diff --git a/api/BUILD.gn b/api/BUILD.gn
index c0bf0bc375..0b54fcb4d8 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -168,11 +168,6 @@ rtc_static_library("libjingle_peerconnection_api") {
     "../rtc_base:rtc_base_approved",
     "../rtc_base/system:rtc_export",
   ]
-
-  if (is_nacl) {
-    # This is needed by .h files included from rtc_base.
-    deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
-  }
 }
 
 rtc_source_set("scoped_refptr") {
diff --git a/media/BUILD.gn b/media/BUILD.gn
index d02ef89d18..d9769717b5 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -136,10 +136,6 @@ rtc_static_library("rtc_media_base") {
   if (!build_with_mozilla) {
     deps += [ "../p2p" ]
   }
-
-  if (is_nacl) {
-    deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
-  }
 }
 
 rtc_static_library("rtc_constants") {
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index ce39958825..bb6aed3ee4 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -108,12 +108,6 @@ rtc_static_library("rtc_p2p") {
     "//third_party/abseil-cpp/absl/strings",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
-
-  if (build_with_chromium) {
-    if (is_nacl) {
-      deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
-    }
-  }
 }
 
 if (rtc_include_tests) {
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 3b9fac45e3..2cc45d5dd1 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -88,6 +88,7 @@ rtc_source_set("rtc_base_approved") {
     "//third_party/abseil-cpp/absl/memory",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
+  public_deps = []  # no-presubmit-check TODO(webrtc:8603)
 
   sources = [
     "bind.h",
@@ -149,14 +150,14 @@ rtc_source_set("rtc_base_approved") {
   }
 
   if (is_nacl) {
-    deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
+    public_deps += [ "//native_client_sdk/src/libraries/nacl_io" ]  # no-presubmit-check TODO(webrtc:8603)
   }
 
   if (is_android) {
     libs = [ "log" ]
   }
 
-  public_deps = [  # no-presubmit-check TODO(webrtc:8603)
+  public_deps += [  # no-presubmit-check TODO(webrtc:8603)
     ":atomicops",
     ":criticalsection",
     ":logging",
@@ -1006,7 +1007,7 @@ rtc_static_library("rtc_base") {
   }
 
   if (is_nacl) {
-    deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
+    public_deps += [ "//native_client_sdk/src/libraries/nacl_io" ]  # no-presubmit-check TODO(webrtc:8603)
     defines += [ "timezone=_timezone" ]
     sources -= [ "ifaddrs_converter.cc" ]
   }
diff --git a/rtc_base/memory/BUILD.gn b/rtc_base/memory/BUILD.gn
index d151557218..3f70fca819 100644
--- a/rtc_base/memory/BUILD.gn
+++ b/rtc_base/memory/BUILD.gn
@@ -44,9 +44,6 @@ rtc_source_set("fifo_buffer") {
   deps = [
     "..:rtc_base",
   ]
-  if (is_nacl) {
-    deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
-  }
 }
 
 rtc_source_set("unittests") {