diff --git a/Source/controls/controller_motion.h b/Source/controls/controller_motion.h
index c700dfba6f2..a294aab774e 100644
--- a/Source/controls/controller_motion.h
+++ b/Source/controls/controller_motion.h
@@ -4,8 +4,6 @@
 
 #if HAS_GAMECTRL || HAS_JOYSTICK || HAS_KBCTRL || HAS_DPAD
 
-#include <SDL.h>
-
 #include "./axis_direction.h"
 #include "./controller.h"
 
diff --git a/Source/controls/devices/game_controller.h b/Source/controls/devices/game_controller.h
index 1b64bc93030..bdc244ded2c 100644
--- a/Source/controls/devices/game_controller.h
+++ b/Source/controls/devices/game_controller.h
@@ -9,8 +9,6 @@ static_assert(false, "GameController is not supported in SDL1.");
 
 #include <SDL.h>
 
-#include "../defs.h"
-
 #include "../controller_buttons.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/Source/controls/devices/joystick.h b/Source/controls/devices/joystick.h
index 537c9d3c105..aa592ba0e8c 100644
--- a/Source/controls/devices/joystick.h
+++ b/Source/controls/devices/joystick.h
@@ -11,8 +11,6 @@
 #include "utils/sdl2_to_1_2_backports.h"
 #endif
 
-#include "../defs.h"
-
 #include "../controller_buttons.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/Source/controls/devices/kbcontroller.h b/Source/controls/devices/kbcontroller.h
index 4a6cc0c796d..932cbd5a4a7 100644
--- a/Source/controls/devices/kbcontroller.h
+++ b/Source/controls/devices/kbcontroller.h
@@ -3,7 +3,7 @@
 // Keyboard keys acting like gamepad buttons
 #if HAS_KBCTRL
 #include <SDL.h>
-#include "../defs.h"
+
 #include "../controller_buttons.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/Source/controls/game_controls.h b/Source/controls/game_controls.h
index 117aba9ab83..7c905ac4e0e 100644
--- a/Source/controls/game_controls.h
+++ b/Source/controls/game_controls.h
@@ -2,9 +2,6 @@
 
 #if HAS_GAMECTRL || HAS_JOYSTICK || HAS_KBCTRL || HAS_DPAD
 
-//#include <cstdint>
-#include <SDL.h>
-
 #include "./axis_direction.h"
 #include "./controller.h"
 
diff --git a/tools/patcher/controls/controller_motion.h b/tools/patcher/controls/controller_motion.h
index c700dfba6f2..a294aab774e 100644
--- a/tools/patcher/controls/controller_motion.h
+++ b/tools/patcher/controls/controller_motion.h
@@ -4,8 +4,6 @@
 
 #if HAS_GAMECTRL || HAS_JOYSTICK || HAS_KBCTRL || HAS_DPAD
 
-#include <SDL.h>
-
 #include "./axis_direction.h"
 #include "./controller.h"
 
diff --git a/tools/patcher/controls/devices/game_controller.h b/tools/patcher/controls/devices/game_controller.h
index 1b64bc93030..bdc244ded2c 100644
--- a/tools/patcher/controls/devices/game_controller.h
+++ b/tools/patcher/controls/devices/game_controller.h
@@ -9,8 +9,6 @@ static_assert(false, "GameController is not supported in SDL1.");
 
 #include <SDL.h>
 
-#include "../defs.h"
-
 #include "../controller_buttons.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/tools/patcher/controls/devices/joystick.h b/tools/patcher/controls/devices/joystick.h
index 537c9d3c105..aa592ba0e8c 100644
--- a/tools/patcher/controls/devices/joystick.h
+++ b/tools/patcher/controls/devices/joystick.h
@@ -11,8 +11,6 @@
 #include "utils/sdl2_to_1_2_backports.h"
 #endif
 
-#include "../defs.h"
-
 #include "../controller_buttons.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/tools/patcher/controls/devices/kbcontroller.h b/tools/patcher/controls/devices/kbcontroller.h
index 4a6cc0c796d..932cbd5a4a7 100644
--- a/tools/patcher/controls/devices/kbcontroller.h
+++ b/tools/patcher/controls/devices/kbcontroller.h
@@ -3,7 +3,7 @@
 // Keyboard keys acting like gamepad buttons
 #if HAS_KBCTRL
 #include <SDL.h>
-#include "../defs.h"
+
 #include "../controller_buttons.h"
 
 DEVILUTION_BEGIN_NAMESPACE
diff --git a/tools/patcher/controls/game_controls.h b/tools/patcher/controls/game_controls.h
index 51f6d79ae59..ee9299f881a 100644
--- a/tools/patcher/controls/game_controls.h
+++ b/tools/patcher/controls/game_controls.h
@@ -2,9 +2,6 @@
 
 #if HAS_GAMECTRL || HAS_JOYSTICK || HAS_KBCTRL || HAS_DPAD
 
-//#include <cstdint>
-#include <SDL.h>
-
 #include "./axis_direction.h"
 #include "./controller.h"