diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 09d31a5d12..2e7ac14b6b 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -236,8 +236,6 @@ rtc_library("peerconnection") {
   sources = [
     "data_channel_controller.cc",
     "data_channel_controller.h",
-    "data_channel_utils.cc",
-    "data_channel_utils.h",
     "ice_server_parsing.cc",
     "ice_server_parsing.h",
     "jsep_ice_candidate.cc",
@@ -255,8 +253,6 @@ rtc_library("peerconnection") {
     "rtc_stats_collector.h",
     "rtc_stats_traversal.cc",
     "rtc_stats_traversal.h",
-    "sctp_data_channel.cc",
-    "sctp_data_channel.h",
     "sdp_offer_answer.cc",  # TODO: Make separate target when not circular
     "sdp_offer_answer.h",  # dependent on peerconnection.h
     "sdp_serializer.cc",
@@ -278,6 +274,7 @@ rtc_library("peerconnection") {
     ":audio_rtp_receiver",
     ":audio_track",
     ":connection_context",
+    ":data_channel_utils",
     ":dtmf_sender",
     ":jitter_buffer_delay",
     ":media_protocol_names",
@@ -291,6 +288,7 @@ rtc_library("peerconnection") {
     ":rtp_sender",
     ":rtp_transceiver",
     ":rtp_transmission_manager",
+    ":sctp_data_channel",
     ":sdp_state_provider",
     ":session_description",
     ":simulcast_description",
@@ -387,6 +385,50 @@ rtc_library("peerconnection") {
   ]
 }
 
+rtc_library("sctp_data_channel") {
+  sources = [
+    "sctp_data_channel.cc",
+    "sctp_data_channel.h",
+  ]
+  deps = [
+    ":data_channel_utils",
+    ":proxy",
+    ":rtc_pc_base",
+    "../api:libjingle_peerconnection_api",
+    "../api:priority",
+    "../api:rtc_error",
+    "../api:scoped_refptr",
+    "../api/transport:datagram_transport_interface",
+    "../media:rtc_data_sctp_transport_internal",
+    "../media:rtc_media_base",
+    "../rtc_base:checks",
+    "../rtc_base:logging",
+    "../rtc_base:macromagic",
+    "../rtc_base:refcount",
+    "../rtc_base:rtc_base",
+    "../rtc_base:rtc_base_approved",
+    "../rtc_base:rtc_base_approved",
+    "../rtc_base:threading",
+    "../rtc_base:threading",
+    "../rtc_base/system:unused",
+    "../rtc_base/task_utils:to_queued_task",
+    "../rtc_base/third_party/sigslot:sigslot",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+}
+
+rtc_library("data_channel_utils") {
+  sources = [
+    "data_channel_utils.cc",
+    "data_channel_utils.h",
+  ]
+  deps = [
+    "../api:libjingle_peerconnection_api",
+    "../media:rtc_media_base",
+    "../rtc_base:checks",
+  ]
+}
+
 rtc_library("connection_context") {
   sources = [
     "connection_context.cc",
@@ -1084,6 +1126,7 @@ if (rtc_include_tests && !build_with_chromium) {
       ":rtp_receiver",
       ":rtp_sender",
       ":rtp_transceiver",
+      ":sctp_data_channel",
       ":session_description",
       ":usage_pattern",
       ":video_rtp_receiver",
@@ -1363,6 +1406,7 @@ if (rtc_include_tests && !build_with_chromium) {
       ":rtc_pc_base",
       ":rtp_receiver",
       ":rtp_sender",
+      ":sctp_data_channel",
       ":video_track_source",
       "../api:audio_options_api",
       "../api:create_frame_generator",