diff --git a/webrtc/call/BUILD.gn b/webrtc/call/BUILD.gn
index 62bcff3385..d86df1e379 100644
--- a/webrtc/call/BUILD.gn
+++ b/webrtc/call/BUILD.gn
@@ -117,6 +117,7 @@ rtc_static_library("call") {
     "../modules/pacing",
     "../modules/rtp_rtcp",
     "../modules/utility",
+    "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:sequenced_task_checker",
     "../system_wrappers",
diff --git a/webrtc/modules/utility/BUILD.gn b/webrtc/modules/utility/BUILD.gn
index 29ff042954..7d03707081 100644
--- a/webrtc/modules/utility/BUILD.gn
+++ b/webrtc/modules/utility/BUILD.gn
@@ -34,6 +34,7 @@ rtc_static_library("utility") {
     "../..:webrtc_common",
     "../../audio/utility:audio_frame_operations",
     "../../common_audio",
+    "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_task_queue",
     "../../system_wrappers",
     "../media_file",
@@ -68,6 +69,7 @@ if (rtc_include_tests) {
     deps = [
       ":utility",
       "..:module_api",
+      "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_task_queue",
       "../../test:test_support",
       "//testing/gmock",
diff --git a/webrtc/rtc_base/BUILD.gn b/webrtc/rtc_base/BUILD.gn
index ee85a632eb..01a5679b35 100644
--- a/webrtc/rtc_base/BUILD.gn
+++ b/webrtc/rtc_base/BUILD.gn
@@ -296,15 +296,15 @@ config("enable_libevent_config") {
 }
 
 rtc_source_set("rtc_task_queue") {
-  public_deps = [
+  deps = [
     ":rtc_base_approved",
+  ]
+  public_deps = [
     ":rtc_task_queue_api",
   ]
 
   if (rtc_link_task_queue_impl) {
-    deps = [
-      ":rtc_task_queue_impl",
-    ]
+    deps += [ ":rtc_task_queue_impl" ]
   }
 }
 
@@ -372,6 +372,7 @@ rtc_static_library("sequenced_task_checker") {
     "sequenced_task_checker_impl.h",
   ]
   deps = [
+    ":rtc_base_approved",
     ":rtc_task_queue",
   ]
 }
@@ -905,6 +906,7 @@ if (rtc_include_tests) {
       "task_queue_unittest.cc",
     ]
     deps = [
+      ":rtc_base_approved",
       ":rtc_base_tests_main",
       ":rtc_base_tests_utils",
       ":rtc_task_queue",
diff --git a/webrtc/rtc_tools/network_tester/BUILD.gn b/webrtc/rtc_tools/network_tester/BUILD.gn
index 847db66820..02bbc3182b 100644
--- a/webrtc/rtc_tools/network_tester/BUILD.gn
+++ b/webrtc/rtc_tools/network_tester/BUILD.gn
@@ -43,6 +43,7 @@ if (rtc_enable_protobuf) {
       ":network_tester_packet_proto",
       "../../p2p",
       "../../rtc_base:protobuf_utils",
+      "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_task_queue",
       "../../rtc_base:sequenced_task_checker",
     ]
diff --git a/webrtc/video/BUILD.gn b/webrtc/video/BUILD.gn
index 57776b9647..b815acef8e 100644
--- a/webrtc/video/BUILD.gn
+++ b/webrtc/video/BUILD.gn
@@ -103,6 +103,7 @@ if (rtc_include_tests) {
       "../modules/video_coding:webrtc_h264",
       "../modules/video_coding:webrtc_vp8",
       "../modules/video_coding:webrtc_vp9",
+      "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base:rtc_task_queue",
       "../system_wrappers",