diff --git a/include/wx/xrc/xh_bmpbt.h b/include/wx/xrc/xh_bmpbt.h
index 0ddc5ca786..b2fdee58f4 100644
--- a/include/wx/xrc/xh_bmpbt.h
+++ b/include/wx/xrc/xh_bmpbt.h
@@ -17,6 +17,8 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XML && wxUSE_XRC
+
 
 class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
 {
@@ -27,5 +29,7 @@ public:
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif //wxUSE_XML && wxUSE_XRC
+
 
 #endif // _WX_XH_BMPBT_H_
diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index ded3f30324..82e8c5871b 100644
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -17,7 +17,7 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/string.h"
 #include "wx/dynarray.h"
@@ -492,6 +492,6 @@ public:
     #define GetXMLID          GetXRCID
 #endif
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
 
 #endif // _WX_XMLRES_H_
diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index ad56a9add2..ab18f0acb3 100644
--- a/src/xrc/xh_bmp.cpp
+++ b/src/xrc/xh_bmp.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_bmp.h"
 #include "wx/bitmap.h"
@@ -58,4 +58,4 @@ bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxIcon"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index e29178e7e5..512575c729 100644
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_bmpbt.h"
 #include <wx/bmpbuttn.h>
@@ -68,4 +68,4 @@ bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxBitmapButton"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_bttn.cpp b/src/xrc/xh_bttn.cpp
index f6b4cffd2f..d391e8ea2b 100644
--- a/src/xrc/xh_bttn.cpp
+++ b/src/xrc/xh_bttn.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_bttn.h"
 #include "wx/button.h"
@@ -61,4 +61,4 @@ bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxButton"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_cald.cpp b/src/xrc/xh_cald.cpp
index 67fa6e5edf..42d706c1de 100644
--- a/src/xrc/xh_cald.cpp
+++ b/src/xrc/xh_cald.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_CALENDARCTRL
+#if wxUSE_XML && wxUSE_XRC && wxUSE_CALENDARCTRL
 
 #include "wx/xrc/xh_cald.h"
 #include "wx/event.h"
@@ -64,4 +64,4 @@ bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxCalendarCtrl"));
 }
 
-#endif // wxUSE_XRC && wxUSE_CALENDARCTRL
+#endif // wxUSE_XML && wxUSE_XRC && wxUSE_CALENDARCTRL
diff --git a/src/xrc/xh_chckb.cpp b/src/xrc/xh_chckb.cpp
index 3731c6b889..52160e255e 100644
--- a/src/xrc/xh_chckb.cpp
+++ b/src/xrc/xh_chckb.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_CHECKBOX
+#if wxUSE_XML && wxUSE_XRC && wxUSE_CHECKBOX
 
 #include "wx/xrc/xh_chckb.h"
 #include "wx/checkbox.h"
@@ -59,4 +59,4 @@ bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxCheckBox"));
 }
 
-#endif // wxUSE_XRC && wxUSE_CHECKBOX
+#endif // wxUSE_XML && wxUSE_XRC && wxUSE_CHECKBOX
diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index 536c011ae6..c9c9c45236 100644
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
 
@@ -133,4 +133,4 @@ bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
 
 #endif // wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_choic.cpp b/src/xrc/xh_choic.cpp
index 29262cc59e..8f74f5c885 100644
--- a/src/xrc/xh_choic.cpp
+++ b/src/xrc/xh_choic.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_choic.h"
 #include "wx/choice.h"
@@ -96,4 +96,4 @@ bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_combo.cpp b/src/xrc/xh_combo.cpp
index 16b11715a6..fa72c134cc 100644
--- a/src/xrc/xh_combo.cpp
+++ b/src/xrc/xh_combo.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_COMBOBOX
+#if wxUSE_XML && wxUSE_XRC && wxUSE_COMBOBOX
 
 #include "wx/xrc/xh_combo.h"
 #include "wx/combobox.h"
@@ -100,4 +100,4 @@ bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
-#endif // wxUSE_XRC && wxUSE_COMBOBOX
+#endif // wxUSE_XML && wxUSE_XRC && wxUSE_COMBOBOX
diff --git a/src/xrc/xh_dlg.cpp b/src/xrc/xh_dlg.cpp
index eef07949ec..6108b8c3c3 100644
--- a/src/xrc/xh_dlg.cpp
+++ b/src/xrc/xh_dlg.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_dlg.h"
 #include "wx/dialog.h"
@@ -82,4 +82,4 @@ bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxDialog"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_frame.cpp b/src/xrc/xh_frame.cpp
index 2685be16e0..9d93881f0b 100644
--- a/src/xrc/xh_frame.cpp
+++ b/src/xrc/xh_frame.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_frame.h"
 #include "wx/frame.h"
@@ -87,4 +87,4 @@ bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxFrame"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_gauge.cpp b/src/xrc/xh_gauge.cpp
index c529b21cbf..d10a958a7b 100644
--- a/src/xrc/xh_gauge.cpp
+++ b/src/xrc/xh_gauge.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_GAUGE
+#if wxUSE_XML && wxUSE_XRC && wxUSE_GAUGE
 
 #include "wx/xrc/xh_gauge.h"
 #include "wx/gauge.h"
@@ -71,4 +71,4 @@ bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxGauge"));
 }
 
-#endif // wxUSE_XRC && wxUSE_GAUGE
+#endif // wxUSE_XML && wxUSE_XRC && wxUSE_GAUGE
diff --git a/src/xrc/xh_gdctl.cpp b/src/xrc/xh_gdctl.cpp
index 46e1add183..6cb07ef41f 100644
--- a/src/xrc/xh_gdctl.cpp
+++ b/src/xrc/xh_gdctl.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_DIRDLG
+#if wxUSE_XML && wxUSE_XRC && wxUSE_DIRDLG
 
 #include "wx/textctrl.h"
 #include "wx/xrc/xh_gdctl.h"
@@ -60,4 +60,4 @@ bool wxGenericDirCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxGenericDirCtrl"));
 }
 
-#endif // wxUSE_XRC && wxUSE_DIRDLG
+#endif // wxUSE_XML && wxUSE_XRC && wxUSE_DIRDLG
diff --git a/src/xrc/xh_html.cpp b/src/xrc/xh_html.cpp
index 7bdf27ed8f..cc97440d56 100644
--- a/src/xrc/xh_html.cpp
+++ b/src/xrc/xh_html.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_HTML
+#if wxUSE_XML && wxUSE_XRC && wxUSE_HTML
 
 #include "wx/xrc/xh_html.h"
 
@@ -82,4 +82,4 @@ bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxHtmlWindow"));
 }
 
-#endif // wxUSE_XRC && wxUSE_HTML
+#endif // wxUSE_XML && wxUSE_XRC && wxUSE_HTML
diff --git a/src/xrc/xh_listb.cpp b/src/xrc/xh_listb.cpp
index 939d6e834c..84a3b58d83 100644
--- a/src/xrc/xh_listb.cpp
+++ b/src/xrc/xh_listb.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_listb.h"
 #include "wx/listbox.h"
@@ -102,4 +102,4 @@ bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_listc.cpp b/src/xrc/xh_listc.cpp
index 6746b83224..689b62bb4d 100644
--- a/src/xrc/xh_listc.cpp
+++ b/src/xrc/xh_listc.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/textctrl.h"
 #include "wx/xrc/xh_listc.h"
@@ -74,4 +74,4 @@ bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxListCtrl"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index 1f473c6dee..e95171cc59 100644
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_menu.h"
 #include "wx/menu.h"
@@ -142,4 +142,4 @@ bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxMenuBar"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_notbk.cpp b/src/xrc/xh_notbk.cpp
index 5248793026..4947899622 100644
--- a/src/xrc/xh_notbk.cpp
+++ b/src/xrc/xh_notbk.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_NOTEBOOK
+#if wxUSE_XML && wxUSE_XRC && wxUSE_NOTEBOOK
 
 #include "wx/xrc/xh_notbk.h"
 
@@ -98,4 +98,4 @@ bool wxNotebookXmlHandler::CanHandle(wxXmlNode *node)
             (m_isInside && IsOfClass(node, wxT("notebookpage"))));
 }
 
-#endif // wxUSE_XRC && wxUSE_NOTEBOOK
+#endif // wxUSE_XML && wxUSE_XRC && wxUSE_NOTEBOOK
diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp
index 6b6a467e19..035c6cade4 100644
--- a/src/xrc/xh_panel.cpp
+++ b/src/xrc/xh_panel.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_panel.h"
 #include "wx/panel.h"
@@ -57,4 +57,4 @@ bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxPanel"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_radbt.cpp b/src/xrc/xh_radbt.cpp
index e615ef9365..1fa49b84ec 100644
--- a/src/xrc/xh_radbt.cpp
+++ b/src/xrc/xh_radbt.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_RADIOBOX
+#if wxUSE_XML && wxUSE_XRC && wxUSE_RADIOBOX
 
 #include "wx/xrc/xh_radbt.h"
 #include "wx/radiobut.h"
@@ -63,4 +63,4 @@ bool wxRadioButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxRadioButton"));
 }
 
-#endif // wxUSE_XRC && wxUSE_NOTEBOOK
+#endif // wxUSE_XML && wxUSE_XRC && wxUSE_NOTEBOOK
diff --git a/src/xrc/xh_radbx.cpp b/src/xrc/xh_radbx.cpp
index 066f397d1e..efb0f72389 100644
--- a/src/xrc/xh_radbx.cpp
+++ b/src/xrc/xh_radbx.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_RADIOBOX
+#if wxUSE_XML && wxUSE_XRC && wxUSE_RADIOBOX
 
 #include "wx/xrc/xh_radbx.h"
 #include "wx/radiobox.h"
diff --git a/src/xrc/xh_scrol.cpp b/src/xrc/xh_scrol.cpp
index dd330bb78b..d95d17e9b8 100644
--- a/src/xrc/xh_scrol.cpp
+++ b/src/xrc/xh_scrol.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_scrol.h"
 #include "wx/scrolbar.h"
@@ -61,4 +61,4 @@ bool wxScrollBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxScrollBar"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_scwin.cpp b/src/xrc/xh_scwin.cpp
index 886da64ce0..c68bb099bf 100644
--- a/src/xrc/xh_scwin.cpp
+++ b/src/xrc/xh_scwin.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_scwin.h"
 #include "wx/scrolwin.h"
@@ -62,4 +62,4 @@ bool wxScrolledWindowXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxScrolledWindow"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index 806370b3a6..d694e9a275 100644
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_sizer.h"
 #include "wx/sizer.h"
@@ -363,4 +363,4 @@ void wxSizerXmlHandler::AddSizerItem(wxSizerItem* sitem)
         m_parentSizer->Add(sitem);
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_slidr.cpp b/src/xrc/xh_slidr.cpp
index 3ca8b26aa7..9afbf18aa0 100644
--- a/src/xrc/xh_slidr.cpp
+++ b/src/xrc/xh_slidr.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_SLIDER
+#if wxUSE_XML && wxUSE_XRC && wxUSE_SLIDER
 
 #include "wx/xrc/xh_slidr.h"
 #include "wx/slider.h"
@@ -91,4 +91,4 @@ bool wxSliderXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxSlider"));
 }
 
-#endif // wxUSE_XRC && wxUSE_SLIDER
+#endif // wxUSE_XML && wxUSE_XRC && wxUSE_SLIDER
diff --git a/src/xrc/xh_spin.cpp b/src/xrc/xh_spin.cpp
index 3398ffaad1..5189a02fe3 100644
--- a/src/xrc/xh_spin.cpp
+++ b/src/xrc/xh_spin.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_spin.h"
 
@@ -105,4 +105,4 @@ bool wxSpinCtrlXmlHandler::CanHandle(wxXmlNode *node)
 
 #endif // wxUSE_SPINCTRL
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_split.cpp b/src/xrc/xh_split.cpp
index 948b241ec1..d9b2597896 100644
--- a/src/xrc/xh_split.cpp
+++ b/src/xrc/xh_split.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_split.h"
 #include "wx/splitter.h"
@@ -105,4 +105,4 @@ bool wxSplitterWindowXmlHandler::CanHandle(wxXmlNode *node)
      return IsOfClass(node, wxT("wxSplitterWindow"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp
index 5dead981da..2bb2a51d0a 100644
--- a/src/xrc/xh_statbar.cpp
+++ b/src/xrc/xh_statbar.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_STATUSBAR
+#if wxUSE_XML && wxUSE_XRC && wxUSE_STATUSBAR
 
 #include "wx/frame.h"
 #include "wx/string.h"
@@ -105,5 +105,5 @@ bool wxStatusBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStatusBar"));
 }
 
-#endif // wxUSE_XRC && wxUSE_STATUSBAR
+#endif // wxUSE_XML && wxUSE_XRC && wxUSE_STATUSBAR
 
diff --git a/src/xrc/xh_stbmp.cpp b/src/xrc/xh_stbmp.cpp
index 42f8073a91..b57a98410c 100644
--- a/src/xrc/xh_stbmp.cpp
+++ b/src/xrc/xh_stbmp.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_stbmp.h"
 #include "wx/statbmp.h"
@@ -53,4 +53,4 @@ bool wxStaticBitmapXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticBitmap"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_stbox.cpp b/src/xrc/xh_stbox.cpp
index 93f21b42d2..a5df4e68f2 100644
--- a/src/xrc/xh_stbox.cpp
+++ b/src/xrc/xh_stbox.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_stbox.h"
 #include "wx/statbox.h"
@@ -53,4 +53,4 @@ bool wxStaticBoxXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticBox"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_stlin.cpp b/src/xrc/xh_stlin.cpp
index 025713ec14..a3ee62202b 100644
--- a/src/xrc/xh_stlin.cpp
+++ b/src/xrc/xh_stlin.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_STATLINE
+#if wxUSE_XML && wxUSE_XRC && wxUSE_STATLINE
 
 #include "wx/xrc/xh_stlin.h"
 #include "wx/statline.h"
@@ -54,4 +54,4 @@ bool wxStaticLineXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticLine"));
 }
 
-#endif // wxUSE_XRC && wxUSE_STATLINE
+#endif // wxUSE_XML && wxUSE_XRC && wxUSE_STATLINE
diff --git a/src/xrc/xh_sttxt.cpp b/src/xrc/xh_sttxt.cpp
index da772ef416..dc42cd178f 100644
--- a/src/xrc/xh_sttxt.cpp
+++ b/src/xrc/xh_sttxt.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_sttxt.h"
 #include "wx/stattext.h"
@@ -57,4 +57,4 @@ bool wxStaticTextXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStaticText"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
index 745189008d..9bc80750bd 100644
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_text.h"
 #include "wx/textctrl.h"
@@ -71,4 +71,4 @@ bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxTextCtrl"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XML && wxUSE_XRC
diff --git a/src/xrc/xh_tglbtn.cpp b/src/xrc/xh_tglbtn.cpp
index 1974ab14d1..0fad6c4d12 100644
--- a/src/xrc/xh_tglbtn.cpp
+++ b/src/xrc/xh_tglbtn.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_TOGGLEBTN
+#if wxUSE_XML && wxUSE_XRC && wxUSE_TOGGLEBTN
 
 #include "wx/xrc/xh_tglbtn.h"
 #include "wx/tglbtn.h"
@@ -55,4 +55,4 @@ bool wxToggleButtonXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxToggleButton"));
 }
 
-#endif // wxUSE_XRC && wxUSE_TOGGLEBTN
+#endif // wxUSE_XML && wxUSE_XRC && wxUSE_TOGGLEBTN
diff --git a/src/xrc/xh_toolb.cpp b/src/xrc/xh_toolb.cpp
index a7a569ead4..18656c683e 100644
--- a/src/xrc/xh_toolb.cpp
+++ b/src/xrc/xh_toolb.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_TOOLBAR
+#if wxUSE_XML && wxUSE_XRC && wxUSE_TOOLBAR
 
 #include "wx/xrc/xh_toolb.h"
 #include "wx/toolbar.h"
diff --git a/src/xrc/xh_tree.cpp b/src/xrc/xh_tree.cpp
index cb886cf3d9..7a21b5f440 100644
--- a/src/xrc/xh_tree.cpp
+++ b/src/xrc/xh_tree.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_tree.h"
 #include "wx/treectrl.h"
diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index f9b5648036..ee2aaaf8c2 100644
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xh_unkwn.h"
 #include "wx/window.h"
diff --git a/src/xrc/xh_wizrd.cpp b/src/xrc/xh_wizrd.cpp
index 2b9508ae05..4fd68ca54d 100644
--- a/src/xrc/xh_wizrd.cpp
+++ b/src/xrc/xh_wizrd.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC && wxUSE_WIZARDDLG
+#if wxUSE_XML && wxUSE_XRC && wxUSE_WIZARDDLG
 
 #include "wx/xrc/xh_wizrd.h"
 #include "wx/log.h"
diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 197ea98480..c02b81d496 100644
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -19,7 +19,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/dialog.h"
 #include "wx/panel.h"
diff --git a/src/xrc/xmlrsall.cpp b/src/xrc/xmlrsall.cpp
index bf2eb99734..a5c414217c 100644
--- a/src/xrc/xmlrsall.cpp
+++ b/src/xrc/xmlrsall.cpp
@@ -20,7 +20,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XML && wxUSE_XRC
 
 #include "wx/xrc/xmlres.h"
 #include "wx/xrc/xh_all.h"