diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
index 74dc7a0cd1..ee5aae4554 100644
--- a/include/wx/propgrid/advprops.h
+++ b/include/wx/propgrid/advprops.h
@@ -11,6 +11,8 @@
 #ifndef _WX_PROPGRID_ADVPROPS_H_
 #define _WX_PROPGRID_ADVPROPS_H_
 
+#include "wx/defs.h"
+
 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/props.h"
diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h
index ad8da40162..01f0a0a5e9 100644
--- a/include/wx/propgrid/editors.h
+++ b/include/wx/propgrid/editors.h
@@ -11,8 +11,12 @@
 #ifndef _WX_PROPGRID_EDITORS_H_
 #define _WX_PROPGRID_EDITORS_H_
 
+#include "wx/defs.h"
+
 #if wxUSE_PROPGRID
 
+#include "wx/window.h"
+
 class WXDLLIMPEXP_FWD_PROPGRID wxPGCell;
 class WXDLLIMPEXP_FWD_PROPGRID wxPGProperty;
 class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGrid;
diff --git a/include/wx/propgrid/manager.h b/include/wx/propgrid/manager.h
index 466447cdf6..2723bdb628 100644
--- a/include/wx/propgrid/manager.h
+++ b/include/wx/propgrid/manager.h
@@ -11,6 +11,8 @@
 #ifndef _WX_PROPGRID_MANAGER_H_
 #define _WX_PROPGRID_MANAGER_H_
 
+#include "wx/defs.h"
+
 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/propgrid.h"
@@ -151,12 +153,12 @@ private:
 // -----------------------------------------------------------------------
 
 #if wxUSE_TOOLBAR
-class wxToolBar;
+class WXDLLIMPEXP_FWD_CORE wxToolBar;
 #endif
 #if wxUSE_HEADERCTRL
 class wxPGHeaderCtrl;
 #endif
-class wxStaticText;
+class WXDLLIMPEXP_FWD_CORE 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 558c044067..f2079f156f 100644
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -11,9 +11,14 @@
 #ifndef _WX_PROPGRID_PROPERTY_H_
 #define _WX_PROPGRID_PROPERTY_H_
 
+#include "wx/defs.h"
+
 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/propgriddefs.h"
+#include "wx/bitmap.h"
+#include "wx/font.h"
+#include "wx/validate.h"
 
 // -----------------------------------------------------------------------
 
diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 2c75e7bb95..5b2c5a52d0 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -11,10 +11,10 @@
 #ifndef _WX_PROPGRID_PROPGRID_H_
 #define _WX_PROPGRID_PROPGRID_H_
 
+#include "wx/defs.h"
+
 #if wxUSE_PROPGRID
 
-#include "wx/dc.h"
-#include "wx/control.h"
 #include "wx/scrolwin.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 0144af931e..45d6dcb033 100644
--- a/include/wx/propgrid/propgriddefs.h
+++ b/include/wx/propgrid/propgriddefs.h
@@ -11,15 +11,16 @@
 #ifndef _WX_PROPGRID_PROPGRIDDEFS_H_
 #define _WX_PROPGRID_PROPGRIDDEFS_H_
 
+#include "wx/defs.h"
+
 #if wxUSE_PROPGRID
 
-#include "wx/dynarray.h"
-#include "wx/vector.h"
-#include "wx/hashmap.h"
+#include "wx/colour.h"
 #include "wx/hashset.h"
-#include "wx/variant.h"
-#include "wx/any.h"
-#include "wx/longlong.h"
+
+class WXDLLIMPEXP_FWD_CORE wxPoint;
+class WXDLLIMPEXP_FWD_CORE wxSize;
+class WXDLLIMPEXP_FWD_CORE wxFont;
 
 #if wxUSE_STD_CONTAINERS
 #include <numeric>
@@ -193,22 +194,21 @@
 // -----------------------------------------------------------------------
 
 
-class wxPGEditor;
-class wxPGProperty;
-class wxPropertyCategory;
-class wxPGChoices;
-class wxPropertyGridPageState;
-class wxPGCell;
-class wxPGCellRenderer;
-class wxPGChoiceEntry;
-class wxPGPropArgCls;
-class wxPropertyGridInterface;
-class wxPropertyGrid;
-class wxPropertyGridEvent;
+class WXDLLIMPEXP_FWD_PROPGRID wxPGEditor;
+class WXDLLIMPEXP_FWD_PROPGRID wxPGProperty;
+class WXDLLIMPEXP_FWD_PROPGRID wxPropertyCategory;
+class WXDLLIMPEXP_FWD_PROPGRID wxPGChoices;
+class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGridPageState;
+class WXDLLIMPEXP_FWD_PROPGRID wxPGCell;
+class WXDLLIMPEXP_FWD_PROPGRID wxPGCellRenderer;
+class WXDLLIMPEXP_FWD_PROPGRID wxPGChoiceEntry;
+class WXDLLIMPEXP_FWD_PROPGRID wxPGPropArgCls;
+class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGridInterface;
+class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGrid;
+class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGridEvent;
 class wxPropertyGridManager;
-class wxPGOwnerDrawnComboBox;
-class wxPGEditorDialogAdapter;
-class wxPGValidationInfo;
+class WXDLLIMPEXP_FWD_PROPGRID wxPGEditorDialogAdapter;
+class WXDLLIMPEXP_FWD_PROPGRID wxPGValidationInfo;
 
 
 // -----------------------------------------------------------------------
diff --git a/include/wx/propgrid/propgridiface.h b/include/wx/propgrid/propgridiface.h
index 0fefdbfabc..2235ff1090 100644
--- a/include/wx/propgrid/propgridiface.h
+++ b/include/wx/propgrid/propgridiface.h
@@ -11,6 +11,8 @@
 #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 dbe3cafcca..f62a058061 100644
--- a/include/wx/propgrid/propgridpagestate.h
+++ b/include/wx/propgrid/propgridpagestate.h
@@ -11,10 +11,14 @@
 #ifndef _WX_PROPGRID_PROPGRIDPAGESTATE_H_
 #define _WX_PROPGRID_PROPGRIDPAGESTATE_H_
 
+#include "wx/defs.h"
+
 #if wxUSE_PROPGRID
 
 #include "wx/propgrid/property.h"
 
+class WXDLLIMPEXP_FWD_CORE wxClientDC;
+
 // -----------------------------------------------------------------------
 
 // A return value from wxPropertyGrid::HitTest(),
diff --git a/include/wx/propgrid/props.h b/include/wx/propgrid/props.h
index 5786bda4e9..a9f2d3bedb 100644
--- a/include/wx/propgrid/props.h
+++ b/include/wx/propgrid/props.h
@@ -11,13 +11,15 @@
 #ifndef _WX_PROPGRID_PROPS_H_
 #define _WX_PROPGRID_PROPS_H_
 
+#include "wx/defs.h"
+
 #if wxUSE_PROPGRID
 
 // -----------------------------------------------------------------------
 
-class wxPGArrayEditorDialog;
+class WXDLLIMPEXP_FWD_PROPGRID wxPGArrayEditorDialog;
 
-#include "wx/propgrid/editors.h"
+#include "wx/propgrid/property.h"
 
 #include "wx/filename.h"
 #include "wx/dialog.h"
diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index c6519412cd..4d0e533315 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -18,6 +18,7 @@
 #if wxUSE_PROPGRID
 
 #ifndef WX_PRECOMP
+    #include "wx/dc.h"
     #include "wx/log.h"
 #endif
 
@@ -27,6 +28,7 @@
 #include "wx/propgrid/propgrid.h"
 #include "wx/propgrid/property.h"
 #include "wx/propgrid/props.h"
+#include "wx/propgrid/editors.h"
 
 #if wxPG_USE_RENDERER_NATIVE
 #include "wx/renderer.h"
diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 6b2cfffe42..36c3d1c7f4 100644
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -28,6 +28,7 @@
 #include "wx/numformatter.h"
 
 #include "wx/propgrid/propgrid.h"
+#include "wx/propgrid/editors.h"
 
 #include <float.h>
 #include <limits.h>