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);