diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 600d27e907..765e4621ac 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -211,6 +211,8 @@ FONTS
 
 #if defined(HAVE_LIBDBGFONT)
 #include "../../gfx/fonts/ps_libdbgfont.c"
+#elif defined(HAVE_OPENGL)
+#include "../../gfx/fonts/gl_raster_font.c"
 #elif defined(_XBOX1)
 #include "../../gfx/fonts/xdk1_xfonts.c"
 #elif defined(_XBOX360)
diff --git a/gfx/context/androidegl_ctx.c b/gfx/context/androidegl_ctx.c
index 6c4e3395b2..e4f243e2d4 100644
--- a/gfx/context/androidegl_ctx.c
+++ b/gfx/context/androidegl_ctx.c
@@ -24,7 +24,7 @@
 #include "../../android/native/jni/android_general.h"
 #include "../image.h"
 
-#include "../gl_font.h"
+#include "../fonts/gl_font.h"
 #include <stdint.h>
 
 #if defined(HAVE_RMENU)
@@ -500,13 +500,6 @@ static unsigned gfx_ctx_get_resolution_width(unsigned resolution_id)
    return gl_width;
 }
 
-static void rmenu_ctx_render_msg(float xpos, float ypos, float scale, unsigned color, const char *msg, ...)
-{
-   gl_t *gl = driver.video_data;
-
-   gl_render_msg_place(gl, xpos, ypos, scale, color, msg);
-}
-
 static gfx_ctx_proc_t gfx_ctx_get_proc_address(const char *symbol)
 {
    rarch_assert(sizeof(void*) == sizeof(void (*)(void)));