diff --git a/reactos/dll/directx/wine/dmusic/buffer.c b/reactos/dll/directx/wine/dmusic/buffer.c
index 221100d84fc..c609c7f8a63 100644
--- a/reactos/dll/directx/wine/dmusic/buffer.c
+++ b/reactos/dll/directx/wine/dmusic/buffer.c
@@ -20,11 +20,8 @@
  */
 
 #include "dmusic_private.h"
-//#include "initguid.h"
 #include <dmksctrl.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-
 static inline IDirectMusicBufferImpl *impl_from_IDirectMusicBuffer(IDirectMusicBuffer *iface)
 {
     return CONTAINING_RECORD(iface, IDirectMusicBufferImpl, IDirectMusicBuffer_iface);
diff --git a/reactos/dll/directx/wine/dmusic/clock.c b/reactos/dll/directx/wine/dmusic/clock.c
index 2a8cd09e712..aa2da54d032 100644
--- a/reactos/dll/directx/wine/dmusic/clock.c
+++ b/reactos/dll/directx/wine/dmusic/clock.c
@@ -20,8 +20,6 @@
 
 #include "dmusic_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-
 static inline IReferenceClockImpl *impl_from_IReferenceClock(IReferenceClock *iface)
 {
     return CONTAINING_RECORD(iface, IReferenceClockImpl, IReferenceClock_iface);
diff --git a/reactos/dll/directx/wine/dmusic/collection.c b/reactos/dll/directx/wine/dmusic/collection.c
index e30f89d1219..e0596ab9330 100644
--- a/reactos/dll/directx/wine/dmusic/collection.c
+++ b/reactos/dll/directx/wine/dmusic/collection.c
@@ -20,7 +20,6 @@
 
 #include "dmusic_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 WINE_DECLARE_DEBUG_CHANNEL(dmfile);
 
 static inline IDirectMusicCollectionImpl *impl_from_IDirectMusicCollection(IDirectMusicCollection *iface)
diff --git a/reactos/dll/directx/wine/dmusic/dmusic.c b/reactos/dll/directx/wine/dmusic/dmusic.c
index e5efcb52d0a..f9f866e2fdc 100644
--- a/reactos/dll/directx/wine/dmusic/dmusic.c
+++ b/reactos/dll/directx/wine/dmusic/dmusic.c
@@ -19,12 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdio.h>
-
 #include "dmusic_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-
 static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface)
 {
     return CONTAINING_RECORD(iface, IDirectMusic8Impl, IDirectMusic8_iface);
diff --git a/reactos/dll/directx/wine/dmusic/dmusic_main.c b/reactos/dll/directx/wine/dmusic/dmusic_main.c
index 80e4a2db165..cae3a572871 100644
--- a/reactos/dll/directx/wine/dmusic/dmusic_main.c
+++ b/reactos/dll/directx/wine/dmusic/dmusic_main.c
@@ -17,16 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdio.h>
-
 #include "dmusic_private.h"
+#include <stdio.h>
 #include "rpcproxy.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-
 static HINSTANCE instance;
 LONG DMUSIC_refCount = 0;
 
diff --git a/reactos/dll/directx/wine/dmusic/dmusic_private.h b/reactos/dll/directx/wine/dmusic/dmusic_private.h
index efb70c6e4e8..5692084d6fa 100644
--- a/reactos/dll/directx/wine/dmusic/dmusic_private.h
+++ b/reactos/dll/directx/wine/dmusic/dmusic_private.h
@@ -22,20 +22,16 @@
 #ifndef __WINE_DMUSIC_PRIVATE_H
 #define __WINE_DMUSIC_PRIVATE_H
 
-//#include <stdarg.h>
+#include <config.h>
 
 #define COBJMACROS
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnt.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-
 #include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+
 #include <wine/list.h>
 #include <wine/unicode.h>
 #include <winreg.h>
diff --git a/reactos/dll/directx/wine/dmusic/download.c b/reactos/dll/directx/wine/dmusic/download.c
index cc2b0241e23..2a6831aeb35 100644
--- a/reactos/dll/directx/wine/dmusic/download.c
+++ b/reactos/dll/directx/wine/dmusic/download.c
@@ -20,8 +20,6 @@
 
 #include "dmusic_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-
 static inline IDirectMusicDownloadImpl* impl_from_IDirectMusicDownload(IDirectMusicDownload *iface)
 {
     return CONTAINING_RECORD(iface, IDirectMusicDownloadImpl, IDirectMusicDownload_iface);
diff --git a/reactos/dll/directx/wine/dmusic/instrument.c b/reactos/dll/directx/wine/dmusic/instrument.c
index 9df3e0c1005..b7877054448 100644
--- a/reactos/dll/directx/wine/dmusic/instrument.c
+++ b/reactos/dll/directx/wine/dmusic/instrument.c
@@ -20,8 +20,6 @@
 
 #include "dmusic_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
-
 static const GUID IID_IDirectMusicInstrumentPRIVATE = { 0xbcb20080, 0xa40c, 0x11d1, { 0x86, 0xbc, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef } };
 
 /* IDirectMusicInstrument IUnknown part: */
diff --git a/reactos/dll/directx/wine/dmusic/port.c b/reactos/dll/directx/wine/dmusic/port.c
index 2e60828dcb3..755019c4658 100644
--- a/reactos/dll/directx/wine/dmusic/port.c
+++ b/reactos/dll/directx/wine/dmusic/port.c
@@ -19,10 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
 #include "dmusic_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
+#include <assert.h>
 
 static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface)
 {
diff --git a/reactos/dll/directx/wine/dmusic/regsvr.c b/reactos/dll/directx/wine/dmusic/regsvr.c
index d0d9a2abba4..dc82e86e67f 100644
--- a/reactos/dll/directx/wine/dmusic/regsvr.c
+++ b/reactos/dll/directx/wine/dmusic/regsvr.c
@@ -19,9 +19,6 @@
  */
 
 #include "dmusic_private.h"
-//#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmusic);
 
 /*
  * Near the bottom of this file are the exported DllRegisterServer and