move input related files into input dir.

72 files changed, 216 insertions, 163 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 31550cf00..b2e943111 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -638,20 +638,20 @@ SET(SRCS
     spellshortcut.h
     textcommand.cpp
     textcommand.h
-    inputmanager.cpp
-    inputmanager.h
-    inputevent.cpp
-    inputevent.h
-    joystick.cpp
-    joystick.h
-    keyboardconfig.cpp
-    keyboardconfig.h
-    keyboarddata.h
-    keydata.h
-    keyevent.cpp
-    keyevent.h
-    keyinput.cpp
-    keyinput.h
+    input/inputmanager.cpp
+    input/inputmanager.h
+    input/inputevent.cpp
+    input/inputevent.h
+    input/joystick.cpp
+    input/joystick.h
+    input/keyboardconfig.cpp
+    input/keyboardconfig.h
+    input/keyboarddata.h
+    input/keydata.h
+    input/keyevent.cpp
+    input/keyevent.h
+    input/keyinput.cpp
+    input/keyinput.h
     localconsts.h
     localplayer.cpp
     localplayer.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 5e159ffe4..d4c6779f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -649,20 +649,20 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      spellshortcut.h \
 	      textcommand.cpp \
 	      textcommand.h \
-	      inputevent.cpp \
-	      inputevent.h \
-	      inputmanager.cpp \
-	      inputmanager.h \
-	      joystick.cpp \
-	      joystick.h \
-	      keyboardconfig.cpp \
-	      keyboardconfig.h \
-	      keyboarddata.h \
-	      keydata.h \
-	      keyevent.cpp \
-	      keyevent.h \
-	      keyinput.cpp \
-	      keyinput.h \
+	      input/inputevent.cpp \
+	      input/inputevent.h \
+	      input/inputmanager.cpp \
+	      input/inputmanager.h \
+	      input/joystick.cpp \
+	      input/joystick.h \
+	      input/keyboardconfig.cpp \
+	      input/keyboardconfig.h \
+	      input/keyboarddata.h \
+	      input/keydata.h \
+	      input/keyevent.cpp \
+	      input/keyevent.h \
+	      input/keyinput.cpp \
+	      input/keyinput.h \
 	      localconsts.h \
 	      localplayer.cpp \
 	      localplayer.h \
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 3ce8c39a1..091a68c87 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -24,14 +24,15 @@
 #include "dropshortcut.h"
 #include "emoteshortcut.h"
 #include "game.h"
-#include "inputevent.h"
 #include "itemshortcut.h"
-#include "inputmanager.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 #include "playerrelations.h"
 #include "soundmanager.h"
 
+#include "input/inputevent.h"
+#include "input/inputmanager.h"
+
 #include "gui/botcheckerwindow.h"
 #include "gui/buyselldialog.h"
 #include "gui/chatwindow.h"
diff --git a/src/client.cpp b/src/client.cpp
index 7ff47e506..93f5d9a51 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -36,9 +36,6 @@
 #include "graphicsmanager.h"
 #include "graphicsvertexes.h"
 #include "itemshortcut.h"
-#include "joystick.h"
-#include "inputmanager.h"
-#include "keyboardconfig.h"
 #include "party.h"
 #include "playerrelations.h"
 #include "soundconsts.h"
@@ -47,6 +44,10 @@
 #include "units.h"
 #include "touchmanager.h"
 
+#include "input/inputmanager.h"
+#include "input/joystick.h"
+#include "input/keyboardconfig.h"
+
 #include "gui/buydialog.h"
 #include "gui/buyselldialog.h"
 #include "gui/changeemaildialog.h"
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 6e1d9ef44..cc16c267f 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -22,7 +22,7 @@
 
 #include "commandhandler.h"
 
-#include "inputmanager.h"
+#include "input/inputmanager.h"
 
 #include "gui/widgets/chattab.h"
 
diff --git a/src/commands.h b/src/commands.h
index fea21e3c7..8308bd5f1 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -24,7 +24,8 @@
 #define COMMANDS_H
 
 #include "playerrelations.h"
-#include "keydata.h"
+
+#include "input/keydata.h"
 
 #include <string>
 
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 271cf7315..4b2b6fa05 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -24,7 +24,8 @@
 #include "being.h"
 #include "client.h"
 #include "graphicsmanager.h"
-#include "keydata.h"
+
+#include "input/keydata.h"
 
 #include "render/graphics.h"
 
diff --git a/src/game.cpp b/src/game.cpp
index 2f6916910..258ce6e60 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -32,10 +32,7 @@
 #include "effectmanager.h"
 #include "emoteshortcut.h"
 #include "guildmanager.h"
-#include "inputmanager.h"
 #include "itemshortcut.h"
-#include "joystick.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "particle.h"
 #include "playerinfo.h"
@@ -43,6 +40,10 @@
 #include "spellshortcut.h"
 #include "touchmanager.h"
 
+#include "input/inputmanager.h"
+#include "input/joystick.h"
+#include "input/keyboardconfig.h"
+
 #include "gui/botcheckerwindow.h"
 #include "gui/debugwindow.h"
 #include "gui/didyouknowwindow.h"
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index b0a7d730c..86c1a0003 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -22,11 +22,12 @@
 
 #include "gui/charcreatedialog.h"
 
-#include "keydata.h"
-#include "keyevent.h"
 #include "main.h"
 #include "units.h"
 
+#include "input/keydata.h"
+#include "input/keyevent.h"
+
 #include "gui/confirmdialog.h"
 #include "gui/okdialog.h"
 
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 92f1aeba8..806cd5b86 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -25,7 +25,8 @@
 #include "client.h"
 #include "configuration.h"
 #include "units.h"
-#include "keyevent.h"
+
+#include "input/keyevent.h"
 
 #include "gui/charcreatedialog.h"
 #include "gui/confirmdialog.h"
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index d31278e51..8705af925 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -29,14 +29,15 @@
 #include "configuration.h"
 #include "game.h"
 #include "guild.h"
-#include "inputmanager.h"
-#include "keyevent.h"
 #include "localplayer.h"
 #include "party.h"
 #include "playerinfo.h"
 #include "spellshortcut.h"
 #include "soundmanager.h"
 
+#include "input/inputmanager.h"
+#include "input/keyevent.h"
+
 #include "gui/emotewindow.h"
 #include "gui/gui.h"
 #include "gui/setup.h"
diff --git a/src/gui/editserverdialog.cpp b/src/gui/editserverdialog.cpp
index 3882defe5..516d30ffe 100644
--- a/src/gui/editserverdialog.cpp
+++ b/src/gui/editserverdialog.cpp
@@ -22,8 +22,9 @@
 #include "gui/editserverdialog.h"
 
 #include "configuration.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "gui/okdialog.h"
 #include "gui/sdlinput.h"
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index dda067644..0145332c8 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -35,12 +35,13 @@
 #include "client.h"
 #include "configuration.h"
 #include "dragdrop.h"
-#include "keydata.h"
-#include "keyevent.h"
-#include "keyinput.h"
 #include "mouseinput.h"
 #include "touchmanager.h"
 
+#include "input/keydata.h"
+#include "input/keyevent.h"
+#include "input/keyinput.h"
+
 #include "resources/image.h"
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 86704c09c..bcd2c5108 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -23,11 +23,12 @@
 #include "gui/inventorywindow.h"
 
 #include "configuration.h"
-#include "inputmanager.h"
-#include "keyevent.h"
 #include "playerinfo.h"
 #include "units.h"
 
+#include "input/inputmanager.h"
+#include "input/keyevent.h"
+
 #include "gui/equipmentwindow.h"
 #include "gui/gui.h"
 #include "gui/itemamountwindow.h"
diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp
index 61760f6d3..e9a178b02 100644
--- a/src/gui/itemamountwindow.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -24,7 +24,8 @@
 
 #include "inventory.h"
 #include "item.h"
-#include "keyboardconfig.h"
+
+#include "input/keyboardconfig.h"
 
 #include "gui/tradewindow.h"
 #include "net/inventoryhandler.h"
diff --git a/src/gui/logindialog.cpp b/src/gui/logindialog.cpp
index 701981008..03975d0f4 100644
--- a/src/gui/logindialog.cpp
+++ b/src/gui/logindialog.cpp
@@ -24,8 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "gui/confirmdialog.h"
 #include "gui/okdialog.h"
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index e1c36fd90..c31f1c980 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -27,13 +27,14 @@
 #include "emoteshortcut.h"
 #include "equipment.h"
 #include "game.h"
-#include "inputmanager.h"
 #include "inventory.h"
 #include "item.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 
+#include "input/inputmanager.h"
+#include "input/keyboardconfig.h"
+
 #include "gui/chatwindow.h"
 #include "gui/inventorywindow.h"
 #include "gui/viewport.h"
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index da33b6915..54e6f4154 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -28,7 +28,6 @@
 #include "game.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "inputmanager.h"
 #include "item.h"
 #include "itemshortcut.h"
 #include "localplayer.h"
@@ -38,6 +37,8 @@
 #include "playerrelations.h"
 #include "spellmanager.h"
 
+#include "input/inputmanager.h"
+
 #include "gui/buydialog.h"
 #include "gui/chatwindow.h"
 #include "gui/equipmentwindow.h"
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 894d4ff24..c6f59d92d 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -25,11 +25,12 @@
 #include "client.h"
 #include "configuration.h"
 #include "game.h"
-#include "keydata.h"
-#include "keyevent.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "input/keydata.h"
+#include "input/keyevent.h"
+
 #include "gui/chatwindow.h"
 #include "gui/npcdialog.h"
 #include "gui/sdlinput.h"
diff --git a/src/gui/registerdialog.cpp b/src/gui/registerdialog.cpp
index 233bf9bf9..22537ac7d 100644
--- a/src/gui/registerdialog.cpp
+++ b/src/gui/registerdialog.cpp
@@ -24,8 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "gui/logindialog.h"
 #include "gui/okdialog.h"
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index 4655bcbec..f37ae858e 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -58,12 +58,13 @@
 
 #include "gui/sdlinput.h"
 
-#include "inputmanager.h"
-#include "keydata.h"
 #include "logger.h"
 #include "mouseinput.h"
 #include "sdlshared.h"
 
+#include "input/inputmanager.h"
+#include "input/keydata.h"
+
 #ifdef USE_SDL2
 #include "gui/gui.h"
 #endif
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 8f0f0b793..1674fcfd0 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -59,7 +59,7 @@
 #ifndef GUI_SDLINPUT_H
 #define GUI_SDLINPUT_H
 
-#include "keyinput.h"
+#include "input/keyinput.h"
 
 #include <SDL.h>
 
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 26144c30d..a1b743f3d 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -25,10 +25,11 @@
 #include "chatlogger.h"
 #include "client.h"
 #include "configuration.h"
-#include "keydata.h"
-#include "keyevent.h"
 #include "main.h"
 
+#include "input/keydata.h"
+#include "input/keyevent.h"
+
 #include "gui/editserverdialog.h"
 #include "gui/gui.h"
 #include "gui/logindialog.h"
diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp
index 0b0fd70de..ad2e3f7d9 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/setup_input.cpp
@@ -24,8 +24,9 @@
 #include "gui/setup_input.h"
 
 #include "configuration.h"
-#include "inputmanager.h"
-#include "keyboardconfig.h"
+
+#include "input/inputmanager.h"
+#include "input/keyboardconfig.h"
 
 #include "gui/okdialog.h"
 #include "gui/setupactiondata.h"
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 1ac5dae8d..b714ffaf3 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -23,7 +23,8 @@
 #include "gui/setup_joystick.h"
 
 #include "configuration.h"
-#include "joystick.h"
+
+#include "input/joystick.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index 4b5b721e1..6fa33f673 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -24,7 +24,7 @@
 #ifndef GUI_SETUPACTIONDATA_H
 #define GUI_SETUPACTIONDATA_H
 
-#include "keydata.h"
+#include "input/keydata.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index f25ca3e37..baeaf847f 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -24,19 +24,20 @@
 #include "actorspritemanager.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "inputmanager.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "maplayer.h"
 #include "party.h"
 #include "playerrelations.h"
-#include "gui/whoisonline.h"
+
+#include "input/inputmanager.h"
+#include "input/keyboardconfig.h"
 
 #include "gui/confirmdialog.h"
 #include "gui/okdialog.h"
 #include "gui/outfitwindow.h"
 #include "gui/setup.h"
 #include "gui/textdialog.h"
+#include "gui/whoisonline.h"
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/chattab.h"
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index b00184a52..3c1479594 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -30,10 +30,11 @@
 #include "gui/widgets/layout.h"
 #include "gui/widgets/textbox.h"
 
-#include "inputmanager.h"
 #include "localplayer.h"
 #include "units.h"
-#include "keyboardconfig.h"
+
+#include "input/inputmanager.h"
+#include "input/keyboardconfig.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/statuspopup.h b/src/gui/statuspopup.h
index 7ee98c32d..69c6c7053 100644
--- a/src/gui/statuspopup.h
+++ b/src/gui/statuspopup.h
@@ -24,7 +24,7 @@
 #ifndef GUI_STATUSPOPUP_H
 #define GUI_STATUSPOPUP_H
 
-#include "keydata.h"
+#include "input/keydata.h"
 
 #include "gui/widgets/popup.h"
 
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 029089704..7ad27c50f 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -26,9 +26,10 @@
 #include "item.h"
 #include "localplayer.h"
 #include "main.h"
-#include "keyboardconfig.h"
 #include "spellmanager.h"
 
+#include "input/keyboardconfig.h"
+
 #include "gui/chatwindow.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp
index 773949e6e..3b26ec2de 100644
--- a/src/gui/textdialog.cpp
+++ b/src/gui/textdialog.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/textdialog.h"
 
-#include "keyboardconfig.h"
+#include "input/keyboardconfig.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp
index f41269179..5466c54d7 100644
--- a/src/gui/updaterwindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -24,8 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "gui/sdlinput.h"
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index fe5238e41..e8ae6bd6c 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -27,13 +27,14 @@
 #include "configuration.h"
 #include "game.h"
 #include "itemshortcut.h"
-#include "inputmanager.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 #include "sdlshared.h"
 #include "textmanager.h"
 
+#include "input/inputmanager.h"
+#include "input/keyboardconfig.h"
+
 #include "gui/beingpopup.h"
 #include "gui/chatwindow.h"
 #include "gui/gui.h"
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index c1910ae88..6fd38e4c6 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -24,7 +24,8 @@
 #include "gui/widgets/browserbox.h"
 
 #include "client.h"
-#include "inputmanager.h"
+
+#include "input/inputmanager.h"
 
 #include "gui/gui.h"
 #include "gui/sdlfont.h"
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index ed9ac0580..1fb4fa5e4 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -25,8 +25,9 @@
 #include "client.h"
 #include "configuration.h"
 #include "graphicsvertexes.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "resources/imageset.h"
 
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index d0c10ecb6..5548390bc 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -24,8 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "resources/image.h"
 
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 9845c295c..8eac7bf79 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -24,8 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "gui/sdlinput.h"
 #include "gui/viewport.h"
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index d0bf896eb..96d068ade 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -25,10 +25,11 @@
 #include "client.h"
 #include "dragdrop.h"
 #include "dropshortcut.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 
+#include "input/keyboardconfig.h"
+
 #include "gui/inventorywindow.h"
 #include "gui/itempopup.h"
 #include "gui/viewport.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 977b55a4f..d72f5379d 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -25,13 +25,14 @@
 #include "client.h"
 #include "configuration.h"
 #include "emoteshortcut.h"
-#include "inputmanager.h"
 #include "inventory.h"
 #include "item.h"
 #include "itemshortcut.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 
+#include "input/inputmanager.h"
+#include "input/keyboardconfig.h"
+
 #include "gui/textpopup.h"
 #include "gui/viewport.h"
 
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index 00bb5e5fd..69c7e4d54 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -22,7 +22,8 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keyevent.h"
+
+#include "input/keyevent.h"
 
 #include "gui/sdlinput.h"
 
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 638f310bd..68068acf7 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -24,7 +24,8 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keyevent.h"
+
+#include "input/keyevent.h"
 
 #include "gui/sdlinput.h"
 
diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index be8b2e310..1c1fc222c 100644
--- a/src/gui/widgets/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -22,8 +22,8 @@
 
 #include "gui/widgets/inttextfield.h"
 
-#include "keydata.h"
-#include "keyevent.h"
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "gui/sdlinput.h"
 
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index c42074d6b..40eaefcf9 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -26,14 +26,15 @@
 #include "configuration.h"
 #include "dragdrop.h"
 #include "inventory.h"
-#include "inputmanager.h"
 #include "item.h"
 #include "itemshortcut.h"
 #include "spellshortcut.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 
+#include "input/inputmanager.h"
+#include "input/keyboardconfig.h"
+
 #include "gui/inventorywindow.h"
 #include "gui/itempopup.h"
 #include "gui/skilldialog.h"
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index a5ffc2f8b..29b7b0e48 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -24,7 +24,8 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keyevent.h"
+
+#include "input/keyevent.h"
 
 #include "gui/gui.h"
 #include "gui/sdlinput.h"
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index ff4a8f6f4..8f595e6c3 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -24,8 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "resources/image.h"
 
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 00b55f936..b8988964e 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -24,7 +24,8 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "keyevent.h"
+
+#include "input/keyevent.h"
 
 #include "resources/image.h"
 
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 335be9866..0ffb25b1d 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -25,10 +25,11 @@
 #include "client.h"
 #include "dragdrop.h"
 #include "itemshortcut.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "spellshortcut.h"
 
+#include "input/keyboardconfig.h"
+
 #include "gui/inventorywindow.h"
 #include "gui/okdialog.h"
 #include "gui/shortcutwindow.h"
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 5a8b7265f..d9b75dc11 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -22,8 +22,8 @@
 
 #include "gui/widgets/tabbedarea.h"
 
-#include "keydata.h"
-#include "keyevent.h"
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tab.h"
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index d38c3c9c9..53f071d3d 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -22,8 +22,8 @@
 
 #include "gui/widgets/textbox.h"
 
-#include "keydata.h"
-#include "keyevent.h"
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include <guichan/font.hpp>
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index bff4f67f2..aac233d24 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -24,8 +24,9 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "inputmanager.h"
-#include "keyevent.h"
+
+#include "input/inputmanager.h"
+#include "input/keyevent.h"
 
 #include "gui/popupmenu.h"
 #include "gui/sdlinput.h"
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 0e2cc5397..d12fc807d 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -23,8 +23,9 @@
 #include "gui/windowmenu.h"
 
 #include "emoteshortcut.h"
-#include "inputmanager.h"
-#include "keyboardconfig.h"
+
+#include "input/inputmanager.h"
+#include "input/keyboardconfig.h"
 
 #include "gui/didyouknowwindow.h"
 #include "gui/helpwindow.h"
diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp
index 37dbbc3cf..8a9cf8ed2 100644
--- a/src/gui/worldselectdialog.cpp
+++ b/src/gui/worldselectdialog.cpp
@@ -23,8 +23,9 @@
 #include "gui/worldselectdialog.h"
 
 #include "client.h"
-#include "keydata.h"
-#include "keyevent.h"
+
+#include "input/keydata.h"
+#include "input/keyevent.h"
 
 #include "gui/sdlinput.h"
 
diff --git a/src/inputevent.cpp b/src/input/inputevent.cpp
index eb047a10b..61e5dc2b1 100644
--- a/src/inputevent.cpp
+++ b/src/input/inputevent.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inputevent.h"
+#include "input/inputevent.h"
 
 #include "debug.h"
 
diff --git a/src/inputevent.h b/src/input/inputevent.h
index 961f7a58f..b65a4b8f2 100644
--- a/src/inputevent.h
+++ b/src/input/inputevent.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef INPUTEVENT_H
-#define INPUTEVENT_H
+#ifndef INPUT_INPUTEVENT_H
+#define INPUT_INPUTEVENT_H
 
 #include <map>
 #include <vector>
@@ -48,4 +48,4 @@ struct InputEvent final
     int mask;
 };
 
-#endif  // INPUTEVENT_H
+#endif  // INPUT_INPUTEVENT_H
diff --git a/src/inputmanager.cpp b/src/input/inputmanager.cpp
index c04185f50..561437124 100644
--- a/src/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -18,17 +18,18 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inputmanager.h"
+#include "input/inputmanager.h"
 
 #include "client.h"
 #include "configuration.h"
 #include "game.h"
-#include "joystick.h"
-#include "keyboardconfig.h"
-#include "keyboarddata.h"
 #include "localplayer.h"
 #include "touchmanager.h"
 
+#include "input/joystick.h"
+#include "input/keyboardconfig.h"
+#include "input/keyboarddata.h"
+
 #include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/inventorywindow.h"
diff --git a/src/inputmanager.h b/src/input/inputmanager.h
index d8b39f6b8..8611e19c3 100644
--- a/src/inputmanager.h
+++ b/src/input/inputmanager.h
@@ -18,11 +18,11 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef INPUTMANAGER_H
-#define INPUTMANAGER_H
+#ifndef INPUT_INPUTMANAGER_H
+#define INPUT_INPUTMANAGER_H
 
-#include "inputevent.h"
-#include "keydata.h"
+#include "input/inputevent.h"
+#include "input/keydata.h"
 
 #include <string>
 #include <map>
@@ -188,4 +188,4 @@ class InputManager final
 
 extern InputManager inputManager;
 
-#endif  // INPUTMANAGER_H
+#endif  // INPUT_INPUTMANAGER_H
diff --git a/src/joystick.cpp b/src/input/joystick.cpp
index a2809d8b9..99a751525 100644
--- a/src/joystick.cpp
+++ b/src/input/joystick.cpp
@@ -20,14 +20,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "joystick.h"
+#include "input/joystick.h"
 
 #include "client.h"
 #include "configuration.h"
-#include "inputmanager.h"
 #include "logger.h"
 #include "sdlshared.h"
 
+#include "input/inputmanager.h"
+
 #include "debug.h"
 
 int Joystick::joystickCount = 0;
diff --git a/src/joystick.h b/src/input/joystick.h
index 174c61e6c..528eb0c94 100644
--- a/src/joystick.h
+++ b/src/input/joystick.h
@@ -20,10 +20,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef JOYSTICK_H
-#define JOYSTICK_H
+#ifndef INPUT_JOYSTICK_H
+#define INPUT_JOYSTICK_H
 
-#include "inputevent.h"
+#include "input/inputevent.h"
 
 #include <SDL.h>
 
@@ -172,4 +172,4 @@ class Joystick final
 
 extern Joystick *joystick;
 
-#endif  // JOYSTICK_H
+#endif  // INPUT_JOYSTICK_H
diff --git a/src/keyboardconfig.cpp b/src/input/keyboardconfig.cpp
index 2bc33fc41..87d7a8d69 100644
--- a/src/keyboardconfig.cpp
+++ b/src/input/keyboardconfig.cpp
@@ -20,12 +20,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "keyboardconfig.h"
+#include "input/keyboardconfig.h"
 
 #include "configuration.h"
-#include "inputmanager.h"
 #include "logger.h"
 
+#include "input/inputmanager.h"
+
 #include "utils/gettext.h"
 
 #include <SDL_events.h>
diff --git a/src/keyboardconfig.h b/src/input/keyboardconfig.h
index 224391cdc..f6152fa1a 100644
--- a/src/keyboardconfig.h
+++ b/src/input/keyboardconfig.h
@@ -20,15 +20,16 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEYBOARDCONFIG_H
-#define KEYBOARDCONFIG_H
+#ifndef INPUT_KEYBOARDCONFIG_H
+#define INPUT_KEYBOARDCONFIG_H
 
 #include <SDL_types.h>
 #include <SDL_keyboard.h>
 
-#include "inputevent.h"
 #include "sdlshared.h"
 
+#include "input/inputevent.h"
+
 #include <map>
 #include <string>
 #include <vector>
@@ -121,4 +122,4 @@ class KeyboardConfig final
 
 extern KeyboardConfig keyboard;
 
-#endif  // KEYBOARDCONFIG_H
+#endif  // INPUT_KEYBOARDCONFIG_H
diff --git a/src/keyboarddata.h b/src/input/keyboarddata.h
index 42291c648..bd5395007 100644
--- a/src/keyboarddata.h
+++ b/src/input/keyboarddata.h
@@ -20,13 +20,14 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEYBOARDDATA_H
-#define KEYBOARDDATA_H
+#ifndef INPUT_KEYBOARDDATA_H
+#define INPUT_KEYBOARDDATA_H
 
 #include "actionmanager.h"
-#include "inputmanager.h"
 #include "localconsts.h"
 
+#include "input/inputmanager.h"
+
 #include "utils/gettext.h"
 
 #include <string>
@@ -1961,4 +1962,4 @@ static const KeyData keyData[Input::KEY_TOTAL] = {
         COND_DEFAULT | COND_INGAME}
 };
 
-#endif  // KEYBOARDDATA_H
+#endif  // INPUT_KEYBOARDDATA_H
diff --git a/src/keydata.h b/src/input/keydata.h
index cfe47a8b4..bb5d27fd1 100644
--- a/src/keydata.h
+++ b/src/input/keydata.h
@@ -20,10 +20,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEYDATA_H
-#define KEYDATA_H
+#ifndef INPUT_KEYDATA_H
+#define INPUT_KEYDATA_H
 
-#include "inputevent.h"
+#include "input/inputevent.h"
 
 #include <string>
 
@@ -345,4 +345,4 @@ namespace Input
     };
 }  // namespace Input
 
-#endif  // KEYDATA_H
+#endif  // INPUT_KEYDATA_H
diff --git a/src/keyevent.cpp b/src/input/keyevent.cpp
index fef854fbf..6947af04a 100644
--- a/src/keyevent.cpp
+++ b/src/input/keyevent.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "keyevent.h"
+#include "input/keyevent.h"
 
 #include "debug.h"
 
diff --git a/src/keyevent.h b/src/input/keyevent.h
index 081ea3d3c..24623bda4 100644
--- a/src/keyevent.h
+++ b/src/input/keyevent.h
@@ -18,10 +18,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEYEVENT_H
-#define KEYEVENT_H
+#ifndef INPUT_KEYEVENT_H
+#define INPUT_KEYEVENT_H
 
-#include "keydata.h"
+#include "input/keydata.h"
 
 #include <guichan/key.hpp>
 #include <guichan/keyevent.hpp>
@@ -64,4 +64,4 @@ class KeyEvent final : public gcn::KeyEvent
 #endif
 };
 
-#endif  // KEYEVENT_H
+#endif  // INPUT_KEYEVENT_H
diff --git a/src/keyinput.cpp b/src/input/keyinput.cpp
index bbc53bff2..b7ffd3ac1 100644
--- a/src/keyinput.cpp
+++ b/src/input/keyinput.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "keyinput.h"
+#include "input/keyinput.h"
 
 #include "debug.h"
 
diff --git a/src/keyinput.h b/src/input/keyinput.h
index 7e5de4bb3..590995e2c 100644
--- a/src/keyinput.h
+++ b/src/input/keyinput.h
@@ -18,10 +18,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef KEYINPUT_H
-#define KEYINPUT_H
+#ifndef INPUT_KEYINPUT_H
+#define INPUT_KEYINPUT_H
 
-#include "keydata.h"
+#include "input/keydata.h"
 
 #include <guichan/keyinput.hpp>
 
@@ -55,4 +55,4 @@ class KeyInput final : public gcn::KeyInput
 #endif
 };
 
-#endif  // KEYINPUT_H
+#endif  // INPUT_KEYINPUT_H
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 4de5dca23..409d9de4f 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -29,7 +29,6 @@
 #include "effectmanager.h"
 #include "guild.h"
 #include "item.h"
-#include "keyboardconfig.h"
 #include "maplayer.h"
 #include "party.h"
 #include "particle.h"
@@ -41,6 +40,8 @@
 #include "statuseffect.h"
 #include "walklayer.h"
 
+#include "input/keyboardconfig.h"
+
 #include "gui/chatwindow.h"
 #include "gui/gui.h"
 #include "gui/ministatuswindow.h"
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index ea74bc6a2..83576d9a2 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -30,14 +30,15 @@
 #include "game.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "inputmanager.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "particle.h"
 #include "party.h"
 #include "playerrelations.h"
 #include "configuration.h"
 
+#include "input/inputmanager.h"
+#include "input/keyboardconfig.h"
+
 #include "gui/botcheckerwindow.h"
 #include "gui/outfitwindow.h"
 #include "gui/socialwindow.h"
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 3c85fb352..68c3f1a02 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -27,12 +27,13 @@
 #include "effectmanager.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "party.h"
 #include "playerrelations.h"
 #include "configuration.h"
 
+#include "input/keyboardconfig.h"
+
 #include "gui/botcheckerwindow.h"
 #include "gui/outfitwindow.h"
 #include "gui/socialwindow.h"
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 70e57c9a4..dea944932 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -27,12 +27,13 @@
 #include "effectmanager.h"
 #include "guild.h"
 #include "guildmanager.h"
-#include "keyboardconfig.h"
 #include "localplayer.h"
 #include "party.h"
 #include "playerrelations.h"
 #include "configuration.h"
 
+#include "input/keyboardconfig.h"
+
 #include "gui/botcheckerwindow.h"
 #include "gui/outfitwindow.h"
 #include "gui/socialwindow.h"
diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp
index de6f459f6..38d0ca864 100644
--- a/src/touchmanager.cpp
+++ b/src/touchmanager.cpp
@@ -22,10 +22,11 @@
 
 #include "configuration.h"
 #include "graphicsvertexes.h"
-#include "inputmanager.h"
 #include "mouseinput.h"
 #include "touchactions.h"
 
+#include "input/inputmanager.h"
+
 #include "render/graphics.h"
 
 #include "gui/theme.h"
diff --git a/src/touchmanager.h b/src/touchmanager.h
index 8f2e4cf8c..8bd2d6159 100644
--- a/src/touchmanager.h
+++ b/src/touchmanager.h
@@ -24,7 +24,8 @@
 #include "resources/image.h"
 
 #include "configlistener.h"
-#include "keydata.h"
+
+#include "input/keydata.h"
 
 #include <guichan/mouseinput.hpp>
 #include <guichan/rectangle.hpp>