diff --git a/gfx/drivers_context/sdl_gl_ctx.c b/gfx/drivers_context/sdl_gl_ctx.c
index c7d9f30de4..d806ff99ec 100644
--- a/gfx/drivers_context/sdl_gl_ctx.c
+++ b/gfx/drivers_context/sdl_gl_ctx.c
@@ -23,6 +23,7 @@
 #endif
 
 #include "../../configuration.h"
+#include "../../gfx/video_defines.h"
 #include "../../verbosity.h"
 
 #include "SDL.h"
diff --git a/gfx/video_defines.h b/gfx/video_defines.h
index 33f94d584b..79ccd61f3d 100644
--- a/gfx/video_defines.h
+++ b/gfx/video_defines.h
@@ -21,6 +21,12 @@
 
 RETRO_BEGIN_DECLS
 
+enum
+{
+   TEXTURES = 8,
+   TEXTURESMASK = TEXTURES - 1
+};
+
 enum texture_filter_type
 {
    TEXTURE_FILTER_LINEAR = 0,
@@ -160,6 +166,69 @@ struct Size2D
    unsigned width, height;
 };
 
+enum gfx_ctx_api
+{
+   GFX_CTX_NONE = 0,
+   GFX_CTX_OPENGL_API,
+   GFX_CTX_OPENGL_ES_API,
+   GFX_CTX_DIRECT3D8_API,
+   GFX_CTX_DIRECT3D9_API,
+   GFX_CTX_DIRECT3D10_API,
+   GFX_CTX_DIRECT3D11_API,
+   GFX_CTX_DIRECT3D12_API,
+   GFX_CTX_OPENVG_API,
+   GFX_CTX_VULKAN_API,
+   GFX_CTX_METAL_API,
+   GFX_CTX_RSX_API
+};
+
+enum display_metric_types
+{
+   DISPLAY_METRIC_NONE = 0,
+   DISPLAY_METRIC_MM_WIDTH,
+   DISPLAY_METRIC_MM_HEIGHT,
+   DISPLAY_METRIC_DPI,
+   DISPLAY_METRIC_PIXEL_WIDTH,
+   DISPLAY_METRIC_PIXEL_HEIGHT
+};
+
+enum display_flags
+{
+   GFX_CTX_FLAGS_NONE            = 0,
+   GFX_CTX_FLAGS_GL_CORE_CONTEXT,
+   GFX_CTX_FLAGS_MULTISAMPLING,
+   GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES,
+   GFX_CTX_FLAGS_HARD_SYNC,
+   GFX_CTX_FLAGS_BLACK_FRAME_INSERTION,
+   GFX_CTX_FLAGS_MENU_FRAME_FILTERING,
+   GFX_CTX_FLAGS_ADAPTIVE_VSYNC,
+   GFX_CTX_FLAGS_SHADERS_GLSL,
+   GFX_CTX_FLAGS_SHADERS_CG,
+   GFX_CTX_FLAGS_SHADERS_HLSL,
+   GFX_CTX_FLAGS_SHADERS_SLANG,
+   GFX_CTX_FLAGS_SCREENSHOTS_SUPPORTED
+};
+
+enum shader_uniform_type
+{
+   UNIFORM_1F = 0,
+   UNIFORM_2F,
+   UNIFORM_3F,
+   UNIFORM_4F,
+   UNIFORM_1FV,
+   UNIFORM_2FV,
+   UNIFORM_3FV,
+   UNIFORM_4FV,
+   UNIFORM_1I
+};
+
+enum shader_program_type
+{
+   SHADER_PROGRAM_VERTEX = 0,
+   SHADER_PROGRAM_FRAGMENT,
+   SHADER_PROGRAM_COMBINED
+};
+
 RETRO_END_DECLS
 
 #endif
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 30bd09a4cc..4772c4d8d7 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -132,80 +132,12 @@
 
 RETRO_BEGIN_DECLS
 
-enum
-{
-   TEXTURES = 8,
-   TEXTURESMASK = TEXTURES - 1
-};
-
 struct LinkInfo
 {
    struct video_shader_pass *pass;
    unsigned tex_w, tex_h;
 };
 
-enum gfx_ctx_api
-{
-   GFX_CTX_NONE = 0,
-   GFX_CTX_OPENGL_API,
-   GFX_CTX_OPENGL_ES_API,
-   GFX_CTX_DIRECT3D8_API,
-   GFX_CTX_DIRECT3D9_API,
-   GFX_CTX_DIRECT3D10_API,
-   GFX_CTX_DIRECT3D11_API,
-   GFX_CTX_DIRECT3D12_API,
-   GFX_CTX_OPENVG_API,
-   GFX_CTX_VULKAN_API,
-   GFX_CTX_METAL_API,
-   GFX_CTX_RSX_API
-};
-
-enum display_metric_types
-{
-   DISPLAY_METRIC_NONE = 0,
-   DISPLAY_METRIC_MM_WIDTH,
-   DISPLAY_METRIC_MM_HEIGHT,
-   DISPLAY_METRIC_DPI,
-   DISPLAY_METRIC_PIXEL_WIDTH,
-   DISPLAY_METRIC_PIXEL_HEIGHT
-};
-
-enum display_flags
-{
-   GFX_CTX_FLAGS_NONE            = 0,
-   GFX_CTX_FLAGS_GL_CORE_CONTEXT,
-   GFX_CTX_FLAGS_MULTISAMPLING,
-   GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES,
-   GFX_CTX_FLAGS_HARD_SYNC,
-   GFX_CTX_FLAGS_BLACK_FRAME_INSERTION,
-   GFX_CTX_FLAGS_MENU_FRAME_FILTERING,
-   GFX_CTX_FLAGS_ADAPTIVE_VSYNC,
-   GFX_CTX_FLAGS_SHADERS_GLSL,
-   GFX_CTX_FLAGS_SHADERS_CG,
-   GFX_CTX_FLAGS_SHADERS_HLSL,
-   GFX_CTX_FLAGS_SHADERS_SLANG,
-   GFX_CTX_FLAGS_SCREENSHOTS_SUPPORTED
-};
-
-enum shader_uniform_type
-{
-   UNIFORM_1F = 0,
-   UNIFORM_2F,
-   UNIFORM_3F,
-   UNIFORM_4F,
-   UNIFORM_1FV,
-   UNIFORM_2FV,
-   UNIFORM_3FV,
-   UNIFORM_4FV,
-   UNIFORM_1I
-};
-
-enum shader_program_type
-{
-   SHADER_PROGRAM_VERTEX = 0,
-   SHADER_PROGRAM_FRAGMENT,
-   SHADER_PROGRAM_COMBINED
-};
 
 struct shader_program_info
 {