diff --git a/zone/loottables.cpp b/zone/loottables.cpp
index 0c66778bd..121dad8c5 100644
--- a/zone/loottables.cpp
+++ b/zone/loottables.cpp
@@ -22,6 +22,7 @@
 #include "npc.h"
 #include "masterentity.h"
 #include "zonedb.h"
+#include "../common/loottable.h"
 #include "../common/misc_functions.h"
 #ifdef _WINDOWS
 #define snprintf	_snprintf
diff --git a/zone/npc.cpp b/zone/npc.cpp
index eae42b670..b8d838d6d 100644
--- a/zone/npc.cpp
+++ b/zone/npc.cpp
@@ -15,15 +15,34 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
+
+#include "../common/bodytypes.h"
+#include "../common/classes.h"
 #include "../common/debug.h"
-#include <iostream>
-#include <string>
-#include <cctype>
-#include <math.h>
-#include "../common/moremath.h"
-#include <stdio.h>
-#include "../common/packet_dump_file.h"
+#include "../common/misc_functions.h"
+#include "../common/rulesys.h"
+#include "../common/seperator.h"
+#include "../common/spdat.h"
+#include "../common/string_util.h"
+#include "../common/clientversions.h"
+#include "../common/features.h"    //
+#include "../common/item.h"        //
+#include "../common/item_struct.h"        //
+#include "../common/linked_list.h"  //
+#include "../common/servertalk.h"
+
+#include "aa.h"
+#include "client.h"
+#include "entity.h"
+#include "npc.h"
+#include "string_ids.h"
+#include "spawn2.h"
 #include "zone.h"
+
+#include <cctype>
+#include <stdio.h>
+#include <string>
+
 #ifdef _WINDOWS
 #define snprintf	_snprintf
 #define strncasecmp	_strnicmp
@@ -33,27 +52,10 @@
 #include <pthread.h>
 #endif
 
-#include "npc.h"
-#include "map.h"
-#include "entity.h"
-#include "masterentity.h"
-#include "../common/spdat.h"
-#include "../common/bodytypes.h"
-#include "spawngroup.h"
-#include "../common/misc_functions.h"
-#include "../common/string_util.h"
-#include "../common/rulesys.h"
-#include "string_ids.h"
-
-//#define SPELLQUEUE //Use only if you want to be spammed by spell testing
-
-
 extern Zone* zone;
 extern volatile bool ZoneLoaded;
 extern EntityList entity_list;
 
-#include "quest_parser_collection.h"
-
 NPC::NPC(const NPCType* d, Spawn2* in_respawn, float x, float y, float z, float heading, int iflymode, bool IsCorpse)
 : Mob(d->name,
 		d->lastname,
diff --git a/zone/npc.h b/zone/npc.h
index a88ae9176..cccf3ecf0 100644
--- a/zone/npc.h
+++ b/zone/npc.h
@@ -18,20 +18,17 @@
 #ifndef NPC_H
 #define NPC_H
 
-class NPC;
-#include "zonedb.h"
-#include "mob.h"
-//#include "spawn.h"
-
-#include <list>
-#include <deque>
-
-#include "spawn2.h"
-#include "../common/loottable.h"
-#include "zonedump.h"
-#include "qglobals.h"
 #include "../common/rulesys.h"
 
+#include "mob.h"
+#include "qglobals.h"
+#include "zonedb.h"
+#include "zonedump.h"
+
+#include <deque>
+#include <list>
+
+
 #ifdef _WINDOWS
 	#define M_PI	3.141592
 #endif
@@ -88,8 +85,12 @@ struct AISpellsVar_Struct {
 	uint8	idle_beneficial_chance;
 }; 
 
-
 class AA_SwarmPetInfo;
+class Client;
+class Group;
+class Raid;
+class Spawn2;
+struct Item_Struct;
 
 class NPC : public Mob
 {