diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 21497874b1..65a6c2b172 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -635,14 +635,6 @@
 #   endif
 #endif /* !defined(wxUSE_HELP) */
 
-#ifndef wxUSE_HEADERCTRL
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_HEADERCTRL must be defined."
-#   else
-#       define wxUSE_HEADERCTRL 0
-#   endif
-#endif /* !defined(wxUSE_HEADERCTRL) */
-
 #ifndef wxUSE_HYPERLINKCTRL
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_HYPERLINKCTRL must be defined."
@@ -1445,6 +1437,17 @@
 #   endif
 #endif /* !wxUSE_HEADERCTRL */
 
+#if wxUSE_REARRANGECTRL
+#   if !wxUSE_CHECKLISTBOX
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxRearrangeCtrl requires wxCheckListBox"
+#       else
+#           undef wxUSE_REARRANGECTRL
+#           define wxUSE_REARRANGECTRL 0
+#       endif
+#   endif
+#endif /* wxUSE_REARRANGECTRL */
+
 /* don't attempt to use native status bar on the platforms not having it */
 #ifndef wxUSE_NATIVE_STATUSBAR
 #   define wxUSE_NATIVE_STATUSBAR 0