diff --git a/PCbuild8/_ctypes/_ctypes.vcproj b/PCbuild8/_ctypes/_ctypes.vcproj
index dfd3a58e8a9..28761df81d7 100644
--- a/PCbuild8/_ctypes/_ctypes.vcproj
+++ b/PCbuild8/_ctypes/_ctypes.vcproj
@@ -16,15 +16,15 @@
 		/>
 	</Platforms>
 	<ToolFiles>
-		<DefaultToolFile
-			FileName="masm.rules"
+		<ToolFile
+			RelativePath=".\masm64.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd_d.vsprops"
+			InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"
 			CharacterSet="0"
 			>
 			<Tool
@@ -34,7 +34,7 @@
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="MASM"
+				Name="MASM64"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -68,7 +68,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -100,9 +99,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd_d.vsprops"
+			InheritedPropertySheets="..\pyd_d.vsprops;.\_ctypes.vsprops"
 			CharacterSet="0"
 			>
 			<Tool
@@ -112,7 +110,7 @@
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="MASM"
+				Name="MASM64"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -147,7 +145,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="17"
@@ -180,7 +177,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -191,7 +188,7 @@
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="MASM"
+				Name="MASM64"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -222,7 +219,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -258,7 +254,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;.\_ctypes.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -269,7 +265,7 @@
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="MASM"
+				Name="MASM64"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -301,7 +297,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -337,7 +332,7 @@
 		<Configuration
 			Name="PGInstrument|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -348,7 +343,7 @@
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="MASM"
+				Name="MASM64"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -379,7 +374,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -415,7 +409,7 @@
 		<Configuration
 			Name="PGInstrument|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGInstrument.vsprops;.\_ctypes.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -426,7 +420,7 @@
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="MASM"
+				Name="MASM64"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -458,7 +452,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -494,7 +487,7 @@
 		<Configuration
 			Name="PGUpdate|Win32"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -505,7 +498,7 @@
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="MASM"
+				Name="MASM64"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -536,7 +529,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -572,7 +564,7 @@
 		<Configuration
 			Name="PGUpdate|x64"
 			ConfigurationType="2"
-			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops"
+			InheritedPropertySheets="..\pyd.vsprops;..\PGUpdate.vsprops;.\_ctypes.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
@@ -583,7 +575,7 @@
 				Name="VCCustomBuildTool"
 			/>
 			<Tool
-				Name="MASM"
+				Name="MASM64"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -615,7 +607,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -797,16 +788,7 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="ml64.exe /Zi /c /nologo /Fo $(OutDir)/win64.obj $(InputPath)&#x0D;&#x0A;"
-						Outputs="$(OutDir)/win64.obj"
+						Name="MASM64"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -814,16 +796,7 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="ml64.exe /c /nologo /Fo $(OutDir)/win64.obj $(InputPath)&#x0D;&#x0A;"
-						Outputs="$(OutDir)/win64.obj"
+						Name="MASM64"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -831,16 +804,7 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="PGInstrument|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="ml64.exe /c /nologo /Fo $(OutDir)/win64.obj $(InputPath)&#x0D;&#x0A;"
-						Outputs="$(OutDir)/win64.obj"
+						Name="MASM64"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -848,16 +812,7 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="PGUpdate|x64"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="ml64.exe /c /nologo /Fo $(OutDir)/win64.obj $(InputPath)&#x0D;&#x0A;"
-						Outputs="$(OutDir)/win64.obj"
+						Name="MASM64"
 					/>
 				</FileConfiguration>
 			</File>
diff --git a/PCbuild8/_ctypes/_ctypes.vsprops b/PCbuild8/_ctypes/_ctypes.vsprops
new file mode 100644
index 00000000000..a15c875cfad
--- /dev/null
+++ b/PCbuild8/_ctypes/_ctypes.vsprops
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="_ctypes"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE"
+	/>
+</VisualStudioPropertySheet>
diff --git a/PCbuild8/_ctypes/masm64.rules b/PCbuild8/_ctypes/masm64.rules
new file mode 100644
index 00000000000..d25d86c5342
--- /dev/null
+++ b/PCbuild8/_ctypes/masm64.rules
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VisualStudioToolFile
+	Name="Microsoft Macro Assembler 64 bit"
+	Version="8.00"
+	>
+	<Rules>
+		<CustomBuildRule
+			Name="MASM64"
+			DisplayName="Microsoft Macro Assembler 64 bit"
+			CommandLine="ml64.exe /c [AllOptions] [AdditionalOptions] /Ta[inputs]"
+			Outputs="[$ObjectFileName]"
+			FileExtensions="*.asm"
+			ExecutionDescription="Assembling (x64) ..."
+			>
+			<Properties>
+				<BooleanProperty
+					Name="NoLogo"
+					DisplayName="Suppress Startup Banner"
+					Description="Suppress the display of the startup banner and information messages.     (/nologo)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/nologo"
+					DefaultValue="true"
+				/>
+				<StringProperty
+					Name="ObjectFileName"
+					DisplayName="Object File Name"
+					PropertyPageName="Object File"
+					Description="Specifies the name of the output object file.     (/Fo:[file])"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Fo&quot;[value]&quot;"
+					DefaultValue="$(IntDir)\$(InputName).obj"
+				/>
+				<EnumProperty
+					Name="PreserveIdentifierCase"
+					DisplayName="Preserve Identifier Case"
+					Description="Specifies preservation of case of user identifiers.     (/Cp, /Cx)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					DefaultValue="0"
+					>
+					<Values>
+						<EnumValue
+							Value="0"
+							DisplayName="Default"
+						/>
+						<EnumValue
+							Value="1"
+							Switch="/Cp"
+							DisplayName="Preserves Identifier Case (/Cp)"
+						/>
+						<EnumValue
+							Value="3"
+							Switch="/Cx"
+							DisplayName="Preserves case in public and extern symbols. (/Cx)"
+						/>
+					</Values>
+				</EnumProperty>
+				<StringProperty
+					Name="PreprocessorDefinitions"
+					DisplayName="Preprocessor Definitions"
+					Description="Defines a text macro with the given name.     (/D[symbol])"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/D&quot;[value]&quot;"
+					Delimited="true"
+					Inheritable="true"
+				/>
+				<BooleanProperty
+					Name="GeneratePreprocessedSourceListing"
+					DisplayName="Generate Preprocessed Source Listing"
+					PropertyPageName="Listing File"
+					Description="Generates a preprocessed source listing to the Output Window.     (/EP)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/EP"
+				/>
+				<StringProperty
+					Name="AssembledCodeListingFile"
+					DisplayName="Assembled Code Listing File"
+					PropertyPageName="Listing File"
+					Description="Generates an assembled code listing file.     (/Fl[file])"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Fl&quot;[value]&quot;"
+				/>
+				<StringProperty
+					Name="SourceListingLineWidth"
+					DisplayName="Source Listing Line Width"
+					PropertyPageName="Listing File"
+					Description="Sets the line width of source listing in characters per line. Range is 60 to 255. Same as PAGE width.     (/Sl [width])"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Sl [value]"
+				/>
+				<StringProperty
+					Name="SourceListingPageLength"
+					DisplayName="Source Listing Page Length"
+					PropertyPageName="Listing File"
+					Description="Sets the page length of source listing in lines per page. Range is 10 to 255. Same as PAGE length.     (/Sp [length])"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Sp [value]"
+				/>
+				<StringProperty
+					Name="IncludePaths"
+					DisplayName="Include Paths"
+					Description="Sets path for include file. A maximum of 10 /I options is allowed.     (/I [path])"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/I &quot;[value]&quot;"
+					Delimited="true"
+					Inheritable="true"
+				/>
+				<BooleanProperty
+					Name="ListAllAvailableInformation"
+					DisplayName="List All Available Information"
+					PropertyPageName="Listing File"
+					Description="Turns on listing of all available information.     (/Sa)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Sa"
+				/>
+				<BooleanProperty
+					Name="AddFirstPassListing"
+					DisplayName="Add First Pass Listing"
+					PropertyPageName="Listing File"
+					Description="Adds first-pass listing to listing file.     (/Sf)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Sf"
+				/>
+				<BooleanProperty
+					Name="EnableAssemblyGeneratedCodeListing"
+					DisplayName="Enable Assembly Generated Code Listing"
+					PropertyPageName="Listing File"
+					Description="Turns on listing of assembly-generated code.     (/Sg)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Sg"
+				/>
+				<BooleanProperty
+					Name="DisableSymbolTable"
+					DisplayName="Disable Symbol Table"
+					PropertyPageName="Listing File"
+					Description="Turns off symbol table when producing a listing.     (/Sn)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Sn"
+				/>
+				<StringProperty
+					Name="SourceListingSubTitle"
+					DisplayName="Source Listing Subtitle"
+					PropertyPageName="Listing File"
+					Description="Specifies subtitle text for source listing. Same as SUBTITLE text.     (/Ss [subtitle])"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Ss [value]"
+				/>
+				<StringProperty
+					Name="SourceListingTitle"
+					DisplayName="Source Listing Title"
+					PropertyPageName="Listing File"
+					Description="Specifies title for source listing. Same as TITLE text.     (/St [title])"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/St [value]"
+				/>
+				<BooleanProperty
+					Name="EnableFalseConditionalsInListing"
+					DisplayName="Enable False Conditionals In Listing"
+					PropertyPageName="Listing File"
+					Description="Turns on false conditionals in listing.     (/Sx)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Sx"
+				/>
+				<EnumProperty
+					Name="WarningLevel"
+					DisplayName="Warning Level"
+					Description="Sets the warning level, where level = 0, 1, 2, or 3.    (/W0, /W1, /W2, /W3)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					DefaultValue="3"
+					>
+					<Values>
+						<EnumValue
+							Value="0"
+							Switch="/W0"
+							DisplayName="Warning Level 0 (/W0)"
+						/>
+						<EnumValue
+							Value="1"
+							Switch="/W1"
+							DisplayName="Warning Level 1 (/W1)"
+						/>
+						<EnumValue
+							Value="2"
+							Switch="/W2"
+							DisplayName="Warning Level 2 (/W2)"
+						/>
+						<EnumValue
+							Value="3"
+							Switch="/W3"
+							DisplayName="Warning Level 3 (/W3)"
+						/>
+					</Values>
+				</EnumProperty>
+				<BooleanProperty
+					Name="TreatWarningsAsErrors"
+					DisplayName="Treat Warnings As Errors"
+					Description="Returns an error code if warnings are generated.     (/WX)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/WX"
+				/>
+				<BooleanProperty
+					Name="MakeAllSymbolsPublic"
+					DisplayName="Make All Symbols Public"
+					PropertyPageName="Object File"
+					Description="Makes all symbols public.     (/Zf)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Zf"
+				/>
+				<BooleanProperty
+					Name="GenerateDebugInformation"
+					DisplayName="Generate Debug Information"
+					Description="Generates Debug Information.     (/Zi)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Zi"
+					DefaultValue="true"
+				/>
+				<EnumProperty
+					Name="PackAlignmentBoundary"
+					DisplayName="Pack Alignment Boundary"
+					PropertyPageName="Advanced"
+					Description="Packs structures on the specified byte boundary. The alignment can be 1, 2, 4, 8 or 16.     (/Zp1, /Zp2, /Zp4, /Zp8, /Zp16)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					>
+					<Values>
+						<EnumValue
+							Value="0"
+							DisplayName="Default"
+						/>
+						<EnumValue
+							Value="1"
+							Switch="/Zp1"
+							DisplayName="One Byte Boundary (/Zp1)"
+						/>
+						<EnumValue
+							Value="2"
+							Switch="/Zp2"
+							DisplayName="Two Byte Boundary (/Zp2)"
+						/>
+						<EnumValue
+							Value="3"
+							Switch="/Zp4"
+							DisplayName="Four Byte Boundary (/Zp4)"
+						/>
+						<EnumValue
+							Value="4"
+							Switch="/Zp8"
+							DisplayName="Eight Byte Boundary (/Zp8)"
+						/>
+						<EnumValue
+							Value="5"
+							Switch="/Zp16"
+							DisplayName="Sixteen Byte Boundary (/Zp16)"
+						/>
+					</Values>
+				</EnumProperty>
+				<BooleanProperty
+					Name="PerformSyntaxCheckOnly"
+					DisplayName="Perform Syntax Check Only"
+					Description="Performs a syntax check only.     (/Zs)"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/Zs"
+				/>
+				<EnumProperty
+					Name="ErrorReporting"
+					DisplayName="Error Reporting"
+					PropertyPageName="Advanced"
+					Description="Reports internal assembler errors to Microsoft.     (/errorReport:[method])"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					>
+					<Values>
+						<EnumValue
+							Value="0"
+							Switch="/errorReport:prompt"
+							DisplayName="Prompt to send report immediately (/errorReport:prompt)"
+						/>
+						<EnumValue
+							Value="1"
+							Switch="/errorReport:queue"
+							DisplayName="Prompt to send report at the next logon (/errorReport:queue)"
+						/>
+						<EnumValue
+							Value="2"
+							Switch="/errorReport:send"
+							DisplayName="Automatically send report (/errorReport:send)"
+						/>
+						<EnumValue
+							Value="3"
+							Switch="/errorReport:none"
+							DisplayName="Do not send report (/errorReport:none)"
+						/>
+					</Values>
+				</EnumProperty>
+				<StringProperty
+					Name="BrowseFile"
+					DisplayName="Generate Browse Information File"
+					PropertyPageName="Advanced"
+					Description="Specifies whether to generate browse information file and its optional name or location of the browse information file.     (/FR[name])"
+					HelpURL="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcmasm/html/vclrfml.asp"
+					Switch="/FR&quot;[value]&quot;"
+					Delimited="true"
+					Inheritable="true"
+				/>
+			</Properties>
+		</CustomBuildRule>
+	</Rules>
+</VisualStudioToolFile>
diff --git a/PCbuild8/pcbuild.sln b/PCbuild8/pcbuild.sln
index 982a16dd35b..e866638785d 100644
--- a/PCbuild8/pcbuild.sln
+++ b/PCbuild8/pcbuild.sln
@@ -2,8 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore\pythoncore.vcproj", "{987306EC-6BAD-4440-B4FB-A699A1EE6A28}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED} = {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}
 		{87AB87DB-B665-4621-A67B-878C15B93FF0} = {87AB87DB-B665-4621-A67B-878C15B93FF0}
+		{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED} = {2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_versioninfo", "make_versioninfo\make_versioninfo.vcproj", "{2AB2AC43-1B73-40B1-8964-95B3FC3F15ED}"
@@ -16,6 +16,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes\_ctypes.
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test\_ctypes_test.vcproj", "{F548A318-960A-4B37-9CD6-86B1B0E33CC8}"
+	ProjectSection(ProjectDependencies) = postProject
+		{987306EC-6BAD-4440-B4FB-A699A1EE6A28} = {987306EC-6BAD-4440-B4FB-A699A1EE6A28}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_elementtree", "_elementtree\_elementtree.vcproj", "{CB025148-F0A1-4B32-A669-19EE0534136D}"
 	ProjectSection(ProjectDependencies) = postProject