diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 82bb132b8a..f6f71e20ba 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -2373,8 +2373,27 @@
 #           define wxUSE_LONLONG 1
 #       endif
 #   endif
+#   if !wxUSE_VARIANT
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxRichTextCtrl requires wxUSE_VARIANT"
+#       else
+#           undef wxUSE_VARIANT
+#           define wxUSE_VARIANT 1
+#       endif
+#   endif
 #endif /* wxUSE_RICHTEXT */
 
+#if wxUSE_PROPGRID
+#   if !wxUSE_VARIANT
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxPropertyGrid requires wxUSE_VARIANT"
+#       else
+#           undef wxUSE_VARIANT
+#           define wxUSE_VARIANT 1
+#       endif
+#   endif
+#endif /* wxUSE_PROPGRID */
+
 #endif /* wxUSE_GUI */
 
 #endif /* _WX_CHKCONF_H_ */