diff --git a/misc/msvc10/cgame.vcxproj b/misc/msvc10/cgame.vcxproj
index 5f497a8f..5dcc6f3d 100644
--- a/misc/msvc10/cgame.vcxproj
+++ b/misc/msvc10/cgame.vcxproj
@@ -1122,6 +1122,7 @@
     <ClInclude Include="..\..\code\cgame\cg_public.h" />
     <ClInclude Include="..\..\code\qcommon\q_shared.h" />
     <ClInclude Include="..\..\code\qcommon\surfaceflags.h" />
+    <ClInclude Include="..\..\code\renderercommon\tr_types.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/misc/msvc10/cgame.vcxproj.filters b/misc/msvc10/cgame.vcxproj.filters
index 44bfbbbc..d2425d51 100644
--- a/misc/msvc10/cgame.vcxproj.filters
+++ b/misc/msvc10/cgame.vcxproj.filters
@@ -115,5 +115,8 @@
     <ClInclude Include="..\..\code\qcommon\surfaceflags.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\code\renderercommon\tr_types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/misc/msvc10/game.vcxproj b/misc/msvc10/game.vcxproj
index 5b336b35..25456a0c 100644
--- a/misc/msvc10/game.vcxproj
+++ b/misc/msvc10/game.vcxproj
@@ -1251,17 +1251,17 @@
     <ClInclude Include="..\..\code\game\ai_main.h" />
     <ClInclude Include="..\..\code\game\ai_team.h" />
     <ClInclude Include="..\..\code\game\ai_vcmd.h" />
-    <ClInclude Include="..\..\code\game\be_aas.h" />
-    <ClInclude Include="..\..\code\game\be_ai_char.h" />
-    <ClInclude Include="..\..\code\game\be_ai_chat.h" />
-    <ClInclude Include="..\..\code\game\be_ai_gen.h" />
-    <ClInclude Include="..\..\code\game\be_ai_goal.h" />
-    <ClInclude Include="..\..\code\game\be_ai_move.h" />
-    <ClInclude Include="..\..\code\game\be_ai_weap.h" />
-    <ClInclude Include="..\..\code\game\be_ea.h" />
+    <ClInclude Include="..\..\code\botlib\be_aas.h" />
+    <ClInclude Include="..\..\code\botlib\be_ai_char.h" />
+    <ClInclude Include="..\..\code\botlib\be_ai_chat.h" />
+    <ClInclude Include="..\..\code\botlib\be_ai_gen.h" />
+    <ClInclude Include="..\..\code\botlib\be_ai_goal.h" />
+    <ClInclude Include="..\..\code\botlib\be_ai_move.h" />
+    <ClInclude Include="..\..\code\botlib\be_ai_weap.h" />
+    <ClInclude Include="..\..\code\botlib\be_ea.h" />
     <ClInclude Include="..\..\code\game\bg_local.h" />
     <ClInclude Include="..\..\code\game\bg_public.h" />
-    <ClInclude Include="..\..\code\game\botlib.h" />
+    <ClInclude Include="..\..\code\botlib\botlib.h" />
     <ClInclude Include="..\..\code\game\chars.h" />
     <ClInclude Include="..\..\code\game\g_local.h" />
     <ClInclude Include="..\..\code\game\g_public.h" />
diff --git a/misc/msvc10/game.vcxproj.filters b/misc/msvc10/game.vcxproj.filters
index 1e7135c6..d12945cc 100644
--- a/misc/msvc10/game.vcxproj.filters
+++ b/misc/msvc10/game.vcxproj.filters
@@ -139,39 +139,12 @@
     <ClInclude Include="..\..\code\game\ai_vcmd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\game\be_aas.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ai_char.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ai_chat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ai_gen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ai_goal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ai_move.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ai_weap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ea.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\game\bg_local.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\code\game\bg_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\game\botlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\game\chars.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -199,5 +172,32 @@
     <ClInclude Include="..\..\code\game\syn.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_aas.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ai_char.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ai_chat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ai_gen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ai_goal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ai_move.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ai_weap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ea.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\botlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/misc/msvc10/q3_ui.vcxproj b/misc/msvc10/q3_ui.vcxproj
index 552c43c0..444ff14b 100644
--- a/misc/msvc10/q3_ui.vcxproj
+++ b/misc/msvc10/q3_ui.vcxproj
@@ -1801,20 +1801,31 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuildStep Include="..\..\code\q3_ui\keycodes.h">
+    <CustomBuildStep Include="..\..\code\client\keycodes.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <ClInclude Include="..\..\code\qcommon\q_shared.h" />
+    <ClInclude Include="..\..\code\game\bg_public.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\code\qcommon\q_shared.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <CustomBuildStep Include="..\..\code\q3_ui\ui_local.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\q3_ui\ui_public.h">
+    <CustomBuildStep Include="..\..\code\ui\ui_public.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">true</ExcludedFromBuild>
diff --git a/misc/msvc10/q3_ui.vcxproj.filters b/misc/msvc10/q3_ui.vcxproj.filters
index 66153a2d..89c347a3 100644
--- a/misc/msvc10/q3_ui.vcxproj.filters
+++ b/misc/msvc10/q3_ui.vcxproj.filters
@@ -151,15 +151,18 @@
     <ClInclude Include="..\..\code\qcommon\q_shared.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\code\game\bg_public.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuildStep Include="..\..\code\q3_ui\keycodes.h">
-      <Filter>Header Files</Filter>
-    </CustomBuildStep>
     <CustomBuildStep Include="..\..\code\q3_ui\ui_local.h">
       <Filter>Header Files</Filter>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\q3_ui\ui_public.h">
+    <CustomBuildStep Include="..\..\code\client\keycodes.h">
+      <Filter>Header Files</Filter>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\code\ui\ui_public.h">
       <Filter>Header Files</Filter>
     </CustomBuildStep>
   </ItemGroup>
diff --git a/misc/msvc10/quake3.vcxproj b/misc/msvc10/quake3.vcxproj
index db5e143d..2479b36e 100644
--- a/misc/msvc10/quake3.vcxproj
+++ b/misc/msvc10/quake3.vcxproj
@@ -1816,43 +1816,34 @@
     <ClInclude Include="..\..\code\qcommon\cm_public.h" />
     <ClInclude Include="..\..\code\game\g_public.h" />
     <ClInclude Include="..\..\code\renderercommon\iqm.h" />
-    <ClInclude Include="..\..\code\renderercommon\qgl.h" />
     <ClInclude Include="..\..\code\renderercommon\tr_common.h" />
     <ClInclude Include="..\..\code\renderercommon\tr_public.h" />
     <ClInclude Include="..\..\code\renderercommon\tr_types.h" />
-    <ClInclude Include="..\..\code\renderergl1\tr_local.h" />
-    <ClInclude Include="..\..\code\ui\keycodes.h" />
+    <ClInclude Include="..\..\code\client\keycodes.h" />
     <ClInclude Include="..\..\code\client\keys.h" />
     <ClInclude Include="..\..\code\qcommon\puff.h" />
     <ClInclude Include="..\..\code\qcommon\q_shared.h" />
     <ClInclude Include="..\..\code\client\qal.h" />
     <ClInclude Include="..\..\code\qcommon\qcommon.h" />
     <ClInclude Include="..\..\code\qcommon\qfiles.h" />
-    <ClInclude Include="..\..\code\renderer\qgl.h" />
-    <ClInclude Include="..\..\code\win32\resource.h" />
     <ClInclude Include="..\..\code\server\server.h" />
     <ClInclude Include="..\..\code\client\snd_local.h" />
     <ClInclude Include="..\..\code\client\snd_public.h" />
     <ClInclude Include="..\..\code\qcommon\surfaceflags.h" />
-    <ClInclude Include="..\..\code\renderer\tr_local.h" />
-    <ClInclude Include="..\..\code\renderer\tr_public.h" />
-    <ClInclude Include="..\..\code\cgame\tr_types.h" />
+    <ClInclude Include="..\..\code\renderergl1\tr_local.h" />
     <ClInclude Include="..\..\code\ui\ui_public.h" />
     <ClInclude Include="..\..\code\qcommon\unzip.h" />
     <ClInclude Include="..\..\code\qcommon\vm_local.h" />
-    <ClInclude Include="..\..\code\win32\win_local.h" />
-    <ClInclude Include="..\..\code\sys\win_resource.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jchuff.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jconfig.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jdct.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jdhuff.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jerror.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jinclude.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jmemsys.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jmorecfg.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jpegint.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jpeglib.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jversion.h" />
+    <ClInclude Include="..\..\code\sys\sys_local.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jconfig.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jdct.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jerror.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jinclude.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jmemsys.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jmorecfg.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jpegint.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jpeglib.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jversion.h" />
     <ClInclude Include="..\..\code\botlib\aasfile.h" />
     <ClInclude Include="..\..\code\botlib\be_aas_bsp.h" />
     <ClInclude Include="..\..\code\botlib\be_aas_cluster.h" />
diff --git a/misc/msvc10/quake3.vcxproj.filters b/misc/msvc10/quake3.vcxproj.filters
index e1789455..d7afa0c6 100644
--- a/misc/msvc10/quake3.vcxproj.filters
+++ b/misc/msvc10/quake3.vcxproj.filters
@@ -713,9 +713,6 @@
     <ClInclude Include="..\..\code\game\g_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\ui\keycodes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\client\keys.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -734,12 +731,6 @@
     <ClInclude Include="..\..\code\qcommon\qfiles.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\renderer\qgl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\win32\resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\server\server.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -752,15 +743,6 @@
     <ClInclude Include="..\..\code\qcommon\surfaceflags.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\renderer\tr_local.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\renderer\tr_public.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\cgame\tr_types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\ui\ui_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -770,45 +752,9 @@
     <ClInclude Include="..\..\code\qcommon\vm_local.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\win32\win_local.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\sys\win_resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jchuff.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jconfig.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jdct.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jdhuff.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jerror.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jinclude.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jmemsys.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jmorecfg.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jpegint.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jpeglib.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jversion.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\botlib\aasfile.h">
       <Filter>botlib\Header Files</Filter>
     </ClInclude>
@@ -905,6 +851,39 @@
     <ClInclude Include="..\..\code\renderergl1\tr_local.h">
       <Filter>renderergl1</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\code\client\keycodes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\sys\sys_local.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jconfig.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jdct.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jerror.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jinclude.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jmemsys.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jmorecfg.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jpegint.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jpeglib.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jversion.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\code\sys\win_resource.rc">
diff --git a/misc/msvc10/ui.vcxproj b/misc/msvc10/ui.vcxproj
index e4526762..5c276f1a 100644
--- a/misc/msvc10/ui.vcxproj
+++ b/misc/msvc10/ui.vcxproj
@@ -785,7 +785,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\ui\keycodes.h">
+    <CustomBuildStep Include="..\..\code\client\keycodes.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -797,19 +797,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\game\q_shared.h">
+    <CustomBuildStep Include="..\..\code\qcommon\q_shared.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\game\surfaceflags.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\cgame\tr_types.h">
+    <CustomBuildStep Include="..\..\code\renderercommon\tr_types.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
diff --git a/misc/msvc10/ui.vcxproj.filters b/misc/msvc10/ui.vcxproj.filters
index 875ff0ef..65a24684 100644
--- a/misc/msvc10/ui.vcxproj.filters
+++ b/misc/msvc10/ui.vcxproj.filters
@@ -49,21 +49,9 @@
     <CustomBuildStep Include="..\..\code\game\bg_public.h">
       <Filter>Header Files</Filter>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\ui\keycodes.h">
-      <Filter>Header Files</Filter>
-    </CustomBuildStep>
     <CustomBuildStep Include="..\..\ui\menudef.h">
       <Filter>Header Files</Filter>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\game\q_shared.h">
-      <Filter>Header Files</Filter>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\game\surfaceflags.h">
-      <Filter>Header Files</Filter>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\cgame\tr_types.h">
-      <Filter>Header Files</Filter>
-    </CustomBuildStep>
     <CustomBuildStep Include="..\..\code\ui\ui_local.h">
       <Filter>Header Files</Filter>
     </CustomBuildStep>
@@ -73,5 +61,14 @@
     <CustomBuildStep Include="..\..\code\ui\ui_shared.h">
       <Filter>Header Files</Filter>
     </CustomBuildStep>
+    <CustomBuildStep Include="..\..\code\client\keycodes.h">
+      <Filter>Header Files</Filter>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\code\renderercommon\tr_types.h">
+      <Filter>Header Files</Filter>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\code\qcommon\q_shared.h">
+      <Filter>Header Files</Filter>
+    </CustomBuildStep>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/misc/msvc11/cgame.vcxproj b/misc/msvc11/cgame.vcxproj
index 64896270..50395b5c 100644
--- a/misc/msvc11/cgame.vcxproj
+++ b/misc/msvc11/cgame.vcxproj
@@ -1130,6 +1130,7 @@
     <ClInclude Include="..\..\code\cgame\cg_public.h" />
     <ClInclude Include="..\..\code\qcommon\q_shared.h" />
     <ClInclude Include="..\..\code\qcommon\surfaceflags.h" />
+    <ClInclude Include="..\..\code\renderercommon\tr_types.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/misc/msvc11/cgame.vcxproj.filters b/misc/msvc11/cgame.vcxproj.filters
index 44bfbbbc..d2425d51 100644
--- a/misc/msvc11/cgame.vcxproj.filters
+++ b/misc/msvc11/cgame.vcxproj.filters
@@ -115,5 +115,8 @@
     <ClInclude Include="..\..\code\qcommon\surfaceflags.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\code\renderercommon\tr_types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/misc/msvc11/game.vcxproj b/misc/msvc11/game.vcxproj
index 04243ae7..649fd539 100644
--- a/misc/msvc11/game.vcxproj
+++ b/misc/msvc11/game.vcxproj
@@ -1259,17 +1259,17 @@
     <ClInclude Include="..\..\code\game\ai_main.h" />
     <ClInclude Include="..\..\code\game\ai_team.h" />
     <ClInclude Include="..\..\code\game\ai_vcmd.h" />
-    <ClInclude Include="..\..\code\game\be_aas.h" />
-    <ClInclude Include="..\..\code\game\be_ai_char.h" />
-    <ClInclude Include="..\..\code\game\be_ai_chat.h" />
-    <ClInclude Include="..\..\code\game\be_ai_gen.h" />
-    <ClInclude Include="..\..\code\game\be_ai_goal.h" />
-    <ClInclude Include="..\..\code\game\be_ai_move.h" />
-    <ClInclude Include="..\..\code\game\be_ai_weap.h" />
-    <ClInclude Include="..\..\code\game\be_ea.h" />
+    <ClInclude Include="..\..\code\botlib\be_aas.h" />
+    <ClInclude Include="..\..\code\botlib\be_ai_char.h" />
+    <ClInclude Include="..\..\code\botlib\be_ai_chat.h" />
+    <ClInclude Include="..\..\code\botlib\be_ai_gen.h" />
+    <ClInclude Include="..\..\code\botlib\be_ai_goal.h" />
+    <ClInclude Include="..\..\code\botlib\be_ai_move.h" />
+    <ClInclude Include="..\..\code\botlib\be_ai_weap.h" />
+    <ClInclude Include="..\..\code\botlib\be_ea.h" />
     <ClInclude Include="..\..\code\game\bg_local.h" />
     <ClInclude Include="..\..\code\game\bg_public.h" />
-    <ClInclude Include="..\..\code\game\botlib.h" />
+    <ClInclude Include="..\..\code\botlib\botlib.h" />
     <ClInclude Include="..\..\code\game\chars.h" />
     <ClInclude Include="..\..\code\game\g_local.h" />
     <ClInclude Include="..\..\code\game\g_public.h" />
diff --git a/misc/msvc11/game.vcxproj.filters b/misc/msvc11/game.vcxproj.filters
index 1e7135c6..d12945cc 100644
--- a/misc/msvc11/game.vcxproj.filters
+++ b/misc/msvc11/game.vcxproj.filters
@@ -139,39 +139,12 @@
     <ClInclude Include="..\..\code\game\ai_vcmd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\game\be_aas.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ai_char.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ai_chat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ai_gen.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ai_goal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ai_move.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ai_weap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\game\be_ea.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\game\bg_local.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\code\game\bg_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\game\botlib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\game\chars.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -199,5 +172,32 @@
     <ClInclude Include="..\..\code\game\syn.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_aas.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ai_char.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ai_chat.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ai_gen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ai_goal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ai_move.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ai_weap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\be_ea.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\botlib\botlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/misc/msvc11/q3_ui.vcxproj b/misc/msvc11/q3_ui.vcxproj
index 0c4eab1e..c3f6865d 100644
--- a/misc/msvc11/q3_ui.vcxproj
+++ b/misc/msvc11/q3_ui.vcxproj
@@ -1809,20 +1809,31 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuildStep Include="..\..\code\q3_ui\keycodes.h">
+    <CustomBuildStep Include="..\..\code\client\keycodes.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <ClInclude Include="..\..\code\qcommon\q_shared.h" />
+    <ClInclude Include="..\..\code\game\bg_public.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|x64'">true</ExcludedFromBuild>
+    </ClInclude>
+    <ClInclude Include="..\..\code\qcommon\q_shared.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|x64'">true</ExcludedFromBuild>
+    </ClInclude>
     <CustomBuildStep Include="..\..\code\q3_ui\ui_local.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\q3_ui\ui_public.h">
+    <CustomBuildStep Include="..\..\code\ui\ui_public.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug TA|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release TA|Win32'">true</ExcludedFromBuild>
diff --git a/misc/msvc11/q3_ui.vcxproj.filters b/misc/msvc11/q3_ui.vcxproj.filters
index 66153a2d..89c347a3 100644
--- a/misc/msvc11/q3_ui.vcxproj.filters
+++ b/misc/msvc11/q3_ui.vcxproj.filters
@@ -151,15 +151,18 @@
     <ClInclude Include="..\..\code\qcommon\q_shared.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\code\game\bg_public.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuildStep Include="..\..\code\q3_ui\keycodes.h">
-      <Filter>Header Files</Filter>
-    </CustomBuildStep>
     <CustomBuildStep Include="..\..\code\q3_ui\ui_local.h">
       <Filter>Header Files</Filter>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\q3_ui\ui_public.h">
+    <CustomBuildStep Include="..\..\code\client\keycodes.h">
+      <Filter>Header Files</Filter>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\code\ui\ui_public.h">
       <Filter>Header Files</Filter>
     </CustomBuildStep>
   </ItemGroup>
diff --git a/misc/msvc11/quake3.vcxproj b/misc/msvc11/quake3.vcxproj
index 0720aa71..18f39821 100644
--- a/misc/msvc11/quake3.vcxproj
+++ b/misc/msvc11/quake3.vcxproj
@@ -1824,43 +1824,34 @@
     <ClInclude Include="..\..\code\qcommon\cm_public.h" />
     <ClInclude Include="..\..\code\game\g_public.h" />
     <ClInclude Include="..\..\code\renderercommon\iqm.h" />
-    <ClInclude Include="..\..\code\renderercommon\qgl.h" />
     <ClInclude Include="..\..\code\renderercommon\tr_common.h" />
     <ClInclude Include="..\..\code\renderercommon\tr_public.h" />
     <ClInclude Include="..\..\code\renderercommon\tr_types.h" />
-    <ClInclude Include="..\..\code\renderergl1\tr_local.h" />
-    <ClInclude Include="..\..\code\ui\keycodes.h" />
+    <ClInclude Include="..\..\code\client\keycodes.h" />
     <ClInclude Include="..\..\code\client\keys.h" />
     <ClInclude Include="..\..\code\qcommon\puff.h" />
     <ClInclude Include="..\..\code\qcommon\q_shared.h" />
     <ClInclude Include="..\..\code\client\qal.h" />
     <ClInclude Include="..\..\code\qcommon\qcommon.h" />
     <ClInclude Include="..\..\code\qcommon\qfiles.h" />
-    <ClInclude Include="..\..\code\renderer\qgl.h" />
-    <ClInclude Include="..\..\code\win32\resource.h" />
     <ClInclude Include="..\..\code\server\server.h" />
     <ClInclude Include="..\..\code\client\snd_local.h" />
     <ClInclude Include="..\..\code\client\snd_public.h" />
     <ClInclude Include="..\..\code\qcommon\surfaceflags.h" />
-    <ClInclude Include="..\..\code\renderer\tr_local.h" />
-    <ClInclude Include="..\..\code\renderer\tr_public.h" />
-    <ClInclude Include="..\..\code\cgame\tr_types.h" />
+    <ClInclude Include="..\..\code\renderergl1\tr_local.h" />
     <ClInclude Include="..\..\code\ui\ui_public.h" />
     <ClInclude Include="..\..\code\qcommon\unzip.h" />
     <ClInclude Include="..\..\code\qcommon\vm_local.h" />
-    <ClInclude Include="..\..\code\win32\win_local.h" />
-    <ClInclude Include="..\..\code\sys\win_resource.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jchuff.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jconfig.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jdct.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jdhuff.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jerror.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jinclude.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jmemsys.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jmorecfg.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jpegint.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jpeglib.h" />
-    <ClInclude Include="..\..\code\jpeg-6b\jversion.h" />
+    <ClInclude Include="..\..\code\sys\sys_local.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jconfig.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jdct.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jerror.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jinclude.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jmemsys.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jmorecfg.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jpegint.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jpeglib.h" />
+    <ClInclude Include="..\..\code\jpeg-8c\jversion.h" />
     <ClInclude Include="..\..\code\botlib\aasfile.h" />
     <ClInclude Include="..\..\code\botlib\be_aas_bsp.h" />
     <ClInclude Include="..\..\code\botlib\be_aas_cluster.h" />
diff --git a/misc/msvc11/quake3.vcxproj.filters b/misc/msvc11/quake3.vcxproj.filters
index e1789455..d7afa0c6 100644
--- a/misc/msvc11/quake3.vcxproj.filters
+++ b/misc/msvc11/quake3.vcxproj.filters
@@ -713,9 +713,6 @@
     <ClInclude Include="..\..\code\game\g_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\ui\keycodes.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\client\keys.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -734,12 +731,6 @@
     <ClInclude Include="..\..\code\qcommon\qfiles.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\renderer\qgl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\win32\resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\server\server.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -752,15 +743,6 @@
     <ClInclude Include="..\..\code\qcommon\surfaceflags.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\renderer\tr_local.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\renderer\tr_public.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\cgame\tr_types.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\ui\ui_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -770,45 +752,9 @@
     <ClInclude Include="..\..\code\qcommon\vm_local.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\win32\win_local.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\sys\win_resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jchuff.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jconfig.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jdct.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jdhuff.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jerror.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jinclude.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jmemsys.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jmorecfg.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jpegint.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jpeglib.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\code\jpeg-6b\jversion.h">
-      <Filter>jpeg\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\code\botlib\aasfile.h">
       <Filter>botlib\Header Files</Filter>
     </ClInclude>
@@ -905,6 +851,39 @@
     <ClInclude Include="..\..\code\renderergl1\tr_local.h">
       <Filter>renderergl1</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\code\client\keycodes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\sys\sys_local.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jconfig.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jdct.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jerror.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jinclude.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jmemsys.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jmorecfg.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jpegint.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jpeglib.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\code\jpeg-8c\jversion.h">
+      <Filter>jpeg\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\code\sys\win_resource.rc">
diff --git a/misc/msvc11/ui.vcxproj b/misc/msvc11/ui.vcxproj
index bed8ec2f..ccf108be 100644
--- a/misc/msvc11/ui.vcxproj
+++ b/misc/msvc11/ui.vcxproj
@@ -793,7 +793,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\ui\keycodes.h">
+    <CustomBuildStep Include="..\..\code\client\keycodes.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -805,19 +805,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\game\q_shared.h">
+    <CustomBuildStep Include="..\..\code\qcommon\q_shared.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\game\surfaceflags.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\cgame\tr_types.h">
+    <CustomBuildStep Include="..\..\code\renderercommon\tr_types.h">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
diff --git a/misc/msvc11/ui.vcxproj.filters b/misc/msvc11/ui.vcxproj.filters
index 875ff0ef..65a24684 100644
--- a/misc/msvc11/ui.vcxproj.filters
+++ b/misc/msvc11/ui.vcxproj.filters
@@ -49,21 +49,9 @@
     <CustomBuildStep Include="..\..\code\game\bg_public.h">
       <Filter>Header Files</Filter>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\ui\keycodes.h">
-      <Filter>Header Files</Filter>
-    </CustomBuildStep>
     <CustomBuildStep Include="..\..\ui\menudef.h">
       <Filter>Header Files</Filter>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\game\q_shared.h">
-      <Filter>Header Files</Filter>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\game\surfaceflags.h">
-      <Filter>Header Files</Filter>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\code\cgame\tr_types.h">
-      <Filter>Header Files</Filter>
-    </CustomBuildStep>
     <CustomBuildStep Include="..\..\code\ui\ui_local.h">
       <Filter>Header Files</Filter>
     </CustomBuildStep>
@@ -73,5 +61,14 @@
     <CustomBuildStep Include="..\..\code\ui\ui_shared.h">
       <Filter>Header Files</Filter>
     </CustomBuildStep>
+    <CustomBuildStep Include="..\..\code\client\keycodes.h">
+      <Filter>Header Files</Filter>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\code\renderercommon\tr_types.h">
+      <Filter>Header Files</Filter>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\code\qcommon\q_shared.h">
+      <Filter>Header Files</Filter>
+    </CustomBuildStep>
   </ItemGroup>
 </Project>
\ No newline at end of file