diff --git a/include/wx/xrc/xh_propgrid.h b/include/wx/xrc/xh_propgrid.h
index 54183d95c5..d9f0b6a615 100644
--- a/include/wx/xrc/xh_propgrid.h
+++ b/include/wx/xrc/xh_propgrid.h
@@ -23,11 +23,13 @@
 
 #include "wx/xrc/xmlres.h"
 
-#include "wx/propgrid/propgrid.h"
-#include "wx/propgrid/manager.h"
-
 #if wxUSE_XRC && wxUSE_PROPGRID
 
+class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGrid;
+class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGridManager;
+class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGridPageState;
+class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGridPopulator;
+
 class wxPropertyGridXmlHandler : public wxXmlResourceHandler
 {
     friend class wxPropertyGridXrcPopulator;
diff --git a/src/xrc/xh_propgrid.cpp b/src/xrc/xh_propgrid.cpp
index 6a8f05373f..cb9ff03ed6 100644
--- a/src/xrc/xh_propgrid.cpp
+++ b/src/xrc/xh_propgrid.cpp
@@ -30,9 +30,12 @@
 
 #if wxUSE_XRC && wxUSE_PROPGRID
 
-#include <wx/propgrid/propgrid.h>
+#include "wx/xrc/xh_propgrid.h"
 
-#include <wx/propgrid/xh_propgrid.h>
+#include "wx/propgrid/manager.h"
+#include "wx/propgrid/propgrid.h"
+
+#include "wx/xml/xml.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"