diff --git a/input/input_autodetect.c b/input/input_autodetect.c
index fb40ee8d9a..628fd1481a 100644
--- a/input/input_autodetect.c
+++ b/input/input_autodetect.c
@@ -25,7 +25,8 @@
 #include "input_config.h"
 #include "input_autodetect.h"
 
-#include "../general.h"
+#include "../configuration.h"
+#include "../runloop.h"
 #include "../verbosity.h"
 
 /* Adds an index for devices with the same name,
diff --git a/input/input_hid_driver.c b/input/input_hid_driver.c
index e3bfa24526..33c673e074 100644
--- a/input/input_hid_driver.c
+++ b/input/input_hid_driver.c
@@ -19,7 +19,6 @@
 #include <string.h>
 
 #include "input_hid_driver.h"
-#include "../general.h"
 #include "../string_list_special.h"
 #include "../verbosity.h"