diff --git a/Makefile b/Makefile
index 7bd725ba55..de2fd030cc 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ ifeq ($(HAVE_SDL), 1)
 endif
 
 ifeq ($(HAVE_OPENGL), 1)
-   OBJ += gfx/gl.o gfx/gfx_context.o gfx/gl_font.o gfx/fonts/gl_font.o gfx/math/matrix.o
+   OBJ += gfx/gl.o gfx/gfx_context.o gfx/gl_font.o gfx/fonts/gl_raster_font.o gfx/math/matrix.o
 
    ifeq ($(HAVE_KMS), 1)
       OBJ += gfx/context/drm_egl_ctx.o
diff --git a/Makefile.win b/Makefile.win
index 17512794a4..c90d9c5ea5 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -102,7 +102,7 @@ ifeq ($(HAVE_THREADS), 1)
 endif
 
 ifeq ($(HAVE_OPENGL), 1)
-   OBJ += gfx/gl.o gfx/math/matrix.o gfx/fonts/gl_font.o gfx/gfx_context.o gfx/context/wgl_ctx.o
+   OBJ += gfx/gl.o gfx/math/matrix.o gfx/gl_font.o gfx/fonts/gl_raster_font.o gfx/gfx_context.o gfx/context/wgl_ctx.o
    DEFINES += -DHAVE_OPENGL
    LIBS += -lopengl32 -lgdi32
 endif
diff --git a/gfx/fonts/gl_font.c b/gfx/fonts/gl_raster_font.c
similarity index 100%
rename from gfx/fonts/gl_font.c
rename to gfx/fonts/gl_raster_font.c