diff --git a/gfx/common/d3d9_common.h b/gfx/common/d3d9_common.h
index cab78e1018..79e3d01ad1 100644
--- a/gfx/common/d3d9_common.h
+++ b/gfx/common/d3d9_common.h
@@ -29,6 +29,37 @@
 
 RETRO_BEGIN_DECLS
 
+typedef struct d3d9_video d3d9_video_t;
+
+typedef struct d3d9_renderchain_driver
+{
+   void (*chain_free)(void *data);
+   void *(*chain_new)(void);
+   bool (*init)(void *data,
+         const void *video_info_data,
+         void *dev_data,
+         const void *final_viewport_data,
+         const void *info_data,
+         bool rgb32);
+   void (*set_final_viewport)(void *data,
+         void *renderchain_data, const void *viewport_data);
+   bool (*add_pass)(void *data, const void *info_data);
+   bool (*add_lut)(void *data,
+         const char *id, const char *path,
+         bool smooth);
+   void (*add_state_tracker)(void *data, void *tracker_data);
+   bool (*render)(void *chain_data, const void *data,
+         unsigned width, unsigned height, unsigned pitch, unsigned rotation);
+   void (*convert_geometry)(void *data, const void *info_data,
+         unsigned *out_width, unsigned *out_height,
+         unsigned width, unsigned height,
+         void *final_viewport);
+   void (*set_font_rect)(void *data, const void *param_data);
+   bool (*read_viewport)(void *data, uint8_t *buffer, bool is_idle);
+   void (*viewport_info)(void *data, struct video_viewport *vp);
+   const char *ident;
+} d3d9_renderchain_driver_t;
+
 typedef struct d3d9_video
 {
    bool keep_aspect;
@@ -43,7 +74,7 @@ typedef struct d3d9_video
    unsigned dev_rotation;
 
    overlay_t *menu;
-   const d3d_renderchain_driver_t *renderchain_driver;
+   const d3d9_renderchain_driver_t *renderchain_driver;
    void *renderchain_data;
 
    RECT font_rect;
diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c
index 1239c0c874..bb64bef32f 100644
--- a/gfx/drivers/d3d9.c
+++ b/gfx/drivers/d3d9.c
@@ -136,12 +136,12 @@ static bool d3d9_init_imports(d3d9_video_t *d3d)
    return true;
 }
 
-extern d3d_renderchain_driver_t cg_d3d9_renderchain;
-extern d3d_renderchain_driver_t hlsl_d3d9_renderchain;
+extern d3d9_renderchain_driver_t cg_d3d9_renderchain;
+extern d3d9_renderchain_driver_t hlsl_d3d9_renderchain;
 
 static bool renderchain_d3d_init_first(
       enum gfx_ctx_api api,
-      const d3d_renderchain_driver_t **renderchain_driver,
+      const d3d9_renderchain_driver_t **renderchain_driver,
       void **renderchain_handle)
 {
    switch (api)
@@ -149,7 +149,7 @@ static bool renderchain_d3d_init_first(
       case GFX_CTX_DIRECT3D9_API:
 #ifdef HAVE_D3D9
          {
-            static const d3d_renderchain_driver_t *renderchain_d3d_drivers[] = {
+            static const d3d9_renderchain_driver_t *renderchain_d3d_drivers[] = {
 #if defined(_WIN32) && defined(HAVE_CG)
                &cg_d3d9_renderchain,
 #endif
diff --git a/gfx/drivers_renderchain/d3d9_cg_renderchain.c b/gfx/drivers_renderchain/d3d9_cg_renderchain.c
index a5a75b3146..88dab9f5ad 100644
--- a/gfx/drivers_renderchain/d3d9_cg_renderchain.c
+++ b/gfx/drivers_renderchain/d3d9_cg_renderchain.c
@@ -1706,7 +1706,7 @@ static void d3d9_cg_renderchain_viewport_info(
    vp->full_height  = height;
 }
 
-d3d_renderchain_driver_t cg_d3d9_renderchain = {
+d3d9_renderchain_driver_t cg_d3d9_renderchain = {
    d3d9_cg_renderchain_free,
    d3d9_cg_renderchain_new,
    d3d9_cg_renderchain_init,
diff --git a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
index 8a56d834f1..a47bdae9d2 100644
--- a/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
+++ b/gfx/drivers_renderchain/d3d9_hlsl_renderchain.c
@@ -427,7 +427,7 @@ static void hlsl_d3d9_renderchain_viewport_info(
    vp->full_height  = height;
 }
 
-d3d_renderchain_driver_t hlsl_d3d9_renderchain = {
+d3d9_renderchain_driver_t hlsl_d3d9_renderchain = {
    hlsl_d3d9_renderchain_free,
    hlsl_d3d9_renderchain_new,
    hlsl_d3d9_renderchain_init,
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 82b5f4d3cd..1084e84b1e 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -825,34 +825,6 @@ typedef struct video_driver
    unsigned (*wrap_type_to_enum)(enum gfx_wrap_type type);
 } video_driver_t;
 
-typedef struct d3d_renderchain_driver
-{
-   void (*chain_free)(void *data);
-   void *(*chain_new)(void);
-   bool (*init)(void *data,
-         const void *video_info_data,
-         void *dev_data,
-         const void *final_viewport_data,
-         const void *info_data,
-         bool rgb32);
-   void (*set_final_viewport)(void *data,
-         void *renderchain_data, const void *viewport_data);
-   bool (*add_pass)(void *data, const void *info_data);
-   bool (*add_lut)(void *data,
-         const char *id, const char *path,
-         bool smooth);
-   void (*add_state_tracker)(void *data, void *tracker_data);
-   bool (*render)(void *chain_data, const void *data,
-         unsigned width, unsigned height, unsigned pitch, unsigned rotation);
-   void (*convert_geometry)(void *data, const void *info_data,
-         unsigned *out_width, unsigned *out_height,
-         unsigned width, unsigned height,
-         void *final_viewport);
-   void (*set_font_rect)(void *data, const void *param_data);
-   bool (*read_viewport)(void *data, uint8_t *buffer, bool is_idle);
-   void (*viewport_info)(void *data, struct video_viewport *vp);
-   const char *ident;
-} d3d_renderchain_driver_t;
 
 extern struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END];