summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputactiondata.h2
-rw-r--r--src/input/inputactionmap.h5
-rw-r--r--src/input/inputmanager.cpp1
-rw-r--r--src/input/inputmanager.h1
-rw-r--r--src/input/joystick.h3
-rw-r--r--src/input/keyboardconfig.h2
-rw-r--r--src/input/keyinput.h2
7 files changed, 1 insertions, 15 deletions
diff --git a/src/input/inputactiondata.h b/src/input/inputactiondata.h
index a0f4c6279..76a04afc1 100644
--- a/src/input/inputactiondata.h
+++ b/src/input/inputactiondata.h
@@ -25,8 +25,6 @@
#include "actions/actionfuncptr.h"
-#include <string>
-
struct InputActionData final
{
const char *const configField;
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index ae75d2b2d..a8d3853ac 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -35,16 +35,11 @@
#include "actions/target.h"
#include "actions/windows.h"
-#include "input/inputaction.h"
#include "input/inputactiondata.h"
#include "input/inputcondition.h"
#include "input/inputmanager.h"
#include "input/inputtype.h"
-#include "utils/gettext.h"
-
-#include <string>
-
#include "localconsts.h"
#define defaultAction(name) \
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index dcb4b57a7..11ff7f291 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -53,6 +53,7 @@
#include "gui/windows/textdialog.h"
#include "gui/windows/tradewindow.h"
+#include "utils/gettext.h"
#include "utils/timer.h"
#include "gui/focushandler.h"
diff --git a/src/input/inputmanager.h b/src/input/inputmanager.h
index 672060a72..11757b630 100644
--- a/src/input/inputmanager.h
+++ b/src/input/inputmanager.h
@@ -29,7 +29,6 @@
#include "utils/stringmap.h"
#include <list>
-#include <string>
#include <SDL_events.h>
diff --git a/src/input/joystick.h b/src/input/joystick.h
index 2276006a7..01937c829 100644
--- a/src/input/joystick.h
+++ b/src/input/joystick.h
@@ -27,9 +27,6 @@
#include <SDL_events.h>
-#include <string>
-#include <vector>
-
class Joystick final
{
public:
diff --git a/src/input/keyboardconfig.h b/src/input/keyboardconfig.h
index 7465de669..7b1d09e33 100644
--- a/src/input/keyboardconfig.h
+++ b/src/input/keyboardconfig.h
@@ -29,8 +29,6 @@
#include "events/inputevent.h"
-#include <string>
-
union SDL_Event;
class KeyboardConfig final
diff --git a/src/input/keyinput.h b/src/input/keyinput.h
index 775ef98dd..f308af244 100644
--- a/src/input/keyinput.h
+++ b/src/input/keyinput.h
@@ -68,8 +68,6 @@
#include "input/key.h"
-#include <string>
-
#include "localconsts.h"
class KeyInput final