diff --git a/gfx/drivers_context/d3d_ctx.c b/gfx/drivers_context/d3d_ctx.c
index 822eeaecf0..c45de9c4c8 100644
--- a/gfx/drivers_context/d3d_ctx.c
+++ b/gfx/drivers_context/d3d_ctx.c
@@ -35,8 +35,10 @@
 
 #ifdef _MSC_VER
 #ifndef _XBOX
+#ifndef HAVE_DYLIB
 #pragma comment( lib, "d3d9" )
 #pragma comment( lib, "d3dx9" )
+#endif
 #ifdef HAVE_CG
 #pragma comment( lib, "cgd3d9" )
 #endif
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index e772669d49..1aee904734 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -415,7 +415,7 @@ static const d3d_renderchain_driver_t *renderchain_d3d_drivers[] = {
    &hlsl_d3d9_renderchain,
 #endif
 #if defined(_WIN32) && defined(HAVE_D3D8)
-   &d3d8_renderchain,
+   &d3d8_d3d_renderchain,
 #endif
    &null_d3d_renderchain,
    NULL
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 105d1669e3..8ddc510678 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -1381,7 +1381,7 @@ extern const shader_backend_t hlsl_backend;
 extern const shader_backend_t gl_cg_backend;
 extern const shader_backend_t shader_null_backend;
 
-extern d3d_renderchain_driver_t d3d8_renderchain;
+extern d3d_renderchain_driver_t d3d8_d3d_renderchain;
 extern d3d_renderchain_driver_t cg_d3d9_renderchain;
 extern d3d_renderchain_driver_t hlsl_d3d9_renderchain;
 extern d3d_renderchain_driver_t null_d3d_renderchain;