From b733e96aea39531145b21e78dcb43dc644805241 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Mon, 15 Dec 2014 17:34:19 -0600
Subject: [PATCH] masterentity.h header order cleanup hate_list.cpp & .h header
 cleanup and forward declare

---
 zone/hate_list.cpp  | 17 ++++++++++-------
 zone/hate_list.h    |  6 ++++++
 zone/masterentity.h | 14 +++++++-------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/zone/hate_list.cpp b/zone/hate_list.cpp
index 2e64f092f..c8c1308aa 100644
--- a/zone/hate_list.cpp
+++ b/zone/hate_list.cpp
@@ -16,19 +16,22 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/debug.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <math.h>
-#include <list>
-#include "masterentity.h"
+#include "client.h"
+#include "entity.h"
+#include "groups.h"
+#include "mob.h"
+#include "raids.h"
+
 #include "../common/rulesys.h"
-#include "../common/misc_functions.h"
+
 #include "hate_list.h"
 #include "quest_parser_collection.h"
 #include "zone.h"
 #include "water_map.h"
 
+#include <stdlib.h>
+#include <list>
+
 extern Zone *zone;
 
 HateList::HateList()
diff --git a/zone/hate_list.h b/zone/hate_list.h
index 4ea8d0bd6..97f16f9d7 100644
--- a/zone/hate_list.h
+++ b/zone/hate_list.h
@@ -19,6 +19,12 @@
 #ifndef HATELIST_H
 #define HATELIST_H
 
+class Client;
+class Group;
+class Mob;
+class Raid;
+struct ExtraAttackOptions;
+
 struct tHateEntry
 {
 	Mob *ent;
diff --git a/zone/masterentity.h b/zone/masterentity.h
index 8c238ed34..72cf0b162 100644
--- a/zone/masterentity.h
+++ b/zone/masterentity.h
@@ -1,17 +1,17 @@
 //Trumpcard: EntityLists are composed of multiple list types. This is the
 //master that includes all types. When entity.h is required, many of these are as well.
 
-#include "entity.h"
-#include "groups.h"
-#include "raids.h"
+#include "beacon.h"
 #include "client.h"
-#include "object.h"
 #include "corpse.h"
 #include "doors.h"
-#include "mob.h"
-#include "trap.h"
-#include "beacon.h"
+#include "entity.h"
+#include "groups.h"
 #include "horse.h"
+#include "mob.h"
+#include "object.h"
+#include "raids.h"
+#include "trap.h"
 
 #ifdef BOTS
 #include "bot.h"