From d44e982eaf9655c74e2a459c0c9bc8ae9e85a38b Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Mon, 15 Dec 2014 18:03:33 -0600
Subject: [PATCH] object.cpp & .h header cleanup

---
 zone/object.cpp | 18 ++++++++----------
 zone/object.h   | 15 +++++++--------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/zone/object.cpp b/zone/object.cpp
index b1acc53c9..fa7598d39 100644
--- a/zone/object.cpp
+++ b/zone/object.cpp
@@ -17,19 +17,17 @@
 */
 
 #include "../common/debug.h"
-#include <iostream>
-#include <stdlib.h>
-
-#include "masterentity.h"
-#include "zonedb.h"
-#include "../common/packet_functions.h"
-#include "../common/packet_dump.h"
-#include "../common/misc_functions.h"
 #include "../common/string_util.h"
-#include "../common/features.h"
-#include "string_ids.h"
+
+#include "client.h"
+#include "entity.h"
+#include "mob.h"
+#include "object.h"
 
 #include "quest_parser_collection.h"
+#include "zonedb.h"
+
+#include <iostream>
 
 const char DEFAULT_OBJECT_NAME[] = "IT63_ACTORDEF";
 const char DEFAULT_OBJECT_NAME_SUFFIX[] = "_ACTORDEF";
diff --git a/zone/object.h b/zone/object.h
index 9f5cb8cb3..9e8fae05d 100644
--- a/zone/object.h
+++ b/zone/object.h
@@ -21,16 +21,15 @@
 // Object Class:
 // Represents Zone Objects (forges, ovens, brew barrels, items dropped to ground, etc)
 
-#include "../common/types.h"
-#include "../common/linked_list.h"
-#include "../common/emu_opcodes.h"
 #include "../common/eq_packet_structs.h"
-#include "../common/item.h"
-#include "client.h"
-#include "mob.h"
-#include "npc.h"
-#include "entity.h"
 #include "../common/timer.h"
+#include "../common/types.h"
+
+#include "entity.h"
+
+class Client;
+class EQApplicationPacket;
+class ItemInst;
 
 /*
 item icon numbers (showeq)