diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 91fdb0a37b..7aeabd351b 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -24,6 +24,10 @@
 #include <math.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <compat/strl.h>
 #include <gfx/scaler/scaler.h>
 #include <gfx/math/matrix_4x4.h>
@@ -39,8 +43,8 @@
 #include "../../record/record_driver.h"
 #include "../../performance_counters.h"
 
-#include "../../general.h"
 #include "../../retroarch.h"
+#include "../../runloop.h"
 #include "../../verbosity.h"
 #include "../common/gl_common.h"
 
@@ -48,10 +52,6 @@
 #include "../video_thread_wrapper.h"
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "../font_driver.h"
 #include "../video_context_driver.h"
 #include "../video_frame.h"
diff --git a/gfx/drivers/nullgfx.c b/gfx/drivers/nullgfx.c
index 67c11a3958..79afcf69e6 100644
--- a/gfx/drivers/nullgfx.c
+++ b/gfx/drivers/nullgfx.c
@@ -14,8 +14,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../../general.h"
 #include "../../driver.h"
+#include "../../runloop.h"
+#include "../../verbosity.h"
 
 static void *null_gfx_init(const video_info_t *video,
       const input_driver_t **input, void **input_data)
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index 1d19bbebce..fb11e8e81d 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -17,14 +17,18 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <retro_inline.h>
 #include <gfx/scaler/scaler.h>
 
 #include "SDL.h"
 #include "SDL_syswm.h"
 #include "../../driver.h"
-#include "../../general.h"
 #include "../../retroarch.h"
+#include "../../runloop.h"
 #include "../../performance_counters.h"
 #include "../../verbosity.h"
 #include "../video_context_driver.h"
@@ -38,9 +42,6 @@
 #include "../../menu/menu_driver.h"
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 typedef struct sdl2_tex
 {
diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c
index 7ecd1a193f..411cfaabfa 100644
--- a/gfx/drivers/xvideo.c
+++ b/gfx/drivers/xvideo.c
@@ -30,9 +30,9 @@
 
 #include <retro_inline.h>
 
+#include "../../configuration.h"
 #include "../../driver.h"
 #include "../../frontend/frontend_driver.h"
-#include "../../general.h"
 #include "../../verbosity.h"
 #include "../font_driver.h"