diff --git a/zone/inventory.cpp b/zone/inventory.cpp
index d290658d0..6b7a0b297 100644
--- a/zone/inventory.cpp
+++ b/zone/inventory.cpp
@@ -22,6 +22,7 @@
 #include "quest_parser_collection.h"
 #include "worldserver.h"
 #include "zonedb.h"
+
 extern WorldServer worldserver;
 
 // @merth: this needs to be touched up
diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index 8bc696888..1f520ed88 100644
--- a/zone/zonedb.cpp
+++ b/zone/zonedb.cpp
@@ -1,21 +1,16 @@
 
-#include "zonedb.h"
-#include "../common/item.h"
-#include "../common/string_util.h"
 #include "../common/extprofile.h"
-#include "../common/guilds.h"
+#include "../common/item.h"
 #include "../common/rulesys.h"
-#include "../common/rdtsc.h"
-#include "zone.h"
-#include "corpse.h"
+#include "../common/string_util.h"
 #include "client.h"
-#include "merc.h"
+#include "corpse.h"
 #include "groups.h"
-#include "raids.h"
-#include <iostream>
-#include <string>
-#include <sstream>
+#include "merc.h"
+#include "zone.h"
+#include "zonedb.h"
 #include <ctime>
+#include <iostream>
 
 extern Zone* zone;
 
diff --git a/zone/zonedb.h b/zone/zonedb.h
index 3f8719946..5adc893ff 100644
--- a/zone/zonedb.h
+++ b/zone/zonedb.h
@@ -3,10 +3,24 @@
 
 #include "../common/shareddb.h"
 #include "../common/eq_packet_structs.h"
-#include "../common/loottable.h"
-#include "zonedump.h"
 #include "../common/faction.h"
-#include <limits>
+
+class Client;
+class Corpse;
+class Merc;
+class NPC;
+class Petition;
+class Spawn2;
+class SpawnGroupList;
+class ItemInst;
+struct CharacterEventLog_Struct;
+struct Door;
+struct ExtendedProfile_Struct;
+struct NPCType;
+struct PlayerCorpse_Struct;
+struct ZonePoint;
+struct npcDecayTimes_Struct;
+template <class TYPE> class LinkedList;
 
 //#include "doors.h"
 
@@ -201,12 +215,6 @@ struct ClientMercEntry {
 	uint32 npcid;
 };
 
-class ItemInst;
-struct FactionMods;
-struct FactionValue;
-struct LootTable_Struct;
-
-
 class ZoneDatabase : public SharedDatabase {
 	typedef std::list<ServerLootItem_Struct*> ItemList;
 public: