diff --git a/zone/command.cpp b/zone/command.cpp
index b2914cf46..453c58ec9 100644
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -50,11 +50,16 @@
 #include "../common/rulesys.h"
 #include "../common/serverinfo.h"
 #include "../common/string_util.h"
+
 #include "client_logs.h"
+#include "command.h"
 #include "guild_mgr.h"
 #include "map.h"
 #include "pathing.h"
+#include "qglobals.h"
 #include "queryserv.h"
+#include "quest_parser_collection.h"
+#include "string_ids.h"
 #include "titles.h"
 #include "water_map.h"
 #include "worldserver.h"
@@ -64,11 +69,7 @@ extern WorldServer worldserver;
 extern TaskManager *taskmanager;
 void CatchSignal(int sig_num);
 
-#include "quest_parser_collection.h"
 
-#include "string_ids.h"
-#include "command.h"
-#include "qglobals.h"
 
 //struct cl_struct *commandlist;	// the actual linked list of commands
 int commandcount;								// how many commands we have
diff --git a/zone/command.h b/zone/command.h
index ea710482b..72ee5c06a 100644
--- a/zone/command.h
+++ b/zone/command.h
@@ -23,9 +23,7 @@
 class Client;
 class Seperator;
 
-#include "../common/seperator.h"
-#include "../common/eq_stream.h"
-#include "client.h"
+#include "../common/types.h"
 
 #define	COMMAND_CHAR	'#'
 #define CMDALIASES	5