diff --git a/api/transport/BUILD.gn b/api/transport/BUILD.gn
index cf8768ee88..991a0d3880 100644
--- a/api/transport/BUILD.gn
+++ b/api/transport/BUILD.gn
@@ -46,6 +46,7 @@ rtc_library("network_control") {
 
   deps = [
     "../../api:field_trials_view",
+    "../../rtc_base/system:rtc_export",
     "../environment",
     "../rtc_event_log",
     "../units:data_rate",
@@ -135,6 +136,10 @@ if (rtc_include_tests) {
     deps = [
       ":network_control",
       "..:simulated_network_api",
+      "../units:data_rate",
+      "../units:data_size",
+      "../units:time_delta",
+      "../units:timestamp",
     ]
   }
   rtc_library("test_feedback_generator") {
@@ -159,8 +164,10 @@ if (rtc_include_tests) {
     sources = [ "stun_unittest.cc" ]
     deps = [
       ":stun_types",
+      "..:array_view",
       "../../rtc_base:byte_buffer",
       "../../rtc_base:byte_order",
+      "../../rtc_base:ip_address",
       "../../rtc_base:macromagic",
       "../../rtc_base:socket_address",
       "../../system_wrappers:metrics",
diff --git a/api/transport/bitrate_settings.h b/api/transport/bitrate_settings.h
index 562309a46c..f0dcbb83c3 100644
--- a/api/transport/bitrate_settings.h
+++ b/api/transport/bitrate_settings.h
@@ -11,7 +11,6 @@
 #ifndef API_TRANSPORT_BITRATE_SETTINGS_H_
 #define API_TRANSPORT_BITRATE_SETTINGS_H_
 
-#include <algorithm>
 
 #include "absl/types/optional.h"
 #include "rtc_base/system/rtc_export.h"
diff --git a/api/transport/data_channel_transport_interface.h b/api/transport/data_channel_transport_interface.h
index 751f79278d..ad8354402f 100644
--- a/api/transport/data_channel_transport_interface.h
+++ b/api/transport/data_channel_transport_interface.h
@@ -12,6 +12,8 @@
 #ifndef API_TRANSPORT_DATA_CHANNEL_TRANSPORT_INTERFACE_H_
 #define API_TRANSPORT_DATA_CHANNEL_TRANSPORT_INTERFACE_H_
 
+#include <cstddef>
+
 #include "absl/types/optional.h"
 #include "api/priority.h"
 #include "api/rtc_error.h"
diff --git a/api/transport/field_trial_based_config.cc b/api/transport/field_trial_based_config.cc
index 0cef30f054..ea3ce21512 100644
--- a/api/transport/field_trial_based_config.cc
+++ b/api/transport/field_trial_based_config.cc
@@ -9,6 +9,9 @@
  */
 #include "api/transport/field_trial_based_config.h"
 
+#include <string>
+
+#include "absl/strings/string_view.h"
 #include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
diff --git a/api/transport/goog_cc_factory.cc b/api/transport/goog_cc_factory.cc
index 036a399f5d..11dd3686df 100644
--- a/api/transport/goog_cc_factory.cc
+++ b/api/transport/goog_cc_factory.cc
@@ -10,9 +10,11 @@
 
 #include "api/transport/goog_cc_factory.h"
 
+#include <cstdint>
 #include <memory>
 #include <utility>
 
+#include "api/transport/network_control.h"
 #include "api/units/time_delta.h"
 #include "modules/congestion_controller/goog_cc/goog_cc_network_control.h"
 
diff --git a/api/transport/network_control.h b/api/transport/network_control.h
index c7a7a981a5..de408a5523 100644
--- a/api/transport/network_control.h
+++ b/api/transport/network_control.h
@@ -10,15 +10,16 @@
 
 #ifndef API_TRANSPORT_NETWORK_CONTROL_H_
 #define API_TRANSPORT_NETWORK_CONTROL_H_
-#include <stdint.h>
 
 #include <memory>
 
 #include "absl/base/attributes.h"
+#include "absl/types/optional.h"
 #include "api/environment/environment.h"
 #include "api/field_trials_view.h"
-#include "api/rtc_event_log/rtc_event_log.h"
 #include "api/transport/network_types.h"
+#include "api/units/data_rate.h"
+#include "api/units/time_delta.h"
 
 namespace webrtc {
 
diff --git a/api/transport/network_types.cc b/api/transport/network_types.cc
index 53d5e5a443..ccb4a6e3a9 100644
--- a/api/transport/network_types.cc
+++ b/api/transport/network_types.cc
@@ -11,6 +11,7 @@
 #include "api/transport/network_types.h"
 
 #include <algorithm>
+#include <vector>
 
 namespace webrtc {
 StreamsConfig::StreamsConfig() = default;
diff --git a/api/transport/network_types.h b/api/transport/network_types.h
index 66149d0613..ebf09ef55e 100644
--- a/api/transport/network_types.h
+++ b/api/transport/network_types.h
@@ -12,6 +12,7 @@
 #define API_TRANSPORT_NETWORK_TYPES_H_
 #include <stdint.h>
 
+#include <cmath>
 #include <vector>
 
 #include "absl/types/optional.h"
@@ -19,6 +20,7 @@
 #include "api/units/data_size.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
+#include "rtc_base/system/rtc_export.h"
 
 namespace webrtc {
 
diff --git a/api/transport/rtp/rtp_source.h b/api/transport/rtp/rtp_source.h
index 11149f5421..961897328f 100644
--- a/api/transport/rtp/rtp_source.h
+++ b/api/transport/rtp/rtp_source.h
@@ -17,7 +17,6 @@
 #include "api/rtp_headers.h"
 #include "api/units/time_delta.h"
 #include "api/units/timestamp.h"
-#include "rtc_base/checks.h"
 
 namespace webrtc {
 
diff --git a/api/transport/stun.cc b/api/transport/stun.cc
index 27266d97db..79d632b3a7 100644
--- a/api/transport/stun.cc
+++ b/api/transport/stun.cc
@@ -10,20 +10,33 @@
 
 #include "api/transport/stun.h"
 
+#if defined(WEBRTC_POSIX)
+#include <netinet/in.h>
+#include <sys/socket.h>
+#endif
 #include <string.h>
 
-#include <algorithm>
+#include <algorithm>  // IWYU pragma: keep
 #include <cstdint>
+#include <cstring>
+#include <functional>
 #include <iterator>
 #include <memory>
+#include <string>
 #include <utility>
+#include <vector>
 
+#include "absl/strings/string_view.h"
+#include "api/array_view.h"
+#include "rtc_base/byte_buffer.h"
 #include "rtc_base/byte_order.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/crc32.h"
 #include "rtc_base/crypto_random.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/message_digest.h"
+#include "rtc_base/socket_address.h"
 #include "system_wrappers/include/metrics.h"
 
 using rtc::ByteBufferReader;
diff --git a/api/transport/stun.h b/api/transport/stun.h
index 62d98f71e0..035de89c2c 100644
--- a/api/transport/stun.h
+++ b/api/transport/stun.h
@@ -14,6 +14,9 @@
 // This file contains classes for dealing with the STUN protocol, as specified
 // in RFC 5389, and its descendants.
 
+#if defined(WEBRTC_POSIX)
+#include <sys/socket.h>
+#endif
 #include <stddef.h>
 #include <stdint.h>
 
@@ -25,6 +28,7 @@
 #include "absl/strings/string_view.h"
 #include "api/array_view.h"
 #include "rtc_base/byte_buffer.h"
+#include "rtc_base/checks.h"
 #include "rtc_base/ip_address.h"
 #include "rtc_base/socket_address.h"
 
diff --git a/api/transport/stun_unittest.cc b/api/transport/stun_unittest.cc
index 9ad4da9a4c..203e831d28 100644
--- a/api/transport/stun_unittest.cc
+++ b/api/transport/stun_unittest.cc
@@ -10,15 +10,21 @@
 
 #include "api/transport/stun.h"
 
+#if defined(WEBRTC_POSIX)
+#include <netinet/in.h>
+#endif
 #include <string.h>
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
 
+#include "api/array_view.h"
 #include "rtc_base/arraysize.h"
 #include "rtc_base/byte_buffer.h"
 #include "rtc_base/byte_order.h"
+#include "rtc_base/ip_address.h"
 #include "rtc_base/socket_address.h"
 #include "system_wrappers/include/metrics.h"
 #include "test/gtest.h"
diff --git a/api/transport/test/create_feedback_generator.cc b/api/transport/test/create_feedback_generator.cc
index 7c83823ce4..6144bccacf 100644
--- a/api/transport/test/create_feedback_generator.cc
+++ b/api/transport/test/create_feedback_generator.cc
@@ -11,6 +11,7 @@
 
 #include <memory>
 
+#include "api/transport/test/feedback_generator_interface.h"
 #include "test/network/feedback_generator.h"
 
 namespace webrtc {
diff --git a/api/transport/test/feedback_generator_interface.h b/api/transport/test/feedback_generator_interface.h
index 6e5118cbf4..1ffc8b0796 100644
--- a/api/transport/test/feedback_generator_interface.h
+++ b/api/transport/test/feedback_generator_interface.h
@@ -10,10 +10,15 @@
 #ifndef API_TRANSPORT_TEST_FEEDBACK_GENERATOR_INTERFACE_H_
 #define API_TRANSPORT_TEST_FEEDBACK_GENERATOR_INTERFACE_H_
 
+#include <cstddef>
 #include <vector>
 
 #include "api/test/simulated_network.h"
 #include "api/transport/network_types.h"
+#include "api/units/data_rate.h"
+#include "api/units/data_size.h"
+#include "api/units/time_delta.h"
+#include "api/units/timestamp.h"
 
 namespace webrtc {
 class FeedbackGenerator {