diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
index 281c4c8d7a..74dc7a0cd1 100644
--- a/include/wx/propgrid/advprops.h
+++ b/include/wx/propgrid/advprops.h
@@ -11,8 +11,6 @@
 #ifndef _WX_PROPGRID_ADVPROPS_H_
 #define _WX_PROPGRID_ADVPROPS_H_
 
-#include "wx/defs.h"
-
 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/props.h"
@@ -127,13 +125,6 @@ operator==(const wxColourPropertyValue&, const wxColourPropertyValue&);
 
 DECLARE_VARIANT_OBJECT_EXPORTED(wxColourPropertyValue, WXDLLIMPEXP_PROPGRID)
 
-// -----------------------------------------------------------------------
-// Declare part of custom colour property macro pairs.
-
-#if wxUSE_IMAGE
-    #include "wx/image.h"
-#endif
-
 // -----------------------------------------------------------------------
 
 // Property representing wxFont.
@@ -282,6 +273,8 @@ class WXDLLIMPEXP_PROPGRID wxCursorProperty : public wxEnumProperty
 #if wxUSE_IMAGE
 
 WXDLLIMPEXP_PROPGRID const wxString& wxPGGetDefaultImageWildcard();
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxImage;
 
 // Property representing image file(name).
 class WXDLLIMPEXP_PROPGRID wxImageFileProperty : public wxFileProperty
diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h
index 42e1214a9d..ad8da40162 100644
--- a/include/wx/propgrid/editors.h
+++ b/include/wx/propgrid/editors.h
@@ -11,8 +11,6 @@
 #ifndef _WX_PROPGRID_EDITORS_H_
 #define _WX_PROPGRID_EDITORS_H_
 
-#include "wx/defs.h"
-
 #if wxUSE_PROPGRID
 
 class WXDLLIMPEXP_FWD_PROPGRID wxPGCell;
diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index 1408d4b0ba..466447cdf6 100644
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -11,21 +11,10 @@
 #ifndef _WX_PROPGRID_MANAGER_H_
 #define _WX_PROPGRID_MANAGER_H_
 
-#include "wx/defs.h"
-
 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/propgrid.h"
 
-#include "wx/dcclient.h"
-#include "wx/scrolwin.h"
-#include "wx/toolbar.h"
-#include "wx/stattext.h"
-#include "wx/button.h"
-#include "wx/textctrl.h"
-#include "wx/dialog.h"
-#include "wx/headerctrl.h"
-
 // -----------------------------------------------------------------------
 
 #ifndef SWIG
@@ -161,10 +150,13 @@ private:
 
 // -----------------------------------------------------------------------
 
+#if wxUSE_TOOLBAR
+class wxToolBar;
+#endif
 #if wxUSE_HEADERCTRL
 class wxPGHeaderCtrl;
 #endif
-
+class wxStaticText;
 
 // wxPropertyGridManager is an efficient multi-page version of wxPropertyGrid,
 // which can optionally have toolbar for mode and page selection, and help
diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index 081b413d6c..558c044067 100644
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -11,8 +11,6 @@
 #ifndef _WX_PROPGRID_PROPERTY_H_
 #define _WX_PROPGRID_PROPERTY_H_
 
-#include "wx/defs.h"
-
 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/propgriddefs.h"
diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 1f34f14a7d..2c75e7bb95 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -11,16 +11,11 @@
 #ifndef _WX_PROPGRID_PROPGRID_H_
 #define _WX_PROPGRID_PROPGRID_H_
 
-#include "wx/defs.h"
-
 #if wxUSE_PROPGRID
 
-#include "wx/thread.h"
-#include "wx/dcclient.h"
+#include "wx/dc.h"
 #include "wx/control.h"
 #include "wx/scrolwin.h"
-#include "wx/tooltip.h"
-#include "wx/datetime.h"
 #include "wx/recguard.h"
 #include "wx/time.h" // needed for wxMilliClock_t
 
diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h
index 0a77831957..0144af931e 100644
--- a/include/wx/propgrid/propgriddefs.h
+++ b/include/wx/propgrid/propgriddefs.h
@@ -11,8 +11,6 @@
 #ifndef _WX_PROPGRID_PROPGRIDDEFS_H_
 #define _WX_PROPGRID_PROPGRIDDEFS_H_
 
-#include "wx/defs.h"
-
 #if wxUSE_PROPGRID
 
 #include "wx/dynarray.h"
@@ -22,7 +20,6 @@
 #include "wx/variant.h"
 #include "wx/any.h"
 #include "wx/longlong.h"
-#include "wx/clntdata.h"
 
 #if wxUSE_STD_CONTAINERS
 #include <numeric>
diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h
index 2235ff1090..0fefdbfabc 100644
--- a/include/wx/propgrid/propgridiface.h
+++ b/include/wx/propgrid/propgridiface.h
@@ -11,8 +11,6 @@
 #ifndef __WX_PROPGRID_PROPGRIDIFACE_H__
 #define __WX_PROPGRID_PROPGRIDIFACE_H__
 
-#include "wx/defs.h"
-
 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/property.h"
diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h
index 64fae9e568..dbe3cafcca 100644
--- a/include/wx/propgrid/propgridpagestate.h
+++ b/include/wx/propgrid/propgridpagestate.h
@@ -11,8 +11,6 @@
 #ifndef _WX_PROPGRID_PROPGRIDPAGESTATE_H_
 #define _WX_PROPGRID_PROPGRIDPAGESTATE_H_
 
-#include "wx/defs.h"
-
 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/property.h"
diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index 07647ddc70..5786bda4e9 100644
--- a/include/wx/propgrid/props.h
+++ b/include/wx/propgrid/props.h
@@ -11,8 +11,6 @@
 #ifndef _WX_PROPGRID_PROPS_H_
 #define _WX_PROPGRID_PROPS_H_
 
-#include "wx/defs.h"
-
 #if wxUSE_PROPGRID
 
 // -----------------------------------------------------------------------
@@ -24,8 +22,6 @@ class wxPGArrayEditorDialog;
 #include "wx/filename.h"
 #include "wx/dialog.h"
 #include "wx/textctrl.h"
-#include "wx/button.h"
-#include "wx/listbox.h"
 #include "wx/valtext.h"
 
 // -----------------------------------------------------------------------
diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index 0cd15bcce0..fe4c163d65 100644
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -18,33 +18,8 @@
 #if wxUSE_PROPGRID
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/dcclient.h"
-    #include "wx/button.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/cursor.h"
-    #include "wx/dialog.h"
     #include "wx/settings.h"
-    #include "wx/msgdlg.h"
-    #include "wx/choice.h"
-    #include "wx/stattext.h"
     #include "wx/textctrl.h"
-    #include "wx/scrolwin.h"
-    #include "wx/dirdlg.h"
-    #include "wx/combobox.h"
-    #include "wx/sizer.h"
-    #include "wx/textdlg.h"
-    #include "wx/filedlg.h"
-    #include "wx/intl.h"
     #include "wx/wxcrtvararg.h"
 #endif
 
@@ -56,13 +31,7 @@
 
 #include "wx/propgrid/advprops.h"
 
-#ifdef __WXMSW__
-    #include "wx/msw/private.h"
-    #include "wx/msw/dc.h"
-#endif
-
 #include "wx/odcombo.h"
-#include "wx/numformatter.h"
 
 // Drawing ARGB on standard DC is supported by OSX and GTK3
 #if defined(__WXOSX__) || defined(__WXGTK3__)
@@ -75,7 +44,10 @@
 
 #if wxPG_USE_GC_FOR_ALPHA
 #include "wx/dcgraph.h"
+#ifndef WX_PRECOMP
+#include "wx/dcclient.h" // for wxDynamicCast purposes
 #include "wx/dcmemory.h" // for wxDynamicCast purposes
+#endif // WX_PRECOMP
 #if wxUSE_METAFILE
     #include "wx/metafile.h"  // for wxDynamicCast purposes
 #endif // wxUSE_METAFILE
diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index 018112cec1..4fe4cacceb 100644
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -18,41 +18,12 @@
 #if wxUSE_PROPGRID
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/dcclient.h"
-    #include "wx/dcmemory.h"
-    #include "wx/button.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/cursor.h"
-    #include "wx/dialog.h"
     #include "wx/settings.h"
-    #include "wx/msgdlg.h"
-    #include "wx/choice.h"
-    #include "wx/stattext.h"
-    #include "wx/scrolwin.h"
-    #include "wx/dirdlg.h"
-    #include "wx/sizer.h"
-    #include "wx/textdlg.h"
-    #include "wx/filedlg.h"
-    #include "wx/statusbr.h"
-    #include "wx/intl.h"
-    #include "wx/frame.h"
+    #include "wx/textctrl.h"
 #endif
 
-
-#include "wx/timer.h"
 #include "wx/dcbuffer.h"
-#include "wx/bmpbuttn.h"
-
+#include "wx/odcombo.h"
 
 // This define is necessary to prevent macro clearing
 #define __wxPG_SOURCE_FILE__
@@ -74,8 +45,6 @@
 
 #define wxPG_BUTTON_SIZEDEC                         0
 
-#include "wx/odcombo.h"
-
 // -----------------------------------------------------------------------
 
 #if defined(__WXMSW__)
diff --git a/src/propgrid/manager.cpp b/src/propgrid/manager.cpp
index f060b9fc3b..de2c1ba9d7 100644
--- a/src/propgrid/manager.cpp
+++ b/src/propgrid/manager.cpp
@@ -18,32 +18,18 @@
 #if wxUSE_PROPGRID
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/cursor.h"
     #include "wx/settings.h"
+    #include "wx/stattext.h"
     #include "wx/textctrl.h"
-    #include "wx/sizer.h"
-    #include "wx/statusbr.h"
-    #include "wx/intl.h"
+    #include "wx/toolbar.h"
 #endif
 
 #include "wx/dcbuffer.h" // for wxALWAYS_NATIVE_DOUBLE_BUFFER
+#include "wx/headerctrl.h" // for wxPGHeaderCtrl
 
 // This define is necessary to prevent macro clearing
 #define __wxPG_SOURCE_FILE__
 
-#include "wx/propgrid/propgrid.h"
-
 #include "wx/propgrid/manager.h"
 
 
diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 0efd257c5c..c6519412cd 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -18,25 +18,9 @@
 #if wxUSE_PROPGRID
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
     #include "wx/log.h"
-    #include "wx/math.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/dcmemory.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/settings.h"
-    #include "wx/intl.h"
 #endif
 
-#include "wx/image.h"
-
 // This define is necessary to prevent macro clearing
 #define __wxPG_SOURCE_FILE__
 
diff --git a/src/propgrid/propgridiface.cpp b/src/propgrid/propgridiface.cpp
index 377ac72ef6..e67667c8a7 100644
--- a/src/propgrid/propgridiface.cpp
+++ b/src/propgrid/propgridiface.cpp
@@ -18,25 +18,13 @@
 #if wxUSE_PROPGRID
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
+    #include "wx/bitmap.h"
+    #include "wx/colour.h"
+    #include "wx/font.h"
     #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/dcmemory.h"
-    #include "wx/button.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/settings.h"
-    #include "wx/sizer.h"
-    #include "wx/intl.h"
+    #include "wx/validate.h"
 #endif
 
-#include "wx/propgrid/property.h"
 #include "wx/propgrid/propgrid.h"
 
 // ----------------------------------------------------------------------------
diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp
index b000204ddd..c9bad30454 100644
--- a/src/propgrid/propgridpagestate.cpp
+++ b/src/propgrid/propgridpagestate.cpp
@@ -18,20 +18,12 @@
 #if wxUSE_PROPGRID
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
+    #include "wx/bitmap.h"
+    #include "wx/dcclient.h"
     #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/dcmemory.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/intl.h"
-    #include "wx/stopwatch.h"
+    #include "wx/font.h"
+    #include "wx/log.h"
+    #include "wx/validate.h"
 #endif
 
 // This define is necessary to prevent macro clearing
@@ -39,7 +31,6 @@
 
 #include "wx/propgrid/propgridpagestate.h"
 #include "wx/propgrid/propgrid.h"
-#include "wx/propgrid/editors.h"
 
 #define wxPG_DEFAULT_SPLITTERX      110
 
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 14689dba39..6b2cfffe42 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -18,41 +18,16 @@
 #if wxUSE_PROPGRID
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #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"
-    #include "wx/dialog.h"
-    #include "wx/settings.h"
-    #include "wx/msgdlg.h"
-    #include "wx/choice.h"
-    #include "wx/stattext.h"
-    #include "wx/scrolwin.h"
     #include "wx/dirdlg.h"
-    #include "wx/combobox.h"
-    #include "wx/layout.h"
-    #include "wx/sizer.h"
-    #include "wx/textdlg.h"
     #include "wx/filedlg.h"
-    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/sizer.h"
+    #include "wx/stattext.h"
 #endif
 
-#include "wx/filename.h"
+#include "wx/numformatter.h"
 
 #include "wx/propgrid/propgrid.h"
-#include "wx/numformatter.h"
 
 #include <float.h>
 #include <limits.h>