diff --git a/zone/raids.cpp b/zone/raids.cpp
index d1e8db464..31d2b63c9 100644
--- a/zone/raids.cpp
+++ b/zone/raids.cpp
@@ -15,13 +15,17 @@
 	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 "masterentity.h"
-#include "npc_ai.h"
-#include "../common/packet_functions.h"
-#include "../common/packet_dump.h"
+
 #include "../common/string_util.h"
+
+#include "client.h"
+#include "entity.h"
+#include "groups.h"
+#include "mob.h"
+#include "raids.h"
+
 #include "worldserver.h"
+
 extern EntityList entity_list;
 extern WorldServer worldserver;
 
diff --git a/zone/raids.h b/zone/raids.h
index 7c3561cd2..ca5d0ff9b 100644
--- a/zone/raids.h
+++ b/zone/raids.h
@@ -19,14 +19,11 @@
 #define RAIDS_H
 
 #include "../common/types.h"
-#include "../common/linked_list.h"
 #include "groups.h"
-#include <vector>
-#include <string>
-#include <queue>
 
 class Client;
 class EQApplicationPacket;
+class Mob;
 
 enum {	//raid packet types:
 	raidAdd = 0,