diff --git a/include/wx/xrc/xh_all.h b/include/wx/xrc/xh_all.h
index 73f64a57ee..0424611ed3 100644
--- a/include/wx/xrc/xh_all.h
+++ b/include/wx/xrc/xh_all.h
@@ -67,6 +67,5 @@
 #include "wx/xrc/xh_bmpcbox.h"
 #include "wx/xrc/xh_animatctrl.h"
 #include "wx/xrc/xh_collpane.h"
-#include "wx/xrc/xh_richtext.h"
 
 #endif // _WX_XH_ALL_H_
diff --git a/src/xrc/xh_richtext.cpp b/src/xrc/xh_richtext.cpp
index f8b08cc839..0d8146785f 100644
--- a/src/xrc/xh_richtext.cpp
+++ b/src/xrc/xh_richtext.cpp
@@ -15,7 +15,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_RICHTEXT
+#if wxUSE_XRC && wxUSE_RICHTEXT && wxUSE_RICHTEXT_XML_HANDLER
 
 #include "wx/xrc/xh_richtext.h"