diff --git a/input/drivers_joypad/ctr_joypad.c b/input/drivers_joypad/ctr_joypad.c
index 9e1ee14a69..f0504511c2 100644
--- a/input/drivers_joypad/ctr_joypad.c
+++ b/input/drivers_joypad/ctr_joypad.c
@@ -14,11 +14,15 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include "../input_joypad_driver.h"
 #include "../input_driver.h"
 #include "../input_autodetect.h"
 #include "../../configuration.h"
-#include "../../general.h"
+#include "../../runloop.h"
 #include "../../configuration.h"
 #include "../../retroarch.h"
 #include "../../command.h"
diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c
index f9a4321fd9..4029cd0c3c 100644
--- a/input/drivers_joypad/dinput_joypad.c
+++ b/input/drivers_joypad/dinput_joypad.c
@@ -23,13 +23,17 @@
 
 #include <boolean.h>
 
-#include "../../configuration.h"
-#include "../../general.h"
-#include "../../verbosity.h"
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include "../input_autodetect.h"
 #include "../input_config.h"
 #include "../input_joypad_driver.h"
 #include "../input_keymaps.h"
+#include "../../configuration.h"
+#include "../../runloop.h"
+#include "../../verbosity.h"
 
 struct dinput_joypad
 {
diff --git a/input/drivers_joypad/xinput_joypad.c b/input/drivers_joypad/xinput_joypad.c
index 33e08df6cd..d739129075 100644
--- a/input/drivers_joypad/xinput_joypad.c
+++ b/input/drivers_joypad/xinput_joypad.c
@@ -30,11 +30,15 @@
 #include <dynamic/dylib.h>
 #include <boolean.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include "../input_autodetect.h"
 #include "../input_config.h"
 
 #include "../../configuration.h"
-#include "../../general.h"
+#include "../../runloop.h"
 #include "../../verbosity.h"
 
 
diff --git a/input/drivers_keyboard/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c
index fbb8dc1fcc..fdcc9cdb6b 100644
--- a/input/drivers_keyboard/keyboard_event_apple.c
+++ b/input/drivers_keyboard/keyboard_event_apple.c
@@ -17,11 +17,15 @@
 #include <stdint.h>
 #include <unistd.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include "../input_config.h"
 #include "../input_keymaps.h"
 #include "../input_keyboard.h"
 
-#include "../../general.h"
+#include "../../runloop.h"
 #include "../../driver.h"
 
 #include "keyboard_event_apple.h"
diff --git a/input/drivers_keyboard/keyboard_event_win32.cpp b/input/drivers_keyboard/keyboard_event_win32.cpp
index 8def077bd7..a40852110f 100644
--- a/input/drivers_keyboard/keyboard_event_win32.cpp
+++ b/input/drivers_keyboard/keyboard_event_win32.cpp
@@ -14,11 +14,15 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../general.h"
-#include "../input_keyboard.h"
-#include "../../gfx/common/win32_common.h"
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include "../input_config.h"
 #include "../input_keymaps.h"
+#include "../input_keyboard.h"
+#include "../../runloop.h"
+#include "../../gfx/common/win32_common.h"
 
 LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message,
 		WPARAM wparam, LPARAM lparam)