diff --git a/gfx/state_tracker.c b/gfx/state_tracker.c
index 46f911a744..26743273c9 100644
--- a/gfx/state_tracker.c
+++ b/gfx/state_tracker.c
@@ -16,6 +16,7 @@
 #include "state_tracker.h"
 #include <stdlib.h>
 #include <compat/strl.h>
+#include "../general.h"
 #include "../input/input_common.h"
 
 #ifdef HAVE_PYTHON
diff --git a/input/input_common.c b/input/input_common.c
index 6ab71f245c..2d7311cdbb 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -20,7 +20,6 @@
 #include <ctype.h>
 
 #include "../general.h"
-#include "../driver.h"
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
diff --git a/input/input_common.h b/input/input_common.h
index ac01e4ae70..aeb2b48a4b 100644
--- a/input/input_common.h
+++ b/input/input_common.h
@@ -18,10 +18,9 @@
 
 #include "input_autodetect.h"
 #include "input_context.h"
-#include "../driver.h"
 #include <file/config_file.h>
-#include "../general.h"
 #include <stdint.h>
+#include "../driver.h"
 
 #ifdef __cplusplus
 extern "C" {