diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h
index 86adcba..c8051dc 100644
--- a/dlls/d3d8/d3d8_private.h
+++ b/dlls/d3d8/d3d8_private.h
@@ -33,7 +33,7 @@
 #include "wingdi.h"
 #include "wine/debug.h"
 #include "d3d8.h"
-#include "wine/wined3d_interface.h"
+#include "wine/wined3d.h"
 
 /* Device caps */
 #define INITIAL_SHADER_HANDLE_TABLE_SIZE        64
diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index 03c4d47..c925cf5 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -36,7 +36,7 @@
 #include "wine/unicode.h"
 
 #include "d3d9.h"
-#include "wine/wined3d_interface.h"
+#include "wine/wined3d.h"
 
 /* ===========================================================================
    Internal use
diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c
index e3bbfb9..b43ca0e 100644
--- a/dlls/ddraw/clipper.c
+++ b/dlls/ddraw/clipper.c
@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index cd1ce15..7a5eadb 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -35,7 +35,7 @@
 
 #include "ddcomimpl.h"
 
-#include "wine/wined3d_interface.h"
+#include "wine/wined3d.h"
 #include "wine/list.h"
 
 /*****************************************************************************
diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h
index 95cfe58..1e8ca51 100644
--- a/dlls/dxgi/dxgi_private.h
+++ b/dlls/dxgi/dxgi_private.h
@@ -28,7 +28,7 @@
 #include "objbase.h"
 
 #include "dxgi.h"
-#include "wine/wined3d_interface.h"
+#include "wine/wined3d.h"
 #ifdef DXGI_INIT_GUID
 #include "initguid.h"
 #endif
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index cb3a26d..dbbdf4f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -37,9 +37,9 @@
 #include "wine/debug.h"
 #include "wine/unicode.h"
 
+#include "objbase.h"
 #include "wined3d_private_types.h"
-#include "wine/wined3d_interface.h"
-#include "wine/wined3d_caps.h"
+#include "wine/wined3d.h"
 #include "wined3d_gl.h"
 #include "wine/list.h"