Switch to including Windows.h from an intermediate.

This makes it easier for Xbox which uses a separate header.

Common/Atomic_Win32.h

@@ -20,7 +20,7 @@
 
 #include "Common.h"
 #include <intrin.h>
-#include <Windows.h>
+#include "CommonWindows.h"
 
 // Atomic operations are performed in a single step by the CPU. It is
 // impossible for other threads to see the operation "half-done."

Common/Common.vcxproj

@@ -175,6 +175,7 @@
     <ClInclude Include="CommonFuncs.h" />
     <ClInclude Include="CommonPaths.h" />
     <ClInclude Include="CommonTypes.h" />
+    <ClInclude Include="CommonWindows.h" />
     <ClInclude Include="ConsoleListener.h" />
     <ClInclude Include="CPUDetect.h" />
     <ClInclude Include="Crypto\md5.h" />

Common/Common.vcxproj.filters

@@ -48,6 +48,7 @@
     </ClInclude>
     <ClInclude Include="KeyMap.h" />
     <ClInclude Include="Swap.h" />
+    <ClInclude Include="CommonWindows.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp" />

Common/CommonWindows.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#ifdef _WIN32
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+
+#ifdef _XBOX
+#include <xtl.h>
+#else
+#include <Windows.h>
+#endif
+
+#undef min
+#undef max
+#endif

Common/ConsoleListener.cpp

@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <math.h>
 #ifdef _WIN32
-#include <windows.h>
+#include "CommonWindows.h"
 #include <array>
 #else
 #include <stdarg.h>

Common/ConsoleListener.h

@@ -21,7 +21,7 @@
 #include "LogManager.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "CommonWindows.h"
 #endif
 
 class ConsoleListener : public LogListener

Common/ExtendedTrace.cpp

@@ -14,7 +14,7 @@
 
 #if defined(WIN32)
 
-#include <windows.h>
+#include "CommonWindows.h"
 #include <stdio.h>
 #include "ExtendedTrace.h"
 using namespace std;

Common/ExtendedTrace.h

@@ -17,7 +17,7 @@
 
 #if defined(WIN32)
 
-#include <windows.h>
+#include "CommonWindows.h"
 #include <tchar.h>
 
 #include <string>

Common/FileSearch.cpp

@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #else
-#include <windows.h>
+#include "CommonWindows.h"
 #endif
 
 // strcasecmp

Common/FileUtil.cpp

@@ -21,7 +21,7 @@
 #include "StringUtils.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "CommonWindows.h"
 #include <shlobj.h>		// for SHGetFolderPath
 #include <shellapi.h>
 #include <commdlg.h>	// for GetSaveFileName

Common/MemArena.cpp

@@ -19,7 +19,7 @@
 #include "MemArena.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "CommonWindows.h"
 #else
 #include <sys/stat.h>
 #include <fcntl.h>

Common/MemArena.h

@@ -19,7 +19,7 @@
 #define _MEMARENA_H_
 
 #ifdef _WIN32
-#include <windows.h>
+#include "CommonWindows.h"
 #endif
 
 #ifdef __SYMBIAN32__

Common/MemoryUtil.cpp

@@ -20,7 +20,7 @@
 #include "StringUtils.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "CommonWindows.h"
 #include <psapi.h>
 #else
 #include <errno.h>

Common/Misc.cpp

@@ -22,7 +22,7 @@
 #endif
 
 #ifdef _WIN32
-#include <windows.h>
+#include "CommonWindows.h"
 #endif
 
 // Generic function to get last error message.

Common/MsgHandler.cpp

@@ -99,7 +99,7 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...)
 }
 
 #ifdef _WIN32
-#include <windows.h>
+#include "CommonWindows.h"
 #endif
 
 // Default non library dependent panic alert

Common/StdMutex.h

@@ -17,7 +17,7 @@
 
 #if defined(_WIN32) // WIN32
 #define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include "CommonWindows.h"
 #else // POSIX
 #include <pthread.h>
 #endif

Common/StdThread.h

@@ -29,7 +29,7 @@
 // WIN32
 
 #define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include "CommonWindows.h"
 
 #if defined(_MSC_VER) && defined(_MT)
 // When linking with LIBCMT (the multithreaded C library), Microsoft recommends

Common/Timer.cpp

@@ -18,7 +18,7 @@
 #include <time.h>
 
 #ifdef _WIN32
-#include <Windows.h>
+#include "CommonWindows.h"
 #include <mmsystem.h>
 #include <sys/timeb.h>
 #else

Common/stdafx.h

@@ -36,7 +36,7 @@
 //#define _CRT_SECURE_NO_DEPRECATE 1
 //#define _CRT_NONSTDC_NO_DEPRECATE 1
 
-#include <windows.h>
+#include "CommonWindows.h"
 #include <tchar.h>
 #include <vector>
 

Core/Debugger/SymbolMap.cpp

@@ -16,7 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #ifdef _WIN32
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #include <WindowsX.h>
 #else
 #include <unistd.h>

Core/FileSystems/DirectoryFileSystem.cpp

@@ -23,7 +23,7 @@
 #include "file/zip_read.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #include <sys/stat.h>
 #else
 #include <dirent.h>

Core/FileSystems/VirtualDiscFileSystem.cpp

@@ -24,7 +24,7 @@
 #include "file/zip_read.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #include <sys/stat.h>
 #else
 #include <dirent.h>

Core/HLE/sceKernelTime.cpp

@@ -17,7 +17,7 @@
 
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #else
 #include <sys/time.h>
 #endif

Core/HLE/sceRtc.cpp

@@ -16,7 +16,7 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #ifdef _WIN32
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #else
 #include <sys/time.h>
 #endif

Core/HW/atrac3plus.cpp

@@ -1,5 +1,5 @@
 #ifdef _WIN32
-#include <Windows.h>
+#include "Common/CommonWindows.h"
 #else
 #include <dlfcn.h>
 #include <errno.h>

Core/MIPS/JitCommon/JitBlockCache.cpp

@@ -25,7 +25,7 @@
 #include "Common.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #endif
 
 #include "Core/Core.h"

Core/System.cpp

@@ -18,7 +18,7 @@
 #ifdef _WIN32
 #define NOMINMAX
 #define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#include "Common/CommonWindows.h"
 #endif
 
 #include "MemMap.h"

GPU/GLES/ShaderManager.cpp

@@ -21,7 +21,7 @@
 
 #ifdef SHADERLOG
 #define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #endif
 
 #include <map>

GPU/GLES/VertexShaderGenerator.cpp

@@ -19,7 +19,7 @@
 #include <locale.h>
 
 #if defined(_WIN32) && defined(_DEBUG)
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #endif
 
 #include "base/stringutil.h"

headless/WindowsHeadlessHost.cpp

@@ -19,7 +19,7 @@
 #include "Compare.h"
 
 #include <stdio.h>
-#include <windows.h>
+#include "Common/CommonWindows.h"
 #include <io.h>
 
 #include "gfx_es2/gl_state.h"

headless/WindowsHeadlessHost.h

@@ -22,7 +22,7 @@
 #undef HEADLESSHOST_CLASS
 #define HEADLESSHOST_CLASS WindowsHeadlessHost
 
-#include <windows.h>
+#include "Common/CommonWindows.h"
 
 // TODO: Get rid of this junk
 class WindowsHeadlessHost : public HeadlessHost