diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index dc7111517f..1f34f14a7d 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -559,8 +559,6 @@ enum wxPG_INTERNAL_FLAGS
     wxPG_FL_NOSTATUSBARHELP             =     0x1000,
     // Marks that we created the state, so we have to destroy it too.
     wxPG_FL_CREATEDSTATE                =     0x2000,
-    // Set if scrollbar's existence was detected in last onresize.
-    wxPG_FL_SCROLLBAR_DETECTED          =     0x4000,
     // Set if wxPGMan requires redrawing of description text box.
     wxPG_FL_DESC_REFRESH_REQUIRED       =     0x8000,
     // Set if contained in wxPropertyGridManager
@@ -2258,13 +2256,9 @@ protected:
 //
 #ifndef __wxPG_SOURCE_FILE__
     #undef wxPG_FL_DESC_REFRESH_REQUIRED
-    #undef wxPG_FL_SCROLLBAR_DETECTED
     #undef wxPG_FL_CREATEDSTATE
     #undef wxPG_FL_NOSTATUSBARHELP
     #undef wxPG_FL_SCROLLED
-    #undef wxPG_FL_FOCUS_INSIDE_CHILD
-    #undef wxPG_FL_FOCUS_INSIDE
-    #undef wxPG_FL_MOUSE_INSIDE_CHILD
     #undef wxPG_FL_CUR_USES_CUSTOM_IMAGE
     #undef wxPG_FL_PRIMARY_FILLS_ENTIRE
     #undef wxPG_FL_VALUE_MODIFIED
@@ -2275,8 +2269,6 @@ protected:
     #undef wxPG_FL_ACTIVATION_BY_CLICK
     #undef wxPG_ICON_WIDTH
     #undef wxPG_USE_RENDERER_NATIVE
-// Following are needed by the manager headers
-//    #undef const wxString&
 #endif
 
 // -----------------------------------------------------------------------