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",