diff --git a/include/wx/brush.h b/include/wx/brush.h
index 201e53e91a..d55ed5c3af 100644
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -15,6 +15,7 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdiobj.h"
+#include "wx/gdicmn.h"      // for wxGDIObjListBase
 
 // NOTE: these values cannot be combined together!
 enum wxBrushStyle
diff --git a/include/wx/font.h b/include/wx/font.h
index e79e04e91c..744e4fefeb 100644
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -19,6 +19,7 @@
 #include "wx/defs.h"        // for wxDEFAULT &c
 #include "wx/fontenc.h"     // the font encoding constants
 #include "wx/gdiobj.h"      // the base class
+#include "wx/gdicmn.h"      // for wxGDIObjListBase
 
 // ----------------------------------------------------------------------------
 // forward declarations
diff --git a/src/mac/carbon/brush.cpp b/src/mac/carbon/brush.cpp
index 5de190f1a5..14a75ca37e 100644
--- a/src/mac/carbon/brush.cpp
+++ b/src/mac/carbon/brush.cpp
@@ -42,7 +42,7 @@ public:
 protected:
     void DoSetStipple(const wxBitmap& stipple);
 
-    wxBitmap      m_stipple ;
+    wxBitmap      m_stipple;
     wxColour      m_colour;
     wxBrushStyle  m_style;
 };
@@ -140,7 +140,7 @@ const 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();
 }