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

@@ -42,6 +42,7 @@
 /// Sanitizes memory before dismissed
 ///
 
+#define _WINSOCKAPI_    // Prevent inclusion of winsock.h in windows.h.
 #include <Windows.h>
 
 #include <stdarg.h>

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>
 

include/WinStd/GDI.h

@@ -24,8 +24,6 @@
 
 #include "Common.h"
 
-#include <Windows.h>
-
 namespace winstd
 {
     template<class T> class gdi_handle;

include/WinStd/Win.h

@@ -25,8 +25,6 @@
 
 #include "Common.h"
 
-#include <Windows.h>
-
 #include <string>
 #include <vector>
 

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"