diff --git a/call/BUILD.gn b/call/BUILD.gn
index 8e026d5bf7..dd2d014b84 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -43,6 +43,7 @@ rtc_source_set("call_interfaces") {
     "../rtc_base:audio_format_to_string",
     "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
+    "../rtc_base/network:sent_packet",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
@@ -427,6 +428,7 @@ if (rtc_include_tests) {
       "../modules/pacing",
       "../rtc_base:rate_limiter",
       "../rtc_base:rtc_base",
+      "../rtc_base/network:sent_packet",
       "../test:test_support",
     ]
   }
diff --git a/call/call.h b/call/call.h
index 4167296d75..40941e0d91 100644
--- a/call/call.h
+++ b/call/call.h
@@ -27,8 +27,8 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "rtc_base/bitrateallocationstrategy.h"
 #include "rtc_base/copyonwritebuffer.h"
+#include "rtc_base/network/sent_packet.h"
 #include "rtc_base/networkroute.h"
-#include "rtc_base/socket.h"
 
 namespace webrtc {
 
diff --git a/call/test/mock_rtp_transport_controller_send.h b/call/test/mock_rtp_transport_controller_send.h
index 37587b2b76..88d0469cbe 100644
--- a/call/test/mock_rtp_transport_controller_send.h
+++ b/call/test/mock_rtp_transport_controller_send.h
@@ -20,9 +20,9 @@
 #include "call/rtp_transport_controller_send_interface.h"
 #include "modules/congestion_controller/include/network_changed_observer.h"
 #include "modules/pacing/packet_router.h"
+#include "rtc_base/network/sent_packet.h"
 #include "rtc_base/networkroute.h"
 #include "rtc_base/rate_limiter.h"
-#include "rtc_base/socket.h"
 #include "test/gmock.h"
 
 namespace webrtc {
diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn
index 5c1a610e2a..c2e4ea269d 100644
--- a/modules/congestion_controller/BUILD.gn
+++ b/modules/congestion_controller/BUILD.gn
@@ -41,6 +41,7 @@ rtc_static_library("congestion_controller") {
     "../../rtc_base:checks",
     "../../rtc_base:ptr_util",
     "../../rtc_base:rate_limiter",
+    "../../rtc_base/network:sent_packet",
     "../../system_wrappers",
     "../../system_wrappers:field_trial",
     "../bitrate_controller",
@@ -110,6 +111,7 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_base_tests_utils",
+      "../../rtc_base/network:sent_packet",
       "../../system_wrappers",
       "../../test:field_trial",
       "../../test:test_support",
diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn
index 2147548cd2..5ee6b4f537 100644
--- a/modules/congestion_controller/rtp/BUILD.gn
+++ b/modules/congestion_controller/rtp/BUILD.gn
@@ -43,6 +43,7 @@ rtc_static_library("congestion_controller") {
     "../../../rtc_base:safe_minmax",
     "../../../rtc_base:sequenced_task_checker",
     "../../../rtc_base/experiments:congestion_controller_experiment",
+    "../../../rtc_base/network:sent_packet",
     "../../../system_wrappers",
     "../../../system_wrappers:field_trial",
     "../../pacing",
@@ -131,6 +132,7 @@ if (rtc_include_tests) {
       "../../../rtc_base:rtc_base",
       "../../../rtc_base:rtc_base_approved",
       "../../../rtc_base:rtc_base_tests_utils",
+      "../../../rtc_base/network:sent_packet",
       "../../../system_wrappers",
       "../../../test:field_trial",
       "../../../test:test_support",
diff --git a/modules/congestion_controller/rtp/send_side_congestion_controller.cc b/modules/congestion_controller/rtp/send_side_congestion_controller.cc
index 26603d95b2..e2e9587cb1 100644
--- a/modules/congestion_controller/rtp/send_side_congestion_controller.cc
+++ b/modules/congestion_controller/rtp/send_side_congestion_controller.cc
@@ -23,11 +23,11 @@
 #include "rtc_base/event.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/network/sent_packet.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/rate_limiter.h"
 #include "rtc_base/sequenced_task_checker.h"
-#include "rtc_base/socket.h"
 #include "rtc_base/timeutils.h"
 #include "system_wrappers/include/field_trial.h"
 
diff --git a/modules/congestion_controller/rtp/send_side_congestion_controller_unittest.cc b/modules/congestion_controller/rtp/send_side_congestion_controller_unittest.cc
index 66ec5783c8..6ed7a49553 100644
--- a/modules/congestion_controller/rtp/send_side_congestion_controller_unittest.cc
+++ b/modules/congestion_controller/rtp/send_side_congestion_controller_unittest.cc
@@ -17,7 +17,7 @@
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
-#include "rtc_base/socket.h"
+#include "rtc_base/network/sent_packet.h"
 #include "system_wrappers/include/clock.h"
 #include "test/field_trial.h"
 #include "test/gmock.h"
diff --git a/modules/congestion_controller/send_side_congestion_controller.cc b/modules/congestion_controller/send_side_congestion_controller.cc
index f26e162239..5b5443f83c 100644
--- a/modules/congestion_controller/send_side_congestion_controller.cc
+++ b/modules/congestion_controller/send_side_congestion_controller.cc
@@ -25,9 +25,9 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/network/sent_packet.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/rate_limiter.h"
-#include "rtc_base/socket.h"
 #include "rtc_base/timeutils.h"
 #include "system_wrappers/include/field_trial.h"
 
diff --git a/modules/congestion_controller/send_side_congestion_controller_unittest.cc b/modules/congestion_controller/send_side_congestion_controller_unittest.cc
index 3653b8c22f..5f58f21cdf 100644
--- a/modules/congestion_controller/send_side_congestion_controller_unittest.cc
+++ b/modules/congestion_controller/send_side_congestion_controller_unittest.cc
@@ -18,7 +18,7 @@
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
-#include "rtc_base/socket.h"
+#include "rtc_base/network/sent_packet.h"
 #include "system_wrappers/include/clock.h"
 #include "test/field_trial.h"
 #include "test/gmock.h"