diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 51d9ca2555..ce6cf7c866 100644
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -16,6 +16,7 @@
 #pragma interface "cmndata.h"
 #endif
 
+#include "wx/window.h"
 #include "wx/font.h"
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index ea234b7964..8d4eee417e 100644
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -56,7 +56,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 // window proc
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUWIN32__) && !defined(__MINGW32__)
+#if defined(__GNUWIN32__) 
 #  define CASTWNDPROC (long unsigned)
 #else
 #  ifdef __BORLANDC__