diff --git a/src/blackcore/win/keyboard_windows.h b/src/blackcore/win/keyboard_windows.h
index cb44de129..9577bf570 100644
--- a/src/blackcore/win/keyboard_windows.h
+++ b/src/blackcore/win/keyboard_windows.h
@@ -13,7 +13,10 @@
 #include "blackcore/keyboard.h"
 #include "blackmisc/hwkeyboardkey.h"
 #include <QHash>
-#include <Windows.h>
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
 
 namespace BlackCore
 {
diff --git a/src/blackcore/win/keymapping_windows.cpp b/src/blackcore/win/keymapping_windows.cpp
index cf698cd8c..6ee827468 100644
--- a/src/blackcore/win/keymapping_windows.cpp
+++ b/src/blackcore/win/keymapping_windows.cpp
@@ -5,6 +5,10 @@
 
 #include "keymapping_windows.h"
 #include <QDebug>
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <windows.h>
 
 using namespace BlackMisc::Hardware;
diff --git a/src/blackcore/win/keymapping_windows.h b/src/blackcore/win/keymapping_windows.h
index e1bbf16ee..884367fe1 100644
--- a/src/blackcore/win/keymapping_windows.h
+++ b/src/blackcore/win/keymapping_windows.h
@@ -8,6 +8,9 @@
 #define BLACKCORE_KEYMAPPING_WINDOWS_H
 
 #include "blackmisc/hwkeyboardkey.h"
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <windows.h>
 
 namespace BlackCore
@@ -39,4 +42,4 @@ namespace BlackCore
     };
 
 } // namespace BlackCore
-#endif // BLACKCORE_KEYMAPPING_WINDOWS_H
+#endif // guard
diff --git a/src/blackmisc/context.cpp b/src/blackmisc/context.cpp
index 240fe6bf6..b9b93690f 100644
--- a/src/blackmisc/context.cpp
+++ b/src/blackmisc/context.cpp
@@ -12,7 +12,7 @@
 #ifndef NOMINMAX
 #define NOMINMAX
 #endif
-#include <Windows.h>
+#include <windows.h>
 #endif
 
 namespace BlackMisc
diff --git a/src/blacksim/fsx/simconnect_datadefinition.h b/src/blacksim/fsx/simconnect_datadefinition.h
index 785d225af..696b6acbc 100644
--- a/src/blacksim/fsx/simconnect_datadefinition.h
+++ b/src/blacksim/fsx/simconnect_datadefinition.h
@@ -6,6 +6,9 @@
 #ifndef BLACKSIMPLUGIN_FSX_SIMCONNECT_DATADEFINITION_H
 #define BLACKSIMPLUGIN_FSX_SIMCONNECT_DATADEFINITION_H
 
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <windows.h>
 
 namespace BlackSimPlugin
diff --git a/src/blacksim/fsx/simconnectutilities.h b/src/blacksim/fsx/simconnectutilities.h
index 154b01307..cc5d62eab 100644
--- a/src/blacksim/fsx/simconnectutilities.h
+++ b/src/blacksim/fsx/simconnectutilities.h
@@ -8,7 +8,10 @@
 // though it does not make sense to be used on non WIN machines.
 // But it allows parts as GUI to comile
 #ifdef Q_OS_WIN
-#include <windows.h>
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <Windows.h>
 #else
 typedef unsigned long   DWORD;
 #endif
diff --git a/src/blacksim/fsx/simulator_fsx.h b/src/blacksim/fsx/simulator_fsx.h
index b565e892a..81bc2e4bb 100644
--- a/src/blacksim/fsx/simulator_fsx.h
+++ b/src/blacksim/fsx/simulator_fsx.h
@@ -6,18 +6,19 @@
 #ifndef BLACKSIMPLUGIN_SIMULATOR_FSX_H
 #define BLACKSIMPLUGIN_SIMULATOR_FSX_H
 
-#define NOMINMAX
-
 #include "simconnect_datadefinition.h"
-
 #include "blackcore/simulator.h"
 #include "blackcore/interpolator_linear.h"
 #include "blackmisc/avaircraft.h"
+#include "blacksim/simulatorinfo.h"
 #include <simconnect/SimConnect.h>
 #include <QObject>
 #include <QtPlugin>
 #include <QHash>
 
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #include <windows.h>
 
 namespace BlackSimPlugin