diff --git a/zone/pets.cpp b/zone/pets.cpp
index 5c2bda36d..5c1f4e0cd 100644
--- a/zone/pets.cpp
+++ b/zone/pets.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "../common/debug.h"
-#include "../common/misc_functions.h"
 #include "../common/spdat.h"
 #include "../common/string_util.h"
 #include "../common/types.h"
@@ -27,7 +26,6 @@
 #include "mob.h"
 
 #include "pets.h"
-#include "worldserver.h"
 #include "zonedb.h"
 
 #ifndef WIN32
diff --git a/zone/pets.h b/zone/pets.h
index 14e5cb722..db78accea 100644
--- a/zone/pets.h
+++ b/zone/pets.h
@@ -1,28 +1,31 @@
 #ifndef PETS_H
 #define PETS_H
 
-	#define PET_BACKOFF			1
-	#define PET_GETLOST			2
-	#define PET_HEALTHREPORT	4
-	#define PET_GUARDHERE		5
-	#define PET_GUARDME			6
-	#define PET_ATTACK			7
-	#define PET_FOLLOWME		8
-	#define PET_SITDOWN			9
-	#define PET_STANDUP			10
-	#define PET_TAUNT			11
-	#define PET_HOLD			12
-	#define PET_NOTAUNT			14
-	#define PET_LEADER			16
-	#define	PET_SLUMBER			17
-	#define	PET_NOCAST			18
-	#define	PET_FOCUS			19
-	#define	PET_FOCUS_ON		25
-	#define	PET_FOCUS_OFF		26
-	#define PET_HOLD_ON			27
-	#define PET_HOLD_OFF		28
+#define PET_BACKOFF			1
+#define PET_GETLOST			2
+#define PET_HEALTHREPORT	4
+#define PET_GUARDHERE		5
+#define PET_GUARDME			6
+#define PET_ATTACK			7
+#define PET_FOLLOWME		8
+#define PET_SITDOWN			9
+#define PET_STANDUP			10
+#define PET_TAUNT			11
+#define PET_HOLD			12
+#define PET_NOTAUNT			14
+#define PET_LEADER			16
+#define	PET_SLUMBER			17
+#define	PET_NOCAST			18
+#define	PET_FOCUS			19
+#define	PET_FOCUS_ON		25
+#define	PET_FOCUS_OFF		26
+#define PET_HOLD_ON			27
+#define PET_HOLD_OFF		28
 
-	class Pet : public NPC {
+class Mob;
+struct NPCType;
+
+class Pet : public NPC {
 	public:
 		Pet(NPCType *type_data, Mob *owner, PetType type, uint16 spell_id, int16 power);