diff --git a/BUILD.gn b/BUILD.gn
index 6856cdc7a2..5a1446d956 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -419,6 +419,11 @@ if (!build_with_chromium) {
 }
 
 rtc_source_set("webrtc_common") {
+  # Client code SHOULD NOT USE THIS TARGET, but for now it needs to be public
+  # because there exists client code that uses it.
+  # TODO(bugs.webrtc.org/9808): Move to private visibility as soon as that
+  # client code gets updated.
+  visibility = [ "*" ]
   sources = [
     "common_types.h",
   ]
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 48704dfe52..4982d19a7b 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -58,7 +58,13 @@ rtc_static_library("audio_format_conversion") {
 }
 
 rtc_static_library("rent_a_codec") {
-  visibility += webrtc_default_visibility
+  # Client code SHOULD NOT USE THIS TARGET, but for now it needs to be public
+  # because there exists client code that uses it.
+  # TODO(bugs.webrtc.org/9808): Move to private visibility as soon as that
+  # client code gets updated.
+  visibility += [ "*" ]
+  allow_poison = [ "audio_codecs" ]
+
   sources = [
     "acm2/acm_codec_database.cc",
     "acm2/acm_codec_database.h",