3 files changed, 10 insertions, 7 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index dec8539d3..1c87e1c33 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -22,13 +22,10 @@
 
 #include "actormanager.h"
 #include "configuration.h"
-#include "dropshortcut.h"
-#include "emoteshortcut.h"
 #include "game.h"
 #ifdef USE_OPENGL
 #include "graphicsmanager.h"
 #endif
-#include "itemshortcut.h"
 #include "spellmanager.h"
 
 #include "actions/actiondef.h"
@@ -43,6 +40,10 @@
 #include "gui/sdlinput.h"
 #include "gui/windowmanager.h"
 
+#include "gui/shortcut/dropshortcut.h"
+#include "gui/shortcut/emoteshortcut.h"
+#include "gui/shortcut/itemshortcut.h"
+
 #include "gui/popups/popupmenu.h"
 
 #include "gui/windows/buydialog.h"
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 6f2d49b77..3511e9808 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -22,9 +22,6 @@
 
 #include "actormanager.h"
 #include "configuration.h"
-#ifdef EATHENA_SUPPORT
-#include "emoteshortcut.h"
-#endif
 #include "game.h"
 #include "inventory.h"
 #include "item.h"
@@ -40,6 +37,10 @@
 
 #include "gui/viewport.h"
 
+#ifdef EATHENA_SUPPORT
+#include "gui/shortcut/emoteshortcut.h"
+#endif
+
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/skilldialog.h"
 #include "gui/windows/socialwindow.h"
diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp
index 826d5ad84..3df0e64d9 100644
--- a/src/actions/pets.cpp
+++ b/src/actions/pets.cpp
@@ -22,7 +22,6 @@
 
 #include "actormanager.h"
 #include "game.h"
-#include "emoteshortcut.h"
 
 #include "actions/actiondef.h"
 
@@ -37,6 +36,8 @@
 
 #include "listeners/inputactionreplaylistener.h"
 
+#include "gui/shortcut/emoteshortcut.h"
+
 #include "net/chathandler.h"
 #ifdef TMWA_SUPPORT
 #include "net/net.h"