diff --git a/reactos/dll/win32/winmm/driver.c b/reactos/dll/win32/winmm/driver.c
index f9771d1a7ab..95717872e49 100644
--- a/reactos/dll/win32/winmm/driver.c
+++ b/reactos/dll/win32/winmm/driver.c
@@ -20,23 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <string.h>
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-//#include "wingdi.h"
-#include <winuser.h>
-//#include "winnls.h"
-#include <winreg.h>
-//#include "mmddk.h"
 #include "winemm.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "excpt.h"
-#include <wine/exception.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(driver);
 
diff --git a/reactos/dll/win32/winmm/joystick.c b/reactos/dll/win32/winmm/joystick.c
index 4c0fa254424..e8232ceed71 100644
--- a/reactos/dll/win32/winmm/joystick.c
+++ b/reactos/dll/win32/winmm/joystick.c
@@ -21,32 +21,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
+#include "winemm.h"
 
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-//#include <stdarg.h>
-//#include <stdio.h>
+
 #include <stdlib.h>
-//#include <string.h>
-//#include <fcntl.h>
+
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
 
-#include "winemm.h"
-//#include "windef.h"
-//#include "winbase.h"
-//#include "mmsystem.h"
-//#include "wingdi.h"
-#include <winuser.h>
-#include <winnls.h>
-
-//#include "mmddk.h"
-
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(winmm);
 
 #define MAXJOYSTICK (JOYSTICKID2 + 30)
diff --git a/reactos/dll/win32/winmm/lolvldrv.c b/reactos/dll/win32/winmm/lolvldrv.c
index 75a015bb356..e500665b384 100644
--- a/reactos/dll/win32/winmm/lolvldrv.c
+++ b/reactos/dll/win32/winmm/lolvldrv.c
@@ -21,19 +21,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <string.h>
-//#include <stdarg.h>
-//#include <stdio.h>
-#include <assert.h>
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winreg.h"
 #include "winemm.h"
-#include <wine/debug.h>
-#include <wine/exception.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(winmm);
 
diff --git a/reactos/dll/win32/winmm/mci.c b/reactos/dll/win32/winmm/mci.c
index d2ac74edcd9..eda26b036cb 100644
--- a/reactos/dll/win32/winmm/mci.c
+++ b/reactos/dll/win32/winmm/mci.c
@@ -42,28 +42,11 @@
  * - size of string in WCHAR or bytes? (#chars for MCI_INFO, #bytes for MCI_SYSINFO)
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <stdlib.h>
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <string.h>
-
-#include <windef.h>
-//#include "winbase.h"
-//#include "wingdi.h"
-#include <mmsystem.h>
-#include <winuser.h>
-//#include "winnls.h"
-#include <winreg.h>
-#include <wownt32.h>
-
-#include <digitalv.h>
 #include "winemm.h"
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include <mmsystem.h>
+#include <wownt32.h>
+#include <digitalv.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(mci);
 
diff --git a/reactos/dll/win32/winmm/mmio.c b/reactos/dll/win32/winmm/mmio.c
index 8b1e6c387b8..cd8b1da8aca 100644
--- a/reactos/dll/win32/winmm/mmio.c
+++ b/reactos/dll/win32/winmm/mmio.c
@@ -27,22 +27,8 @@
  *      + 32 A <=> W message mapping
  */
 
-
-//#include <ctype.h>
-#include <stdarg.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <errno.h>
-#include <assert.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winnls.h>
-//#include "mmsystem.h"
 #include "winemm.h"
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(mmio);
 
 static WINE_MMIO *MMIOList;
diff --git a/reactos/dll/win32/winmm/playsound.c b/reactos/dll/win32/winmm/playsound.c
index 6196e9ff43c..b3eaa7a0d78 100644
--- a/reactos/dll/win32/winmm/playsound.c
+++ b/reactos/dll/win32/winmm/playsound.c
@@ -21,19 +21,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdarg.h>
-//#include <string.h>
-
-#include <windef.h>
-//#include "winbase.h"
-//#include "mmsystem.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-#include <winreg.h>
 #include "winemm.h"
-#include <winternl.h>
 
-#include <wine/debug.h>
+#include <winternl.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(winmm);
 
diff --git a/reactos/dll/win32/winmm/registry.c b/reactos/dll/win32/winmm/registry.c
index 9ac94a38917..57f6605b321 100644
--- a/reactos/dll/win32/winmm/registry.c
+++ b/reactos/dll/win32/winmm/registry.c
@@ -16,10 +16,7 @@
     TODO: Handle system.ini
 */
 
-#include <windef.h>
-#include <winreg.h>
 #include "winemm.h"
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(winmm);
 
diff --git a/reactos/dll/win32/winmm/time.c b/reactos/dll/win32/winmm/time.c
index 1c4dbc4c907..5da3f2f0752 100644
--- a/reactos/dll/win32/winmm/time.c
+++ b/reactos/dll/win32/winmm/time.c
@@ -20,11 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
+#include "winemm.h"
 
-//#include <stdarg.h>
-//#include <time.h>
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
 #endif
@@ -32,14 +29,6 @@
 # include <unistd.h>
 #endif
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "mmsystem.h"
-
-#include "winemm.h"
-
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(mmtime);
 
 typedef struct tagWINE_TIMERENTRY {
diff --git a/reactos/dll/win32/winmm/winemm.h b/reactos/dll/win32/winmm/winemm.h
index 1dd73539bb4..1da6c68471d 100644
--- a/reactos/dll/win32/winmm/winemm.h
+++ b/reactos/dll/win32/winmm/winemm.h
@@ -19,12 +19,28 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <config.h>
+
+#include <assert.h>
 #include <stdarg.h>
+#include <stdio.h>
+
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 
 #include <windef.h>
-//#include "winbase.h"
+#include <winbase.h>
+#include <winuser.h>
+#include <winreg.h>
 #include <mmddk.h>
 
+#include <wine/debug.h>
+#include <wine/exception.h>
+#include <wine/unicode.h>
+
 #define WINE_DEFAULT_WINMM_DRIVER     "alsa,oss,coreaudio,esd"
 #define WINE_DEFAULT_WINMM_MAPPER     "msacm32.drv"
 #define WINE_DEFAULT_WINMM_MIDI       "midimap.dll"
diff --git a/reactos/dll/win32/winmm/winmm.c b/reactos/dll/win32/winmm/winmm.c
index 2c7644496e1..fc63b09bfc8 100644
--- a/reactos/dll/win32/winmm/winmm.c
+++ b/reactos/dll/win32/winmm/winmm.c
@@ -39,22 +39,8 @@
  *        midi, mixer and aux
  */
 
-#include <stdio.h>
-//#include <stdarg.h>
-//#include <string.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <windef.h>
-#include <winbase.h>
-//#include "mmsystem.h"
-#include <winuser.h>
-#include <winnls.h>
-//#include "winternl.h"
 #include "winemm.h"
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(winmm);
 
 /* ========================================================================
diff --git a/reactos/dll/win32/winmm/winmm_res.rc b/reactos/dll/win32/winmm/winmm_res.rc
index 65817bd4091..23da1b66d1a 100644
--- a/reactos/dll/win32/winmm/winmm_res.rc
+++ b/reactos/dll/win32/winmm/winmm_res.rc
@@ -22,10 +22,8 @@
  *       MMSYSTEM...)
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "mmddk.h"
-#include "winnls.h"
+#include <windef.h>
+#include <mmddk.h>
 
 /* Add your language specific defines here */
 #ifdef LANGUAGE_PT_BR