diff --git a/Common/Atomic_Win32.h b/Common/Atomic_Win32.h
index 541aa203e7..87ddc8a82d 100644
--- a/Common/Atomic_Win32.h
+++ b/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."
diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index 0d27075419..ea2e861c0c 100644
--- a/Common/Common.vcxproj
+++ b/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" />
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index 3bcc5ae830..c498c5df18 100644
--- a/Common/Common.vcxproj.filters
+++ b/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" />
diff --git a/Common/CommonWindows.h b/Common/CommonWindows.h
new file mode 100644
index 0000000000..4f43edb8ed
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/Common/ConsoleListener.cpp b/Common/ConsoleListener.cpp
index e5d3ef9c4c..d3f27aa413 100644
--- a/Common/ConsoleListener.cpp
+++ b/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>
diff --git a/Common/ConsoleListener.h b/Common/ConsoleListener.h
index 1eff61a358..a79cf89f62 100644
--- a/Common/ConsoleListener.h
+++ b/Common/ConsoleListener.h
@@ -21,7 +21,7 @@
 #include "LogManager.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "CommonWindows.h"
 #endif
 
 class ConsoleListener : public LogListener
diff --git a/Common/ExtendedTrace.cpp b/Common/ExtendedTrace.cpp
index 8864c976bc..751d9b3d54 100644
--- a/Common/ExtendedTrace.cpp
+++ b/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;
diff --git a/Common/ExtendedTrace.h b/Common/ExtendedTrace.h
index 12e7ed41fa..433f3e6d07 100644
--- a/Common/ExtendedTrace.h
+++ b/Common/ExtendedTrace.h
@@ -17,7 +17,7 @@
 
 #if defined(WIN32)
 
-#include <windows.h>
+#include "CommonWindows.h"
 #include <tchar.h>
 
 #include <string>
diff --git a/Common/FileSearch.cpp b/Common/FileSearch.cpp
index 3d8e07d852..fb620e0269 100644
--- a/Common/FileSearch.cpp
+++ b/Common/FileSearch.cpp
@@ -21,7 +21,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #else
-#include <windows.h>
+#include "CommonWindows.h"
 #endif
 
 // strcasecmp
diff --git a/Common/FileUtil.cpp b/Common/FileUtil.cpp
index 06dd86b026..9f93febbd8 100644
--- a/Common/FileUtil.cpp
+++ b/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
diff --git a/Common/MemArena.cpp b/Common/MemArena.cpp
index c88f764989..327c974c07 100644
--- a/Common/MemArena.cpp
+++ b/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>
diff --git a/Common/MemArena.h b/Common/MemArena.h
index 898bcd12d5..79165ad8b4 100644
--- a/Common/MemArena.h
+++ b/Common/MemArena.h
@@ -19,7 +19,7 @@
 #define _MEMARENA_H_
 
 #ifdef _WIN32
-#include <windows.h>
+#include "CommonWindows.h"
 #endif
 
 #ifdef __SYMBIAN32__
diff --git a/Common/MemoryUtil.cpp b/Common/MemoryUtil.cpp
index 88750232be..16ef11c147 100644
--- a/Common/MemoryUtil.cpp
+++ b/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>
diff --git a/Common/Misc.cpp b/Common/Misc.cpp
index 1d4bd15b09..37807a0f61 100644
--- a/Common/Misc.cpp
+++ b/Common/Misc.cpp
@@ -22,7 +22,7 @@
 #endif
 
 #ifdef _WIN32
-#include <windows.h>
+#include "CommonWindows.h"
 #endif
 
 // Generic function to get last error message.
diff --git a/Common/MsgHandler.cpp b/Common/MsgHandler.cpp
index 75ebd60e3b..1bc7f4cd0c 100644
--- a/Common/MsgHandler.cpp
+++ b/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
diff --git a/Common/StdMutex.h b/Common/StdMutex.h
index 57bc409c17..e5a9cfb1b7 100644
--- a/Common/StdMutex.h
+++ b/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
diff --git a/Common/StdThread.h b/Common/StdThread.h
index f32a96be92..11d6755579 100644
--- a/Common/StdThread.h
+++ b/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
diff --git a/Common/Timer.cpp b/Common/Timer.cpp
index c48d0812c4..fbab97fb33 100644
--- a/Common/Timer.cpp
+++ b/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
diff --git a/Common/stdafx.h b/Common/stdafx.h
index 3481699e0a..d8e0aca636 100644
--- a/Common/stdafx.h
+++ b/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>
 
diff --git a/Core/Debugger/SymbolMap.cpp b/Core/Debugger/SymbolMap.cpp
index 2b971acc9b..4ac18c9c4b 100644
--- a/Core/Debugger/SymbolMap.cpp
+++ b/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>
diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp
index 9b502f0605..293c40cc70 100644
--- a/Core/FileSystems/DirectoryFileSystem.cpp
+++ b/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>
diff --git a/Core/FileSystems/VirtualDiscFileSystem.cpp b/Core/FileSystems/VirtualDiscFileSystem.cpp
index f122c2b542..56d5268e33 100644
--- a/Core/FileSystems/VirtualDiscFileSystem.cpp
+++ b/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>
diff --git a/Core/HLE/sceKernelTime.cpp b/Core/HLE/sceKernelTime.cpp
index 8009677568..6d32045762 100644
--- a/Core/HLE/sceKernelTime.cpp
+++ b/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
diff --git a/Core/HLE/sceRtc.cpp b/Core/HLE/sceRtc.cpp
index 745dd660fb..6fa90b8d74 100644
--- a/Core/HLE/sceRtc.cpp
+++ b/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
diff --git a/Core/HW/atrac3plus.cpp b/Core/HW/atrac3plus.cpp
index cd3ef18cbb..0f1e6d95c8 100644
--- a/Core/HW/atrac3plus.cpp
+++ b/Core/HW/atrac3plus.cpp
@@ -1,5 +1,5 @@
 #ifdef _WIN32
-#include <Windows.h>
+#include "Common/CommonWindows.h"
 #else
 #include <dlfcn.h>
 #include <errno.h>
diff --git a/Core/MIPS/JitCommon/JitBlockCache.cpp b/Core/MIPS/JitCommon/JitBlockCache.cpp
index 6c28292462..cb210a1f6c 100644
--- a/Core/MIPS/JitCommon/JitBlockCache.cpp
+++ b/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"
diff --git a/Core/System.cpp b/Core/System.cpp
index c9b66bed73..f40c38e2d5 100644
--- a/Core/System.cpp
+++ b/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"
diff --git a/GPU/GLES/ShaderManager.cpp b/GPU/GLES/ShaderManager.cpp
index ec3819aa88..eb5385e5cf 100644
--- a/GPU/GLES/ShaderManager.cpp
+++ b/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>
diff --git a/GPU/GLES/VertexShaderGenerator.cpp b/GPU/GLES/VertexShaderGenerator.cpp
index 1c83e3046e..725eca188b 100644
--- a/GPU/GLES/VertexShaderGenerator.cpp
+++ b/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"
diff --git a/headless/WindowsHeadlessHost.cpp b/headless/WindowsHeadlessHost.cpp
index 6dd61416e8..022d93d78b 100644
--- a/headless/WindowsHeadlessHost.cpp
+++ b/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"
diff --git a/headless/WindowsHeadlessHost.h b/headless/WindowsHeadlessHost.h
index 022a2c6065..71e37a9e2f 100644
--- a/headless/WindowsHeadlessHost.h
+++ b/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