diff --git a/common/item.cpp b/common/item.cpp
index df4997470..1b99ad779 100644
--- a/common/item.cpp
+++ b/common/item.cpp
@@ -16,19 +16,16 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "debug.h"
-#include "string_util.h"
-#include "item.h"
-#include "database.h"
-#include "misc.h"
-#include "races.h"
-#include "shareddb.h"
 #include "classes.h"
+#include "debug.h"
+#include "item.h"
+#include "races.h"
 #include "rulesys.h"
+#include "shareddb.h"
+#include "string_util.h"
 
 #include <limits.h>
 
-#include <sstream>
 #include <iostream>
 
 std::list<ItemInst*> dirty_inst;
diff --git a/common/item.h b/common/item.h
index 995f121d6..b0aa06466 100644
--- a/common/item.h
+++ b/common/item.h
@@ -23,21 +23,16 @@
 #ifndef __ITEM_H
 #define __ITEM_H
 
-class ItemInst;				// Item belonging to a client (contains info on item, dye, augments, charges, etc)
-class ItemInstQueue;		// Queue of ItemInst objects (i.e., cursor)
-class Inventory;			// Character inventory
 class ItemParse;			// Parses item packets
 class EvolveInfo;			// Stores information about an evolving item family
 
-#include <string>
-#include <vector>
-#include <map>
-#include <list>
-#include "../common/eq_packet_structs.h"
 #include "../common/eq_constants.h"
 #include "../common/item_struct.h"
 #include "../common/timer.h"
 
+#include <list>
+#include <map>
+
 // Helper typedefs
 typedef std::list<ItemInst*>::const_iterator				iter_queue;
 typedef std::map<int16, ItemInst*>::const_iterator			iter_inst;