Each individual file should have its own multiple-include checking, so it shouldn't be in the file doing the including.

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@285 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/oledlg.h b/mingw-w64-headers/include/oledlg.h
index 8d8b9a8..2f31820 100644
--- a/mingw-w64-headers/include/oledlg.h
+++ b/mingw-w64-headers/include/oledlg.h
@@ -18,21 +18,13 @@
 #define _UNICODE
 #endif
 
-#ifndef _WINDOWS_
 #include <windows.h>
-#endif
-#ifndef _INC_SHELLAPI
 #include <shellapi.h>
-#endif
-#ifndef _INC_COMMDLG
 #include <commdlg.h>
-#endif
-#ifndef _OLE2_H_
 #include <ole2.h>
-#endif
 #include <string.h>
 #include <tchar.h>
-#endif
+#endif /* End RC_INVOKED */
 
 #include <dlgs.h>