diff --git a/gfx/font_driver.c b/gfx/font_driver.c
index 2626244d36..5fa4d1f988 100644
--- a/gfx/font_driver.c
+++ b/gfx/font_driver.c
@@ -16,7 +16,8 @@
 
 #include "font_driver.h"
 #include "video_thread_wrapper.h"
-#include "../general.h"
+
+#include "../configuration.h"
 #include "../verbosity.h"
 
 static const font_renderer_driver_t *font_backends[] = {
diff --git a/gfx/video_context_driver.c b/gfx/video_context_driver.c
index fecce22b21..de7a09cca9 100644
--- a/gfx/video_context_driver.c
+++ b/gfx/video_context_driver.c
@@ -24,7 +24,7 @@
 #include "../config.h"
 #endif
 
-#include "../general.h"
+#include "../configuration.h"
 #include "../verbosity.h"
 
 static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
diff --git a/gfx/video_filter.c b/gfx/video_filter.c
index cc2903bba0..3383c1b785 100644
--- a/gfx/video_filter.c
+++ b/gfx/video_filter.c
@@ -25,7 +25,6 @@
 #include "../frontend/frontend_driver.h"
 #include "../config_file_userdata.h"
 #include "../dynamic.h"
-#include "../general.h"
 #include "../performance_counters.h"
 #include "../verbosity.h"
 #include "video_filter.h"
diff --git a/gfx/video_state_python.c b/gfx/video_state_python.c
index ae678b03a3..f6737a6ca3 100644
--- a/gfx/video_state_python.c
+++ b/gfx/video_state_python.c
@@ -29,7 +29,6 @@
 #include "video_state_python.h"
 #include "../dynamic.h"
 #include "../core.h"
-#include "../general.h"
 #include "../verbosity.h"
 #include "../input/input_config.h"
 
diff --git a/gfx/video_state_tracker.c b/gfx/video_state_tracker.c
index 6926b4bc6e..3d6f84dae7 100644
--- a/gfx/video_state_tracker.c
+++ b/gfx/video_state_tracker.c
@@ -18,8 +18,9 @@
 #include <stdlib.h>
 #include <compat/strl.h>
 #include <retro_inline.h>
-#include "../general.h"
+
 #include "../input/input_config.h"
+#include "../configuration.h"
 #include "../verbosity.h"
 
 #ifdef HAVE_PYTHON