diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp
index e2429a1a..b877d52f 100644
--- a/r5dev/core/init.cpp
+++ b/r5dev/core/init.cpp
@@ -48,8 +48,8 @@
 #include "vgui/vgui_fpspanel.h"
 #include "vguimatsurface/MatSystemSurface.h"
 #include "client/vengineclient_impl.h"
-#endif // !DEDICATED
 #include "client/cdll_engine_int.h"
+#endif // !DEDICATED
 #ifndef CLIENT_DLL
 #include "engine/server/server.h"
 #include "server/persistence.h"
@@ -450,9 +450,8 @@ void DetourRegister() // Register detour classes to be searched and hooked.
 
 	// Client
 	REGISTER(HVEngineClient);
-#endif // !DEDICATED
-
 	REGISTER(VDll_Engine_Int);
+#endif // !DEDICATED
 
 #ifndef CLIENT_DLL
 
diff --git a/r5dev/launcher/IApplication.cpp b/r5dev/launcher/IApplication.cpp
index 5e2b049e..86efb8f1 100644
--- a/r5dev/launcher/IApplication.cpp
+++ b/r5dev/launcher/IApplication.cpp
@@ -17,16 +17,14 @@
 #include "engine/sys_engine.h"
 #include "engine/sys_dll2.h"
 #include "engine/host_cmd.h"
+#include "engine/enginetrace.h"
 #include "engine/server/sv_main.h"
 #ifndef CLIENT_DLL
 #include "server/vengineserver_impl.h"
-#endif // !CLIENT_DLL
-#include "client/cdll_engine_int.h"
-#include "engine/enginetrace.h"
-#ifndef CLIENT_DLL
 #include "game/server/gameinterface.h"
 #endif // !CLIENT_DLL
 #ifndef DEDICATED
+#include "client/cdll_engine_int.h"
 #include "game/client/cliententitylist.h"
 #include "gameui/IConsole.h"
 #include "windows/id3dx.h"
@@ -104,11 +102,6 @@ bool CModAppSystemGroup::Create(CModAppSystemGroup* pModAppSystemGroup)
 	{
 		cv->EnableDevCvars();
 	}
-	if (pModAppSystemGroup->IsServerOnly())
-	{
-		*g_pHLClient = nullptr;
-		*gHLClient = nullptr;
-	}
 
 	g_FrameTasks.push_back(std::move(g_TaskScheduler));
 	g_bAppSystemInit = true;
diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj
index c592efe8..a1198b30 100644
--- a/r5dev/vproj/dedicated.vcxproj
+++ b/r5dev/vproj/dedicated.vcxproj
@@ -126,7 +126,6 @@
   <ItemGroup>
     <ClInclude Include="..\appframework\engine_launcher_api.h" />
     <ClInclude Include="..\bsplib\bsplib.h" />
-    <ClInclude Include="..\client\cdll_engine_int.h" />
     <ClInclude Include="..\common\igameserverdata.h" />
     <ClInclude Include="..\common\netmessages.h" />
     <ClInclude Include="..\common\opcodes.h" />
@@ -524,7 +523,6 @@
   <ItemGroup>
     <ClCompile Include="..\bonesetup\bone_utils.cpp" />
     <ClCompile Include="..\bsplib\bsplib.cpp" />
-    <ClCompile Include="..\client\cdll_engine_int.cpp" />
     <ClCompile Include="..\common\netmessages.cpp" />
     <ClCompile Include="..\common\opcodes.cpp" />
     <ClCompile Include="..\core\dllmain.cpp" />
diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters
index aec969ac..ff7f7bcb 100644
--- a/r5dev/vproj/dedicated.vcxproj.filters
+++ b/r5dev/vproj/dedicated.vcxproj.filters
@@ -4,9 +4,6 @@
     <Filter Include="sdk">
       <UniqueIdentifier>{f97c7e9b-cc5e-4ec1-8c2a-19cf941b5c90}</UniqueIdentifier>
     </Filter>
-    <Filter Include="sdk\client">
-      <UniqueIdentifier>{c9b133cf-3943-49c9-abb0-c6f9e83a696c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="sdk\common">
       <UniqueIdentifier>{f280958c-f362-4918-a1f3-ca66f4bf1ec6}</UniqueIdentifier>
     </Filter>
@@ -660,9 +657,6 @@
     <ClInclude Include="..\networksystem\pylon.h">
       <Filter>sdk\networksystem</Filter>
     </ClInclude>
-    <ClInclude Include="..\client\cdll_engine_int.h">
-      <Filter>sdk\client</Filter>
-    </ClInclude>
     <ClInclude Include="..\game\server\fairfight_impl.h">
       <Filter>sdk\game\server</Filter>
     </ClInclude>
@@ -1754,9 +1748,6 @@
     <ClCompile Include="..\game\server\baseentity.cpp">
       <Filter>sdk\game\server</Filter>
     </ClCompile>
-    <ClCompile Include="..\client\cdll_engine_int.cpp">
-      <Filter>sdk\client</Filter>
-    </ClCompile>
     <ClCompile Include="..\common\netmessages.cpp">
       <Filter>sdk\common</Filter>
     </ClCompile>