Merge with trunk up to revision 45620.
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 3bd740f..910dbb1 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -147,7 +147,7 @@
AdditionalOptions=" /USECL:MS_ITANIUM"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl;{MSSDKPATH}\include\Win64\crt;{MSSDKPATH}\include\Win64\crt\sys;{MSSDKPATH}\include\Win64\mfc;..\Include,..\PC"
+ AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT"
StringPooling="TRUE"
BasicRuntimeChecks="0"
@@ -214,7 +214,7 @@
AdditionalOptions="/Zm200 /USECL:MS_OPTERON"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="{MSSDKPATH}\include\Win64\atl\amd64;{MSSDKPATH}\include\Win64\crt\amd64;{MSSDKPATH}\include\Win64\crt\amd64\sys;{MSSDKPATH}\include\Win64\mfc\amd64;..\Include,..\PC"
+ AdditionalIncludeDirectories="..\Include,..\PC"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT"
StringPooling="TRUE"
BasicRuntimeChecks="0"