Windows: Use CommonWindows more consistently.

Also, make sure WinSock2.h is included beforehand where it's needed.

Common/GPU/thin3d_create.h

@@ -7,11 +7,7 @@
 // Separated this stuff into its own file so we don't get Windows.h included if all we want is the thin3d declarations.
 
 #ifdef _WIN32
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include "Common/CommonWindows.h"
 #include <D3Dcommon.h>
 struct IDirect3DDevice9;
 struct IDirect3D9;

Core/FileSystems/DirectoryFileSystem.cpp

@@ -49,6 +49,7 @@
 #ifdef _WIN32
 #include "Common/CommonWindows.h"
 #include <sys/stat.h>
+#undef FILE_OPEN
 #else
 #include <dirent.h>
 #include <unistd.h>

Core/HLE/proAdhoc.cpp

@@ -22,6 +22,7 @@
 // All credit goes to him!
 
 #if defined(_WIN32)
+#include <WinSock2.h>
 #include "Common/CommonWindows.h"
 #endif
 

Core/HLE/proAdhocServer.cpp

@@ -33,6 +33,7 @@
 #include <sys/types.h>
 // Net stuff
 #if defined(_WIN32)
+#include <WinSock2.h>
 #include <WS2tcpip.h>
 #else
 #include <sys/socket.h>

Core/HLE/sceNetAdhoc.cpp

@@ -16,6 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #if defined(_WIN32)
+#include <WinSock2.h>
 #include "Common/CommonWindows.h"
 #endif
 

Core/HLE/sceUsbCam.cpp

@@ -34,9 +34,7 @@
 #endif
 
 #ifdef HAVE_WIN32_CAMERA
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
+#include "Common/CommonWindows.h"
 #include "Windows/CaptureDevice.h"
 #endif
 

Core/HLE/sceUsbMic.cpp

@@ -33,7 +33,7 @@
 #endif
 
 #ifdef HAVE_WIN32_MICROPHONE
-#define NOMINMAX
+#include "Common/CommonWindows.h"
 #include "Windows/CaptureDevice.h"
 #endif
 

Windows/WindowsHost.cpp

@@ -20,7 +20,7 @@
 #include <algorithm>
 
 // For shell links
-#include "windows.h"
+#include "Common/CommonWindows.h"
 #include "winnls.h"
 #include "shobjidl.h"
 #include "objbase.h"