diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c
index 0fe79083dc..d56d6dbeff 100644
--- a/gfx/drivers/ctr_gfx.c
+++ b/gfx/drivers/ctr_gfx.c
@@ -21,11 +21,14 @@
 
 #include <retro_inline.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include "ctr_gu.h"
 
 #include "../../configuration.h"
 #include "../../command.h"
-#include "../../general.h"
 #include "../../driver.h"
 
 #include "../../retroarch.h"
diff --git a/gfx/drivers/dispmanx_gfx.c b/gfx/drivers/dispmanx_gfx.c
index 56e7264b47..bd7d8c7789 100644
--- a/gfx/drivers/dispmanx_gfx.c
+++ b/gfx/drivers/dispmanx_gfx.c
@@ -18,13 +18,13 @@
 #include <rthreads/rthreads.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../../config.h"
 #endif
 
 #include "../../configuration.h"
 #include "../../driver.h"
-#include "../../general.h"
 #include "../../retroarch.h"
+#include "../../runloop.h"
 #include "../video_context_driver.h"
 #include "../font_driver.h"
 
diff --git a/gfx/drivers/drm_gfx.c b/gfx/drivers/drm_gfx.c
index 05bf47b1b8..f87ae08271 100644
--- a/gfx/drivers/drm_gfx.c
+++ b/gfx/drivers/drm_gfx.c
@@ -24,15 +24,15 @@
 #include <string/stdstring.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../../config.h"
 #endif
 
+#include "../font_driver.h"
+#include "../video_context_driver.h"
 #include "../../configuration.h"
 #include "../../driver.h"
-#include "../../general.h"
 #include "../../retroarch.h"
-#include "../video_context_driver.h"
-#include "../font_driver.h"
+#include "../../runloop.h"
 
 #include "drm_pixformats.h"
 
diff --git a/gfx/drivers/exynos_gfx.c b/gfx/drivers/exynos_gfx.c
index 2bb4a68945..f6fbb9c996 100644
--- a/gfx/drivers/exynos_gfx.c
+++ b/gfx/drivers/exynos_gfx.c
@@ -31,12 +31,15 @@
 #include <retro_assert.h>
 #include <string/stdstring.h>
 
-#include "../common/drm_common.h"
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
 
-#include "../../general.h"
+#include "../common/drm_common.h"
+#include "../font_driver.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../font_driver.h"
+#include "../../runloop.h"
 
 /* TODO: Honor these properties: vsync, menu rotation, menu alpha, aspect ratio change */
 
diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c
index 6fe6c0748f..b5981aaaa4 100644
--- a/gfx/drivers/gx_gfx.c
+++ b/gfx/drivers/gx_gfx.c
@@ -23,20 +23,23 @@
 
 #include <streams/file_stream.h>
 
-#include "../../configuration.h"
-#include "../../driver.h"
-#include "../../general.h"
-#include "../drivers_font_renderer/bitmap.h"
-#include "../../menu/menu_driver.h"
-#include "../../menu/menu_display.h"
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
 
 #ifdef HW_RVL
 #include "../../memory/wii/mem2_manager.h"
 #endif
 
+#include "../drivers_font_renderer/bitmap.h"
 #include "../../defines/gx_defines.h"
+#include "../../configuration.h"
+#include "../../driver.h"
+#include "../../runloop.h"
+#include "../../menu/menu_driver.h"
+#include "../../menu/menu_display.h"
 
-extern syssram* __SYS_LockSram();
+extern syssram* __SYS_LockSram(void);
 extern u32 __SYS_UnlockSram(u32 write);
 
 struct gx_overlay_data
@@ -66,13 +69,6 @@ typedef struct gx_video
    void *framebuf[2];
 } gx_video_t;
 
-unsigned g_current_framebuf;
-
-bool g_vsync;
-OSCond g_video_cond;
-volatile bool g_draw_done;
-uint32_t g_orientation;
-
 static struct
 {
    uint32_t *data; /* needs to be resizable. */
@@ -87,13 +83,19 @@ static struct
    GXTexObj obj;
 } menu_tex ATTRIBUTE_ALIGN(32);
 
-uint8_t gx_fifo[256 * 1024] ATTRIBUTE_ALIGN(32);
-uint8_t display_list[1024] ATTRIBUTE_ALIGN(32);
+static OSCond g_video_cond;
+static unsigned g_current_framebuf;
+static volatile bool g_draw_done = false;
+static bool              g_vsync = false;
+static uint32_t g_orientation    = 0;
+
+static uint8_t gx_fifo[256 * 1024] ATTRIBUTE_ALIGN(32);
+static uint8_t display_list[1024]  ATTRIBUTE_ALIGN(32);
+static size_t display_list_size;
 uint16_t gx_xOrigin, gx_yOrigin;
 int8_t gx_system_xOrigin, gx_used_system_xOrigin;
 int8_t gx_xOriginNeg, gx_xOriginPos;
 int8_t gx_yOriginNeg, gx_yOriginPos;
-size_t display_list_size;
 GXRModeObj gx_mode;
 unsigned gx_old_width, gx_old_height;
 
diff --git a/gfx/drivers/nullgfx.c b/gfx/drivers/nullgfx.c
index 7e81f34f69..b736a7aab7 100644
--- a/gfx/drivers/nullgfx.c
+++ b/gfx/drivers/nullgfx.c
@@ -16,7 +16,6 @@
 
 #include "../../driver.h"
 #include "../../configuration.h"
-#include "../../runloop.h"
 #include "../../verbosity.h"
 
 static void *null_gfx_init(const video_info_t *video,
diff --git a/gfx/drivers/omap_gfx.c b/gfx/drivers/omap_gfx.c
index dfac30e872..a2310375a8 100644
--- a/gfx/drivers/omap_gfx.c
+++ b/gfx/drivers/omap_gfx.c
@@ -26,7 +26,7 @@
 #include <assert.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../../config.h"
 #endif
 
 #include <sys/mman.h>
@@ -39,8 +39,8 @@
 
 #include "../../configuration.h"
 #include "../../driver.h"
-#include "../../general.h"
 #include "../../retroarch.h"
+#include "../../runloop.h"
 
 #include "../video_context_driver.h"
 #include "../video_frame.h"
diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c
index fbf5647724..13978c555e 100644
--- a/gfx/drivers/psp1_gfx.c
+++ b/gfx/drivers/psp1_gfx.c
@@ -24,9 +24,13 @@
 #include <retro_assert.h>
 #include <retro_inline.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include "../../defines/psp_defines.h"
-#include "../../general.h"
 #include "../../driver.h"
+#include "../../runloop.h"
 
 #ifndef SCEGU_SCR_WIDTH
 #define SCEGU_SCR_WIDTH 480
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index 5fabb6e8ac..3653bd31b6 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -17,13 +17,21 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <retro_inline.h>
 #include <gfx/scaler/scaler.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
+#ifdef HAVE_X11
+#include "../common/x11_common.h"
+#endif
+
+#ifdef HAVE_MENU
+#include "../../menu/menu_driver.h"
+#endif
+
 #include "SDL.h"
 #include "SDL_syswm.h"
 
@@ -36,15 +44,6 @@
 #include "../video_context_driver.h"
 #include "../font_driver.h"
 
-#ifdef HAVE_X11
-#include "../common/x11_common.h"
-#endif
-
-#ifdef HAVE_MENU
-#include "../../menu/menu_driver.h"
-#endif
-
-
 typedef struct sdl2_tex
 {
    SDL_Texture *tex;
diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c
index e1b5ff3983..84eb4c14bc 100644
--- a/gfx/drivers/sdl_gfx.c
+++ b/gfx/drivers/sdl_gfx.c
@@ -21,27 +21,26 @@
 #include <gfx/scaler/scaler.h>
 #include <retro_assert.h>
 
-#include "SDL.h"
-
-#include "../../configuration.h"
-#include "../../driver.h"
-#include "../../general.h"
-#include "../../performance_counters.h"
-
-#include "../video_frame.h"
-#include "../video_context_driver.h"
-#include "../font_driver.h"
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
 
 #ifdef HAVE_X11
 #include "../common/x11_common.h"
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "SDL.h"
 #include "SDL_syswm.h"
 
+#include "../../configuration.h"
+#include "../../driver.h"
+#include "../../runloop.h"
+#include "../../performance_counters.h"
+
+#include "../video_frame.h"
+#include "../video_context_driver.h"
+#include "../font_driver.h"
+
 typedef struct sdl_menu_frame
 {
    bool active;
diff --git a/gfx/drivers/sunxi_gfx.c b/gfx/drivers/sunxi_gfx.c
index 8a65159496..9cf03d4d75 100644
--- a/gfx/drivers/sunxi_gfx.c
+++ b/gfx/drivers/sunxi_gfx.c
@@ -24,8 +24,12 @@
 #include <rthreads/rthreads.h>
 #include <string/stdstring.h>
 
-#include "../../general.h"
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include "../../retroarch.h"
+#include "../../runloop.h"
 #include "../font_driver.h"
 
 #define NUMPAGES 2
diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c
index 88d77febde..614b938a5e 100644
--- a/gfx/drivers/vg.c
+++ b/gfx/drivers/vg.c
@@ -26,9 +26,13 @@
 #include <gfx/math/matrix_3x3.h>
 #include <libretro.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
 #include "../video_context_driver.h"
-#include "../../general.h"
 #include "../../retroarch.h"
+#include "../../runloop.h"
 #include "../../driver.h"
 #include "../../performance_counters.h"
 #include "../font_driver.h"
diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c
index 4f52a9297c..e7d719e4bb 100644
--- a/gfx/drivers/vita2d_gfx.c
+++ b/gfx/drivers/vita2d_gfx.c
@@ -19,16 +19,20 @@
 #include <retro_inline.h>
 #include <string/stdstring.h>
 
-#include "../../defines/psp_defines.h"
-#include "../common/vita2d_common.h"
-#include "../../general.h"
-#include "../../driver.h"
-#include "../video_coord_array.h"
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
 
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
 #endif
 
+#include "../../defines/psp_defines.h"
+#include "../common/vita2d_common.h"
+#include "../../driver.h"
+#include "../../runloop.h"
+#include "../video_coord_array.h"
+
 static void vita2d_gfx_set_viewport(void *data, unsigned viewport_width,
       unsigned viewport_height, bool force_full, bool allow_rotate);
       
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 9d7d916b4a..c851f93412 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -18,10 +18,6 @@
 #include <math.h>
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <compat/strl.h>
 #include <gfx/scaler/scaler.h>
 #include <formats/image.h>
@@ -30,6 +26,14 @@
 #include <retro_assert.h>
 #include <libretro.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
+#ifdef HAVE_MENU
+#include "../../menu/menu_driver.h"
+#endif
+
 #include "../common/vulkan_common.h"
 
 #include "../../driver.h"
@@ -41,10 +45,6 @@
 #include "../../runloop.h"
 #include "../../verbosity.h"
 
-#ifdef HAVE_MENU
-#include "../../menu/menu_driver.h"
-#endif
-
 #include "../font_driver.h"
 #include "../video_context_driver.h"
 #include "../video_coord_array.h"
diff --git a/gfx/drivers/xenon360_gfx.c b/gfx/drivers/xenon360_gfx.c
index e8955acdc0..0411b2bd57 100644
--- a/gfx/drivers/xenon360_gfx.c
+++ b/gfx/drivers/xenon360_gfx.c
@@ -23,12 +23,12 @@
 #include <xenos/xenos.h>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "../../config.h"
 #endif
 
 #include "../../configuration.h"
 #include "../../driver.h"
-#include "../../general.h"
+#include "../../runloop.h"
 
 #define XE_W 512
 #define XE_H 512
diff --git a/gfx/drivers/xshm_gfx.c b/gfx/drivers/xshm_gfx.c
index d9efe7498f..6a5211a4a6 100644
--- a/gfx/drivers/xshm_gfx.c
+++ b/gfx/drivers/xshm_gfx.c
@@ -19,21 +19,20 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "../common/x11_common.h"
-
-#ifdef HAVE_MENU
-#include "../../menu/menu_driver.h"
-#endif
-
 #include <sys/shm.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/XShm.h>
 
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
+#ifdef HAVE_MENU
+#include "../../menu/menu_driver.h"
+#endif
+
+#include "../common/x11_common.h"
 
 typedef struct xshm
 {