diff --git a/api/BUILD.gn b/api/BUILD.gn
index 02dbe8da60..8ec98dfc30 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -339,8 +339,8 @@ rtc_library("libjingle_peerconnection_api") {
     "../call:rtp_interfaces",
     "../media:media_engine",
     "../p2p:connection",
+    "../p2p:port",
     "../p2p:port_allocator",
-    "../p2p:rtc_p2p",
     "../pc:media_factory",
     "../rtc_base:copy_on_write_buffer",
     "../rtc_base:logging",
@@ -981,7 +981,6 @@ rtc_library("ice_transport_factory") {
     "../p2p:p2p_constants",
     "../p2p:p2p_transport_channel",
     "../p2p:port_allocator",
-    "../p2p:rtc_p2p",
     "../rtc_base:macromagic",
     "../rtc_base:threading",
     "../rtc_base/system:rtc_export",
@@ -1336,7 +1335,7 @@ if (rtc_include_tests) {
       ":rtc_error",
       ":rtp_parameters",
       ":scoped_refptr",
-      "../p2p:rtc_p2p",
+      "../p2p:port_allocator",
       "../rtc_base:refcount",
       "../rtc_base:rtc_certificate_generator",
       "../test:test_support",
@@ -1583,7 +1582,7 @@ if (rtc_include_tests) {
       ":scoped_refptr",
       ":sequence_checker",
       ":time_controller",
-      "../p2p:rtc_p2p",
+      "../p2p:p2p_constants",
       "../rtc_base:buffer",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
diff --git a/api/test/pclf/BUILD.gn b/api/test/pclf/BUILD.gn
index 2f3c2dd389..e4ae4a5320 100644
--- a/api/test/pclf/BUILD.gn
+++ b/api/test/pclf/BUILD.gn
@@ -74,7 +74,6 @@ rtc_library("media_quality_test_params") {
     "../../../api/video_codecs:video_codecs_api",
     "../../../p2p:connection",
     "../../../p2p:port_allocator",
-    "../../../p2p:rtc_p2p",
     "../../../rtc_base:checks",
     "../../../rtc_base:network",
     "../../../rtc_base:rtc_certificate_generator",
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index aeef257ecf..3c95783dfc 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -711,7 +711,6 @@ if (is_linux || is_chromeos || is_win) {
       "../media:video_common",
       "../p2p:connection",
       "../p2p:port_allocator",
-      "../p2p:rtc_p2p",
       "../pc:video_track_source",
       "../rtc_base:async_dns_resolver",
       "../rtc_base:buffer",
@@ -824,7 +823,6 @@ if (is_linux || is_chromeos || is_win) {
       "../p2p:basic_packet_socket_factory",
       "../p2p:p2p_server_utils",
       "../p2p:port_interface",
-      "../p2p:rtc_p2p",
       "../pc:rtc_pc",
       "../rtc_base:async_udp_socket",
       "../rtc_base:ip_address",
@@ -839,7 +837,6 @@ if (is_linux || is_chromeos || is_win) {
     sources = [ "stunserver/stunserver_main.cc" ]
     deps = [
       "../p2p:p2p_server_utils",
-      "../p2p:rtc_p2p",
       "../pc:rtc_pc",
       "../rtc_base:async_udp_socket",
       "../rtc_base:socket_address",
@@ -879,7 +876,6 @@ if (!build_with_chromium) {
     deps = [
       "../p2p:basic_packet_socket_factory",
       "../p2p:libstunprober",
-      "../p2p:rtc_p2p",
       "../rtc_base:checks",
       "../rtc_base:crypto_random",
       "../rtc_base:logging",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 7a27f40ffe..c4ba3fad40 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -699,7 +699,6 @@ rtc_source_set("rtc_data_sctp_transport_internal") {
     "../api:rtc_error",
     "../api/transport:datagram_transport_interface",
     "../p2p:packet_transport_internal",
-    "../p2p:rtc_p2p",
     "../rtc_base:copy_on_write_buffer",
     "../rtc_base:threading",
   ]
@@ -726,7 +725,6 @@ if (rtc_build_dcsctp) {
       "../net/dcsctp/public:utils",
       "../net/dcsctp/timer:task_queue_timeout",
       "../p2p:packet_transport_internal",
-      "../p2p:rtc_p2p",
       "../rtc_base:checks",
       "../rtc_base:copy_on_write_buffer",
       "../rtc_base:event_tracer",
@@ -837,7 +835,6 @@ if (rtc_include_tests) {
       "../modules/video_coding:video_codec_interface",
       "../modules/video_coding:video_coding_utility",
       "../modules/video_coding/svc:scalability_mode_util",
-      "../p2p:rtc_p2p",
       "../rtc_base:buffer",
       "../rtc_base:byte_order",
       "../rtc_base:checks",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 4bf20a0ea2..0a2d6bfcac 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -73,6 +73,8 @@ rtc_library("rtc_p2p") {
     ":p2p_transport_channel",
     ":p2p_transport_channel_ice_field_trials",
     ":packet_transport_internal",
+    ":port",
+    ":port_allocator",
     ":port_interface",
     ":pseudo_tcp",
     ":regathering_controller",
@@ -1006,8 +1008,11 @@ if (rtc_include_tests) {
     visibility = [ "*" ]
     sources = [ "base/fake_ice_transport.h" ]
     deps = [
+      ":candidate_pair_interface",
+      ":connection",
+      ":connection_info",
       ":ice_transport_internal",
-      ":rtc_p2p",
+      ":port",
       ":transport_description",
       "../api:candidate",
       "../api:ice_transport_interface",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 9bedae8e5c..12ca1bf189 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -93,8 +93,8 @@ rtc_source_set("channel") {
     "../media:rtp_utils",
     "../media:stream_params",
     "../modules/rtp_rtcp:rtp_rtcp_format",
+    "../p2p:basic_packet_socket_factory",
     "../p2p:dtls_transport_internal",
-    "../p2p:rtc_p2p",
     "../rtc_base:async_packet_socket",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
@@ -140,7 +140,6 @@ rtc_source_set("dtls_srtp_transport") {
     "../api:rtc_error",
     "../p2p:dtls_transport_internal",
     "../p2p:packet_transport_internal",
-    "../p2p:rtc_p2p",
     "../rtc_base:buffer",
     "../rtc_base:checks",
     "../rtc_base:logging",
@@ -167,7 +166,6 @@ rtc_source_set("dtls_transport") {
     "../api:sequence_checker",
     "../p2p:dtls_transport",
     "../p2p:dtls_transport_internal",
-    "../p2p:rtc_p2p",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -239,7 +237,6 @@ rtc_source_set("jsep_transport") {
     "../p2p:ice_transport_internal",
     "../p2p:p2p_constants",
     "../p2p:p2p_transport_channel",
-    "../p2p:rtc_p2p",
     "../p2p:transport_description",
     "../p2p:transport_info",
     "../rtc_base:checks",
@@ -266,7 +263,6 @@ rtc_source_set("jsep_transport_collection") {
     "../api:libjingle_peerconnection_api",
     "../api:sequence_checker",
     "../p2p:p2p_constants",
-    "../p2p:rtc_p2p",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -326,7 +322,6 @@ rtc_source_set("jsep_transport_controller") {
     "../p2p:packet_transport_internal",
     "../p2p:port",
     "../p2p:port_allocator",
-    "../p2p:rtc_p2p",
     "../p2p:transport_description",
     "../p2p:transport_info",
     "../rtc_base:callback_list",
@@ -385,7 +380,6 @@ rtc_source_set("media_session") {
     "../media:stream_params",
     "../p2p:ice_credentials_iterator",
     "../p2p:p2p_constants",
-    "../p2p:rtc_p2p",
     "../p2p:transport_description",
     "../p2p:transport_description_factory",
     "../p2p:transport_info",
@@ -506,7 +500,6 @@ rtc_source_set("rtp_transport") {
     "../media:rtp_utils",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:packet_transport_internal",
-    "../p2p:rtc_p2p",
     "../rtc_base:async_packet_socket",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
@@ -530,7 +523,6 @@ rtc_source_set("rtp_transport_internal") {
     ":session_description",
     "../call:rtp_receiver",
     "../p2p:ice_transport_internal",
-    "../p2p:rtc_p2p",
     "../rtc_base:callback_list",
     "../rtc_base:network_route",
     "../rtc_base:ssl_adapter",
@@ -554,7 +546,6 @@ rtc_source_set("sctp_transport") {
     "../api/transport:datagram_transport_interface",
     "../media:rtc_data_sctp_transport_internal",
     "../p2p:dtls_transport_internal",
-    "../p2p:rtc_p2p",
     "../rtc_base:checks",
     "../rtc_base:copy_on_write_buffer",
     "../rtc_base:logging",
@@ -631,7 +622,6 @@ rtc_source_set("srtp_transport") {
     "../media:rtp_utils",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:packet_transport_internal",
-    "../p2p:rtc_p2p",
     "../rtc_base:async_packet_socket",
     "../rtc_base:buffer",
     "../rtc_base:checks",
@@ -659,7 +649,6 @@ rtc_source_set("transport_stats") {
     "../p2p:dtls_transport_internal",
     "../p2p:ice_transport_internal",
     "../p2p:port",
-    "../p2p:rtc_p2p",
     "../rtc_base:ssl_adapter",
     "//third_party/abseil-cpp/absl/strings:string_view",
   ]
@@ -713,7 +702,6 @@ rtc_source_set("session_description") {
     "../media:media_constants",
     "../media:rid_description",
     "../media:stream_params",
-    "../p2p:rtc_p2p",
     "../p2p:transport_description",
     "../p2p:transport_info",
     "../rtc_base:checks",
@@ -822,7 +810,6 @@ rtc_library("connection_context") {
     "../media:media_engine",
     "../media:rtc_data_sctp_transport_factory",
     "../p2p:basic_packet_socket_factory",
-    "../p2p:rtc_p2p",
     "../rtc_base:checks",
     "../rtc_base:crypto_random",
     "../rtc_base:macromagic",
@@ -932,7 +919,6 @@ rtc_source_set("rtc_stats_collector") {
     "../p2p:ice_transport_internal",
     "../p2p:p2p_constants",
     "../p2p:port",
-    "../p2p:rtc_p2p",
     "../rtc_base:checks",
     "../rtc_base:event_tracer",
     "../rtc_base:ip_address",
@@ -1031,7 +1017,6 @@ rtc_source_set("sdp_offer_answer") {
     "../p2p:p2p_transport_channel",
     "../p2p:port",
     "../p2p:port_allocator",
-    "../p2p:rtc_p2p",
     "../p2p:transport_description",
     "../p2p:transport_description_factory",
     "../p2p:transport_info",
@@ -1155,7 +1140,6 @@ rtc_source_set("peer_connection") {
     "../p2p:p2p_transport_channel",
     "../p2p:port",
     "../p2p:port_allocator",
-    "../p2p:rtc_p2p",
     "../p2p:transport_description",
     "../p2p:transport_info",
     "../rtc_base:checks",
@@ -1209,7 +1193,6 @@ rtc_source_set("sdp_utils") {
   deps = [
     ":session_description",
     "../api:libjingle_peerconnection_api",
-    "../p2p:rtc_p2p",
     "../p2p:transport_info",
     "../rtc_base:checks",
     "../rtc_base/system:rtc_export",
@@ -1250,7 +1233,6 @@ rtc_source_set("legacy_stats_collector") {
     "../p2p:ice_transport_internal",
     "../p2p:p2p_constants",
     "../p2p:port",
-    "../p2p:rtc_p2p",
     "../rtc_base:checks",
     "../rtc_base:event_tracer",
     "../rtc_base:ip_address",
@@ -1324,7 +1306,6 @@ rtc_source_set("webrtc_sdp") {
     "../p2p:p2p_constants",
     "../p2p:port",
     "../p2p:port_interface",
-    "../p2p:rtc_p2p",
     "../p2p:transport_description",
     "../p2p:transport_info",
     "../rtc_base:checks",
@@ -1362,7 +1343,6 @@ rtc_source_set("webrtc_session_description_factory") {
     "../api:sequence_checker",
     "../api/task_queue",
     "../call:payload_type",
-    "../p2p:rtc_p2p",
     "../p2p:transport_description",
     "../p2p:transport_description_factory",
     "../rtc_base:checks",
@@ -1393,7 +1373,6 @@ rtc_library("ice_server_parsing") {
     "../p2p:port",
     "../p2p:port_allocator",
     "../p2p:port_interface",
-    "../p2p:rtc_p2p",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
     "../rtc_base:logging",
@@ -1460,7 +1439,6 @@ rtc_source_set("peer_connection_factory") {
     "../p2p:connection",
     "../p2p:default_ice_transport_factory",
     "../p2p:port_allocator",
-    "../p2p:rtc_p2p",
     "../pc:audio_track",
     "../pc:connection_context",
     "../pc:media_factory",
@@ -2058,7 +2036,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../p2p:p2p_constants",
       "../p2p:p2p_test_utils",
       "../p2p:packet_transport_internal",
-      "../p2p:rtc_p2p",
+      "../p2p:port_allocator",
       "../p2p:transport_description",
       "../p2p:transport_description_factory",
       "../p2p:transport_info",
@@ -2152,7 +2130,6 @@ if (rtc_include_tests && !build_with_chromium) {
       "../p2p:p2p_test_utils",
       "../p2p:port_allocator",
       "../p2p:port_interface",
-      "../p2p:rtc_p2p",
       "../rtc_base:checks",
       "../rtc_base:crypto_random",
       "../rtc_base:gunit_helpers",
@@ -2206,7 +2183,6 @@ if (rtc_include_tests && !build_with_chromium) {
       "../p2p:p2p_test_utils",
       "../p2p:port_allocator",
       "../p2p:port_interface",
-      "../p2p:rtc_p2p",
       "../rtc_base:gunit_helpers",
       "../rtc_base:logging",
       "../rtc_base:rtc_base_tests_utils",
@@ -2492,7 +2468,6 @@ if (rtc_include_tests && !build_with_chromium) {
       "../media:rtc_media_tests_utils",
       "../modules/audio_processing",
       "../p2p:p2p_test_utils",
-      "../p2p:rtc_p2p",
       "../rtc_base:safe_conversions",
       "../test:audio_codec_mocks",
       "../test:test_main",
@@ -2616,6 +2591,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../media:stream_params",
       "../modules/audio_processing:audioproc_test_utils",
       "../modules/rtp_rtcp:rtp_rtcp_format",
+      "../p2p:basic_packet_socket_factory",
       "../p2p:basic_port_allocator",
       "../p2p:connection",
       "../p2p:fake_ice_transport",
@@ -2627,7 +2603,6 @@ if (rtc_include_tests && !build_with_chromium) {
       "../p2p:port",
       "../p2p:port_allocator",
       "../p2p:port_interface",
-      "../p2p:rtc_p2p",
       "../rtc_base:checks",
       "../rtc_base:crypto_random",
       "../rtc_base:gunit_helpers",
@@ -2781,7 +2756,6 @@ if (rtc_include_tests && !build_with_chromium) {
       "../p2p:fake_port_allocator",
       "../p2p:p2p_test_utils",
       "../p2p:port_allocator",
-      "../p2p:rtc_p2p",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:logging",
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index 995c3d081a..f8ce64e215 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -45,7 +45,6 @@ if (rtc_enable_protobuf) {
       "../../api/task_queue:pending_task_safety_flag",
       "../../api/units:timestamp",
       "../../p2p:basic_packet_socket_factory",
-      "../../p2p:rtc_p2p",
       "../../rtc_base:async_packet_socket",
       "../../rtc_base:checks",
       "../../rtc_base:ip_address",
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index e8957f1083..65e460a303 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -462,20 +462,14 @@ if (!build_with_chromium) {
 
 webrtc_fuzzer_test("stun_parser_fuzzer") {
   sources = [ "stun_parser_fuzzer.cc" ]
-  deps = [
-    "../../api/transport:stun_types",
-    "../../p2p:rtc_p2p",
-  ]
+  deps = [ "../../api/transport:stun_types" ]
   seed_corpus = "corpora/stun-corpus"
   dict = "corpora/stun.tokens"
 }
 
 webrtc_fuzzer_test("stun_validator_fuzzer") {
   sources = [ "stun_validator_fuzzer.cc" ]
-  deps = [
-    "../../api/transport:stun_types",
-    "../../p2p:rtc_p2p",
-  ]
+  deps = [ "../../api/transport:stun_types" ]
   seed_corpus = "corpora/stun-corpus"
   dict = "corpora/stun.tokens"
 }
@@ -484,7 +478,6 @@ webrtc_fuzzer_test("pseudotcp_parser_fuzzer") {
   sources = [ "pseudotcp_parser_fuzzer.cc" ]
   deps = [
     "../../p2p:pseudo_tcp",
-    "../../p2p:rtc_p2p",
     "../../rtc_base:threading",
   ]
 }
diff --git a/test/network/BUILD.gn b/test/network/BUILD.gn
index 18d1ca6fcd..d1ba8f57fc 100644
--- a/test/network/BUILD.gn
+++ b/test/network/BUILD.gn
@@ -59,7 +59,6 @@ rtc_library("emulated_network") {
     "../../api/units:timestamp",
     "../../p2p:basic_packet_socket_factory",
     "../../p2p:p2p_server_utils",
-    "../../p2p:rtc_p2p",
     "../../rtc_base:async_packet_socket",
     "../../rtc_base:checks",
     "../../rtc_base:copy_on_write_buffer",
@@ -113,7 +112,6 @@ if (rtc_include_tests && !build_with_chromium) {
       "../../modules/audio_device:test_audio_device_module",
       "../../p2p:basic_packet_socket_factory",
       "../../p2p:basic_port_allocator",
-      "../../p2p:rtc_p2p",
       "../../pc:pc_test_utils",
       "../../pc:peerconnection_wrapper",
       "../../rtc_base:gunit_helpers",
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index d0298af44a..94e6c62a1f 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -122,7 +122,7 @@ if (!build_with_chromium) {
         "../../../modules/audio_device:test_audio_device_module",
         "../../../modules/audio_processing/aec_dump",
         "../../../p2p:basic_port_allocator",
-        "../../../p2p:rtc_p2p",
+        "../../../p2p:port_allocator",
         "../../../pc:pc_test_utils",
         "../../../rtc_base:checks",
         "../../../rtc_base:threading",
@@ -334,7 +334,6 @@ if (!build_with_chromium) {
         "../../../media:media_constants",
         "../../../media:rtc_audio_video",
         "../../../modules/audio_device:audio_device_impl",
-        "../../../p2p:rtc_p2p",
         "../../../pc:pc_test_utils",
         "../../../pc:peerconnection_wrapper",
         "../../../rtc_base:gunit_helpers",
@@ -595,7 +594,6 @@ if (!build_with_chromium) {
       "../../../media:media_constants",
       "../../../media:rid_description",
       "../../../p2p:p2p_constants",
-      "../../../p2p:rtc_p2p",
       "../../../pc:sdp_utils",
       "../../../pc:session_description",
       "../../../pc:simulcast_description",
diff --git a/test/peer_scenario/BUILD.gn b/test/peer_scenario/BUILD.gn
index 793dd0663c..335f7f322d 100644
--- a/test/peer_scenario/BUILD.gn
+++ b/test/peer_scenario/BUILD.gn
@@ -65,7 +65,8 @@ if (rtc_include_tests) {
       "../../modules/rtp_rtcp:rtp_rtcp_format",
       "../../p2p:basic_port_allocator",
       "../../p2p:dtls_transport_internal",
-      "../../p2p:rtc_p2p",
+      "../../p2p:p2p_constants",
+      "../../p2p:port_allocator",
       "../../p2p:transport_description",
       "../../pc:channel",
       "../../pc:dtls_transport",