diff --git a/zone/beacon.cpp b/zone/beacon.cpp
index 9b88dd524..f21a3b512 100644
--- a/zone/beacon.cpp
+++ b/zone/beacon.cpp
@@ -23,7 +23,7 @@ target to center around.
 
 */
 
-#include "../common/debug.h"
+class Zone;
 
 #ifdef _WINDOWS
     #define snprintf	_snprintf
@@ -32,7 +32,17 @@ target to center around.
     #define strcasecmp	_stricmp
 #endif
 
-#include "masterentity.h"
+#include "../common/races.h"
+#include "beacon.h"
+#include "entity.h"
+#include "mob.h" 
+
+
+#ifdef BOTS
+#include "bot.h"
+#endif
+
+
 #include "../common/spdat.h"
 
 extern EntityList entity_list;
diff --git a/zone/beacon.h b/zone/beacon.h
index 0aad56e21..f7845e91d 100644
--- a/zone/beacon.h
+++ b/zone/beacon.h
@@ -19,11 +19,14 @@
 #ifndef BEACON_H
 #define BEACON_H
 
-#include "entity.h"
 #include "mob.h"
 #include "../common/types.h"
 #include "../common/timer.h"
 
+class Group;
+class Raid;
+struct ExtraAttackOptions;
+
 class Beacon : public Mob
 {
 public: