diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index ca1edaf08e..25af3dd90c 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1276,6 +1276,17 @@
                         wxUSE_CHOICEBOOK || \
                         wxUSE_TREEBOOK)
 
+#if wxUSE_COLLPANE
+#   if !wxUSE_BUTTON || !wxUSE_STATLINE
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_COLLPANE requires wxUSE_BUTTON and wxUSE_STATLINE"
+#       else
+#           undef wxUSE_COLLPANE
+#           define wxUSE_COLLPANE 0
+#       endif
+#   endif
+#endif /* wxUSE_COLLPANE */
+
 #if wxUSE_LISTBOOK
 #   if !wxUSE_LISTCTRL
 #       ifdef wxABORT_ON_CONFIG_ERROR
diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h
index 6f3cd07852..c40d772b68 100644
--- a/include/wx/generic/collpaneg.h
+++ b/include/wx/generic/collpaneg.h
@@ -12,8 +12,6 @@
 #ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
 #define _WX_COLLAPSABLE_PANE_H_GENERIC_
 
-#if wxUSE_BUTTON && wxUSE_STATLINE
-
 // forward declared
 class WXDLLEXPORT wxButton;
 class WXDLLEXPORT wxStaticLine;
@@ -104,5 +102,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#endif // wxUSE_BUTTON && wxUSE_STATLINE
 #endif // _WX_COLLAPSABLE_PANE_H_GENERIC_