diff --git a/features.bzl b/features.bzl
index a868fda..328d23d 100644
--- a/features.bzl
+++ b/features.bzl
@@ -8,6 +8,9 @@ _cc = struct(
     # on find_cpp_toolchain are available (#17308).
     # Note: While the target and parameter are available in 6.1.0, they only take effect in Bazel 7.
     find_cpp_toolchain_has_mandatory_param = ge("6.1.0"),
+    # Note: In Bazel 6.3 the `grep_includes` parameter is optional and a no-op in the cc_common API
+    # In future Bazel versions it will be removed altogether.
+    grep_includes_is_optional = ge("6.3.0"),
 )
 
 _external_deps = struct(