diff --git a/include/wx/xrc/xh_chckl.h b/include/wx/xrc/xh_chckl.h
index 577065e986..d3a2bc2abe 100644
--- a/include/wx/xrc/xh_chckl.h
+++ b/include/wx/xrc/xh_chckl.h
@@ -17,6 +17,8 @@
 
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_CHECKLISTBOX
+
 class WXDLLIMPEXP_XRC wxCheckListBoxXmlHandler : public wxXmlResourceHandler
 {
 DECLARE_DYNAMIC_CLASS(wxCheckListBoxXmlHandler)
@@ -29,6 +31,6 @@ private:
     wxArrayString strList;
 };
 
-
+#endif
 
 #endif // _WX_XH_CHECKLIST_H_
diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index 8ed6fef709..d7e5226486 100644
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -21,7 +21,7 @@
 
 #if wxUSE_XRC
 
-#if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
+#if wxUSE_CHECKLISTBOX
 
 #include "wx/xrc/xh_chckl.h"
 #include "wx/checklst.h"
@@ -131,6 +131,6 @@ bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
            (m_insideBox && node->GetName() == wxT("item")));
 }
 
-#endif // wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
+#endif // wxUSE_CHECKLISTBOX
 
 #endif // wxUSE_XRC