diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn
index ab0b4f5b32..f5abb1b281 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -176,6 +176,7 @@ rtc_static_library("audio_device") {
         public_deps = [
           "../../base:rtc_base",
           "../../sdk:rtc_sdk_common_objc",
+          "../../sdk:rtc_sdk_helpers_objc",
         ]
         sources += [
           "ios/audio_device_ios.h",
diff --git a/webrtc/sdk/BUILD.gn b/webrtc/sdk/BUILD.gn
index 5596af09fc..1b27218745 100644
--- a/webrtc/sdk/BUILD.gn
+++ b/webrtc/sdk/BUILD.gn
@@ -27,6 +27,21 @@ if (is_ios || is_mac) {
     ]
   }
 
+  rtc_static_library("rtc_sdk_helpers_objc") {
+    sources = [
+      "objc/Framework/Classes/helpers.h",
+      "objc/Framework/Classes/helpers.mm",
+    ]
+    deps = [
+      "../base:rtc_base_approved",
+    ]
+    configs += [ "..:common_objc" ]
+
+    if (is_ios) {
+      libs = [ "AVFoundation.framework" ]
+    }
+  }
+
   rtc_static_library("rtc_sdk_common_objc") {
     sources = [
       "objc/Framework/Classes/NSString+StdString.h",
@@ -39,8 +54,6 @@ if (is_ios || is_mac) {
       "objc/Framework/Classes/RTCMetricsSampleInfo.mm",
       "objc/Framework/Classes/RTCSSLAdapter.mm",
       "objc/Framework/Classes/RTCTracing.mm",
-      "objc/Framework/Classes/helpers.h",
-      "objc/Framework/Classes/helpers.mm",
       "objc/Framework/Headers/WebRTC/RTCDispatcher.h",
       "objc/Framework/Headers/WebRTC/RTCFieldTrials.h",
       "objc/Framework/Headers/WebRTC/RTCLogging.h",
@@ -52,6 +65,7 @@ if (is_ios || is_mac) {
     ]
 
     deps = [
+      ":rtc_sdk_helpers_objc",
       "../base:rtc_base",
     ]
     configs += [ "..:common_objc" ]
@@ -285,7 +299,7 @@ if (is_ios || is_mac) {
       # gets additional generated targets which would require many lines here to
       # cover (which would be confusing to read and hard to maintain).
       if (!is_android && !is_ios) {
-        visibility = [ "//webrtc:rtc_unittests" ]
+        visibility = [ "../:rtc_unittests" ]
       }
       sources = [
         "objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm",
@@ -316,9 +330,9 @@ if (is_ios || is_mac) {
       defines = [ "GTEST_RELATIVE_PATH" ]
       deps = [
         ":rtc_sdk_peerconnection_objc",
+        "..//system_wrappers:system_wrappers_default",
         "../base:rtc_base_tests_utils",
         "//third_party/ocmock",
-        "//webrtc/system_wrappers:system_wrappers_default",
       ]
 
       if (!build_with_chromium && is_clang) {
@@ -420,8 +434,8 @@ if (is_ios || is_mac) {
     complete_static_lib = true
     deps = [
       ":rtc_sdk_peerconnection_objc",
-      "//webrtc/system_wrappers:field_trial_default",
-      "//webrtc/system_wrappers:metrics_default",
+      "..//system_wrappers:field_trial_default",
+      "..//system_wrappers:metrics_default",
     ]
   }
 
@@ -435,7 +449,7 @@ if (is_ios || is_mac) {
       "objc/Framework/Classes/h264_video_toolbox_nalu.h",
     ]
 
-    configs += [ "//webrtc:common_objc" ]
+    configs += [ "../:common_objc" ]
 
     deps = [
       ":rtc_sdk_common_objc",
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index 4682b7dcad..0a4c2e1aa7 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -314,8 +314,10 @@ rtc_source_set("fileutils") {
     "testsupport/fileutils.cc",
     "testsupport/fileutils.h",
   ]
+  deps = []
   if (is_ios) {
     sources += [ "testsupport/iosfileutils.mm" ]
+    deps += [ "../sdk:rtc_sdk_helpers_objc" ]
   }
   visibility = [ ":*" ]
 }