diff -ruN mingw/include.orig/basetsd.h mingw/include/basetsd.h
--- mingw/include.orig/basetsd.h	2002-08-19 13:13:24.000000000 +0900
+++ mingw/include/basetsd.h	2002-08-06 19:03:06.000000000 +0900
@@ -1,5 +1,5 @@
-#ifndef _BASETSD_H
-#define _BASETSD_H
+#ifndef _BASETSD_H_
+#define _BASETSD_H_
 
 #ifdef __GNUC__
 #ifndef __int64
@@ -113,4 +113,4 @@
 #endif
 #endif /* !RC_INVOKED */
 
-#endif /* _BASETSD_H */
+#endif /* _BASETSD_H_ */
diff -ruN mingw/include.orig/mmsystem.h mingw/include/mmsystem.h
--- mingw/include.orig/mmsystem.h	2002-08-19 13:13:24.000000000 +0900
+++ mingw/include/mmsystem.h	2002-08-06 19:04:32.000000000 +0900
@@ -1012,7 +1012,10 @@
 	WORD wBitsPerSample;
 	WORD cbSize;
 } WAVEFORMATEX,*PWAVEFORMATEX,*LPWAVEFORMATEX;
+#ifndef _LPCWAVEFORMATEX_DEFINED
+#define _LPCWAVEFORMATEX_DEFINED
 typedef const WAVEFORMATEX *LPCWAVEFORMATEX;
+#endif // _LPCWAVEFORMATEX_DEFINED
 #endif
 DECLARE_HANDLE(HMIDI);
 DECLARE_HANDLE(HMIDIIN);
diff -ruN mingw/include.orig/ras.h mingw/include/ras.h
--- mingw/include.orig/ras.h	2002-08-19 13:13:24.000000000 +0900
+++ mingw/include/ras.h	2002-08-06 19:02:38.000000000 +0900
@@ -13,7 +13,7 @@
 /* TODO
 include <basetsd.h> from winnt.h so that this typedef is not necessary
 */
-#ifndef _BASETSD_H
+#ifndef _BASETSD_H_
 typedef unsigned long ULONG_PTR, *PULONG_PTR;
 #endif
 
diff -ruN mingw/include.orig/winnls.h mingw/include/winnls.h
--- mingw/include.orig/winnls.h	2002-08-19 13:13:24.000000000 +0900
+++ mingw/include/winnls.h	2002-08-06 19:00:40.000000000 +0900
@@ -407,7 +407,7 @@
 #define CAL_RETURN_NUMBER LOCALE_RETURN_NUMBER
 #define CAL_USE_CP_ACP LOCALE_USE_CP_ACP
 #endif /* WINVER >= 0x0500 */
-#ifndef  _BASETSD_H
+#ifndef  _BASETSD_H_
 typedef long LONG_PTR;
 #endif