diff --git a/include/wx/msw/wrapwin.h b/include/wx/msw/wrapwin.h
index b7b6d6e24c..1e039d424d 100644
--- a/include/wx/msw/wrapwin.h
+++ b/include/wx/msw/wrapwin.h
@@ -43,22 +43,16 @@
     #define _WIN32_WINNT 0x0600
 #endif
 
+/* Deal with clash with __WINDOWS__ include guard */
+#if defined(__WXWINCE__) && defined(__WINDOWS__)
+#undef __WINDOWS__
+#endif
 
 #include <windows.h>
 
-#ifdef __WXWINCE__
-    // this doesn't make any sense knowing that windows.h includes all these
-    // headers anyhow, but the fact remains that when building using eVC 4 the
-    // functions and constants from these headers are not defined unless we
-    // explicitly include them ourselves -- how is it possible is beyond me...
-    #include <winbase.h>
-    #include <wingdi.h>
-    #include <winuser.h>
-
-    // this one OTOH contains many useful CE-only functions
-    #include <shellapi.h>
-#endif // __WXWINCE__
-
+#if defined(__WXWINCE__) && !defined(__WINDOWS__)
+#define __WINDOWS__
+#endif
 
 // #undef the macros defined in winsows.h which conflict with code elsewhere
 #include "wx/msw/winundef.h"