diff --git a/sourcemm/Makefile.ep2 b/sourcemm/Makefile.ep2
index 3f94b77..9c59210 100644
--- a/sourcemm/Makefile.ep2
+++ b/sourcemm/Makefile.ep2
@@ -21,7 +21,7 @@ OBJECTS = metamod.cpp metamod_util.cpp metamod_console.cpp metamod_oslink.cpp me
 
 LINK = $(HL2SDK)/linux_sdk/tier1_i486.a vstdlib_i486.so tier0_i486.so -static-libgcc
 
-INCLUDE = -I. -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
+INCLUDE = -I. -I$(HL2PUB) -I$(HL2PUB)/game/server -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
           -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SMM_ROOT) -I$(SMM_ROOT)/sourcehook
 
 ifeq "$(DEBUG)" "true"
diff --git a/sourcemm/episode2/msvc8/sourcemm.vcproj b/sourcemm/episode2/msvc8/sourcemm.vcproj
index bf6914f..5a3ae02 100644
--- a/sourcemm/episode2/msvc8/sourcemm.vcproj
+++ b/sourcemm/episode2/msvc8/sourcemm.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;$(HL2SDKOB)\public;$(HL2SDKOB)\public\dlls;$(HL2SDKOB)\public\engine;$(HL2SDKOB)\public\tier0;$(HL2SDKOB)\public\tier1;$(HL2SDKOB)\public\vstdlib;$(HL2SDKOB)\tier1"
+				AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;;&quot;$(HL2SDKOB)\tier1&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier2.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
+				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
 				OutputFile="$(OutDir)/server.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib"
@@ -127,7 +127,7 @@
 				Optimization="3"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;$(HL2SDKOB)\public;$(HL2SDKOB)\public\dlls;$(HL2SDKOB)\public\engine;$(HL2SDKOB)\public\tier0;$(HL2SDKOB)\public\tier1;$(HL2SDKOB)\public\vstdlib;$(HL2SDKOB)\tier1"
+				AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;;&quot;$(HL2SDKOB)\tier1&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -150,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier2.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
+				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
 				OutputFile="$(OutDir)/server.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib"
diff --git a/sourcemm/episode2/provider_ep2.cpp b/sourcemm/episode2/provider_ep2.cpp
index a6b02f1..6196f5e 100644
--- a/sourcemm/episode2/provider_ep2.cpp
+++ b/sourcemm/episode2/provider_ep2.cpp
@@ -26,10 +26,6 @@
  * Version: $Id$
  */
 
-#if defined _DEBUG
-#define DEBUG2
-#undef _DEBUG
-#endif
 #include "../metamod_oslink.h"
 #include <sourcehook.h>
 #include <convar.h>
@@ -44,10 +40,6 @@
 #include "metamod_console.h"
 #include "vsp_listener.h"
 #include <filesystem.h>
-#if defined DEBUG2
-#undef DEBUG2
-#define _DEBUG
-#endif
 
 /* Types */
 typedef void (*CONPRINTF_FUNC)(const char *, ...);
diff --git a/sourcemm/episode2/vsp_listener.cpp b/sourcemm/episode2/vsp_listener.cpp
index 137234c..263384c 100644
--- a/sourcemm/episode2/vsp_listener.cpp
+++ b/sourcemm/episode2/vsp_listener.cpp
@@ -25,22 +25,14 @@
  * Version: $Id$
  */
 
-#if defined _DEBUG
-#define DEBUG2
-#undef _DEBUG
-#endif
 #include "../metamod_oslink.h"
+#include "metamod.h"
 #include <sourcehook.h>
 #include <convar.h>
 #include <eiface.h>
 #include "iplayerinfo.h"
-#if defined DEBUG2
-#undef DEBUG2
-#define _DEBUG
-#endif
 #include "vsp_listener.h"
 #include "svn_version.h"
-#include "metamod.h"
 #include "provider_ep2.h"
 
 SH_DECL_HOOK1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
diff --git a/sourcemm/metamod.cpp b/sourcemm/metamod.cpp
index 4d58d06..9d8cf0d 100644
--- a/sourcemm/metamod.cpp
+++ b/sourcemm/metamod.cpp
@@ -26,21 +26,13 @@
  */
 
 #include "metamod_oslink.h"
-#if defined _DEBUG
-#define DEBUG2
-#undef _DEBUG
-#endif
+#include "metamod.h"
 #include <interface.h>
 #include <eiface.h>
-#include "metamod.h"
 #include "metamod_provider.h"
 #include "metamod_plugins.h"
 #include "metamod_util.h"
 #include "metamod_console.h"
-#if defined DEBUG2
-#undef DEBUG2
-#define _DEBUG
-#endif
 
 using namespace SourceMM;
 using namespace SourceHook;
diff --git a/sourcemm/metamod_console.cpp b/sourcemm/metamod_console.cpp
index 3b829ba..13adfd1 100644
--- a/sourcemm/metamod_console.cpp
+++ b/sourcemm/metamod_console.cpp
@@ -26,19 +26,11 @@
  */
 
 #include "metamod_oslink.h"
-#if defined _DEBUG
-#define DEBUG2
-#undef _DEBUG
-#endif
 #include <ctype.h>
 #include "metamod.h"
 #include "metamod_util.h"
 #include "metamod_console.h"
 #include "metamod_plugins.h"
-#if defined DEBUG2
-#undef DEBUG2
-#define _DEBUG
-#endif
 
 using namespace SourceMM;
 using namespace SourceHook;
diff --git a/sourcemm/metamod_plugins.cpp b/sourcemm/metamod_plugins.cpp
index f6e32fa..b5881b8 100644
--- a/sourcemm/metamod_plugins.cpp
+++ b/sourcemm/metamod_plugins.cpp
@@ -26,17 +26,9 @@
  */
 
 #include "metamod_oslink.h"
-#if defined _DEBUG
-#define DEBUG2
-#undef _DEBUG
-#endif
 #include "metamod.h"
 #include "metamod_plugins.h"
 #include "metamod_util.h"
-#if defined DEBUG2
-#undef DEBUG2
-#define _DEBUG
-#endif
 
 /** 
  * @brief Implements functions from CPlugin.h