diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h
index 8554818c23..621b0c28c7 100644
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -12,11 +12,9 @@
 #ifndef _WX_BRUSH_H_
 #define _WX_BRUSH_H_
 
-#include "wx/gdicmn.h"
-#include "wx/gdiobj.h"
-#include "wx/bitmap.h"
-
 class WXDLLIMPEXP_FWD_CORE wxBrush;
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
 // ----------------------------------------------------------------------------
 // wxBrush
diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp
index b8e881b81f..287ed0c027 100644
--- a/src/msw/brush.cpp
+++ b/src/msw/brush.cpp
@@ -275,7 +275,7 @@ wxColour wxBrush::GetColour() const
 
 wxBrushStyle wxBrush::GetStyle() const
 {
-    wxCHECK_MSG( Ok(), 0, _T("invalid brush") );
+    wxCHECK_MSG( Ok(), wxBRUSHSTYLE_MAX, _T("invalid brush") );
 
     return M_BRUSHDATA->GetStyle();
 }