diff --git a/configure.ac b/configure.ac
index 5515eb18e..ad7311427 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,7 @@ mingw32* | windows*)
 		src/win/mpd_win32_rc.rc
 	])
 	AC_CHECK_TOOL(WINDRES, windres)
+	AM_CPPFLAGS="$AM_CPPFLAGS -DWIN32_LEAN_AND_MEAN"
 	AM_CPPFLAGS="$AM_CPPFLAGS -DWINVER=0x0501"
 	LIBS="$LIBS -lws2_32"
 	HAVE_WINDOWS=1
diff --git a/src/mixer/winmm_mixer_plugin.c b/src/mixer/winmm_mixer_plugin.c
index ceddf6afd..99da60cce 100644
--- a/src/mixer/winmm_mixer_plugin.c
+++ b/src/mixer/winmm_mixer_plugin.c
@@ -22,6 +22,8 @@
 #include "output_api.h"
 #include "output/winmm_output_plugin.h"
 
+#include <mmsystem.h>
+
 #include <assert.h>
 #include <math.h>
 #include <windows.h>
diff --git a/src/output/winmm_output_plugin.c b/src/output/winmm_output_plugin.c
index 4d95834b9..c1b3af126 100644
--- a/src/output/winmm_output_plugin.c
+++ b/src/output/winmm_output_plugin.c
@@ -26,7 +26,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <windows.h>
 
 #undef G_LOG_DOMAIN
 #define G_LOG_DOMAIN "winmm_output"
diff --git a/src/output/winmm_output_plugin.h b/src/output/winmm_output_plugin.h
index 0605530e1..364356483 100644
--- a/src/output/winmm_output_plugin.h
+++ b/src/output/winmm_output_plugin.h
@@ -25,6 +25,7 @@
 #ifdef ENABLE_WINMM_OUTPUT
 
 #include <windows.h>
+#include <mmsystem.h>
 
 struct winmm_output;