diff --git a/Makefile.common b/Makefile.common
index 5524ff5591..f59932ed00 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -113,7 +113,7 @@ OBJ += frontend/frontend.o \
 		libretro-sdk/queues/message_queue.o \
 		rewind.o \
 		gfx/gfx_common.o \
-		gfx/fonts/bitmapfont.o \
+		gfx/drivers_font_renderer/bitmapfont.o \
 		input/input_autodetect.o \
 		input/input_joypad_driver.o \
 		input/input_joypad.o \
@@ -138,7 +138,7 @@ OBJ += frontend/frontend.o \
 		libretro-sdk/gfx/scaler/scaler_int.o \
 		libretro-sdk/gfx/scaler/scaler_filter.o \
 		gfx/image/image_rpng.o \
-		gfx/fonts/fonts.o \
+		gfx/font_renderer_driver.o \
 		gfx/video_filter.o \
 		audio/audio_resampler_driver.o \
 		audio/dsp_filter.o \
@@ -307,7 +307,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
 endif
 
 ifeq ($(HAVE_FREETYPE), 1)
-   OBJ += gfx/fonts/freetype.o
+   OBJ += gfx/drivers_font_renderer/freetype.o
    LIBS += $(FREETYPE_LIBS)
    DEFINES += $(FREETYPE_CFLAGS)
 endif
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index da2cdeabcf..46a7e2fad2 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -24,7 +24,7 @@
 #include <gfx/scaler/scaler.h>
 #include "../gfx_common.h"
 #include "../video_context_driver.h"
-#include "../fonts/fonts.h"
+#include "../font_renderer_driver.h"
 
 #ifdef HAVE_X11
 #include "../drivers_context/x11_common.h"
diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c
index 60930a8e0c..3e6e8e7b9e 100644
--- a/gfx/drivers/xvideo.c
+++ b/gfx/drivers/xvideo.c
@@ -20,7 +20,7 @@
 #include <signal.h>
 #include <math.h>
 #include "../gfx_common.h"
-#include "../fonts/fonts.h"
+#include "../font_renderer_driver.h"
 
 #include "../drivers_context/x11_common.h"
 
diff --git a/gfx/fonts/bitmap.bin b/gfx/drivers_font_renderer/bitmap.bin
similarity index 100%
rename from gfx/fonts/bitmap.bin
rename to gfx/drivers_font_renderer/bitmap.bin
diff --git a/gfx/fonts/bitmap.bmp b/gfx/drivers_font_renderer/bitmap.bmp
similarity index 100%
rename from gfx/fonts/bitmap.bmp
rename to gfx/drivers_font_renderer/bitmap.bmp
diff --git a/gfx/fonts/bitmap.h b/gfx/drivers_font_renderer/bitmap.h
similarity index 100%
rename from gfx/fonts/bitmap.h
rename to gfx/drivers_font_renderer/bitmap.h
diff --git a/gfx/fonts/bitmapfont.c b/gfx/drivers_font_renderer/bitmapfont.c
similarity index 99%
rename from gfx/fonts/bitmapfont.c
rename to gfx/drivers_font_renderer/bitmapfont.c
index b301518ecd..0ddec545b7 100644
--- a/gfx/fonts/bitmapfont.c
+++ b/gfx/drivers_font_renderer/bitmapfont.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fonts.h"
+#include "../font_renderer_driver.h"
 #include "bitmap.h"
 #include <string.h>
 #include <stdlib.h>
diff --git a/gfx/fonts/coretext.c b/gfx/drivers_font_renderer/coretext.c
similarity index 99%
rename from gfx/fonts/coretext.c
rename to gfx/drivers_font_renderer/coretext.c
index d7a671b120..1d166a19bb 100644
--- a/gfx/fonts/coretext.c
+++ b/gfx/drivers_font_renderer/coretext.c
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fonts.h"
+#include "../font_renderer_driver.h"
 #include "../../general.h"
 #include <string.h>
 #include <stddef.h>
diff --git a/gfx/fonts/freetype.c b/gfx/drivers_font_renderer/freetype.c
similarity index 99%
rename from gfx/fonts/freetype.c
rename to gfx/drivers_font_renderer/freetype.c
index 7ed8cb8b6c..30e1a192bb 100644
--- a/gfx/fonts/freetype.c
+++ b/gfx/drivers_font_renderer/freetype.c
@@ -14,7 +14,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fonts.h"
+#include "../font_renderer_driver.h"
 #include <file/file_path.h>
 #include "../../general.h"
 #include <string.h>
diff --git a/gfx/fonts/fonts.c b/gfx/font_renderer_driver.c
similarity index 95%
rename from gfx/fonts/fonts.c
rename to gfx/font_renderer_driver.c
index e4a433c1f8..78bc700703 100644
--- a/gfx/fonts/fonts.c
+++ b/gfx/font_renderer_driver.c
@@ -14,11 +14,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "fonts.h"
-#include "../../general.h"
+#include "font_renderer_driver.h"
+#include "../general.h"
 
 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include "../config.h"
 #endif
 
 static const font_renderer_driver_t *font_backends[] = {
diff --git a/gfx/fonts/fonts.h b/gfx/font_renderer_driver.h
similarity index 100%
rename from gfx/fonts/fonts.h
rename to gfx/font_renderer_driver.h
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index 9ad877af39..4b439d24d5 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -18,7 +18,7 @@
 #define __GL_COMMON_H
 
 #include "../general.h"
-#include "fonts/fonts.h"
+#include "font_renderer_driver.h"
 #include <gfx/math/matrix_4x4.h>
 #include <gfx/scaler/scaler.h>
 #include "font_gl_driver.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 2239987616..6caf9d7ba5 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -237,15 +237,15 @@ VIDEO DRIVER
 FONTS
 ============================================================ */
 
-#include "../gfx/fonts/fonts.c"
-#include "../gfx/fonts/bitmapfont.c"
+#include "../gfx/font_renderer_driver.c"
+#include "../gfx/drivers_font_renderer/bitmapfont.c"
 
 #if defined(HAVE_FREETYPE)
-#include "../gfx/fonts/freetype.c"
+#include "../gfx/drivers_font_renderer/freetype.c"
 #endif
 
 #if defined(__APPLE__)
-#include "../gfx/fonts/coretext.c"
+#include "../gfx/drivers_font_renderer/coretext.c"
 #endif
 
 #ifdef HAVE_OPENGL
diff --git a/menu/disp/lakka.h b/menu/disp/lakka.h
index 43afec4ac9..5ba01180d6 100644
--- a/menu/disp/lakka.h
+++ b/menu/disp/lakka.h
@@ -20,7 +20,7 @@
 #define _MENU_DISP_LAKKA_H
 
 #include "../../gfx/gl_common.h"
-#include "../../gfx/fonts/fonts.h"
+#include "../../gfx/font_renderer_driver.h"
 
 #define THEME "monochrome" // flatui or monochrome themes are available
 
diff --git a/menu/disp/rgui.c b/menu/disp/rgui.c
index 34fc8df343..64044c00df 100644
--- a/menu/disp/rgui.c
+++ b/menu/disp/rgui.c
@@ -26,7 +26,7 @@
 #include <compat/posix_string.h>
 #include <file/file_path.h>
 
-#include "../../gfx/fonts/bitmap.h"
+#include "../../gfx/drivers_font_renderer/bitmap.h"
 
 #include "shared.h"