diff --git a/src/blackgui/windowfinder.cpp b/src/blackgui/windowfinder.cpp
index 2efbc97c6..f18d65c78 100644
--- a/src/blackgui/windowfinder.cpp
+++ b/src/blackgui/windowfinder.cpp
@@ -10,7 +10,7 @@
 #include "windowfinder.h"
 
 #if defined(Q_OS_WIN)
-    #include "win/windowfinder_win.h"
+    #include "win/windowfinderwindows.h"
 #elif defined(Q_OS_LINUX)
 #elif defined(Q_OS_OSX)
 #else
diff --git a/src/blackinput/joystick.cpp b/src/blackinput/joystick.cpp
index 73251875c..dbdb0480a 100644
--- a/src/blackinput/joystick.cpp
+++ b/src/blackinput/joystick.cpp
@@ -10,11 +10,11 @@
 #include "joystick.h"
 
 #if defined(Q_OS_WIN)
-    #include "win/joystick_windows.h"
+    #include "win/joystickwindows.h"
 #elif defined(Q_OS_LINUX)
     #include "linux/joysticklinux.h"
 #elif defined(Q_OS_OSX)
-    #include "osx/joystick_mac.h"
+    #include "osx/joystickmac.h"
 #else
     #error "Platform is not supported!"
 #endif
diff --git a/src/blackinput/keyboard.cpp b/src/blackinput/keyboard.cpp
index 5ba81664c..b2f2eb47f 100644
--- a/src/blackinput/keyboard.cpp
+++ b/src/blackinput/keyboard.cpp
@@ -6,11 +6,11 @@
 #include "keyboard.h"
 
 #if defined(Q_OS_WIN)
-    #include "win/keyboard_windows.h"
+    #include "win/keyboardwindows.h"
 #elif defined(Q_OS_LINUX)
     #include "linux/keyboardlinux.h"
 #elif defined(Q_OS_OSX)
-    #include "osx/keyboard_mac.h"
+    #include "osx/keyboardmac.h"
 #else
     #error "Platform is not supported!"
 #endif
diff --git a/src/plugins/simulator/fs9/registermetadata.cpp b/src/plugins/simulator/fs9/registermetadata.cpp
index 0013dfa6c..e919de3db 100644
--- a/src/plugins/simulator/fs9/registermetadata.cpp
+++ b/src/plugins/simulator/fs9/registermetadata.cpp
@@ -8,8 +8,8 @@
  */
 
 #include "registermetadata.h"
-#include "fs9_host.h"
-#include "fs9_client.h"
+#include "fs9host.h"
+#include "fs9client.h"
 
 namespace BlackSimPlugin
 {
diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp
index 5bf1eed9e..d26667c12 100644
--- a/src/plugins/simulator/fs9/simulatorfs9.cpp
+++ b/src/plugins/simulator/fs9/simulatorfs9.cpp
@@ -14,6 +14,7 @@
 #include "fs9client.h"
 #include "multiplayerpackets.h"
 #include "multiplayerpacketparser.h"
+#include "registermetadata.h"
 #include "blackcore/interpolatorlinear.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/logmessage.h"