diff --git a/dlls/cstrike/cstrike/msvc7/cstrike.vcproj b/dlls/cstrike/cstrike/msvc7/cstrike.vcproj
index fcaf0144..4c33e01a 100755
--- a/dlls/cstrike/cstrike/msvc7/cstrike.vcproj
+++ b/dlls/cstrike/cstrike/msvc7/cstrike.vcproj
@@ -22,7 +22,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
@@ -88,7 +88,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
diff --git a/dlls/cstrike/cstrike/msvc8/cstrike.vcproj b/dlls/cstrike/cstrike/msvc8/cstrike.vcproj
index e2742339..0ae4b42a 100644
--- a/dlls/cstrike/cstrike/msvc8/cstrike.vcproj
+++ b/dlls/cstrike/cstrike/msvc8/cstrike.vcproj
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -145,7 +145,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;CSTRIKE_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/dlls/cstrike/csx/msvc7/csx.vcproj b/dlls/cstrike/csx/msvc7/csx.vcproj
index 4e4129ff..93a0b835 100755
--- a/dlls/cstrike/csx/msvc7/csx.vcproj
+++ b/dlls/cstrike/csx/msvc7/csx.vcproj
@@ -23,7 +23,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;csx_EXPORTS;JIT"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
@@ -88,7 +88,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;csx_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
diff --git a/dlls/cstrike/csx/msvc8/csx.vcproj b/dlls/cstrike/csx/msvc8/csx.vcproj
index 6e464864..e7d96e02 100644
--- a/dlls/cstrike/csx/msvc8/csx.vcproj
+++ b/dlls/cstrike/csx/msvc8/csx.vcproj
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;csx_EXPORTS;JIT"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -145,7 +145,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;csx_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
diff --git a/dlls/dod/dodfun/msvc7/dodfun.vcproj b/dlls/dod/dodfun/msvc7/dodfun.vcproj
index 01360bad..81937933 100755
--- a/dlls/dod/dodfun/msvc7/dodfun.vcproj
+++ b/dlls/dod/dodfun/msvc7/dodfun.vcproj
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="dodfun_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
@@ -87,7 +87,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;dodfun_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
diff --git a/dlls/dod/dodfun/msvc8/dodfun.vcproj b/dlls/dod/dodfun/msvc8/dodfun.vcproj
index 57d0b4c7..9f93acfd 100644
--- a/dlls/dod/dodfun/msvc8/dodfun.vcproj
+++ b/dlls/dod/dodfun/msvc8/dodfun.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="dodfun_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;dodfun_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
diff --git a/dlls/dod/dodx/msvc7/dodx.vcproj b/dlls/dod/dodx/msvc7/dodx.vcproj
index c64d5faa..bc7d0fd7 100755
--- a/dlls/dod/dodx/msvc7/dodx.vcproj
+++ b/dlls/dod/dodx/msvc7/dodx.vcproj
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="dodx_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
@@ -87,7 +87,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;dodx_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
diff --git a/dlls/dod/dodx/msvc8/dodx.vcproj b/dlls/dod/dodx/msvc8/dodx.vcproj
index 6210f0bb..49248d32 100644
--- a/dlls/dod/dodx/msvc8/dodx.vcproj
+++ b/dlls/dod/dodx/msvc8/dodx.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="dodx_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;dodx_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
diff --git a/dlls/dod/dodx/sdk/moduleconfig.h b/dlls/dod/dodx/sdk/moduleconfig.h
index a9937c09..ba3a5701 100755
--- a/dlls/dod/dodx/sdk/moduleconfig.h
+++ b/dlls/dod/dodx/sdk/moduleconfig.h
@@ -3,7 +3,7 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-#include "../svn_version.h"
+#include "svn_version.h"
 
 // Module info
 #define MODULE_NAME "DoDX"
diff --git a/dlls/engine/msvc7/engine.vcproj b/dlls/engine/msvc7/engine.vcproj
index 0ba17a70..843834cb 100755
--- a/dlls/engine/msvc7/engine.vcproj
+++ b/dlls/engine/msvc7/engine.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ENGINE_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -69,7 +69,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ENGINE_EXPORTS"
 				RuntimeLibrary="4"
 				StructMemberAlignment="3"
diff --git a/dlls/engine/msvc8/engine.vcproj b/dlls/engine/msvc8/engine.vcproj
index eb5c0981..c5aa24a4 100644
--- a/dlls/engine/msvc8/engine.vcproj
+++ b/dlls/engine/msvc8/engine.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ENGINE_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ENGINE_EXPORTS"
 				RuntimeLibrary="0"
 				StructMemberAlignment="3"
diff --git a/dlls/fakemeta/msvc7/fakemeta.vcproj b/dlls/fakemeta/msvc7/fakemeta.vcproj
index 1e5d9ead..a87b7dfc 100755
--- a/dlls/fakemeta/msvc7/fakemeta.vcproj
+++ b/dlls/fakemeta/msvc7/fakemeta.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FAKEMETA_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -69,7 +69,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FAKEMETA_EXPORTS"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
diff --git a/dlls/fakemeta/msvc8/fakemeta.vcproj b/dlls/fakemeta/msvc8/fakemeta.vcproj
index a1c4fa4e..5edf2398 100644
--- a/dlls/fakemeta/msvc8/fakemeta.vcproj
+++ b/dlls/fakemeta/msvc8/fakemeta.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FAKEMETA_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -121,7 +121,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FAKEMETA_EXPORTS"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
diff --git a/dlls/fun/msvc7/fun.vcproj b/dlls/fun/msvc7/fun.vcproj
index c8255182..867433fd 100755
--- a/dlls/fun/msvc7/fun.vcproj
+++ b/dlls/fun/msvc7/fun.vcproj
@@ -23,7 +23,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FUN_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
@@ -87,7 +87,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FUN_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
diff --git a/dlls/fun/msvc8/fun.vcproj b/dlls/fun/msvc8/fun.vcproj
index ad64c785..a5da5104 100644
--- a/dlls/fun/msvc8/fun.vcproj
+++ b/dlls/fun/msvc8/fun.vcproj
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FUN_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -144,7 +144,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FUN_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
diff --git a/dlls/geoip/msvc7/geoip.vcproj b/dlls/geoip/msvc7/geoip.vcproj
index 024a9788..aa8edb38 100755
--- a/dlls/geoip/msvc7/geoip.vcproj
+++ b/dlls/geoip/msvc7/geoip.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
diff --git a/dlls/geoip/msvc8/geoip.vcproj b/dlls/geoip/msvc8/geoip.vcproj
index 1971320e..627c48c8 100644
--- a/dlls/geoip/msvc8/geoip.vcproj
+++ b/dlls/geoip/msvc8/geoip.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -123,7 +123,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GEOIP_EXPORTS"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
diff --git a/dlls/hamsandwich/msvc8/hs.vcproj b/dlls/hamsandwich/msvc8/hs.vcproj
index 92e683b6..1e91df1b 100644
--- a/dlls/hamsandwich/msvc8/hs.vcproj
+++ b/dlls/hamsandwich/msvc8/hs.vcproj
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="z:\metamod\metamod;z:\hlsdk\common;z:\hlsdk\engine;z:\hlsdk\dlls;z:\hlsdk\pm_shared;.."
+				AdditionalIncludeDirectories="z:\metamod\metamod;z:\hlsdk\common;z:\hlsdk\engine;z:\hlsdk\dlls;z:\hlsdk\pm_shared;..;..\tableentries"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -133,7 +133,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="z:\metamod\metamod;z:\hlsdk\common;z:\hlsdk\engine;z:\hlsdk\dlls;z:\hlsdk\pm_shared;&quot;$(ProjectDir)\..\tableentries&quot;;&quot;$(ProjectDir)\..&quot;"
+				AdditionalIncludeDirectories="z:\metamod\metamod;z:\hlsdk\common;z:\hlsdk\engine;z:\hlsdk\dlls;z:\hlsdk\pm_shared;..;..\tableentries"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
diff --git a/dlls/mysqlx/msvc7/mysqlx.vcproj b/dlls/mysqlx/msvc7/mysqlx.vcproj
index 1faaf84a..8d2e2361 100644
--- a/dlls/mysqlx/msvc7/mysqlx.vcproj
+++ b/dlls/mysqlx/msvc7/mysqlx.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\mysql;..\thread;..\sdk;.;.."
+				AdditionalIncludeDirectories="..\;..\mysql;..\thread;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\mysql;..\thread;..\sdk;.;.."
+				AdditionalIncludeDirectories="..\;..\mysql;..\thread;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
diff --git a/dlls/mysqlx/msvc8/mysqlx.vcproj b/dlls/mysqlx/msvc8/mysqlx.vcproj
index c598a849..fb0b44c9 100644
--- a/dlls/mysqlx/msvc8/mysqlx.vcproj
+++ b/dlls/mysqlx/msvc8/mysqlx.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\mysql;..\thread;..\sdk;."
+				AdditionalIncludeDirectories="..\;..\mysql;..\thread;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -123,7 +123,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\mysql;..\thread;..\sdk;."
+				AdditionalIncludeDirectories="..\;..\mysql;..\thread;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MYSQL2_EXPORTS;SM_DEFAULT_THREADER"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
diff --git a/dlls/ns/msvc7/ns.vcproj b/dlls/ns/msvc7/ns.vcproj
index eb6a57f8..8b1c3817 100755
--- a/dlls/ns/msvc7/ns.vcproj
+++ b/dlls/ns/msvc7/ns.vcproj
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
@@ -86,7 +86,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/I "
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
diff --git a/dlls/ns/msvc8/ns.vcproj b/dlls/ns/msvc8/ns.vcproj
index 9370c4bf..2a6728c9 100644
--- a/dlls/ns/msvc8/ns.vcproj
+++ b/dlls/ns/msvc8/ns.vcproj
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -144,7 +144,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/I "
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
diff --git a/dlls/nvault/msvc7/nvault.vcproj b/dlls/nvault/msvc7/nvault.vcproj
index 1c13cabe..5221111a 100755
--- a/dlls/nvault/msvc7/nvault.vcproj
+++ b/dlls/nvault/msvc7/nvault.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NVAULT_EXPORTS"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
@@ -70,7 +70,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NVAULT_EXPORTS"
 				RuntimeLibrary="4"
 				StructMemberAlignment="3"
diff --git a/dlls/nvault/msvc8/nvault.vcproj b/dlls/nvault/msvc8/nvault.vcproj
index 33137971..edda0229 100644
--- a/dlls/nvault/msvc8/nvault.vcproj
+++ b/dlls/nvault/msvc8/nvault.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;NVAULT_EXPORTS"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
@@ -123,7 +123,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NVAULT_EXPORTS"
 				RuntimeLibrary="0"
 				StructMemberAlignment="3"
diff --git a/dlls/regex/msvc7/regex.vcproj b/dlls/regex/msvc7/regex.vcproj
index 5ca17628..168a8bab 100755
--- a/dlls/regex/msvc7/regex.vcproj
+++ b/dlls/regex/msvc7/regex.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS;PCRE_STATIC"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS;PCRE_STATIC"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
diff --git a/dlls/regex/msvc8/regex.vcproj b/dlls/regex/msvc8/regex.vcproj
index 3a99351d..5be2ebd1 100644
--- a/dlls/regex/msvc8/regex.vcproj
+++ b/dlls/regex/msvc8/regex.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS;PCRE_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -123,7 +123,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REGEX_EXPORTS;PCRE_STATIC"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
diff --git a/dlls/sockets/msvc7/sockets.vcproj b/dlls/sockets/msvc7/sockets.vcproj
index ca9d4b91..772077a4 100755
--- a/dlls/sockets/msvc7/sockets.vcproj
+++ b/dlls/sockets/msvc7/sockets.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -70,7 +70,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
diff --git a/dlls/sockets/msvc8/sockets.vcproj b/dlls/sockets/msvc8/sockets.vcproj
index 9674c469..9de15a3d 100644
--- a/dlls/sockets/msvc8/sockets.vcproj
+++ b/dlls/sockets/msvc8/sockets.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOCKETS_EXPORTS"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
diff --git a/dlls/sqlite/msvc7/sqlite.vcproj b/dlls/sqlite/msvc7/sqlite.vcproj
index dd052abd..815fad45 100644
--- a/dlls/sqlite/msvc7/sqlite.vcproj
+++ b/dlls/sqlite/msvc7/sqlite.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;NO_TCL&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\sqlite-source&quot;;&quot;..\sqlitepp&quot;;&quot;..\thread&quot;;&quot;..\sdk&quot;;.."
+				AdditionalIncludeDirectories="..\;..\sdk;..\sqlite-source;..\sqlitepp;..\thread"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;sqlite_EXPORTS;SM_DEFAULT_THREADER"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -77,7 +77,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="&quot;..\sqlite-source&quot;;&quot;..\sqlitepp&quot;;&quot;..\thread&quot;;&quot;..\sdk&quot;;.."
+				AdditionalIncludeDirectories="..\;..\sdk;..\sqlite-source;..\sqlitepp;..\thread"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;sqlite_EXPORTS;SM_DEFAULT_THREADER"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
diff --git a/dlls/sqlite/msvc8/sqlite.vcproj b/dlls/sqlite/msvc8/sqlite.vcproj
index 196e68f6..05ecee0a 100644
--- a/dlls/sqlite/msvc8/sqlite.vcproj
+++ b/dlls/sqlite/msvc8/sqlite.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;NO_TCL&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\sqlite-source&quot;;&quot;..\sqlitepp&quot;;&quot;..\thread&quot;;&quot;..\sdk&quot;"
+				AdditionalIncludeDirectories="..\;..\sdk;..\sqlite-source;..\sqlitepp;..\thread"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;sqlite_EXPORTS;SM_DEFAULT_THREADER"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -129,7 +129,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="&quot;..\sqlite-source&quot;;&quot;..\sqlitepp&quot;;&quot;..\thread&quot;;&quot;..\sdk&quot;"
+				AdditionalIncludeDirectories="..\;..\sdk;..\sqlite-source;..\sqlitepp;..\thread"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;sqlite_EXPORTS;SM_DEFAULT_THREADER"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/dlls/sven/msvc7/svencoop.vcproj b/dlls/sven/msvc7/svencoop.vcproj
index 54a99c06..a8dbc730 100644
--- a/dlls/sven/msvc7/svencoop.vcproj
+++ b/dlls/sven/msvc7/svencoop.vcproj
@@ -23,7 +23,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SVENCOOP_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
@@ -89,7 +89,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SVENCOOP_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
diff --git a/dlls/sven/msvc8/svencoop.vcproj b/dlls/sven/msvc8/svencoop.vcproj
index 0fb7c763..2d5d2477 100644
--- a/dlls/sven/msvc8/svencoop.vcproj
+++ b/dlls/sven/msvc8/svencoop.vcproj
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SVENCOOP_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -144,7 +144,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SVENCOOP_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/dlls/tfcx/msvc7/tfcx.vcproj b/dlls/tfcx/msvc7/tfcx.vcproj
index c13a8803..5f9913ef 100755
--- a/dlls/tfcx/msvc7/tfcx.vcproj
+++ b/dlls/tfcx/msvc7/tfcx.vcproj
@@ -22,7 +22,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;tfcx_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
@@ -87,7 +87,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;tfcx_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
diff --git a/dlls/tfcx/msvc8/tfcx.vcproj b/dlls/tfcx/msvc8/tfcx.vcproj
index 1ee6a568..aeeadac2 100644
--- a/dlls/tfcx/msvc8/tfcx.vcproj
+++ b/dlls/tfcx/msvc8/tfcx.vcproj
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;tfcx_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -144,7 +144,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;tfcx_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/dlls/ts/tsfun/msvc7/tsfun.vcproj b/dlls/ts/tsfun/msvc7/tsfun.vcproj
index 1bdde589..fb9b1d41 100755
--- a/dlls/ts/tsfun/msvc7/tsfun.vcproj
+++ b/dlls/ts/tsfun/msvc7/tsfun.vcproj
@@ -20,6 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TSFUN_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -85,6 +86,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TSFUN_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
diff --git a/dlls/ts/tsfun/msvc8/tsfun.vcproj b/dlls/ts/tsfun/msvc8/tsfun.vcproj
index a3e33af1..a28c8975 100644
--- a/dlls/ts/tsfun/msvc8/tsfun.vcproj
+++ b/dlls/ts/tsfun/msvc8/tsfun.vcproj
@@ -48,6 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TSFUN_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -144,6 +145,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TSFUN_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/dlls/ts/tsx/msvc7/tsx.vcproj b/dlls/ts/tsx/msvc7/tsx.vcproj
index ad49adf3..e60ccffc 100755
--- a/dlls/ts/tsx/msvc7/tsx.vcproj
+++ b/dlls/ts/tsx/msvc7/tsx.vcproj
@@ -22,7 +22,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;tsx_amxx_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
@@ -87,7 +87,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="tsx_amxx_EXPORTS"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
diff --git a/dlls/ts/tsx/msvc8/tsx.vcproj b/dlls/ts/tsx/msvc8/tsx.vcproj
index 9ec01306..ab53a364 100644
--- a/dlls/ts/tsx/msvc8/tsx.vcproj
+++ b/dlls/ts/tsx/msvc8/tsx.vcproj
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;tsx_amxx_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -144,7 +144,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\sdk"
+				AdditionalIncludeDirectories="..\;..\sdk"
 				PreprocessorDefinitions="tsx_amxx_EXPORTS"
 				StringPooling="true"
 				RuntimeLibrary="0"