diff --git a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h
index 4d827ddeb..2465b5bc9 100644
--- a/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h
+++ b/src/plugins/simulator/emulatedconfig/simulatoremulatedconfig.h
@@ -32,7 +32,7 @@ namespace BlackSimPlugin
             CSimulatorEmulatedConfig(QObject *parent = nullptr);
 
             //! Dtor
-            virtual ~CSimulatorEmulatedConfig() {}
+            virtual ~CSimulatorEmulatedConfig() override {}
 
             //! \copydoc BlackGui::IPluginConfig::createConfigWindow()
             BlackGui::CPluginConfigWindow *createConfigWindow(QWidget *parent) override;
diff --git a/src/plugins/simulator/fscommon/fsuipcimpl.cpp b/src/plugins/simulator/fscommon/fsuipcimpl.cpp
index d9c677569..d49cc73f4 100644
--- a/src/plugins/simulator/fscommon/fsuipcimpl.cpp
+++ b/src/plugins/simulator/fscommon/fsuipcimpl.cpp
@@ -18,11 +18,11 @@
 // bug in FSUIPC_User.h, windows.h not included, so we have to import it first
 
 #ifdef SWIFT_USING_FSUIPC32
+#include "../fsuipc32/IPCuser.h"
 #include "../fsuipc32/FSUIPC_User.h"
 #include "../fsuipc32/NewWeather.h"
-#endif
-
-#ifdef SWIFT_USING_FSUIPC64
+#elif SWIFT_USING_FSUIPC64
+#include "../fsuipc64/IPCuser64.h"
 #include "../fsuipc64/FSUIPC_User64.h"
 #include "../fsuipc64/NewWeather.h"
 #endif
@@ -56,8 +56,7 @@ namespace BlackSimPlugin
             int m_leftTrials = 0;
         };
 
-        CFsuipc::CFsuipc(QObject *parent)
-            : QObject(parent)
+        CFsuipc::CFsuipc(QObject *parent) : QObject(parent)
         {
             startTimer(100);
         }