diff --git a/source/src/Makefile b/source/src/Makefile
index 614c60e3..b31284b8 100644
--- a/source/src/Makefile
+++ b/source/src/Makefile
@@ -187,6 +187,7 @@ depend:
 	makedepend -Y -I. -Ibot $(subst .o,.cpp,$(CLIENT_OBJS))
 	makedepend -a -o.h.gch -Y -I. -Ibot $(subst .h.gch,.h,$(CLIENT_PCH))
 	makedepend -a -o-standalone.o -Y -I. -Ibot $(subst -standalone.o,.cpp,$(SERVER_OBJS))
+	makedepend -a -o-standalone.o -Y -I. $(subst -standalone.o,.cpp,$(filter-out $(SERVER_OBJS), $(MASTER_OBJS)))
 
 # DO NOT DELETE
 
@@ -369,3 +370,10 @@ tools-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h
 tools-standalone.o: sound.h weapon.h entity.h world.h i18n.h command.h vote.h
 tools-standalone.o: console.h protos.h
 wizard-standalone.o: platform.h
+
+command-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h
+command-standalone.o: sound.h weapon.h entity.h world.h i18n.h command.h
+command-standalone.o: vote.h console.h protos.h
+master-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h
+master-standalone.o: sound.h weapon.h entity.h world.h i18n.h command.h
+master-standalone.o: vote.h console.h protos.h
diff --git a/source/src/serverms.cpp b/source/src/serverms.cpp
index 18c06e28..fd3a20f4 100644
--- a/source/src/serverms.cpp
+++ b/source/src/serverms.cpp
@@ -1,7 +1,6 @@
 // all server side masterserver and pinging functionality
 
 #include "cube.h"
-#include "cmodserver.h"
 
 #ifdef STANDALONE
 bool resolverwait(const char *name, ENetAddress *address)