From 82935bd8e0b10f1c29149d2c1639b64392f575cd Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 15 Nov 2021 11:35:08 +0100
Subject: [PATCH] Unify Windows.h inclusion

Windows.h must be included first and must be included with care
regarding WinSock.h and WinSock2.h affair.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 include/WinStd/Common.h | 1 +
 include/WinStd/EAP.h    | 3 +--
 include/WinStd/GDI.h    | 2 --
 include/WinStd/Win.h    | 2 --
 src/PCH.h               | 2 --
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/include/WinStd/Common.h b/include/WinStd/Common.h
index 75db96f0..a61a287b 100644
--- a/include/WinStd/Common.h
+++ b/include/WinStd/Common.h
@@ -42,6 +42,7 @@
 /// Sanitizes memory before dismissed
 ///
 
+#define _WINSOCKAPI_    // Prevent inclusion of winsock.h in windows.h.
 #include <Windows.h>
 
 #include <stdarg.h>
diff --git a/include/WinStd/EAP.h b/include/WinStd/EAP.h
index e9eed9d3..f1820421 100644
--- a/include/WinStd/EAP.h
+++ b/include/WinStd/EAP.h
@@ -25,9 +25,8 @@
 
 #include "Common.h"
 
-#include <Windows.h>
 #include <eaphostpeerconfigapis.h>
-#include <eaptypes.h> // Must include after <Windows.h>
+#include <eaptypes.h>
 
 #include <memory>
 
diff --git a/include/WinStd/GDI.h b/include/WinStd/GDI.h
index 4d3c8e33..c7097bd4 100644
--- a/include/WinStd/GDI.h
+++ b/include/WinStd/GDI.h
@@ -24,8 +24,6 @@
 
 #include "Common.h"
 
-#include <Windows.h>
-
 namespace winstd
 {
     template<class T> class gdi_handle;
diff --git a/include/WinStd/Win.h b/include/WinStd/Win.h
index 285b5cba..55c8f8be 100644
--- a/include/WinStd/Win.h
+++ b/include/WinStd/Win.h
@@ -25,8 +25,6 @@
 
 #include "Common.h"
 
-#include <Windows.h>
-
 #include <string>
 #include <vector>
 
diff --git a/src/PCH.h b/src/PCH.h
index d74cea1a..270a5357 100644
--- a/src/PCH.h
+++ b/src/PCH.h
@@ -20,8 +20,6 @@
 
 #pragma once
 
-#define _WINSOCKAPI_    // Prevent inclusion of winsock.h in windows.h.
-
 #include "../include/WinStd/Base64.h"
 #include "../include/WinStd/COM.h"
 #include "../include/WinStd/Cred.h"