Issue 14813: Fix Visual Studio 2008 build after the move into the PC/VS9.0

directory.

PC/VS9.0/_bz2.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="_bz2"
 	ProjectGUID="{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
 	RootNamespace="bz2"
@@ -527,7 +527,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_bz2module.c"
+				RelativePath="..\..\Modules\_bz2module.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/_ctypes.vcproj

@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -103,7 +103,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -164,7 +164,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -228,7 +228,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -355,7 +355,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -419,7 +419,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -483,7 +483,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
+				AdditionalIncludeDirectories="..\..\Modules\_ctypes\libffi_msvc"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -531,27 +531,27 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\Modules\_ctypes\ctypes.h"
+				RelativePath="..\..\Modules\_ctypes\ctypes.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\ctypes_dlfcn.h"
+				RelativePath="..\..\Modules\_ctypes\ctypes_dlfcn.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.h"
+				RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\libffi_msvc\ffi_common.h"
+				RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi_common.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\libffi_msvc\fficonfig.h"
+				RelativePath="..\..\Modules\_ctypes\libffi_msvc\fficonfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\libffi_msvc\ffitarget.h"
+				RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffitarget.h"
 				>
 			</File>
 		</Filter>
@@ -559,39 +559,39 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_ctypes\_ctypes.c"
+				RelativePath="..\..\Modules\_ctypes\_ctypes.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\callbacks.c"
+				RelativePath="..\..\Modules\_ctypes\callbacks.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\callproc.c"
+				RelativePath="..\..\Modules\_ctypes\callproc.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\cfield.c"
+				RelativePath="..\..\Modules\_ctypes\cfield.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\libffi_msvc\ffi.c"
+				RelativePath="..\..\Modules\_ctypes\libffi_msvc\ffi.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\malloc_closure.c"
+				RelativePath="..\..\Modules\_ctypes\malloc_closure.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\libffi_msvc\prep_cif.c"
+				RelativePath="..\..\Modules\_ctypes\libffi_msvc\prep_cif.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\stgdict.c"
+				RelativePath="..\..\Modules\_ctypes\stgdict.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\libffi_msvc\win32.c"
+				RelativePath="..\..\Modules\_ctypes\libffi_msvc\win32.c"
 				>
 				<FileConfiguration
 					Name="Debug|x64"
@@ -627,7 +627,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\Modules\_ctypes\libffi_msvc\win64.asm"
+				RelativePath="..\..\Modules\_ctypes\libffi_msvc\win64.asm"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"

PC/VS9.0/_ctypes_test.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="_ctypes_test"
 	ProjectGUID="{9EC7190A-249F-4180-A900-548FDCF3055F}"
 	RootNamespace="_ctypes_test"
@@ -503,7 +503,7 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\Modules\_ctypes\_ctypes_test.h"
+				RelativePath="..\..\Modules\_ctypes\_ctypes_test.h"
 				>
 			</File>
 		</Filter>
@@ -511,7 +511,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_ctypes\_ctypes_test.c"
+				RelativePath="..\..\Modules\_ctypes\_ctypes_test.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/_decimal.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="_decimal"
 	ProjectGUID="{0E9791DB-593A-465F-98BC-681011311617}"
 	RootNamespace="_decimal"
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_32 /DPPRO /DMASM"
-				AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+				AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -105,7 +105,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_64 /DMASM"
-				AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+				AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -167,7 +167,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_32 /DPPRO /DMASM"
-				AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+				AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -231,7 +231,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_64 /DMASM"
-				AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+				AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -294,7 +294,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_32 /DPPRO /DMASM"
-				AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+				AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -358,7 +358,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_64 /DMASM"
-				AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+				AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -422,7 +422,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_32 /DPPRO /DMASM"
-				AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+				AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -486,7 +486,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D_CRT_SECURE_NO_WARNINGS /DCONFIG_64 /DMASM"
-				AdditionalIncludeDirectories="..\Modules\_decimal;..\Modules\_decimal\libmpdec"
+				AdditionalIncludeDirectories="..\..\Modules\_decimal;..\..\Modules\_decimal\libmpdec"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -533,71 +533,71 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\basearith.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\basearith.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\bits.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\bits.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\constants.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\constants.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\convolute.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\convolute.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\crt.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\crt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\difradix2.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\difradix2.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\docstrings.h"
+				RelativePath="..\..\Modules\_decimal\docstrings.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\fnt.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\fnt.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\fourstep.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\fourstep.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\mpdecimal.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\mpdecimal.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\numbertheory.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\numbertheory.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\sixstep.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\sixstep.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\transpose.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\transpose.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\typearith.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\typearith.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\umodarith.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\umodarith.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\vccompat.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\vccompat.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\vcstdint.h"
+				RelativePath="..\..\Modules\_decimal\libmpdec\vcstdint.h"
 				>
 			</File>
 		</Filter>
@@ -605,67 +605,67 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_decimal\_decimal.c"
+				RelativePath="..\..\Modules\_decimal\_decimal.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\basearith.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\basearith.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\constants.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\constants.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\context.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\context.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\convolute.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\convolute.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\crt.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\crt.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\difradix2.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\difradix2.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\fnt.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\fnt.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\fourstep.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\fourstep.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\io.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\io.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\memory.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\memory.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\mpdecimal.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\mpdecimal.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\numbertheory.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\numbertheory.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\sixstep.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\sixstep.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\transpose.c"
+				RelativePath="..\..\Modules\_decimal\libmpdec\transpose.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_decimal\libmpdec\vcdiv64.asm"
+				RelativePath="..\..\Modules\_decimal\libmpdec\vcdiv64.asm"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"

PC/VS9.0/_elementtree.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="_elementtree"
 	ProjectGUID="{17E1E049-C309-4D79-843F-AE483C264AEA}"
 	RootNamespace="_elementtree"
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Modules\expat"
 				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Modules\expat"
 				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -166,7 +166,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Modules\expat"
 				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -229,7 +229,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Modules\expat"
 				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -291,7 +291,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Modules\expat"
 				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -354,7 +354,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Modules\expat"
 				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -417,7 +417,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Modules\expat"
 				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -480,7 +480,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Modules\expat"
+				AdditionalIncludeDirectories="..\..\Modules\expat"
 				PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -527,63 +527,63 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\Modules\expat\ascii.h"
+				RelativePath="..\..\Modules\expat\ascii.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\asciitab.h"
+				RelativePath="..\..\Modules\expat\asciitab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\expat.h"
+				RelativePath="..\..\Modules\expat\expat.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\expat_config.h"
+				RelativePath="..\..\Modules\expat\expat_config.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\expat_external.h"
+				RelativePath="..\..\Modules\expat\expat_external.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\iasciitab.h"
+				RelativePath="..\..\Modules\expat\iasciitab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\internal.h"
+				RelativePath="..\..\Modules\expat\internal.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\latin1tab.h"
+				RelativePath="..\..\Modules\expat\latin1tab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\macconfig.h"
+				RelativePath="..\..\Modules\expat\macconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\nametab.h"
+				RelativePath="..\..\Modules\expat\nametab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\pyexpatns.h"
+				RelativePath="..\..\Modules\expat\pyexpatns.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\utf8tab.h"
+				RelativePath="..\..\Modules\expat\utf8tab.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\winconfig.h"
+				RelativePath="..\..\Modules\expat\winconfig.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\xmlrole.h"
+				RelativePath="..\..\Modules\expat\xmlrole.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\xmltok.h"
+				RelativePath="..\..\Modules\expat\xmltok.h"
 				>
 			</File>
 		</Filter>
@@ -591,19 +591,19 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_elementtree.c"
+				RelativePath="..\..\Modules\_elementtree.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\xmlparse.c"
+				RelativePath="..\..\Modules\expat\xmlparse.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\xmlrole.c"
+				RelativePath="..\..\Modules\expat\xmlrole.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\xmltok.c"
+				RelativePath="..\..\Modules\expat\xmltok.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/_hashlib.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="_hashlib"
 	ProjectGUID="{447F05A8-F581-4CAC-A466-5AC7936E207E}"
 	RootNamespace="_hashlib"
@@ -527,7 +527,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_hashopenssl.c"
+				RelativePath="..\..\Modules\_hashopenssl.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/_lzma.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="_lzma"
 	ProjectGUID="{F9D71780-F393-11E0-BE50-0800200C9A66}"
 	RootNamespace="lzma"
@@ -527,7 +527,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_lzmamodule.c"
+				RelativePath="..\..\Modules\_lzmamodule.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/_msi.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="_msi"
 	ProjectGUID="{31FFC478-7B4A-43E8-9954-8D03E2187E9C}"
 	RootNamespace="_msi"
@@ -519,7 +519,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\PC\_msi.c"
+				RelativePath="..\..\PC\_msi.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/_multiprocessing.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="_multiprocessing"
 	ProjectGUID="{9E48B300-37D1-11DD-8C41-005056C00008}"
 	RootNamespace="_multiprocessing"
@@ -519,7 +519,7 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\Modules\_multiprocessing\multiprocessing.h"
+				RelativePath="..\..\Modules\_multiprocessing\multiprocessing.h"
 				>
 			</File>
 		</Filter>
@@ -527,11 +527,11 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_multiprocessing\multiprocessing.c"
+				RelativePath="..\..\Modules\_multiprocessing\multiprocessing.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_multiprocessing\semaphore.c"
+				RelativePath="..\..\Modules\_multiprocessing\semaphore.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/_socket.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="_socket"
 	ProjectGUID="{86937F53-C189-40EF-8CE8-8759D8E7D480}"
 	RootNamespace="_socket"
@@ -519,7 +519,7 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\Modules\socketmodule.h"
+				RelativePath="..\..\Modules\socketmodule.h"
 				>
 			</File>
 		</Filter>
@@ -527,7 +527,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\socketmodule.c"
+				RelativePath="..\..\Modules\socketmodule.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/_sqlite3.vcproj

@@ -527,43 +527,43 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\Modules\_sqlite\cache.h"
+				RelativePath="..\..\Modules\_sqlite\cache.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\connection.h"
+				RelativePath="..\..\Modules\_sqlite\connection.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\cursor.h"
+				RelativePath="..\..\Modules\_sqlite\cursor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\microprotocols.h"
+				RelativePath="..\..\Modules\_sqlite\microprotocols.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\module.h"
+				RelativePath="..\..\Modules\_sqlite\module.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\prepare_protocol.h"
+				RelativePath="..\..\Modules\_sqlite\prepare_protocol.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\row.h"
+				RelativePath="..\..\Modules\_sqlite\row.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\sqlitecompat.h"
+				RelativePath="..\..\Modules\_sqlite\sqlitecompat.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\statement.h"
+				RelativePath="..\..\Modules\_sqlite\statement.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\util.h"
+				RelativePath="..\..\Modules\_sqlite\util.h"
 				>
 			</File>
 		</Filter>
@@ -571,39 +571,39 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_sqlite\cache.c"
+				RelativePath="..\..\Modules\_sqlite\cache.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\connection.c"
+				RelativePath="..\..\Modules\_sqlite\connection.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\cursor.c"
+				RelativePath="..\..\Modules\_sqlite\cursor.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\microprotocols.c"
+				RelativePath="..\..\Modules\_sqlite\microprotocols.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\module.c"
+				RelativePath="..\..\Modules\_sqlite\module.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\prepare_protocol.c"
+				RelativePath="..\..\Modules\_sqlite\prepare_protocol.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\row.c"
+				RelativePath="..\..\Modules\_sqlite\row.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\statement.c"
+				RelativePath="..\..\Modules\_sqlite\statement.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_sqlite\util.c"
+				RelativePath="..\..\Modules\_sqlite\util.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/_ssl.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="_ssl"
 	ProjectGUID="{C6E20F84-3247-4AD6-B051-B073268F73BA}"
 	RootNamespace="_ssl"
@@ -527,7 +527,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_ssl.c"
+				RelativePath="..\..\Modules\_ssl.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/_testbuffer.vcproj

@@ -511,7 +511,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_testbuffer.c"
+				RelativePath="..\..\Modules\_testbuffer.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/_testcapi.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="_testcapi"
 	ProjectGUID="{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"
 	RootNamespace="_testcapi"
@@ -511,7 +511,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_testcapimodule.c"
+				RelativePath="..\..\Modules\_testcapimodule.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/_tkinter.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="_tkinter"
 	ProjectGUID="{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
 	RootNamespace="_tkinter"
@@ -527,11 +527,11 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\_tkinter.c"
+				RelativePath="..\..\Modules\_tkinter.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\tkappinit.c"
+				RelativePath="..\..\Modules\tkappinit.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/bdist_wininst.vcproj

@@ -20,7 +20,7 @@
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\lib\distutils\command"
+			OutputDirectory="..\..\lib\distutils\command"
 			ConfigurationType="1"
 			InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"
 			UseOfMFC="0"
@@ -45,14 +45,14 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\..\lib\distutils\command\wininst.tlb"
+				TypeLibraryName=".\..\..\lib\distutils\command\wininst.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="1"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\PC\bdist_wininst;..\Include;..\Modules\zlib"
+				AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -67,7 +67,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="0"
-				AdditionalIncludeDirectories="..\PC;..\PC\bdist_wininst;..\Include"
+				AdditionalIncludeDirectories="..\..\PC;..\..\PC\bdist_wininst;..\..\Include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -75,11 +75,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib imagehlp.lib"
-				OutputFile="..\lib\distutils\command\wininst-9.0.exe"
+				OutputFile="..\..\lib\distutils\command\wininst-9.0.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBC"
-				ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
+				ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -135,14 +135,14 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="3"
-				TypeLibraryName=".\..\lib\distutils\command\wininst.tlb"
+				TypeLibraryName=".\..\..\lib\distutils\command\wininst.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="1"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\PC\bdist_wininst;..\Include;..\Modules\zlib"
+				AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -157,7 +157,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="0"
-				AdditionalIncludeDirectories="..\PC;..\PC\bdist_wininst;..\Include"
+				AdditionalIncludeDirectories="..\..\PC;..\..\PC\bdist_wininst;..\..\Include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -165,11 +165,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="comctl32.lib imagehlp.lib"
-				OutputFile="..\lib\distutils\command\wininst-9.0-amd64.exe"
+				OutputFile="..\..\lib\distutils\command\wininst-9.0-amd64.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="LIBC"
-				ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0-amd64.pdb"
+				ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0-amd64.pdb"
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -206,38 +206,38 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="..\PC\bdist_wininst\extract.c"
+				RelativePath="..\..\PC\bdist_wininst\extract.c"
 				>
 			</File>
 			<File
-				RelativePath="..\PC\bdist_wininst\install.c"
+				RelativePath="..\..\PC\bdist_wininst\install.c"
 				>
 			</File>
 			<Filter
 				Name="zlib"
 				>
 				<File
-					RelativePath="..\Modules\zlib\adler32.c"
+					RelativePath="..\..\Modules\zlib\adler32.c"
 					>
 				</File>
 				<File
-					RelativePath="..\Modules\zlib\crc32.c"
+					RelativePath="..\..\Modules\zlib\crc32.c"
 					>
 				</File>
 				<File
-					RelativePath="..\Modules\zlib\inffast.c"
+					RelativePath="..\..\Modules\zlib\inffast.c"
 					>
 				</File>
 				<File
-					RelativePath="..\Modules\zlib\inflate.c"
+					RelativePath="..\..\Modules\zlib\inflate.c"
 					>
 				</File>
 				<File
-					RelativePath="..\Modules\zlib\inftrees.c"
+					RelativePath="..\..\Modules\zlib\inftrees.c"
 					>
 				</File>
 				<File
-					RelativePath="..\Modules\zlib\zutil.c"
+					RelativePath="..\..\Modules\zlib\zutil.c"
 					>
 				</File>
 			</Filter>
@@ -247,7 +247,7 @@
 			Filter="h;hpp;hxx;hm;inl"
 			>
 			<File
-				RelativePath="..\PC\bdist_wininst\archive.h"
+				RelativePath="..\..\PC\bdist_wininst\archive.h"
 				>
 			</File>
 		</Filter>
@@ -256,11 +256,11 @@
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
-				RelativePath="..\PC\bdist_wininst\install.rc"
+				RelativePath="..\..\PC\bdist_wininst\install.rc"
 				>
 			</File>
 			<File
-				RelativePath="..\PC\bdist_wininst\PythonPowered.bmp"
+				RelativePath="..\..\PC\bdist_wininst\PythonPowered.bmp"
 				>
 			</File>
 		</Filter>

PC/VS9.0/kill_python.c

+/*
+ * Helper program for killing lingering python[_d].exe processes before
+ * building, thus attempting to avoid build failures due to files being
+ * locked.
+ */
+
+#include <windows.h>
+#include <wchar.h>
+#include <tlhelp32.h>
+#include <stdio.h>
+
+#pragma comment(lib, "psapi")
+
+#ifdef _DEBUG
+#define PYTHON_EXE          (L"python_d.exe")
+#define PYTHON_EXE_LEN      (12)
+#define KILL_PYTHON_EXE     (L"kill_python_d.exe")
+#define KILL_PYTHON_EXE_LEN (17)
+#else
+#define PYTHON_EXE          (L"python.exe")
+#define PYTHON_EXE_LEN      (10)
+#define KILL_PYTHON_EXE     (L"kill_python.exe")
+#define KILL_PYTHON_EXE_LEN (15)
+#endif
+
+int
+main(int argc, char **argv)
+{
+    HANDLE   hp, hsp, hsm; /* process, snapshot processes, snapshot modules */
+    DWORD    dac, our_pid;
+    size_t   len;
+    wchar_t  path[MAX_PATH+1];
+
+    MODULEENTRY32W  me;
+    PROCESSENTRY32W pe;
+
+    me.dwSize = sizeof(MODULEENTRY32W);
+    pe.dwSize = sizeof(PROCESSENTRY32W);
+
+    memset(path, 0, MAX_PATH+1);
+
+    our_pid = GetCurrentProcessId();
+
+    hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, our_pid);
+    if (hsm == INVALID_HANDLE_VALUE) {
+        printf("CreateToolhelp32Snapshot[1] failed: %d\n", GetLastError());
+        return 1;
+    }
+
+    if (!Module32FirstW(hsm, &me)) {
+        printf("Module32FirstW[1] failed: %d\n", GetLastError());
+        CloseHandle(hsm);
+        return 1;
+    }
+
+    /*
+     * Enumerate over the modules for the current process in order to find
+     * kill_process[_d].exe, then take a note of the directory it lives in.
+     */
+    do {
+        if (_wcsnicmp(me.szModule, KILL_PYTHON_EXE, KILL_PYTHON_EXE_LEN))
+            continue;
+
+        len = wcsnlen_s(me.szExePath, MAX_PATH) - KILL_PYTHON_EXE_LEN;
+        wcsncpy_s(path, MAX_PATH+1, me.szExePath, len); 
+
+        break;
+
+    } while (Module32NextW(hsm, &me));
+
+    CloseHandle(hsm);
+
+    if (path == NULL) {
+        printf("failed to discern directory of running process\n");
+        return 1;
+    }
+
+    /*
+     * Take a snapshot of system processes.  Enumerate over the snapshot,
+     * looking for python processes.  When we find one, verify it lives
+     * in the same directory we live in.  If it does, kill it.  If we're
+     * unable to kill it, treat this as a fatal error and return 1.
+     * 
+     * The rationale behind this is that we're called at the start of the 
+     * build process on the basis that we'll take care of killing any
+     * running instances, such that the build won't encounter permission
+     * denied errors during linking. If we can't kill one of the processes,
+     * we can't provide this assurance, and the build shouldn't start.
+     */
+
+    hsp = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+    if (hsp == INVALID_HANDLE_VALUE) {
+        printf("CreateToolhelp32Snapshot[2] failed: %d\n", GetLastError());
+        return 1;
+    }
+
+    if (!Process32FirstW(hsp, &pe)) {
+        printf("Process32FirstW failed: %d\n", GetLastError());
+        CloseHandle(hsp);
+        return 1;
+    }
+
+    dac = PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | PROCESS_TERMINATE;
+    do {
+
+        /*
+         * XXX TODO: if we really wanted to be fancy, we could check the 
+         * modules for all processes (not just the python[_d].exe ones)
+         * and see if any of our DLLs are loaded (i.e. python33[_d].dll),
+         * as that would also inhibit our ability to rebuild the solution.
+         * Not worth loosing sleep over though; for now, a simple check 
+         * for just the python executable should be sufficient.
+         */
+
+        if (_wcsnicmp(pe.szExeFile, PYTHON_EXE, PYTHON_EXE_LEN))
+            /* This isn't a python process. */
+            continue;
+
+        /* It's a python process, so figure out which directory it's in... */
+        hsm = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, pe.th32ProcessID);
+        if (hsm == INVALID_HANDLE_VALUE)
+            /* 
+             * If our module snapshot fails (which will happen if we don't own
+             * the process), just ignore it and continue.  (It seems different
+             * versions of Windows return different values for GetLastError()
+             * in this situation; it's easier to just ignore it and move on vs.
+             * stopping the build for what could be a false positive.)
+             */
+             continue;
+
+        if (!Module32FirstW(hsm, &me)) {
+            printf("Module32FirstW[2] failed: %d\n", GetLastError());
+            CloseHandle(hsp);
+            CloseHandle(hsm);
+            return 1;
+        }
+
+        do {
+            if (_wcsnicmp(me.szModule, PYTHON_EXE, PYTHON_EXE_LEN))
+                /* Wrong module, we're looking for python[_d].exe... */
+                continue;
+
+            if (_wcsnicmp(path, me.szExePath, len))
+                /* Process doesn't live in our directory. */
+                break;
+
+            /* Python process residing in the right directory, kill it!  */
+            hp = OpenProcess(dac, FALSE, pe.th32ProcessID);
+            if (!hp) {
+                printf("OpenProcess failed: %d\n", GetLastError());
+                CloseHandle(hsp);
+                CloseHandle(hsm);
+                return 1;
+            }
+
+            if (!TerminateProcess(hp, 1)) {
+                printf("TerminateProcess failed: %d\n", GetLastError());
+                CloseHandle(hsp);
+                CloseHandle(hsm);
+                CloseHandle(hp);
+                return 1;
+            }
+
+            CloseHandle(hp);
+            break;
+
+        } while (Module32NextW(hsm, &me));
+
+        CloseHandle(hsm);
+
+    } while (Process32NextW(hsp, &pe));
+
+    CloseHandle(hsp);
+
+    return 0;
+}
+
+/* vi: set ts=8 sw=4 sts=4 expandtab */

PC/VS9.0/make_buildinfo.c

+#include <windows.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <io.h>
+
+#define CMD_SIZE 500
+
+/* This file creates the getbuildinfo.o object, by first
+   invoking subwcrev.exe (if found), and then invoking cl.exe.
+   As a side effect, it might generate PCBuild\getbuildinfo2.c
+   also. If this isn't a subversion checkout, or subwcrev isn't
+   found, it compiles ..\\..\\Modules\\getbuildinfo.c instead.
+
+   Currently, subwcrev.exe is found from the registry entries
+   of TortoiseSVN.
+
+   No attempt is made to place getbuildinfo.o into the proper
+   binary directory. This isn't necessary, as this tool is
+   invoked as a pre-link step for pythoncore, so that overwrites
+   any previous getbuildinfo.o.
+
+   However, if a second argument is provided, this will be used
+   as a temporary directory where any getbuildinfo2.c and
+   getbuildinfo.o files are put.  This is useful if multiple
+   configurations are being built in parallel, to avoid them
+   trampling each other's files.
+
+*/
+
+int make_buildinfo2(const char *tmppath)
+{
+    struct _stat st;
+    HKEY hTortoise;
+    char command[CMD_SIZE+1];
+    DWORD type, size;
+    if (_stat(".svn", &st) < 0)
+        return 0;
+    /* Allow suppression of subwcrev.exe invocation if a no_subwcrev file is present. */
+    if (_stat("no_subwcrev", &st) == 0)
+        return 0;
+    if (RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS &&
+        RegOpenKey(HKEY_CURRENT_USER, "Software\\TortoiseSVN", &hTortoise) != ERROR_SUCCESS)
+        /* Tortoise not installed */
+        return 0;
+    command[0] = '"';  /* quote the path to the executable */
+    size = sizeof(command) - 1;
+    if (RegQueryValueEx(hTortoise, "Directory", 0, &type, command+1, &size) != ERROR_SUCCESS ||
+        type != REG_SZ)
+        /* Registry corrupted */
+        return 0;
+    strcat_s(command, CMD_SIZE, "bin\\subwcrev.exe");
+    if (_stat(command+1, &st) < 0)
+        /* subwcrev.exe not part of the release */
+        return 0;
+    strcat_s(command, CMD_SIZE, "\" ..\\.. ..\\..\\Modules\\getbuildinfo.c \"");
+    strcat_s(command, CMD_SIZE, tmppath); /* quoted tmppath */
+    strcat_s(command, CMD_SIZE, "getbuildinfo2.c\"");
+
+    puts(command); fflush(stdout);
+    if (system(command) < 0)
+        return 0;
+    return 1;
+}
+
+const char DELIMS[] = { " \n" };
+
+int get_mercurial_info(char * hgbranch, char * hgtag, char * hgrev, int size)
+{
+    int result = 0;
+    char filename[CMD_SIZE];
+    char cmdline[CMD_SIZE];
+
+    strcpy_s(filename, CMD_SIZE, "tmpXXXXXX");
+    if (_mktemp_s(filename, CMD_SIZE) == 0) {
+        int rc;
+
+        strcpy_s(cmdline, CMD_SIZE, "hg id -bit > ");
+        strcat_s(cmdline, CMD_SIZE, filename);
+        rc = system(cmdline);
+        if (rc == 0) {
+            FILE * fp;
+            
+            if (fopen_s(&fp, filename, "r") == 0) {
+                char * cp = fgets(cmdline, CMD_SIZE, fp);
+
+                if (cp) {
+                    char * context = NULL;
+                    char * tp = strtok_s(cp, DELIMS, &context);
+                    if (tp) {
+                        strcpy_s(hgrev, size, tp);
+                        tp = strtok_s(NULL, DELIMS, &context);
+                        if (tp) {
+                            strcpy_s(hgbranch, size, tp);
+                            tp = strtok_s(NULL, DELIMS, &context);
+                            if (tp) {
+                                strcpy_s(hgtag, size, tp);
+                                result = 1;
+                            }
+                        }
+                    }
+                }
+                fclose(fp);
+            }
+        }
+        _unlink(filename);
+    }
+    return result;
+}
+
+int main(int argc, char*argv[])
+{
+    char command[CMD_SIZE] = "cl.exe -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS -DWIN32 -D_WINDLL ";
+    char tmppath[CMD_SIZE] = "";
+    int do_unlink, result;
+    char *tmpdir = NULL;
+    if (argc <= 2 || argc > 3) {
+        fprintf(stderr, "make_buildinfo $(ConfigurationName) [tmpdir]\n");
+        return EXIT_FAILURE;
+    }
+    if (strcmp(argv[1], "Release") == 0) {
+        strcat_s(command, CMD_SIZE, "-MD ");
+    }
+    else if (strcmp(argv[1], "Debug") == 0) {
+        strcat_s(command, CMD_SIZE, "-D_DEBUG -MDd ");
+    }
+    else if (strcmp(argv[1], "ReleaseItanium") == 0) {
+        strcat_s(command, CMD_SIZE, "-MD /USECL:MS_ITANIUM ");
+    }
+    else if (strcmp(argv[1], "ReleaseAMD64") == 0) {
+        strcat_s(command, CMD_SIZE, "-MD ");
+        strcat_s(command, CMD_SIZE, "-MD /USECL:MS_OPTERON ");
+    }
+    else {
+        fprintf(stderr, "unsupported configuration %s\n", argv[1]);
+        return EXIT_FAILURE;
+    }
+    if (argc > 2) {
+        tmpdir = argv[2];
+        strcat_s(tmppath, _countof(tmppath), tmpdir);
+        /* Hack fix for bad command line:  If the command is issued like this:
+         * $(SolutionDir)make_buildinfo.exe" Debug "$(IntDir)"
+         * we will get a trailing quote because IntDir ends with a backslash that then
+         * escapes the final ".  To simplify the life for developers, catch that problem
+         * here by cutting it off.
+         * The proper command line, btw is:
+         * $(SolutionDir)make_buildinfo.exe" Debug "$(IntDir)\"
+         * Hooray for command line parsing on windows.
+         */
+        if (strlen(tmppath) > 0 && tmppath[strlen(tmppath)-1] == '"')
+            tmppath[strlen(tmppath)-1] = '\0';
+        strcat_s(tmppath, _countof(tmppath), "\\");
+    }
+
+    if ((do_unlink = make_buildinfo2(tmppath))) {
+        strcat_s(command, CMD_SIZE, "\"");
+        strcat_s(command, CMD_SIZE, tmppath);
+        strcat_s(command, CMD_SIZE, "getbuildinfo2.c\" -DSUBWCREV ");
+    }
+    else {
+        char hgtag[CMD_SIZE];
+        char hgbranch[CMD_SIZE];
+        char hgrev[CMD_SIZE];
+
+        if (get_mercurial_info(hgbranch, hgtag, hgrev, CMD_SIZE)) {
+            strcat_s(command, CMD_SIZE, "-DHGBRANCH=\\\"");
+            strcat_s(command, CMD_SIZE, hgbranch);
+            strcat_s(command, CMD_SIZE, "\\\"");
+
+            strcat_s(command, CMD_SIZE, " -DHGTAG=\\\"");
+            strcat_s(command, CMD_SIZE, hgtag);
+            strcat_s(command, CMD_SIZE, "\\\"");
+
+            strcat_s(command, CMD_SIZE, " -DHGVERSION=\\\"");
+            strcat_s(command, CMD_SIZE, hgrev);
+            strcat_s(command, CMD_SIZE, "\\\" ");
+        }
+        strcat_s(command, CMD_SIZE, "..\\..\\Modules\\getbuildinfo.c");
+    }
+    strcat_s(command, CMD_SIZE, " -Fo\"");
+    strcat_s(command, CMD_SIZE, tmppath);
+    strcat_s(command, CMD_SIZE, "getbuildinfo.o\" -I..\\..\\Include -I..\\..\\PC");
+    puts(command); fflush(stdout);
+    result = system(command);
+    if (do_unlink) {
+        command[0] = '\0';
+        strcat_s(command, CMD_SIZE, "\"");
+        strcat_s(command, CMD_SIZE, tmppath);
+        strcat_s(command, CMD_SIZE, "getbuildinfo2.c\"");
+        _unlink(command);
+    }
+    if (result < 0)
+        return EXIT_FAILURE;
+    return 0;
+}

PC/VS9.0/make_buildinfo.vcproj

 <?xml version="1.0" encoding="windows-1250"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="make_buildinfo"
 	ProjectGUID="{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
 	RootNamespace="make_buildinfo"

PC/VS9.0/make_versioninfo.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="make_versioninfo"
 	ProjectGUID="{F0E0541E-F17D-430B-97C4-93ADF0DD284E}"
 	RootNamespace="make_versioninfo"
@@ -32,8 +32,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Build PC/pythonnt_rc(_d).h"
-				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\pythonnt_rc.h&#x0D;&#x0A;"
-				Outputs="$(SolutionDir)..\PC\pythonnt_rc.h"
+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;"
+				Outputs="$(SolutionDir)..\..\PC\pythonnt_rc.h"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -92,7 +92,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\python_nt.h&#x0D;&#x0A;"
+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\python_nt.h&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -106,8 +106,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Build PC/pythonnt_rc(_d).h"
-				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\pythonnt_rc.h&#x0D;&#x0A;"
-				Outputs="$(SolutionDir)..\PC\pythonnt_rc.h"
+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\pythonnt_rc.h&#x0D;&#x0A;"
+				Outputs="$(SolutionDir)..\..\PC\pythonnt_rc.h"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -158,7 +158,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\python_nt.h&#x0D;&#x0A;"
+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\..\PC\python_nt.h&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -175,8 +175,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Build PC/pythonnt_rc(_d).h"
-				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
-				Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
+				Outputs="$(SolutionDir)..\..\PC\pythonnt_rc_d.h"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -235,7 +235,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\python_nt_d.h&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -249,8 +249,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Build PC/pythonnt_rc(_d).h"
-				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
-				Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
+				Outputs="$(SolutionDir)..\..\PC\pythonnt_rc_d.h"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -303,7 +303,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\..\PC\python_nt_d.h&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
@@ -314,7 +314,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\PC\make_versioninfo.c"
+				RelativePath="..\..\PC\make_versioninfo.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/pcbuild.sln

@@ -29,7 +29,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buil
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}"
 	ProjectSection(SolutionItems) = preProject
-		..\Modules\getbuildinfo.c = ..\Modules\getbuildinfo.c
+		..\..\Modules\getbuildinfo.c = ..\..\Modules\getbuildinfo.c
 		readme.txt = readme.txt
 	EndProjectSection
 EndProject

PC/VS9.0/pyexpat.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="pyexpat"
 	ProjectGUID="{D06B6426-4762-44CC-8BAD-D79052507F2F}"
 	RootNamespace="pyexpat"
@@ -42,7 +42,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\..\Modules\expat"
+				AdditionalIncludeDirectories=".\..\..\Modules\expat"
 				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -103,7 +103,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\..\Modules\expat"
+				AdditionalIncludeDirectories=".\..\..\Modules\expat"
 				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -164,7 +164,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\..\Modules\expat"
+				AdditionalIncludeDirectories=".\..\..\Modules\expat"
 				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -226,7 +226,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\..\Modules\expat"
+				AdditionalIncludeDirectories=".\..\..\Modules\expat"
 				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -287,7 +287,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\..\Modules\expat"
+				AdditionalIncludeDirectories=".\..\..\Modules\expat"
 				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -349,7 +349,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\..\Modules\expat"
+				AdditionalIncludeDirectories=".\..\..\Modules\expat"
 				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -411,7 +411,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\..\Modules\expat"
+				AdditionalIncludeDirectories=".\..\..\Modules\expat"
 				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -473,7 +473,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\..\Modules\expat"
+				AdditionalIncludeDirectories=".\..\..\Modules\expat"
 				PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
 			/>
 			<Tool
@@ -519,11 +519,11 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\Modules\expat\xmlrole.h"
+				RelativePath="..\..\Modules\expat\xmlrole.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\xmltok.h"
+				RelativePath="..\..\Modules\expat\xmltok.h"
 				>
 			</File>
 		</Filter>
@@ -531,19 +531,19 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\pyexpat.c"
+				RelativePath="..\..\Modules\pyexpat.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\xmlparse.c"
+				RelativePath="..\..\Modules\expat\xmlparse.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\xmlrole.c"
+				RelativePath="..\..\Modules\expat\xmlrole.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\expat\xmltok.c"
+				RelativePath="..\..\Modules\expat\xmltok.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/pyproject.vsprops

@@ -11,7 +11,7 @@
 		Optimization="2"
 		InlineFunctionExpansion="1"
 		EnableIntrinsicFunctions="true"
-		AdditionalIncludeDirectories="..\Include; ..\PC"
+		AdditionalIncludeDirectories="..\..\Include; ..\..\PC"
 		PreprocessorDefinitions="_WIN32"
 		StringPooling="true"
 		ExceptionHandling="0"
@@ -34,7 +34,7 @@
 	/>
 	<Tool
 		Name="VCResourceCompilerTool"
-		AdditionalIncludeDirectories="..\PC;..\Include"
+		AdditionalIncludeDirectories="..\..\PC;..\..\Include"
 	/>
 	<UserMacro
 		Name="PyDllName"
@@ -46,7 +46,7 @@
 	/>
 	<UserMacro
 		Name="externalsDir"
-		Value="..\.."
+		Value="..\..\.."
 	/>
 	<UserMacro
 		Name="sqlite3Dir"

PC/VS9.0/python.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="python"
 	ProjectGUID="{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}"
 	TargetFrameworkVersion="131072"
@@ -202,7 +202,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\Include"
+				AdditionalIncludeDirectories="..\..\Include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -277,7 +277,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="..\Include"
+				AdditionalIncludeDirectories="..\..\Include"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -615,11 +615,11 @@
 			Name="Resource Files"
 			>
 			<File
-				RelativePath="..\PC\pycon.ico"
+				RelativePath="..\..\PC\pycon.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\PC\python_exe.rc"
+				RelativePath="..\..\PC\python_exe.rc"
 				>
 			</File>
 		</Filter>
@@ -627,7 +627,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\python.c"
+				RelativePath="..\..\Modules\python.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/python3dll.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="python3dll"
 	ProjectGUID="{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
 	RootNamespace="python3dll"
@@ -27,9 +27,9 @@
 			>
 			<Tool
 				Name="VCNMakeTool"
-				BuildCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir)"
-				ReBuildCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) rebuild"
-				CleanCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) clean"
+				BuildCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir)"
+				ReBuildCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) rebuild"
+				CleanCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) clean"
 				Output="$(OutDir)\python3.dll"
 				PreprocessorDefinitions=""
 				IncludeSearchPath=""
@@ -46,9 +46,9 @@
 			>
 			<Tool
 				Name="VCNMakeTool"
-				BuildCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir)"
-				ReBuildCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) rebuild"
-				CleanCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) clean"
+				BuildCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir)"
+				ReBuildCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) rebuild"
+				CleanCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) clean"
 				Output="$(OutDir)\python3.dll"
 				PreprocessorDefinitions=""
 				IncludeSearchPath=""
@@ -65,9 +65,9 @@
 			>
 			<Tool
 				Name="VCNMakeTool"
-				BuildCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir)"
-				ReBuildCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) rebuild"
-				CleanCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) clean"
+				BuildCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir)"
+				ReBuildCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) rebuild"
+				CleanCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) clean"
 				Output="$(OutDir)\python3.dll"
 				PreprocessorDefinitions=""
 				IncludeSearchPath=""
@@ -84,9 +84,9 @@
 			>
 			<Tool
 				Name="VCNMakeTool"
-				BuildCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir)"
-				ReBuildCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) rebuild"
-				CleanCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) clean"
+				BuildCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir)"
+				ReBuildCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) rebuild"
+				CleanCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) clean"
 				Output="$(OutDir)\python3.dll"
 				PreprocessorDefinitions=""
 				IncludeSearchPath=""
@@ -103,9 +103,9 @@
 			>
 			<Tool
 				Name="VCNMakeTool"
-				BuildCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir)"
-				ReBuildCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) rebuild"
-				CleanCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) clean"
+				BuildCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir)"
+				ReBuildCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) rebuild"
+				CleanCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x86 OutDir=$(OutDir) clean"
 				Output="$(OutDir)\python3.dll"
 				PreprocessorDefinitions=""
 				IncludeSearchPath=""
@@ -122,9 +122,9 @@
 			>
 			<Tool
 				Name="VCNMakeTool"
-				BuildCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir)"
-				ReBuildCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) rebuild"
-				CleanCommandLine="cd $(InputDir)\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) clean"
+				BuildCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir)"
+				ReBuildCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) rebuild"
+				CleanCommandLine="cd $(InputDir)\..\..\PC&#x0D;&#x0A;nmake /f python3.mak MACHINE=x64 OutDir=$(OutDir) clean"
 				Output="$(OutDir)\python3.dll"
 				PreprocessorDefinitions=""
 				IncludeSearchPath=""
@@ -144,7 +144,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\PC\python3.def"
+				RelativePath="..\..\PC\python3.def"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -172,7 +172,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\PC\python3dll.c"
+				RelativePath="..\..\PC\python3dll.c"
 				>
 				<FileConfiguration
 					Name="Release|Win32"
@@ -212,7 +212,7 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\PC\python_nt.rc"
+				RelativePath="..\..\PC\python_nt.rc"
 				>
 				<FileConfiguration
 					Name="Release|Win32"

PC/VS9.0/pythonw.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="pythonw"
 	ProjectGUID="{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"
 	TargetFrameworkVersion="131072"
@@ -600,7 +600,7 @@
 			Name="Resource Files"
 			>
 			<File
-				RelativePath="..\PC\python_exe.rc"
+				RelativePath="..\..\PC\python_exe.rc"
 				>
 			</File>
 		</Filter>
@@ -608,7 +608,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\PC\WinMain.c"
+				RelativePath="..\..\PC\WinMain.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/select.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="select"
 	ProjectGUID="{18CAE28C-B454-46C1-87A0-493D91D97F03}"
 	RootNamespace="select"
@@ -527,7 +527,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\selectmodule.c"
+				RelativePath="..\..\Modules\selectmodule.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/sqlite3.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="sqlite3"
 	ProjectGUID="{A1A295E5-463C-437F-81CA-1F32367685DA}"
 	RootNamespace="sqlite3"

PC/VS9.0/ssl.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="ssl"
 	ProjectGUID="{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}"
 	RootNamespace="ssl"

PC/VS9.0/unicodedata.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="unicodedata"
 	ProjectGUID="{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}"
 	RootNamespace="unicodedata"
@@ -511,11 +511,11 @@
 			Name="Header Files"
 			>
 			<File
-				RelativePath="..\Modules\unicodedata_db.h"
+				RelativePath="..\..\Modules\unicodedata_db.h"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\unicodename_db.h"
+				RelativePath="..\..\Modules\unicodename_db.h"
 				>
 			</File>
 		</Filter>
@@ -523,7 +523,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\unicodedata.c"
+				RelativePath="..\..\Modules\unicodedata.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/w9xpopen.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="w9xpopen"
 	ProjectGUID="{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"
 	RootNamespace="w9xpopen"
@@ -566,7 +566,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\PC\w9xpopen.c"
+				RelativePath="..\..\PC\w9xpopen.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/winsound.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="winsound"
 	ProjectGUID="{28B5D777-DDF2-4B6B-B34F-31D938813856}"
 	RootNamespace="winsound"
@@ -513,7 +513,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\PC\winsound.c"
+				RelativePath="..\..\PC\winsound.c"
 				>
 			</File>
 		</Filter>

PC/VS9.0/xxlimited.vcproj

 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="xxlimited"
 	ProjectGUID="{F749B822-B489-4CA5-A3AD-CE078F5F338A}"
 	RootNamespace="xxlimited"
@@ -407,7 +407,7 @@
 			Name="Source Files"
 			>
 			<File
-				RelativePath="..\Modules\xxlimited.c"
+				RelativePath="..\..\Modules\xxlimited.c"
 				>
 			</File>
 		</Filter>