Delete unneeded direct includes of common_types.h

And delete corresponding dependencies on :webrtc_common. After this
change, common_types.h is included directly only from code in the
following directories:

api/
api/video/
api/video_codecs/
common_video/libyuv/include/
media/base/
modules/remote_bitrate_estimator/
modules/rtp_rtcp/source/
modules/video_coding/codecs/vp9/

There remains plenty of indirect dependencies on the types declared in
common_types.h, but the fewer direct dependencies should make it
easier to find the proper place for each type.

Bug: webrtc:5876
Change-Id: I93e8f214025ecb613c19fdec2015bd3f96c59aae
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130501
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27376}

api/audio_codecs/BUILD.gn

@@ -32,7 +32,6 @@ rtc_source_set("audio_codecs_api") {
     "..:array_view",
     "..:bitrate_allocation",
     "..:scoped_refptr",
-    "../..:webrtc_common",
     "../../rtc_base:checks",
     "../../rtc_base:deprecation",
     "../../rtc_base:rtc_base_approved",

api/video/builtin_video_bitrate_allocator_factory.cc

@@ -13,7 +13,6 @@
 #include "absl/memory/memory.h"
 #include "api/video/video_bitrate_allocator.h"
 #include "api/video_codecs/video_codec.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/vp9/svc_rate_allocator.h"
 #include "modules/video_coding/utility/default_video_bitrate_allocator.h"
 #include "modules/video_coding/utility/simulcast_rate_allocator.h"

api/video_codecs/BUILD.gn

@@ -137,7 +137,6 @@ rtc_static_library("rtc_software_fallback_wrappers") {
 
   deps = [
     ":video_codecs_api",
-    "../../:webrtc_common",
     "../../media:rtc_h264_profile_id",
     "../../media:rtc_media_base",
     "../../modules/video_coding:video_codec_interface",

api/video_codecs/test/BUILD.gn

@@ -22,7 +22,6 @@ if (rtc_include_tests) {
       "..:rtc_software_fallback_wrappers",
       "..:video_codecs_api",
       "../..:mock_video_encoder",
-      "../../../:webrtc_common",
       "../../../api:scoped_refptr",
       "../../../modules:module_api",
       "../../../modules/video_coding:video_codec_interface",

api/video_codecs/test/video_decoder_software_fallback_wrapper_unittest.cc

@@ -17,7 +17,6 @@
 #include "api/video/video_frame.h"
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_decoder.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_error_codes.h"

api/video_codecs/test/video_encoder_software_fallback_wrapper_unittest.cc

@@ -27,7 +27,6 @@
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_encoder.h"
 #include "api/video_codecs/video_encoder_software_fallback_wrapper.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/include/module_common_types.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/include/video_codec_interface.h"

api/video_codecs/video_encoder_software_fallback_wrapper.cc

@@ -21,7 +21,6 @@
 #include "api/video/video_bitrate_allocation.h"
 #include "api/video/video_frame.h"
 #include "api/video_codecs/video_codec.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"

call/BUILD.gn

@@ -30,7 +30,6 @@ rtc_source_set("call_interfaces") {
   deps = [
     ":rtp_interfaces",
     ":video_stream_api",
-    "..:webrtc_common",
     "../api:fec_controller_api",
     "../api:libjingle_peerconnection_api",
     "../api:rtp_headers",
@@ -100,7 +99,6 @@ rtc_source_set("rtp_receiver") {
   ]
   deps = [
     ":rtp_interfaces",
-    "..:webrtc_common",
     "../api:array_view",
     "../api:rtp_headers",
     "../modules/rtp_rtcp",
@@ -125,7 +123,6 @@ rtc_source_set("rtp_sender") {
   deps = [
     ":bitrate_configurator",
     ":rtp_interfaces",
-    "..:webrtc_common",
     "../api:fec_controller_api",
     "../api:transport_api",
     "../api/transport:field_trial_based_config",
@@ -217,7 +214,6 @@ rtc_static_library("call") {
     ":rtp_sender",
     ":simulated_network",
     ":video_stream_api",
-    "..:webrtc_common",
     "../api:array_view",
     "../api:callfactory_api",
     "../api:fec_controller_api",
@@ -322,7 +318,6 @@ rtc_source_set("fake_network") {
     ":call_interfaces",
     ":simulated_network",
     ":simulated_packet_receiver",
-    "..:webrtc_common",
     "../api:libjingle_peerconnection_api",
     "../api:simulated_network_api",
     "../api:transport_api",
@@ -363,7 +358,6 @@ if (rtc_include_tests) {
       ":rtp_receiver",
       ":rtp_sender",
       ":simulated_network",
-      "../:webrtc_common",
       "../api:array_view",
       "../api:fake_media_transport",
       "../api:fake_media_transport",

call/rtp_payload_params.cc

@@ -16,7 +16,6 @@
 #include "absl/container/inlined_vector.h"
 #include "absl/types/variant.h"
 #include "api/video/video_timing.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/h264/include/h264_globals.h"
 #include "modules/video_coding/codecs/interface/common_constants.h"
 #include "modules/video_coding/codecs/vp8/include/vp8_globals.h"

call/rtp_payload_params_unittest.cc

@@ -18,7 +18,6 @@
 #include "api/video/video_content_type.h"
 #include "api/video/video_rotation.h"
 #include "call/rtp_payload_params.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/h264/include/h264_globals.h"
 #include "modules/video_coding/codecs/interface/common_constants.h"
 #include "modules/video_coding/codecs/vp8/include/vp8_globals.h"

common_video/h264/profile_level_id_unittest.cc

@@ -14,7 +14,6 @@
 #include <string>
 
 #include "absl/types/optional.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "media/base/h264_profile_level_id.h"
 #include "test/gtest.h"
 

media/BUILD.gn

@@ -185,7 +185,6 @@ rtc_static_library("rtc_encoder_simulcast_proxy") {
   ]
   deps = [
     ":rtc_simulcast_encoder_adapter",
-    "../:webrtc_common",
     "../api/video:video_bitrate_allocation",
     "../api/video:video_frame",
     "../api/video_codecs:video_codecs_api",
@@ -445,7 +444,6 @@ if (rtc_include_tests) {
       ":rtc_internal_video_codecs",
       ":rtc_media",
       ":rtc_media_base",
-      "..:webrtc_common",
       "../api:call_api",
       "../api/video:video_bitrate_allocation",
       "../api/video:video_frame",

media/engine/encoder_simulcast_proxy.h

@@ -23,7 +23,6 @@
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_encoder.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/include/video_codec_interface.h"
 
 namespace webrtc {

media/engine/fake_webrtc_video_engine.h

@@ -26,7 +26,6 @@
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "rtc_base/critical_section.h"
 #include "rtc_base/event.h"

modules/audio_processing/BUILD.gn

@@ -157,7 +157,6 @@ rtc_static_library("audio_processing") {
     ":gain_control_config_proxy",
     ":gain_control_interface",
     ":noise_suppression_proxy",
-    "../..:webrtc_common",
     "../../api:array_view",
     "../../api:function_view",
     "../../api/audio:aec3_config",
@@ -330,7 +329,6 @@ rtc_source_set("audio_processing_c") {
   }
 
   deps = [
-    "../..:webrtc_common",
     "../../common_audio",
     "../../common_audio:common_audio_c",
     "../../common_audio/third_party/fft4g",
@@ -455,7 +453,6 @@ if (rtc_include_tests) {
       ":file_audio_generator_unittests",
       ":gain_control_config_proxy",
       ":mocks",
-      "../..:webrtc_common",
       "../../api:array_view",
       "../../api:scoped_refptr",
       "../../api/audio:aec3_config",
@@ -705,7 +702,6 @@ if (rtc_include_tests) {
     ]
     deps = [
       ":audio_processing",
-      "../..:webrtc_common",
       "../../common_audio",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/system:file_wrapper",
@@ -726,7 +722,6 @@ if (rtc_include_tests) {
     ]
     deps = [
       ":audio_processing",
-      "../..:webrtc_common",
       "../../rtc_base/system:file_wrapper",
       "../../system_wrappers",
     ]
@@ -748,7 +743,6 @@ if (rtc_include_tests) {
 
       deps = [
         ":audioproc_debug_proto",
-        "../..:webrtc_common",
         "../../rtc_base:checks",
         "../../rtc_base:protobuf_utils",
         "../../rtc_base:rtc_base_approved",

modules/audio_processing/agc/BUILD.gn

@@ -19,7 +19,6 @@ rtc_source_set("agc") {
     ":level_estimation",
     "..:apm_logging",
     "..:gain_control_interface",
-    "../../..:webrtc_common",
     "../../../rtc_base:checks",
     "../../../rtc_base:gtest_prod",
     "../../../rtc_base:logging",
@@ -41,7 +40,6 @@ rtc_source_set("level_estimation") {
     "utility.h",
   ]
   deps = [
-    "../../..:webrtc_common",
     "../../../rtc_base:checks",
     "../../../rtc_base:macromagic",
     "../vad",
@@ -65,7 +63,6 @@ rtc_source_set("agc_legacy_c") {
   ]
 
   deps = [
-    "../../..:webrtc_common",
     "../../../common_audio",
     "../../../common_audio:common_audio_c",
     "../../../common_audio/third_party/fft4g",
@@ -112,7 +109,6 @@ if (rtc_include_tests) {
       ":agc",
       ":level_estimation",
       "..:mocks",
-      "../../..:webrtc_common",
       "../../../test:fileutils",
       "../../../test:test_support",
       "//testing/gtest",

modules/audio_processing/test/conversational_speech/BUILD.gn

@@ -46,7 +46,6 @@ rtc_static_library("lib") {
     "wavreader_interface.h",
   ]
   deps = [
-    "../../../..:webrtc_common",
     "../../../../api:array_view",
     "../../../../common_audio",
     "../../../../rtc_base:checks",
@@ -68,7 +67,6 @@ rtc_source_set("unittest") {
   ]
   deps = [
     ":lib",
-    "../../../..:webrtc_common",
     "../../../../api:array_view",
     "../../../../common_audio",
     "../../../../rtc_base:rtc_base_approved",

modules/audio_processing/test/py_quality_assessment/BUILD.gn

@@ -116,7 +116,6 @@ rtc_executable("fake_polqa") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   output_dir = "${root_out_dir}/py_quality_assessment/quality_assessment"
   deps = [
-    "../../../..:webrtc_common",
     "../../../../rtc_base:checks",
     "../../../../rtc_base:rtc_base_approved",
   ]
@@ -127,7 +126,6 @@ rtc_executable("vad") {
     "quality_assessment/vad.cc",
   ]
   deps = [
-    "../../../..:webrtc_common",
     "../../../../common_audio",
     "../../../../rtc_base:rtc_base_approved",
   ]
@@ -139,7 +137,6 @@ rtc_executable("apm_vad") {
   ]
   deps = [
     "../..",
-    "../../../..:webrtc_common",
     "../../../../common_audio",
     "../../../../rtc_base:rtc_base_approved",
     "../../vad",
@@ -152,7 +149,6 @@ rtc_executable("sound_level") {
   ]
   deps = [
     "../..",
-    "../../../..:webrtc_common",
     "../../../../common_audio",
     "../../../../rtc_base:rtc_base_approved",
   ]

modules/congestion_controller/BUILD.gn

@@ -31,7 +31,6 @@ rtc_static_library("congestion_controller") {
   deps = [
     ":transport_feedback",
     "..:module_api",
-    "../..:webrtc_common",
     "../../api:scoped_refptr",
     "../../api/transport:field_trial_based_config",
     "../../api/transport:network_control",

modules/congestion_controller/goog_cc/BUILD.gn

@@ -30,7 +30,6 @@ rtc_static_library("goog_cc") {
     ":probe_controller",
     ":pushback_controller",
     "../..:module_api",
-    "../../..:webrtc_common",
     "../../../api/transport:field_trial_based_config",
     "../../../api/transport:network_control",
     "../../../api/transport:webrtc_key_value_config",
@@ -88,7 +87,6 @@ rtc_source_set("alr_detector") {
     "alr_detector.h",
   ]
   deps = [
-    "../../..:webrtc_common",
     "../../../api/transport:webrtc_key_value_config",
     "../../../logging:rtc_event_log_api",
     "../../../logging:rtc_event_pacing",

modules/congestion_controller/include/send_side_congestion_controller.h

@@ -16,7 +16,6 @@
 
 #include "api/transport/field_trial_based_config.h"
 #include "api/transport/webrtc_key_value_config.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
 #include "modules/congestion_controller/include/network_changed_observer.h"
 #include "modules/congestion_controller/include/send_side_congestion_controller_interface.h"

modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h

@@ -16,7 +16,6 @@
 #include <map>
 #include <vector>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/include/module.h"
 #include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"

modules/remote_bitrate_estimator/overuse_detector_unittest.cc

@@ -14,7 +14,6 @@
 #include <cstdlib>
 #include <memory>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/remote_bitrate_estimator/inter_arrival.h"
 #include "modules/remote_bitrate_estimator/overuse_detector.h"
 #include "modules/remote_bitrate_estimator/overuse_estimator.h"

modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc

@@ -15,7 +15,6 @@
 #include <utility>
 
 #include "absl/types/optional.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/remote_bitrate_estimator/aimd_rate_control.h"
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "modules/remote_bitrate_estimator/inter_arrival.h"

modules/remote_bitrate_estimator/test/bwe_test_logging.h

@@ -128,7 +128,6 @@
 #include <stack>
 #include <string>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/critical_section.h"
 

modules/rtp_rtcp/BUILD.gn

@@ -89,7 +89,6 @@ rtc_source_set("rtp_rtcp_format") {
   deps = [
     "..:module_api",
     "..:module_api_public",
-    "../..:webrtc_common",
     "../../api:array_view",
     "../../api:function_view",
     "../../api:libjingle_peerconnection_api",

modules/rtp_rtcp/include/rtp_rtcp_defines.h

@@ -20,7 +20,6 @@
 #include "api/audio_codecs/audio_format.h"
 #include "api/rtp_headers.h"
 #include "api/transport/network_types.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/include/module_common_types.h"
 #include "system_wrappers/include/clock.h"
 

modules/rtp_rtcp/source/nack_rtx_unittest.cc

@@ -19,7 +19,6 @@
 #include "api/transport/field_trial_based_config.h"
 #include "call/rtp_stream_receiver_controller.h"
 #include "call/rtx_receive_stream.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/include/receive_statistics.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"

modules/rtp_rtcp/source/remote_ntp_time_estimator_unittest.cc

@@ -9,7 +9,6 @@
  */
 
 #include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "system_wrappers/include/clock.h"
 #include "test/gmock.h"
 #include "test/gtest.h"

modules/rtp_rtcp/source/rtcp_receiver.cc

@@ -21,7 +21,6 @@
 #include "absl/memory/memory.h"
 #include "api/video/video_bitrate_allocation.h"
 #include "api/video/video_bitrate_allocator.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/source/rtcp_packet/bye.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/compound_packet.h"

modules/rtp_rtcp/source/rtcp_receiver_unittest.cc

@@ -13,7 +13,6 @@
 #include "api/array_view.h"
 #include "api/video/video_bitrate_allocation.h"
 #include "api/video/video_bitrate_allocator.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/mocks/mock_rtcp_bandwidth_observer.h"
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "modules/rtp_rtcp/source/rtcp_packet.h"

modules/rtp_rtcp/source/rtcp_sender.cc

@@ -16,7 +16,6 @@
 #include <utility>
 
 #include "absl/memory/memory.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "logging/rtc_event_log/events/rtc_event_rtcp_packet_outgoing.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/app.h"

modules/rtp_rtcp/source/rtcp_sender_unittest.cc

@@ -10,7 +10,6 @@
 
 #include <memory>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/bye.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"

modules/rtp_rtcp/source/rtp_format.h

@@ -16,7 +16,6 @@
 #include <vector>
 
 #include "api/array_view.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/source/rtp_video_header.h"
 

modules/rtp_rtcp/source/rtp_format_h264.cc

@@ -20,7 +20,6 @@
 
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/h264/h264_common.h"
 #include "common_video/h264/pps_parser.h"
 #include "common_video/h264/sps_parser.h"

modules/rtp_rtcp/source/rtp_format_video_generic.h

@@ -14,7 +14,6 @@
 #include <vector>
 
 #include "api/array_view.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/source/rtp_format.h"
 #include "rtc_base/constructor_magic.h"
 

modules/rtp_rtcp/source/rtp_format_vp8.cc

@@ -14,7 +14,6 @@
 #include <string.h>  // memcpy
 #include <vector>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "modules/video_coding/codecs/interface/common_constants.h"
 #include "rtc_base/checks.h"

modules/rtp_rtcp/source/rtp_format_vp9.cc

@@ -12,7 +12,6 @@
 
 #include <string.h>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "modules/video_coding/codecs/interface/common_constants.h"
 #include "rtc_base/bit_buffer.h"

modules/rtp_rtcp/source/rtp_header_extensions.h

@@ -21,7 +21,6 @@
 #include "api/video/video_frame_marking.h"
 #include "api/video/video_rotation.h"
 #include "api/video/video_timing.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 
 namespace webrtc {

modules/rtp_rtcp/source/rtp_rtcp_impl.h

@@ -21,7 +21,6 @@
 #include "absl/types/optional.h"
 #include "api/rtp_headers.h"
 #include "api/video/video_bitrate_allocation.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/include/module_common_types.h"
 #include "modules/include/module_fec_types.h"
 #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"

modules/rtp_rtcp/source/rtp_sender.h

@@ -22,7 +22,6 @@
 #include "api/array_view.h"
 #include "api/call/transport.h"
 #include "api/transport/webrtc_key_value_config.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/include/flexfec_sender.h"
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"

modules/rtp_rtcp/source/rtp_sender_audio.h

@@ -17,7 +17,6 @@
 #include <memory>
 
 #include "absl/strings/string_view.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/include/audio_coding_module_typedefs.h"
 #include "modules/rtp_rtcp/source/dtmf_queue.h"
 #include "modules/rtp_rtcp/source/rtp_sender.h"

modules/rtp_rtcp/source/rtp_sender_video.h

@@ -16,7 +16,6 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/include/flexfec_sender.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/playout_delay_oracle.h"

modules/rtp_rtcp/source/rtp_utility.h

@@ -16,7 +16,6 @@
 
 #include "absl/strings/string_view.h"
 #include "api/rtp_headers.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 

modules/video_capture/BUILD.gn

@@ -28,7 +28,6 @@ rtc_static_library("video_capture_module") {
 
   deps = [
     "..:module_api",
-    "../..:webrtc_common",
     "../../api:scoped_refptr",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
@@ -75,10 +74,7 @@ if (!build_with_chromium) {
         "linux/video_capture_linux.cc",
         "linux/video_capture_linux.h",
       ]
-      deps += [
+      deps += [ "../../media:rtc_media_base" ]
-        "../..:webrtc_common",
-        "../../media:rtc_media_base",
-      ]
     }
     if (is_win) {
       sources = [

modules/video_capture/device_info_impl.cc

@@ -13,7 +13,6 @@
 
 #include "absl/strings/match.h"
 #include "absl/strings/string_view.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_capture/device_info_impl.h"
 #include "rtc_base/logging.h"
 

modules/video_capture/linux/device_info_linux.cc

@@ -21,7 +21,6 @@
 #include <linux/videodev2.h>
 #include <vector>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_capture/video_capture.h"
 #include "modules/video_capture/video_capture_defines.h"
 #include "modules/video_capture/video_capture_impl.h"

modules/video_capture/linux/video_capture_linux.h

@@ -15,7 +15,6 @@
 #include <stdint.h>
 #include <memory>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_capture/video_capture_defines.h"
 #include "modules/video_capture/video_capture_impl.h"
 #include "rtc_base/critical_section.h"

modules/video_capture/video_capture_impl.cc

@@ -13,7 +13,6 @@
 
 #include "api/video/i420_buffer.h"
 #include "api/video/video_frame_buffer.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "modules/video_capture/video_capture_config.h"
 #include "modules/video_capture/video_capture_impl.h"

modules/video_coding/BUILD.gn

@@ -17,7 +17,6 @@ rtc_static_library("encoded_frame") {
   deps = [
     ":codec_globals_headers",
     ":video_codec_interface",
-    "../../:webrtc_common",
     "../../api/video:encoded_image",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
@@ -150,7 +149,6 @@ rtc_static_library("video_coding") {
     ":webrtc_vp9_helpers",
     "..:module_api",
     "..:module_api_public",
-    "../..:webrtc_common",
     "../../api:fec_controller_api",
     "../../api:rtp_headers",
     "../../api/units:data_rate",
@@ -195,7 +193,6 @@ rtc_source_set("video_codec_interface") {
   ]
   deps = [
     "..:module_api",
-    "../..:webrtc_common",
     "../../api/video:video_frame",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
@@ -246,7 +243,6 @@ rtc_source_set("video_coding_utility") {
   deps = [
     ":video_codec_interface",
     "..:module_api",
-    "../..:webrtc_common",
     "../../api/video:encoded_frame",
     "../../api/video:encoded_image",
     "../../api/video:video_bitrate_allocation",
@@ -281,7 +277,6 @@ rtc_static_library("webrtc_h264") {
   deps = [
     ":video_codec_interface",
     ":video_coding_utility",
-    "../../:webrtc_common",
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
     "../../api/video_codecs:video_codecs_api",
@@ -335,7 +330,6 @@ rtc_static_library("webrtc_multiplex") {
     ":video_codec_interface",
     ":video_coding_utility",
     "..:module_api",
-    "../..:webrtc_common",
     "../../api:scoped_refptr",
     "../../api/video:encoded_image",
     "../../api/video:video_frame",
@@ -567,7 +561,6 @@ if (rtc_include_tests) {
       ":videocodec_test_stats_impl",
       ":webrtc_vp9_helpers",
       "..:module_api",
-      "../..:webrtc_common",
       "../../api:scoped_refptr",
       "../../api:videocodec_test_fixture_api",
       "../../api/task_queue",
@@ -832,7 +825,6 @@ if (rtc_include_tests) {
       ":webrtc_vp9_helpers",
       "..:module_api",
       "..:module_fec_api",
-      "../..:webrtc_common",
       "../../api:array_view",
       "../../api:create_simulcast_test_fixture_api",
       "../../api:fec_controller_api",

modules/video_coding/codecs/h264/h264.cc

@@ -16,7 +16,6 @@
 #include "absl/memory/memory.h"
 #include "absl/types/optional.h"
 #include "api/video_codecs/sdp_video_format.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "media/base/h264_profile_level_id.h"
 #include "media/base/media_constants.h"
 

modules/video_coding/codecs/h264/test/h264_impl_unittest.cc

@@ -18,7 +18,6 @@
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_decoder.h"
 #include "api/video_codecs/video_encoder.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "common_video/test/utilities.h"
 #include "media/base/codec.h"

modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.h

@@ -16,7 +16,6 @@
 #include <vector>
 
 #include "api/video/encoded_image.h"
-#include "common_types.h"  // NOLINT(build/include)
 
 namespace webrtc {
 

modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc

@@ -27,7 +27,6 @@
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_decoder.h"
 #include "api/video_codecs/video_encoder.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/include/video_frame_buffer.h"
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "media/base/media_constants.h"

modules/video_coding/codecs/test/video_codec_unittest.cc

@@ -10,7 +10,6 @@
 
 #include <utility>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/video_coding/codecs/test/video_codec_unittest.h"
 #include "modules/video_coding/include/video_error_codes.h"

modules/video_coding/codecs/test/video_encoder_decoder_instantiation_tests.cc

@@ -16,7 +16,6 @@
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "common_types.h"  // NOLINT(build/include)
 #if defined(WEBRTC_ANDROID)
 #include "modules/video_coding/codecs/test/android_codec_factory_helper.h"
 #elif defined(WEBRTC_IOS)

modules/video_coding/codecs/test/videocodec_test_fixture_config_unittest.cc

@@ -12,7 +12,6 @@
 
 #include "api/test/videocodec_test_fixture.h"
 #include "api/video_codecs/video_codec.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "test/gmock.h"
 #include "test/gtest.h"
 #include "test/video_codec_settings.h"

modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc

@@ -26,7 +26,6 @@
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_decoder.h"
 #include "api/video_codecs/video_encoder_config.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/h264/h264_common.h"
 #include "media/base/h264_profile_level_id.h"
 #include "media/base/media_constants.h"

modules/video_coding/codecs/test/videocodec_test_fixture_impl.h

@@ -18,7 +18,6 @@
 #include "api/test/videocodec_test_fixture.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/h264/h264_common.h"
 #include "modules/video_coding/codecs/test/videocodec_test_stats_impl.h"
 #include "modules/video_coding/codecs/test/videoprocessor.h"

modules/video_coding/codecs/test/videocodec_test_mediacodec.cc

@@ -14,7 +14,6 @@
 
 #include "absl/memory/memory.h"
 #include "api/test/create_videocodec_test_fixture.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "media/base/media_constants.h"
 #include "modules/video_coding/codecs/test/android_codec_factory_helper.h"
 #include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h"

modules/video_coding/codecs/test/videoprocessor.cc

@@ -24,7 +24,6 @@
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_rotation.h"
 #include "api/video_codecs/video_codec.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/h264/h264_common.h"
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"

modules/video_coding/codecs/test/videoprocessor.h

@@ -29,7 +29,6 @@
 #include "api/video/video_frame.h"
 #include "api/video_codecs/video_decoder.h"
 #include "api/video_codecs/video_encoder.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/include/module_common_types.h"
 #include "modules/video_coding/codecs/test/videocodec_test_stats_impl.h"
 #include "modules/video_coding/include/video_codec_interface.h"

modules/video_coding/codecs/vp8/default_temporal_layers_unittest.cc

@@ -16,7 +16,6 @@
 #include "api/video/video_bitrate_allocation.h"
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/vp8_frame_config.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/utility/simulcast_rate_allocator.h"

modules/video_coding/codecs/vp8/libvpx_vp8_decoder.cc

@@ -20,7 +20,6 @@
 #include "api/video/video_frame.h"
 #include "api/video/video_frame_buffer.h"
 #include "api/video/video_rotation.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h"
 #include "modules/video_coding/include/video_error_codes.h"

modules/video_coding/codecs/vp8/libvpx_vp8_decoder.h

@@ -15,7 +15,6 @@
 
 #include "api/video/encoded_image.h"
 #include "api/video_codecs/video_decoder.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/include/i420_buffer_pool.h"
 #include "modules/include/module_common_types.h"
 #include "modules/video_coding/codecs/vp8/include/vp8.h"

modules/video_coding/codecs/vp8/libvpx_vp8_encoder.h

@@ -20,7 +20,6 @@
 #include "api/video_codecs/video_encoder.h"
 #include "api/video_codecs/vp8_frame_buffer_controller.h"
 #include "api/video_codecs/vp8_frame_config.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/vp8/include/vp8.h"
 #include "modules/video_coding/codecs/vp8/libvpx_interface.h"
 #include "modules/video_coding/include/video_codec_interface.h"

modules/video_coding/codecs/vp9/svc_rate_allocator.cc

@@ -15,7 +15,6 @@
 #include <cstddef>
 #include <numeric>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/checks.h"
 
 namespace webrtc {

modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc

@@ -10,7 +10,6 @@
 
 #include <algorithm>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/vp9/svc_config.h"
 #include "modules/video_coding/codecs/vp9/svc_rate_allocator.h"
 #include "rtc_base/checks.h"

modules/video_coding/decoding_state_unittest.cc

@@ -9,7 +9,6 @@
  */
 
 #include "modules/video_coding/decoding_state.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/source/rtp_video_header.h"
 #include "modules/video_coding/codecs/interface/common_constants.h"
 #include "modules/video_coding/codecs/vp8/include/vp8_globals.h"

modules/video_coding/encoded_frame.h

@@ -14,7 +14,6 @@
 #include <vector>
 
 #include "api/video/encoded_image.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/include/module_common_types.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_coding_defines.h"

modules/video_coding/fec_controller_default.h

@@ -17,7 +17,6 @@
 #include <vector>
 
 #include "api/fec_controller.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/media_opt_util.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/critical_section.h"

modules/video_coding/frame_buffer.h

@@ -15,7 +15,6 @@
 #include <stdint.h>
 #include <vector>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/h264/include/h264_globals.h"
 #include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
 #include "modules/video_coding/encoded_frame.h"

modules/video_coding/frame_buffer2.cc

@@ -19,7 +19,6 @@
 
 #include "api/video/encoded_image.h"
 #include "api/video/video_timing.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "modules/video_coding/jitter_estimator.h"
 #include "modules/video_coding/timing.h"

modules/video_coding/frame_object.h

@@ -13,7 +13,6 @@
 
 #include "absl/types/optional.h"
 #include "api/video/encoded_frame.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h"
 

modules/video_coding/h264_sps_pps_tracker_unittest.cc

@@ -14,7 +14,6 @@
 #include <vector>
 
 #include "absl/types/variant.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/h264/h264_common.h"
 #include "modules/rtp_rtcp/source/rtp_video_header.h"
 #include "modules/video_coding/codecs/h264/include/h264_globals.h"

modules/video_coding/include/video_codec_interface.h

@@ -17,7 +17,6 @@
 #include "api/video/video_frame.h"
 #include "api/video_codecs/video_decoder.h"
 #include "api/video_codecs/video_encoder.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/generic_frame_descriptor/generic_frame_info.h"
 #include "modules/include/module_common_types.h"
 #include "modules/video_coding/include/video_error_codes.h"

modules/video_coding/include/video_coding_defines.h

@@ -18,7 +18,6 @@
 #include "api/video/video_content_type.h"
 #include "api/video/video_frame.h"
 #include "api/video/video_timing.h"
-#include "common_types.h"  // NOLINT(build/include)
 
 namespace webrtc {
 

modules/video_coding/packet_buffer.cc

@@ -17,7 +17,6 @@
 
 #include "absl/types/variant.h"
 #include "api/video/encoded_frame.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/h264/h264_common.h"
 #include "modules/rtp_rtcp/source/rtp_video_header.h"
 #include "modules/video_coding/codecs/h264/include/h264_globals.h"

modules/video_coding/receiver.cc

@@ -18,7 +18,6 @@
 
 #include "absl/memory/memory.h"
 #include "api/video/encoded_image.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/encoded_frame.h"
 #include "modules/video_coding/internal_defines.h"
 #include "modules/video_coding/jitter_buffer_common.h"

modules/video_coding/receiver_unittest.cc

@@ -13,7 +13,6 @@
 #include <queue>
 #include <vector>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/encoded_frame.h"
 #include "modules/video_coding/jitter_buffer_common.h"
 #include "modules/video_coding/packet.h"

modules/video_coding/session_info.h

@@ -16,7 +16,6 @@
 #include <list>
 #include <vector>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/h264/include/h264_globals.h"
 #include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
 #include "modules/video_coding/include/video_coding.h"

modules/video_coding/test/stream_generator.h

@@ -13,7 +13,6 @@
 #include <stdint.h>
 #include <list>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/packet.h"
 #include "rtc_base/constructor_magic.h"
 

modules/video_coding/utility/default_video_bitrate_allocator_unittest.cc

@@ -11,7 +11,6 @@
 #include <limits>
 #include <memory>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/utility/default_video_bitrate_allocator.h"
 #include "test/gtest.h"
 

modules/video_coding/utility/ivf_file_writer.h

@@ -16,7 +16,6 @@
 #include <memory>
 
 #include "api/video/encoded_image.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/system/file_wrapper.h"
 #include "rtc_base/time_utils.h"

modules/video_coding/utility/simulcast_rate_allocator.cc

@@ -18,7 +18,6 @@
 #include <tuple>
 #include <vector>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/checks.h"
 #include "rtc_base/experiments/rate_control_settings.h"
 #include "system_wrappers/include/field_trial.h"

modules/video_coding/utility/simulcast_test_fixture_impl.h

@@ -21,7 +21,6 @@
 #include "api/video/video_frame.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/utility/simulcast_rate_allocator.h"
 
 namespace webrtc {

modules/video_coding/utility/simulcast_utility.cc

@@ -12,7 +12,6 @@
 
 #include <cmath>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/utility/simulcast_utility.h"
 #include "rtc_base/checks.h"
 

modules/video_coding/video_codec_initializer.cc

@@ -18,7 +18,6 @@
 #include "api/scoped_refptr.h"
 #include "api/video/video_bitrate_allocation.h"
 #include "api/video_codecs/video_encoder.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/vp9/svc_config.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "rtc_base/checks.h"

modules/video_coding/video_codec_initializer_unittest.cc

@@ -23,7 +23,6 @@
 #include "api/video_codecs/video_encoder.h"
 #include "api/video_codecs/vp8_temporal_layers.h"
 #include "api/video_codecs/vp8_temporal_layers_factory.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/ref_counted_object.h"

modules/video_coding/video_coding_impl.cc

@@ -14,7 +14,6 @@
 #include <memory>
 
 #include "api/video/encoded_image.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/timing.h"
 #include "rtc_base/critical_section.h"

modules/video_coding/video_receiver.cc

@@ -15,7 +15,6 @@
 #include "api/rtp_headers.h"
 #include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_decoder.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/include/module_common_types.h"
 #include "modules/utility/include/process_thread.h"
 #include "modules/video_coding/decoder_database.h"

p2p/BUILD.gn

@@ -240,7 +240,6 @@ rtc_static_library("libstunprober") {
 
   deps = [
     ":rtc_p2p",
-    "..:webrtc_common",
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base/system:rtc_export",

pc/BUILD.gn

@@ -72,7 +72,6 @@ rtc_static_library("rtc_pc_base") {
   ]
 
   deps = [
-    "..:webrtc_common",
     "../api:array_view",
     "../api:audio_options_api",
     "../api:call_api",
@@ -192,7 +191,6 @@ rtc_static_library("peerconnection") {
 
   deps = [
     ":rtc_pc_base",
-    "..:webrtc_common",
     "../api:array_view",
     "../api:audio_options_api",
     "../api:call_api",
@@ -398,7 +396,6 @@ if (rtc_include_tests) {
       ":libjingle_peerconnection",
       ":peerconnection",
       ":rtc_pc_base",
-      "..:webrtc_common",
       "../api:audio_options_api",
       "../api:create_peerconnection_factory",
       "../api:libjingle_peerconnection_api",
@@ -522,7 +519,6 @@ if (rtc_include_tests) {
     deps += [
       ":libjingle_peerconnection",
       ":pc_test_utils",
-      "..:webrtc_common",
       "../api:callfactory_api",
       "../api:fake_media_transport",
       "../api:rtc_stats_api",

pc/test/fake_audio_capture_module.h

@@ -23,7 +23,6 @@
 #include <memory>
 
 #include "api/scoped_refptr.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_device/include/audio_device.h"
 #include "rtc_base/critical_section.h"
 #include "rtc_base/message_handler.h"

rtc_base/BUILD.gn

@@ -782,7 +782,6 @@ rtc_static_library("rtc_base") {
   deps = [
     ":checks",
     ":stringutils",
-    "..:webrtc_common",
     "../api:array_view",
     "../api:scoped_refptr",
     "../system_wrappers:field_trial",

rtc_base/system/BUILD.gn

@@ -38,7 +38,6 @@ rtc_source_set("file_wrapper") {
   deps = [
     "..:checks",
     "..:criticalsection",
-    "../..:webrtc_common",
   ]
 }
 

rtc_tools/BUILD.gn

@@ -255,7 +255,6 @@ if (!build_with_chromium) {
     ]
 
     deps = [
-      "..:webrtc_common",
       "../common_video",
     ]
   }
@@ -298,7 +297,6 @@ if (!build_with_chromium) {
       defines = [ "ENABLE_RTC_EVENT_LOG" ]
       deps = [
         ":chart_proto",
-        "../:webrtc_common",
         "../api:function_view",
 
         # TODO(kwiberg): Remove this dependency.
@@ -415,7 +413,6 @@ if (rtc_include_tests) {
       ":video_file_reader",
       ":video_file_writer",
       ":video_quality_analysis",
-      "../:webrtc_common",
       "../api:scoped_refptr",
       "../api/video:video_frame",
       "../api/video:video_frame_i420",
@@ -475,7 +472,6 @@ if (rtc_include_tests) {
       ]
 
       deps = [
-        "..:webrtc_common",
         "../common_audio",
         "../modules/audio_processing",
         "../modules/audio_processing:audioproc_debug_proto",

rtc_tools/event_log_visualizer/analyzer.cc

@@ -27,7 +27,6 @@
 #include "call/call.h"
 #include "call/video_receive_stream.h"
 #include "call/video_send_stream.h"
-#include "common_types.h"  // NOLINT(build/include)
 #include "logging/rtc_event_log/rtc_stream_config.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
 #include "modules/audio_coding/neteq/tools/audio_sink.h"

rtc_tools/frame_editing/frame_editing_lib.cc

@@ -13,7 +13,6 @@
 #include <memory>
 #include <string>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "rtc_tools/frame_editing/frame_editing_lib.h"
 

rtc_tools/frame_editing/frame_editing_unittest.cc

@@ -14,7 +14,6 @@
 #include <memory>
 #include <string>
 
-#include "common_types.h"  // NOLINT(build/include)
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 #include "rtc_tools/frame_editing/frame_editing_lib.h"
 #include "test/gtest.h"