diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index b8a307074a..178b0c35c0 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -32,6 +32,10 @@
 #include <linux/input.h>
 #include <linux/kd.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
@@ -41,13 +45,9 @@
 #include "../input_config.h"
 #include "../input_joypad_driver.h"
 #include "../input_keymaps.h"
-#include "../../general.h"
+#include "../../runloop.h"
 #include "../../verbosity.h"
 
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"
-#endif
-
 typedef struct udev_input udev_input_t;
 
 typedef void (*device_handle_cb)(void *data,
diff --git a/input/input_remapping.c b/input/input_remapping.c
index 8a8c685aa3..5bdb77e198 100644
--- a/input/input_remapping.c
+++ b/input/input_remapping.c
@@ -13,13 +13,13 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/strl.h>
 #include <file/config_file.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
 #include "input_remapping.h"
-
-#include "../general.h"
+#include "../runloop.h"
 
 /**
  * input_remapping_load_file: