From c6d184cd3b46fbd1ac0205e26111b6ea235e349e Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 18 Oct 2017 03:09:17 +0200
Subject: [PATCH] Ref T118, fix for simconnect.h not including windows.h

---
 src/plugins/simulator/fsx/simconnectwindows.h       | 13 +++++++++++++
 .../simulator/fsxcommon/simconnectdatadefinition.h  |  6 +-----
 .../simulator/fsxcommon/simulatorfsxcommon.h        |  7 +------
 3 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 src/plugins/simulator/fsx/simconnectwindows.h

diff --git a/src/plugins/simulator/fsx/simconnectwindows.h b/src/plugins/simulator/fsx/simconnectwindows.h
new file mode 100644
index 000000000..5a1494785
--- /dev/null
+++ b/src/plugins/simulator/fsx/simconnectwindows.h
@@ -0,0 +1,13 @@
+// in P3Dv4 the simconnect.h does not include windows.h
+// here we include windows.h first
+
+#ifndef BLACKSIMPLUGIN_FSX_SIMCONNECTWINDOWS_H
+#define BLACKSIMPLUGIN_FSX_SIMCONNECTWINDOWS_H
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+#include <SimConnect.h>
+
+#endif // guard
diff --git a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h
index e0e31e2ff..ef81628b9 100644
--- a/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h
+++ b/src/plugins/simulator/fsxcommon/simconnectdatadefinition.h
@@ -14,12 +14,8 @@
 
 #include <QtGlobal>
 
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
 #include "blackmisc/aviation/aircraftlights.h"
-#include <SimConnect.h>
-#include <windows.h>
+#include "../fsx/simconnectwindows.h"
 #include <algorithm>
 #include <QString>
 
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
index 978e007dc..adf7dd70a 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.h
@@ -14,6 +14,7 @@
 
 #include "simconnectdatadefinition.h"
 #include "simconnectobject.h"
+#include "../fsx/simconnectwindows.h"
 #include "../fscommon/simulatorfscommon.h"
 #include "blackcore/simulator.h"
 #include "blackmisc/simulation/interpolatorlinear.h"
@@ -26,17 +27,11 @@
 #include "blackmisc/network/client.h"
 #include "blackmisc/pixmap.h"
 
-#include <SimConnect.h>
 #include <QObject>
 #include <QtPlugin>
 #include <QHash>
 #include <QFutureWatcher>
 
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#include <windows.h>
-
 namespace BlackSimPlugin
 {
     namespace FsxCommon