diff --git a/r5dev/engine/host_state.cpp b/r5dev/engine/host_state.cpp
index a1c952ab..f238142a 100644
--- a/r5dev/engine/host_state.cpp
+++ b/r5dev/engine/host_state.cpp
@@ -41,7 +41,9 @@
 #include "client/vengineclient_impl.h"
 #endif // DEDICATED
 #include "networksystem/pylon.h"
+#ifndef CLIENT_DLL
 #include "networksystem/bansystem.h"
+#endif // !CLIENT_DLL
 #include "networksystem/listmanager.h"
 #include "public/edict.h"
 #ifndef CLIENT_DLL
@@ -182,7 +184,9 @@ FORCEINLINE void CHostState::Init(void)
 FORCEINLINE void CHostState::Setup(void) 
 {
 	g_pHostState->LoadConfig();
+#ifndef CLIENT_DLL
 	g_pBanSystem->Load();
+#endif // !CLIENT_DLL
 	g_pConVar->PurgeHostNames();
 
 	net_usesocketsforloopback->SetValue(1);
diff --git a/r5dev/tier1/cmd.cpp b/r5dev/tier1/cmd.cpp
index a4e944a3..c68d9dd2 100644
--- a/r5dev/tier1/cmd.cpp
+++ b/r5dev/tier1/cmd.cpp
@@ -392,7 +392,9 @@ void ConCommand::InitShipped(void)
 #endif // !DEDICATED
 
 	help->m_fnCommandCallback = CVHelp_f;
+#ifndef CLIENT_DLL
 	changelevel->m_fnCommandCallback = Host_Changelevel_f;
+#endif // !CLIENT_DLL
 	convar_list->m_fnCommandCallback = CVList_f;
 	convar_differences->m_fnCommandCallback = CVDiff_f;
 	convar_findByFlags->m_fnCommandCallback = CVFlag_f;
diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp
index 552a7ebd..e263a85e 100644
--- a/r5dev/vstdlib/callback.cpp
+++ b/r5dev/vstdlib/callback.cpp
@@ -19,6 +19,9 @@
 #include "engine/net.h"
 #include "engine/host_cmd.h"
 #include "engine/host_state.h"
+#ifndef CLIENT_DLL
+#include "engine/server/server.h"
+#endif // !CLIENT_DLL
 #ifndef DEDICATED
 #include "client/cdll_engine_int.h"
 #endif // !DEDICATED
@@ -28,6 +31,7 @@
 #include "filesystem/filesystem.h"
 #include "vpklib/packedstore.h"
 #include "squirrel/sqscript.h"
+#include "ebisusdk/EbisuSDK.h"
 #ifndef DEDICATED
 #include "gameui/IBrowser.h"
 #include "gameui/IConsole.h"
@@ -47,8 +51,6 @@
 #ifndef DEDICATED
 #include "game/client/view.h"
 #endif // !DEDICATED
-#include <ebisusdk/EbisuSDK.h>
-#include <engine/server/server.h>
 
 
 /*