diff --git a/gfx/drivers/gl2.c b/gfx/drivers/gl2.c
index cf6590a904..d0397ca872 100644
--- a/gfx/drivers/gl2.c
+++ b/gfx/drivers/gl2.c
@@ -100,6 +100,19 @@ typedef struct video_shader_ctx_scale
    struct gfx_fbo_scale *scale;
 } video_shader_ctx_scale_t;
 
+typedef struct video_shader_ctx_init
+{
+   const char *path;
+   const shader_backend_t *shader;
+   void *data;
+   void *shader_data;
+   enum rarch_shader_type shader_type;
+   struct
+   {
+      bool core_context_enabled;
+   } gl;
+} video_shader_ctx_init_t;
+
 static const shader_backend_t *gl2_shader_ctx_drivers[] = {
 #ifdef HAVE_GLSL
    &gl_glsl_backend,
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 72ebfb4e90..7958d09c49 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -60,6 +60,12 @@
 
 #define TIME_TO_FPS(last_time, new_time, frames) ((1000000.0f * (frames)) / ((new_time) - (last_time)))
 
+struct aspect_ratio_elem
+{
+   float value;
+   char name[64];
+};
+
 typedef struct
 {
    struct string_list *list;
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 083a0d2cec..54c4208cec 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -278,19 +278,6 @@ typedef struct shader_backend
    const char *ident;
 } shader_backend_t;
 
-typedef struct video_shader_ctx_init
-{
-   const char *path;
-   const shader_backend_t *shader;
-   void *data;
-   void *shader_data;
-   enum rarch_shader_type shader_type;
-   struct
-   {
-      bool core_context_enabled;
-   } gl;
-} video_shader_ctx_init_t;
-
 typedef struct video_shader_ctx_params
 {
    void *data;
@@ -622,14 +609,6 @@ typedef struct gfx_ctx_driver
    void (*make_current)(bool release);
 } gfx_ctx_driver_t;
 
-typedef struct gfx_ctx_size
-{
-   bool *quit;
-   bool *resize;
-   unsigned *width;
-   unsigned *height;
-} gfx_ctx_size_t;
-
 typedef struct gfx_ctx_mode
 {
    unsigned width;
@@ -643,13 +622,6 @@ typedef struct gfx_ctx_metrics
    enum display_metric_types type;
 } gfx_ctx_metrics_t;
 
-typedef struct gfx_ctx_aspect
-{
-   float *aspect;
-   unsigned width;
-   unsigned height;
-} gfx_ctx_aspect_t;
-
 typedef struct gfx_ctx_input
 {
    input_driver_t **input;
@@ -661,12 +633,6 @@ typedef struct gfx_ctx_ident
    const char *ident;
 } gfx_ctx_ident_t;
 
-struct aspect_ratio_elem
-{
-   float value;
-   char name[64];
-};
-
 /* Optionally implemented interface to poke more
  * deeply into video driver. */