Filename changes to facilitate future updates

zone/bonuses.cpp

@@ -17,7 +17,7 @@
 */
 #include "../common/classes.h"
 #include "../common/global_define.h"
-#include "../common/item.h"
+#include "../common/item_instance.h"
 #include "../common/rulesys.h"
 #include "../common/skills.h"
 #include "../common/spdat.h"

zone/client.h

@@ -45,9 +45,9 @@ namespace EQEmu
 #include "../common/extprofile.h"
 #include "../common/races.h"
 #include "../common/seperator.h"
-#include "../common/item.h"
+#include "../common/item_instance.h"
 #include "../common/guilds.h"
-#include "../common/item_base.h"
+#include "../common/item_data.h"
 
 #include "common.h"
 #include "merc.h"

zone/npc.cpp

@@ -26,8 +26,8 @@
 #include "../common/string_util.h"
 #include "../common/emu_versions.h"
 #include "../common/features.h"
-#include "../common/item.h"
-#include "../common/item_base.h"
+#include "../common/item_instance.h"
+#include "../common/item_data.h"
 #include "../common/linked_list.h"
 #include "../common/servertalk.h"
 #include "../common/say_link.h"

zone/perl_questitem.cpp

@@ -26,7 +26,7 @@
 #undef seed
 #endif
 
-#include "../common/item.h"
+#include "../common/item_instance.h"
 
 #ifdef THIS		/* this macro seems to leak out on some systems */
 #undef THIS

zone/spell_effects.cpp

@@ -20,7 +20,7 @@
 #include "../common/bodytypes.h"
 #include "../common/classes.h"
 #include "../common/global_define.h"
-#include "../common/item.h"
+#include "../common/item_instance.h"
 #include "../common/rulesys.h"
 #include "../common/skills.h"
 #include "../common/spdat.h"

zone/spells.cpp

@@ -70,7 +70,7 @@ Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
 #include "../common/classes.h"
 #include "../common/global_define.h"
 #include "../common/eqemu_logsys.h"
-#include "../common/item.h"
+#include "../common/item_instance.h"
 #include "../common/rulesys.h"
 #include "../common/skills.h"
 #include "../common/spdat.h"

zone/zonedb.cpp

@@ -1,7 +1,7 @@
 
 #include "../common/eqemu_logsys.h"
 #include "../common/extprofile.h"
-#include "../common/item.h"
+#include "../common/item_instance.h"
 #include "../common/rulesys.h"
 #include "../common/string_util.h"
 

zone/zonedump.h

@@ -28,7 +28,7 @@ spawn2 mediumblob, npcs mediumblob, npc_loot mediumblob, gmspawntype mediumblob,
 #define ZONEDUMP_H
 #include "../common/faction.h"
 #include "../common/eq_packet_structs.h"
-#include "../common/item.h"
+#include "../common/item_instance.h"
 
 #pragma pack(1)