diff --git a/Source/Core/Common/stdafx.h b/Source/Core/Common/stdafx.h
index 1cbeb9d7e3..33024b3aea 100644
--- a/Source/Core/Common/stdafx.h
+++ b/Source/Core/Common/stdafx.h
@@ -4,6 +4,10 @@
 
 #pragma once
 
+#if _MSC_FULL_VER < 180030723
+#error Please update your build environment to VS2013 with Update 3 or later!
+#endif
+
 // Windows Vista is the lowest version we support
 #define _WIN32_WINNT 0x0600
 
diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index 63198e3fa3..042cd7d6d0 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -57,7 +57,7 @@
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <MinimalRebuild>false</MinimalRebuild>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/d2Zi+ /volatile:iso /D PSAPI_VERSION=1 /D _M_X86=1 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zo /volatile:iso /D PSAPI_VERSION=1 /D _M_X86=1 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(Platform)'=='x64'">/D _ARCH_64=1 /D _M_X86_64=1 %(AdditionalOptions)</AdditionalOptions>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <!--