diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index 313c2257a2..a840f06f81 100644
--- a/include/wx/afterstd.h
+++ b/include/wx/afterstd.h
@@ -13,6 +13,9 @@
     See the comments in beforestd.h.
  */
 
+#if defined(__WXMSW__) && defined(__MINGW32__)
+    #include "wx/msw/winundef.h"
+#endif
 #ifdef _MSC_VER
 #   pragma warning(pop)
 #endif
diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 3228aee579..b836cffb72 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -24,9 +24,6 @@
     #include <vector>
     #include <algorithm>
     #include "wx/afterstd.h"
-    #if defined(__WXMSW__) && defined(__MINGW32__)
-        #include "wx/msw/winundef.h"
-    #endif
 #endif
 
 /*
@@ -457,7 +454,7 @@ public:                                                               \
 // ----------------------------------------------------------------------------
 
 #define _WX_DEFINE_SORTED_TYPEARRAY_2(T, name, base, defcomp, classexp, comptype)\
-wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(void *),                   \
+wxCOMPILE_TIME_ASSERT2(sizeof(T) <= sizeof(base::base_type),          \
                        TypeTooBigToBeStoredInSorted##base,            \
                        name);                                         \
 classexp name : public base                                           \
diff --git a/include/wx/list.h b/include/wx/list.h
index 43316ca914..ffddd09a58 100644
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -42,9 +42,6 @@
     #include "wx/beforestd.h"
     #include <list>
     #include "wx/afterstd.h"
-    #if defined(__WXMSW__) && defined(__MINGW32__)
-        #include "wx/msw/winundef.h"
-    #endif
 #endif
 
 // ----------------------------------------------------------------------------