diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 5101f27e94..8619ac5b70 100755
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -235,6 +235,7 @@ def _CheckNoRtcBaseDeps(input_api, gyp_files, output_api):
   violating_files = []
   for f in gyp_files:
     gyp_exceptions = (
+        'audio_device.gypi',
         'base_tests.gyp',
         'desktop_capture.gypi',
         'p2p.gyp',
@@ -260,6 +261,7 @@ def _CheckNoRtcBaseDepsGn(input_api, gn_files, output_api):
   violating_files = []
   for f in gn_files:
     gn_exceptions = (
+        os.path.join('audio_device', 'BUILD.gn'),
         os.path.join('base_tests', 'BUILD.gn'),
         os.path.join('desktop_capture', 'BUILD.gn'),
         os.path.join('p2p', 'BUILD.gn'),
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 59cdf4c11f..d4c5c0b416 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -93,6 +93,7 @@ rtc_static_library("rtc_base_approved") {
 
   sources = [
     "array_view.h",
+    "arraysize.h",
     "atomicops.h",
     "bind.h",
     "bitbuffer.cc",
@@ -288,7 +289,6 @@ rtc_static_library("rtc_base") {
 
   sources = [
     "applefilesystem.mm",
-    "arraysize.h",
     "asyncfile.cc",
     "asyncfile.h",
     "asyncinvoker-inl.h",
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 9fe2c6c2e0..f149eb39bd 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -29,6 +29,7 @@
       'target_name': 'rtc_base_approved',
       'type': 'static_library',
       'sources': [
+        'arraysize.h',
         'array_view.h',
         'atomicops.h',
         'bind.h',
@@ -231,7 +232,6 @@
       ],
       'sources': [
         'applefilesystem.mm',
-        'arraysize.h',
         'asyncfile.cc',
         'asyncfile.h',
         'asyncinvoker.cc',
diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn
index fcd4ffd45d..06b3129a86 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -53,7 +53,6 @@ rtc_source_set("audio_device") {
 
   deps = [
     "../..:webrtc_common",
-    "../../base:rtc_base",
     "../../base:rtc_base_approved",
     "../../base:rtc_task_queue",
     "../../common_audio",
@@ -175,6 +174,7 @@ rtc_source_set("audio_device") {
       }
       if (is_ios) {
         public_deps = [
+          "../../base:rtc_base",
           "../../sdk:rtc_sdk_common_objc",
         ]
         sources += [
diff --git a/webrtc/modules/audio_device/audio_device.gypi b/webrtc/modules/audio_device/audio_device.gypi
index 725d9354ef..61975d0460 100644
--- a/webrtc/modules/audio_device/audio_device.gypi
+++ b/webrtc/modules/audio_device/audio_device.gypi
@@ -173,6 +173,7 @@
                 }],
                 ['OS=="ios"', {
                   'dependencies': [
+                    '<(webrtc_root)/base/base.gyp:rtc_base',
                     '<(webrtc_root)/sdk/sdk.gyp:rtc_sdk_common_objc',
                   ],
                   'export_dependent_settings': [