diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c
index a0a0f4fdd0..5dcc51d036 100644
--- a/gfx/drivers_font/gl_raster_font.c
+++ b/gfx/drivers_font/gl_raster_font.c
@@ -138,11 +138,9 @@ static int get_message_width(gl_raster_t *font, const char *msg)
       for (i = 0; i < msg_len; i++)
       {
          const struct font_glyph *glyph = 
-            (const struct font_glyph*)
             font->font_driver->get_glyph(font->font_data, (uint8_t)msg[i]);
          if (!glyph) /* Do something smarter here ... */
-            glyph = (const struct font_glyph*)
-               font->font_driver->get_glyph(font->font_data, '?');
+            glyph = font->font_driver->get_glyph(font->font_data, '?');
          if (!glyph)
             continue;
 
@@ -214,10 +212,10 @@ static void gl_raster_font_render_message(
       {
          int off_x, off_y, tex_x, tex_y, width, height;
          const struct font_glyph *glyph =
-            (const struct font_glyph*)font->font_driver->get_glyph(font->font_data, (uint8_t)msg[i]);
+            font->font_driver->get_glyph(font->font_data, (uint8_t)msg[i]);
 
          if (!glyph) /* Do something smarter here ... */
-            glyph = (const struct font_glyph*)font->font_driver->get_glyph(font->font_data, '?');
+            glyph = font->font_driver->get_glyph(font->font_data, '?');
          if (!glyph)
             continue;
 
@@ -363,7 +361,7 @@ static void gl_raster_font_render_msg(void *data, const char *msg,
       gl_raster_font_restore_viewport(gl);
 }
 
-static const void *gl_raster_font_get_glyph(
+static const struct font_glyph *gl_raster_font_get_glyph(
       void *data, uint32_t code)
 {
    gl_raster_t *font = (gl_raster_t*)data;
diff --git a/gfx/drivers_font_renderer/bitmapfont.c b/gfx/drivers_font_renderer/bitmapfont.c
index 10626c5866..02ff13b9a1 100644
--- a/gfx/drivers_font_renderer/bitmapfont.c
+++ b/gfx/drivers_font_renderer/bitmapfont.c
@@ -40,7 +40,7 @@ static const struct font_atlas *font_renderer_bmp_get_atlas(void *data)
    return &handle->atlas;
 }
 
-static const void *font_renderer_bmp_get_glyph(
+static const struct font_glyph *font_renderer_bmp_get_glyph(
       void *data, uint32_t code)
 {
    bm_renderer_t *handle = (bm_renderer_t*)data;
diff --git a/gfx/drivers_font_renderer/coretext.c b/gfx/drivers_font_renderer/coretext.c
index 8acafa699d..fb15f46235 100644
--- a/gfx/drivers_font_renderer/coretext.c
+++ b/gfx/drivers_font_renderer/coretext.c
@@ -45,7 +45,7 @@ static const struct font_atlas *font_renderer_ct_get_atlas(void *data)
   return &handle->atlas;
 }
 
-static const void *font_renderer_ct_get_glyph(void *data, uint32_t code)
+static const struct font_glyph *font_renderer_ct_get_glyph(void *data, uint32_t code)
 {
    ct_font_renderer_t *handle   = (ct_font_renderer_t*)data;
 
diff --git a/gfx/drivers_font_renderer/freetype.c b/gfx/drivers_font_renderer/freetype.c
index 1f5ac6edb5..9890d21823 100644
--- a/gfx/drivers_font_renderer/freetype.c
+++ b/gfx/drivers_font_renderer/freetype.c
@@ -45,7 +45,7 @@ static const struct font_atlas *font_renderer_ft_get_atlas(void *data)
    return &handle->atlas;
 }
 
-static const void *font_renderer_ft_get_glyph(
+static const struct font_glyph *font_renderer_ft_get_glyph(
       void *data, uint32_t code)
 {
    ft_font_renderer_t *handle = (ft_font_renderer_t*)data;
diff --git a/gfx/font_renderer_driver.h b/gfx/font_renderer_driver.h
index 73842bef78..1c34e02b44 100644
--- a/gfx/font_renderer_driver.h
+++ b/gfx/font_renderer_driver.h
@@ -67,7 +67,7 @@ typedef struct font_renderer
          const void *params);
    const char *ident;
 
-   const void *(*get_glyph)(void *data, uint32_t code);
+   const struct font_glyph *(*get_glyph)(void *data, uint32_t code);
    void (*bind_block)(void *data, void *block);
    void (*flush)(void *data);
 } font_renderer_t;
@@ -85,7 +85,7 @@ typedef struct font_renderer_driver
    const struct font_atlas *(*get_atlas)(void *data);
 
    /* Returns NULL if no glyph for this code is found. */
-   const void *(*get_glyph)(void *data, uint32_t code);
+   const struct font_glyph *(*get_glyph)(void *data, uint32_t code);
 
    void (*free)(void *data);