diff --git a/win32/System/System.vcproj b/win32/System/System.vcproj
index 99d5508ba2e..0158bb5d941 100644
--- a/win32/System/System.vcproj
+++ b/win32/System/System.vcproj
@@ -43,15 +43,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="if not exist ..\..\lib\System\platform\MappedFile.cpp echo #include &quot;../win32/MappedFile.cpp&quot;  &gt;..\..\lib\System\platform\MappedFile.cpp
-if not exist ..\..\lib\System\platform\Memory.cpp echo #include &quot;../win32/Memory.cpp&quot;  &gt;..\..\lib\System\platform\Memory.cpp
-if not exist ..\..\lib\System\platform\Process.cpp echo #include &quot;../win32/Process.cpp&quot;  &gt;..\..\lib\System\platform\Process.cpp
-if not exist ..\..\lib\System\platform\Program.cpp echo #include &quot;../win32/Program.cpp&quot;  &gt;..\..\lib\System\platform\Program.cpp
-if not exist ..\..\lib\System\platform\Signals.cpp echo #include &quot;../win32/Signals.cpp&quot;  &gt;..\..\lib\System\platform\Signals.cpp
-if not exist ..\..\lib\System\platform\SysConfig.cpp echo #include &quot;../win32/SysConfig.cpp&quot;  &gt;..\..\lib\System\platform\SysConfig.cpp
-if not exist ..\..\lib\System\platform\TimeValue.cpp echo #include &quot;../win32/TimeValue.cpp&quot;  &gt;..\..\lib\System\platform\TimeValue.cpp
-"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -93,15 +85,7 @@ if not exist ..\..\lib\System\platform\TimeValue.cpp echo #include &quot;../win3
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="if not exist ..\..\lib\System\platform\MappedFile.cpp echo #include &quot;../win32/MappedFile.cpp&quot;  &gt;..\..\lib\System\platform\MappedFile.cpp
-if not exist ..\..\lib\System\platform\Memory.cpp echo #include &quot;../win32/Memory.cpp&quot;  &gt;..\..\lib\System\platform\Memory.cpp
-if not exist ..\..\lib\System\platform\Process.cpp echo #include &quot;../win32/Process.cpp&quot;  &gt;..\..\lib\System\platform\Process.cpp
-if not exist ..\..\lib\System\platform\Program.cpp echo #include &quot;../win32/Program.cpp&quot;  &gt;..\..\lib\System\platform\Program.cpp
-if not exist ..\..\lib\System\platform\Signals.cpp echo #include &quot;../win32/Signals.cpp&quot;  &gt;..\..\lib\System\platform\Signals.cpp
-if not exist ..\..\lib\System\platform\SysConfig.cpp echo #include &quot;../win32/SysConfig.cpp&quot;  &gt;..\..\lib\System\platform\SysConfig.cpp
-if not exist ..\..\lib\System\platform\TimeValue.cpp echo #include &quot;../win32/TimeValue.cpp&quot;  &gt;..\..\lib\System\platform\TimeValue.cpp
-"/>
+				Name="VCPreBuildEventTool"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -144,9 +128,6 @@ if not exist ..\..\lib\System\platform\TimeValue.cpp echo #include &quot;../win3
 			<File
 				RelativePath="..\..\lib\System\Signals.cpp">
 			</File>
-			<File
-				RelativePath="..\..\lib\System\SysConfig.cpp">
-			</File>
 			<File
 				RelativePath="..\..\lib\System\TimeValue.cpp">
 			</File>
@@ -176,9 +157,6 @@ if not exist ..\..\lib\System\platform\TimeValue.cpp echo #include &quot;../win3
 			<File
 				RelativePath="..\..\include\llvm\System\Signals.h">
 			</File>
-			<File
-				RelativePath="..\..\include\llvm\System\SysConfig.h">
-			</File>
 			<File
 				RelativePath="..\..\include\llvm\System\TimeValue.h">
 			</File>
@@ -305,23 +283,6 @@ if not exist ..\..\lib\System\platform\TimeValue.cpp echo #include &quot;../win3
 						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\lib\System\Win32\SysConfig.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)/$(InputName)1.obj"/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\..\lib\System\Win32\TimeValue.cpp">
 				<FileConfiguration