diff --git a/gfx/drivers_font/ctr_font.c b/gfx/drivers_font/ctr_font.c
index eda1809bc1..230465019a 100644
--- a/gfx/drivers_font/ctr_font.c
+++ b/gfx/drivers_font/ctr_font.c
@@ -28,7 +28,6 @@
 #include "../drivers/ctr_gu.h"
 #include "../../ctr/gpu_old.h"
 
-#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 /* FIXME: this is just a workaround to avoid
diff --git a/gfx/drivers_font/d3d10_font.c b/gfx/drivers_font/d3d10_font.c
index 06556dabfa..0efbf8ee4f 100644
--- a/gfx/drivers_font/d3d10_font.c
+++ b/gfx/drivers_font/d3d10_font.c
@@ -16,7 +16,6 @@
 
 #define CINTERFACE
 
-#include <stdio.h>
 #include <string.h>
 #include <malloc.h>
 #include <math.h>
@@ -25,7 +24,6 @@
 #include "../font_driver.h"
 #include "../common/d3d10_common.h"
 
-#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct
diff --git a/gfx/drivers_font/d3d11_font.c b/gfx/drivers_font/d3d11_font.c
index ebce7e43d8..214ede8dbe 100644
--- a/gfx/drivers_font/d3d11_font.c
+++ b/gfx/drivers_font/d3d11_font.c
@@ -15,7 +15,6 @@
 
 #define CINTERFACE
 
-#include <stdio.h>
 #include <string.h>
 #include <malloc.h>
 #include <math.h>
@@ -24,7 +23,6 @@
 #include "../font_driver.h"
 #include "../common/d3d11_common.h"
 
-#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct
diff --git a/gfx/drivers_font/d3d12_font.c b/gfx/drivers_font/d3d12_font.c
index fdcf5b53b9..97be969a42 100644
--- a/gfx/drivers_font/d3d12_font.c
+++ b/gfx/drivers_font/d3d12_font.c
@@ -15,7 +15,6 @@
 
 #define CINTERFACE
 
-#include <stdio.h>
 #include <string.h>
 #include <malloc.h>
 #include <math.h>
@@ -24,7 +23,6 @@
 #include "../font_driver.h"
 #include "../common/d3d12_common.h"
 
-#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct
diff --git a/gfx/drivers_font/gdi_font.c b/gfx/drivers_font/gdi_font.c
index 3f1ad8db0b..85ca199122 100644
--- a/gfx/drivers_font/gdi_font.c
+++ b/gfx/drivers_font/gdi_font.c
@@ -20,19 +20,20 @@
 #include <encodings/utf.h>
 #include <lists/string_list.h>
 
+#include <windows.h>
+#include <wingdi.h>
+
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
 
-#include "../font_driver.h"
-#include "../../configuration.h"
 #include "../../retroarch.h"
-#include "../../verbosity.h"
 #include "../common/gdi_common.h"
 #include "../common/win32_common.h"
 
-#include <windows.h>
-#include <wingdi.h>
+#include "../font_driver.h"
+#include "../../verbosity.h"
+
 
 typedef struct
 {
diff --git a/gfx/drivers_font/gl1_raster_font.c b/gfx/drivers_font/gl1_raster_font.c
index fab29689f6..0421f17654 100644
--- a/gfx/drivers_font/gl1_raster_font.c
+++ b/gfx/drivers_font/gl1_raster_font.c
@@ -23,7 +23,6 @@
 
 #include "../common/gl1_common.h"
 #include "../font_driver.h"
-#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 /* TODO: Move viewport side effects to the caller: it's a source of bugs. */
diff --git a/gfx/drivers_font/gl_core_raster_font.c b/gfx/drivers_font/gl_core_raster_font.c
index 3abd0e59ec..d991fc5e49 100644
--- a/gfx/drivers_font/gl_core_raster_font.c
+++ b/gfx/drivers_font/gl_core_raster_font.c
@@ -24,7 +24,6 @@
 
 #include "../common/gl_core_common.h"
 #include "../font_driver.h"
-#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 /* TODO: Move viewport side effects to the caller: it's a source of bugs. */
diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c
index a6cea8a6f1..8383cb1330 100644
--- a/gfx/drivers_font/gl_raster_font.c
+++ b/gfx/drivers_font/gl_raster_font.c
@@ -23,7 +23,6 @@
 
 #include "../common/gl_common.h"
 #include "../font_driver.h"
-#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 /* TODO: Move viewport side effects to the caller: it's a source of bugs. */
diff --git a/gfx/drivers_font/switch_font.c b/gfx/drivers_font/switch_font.c
index 831000f8af..f69d846bae 100644
--- a/gfx/drivers_font/switch_font.c
+++ b/gfx/drivers_font/switch_font.c
@@ -25,7 +25,6 @@
 
 #include "../font_driver.h"
 
-#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #include "../common/switch_common.h"
diff --git a/gfx/drivers_font/wiiu_font.c b/gfx/drivers_font/wiiu_font.c
index be6c991655..bef879d79f 100644
--- a/gfx/drivers_font/wiiu_font.c
+++ b/gfx/drivers_font/wiiu_font.c
@@ -26,7 +26,6 @@
 #include "../../wiiu/system/memory.h"
 #include "../../wiiu/wiiu_dbg.h"
 
-#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 typedef struct