diff --git a/zone/horse.cpp b/zone/horse.cpp
index df7c7e7c1..9a4e5240c 100644
--- a/zone/horse.cpp
+++ b/zone/horse.cpp
@@ -17,13 +17,13 @@
 */
 
 #include "../common/debug.h"
-#include "masterentity.h"
-#include "../common/item.h"
 #include "../common/linked_list.h"
 #include "../common/string_util.h"
-#include <math.h>
-#include <assert.h>
-#include "worldserver.h"
+
+#include "client.h"
+#include "entity.h"
+#include "horse.h"
+#include "mob.h"
 
 std::map<uint16, const NPCType *> Horse::horse_types;
 LinkedList<NPCType *> horses_auto_delete;
diff --git a/zone/horse.h b/zone/horse.h
index dd58007eb..0965a2b69 100644
--- a/zone/horse.h
+++ b/zone/horse.h
@@ -18,11 +18,15 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
 #ifndef HORSES_H
 #define HORSES_H
 
-#include "../common/debug.h"
 #include "npc.h"
 
 #include <map>
 
+class Client;
+class Mob;
+struct NPCType;
+struct NewSpawn_Struct;
+
 class Horse : public NPC {
 public:
 	Horse(Client *owner, uint16 spell_id, float x, float y, float z, float heading);
diff --git a/zone/loottables.cpp b/zone/loottables.cpp
index ec2960579..b6a2c8092 100644
--- a/zone/loottables.cpp
+++ b/zone/loottables.cpp
@@ -15,15 +15,20 @@
 	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/debug.h"
-#include <stdio.h>
-#include <iostream>
-#include <stdlib.h>
-#include "npc.h"
-#include "masterentity.h"
-#include "zonedb.h"
 #include "../common/loottable.h"
 #include "../common/misc_functions.h"
+
+#include "client.h"
+#include "entity.h"
+#include "mob.h"
+#include "npc.h"
+#include "zonedb.h"
+
+#include <iostream>
+#include <stdlib.h>
+
 #ifdef _WINDOWS
 #define snprintf	_snprintf
 #endif
diff --git a/zone/map.cpp b/zone/map.cpp
index a023cc125..b6f4de2b5 100644
--- a/zone/map.cpp
+++ b/zone/map.cpp
@@ -1,15 +1,15 @@
 #include "../common/debug.h"
 #include "../common/misc_functions.h"
+
 #include "map.h"
 #include "raycast_mesh.h"
 #include "zone.h"
-#include <stdint.h>
+
 #include <algorithm>
-#include <locale>
-#include <vector>
+#include <map>
 #include <memory>
 #include <tuple>
-#include <map>
+#include <vector>
 #include <zlib.h>
 
 uint32 InflateData(const char* buffer, uint32 len, char* out_buffer, uint32 out_len_max) {
diff --git a/zone/map.h b/zone/map.h
index 224e30c73..dc03d8ac0 100644
--- a/zone/map.h
+++ b/zone/map.h
@@ -23,7 +23,6 @@
 #define ZONE_MAP_H
 
 #include <stdio.h>
-#include <string>
 
 #define BEST_Z_INVALID -99999
 
diff --git a/zone/masterentity.h b/zone/masterentity.h
index 72cf0b162..8c238ed34 100644
--- a/zone/masterentity.h
+++ b/zone/masterentity.h
@@ -1,17 +1,17 @@
 //Trumpcard: EntityLists are composed of multiple list types. This is the
 //master that includes all types. When entity.h is required, many of these are as well.
 
-#include "beacon.h"
-#include "client.h"
-#include "corpse.h"
-#include "doors.h"
 #include "entity.h"
 #include "groups.h"
-#include "horse.h"
-#include "mob.h"
-#include "object.h"
 #include "raids.h"
+#include "client.h"
+#include "object.h"
+#include "corpse.h"
+#include "doors.h"
+#include "mob.h"
 #include "trap.h"
+#include "beacon.h"
+#include "horse.h"
 
 #ifdef BOTS
 #include "bot.h"
diff --git a/zone/merc.h b/zone/merc.h
index 167fe70d6..f604d485c 100644
--- a/zone/merc.h
+++ b/zone/merc.h
@@ -1,9 +1,18 @@
 #ifndef MERC_H
 #define MERC_H
-#include "mob.h"
-#include "zonedb.h"
+
 #include "npc.h"
 
+class Client;
+class Corpse;
+class Group;
+class Mob;
+class Raid;
+struct Item_Struct;
+struct MercTemplate;
+struct NPCType;
+struct NewSpawn_Struct;
+
 #define MERC_DEBUG 0
 #define MAXMERCS 1
 #define TANK 1