--- w32api-3.9/include/mmsystem.h.orig	2006-05-10 10:57:45.000000000 +0200
+++ w32api-3.9/include/mmsystem.h	2007-04-03 22:32:18.144508563 +0200
@@ -1010,8 +1010,7 @@
 	WAVEFORMAT wf;
 	WORD wBitsPerSample;
 } PCMWAVEFORMAT, *PPCMWAVEFORMAT,*LPPCMWAVEFORMAT;
-#ifndef _LPCWAVEFORMATEX_DEFINED
-#define _LPCWAVEFORMATEX_DEFINED
+#ifndef _WAVEFORMATEX_
 #define _WAVEFORMATEX_
 typedef struct tWAVEFORMATEX {
 	WORD wFormatTag;
@@ -1022,6 +1021,9 @@
 	WORD wBitsPerSample;
 	WORD cbSize;
 } WAVEFORMATEX,*PWAVEFORMATEX,*LPWAVEFORMATEX;
+#endif
+#ifndef _LPCWAVEFORMATEX_DEFINED
+#define _LPCWAVEFORMATEX_DEFINED
 typedef const WAVEFORMATEX *LPCWAVEFORMATEX;
 #endif
 DECLARE_HANDLE(HMIDI);