diff --git a/api/BUILD.gn b/api/BUILD.gn
index fb22de639a..bc3d649e70 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -158,7 +158,6 @@ rtc_static_library("libjingle_peerconnection_api") {
     "../rtc_base:deprecation",
     "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
-    "../rtc_base:stringutils",
     "../rtc_base/system:rtc_export",
   ]
 
diff --git a/api/video_codecs/video_codec.cc b/api/video_codecs/video_codec.cc
index a52f3981ae..ab73426d13 100644
--- a/api/video_codecs/video_codec.cc
+++ b/api/video_codecs/video_codec.cc
@@ -15,7 +15,6 @@
 
 #include "absl/strings/match.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/stringutils.h"
 
 namespace webrtc {
 
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 3d53c278b9..d6e1ae7f10 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -78,7 +78,6 @@ rtc_static_library("audio") {
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:safe_minmax",
-    "../rtc_base:stringutils",
     "../system_wrappers",
     "../system_wrappers:field_trial",
     "../system_wrappers:metrics",
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 041bf3e0c2..3fded23736 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -698,7 +698,6 @@ if (is_linux || is_win) {
       "../media:rtc_media_base",
       "../p2p:rtc_p2p",
       "../rtc_base:checks",
-      "../rtc_base:stringutils",
       "../rtc_base/third_party/sigslot",
       "../system_wrappers:field_trial",
       "../test:field_trial",
@@ -763,7 +762,6 @@ if (is_linux || is_win) {
     ]
     deps = [
       "../rtc_base:rtc_base_approved",
-      "../rtc_base:stringutils",
       "../rtc_tools:command_line_parser",
       "../system_wrappers:field_trial",
       "../test:field_trial",
@@ -933,7 +931,6 @@ if (!build_with_chromium) {
       "../rtc_base:checks",
       "../rtc_base:rtc_base",
       "../rtc_base:rtc_base_approved",
-      "../rtc_base:stringutils",
     ]
   }
 }
diff --git a/media/engine/webrtcvideoengine.cc b/media/engine/webrtcvideoengine.cc
index e4292314b8..a6c6248326 100644
--- a/media/engine/webrtcvideoengine.cc
+++ b/media/engine/webrtcvideoengine.cc
@@ -32,7 +32,6 @@
 #include "rtc_base/copyonwritebuffer.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/stringutils.h"
 #include "rtc_base/timeutils.h"
 #include "rtc_base/trace_event.h"
 #include "system_wrappers/include/field_trial.h"
diff --git a/media/engine/webrtcvideoengine_unittest.cc b/media/engine/webrtcvideoengine_unittest.cc
index 5e8183670a..f63c2c0a3d 100644
--- a/media/engine/webrtcvideoengine_unittest.cc
+++ b/media/engine/webrtcvideoengine_unittest.cc
@@ -49,7 +49,6 @@
 #include "rtc_base/fakeclock.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/stringutils.h"
 #include "test/field_trial.h"
 #include "test/gmock.h"
 
diff --git a/media/sctp/sctptransport.cc b/media/sctp/sctptransport.cc
index 4ffaaf7f5a..04a6ca04d1 100644
--- a/media/sctp/sctptransport.cc
+++ b/media/sctp/sctptransport.cc
@@ -36,7 +36,6 @@ enum PreservedErrno {
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/stringutils.h"
 #include "rtc_base/thread_checker.h"
 #include "rtc_base/trace_event.h"
 #include "usrsctplib/usrsctp.h"
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index 66b07df199..9b59558f89 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -331,7 +331,6 @@ rtc_source_set("apm_logging") {
     "../../common_audio:common_audio",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
-    "../../rtc_base:stringutils",
   ]
   defines = []
 }
@@ -583,7 +582,6 @@ if (rtc_include_tests) {
         "../../rtc_base:rtc_base_approved",
         "../../rtc_base:rtc_json",
         "../../rtc_base:rtc_task_queue",
-        "../../rtc_base:stringutils",
         "../../system_wrappers",
         "../../test:test_support",
         "aec_dump",
diff --git a/modules/audio_processing/test/audio_processing_simulator.cc b/modules/audio_processing/test/audio_processing_simulator.cc
index df9f4976be..331d7e508f 100644
--- a/modules/audio_processing/test/audio_processing_simulator.cc
+++ b/modules/audio_processing/test/audio_processing_simulator.cc
@@ -31,7 +31,6 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/strings/json.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/stringutils.h"
 
 namespace webrtc {
 namespace test {
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index e7f93eb291..d416d44bd3 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -215,7 +215,6 @@ rtc_static_library("rtp_rtcp") {
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:safe_minmax",
     "../../rtc_base:sequenced_task_checker",
-    "../../rtc_base:stringutils",
     "../../rtc_base/system:fallthrough",
     "../../rtc_base/time:timestamp_extrapolator",
     "../../system_wrappers",
diff --git a/modules/rtp_rtcp/source/rtp_utility.cc b/modules/rtp_rtcp/source/rtp_utility.cc
index 44c671f506..9db5ed914a 100644
--- a/modules/rtp_rtcp/source/rtp_utility.cc
+++ b/modules/rtp_rtcp/source/rtp_utility.cc
@@ -24,7 +24,6 @@
 #include "modules/video_coding/codecs/interface/common_constants.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/stringutils.h"
 
 namespace webrtc {
 
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 7d26947e5e..6695458aae 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -92,7 +92,6 @@ rtc_static_library("rtc_p2p") {
     "../rtc_base:checks",
     "../rtc_base:rtc_base",
     "../rtc_base:safe_minmax",
-    "../rtc_base:stringutils",
     "../rtc_base:weak_ptr",
     "../rtc_base/network:sent_packet",
     "../rtc_base/system:rtc_export",
@@ -184,7 +183,6 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_base",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
-      "../rtc_base:stringutils",
       "../rtc_base:testclient",
       "../rtc_base/network:sent_packet",
       "../rtc_base/third_party/sigslot:sigslot",
diff --git a/p2p/base/dtlstransport_unittest.cc b/p2p/base/dtlstransport_unittest.cc
index 824c39f44a..5eec2e4bdc 100644
--- a/p2p/base/dtlstransport_unittest.cc
+++ b/p2p/base/dtlstransport_unittest.cc
@@ -24,7 +24,6 @@
 #include "rtc_base/ssladapter.h"
 #include "rtc_base/sslidentity.h"
 #include "rtc_base/sslstreamadapter.h"
-#include "rtc_base/stringutils.h"
 
 #define MAYBE_SKIP_TEST(feature)                                  \
   if (!(rtc::SSLStreamAdapter::feature())) {                      \
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 0fb619ce2d..e8ac9b960a 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -90,7 +90,6 @@ rtc_static_library("rtc_pc_base") {
     "../rtc_base:checks",
     "../rtc_base:rtc_base",
     "../rtc_base:rtc_task_queue",
-    "../rtc_base:stringutils",
     "../rtc_base/third_party/base64",
     "../rtc_base/third_party/sigslot",
     "../system_wrappers:metrics",
@@ -214,7 +213,6 @@ rtc_static_library("peerconnection") {
     "../rtc_base:checks",
     "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
-    "../rtc_base:stringutils",
     "../rtc_base/experiments:congestion_controller_experiment",
     "../rtc_base/system:rtc_export",
     "../rtc_base/third_party/base64",
@@ -520,7 +518,6 @@ if (rtc_include_tests) {
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:rtc_base_tests_utils",
-      "../rtc_base:stringutils",
       "../rtc_base/third_party/base64",
       "../rtc_base/third_party/sigslot:sigslot",
       "../system_wrappers:metrics",
diff --git a/pc/mediasession.cc b/pc/mediasession.cc
index 47a84e7217..27660d898a 100644
--- a/pc/mediasession.cc
+++ b/pc/mediasession.cc
@@ -31,7 +31,6 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/stringutils.h"
 #include "rtc_base/third_party/base64/base64.h"
 
 namespace {
diff --git a/pc/peerconnection_signaling_unittest.cc b/pc/peerconnection_signaling_unittest.cc
index f57f806b64..d90411c61c 100644
--- a/pc/peerconnection_signaling_unittest.cc
+++ b/pc/peerconnection_signaling_unittest.cc
@@ -29,7 +29,6 @@
 #include "pc/test/fakeaudiocapturemodule.h"
 #include "pc/test/fakertccertificategenerator.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/stringutils.h"
 #include "rtc_base/virtualsocketserver.h"
 #include "test/gmock.h"
 
diff --git a/pc/peerconnectionendtoend_unittest.cc b/pc/peerconnectionendtoend_unittest.cc
index dee253b7c7..18f3563c4d 100644
--- a/pc/peerconnectionendtoend_unittest.cc
+++ b/pc/peerconnectionendtoend_unittest.cc
@@ -21,7 +21,6 @@
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/stringutils.h"
 
 #ifdef WEBRTC_ANDROID
 #include "pc/test/androidtestinitializer.h"
diff --git a/pc/rtcstatscollector_unittest.cc b/pc/rtcstatscollector_unittest.cc
index adca9ef6c4..2be4371f41 100644
--- a/pc/rtcstatscollector_unittest.cc
+++ b/pc/rtcstatscollector_unittest.cc
@@ -35,7 +35,6 @@
 #include "rtc_base/fakesslidentity.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/stringutils.h"
 #include "rtc_base/timeutils.h"
 
 using testing::AtLeast;
diff --git a/pc/webrtcsdp.cc b/pc/webrtcsdp.cc
index 0a0d659058..5707b3c42b 100644
--- a/pc/webrtcsdp.cc
+++ b/pc/webrtcsdp.cc
@@ -45,7 +45,6 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/messagedigest.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/stringutils.h"
 
 using cricket::AudioContentDescription;
 using cricket::Candidate;
diff --git a/rtc_base/httpcommon.cc b/rtc_base/httpcommon.cc
index 13d0c1a890..4640363b69 100644
--- a/rtc_base/httpcommon.cc
+++ b/rtc_base/httpcommon.cc
@@ -31,7 +31,6 @@
 #include "rtc_base/messagedigest.h"
 #include "rtc_base/socketaddress.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/stringutils.h"
 #include "rtc_base/third_party/base64/base64.h"  // for Base64
 #include "rtc_base/zero_memory.h"                // for ExplicitZeroMemory
 
diff --git a/rtc_base/macutils.cc b/rtc_base/macutils.cc
index 2b8700f4d6..67fb69ca60 100644
--- a/rtc_base/macutils.cc
+++ b/rtc_base/macutils.cc
@@ -16,7 +16,6 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/macutils.h"
-#include "rtc_base/stringutils.h"
 
 namespace rtc {
 
diff --git a/rtc_base/opensslstreamadapter.cc b/rtc_base/opensslstreamadapter.cc
index 727cb84aae..2682013ba9 100644
--- a/rtc_base/opensslstreamadapter.cc
+++ b/rtc_base/opensslstreamadapter.cc
@@ -34,7 +34,6 @@
 #include "rtc_base/opensslidentity.h"
 #include "rtc_base/sslcertificate.h"
 #include "rtc_base/stream.h"
-#include "rtc_base/stringutils.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/timeutils.h"
 
diff --git a/rtc_base/socketadapters.cc b/rtc_base/socketadapters.cc
index 9587d8dfc0..3fe88d51da 100644
--- a/rtc_base/socketadapters.cc
+++ b/rtc_base/socketadapters.cc
@@ -37,7 +37,6 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/socketadapters.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/stringutils.h"
 #include "rtc_base/zero_memory.h"
 
 namespace rtc {
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 638688dc59..8efb2f8ed8 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -762,7 +762,6 @@ if (is_android) {
       "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_task_queue",
-      "../../rtc_base:stringutils",
       "../../system_wrappers:field_trial",
       "//third_party/abseil-cpp/absl/memory",
       "//third_party/abseil-cpp/absl/types:optional",
diff --git a/sdk/android/src/jni/pc/peerconnectionfactory.cc b/sdk/android/src/jni/pc/peerconnectionfactory.cc
index 6743a869eb..79d182ca44 100644
--- a/sdk/android/src/jni/pc/peerconnectionfactory.cc
+++ b/sdk/android/src/jni/pc/peerconnectionfactory.cc
@@ -22,7 +22,6 @@
 // The user may pass in a nullptr.
 #include "modules/audio_processing/include/audio_processing.h"  // nogncheck
 #include "rtc_base/event_tracer.h"
-#include "rtc_base/stringutils.h"
 #include "rtc_base/thread.h"
 #include "sdk/android/generated_peerconnection_jni/jni/PeerConnectionFactory_jni.h"
 #include "sdk/android/native_api/jni/java_types.h"
diff --git a/test/scenario/BUILD.gn b/test/scenario/BUILD.gn
index 206a31b374..b401947a56 100644
--- a/test/scenario/BUILD.gn
+++ b/test/scenario/BUILD.gn
@@ -87,7 +87,6 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_task_queue",
       "../../rtc_base:safe_minmax",
       "../../rtc_base:sequenced_task_checker",
-      "../../rtc_base:stringutils",
       "../../system_wrappers",
       "../../system_wrappers:field_trial",
       "../../video",
diff --git a/test/scenario/scenario_tests/BUILD.gn b/test/scenario/scenario_tests/BUILD.gn
index b4d5948bc8..4f8f769cf3 100644
--- a/test/scenario/scenario_tests/BUILD.gn
+++ b/test/scenario/scenario_tests/BUILD.gn
@@ -23,7 +23,6 @@ if (rtc_include_tests) {
       "../../:test_support",
       "../../../modules/congestion_controller/bbr",
       "../../../rtc_base:rtc_base_approved",
-      "../../../rtc_base:stringutils",
       "../../../rtc_base/experiments:field_trial_parser",
       "//testing/gtest",
     ]