diff --git a/defines/d3d_defines.h b/defines/d3d_defines.h
index c4dccb2618..d579c1f98b 100644
--- a/defines/d3d_defines.h
+++ b/defines/d3d_defines.h
@@ -57,6 +57,7 @@
 #define LPDIRECT3DCUBETEXTURE          LPDIRECT3DCUBETEXTURE8
 #define LPDIRECT3DVOLUMETEXTURE        LPDIRECT3DVOLUMETEXTURE8
 #define LPDIRECT3DVERTEXBUFFER         LPDIRECT3DVERTEXBUFFER8
+#define LPDIRECT3DVERTEXDECLARATION    (void*)
 #define LPDIRECT3DSURFACE              LPDIRECT3DSURFACE8
 #define LPDIRECT3DRESOURCE             LPDIRECT3DRESOURCE8
 #define D3DVERTEXELEMENT               D3DVERTEXELEMENT8
diff --git a/gfx/common/d3d_common.c b/gfx/common/d3d_common.c
index 5de2e746c9..2e3f506907 100644
--- a/gfx/common/d3d_common.c
+++ b/gfx/common/d3d_common.c
@@ -217,7 +217,9 @@ void d3d_vertex_declaration_free(void *data)
    LPDIRECT3DVERTEXDECLARATION vertex_decl = (LPDIRECT3DVERTEXDECLARATION)data;
    if (!vertex_decl)
       return;
-#if defined(HAVE_D3D9) && !defined(__cplusplus)
+#if defined(HAVE_D3D8)
+   /* empty */
+#elif defined(HAVE_D3D9) && !defined(__cplusplus)
    IDirect3DVertexDeclaration9_Release(vertex_decl);
 #else
    vertex_decl->Release();
@@ -798,10 +800,8 @@ void d3d_disable_blend_func(void *data)
 
 void d3d_set_vertex_declaration(void *data, void *vertex_data)
 {
-   LPDIRECT3DDEVICE dev = (LPDIRECT3DDEVICE)data;
-#if defined(HAVE_D3D9)
+   LPDIRECT3DDEVICE dev             = (LPDIRECT3DDEVICE)data;
    LPDIRECT3DVERTEXDECLARATION decl = (LPDIRECT3DVERTEXDECLARATION)vertex_data;
-#endif
    if (!dev)
       return;