diff --git a/win32/CodeGen/CodeGen.vcproj b/win32/CodeGen/CodeGen.vcproj
index f4ec8f1..6d58135 100644
--- a/win32/CodeGen/CodeGen.vcproj
+++ b/win32/CodeGen/CodeGen.vcproj
@@ -170,10 +170,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\lib\CodeGen\BreakCriticalMachineEdges.cpp"
-				>
-			</File>
-			<File
 				RelativePath="..\..\lib\CodeGen\CollectorMetadata.cpp"
 				>
 			</File>
@@ -368,6 +364,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\include\llvm\CodeGen\BreakCriticalMachineEdge.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\include\llvm\CodeGen\CallingConvLower.h"
 				>
 			</File>
diff --git a/win32/Configure/Configure.vcproj b/win32/Configure/Configure.vcproj
index 9a7bcd4..ffe65cb 100644
--- a/win32/Configure/Configure.vcproj
+++ b/win32/Configure/Configure.vcproj
@@ -111,9 +111,9 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating $(SolutionDir)llvm\Config\config.h"
-						CommandLine="copy $(InputPath)+$(SolutionDir)config.h  $(ProjectDir)..\llvm\Config\config.h&#x0D;&#x0A;"
-						AdditionalDependencies="$(SolutionDir)config.h"
-						Outputs="$(ProjectDir)..\llvm\Config\config.h"
+						CommandLine="copy &quot;$(InputPath)&quot;+&quot;$(SolutionDir)config.h&quot;  &quot;$(ProjectDir)..\llvm\Config\config.h&quot;&#x0D;&#x0A;"
+						AdditionalDependencies="&quot;$(SolutionDir)config.h&quot;"
+						Outputs="&quot;$(ProjectDir)..\llvm\Config\config.h&quot;"
 					/>
 				</FileConfiguration>
 			</File>
@@ -126,8 +126,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating $(SolutionDir)llvm\Support\DataTypes.h"
-						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\Support\DataTypes.h&#x0D;&#x0A;"
-						Outputs="$(ProjectDir)..\llvm\Support\DataTypes.h"
+						CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\Support\DataTypes.h&quot;&#x0D;&#x0A;"
+						Outputs="&quot;$(ProjectDir)..\llvm\Support\DataTypes.h&quot;"
 					/>
 				</FileConfiguration>
 			</File>
@@ -140,8 +140,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating $(SolutionDir)llvm\ADT\hash_map"
-						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\ADT\hash_map&#x0D;&#x0A;"
-						Outputs="$(ProjectDir)..\llvm\ADT\hash_map"
+						CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_map&quot;&#x0D;&#x0A;"
+						Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_map&quot;"
 					/>
 				</FileConfiguration>
 			</File>
@@ -154,8 +154,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating $(SolutionDir)llvm\ADT\hash_set"
-						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\ADT\hash_set&#x0D;&#x0A;"
-						Outputs="$(ProjectDir)..\llvm\ADT\hash_set"
+						CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\hash_set&quot;&#x0D;&#x0A;"
+						Outputs="&quot;$(ProjectDir)..\llvm\ADT\hash_set&quot;"
 					/>
 				</FileConfiguration>
 			</File>
@@ -168,8 +168,8 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Generating $(SolutionDir)llvm\ADT\iterator"
-						CommandLine="copy $(InputPath) $(ProjectDir)..\llvm\ADT\iterator&#x0D;&#x0A;"
-						Outputs="$(ProjectDir)..\llvm\ADT\iterator"
+						CommandLine="copy &quot;$(InputPath)&quot; &quot;$(ProjectDir)..\llvm\ADT\iterator&quot;&#x0D;&#x0A;"
+						Outputs="&quot;$(ProjectDir)..\llvm\ADT\iterator&quot;"
 					/>
 				</FileConfiguration>
 			</File>