2 files changed, 5 insertions, 45 deletions
diff --git a/build/visual-studio/core/core.vcxproj b/build/visual-studio/core/core.vcxproj
index 2f48f93eb..648e296f3 100644
--- a/build/visual-studio/core/core.vcxproj
+++ b/build/visual-studio/core/core.vcxproj
@@ -183,11 +183,10 @@
     <ClInclude Include="..\..\..\source\core\slang-compression-system.h" />
     <ClInclude Include="..\..\..\source\core\slang-deflate-compression-system.h" />
     <ClInclude Include="..\..\..\source\core\slang-dictionary.h" />
-    <ClInclude Include="..\..\..\source\core\slang-downstream-compiler.h" />
     <ClInclude Include="..\..\..\source\core\slang-exception.h" />
+    <ClInclude Include="..\..\..\source\core\slang-file-system.h" />
     <ClInclude Include="..\..\..\source\core\slang-free-list.h" />
     <ClInclude Include="..\..\..\source\core\slang-func-ptr.h" />
-    <ClInclude Include="..\..\..\source\core\slang-gcc-compiler-util.h" />
     <ClInclude Include="..\..\..\source\core\slang-hash.h" />
     <ClInclude Include="..\..\..\source\core\slang-hex-dump-util.h" />
     <ClInclude Include="..\..\..\source\core\slang-io.h" />
@@ -196,8 +195,6 @@
     <ClInclude Include="..\..\..\source\core\slang-lz4-compression-system.h" />
     <ClInclude Include="..\..\..\source\core\slang-math.h" />
     <ClInclude Include="..\..\..\source\core\slang-memory-arena.h" />
-    <ClInclude Include="..\..\..\source\core\slang-name-convention-util.h" />
-    <ClInclude Include="..\..\..\source\core\slang-nvrtc-compiler.h" />
     <ClInclude Include="..\..\..\source\core\slang-offset-container.h" />
     <ClInclude Include="..\..\..\source\core\slang-platform.h" />
     <ClInclude Include="..\..\..\source\core\slang-process-util.h" />
@@ -222,10 +219,8 @@
     <ClInclude Include="..\..\..\source\core\slang-type-traits.h" />
     <ClInclude Include="..\..\..\source\core\slang-uint-set.h" />
     <ClInclude Include="..\..\..\source\core\slang-virtual-object-pool.h" />
-    <ClInclude Include="..\..\..\source\core\slang-visual-studio-compiler-util.h" />
     <ClInclude Include="..\..\..\source\core\slang-writer.h" />
     <ClInclude Include="..\..\..\source\core\slang-zip-file-system.h" />
-    <ClInclude Include="..\..\..\source\core\windows\slang-win-visual-studio-util.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\core\slang-archive-file-system.cpp" />
@@ -233,15 +228,12 @@
     <ClCompile Include="..\..\..\source\core\slang-byte-encode-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-char-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-deflate-compression-system.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-downstream-compiler.cpp" />
+    <ClCompile Include="..\..\..\source\core\slang-file-system.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-free-list.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-gcc-compiler-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-hex-dump-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-io.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-lz4-compression-system.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-memory-arena.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-name-convention-util.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-nvrtc-compiler.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-offset-container.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-platform.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-random-generator.cpp" />
@@ -260,11 +252,9 @@
     <ClCompile Include="..\..\..\source\core\slang-token-reader.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-type-text-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-uint-set.cpp" />
-    <ClCompile Include="..\..\..\source\core\slang-visual-studio-compiler-util.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-writer.cpp" />
     <ClCompile Include="..\..\..\source\core\slang-zip-file-system.cpp" />
     <ClCompile Include="..\..\..\source\core\windows\slang-win-process-util.cpp" />
-    <ClCompile Include="..\..\..\source\core\windows\slang-win-visual-studio-util.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="..\..\..\source\core\core.natvis" />
diff --git a/build/visual-studio/core/core.vcxproj.filters b/build/visual-studio/core/core.vcxproj.filters
index 5e63e4681..669b831a7 100644
--- a/build/visual-studio/core/core.vcxproj.filters
+++ b/build/visual-studio/core/core.vcxproj.filters
@@ -48,10 +48,10 @@
     <ClInclude Include="..\..\..\source\core\slang-dictionary.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-downstream-compiler.h">
+    <ClInclude Include="..\..\..\source\core\slang-exception.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-exception.h">
+    <ClInclude Include="..\..\..\source\core\slang-file-system.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-free-list.h">
@@ -60,9 +60,6 @@
     <ClInclude Include="..\..\..\source\core\slang-func-ptr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-gcc-compiler-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-hash.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -87,12 +84,6 @@
     <ClInclude Include="..\..\..\source\core\slang-memory-arena.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-name-convention-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-nvrtc-compiler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-offset-container.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -165,18 +156,12 @@
     <ClInclude Include="..\..\..\source\core\slang-virtual-object-pool.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\slang-visual-studio-compiler-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-writer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\source\core\slang-zip-file-system.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\core\windows\slang-win-visual-studio-util.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\core\slang-archive-file-system.cpp">
@@ -194,15 +179,12 @@
     <ClCompile Include="..\..\..\source\core\slang-deflate-compression-system.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-downstream-compiler.cpp">
+    <ClCompile Include="..\..\..\source\core\slang-file-system.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\core\slang-free-list.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-gcc-compiler-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\core\slang-hex-dump-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -215,12 +197,6 @@
     <ClCompile Include="..\..\..\source\core\slang-memory-arena.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-name-convention-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-nvrtc-compiler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\core\slang-offset-container.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -275,9 +251,6 @@
     <ClCompile Include="..\..\..\source\core\slang-uint-set.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\slang-visual-studio-compiler-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\source\core\slang-writer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -287,9 +260,6 @@
     <ClCompile Include="..\..\..\source\core\windows\slang-win-process-util.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\core\windows\slang-win-visual-studio-util.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Natvis Include="..\..\..\source\core\core.natvis">