diff --git a/gfx/d3d/render_chain_cg.cpp b/gfx/d3d/render_chain_cg.cpp
index 15da7bceff..bf444490e8 100644
--- a/gfx/d3d/render_chain_cg.cpp
+++ b/gfx/d3d/render_chain_cg.cpp
@@ -978,10 +978,11 @@ static void cg_d3d9_renderchain_convert_geometry(
 	  void *data, const void *info_data,
       unsigned *out_width, unsigned *out_height,
       unsigned width, unsigned height,
-      D3DVIEWPORT *final_viewport)
+      void *final_viewport_data)
 {
-   const LinkInfo *info = (const LinkInfo*)info_data;
-   cg_renderchain_t *chain = (cg_renderchain_t*)data;
+   const LinkInfo *info        = (const LinkInfo*)info_data;
+   cg_renderchain_t *chain     = (cg_renderchain_t*)data;
+   D3DVIEWPORT *final_viewport = (D3DVIEWPORT*)final_viewport_data; 
 
    if (!chain || !info)
       return;
diff --git a/gfx/d3d/render_chain_driver.h b/gfx/d3d/render_chain_driver.h
index ff7f597522..f7e7437713 100644
--- a/gfx/d3d/render_chain_driver.h
+++ b/gfx/d3d/render_chain_driver.h
@@ -17,7 +17,6 @@
 #ifndef __D3D_RENDER_CHAIN_H
 #define __D3D_RENDER_CHAIN_H
 
-#include "d3d.h"
 #include "../video_state_tracker.h"
 #include "../video_shader_parse.h"
 #include "../../libretro.h"
@@ -62,7 +61,7 @@ typedef struct renderchain_driver
    void (*convert_geometry)(void *data, const void *info_data,
          unsigned *out_width, unsigned *out_height,
          unsigned width, unsigned height,
-         D3DVIEWPORT *final_viewport);
+         void *final_viewport);
    const char *ident;
 } renderchain_driver_t;
 
diff --git a/gfx/d3d/render_chain_null.cpp b/gfx/d3d/render_chain_null.cpp
index 1fee8a8a5b..d02bb06b40 100644
--- a/gfx/d3d/render_chain_null.cpp
+++ b/gfx/d3d/render_chain_null.cpp
@@ -143,7 +143,7 @@ static void null_renderchain_convert_geometry(
 	  void *data, const void *info_data,
       unsigned *out_width, unsigned *out_height,
       unsigned width, unsigned height,
-      D3DVIEWPORT *final_viewport)
+      void *final_viewport_data)
 {
    (void)data;
    (void)info_data;
@@ -151,7 +151,7 @@ static void null_renderchain_convert_geometry(
    (void)out_height;
    (void)width;
    (void)height;
-   (void)final_viewport;
+   (void)final_viewport_data;
 }
 
 renderchain_driver_t null_renderchain = {