--- windef.h.bak	2012-09-03 16:54:05.156250000 +0100
+++ windef.h	2012-09-03 16:54:25.343750000 +0100
@@ -101,15 +101,14 @@
 #ifndef _DEF_WINBOOL_
 #define _DEF_WINBOOL_
 typedef int WINBOOL;
+typedef WINBOOL *PBOOL;
+typedef WINBOOL *LPBOOL;
+#if !defined(__OBJC__) && !defined(__OBJC_BOOL) && !defined(__objc_INCLUDE_GNU) && !defined(NOBOOLTYPE)
 #pragma push_macro("BOOL")
 #undef BOOL
-#if !defined(__OBJC__) && !defined(__OBJC_BOOL) && !defined(__objc_INCLUDE_GNU) && !defined(NOBOOLTYPE)
 typedef int BOOL;
-#endif
-#define BOOL WINBOOL
-typedef BOOL *PBOOL;
-typedef BOOL *LPBOOL;
 #pragma pop_macro("BOOL")
+#endif
 #endif /* _DEF_WINBOOL_ */
 
 typedef unsigned char BYTE;