12 files changed, 24 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c07b1d2c3..4ea2407af 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1195,8 +1195,8 @@ SET(SRCS
     resources/map/tileset.h
     touchactions.cpp
     touchactions.h
-    touchmanager.cpp
-    touchmanager.h
+    input/touch/touchmanager.cpp
+    input/touch/touchmanager.h
     units.cpp
     units.h
     variabledata.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 10f5afb7a..51322dbf2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -654,8 +654,8 @@ SRC += events/actionevent.h \
 	      textmanager.h \
 	      touchactions.cpp \
 	      touchactions.h \
-	      touchmanager.cpp \
-	      touchmanager.h \
+	      input/touch/touchmanager.cpp \
+	      input/touch/touchmanager.h \
 	      variabledata.h \
 	      vector.cpp \
 	      vector.h \
diff --git a/src/client.cpp b/src/client.cpp
index ec5adcfd1..622aaef3d 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -34,7 +34,6 @@
 #include "spellmanager.h"
 #include "statuseffect.h"
 #include "units.h"
-#include "touchmanager.h"
 
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
@@ -45,6 +44,8 @@
 #include "input/joystick.h"
 #include "input/keyboardconfig.h"
 
+#include "input/touch/touchmanager.h"
+
 #include "gui/dialogsmanager.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index 3055cc80b..400c402aa 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -28,12 +28,13 @@
 #include "graphicsmanager.h"
 #include "settings.h"
 #include "soundmanager.h"
-#include "touchmanager.h"
 
 #include "input/inputmanager.h"
 #include "input/joystick.h"
 #include "input/keyboardconfig.h"
 
+#include "input/touch/touchmanager.h"
+
 #include "gui/dialogsmanager.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
diff --git a/src/game.cpp b/src/game.cpp
index 1cec9efbd..b5be417b4 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -30,7 +30,6 @@
 #include "gamemodifiers.h"
 #include "soundmanager.h"
 #include "settings.h"
-#include "touchmanager.h"
 
 #include "being/crazymoves.h"
 #include "being/localplayer.h"
@@ -48,6 +47,8 @@
 #include "input/joystick.h"
 #include "input/keyboardconfig.h"
 
+#include "input/touch/touchmanager.h"
+
 #include "gui/dialogsmanager.h"
 #include "gui/gui.h"
 #include "gui/popupmanager.h"
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 146558032..02b0d3f08 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -79,7 +79,6 @@
 #include "resources/image.h"
 #endif
 #include "settings.h"
-#include "touchmanager.h"
 
 #include "listeners/focuslistener.h"
 #include "listeners/guiconfiglistener.h"
@@ -87,6 +86,8 @@
 
 #include "input/inputmanager.h"
 
+#include "input/touch/touchmanager.h"
+
 #include "render/renderers.h"
 
 #include "resources/imageset.h"
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index 49c0b859e..1793bcbea 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -27,7 +27,6 @@
 #include "game.h"
 #include "settings.h"
 #include "spellmanager.h"
-#include "touchmanager.h"
 
 #include "gui/gui.h"
 #include "gui/userpalette.h"
@@ -52,6 +51,8 @@
 #include "gui/widgets/createwidget.h"
 #include "gui/widgets/desktop.h"
 
+#include "input/touch/touchmanager.h"
+
 #include "utils/delete2.h"
 #include "utils/files.h"
 #include "utils/sdlcheckutils.h"
diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp
index 674668cf7..85a999e46 100644
--- a/src/gui/windows/setupwindow.cpp
+++ b/src/gui/windows/setupwindow.cpp
@@ -24,7 +24,6 @@
 
 #include "configuration.h"
 #include "game.h"
-#include "touchmanager.h"
 
 #include "gui/windows/chatwindow.h"
 
@@ -50,6 +49,8 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/tabbedarea.h"
 
+#include "input/touch/touchmanager.h"
+
 #include "utils/delete2.h"
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index fcee4066c..f06fa1a5b 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -23,7 +23,6 @@
 #include "configuration.h"
 #include "game.h"
 #include "settings.h"
-#include "touchmanager.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -36,6 +35,8 @@
 #include "input/multitouchmanager.h"
 #endif
 
+#include "input/touch/touchmanager.h"
+
 #include "gui/gui.h"
 #include "gui/sdlinput.h"
 
diff --git a/src/touchmanager.cpp b/src/input/touch/touchmanager.cpp
index 1a8d78cf6..3107b62c8 100644
--- a/src/touchmanager.cpp
+++ b/src/input/touch/touchmanager.cpp
@@ -18,7 +18,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "touchmanager.h"
+#include "input/touch/touchmanager.h"
 
 #include "configuration.h"
 #include "graphicsvertexes.h"
diff --git a/src/touchmanager.h b/src/input/touch/touchmanager.h
index f67a2b72d..f12bb850a 100644
--- a/src/touchmanager.h
+++ b/src/input/touch/touchmanager.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TOUCHMANAGER_H
-#define TOUCHMANAGER_H
+#ifndef INPUT_TOUCH_TOUCHMANAGER_H
+#define INPUT_TOUCH_TOUCHMANAGER_H
 
 #include "listeners/configlistener.h"
 
@@ -200,4 +200,4 @@ class TouchManager final : public ConfigListener
 
 extern TouchManager touchManager;
 
-#endif  // TOUCHMANAGER_H
+#endif  // INPUT_TOUCH_TOUCHMANAGER_H
diff --git a/src/touchactions.cpp b/src/touchactions.cpp
index c2d34463f..3d3d38408 100644
--- a/src/touchactions.cpp
+++ b/src/touchactions.cpp
@@ -20,11 +20,11 @@
 
 #include "touchactions.h"
 
-#include "touchmanager.h"
-
 #include "input/inputmanager.h"
 #include "input/mouseinput.h"
 
+#include "input/touch/touchmanager.h"
+
 #include "debug.h"
 
 bool padClicked(false);