diff --git a/Common/CommonWindows.h b/Common/CommonWindows.h
index bacd41cb5f..28e8bc0a1d 100644
--- a/Common/CommonWindows.h
+++ b/Common/CommonWindows.h
@@ -1,5 +1,17 @@
 #pragma once
 
+#if defined(_MSC_VER) && _MSC_VER < 1700
+#error You need a newer version of Visual Studio
+#else
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x601 // Compile for Win7 on Visual Studio 2012 and above
+#undef WINVER
+#define WINVER 0x601
+#endif
+
+#undef _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
+#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
+
 #ifdef _WIN32
 #pragma warning(disable:4091)
 
diff --git a/Windows/stdafx.h b/Windows/stdafx.h
index 97093c82b5..95352445fb 100644
--- a/Windows/stdafx.h
+++ b/Windows/stdafx.h
@@ -17,23 +17,6 @@
 
 #pragma once
 
-#undef _WIN32_WINNT
-
-#if defined(_MSC_VER) && _MSC_VER < 1700
-#error You need a newer version of Visual Studio
-#else
-#define _WIN32_WINNT 0x601 // Compile for Win7 on Visual Studio 2012 and above
-#endif
-
-#undef WINVER
-#define WINVER _WIN32_WINNT
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0600       // Default value is 0x0400
-#endif
-
-#undef _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
-#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
-
 #ifndef __clang__
 #if defined _M_IX86
 #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")