diff --git a/BUILD.gn b/BUILD.gn
index c844e3853f..75141df66d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -538,7 +538,6 @@ if (rtc_include_tests) {
     testonly = true
 
     deps = [
-      ":webrtc_common",
       "api:compile_all_headers",
       "api:rtc_api_unittests",
       "api/audio/test:audio_api_unittests",
diff --git a/api/BUILD.gn b/api/BUILD.gn
index 6b4f04db03..db0723dec8 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -87,7 +87,6 @@ rtc_library("rtp_packet_info") {
     ":refcountedbase",
     ":rtp_headers",
     ":scoped_refptr",
-    "..:webrtc_common",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/system:rtc_export",
   ]
@@ -197,7 +196,6 @@ rtc_library("libjingle_peerconnection_api") {
     # Basically, don't add stuff here. You might break sensitive downstream
     # targets like pnacl. API should not depend on anything outside of this
     # file, really. All these should arguably go away in time.
-    "..:webrtc_common",
     "../media:rtc_media_base",
     "../media:rtc_media_config",
     "../modules/audio_processing:audio_processing_statistics",
@@ -829,7 +827,6 @@ if (rtc_include_tests) {
       ":array_view",
       ":libjingle_peerconnection_api",
       ":rtp_parameters",
-      "..:webrtc_common",
       "../rtc_base:checks",
       "../rtc_base:rtc_base_approved",
       "crypto:frame_encryptor_interface",
@@ -846,7 +843,6 @@ if (rtc_include_tests) {
       ":array_view",
       ":libjingle_peerconnection_api",
       ":rtp_parameters",
-      "..:webrtc_common",
       "../rtc_base:checks",
       "../rtc_base:rtc_base_approved",
       "crypto:frame_decryptor_interface",
diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index ee7e51d4c4..e864e036f4 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -314,7 +314,6 @@ rtc_library("builtin_video_bitrate_allocator_factory") {
     ":video_bitrate_allocation",
     ":video_bitrate_allocator",
     ":video_bitrate_allocator_factory",
-    "../../:webrtc_common",
     "../../api:scoped_refptr",
     "../../media:rtc_media_base",
     "../../modules/video_coding:video_coding_utility",
diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index 848008fc53..1569125345 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -40,7 +40,6 @@ rtc_library("video_codecs_api") {
   deps = [
     "..:fec_controller_api",
     "..:scoped_refptr",
-    "../..:webrtc_common",
     "../../modules/video_coding:codec_globals_headers",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index db29a79092..dd92ee3fbf 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -94,7 +94,6 @@ if (rtc_include_tests) {
 
     deps = [
       ":common_video",
-      "../:webrtc_common",
       "../api:scoped_refptr",
       "../api/units:time_delta",
       "../api/video:video_frame",
diff --git a/modules/BUILD.gn b/modules/BUILD.gn
index f6f44bd4b3..27615fbc48 100644
--- a/modules/BUILD.gn
+++ b/modules/BUILD.gn
@@ -31,7 +31,6 @@ group("modules") {
 
 rtc_source_set("module_api_public") {
   sources = [ "include/module_common_types_public.h" ]
-  deps = [ "..:webrtc_common" ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
 }
 
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index 0b2d2cdeb1..3f6532519e 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -116,7 +116,6 @@ if (rtc_include_tests) {
     deps = [
       ":remote_bitrate_estimator",
       "..:module_api_public",
-      "../..:webrtc_common",
       "../../api/transport:field_trial_based_config",
       "../../api/transport:mock_network_control",
       "../../api/transport:network_control",
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 2b1ea8b565..d137665214 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -249,7 +249,6 @@ rtc_library("rtp_rtcp") {
     "..:module_api",
     "..:module_api_public",
     "..:module_fec_api",
-    "../..:webrtc_common",
     "../../api:array_view",
     "../../api:frame_transformer_interface",
     "../../api:function_view",
@@ -330,7 +329,6 @@ rtc_library("rtcp_transceiver") {
   deps = [
     ":rtp_rtcp",
     ":rtp_rtcp_format",
-    "../../:webrtc_common",
     "../../api:array_view",
     "../../api:rtp_headers",
     "../../api:transport_api",
@@ -520,7 +518,6 @@ if (rtc_include_tests) {
       ":rtcp_transceiver",
       ":rtp_rtcp",
       ":rtp_rtcp_format",
-      "../..:webrtc_common",
       "../../api:array_view",
       "../../api:libjingle_peerconnection_api",
       "../../api:mock_frame_encryptor",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 354cbe050d..e98200a943 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -265,7 +265,6 @@ rtc_library("video_coding_legacy") {
     ":video_coding",
     "..:module_api",
     "..:module_api_public",
-    "../../:webrtc_common",
     "../../api:rtp_headers",
     "../../api:rtp_packet_info",
     "../../api/video:encoded_image",
@@ -460,7 +459,6 @@ rtc_library("webrtc_vp8") {
     ":video_codec_interface",
     ":video_coding_utility",
     ":webrtc_vp8_temporal_layers",
-    "../..:webrtc_common",
     "../../api:fec_controller_api",
     "../../api:scoped_refptr",
     "../../api/video:encoded_image",
@@ -503,7 +501,6 @@ rtc_library("webrtc_vp8_temporal_layers") {
     ":codec_globals_headers",
     ":video_codec_interface",
     ":video_coding_utility",
-    "../..:webrtc_common",
     "../../api:fec_controller_api",
     "../../api/video_codecs:video_codecs_api",
     "../../rtc_base:checks",
@@ -527,7 +524,6 @@ rtc_library("webrtc_vp9_helpers") {
   deps = [
     ":codec_globals_headers",
     ":video_codec_interface",
-    "../..:webrtc_common",
     "../../api/video:video_bitrate_allocation",
     "../../api/video:video_bitrate_allocator",
     "../../api/video:video_codec_constants",
@@ -556,7 +552,6 @@ rtc_library("webrtc_vp9") {
     ":video_codec_interface",
     ":video_coding_utility",
     ":webrtc_vp9_helpers",
-    "../..:webrtc_common",
     "../../api:fec_controller_api",
     "../../api:scoped_refptr",
     "../../api/video:video_frame",
@@ -653,7 +648,6 @@ if (rtc_include_tests) {
       ":video_codec_interface",
       ":video_coding",
       ":video_coding_utility",
-      "../../:webrtc_common",
       "../../api:mock_video_decoder",
       "../../api:mock_video_encoder",
       "../../api:simulcast_test_fixture_api",
@@ -762,7 +756,6 @@ if (rtc_include_tests) {
       ":video_coding_utility",
       ":videocodec_test_stats_impl",
       ":webrtc_vp9_helpers",
-      "../..:webrtc_common",
       "../../api:array_view",
       "../../api:videocodec_test_fixture_api",
       "../../api/test/video:function_video_factory",
@@ -837,7 +830,6 @@ if (rtc_include_tests) {
       ":webrtc_vp8",
       ":webrtc_vp9",
       ":webrtc_vp9_helpers",
-      "../..:webrtc_common",
       "../../api:create_frame_generator",
       "../../api:create_videocodec_test_fixture_api",
       "../../api:frame_generator_api",