diff --git a/gfx/font_gl_driver.h b/gfx/font_gl_driver.h
index 1abb134728..1fbc080255 100644
--- a/gfx/font_gl_driver.h
+++ b/gfx/font_gl_driver.h
@@ -23,12 +23,6 @@
 
 struct font_glyph;
 
-/* XXX: please include gl_common.h before this file */
-typedef struct gl_raster_block {
-   bool fullscreen;
-   gl_coord_array_t carr;
-} gl_font_raster_block_t;
-
 typedef struct gl_font_renderer
 {
    void *(*init)(void *data, const char *font_path, float font_size);
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index befa2ddc38..54cf86ec28 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -254,6 +254,12 @@ typedef struct gl_coord_array
    unsigned allocated;
 } gl_coord_array_t;
 
+typedef struct gl_raster_block
+{
+   bool fullscreen;
+   gl_coord_array_t carr;
+} gl_font_raster_block_t;
+
 struct gl_font_renderer;
 
 typedef struct gl