diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index e4e6ddaa5b..59b0558bbd 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -151,6 +151,7 @@ rtc_library("rtc_pc_base") {
     "../rtc_base/network:sent_packet",
     "../rtc_base/synchronization:mutex",
     "../rtc_base/system:file_wrapper",
+    "../rtc_base/system:no_unique_address",
     "../rtc_base/system:rtc_export",
     "../rtc_base/task_utils:pending_task_safety_flag",
     "../rtc_base/task_utils:to_queued_task",
diff --git a/pc/jsep_transport_collection.cc b/pc/jsep_transport_collection.cc
index 03b85a4aa0..177a6ccc1c 100644
--- a/pc/jsep_transport_collection.cc
+++ b/pc/jsep_transport_collection.cc
@@ -10,7 +10,13 @@
 
 #include "pc/jsep_transport_collection.h"
 
+#include <algorithm>
 #include <map>
+#include <type_traits>
+#include <utility>
+
+#include "p2p/base/p2p_constants.h"
+#include "rtc_base/logging.h"
 
 namespace webrtc {
 
diff --git a/pc/jsep_transport_collection.h b/pc/jsep_transport_collection.h
index 726ba348b2..0db0ca1ab4 100644
--- a/pc/jsep_transport_collection.h
+++ b/pc/jsep_transport_collection.h
@@ -11,14 +11,19 @@
 #ifndef PC_JSEP_TRANSPORT_COLLECTION_H_
 #define PC_JSEP_TRANSPORT_COLLECTION_H_
 
+#include <functional>
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "api/sequence_checker.h"
 #include "pc/jsep_transport.h"
 #include "pc/session_description.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/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc
index e7eff183a7..97a5cf5f28 100644
--- a/pc/jsep_transport_controller.cc
+++ b/pc/jsep_transport_controller.cc
@@ -15,6 +15,7 @@
 #include <algorithm>
 #include <functional>
 #include <memory>
+#include <type_traits>
 #include <utility>
 
 #include "absl/algorithm/container.h"
@@ -30,8 +31,6 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/net_helper.h"
-#include "rtc_base/socket_address.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/trace_event.h"
 
diff --git a/pc/jsep_transport_controller.h b/pc/jsep_transport_controller.h
index ef2c7ce089..a11bac52fd 100644
--- a/pc/jsep_transport_controller.h
+++ b/pc/jsep_transport_controller.h
@@ -31,6 +31,7 @@
 #include "api/rtc_error.h"
 #include "api/rtc_event_log/rtc_event_log.h"
 #include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
 #include "api/transport/data_channel_transport_interface.h"
 #include "api/transport/sctp_transport_factory_interface.h"
 #include "media/sctp/sctp_transport_internal.h"
@@ -56,6 +57,7 @@
 #include "pc/srtp_transport.h"
 #include "pc/transport_stats.h"
 #include "rtc_base/callback_list.h"
+#include "rtc_base/checks.h"
 #include "rtc_base/constructor_magic.h"
 #include "rtc_base/copy_on_write_buffer.h"
 #include "rtc_base/helpers.h"