diff --git a/.bazelrc b/.bazelrc
index 64dfac487..ffcd8bbce 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -18,6 +18,11 @@ build --cxxopt='-std=c++17'
 # https://github.com/bazelbuild/bazel/pull/15327 for details.
 build --incompatible_disallow_empty_glob
 
+# Flip incompatible_config_setting_private_default_visibility to avoid breaking
+# forward compatibility. See https://github.com/bazelbuild/bazel/issues/12933
+# for details.
+common --incompatible_config_setting_private_default_visibility
+
 # Link Google Test against Abseil and RE2.
 build --define='absl=1'
 
diff --git a/tcmalloc/BUILD b/tcmalloc/BUILD
index 5fba25bd1..4fcf60f12 100644
--- a/tcmalloc/BUILD
+++ b/tcmalloc/BUILD
@@ -32,6 +32,7 @@ config_setting(
     flag_values = {
         "@bazel_tools//tools/cpp:compiler": "clang",
     },
+    visibility = ["//tcmalloc:__subpackages__"],
 )
 
 cc_library(