11 files changed, 25 insertions, 15 deletions
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 51f1e8108..806c8e89f 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -25,7 +25,6 @@
 
 #include "actormanager.h"
 #include "configuration.h"
-#include "item.h"
 #include "units.h"
 
 #include "gui/gui.h"
@@ -42,6 +41,8 @@
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/item/item.h"
+
 #include "net/beinghandler.h"
 #include "net/serverfeatures.h"
 
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index eba6f1ee9..b14e3f32c 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -25,7 +25,6 @@
 #include "actormanager.h"
 #include "configuration.h"
 #include "gamemodifiers.h"
-#include "item.h"
 #include "party.h"
 
 #include "being/localplayer.h"
@@ -85,6 +84,8 @@
 
 #include "resources/db/npcdb.h"
 
+#include "resources/item/item.h"
+
 #include "resources/map/map.h"
 #include "resources/map/mapitem.h"
 #include "resources/map/speciallayer.h"
diff --git a/src/gui/shortcut/dropshortcut.cpp b/src/gui/shortcut/dropshortcut.cpp
index e9264e9c3..66fcd0dfa 100644
--- a/src/gui/shortcut/dropshortcut.cpp
+++ b/src/gui/shortcut/dropshortcut.cpp
@@ -23,12 +23,13 @@
 #include "gui/shortcut/dropshortcut.h"
 
 #include "inventory.h"
-#include "item.h"
 #include "settings.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
+#include "resources/item/item.h"
+
 #include "net/packetlimiter.h"
 
 #include "debug.h"
diff --git a/src/gui/shortcut/itemshortcut.cpp b/src/gui/shortcut/itemshortcut.cpp
index 7d6aec8f1..ab7e898f6 100644
--- a/src/gui/shortcut/itemshortcut.cpp
+++ b/src/gui/shortcut/itemshortcut.cpp
@@ -24,16 +24,17 @@
 
 #include "configuration.h"
 #include "inventory.h"
-#include "item.h"
 #include "spellmanager.h"
 
 #include "being/playerinfo.h"
 
 #include "const/spells.h"
 
+#include "const/resources/skill.h"
+
 #include "gui/windows/skilldialog.h"
 
-#include "const/resources/skill.h"
+#include "resources/item/item.h"
 
 #include "debug.h"
 
diff --git a/src/gui/shortcut/shortcutbase.cpp b/src/gui/shortcut/shortcutbase.cpp
index 99eb492f1..9e5a4be61 100644
--- a/src/gui/shortcut/shortcutbase.cpp
+++ b/src/gui/shortcut/shortcutbase.cpp
@@ -23,7 +23,8 @@
 #include "gui/shortcut/shortcutbase.h"
 
 #include "configuration.h"
-#include "item.h"
+
+#include "resources/item/item.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 4770ef69a..71c09d723 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -23,7 +23,6 @@
 #include "gui/windows/inventorywindow.h"
 
 #include "configuration.h"
-#include "item.h"
 #include "units.h"
 
 #include "being/playerinfo.h"
@@ -62,6 +61,8 @@
 
 #include "resources/iteminfo.h"
 
+#include "resources/item/item.h"
+
 #include "utils/delete2.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index fba671675..08227e19e 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -22,8 +22,6 @@
 
 #include "gui/windows/itemamountwindow.h"
 
-#include "item.h"
-
 #include "being/playerinfo.h"
 
 #include "input/keyboardconfig.h"
@@ -48,6 +46,8 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/slider.h"
 
+#include "resources/item/item.h"
+
 #include "utils/gettext.h"
 
 #include <cmath>
diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp
index da7210a43..1030e41ae 100644
--- a/src/gui/windows/maileditwindow.cpp
+++ b/src/gui/windows/maileditwindow.cpp
@@ -20,10 +20,7 @@
 
 #include "gui/windows/maileditwindow.h"
 
-#include "item.h"
-
 #include "being/playerinfo.h"
-#include "net/mailhandler.h"
 
 #include "gui/windows/inventorywindow.h"
 #include "gui/windows/itemamountwindow.h"
@@ -35,6 +32,10 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/scrollarea.h"
 
+#include "resources/item/item.h"
+
+#include "net/mailhandler.h"
+
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 9cdf6a3b0..28ede67e6 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -24,7 +24,6 @@
 
 #include "actormanager.h"
 #include "configuration.h"
-#include "item.h"
 #include "settings.h"
 #include "soundmanager.h"
 
@@ -62,6 +61,8 @@
 #include "resources/db/npcdb.h"
 #include "resources/db/npcdialogdb.h"
 
+#include "resources/item/item.h"
+
 #include "net/npchandler.h"
 #include "net/packetlimiter.h"
 
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 6ac5b34dc..11a0a2f41 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -24,7 +24,6 @@
 
 #include "configuration.h"
 #include "gamemodifiers.h"
-#include "item.h"
 #include "settings.h"
 #include "units.h"
 
@@ -49,6 +48,8 @@
 #include "net/inventoryhandler.h"
 #include "net/playerhandler.h"
 
+#include "resources/item/item.h"
+
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index 69cf87848..68c779148 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -24,7 +24,6 @@
 
 #include "configuration.h"
 #include "game.h"
-#include "item.h"
 #include "units.h"
 
 #include "being/localplayer.h"
@@ -50,6 +49,8 @@
 
 #include "gui/widgets/tabs/chat/chattab.h"
 
+#include "resources/item/item.h"
+
 #include "net/tradehandler.h"
 
 #include "utils/delete2.h"