diff --git a/api/BUILD.gn b/api/BUILD.gn
index d4811d0440..45f0a95e59 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -231,7 +231,6 @@ rtc_source_set("ortc_api") {
 
   deps = [
     ":libjingle_peerconnection_api",
-    "..:webrtc_common",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h
index 7570160cc2..5aac712e46 100644
--- a/api/media_transport_interface.h
+++ b/api/media_transport_interface.h
@@ -27,7 +27,6 @@
 #include "api/array_view.h"
 #include "api/rtcerror.h"
 #include "api/video/encoded_image.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/copyonwritebuffer.h"
 #include "rtc_base/networkroute.h"
 
diff --git a/api/ortc/rtptransportinterface.h b/api/ortc/rtptransportinterface.h
index b0d30e8560..4b9d16158f 100644
--- a/api/ortc/rtptransportinterface.h
+++ b/api/ortc/rtptransportinterface.h
@@ -18,7 +18,6 @@
 #include "api/rtcerror.h"
 #include "api/rtp_headers.h"
 #include "api/rtpparameters.h"
-#include "common_types.h"  // NOLINT(build/include)
 
 namespace webrtc {
 
diff --git a/api/video_codecs/video_encoder_config.h b/api/video_codecs/video_encoder_config.h
index c9b764613c..9dd8e4fa5d 100644
--- a/api/video_codecs/video_encoder_config.h
+++ b/api/video_codecs/video_encoder_config.h
@@ -18,7 +18,6 @@
 #include "absl/types/optional.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_codec.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/refcount.h"
 #include "rtc_base/scoped_ref_ptr.h"
 
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 3754a41df7..c835f24dbe 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -45,7 +45,6 @@ rtc_static_library("audio") {
   }
 
   deps = [
-    "..:webrtc_common",
     "../api:array_view",
     "../api:call_api",
     "../api:libjingle_peerconnection_api",
diff --git a/audio/audio_receive_stream.cc b/audio/audio_receive_stream.cc
index 48484915de..42507656ec 100644
--- a/audio/audio_receive_stream.cc
+++ b/audio/audio_receive_stream.cc
@@ -24,7 +24,6 @@
 #include "audio/conversion.h"
 #include "call/rtp_config.h"
 #include "call/rtp_stream_receiver_controller_interface.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
diff --git a/audio/audio_send_stream.cc b/audio/audio_send_stream.cc
index 3e97ab23ec..283d9ec4ee 100644
--- a/audio/audio_send_stream.cc
+++ b/audio/audio_send_stream.cc
@@ -26,7 +26,6 @@
 #include "call/rtp_config.h"
 #include "call/rtp_transport_controller_send_interface.h"
 #include "common_audio/vad/include/vad.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "logging/rtc_event_log/events/rtc_event_audio_send_stream_config.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
 #include "logging/rtc_event_log/rtc_stream_config.h"
diff --git a/audio/channel_receive.h b/audio/channel_receive.h
index c774875ab2..02d0e4b982 100644
--- a/audio/channel_receive.h
+++ b/audio/channel_receive.h
@@ -25,7 +25,6 @@
 #include "api/rtpreceiverinterface.h"
 #include "call/rtp_packet_sink_interface.h"
 #include "call/syncable.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/include/audio_coding_module.h"
 
 // TODO(solenberg, nisse): This file contains a few NOLINT marks, to silence
diff --git a/audio/channel_send.cc b/audio/channel_send.cc
index b37a535e4f..e96b5b790a 100644
--- a/audio/channel_send.cc
+++ b/audio/channel_send.cc
@@ -23,7 +23,6 @@
 #include "api/crypto/frameencryptorinterface.h"
 #include "audio/utility/audio_frame_operations.h"
 #include "call/rtp_transport_controller_send_interface.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "logging/rtc_event_log/events/rtc_event_audio_playout.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor_config.h"
diff --git a/audio/utility/BUILD.gn b/audio/utility/BUILD.gn
index 76c09a51a3..11a65bdd46 100644
--- a/audio/utility/BUILD.gn
+++ b/audio/utility/BUILD.gn
@@ -21,7 +21,6 @@ rtc_static_library("audio_frame_operations") {
   ]
 
   deps = [
-    "../..:webrtc_common",
     "../../api/audio:audio_frame_api",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 50decd1216..577cab80ff 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -196,7 +196,6 @@ rtc_static_library("call") {
     ":rtp_sender",
     ":simulated_network",
     ":video_stream_api",
-    "..:webrtc_common",
     "../api:callfactory_api",
     "../api:simulated_network_api",
     "../api:transport_api",
@@ -240,7 +239,6 @@ rtc_source_set("video_stream_api") {
   ]
   deps = [
     ":rtp_interfaces",
-    "../:webrtc_common",
     "../api:libjingle_peerconnection_api",
     "../api:transport_api",
     "../api/video:video_frame",
@@ -290,7 +288,6 @@ rtc_source_set("fake_network") {
     ":call_interfaces",
     ":simulated_network",
     ":simulated_packet_receiver",
-    "..:webrtc_common",
     "../api:simulated_network_api",
     "../api:transport_api",
     "../modules:module_api",
@@ -330,7 +327,6 @@ if (rtc_include_tests) {
       ":rtp_receiver",
       ":rtp_sender",
       ":simulated_network",
-      "..:webrtc_common",
       "../api:array_view",
       "../api:fake_media_transport",
       "../api:fake_media_transport",
@@ -389,7 +385,6 @@ if (rtc_include_tests) {
       ":call_interfaces",
       ":simulated_network",
       ":video_stream_api",
-      "..:webrtc_common",
       "../api:simulated_network_api",
       "../api/audio_codecs:builtin_audio_encoder_factory",
       "../api/video:builtin_video_bitrate_allocator_factory",
diff --git a/call/audio_receive_stream.h b/call/audio_receive_stream.h
index bad0c1a4a0..f792aa2f04 100644
--- a/call/audio_receive_stream.h
+++ b/call/audio_receive_stream.h
@@ -24,7 +24,6 @@
 #include "api/rtpparameters.h"
 #include "api/rtpreceiverinterface.h"
 #include "call/rtp_config.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
diff --git a/call/call.h b/call/call.h
index 5cbbe907f7..c0e31c0902 100644
--- a/call/call.h
+++ b/call/call.h
@@ -24,7 +24,6 @@
 #include "call/rtp_transport_controller_send_interface.h"
 #include "call/video_receive_stream.h"
 #include "call/video_send_stream.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/bitrateallocationstrategy.h"
 #include "rtc_base/copyonwritebuffer.h"
 #include "rtc_base/network/sent_packet.h"
diff --git a/call/fake_network_pipe.h b/call/fake_network_pipe.h
index 56007a9976..b1b4cee14d 100644
--- a/call/fake_network_pipe.h
+++ b/call/fake_network_pipe.h
@@ -23,7 +23,6 @@
 #include "api/test/simulated_network.h"
 #include "call/call.h"
 #include "call/simulated_packet_receiver.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/thread_annotations.h"
diff --git a/call/packet_receiver.h b/call/packet_receiver.h
index f05e409d79..02a01550de 100644
--- a/call/packet_receiver.h
+++ b/call/packet_receiver.h
@@ -16,7 +16,6 @@
 #include <vector>
 
 #include "api/mediatypes.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/copyonwritebuffer.h"
 
 namespace webrtc {
diff --git a/call/rtcp_demuxer.cc b/call/rtcp_demuxer.cc
index d441c05b3d..a06d2a4604 100644
--- a/call/rtcp_demuxer.cc
+++ b/call/rtcp_demuxer.cc
@@ -13,7 +13,6 @@
 #include "api/rtp_headers.h"
 #include "call/rtcp_packet_sink_interface.h"
 #include "call/rtp_rtcp_demuxer_helper.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/call/rtcp_demuxer_unittest.cc b/call/rtcp_demuxer_unittest.cc
index 808364acc5..6ceb7ab5d9 100644
--- a/call/rtcp_demuxer_unittest.cc
+++ b/call/rtcp_demuxer_unittest.cc
@@ -16,7 +16,6 @@
 #include "absl/memory/memory.h"
 #include "api/rtp_headers.h"
 #include "call/rtcp_packet_sink_interface.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/source/rtcp_packet/bye.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
diff --git a/call/rtp_demuxer_unittest.cc b/call/rtp_demuxer_unittest.cc
index b5ede3cd03..3b8200e781 100644
--- a/call/rtp_demuxer_unittest.cc
+++ b/call/rtp_demuxer_unittest.cc
@@ -17,7 +17,6 @@
 #include "absl/memory/memory.h"
 #include "call/ssrc_binding_observer.h"
 #include "call/test/mock_rtp_packet_sink_interface.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
diff --git a/call/rtp_payload_params.h b/call/rtp_payload_params.h
index f6829cace5..b91bfe4b2c 100644
--- a/call/rtp_payload_params.h
+++ b/call/rtp_payload_params.h
@@ -16,7 +16,6 @@
 
 #include "api/video_codecs/video_encoder.h"
 #include "call/rtp_config.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h"
 #include "modules/rtp_rtcp/source/rtp_video_header.h"
 
diff --git a/call/rtp_transport_controller_send.h b/call/rtp_transport_controller_send.h
index d62cfb6120..f1c46cc078 100644
--- a/call/rtp_transport_controller_send.h
+++ b/call/rtp_transport_controller_send.h
@@ -20,7 +20,6 @@
 #include "call/rtp_bitrate_configurator.h"
 #include "call/rtp_transport_controller_send_interface.h"
 #include "call/rtp_video_sender.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/congestion_controller/include/send_side_congestion_controller_interface.h"
 #include "modules/pacing/packet_router.h"
 #include "modules/utility/include/process_thread.h"
diff --git a/call/rtp_video_sender.h b/call/rtp_video_sender.h
index d0965fd351..adac46bcd8 100644
--- a/call/rtp_video_sender.h
+++ b/call/rtp_video_sender.h
@@ -23,7 +23,6 @@
 #include "call/rtp_payload_params.h"
 #include "call/rtp_transport_controller_send_interface.h"
 #include "call/rtp_video_sender_interface.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "logging/rtc_event_log/rtc_event_log.h"
 #include "modules/rtp_rtcp/include/flexfec_sender.h"
 #include "modules/rtp_rtcp/source/rtp_video_header.h"
diff --git a/call/video_receive_stream.h b/call/video_receive_stream.h
index 34d217fc64..94cbfcc2f1 100644
--- a/call/video_receive_stream.h
+++ b/call/video_receive_stream.h
@@ -26,7 +26,6 @@
 #include "api/video/video_timing.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "call/rtp_config.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 
 namespace webrtc {
diff --git a/call/video_send_stream.h b/call/video_send_stream.h
index e91882c18e..a76e82e389 100644
--- a/call/video_send_stream.h
+++ b/call/video_send_stream.h
@@ -27,7 +27,6 @@
 #include "api/video/video_stream_encoder_settings.h"
 #include "api/video_codecs/video_encoder_config.h"
 #include "call/rtp_config.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 
 namespace webrtc {
diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn
index 911c0501e6..74b0c6029f 100644
--- a/common_audio/BUILD.gn
+++ b/common_audio/BUILD.gn
@@ -47,7 +47,6 @@ rtc_static_library("common_audio") {
   deps = [
     ":common_audio_c",
     ":sinc_resampler",
-    "..:webrtc_common",
     "../rtc_base:checks",
     "../rtc_base:gtest_prod",
     "../rtc_base:rtc_base_approved",
@@ -182,7 +181,6 @@ rtc_source_set("common_audio_c") {
   deps = [
     ":common_audio_c_arm_asm",
     ":common_audio_cc",
-    "..:webrtc_common",
     "../rtc_base:checks",
     "../rtc_base:compile_assert_c",
     "../rtc_base:rtc_base_approved",
@@ -202,7 +200,6 @@ rtc_source_set("common_audio_cc") {
   ]
 
   deps = [
-    "..:webrtc_common",
     "../rtc_base:rtc_base_approved",
     "../system_wrappers",
   ]
@@ -213,7 +210,6 @@ rtc_source_set("sinc_resampler") {
     "resampler/sinc_resampler.h",
   ]
   deps = [
-    "..:webrtc_common",
     "../rtc_base:gtest_prod",
     "../rtc_base:rtc_base_approved",
     "../rtc_base/memory:aligned_malloc",
@@ -382,7 +378,6 @@ if (rtc_include_tests) {
       ":fir_filter",
       ":fir_filter_factory",
       ":sinc_resampler",
-      "..:webrtc_common",
       "../rtc_base:checks",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index ca02d0c5ee..6066b6409f 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -747,7 +747,6 @@ if (is_linux || is_win) {
       "peerconnection/server/utils.h",
     ]
     deps = [
-      "..:webrtc_common",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:stringutils",
       "../rtc_tools:command_line_parser",
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 55b7c02e34..575952c315 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -54,7 +54,6 @@ rtc_source_set("rtc_stream_config") {
 
   deps = [
     ":rtc_event_log_api",
-    "..:webrtc_common",
     "../api:libjingle_peerconnection_api",
   ]
 }
@@ -301,7 +300,6 @@ if (rtc_enable_protobuf) {
       ":rtc_event_log_impl_encoder",
       ":rtc_event_log_proto",
       ":rtc_stream_config",
-      "..:webrtc_common",
       "../api:libjingle_peerconnection_api",
       "../call:video_stream_api",
       "../modules/audio_coding:audio_network_adaptor",
diff --git a/media/base/codec.h b/media/base/codec.h
index dd44f186a5..0ca6535287 100644
--- a/media/base/codec.h
+++ b/media/base/codec.h
@@ -18,7 +18,6 @@
 
 #include "api/rtpparameters.h"
 #include "api/video_codecs/sdp_video_format.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "media/base/mediaconstants.h"
 #include "rtc_base/system/rtc_export.h"
 
diff --git a/media/base/vp9_profile.h b/media/base/vp9_profile.h
index 5cc1d166a8..755c46da2c 100644
--- a/media/base/vp9_profile.h
+++ b/media/base/vp9_profile.h
@@ -16,7 +16,6 @@
 
 #include "absl/types/optional.h"
 #include "api/video_codecs/sdp_video_format.h"
-#include "common_types.h"  // NOLINT(build/include)
 
 namespace webrtc {
 
diff --git a/media/engine/adm_helpers.h b/media/engine/adm_helpers.h
index c6ea3a209f..2a35d26b47 100644
--- a/media/engine/adm_helpers.h
+++ b/media/engine/adm_helpers.h
@@ -11,8 +11,6 @@
 #ifndef MEDIA_ENGINE_ADM_HELPERS_H_
 #define MEDIA_ENGINE_ADM_HELPERS_H_
 
-#include "common_types.h"  // NOLINT(build/include)
-
 namespace webrtc {
 
 class AudioDeviceModule;
diff --git a/media/engine/payload_type_mapper.cc b/media/engine/payload_type_mapper.cc
index 80faa1b3bd..ae4e309ef4 100644
--- a/media/engine/payload_type_mapper.cc
+++ b/media/engine/payload_type_mapper.cc
@@ -14,7 +14,6 @@
 
 #include "absl/strings/ascii.h"
 #include "api/audio_codecs/audio_format.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "media/base/mediaconstants.h"
 
 namespace cricket {
diff --git a/modules/audio_coding/acm2/acm_receiver.cc b/modules/audio_coding/acm2/acm_receiver.cc
index 3411d909a4..e3aa4ed3e2 100644
--- a/modules/audio_coding/acm2/acm_receiver.cc
+++ b/modules/audio_coding/acm2/acm_receiver.cc
@@ -18,7 +18,6 @@
 #include "absl/strings/match.h"
 #include "api/audio/audio_frame.h"
 #include "api/audio_codecs/audio_decoder.h"
-#include "common_types.h"
 #include "modules/audio_coding/acm2/acm_resampler.h"
 #include "modules/audio_coding/acm2/call_statistics.h"
 #include "modules/audio_coding/acm2/rent_a_codec.h"
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index a44c41d6b7..67495aca77 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -215,7 +215,6 @@ rtc_source_set("audio_device_impl") {
     ":audio_device_buffer",
     ":audio_device_default",
     ":audio_device_generic",
-    "../..:webrtc_common",
     "../../api:array_view",
     "../../common_audio",
     "../../common_audio:common_audio_c",
diff --git a/modules/audio_mixer/BUILD.gn b/modules/audio_mixer/BUILD.gn
index fb8bfa6737..f935e83c5b 100644
--- a/modules/audio_mixer/BUILD.gn
+++ b/modules/audio_mixer/BUILD.gn
@@ -37,7 +37,6 @@ rtc_static_library("audio_mixer_impl") {
 
   deps = [
     ":audio_frame_manipulator",
-    "../..:webrtc_common",
     "../../api:array_view",
     "../../api/audio:audio_frame_api",
     "../../api/audio:audio_mixer_api",
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index 656048ad1c..390fc0a051 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -29,7 +29,6 @@ rtc_static_library("primitives") {
   ]
 
   deps = [
-    "../..:webrtc_common",
     "../../rtc_base:checks",
     "../../rtc_base/system:rtc_export",
     "//third_party/abseil-cpp/absl/memory",
@@ -97,7 +96,6 @@ if (rtc_include_tests) {
       ":desktop_capture",
       ":desktop_capture_mock",
       ":primitives",
-      "../..:webrtc_common",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers:cpu_features_api",
@@ -419,7 +417,6 @@ rtc_static_library("desktop_capture_generic") {
 
   deps = [
     ":primitives",
-    "../..:webrtc_common",
     "../../api:refcountedbase",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn
index a06233ad90..9bc61936f1 100644
--- a/modules/pacing/BUILD.gn
+++ b/modules/pacing/BUILD.gn
@@ -29,7 +29,6 @@ rtc_static_library("pacing") {
   deps = [
     ":interval_budget",
     "..:module_api",
-    "../../:webrtc_common",
     "../../api/transport:network_control",
     "../../logging:rtc_event_bwe",
     "../../logging:rtc_event_log_api",
@@ -56,7 +55,6 @@ rtc_source_set("interval_budget") {
   ]
 
   deps = [
-    "../../:webrtc_common",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
   ]
diff --git a/modules/utility/BUILD.gn b/modules/utility/BUILD.gn
index 32da10950f..1d780b0e4a 100644
--- a/modules/utility/BUILD.gn
+++ b/modules/utility/BUILD.gn
@@ -26,7 +26,6 @@ rtc_static_library("utility") {
 
   deps = [
     "..:module_api",
-    "../..:webrtc_common",
     "../../common_audio",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn
index 7f86bc9f08..da83d12e8d 100644
--- a/system_wrappers/BUILD.gn
+++ b/system_wrappers/BUILD.gn
@@ -33,7 +33,6 @@ rtc_static_library("system_wrappers") {
   libs = []
   deps = [
     ":cpu_features_api",
-    "..:webrtc_common",
     "../api:array_view",
     "../modules:module_api_public",
     "../rtc_base:checks",
@@ -90,9 +89,6 @@ rtc_source_set("cpu_features_api") {
   sources = [
     "include/cpu_features_wrapper.h",
   ]
-  deps = [
-    "..:webrtc_common",
-  ]
 }
 
 rtc_source_set("field_trial") {
diff --git a/system_wrappers/include/metrics.h b/system_wrappers/include/metrics.h
index 2a2cda02d0..f00ecf2622 100644
--- a/system_wrappers/include/metrics.h
+++ b/system_wrappers/include/metrics.h
@@ -15,7 +15,6 @@
 #include <memory>
 #include <string>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/atomicops.h"
 #include "rtc_base/checks.h"
 
diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc
index aca3453869..ddaba77a4f 100644
--- a/test/fake_encoder.cc
+++ b/test/fake_encoder.cc
@@ -16,7 +16,6 @@
 #include <memory>
 
 #include "api/video_codecs/vp8_temporal_layers.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "rtc_base/checks.h"
 #include "system_wrappers/include/sleep.h"
diff --git a/test/fake_encoder.h b/test/fake_encoder.h
index eba19f82bd..da38f11b45 100644
--- a/test/fake_encoder.h
+++ b/test/fake_encoder.h
@@ -15,7 +15,6 @@
 #include <vector>
 
 #include "api/video_codecs/video_encoder.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/sequenced_task_checker.h"
 #include "rtc_base/task_queue.h"
diff --git a/test/fake_vp8_encoder.cc b/test/fake_vp8_encoder.cc
index 9ef7b1c7b1..9180bec049 100644
--- a/test/fake_vp8_encoder.cc
+++ b/test/fake_vp8_encoder.cc
@@ -12,7 +12,6 @@
 
 #include "api/video_codecs/create_vp8_temporal_layers.h"
 #include "api/video_codecs/vp8_temporal_layers.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "modules/video_coding/utility/simulcast_utility.h"
diff --git a/test/rtp_file_reader.h b/test/rtp_file_reader.h
index 4913522ba7..805044f52f 100644
--- a/test/rtp_file_reader.h
+++ b/test/rtp_file_reader.h
@@ -13,8 +13,6 @@
 #include <set>
 #include <string>
 
-#include "common_types.h"  // NOLINT(build/include)
-
 namespace webrtc {
 namespace test {
 
diff --git a/test/rtp_file_writer.h b/test/rtp_file_writer.h
index 4496ca4a25..5e560d7375 100644
--- a/test/rtp_file_writer.h
+++ b/test/rtp_file_writer.h
@@ -12,7 +12,6 @@
 
 #include <string>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "test/rtp_file_reader.h"
 
 namespace webrtc {
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index 7a34d0b2e5..622827fd00 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -37,7 +37,6 @@ if (rtc_include_tests) {
       "../:test_common",
       "../:test_support",
       "../:video_test_common",
-      "../..:webrtc_common",
       "../../api:libjingle_peerconnection_api",
       "../../api:transport_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
diff --git a/test/testsupport/jpeg_frame_writer.cc b/test/testsupport/jpeg_frame_writer.cc
index 537e85cfa5..8bf1ee4630 100644
--- a/test/testsupport/jpeg_frame_writer.cc
+++ b/test/testsupport/jpeg_frame_writer.cc
@@ -10,7 +10,6 @@
 
 #include <stdio.h>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
diff --git a/test/vcm_capturer.h b/test/vcm_capturer.h
index 59df4c71e2..5f4707f911 100644
--- a/test/vcm_capturer.h
+++ b/test/vcm_capturer.h
@@ -12,7 +12,6 @@
 
 #include <memory>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "modules/video_capture/video_capture.h"
 #include "rtc_base/criticalsection.h"
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 824f1c15ec..b53d730ae0 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -53,7 +53,6 @@ rtc_static_library("video") {
 
   deps = [
     ":frame_dumping_decoder",
-    "..:webrtc_common",
     "../api:fec_controller_api",
     "../api:libjingle_peerconnection_api",
     "../api:transport_api",
@@ -376,7 +375,6 @@ if (rtc_include_tests) {
       "replay.cc",
     ]
     deps = [
-      "..:webrtc_common",
       "../api/test/video:function_video_factory",
       "../api/video_codecs:video_codecs_api",
       "../call:call_interfaces",
diff --git a/video/receive_statistics_proxy.h b/video/receive_statistics_proxy.h
index 23cc703850..100e75116c 100644
--- a/video/receive_statistics_proxy.h
+++ b/video/receive_statistics_proxy.h
@@ -18,7 +18,6 @@
 
 #include "absl/types/optional.h"
 #include "call/video_receive_stream.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/numerics/histogram_percentile_counter.h"
diff --git a/video/report_block_stats.h b/video/report_block_stats.h
index 241fec76a6..e0a69c9052 100644
--- a/video/report_block_stats.h
+++ b/video/report_block_stats.h
@@ -14,7 +14,6 @@
 #include <map>
 #include <vector>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 
 namespace webrtc {
diff --git a/video/rtp_video_stream_receiver.cc b/video/rtp_video_stream_receiver.cc
index f85ae2d59e..3ebddf0e0e 100644
--- a/video/rtp_video_stream_receiver.cc
+++ b/video/rtp_video_stream_receiver.cc
@@ -16,7 +16,6 @@
 
 #include "absl/memory/memory.h"
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "media/base/mediaconstants.h"
 #include "modules/pacing/packet_router.h"
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
diff --git a/video/send_delay_stats.h b/video/send_delay_stats.h
index 3337899069..b44516b285 100644
--- a/video/send_delay_stats.h
+++ b/video/send_delay_stats.h
@@ -16,7 +16,6 @@
 #include <set>
 
 #include "call/video_send_stream.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"
diff --git a/video/send_statistics_proxy.cc b/video/send_statistics_proxy.cc
index e11304bfdf..24e9641947 100644
--- a/video/send_statistics_proxy.cc
+++ b/video/send_statistics_proxy.cc
@@ -15,7 +15,6 @@
 #include <limits>
 #include <utility>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
diff --git a/video/send_statistics_proxy.h b/video/send_statistics_proxy.h
index 2fa87cccce..7316f3b55a 100644
--- a/video/send_statistics_proxy.h
+++ b/video/send_statistics_proxy.h
@@ -18,7 +18,6 @@
 
 #include "api/video/video_stream_encoder_observer.h"
 #include "call/video_send_stream.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "rtc_base/criticalsection.h"
diff --git a/video/transport_adapter.h b/video/transport_adapter.h
index 8ec53fdf25..786858b0e2 100644
--- a/video/transport_adapter.h
+++ b/video/transport_adapter.h
@@ -13,7 +13,6 @@
 #include <atomic>
 
 #include "api/call/transport.h"
-#include "common_types.h"  // NOLINT(build/include)
 
 namespace webrtc {
 namespace internal {
diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc
index bb5ee755d9..4f2b9df752 100644
--- a/video/video_receive_stream.cc
+++ b/video/video_receive_stream.cc
@@ -21,7 +21,6 @@
 #include "api/video_codecs/video_decoder_factory.h"
 #include "call/rtp_stream_receiver_controller_interface.h"
 #include "call/rtx_receive_stream.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/h264/profile_level_id.h"
 #include "common_video/include/incoming_video_stream.h"
 #include "common_video/libyuv/include/webrtc_libyuv.h"
diff --git a/video/video_send_stream_impl.h b/video/video_send_stream_impl.h
index 6197a0498c..5ef4a451a4 100644
--- a/video/video_send_stream_impl.h
+++ b/video/video_send_stream_impl.h
@@ -18,7 +18,6 @@
 #include "api/video/video_stream_encoder_interface.h"
 #include "call/bitrate_allocator.h"
 #include "call/rtp_video_sender_interface.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/utility/include/process_thread.h"
 #include "rtc_base/weak_ptr.h"
 #include "video/call_stats.h"