diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 83c748da39..394edd6cda 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -31,6 +31,10 @@ extern WXDLLIMPEXP_DATA_PROPGRID(const char) wxPropertyGridNameStr[];
 
 class wxPGComboBox;
 
+#if wxUSE_STATUSBAR
+class WXDLLIMPEXP_FWD_CORE wxStatusBar;
+#endif
+
 // -----------------------------------------------------------------------
 // Global variables
 // -----------------------------------------------------------------------
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 9eea13d63b..18fc6860ff 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -31,6 +31,7 @@
     #include "wx/dcclient.h"
     #include "wx/dcmemory.h"
     #include "wx/button.h"
+    #include "wx/bmpbuttn.h"
     #include "wx/pen.h"
     #include "wx/brush.h"
     #include "wx/cursor.h"