diff --git a/config/vs2015/botlib.vcxproj b/config/vs2015/botlib.vcxproj
index 8cbb759..237de5c 100644
--- a/config/vs2015/botlib.vcxproj
+++ b/config/vs2015/botlib.vcxproj
@@ -543,7 +543,7 @@
     <ClInclude Include="..\..\source\engine\botlib\be_ai_weight.h" />
     <ClInclude Include="..\..\source\engine\botlib\be_interface.h" />
     <ClInclude Include="..\..\source\game\bg_public.h" />
-    <ClInclude Include="..\..\source\qcommon\cm_public.h" />
+    <ClInclude Include="..\..\source\engine\qcommon\cm_public.h" />
     <ClInclude Include="..\..\source\game\g_public.h" />
     <ClInclude Include="..\..\source\engine\botlib\l_crc.h" />
     <ClInclude Include="..\..\source\engine\botlib\l_libvar.h" />
@@ -554,9 +554,9 @@
     <ClInclude Include="..\..\source\engine\botlib\l_struct.h" />
     <ClInclude Include="..\..\source\engine\botlib\l_utils.h" />
     <ClInclude Include="..\..\source\game\q_shared.h" />
-    <ClInclude Include="..\..\source\qcommon\qcommon.h" />
-    <ClInclude Include="..\..\source\qcommon\qfiles.h" />
-    <ClInclude Include="..\..\source\server\server.h" />
+    <ClInclude Include="..\..\source\engine\qcommon\qcommon.h" />
+    <ClInclude Include="..\..\source\engine\qcommon\qfiles.h" />
+    <ClInclude Include="..\..\source\engine\server\server.h" />
     <ClInclude Include="..\..\source\game\surfaceflags.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/config/vs2015/botlib.vcxproj.filters b/config/vs2015/botlib.vcxproj.filters
index 4547f6a..5fe99f2 100644
--- a/config/vs2015/botlib.vcxproj.filters
+++ b/config/vs2015/botlib.vcxproj.filters
@@ -151,7 +151,7 @@
     <ClInclude Include="..\..\source\game\bg_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\qcommon\cm_public.h">
+    <ClInclude Include="..\..\source\engine\qcommon\cm_public.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\source\game\g_public.h">
@@ -184,13 +184,13 @@
     <ClInclude Include="..\..\source\game\q_shared.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\qcommon\qcommon.h">
+    <ClInclude Include="..\..\source\engine\qcommon\qcommon.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\qcommon\qfiles.h">
+    <ClInclude Include="..\..\source\engine\qcommon\qfiles.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\server\server.h">
+    <ClInclude Include="..\..\source\engine\server\server.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\source\game\surfaceflags.h">
diff --git a/config/vs2015/quake3.vcxproj b/config/vs2015/quake3.vcxproj
index 3b6f64f..2469f38 100644
--- a/config/vs2015/quake3.vcxproj
+++ b/config/vs2015/quake3.vcxproj
@@ -747,7 +747,7 @@
     <ClInclude Include="..\..\source\engine\qcommon\cm_polylib.h" />
     <ClInclude Include="..\..\source\engine\qcommon\cm_public.h" />
     <ClInclude Include="..\..\source\game\g_public.h" />
-    <ClInclude Include="..\..\source\sq3_ui\keycodes.h" />
+    <ClInclude Include="..\..\source\q3_ui\keycodes.h" />
     <ClInclude Include="..\..\source\engine\client\keys.h" />
     <ClInclude Include="..\..\source\game\q_shared.h" />
     <ClInclude Include="..\..\source\engine\qcommon\qcommon.h" />
diff --git a/config/vs2015/quake3.vcxproj.filters b/config/vs2015/quake3.vcxproj.filters
index 2c9318e..1421c30 100644
--- a/config/vs2015/quake3.vcxproj.filters
+++ b/config/vs2015/quake3.vcxproj.filters
@@ -251,7 +251,7 @@
     <ClInclude Include="..\..\source\engine\win32\win_local.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\sq3_ui\keycodes.h">
+    <ClInclude Include="..\..\source\q3_ui\keycodes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/config/vs2015/renderer.vcxproj b/config/vs2015/renderer.vcxproj
index d78b9aa..1ea0306 100644
--- a/config/vs2015/renderer.vcxproj
+++ b/config/vs2015/renderer.vcxproj
@@ -919,10 +919,10 @@
     <ClInclude Include="..\..\source\engine\qcommon\qcommon.h" />
     <ClInclude Include="..\..\source\engine\qcommon\qfiles.h" />
     <ClInclude Include="..\..\source\engine\renderer\qgl.h" />
-    <ClInclude Include="..\..\game\surfaceflags.h" />
+    <ClInclude Include="..\..\source\game\surfaceflags.h" />
     <ClInclude Include="..\..\source\engine\renderer\tr_local.h" />
     <ClInclude Include="..\..\source\engine\renderer\tr_public.h" />
-    <ClInclude Include="..\..\cgame\tr_types.h" />
+    <ClInclude Include="..\..\source\cgame\tr_types.h" />
     <ClInclude Include="..\..\source\engine\win32\win_local.h" />
     <ClInclude Include="..\..\third_party\jpeg-6\jchuff.h" />
     <ClInclude Include="..\..\third_party\jpeg-6\jconfig.h" />
diff --git a/config/vs2015/renderer.vcxproj.filters b/config/vs2015/renderer.vcxproj.filters
index 3e635d8..ee71207 100644
--- a/config/vs2015/renderer.vcxproj.filters
+++ b/config/vs2015/renderer.vcxproj.filters
@@ -268,10 +268,10 @@
     <ClInclude Include="..\..\third_party\jpeg-6\jversion.h">
       <Filter>jpeg\Header Files No. 1</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\game\surfaceflags.h">
+    <ClInclude Include="..\..\source\game\surfaceflags.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\cgame\tr_types.h">
+    <ClInclude Include="..\..\source\cgame\tr_types.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>