diff --git a/api/BUILD.gn b/api/BUILD.gn
index 63c1326..419ebc1 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -490,6 +490,8 @@
 
   deps = [
     ":array_view",
+    ":rtc_stats_api",
+    ":scoped_refptr",
     ":stats_observer_interface",
     "../rtc_base:checks",
     "video:encoded_image",
@@ -574,6 +576,7 @@
 
   deps = [
     ":rtc_stats_api",
+    ":scoped_refptr",
     "//third_party/abseil-cpp/absl/strings:string_view",
   ]
 }
@@ -645,6 +648,7 @@
 
   deps = [
     ":scoped_refptr",
+    "../rtc_base:checks",
     "video:video_frame",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
@@ -685,6 +689,7 @@
         "transport:bitrate_settings",
         "transport:network_control",
         "video_codecs:video_codecs_api",
+        "//third_party/abseil-cpp/absl/types:optional",
       ]
     }
 
@@ -769,8 +774,10 @@
     ":create_frame_generator",
     ":frame_generator_api",
     "../rtc_base:checks",
+    "../system_wrappers",
     "../test:fileutils",
     "test/pclf:media_configuration",
+    "units:time_delta",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
@@ -882,19 +889,24 @@
   ]
   deps = [
     ":array_view",
+    ":field_trials_view",
     ":packet_socket_factory",
     ":peer_network_dependencies",
     ":simulated_network_api",
     ":time_controller",
     "..//test/network:simulated_network",
     "../rtc_base:checks",
+    "../rtc_base:ip_address",
     "../rtc_base:network",
     "../rtc_base:network_constants",
+    "../rtc_base:socket_address",
     "../rtc_base:threading",
     "test/network_emulation",
     "units:data_rate",
     "units:data_size",
     "units:timestamp",
+    "//third_party/abseil-cpp/absl/strings:string_view",
+    "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
 
@@ -906,12 +918,14 @@
   ]
 
   deps = [
+    "../rtc_base:socket_server",
     "../rtc_base:threading",
     "../rtc_base/synchronization:yield_policy",
     "../system_wrappers",
     "task_queue",
     "units:time_delta",
     "units:timestamp",
+    "//third_party/abseil-cpp/absl/strings:string_view",
   ]
 }
 
@@ -1017,6 +1031,7 @@
       ]
 
       deps = [
+        ":scoped_refptr",
         "../modules/audio_processing",
         "../modules/audio_processing:audioproc_f_impl",
         "audio:audio_processing",
@@ -1085,8 +1100,12 @@
     sources = [ "test/videocodec_test_fixture.h" ]
     deps = [
       ":videocodec_test_stats_api",
+      "../modules/video_coding:codec_globals_headers",
       "../modules/video_coding:video_codec_interface",
+      "video:encoded_image",
+      "video:video_frame",
       "video_codecs:video_codecs_api",
+      "//third_party/abseil-cpp/absl/types:optional",
     ]
   }
 
@@ -1112,6 +1131,7 @@
 
     deps = [
       "../test:test_support",
+      "audio:audio_frame_api",
       "audio:audio_mixer_api",
     ]
   }
@@ -1136,7 +1156,12 @@
     deps = [
       ":libjingle_peerconnection_api",
       ":priority",
+      ":rtc_error",
+      ":scoped_refptr",
+      "../rtc_base:refcount",
       "../test:test_support",
+      "//third_party/abseil-cpp/absl/functional:any_invocable",
+      "//third_party/abseil-cpp/absl/types:optional",
     ]
   }
 
@@ -1148,6 +1173,9 @@
     deps = [
       ":dtmf_sender_interface",
       ":libjingle_peerconnection_api",
+      ":make_ref_counted",
+      ":scoped_refptr",
+      "../rtc_base:refcount",
       "../test:test_support",
     ]
   }
@@ -1167,6 +1195,9 @@
     testonly = true
     sources = [ "test/mock_frame_encryptor.h" ]
     deps = [
+      ":array_view",
+      ":rtp_parameters",
+
       # For api/crypto/frame_encryptor_interface.h
       ":libjingle_peerconnection_api",
       "../test:test_support",
@@ -1179,7 +1210,9 @@
     testonly = true
     sources = [ "test/mock_frame_decryptor.h" ]
     deps = [
+      ":array_view",
       ":libjingle_peerconnection_api",
+      ":rtp_parameters",
       "../test:test_support",
       "crypto:frame_decryptor_interface",
     ]
@@ -1191,6 +1224,7 @@
     sources = [ "test/mock_frame_transformer.h" ]
     deps = [
       ":frame_transformer_interface",
+      ":scoped_refptr",
       "../test:test_support",
     ]
   }
@@ -1203,6 +1237,9 @@
       ":libjingle_peerconnection_api",
       "../api/video_codecs:video_codecs_api",
       "../test:test_support",
+      "units:data_rate",
+      "video:render_resolution",
+      "//third_party/abseil-cpp/absl/types:optional",
     ]
   }
 
@@ -1248,7 +1285,10 @@
     sources = [ "test/mock_media_stream_interface.h" ]
 
     deps = [
+      ":audio_options_api",
       ":media_stream_interface",
+      ":scoped_refptr",
+      "../rtc_base:refcount",
       "../test:test_support",
     ]
   }
@@ -1259,7 +1299,10 @@
     sources = [ "test/mock_packet_socket_factory.h" ]
 
     deps = [
+      ":async_dns_resolver",
       ":packet_socket_factory",
+      "../rtc_base:async_packet_socket",
+      "../rtc_base:socket_address",
       "../test:test_support",
     ]
   }
@@ -1270,11 +1313,24 @@
     sources = [ "test/mock_peerconnectioninterface.h" ]
 
     deps = [
+      ":candidate",
+      ":dtls_transport_interface",
+      ":libjingle_logging_api",
       ":libjingle_peerconnection_api",
+      ":make_ref_counted",
+      ":media_stream_interface",
       ":ref_count",
+      ":rtc_error",
+      ":rtc_stats_api",
+      ":rtp_parameters",
       "../api:scoped_refptr",
       "../rtc_base:refcount",
       "../test:test_support",
+      "adaptation:resource_adaptation_api",
+      "transport:bandwidth_estimation_settings",
+      "transport:bitrate_settings",
+      "transport:network_control",
+      "//third_party/abseil-cpp/absl/types:optional",
     ]
   }
 
@@ -1284,8 +1340,17 @@
     sources = [ "test/mock_peer_connection_factory_interface.h" ]
 
     deps = [
+      ":audio_options_api",
       ":libjingle_peerconnection_api",
+      ":media_stream_interface",
+      ":rtc_error",
+      ":rtp_parameters",
+      ":scoped_refptr",
+      "../p2p:rtc_p2p",
+      "../rtc_base:refcount",
+      "../rtc_base:rtc_certificate_generator",
       "../test:test_support",
+      "//third_party/abseil-cpp/absl/strings:string_view",
     ]
   }
 
@@ -1317,7 +1382,9 @@
     sources = [ "test/mock_async_dns_resolver.h" ]
     deps = [
       ":async_dns_resolver",
+      "../rtc_base:socket_address",
       "../test:test_support",
+      "//third_party/abseil-cpp/absl/functional:any_invocable",
     ]
   }
 
@@ -1331,10 +1398,24 @@
     ]
 
     deps = [
+      ":array_view",
+      ":dtls_transport_interface",
+      ":frame_transformer_interface",
       ":libjingle_peerconnection_api",
+      ":make_ref_counted",
+      ":media_stream_interface",
+      ":rtc_error",
+      ":rtp_parameters",
       ":rtp_sender_interface",
+      ":rtp_transceiver_direction",
+      ":scoped_refptr",
       "../api/crypto:frame_decryptor_interface",
+      "../rtc_base:refcount",
       "../test:test_support",
+      "crypto:frame_encryptor_interface",
+      "transport/rtp:rtp_source",
+      "video_codecs:video_codecs_api",
+      "//third_party/abseil-cpp/absl/types:optional",
     ]
   }
 
@@ -1344,9 +1425,11 @@
     sources = [ "test/mock_transformable_audio_frame.h" ]
 
     deps = [
+      ":array_view",
       ":frame_transformer_interface",
       "../api/units:timestamp",
       "../test:test_support",
+      "//third_party/abseil-cpp/absl/types:optional",
     ]
   }
 
@@ -1356,8 +1439,12 @@
     sources = [ "test/mock_transformable_video_frame.h" ]
 
     deps = [
+      ":array_view",
       ":frame_transformer_interface",
       "../test:test_support",
+      "units:timestamp",
+      "video:video_frame_metadata",
+      "//third_party/abseil-cpp/absl/types:optional",
     ]
   }
 
@@ -1369,6 +1456,7 @@
     deps = [
       "../api/video:video_bitrate_allocator",
       "../test:test_support",
+      "video:video_bitrate_allocation",
     ]
   }
 
@@ -1380,6 +1468,9 @@
     deps = [
       "../api/video:video_bitrate_allocator_factory",
       "../test:test_support",
+      "environment",
+      "video:video_bitrate_allocator",
+      "video_codecs:video_codecs_api",
     ]
   }
 
@@ -1406,6 +1497,9 @@
     deps = [
       "../api/video_codecs:video_codecs_api",
       "../test:test_support",
+      "video:encoded_image",
+      "video:video_frame",
+      "//third_party/abseil-cpp/absl/types:optional",
     ]
   }
 
@@ -1415,8 +1509,12 @@
     sources = [ "test/mock_video_encoder.h" ]
 
     deps = [
+      ":fec_controller_api",
       "../api/video_codecs:video_codecs_api",
       "../test:test_support",
+      "video:encoded_image",
+      "video:video_frame",
+      "video:video_frame_type",
     ]
   }
 
@@ -1431,6 +1529,7 @@
       "../api:scoped_refptr",
       "../rtc_base:refcount",
       "../test:test_support",
+      "video:video_frame",
     ]
   }
 
@@ -1448,12 +1547,14 @@
       ":time_controller",
       "../call",
       "../call:call_interfaces",
+      "../media:media_engine",
       "../pc:media_factory",
       "../rtc_base:checks",
       "../system_wrappers",
       "../test/time_controller",
       "environment",
       "environment:environment_factory",
+      "units:timestamp",
       "//third_party/abseil-cpp/absl/base:nullability",
     ]
   }
@@ -1508,6 +1609,7 @@
       "../rtc_base/containers:flat_set",
       "../rtc_base/synchronization:sequence_checker_internal",
       "../rtc_base/task_utils:repeating_task",
+      "../system_wrappers",
       "../system_wrappers:field_trial",
       "../test:field_trial",
       "../test:fileutils",
@@ -1523,6 +1625,7 @@
       "units:units_unittests",
       "video:frame_buffer_unittest",
       "video:rtp_video_frame_assembler_unittests",
+      "video:video_frame",
       "video:video_frame_metadata_unittest",
       "//testing/gtest",
       "//third_party/abseil-cpp/absl/functional:any_invocable",
diff --git a/api/test/DEPS b/api/test/DEPS
index 270b274..5506d6c 100644
--- a/api/test/DEPS
+++ b/api/test/DEPS
@@ -5,6 +5,9 @@
   ".*": [
     "+video"
   ],
+  ".*": [
+    "+rtc_base/ref_counted_object.h",
+  ],
   "dummy_peer_connection\.h": [
     "+rtc_base/ref_counted_object.h",
   ],
@@ -15,6 +18,8 @@
     "+rtc_base/thread.h",
     "+rtc_base/network.h",
     "+rtc_base/network_constants.h",
+    "+rtc_base/ip_address.h",
+    "+rtc_base/socket_address.h",
   ],
   "peer_network_dependencies\.h": [
     "+rtc_base/network.h",
@@ -32,8 +37,23 @@
   "time_controller\.h": [
     "+rtc_base/synchronization/yield_policy.h",
     "+system_wrappers/include/clock.h",
+    "+rtc_base/socket_server.h",
   ],
   "create_frame_generator\.h": [
     "+system_wrappers/include/clock.h",
   ],
+  "mock_async_dns_resolver\.h": [
+    "+rtc_base/socket_address.h",
+  ],
+  "mock_packet_socket_factory\.h": [
+    "+rtc_base/async_packet_socket.h",
+    "+rtc_base/socket_address.h",
+  ],
+  "mock_peer_connection_factory_interface\.h": [
+    "+p2p/base/port_allocator.h",
+    "+rtc_base/rtc_certificate_generator.h",
+  ],
+  "videocodec_test_fixture\.h": [
+    "+modules/video_coding/codecs/h264/include/h264_globals.h",
+  ],
 }
diff --git a/api/test/audioproc_float.cc b/api/test/audioproc_float.cc
index 2e0f15c..f734b8b 100644
--- a/api/test/audioproc_float.cc
+++ b/api/test/audioproc_float.cc
@@ -10,8 +10,11 @@
 
 #include "api/test/audioproc_float.h"
 
+#include <memory>
 #include <utility>
 
+#include "api/audio/audio_processing.h"
+#include "api/scoped_refptr.h"
 #include "modules/audio_processing/test/audioproc_float_impl.h"
 
 namespace webrtc {
diff --git a/api/test/audioproc_float.h b/api/test/audioproc_float.h
index dbdd934..3c21753 100644
--- a/api/test/audioproc_float.h
+++ b/api/test/audioproc_float.h
@@ -12,9 +12,9 @@
 #define API_TEST_AUDIOPROC_FLOAT_H_
 
 #include <memory>
-#include <vector>
 
 #include "api/audio/audio_processing.h"
+#include "api/scoped_refptr.h"
 
 namespace webrtc {
 namespace test {
diff --git a/api/test/create_frame_generator.cc b/api/test/create_frame_generator.cc
index 10eb1a8..f0d8e05 100644
--- a/api/test/create_frame_generator.cc
+++ b/api/test/create_frame_generator.cc
@@ -10,12 +10,18 @@
 
 #include "api/test/create_frame_generator.h"
 
+#include <cstdint>
 #include <cstdio>
-#include <utility>
+#include <memory>
+#include <string>
+#include <vector>
 
 #include "absl/base/nullability.h"
 #include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
+#include "api/environment/environment.h"
 #include "api/environment/environment_factory.h"
+#include "api/test/frame_generator_interface.h"
 #include "rtc_base/checks.h"
 #include "test/frame_generator.h"
 #include "test/testsupport/ivf_video_frame_generator.h"
diff --git a/api/test/create_frame_generator.h b/api/test/create_frame_generator.h
index 7ed0828..14c88d3 100644
--- a/api/test/create_frame_generator.h
+++ b/api/test/create_frame_generator.h
@@ -11,6 +11,8 @@
 #ifndef API_TEST_CREATE_FRAME_GENERATOR_H_
 #define API_TEST_CREATE_FRAME_GENERATOR_H_
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/api/test/create_network_emulation_manager.cc b/api/test/create_network_emulation_manager.cc
index 36c496f..488481d 100644
--- a/api/test/create_network_emulation_manager.cc
+++ b/api/test/create_network_emulation_manager.cc
@@ -15,6 +15,7 @@
 #include <utility>
 
 #include "api/field_trials_view.h"
+#include "api/test/network_emulation_manager.h"
 #include "test/network/network_emulation_manager.h"
 
 namespace webrtc {
diff --git a/api/test/create_peer_connection_quality_test_frame_generator.cc b/api/test/create_peer_connection_quality_test_frame_generator.cc
index a1c5363..d4aa46d 100644
--- a/api/test/create_peer_connection_quality_test_frame_generator.cc
+++ b/api/test/create_peer_connection_quality_test_frame_generator.cc
@@ -10,12 +10,18 @@
 
 #include "api/test/create_peer_connection_quality_test_frame_generator.h"
 
+#include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
+#include "absl/types/optional.h"
 #include "api/test/create_frame_generator.h"
+#include "api/test/frame_generator_interface.h"
 #include "api/test/pclf/media_configuration.h"
+#include "api/units/time_delta.h"
 #include "rtc_base/checks.h"
+#include "system_wrappers/include/clock.h"
 #include "test/testsupport/file_utils.h"
 
 namespace webrtc {
diff --git a/api/test/create_peerconnection_quality_test_fixture.cc b/api/test/create_peerconnection_quality_test_fixture.cc
index e156991..fd8e2cf 100644
--- a/api/test/create_peerconnection_quality_test_fixture.cc
+++ b/api/test/create_peerconnection_quality_test_fixture.cc
@@ -11,10 +11,14 @@
 #include "api/test/create_peerconnection_quality_test_fixture.h"
 
 #include <memory>
+#include <string>
 #include <utility>
 
+#include "api/test/audio_quality_analyzer_interface.h"
 #include "api/test/metrics/global_metrics_logger_and_exporter.h"
+#include "api/test/peerconnection_quality_test_fixture.h"
 #include "api/test/time_controller.h"
+#include "api/test/video_quality_analyzer_interface.h"
 #include "test/pc/e2e/peer_connection_quality_test.h"
 
 namespace webrtc {
diff --git a/api/test/create_simulcast_test_fixture.cc b/api/test/create_simulcast_test_fixture.cc
index 024145d..164395f 100644
--- a/api/test/create_simulcast_test_fixture.cc
+++ b/api/test/create_simulcast_test_fixture.cc
@@ -14,6 +14,9 @@
 #include <utility>
 
 #include "api/test/simulcast_test_fixture.h"
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_decoder_factory.h"
+#include "api/video_codecs/video_encoder_factory.h"
 #include "modules/video_coding/utility/simulcast_test_fixture_impl.h"
 
 namespace webrtc {
diff --git a/api/test/create_time_controller.cc b/api/test/create_time_controller.cc
index 9189e36..f0fb5ac 100644
--- a/api/test/create_time_controller.cc
+++ b/api/test/create_time_controller.cc
@@ -18,8 +18,11 @@
 #include "api/environment/environment.h"
 #include "api/environment/environment_factory.h"
 #include "api/peer_connection_interface.h"
+#include "api/test/time_controller.h"
+#include "api/units/timestamp.h"
 #include "call/call.h"
 #include "call/call_config.h"
+#include "media/base/media_engine.h"
 #include "pc/media_factory.h"
 #include "rtc_base/checks.h"
 #include "system_wrappers/include/clock.h"
diff --git a/api/test/create_time_controller_unittest.cc b/api/test/create_time_controller_unittest.cc
index 0ea868c..365d4ae 100644
--- a/api/test/create_time_controller_unittest.cc
+++ b/api/test/create_time_controller_unittest.cc
@@ -10,10 +10,12 @@
 
 #include "api/test/create_time_controller.h"
 
+#include <functional>
+
 #include "api/test/time_controller.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
-#include "test/gmock.h"
+#include "system_wrappers/include/clock.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/api/test/create_video_quality_test_fixture.cc b/api/test/create_video_quality_test_fixture.cc
index 1fa7d24..1cfe228 100644
--- a/api/test/create_video_quality_test_fixture.cc
+++ b/api/test/create_video_quality_test_fixture.cc
@@ -13,6 +13,8 @@
 #include <memory>
 #include <utility>
 
+#include "api/fec_controller.h"
+#include "api/test/video_quality_test_fixture.h"
 #include "video/video_quality_test.h"
 
 namespace webrtc {
diff --git a/api/test/create_videocodec_test_fixture.cc b/api/test/create_videocodec_test_fixture.cc
index 1f618e5..f8a035f 100644
--- a/api/test/create_videocodec_test_fixture.cc
+++ b/api/test/create_videocodec_test_fixture.cc
@@ -14,6 +14,8 @@
 #include <utility>
 
 #include "api/test/videocodec_test_fixture.h"
+#include "api/video_codecs/video_decoder_factory.h"
+#include "api/video_codecs/video_encoder_factory.h"
 #include "modules/video_coding/codecs/test/videocodec_test_fixture_impl.h"
 
 namespace webrtc {
diff --git a/api/test/fake_frame_decryptor.cc b/api/test/fake_frame_decryptor.cc
index 16cb1bd..c82db2c 100644
--- a/api/test/fake_frame_decryptor.cc
+++ b/api/test/fake_frame_decryptor.cc
@@ -10,8 +10,12 @@
 
 #include "api/test/fake_frame_decryptor.h"
 
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
+#include "api/array_view.h"
+#include "api/media_types.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/api/test/fake_frame_encryptor.cc b/api/test/fake_frame_encryptor.cc
index 89d14aa..2911e84 100644
--- a/api/test/fake_frame_encryptor.cc
+++ b/api/test/fake_frame_encryptor.cc
@@ -10,6 +10,11 @@
 
 #include "api/test/fake_frame_encryptor.h"
 
+#include <cstddef>
+#include <cstdint>
+
+#include "api/array_view.h"
+#include "api/media_types.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/api/test/frame_generator_interface.cc b/api/test/frame_generator_interface.cc
index fe7b1e8..5779158 100644
--- a/api/test/frame_generator_interface.cc
+++ b/api/test/frame_generator_interface.cc
@@ -10,6 +10,8 @@
 
 #include "api/test/frame_generator_interface.h"
 
+#include "rtc_base/checks.h"
+
 namespace webrtc {
 namespace test {
 
diff --git a/api/test/frame_generator_interface.h b/api/test/frame_generator_interface.h
index e963467..169ead8 100644
--- a/api/test/frame_generator_interface.h
+++ b/api/test/frame_generator_interface.h
@@ -11,6 +11,7 @@
 #ifndef API_TEST_FRAME_GENERATOR_INTERFACE_H_
 #define API_TEST_FRAME_GENERATOR_INTERFACE_H_
 
+#include <cstddef>
 #include <utility>
 
 #include "absl/types/optional.h"
diff --git a/api/test/mock_async_dns_resolver.h b/api/test/mock_async_dns_resolver.h
index 26127eb..d6a7148 100644
--- a/api/test/mock_async_dns_resolver.h
+++ b/api/test/mock_async_dns_resolver.h
@@ -11,10 +11,11 @@
 #ifndef API_TEST_MOCK_ASYNC_DNS_RESOLVER_H_
 #define API_TEST_MOCK_ASYNC_DNS_RESOLVER_H_
 
-#include <functional>
 #include <memory>
 
+#include "absl/functional/any_invocable.h"
 #include "api/async_dns_resolver.h"
+#include "rtc_base/socket_address.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_audio_mixer.h b/api/test/mock_audio_mixer.h
index 88dc108..458c076 100644
--- a/api/test/mock_audio_mixer.h
+++ b/api/test/mock_audio_mixer.h
@@ -11,6 +11,9 @@
 #ifndef API_TEST_MOCK_AUDIO_MIXER_H_
 #define API_TEST_MOCK_AUDIO_MIXER_H_
 
+#include <cstddef>
+
+#include "api/audio/audio_frame.h"
 #include "api/audio/audio_mixer.h"
 #include "test/gmock.h"
 
diff --git a/api/test/mock_audio_sink.h b/api/test/mock_audio_sink.h
index 88f38a3..6218b86 100644
--- a/api/test/mock_audio_sink.h
+++ b/api/test/mock_audio_sink.h
@@ -11,6 +11,9 @@
 #ifndef API_TEST_MOCK_AUDIO_SINK_H_
 #define API_TEST_MOCK_AUDIO_SINK_H_
 
+#include <cstddef>
+#include <cstdint>
+
 #include "absl/types/optional.h"
 #include "api/media_stream_interface.h"
 #include "test/gmock.h"
diff --git a/api/test/mock_data_channel.h b/api/test/mock_data_channel.h
index d8e19b0..8b8d56a 100644
--- a/api/test/mock_data_channel.h
+++ b/api/test/mock_data_channel.h
@@ -11,10 +11,16 @@
 #ifndef API_TEST_MOCK_DATA_CHANNEL_H_
 #define API_TEST_MOCK_DATA_CHANNEL_H_
 
+#include <cstdint>
 #include <string>
 
+#include "absl/functional/any_invocable.h"
+#include "absl/types/optional.h"
 #include "api/data_channel_interface.h"
 #include "api/priority.h"
+#include "api/rtc_error.h"
+#include "api/scoped_refptr.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_dtmf_sender.h b/api/test/mock_dtmf_sender.h
index 9029195..ec60ccb 100644
--- a/api/test/mock_dtmf_sender.h
+++ b/api/test/mock_dtmf_sender.h
@@ -12,8 +12,12 @@
 #define API_TEST_MOCK_DTMF_SENDER_H_
 
 #include <string>
+#include <type_traits>
 
 #include "api/dtmf_sender_interface.h"
+#include "api/make_ref_counted.h"
+#include "api/scoped_refptr.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_encoder_selector.h b/api/test/mock_encoder_selector.h
index 2e018d5..a54c4c1 100644
--- a/api/test/mock_encoder_selector.h
+++ b/api/test/mock_encoder_selector.h
@@ -11,6 +11,10 @@
 #ifndef API_TEST_MOCK_ENCODER_SELECTOR_H_
 #define API_TEST_MOCK_ENCODER_SELECTOR_H_
 
+#include "absl/types/optional.h"
+#include "api/units/data_rate.h"
+#include "api/video/render_resolution.h"
+#include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_encoder_factory.h"
 #include "test/gmock.h"
 
diff --git a/api/test/mock_frame_decryptor.h b/api/test/mock_frame_decryptor.h
index 9604b96..3f762ff 100644
--- a/api/test/mock_frame_decryptor.h
+++ b/api/test/mock_frame_decryptor.h
@@ -11,9 +11,13 @@
 #ifndef API_TEST_MOCK_FRAME_DECRYPTOR_H_
 #define API_TEST_MOCK_FRAME_DECRYPTOR_H_
 
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
+#include "api/array_view.h"
 #include "api/crypto/frame_decryptor_interface.h"
+#include "api/media_types.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_frame_encryptor.h b/api/test/mock_frame_encryptor.h
index e47321f..5e99dff 100644
--- a/api/test/mock_frame_encryptor.h
+++ b/api/test/mock_frame_encryptor.h
@@ -11,7 +11,12 @@
 #ifndef API_TEST_MOCK_FRAME_ENCRYPTOR_H_
 #define API_TEST_MOCK_FRAME_ENCRYPTOR_H_
 
+#include <cstddef>
+#include <cstdint>
+
+#include "api/array_view.h"
 #include "api/crypto/frame_encryptor_interface.h"
+#include "api/media_types.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_frame_transformer.h b/api/test/mock_frame_transformer.h
index 8f438bd..d10da47 100644
--- a/api/test/mock_frame_transformer.h
+++ b/api/test/mock_frame_transformer.h
@@ -11,10 +11,11 @@
 #ifndef API_TEST_MOCK_FRAME_TRANSFORMER_H_
 #define API_TEST_MOCK_FRAME_TRANSFORMER_H_
 
+#include <cstdint>
 #include <memory>
-#include <vector>
 
 #include "api/frame_transformer_interface.h"
+#include "api/scoped_refptr.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_media_stream_interface.h b/api/test/mock_media_stream_interface.h
index dfdbab3..34e0c60 100644
--- a/api/test/mock_media_stream_interface.h
+++ b/api/test/mock_media_stream_interface.h
@@ -12,8 +12,12 @@
 #define API_TEST_MOCK_MEDIA_STREAM_INTERFACE_H_
 
 #include <string>
+#include <type_traits>
 
+#include "api/audio_options.h"
 #include "api/media_stream_interface.h"
+#include "api/scoped_refptr.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_packet_socket_factory.h b/api/test/mock_packet_socket_factory.h
index 82f7676..d54be78 100644
--- a/api/test/mock_packet_socket_factory.h
+++ b/api/test/mock_packet_socket_factory.h
@@ -11,10 +11,14 @@
 #ifndef API_TEST_MOCK_PACKET_SOCKET_FACTORY_H_
 #define API_TEST_MOCK_PACKET_SOCKET_FACTORY_H_
 
+#include <cstdint>
 #include <memory>
-#include <string>
+#include <type_traits>
 
+#include "api/async_dns_resolver.h"
 #include "api/packet_socket_factory.h"
+#include "rtc_base/async_packet_socket.h"
+#include "rtc_base/socket_address.h"
 #include "test/gmock.h"
 
 namespace rtc {
diff --git a/api/test/mock_peer_connection_factory_interface.h b/api/test/mock_peer_connection_factory_interface.h
index 67a67b8..4551266 100644
--- a/api/test/mock_peer_connection_factory_interface.h
+++ b/api/test/mock_peer_connection_factory_interface.h
@@ -11,10 +11,22 @@
 #ifndef API_TEST_MOCK_PEER_CONNECTION_FACTORY_INTERFACE_H_
 #define API_TEST_MOCK_PEER_CONNECTION_FACTORY_INTERFACE_H_
 
+#include <cstdint>
+#include <cstdio>
 #include <memory>
 #include <string>
 
+#include "absl/strings/string_view.h"
+#include "api/audio_options.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
 #include "api/peer_connection_interface.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
+#include "api/scoped_refptr.h"
+#include "p2p/base/port_allocator.h"
+#include "rtc_base/ref_counted_object.h"
+#include "rtc_base/rtc_certificate_generator.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_peerconnectioninterface.h b/api/test/mock_peerconnectioninterface.h
index 3082293..782e45e 100644
--- a/api/test/mock_peerconnectioninterface.h
+++ b/api/test/mock_peerconnectioninterface.h
@@ -11,15 +11,35 @@
 #ifndef API_TEST_MOCK_PEERCONNECTIONINTERFACE_H_
 #define API_TEST_MOCK_PEERCONNECTIONINTERFACE_H_
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <type_traits>
-#include <utility>
 #include <vector>
 
+#include "absl/types/optional.h"
+#include "api/adaptation/resource.h"
+#include "api/candidate.h"
+#include "api/data_channel_interface.h"
+#include "api/dtls_transport_interface.h"
+#include "api/jsep.h"
+#include "api/make_ref_counted.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
 #include "api/peer_connection_interface.h"
+#include "api/rtc_error.h"
+#include "api/rtc_event_log_output.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "api/rtp_transceiver_interface.h"
 #include "api/scoped_refptr.h"
 #include "api/sctp_transport_interface.h"
+#include "api/set_remote_description_observer_interface.h"
+#include "api/stats/rtc_stats_collector_callback.h"
+#include "api/transport/bandwidth_estimation_settings.h"
+#include "api/transport/bitrate_settings.h"
+#include "api/transport/network_control.h"
 #include "rtc_base/ref_counted_object.h"
 #include "test/gmock.h"
 
diff --git a/api/test/mock_rtp_transceiver.h b/api/test/mock_rtp_transceiver.h
index 72a69f1..f3dbec6 100644
--- a/api/test/mock_rtp_transceiver.h
+++ b/api/test/mock_rtp_transceiver.h
@@ -14,7 +14,17 @@
 #include <string>
 #include <vector>
 
+#include "absl/types/optional.h"
+#include "api/array_view.h"
+#include "api/make_ref_counted.h"
+#include "api/media_types.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
+#include "api/rtp_receiver_interface.h"
+#include "api/rtp_sender_interface.h"
+#include "api/rtp_transceiver_direction.h"
 #include "api/rtp_transceiver_interface.h"
+#include "api/scoped_refptr.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_rtpreceiver.h b/api/test/mock_rtpreceiver.h
index 63318dc..b591db4 100644
--- a/api/test/mock_rtpreceiver.h
+++ b/api/test/mock_rtpreceiver.h
@@ -14,8 +14,15 @@
 #include <string>
 #include <vector>
 
+#include "absl/types/optional.h"
 #include "api/crypto/frame_decryptor_interface.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
+#include "api/rtp_parameters.h"
 #include "api/rtp_receiver_interface.h"
+#include "api/scoped_refptr.h"
+#include "api/transport/rtp/rtp_source.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_rtpsender.h b/api/test/mock_rtpsender.h
index 5a38d1d..6e85451 100644
--- a/api/test/mock_rtpsender.h
+++ b/api/test/mock_rtpsender.h
@@ -11,11 +11,25 @@
 #ifndef API_TEST_MOCK_RTPSENDER_H_
 #define API_TEST_MOCK_RTPSENDER_H_
 
+#include <cstdint>
 #include <memory>
 #include <string>
+#include <type_traits>
 #include <vector>
 
+#include "api/crypto/frame_encryptor_interface.h"
+#include "api/dtls_transport_interface.h"
+#include "api/dtmf_sender_interface.h"
+#include "api/frame_transformer_interface.h"
+#include "api/make_ref_counted.h"
+#include "api/media_stream_interface.h"
+#include "api/media_types.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
 #include "api/rtp_sender_interface.h"
+#include "api/scoped_refptr.h"
+#include "api/video_codecs/video_encoder_factory.h"
+#include "rtc_base/ref_counted_object.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_transformable_audio_frame.h b/api/test/mock_transformable_audio_frame.h
index c51d2f0..0bed626 100644
--- a/api/test/mock_transformable_audio_frame.h
+++ b/api/test/mock_transformable_audio_frame.h
@@ -11,8 +11,11 @@
 #ifndef API_TEST_MOCK_TRANSFORMABLE_AUDIO_FRAME_H_
 #define API_TEST_MOCK_TRANSFORMABLE_AUDIO_FRAME_H_
 
+#include <cstdint>
 #include <string>
 
+#include "absl/types/optional.h"
+#include "api/array_view.h"
 #include "api/frame_transformer_interface.h"
 #include "api/units/timestamp.h"
 #include "test/gmock.h"
diff --git a/api/test/mock_transformable_frame.h b/api/test/mock_transformable_frame.h
index d6e0856..8ca2681 100644
--- a/api/test/mock_transformable_frame.h
+++ b/api/test/mock_transformable_frame.h
@@ -15,6 +15,7 @@
 
 #include <optional>
 #include <string>
+#include <type_traits>
 
 #include "api/array_view.h"
 #include "api/frame_transformer_interface.h"
diff --git a/api/test/mock_transformable_video_frame.h b/api/test/mock_transformable_video_frame.h
index 2cf7cb2..2ec3579 100644
--- a/api/test/mock_transformable_video_frame.h
+++ b/api/test/mock_transformable_video_frame.h
@@ -11,10 +11,15 @@
 #ifndef API_TEST_MOCK_TRANSFORMABLE_VIDEO_FRAME_H_
 #define API_TEST_MOCK_TRANSFORMABLE_VIDEO_FRAME_H_
 
+#include <cstdint>
 #include <string>
-#include <vector>
+#include <type_traits>
 
+#include "absl/types/optional.h"
+#include "api/array_view.h"
 #include "api/frame_transformer_interface.h"
+#include "api/units/timestamp.h"
+#include "api/video/video_frame_metadata.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_video_bitrate_allocator.h b/api/test/mock_video_bitrate_allocator.h
index 76cf49e..de06d93 100644
--- a/api/test/mock_video_bitrate_allocator.h
+++ b/api/test/mock_video_bitrate_allocator.h
@@ -11,6 +11,7 @@
 #ifndef API_TEST_MOCK_VIDEO_BITRATE_ALLOCATOR_H_
 #define API_TEST_MOCK_VIDEO_BITRATE_ALLOCATOR_H_
 
+#include "api/video/video_bitrate_allocation.h"
 #include "api/video/video_bitrate_allocator.h"
 #include "test/gmock.h"
 
diff --git a/api/test/mock_video_bitrate_allocator_factory.h b/api/test/mock_video_bitrate_allocator_factory.h
index 7c6492e..7e7906a 100644
--- a/api/test/mock_video_bitrate_allocator_factory.h
+++ b/api/test/mock_video_bitrate_allocator_factory.h
@@ -13,7 +13,10 @@
 
 #include <memory>
 
+#include "api/environment/environment.h"
+#include "api/video/video_bitrate_allocator.h"
 #include "api/video/video_bitrate_allocator_factory.h"
+#include "api/video_codecs/video_codec.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/api/test/mock_video_decoder.h b/api/test/mock_video_decoder.h
index dc499d4..c252c24 100644
--- a/api/test/mock_video_decoder.h
+++ b/api/test/mock_video_decoder.h
@@ -11,8 +11,11 @@
 #ifndef API_TEST_MOCK_VIDEO_DECODER_H_
 #define API_TEST_MOCK_VIDEO_DECODER_H_
 
-#include <utility>
+#include <cstdint>
 
+#include "absl/types/optional.h"
+#include "api/video/encoded_image.h"
+#include "api/video/video_frame.h"
 #include "api/video_codecs/video_decoder.h"
 #include "test/gmock.h"
 
diff --git a/api/test/mock_video_encoder.h b/api/test/mock_video_encoder.h
index 11e0f64..9340d6e 100644
--- a/api/test/mock_video_encoder.h
+++ b/api/test/mock_video_encoder.h
@@ -11,8 +11,15 @@
 #ifndef API_TEST_MOCK_VIDEO_ENCODER_H_
 #define API_TEST_MOCK_VIDEO_ENCODER_H_
 
+#include <cstddef>
+#include <cstdint>
 #include <vector>
 
+#include "api/fec_controller_override.h"
+#include "api/video/encoded_image.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_frame_type.h"
+#include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_encoder.h"
 #include "test/gmock.h"
 
diff --git a/api/test/mock_video_track.h b/api/test/mock_video_track.h
index 1212a32..fbedaec 100644
--- a/api/test/mock_video_track.h
+++ b/api/test/mock_video_track.h
@@ -15,6 +15,9 @@
 
 #include "api/media_stream_interface.h"
 #include "api/scoped_refptr.h"
+#include "api/video/video_frame.h"
+#include "api/video/video_sink_interface.h"
+#include "api/video/video_source_interface.h"
 #include "rtc_base/ref_counted_object.h"
 #include "test/gmock.h"
 
diff --git a/api/test/neteq_simulator_factory.cc b/api/test/neteq_simulator_factory.cc
index b146fe1..6a05816 100644
--- a/api/test/neteq_simulator_factory.cc
+++ b/api/test/neteq_simulator_factory.cc
@@ -12,12 +12,10 @@
 
 #include <memory>
 #include <string>
-#include <vector>
 
-#include "absl/flags/flag.h"
-#include "absl/flags/parse.h"
+#include "absl/strings/string_view.h"
+#include "api/test/neteq_simulator.h"
 #include "modules/audio_coding/neteq/tools/neteq_test_factory.h"
-#include "rtc_base/checks.h"
 
 namespace webrtc {
 namespace test {
diff --git a/api/test/network_emulation_manager.cc b/api/test/network_emulation_manager.cc
index 9d50897..03dcd84 100644
--- a/api/test/network_emulation_manager.cc
+++ b/api/test/network_emulation_manager.cc
@@ -9,8 +9,13 @@
  */
 #include "api/test/network_emulation_manager.h"
 
+#include <cstdint>
+#include <memory>
+#include <string>
 #include <utility>
 
+#include "absl/strings/string_view.h"
+#include "api/test/simulated_network.h"
 #include "api/units/data_rate.h"
 #include "rtc_base/checks.h"
 #include "test/network/simulated_network.h"
diff --git a/api/test/network_emulation_manager.h b/api/test/network_emulation_manager.h
index 48bb19b..aeb32e7 100644
--- a/api/test/network_emulation_manager.h
+++ b/api/test/network_emulation_manager.h
@@ -11,13 +11,17 @@
 #ifndef API_TEST_NETWORK_EMULATION_MANAGER_H_
 #define API_TEST_NETWORK_EMULATION_MANAGER_H_
 
+#include <cstdint>
 #include <functional>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
 #include "api/array_view.h"
+#include "api/field_trials_view.h"
 #include "api/packet_socket_factory.h"
 #include "api/test/network_emulation/cross_traffic.h"
 #include "api/test/network_emulation/network_emulation_interfaces.h"
@@ -25,9 +29,10 @@
 #include "api/test/simulated_network.h"
 #include "api/test/time_controller.h"
 #include "api/units/data_rate.h"
-#include "api/units/timestamp.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/network.h"
 #include "rtc_base/network_constants.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
diff --git a/api/test/peerconnection_quality_test_fixture.h b/api/test/peerconnection_quality_test_fixture.h
index 0b1e69e..04be298 100644
--- a/api/test/peerconnection_quality_test_fixture.h
+++ b/api/test/peerconnection_quality_test_fixture.h
@@ -11,51 +11,16 @@
 #define API_TEST_PEERCONNECTION_QUALITY_TEST_FIXTURE_H_
 
 #include <stddef.h>
-#include <stdint.h>
 
 #include <functional>
-#include <map>
 #include <memory>
-#include <string>
-#include <utility>
-#include <vector>
 
-#include "absl/base/macros.h"
-#include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
-#include "absl/types/optional.h"
-#include "api/array_view.h"
-#include "api/audio/audio_mixer.h"
-#include "api/audio/audio_processing.h"
-#include "api/fec_controller.h"
-#include "api/function_view.h"
-#include "api/media_stream_interface.h"
-#include "api/peer_connection_interface.h"
-#include "api/rtc_event_log/rtc_event_log_factory_interface.h"
-#include "api/rtp_parameters.h"
-#include "api/task_queue/task_queue_factory.h"
-#include "api/test/audio_quality_analyzer_interface.h"
-#include "api/test/frame_generator_interface.h"
-#include "api/test/pclf/media_configuration.h"
 #include "api/test/pclf/media_quality_test_params.h"
 #include "api/test/pclf/peer_configurer.h"
-#include "api/test/peer_network_dependencies.h"
-#include "api/test/simulated_network.h"
 #include "api/test/stats_observer_interface.h"
 #include "api/test/track_id_stream_info_map.h"
-#include "api/test/video/video_frame_writer.h"
-#include "api/test/video_quality_analyzer_interface.h"
-#include "api/transport/network_control.h"
 #include "api/units/time_delta.h"
-#include "api/video_codecs/video_decoder_factory.h"
-#include "api/video_codecs/video_encoder.h"
-#include "api/video_codecs/video_encoder_factory.h"
-#include "media/base/media_constants.h"
-#include "rtc_base/checks.h"
-#include "rtc_base/network.h"
-#include "rtc_base/rtc_certificate_generator.h"
-#include "rtc_base/ssl_certificate.h"
-#include "rtc_base/thread.h"
 
 namespace webrtc {
 namespace webrtc_pc_e2e {
diff --git a/api/test/peerconnection_quality_test_fixture_unittest.cc b/api/test/peerconnection_quality_test_fixture_unittest.cc
index 26ae8cf..cd3dbb2 100644
--- a/api/test/peerconnection_quality_test_fixture_unittest.cc
+++ b/api/test/peerconnection_quality_test_fixture_unittest.cc
@@ -8,15 +8,18 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "api/test/peerconnection_quality_test_fixture.h"
-
+#include <cstddef>
+#include <memory>
+#include <string>
 #include <vector>
 
+#include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "api/test/pclf/media_configuration.h"
 #include "api/test/video/video_frame_writer.h"
-#include "rtc_base/gunit.h"
+#include "api/video/video_frame.h"
 #include "test/gmock.h"
+#include "test/gtest.h"
 #include "test/testsupport/file_utils.h"
 
 namespace webrtc {
diff --git a/api/test/simulated_network.h b/api/test/simulated_network.h
index 581540e..618fe71 100644
--- a/api/test/simulated_network.h
+++ b/api/test/simulated_network.h
@@ -14,13 +14,12 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <functional>
 #include <vector>
 
 #include "absl/functional/any_invocable.h"
 #include "absl/types/optional.h"
 #include "api/units/data_rate.h"
-#include "rtc_base/random.h"
-#include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
 
diff --git a/api/test/stats_observer_interface.h b/api/test/stats_observer_interface.h
index 58d8f52..364e201 100644
--- a/api/test/stats_observer_interface.h
+++ b/api/test/stats_observer_interface.h
@@ -12,6 +12,7 @@
 #define API_TEST_STATS_OBSERVER_INTERFACE_H_
 
 #include "absl/strings/string_view.h"
+#include "api/scoped_refptr.h"
 #include "api/stats/rtc_stats_report.h"
 
 namespace webrtc {
diff --git a/api/test/test_dependency_factory.cc b/api/test/test_dependency_factory.cc
index 41ad70c..983213e 100644
--- a/api/test/test_dependency_factory.cc
+++ b/api/test/test_dependency_factory.cc
@@ -13,6 +13,7 @@
 #include <memory>
 #include <utility>
 
+#include "api/test/video_quality_test_fixture.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/platform_thread_types.h"
 
diff --git a/api/test/time_controller.cc b/api/test/time_controller.cc
index 364dbc2..627777b 100644
--- a/api/test/time_controller.cc
+++ b/api/test/time_controller.cc
@@ -9,6 +9,14 @@
  */
 #include "api/test/time_controller.h"
 
+#include <functional>
+#include <memory>
+
+#include "absl/strings/string_view.h"
+#include "api/task_queue/task_queue_base.h"
+#include "api/task_queue/task_queue_factory.h"
+#include "api/units/time_delta.h"
+
 namespace webrtc {
 std::unique_ptr<TaskQueueFactory> TimeController::CreateTaskQueueFactory() {
   class FactoryWrapper final : public TaskQueueFactory {
diff --git a/api/test/time_controller.h b/api/test/time_controller.h
index 121f65c..c2b20e2 100644
--- a/api/test/time_controller.h
+++ b/api/test/time_controller.h
@@ -17,7 +17,7 @@
 #include "api/task_queue/task_queue_factory.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
-#include "rtc_base/synchronization/yield_policy.h"
+#include "rtc_base/socket_server.h"
 #include "rtc_base/thread.h"
 #include "system_wrappers/include/clock.h"
 
diff --git a/api/test/video_quality_analyzer_interface.h b/api/test/video_quality_analyzer_interface.h
index 1127898..6e69ede 100644
--- a/api/test/video_quality_analyzer_interface.h
+++ b/api/test/video_quality_analyzer_interface.h
@@ -11,12 +11,14 @@
 #ifndef API_TEST_VIDEO_QUALITY_ANALYZER_INTERFACE_H_
 #define API_TEST_VIDEO_QUALITY_ANALYZER_INTERFACE_H_
 
-#include <memory>
+#include <cstdint>
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "api/array_view.h"
+#include "api/scoped_refptr.h"
+#include "api/stats/rtc_stats_report.h"
 #include "api/test/stats_observer_interface.h"
 #include "api/video/encoded_image.h"
 #include "api/video/video_frame.h"
diff --git a/api/test/video_quality_test_fixture.h b/api/test/video_quality_test_fixture.h
index cbe547b..0302e89 100644
--- a/api/test/video_quality_test_fixture.h
+++ b/api/test/video_quality_test_fixture.h
@@ -11,18 +11,23 @@
 #ifndef API_TEST_VIDEO_QUALITY_TEST_FIXTURE_H_
 #define API_TEST_VIDEO_QUALITY_TEST_FIXTURE_H_
 
+#include <cstddef>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "absl/types/optional.h"
 #include "api/fec_controller.h"
 #include "api/media_types.h"
 #include "api/network_state_predictor.h"
+#include "api/rtp_parameters.h"
 #include "api/test/simulated_network.h"
 #include "api/transport/bitrate_settings.h"
 #include "api/transport/network_control.h"
-#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/spatial_layer.h"
+#include "api/video_codecs/video_codec.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
 #include "video/config/video_encoder_config.h"
diff --git a/api/test/videocodec_test_fixture.h b/api/test/videocodec_test_fixture.h
index 8e66f72..dd39c4f 100644
--- a/api/test/videocodec_test_fixture.h
+++ b/api/test/videocodec_test_fixture.h
@@ -11,14 +11,18 @@
 #ifndef API_TEST_VIDEOCODEC_TEST_FIXTURE_H_
 #define API_TEST_VIDEOCODEC_TEST_FIXTURE_H_
 
+#include <cstddef>
 #include <string>
 #include <vector>
 
+#include "absl/types/optional.h"
 #include "api/test/videocodec_test_stats.h"
+#include "api/video/encoded_image.h"
+#include "api/video/video_codec_type.h"
 #include "api/video_codecs/h264_profile_level_id.h"
-#include "api/video_codecs/video_decoder_factory.h"
-#include "api/video_codecs/video_encoder_factory.h"
-#include "modules/video_coding/include/video_codec_interface.h"
+#include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_codec.h"
+#include "modules/video_coding/codecs/h264/include/h264_globals.h"
 
 namespace webrtc {
 namespace test {
diff --git a/api/test/videocodec_test_stats.cc b/api/test/videocodec_test_stats.cc
index f082b1e..d71ebd2 100644
--- a/api/test/videocodec_test_stats.cc
+++ b/api/test/videocodec_test_stats.cc
@@ -10,6 +10,10 @@
 
 #include "api/test/videocodec_test_stats.h"
 
+#include <cstddef>
+#include <map>
+#include <string>
+
 #include "rtc_base/strings/string_builder.h"
 
 namespace webrtc {
diff --git a/api/test/videocodec_test_stats.h b/api/test/videocodec_test_stats.h
index d620d31..3ce91ce 100644
--- a/api/test/videocodec_test_stats.h
+++ b/api/test/videocodec_test_stats.h
@@ -18,7 +18,6 @@
 #include <string>
 #include <vector>
 
-#include "absl/types/optional.h"
 #include "api/units/data_rate.h"
 #include "api/units/frequency.h"
 #include "api/video/video_frame_type.h"
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 7b8ac7c..2e6b1c3 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -954,6 +954,7 @@
       "../../rtc_base:stringutils",
       "../../test:test_common",
       "../rtp_rtcp:rtp_rtcp_format",
+      "//third_party/abseil-cpp/absl/types:optional",
     ]
   }
 
diff --git a/modules/video_coding/codecs/test/videocodec_test_stats_impl.h b/modules/video_coding/codecs/test/videocodec_test_stats_impl.h
index 1a7980a..4212cfa 100644
--- a/modules/video_coding/codecs/test/videocodec_test_stats_impl.h
+++ b/modules/video_coding/codecs/test/videocodec_test_stats_impl.h
@@ -17,6 +17,7 @@
 #include <string>
 #include <vector>
 
+#include "absl/types/optional.h"
 #include "api/test/videocodec_test_stats.h"  // NOLINT(build/include)
 
 namespace webrtc {
diff --git a/net/dcsctp/socket/BUILD.gn b/net/dcsctp/socket/BUILD.gn
index 7810419..56c7907 100644
--- a/net/dcsctp/socket/BUILD.gn
+++ b/net/dcsctp/socket/BUILD.gn
@@ -228,6 +228,7 @@
       "../../../rtc_base:copy_on_write_buffer",
       "../../../rtc_base:gunit_helpers",
       "../../../rtc_base:logging",
+      "../../../rtc_base:random",
       "../../../rtc_base:rtc_base_tests_utils",
       "../../../rtc_base:socket_address",
       "../../../rtc_base:stringutils",
diff --git a/net/dcsctp/socket/dcsctp_socket_network_test.cc b/net/dcsctp/socket/dcsctp_socket_network_test.cc
index 0f41efb..f497cfa 100644
--- a/net/dcsctp/socket/dcsctp_socket_network_test.cc
+++ b/net/dcsctp/socket/dcsctp_socket_network_test.cc
@@ -33,6 +33,7 @@
 #include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/random.h"
 #include "rtc_base/socket_address.h"
 #include "rtc_base/strings/string_format.h"
 #include "rtc_base/time_utils.h"
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 61cb0f3..fe9bb65 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -2819,6 +2819,7 @@
       "../api/test/pclf:media_quality_test_params",
       "../api/test/pclf:peer_configurer",
       "../api/video_codecs:video_codecs_api",
+      "../media:media_constants",
       "../modules/video_coding:webrtc_vp9",
       "../modules/video_coding/svc:scalability_mode_util",
       "../rtc_base/containers:flat_map",
diff --git a/pc/test/svc_e2e_tests.cc b/pc/test/svc_e2e_tests.cc
index 78342d4..757e983 100644
--- a/pc/test/svc_e2e_tests.cc
+++ b/pc/test/svc_e2e_tests.cc
@@ -27,6 +27,7 @@
 #include "api/test/simulated_network.h"
 #include "api/test/time_controller.h"
 #include "api/video_codecs/vp9_profile.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/codecs/vp9/include/vp9.h"
 #include "modules/video_coding/svc/scalability_mode_util.h"
 #include "rtc_base/containers/flat_map.h"
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index 3d9d5bd..f9d1f47 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -304,6 +304,7 @@
         "../../../api/test/pclf:peer_configurer",
         "../../../api/video_codecs:builtin_video_decoder_factory",
         "../../../api/video_codecs:builtin_video_encoder_factory",
+        "../../../media:media_constants",
         "../../../media:rtc_audio_video",
         "../../../modules/audio_device:audio_device_impl",
         "../../../p2p:rtc_p2p",
diff --git a/test/pc/e2e/peer_connection_e2e_smoke_test.cc b/test/pc/e2e/peer_connection_e2e_smoke_test.cc
index 2478289..b237472 100644
--- a/test/pc/e2e/peer_connection_e2e_smoke_test.cc
+++ b/test/pc/e2e/peer_connection_e2e_smoke_test.cc
@@ -22,6 +22,7 @@
 #include "api/test/pclf/media_quality_test_params.h"
 #include "api/test/pclf/peer_configurer.h"
 #include "api/test/peerconnection_quality_test_fixture.h"
+#include "media/base/media_constants.h"
 #include "system_wrappers/include/field_trial.h"
 #include "test/field_trial.h"
 #include "test/gtest.h"
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 77b453e..aa18fd0 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -629,6 +629,7 @@
         "../api/test/pclf:media_quality_test_params",
         "../api/test/pclf:peer_configurer",
         "../api/video_codecs:video_codecs_api",
+        "../media:media_constants",
         "../modules/video_coding:webrtc_vp9",
         "../system_wrappers:field_trial",
         "../test:field_trial",
diff --git a/video/pc_full_stack_tests.cc b/video/pc_full_stack_tests.cc
index f1d6494..345d090 100644
--- a/video/pc_full_stack_tests.cc
+++ b/video/pc_full_stack_tests.cc
@@ -26,6 +26,7 @@
 #include "api/test/simulated_network.h"
 #include "api/test/time_controller.h"
 #include "api/video_codecs/vp9_profile.h"
+#include "media/base/media_constants.h"
 #include "modules/video_coding/codecs/vp9/include/vp9.h"
 #include "system_wrappers/include/field_trial.h"
 #include "test/field_trial.h"