diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 2dd4dc7a74..2b1a34a66c 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -90,6 +90,8 @@ rtc_source_set("rtc_base_approved") {
 }
 
 rtc_source_set("macromagic") {
+  # TODO(bugs.webrtc.org/9606): This should not be public.
+  visibility = [ "*" ]
   sources = [
     "arraysize.h",
     "constructormagic.h",
@@ -188,6 +190,7 @@ rtc_source_set("rtc_event") {
 }
 
 rtc_source_set("logging") {
+  visibility = [ "*" ]
   deps = [
     ":criticalsection",
     ":macromagic",
@@ -237,6 +240,8 @@ rtc_source_set("atomicops") {
 }
 
 rtc_source_set("checks") {
+  # TODO(bugs.webrtc.org/9607): This should not be public.
+  visibility = [ "*" ]
   sources = [
     "checks.cc",
     "checks.h",
@@ -295,6 +300,7 @@ rtc_source_set("safe_conversions") {
 }
 
 rtc_source_set("timeutils") {
+  visibility = [ "*" ]
   sources = [
     "timeutils.cc",
     "timeutils.h",
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 6b2f6b9043..7c95f0fe9e 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -55,6 +55,7 @@ if (is_ios || is_mac) {
   }
 
   rtc_static_library("common_objc") {
+    visibility = [ "*" ]
     sources = [
       "objc/Framework/Classes/Common/NSString+StdString.h",
       "objc/Framework/Classes/Common/NSString+StdString.mm",
@@ -231,6 +232,7 @@ if (is_ios || is_mac) {
     }
 
     rtc_static_library("videoframebuffer_objc") {
+      visibility = [ "*" ]
       sources = [
         "objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm",
         "objc/Framework/Classes/Video/RTCCVPixelBuffer.mm",