diff --git a/core/logic/msvc10/logic.vcxproj b/core/logic/msvc10/logic.vcxproj
index 0bf594a3..70ae9a90 100644
--- a/core/logic/msvc10/logic.vcxproj
+++ b/core/logic/msvc10/logic.vcxproj
@@ -143,6 +143,9 @@
     <ClCompile Include="..\thread\WinThreads.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\public\sm_platform.h" />
+    <ClInclude Include="..\..\..\public\sm_trie_tpl.h" />
+    <ClInclude Include="..\..\..\public\sourcemod_version.h" />
     <ClInclude Include="..\AutoHandleRooter.h" />
     <ClInclude Include="..\CellArray.h" />
     <ClInclude Include="..\common_logic.h" />
@@ -156,7 +159,6 @@
     <ClInclude Include="..\sm_memtable.h" />
     <ClInclude Include="..\sm_symtable.h" />
     <ClInclude Include="..\stringutil.h" />
-    <ClInclude Include="..\svn_version.h" />
     <ClInclude Include="..\TextParsers.h" />
     <ClInclude Include="..\ThreadSupport.h" />
     <ClInclude Include="..\thread\BaseWorker.h" />
diff --git a/core/logic/msvc10/logic.vcxproj.filters b/core/logic/msvc10/logic.vcxproj.filters
index ea43a785..06d2be90 100644
--- a/core/logic/msvc10/logic.vcxproj.filters
+++ b/core/logic/msvc10/logic.vcxproj.filters
@@ -131,9 +131,6 @@
     <ClInclude Include="..\Profiler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\svn_version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\TextParsers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -179,6 +176,15 @@
     <ClInclude Include="..\Translator.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\public\sm_trie_tpl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\public\sourcemod_version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\public\sm_platform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\version.rc">
diff --git a/core/msvc10/sourcemod_mm.vcxproj b/core/msvc10/sourcemod_mm.vcxproj
index 60416169..3bcbfa4d 100644
--- a/core/msvc10/sourcemod_mm.vcxproj
+++ b/core/msvc10/sourcemod_mm.vcxproj
@@ -2037,10 +2037,11 @@
     <ClCompile Include="..\smn_vector.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\public\sm_platform.h" />
+    <ClInclude Include="..\..\public\sourcemod_version.h" />
     <ClInclude Include="..\AdminCache.h" />
     <ClInclude Include="..\ADTFactory.h" />
     <ClInclude Include="..\CDataPack.h" />
-    <ClInclude Include="..\CellArray.h" />
     <ClInclude Include="..\CellRecipientFilter.h" />
     <ClInclude Include="..\ChatTriggers.h" />
     <ClInclude Include="..\..\public\compat_wrappers.h" />
@@ -2049,6 +2050,9 @@
     <ClInclude Include="..\ConCommandBaseIterator.h" />
     <ClInclude Include="..\ConsoleDetours.h" />
     <ClInclude Include="..\ConVarManager.h" />
+    <ClInclude Include="..\convar_sm_l4d.h" />
+    <ClInclude Include="..\convar_sm_ob.h" />
+    <ClInclude Include="..\convar_sm_swarm.h" />
     <ClInclude Include="..\CoreConfig.h" />
     <ClInclude Include="..\Database.h" />
     <ClInclude Include="..\DebugReporter.h" />
@@ -2056,13 +2060,11 @@
     <ClInclude Include="..\ExtensionSys.h" />
     <ClInclude Include="..\ForwardSys.h" />
     <ClInclude Include="..\frame_hooks.h" />
-    <ClInclude Include="..\GameConfigs.h" />
     <ClInclude Include="..\HalfLife2.h" />
     <ClInclude Include="..\HandleSys.h" />
     <ClInclude Include="..\LibrarySys.h" />
     <ClInclude Include="..\Logger.h" />
     <ClInclude Include="..\logic_bridge.h" />
-    <ClInclude Include="..\MemoryUtils.h" />
     <ClInclude Include="..\MenuManager.h" />
     <ClInclude Include="..\MenuStyle_Base.h" />
     <ClInclude Include="..\MenuStyle_Radio.h" />
@@ -2071,7 +2073,6 @@
     <ClInclude Include="..\NativeInvoker.h" />
     <ClInclude Include="..\NativeOwner.h" />
     <ClInclude Include="..\NextMap.h" />
-    <ClInclude Include="..\PhraseCollection.h" />
     <ClInclude Include="..\PlayerManager.h" />
     <ClInclude Include="..\PluginInfoDatabase.h" />
     <ClInclude Include="..\PluginSys.h" />
@@ -2080,20 +2081,16 @@
     <ClInclude Include="..\sm_fastlink.h" />
     <ClInclude Include="..\sm_globals.h" />
     <ClInclude Include="..\sm_memtable.h" />
-    <ClInclude Include="..\..\public\sm_platform.h" />
     <ClInclude Include="..\sm_queue.h" />
     <ClInclude Include="..\sm_simple_prioqueue.h" />
     <ClInclude Include="..\sm_srvcmds.h" />
     <ClInclude Include="..\sm_stringutil.h" />
-    <ClInclude Include="..\sm_symtable.h" />
     <ClInclude Include="..\sm_trie.h" />
     <ClInclude Include="..\..\public\sm_trie_tpl.h" />
-    <ClInclude Include="..\sm_version.h" />
     <ClInclude Include="..\smn_usermsgs.h" />
     <ClInclude Include="..\sourcemm_api.h" />
     <ClInclude Include="..\sourcemod.h" />
     <ClInclude Include="..\TimerSys.h" />
-    <ClInclude Include="..\Translator.h" />
     <ClInclude Include="..\UserMessages.h" />
     <ClInclude Include="..\..\public\IAdminSystem.h" />
     <ClInclude Include="..\..\public\IADTFactory.h" />
diff --git a/core/msvc10/sourcemod_mm.vcxproj.filters b/core/msvc10/sourcemod_mm.vcxproj.filters
index 47f5e446..885e10af 100644
--- a/core/msvc10/sourcemod_mm.vcxproj.filters
+++ b/core/msvc10/sourcemod_mm.vcxproj.filters
@@ -209,9 +209,6 @@
     <ClInclude Include="..\CDataPack.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CellArray.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\CellRecipientFilter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -257,9 +254,6 @@
     <ClInclude Include="..\frame_hooks.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\GameConfigs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\HalfLife2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -275,9 +269,6 @@
     <ClInclude Include="..\logic_bridge.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\MemoryUtils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\MenuManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -302,9 +293,6 @@
     <ClInclude Include="..\NextMap.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\PhraseCollection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\PlayerManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -329,9 +317,6 @@
     <ClInclude Include="..\sm_memtable.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\public\sm_platform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\sm_queue.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -344,18 +329,12 @@
     <ClInclude Include="..\sm_stringutil.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\sm_symtable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\sm_trie.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\public\sm_trie_tpl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\sm_version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\smn_usermsgs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -368,9 +347,6 @@
     <ClInclude Include="..\TimerSys.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Translator.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\UserMessages.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -458,6 +434,21 @@
     <ClInclude Include="..\convar_sm.h">
       <Filter>HL2SDK</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\public\sm_platform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\public\sourcemod_version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\convar_sm_l4d.h">
+      <Filter>HL2SDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\convar_sm_ob.h">
+      <Filter>HL2SDK</Filter>
+    </ClInclude>
+    <ClInclude Include="..\convar_sm_swarm.h">
+      <Filter>HL2SDK</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\version.rc">