diff --git a/gfx/drivers/caca_gfx.c b/gfx/drivers/caca_gfx.c
index 77758dda86..7d7106be21 100644
--- a/gfx/drivers/caca_gfx.c
+++ b/gfx/drivers/caca_gfx.c
@@ -25,6 +25,8 @@
 
 #include "../common/caca_common.h"
 
+#include "../font_driver.h"
+
 #include "../../driver.h"
 #include "../../verbosity.h"
 
diff --git a/gfx/drivers/d3d.cpp b/gfx/drivers/d3d.cpp
index b1100266c4..603749ba7e 100644
--- a/gfx/drivers/d3d.cpp
+++ b/gfx/drivers/d3d.cpp
@@ -47,6 +47,8 @@
 #include "../../menu/menu_driver.h"
 #endif
 
+#include "../font_driver.h"
+
 #include "../../core.h"
 #include "../../performance_counters.h"
 
diff --git a/gfx/drivers/dispmanx_gfx.c b/gfx/drivers/dispmanx_gfx.c
index 3a828a1c7c..7ba3883185 100644
--- a/gfx/drivers/dispmanx_gfx.c
+++ b/gfx/drivers/dispmanx_gfx.c
@@ -25,6 +25,8 @@
 #include "../../menu/menu_driver.h"
 #endif
 
+#include "../font_driver.h"
+
 #include "../../driver.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c
index e9c3e4c866..748c9dac30 100644
--- a/gfx/drivers/gdi_gfx.c
+++ b/gfx/drivers/gdi_gfx.c
@@ -25,6 +25,8 @@
 #include "../../menu/menu_driver.h"
 #endif
 
+#include "../font_driver.h"
+
 #include "../../driver.h"
 #include "../../configuration.h"
 #include "../../verbosity.h"
diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c
index b131268973..a68889b483 100644
--- a/gfx/drivers/gx_gfx.c
+++ b/gfx/drivers/gx_gfx.c
@@ -36,6 +36,8 @@
 #include "../../memory/wii/mem2_manager.h"
 #endif
 
+#include "../font_driver.h"
+
 #include "../drivers_font_renderer/bitmap.h"
 #include "../../defines/gx_defines.h"
 #include "../../configuration.h"
diff --git a/gfx/drivers/nullgfx.c b/gfx/drivers/nullgfx.c
index 30708f4dfd..fac6f4fdfa 100644
--- a/gfx/drivers/nullgfx.c
+++ b/gfx/drivers/nullgfx.c
@@ -14,8 +14,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../video_driver.h"
+
 #include "../../driver.h"
-#include "../../configuration.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 fbc25df83b..e2c8554539 100644
--- a/gfx/drivers/omap_gfx.c
+++ b/gfx/drivers/omap_gfx.c
@@ -42,6 +42,8 @@
 #include <gfx/video_frame.h>
 #include <string/stdstring.h>
 
+#include "../font_driver.h"
+
 #include "../../configuration.h"
 #include "../../driver.h"
 #include "../../retroarch.h"
@@ -49,8 +51,6 @@
 
 #include "../video_context_driver.h"
 
-#include "../font_driver.h"
-
 typedef struct omapfb_page
 {
   unsigned yoffset;
diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c
index 1185064407..c4dff6d424 100644
--- a/gfx/drivers/psp1_gfx.c
+++ b/gfx/drivers/psp1_gfx.c
@@ -32,6 +32,8 @@
 #include "../../menu/menu_driver.h"
 #endif
 
+#include "../font_driver.h"
+
 #include "../../defines/psp_defines.h"
 #include "../../runloop.h"
 
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index 5613a63131..d4cc2c439f 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -35,13 +35,14 @@
 #include "SDL.h"
 #include "SDL_syswm.h"
 
+#include "../font_driver.h"
+
 #include "../../configuration.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
 #include "../../performance_counters.h"
 #include "../../verbosity.h"
 #include "../video_context_driver.h"
-#include "../font_driver.h"
 
 typedef struct sdl2_tex
 {
diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c
index e79fd926a9..f4cb032517 100644
--- a/gfx/drivers/sdl_gfx.c
+++ b/gfx/drivers/sdl_gfx.c
@@ -38,12 +38,13 @@
 #include "SDL.h"
 #include "SDL_syswm.h"
 
+#include "../font_driver.h"
+
 #include "../../configuration.h"
 #include "../../runloop.h"
 #include "../../performance_counters.h"
 
 #include "../video_context_driver.h"
-#include "../font_driver.h"
 
 typedef struct sdl_menu_frame
 {
diff --git a/gfx/drivers/sunxi_gfx.c b/gfx/drivers/sunxi_gfx.c
index 3c290fa22c..25ee4eb3e0 100644
--- a/gfx/drivers/sunxi_gfx.c
+++ b/gfx/drivers/sunxi_gfx.c
@@ -32,9 +32,10 @@
 #include "../../menu/menu_driver.h"
 #endif
 
+#include "../font_driver.h"
+
 #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 700e1997a2..7016da0567 100644
--- a/gfx/drivers/vg.c
+++ b/gfx/drivers/vg.c
@@ -35,12 +35,13 @@
 #include "../../menu/menu_driver.h"
 #endif
 
+#include "../font_driver.h"
 #include "../video_context_driver.h"
+
 #include "../../retroarch.h"
 #include "../../runloop.h"
 #include "../../driver.h"
 #include "../../performance_counters.h"
-#include "../font_driver.h"
 #include "../../content.h"
 #include "../../runloop.h"
 #include "../../verbosity.h"
diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c
index c4b0a32267..428f51ce47 100644
--- a/gfx/drivers/vita2d_gfx.c
+++ b/gfx/drivers/vita2d_gfx.c
@@ -28,6 +28,8 @@
 #include "../../menu/menu_driver.h"
 #endif
 
+#include "../font_driver.h"
+
 #include "../common/vita2d_common.h"
 #include "../../driver.h"
 #include "../../runloop.h"
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 701ccb1081..675ecbac9a 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -34,6 +34,8 @@
 #include "../../menu/menu_driver.h"
 #endif
 
+#include "../font_driver.h"
+
 #include "../common/vulkan_common.h"
 
 #include "../../driver.h"
@@ -45,7 +47,6 @@
 #include "../../runloop.h"
 #include "../../verbosity.h"
 
-#include "../font_driver.h"
 #include "../video_context_driver.h"
 #include "../video_coord_array.h"
 
diff --git a/gfx/drivers/wiiu_gfx.c b/gfx/drivers/wiiu_gfx.c
index c1fb356e5f..53c91e564f 100644
--- a/gfx/drivers/wiiu_gfx.c
+++ b/gfx/drivers/wiiu_gfx.c
@@ -37,6 +37,8 @@
 
 #include "wiiu_dbg.h"
 
+#include "../font_driver.h"
+
 #define _X 0x00
 #define _Y 0x01
 #define _Z 0x02
diff --git a/gfx/drivers/xenon360_gfx.c b/gfx/drivers/xenon360_gfx.c
index da74eac58b..8bf7f146b7 100644
--- a/gfx/drivers/xenon360_gfx.c
+++ b/gfx/drivers/xenon360_gfx.c
@@ -26,6 +26,8 @@
 #include "../../config.h"
 #endif
 
+#include "../font_driver.h"
+
 #include "../../driver.h"
 #include "../../runloop.h"
 
diff --git a/gfx/drivers/xshm_gfx.c b/gfx/drivers/xshm_gfx.c
index 31bf833df0..042d23f605 100644
--- a/gfx/drivers/xshm_gfx.c
+++ b/gfx/drivers/xshm_gfx.c
@@ -32,6 +32,8 @@
 #include "../../menu/menu_driver.h"
 #endif
 
+#include "../font_driver.h"
+
 #include "../common/x11_common.h"
 
 typedef struct xshm
diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c
index 463e1f28c2..734de98dc5 100644
--- a/gfx/drivers/xvideo.c
+++ b/gfx/drivers/xvideo.c
@@ -38,10 +38,11 @@
 #include "../../menu/menu_driver.h"
 #endif
 
+#include "../font_driver.h"
+
 #include "../../configuration.h"
 #include "../../frontend/frontend_driver.h"
 #include "../../verbosity.h"
-#include "../font_driver.h"
 
 #include "../common/x11_common.h"