diff --git a/Common/stdafx.h b/Common/stdafx.h
index 993286e03..3481699e0 100644
--- a/Common/stdafx.h
+++ b/Common/stdafx.h
@@ -18,8 +18,15 @@
 #pragma once
 
 #ifndef _WIN32_WINNT
-	#define _WIN32_WINNT 0x501
-#endif
+
+#if _MSC_VER < 1700
+#define _WIN32_WINNT 0x501 // Compile for XP on Visual Studio 2010 and below
+#else
+#define _WIN32_WINNT 0x600 // Compile for Vista on Visual Studio 2012 and above
+#endif // #if _MSC_VER < 1700
+
+#endif // #ifndef _WIN32_WINNT
+
 #ifndef _WIN32_IE
 #define _WIN32_IE 0x0500       // Default value is 0x0400
 #endif
diff --git a/GPU/GLES/TextureScaler.cpp b/GPU/GLES/TextureScaler.cpp
index b592c2cdb..c13bbdbfe 100644
--- a/GPU/GLES/TextureScaler.cpp
+++ b/GPU/GLES/TextureScaler.cpp
@@ -15,6 +15,9 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
+// Has to be included before TextureScaler.h, else we get those std::bind errors in VS2012..
+#include "../native/base/basictypes.h" 
+
 #include "TextureScaler.h"
 
 #include "Core/Config.h"
diff --git a/Windows/stdafx.h b/Windows/stdafx.h
index a7b53365b..30f5a12f9 100644
--- a/Windows/stdafx.h
+++ b/Windows/stdafx.h
@@ -26,7 +26,13 @@
 //#ifdef WINDOWS
 
 #undef _WIN32_WINNT
-#define _WIN32_WINNT 0x600
+
+#if _MSC_VER < 1700
+#define _WIN32_WINNT 0x501 // Compile for XP on Visual Studio 2010 and below
+#else
+#define _WIN32_WINNT 0x600 // Compile for Vista on Visual Studio 2012 and above
+#endif
+
 #undef WINVER
 #define WINVER 0x0600
 #ifndef _WIN32_IE