diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 1b09f730e9..63ac97d69f 100644
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -141,6 +141,11 @@
 #define QS_ALLPOSTMESSAGE 0
 #endif
 
+// Missing from MinGW 4.8 SDK headers.
+#ifndef BS_TYPEMASK
+#define BS_TYPEMASK 0xf
+#endif
+
 // ----------------------------------------------------------------------------
 // menu stuff
 // ----------------------------------------------------------------------------
diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 2f1dcc62a9..4010f4e076 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -35,6 +35,8 @@
     #include "wx/log.h"
     #include "wx/settings.h"
     #include "wx/ctrlsub.h"
+    #include "wx/msw/private.h"
+    #include "wx/msw/missing.h"
 #endif
 
 #if wxUSE_LISTCTRL
@@ -46,16 +48,10 @@
 #endif // wxUSE_TREECTRL
 
 #include "wx/renderer.h"
-#include "wx/msw/private.h"
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/dc.h"          // for wxDCTemp
 #include "wx/msw/ownerdrawnbutton.h"
 
-// Missing from MinGW 4.8 SDK headers.
-#ifndef BS_TYPEMASK
-#define BS_TYPEMASK 0xf
-#endif
-
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------