8 files changed, 15 insertions, 6 deletions
diff --git a/src/being/being.h b/src/being/being.h
index b6015486f..0ca1ce780 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -36,7 +36,6 @@
 
 #include "resources/beinginfo.h"
 #include "resources/beingslot.h"
-#include "resources/missileinfo.h"
 
 #include "being/actorsprite.h"
 
@@ -67,6 +66,7 @@ class Text;
 
 struct ChatObject;
 struct HorseInfo;
+struct MissileInfo;
 struct SkillInfo;
 struct ParticleInfo;
 
diff --git a/src/game.cpp b/src/game.cpp
index 08f123bce..7a66c0b19 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -35,6 +35,7 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
+#include "const/itemshortcut.h"
 #include "const/spells.h"
 
 #include "const/gui/chat.h"
@@ -56,7 +57,6 @@
 
 #include "gui/shortcut/dropshortcut.h"
 #include "gui/shortcut/emoteshortcut.h"
-#include "gui/shortcut/itemshortcut.h"
 
 #include "gui/popups/popupmenu.h"
 
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 9ad23888b..18d2fd236 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -78,6 +78,7 @@
 #include "resources/chatobject.h"
 #include "resources/groupinfo.h"
 #include "resources/iteminfo.h"
+#include "resources/itemmenuitem.h"
 
 #include "resources/db/groupdb.h"
 #include "resources/db/npcdb.h"
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 2f5744dec..606b85529 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -35,9 +35,10 @@
 #include "gui/windows/skilldialog.h"
 #include "gui/windows/statuswindow.h"
 
+#include "net/ea/inventoryhandler.h"
+
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocolout.h"
-#include "net/eathena/inventoryhandler.h"
 #include "net/eathena/sp.h"
 
 #include "resources/db/unitsdb.h"
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index e1d55d47d..02102a78b 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -35,7 +35,8 @@
 #include "gui/windows/skilldialog.h"
 #include "gui/windows/statuswindow.h"
 
-#include "net/tmwa/inventoryhandler.h"
+#include "net/ea/inventoryhandler.h"
+
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocolout.h"
 #include "net/tmwa/sp.h"
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index f54f5075b..041dda9be 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -31,6 +31,7 @@
 #include "fs/virtfs/tools.h"
 
 #include "resources/iteminfo.h"
+#include "resources/itemmenuitem.h"
 #include "resources/itemtypemapdata.h"
 
 #include "resources/db/itemfielddb.h"
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 118ce5d71..2997a48ad 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -28,6 +28,8 @@
 
 #include "enums/resources/spritedirection.h"
 
+#include "resources/itemmenuitem.h"
+
 #include "resources/db/colordb.h"
 #include "resources/db/itemdb.h"
 
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 414fa45b8..28b9d9049 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -28,10 +28,9 @@
 #include "enums/resources/item/itemdbtype.h"
 
 #include "enums/simpletypes/beingtypeid.h"
+#include "enums/simpletypes/itemcolor.h"
 
 #include "resources/cursors.h"
-#include "resources/itemcolordata.h"
-#include "resources/itemmenuitem.h"
 #include "resources/missileinfo.h"
 #include "resources/soundinfo.h"
 
@@ -40,6 +39,10 @@
 #include "utils/cast.h"
 #include "utils/intmap.h"
 
+class ItemColorData;
+
+struct ItemMenuItem;
+
 // sprite, <itemfrom, itemto>
 typedef std::map<int, IntMap> SpriteToItemMap;
 typedef SpriteToItemMap::const_iterator SpriteToItemMapCIter;