diff --git a/AMBuildScript b/AMBuildScript
index 6f6b3b24..2f37874d 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -277,7 +277,7 @@ class SM:
 			else:
 				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
 			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
-			if sdk == 'ep2v':
+			if sdk in ['ep2v', 'css']:
 				libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so']
 				for lib in libs:
 					link = os.path.join(workFolder, lib)
@@ -286,7 +286,7 @@ class SM:
 						os.lstat(link)
 					except:
 						job.AddCommand(SymlinkCommand(link, target))
-			elif sdk in ['css', 'l4d', 'l4d2', 'csgo']:
+			elif sdk in ['l4d', 'l4d2', 'csgo']:
 				libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']
 				if sdk == 'csgo':
 					libs.append('interfaces_i486.a')
@@ -388,10 +388,10 @@ class SM:
 		if not noLink:
 			if AMBuild.target['platform'] == 'linux':
 				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
-				if sdk == 'ep2v':
+				if sdk in ['ep2v', 'css']:
 					compiler['POSTLINKFLAGS'][0:0] = ['libtier0_srv.so']
 					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib_srv.so']
-				elif sdk in ['css', 'l4d', 'l4d2', 'csgo']:
+				elif sdk in ['l4d', 'l4d2', 'csgo']:
 					compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
 					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
 				else:
diff --git a/core/HalfLife2.cpp b/core/HalfLife2.cpp
index 34a37c7e..8e7deccf 100644
--- a/core/HalfLife2.cpp
+++ b/core/HalfLife2.cpp
@@ -56,10 +56,10 @@ typedef ICommandLine *(*FakeGetCommandLine)();
 #define TIER0_NAME			"libtier0.dylib"
 #define VSTDLIB_NAME		"libvstdlib.dylib"
 #elif defined __linux__
-#if SOURCE_ENGINE == SE_ORANGEBOXVALVE
+#if SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
 #define TIER0_NAME			"libtier0_srv.so"
 #define VSTDLIB_NAME		"libvstdlib_srv.so"
-#elif SOURCE_ENGINE >= SE_CSS
+#elif SOURCE_ENGINE >= SE_LEFT4DEAD
 #define TIER0_NAME			"libtier0.so"
 #define VSTDLIB_NAME		"libvstdlib.so"
 #else
diff --git a/core/Makefile b/core/Makefile
index a7a8064b..08f9dc8a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -131,7 +131,7 @@ ifneq (,$(filter original orangebox left4dead,$(ENGINE)))
 	LIB_SUFFIX = _i486.$(LIB_EXT)
 else
 	LIB_PREFIX = lib
-	ifeq "$(ENGINE)" "orangeboxvalve"
+	ifneq (,$(filter orangeboxvalve css,$(ENGINE)))
 		ifneq "$(OS)" "Darwin"
 			LIB_SUFFIX = _srv.$(LIB_EXT)
 		else
diff --git a/extensions/sdktools/vglobals.cpp b/extensions/sdktools/vglobals.cpp
index 8ab8aebd..5bdae558 100644
--- a/extensions/sdktools/vglobals.cpp
+++ b/extensions/sdktools/vglobals.cpp
@@ -127,22 +127,14 @@ void GetIServer()
 
 #if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11
 	/* Get the CreateFakeClient function pointer */
-#if SOURCE_ENGINE == SE_CSS
-	if (!(vfunc=SH_GET_ORIG_VFNPTR_ENTRY(engine, &IVEngineServer::CreateFakeClientEx)))
-#else
 	if (!(vfunc=SH_GET_ORIG_VFNPTR_ENTRY(engine, &IVEngineServer::CreateFakeClient)))
-#endif
 	{
 		return;
 	}
 #else
 	/* Get the interface manually */
 	SourceHook::MemFuncInfo info = {true, -1, 0, 0};
-#if SOURCE_ENGINE == SE_CSS
-	SourceHook::GetFuncInfo(&IVEngineServer::CreateFakeClientEx, info);
-#else
 	SourceHook::GetFuncInfo(&IVEngineServer::CreateFakeClient, info);
-#endif
 
 	vfunc = enginePatch->GetOrigFunc(info.vtbloffs, info.vtblindex);
 	if (!vfunc)