diff --git a/net/dcsctp/common/BUILD.gn b/net/dcsctp/common/BUILD.gn
index 72b3f505e5..6e99cdcef4 100644
--- a/net/dcsctp/common/BUILD.gn
+++ b/net/dcsctp/common/BUILD.gn
@@ -9,7 +9,10 @@
 import("../../../webrtc.gni")
 
 rtc_source_set("internal_types") {
-  deps = [ "../public:strong_alias" ]
+  deps = [
+    "../public:strong_alias",
+    "../public:types",
+  ]
   sources = [ "internal_types.h" ]
 }
 
diff --git a/net/dcsctp/rx/BUILD.gn b/net/dcsctp/rx/BUILD.gn
index 75312b96da..55d3aa64dd 100644
--- a/net/dcsctp/rx/BUILD.gn
+++ b/net/dcsctp/rx/BUILD.gn
@@ -14,16 +14,28 @@ rtc_library("data_tracker") {
     "../../../rtc_base",
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
+    "../common:sequence_numbers",
+    "../packet:chunk",
+    "../packet:data",
+    "../timer",
   ]
   sources = [
     "data_tracker.cc",
     "data_tracker.h",
   ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
 }
 
 rtc_source_set("reassembly_streams") {
-  deps = [ "../packet:chunk" ]
+  deps = [
+    "../../../api:array_view",
+    "../common:sequence_numbers",
+    "../packet:chunk",
+    "../packet:data",
+    "../public:types",
+  ]
   sources = [ "reassembly_streams.h" ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
 }
 
 rtc_library("traditional_reassembly_streams") {
@@ -33,25 +45,43 @@ rtc_library("traditional_reassembly_streams") {
     "../../../rtc_base",
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
+    "../common:sequence_numbers",
+    "../packet:chunk",
+    "../packet:data",
+    "../public:types",
   ]
   sources = [
     "traditional_reassembly_streams.cc",
     "traditional_reassembly_streams.h",
   ]
+  absl_deps = [
+    "//third_party/abseil-cpp/absl/algorithm:container",
+    "//third_party/abseil-cpp/absl/strings",
+    "//third_party/abseil-cpp/absl/types:optional",
+  ]
 }
 
 rtc_library("reassembly_queue") {
   deps = [
+    ":reassembly_streams",
     ":traditional_reassembly_streams",
     "../../../api:array_view",
     "../../../rtc_base",
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
+    "../common:internal_types",
+    "../common:sequence_numbers",
+    "../common:str_join",
+    "../packet:chunk",
+    "../packet:data",
+    "../packet:parameter",
+    "../public:types",
   ]
   sources = [
     "reassembly_queue.cc",
     "reassembly_queue.h",
   ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
 }
 
 if (rtc_include_tests) {
diff --git a/net/dcsctp/socket/BUILD.gn b/net/dcsctp/socket/BUILD.gn
index b48c3f6097..73d3ef2760 100644
--- a/net/dcsctp/socket/BUILD.gn
+++ b/net/dcsctp/socket/BUILD.gn
@@ -16,6 +16,7 @@ rtc_source_set("context") {
     "../public:socket",
     "../public:types",
   ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
 }
 
 rtc_library("heartbeat_handler") {
@@ -25,12 +26,22 @@ rtc_library("heartbeat_handler") {
     "../../../rtc_base",
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
+    "../packet:bounded_io",
+    "../packet:chunk",
+    "../packet:parameter",
+    "../packet:sctp_packet",
+    "../public:socket",
     "../public:types",
+    "../timer",
   ]
   sources = [
     "heartbeat_handler.cc",
     "heartbeat_handler.h",
   ]
+  absl_deps = [
+    "//third_party/abseil-cpp/absl/strings",
+    "//third_party/abseil-cpp/absl/types:optional",
+  ]
 }
 
 rtc_library("stream_reset_handler") {
@@ -40,12 +51,24 @@ rtc_library("stream_reset_handler") {
     "../../../rtc_base",
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
+    "../common:internal_types",
+    "../common:str_join",
+    "../packet:chunk",
+    "../packet:parameter",
+    "../packet:sctp_packet",
+    "../packet:tlv_trait",
+    "../public:socket",
     "../public:types",
+    "../rx:data_tracker",
+    "../rx:reassembly_queue",
+    "../timer",
+    "../tx:retransmission_queue",
   ]
   sources = [
     "stream_reset_handler.cc",
     "stream_reset_handler.h",
   ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
 }
 
 rtc_library("transmission_control_block") {
@@ -58,12 +81,13 @@ rtc_library("transmission_control_block") {
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
     "../common:sequence_numbers",
+    "../packet:chunk",
     "../packet:sctp_packet",
     "../public:socket",
     "../public:types",
     "../rx:data_tracker",
     "../rx:reassembly_queue",
-    "../timer:timer",
+    "../timer",
     "../tx:retransmission_error_counter",
     "../tx:retransmission_queue",
     "../tx:retransmission_timeout",
@@ -74,19 +98,43 @@ rtc_library("transmission_control_block") {
     "transmission_control_block.cc",
     "transmission_control_block.h",
   ]
+  absl_deps = [
+    "//third_party/abseil-cpp/absl/strings",
+    "//third_party/abseil-cpp/absl/types:optional",
+  ]
 }
 
 rtc_library("dcsctp_socket") {
   deps = [
     ":context",
+    ":heartbeat_handler",
+    ":stream_reset_handler",
     ":transmission_control_block",
     "../../../api:array_view",
+    "../../../api:refcountedbase",
+    "../../../api:scoped_refptr",
     "../../../rtc_base",
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
+    "../common:internal_types",
+    "../packet:bounded_io",
+    "../packet:chunk",
     "../packet:chunk_validators",
+    "../packet:data",
+    "../packet:error_cause",
+    "../packet:parameter",
+    "../packet:sctp_packet",
+    "../packet:tlv_trait",
+    "../public:socket",
     "../public:types",
+    "../rx:data_tracker",
+    "../rx:reassembly_queue",
+    "../timer",
     "../tx:fcfs_send_queue",
+    "../tx:retransmission_error_counter",
+    "../tx:retransmission_queue",
+    "../tx:retransmission_timeout",
+    "../tx:send_queue",
   ]
   sources = [
     "callback_deferrer.h",
@@ -95,6 +143,10 @@ rtc_library("dcsctp_socket") {
     "state_cookie.cc",
     "state_cookie.h",
   ]
+  absl_deps = [
+    "//third_party/abseil-cpp/absl/strings",
+    "//third_party/abseil-cpp/absl/types:optional",
+  ]
 }
 
 if (rtc_include_tests) {
diff --git a/net/dcsctp/timer/BUILD.gn b/net/dcsctp/timer/BUILD.gn
index 8eec923a2b..6354de01fb 100644
--- a/net/dcsctp/timer/BUILD.gn
+++ b/net/dcsctp/timer/BUILD.gn
@@ -14,6 +14,7 @@ rtc_library("timer") {
     "../../../rtc_base",
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
+    "../public:socket",
     "../public:strong_alias",
     "../public:types",
   ]
@@ -22,6 +23,10 @@ rtc_library("timer") {
     "timer.cc",
     "timer.h",
   ]
+  absl_deps = [
+    "//third_party/abseil-cpp/absl/strings",
+    "//third_party/abseil-cpp/absl/types:optional",
+  ]
 }
 
 if (rtc_include_tests) {
diff --git a/net/dcsctp/tx/BUILD.gn b/net/dcsctp/tx/BUILD.gn
index 47d665f139..db11d29399 100644
--- a/net/dcsctp/tx/BUILD.gn
+++ b/net/dcsctp/tx/BUILD.gn
@@ -10,11 +10,14 @@ import("../../../webrtc.gni")
 
 rtc_source_set("send_queue") {
   deps = [
+    "../../../api:array_view",
     "../common:internal_types",
     "../packet:chunk",
+    "../packet:data",
     "../public:types",
   ]
   sources = [ "send_queue.h" ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
 }
 
 rtc_library("fcfs_send_queue") {
@@ -23,28 +26,41 @@ rtc_library("fcfs_send_queue") {
     "../../../api:array_view",
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
+    "../common:pair_hash",
+    "../packet:data",
+    "../public:socket",
+    "../public:types",
   ]
   sources = [
     "fcfs_send_queue.cc",
     "fcfs_send_queue.h",
   ]
+  absl_deps = [
+    "//third_party/abseil-cpp/absl/algorithm:container",
+    "//third_party/abseil-cpp/absl/algorithm:container",
+    "//third_party/abseil-cpp/absl/strings",
+    "//third_party/abseil-cpp/absl/types:optional",
+  ]
 }
 
 rtc_library("retransmission_error_counter") {
   deps = [
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
+    "../public:types",
   ]
   sources = [
     "retransmission_error_counter.cc",
     "retransmission_error_counter.h",
   ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
 }
 
 rtc_library("retransmission_timeout") {
   deps = [
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
+    "../public:types",
   ]
   sources = [
     "retransmission_timeout.cc",
@@ -54,15 +70,28 @@ rtc_library("retransmission_timeout") {
 
 rtc_library("retransmission_queue") {
   deps = [
+    ":retransmission_timeout",
     ":send_queue",
     "../../../api:array_view",
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
+    "../common:math",
+    "../common:pair_hash",
+    "../common:sequence_numbers",
+    "../common:str_join",
+    "../packet:chunk",
+    "../packet:data",
+    "../public:types",
+    "../timer",
   ]
   sources = [
     "retransmission_queue.cc",
     "retransmission_queue.h",
   ]
+  absl_deps = [
+    "//third_party/abseil-cpp/absl/strings",
+    "//third_party/abseil-cpp/absl/types:optional",
+  ]
 }
 
 if (rtc_include_tests) {