From 782b6fee9429e4e09f8302bf67ab4b3e42789fe3 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Mon, 15 Dec 2014 17:54:23 -0600
Subject: [PATCH] merc.cpp header include cleanup

---
 zone/merc.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/zone/merc.cpp b/zone/merc.cpp
index f86ed7faf..76167382f 100644
--- a/zone/merc.cpp
+++ b/zone/merc.cpp
@@ -1,18 +1,21 @@
+
 #include "merc.h"
-#include "masterentity.h"
-#include "npc_ai.h"
-#include "../common/packet_dump.h"
+#include "client.h"
+#include "corpse.h"
+#include "entity.h"
+#include "groups.h"
+#include "mob.h"
+
 #include "../common/eq_packet_structs.h"
 #include "../common/eq_constants.h"
 #include "../common/skills.h"
 #include "../common/spdat.h"
+
 #include "zone.h"
 #include "string_ids.h"
-#include "../common/misc_functions.h"
+
 #include "../common/string_util.h"
 #include "../common/rulesys.h"
-#include "quest_parser_collection.h"
-#include "water_map.h"
 
 extern volatile bool ZoneLoaded;