diff --git a/win32/orbital.vcxproj b/win32/orbital.vcxproj
index 181b66bd..eca25d22 100644
--- a/win32/orbital.vcxproj
+++ b/win32/orbital.vcxproj
@@ -27,10 +27,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\orbital\CommandParser.h" />
     <ClInclude Include="..\orbital\generated\mesh-parser.h" />
+    <ClInclude Include="..\orbital\generated\gun-parser.h" />
     <ClInclude Include="..\orbital\gun.h" />
     <ClInclude Include="..\orbital\mesh-compiler.h" />
+    <ClInclude Include="..\orbital\gun-compiler.h" />
     <ClInclude Include="..\orbital\mesh.h" />
     <ClInclude Include="..\orbital\orbital.h" />
     <ClInclude Include="..\orbital\particlesystem.h" />
@@ -41,8 +42,13 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\orbital\generated\mesh-parser.cpp" />
+    <ClCompile Include="..\orbital\generated\gun-parser.cpp" />
     <ClCompile Include="..\orbital\generated\mesh-scanner.cpp" />
+    <ClCompile Include="..\orbital\generated\gun-scanner.cpp" />
     <ClCompile Include="..\orbital\mesh-compiler.cpp" />
+    <ClCompile Include="..\orbital\mesh.cpp" />
+    <ClCompile Include="..\orbital\gun-compiler.cpp" />
+    <ClCompile Include="..\orbital\gun.cpp" />
     <ClCompile Include="..\orbital\orbital.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -58,7 +64,9 @@
     <None Include="..\orbital\generated\position.hh" />
     <None Include="..\orbital\generated\stack.hh" />
     <None Include="..\orbital\mesh-scanner.l" />
+    <None Include="..\orbital\gun-scanner.l" />
     <None Include="..\orbital\mesh-parser.y" />
+    <None Include="..\orbital\gun-parser.y" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{ee203b88-44cf-4859-9d42-7a5f40fecb52}</ProjectGuid>
diff --git a/win32/orbital.vcxproj.filters b/win32/orbital.vcxproj.filters
index b915a80b..d0db8832 100644
--- a/win32/orbital.vcxproj.filters
+++ b/win32/orbital.vcxproj.filters
@@ -3,15 +3,18 @@
   <ItemGroup>
     <ClInclude Include="..\orbital\gun.h" />
     <ClInclude Include="..\orbital\mesh.h" />
-    <ClInclude Include="..\orbital\CommandParser.h" />
     <ClInclude Include="..\orbital\player.h" />
     <ClInclude Include="..\orbital\tank.h" />
     <ClInclude Include="..\orbital\starfield.h" />
     <ClInclude Include="..\orbital\snake.h" />
     <ClInclude Include="..\orbital\mesh-compiler.h" />
+    <ClInclude Include="..\orbital\gun-compiler.h" />
     <ClInclude Include="..\orbital\generated\mesh-parser.h">
       <Filter>generated</Filter>
     </ClInclude>
+    <ClInclude Include="..\orbital\generated\gun-parser.h">
+      <Filter>generated</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\orbital\orbital.h" />
@@ -22,19 +25,30 @@
   <ItemGroup>
     <ClCompile Include="..\orbital\orbital.cpp" />
     <ClCompile Include="..\orbital\mesh-compiler.cpp" />
+    <ClCompile Include="..\orbital\mesh.cpp" />
+    <ClCompile Include="..\orbital\gun-compiler.cpp" />
+    <ClCompile Include="..\orbital\gun.cpp" />
     <ClCompile Include="..\orbital\generated\mesh-parser.cpp">
       <Filter>generated</Filter>
     </ClCompile>
+    <ClCompile Include="..\orbital\generated\gun-parser.cpp">
+      <Filter>generated</Filter>
+    </ClCompile>
     <ClCompile Include="..\orbital\generated\mesh-scanner.cpp">
       <Filter>generated</Filter>
     </ClCompile>
+    <ClCompile Include="..\orbital\generated\gun-scanner.cpp">
+      <Filter>generated</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <LolFxCompile Include="..\orbital\shiny.lolfx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\orbital\mesh-scanner.l" />
+    <None Include="..\orbital\gun-scanner.l" />
     <None Include="..\orbital\mesh-parser.y" />
+    <None Include="..\orbital\gun-parser.y" />
     <None Include="..\orbital\generated\location.hh">
       <Filter>generated</Filter>
     </None>