diff --git a/api/BUILD.gn b/api/BUILD.gn
index 7e54cb3..ec03df3 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -53,8 +53,8 @@
     "../modules/audio_device:audio_device_api",
     "../modules/audio_processing:api",
     "../pc:peerconnection",
+    "../rtc_base",
     "../rtc_base:deprecation",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
     "audio:audio_mixer_api",
     "audio_codecs:audio_codecs_api",
@@ -162,9 +162,9 @@
     "../logging:rtc_event_log_api",
     "../media:rtc_media_config",
     "../modules/audio_processing:audio_processing_statistics",
+    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:deprecation",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/system:rtc_export",
   ]
@@ -326,8 +326,8 @@
     "test/simulated_network.h",
   ]
   deps = [
+    "../rtc_base",
     "../rtc_base:criticalsection",
-    "../rtc_base:rtc_base",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
@@ -339,7 +339,7 @@
   ]
   deps = [
     ":simulated_network_api",
-    "../rtc_base:rtc_base",
+    "../rtc_base",
   ]
 }
 
@@ -386,7 +386,7 @@
     ":libjingle_peerconnection_api",
     ":scoped_refptr",
     "../p2p:rtc_p2p",
-    "../rtc_base:rtc_base",
+    "../rtc_base",
     "//third_party/abseil-cpp/absl/memory",
   ]
 }
@@ -410,8 +410,8 @@
       ]
 
       deps = [
+        "../modules/audio_processing",
         "../modules/audio_processing:api",
-        "../modules/audio_processing:audio_processing",
         "../modules/audio_processing:audioproc_f_impl",
       ]
     }
@@ -673,8 +673,8 @@
 
     deps = [
       ":libjingle_peerconnection_api",
+      "../rtc_base",
       "../rtc_base:checks",
-      "../rtc_base:rtc_base",
       "//third_party/abseil-cpp/absl/memory",
     ]
   }
diff --git a/api/audio/BUILD.gn b/api/audio/BUILD.gn
index 7b87276..b5a6111 100644
--- a/api/audio/BUILD.gn
+++ b/api/audio/BUILD.gn
@@ -59,7 +59,7 @@
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_json",
     "../../rtc_base/system:rtc_export",
-    "//third_party/abseil-cpp/absl/strings:strings",
+    "//third_party/abseil-cpp/absl/strings",
   ]
 }
 
diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index ed8a030..aef213e 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -50,8 +50,8 @@
   deps = [
     ":video_frame",
     "..:scoped_refptr",
+    "../../rtc_base",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base",
     "../../rtc_base/memory:aligned_malloc",
     "../../rtc_base/system:rtc_export",
     "//third_party/libyuv",
@@ -68,8 +68,8 @@
     ":video_frame",
     ":video_frame_i420",
     "..:scoped_refptr",
+    "../../rtc_base",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base",
     "../../rtc_base/memory:aligned_malloc",
     "//third_party/libyuv",
   ]
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index fc42002..ce6525e 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -63,16 +63,16 @@
     "../modules/audio_device",
     "../modules/audio_processing",
     "../modules/audio_processing:api",
-    "../modules/bitrate_controller:bitrate_controller",
-    "../modules/pacing:pacing",
-    "../modules/remote_bitrate_estimator:remote_bitrate_estimator",
+    "../modules/bitrate_controller",
+    "../modules/pacing",
+    "../modules/remote_bitrate_estimator",
     "../modules/rtp_rtcp",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../modules/utility",
+    "../rtc_base",
     "../rtc_base:audio_format_to_string",
     "../rtc_base:checks",
     "../rtc_base:rate_limiter",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:safe_minmax",
@@ -98,7 +98,7 @@
       "../api:simulated_network_api",
       "../call:fake_network",
       "../call:simulated_network",
-      "../system_wrappers:system_wrappers",
+      "../system_wrappers",
       "../test:test_common",
       "../test:test_support",
       "//third_party/abseil-cpp/absl/memory",
@@ -150,7 +150,7 @@
       "../modules/audio_mixer:audio_mixer_impl",
       "../modules/audio_processing:audio_processing_statistics",
       "../modules/audio_processing:mocks",
-      "../modules/pacing:pacing",
+      "../modules/pacing",
       "../modules/rtp_rtcp:mock_rtp_rtcp",
       "../modules/rtp_rtcp:rtp_rtcp_format",
       "../modules/utility",
@@ -159,7 +159,7 @@
       "../rtc_base:rtc_task_queue",
       "../rtc_base:safe_compare",
       "../rtc_base:timeutils",
-      "../system_wrappers:system_wrappers",
+      "../system_wrappers",
       "../test:audio_codec_mocks",
       "../test:rtp_test_utils",
       "../test:test_common",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 05d30fc..1f94d9c 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -40,14 +40,14 @@
     "../api/audio_codecs:audio_codecs_api",
     "../api/task_queue",
     "../api/transport:network_control",
-    "../modules/audio_device:audio_device",
+    "../modules/audio_device",
+    "../modules/audio_processing",
     "../modules/audio_processing:api",
-    "../modules/audio_processing:audio_processing",
     "../modules/audio_processing:audio_processing_statistics",
-    "../modules/utility:utility",
+    "../modules/utility",
+    "../rtc_base",
     "../rtc_base:audio_format_to_string",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/network:sent_packet",
     "//third_party/abseil-cpp/absl/types:optional",
@@ -141,15 +141,15 @@
     "../modules/congestion_controller/rtp:control_handler",
     "../modules/congestion_controller/rtp:transport_feedback",
     "../modules/pacing",
-    "../modules/rtp_rtcp:rtp_rtcp",
+    "../modules/rtp_rtcp",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../modules/rtp_rtcp:rtp_video_header",
     "../modules/utility",
     "../modules/video_coding:codec_globals_headers",
     "../modules/video_coding:video_codec_interface",
+    "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:rate_limiter",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
     "../rtc_base/task_utils:repeating_task",
@@ -242,7 +242,7 @@
     "../modules/rtp_rtcp",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../modules/utility",
-    "../modules/video_coding:video_coding",
+    "../modules/video_coding",
     "../rtc_base:checks",
     "../rtc_base:rate_limiter",
     "../rtc_base:rtc_base_approved",
@@ -276,7 +276,7 @@
     "../api/video:video_frame",
     "../api/video:video_stream_encoder",
     "../api/video_codecs:video_codecs_api",
-    "../common_video:common_video",
+    "../common_video",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
@@ -374,7 +374,7 @@
       "../api/audio_codecs:builtin_audio_decoder_factory",
       "../api/task_queue:global_task_queue_factory",
       "../api/video:video_frame",
-      "../audio:audio",
+      "../audio",
       "../logging:rtc_event_log_api",
       "../logging:rtc_event_log_impl_base",
       "../modules/audio_device:mock_audio_device",
@@ -389,9 +389,9 @@
       "../modules/rtp_rtcp:mock_rtp_rtcp",
       "../modules/rtp_rtcp:rtp_rtcp_format",
       "../modules/utility:mock_process_thread",
+      "../modules/video_coding",
       "../modules/video_coding:codec_globals_headers",
       "../modules/video_coding:video_codec_interface",
-      "../modules/video_coding:video_coding",
       "../rtc_base:checks",
       "../rtc_base:rate_limiter",
       "../rtc_base:rtc_base_approved",
@@ -403,7 +403,7 @@
       "../test:test_common",
       "../test:test_support",
       "../test:video_test_common",
-      "../video:video",
+      "../video",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/abseil-cpp/absl/container:inlined_vector",
@@ -467,8 +467,8 @@
       "../api:libjingle_peerconnection_api",
       "../modules/congestion_controller",
       "../modules/pacing",
+      "../rtc_base",
       "../rtc_base:rate_limiter",
-      "../rtc_base:rtc_base",
       "../rtc_base/network:sent_packet",
       "../test:test_support",
     ]
diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn
index f7ffa00..4729e13 100644
--- a/common_audio/BUILD.gn
+++ b/common_audio/BUILD.gn
@@ -56,7 +56,7 @@
     "../rtc_base/system:arch",
     "../system_wrappers",
     "../system_wrappers:cpu_features_api",
-    "third_party/fft4g:fft4g",
+    "third_party/fft4g",
     "//third_party/abseil-cpp/absl/container:inlined_vector",
     "//third_party/abseil-cpp/absl/memory",
     "//third_party/abseil-cpp/absl/types:optional",
@@ -188,7 +188,7 @@
     "../rtc_base/system:arch",
     "../system_wrappers",
     "../system_wrappers:cpu_features_api",
-    "third_party/fft4g:fft4g",
+    "third_party/fft4g",
     "third_party/spl_sqrt_floor",
   ]
 }
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index bbaaa89..2b0712c 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -48,8 +48,8 @@
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
     "../media:rtc_h264_profile_id",
+    "../rtc_base",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:safe_minmax",
     "../system_wrappers:metrics",
@@ -95,9 +95,9 @@
       "../api/video:video_frame_i010",
       "../api/video:video_frame_i420",
       "../media:rtc_h264_profile_id",
-      "../modules/video_capture:video_capture",
+      "../modules/video_capture",
+      "../rtc_base",
       "../rtc_base:checks",
-      "../rtc_base:rtc_base",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
       "../test:fileutils",
diff --git a/common_video/generic_frame_descriptor/BUILD.gn b/common_video/generic_frame_descriptor/BUILD.gn
index d9bd494..6c69b64 100644
--- a/common_video/generic_frame_descriptor/BUILD.gn
+++ b/common_video/generic_frame_descriptor/BUILD.gn
@@ -18,6 +18,6 @@
     "../../api:array_view",
     "../../rtc_base:checks",
     "//third_party/abseil-cpp/absl/container:inlined_vector",
-    "//third_party/abseil-cpp/absl/strings:strings",
+    "//third_party/abseil-cpp/absl/strings",
   ]
 }
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index e3c0845..181175e 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -33,7 +33,7 @@
     # TODO(sakal): We include some code from the tests. Remove this dependency
     # and remove this if-clause.
     if (rtc_include_tests) {
-      deps += [ "androidnativeapi:androidnativeapi" ]
+      deps += [ "androidnativeapi" ]
     }
   }
 
@@ -69,7 +69,7 @@
     "turnserver/read_auth_file.h",
   ]
   deps = [
-    "../rtc_base:rtc_base",
+    "../rtc_base",
   ]
 }
 
@@ -387,7 +387,7 @@
       }
 
       if (target_cpu == "x86") {
-        deps += [ "//testing/iossim:iossim" ]
+        deps += [ "//testing/iossim" ]
       }
     }
 
@@ -511,10 +511,10 @@
         "../api/video:builtin_video_bitrate_allocator_factory",
         "../logging:rtc_event_log_impl_base",
         "../media:rtc_audio_video",
+        "../modules/audio_processing",
         "../modules/audio_processing:api",
-        "../modules/audio_processing:audio_processing",
         "../pc:libjingle_peerconnection",
-        "../rtc_base:rtc_base",
+        "../rtc_base",
         "../sdk:base_objc",
         "../sdk:default_codec_factory_objc",
         "../sdk:helpers_objc",
@@ -546,7 +546,7 @@
       ]
 
       if (target_cpu == "x86") {
-        deps += [ "//testing/iossim:iossim" ]
+        deps += [ "//testing/iossim" ]
       }
     }
   }
@@ -649,7 +649,7 @@
         deps = [
           ":AppRTCMobile_lib",
           ":apprtc_signaling",
-          "../rtc_base:rtc_base",
+          "../rtc_base",
           "../sdk:framework_objc+link",
           "../sdk:ios_framework_bundle",
           "//build/config/ios:xctest",
@@ -739,13 +739,13 @@
       "../api/video_codecs:builtin_video_decoder_factory",
       "../api/video_codecs:builtin_video_encoder_factory",
       "../media:rtc_audio_video",
-      "../modules/audio_device:audio_device",
+      "../modules/audio_device",
+      "../modules/audio_processing",
       "../modules/audio_processing:api",
-      "../modules/audio_processing:audio_processing",
       "../modules/video_capture:video_capture_module",
       "../pc:libjingle_peerconnection",
       "../pc:peerconnection",
-      "../rtc_base:rtc_base",
+      "../rtc_base",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_json",
       "../test:video_test_common",
@@ -780,7 +780,7 @@
       "../p2p:p2p_server_utils",
       "../p2p:rtc_p2p",
       "../pc:rtc_pc",
-      "../rtc_base:rtc_base",
+      "../rtc_base",
       "../rtc_base:rtc_base_approved",
     ]
   }
@@ -794,7 +794,7 @@
       "../p2p:p2p_server_utils",
       "../p2p:rtc_p2p",
       "../pc:rtc_pc",
-      "../rtc_base:rtc_base",
+      "../rtc_base",
       "../rtc_base:rtc_base_approved",
     ]
   }
@@ -807,7 +807,7 @@
       "../p2p:p2p_server_utils",
       "../p2p:rtc_p2p",
       "../pc:rtc_pc",
-      "../rtc_base:rtc_base",
+      "../rtc_base",
       "../rtc_base:rtc_base_approved",
     ]
   }
@@ -847,20 +847,20 @@
       "../media:rtc_internal_video_codecs",
       "../media:rtc_media",
       "../media:rtc_media_base",
-      "../modules/audio_device:audio_device",
+      "../modules/audio_device",
+      "../modules/audio_processing",
       "../modules/audio_processing:api",
-      "../modules/audio_processing:audio_processing",
       "../modules/video_capture:video_capture_module",
       "../pc:libjingle_peerconnection",
       "../pc:peerconnection",
-      "../rtc_base:rtc_base",
+      "../rtc_base",
       "../test:platform_video_capturer",
       "../test:video_test_common",
       "//third_party/abseil-cpp/absl/memory",
     ]
     if (is_android) {
       deps += [
-        "../modules/utility:utility",
+        "../modules/utility",
         "../sdk/android:libjingle_peerconnection_jni",
       ]
     }
@@ -907,8 +907,8 @@
     deps = [
       "../p2p:libstunprober",
       "../p2p:rtc_p2p",
+      "../rtc_base",
       "../rtc_base:checks",
-      "../rtc_base:rtc_base",
       "../rtc_base:rtc_base_approved",
     ]
   }
diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn
index acf580b..d8fa13d 100644
--- a/examples/androidnativeapi/BUILD.gn
+++ b/examples/androidnativeapi/BUILD.gn
@@ -57,9 +57,9 @@
       "//media:rtc_internal_video_codecs",
       "//modules/audio_processing",
       "//modules/audio_processing:api",
-      "//modules/utility:utility",
+      "//modules/utility",
       "//pc:libjingle_peerconnection",
-      "//rtc_base:rtc_base",
+      "//rtc_base",
       "//rtc_base:rtc_base_approved",
       "//sdk/android:native_api_base",
       "//sdk/android:native_api_jni",
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index fc8c65b..6c072dd 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -111,7 +111,7 @@
   deps = [
     ":rtc_event_log_api",
     "../api:scoped_refptr",
-    "../modules/remote_bitrate_estimator:remote_bitrate_estimator",
+    "../modules/remote_bitrate_estimator",
     "//third_party/abseil-cpp/absl/memory",
   ]
 }
@@ -195,7 +195,7 @@
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
     "//third_party/abseil-cpp/absl/memory",
-    "//third_party/abseil-cpp/absl/strings:strings",
+    "//third_party/abseil-cpp/absl/strings",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 
@@ -216,7 +216,7 @@
       ":rtc_stream_config",
       "../api:array_view",
       "../modules/audio_coding:audio_network_adaptor",
-      "../modules/remote_bitrate_estimator:remote_bitrate_estimator",
+      "../modules/remote_bitrate_estimator",
       "../modules/rtp_rtcp:rtp_rtcp_format",
     ]
     sources += [
@@ -287,8 +287,8 @@
   deps = [
     ":ice_log",
     ":rtc_event_log_api",
+    "../rtc_base",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base",
   ]
 }
 
@@ -336,7 +336,7 @@
       "../call:video_stream_api",
       "../modules/audio_coding:audio_network_adaptor",
       "../modules/congestion_controller/rtp:transport_feedback",
-      "../modules/remote_bitrate_estimator:remote_bitrate_estimator",
+      "../modules/remote_bitrate_estimator",
       "../modules/rtp_rtcp",
       "../modules/rtp_rtcp:rtp_rtcp_format",
       "../rtc_base:checks",
@@ -387,12 +387,12 @@
         "../call",
         "../call:call_interfaces",
         "../modules/audio_coding:audio_network_adaptor",
-        "../modules/remote_bitrate_estimator:remote_bitrate_estimator",
+        "../modules/remote_bitrate_estimator",
         "../modules/rtp_rtcp:rtp_rtcp_format",
         "../rtc_base:checks",
         "../rtc_base:rtc_base_approved",
         "../rtc_base:rtc_base_tests_utils",
-        "../system_wrappers:system_wrappers",
+        "../system_wrappers",
         "../test:fileutils",
         "../test:test_support",
         "//testing/gtest",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 1605127..26a17a1 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -32,8 +32,8 @@
 
   deps = [
     "..:webrtc_common",
+    "../rtc_base",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/system:rtc_export",
     "//third_party/abseil-cpp/absl/types:optional",
@@ -124,7 +124,7 @@
     "../call:call_interfaces",
     "../common_video",
     "../modules/audio_processing:audio_processing_statistics",
-    "../rtc_base:rtc_base",
+    "../rtc_base",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/system:rtc_export",
     "../rtc_base/third_party/sigslot",
@@ -264,9 +264,9 @@
     "../api/video:video_bitrate_allocator_factory",
     "../modules/audio_processing:api",
     "../modules/audio_processing:gain_control_interface",
-    "../modules/audio_processing/aec_dump:aec_dump",
+    "../modules/audio_processing/aec_dump",
+    "../modules/video_coding",
     "../modules/video_coding:video_codec_interface",
-    "../modules/video_coding:video_coding",
     "../modules/video_coding:video_coding_utility",
     "../rtc_base:audio_format_to_string",
     "../rtc_base:checks",
@@ -300,7 +300,7 @@
 
   public_configs = []
   if (build_with_chromium) {
-    deps += [ "../modules/video_capture:video_capture" ]
+    deps += [ "../modules/video_capture" ]
   } else {
     public_configs += [ ":rtc_media_defines_config" ]
     deps += [ "../modules/video_capture:video_capture_internal_impl" ]
@@ -327,13 +327,13 @@
     "../call",
     "../call:call_interfaces",
     "../call:video_stream_api",
-    "../common_video:common_video",
-    "../modules/audio_device:audio_device",
+    "../common_video",
+    "../modules/audio_device",
     "../modules/audio_device:audio_device_impl",
     "../modules/audio_mixer:audio_mixer_impl",
-    "../modules/audio_processing:audio_processing",
+    "../modules/audio_processing",
     "../pc:rtc_pc_base",
-    "../rtc_base:rtc_base",
+    "../rtc_base",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:stringutils",
     "../rtc_base/experiments:audio_allocation_settings",
@@ -379,7 +379,7 @@
     "../api:call_api",
     "../api:transport_api",
     "../p2p:rtc_p2p",
-    "../rtc_base:rtc_base",
+    "../rtc_base",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/third_party/sigslot",
     "../system_wrappers",
@@ -410,9 +410,9 @@
       "../api/video:encoded_image",
       "../api/video:video_frame_i420",
       "../call:video_stream_api",
-      "../common_video:common_video",
+      "../common_video",
+      "../modules/audio_processing",
       "../modules/audio_processing:api",
-      "../modules/audio_processing:audio_processing",
       "../modules/rtp_rtcp:rtp_rtcp_format",
       "../modules/video_coding:video_codec_interface",
       "../modules/video_coding:video_coding_utility",
@@ -454,7 +454,7 @@
       "../api/video_codecs:video_codecs_api",
       "../call:call_interfaces",
       "../call:mock_rtp_interfaces",
-      "../rtc_base:rtc_base",
+      "../rtc_base",
       "../rtc_base:rtc_base_approved",
       "../rtc_base/third_party/sigslot",
       "../test:test_support",
@@ -508,7 +508,7 @@
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base:rtc_task_queue",
       "../rtc_base:stringutils",
-      "../rtc_base/third_party/sigslot:sigslot",
+      "../rtc_base/third_party/sigslot",
       "../test:field_trial",
       "//third_party/abseil-cpp/absl/memory",
       "//third_party/abseil-cpp/absl/strings",
@@ -586,14 +586,14 @@
       "../api/video_codecs:video_codecs_api",
       "../audio",
       "../call:call_interfaces",
-      "../common_video:common_video",
+      "../common_video",
       "../logging:rtc_event_log_api",
       "../logging:rtc_event_log_impl_base",
       "../modules/audio_device:mock_audio_device",
-      "../modules/audio_processing:audio_processing",
+      "../modules/audio_processing",
       "../modules/video_coding:simulcast_test_fixture_impl",
       "../p2p:p2p_test_utils",
-      "../rtc_base:rtc_base",
+      "../rtc_base",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_main",
       "../test:audio_codec_mocks",
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 56792e9..8575e71 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -47,7 +47,7 @@
     "../../api:array_view",
     "../../api/audio:audio_frame_api",
     "../../api/audio_codecs:audio_codecs_api",
-    "../../common_audio:common_audio",
+    "../../common_audio",
     "../../common_audio:common_audio_c",
     "../../logging:rtc_event_log_api",
     "../../rtc_base:audio_format_to_string",
@@ -1041,8 +1041,8 @@
     "../../api:array_view",
     "../../api:rtp_headers",
     "../../common_audio",
+    "../../rtc_base",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/system:arch",
     "../../test:rtp_test_utils",
@@ -1088,7 +1088,7 @@
     "../../rtc_base:rtc_base_approved",
     "../rtp_rtcp",
     "../rtp_rtcp:rtp_rtcp_format",
-    "//third_party/abseil-cpp/absl/strings:strings",
+    "//third_party/abseil-cpp/absl/strings",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 
@@ -1961,8 +1961,8 @@
       "../../logging:rtc_event_audio",
       "../../logging:rtc_event_log_api",
       "../../modules/rtp_rtcp:rtp_rtcp_format",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_base_tests_utils",
       "../../rtc_base:sanitizer",
diff --git a/modules/audio_coding/codecs/opus/test/BUILD.gn b/modules/audio_coding/codecs/opus/test/BUILD.gn
index 058dbfa..51b0df3 100644
--- a/modules/audio_coding/codecs/opus/test/BUILD.gn
+++ b/modules/audio_coding/codecs/opus/test/BUILD.gn
@@ -27,7 +27,7 @@
     ]
 
     deps = [
-      "../../../../../common_audio:common_audio",
+      "../../../../../common_audio",
       "../../../../../common_audio:common_audio_c",
       "../../../../../rtc_base:checks",
       "../../../../../rtc_base/memory:aligned_array",
@@ -45,7 +45,7 @@
 
     deps = [
       ":test",
-      "../../../../../common_audio:common_audio",
+      "../../../../../common_audio",
       "../../../../../common_audio:common_audio_c",
       "../../../../../rtc_base:rtc_base_approved",
       "../../../../../test:test_support",
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index e04b031..52e0181 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -75,9 +75,9 @@
       ":audio_device_buffer",
       ":audio_device_generic",
       "../../api:array_view",
+      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:gtest_prod",
-      "../../rtc_base:rtc_base",
       "../../rtc_base/system:fallthrough",
       "../../sdk:audio_device",
       "../../sdk:audio_objc",
@@ -203,13 +203,13 @@
     ":audio_device_generic",
     "../../api:array_view",
     "../../api:scoped_refptr",
+    "../../api/task_queue",
     "../../api/task_queue:global_task_queue_factory",
-    "../../api/task_queue:task_queue",
     "../../common_audio",
     "../../common_audio:common_audio_c",
+    "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:deprecation",
-    "../../rtc_base:rtc_base",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_task_queue",
     "../../rtc_base/system:arch",
@@ -440,7 +440,7 @@
       "../../system_wrappers",
       "../../test:fileutils",
       "../../test:test_support",
-      "../utility:utility",
+      "../utility",
       "//third_party/abseil-cpp/absl/types:optional",
     ]
     if (is_linux || is_mac || is_win) {
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index c606b7f..f99c44d 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -81,7 +81,7 @@
   deps = [
     ":api",
     "../../api/audio:audio_frame_api",
-    "../../common_audio:common_audio",
+    "../../common_audio",
     "../../common_audio:common_audio_c",
     "../../rtc_base:checks",
   ]
@@ -163,7 +163,7 @@
     "../../api/audio:echo_control",
     "../../audio/utility:audio_frame_operations",
     "../../common_audio:common_audio_c",
-    "../../common_audio/third_party/fft4g:fft4g",
+    "../../common_audio/third_party/fft4g",
     "../../rtc_base:checks",
     "../../rtc_base:deprecation",
     "../../rtc_base:gtest_prod",
@@ -174,9 +174,9 @@
     "../../system_wrappers:cpu_features_api",
     "../../system_wrappers:field_trial",
     "../../system_wrappers:metrics",
-    "aec:aec",
+    "aec",
     "aec:aec_core",
-    "aec3:aec3",
+    "aec3",
     "aecm:aecm_core",
     "agc",
     "agc:agc_legacy_c",
@@ -253,7 +253,7 @@
   deps = [
     ":audio_frame_view",
     "../../rtc_base:rtc_base_approved",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
   ]
 }
 
@@ -266,9 +266,9 @@
   deps = [
     ":audio_generator_interface",
     ":file_audio_generator",
-    "../../common_audio:common_audio",
+    "../../common_audio",
     "../../rtc_base:rtc_base_approved",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
     "//third_party/abseil-cpp/absl/memory",
   ]
 }
@@ -280,9 +280,9 @@
   ]
   deps = [
     ":audio_generator_interface",
-    "../../common_audio:common_audio",
+    "../../common_audio",
     "../../rtc_base:rtc_base_approved",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
   ]
 }
 
@@ -318,7 +318,7 @@
     "../..:webrtc_common",
     "../../common_audio",
     "../../common_audio:common_audio_c",
-    "../../common_audio/third_party/fft4g:fft4g",
+    "../../common_audio/third_party/fft4g",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
     "../../system_wrappers:cpu_features_api",
@@ -363,7 +363,7 @@
   ]
   deps = [
     "../../api:array_view",
-    "../../common_audio:common_audio",
+    "../../common_audio",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
   ]
@@ -443,12 +443,12 @@
       "../../api:scoped_refptr",
       "../../api/audio:aec3_config",
       "../../api/audio:aec3_factory",
-      "../../common_audio:common_audio",
+      "../../common_audio",
       "../../common_audio:common_audio_c",
+      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:gtest_prod",
       "../../rtc_base:protobuf_utils",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_base_tests_utils",
       "../../rtc_base:safe_minmax",
@@ -576,7 +576,7 @@
     deps = [
       "../../api:array_view",
       "../../api/audio:audio_frame_api",
-      "../../common_audio:common_audio",
+      "../../common_audio",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:safe_minmax",
@@ -612,7 +612,7 @@
         ":runtime_settings_protobuf_utils",
         "../../api/audio:aec3_config_json",
         "../../api/audio:aec3_factory",
-        "../../common_audio:common_audio",
+        "../../common_audio",
         "../../rtc_base:checks",
         "../../rtc_base:protobuf_utils",
         "../../rtc_base:rtc_base_approved",
@@ -688,7 +688,7 @@
     deps = [
       ":audio_processing",
       "../..:webrtc_common",
-      "../../common_audio:common_audio",
+      "../../common_audio",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/system:file_wrapper",
       "../../system_wrappers",
diff --git a/modules/audio_processing/agc2/rnn_vad/BUILD.gn b/modules/audio_processing/agc2/rnn_vad/BUILD.gn
index b26aef0..3748a71 100644
--- a/modules/audio_processing/agc2/rnn_vad/BUILD.gn
+++ b/modules/audio_processing/agc2/rnn_vad/BUILD.gn
@@ -122,7 +122,7 @@
     deps = [
       ":rnn_vad",
       "../../../../api:array_view",
-      "../../../../common_audio:common_audio",
+      "../../../../common_audio",
       "../../../../rtc_base:rtc_base_approved",
       "../../../../test:test_support",
     ]
diff --git a/modules/audio_processing/vad/BUILD.gn b/modules/audio_processing/vad/BUILD.gn
index 6c64e94..bf99115 100644
--- a/modules/audio_processing/vad/BUILD.gn
+++ b/modules/audio_processing/vad/BUILD.gn
@@ -38,7 +38,7 @@
     "../../../audio/utility:audio_frame_operations",
     "../../../common_audio",
     "../../../common_audio:common_audio_c",
-    "../../../common_audio/third_party/fft4g:fft4g",
+    "../../../common_audio/third_party/fft4g",
     "../../../rtc_base:checks",
     "../../audio_coding:isac_vad",
   ]
diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn
index 1f013f8..5f6d95a 100644
--- a/modules/bitrate_controller/BUILD.gn
+++ b/modules/bitrate_controller/BUILD.gn
@@ -44,7 +44,7 @@
     "../../system_wrappers:metrics",
     "../congestion_controller/goog_cc:delay_based_bwe",
     "../pacing",
-    "../remote_bitrate_estimator:remote_bitrate_estimator",
+    "../remote_bitrate_estimator",
     "../rtp_rtcp",
     "../rtp_rtcp:rtp_rtcp_format",
     "//third_party/abseil-cpp/absl/memory",
@@ -65,13 +65,13 @@
       "../../logging:mocks",
       "../../logging:rtc_event_bwe",
       "../../logging:rtc_event_log_api",
-      "../../system_wrappers:system_wrappers",
+      "../../system_wrappers",
       "../../test:field_trial",
       "../../test:test_support",
       "../congestion_controller/goog_cc:delay_based_bwe",
+      "../pacing",
       "../pacing:mock_paced_sender",
-      "../pacing:pacing",
-      "../remote_bitrate_estimator:remote_bitrate_estimator",
+      "../remote_bitrate_estimator",
       "../rtp_rtcp:rtp_rtcp_format",
     ]
   }
diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn
index 0a99433..caa6d7f 100644
--- a/modules/congestion_controller/BUILD.gn
+++ b/modules/congestion_controller/BUILD.gn
@@ -58,7 +58,7 @@
   ]
 
   if (!build_with_mozilla) {
-    deps += [ "../../rtc_base:rtc_base" ]
+    deps += [ "../../rtc_base" ]
   }
 }
 
@@ -75,7 +75,7 @@
     "../../modules:module_api",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp_format",
     "rtp:transport_feedback",
   ]
@@ -112,17 +112,17 @@
       ":mock_congestion_controller",
       ":transport_feedback",
       "../../logging:mocks",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/network:sent_packet",
       "../../system_wrappers",
       "../../test:field_trial",
       "../../test:test_support",
-      "../bitrate_controller:bitrate_controller",
+      "../bitrate_controller",
+      "../pacing",
       "../pacing:mock_paced_sender",
-      "../pacing:pacing",
-      "../remote_bitrate_estimator:remote_bitrate_estimator",
+      "../remote_bitrate_estimator",
       "../rtp_rtcp:rtp_rtcp_format",
       "bbr:bbr_unittests",
       "goog_cc:estimators",
diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn
index 36fd72d..161cb3b 100644
--- a/modules/congestion_controller/goog_cc/BUILD.gn
+++ b/modules/congestion_controller/goog_cc/BUILD.gn
@@ -205,7 +205,7 @@
       "../../../api/units:timestamp",
       "../../../logging:rtc_event_log_api",
       "../../../rtc_base:checks",
-      "../../remote_bitrate_estimator:remote_bitrate_estimator",
+      "../../remote_bitrate_estimator",
       "//third_party/abseil-cpp/absl/types:optional",
     ]
   }
diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn
index d3c705c..a075cce 100644
--- a/modules/congestion_controller/rtp/BUILD.gn
+++ b/modules/congestion_controller/rtp/BUILD.gn
@@ -43,7 +43,7 @@
   ]
 
   if (!build_with_mozilla) {
-    deps += [ "../../../rtc_base:rtc_base" ]
+    deps += [ "../../../rtc_base" ]
   }
 }
 rtc_static_library("transport_feedback") {
@@ -84,16 +84,16 @@
       "../:mock_congestion_controller",
       "../../../api/transport:network_control",
       "../../../logging:mocks",
+      "../../../rtc_base",
       "../../../rtc_base:checks",
-      "../../../rtc_base:rtc_base",
       "../../../rtc_base:rtc_base_approved",
       "../../../rtc_base/network:sent_packet",
       "../../../system_wrappers",
       "../../../test:field_trial",
       "../../../test:test_support",
+      "../../pacing",
       "../../pacing:mock_paced_sender",
-      "../../pacing:pacing",
-      "../../remote_bitrate_estimator:remote_bitrate_estimator",
+      "../../remote_bitrate_estimator",
       "../../rtp_rtcp:rtp_rtcp_format",
       "//testing/gmock",
     ]
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index ca13924..9e7f53c 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -37,7 +37,7 @@
   ]
 
   if (!build_with_mozilla) {
-    deps += [ "../../rtc_base:rtc_base" ]  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
+    deps += [ "../../rtc_base" ]  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
   }
 }
 
@@ -56,7 +56,7 @@
         ":desktop_capture_mock",
         ":primitives",
         ":screen_drawer",
-        "../../rtc_base:rtc_base",
+        "../../rtc_base",
         "../../rtc_base:rtc_base_approved",
         "../../rtc_base/third_party/base64",
         "../../system_wrappers",
@@ -240,8 +240,8 @@
       ":desktop_capture_generic",
       ":primitives",
       "../../api:scoped_refptr",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/synchronization:rw_lock_wrapper",
       "../../sdk:helpers_objc",
@@ -430,8 +430,8 @@
     ":primitives",
     "../../api:refcountedbase",
     "../../api:scoped_refptr",
+    "../../rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
     "../../rtc_base/synchronization:rw_lock_wrapper",
     "../../rtc_base/system:arch",
     "../../rtc_base/system:rtc_export",
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index 12d3086..e15f375 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -132,9 +132,9 @@
       "../../api/transport:field_trial_based_config",
       "../../api/transport:network_control",
       "../../logging:mocks",
+      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:gtest_prod",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_numerics",
       "../../rtc_base:safe_minmax",
@@ -172,7 +172,7 @@
       ":bwe_simulator_lib",
       ":remote_bitrate_estimator",
       "../../rtc_base:rtc_base_approved",
-      "../../system_wrappers:system_wrappers",
+      "../../system_wrappers",
       "../../test:field_trial",
       "../../test:fileutils",
       "../../test:test_support",
@@ -204,14 +204,14 @@
       ":remote_bitrate_estimator",
       "..:module_api_public",
       "../..:webrtc_common",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
       "../../test:field_trial",
       "../../test:fileutils",
       "../../test:test_support",
-      "../pacing:pacing",
+      "../pacing",
       "../rtp_rtcp:rtp_rtcp_format",
     ]
   }
@@ -227,7 +227,7 @@
       ":remote_bitrate_estimator",
       "../..:webrtc_common",
       "../../rtc_base:rtc_base_approved",
-      "../../system_wrappers:system_wrappers",
+      "../../system_wrappers",
       "../../test:fileutils",
       "../../test:test_main",
       "../../test:test_support",
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 3c247da..ec84ed8 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -444,7 +444,7 @@
       "../../api/video:video_frame",
       "../../api/video_codecs:video_codecs_api",
       "../../call:rtp_receiver",
-      "../../common_video:common_video",
+      "../../common_video",
       "../../common_video/test:utilities",
       "../../logging:mocks",
       "../../logging:rtc_event_log_api",
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index f174ae9..44db2c6 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -149,9 +149,9 @@
         "../../api:scoped_refptr",
         "../../api/video:video_frame",
         "../../api/video:video_frame_i420",
-        "../../common_video:common_video",
+        "../../common_video",
         "../../rtc_base:rtc_base_approved",
-        "../../system_wrappers:system_wrappers",
+        "../../system_wrappers",
         "../../test:test_support",
         "../../test:video_test_common",
         "../utility",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 0cd95668e..0e0866c 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -27,7 +27,7 @@
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/experiments:alr_experiment",
     "../../rtc_base/experiments:rtt_mult_experiment",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
     "//third_party/abseil-cpp/absl/types:optional",
     "//third_party/abseil-cpp/absl/types:variant",
   ]
@@ -50,7 +50,7 @@
     "../../rtc_base:rtc_numerics",
     "../../system_wrappers",
     "../../system_wrappers:field_trial",
-    "../utility:utility",
+    "../utility",
   ]
 }
 
@@ -160,9 +160,9 @@
     "../../api/video:video_frame_i420",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
+    "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:deprecation",
-    "../../rtc_base:rtc_base",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
@@ -175,7 +175,7 @@
     "../../rtc_base/time:timestamp_extrapolator",
     "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp_format",
-    "../utility:utility",
+    "../utility",
     "//third_party/abseil-cpp/absl/container:inlined_vector",
     "//third_party/abseil-cpp/absl/types:optional",
     "//third_party/abseil-cpp/absl/types:variant",
@@ -196,8 +196,8 @@
     "../..:webrtc_common",
     "../../api/video:video_frame",
     "../../api/video_codecs:video_codecs_api",
-    "../../common_video:common_video",
-    "../../common_video/generic_frame_descriptor:generic_frame_descriptor",
+    "../../common_video",
+    "../../common_video/generic_frame_descriptor",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
@@ -286,8 +286,8 @@
     "../../api/video_codecs:video_codecs_api",
     "../../media:rtc_h264_profile_id",
     "../../media:rtc_media_base",
+    "../../rtc_base",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base",
     "../../rtc_base/system:rtc_export",
     "../../system_wrappers:metrics",
     "//third_party/abseil-cpp/absl/memory",
@@ -308,7 +308,7 @@
     ]
     deps += [
       "../../common_video",
-      "//third_party/ffmpeg:ffmpeg",
+      "//third_party/ffmpeg",
       "//third_party/openh264:encoder",
     ]
 
@@ -340,9 +340,9 @@
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
     "../../api/video_codecs:video_codecs_api",
-    "../../common_video:common_video",
+    "../../common_video",
+    "../../rtc_base",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base",
     "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp_format",
   ]
@@ -470,8 +470,8 @@
     "../../common_video",
     "../../media:rtc_media_base",
     "../../media:rtc_vp9_profile",
+    "../../rtc_base",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base",
     "../../rtc_base/experiments:rate_control_settings",
     "../../system_wrappers",
     "../../system_wrappers:field_trial",
@@ -545,7 +545,7 @@
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
       "../../api/video_codecs:video_codecs_api",
-      "../../common_video:common_video",
+      "../../common_video",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../test:test_support",
@@ -581,7 +581,7 @@
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
       "../../api/video_codecs:video_codecs_api",
-      "../../common_video:common_video",
+      "../../common_video",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_task_queue",
@@ -723,7 +723,7 @@
       "../../media:rtc_media_base",
       "../../media:rtc_simulcast_encoder_adapter",
       "../../media:rtc_vp9_profile",
-      "../../rtc_base:rtc_base",
+      "../../rtc_base",
       "../../test:field_trial",
       "../../test:fileutils",
       "../../test:test_support",
@@ -840,10 +840,10 @@
       "../../api/video:video_frame_i420",
       "../../api/video_codecs:video_codecs_api",
       "../../api/video_codecs:vp8_temporal_layers_factory",
-      "../../common_video:common_video",
+      "../../common_video",
       "../../media:rtc_media_base",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_base_tests_utils",
       "../../rtc_base:rtc_numerics",
diff --git a/modules/video_processing/BUILD.gn b/modules/video_processing/BUILD.gn
index 84ce3b7..d488a46 100644
--- a/modules/video_processing/BUILD.gn
+++ b/modules/video_processing/BUILD.gn
@@ -108,7 +108,7 @@
       "../../api:scoped_refptr",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
-      "../../common_video:common_video",
+      "../../common_video",
       "../../test:fileutils",
       "../../test:test_support",
       "../../test:video_test_common",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 7340a03..83b0799 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -90,8 +90,8 @@
     "../api/transport:enums",
     "../logging:ice_log",
     "../logging:rtc_event_log_api",
+    "../rtc_base",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base",
     "../rtc_base:safe_minmax",
     "../rtc_base:weak_ptr",
     "../rtc_base/network:sent_packet",
@@ -122,7 +122,7 @@
     ]
     deps = [
       ":rtc_p2p",
-      "../rtc_base:rtc_base",
+      "../rtc_base",
       "../rtc_base:rtc_base_approved",
       "//third_party/abseil-cpp/absl/algorithm:container",
       "//third_party/abseil-cpp/absl/types:optional",
@@ -149,8 +149,8 @@
       ":rtc_p2p",
       "../api:libjingle_peerconnection_api",
       "../api:ortc_api",
+      "../rtc_base",
       "../rtc_base:gunit_helpers",
-      "../rtc_base:rtc_base",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base/third_party/sigslot",
@@ -196,14 +196,14 @@
       "../api:ortc_api",
       "../api:scoped_refptr",
       "../api/units:time_delta",
+      "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
-      "../rtc_base:rtc_base",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base:testclient",
       "../rtc_base/network:sent_packet",
-      "../rtc_base/third_party/sigslot:sigslot",
+      "../rtc_base/third_party/sigslot",
       "../system_wrappers:metrics",
       "../test:test_support",
       "//testing/gtest",
@@ -225,8 +225,8 @@
   ]
   deps = [
     ":rtc_p2p",
+    "../rtc_base",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_tests_utils",
     "../rtc_base/third_party/sigslot",
     "//third_party/abseil-cpp/absl/algorithm:container",
@@ -244,8 +244,8 @@
   deps = [
     ":rtc_p2p",
     "..:webrtc_common",
+    "../rtc_base",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base",
     "../rtc_base/system:rtc_export",
   ]
 }
@@ -261,9 +261,9 @@
       ":libstunprober",
       ":p2p_test_utils",
       ":rtc_p2p",
+      "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
-      "../rtc_base:rtc_base",
       "../rtc_base:rtc_base_tests_utils",
       "../test:test_support",
       "//testing/gtest",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index c508970..280e077 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -84,7 +84,7 @@
     "../call:call_interfaces",
     "../call:rtp_interfaces",
     "../call:rtp_receiver",
-    "../common_video:common_video",
+    "../common_video",
     "../logging:rtc_event_log_api",
     "../media:rtc_data",
     "../media:rtc_h264_profile_id",
@@ -92,8 +92,8 @@
     "../media:rtc_media_config",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:rtc_p2p",
+    "../rtc_base",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:stringutils",
     "../rtc_base/third_party/base64",
@@ -203,15 +203,15 @@
     "../api/video:video_frame",
     "../api/video_codecs:video_codecs_api",
     "../call:call_interfaces",
-    "../common_video:common_video",
+    "../common_video",
     "../logging:ice_log",
     "../logging:rtc_event_log_api",
     "../logging:rtc_event_log_impl_output",
     "../media:rtc_data",
     "../media:rtc_media_base",
     "../p2p:rtc_p2p",
+    "../rtc_base",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/system:rtc_export",
     "../rtc_base/third_party/base64",
@@ -287,9 +287,9 @@
       "../p2p:fake_ice_transport",
       "../p2p:p2p_test_utils",
       "../p2p:rtc_p2p",
+      "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
-      "../rtc_base:rtc_base",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_main",
       "../rtc_base:rtc_base_tests_utils",
@@ -335,11 +335,11 @@
       "../p2p:p2p_test_utils",
       "../p2p:rtc_p2p",
       "../pc:peerconnection",
+      "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
-      "../rtc_base:rtc_base",
       "../rtc_base:rtc_base_tests_utils",
-      "../system_wrappers:system_wrappers",
+      "../system_wrappers",
       "../test:perf_test",
       "../test:test_support",
       "//third_party/abseil-cpp/absl/memory",
@@ -415,14 +415,14 @@
       "../media:rtc_media",
       "../media:rtc_media_base",
       "../media:rtc_media_tests_utils",
-      "../modules/audio_device:audio_device",
+      "../modules/audio_device",
+      "../modules/audio_processing",
       "../modules/audio_processing:api",
-      "../modules/audio_processing:audio_processing",
       "../p2p:p2p_test_utils",
       "../p2p:rtc_p2p",
+      "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
-      "../rtc_base:rtc_base",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_task_queue",
       "../rtc_base/task_utils:repeating_task",
@@ -505,7 +505,7 @@
       "../rtc_base:gunit_helpers",
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base/third_party/base64",
-      "../rtc_base/third_party/sigslot:sigslot",
+      "../rtc_base/third_party/sigslot",
       "../system_wrappers:metrics",
       "../test:fileutils",
       "//third_party/abseil-cpp/absl/algorithm:container",
@@ -539,13 +539,13 @@
       "../media:rtc_data",  # TODO(phoglund): AFAIK only used for one sctp constant.
       "../media:rtc_media_base",
       "../media:rtc_media_tests_utils",
+      "../modules/audio_processing",
       "../modules/audio_processing:api",
-      "../modules/audio_processing:audio_processing",
-      "../modules/utility:utility",
+      "../modules/utility",
       "../p2p:p2p_test_utils",
       "../p2p:rtc_p2p",
       "../pc:rtc_pc",
-      "../rtc_base:rtc_base",
+      "../rtc_base",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_main",
       "../rtc_base:rtc_task_queue",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index c5531bf2..f4e9f76 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -252,7 +252,7 @@
 
   if (build_with_chromium) {
     # Dependency on chromium's waitable_event (in //base).
-    deps += [ "//base:base" ]
+    deps += [ "//base" ]
     sources = [
       "../../webrtc_overrides/rtc_base/event.cc",
       "../../webrtc_overrides/rtc_base/event.h",
@@ -281,7 +281,7 @@
 
   if (build_with_chromium) {
     # Dependency on chromium's logging (in //base).
-    deps += [ "//base:base" ]
+    deps += [ "//base" ]
     sources = [
       "../../webrtc_overrides/rtc_base/logging.cc",
       "../../webrtc_overrides/rtc_base/logging.h",
@@ -433,7 +433,7 @@
     ":macromagic",
     ":safe_minmax",
     "../api:array_view",
-    "//third_party/abseil-cpp/absl/strings:strings",
+    "//third_party/abseil-cpp/absl/strings",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
@@ -1181,10 +1181,10 @@
       ":rtc_base_tests_main",
       ":rtc_base_tests_utils",
       ":testclient",
-      "../system_wrappers:system_wrappers",
+      "../system_wrappers",
       "../test:fileutils",
       "../test:test_support",
-      "third_party/sigslot:sigslot",
+      "third_party/sigslot",
       "//testing/gtest",
       "//third_party/abseil-cpp/absl/memory",
     ]
@@ -1259,12 +1259,12 @@
       "../api:array_view",
       "../api:scoped_refptr",
       "../api/units:time_delta",
-      "../system_wrappers:system_wrappers",
+      "../system_wrappers",
       "../test:fileutils",
       "../test:test_support",
       "memory:unittests",
       "third_party/base64",
-      "third_party/sigslot:sigslot",
+      "third_party/sigslot",
       "//third_party/abseil-cpp/absl/memory",
     ]
   }
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 7bdda7d..6269f4c 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -183,7 +183,7 @@
       "../logging:rtc_event_log_impl_base",
       "../media:rtc_audio_video",
       "../media:rtc_media_base",
-      "../rtc_base:rtc_base",
+      "../rtc_base",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_json",
       "../rtc_base/system:file_wrapper",
@@ -418,7 +418,7 @@
       "../api:scoped_refptr",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
-      "../common_video:common_video",
+      "../common_video",
       "../rtc_base",
       "../rtc_base:checks",
       "../test:fileutils",
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index aa53c5a..151f9a7 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -45,13 +45,13 @@
       ":network_tester_packet_proto",
       "../../api/task_queue",
       "../../p2p",
+      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:protobuf_utils",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_task_queue",
       "../../rtc_base:sequenced_task_checker",
-      "../../rtc_base/third_party/sigslot:sigslot",
+      "../../rtc_base/third_party/sigslot",
       "//third_party/abseil-cpp/absl/memory",
       "//third_party/abseil-cpp/absl/types:optional",
     ]
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 255dc43..252ec9d 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -130,8 +130,8 @@
     ]
 
     deps = [
+      "../rtc_base",
       "../rtc_base:checks",
-      "../rtc_base:rtc_base",
     ]
     configs += [
       "..:common_objc",
@@ -189,9 +189,9 @@
 
       deps = [
         ":base_objc",
+        "../rtc_base",
         "../rtc_base:checks",
         "../rtc_base:logging",
-        "../rtc_base:rtc_base",
       ]
 
       configs += [
@@ -208,9 +208,9 @@
 
       deps = [
         ":base_objc",
+        "../rtc_base",
         "../rtc_base:checks",
         "../rtc_base:logging",
-        "../rtc_base:rtc_base",
       ]
 
       configs += [
@@ -248,7 +248,7 @@
         ]
 
         deps = [
-          "../rtc_base:rtc_base",
+          "../rtc_base",
         ]
       }
 
@@ -274,8 +274,8 @@
           "../modules/audio_device:audio_device_api",
           "../modules/audio_device:audio_device_buffer",
           "../modules/audio_device:audio_device_generic",
+          "../rtc_base",
           "../rtc_base:checks",
-          "../rtc_base:rtc_base",
           "../rtc_base/system:fallthrough",
           "../system_wrappers:metrics",
         ]
@@ -307,8 +307,8 @@
           ":audio_session_observer",
           ":base_objc",
           ":helpers_objc",
+          "../rtc_base",
           "../rtc_base:checks",
-          "../rtc_base:rtc_base",
           "../rtc_base:rtc_base_approved",
         ]
       }
@@ -331,8 +331,8 @@
         "../api/video:video_frame_i420",
         "../common_video",
         "../media:rtc_media_base",
+        "../rtc_base",
         "../rtc_base:checks",
-        "../rtc_base:rtc_base",
         "//third_party/libyuv",
       ]
 
@@ -412,8 +412,8 @@
         "../api/video:video_frame",
         "../common_video",
         "../media:rtc_media_base",
+        "../rtc_base",
         "../rtc_base:checks",
-        "../rtc_base:rtc_base",
         "//third_party/abseil-cpp/absl/types:optional",
       ]
 
@@ -665,7 +665,7 @@
         ":native_video",
         ":peerconnectionfactory_base_objc",
         "../api:libjingle_peerconnection_api",
-        "../rtc_base:rtc_base",
+        "../rtc_base",
       ]
     }
 
@@ -763,7 +763,7 @@
         "../api/video_codecs:video_codecs_api",
         "../modules:module_api",
         "../modules/video_coding:video_codec_interface",
-        "../rtc_base:rtc_base",
+        "../rtc_base",
       ]
     }
 
@@ -916,12 +916,12 @@
         "../media:rtc_media_base",
         "../modules:module_api",
         "../modules/audio_device:audio_device_api",
+        "../modules/audio_processing",
         "../modules/audio_processing:api",
-        "../modules/audio_processing:audio_processing",
         "../modules/video_coding:video_codec_interface",
         "../pc:peerconnection",
+        "../rtc_base",
         "../rtc_base:checks",
-        "../rtc_base:rtc_base",
         "../system_wrappers:field_trial",
         "../system_wrappers:metrics",
         "//third_party/abseil-cpp/absl/memory",
@@ -1067,13 +1067,13 @@
             ":videotoolbox_objc",
             "../api:scoped_refptr",
             "../api/video:video_frame_i420",
-            "../common_video:common_video",
+            "../common_video",
             "../media:rtc_media_base",
             "../media:rtc_media_tests_utils",
             "../modules:module_api",
+            "../rtc_base",
             "../rtc_base:gunit_helpers",
-            "../rtc_base:rtc_base",
-            "../system_wrappers:system_wrappers",
+            "../system_wrappers",
             "//third_party/libyuv",
           ]
 
@@ -1188,8 +1188,8 @@
           "../media:rtc_media_base",
           "../modules:module_api",
           "../modules/audio_device:audio_device_api",
+          "../modules/audio_processing",
           "../modules/audio_processing:api",
-          "../modules/audio_processing:audio_processing",
           "../modules/video_coding:video_codec_interface",
           "../rtc_base:gunit_helpers",
           "../rtc_base/system:unused",
@@ -1548,7 +1548,7 @@
         "../api/video:video_frame",
         "../api/video_codecs:video_codecs_api",
         "../common_video",
-        "../rtc_base:rtc_base",
+        "../rtc_base",
         "//third_party/abseil-cpp/absl/memory",
       ]
     }
@@ -1589,8 +1589,8 @@
         "../media:rtc_media_base",
         "../modules:module_api",
         "../modules/video_coding:video_codec_interface",
+        "../rtc_base",
         "../rtc_base:checks",
-        "../rtc_base:rtc_base",
         "//third_party/abseil-cpp/absl/memory",
       ]
     }
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 06eef3a..8c49bbe 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -152,7 +152,7 @@
       ":libjingle_peerconnection_jni",
       ":libjingle_peerconnection_metrics_default_jni",
       "../../pc:libjingle_peerconnection",
-      "../../rtc_base:rtc_base",
+      "../../rtc_base",
     ]
     output_extension = "so"
   }
@@ -176,7 +176,7 @@
       ":null_video_jni",
       ":peerconnection_jni",
       "../../pc:peerconnection",
-      "../../rtc_base:rtc_base",
+      "../../rtc_base",
       "../../rtc_base:rtc_base_approved",
     ]
     output_extension = "so"
@@ -564,8 +564,8 @@
       ":native_api_jni",
       "../../api:libjingle_peerconnection_api",
       "../../api:scoped_refptr",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers:metrics",
       "//third_party/abseil-cpp/absl/memory",
@@ -583,8 +583,8 @@
       ":builtin_audio_codecs_jni",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
       "../../api/audio_codecs:builtin_audio_encoder_factory",
+      "../../modules/audio_processing",
       "../../modules/audio_processing:api",
-      "../../modules/audio_processing:audio_processing",
       "../../rtc_base:rtc_base_approved",
     ]
   }
@@ -625,13 +625,13 @@
       "../../api:scoped_refptr",
       "../../api/task_queue",
       "../../api/video_codecs:video_codecs_api",
-      "../../common_video:common_video",
+      "../../common_video",
       "../../media:rtc_internal_video_codecs",
       "../../media:rtc_media_base",
       "../../modules/video_coding:video_codec_interface",
       "../../modules/video_coding:video_coding_utility",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_task_queue",
       "../../rtc_base:sequenced_task_checker",
       "../../rtc_base:weak_ptr",
@@ -688,13 +688,13 @@
       "../../api/video:video_frame",
       "../../api/video_codecs:rtc_software_fallback_wrappers",
       "../../api/video_codecs:video_codecs_api",
-      "../../common_video:common_video",
+      "../../common_video",
       "../../media:rtc_media_base",
       "../../modules/video_coding:codec_globals_headers",
       "../../modules/video_coding:video_codec_interface",
       "../../modules/video_coding:video_coding_utility",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_task_queue",
       "../../rtc_base/task_utils:to_queued_task",
       "//third_party/libyuv",
@@ -771,11 +771,11 @@
       "../../logging:rtc_event_log_impl_base",
       "../../media:rtc_data",
       "../../media:rtc_media_base",
-      "../../modules/audio_device:audio_device",
-      "../../modules/utility:utility",
+      "../../modules/audio_device",
+      "../../modules/utility",
       "../../pc:peerconnection",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_task_queue",
       "../../rtc_base/system:thread_registry",
@@ -892,8 +892,8 @@
     deps = [
       ":base_jni",
       ":native_api_jni",
+      "//rtc_base",
       "//rtc_base:checks",
-      "//rtc_base:rtc_base",
       "//third_party/abseil-cpp/absl/memory",
     ]
   }
@@ -912,7 +912,7 @@
       ":base_jni",
       ":java_audio_device_module",
       ":opensles_audio_device_module",
-      "../../modules/audio_device:audio_device",
+      "../../modules/audio_device",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
@@ -957,7 +957,7 @@
       ":peerconnection_jni",
       "//api:libjingle_peerconnection_api",
       "//api/video_codecs:video_codecs_api",
-      "//rtc_base:rtc_base",
+      "//rtc_base",
     ]
   }
 
@@ -993,7 +993,7 @@
       ":videoframe_jni",
       "//api:libjingle_peerconnection_api",
       "//api/video:video_frame",
-      "//rtc_base:rtc_base",
+      "//rtc_base",
       "//rtc_base:rtc_base_approved",
       "//third_party/abseil-cpp/absl/memory",
     ]
@@ -1056,9 +1056,9 @@
       "../../logging:rtc_event_log_api",
       "../../logging:rtc_event_log_impl_base",
       "../../media:rtc_audio_video",
-      "../../modules/audio_device:audio_device",
+      "../../modules/audio_device",
+      "../../modules/audio_processing",
       "../../modules/audio_processing:api",
-      "../../modules/audio_processing:audio_processing",
     ]
   }
 
@@ -1090,9 +1090,9 @@
       ":native_api_jni",
       "../../api:scoped_refptr",
       "../../api/video:video_frame",
-      "../../common_video:common_video",
+      "../../common_video",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
     ]
   }
@@ -1108,7 +1108,7 @@
       ":base_jni",
       ":generated_logging_jni",
       ":native_api_jni",
-      "../../rtc_base:rtc_base",
+      "../../rtc_base",
     ]
   }
 
@@ -1148,7 +1148,7 @@
       ":audio_device_module_base",
       ":base_jni",
       ":generated_java_audio_device_module_native_jni",
-      "../../modules/audio_device:audio_device",
+      "../../modules/audio_device",
       "../../modules/audio_device:audio_device_buffer",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
@@ -1174,10 +1174,10 @@
         ":audio_device_module_base",
         ":base_jni",
         "../../api:array_view",
-        "../../modules/audio_device:audio_device",
+        "../../modules/audio_device",
         "../../modules/audio_device:audio_device_buffer",
+        "../../rtc_base",
         "../../rtc_base:checks",
-        "../../rtc_base:rtc_base",
         "../../rtc_base:rtc_base_approved",
         "../../system_wrappers",
         "//third_party/abseil-cpp/absl/types:optional",
@@ -1200,7 +1200,7 @@
       ":audio_device_module_base",
       ":base_jni",
       "../../api:array_view",
-      "../../modules/audio_device:audio_device",
+      "../../modules/audio_device",
       "../../modules/audio_device:audio_device_buffer",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
@@ -1480,7 +1480,7 @@
       ":libjingle_peerconnection_jni",
       ":libjingle_peerconnection_metrics_default_jni",
       "../../pc:libjingle_peerconnection",
-      "../../rtc_base:rtc_base",
+      "../../rtc_base",
     ]
     output_extension = "so"
   }
@@ -1541,11 +1541,11 @@
       "../../media:rtc_audio_video",
       "../../media:rtc_internal_video_codecs",
       "../../media:rtc_media_base",
-      "../../modules/audio_device:audio_device",
+      "../../modules/audio_device",
       "../../modules/audio_device:mock_audio_device",
+      "../../modules/audio_processing",
       "../../modules/audio_processing:api",
-      "../../modules/audio_processing:audio_processing",
-      "../../modules/utility:utility",
+      "../../modules/utility",
       "../../pc:libjingle_peerconnection",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn
index ee24c8b..9f8cd1b 100644
--- a/system_wrappers/BUILD.gn
+++ b/system_wrappers/BUILD.gn
@@ -66,9 +66,9 @@
   if (is_win) {
     libs += [ "winmm.lib" ]
 
-    # Windows needs ../rtc_base:rtc_base due to include of
+    # Windows needs ../rtc_base due to include of
     # webrtc/rtc_base/win32.h in source/clock.cc.
-    deps += [ "../rtc_base:rtc_base" ]
+    deps += [ "../rtc_base" ]
   }
 
   deps += [
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 5743ed6..3ef0827f 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -65,8 +65,8 @@
     "../call:video_stream_api",
     "../common_video",
     "../media:rtc_media_base",
+    "../rtc_base",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base",
     "../rtc_base:rtc_task_queue",
     "../rtc_base/task_utils:repeating_task",
     "../system_wrappers",
@@ -88,7 +88,7 @@
         "../api:libjingle_peerconnection_api",
         "../api:scoped_refptr",
         "../modules/video_capture:video_capture_module",
-        "../rtc_base:rtc_base",
+        "../rtc_base",
         "../sdk:base_objc",
         "../sdk:native_api",
         "../sdk:native_video",
@@ -257,8 +257,8 @@
       ":field_trial",
       ":perf_test",
       ":test_support",
+      "../rtc_base",
       "../rtc_base:checks",
-      "../rtc_base:rtc_base",
       "../system_wrappers:field_trial",
       "../system_wrappers:metrics",
       "//testing/gtest",
@@ -323,7 +323,7 @@
     }
 
     if (is_android) {
-      deps += [ "//base:base" ]
+      deps += [ "//base" ]
     }
   }
 
@@ -384,7 +384,7 @@
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
       "../call:video_stream_api",
-      "../modules/rtp_rtcp:rtp_rtcp",
+      "../modules/rtp_rtcp",
       "../modules/video_capture",
       "../modules/video_coding:simulcast_test_fixture_impl",
       "../rtc_base:rtc_base_approved",
@@ -490,7 +490,7 @@
     deps += [ ":fileutils_mac_objc" ]
   }
   if (is_win) {
-    deps += [ "../rtc_base:rtc_base" ]
+    deps += [ "../rtc_base" ]
   }
 }
 
@@ -524,7 +524,7 @@
     deps += [ ":fileutils_mac_objc" ]
   }
   if (is_win) {
-    deps += [ "../rtc_base:rtc_base" ]
+    deps += [ "../rtc_base" ]
   }
 }
 
@@ -650,7 +650,7 @@
     "../api/video:video_frame_i420",
     "../api/video_codecs:video_codecs_api",
     "../api/video_codecs:vp8_temporal_layers_factory",
-    "../common_video:common_video",
+    "../common_video",
     "../modules:module_api",
     "../modules/video_coding:codec_globals_headers",
     "../modules/video_coding:video_codec_interface",
@@ -885,7 +885,7 @@
   ]
   deps = [
     "../api:array_view",
-    "../common_audio:common_audio",
+    "../common_audio",
     "../modules/audio_device:audio_device_impl",
     "../rtc_base:rtc_base_approved",
     "//third_party/abseil-cpp/absl/memory",
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 2cb4b13..13cfc4b 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -225,7 +225,7 @@
     "../../modules/rtp_rtcp:rtp_rtcp_format",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
   ]
   seed_corpus = "corpora/rtcp-corpus"
 }
@@ -260,7 +260,7 @@
     "../../logging:rtc_event_log_impl_base",
     "../../modules/congestion_controller",
     "../../modules/pacing",
-    "../../modules/remote_bitrate_estimator:remote_bitrate_estimator",
+    "../../modules/remote_bitrate_estimator",
     "../../modules/rtp_rtcp:rtp_rtcp_format",
   ]
 }
@@ -357,7 +357,7 @@
     "turn_unwrap_fuzzer.cc",
   ]
   deps = [
-    "../../media:media",
+    "../../media",
     "../../media:rtc_media_base",
   ]
 }
@@ -398,7 +398,7 @@
     "residual_echo_detector_fuzzer.cc",
   ]
   deps = [
-    "../../modules/audio_processing:audio_processing",
+    "../../modules/audio_processing",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
   ]
@@ -455,7 +455,7 @@
   ]
   deps = [
     "../../p2p:rtc_p2p",
-    "../../rtc_base:rtc_base",
+    "../../rtc_base",
   ]
 }
 
@@ -555,7 +555,7 @@
   ]
   deps = [
     "../../modules/video_coding/",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
   ]
 }
 
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index a51c787..66b531e 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -54,7 +54,7 @@
     "../../../api/transport:network_control",
     "../../../api/video_codecs:video_codecs_api",
     "../../../logging:rtc_event_log_api",
-    "../../../rtc_base:rtc_base",
+    "../../../rtc_base",
     "api:peer_connection_quality_test_fixture_api",
     "//third_party/abseil-cpp/absl/memory",
   ]
@@ -203,7 +203,7 @@
       "../../../p2p:rtc_p2p",
       "../../../pc:pc_test_utils",
       "../../../pc:peerconnection_wrapper",
-      "../../../rtc_base:rtc_base",
+      "../../../rtc_base",
       "../../../rtc_base:rtc_base_approved",
       "../../../test:copy_to_file_audio_capturer",
       "../../../test:video_test_common",
@@ -235,13 +235,13 @@
       "../../../logging:rtc_event_log_api",
       "../../../logging:rtc_event_log_impl_output",
       "../../../pc:pc_test_utils",
+      "../../../rtc_base",
       "../../../rtc_base:gunit_helpers",
-      "../../../rtc_base:rtc_base",
       "../../../rtc_base:rtc_base_approved",
       "../../../rtc_base:rtc_task_queue",
       "../../../rtc_base:safe_conversions",
       "../../../rtc_base/task_utils:repeating_task",
-      "../../../system_wrappers:system_wrappers",
+      "../../../system_wrappers",
       "../../../test:fileutils",
       "../../../test:video_test_support",
       "api:audio_quality_analyzer_api",
@@ -302,9 +302,9 @@
       "../../../p2p:rtc_p2p",
       "../../../pc:pc_test_utils",
       "../../../pc:peerconnection_wrapper",
+      "../../../rtc_base",
       "../../../rtc_base:gunit_helpers",
       "../../../rtc_base:logging",
-      "../../../rtc_base:rtc_base",
       "../../../rtc_base:rtc_event",
       "../../../test:fileutils",
       "../../../test:test_support",
@@ -377,13 +377,13 @@
     "../../../api/units:timestamp",
     "../../../api/video:encoded_image",
     "../../../api/video:video_frame",
-    "../../../common_video:common_video",
+    "../../../common_video",
     "../../../rtc_base:criticalsection",
     "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
     "../../../rtc_base:rtc_event",
     "../../../rtc_base:rtc_numerics",
-    "../../../system_wrappers:system_wrappers",
+    "../../../system_wrappers",
     "api:video_quality_analyzer_api",
     "//third_party/abseil-cpp/absl/memory",
   ]
diff --git a/test/pc/e2e/api/BUILD.gn b/test/pc/e2e/api/BUILD.gn
index e01ad25..24c1cbf 100644
--- a/test/pc/e2e/api/BUILD.gn
+++ b/test/pc/e2e/api/BUILD.gn
@@ -64,7 +64,7 @@
     "../../../../api/units:time_delta",
     "../../../../api/video_codecs:video_codecs_api",
     "../../../../logging:rtc_event_log_api",
-    "../../../../rtc_base:rtc_base",
+    "../../../../rtc_base",
     "//third_party/abseil-cpp/absl/memory",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index c0cd3ef..8f842d5 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -122,8 +122,8 @@
       "../../modules/video_coding:webrtc_multiplex",
       "../../modules/video_coding:webrtc_vp8",
       "../../modules/video_coding:webrtc_vp9",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_base_tests_utils",
       "../../rtc_base:rtc_task_queue",
diff --git a/test/scenario/network/BUILD.gn b/test/scenario/network/BUILD.gn
index de120b6..dc01f79 100644
--- a/test/scenario/network/BUILD.gn
+++ b/test/scenario/network/BUILD.gn
@@ -32,13 +32,13 @@
     "../../../api/units:data_size",
     "../../../api/units:time_delta",
     "../../../api/units:timestamp",
-    "../../../rtc_base:rtc_base",
+    "../../../rtc_base",
     "../../../rtc_base:rtc_base_tests_utils",
     "../../../rtc_base:safe_minmax",
     "../../../rtc_base:task_queue_for_test",
     "../../../rtc_base/task_utils:repeating_task",
-    "../../../rtc_base/third_party/sigslot:sigslot",
-    "../../../system_wrappers:system_wrappers",
+    "../../../rtc_base/third_party/sigslot",
+    "../../../system_wrappers",
     "//third_party/abseil-cpp/absl/memory",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
@@ -82,9 +82,9 @@
     "../../../p2p:rtc_p2p",
     "../../../pc:pc_test_utils",
     "../../../pc:peerconnection_wrapper",
+    "../../../rtc_base",
     "../../../rtc_base:gunit_helpers",
     "../../../rtc_base:logging",
-    "../../../rtc_base:rtc_base",
     "../../../rtc_base:rtc_event",
     "../../../test:test_support",
     "//third_party/abseil-cpp/absl/memory",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 6dee9a7..0e02401 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -132,10 +132,10 @@
     "../api/video:video_frame",
     "../api/video:video_stream_decoder",
     "../api/video_codecs:video_codecs_api",
-    "../modules/video_coding:video_coding",
+    "../modules/video_coding",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
-    "../system_wrappers:system_wrappers",
+    "../system_wrappers",
     "//third_party/abseil-cpp/absl/memory",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
@@ -153,8 +153,8 @@
     "../api/video:encoded_frame",
     "../api/video:encoded_image",
     "../api/video_codecs:video_codecs_api",
+    "../modules/video_coding",
     "../modules/video_coding:video_codec_interface",
-    "../modules/video_coding:video_coding",
     "../modules/video_coding:video_coding_utility",
     "../rtc_base:rtc_base_approved",
     "//third_party/abseil-cpp/absl/memory",
@@ -188,7 +188,7 @@
     "../api/video:video_frame_i420",
     "../api/video:video_stream_encoder",
     "../api/video_codecs:video_codecs_api",
-    "../common_video:common_video",
+    "../common_video",
     "../modules:module_api_public",
     "../modules/video_coding",
     "../modules/video_coding:video_codec_interface",
@@ -261,7 +261,7 @@
       "../modules/audio_device:windows_core_audio_utility",
       "../modules/audio_mixer:audio_mixer_impl",
       "../modules/rtp_rtcp",
-      "../modules/video_coding:video_coding",
+      "../modules/video_coding",
       "../modules/video_coding:video_coding_utility",
       "../modules/video_coding:webrtc_h264",
       "../modules/video_coding:webrtc_multiplex",
@@ -303,7 +303,7 @@
       "../api:video_quality_test_fixture_api",
       "../api/video_codecs:video_codecs_api",
       "../media:rtc_vp9_profile",
-      "../modules/pacing:pacing",
+      "../modules/pacing",
       "../modules/video_coding:webrtc_vp9",
       "../rtc_base:rtc_base_approved",
       "../rtc_base/experiments:alr_experiment",