Apply include-cleaner to call/
Bug: webrtc:42226242
Change-Id: I41a9d52286d2b42c78fca3e4fde71d4e6345bc75
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/380900
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44109}
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 09cd9eb..23952c8 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -55,7 +55,6 @@
"../api:transport_api",
"../api/adaptation:resource_adaptation_api",
"../api/audio:audio_device",
- "../api/audio:audio_frame_processor",
"../api/audio:audio_mixer_api",
"../api/audio:audio_processing",
"../api/audio:audio_processing_statistics",
@@ -72,15 +71,11 @@
"../api/units:time_delta",
"../api/units:timestamp",
"../modules/async_audio_processing",
- "../modules/audio_device",
- "../modules/audio_processing",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:audio_format_to_string",
"../rtc_base:checks",
"../rtc_base:copy_on_write_buffer",
- "../rtc_base:network_route",
- "../rtc_base:refcount",
"../rtc_base:stringutils",
"../rtc_base/network:sent_packet",
"../video/config:encoder_config",
@@ -150,7 +145,6 @@
deps = [
":rtp_interfaces",
"../api:array_view",
- "../api:rtp_headers",
"../api:sequence_checker",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
@@ -184,7 +178,6 @@
"../api:fec_controller_api",
"../api:field_trials_view",
"../api:frame_transformer_interface",
- "../api:network_state_predictor_api",
"../api:rtp_headers",
"../api:rtp_packet_sender",
"../api:rtp_parameters",
@@ -194,11 +187,10 @@
"../api/crypto:options",
"../api/environment",
"../api/rtc_event_log",
+ "../api/task_queue",
"../api/task_queue:pending_task_safety_flag",
- "../api/task_queue:task_queue",
"../api/transport:bandwidth_estimation_settings",
"../api/transport:bitrate_settings",
- "../api/transport:field_trial_based_config",
"../api/transport:goog_cc",
"../api/transport:network_control",
"../api/transport/rtp:dependency_descriptor",
@@ -220,7 +212,6 @@
"../common_video/generic_frame_descriptor",
"../logging:rtc_event_bwe",
"../modules:module_fec_api",
- "../modules/congestion_controller",
"../modules/congestion_controller/rtp:control_handler",
"../modules/congestion_controller/rtp:transport_feedback",
"../modules/pacing",
@@ -236,7 +227,6 @@
"../rtc_base:logging",
"../rtc_base:macromagic",
"../rtc_base:network_route",
- "../rtc_base:race_checker",
"../rtc_base:random",
"../rtc_base:rate_limiter",
"../rtc_base:safe_conversions",
@@ -261,10 +251,6 @@
"rtp_bitrate_configurator.h",
]
deps = [
- ":rtp_interfaces",
-
- # For api/bitrate_constraints.h
- "../api:libjingle_peerconnection_api",
"../api/transport:bitrate_settings",
"../api/units:data_rate",
"../rtc_base:checks",
@@ -290,8 +276,6 @@
"../rtc_base:safe_minmax",
"../rtc_base/experiments:field_trial_parser",
"../rtc_base/system:no_unique_address",
- "../system_wrappers",
- "../system_wrappers:field_trial",
"../system_wrappers:metrics",
"//third_party/abseil-cpp/absl/algorithm:container",
]
@@ -309,15 +293,12 @@
deps = [
":bitrate_allocator",
":call_interfaces",
- ":fake_network",
- ":payload_type",
":payload_type",
":payload_type_picker",
":receive_stream_interface",
":rtp_interfaces",
":rtp_receiver",
":rtp_sender",
- ":simulated_network",
":version",
":video_receive_stream_api",
":video_send_stream_api",
@@ -329,8 +310,6 @@
"../api:rtp_parameters",
"../api:scoped_refptr",
"../api:sequence_checker",
- "../api:simulated_network_api",
- "../api:transport_api",
"../api/adaptation:resource_adaptation_api",
"../api/environment",
"../api/rtc_event_log",
@@ -342,7 +321,6 @@
"../api/units:data_size",
"../api/units:time_delta",
"../api/units:timestamp",
- "../api/video_codecs:video_codecs_api",
"../audio",
"../logging:rtc_event_audio",
"../logging:rtc_event_rtp_rtcp",
@@ -350,7 +328,6 @@
"../logging:rtc_stream_config",
"../media:codec",
"../modules/congestion_controller",
- "../modules/pacing",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../modules/video_coding",
@@ -360,8 +337,6 @@
"../rtc_base:event_tracer",
"../rtc_base:logging",
"../rtc_base:macromagic",
- "../rtc_base:rate_limiter",
- "../rtc_base:rtc_event",
"../rtc_base:safe_minmax",
"../rtc_base:stringutils",
"../rtc_base:threading",
@@ -371,9 +346,7 @@
"../rtc_base/system:no_unique_address",
"../rtc_base/task_utils:repeating_task",
"../system_wrappers",
- "../system_wrappers:field_trial",
"../system_wrappers:metrics",
- "../test/network:simulated_network",
"../video",
"../video:decode_synchronizer",
"../video/config:encoder_config",
@@ -397,7 +370,6 @@
"../rtc_base:checks",
"../rtc_base:logging",
"../rtc_base:stringutils",
- "../rtc_base:strong_alias",
"//third_party/abseil-cpp/absl/strings",
]
}
@@ -416,11 +388,9 @@
deps = [
"../api:frame_transformer_interface",
"../api:rtp_headers",
- "../api:rtp_parameters",
"../api:scoped_refptr",
"../api/crypto:frame_decryptor_interface",
"../api/transport/rtp:rtp_source",
- "../modules/rtp_rtcp:rtp_rtcp_format",
]
}
@@ -467,6 +437,7 @@
"../api/crypto:frame_decryptor_interface",
"../api/crypto:options",
"../api/units:time_delta",
+ "../api/units:timestamp",
"../api/video:recordable_encoded_frame",
"../api/video:video_frame",
"../api/video:video_rtp_headers",
@@ -485,10 +456,7 @@
rtc_source_set("simulated_packet_receiver") {
sources = [ "simulated_packet_receiver.h" ]
- deps = [
- ":call_interfaces",
- "../api:simulated_network_api",
- ]
+ deps = [ ":call_interfaces" ]
}
rtc_library("fake_network") {
@@ -497,11 +465,9 @@
"fake_network_pipe.h",
]
deps = [
- ":call_interfaces",
":simulated_packet_receiver",
"../api:array_view",
"../api:rtp_parameters",
- "../api:sequence_checker",
"../api:simulated_network_api",
"../api:transport_api",
"../api/units:timestamp",
@@ -512,7 +478,6 @@
"../rtc_base:macromagic",
"../rtc_base/synchronization:mutex",
"../system_wrappers",
- "../test/network:simulated_network",
]
}
@@ -545,7 +510,6 @@
":rtp_interfaces",
":rtp_receiver",
":rtp_sender",
- ":simulated_network",
":video_receive_stream_api",
":video_send_stream_api",
"../api:array_view",
@@ -561,7 +525,6 @@
"../api:simulated_network_api",
"../api:transport_api",
"../api/adaptation:resource_adaptation_api",
- "../api/audio_codecs:builtin_audio_decoder_factory",
"../api/crypto:options",
"../api/environment",
"../api/environment:environment_factory",
@@ -588,11 +551,7 @@
"../media:codec",
"../media:media_constants",
"../modules/audio_device:mock_audio_device",
- "../modules/audio_mixer",
- "../modules/audio_mixer:audio_mixer_impl",
"../modules/audio_processing:mocks",
- "../modules/congestion_controller",
- "../modules/pacing",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:mock_rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
@@ -612,13 +571,10 @@
"../rtc_base:threading",
"../rtc_base:timeutils",
"../rtc_base/synchronization:mutex",
- "../system_wrappers",
"../test:audio_codec_mocks",
- "../test:direct_transport",
"../test:encoder_settings",
"../test:explicit_key_value_config",
"../test:fake_video_codecs",
- "../test:field_trial",
"../test:frame_generator_capturer",
"../test:mock_transport",
"../test:run_loop",
@@ -627,14 +583,12 @@
"../test:test_support",
"../test:video_test_constants",
"../test/scenario",
- "../test/time_controller:time_controller",
+ "../test/time_controller",
"../video",
"../video/config:encoder_config",
"adaptation:resource_adaptation_test_utilities",
- "//testing/gmock",
- "//testing/gtest",
"//third_party/abseil-cpp/absl/container:inlined_vector",
- "//third_party/abseil-cpp/absl/functional:any_invocable",
+ "//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/strings:string_view",
"//third_party/abseil-cpp/absl/types:variant",
]
@@ -650,7 +604,7 @@
]
deps = [
":call_interfaces",
- ":simulated_network",
+ ":fake_network",
":video_receive_stream_api",
":video_send_stream_api",
"../api:array_view",
@@ -662,7 +616,6 @@
"../api:sequence_checker",
"../api:simulated_network_api",
"../api/audio:audio_device",
- "../api/audio:audio_processing",
"../api/audio:builtin_audio_processing_builder",
"../api/audio_codecs:builtin_audio_encoder_factory",
"../api/environment",
@@ -685,41 +638,28 @@
"../api/video_codecs:video_codecs_api",
"../media:rtc_internal_video_codecs",
"../media:rtc_simulcast_encoder_adapter",
- "../modules/audio_coding",
- "../modules/audio_device",
"../modules/audio_device:test_audio_device_module",
"../modules/audio_mixer:audio_mixer_impl",
- "../modules/rtp_rtcp",
- "../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
"../rtc_base:logging",
- "../rtc_base:macromagic",
- "../rtc_base:platform_thread",
"../rtc_base:rtc_event",
"../rtc_base:stringutils",
"../rtc_base:task_queue_for_test",
"../rtc_base:threading",
- "../rtc_base:timeutils",
- "../rtc_base/synchronization:mutex",
"../rtc_base/task_utils:repeating_task",
- "../system_wrappers",
"../system_wrappers:metrics",
- "../test:direct_transport",
"../test:encoder_settings",
"../test:fake_video_codecs",
"../test:field_trial",
"../test:fileutils",
"../test:frame_generator_capturer",
- "../test:null_transport",
"../test:test_common",
"../test:test_flags",
"../test:test_support",
"../test:video_test_common",
"../test:video_test_constants",
"../test/network:simulated_network",
- "../video",
"../video/config:encoder_config",
- "//testing/gtest",
"//third_party/abseil-cpp/absl/flags:flag",
"//third_party/abseil-cpp/absl/strings:string_view",
]
@@ -738,10 +678,7 @@
":rtp_interfaces",
"../api:fec_controller_api",
"../api:frame_transformer_interface",
- "../api:libjingle_peerconnection_api",
"../api:scoped_refptr",
- "../api/crypto:frame_encryptor_interface",
- "../api/crypto:options",
"../api/transport:bandwidth_estimation_settings",
"../api/transport:bitrate_settings",
"../api/transport:network_control",
@@ -750,7 +687,6 @@
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:network_route",
- "../rtc_base:rate_limiter",
"../rtc_base/network:sent_packet",
"../test:test_support",
"//third_party/abseil-cpp/absl/strings:string_view",
@@ -774,7 +710,15 @@
]
deps = [
":call_interfaces",
+ "../api:frame_transformer_interface",
+ "../api:rtp_headers",
+ "../api:rtp_sender_interface",
+ "../api:scoped_refptr",
+ "../api/audio:audio_frame_api",
"../api/audio:audio_mixer_api",
+ "../api/audio_codecs:audio_codecs_api",
+ "../api/crypto:frame_decryptor_interface",
+ "../api/transport/rtp:rtp_source",
"../test:test_support",
]
}
@@ -806,7 +750,6 @@
"../system_wrappers",
"../test:test_support",
"../test/network:simulated_network",
- "//testing/gtest",
]
}
}
diff --git a/call/adaptation/BUILD.gn b/call/adaptation/BUILD.gn
index fdae669..f099375 100644
--- a/call/adaptation/BUILD.gn
+++ b/call/adaptation/BUILD.gn
@@ -34,21 +34,19 @@
deps = [
"../../api:field_trials_view",
"../../api:make_ref_counted",
+ "../../api:ref_count",
"../../api:rtp_parameters",
"../../api:scoped_refptr",
"../../api:sequence_checker",
"../../api/adaptation:resource_adaptation_api",
- "../../api/task_queue:task_queue",
+ "../../api/task_queue",
"../../api/video:video_adaptation",
"../../api/video:video_frame",
- "../../api/video:video_stream_encoder",
"../../api/video_codecs:video_codecs_api",
- "../../modules/video_coding:video_coding_utility",
"../../modules/video_coding/svc:scalability_mode_util",
"../../rtc_base:checks",
"../../rtc_base:logging",
"../../rtc_base:macromagic",
- "../../rtc_base:refcount",
"../../rtc_base:safe_conversions",
"../../rtc_base:stringutils",
"../../rtc_base/experiments:balanced_degradation_settings",
@@ -82,21 +80,16 @@
"../../api:scoped_refptr",
"../../api:sequence_checker",
"../../api/adaptation:resource_adaptation_api",
- "../../api/task_queue:default_task_queue_factory",
- "../../api/task_queue:task_queue",
"../../api/units:time_delta",
"../../api/video:video_adaptation",
+ "../../api/video:video_frame",
"../../api/video_codecs:video_codecs_api",
"../../rtc_base:checks",
- "../../rtc_base:gunit_helpers",
"../../rtc_base:macromagic",
"../../rtc_base:rtc_event",
"../../rtc_base:stringutils",
"../../rtc_base:task_queue_for_test",
"../../rtc_base:threading",
- "../../rtc_base/synchronization:mutex",
- "../../test:field_trial",
- "../../test:rtc_expect_death",
"../../test:scoped_key_value_config",
"../../test:test_support",
"../../test:wait_until",
@@ -122,10 +115,10 @@
":resource_adaptation",
"../../api:make_ref_counted",
"../../api:scoped_refptr",
- "../../api:sequence_checker",
"../../api/adaptation:resource_adaptation_api",
- "../../api/task_queue:task_queue",
- "../../api/video:video_stream_encoder",
+ "../../api/video:video_adaptation",
+ "../../api/video:video_bitrate_allocation",
+ "../../api/video_codecs:video_codecs_api",
"../../test:test_support",
"../../video:video_stream_encoder_interface",
"../../video/config:encoder_config",
diff --git a/call/adaptation/adaptation_constraint.h b/call/adaptation/adaptation_constraint.h
index 9ad6414..e3dad3a 100644
--- a/call/adaptation/adaptation_constraint.h
+++ b/call/adaptation/adaptation_constraint.h
@@ -13,7 +13,6 @@
#include <string>
-#include "api/adaptation/resource.h"
#include "call/adaptation/video_source_restrictions.h"
#include "call/adaptation/video_stream_input_state.h"
diff --git a/call/adaptation/broadcast_resource_listener.cc b/call/adaptation/broadcast_resource_listener.cc
index 28720be..9a29426 100644
--- a/call/adaptation/broadcast_resource_listener.cc
+++ b/call/adaptation/broadcast_resource_listener.cc
@@ -16,9 +16,12 @@
#include <vector>
#include "absl/strings/string_view.h"
+#include "api/adaptation/resource.h"
#include "api/make_ref_counted.h"
+#include "api/scoped_refptr.h"
#include "rtc_base/checks.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
namespace webrtc {
diff --git a/call/adaptation/broadcast_resource_listener.h b/call/adaptation/broadcast_resource_listener.h
index 2c5a5c7..2c11560 100644
--- a/call/adaptation/broadcast_resource_listener.h
+++ b/call/adaptation/broadcast_resource_listener.h
@@ -16,6 +16,7 @@
#include "api/adaptation/resource.h"
#include "api/scoped_refptr.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
namespace webrtc {
diff --git a/call/adaptation/broadcast_resource_listener_unittest.cc b/call/adaptation/broadcast_resource_listener_unittest.cc
index 9cd8050..c7d5f46 100644
--- a/call/adaptation/broadcast_resource_listener_unittest.cc
+++ b/call/adaptation/broadcast_resource_listener_unittest.cc
@@ -10,6 +10,10 @@
#include "call/adaptation/broadcast_resource_listener.h"
+#include <vector>
+
+#include "api/adaptation/resource.h"
+#include "api/scoped_refptr.h"
#include "call/adaptation/test/fake_resource.h"
#include "call/adaptation/test/mock_resource_listener.h"
#include "test/gmock.h"
diff --git a/call/adaptation/encoder_settings.cc b/call/adaptation/encoder_settings.cc
index bfc14d8..171f8a1 100644
--- a/call/adaptation/encoder_settings.cc
+++ b/call/adaptation/encoder_settings.cc
@@ -13,6 +13,11 @@
#include <optional>
#include <utility>
+#include "api/video/video_codec_type.h"
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_encoder.h"
+#include "video/config/video_encoder_config.h"
+
namespace webrtc {
EncoderSettings::EncoderSettings(VideoEncoder::EncoderInfo encoder_info,
diff --git a/call/adaptation/encoder_settings.h b/call/adaptation/encoder_settings.h
index 2d5e9bc..04f0746 100644
--- a/call/adaptation/encoder_settings.h
+++ b/call/adaptation/encoder_settings.h
@@ -13,6 +13,7 @@
#include <optional>
+#include "api/video/video_codec_type.h"
#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
#include "video/config/video_encoder_config.h"
diff --git a/call/adaptation/resource_adaptation_processor.cc b/call/adaptation/resource_adaptation_processor.cc
index c11d196..5784b33 100644
--- a/call/adaptation/resource_adaptation_processor.cc
+++ b/call/adaptation/resource_adaptation_processor.cc
@@ -19,11 +19,19 @@
#include "absl/algorithm/container.h"
#include "absl/strings/string_view.h"
+#include "api/adaptation/resource.h"
+#include "api/make_ref_counted.h"
+#include "api/scoped_refptr.h"
#include "api/sequence_checker.h"
+#include "api/task_queue/task_queue_base.h"
#include "api/video/video_adaptation_counters.h"
+#include "call/adaptation/resource_adaptation_processor_interface.h"
+#include "call/adaptation/video_source_restrictions.h"
#include "call/adaptation/video_stream_adapter.h"
+#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/strings/string_builder.h"
+#include "rtc_base/synchronization/mutex.h"
namespace webrtc {
diff --git a/call/adaptation/resource_adaptation_processor.h b/call/adaptation/resource_adaptation_processor.h
index a4cc1ca..4506292 100644
--- a/call/adaptation/resource_adaptation_processor.h
+++ b/call/adaptation/resource_adaptation_processor.h
@@ -12,25 +12,22 @@
#define CALL_ADAPTATION_RESOURCE_ADAPTATION_PROCESSOR_H_
#include <map>
-#include <memory>
-#include <optional>
#include <string>
#include <utility>
#include <vector>
#include "absl/strings/string_view.h"
#include "api/adaptation/resource.h"
-#include "api/rtp_parameters.h"
+#include "api/ref_count.h"
#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "api/task_queue/task_queue_base.h"
#include "api/video/video_adaptation_counters.h"
-#include "api/video/video_frame.h"
#include "call/adaptation/resource_adaptation_processor_interface.h"
#include "call/adaptation/video_source_restrictions.h"
#include "call/adaptation/video_stream_adapter.h"
-#include "call/adaptation/video_stream_input_state.h"
-#include "call/adaptation/video_stream_input_state_provider.h"
-#include "video/video_stream_encoder_observer.h"
+#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
namespace webrtc {
diff --git a/call/adaptation/resource_adaptation_processor_interface.h b/call/adaptation/resource_adaptation_processor_interface.h
index b5c417a..6446cc9 100644
--- a/call/adaptation/resource_adaptation_processor_interface.h
+++ b/call/adaptation/resource_adaptation_processor_interface.h
@@ -12,18 +12,11 @@
#define CALL_ADAPTATION_RESOURCE_ADAPTATION_PROCESSOR_INTERFACE_H_
#include <map>
-#include <optional>
#include <vector>
#include "api/adaptation/resource.h"
-#include "api/rtp_parameters.h"
#include "api/scoped_refptr.h"
-#include "api/task_queue/task_queue_base.h"
#include "api/video/video_adaptation_counters.h"
-#include "api/video/video_frame.h"
-#include "call/adaptation/adaptation_constraint.h"
-#include "call/adaptation/encoder_settings.h"
-#include "call/adaptation/video_source_restrictions.h"
namespace webrtc {
diff --git a/call/adaptation/resource_unittest.cc b/call/adaptation/resource_unittest.cc
index e806756..ac23362 100644
--- a/call/adaptation/resource_unittest.cc
+++ b/call/adaptation/resource_unittest.cc
@@ -10,7 +10,6 @@
#include "api/adaptation/resource.h"
-#include <memory>
#include "api/scoped_refptr.h"
#include "call/adaptation/test/fake_resource.h"
diff --git a/call/adaptation/test/fake_adaptation_constraint.cc b/call/adaptation/test/fake_adaptation_constraint.cc
index 2a03935..acd29e9 100644
--- a/call/adaptation/test/fake_adaptation_constraint.cc
+++ b/call/adaptation/test/fake_adaptation_constraint.cc
@@ -11,9 +11,10 @@
#include "call/adaptation/test/fake_adaptation_constraint.h"
#include <string>
-#include <utility>
#include "absl/strings/string_view.h"
+#include "call/adaptation/video_source_restrictions.h"
+#include "call/adaptation/video_stream_input_state.h"
namespace webrtc {
diff --git a/call/adaptation/test/fake_adaptation_constraint.h b/call/adaptation/test/fake_adaptation_constraint.h
index 5c68433..31c9110 100644
--- a/call/adaptation/test/fake_adaptation_constraint.h
+++ b/call/adaptation/test/fake_adaptation_constraint.h
@@ -15,6 +15,8 @@
#include "absl/strings/string_view.h"
#include "call/adaptation/adaptation_constraint.h"
+#include "call/adaptation/video_source_restrictions.h"
+#include "call/adaptation/video_stream_input_state.h"
namespace webrtc {
diff --git a/call/adaptation/test/fake_frame_rate_provider.h b/call/adaptation/test/fake_frame_rate_provider.h
index b8815f5..10ec9f0 100644
--- a/call/adaptation/test/fake_frame_rate_provider.h
+++ b/call/adaptation/test/fake_frame_rate_provider.h
@@ -11,10 +11,15 @@
#ifndef CALL_ADAPTATION_TEST_FAKE_FRAME_RATE_PROVIDER_H_
#define CALL_ADAPTATION_TEST_FAKE_FRAME_RATE_PROVIDER_H_
-#include <string>
#include <vector>
+#include "api/video/video_adaptation_counters.h"
+#include "api/video/video_adaptation_reason.h"
+#include "api/video/video_bitrate_allocation.h"
+#include "api/video_codecs/video_codec.h"
+#include "api/video_codecs/video_encoder.h"
#include "test/gmock.h"
+#include "video/config/video_encoder_config.h"
#include "video/video_stream_encoder_observer.h"
namespace webrtc {
diff --git a/call/adaptation/test/fake_resource.cc b/call/adaptation/test/fake_resource.cc
index 6d17691..7a47b79 100644
--- a/call/adaptation/test/fake_resource.cc
+++ b/call/adaptation/test/fake_resource.cc
@@ -10,12 +10,12 @@
#include "call/adaptation/test/fake_resource.h"
-#include <algorithm>
#include <string>
-#include <utility>
#include "absl/strings/string_view.h"
+#include "api/adaptation/resource.h"
#include "api/make_ref_counted.h"
+#include "api/scoped_refptr.h"
namespace webrtc {
diff --git a/call/adaptation/test/fake_resource.h b/call/adaptation/test/fake_resource.h
index 0e02b0c..6284cfa 100644
--- a/call/adaptation/test/fake_resource.h
+++ b/call/adaptation/test/fake_resource.h
@@ -11,9 +11,7 @@
#ifndef CALL_ADAPTATION_TEST_FAKE_RESOURCE_H_
#define CALL_ADAPTATION_TEST_FAKE_RESOURCE_H_
-#include <optional>
#include <string>
-#include <vector>
#include "absl/strings/string_view.h"
#include "api/adaptation/resource.h"
diff --git a/call/adaptation/test/fake_video_stream_input_state_provider.cc b/call/adaptation/test/fake_video_stream_input_state_provider.cc
index ce92dfb..5e69583 100644
--- a/call/adaptation/test/fake_video_stream_input_state_provider.cc
+++ b/call/adaptation/test/fake_video_stream_input_state_provider.cc
@@ -10,6 +10,9 @@
#include "call/adaptation/test/fake_video_stream_input_state_provider.h"
+#include "call/adaptation/video_stream_input_state.h"
+#include "call/adaptation/video_stream_input_state_provider.h"
+
namespace webrtc {
FakeVideoStreamInputStateProvider::FakeVideoStreamInputStateProvider()
diff --git a/call/adaptation/test/fake_video_stream_input_state_provider.h b/call/adaptation/test/fake_video_stream_input_state_provider.h
index 93f7dba..dd207b8 100644
--- a/call/adaptation/test/fake_video_stream_input_state_provider.h
+++ b/call/adaptation/test/fake_video_stream_input_state_provider.h
@@ -11,6 +11,7 @@
#ifndef CALL_ADAPTATION_TEST_FAKE_VIDEO_STREAM_INPUT_STATE_PROVIDER_H_
#define CALL_ADAPTATION_TEST_FAKE_VIDEO_STREAM_INPUT_STATE_PROVIDER_H_
+#include "call/adaptation/video_stream_input_state.h"
#include "call/adaptation/video_stream_input_state_provider.h"
namespace webrtc {
diff --git a/call/adaptation/test/mock_resource_listener.h b/call/adaptation/test/mock_resource_listener.h
index 1c4df31..14c6c17 100644
--- a/call/adaptation/test/mock_resource_listener.h
+++ b/call/adaptation/test/mock_resource_listener.h
@@ -12,6 +12,7 @@
#define CALL_ADAPTATION_TEST_MOCK_RESOURCE_LISTENER_H_
#include "api/adaptation/resource.h"
+#include "api/scoped_refptr.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/call/adaptation/video_source_restrictions.cc b/call/adaptation/video_source_restrictions.cc
index be4e13b..92dfa24 100644
--- a/call/adaptation/video_source_restrictions.cc
+++ b/call/adaptation/video_source_restrictions.cc
@@ -11,6 +11,7 @@
#include "call/adaptation/video_source_restrictions.h"
#include <algorithm>
+#include <cstddef>
#include <limits>
#include <optional>
#include <string>
diff --git a/call/adaptation/video_source_restrictions.h b/call/adaptation/video_source_restrictions.h
index 6e1b6c6..31fb969 100644
--- a/call/adaptation/video_source_restrictions.h
+++ b/call/adaptation/video_source_restrictions.h
@@ -11,9 +11,9 @@
#ifndef CALL_ADAPTATION_VIDEO_SOURCE_RESTRICTIONS_H_
#define CALL_ADAPTATION_VIDEO_SOURCE_RESTRICTIONS_H_
+#include <cstddef>
#include <optional>
#include <string>
-#include <utility>
namespace webrtc {
diff --git a/call/adaptation/video_source_restrictions_unittest.cc b/call/adaptation/video_source_restrictions_unittest.cc
index eaa537c..aac7654 100644
--- a/call/adaptation/video_source_restrictions_unittest.cc
+++ b/call/adaptation/video_source_restrictions_unittest.cc
@@ -10,6 +10,7 @@
#include "call/adaptation/video_source_restrictions.h"
+#include <cstddef>
#include <optional>
#include "test/gtest.h"
diff --git a/call/adaptation/video_stream_adapter.cc b/call/adaptation/video_stream_adapter.cc
index 3eb41ad..134ebec 100644
--- a/call/adaptation/video_stream_adapter.cc
+++ b/call/adaptation/video_stream_adapter.cc
@@ -11,21 +11,30 @@
#include "call/adaptation/video_stream_adapter.h"
#include <algorithm>
+#include <cstddef>
+#include <cstdint>
#include <limits>
#include <optional>
#include <utility>
#include "absl/types/variant.h"
+#include "api/adaptation/resource.h"
+#include "api/field_trials_view.h"
+#include "api/rtp_parameters.h"
+#include "api/scoped_refptr.h"
#include "api/sequence_checker.h"
#include "api/video/video_adaptation_counters.h"
-#include "api/video/video_adaptation_reason.h"
-#include "api/video_codecs/video_encoder.h"
+#include "api/video/video_codec_type.h"
+#include "api/video_codecs/video_codec.h"
+#include "call/adaptation/adaptation_constraint.h"
#include "call/adaptation/video_source_restrictions.h"
#include "call/adaptation/video_stream_input_state.h"
+#include "call/adaptation/video_stream_input_state_provider.h"
#include "modules/video_coding/svc/scalability_mode_util.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
+#include "video/video_stream_encoder_observer.h"
namespace webrtc {
diff --git a/call/adaptation/video_stream_adapter.h b/call/adaptation/video_stream_adapter.h
index bbc546a..d28c24a 100644
--- a/call/adaptation/video_stream_adapter.h
+++ b/call/adaptation/video_stream_adapter.h
@@ -11,22 +11,22 @@
#ifndef CALL_ADAPTATION_VIDEO_STREAM_ADAPTER_H_
#define CALL_ADAPTATION_VIDEO_STREAM_ADAPTER_H_
-#include <memory>
+#include <cstdint>
#include <optional>
-#include <utility>
#include <vector>
#include "absl/types/variant.h"
#include "api/adaptation/resource.h"
#include "api/field_trials_view.h"
#include "api/rtp_parameters.h"
+#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
#include "api/video/video_adaptation_counters.h"
+#include "api/video_codecs/video_codec.h"
#include "call/adaptation/adaptation_constraint.h"
-#include "call/adaptation/degradation_preference_provider.h"
#include "call/adaptation/video_source_restrictions.h"
#include "call/adaptation/video_stream_input_state.h"
#include "call/adaptation/video_stream_input_state_provider.h"
-#include "modules/video_coding/utility/quality_scaler.h"
#include "rtc_base/experiments/balanced_degradation_settings.h"
#include "rtc_base/system/no_unique_address.h"
#include "rtc_base/thread_annotations.h"
diff --git a/call/adaptation/video_stream_adapter_unittest.cc b/call/adaptation/video_stream_adapter_unittest.cc
index 2d0aa97..455c9be 100644
--- a/call/adaptation/video_stream_adapter_unittest.cc
+++ b/call/adaptation/video_stream_adapter_unittest.cc
@@ -10,27 +10,26 @@
#include "call/adaptation/video_stream_adapter.h"
+#include <cstddef>
#include <optional>
#include <string>
-#include <utility>
+#include "api/adaptation/resource.h"
+#include "api/rtp_parameters.h"
#include "api/scoped_refptr.h"
-#include "api/video/video_adaptation_reason.h"
-#include "api/video_codecs/video_codec.h"
+#include "api/video/video_adaptation_counters.h"
#include "api/video_codecs/video_encoder.h"
#include "call/adaptation/adaptation_constraint.h"
-#include "call/adaptation/encoder_settings.h"
#include "call/adaptation/test/fake_frame_rate_provider.h"
#include "call/adaptation/test/fake_resource.h"
#include "call/adaptation/test/fake_video_stream_input_state_provider.h"
#include "call/adaptation/video_source_restrictions.h"
#include "call/adaptation/video_stream_input_state.h"
+#include "rtc_base/checks.h"
#include "rtc_base/string_encode.h"
#include "test/gmock.h"
#include "test/gtest.h"
#include "test/scoped_key_value_config.h"
-#include "test/testsupport/rtc_expect_death.h"
-#include "video/config/video_encoder_config.h"
namespace webrtc {
diff --git a/call/adaptation/video_stream_input_state.cc b/call/adaptation/video_stream_input_state.cc
index df4a6a1..a2a9f11 100644
--- a/call/adaptation/video_stream_input_state.cc
+++ b/call/adaptation/video_stream_input_state.cc
@@ -12,6 +12,7 @@
#include <optional>
+#include "api/video/video_codec_type.h"
#include "api/video_codecs/video_encoder.h"
namespace webrtc {
diff --git a/call/adaptation/video_stream_input_state_provider.cc b/call/adaptation/video_stream_input_state_provider.cc
index 3261af3..1a22038 100644
--- a/call/adaptation/video_stream_input_state_provider.cc
+++ b/call/adaptation/video_stream_input_state_provider.cc
@@ -10,7 +10,12 @@
#include "call/adaptation/video_stream_input_state_provider.h"
+#include "call/adaptation/encoder_settings.h"
#include "call/adaptation/video_stream_adapter.h"
+#include "call/adaptation/video_stream_input_state.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/synchronization/mutex.h"
+#include "video/video_stream_encoder_observer.h"
namespace webrtc {
diff --git a/call/adaptation/video_stream_input_state_provider.h b/call/adaptation/video_stream_input_state_provider.h
index 81996e6..1702c72 100644
--- a/call/adaptation/video_stream_input_state_provider.h
+++ b/call/adaptation/video_stream_input_state_provider.h
@@ -14,6 +14,7 @@
#include "call/adaptation/encoder_settings.h"
#include "call/adaptation/video_stream_input_state.h"
#include "rtc_base/synchronization/mutex.h"
+#include "rtc_base/thread_annotations.h"
#include "video/video_stream_encoder_observer.h"
namespace webrtc {
diff --git a/call/adaptation/video_stream_input_state_provider_unittest.cc b/call/adaptation/video_stream_input_state_provider_unittest.cc
index e9cd72b..b31c54a 100644
--- a/call/adaptation/video_stream_input_state_provider_unittest.cc
+++ b/call/adaptation/video_stream_input_state_provider_unittest.cc
@@ -10,12 +10,17 @@
#include "call/adaptation/video_stream_input_state_provider.h"
+#include <optional>
#include <utility>
+#include "api/video/video_codec_type.h"
+#include "api/video_codecs/video_codec.h"
#include "api/video_codecs/video_encoder.h"
#include "call/adaptation/encoder_settings.h"
#include "call/adaptation/test/fake_frame_rate_provider.h"
+#include "call/adaptation/video_stream_input_state.h"
#include "test/gtest.h"
+#include "video/config/video_encoder_config.h"
namespace webrtc {
diff --git a/call/bitrate_allocator.cc b/call/bitrate_allocator.cc
index aa5f571..517d210 100644
--- a/call/bitrate_allocator.cc
+++ b/call/bitrate_allocator.cc
@@ -18,7 +18,6 @@
#include <map>
#include <optional>
#include <string>
-#include <utility>
#include <vector>
#include "absl/algorithm/container.h"
diff --git a/call/bitrate_estimator_tests.cc b/call/bitrate_estimator_tests.cc
index de5f2ab..fadc0a1 100644
--- a/call/bitrate_estimator_tests.cc
+++ b/call/bitrate_estimator_tests.cc
@@ -15,6 +15,7 @@
#include <string>
#include <vector>
+#include "absl/strings/match.h"
#include "absl/strings/string_view.h"
#include "api/rtp_parameters.h"
#include "api/test/create_frame_generator.h"
diff --git a/call/call_unittest.cc b/call/call_unittest.cc
index a33bad7..644f081 100644
--- a/call/call_unittest.cc
+++ b/call/call_unittest.cc
@@ -29,7 +29,6 @@
#include "api/units/timestamp.h"
#include "api/video/builtin_video_bitrate_allocator_factory.h"
#include "api/video_codecs/sdp_video_format.h"
-#include "audio/audio_receive_stream.h"
#include "audio/audio_send_stream.h"
#include "call/adaptation/test/fake_resource.h"
#include "call/adaptation/test/mock_resource_listener.h"
diff --git a/call/rtp_video_sender.cc b/call/rtp_video_sender.cc
index 5174db6..5294c19 100644
--- a/call/rtp_video_sender.cc
+++ b/call/rtp_video_sender.cc
@@ -22,6 +22,7 @@
#include <vector>
#include "absl/algorithm/container.h"
+#include "absl/base/nullability.h"
#include "absl/strings/match.h"
#include "absl/strings/string_view.h"
#include "api/array_view.h"
@@ -35,6 +36,8 @@
#include "api/rtp_parameters.h"
#include "api/scoped_refptr.h"
#include "api/sequence_checker.h"
+#include "api/task_queue/pending_task_safety_flag.h"
+#include "api/task_queue/task_queue_base.h"
#include "api/transport/rtp/dependency_descriptor.h"
#include "api/units/data_rate.h"
#include "api/units/data_size.h"
diff --git a/call/rtp_video_sender.h b/call/rtp_video_sender.h
index 8965cfb..969b736 100644
--- a/call/rtp_video_sender.h
+++ b/call/rtp_video_sender.h
@@ -15,7 +15,6 @@
#include <cstdint>
#include <map>
#include <memory>
-#include <optional>
#include <vector>
#include "absl/base/nullability.h"
@@ -34,7 +33,6 @@
#include "api/units/data_size.h"
#include "api/units/frequency.h"
#include "api/video/encoded_image.h"
-#include "api/video/video_codec_type.h"
#include "api/video/video_layers_allocation.h"
#include "api/video_codecs/video_encoder.h"
#include "call/rtp_config.h"
diff --git a/call/rtp_video_sender_unittest.cc b/call/rtp_video_sender_unittest.cc
index e413646..2ed9041 100644
--- a/call/rtp_video_sender_unittest.cc
+++ b/call/rtp_video_sender_unittest.cc
@@ -59,6 +59,7 @@
#include "modules/video_coding/fec_controller_default.h"
#include "modules/video_coding/include/video_codec_interface.h"
#include "rtc_base/buffer.h"
+#include "rtc_base/checks.h"
#include "rtc_base/rate_limiter.h"
#include "test/explicit_key_value_config.h"
#include "test/gmock.h"
diff --git a/call/test/mock_audio_receive_stream.h b/call/test/mock_audio_receive_stream.h
index 3613d15..d1b48ba 100644
--- a/call/test/mock_audio_receive_stream.h
+++ b/call/test/mock_audio_receive_stream.h
@@ -11,10 +11,18 @@
#ifndef CALL_TEST_MOCK_AUDIO_RECEIVE_STREAM_H_
#define CALL_TEST_MOCK_AUDIO_RECEIVE_STREAM_H_
+#include <cstdint>
#include <map>
#include <vector>
+#include "api/audio/audio_frame.h"
#include "api/audio/audio_mixer.h"
+#include "api/audio_codecs/audio_format.h"
+#include "api/crypto/frame_decryptor_interface.h"
+#include "api/frame_transformer_interface.h"
+#include "api/rtp_headers.h"
+#include "api/scoped_refptr.h"
+#include "api/transport/rtp/rtp_source.h"
#include "call/audio_receive_stream.h"
#include "test/gmock.h"
diff --git a/call/test/mock_audio_send_stream.h b/call/test/mock_audio_send_stream.h
index 1993de8..d0c3fd8 100644
--- a/call/test/mock_audio_send_stream.h
+++ b/call/test/mock_audio_send_stream.h
@@ -13,6 +13,8 @@
#include <memory>
+#include "api/audio/audio_frame.h"
+#include "api/rtp_sender_interface.h"
#include "call/audio_send_stream.h"
#include "test/gmock.h"
diff --git a/call/test/mock_bitrate_allocator.h b/call/test/mock_bitrate_allocator.h
index b08916f..c97a6f6 100644
--- a/call/test/mock_bitrate_allocator.h
+++ b/call/test/mock_bitrate_allocator.h
@@ -10,7 +10,6 @@
#ifndef CALL_TEST_MOCK_BITRATE_ALLOCATOR_H_
#define CALL_TEST_MOCK_BITRATE_ALLOCATOR_H_
-#include <string>
#include "call/bitrate_allocator.h"
#include "test/gmock.h"
diff --git a/call/video_receive_stream.h b/call/video_receive_stream.h
index f13a006..1508d39 100644
--- a/call/video_receive_stream.h
+++ b/call/video_receive_stream.h
@@ -28,6 +28,7 @@
#include "api/rtp_headers.h"
#include "api/scoped_refptr.h"
#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
#include "api/video/recordable_encoded_frame.h"
#include "api/video/video_content_type.h"
#include "api/video/video_frame.h"
