diff --git a/gfx/drivers/gl_common.h b/gfx/drivers/gl_common.h
index b60e19addd..68f639806f 100644
--- a/gfx/drivers/gl_common.h
+++ b/gfx/drivers/gl_common.h
@@ -230,11 +230,11 @@ typedef struct gfx_coord_array
    unsigned allocated;
 } gfx_coord_array_t;
 
-typedef struct gl_raster_block
+typedef struct gfx_raster_block
 {
    bool fullscreen;
    gfx_coord_array_t carr;
-} gl_font_raster_block_t;
+} gfx_font_raster_block_t;
 
 struct gl_font_renderer;
 
diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c
index d8bc354d2a..de4ea93fa2 100644
--- a/gfx/drivers_font/gl_raster_font.c
+++ b/gfx/drivers_font/gl_raster_font.c
@@ -44,7 +44,7 @@ typedef struct
    const font_renderer_driver_t *font_driver;
    void *font_data;
 
-   gl_font_raster_block_t *block;
+   gfx_font_raster_block_t *block;
 } gl_raster_t;
 
 static void *gl_raster_font_init_font(void *data,
@@ -430,7 +430,7 @@ static const struct font_glyph *gl_raster_font_get_glyph(
 static void gl_raster_font_flush_block(void *data)
 {
    gl_raster_t       *font       = (gl_raster_t*)data;
-   gl_font_raster_block_t *block = font->block;
+   gfx_font_raster_block_t *block = font->block;
 
    if (font && block->carr.coords.vertices)
    {
@@ -443,7 +443,7 @@ static void gl_raster_font_flush_block(void *data)
 static void gl_raster_font_bind_block(void *data, void *userdata)
 {
    gl_raster_t *font = (gl_raster_t*)data;
-   gl_font_raster_block_t *block = (gl_font_raster_block_t*)userdata;
+   gfx_font_raster_block_t *block = (gfx_font_raster_block_t*)userdata;
 
    if (font)
       font->block = block;
diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index d4c39eb3f0..9243fe49d0 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -55,7 +55,7 @@ typedef struct glui_handle
       GLuint white;
    } textures;
 
-   gl_font_raster_block_t list_block;
+   gfx_font_raster_block_t list_block;
 } glui_handle_t;
 
 static void glui_blit_line(float x, float y,
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index ebb0d99620..f544c4b11d 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -222,7 +222,7 @@ typedef struct xmb_handle
    xmb_node_t settings_node;
    bool prevent_populate;
 
-   gl_font_raster_block_t raster_block;
+   gfx_font_raster_block_t raster_block;
 } xmb_handle_t;
 
 static const GLfloat rmb_vertex[] = {