diff --git a/Makefile.common b/Makefile.common
index 6c09fb62ec..26db41efea 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1245,7 +1245,8 @@ ifeq ($(HAVE_D3D9), 1)
 
    ifeq ($(HAVE_HLSL), 1)
       LIBS += -lcgD3D9
-      OBJ  += gfx/drivers_renderchain/d3d9_hlsl_renderchain.o
+      OBJ  += gfx/drivers_renderchain/d3d9_hlsl_renderchain.o \
+				  gfx/drivers_shader/shader_hlsl.o
    endif
 endif
 
diff --git a/gfx/drivers_shader/shader_hlsl.c b/gfx/drivers_shader/shader_hlsl.c
index a26e3e4fce..8fb74fc3a1 100644
--- a/gfx/drivers_shader/shader_hlsl.c
+++ b/gfx/drivers_shader/shader_hlsl.c
@@ -457,11 +457,7 @@ static void hlsl_use(void *data, void *shader_data, unsigned idx, bool set_activ
          hlsl_data->active_idx = idx;
 
       d3d_set_vertex_shader(d3dr, idx, hlsl_data->prg[idx].vprg);
-#ifdef _XBOX
-      D3DDevice_SetPixelShader(d3dr, hlsl_data->prg[idx].fprg);
-#else
       d3dr->SetPixelShader(hlsl_data->prg[idx].fprg);
-#endif
    }
 }
 
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 3bbfc30698..716d2b7baf 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -397,6 +397,7 @@ static const renderchain_driver_t *renderchain_drivers[] = {
 #endif
 #if defined(_WIN32) && defined(HAVE_D3D9) && defined(HAVE_HLSL)
    &hlsl_d3d9_renderchain,
+#endif
 #if defined(_WIN32) && defined(HAVE_D3D8)
    &d3d8_renderchain,
 #endif