diff --git a/zone/tasks.cpp b/zone/tasks.cpp
index 924d3770b..f8f3ba9b2 100644
--- a/zone/tasks.cpp
+++ b/zone/tasks.cpp
@@ -21,20 +21,21 @@ Copyright (C) 2001-2008 EQEMu Development Team (http://eqemulator.net)
 #include "tasks.h"
 
 #include <string.h>
-#include <stdlib.h>
 
 #ifdef _WINDOWS
 #define strcasecmp _stricmp
 #endif
 
 #include "../common/misc_functions.h"
-#include "../common/string_util.h"
 #include "../common/rulesys.h"
-#include "masterentity.h"
-#include "../common/features.h"
-#include "quest_parser_collection.h"
+#include "../common/string_util.h"
+
+#include "client.h"
+#include "entity.h"
 #include "mob.h"
+
 #include "queryserv.h"
+#include "quest_parser_collection.h"
 
 extern QueryServ* QServ;
 
diff --git a/zone/tasks.h b/zone/tasks.h
index d92d6d17f..6298fcb5c 100644
--- a/zone/tasks.h
+++ b/zone/tasks.h
@@ -21,9 +21,8 @@ Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net)
 #define TASKS_H
 
 #include "../common/types.h"
-#include "mob.h"
+
 #include <vector>
-#include <queue>
 
 #define MAXTASKS 10000
 #define MAXTASKSETS 1000
@@ -44,6 +43,7 @@ Copyright (C) 2001-2004 EQEMu Development Team (http://eqemulator.net)
 #define RELOADTASKSETS		3
 
 class Client;
+class Mob;
 
 struct TaskGoalList_Struct {
 	int ListID;