diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c
index 5d47351391..497521de79 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;
 
-   gfx_font_raster_block_t *block;
+   video_font_raster_block_t *block;
 } gl_raster_t;
 
 static void gl_raster_font_free_font(void *data);
@@ -520,7 +520,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;
-   gfx_font_raster_block_t *block = font ? font->block : NULL;
+   video_font_raster_block_t *block = font ? font->block : NULL;
 
    if (!font || !block || !block->carr.coords.vertices)
       return;
@@ -533,7 +533,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;
-   gfx_font_raster_block_t *block = (gfx_font_raster_block_t*)userdata;
+   video_font_raster_block_t *block = (video_font_raster_block_t*)userdata;
 
    if (font)
       font->block = block;
diff --git a/gfx/video_coord_array.h b/gfx/video_coord_array.h
index 88116a7b15..1fd6588c46 100644
--- a/gfx/video_coord_array.h
+++ b/gfx/video_coord_array.h
@@ -82,11 +82,11 @@ typedef struct video_coord_array
    unsigned allocated;
 } video_coord_array_t;
 
-typedef struct gfx_raster_block
+typedef struct video_font_raster_block
 {
    bool fullscreen;
    video_coord_array_t carr;
-} gfx_font_raster_block_t;
+} video_font_raster_block_t;
 
 bool video_coord_array_append(video_coord_array_t *ca,
       const video_coords_t *coords, unsigned count);
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index f30f1a0eae..49c88ed897 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -109,7 +109,7 @@ typedef struct mui_handle
       size_t selection_ptr;
    } categories;
 
-   gfx_font_raster_block_t list_block;
+   video_font_raster_block_t list_block;
    float scroll_y;
 } mui_handle_t;
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index c85d218b1e..5391e0184e 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -243,7 +243,7 @@ typedef struct xmb_handle
    xmb_node_t history_tab_node;
    xmb_node_t add_tab_node;
 
-   gfx_font_raster_block_t raster_block;
+   video_font_raster_block_t raster_block;
 } xmb_handle_t;
 
 float gradient_dark_purple[16] = {
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index a5e4683016..4f60d85183 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -107,7 +107,7 @@ typedef struct zarch_handle
    math_matrix_4x4 mvp;
    unsigned width;
    unsigned height;
-   gfx_font_raster_block_t tmp_block;
+   video_font_raster_block_t tmp_block;
    unsigned hash;
 
    struct {