10 files changed, 19 insertions, 15 deletions
diff --git a/src/net/ea/buysellrecv.cpp b/src/net/ea/buysellrecv.cpp
index 8ec0e86b0..795ec5a33 100644
--- a/src/net/ea/buysellrecv.cpp
+++ b/src/net/ea/buysellrecv.cpp
@@ -23,7 +23,6 @@
 #include "net/ea/buysellrecv.h"
 
 #include "inventory.h"
-#include "item.h"
 #include "notifymanager.h"
 
 #include "being/playerinfo.h"
@@ -40,6 +39,8 @@
 
 #include "net/messagein.h"
 
+#include "resources/item/item.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/equipbackend.h b/src/net/ea/equipbackend.h
index 673708aa6..67985dbea 100644
--- a/src/net/ea/equipbackend.h
+++ b/src/net/ea/equipbackend.h
@@ -23,7 +23,7 @@
 #ifndef NET_EA_EQUIPBACKEND_H
 #define NET_EA_EQUIPBACKEND_H
 
-#include "item.h"
+#include "resources/item/item.h"
 
 #include "being/playerinfo.h"
 
diff --git a/src/net/eathena/auctionhandler.cpp b/src/net/eathena/auctionhandler.cpp
index 02e903929..2ecc6d90f 100644
--- a/src/net/eathena/auctionhandler.cpp
+++ b/src/net/eathena/auctionhandler.cpp
@@ -20,13 +20,13 @@
 
 #include "net/eathena/auctionhandler.h"
 
-#include "item.h"
-
 #include "const/net/inventory.h"
 
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocolout.h"
 
+#include "resources/item/item.h"
+
 #include "debug.h"
 
 extern Net::AuctionHandler *auctionHandler;
diff --git a/src/net/eathena/buyingstorerecv.cpp b/src/net/eathena/buyingstorerecv.cpp
index 13054c2c3..78cbce318 100644
--- a/src/net/eathena/buyingstorerecv.cpp
+++ b/src/net/eathena/buyingstorerecv.cpp
@@ -22,7 +22,6 @@
 
 #include "actormanager.h"
 #include "inventory.h"
-#include "item.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
@@ -42,6 +41,8 @@
 
 #include "net/messagein.h"
 
+#include "resources/item/item.h"
+
 #include "debug.h"
 
 namespace EAthena
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 706d286f1..96bc36043 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -22,8 +22,6 @@
 
 #include "net/eathena/inventoryhandler.h"
 
-#include "item.h"
-
 #include "const/net/inventory.h"
 
 #include "enums/equipslot.h"
@@ -33,6 +31,8 @@
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocolout.h"
 
+#include "resources/item/item.h"
+
 #include "debug.h"
 
 extern Net::InventoryHandler *inventoryHandler;
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index 6c3026e7b..cd811e199 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -22,8 +22,6 @@
 
 #include "net/eathena/tradehandler.h"
 
-#include "item.h"
-
 #include "being/playerinfo.h"
 
 #include "const/net/inventory.h"
@@ -32,6 +30,8 @@
 #include "net/eathena/protocolout.h"
 #include "net/eathena/traderecv.h"
 
+#include "resources/item/item.h"
+
 #include "debug.h"
 
 extern Net::TradeHandler *tradeHandler;
diff --git a/src/net/eathena/traderecv.cpp b/src/net/eathena/traderecv.cpp
index bae158aa7..4b6cbf237 100644
--- a/src/net/eathena/traderecv.cpp
+++ b/src/net/eathena/traderecv.cpp
@@ -23,7 +23,6 @@
 #include "net/eathena/traderecv.h"
 
 #include "inventory.h"
-#include "item.h"
 #include "itemcolormanager.h"
 #include "notifymanager.h"
 
@@ -37,6 +36,8 @@
 
 #include "net/ea/traderecv.h"
 
+#include "resources/item/item.h"
+
 #include "debug.h"
 
 extern int packetVersion;
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index ea4d27804..0df6c9cf1 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -22,8 +22,6 @@
 
 #include "net/tmwa/inventoryhandler.h"
 
-#include "item.h"
-
 #include "const/net/inventory.h"
 
 #include "enums/equipslot.h"
@@ -31,6 +29,8 @@
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocolout.h"
 
+#include "resources/item/item.h"
+
 #include "debug.h"
 
 extern Net::InventoryHandler *inventoryHandler;
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index ebdd56fb6..7449b3555 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -22,8 +22,6 @@
 
 #include "net/tmwa/tradehandler.h"
 
-#include "item.h"
-
 #include "being/playerinfo.h"
 
 #include "const/net/inventory.h"
@@ -31,6 +29,8 @@
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocolout.h"
 
+#include "resources/item/item.h"
+
 #include "debug.h"
 
 extern Net::TradeHandler *tradeHandler;
diff --git a/src/net/tmwa/traderecv.cpp b/src/net/tmwa/traderecv.cpp
index db27d7800..59250122d 100644
--- a/src/net/tmwa/traderecv.cpp
+++ b/src/net/tmwa/traderecv.cpp
@@ -23,7 +23,6 @@
 #include "net/tmwa/traderecv.h"
 
 #include "inventory.h"
-#include "item.h"
 #include "notifymanager.h"
 
 #include "being/playerinfo.h"
@@ -41,6 +40,8 @@
 
 #include "net/ea/traderecv.h"
 
+#include "resources/item/item.h"
+
 #include "utils/stringutils.h"
 
 #include "debug.h"