diff --git a/api/BUILD.gn b/api/BUILD.gn
index dcda369970..870bc263fa 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -14,7 +14,7 @@ if (is_android) {
 
 group("api") {
   visibility = [ "*" ]
-  public_deps = [
+  deps = [
     ":libjingle_peerconnection_api",
   ]
 }
@@ -87,13 +87,10 @@ rtc_static_library("libjingle_peerconnection_api") {
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 
-  public_deps = [
-    ":peerconnection_and_implicit_call_api",
-  ]
-
   deps = [
     ":array_view",
     ":optional",
+    ":peerconnection_and_implicit_call_api",
     ":rtc_stats_api",
     ":video_frame_api",
     "audio_codecs:audio_codecs_api",
@@ -281,11 +278,8 @@ rtc_source_set("libjingle_peerconnection_test_api") {
     "test/fakeconstraints.h",
   ]
 
-  public_deps = [
-    ":libjingle_peerconnection_api",
-  ]
-
   deps = [
+    ":libjingle_peerconnection_api",
     "../rtc_base:rtc_base_approved",
   ]
 }
@@ -297,11 +291,8 @@ if (rtc_include_tests) {
       "test/mock_audio_mixer.h",
     ]
 
-    public_deps = [
-      ":audio_mixer_api",
-    ]
-
     deps = [
+      ":audio_mixer_api",
       "../test:test_support",
       "//testing/gmock",
     ]
@@ -328,11 +319,8 @@ if (rtc_include_tests) {
       "test/mock_video_encoder_factory.h",
     ]
 
-    public_deps = [
-      "../api/video_codecs:video_codecs_api",
-    ]
-
     deps = [
+      "../api/video_codecs:video_codecs_api",
       "../test:test_support",
       "//testing/gmock",
     ]
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 16c9faebd3..9d4f570b49 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -509,6 +509,7 @@ if (is_linux || is_win) {
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
     deps = [
+      "../api:libjingle_peerconnection_api",
       "../api:video_frame_api_i420",
       "../rtc_base:checks",
       "../rtc_base:stringutils",
@@ -543,6 +544,7 @@ if (is_linux || is_win) {
 
     deps += [
       "../api:libjingle_peerconnection_test_api",
+      "../api:peerconnection_and_implicit_call_api",
       "../api:video_frame_api",
       "../api/audio_codecs:builtin_audio_decoder_factory",
       "../api/audio_codecs:builtin_audio_encoder_factory",
@@ -669,7 +671,9 @@ if (is_win || is_android) {
       ]
     }
     deps = [
+      "../api:libjingle_peerconnection_api",
       "../api:libjingle_peerconnection_test_api",
+      "../api:peerconnection_and_implicit_call_api",
       "../api:video_frame_api",
       "../api/audio_codecs:builtin_audio_decoder_factory",
       "../api/audio_codecs:builtin_audio_encoder_factory",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index efd0f25415..4308f74808 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -562,6 +562,7 @@ if (rtc_include_tests) {
       "../../api:optional",
       "../../api:video_frame_api",
       "../../api:video_frame_api_i420",
+      "../../api/video_codecs:video_codecs_api",
       "../../common_video",
       "../../media:rtc_audio_video",
       "../../media:rtc_internal_video_codecs",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 09fa2c2533..b494b14986 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -185,6 +185,7 @@ rtc_static_library("peerconnection") {
     "../api:call_api",
     "../api:libjingle_peerconnection_api",
     "../api:optional",
+    "../api:peerconnection_and_implicit_call_api",
     "../api:rtc_stats_api",
     "../api/video_codecs:video_codecs_api",
     "../call:call_interfaces",
@@ -348,6 +349,7 @@ if (rtc_include_tests) {
       ":peerconnection",
       ":rtc_pc_base",
       "..:webrtc_common",
+      "../api:libjingle_peerconnection_api",
       "../api:libjingle_peerconnection_test_api",
       "../api:peerconnection_and_implicit_call_api",
       "../api:rtc_stats_api",
@@ -454,7 +456,9 @@ if (rtc_include_tests) {
     deps = [
       ":peerconnection",
       ":rtc_pc_base",
+      "../api:libjingle_peerconnection_api",
       "../api:mock_rtp",
+      "../api:peerconnection_and_implicit_call_api",
       "../rtc_base:checks",
       "../rtc_base:stringutils",
     ]
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index ef243d0eed..9ecc01fc2b 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -392,6 +392,7 @@ if (is_ios || is_mac) {
       deps = [
         ":peerconnectionfactory_base_objc",
         "../api:libjingle_peerconnection_api",
+        "../api:peerconnection_and_implicit_call_api",
         "../rtc_base:rtc_base",
       ]
     }