diff --git a/hlslang.vcxproj b/hlslang.vcxproj
index d83c082..c12df5d 100644
--- a/hlslang.vcxproj
+++ b/hlslang.vcxproj
@@ -222,17 +222,15 @@
     <ClCompile Include="hlslang\MachineIndependent\IntermTraverse.cpp" />
     <ClCompile Include="hlslang\MachineIndependent\ParseHelper.cpp" />
     <ClCompile Include="hlslang\MachineIndependent\PoolAlloc.cpp" />
+    <ClCompile Include="hlslang\MachineIndependent\preprocessor\mojoshader.cpp" />
+    <ClCompile Include="hlslang\MachineIndependent\preprocessor\mojoshader_common.cpp" />
+    <ClCompile Include="hlslang\MachineIndependent\preprocessor\mojoshader_lexer.cpp" />
+    <ClCompile Include="hlslang\MachineIndependent\preprocessor\mojoshader_preprocessor.cpp" />
+    <ClCompile Include="hlslang\MachineIndependent\preprocessor\sourceloc.cpp" />
     <ClCompile Include="hlslang\MachineIndependent\RemoveTree.cpp" />
     <ClCompile Include="hlslang\MachineIndependent\SymbolTable.cpp" />
     <ClCompile Include="hlslang\MachineIndependent\Gen_hlslang.cpp" />
     <ClCompile Include="hlslang\MachineIndependent\Gen_hlslang_tab.cpp" />
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\atom.c" />
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\cpp.c" />
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\cppstruct.c" />
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\memory.c" />
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\scanner.c" />
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\symbols.c" />
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\tokens.c" />
     <ClCompile Include="hlslang\GLSLCodeGen\glslCommon.cpp" />
     <ClCompile Include="hlslang\GLSLCodeGen\glslFunction.cpp" />
     <ClCompile Include="hlslang\GLSLCodeGen\glslOutput.cpp" />
@@ -333,19 +331,11 @@ rename %(RootDir)%(Directory)%(Filename)_tab.c Gen_%(Filename)_tab.cpp
     <ClInclude Include="hlslang\MachineIndependent\Initialize.h" />
     <ClInclude Include="hlslang\MachineIndependent\localintermediate.h" />
     <ClInclude Include="hlslang\MachineIndependent\ParseHelper.h" />
+    <ClInclude Include="hlslang\MachineIndependent\preprocessor\mojoshader.h" />
+    <ClInclude Include="hlslang\MachineIndependent\preprocessor\mojoshader_internal.h" />
     <ClInclude Include="hlslang\MachineIndependent\RemoveTree.h" />
     <ClInclude Include="hlslang\MachineIndependent\hlslang_tab.h" />
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\atom.h" />
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\compile.h" />
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\cpp.h" />
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\memory.h" />
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\parser.h" />
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\preprocess.h" />
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\scanner.h" />
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\slglobals.h" />
     <ClInclude Include="hlslang\MachineIndependent\preprocessor\sourceloc.h" />
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\symbols.h" />
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\tokens.h" />
     <ClInclude Include="hlslang\Include\BaseTypes.h" />
     <ClInclude Include="hlslang\Include\Common.h" />
     <ClInclude Include="hlslang\Include\ConstantUnion.h" />
@@ -370,6 +360,9 @@ rename %(RootDir)%(Directory)%(Filename)_tab.c Gen_%(Filename)_tab.cpp
     <ClInclude Include="hlslang\OSDependent\Windows\osinclude.h" />
     <ClInclude Include="hlslang\OSDependent\Linux\osinclude.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="hlslang\MachineIndependent\preprocessor\mojoshader_lexer.re" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/hlslang.vcxproj.filters b/hlslang.vcxproj.filters
index 34cf5ad..dba46e0 100644
--- a/hlslang.vcxproj.filters
+++ b/hlslang.vcxproj.filters
@@ -70,27 +70,6 @@
     <ClCompile Include="hlslang\MachineIndependent\Gen_hlslang_tab.cpp">
       <Filter>Machine Independent\Generated Source</Filter>
     </ClCompile>
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\atom.c">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClCompile>
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\cpp.c">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClCompile>
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\cppstruct.c">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClCompile>
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\memory.c">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClCompile>
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\scanner.c">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClCompile>
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\symbols.c">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClCompile>
-    <ClCompile Include="hlslang\MachineIndependent\preprocessor\tokens.c">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClCompile>
     <ClCompile Include="hlslang\GLSLCodeGen\glslCommon.cpp">
       <Filter>GLSL Code Gen</Filter>
     </ClCompile>
@@ -121,15 +100,27 @@
     <ClCompile Include="hlslang\GLSLCodeGen\typeSamplers.cpp">
       <Filter>GLSL Code Gen</Filter>
     </ClCompile>
-    <ClCompile Include="hlslang\OSDependent\Windows\main.cpp">
-      <Filter>OSDependent\Windows</Filter>
-    </ClCompile>
     <ClCompile Include="hlslang\OSDependent\Windows\ossource.cpp">
       <Filter>OSDependent\Windows</Filter>
     </ClCompile>
     <ClCompile Include="hlslang\OSDependent\Linux\ossource.cpp">
       <Filter>OSDependent\Linux</Filter>
     </ClCompile>
+    <ClCompile Include="hlslang\MachineIndependent\preprocessor\sourceloc.cpp">
+      <Filter>Machine Independent\CPP</Filter>
+    </ClCompile>
+    <ClCompile Include="hlslang\MachineIndependent\preprocessor\mojoshader.cpp">
+      <Filter>Machine Independent\CPP</Filter>
+    </ClCompile>
+    <ClCompile Include="hlslang\MachineIndependent\preprocessor\mojoshader_common.cpp">
+      <Filter>Machine Independent\CPP</Filter>
+    </ClCompile>
+    <ClCompile Include="hlslang\MachineIndependent\preprocessor\mojoshader_lexer.cpp">
+      <Filter>Machine Independent\CPP</Filter>
+    </ClCompile>
+    <ClCompile Include="hlslang\MachineIndependent\preprocessor\mojoshader_preprocessor.cpp">
+      <Filter>Machine Independent\CPP</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="hlslang\MachineIndependent\Initialize.h">
@@ -147,39 +138,9 @@
     <ClInclude Include="hlslang\MachineIndependent\hlslang_tab.h">
       <Filter>Machine Independent\Generated Source</Filter>
     </ClInclude>
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\atom.h">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClInclude>
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\compile.h">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClInclude>
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\cpp.h">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClInclude>
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\memory.h">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClInclude>
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\parser.h">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClInclude>
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\preprocess.h">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClInclude>
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\scanner.h">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClInclude>
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\slglobals.h">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClInclude>
     <ClInclude Include="hlslang\MachineIndependent\preprocessor\sourceloc.h">
       <Filter>Machine Independent\CPP</Filter>
     </ClInclude>
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\symbols.h">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClInclude>
-    <ClInclude Include="hlslang\MachineIndependent\preprocessor\tokens.h">
-      <Filter>Machine Independent\CPP</Filter>
-    </ClInclude>
     <ClInclude Include="hlslang\Include\BaseTypes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -249,6 +210,12 @@
     <ClInclude Include="hlslang\OSDependent\Linux\osinclude.h">
       <Filter>OSDependent\Linux</Filter>
     </ClInclude>
+    <ClInclude Include="hlslang\MachineIndependent\preprocessor\mojoshader.h">
+      <Filter>Machine Independent\CPP</Filter>
+    </ClInclude>
+    <ClInclude Include="hlslang\MachineIndependent\preprocessor\mojoshader_internal.h">
+      <Filter>Machine Independent\CPP</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="hlslang\MachineIndependent\hlslang.l">
@@ -258,4 +225,9 @@
       <Filter>Machine Independent</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="hlslang\MachineIndependent\preprocessor\mojoshader_lexer.re">
+      <Filter>Machine Independent\CPP</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file