diff --git a/api/BUILD.gn b/api/BUILD.gn
index bf258c50f2..607d206842 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -172,6 +172,7 @@ rtc_library("media_stream_interface") {
     ":sequence_checker",
     ":video_track_source_constraints",
     "../rtc_base:checks",
+    "../rtc_base:macromagic",
     "../rtc_base/system:no_unique_address",
     "../rtc_base/system:rtc_export",
     "audio:audio_processing_statistics",
@@ -470,6 +471,7 @@ rtc_source_set("make_ref_counted") {
   sources = [ "make_ref_counted.h" ]
   deps = [
     ":ref_count",
+    ":scoped_refptr",
     "../rtc_base:refcount",
   ]
 }
diff --git a/api/DEPS b/api/DEPS
index 129cc4a185..a03410297b 100644
--- a/api/DEPS
+++ b/api/DEPS
@@ -102,6 +102,7 @@ specific_include_rules = {
 
   "packet_socket_factory\.h": [
     "+rtc_base/async_packet_socket.h",
+    "+rtc_base/socket_address.h",
   ],
 
   "peer_connection_interface\.h": [
@@ -171,6 +172,7 @@ specific_include_rules = {
 
   "notifier\.h": [
     "+rtc_base/system/no_unique_address.h",
+    "+rtc_base/thread_annotations.h",
   ],
 
   "priority\.h": [
diff --git a/api/async_dns_resolver.h b/api/async_dns_resolver.h
index db02cd185c..d055a5b7c8 100644
--- a/api/async_dns_resolver.h
+++ b/api/async_dns_resolver.h
@@ -11,11 +11,9 @@
 #ifndef API_ASYNC_DNS_RESOLVER_H_
 #define API_ASYNC_DNS_RESOLVER_H_
 
-#include <functional>
 #include <memory>
 
 #include "absl/functional/any_invocable.h"
-#include "rtc_base/checks.h"
 #include "rtc_base/socket_address.h"
 #include "rtc_base/system/rtc_export.h"
 
diff --git a/api/audio_options.cc b/api/audio_options.cc
index f5baf06d19..8d231330dc 100644
--- a/api/audio_options.cc
+++ b/api/audio_options.cc
@@ -10,6 +10,8 @@
 
 #include "api/audio_options.h"
 
+#include <string>
+
 #include "api/array_view.h"
 #include "rtc_base/strings/string_builder.h"
 
diff --git a/api/create_peerconnection_factory.cc b/api/create_peerconnection_factory.cc
index e5ba20f53a..310b58d4a1 100644
--- a/api/create_peerconnection_factory.cc
+++ b/api/create_peerconnection_factory.cc
@@ -14,11 +14,17 @@
 #include <utility>
 
 #include "api/audio/audio_device.h"
+#include "api/audio/audio_mixer.h"
 #include "api/audio/audio_processing.h"
+#include "api/audio_codecs/audio_decoder_factory.h"
+#include "api/audio_codecs/audio_encoder_factory.h"
 #include "api/enable_media.h"
+#include "api/field_trials_view.h"
 #include "api/peer_connection_interface.h"
 #include "api/rtc_event_log/rtc_event_log_factory.h"
 #include "api/scoped_refptr.h"
+#include "api/video_codecs/video_decoder_factory.h"
+#include "api/video_codecs/video_encoder_factory.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
diff --git a/api/data_channel_interface.cc b/api/data_channel_interface.cc
index 966faf2412..05c7a1a2c7 100644
--- a/api/data_channel_interface.cc
+++ b/api/data_channel_interface.cc
@@ -10,7 +10,12 @@
 
 #include "api/data_channel_interface.h"
 
+#include <cstdint>
+#include <string>
+
+#include "absl/functional/any_invocable.h"
 #include "api/priority.h"
+#include "api/rtc_error.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/api/dtmf_sender_interface.h b/api/dtmf_sender_interface.h
index 4aed3382ed..4692f258b2 100644
--- a/api/dtmf_sender_interface.h
+++ b/api/dtmf_sender_interface.h
@@ -13,7 +13,6 @@
 
 #include <string>
 
-#include "api/media_stream_interface.h"
 #include "api/ref_count.h"
 
 namespace webrtc {
diff --git a/api/fec_controller.h b/api/fec_controller.h
index 5c2aa3b786..8eceab5bd9 100644
--- a/api/fec_controller.h
+++ b/api/fec_controller.h
@@ -11,6 +11,8 @@
 #ifndef API_FEC_CONTROLLER_H_
 #define API_FEC_CONTROLLER_H_
 
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <vector>
 
diff --git a/api/ice_transport_interface.h b/api/ice_transport_interface.h
index f4c7613fa8..0b09b1541d 100644
--- a/api/ice_transport_interface.h
+++ b/api/ice_transport_interface.h
@@ -15,7 +15,6 @@
 
 #include "api/async_dns_resolver.h"
 #include "api/ref_count.h"
-#include "api/rtc_error.h"
 #include "api/rtc_event_log/rtc_event_log.h"
 #include "api/scoped_refptr.h"
 
diff --git a/api/jsep.cc b/api/jsep.cc
index 21781d9a35..c35d9bb227 100644
--- a/api/jsep.cc
+++ b/api/jsep.cc
@@ -10,6 +10,10 @@
 
 #include "api/jsep.h"
 
+#include <cstddef>
+#include <string>
+#include <vector>
+
 namespace webrtc {
 
 std::string IceCandidateInterface::server_url() const {
diff --git a/api/jsep_ice_candidate.cc b/api/jsep_ice_candidate.cc
index e18e6e28af..aeda0cd7fa 100644
--- a/api/jsep_ice_candidate.cc
+++ b/api/jsep_ice_candidate.cc
@@ -10,11 +10,15 @@
 
 #include "api/jsep_ice_candidate.h"
 
+#include <cstddef>
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "absl/algorithm/container.h"
 #include "absl/memory/memory.h"
+#include "api/candidate.h"
+#include "api/jsep.h"
 
 namespace webrtc {
 
diff --git a/api/jsep_session_description.h b/api/jsep_session_description.h
index c51abd57d4..e28f8b0f57 100644
--- a/api/jsep_session_description.h
+++ b/api/jsep_session_description.h
@@ -14,6 +14,7 @@
 #ifndef API_JSEP_SESSION_DESCRIPTION_H_
 #define API_JSEP_SESSION_DESCRIPTION_H_
 
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/api/legacy_stats_types.cc b/api/legacy_stats_types.cc
index 01eee2ce98..959d733953 100644
--- a/api/legacy_stats_types.cc
+++ b/api/legacy_stats_types.cc
@@ -12,10 +12,13 @@
 
 #include <string.h>
 
+#include <cstdint>
+#include <string>
 #include <utility>
 
 #include "absl/algorithm/container.h"
 #include "api/make_ref_counted.h"
+#include "api/sequence_checker.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/string_encode.h"
 
diff --git a/api/make_ref_counted.h b/api/make_ref_counted.h
index 40eb3ad87a..311d207eb4 100644
--- a/api/make_ref_counted.h
+++ b/api/make_ref_counted.h
@@ -13,6 +13,8 @@
 #include <type_traits>
 #include <utility>
 
+#include "api/ref_count.h"
+#include "api/scoped_refptr.h"
 #include "rtc_base/ref_counted_object.h"
 
 namespace webrtc {
diff --git a/api/media_stream_interface.cc b/api/media_stream_interface.cc
index 6b0a6a9297..ee132b77d6 100644
--- a/api/media_stream_interface.cc
+++ b/api/media_stream_interface.cc
@@ -10,7 +10,9 @@
 
 #include "api/media_stream_interface.h"
 
+#include "api/audio_options.h"
 #include "api/media_types.h"
+#include "api/scoped_refptr.h"
 
 namespace webrtc {
 
diff --git a/api/media_types.cc b/api/media_types.cc
index 5c7d55b876..850c8e2d35 100644
--- a/api/media_types.cc
+++ b/api/media_types.cc
@@ -10,6 +10,8 @@
 
 #include "api/media_types.h"
 
+#include <string>
+
 #include "rtc_base/checks.h"
 
 namespace cricket {
diff --git a/api/network_state_predictor.h b/api/network_state_predictor.h
index eebd208a61..d3063ceafd 100644
--- a/api/network_state_predictor.h
+++ b/api/network_state_predictor.h
@@ -11,8 +11,8 @@
 #ifndef API_NETWORK_STATE_PREDICTOR_H_
 #define API_NETWORK_STATE_PREDICTOR_H_
 
+#include <cstdint>
 #include <memory>
-#include <vector>
 
 #include "api/transport/bandwidth_usage.h"
 
diff --git a/api/notifier.h b/api/notifier.h
index 64d5b22ad5..d1070a96e7 100644
--- a/api/notifier.h
+++ b/api/notifier.h
@@ -17,6 +17,7 @@
 #include "api/sequence_checker.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/system/no_unique_address.h"
+#include "rtc_base/thread_annotations.h"
 
 namespace webrtc {
 
diff --git a/api/packet_socket_factory.h b/api/packet_socket_factory.h
index 0785888a81..a73d3deaff 100644
--- a/api/packet_socket_factory.h
+++ b/api/packet_socket_factory.h
@@ -11,12 +11,14 @@
 #ifndef API_PACKET_SOCKET_FACTORY_H_
 #define API_PACKET_SOCKET_FACTORY_H_
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "api/async_dns_resolver.h"
 #include "rtc_base/async_packet_socket.h"
+#include "rtc_base/socket_address.h"
 #include "rtc_base/system/rtc_export.h"
 
 namespace rtc {
diff --git a/api/peer_connection_interface.cc b/api/peer_connection_interface.cc
index dedfd355d6..6cdbf7023d 100644
--- a/api/peer_connection_interface.cc
+++ b/api/peer_connection_interface.cc
@@ -10,9 +10,16 @@
 
 #include "api/peer_connection_interface.h"
 
+#include <memory>
 #include <utility>
 
+#include "api/media_types.h"
+#include "api/rtc_error.h"
+#include "api/rtp_parameters.h"
+#include "api/scoped_refptr.h"
+#include "p2p/base/port_allocator.h"
 #include "pc/media_factory.h"
+#include "rtc_base/rtc_certificate_generator.h"
 
 namespace webrtc {
 
diff --git a/api/ref_counted_base.h b/api/ref_counted_base.h
index 2638ac17cb..a47a8bb111 100644
--- a/api/ref_counted_base.h
+++ b/api/ref_counted_base.h
@@ -12,6 +12,7 @@
 
 #include <type_traits>
 
+#include "api/ref_count.h"
 #include "rtc_base/ref_counter.h"
 
 namespace webrtc {
diff --git a/api/rtc_error.cc b/api/rtc_error.cc
index 0aa4304386..eb4f90118b 100644
--- a/api/rtc_error.cc
+++ b/api/rtc_error.cc
@@ -11,6 +11,7 @@
 #include "api/rtc_error.h"
 
 #include <iterator>
+#include <string>
 
 #include "absl/strings/string_view.h"
 
diff --git a/api/rtc_error_unittest.cc b/api/rtc_error_unittest.cc
index 29dd002b14..68ca2f5a51 100644
--- a/api/rtc_error_unittest.cc
+++ b/api/rtc_error_unittest.cc
@@ -10,8 +10,11 @@
 
 #include "api/rtc_error.h"
 
+#include <string>
 #include <utility>
 
+#include "absl/strings/string_view.h"
+#include "rtc_base/checks.h"
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/api/rtp_headers.cc b/api/rtp_headers.cc
index 8813e0f4c2..c272ccae06 100644
--- a/api/rtp_headers.cc
+++ b/api/rtp_headers.cc
@@ -10,6 +10,10 @@
 
 #include "api/rtp_headers.h"
 
+#include "api/video/video_content_type.h"
+#include "api/video/video_rotation.h"
+#include "rtc_base/checks.h"
+
 namespace webrtc {
 
 AudioLevel::AudioLevel() : voice_activity_(false), audio_level_(0) {}
diff --git a/api/rtp_packet_sender.h b/api/rtp_packet_sender.h
index dc5fc5fb3d..13cb37f867 100644
--- a/api/rtp_packet_sender.h
+++ b/api/rtp_packet_sender.h
@@ -11,6 +11,7 @@
 #ifndef API_RTP_PACKET_SENDER_H_
 #define API_RTP_PACKET_SENDER_H_
 
+#include <cstdint>
 #include <memory>
 #include <vector>
 
diff --git a/api/rtp_parameters_unittest.cc b/api/rtp_parameters_unittest.cc
index 234c3c9b6d..0dc3cb5bd6 100644
--- a/api/rtp_parameters_unittest.cc
+++ b/api/rtp_parameters_unittest.cc
@@ -10,6 +10,8 @@
 
 #include "api/rtp_parameters.h"
 
+#include <vector>
+
 #include "test/gtest.h"
 
 namespace webrtc {
diff --git a/api/rtp_sender_interface.cc b/api/rtp_sender_interface.cc
index f1ca5c2203..ea928e056a 100644
--- a/api/rtp_sender_interface.cc
+++ b/api/rtp_sender_interface.cc
@@ -10,6 +10,7 @@
 
 #include "api/rtp_sender_interface.h"
 
+#include "api/rtp_parameters.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/api/rtp_transceiver_interface.cc b/api/rtp_transceiver_interface.cc
index 5f1676749d..a5e53f53d2 100644
--- a/api/rtp_transceiver_interface.cc
+++ b/api/rtp_transceiver_interface.cc
@@ -10,6 +10,8 @@
 
 #include "api/rtp_transceiver_interface.h"
 
+#include "api/rtc_error.h"
+#include "api/rtp_transceiver_direction.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {
diff --git a/api/sctp_transport_interface.cc b/api/sctp_transport_interface.cc
index 8bd279c3b1..5ca57f1783 100644
--- a/api/sctp_transport_interface.cc
+++ b/api/sctp_transport_interface.cc
@@ -12,6 +12,9 @@
 
 #include <utility>
 
+#include "api/dtls_transport_interface.h"
+#include "api/scoped_refptr.h"
+
 namespace webrtc {
 
 SctpTransportInformation::SctpTransportInformation(SctpTransportState state)
diff --git a/api/video_track_source_proxy_factory.h b/api/video_track_source_proxy_factory.h
index eb6e96429a..3ab10da1de 100644
--- a/api/video_track_source_proxy_factory.h
+++ b/api/video_track_source_proxy_factory.h
@@ -12,6 +12,8 @@
 #define API_VIDEO_TRACK_SOURCE_PROXY_FACTORY_H_
 
 #include "api/media_stream_interface.h"
+#include "api/scoped_refptr.h"
+#include "rtc_base/system/rtc_export.h"
 #include "rtc_base/thread.h"
 
 namespace webrtc {
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index f21f407fbf..a5560cdf49 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -49,6 +49,7 @@ rtc_source_set("proxy") {
   visibility = [ ":*" ]
   sources = [ "proxy.h" ]
   deps = [
+    "../api:make_ref_counted",
     "../api:scoped_refptr",
     "../api/task_queue",
     "../rtc_base:event_tracer",
diff --git a/pc/proxy.h b/pc/proxy.h
index bfb2c7f44f..160d532318 100644
--- a/pc/proxy.h
+++ b/pc/proxy.h
@@ -64,6 +64,7 @@
 #include <type_traits>
 #include <utility>
 
+#include "api/make_ref_counted.h"
 #include "api/scoped_refptr.h"
 #include "api/task_queue/task_queue_base.h"
 #include "rtc_base/event.h"
diff --git a/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h b/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h
index 627d02a6c8..7f70887e51 100644
--- a/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h
+++ b/sdk/objc/api/peerconnection/RTCDtmfSender+Private.h
@@ -11,6 +11,7 @@
 #import "RTCDtmfSender.h"
 
 #include "api/dtmf_sender_interface.h"
+#include "api/scoped_refptr.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/sdk/objc/api/peerconnection/RTCDtmfSender.mm b/sdk/objc/api/peerconnection/RTCDtmfSender.mm
index 2cec54aef5..88a5505d51 100644
--- a/sdk/objc/api/peerconnection/RTCDtmfSender.mm
+++ b/sdk/objc/api/peerconnection/RTCDtmfSender.mm
@@ -13,6 +13,7 @@
 #import "base/RTCLogging.h"
 #import "helpers/NSString+StdString.h"
 
+#include "api/scoped_refptr.h"
 #include "rtc_base/time_utils.h"
 
 @implementation RTC_OBJC_TYPE (RTCDtmfSender) {