diff --git a/dlls/d3drm/d3drm_main.c b/dlls/d3drm/d3drm_main.c
index e87dcb840eb..3d5255f7b01 100644
--- a/dlls/d3drm/d3drm_main.c
+++ b/dlls/d3drm/d3drm_main.c
@@ -21,8 +21,9 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "d3d.h"
+#include "initguid.h"
 #include "d3drm.h"
-#include "d3drm_private.h"
 
 
 /***********************************************************************
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 83fdffaad66..9990d2c2b1a 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -18,8 +18,9 @@
  */
 
 #define COBJMACROS
-#include <d3drm.h>
+#include <d3d.h>
 #include <initguid.h>
+#include <d3drm.h>
 #include <d3drmwin.h>
 
 #include "wine/test.h"
diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c
index 9ca28099c97..760afe8af09 100644
--- a/dlls/dmband/dmutils.c
+++ b/dlls/dmband/dmutils.c
@@ -37,6 +37,7 @@
 #include "wine/unicode.h"
 #include "objbase.h"
 
+#include "initguid.h"
 #include "dmusici.h"
 #include "dmusicf.h"
 #include "dmusics.h"
diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c
index 240cc9d9736..c15c97d5001 100644
--- a/dlls/dmcompos/dmcompos_main.c
+++ b/dlls/dmcompos/dmcompos_main.c
@@ -20,6 +20,20 @@
 #include "config.h"
 #include "wine/port.h"
 
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnt.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "objbase.h"
+#include "initguid.h"
+#include "dmusici.h"
+
 #include "dmcompos_private.h"
 #include "rpcproxy.h"
 
diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c
index d069a015698..37302ff0eb6 100644
--- a/dlls/dmime/dmime_main.c
+++ b/dlls/dmime/dmime_main.c
@@ -18,8 +18,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "dmime_private.h"
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnt.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "objbase.h"
 #include "rpcproxy.h"
+#include "initguid.h"
+#include "dmusici.h"
+
+#include "dmime_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmime);
 
diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c
index 38faa8e22e1..f02e523ab09 100644
--- a/dlls/dmloader/dmloader_main.c
+++ b/dlls/dmloader/dmloader_main.c
@@ -17,8 +17,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "dmloader_private.h"
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnt.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "objbase.h"
 #include "rpcproxy.h"
+#include "initguid.h"
+#include "dmusici.h"
+
+#include "dmloader_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmloader);
 
diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c
index 6caf158d32c..6a3c686629e 100644
--- a/dlls/dmscript/dmscript_main.c
+++ b/dlls/dmscript/dmscript_main.c
@@ -20,8 +20,22 @@
 #include "config.h"
 #include "wine/port.h"
 
-#include "dmscript_private.h"
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnt.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "objbase.h"
 #include "rpcproxy.h"
+#include "initguid.h"
+#include "dmusici.h"
+
+#include "dmscript_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmscript);
 
diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c
index b76fa739ab5..11e3f62ea98 100644
--- a/dlls/dmstyle/dmstyle_main.c
+++ b/dlls/dmstyle/dmstyle_main.c
@@ -17,8 +17,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "dmstyle_private.h"
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnt.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "objbase.h"
 #include "rpcproxy.h"
+#include "initguid.h"
+#include "dmusici.h"
+
+#include "dmstyle_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);
 
diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c
index 8708787e733..ad172ab7c2b 100644
--- a/dlls/dmusic/dmusic_main.c
+++ b/dlls/dmusic/dmusic_main.c
@@ -21,9 +21,22 @@
 #include "wine/port.h"
 
 #include <stdio.h>
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnt.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "objbase.h"
+#include "rpcproxy.h"
+#include "initguid.h"
+#include "dmusici.h"
 
 #include "dmusic_private.h"
-#include "rpcproxy.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c
index a9be90c9604..b02f3720d0e 100644
--- a/dlls/dswave/dswave_main.c
+++ b/dlls/dswave/dswave_main.c
@@ -21,9 +21,22 @@
 #include "wine/port.h"
 
 #include <stdio.h>
+#include <stdarg.h>
+
+#define COBJMACROS
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnt.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "objbase.h"
+#include "rpcproxy.h"
+#include "initguid.h"
+#include "dmusici.h"
 
 #include "dswave_private.h"
-#include "rpcproxy.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dswave);
 
diff --git a/dlls/dxguid/dxguid.c b/dlls/dxguid/dxguid.c
index 4f34a4f2931..f923d9c25f8 100644
--- a/dlls/dxguid/dxguid.c
+++ b/dlls/dxguid/dxguid.c
@@ -36,7 +36,6 @@
 #include "mmsystem.h"
 #include "dsound.h"
 #include "dsconf.h"
-#include "dmusici.h"
 #include "dmusics.h"
 #include "dplay.h"
 #include "dplay8.h"
@@ -45,5 +44,4 @@
 #include "ddrawi.h"
 #include "dxdiag.h"
 #include "dxfile.h"
-#include "d3drm.h"
 #include "rmxfguid.h"