diff --git a/api/BUILD.gn b/api/BUILD.gn
index d8b49877ff..b8c80311fb 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -193,6 +193,7 @@ rtc_library("libjingle_peerconnection_api") {
     "../rtc_base:logging",
     "../rtc_base:network_constants",
     "../rtc_base:refcount",
+    "../rtc_base:stringutils",
     "adaptation:resource_adaptation_api",
     "audio:audio_mixer_api",
     "audio_codecs:audio_codecs_api",
diff --git a/api/audio/BUILD.gn b/api/audio/BUILD.gn
index b16f59c9ef..2e059fd9c2 100644
--- a/api/audio/BUILD.gn
+++ b/api/audio/BUILD.gn
@@ -69,6 +69,7 @@ rtc_library("aec3_config_json") {
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_json",
+    "../../rtc_base:stringutils",
     "../../rtc_base/system:rtc_export",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
diff --git a/api/audio_codecs/L16/BUILD.gn b/api/audio_codecs/L16/BUILD.gn
index dbc3c86252..291574abce 100644
--- a/api/audio_codecs/L16/BUILD.gn
+++ b/api/audio_codecs/L16/BUILD.gn
@@ -26,6 +26,7 @@ rtc_library("audio_encoder_L16") {
     "../../../rtc_base:rtc_base_approved",
     "../../../rtc_base:safe_conversions",
     "../../../rtc_base:safe_minmax",
+    "../../../rtc_base:stringutils",
     "../../../rtc_base/system:rtc_export",
   ]
   absl_deps = [
diff --git a/api/audio_codecs/g711/BUILD.gn b/api/audio_codecs/g711/BUILD.gn
index b43db34cb1..10445edf66 100644
--- a/api/audio_codecs/g711/BUILD.gn
+++ b/api/audio_codecs/g711/BUILD.gn
@@ -26,6 +26,7 @@ rtc_library("audio_encoder_g711") {
     "../../../rtc_base:rtc_base_approved",
     "../../../rtc_base:safe_conversions",
     "../../../rtc_base:safe_minmax",
+    "../../../rtc_base:stringutils",
     "../../../rtc_base/system:rtc_export",
   ]
   absl_deps = [
diff --git a/api/audio_codecs/g722/BUILD.gn b/api/audio_codecs/g722/BUILD.gn
index e2bbdaf9b7..7a6a5c8fd5 100644
--- a/api/audio_codecs/g722/BUILD.gn
+++ b/api/audio_codecs/g722/BUILD.gn
@@ -32,6 +32,7 @@ rtc_library("audio_encoder_g722") {
     "../../../rtc_base:rtc_base_approved",
     "../../../rtc_base:safe_conversions",
     "../../../rtc_base:safe_minmax",
+    "../../../rtc_base:stringutils",
     "../../../rtc_base/system:rtc_export",
   ]
   absl_deps = [
diff --git a/api/audio_codecs/ilbc/BUILD.gn b/api/audio_codecs/ilbc/BUILD.gn
index 80c106b3b4..00f80723ac 100644
--- a/api/audio_codecs/ilbc/BUILD.gn
+++ b/api/audio_codecs/ilbc/BUILD.gn
@@ -32,6 +32,7 @@ rtc_library("audio_encoder_ilbc") {
     "../../../rtc_base:rtc_base_approved",
     "../../../rtc_base:safe_conversions",
     "../../../rtc_base:safe_minmax",
+    "../../../rtc_base:stringutils",
   ]
   absl_deps = [
     "//third_party/abseil-cpp/absl/strings",
diff --git a/api/audio_codecs/isac/BUILD.gn b/api/audio_codecs/isac/BUILD.gn
index 2231371813..bda315b95e 100644
--- a/api/audio_codecs/isac/BUILD.gn
+++ b/api/audio_codecs/isac/BUILD.gn
@@ -68,6 +68,7 @@ rtc_library("audio_encoder_isac_fix") {
     "../../../api:field_trials_view",
     "../../../modules/audio_coding:isac_fix",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:stringutils",
     "../../../rtc_base/system:rtc_export",
   ]
   absl_deps = [
@@ -108,6 +109,7 @@ rtc_library("audio_encoder_isac_float") {
     "../../../api:field_trials_view",
     "../../../modules/audio_coding:isac",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:stringutils",
     "../../../rtc_base/system:rtc_export",
   ]
   absl_deps = [
diff --git a/api/neteq/BUILD.gn b/api/neteq/BUILD.gn
index 4e85c4d268..c37da87cd5 100644
--- a/api/neteq/BUILD.gn
+++ b/api/neteq/BUILD.gn
@@ -21,6 +21,7 @@ rtc_source_set("neteq_api") {
     "..:rtp_packet_info",
     "..:scoped_refptr",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:stringutils",
     "../../system_wrappers:system_wrappers",
     "../audio_codecs:audio_codecs_api",
   ]
diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index 43473837e3..074ec2d8dd 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -31,6 +31,7 @@ rtc_library("video_rtp_headers") {
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:safe_conversions",
+    "../../rtc_base:stringutils",
     "../../rtc_base/system:rtc_export",
     "../units:data_rate",
     "../units:time_delta",
diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index bff7a3f715..1e9c23669d 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -49,6 +49,7 @@ rtc_library("video_codecs_api") {
     "../../rtc_base:macromagic",
     "../../rtc_base:refcount",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:stringutils",
     "../../rtc_base/system:rtc_export",
     "../units:data_rate",
     "../video:encoded_image",
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index aaf47d86be..267e5d36c2 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -96,6 +96,7 @@ rtc_library("audio") {
     "../rtc_base:rtc_task_queue",
     "../rtc_base:safe_conversions",
     "../rtc_base:safe_minmax",
+    "../rtc_base:stringutils",
     "../rtc_base:threading",
     "../rtc_base/containers:flat_set",
     "../rtc_base/experiments:field_trial_parser",
diff --git a/audio/utility/BUILD.gn b/audio/utility/BUILD.gn
index 999a93bec9..82012ae5ed 100644
--- a/audio/utility/BUILD.gn
+++ b/audio/utility/BUILD.gn
@@ -49,6 +49,7 @@ if (rtc_include_tests) {
       "../../rtc_base:logging",
       "../../rtc_base:macromagic",
       "../../rtc_base:rtc_base_approved",
+      "../../rtc_base:stringutils",
       "../../test:field_trial",
       "../../test:test_support",
       "//testing/gtest",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 59513c8db4..b0876b0eb1 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -73,6 +73,7 @@ rtc_library("call_interfaces") {
     "../rtc_base:checks",
     "../rtc_base:refcount",
     "../rtc_base:rtc_base_approved",
+    "../rtc_base:stringutils",
     "../rtc_base/network:sent_packet",
   ]
   absl_deps = [
@@ -123,6 +124,7 @@ rtc_library("rtp_interfaces") {
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
+    "../rtc_base:stringutils",
   ]
   absl_deps = [
     "//third_party/abseil-cpp/absl/algorithm:container",
@@ -150,6 +152,7 @@ rtc_library("rtp_receiver") {
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
+    "../rtc_base:stringutils",
     "../rtc_base/containers:flat_map",
     "../rtc_base/containers:flat_set",
   ]
@@ -319,6 +322,7 @@ rtc_library("call") {
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:safe_minmax",
+    "../rtc_base:stringutils",
     "../rtc_base/experiments:field_trial_parser",
     "../rtc_base/network:sent_packet",
     "../rtc_base/system:no_unique_address",
@@ -561,6 +565,7 @@ if (rtc_include_tests) {
         "../rtc_base:macromagic",
         "../rtc_base:rtc_base_approved",
         "../rtc_base:rtc_event",
+        "../rtc_base:stringutils",
         "../rtc_base:task_queue_for_test",
         "../rtc_base:threading",
         "../rtc_base/synchronization:mutex",
diff --git a/call/adaptation/BUILD.gn b/call/adaptation/BUILD.gn
index ee264a22ad..172c431523 100644
--- a/call/adaptation/BUILD.gn
+++ b/call/adaptation/BUILD.gn
@@ -50,6 +50,7 @@ rtc_library("resource_adaptation") {
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_task_queue",
     "../../rtc_base:safe_conversions",
+    "../../rtc_base:stringutils",
     "../../rtc_base/experiments:balanced_degradation_settings",
     "../../rtc_base/synchronization:mutex",
     "../../rtc_base/system:no_unique_address",
@@ -88,6 +89,7 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_event",
       "../../rtc_base:rtc_task_queue",
+      "../../rtc_base:stringutils",
       "../../rtc_base:task_queue_for_test",
       "../../rtc_base/synchronization:mutex",
       "../../test:field_trial",
diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn
index 7361b912a3..14eb9af8c2 100644
--- a/common_audio/BUILD.gn
+++ b/common_audio/BUILD.gn
@@ -384,6 +384,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../rtc_base:macromagic",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
+      "../rtc_base:stringutils",
       "../rtc_base/system:arch",
       "../system_wrappers",
       "../test:fileutils",
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 33aab628b0..d1d4baca83 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -70,6 +70,7 @@ rtc_library("read_auth_file") {
   deps = [
     "../api:array_view",
     "../rtc_base",
+    "../rtc_base:stringutils",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/strings:strings" ]
 }
@@ -688,6 +689,7 @@ if (is_linux || is_chromeos || is_win) {
       "../rtc_base:macromagic",
       "../rtc_base:net_helpers",
       "../rtc_base:refcount",
+      "../rtc_base:stringutils",
       "../rtc_base:threading",
       "../rtc_base/third_party/sigslot",
       "../system_wrappers:field_trial",
@@ -764,6 +766,7 @@ if (is_linux || is_chromeos || is_win) {
     deps = [
       "../rtc_base:checks",
       "../rtc_base:rtc_base_approved",
+      "../rtc_base:stringutils",
       "../system_wrappers:field_trial",
       "../test:field_trial",
       "//third_party/abseil-cpp/absl/flags:flag",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 8c16e801c4..87d51754fe 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -412,6 +412,7 @@ if (rtc_build_dcsctp) {
       "../rtc_base:logging",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:socket",
+      "../rtc_base:stringutils",
       "../rtc_base:threading",
       "../rtc_base/task_utils:pending_task_safety_flag",
       "../rtc_base/task_utils:to_queued_task",
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 4b3474c2c4..a6aacea3a2 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -766,6 +766,7 @@ rtc_library("webrtc_opus") {
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:safe_conversions",
     "../../rtc_base:safe_minmax",
+    "../../rtc_base:stringutils",
     "../../system_wrappers:field_trial",
   ]
   absl_deps = [
@@ -1090,6 +1091,7 @@ rtc_library("neteq_tools_minimal") {
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:safe_conversions",
+    "../../rtc_base:stringutils",
     "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp_format",
   ]
@@ -1126,6 +1128,7 @@ rtc_library("neteq_test_tools") {
     "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:stringutils",
     "../../rtc_base/system:arch",
     "../../test:rtp_test_utils",
     "../rtp_rtcp:rtp_rtcp_format",
@@ -1168,6 +1171,7 @@ rtc_library("neteq_tools") {
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:safe_conversions",
+    "../../rtc_base:stringutils",
     "../rtp_rtcp",
     "../rtp_rtcp:rtp_rtcp_format",
   ]
@@ -1414,6 +1418,7 @@ if (rtc_include_tests) {
       "../../rtc_base:logging",
       "../../rtc_base:macromagic",
       "../../rtc_base:rtc_base_approved",
+      "../../rtc_base:stringutils",
       "../../rtc_base/synchronization:mutex",
       "../../test:fileutils",
       "../../test:scoped_key_value_config",
@@ -1479,19 +1484,20 @@ if (rtc_include_tests) {
 
     defines = audio_coding_defines
 
-    deps = audio_coding_deps + [
-             "../../api/audio:audio_frame_api",
-             "../../rtc_base:checks",
-             ":audio_coding",
-             ":neteq_tools",
-             "../../api/audio_codecs:builtin_audio_decoder_factory",
-             "../../api/audio_codecs:builtin_audio_encoder_factory",
-             "../../api/audio_codecs:audio_codecs_api",
-             "../../rtc_base:rtc_base_approved",
-             "../../test:test_support",
-             "//testing/gtest",
-           ]
-
+    deps = [
+      ":audio_coding",
+      ":neteq_tools",
+      "../../api/audio:audio_frame_api",
+      "../../api/audio_codecs:audio_codecs_api",
+      "../../api/audio_codecs:builtin_audio_decoder_factory",
+      "../../api/audio_codecs:builtin_audio_encoder_factory",
+      "../../rtc_base:checks",
+      "../../rtc_base:rtc_base_approved",
+      "../../rtc_base:stringutils",
+      "../../test:test_support",
+      "//testing/gtest",
+    ]
+    deps += audio_coding_deps
     absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
   }
 
@@ -2105,6 +2111,7 @@ if (rtc_include_tests) {
         "../../rtc_base:rtc_event",
         "../../rtc_base:safe_conversions",
         "../../rtc_base:sanitizer",
+        "../../rtc_base:stringutils",
         "../../rtc_base:timeutils",
         "../../rtc_base/synchronization:mutex",
         "../../rtc_base/system:arch",
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index aa2a1d2319..6171a55d1b 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -118,6 +118,7 @@ rtc_source_set("windows_core_audio_utility") {
       "../../rtc_base:logging",
       "../../rtc_base:macromagic",
       "../../rtc_base:rtc_base_approved",
+      "../../rtc_base:stringutils",
     ]
 
     libs = [ "oleaut32.lib" ]
@@ -158,6 +159,7 @@ rtc_source_set("audio_device_module_from_input_and_output") {
       "../../rtc_base:refcount",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:safe_conversions",
+      "../../rtc_base:stringutils",
     ]
     absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
   }
@@ -188,6 +190,7 @@ rtc_library("audio_device_impl") {
     "../../rtc_base:rtc_event",
     "../../rtc_base:rtc_task_queue",
     "../../rtc_base:safe_conversions",
+    "../../rtc_base:stringutils",
     "../../rtc_base/synchronization:mutex",
     "../../rtc_base/system:arch",
     "../../rtc_base/system:file_wrapper",
diff --git a/modules/audio_mixer/BUILD.gn b/modules/audio_mixer/BUILD.gn
index e4b3830009..5b4aefe724 100644
--- a/modules/audio_mixer/BUILD.gn
+++ b/modules/audio_mixer/BUILD.gn
@@ -122,6 +122,7 @@ if (rtc_include_tests) {
       "../../audio/utility:audio_frame_operations",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
+      "../../rtc_base:stringutils",
       "../../rtc_base:task_queue_for_test",
       "../../test:test_support",
     ]
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index b44624e6af..39b29aaabe 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -36,6 +36,7 @@ rtc_library("api") {
     "../../rtc_base:macromagic",
     "../../rtc_base:refcount",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:stringutils",
     "../../rtc_base/system:arch",
     "../../rtc_base/system:file_wrapper",
     "../../rtc_base/system:rtc_export",
@@ -306,6 +307,7 @@ rtc_library("apm_logging") {
     "../../common_audio",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:stringutils",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
   defines = []
@@ -387,6 +389,7 @@ if (rtc_include_tests) {
         "../../rtc_base:rtc_event",
         "../../rtc_base:safe_conversions",
         "../../rtc_base:safe_minmax",
+        "../../rtc_base:stringutils",
         "../../rtc_base:task_queue_for_test",
         "../../rtc_base:threading",
         "../../rtc_base/synchronization:mutex",
@@ -547,6 +550,7 @@ if (rtc_include_tests) {
         "../../rtc_base:rtc_base_approved",
         "../../rtc_base:rtc_json",
         "../../rtc_base:safe_conversions",
+        "../../rtc_base:stringutils",
         "../../rtc_base:task_queue_for_test",
         "../../rtc_base/system:file_wrapper",
         "../../system_wrappers",
diff --git a/modules/audio_processing/aec3/BUILD.gn b/modules/audio_processing/aec3/BUILD.gn
index a209738409..128e8f3bd4 100644
--- a/modules/audio_processing/aec3/BUILD.gn
+++ b/modules/audio_processing/aec3/BUILD.gn
@@ -312,6 +312,7 @@ if (rtc_include_tests) {
       "../../../rtc_base:macromagic",
       "../../../rtc_base:rtc_base_approved",
       "../../../rtc_base:safe_minmax",
+      "../../../rtc_base:stringutils",
       "../../../rtc_base/system:arch",
       "../../../system_wrappers",
       "../../../test:field_trial",
diff --git a/modules/audio_processing/ns/BUILD.gn b/modules/audio_processing/ns/BUILD.gn
index eb99c775a9..9baadcba85 100644
--- a/modules/audio_processing/ns/BUILD.gn
+++ b/modules/audio_processing/ns/BUILD.gn
@@ -85,6 +85,7 @@ if (rtc_include_tests) {
       "../../../rtc_base:checks",
       "../../../rtc_base:rtc_base_approved",
       "../../../rtc_base:safe_minmax",
+      "../../../rtc_base:stringutils",
       "../../../rtc_base/system:arch",
       "../../../system_wrappers",
       "../../../test:test_support",
diff --git a/modules/audio_processing/test/conversational_speech/BUILD.gn b/modules/audio_processing/test/conversational_speech/BUILD.gn
index 8785ce85ec..5763ff82b9 100644
--- a/modules/audio_processing/test/conversational_speech/BUILD.gn
+++ b/modules/audio_processing/test/conversational_speech/BUILD.gn
@@ -50,6 +50,7 @@ rtc_library("lib") {
     "../../../../rtc_base:logging",
     "../../../../rtc_base:rtc_base_approved",
     "../../../../rtc_base:safe_conversions",
+    "../../../../rtc_base:stringutils",
     "../../../../test:fileutils",
   ]
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index 91e0c205f1..9c82ce266e 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -484,6 +484,7 @@ rtc_library("desktop_capture_generic") {
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
     "../../rtc_base:refcount",
+    "../../rtc_base:stringutils",
     "../../rtc_base/synchronization:mutex",
     "../../rtc_base/system:arch",
     "../../rtc_base/system:no_unique_address",
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index 8a6bc9377e..06d04be06f 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -60,6 +60,7 @@ rtc_library("remote_bitrate_estimator") {
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:safe_minmax",
+    "../../rtc_base:stringutils",
     "../../rtc_base/experiments:field_trial_parser",
     "../../rtc_base/synchronization:mutex",
     "../../system_wrappers",
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 7758738a42..1704ea043d 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -125,6 +125,7 @@ rtc_library("rtp_rtcp_format") {
     "../../rtc_base:macromagic",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:safe_conversions",
+    "../../rtc_base:stringutils",
     "../../system_wrappers",
     "../video_coding:codec_globals_headers",
   ]
@@ -624,6 +625,7 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base_tests_utils",
       "../../rtc_base:rtc_event",
       "../../rtc_base:rtc_numerics",
+      "../../rtc_base:stringutils",
       "../../rtc_base:task_queue_for_test",
       "../../rtc_base/task_utils:to_queued_task",
       "../../system_wrappers",
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index e8b0d9b665..b15b73340c 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -55,6 +55,7 @@ if (!build_with_chromium) {
       "../../rtc_base:macromagic",
       "../../rtc_base:refcount",
       "../../rtc_base:rtc_base_approved",
+      "../../rtc_base:stringutils",
       "../../rtc_base/synchronization:mutex",
       "../../system_wrappers",
     ]
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 734ebdcf6d..5168492876 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -528,6 +528,7 @@ rtc_library("video_coding_utility") {
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
+    "../../rtc_base:stringutils",
     "../../rtc_base:weak_ptr",
     "../../rtc_base/experiments:bandwidth_quality_scaler_settings",
     "../../rtc_base/experiments:encoder_info_settings",
@@ -784,6 +785,7 @@ rtc_library("webrtc_vp9") {
     "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
+    "../../rtc_base:stringutils",
     "../../rtc_base/experiments:encoder_info_settings",
     "../../rtc_base/experiments:field_trial_parser",
     "../../rtc_base/experiments:rate_control_settings",
@@ -1003,6 +1005,7 @@ if (rtc_include_tests) {
       "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_base_tests_utils",
+      "../../rtc_base:stringutils",
       "../../rtc_base:task_queue_for_test",
       "../../system_wrappers",
       "../../test:fileutils",
@@ -1089,6 +1092,7 @@ if (rtc_include_tests) {
       "../../media:rtc_simulcast_encoder_adapter",
       "../../rtc_base",
       "../../rtc_base:refcount",
+      "../../rtc_base:stringutils",
       "../../test:explicit_key_value_config",
       "../../test:field_trial",
       "../../test:fileutils",
@@ -1250,6 +1254,7 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_event",
       "../../rtc_base:rtc_numerics",
       "../../rtc_base:rtc_task_queue",
+      "../../rtc_base:stringutils",
       "../../rtc_base:task_queue_for_test",
       "../../rtc_base/experiments:encoder_info_settings",
       "../../rtc_base/experiments:jitter_upper_bound_experiment",
diff --git a/net/dcsctp/packet/BUILD.gn b/net/dcsctp/packet/BUILD.gn
index d981c5ebd1..b8ce420577 100644
--- a/net/dcsctp/packet/BUILD.gn
+++ b/net/dcsctp/packet/BUILD.gn
@@ -74,6 +74,7 @@ rtc_library("parameter") {
     "../../../rtc_base:checks",
     "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:stringutils",
     "../common:internal_types",
     "../common:math",
     "../common:str_join",
@@ -119,6 +120,7 @@ rtc_library("error_cause") {
     "../../../rtc_base:checks",
     "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:stringutils",
     "../common:internal_types",
     "../common:math",
     "../common:str_join",
@@ -172,6 +174,7 @@ rtc_library("chunk") {
     "../../../rtc_base:checks",
     "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:stringutils",
     "../common:math",
     "../common:str_join",
     "../packet:bounded_io",
@@ -245,6 +248,7 @@ rtc_library("sctp_packet") {
     "../../../rtc_base:checks",
     "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:stringutils",
     "../common:internal_types",
     "../common:math",
     "../public:types",
diff --git a/net/dcsctp/rx/BUILD.gn b/net/dcsctp/rx/BUILD.gn
index 1f3aa87653..4ddf3580a2 100644
--- a/net/dcsctp/rx/BUILD.gn
+++ b/net/dcsctp/rx/BUILD.gn
@@ -14,6 +14,7 @@ rtc_library("data_tracker") {
     "../../../rtc_base:checks",
     "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:stringutils",
     "../common:sequence_numbers",
     "../packet:chunk",
     "../packet:data",
diff --git a/net/dcsctp/socket/BUILD.gn b/net/dcsctp/socket/BUILD.gn
index 114f0501b0..edb5a2a615 100644
--- a/net/dcsctp/socket/BUILD.gn
+++ b/net/dcsctp/socket/BUILD.gn
@@ -102,6 +102,7 @@ rtc_library("transmission_control_block") {
     "../../../rtc_base:checks",
     "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:stringutils",
     "../common:sequence_numbers",
     "../packet:chunk",
     "../packet:sctp_packet",
@@ -142,6 +143,7 @@ rtc_library("dcsctp_socket") {
     "../../../rtc_base:logging",
     "../../../rtc_base:refcount",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:stringutils",
     "../common:internal_types",
     "../packet:bounded_io",
     "../packet:chunk",
@@ -237,6 +239,7 @@ if (rtc_include_tests) {
       "../../../rtc_base:rtc_base_approved",
       "../../../rtc_base:rtc_base_tests_utils",
       "../../../rtc_base:socket_address",
+      "../../../rtc_base:stringutils",
       "../../../rtc_base/task_utils:to_queued_task",
       "../../../test:test_support",
       "../common:handover_testing",
diff --git a/net/dcsctp/tx/BUILD.gn b/net/dcsctp/tx/BUILD.gn
index 7995776893..24a7fd2be3 100644
--- a/net/dcsctp/tx/BUILD.gn
+++ b/net/dcsctp/tx/BUILD.gn
@@ -106,6 +106,7 @@ rtc_library("retransmission_queue") {
     "../../../rtc_base:checks",
     "../../../rtc_base:logging",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:stringutils",
     "../common:math",
     "../common:sequence_numbers",
     "../common:str_join",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 9114ddc1ee..eab036e2d0 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -115,6 +115,7 @@ rtc_library("rtc_p2p") {
     "../rtc_base:socket_address",
     "../rtc_base:socket_factory",
     "../rtc_base:socket_server",
+    "../rtc_base:stringutils",
     "../rtc_base:threading",
     "../rtc_base/containers:flat_map",
     "../rtc_base/experiments:field_trial_parser",
@@ -299,6 +300,7 @@ rtc_library("p2p_server_utils") {
     "../rtc_base:logging",
     "../rtc_base:rtc_base_tests_utils",
     "../rtc_base:socket_address",
+    "../rtc_base:stringutils",
     "../rtc_base:threading",
     "../rtc_base/task_utils:to_queued_task",
     "../rtc_base/third_party/sigslot",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index a5ec46c748..cb9d2978ae 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -51,6 +51,7 @@ rtc_library("proxy") {
     "../rtc_base:refcount",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_event",
+    "../rtc_base:stringutils",
     "../rtc_base:threading",
     "../rtc_base/system:rtc_export",
   ]
@@ -85,6 +86,7 @@ rtc_source_set("channel") {
     "../rtc_base:macromagic",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:socket",
+    "../rtc_base:stringutils",
     "../rtc_base:threading",
     "../rtc_base/containers:flat_set",
     "../rtc_base/network:sent_packet",
@@ -245,6 +247,7 @@ rtc_source_set("jsep_transport") {
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
     "../rtc_base:rtc_base_approved",
+    "../rtc_base:stringutils",
     "../rtc_base:threading",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
@@ -347,6 +350,7 @@ rtc_source_set("media_session") {
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:logging",
+    "../rtc_base:stringutils",
     "../rtc_base/third_party/base64",
   ]
   absl_deps = [
@@ -578,6 +582,7 @@ rtc_source_set("srtp_session") {
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
+    "../rtc_base:stringutils",
     "../rtc_base/synchronization:mutex",
     "../system_wrappers:metrics",
   ]
@@ -1904,6 +1909,7 @@ rtc_library("rtp_parameters_conversion") {
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:rtc_base",
+    "../rtc_base:stringutils",
   ]
   absl_deps = [
     "//third_party/abseil-cpp/absl/algorithm:container",
@@ -2091,6 +2097,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base:socket_address",
+      "../rtc_base:stringutils",
       "../rtc_base:threading",
       "../rtc_base/containers:flat_set",
       "../rtc_base/task_utils:pending_task_safety_flag",
@@ -2339,6 +2346,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base:rtc_json",
       "../rtc_base:socket_address",
+      "../rtc_base:stringutils",
       "../rtc_base:threading",
       "../rtc_base/synchronization:mutex",
       "../rtc_base/third_party/base64",
@@ -2616,6 +2624,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../rtc_base:refcount",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_task_queue",
+      "../rtc_base:stringutils",
       "../rtc_base:task_queue_for_test",
       "../rtc_base:threading",
       "../rtc_base/synchronization:mutex",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index d0551b7bd2..1bcbde85ee 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -89,6 +89,7 @@ rtc_library("rtc_base_approved") {
     ":rtc_task_queue",
     ":safe_compare",
     ":safe_conversions",
+    ":stringutils",
     ":type_traits",
     "../api:array_view",
     "../api:scoped_refptr",
@@ -180,7 +181,6 @@ rtc_library("rtc_base_approved") {
   public_deps += [  # no-presubmit-check TODO(webrtc:8603)
     ":platform_thread",
     ":platform_thread_types",
-    ":stringutils",
     ":timeutils",
     "../api:sequence_checker",
   ]
@@ -913,6 +913,7 @@ if (is_win) {
       ":logging",
       ":macromagic",
       ":rtc_base_approved",
+      ":stringutils",
     ]
 
     libs = [
@@ -1241,6 +1242,7 @@ rtc_library("rtc_base_tests_utils") {
     ":socket_address",
     ":socket_factory",
     ":socket_server",
+    ":stringutils",
     ":threading",
     "../api/units:time_delta",
     "../api/units:timestamp",
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 24db970a52..0a48f602d9 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -65,6 +65,7 @@ rtc_library("video_file_reader") {
     "../rtc_base:logging",
     "../rtc_base:refcount",
     "../rtc_base:rtc_base_approved",
+    "../rtc_base:stringutils",
   ]
   absl_deps = [
     "//third_party/abseil-cpp/absl/strings",
@@ -591,6 +592,7 @@ if (rtc_include_tests) {
           "../rtc_base:macromagic",
           "../rtc_base:protobuf_utils",
           "../rtc_base:rtc_base_approved",
+          "../rtc_base:stringutils",
           "//third_party/abseil-cpp/absl/flags:flag",
           "//third_party/abseil-cpp/absl/flags:parse",
         ]
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index ced97d9761..81f09d9b7c 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -362,6 +362,7 @@ if (is_ios || is_mac) {
         deps = [
           "../rtc_base",
           "../rtc_base:network_constants",
+          "../rtc_base:stringutils",
           "../rtc_base:threading",
         ]
 
@@ -1608,6 +1609,7 @@ if (is_ios || is_mac) {
           "../rtc_base",
           "../rtc_base:logging",
           "../rtc_base:macromagic",
+          "../rtc_base:stringutils",
           "../rtc_base:threading",
           "../rtc_base/task_utils:pending_task_safety_flag",
           "../rtc_base/task_utils:to_queued_task",
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 9f9b49c959..3b595c1cd2 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -590,6 +590,7 @@ if (current_os == "linux" || is_android) {
       "../../rtc_base:macromagic",
       "../../rtc_base:refcount",
       "../../rtc_base:rtc_base_approved",
+      "../../rtc_base:stringutils",
       "../../rtc_base:threading",
       "../../rtc_base/task_utils:pending_task_safety_flag",
       "../../rtc_base/task_utils:to_queued_task",
@@ -803,6 +804,7 @@ if (current_os == "linux" || is_android) {
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_task_queue",
       "../../rtc_base:safe_conversions",
+      "../../rtc_base:stringutils",
       "../../rtc_base:threading",
       "../../system_wrappers:field_trial",
     ]
@@ -1640,6 +1642,7 @@ if (is_android) {
       "../../rtc_base:macromagic",
       "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_event",
+      "../../rtc_base:stringutils",
       "../../rtc_base:threading",
       "../../rtc_base/synchronization:mutex",
       "../../rtc_base/system:inline",
diff --git a/stats/BUILD.gn b/stats/BUILD.gn
index 88613af68d..c636e044d8 100644
--- a/stats/BUILD.gn
+++ b/stats/BUILD.gn
@@ -26,6 +26,7 @@ rtc_library("rtc_stats") {
     "../rtc_base:checks",
     "../rtc_base:macromagic",
     "../rtc_base:rtc_base_approved",
+    "../rtc_base:stringutils",
   ]
 }
 
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index e65bcc5d56..72fa6d7926 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -643,7 +643,10 @@ webrtc_fuzzer_test("field_trial_fuzzer") {
 
 webrtc_fuzzer_test("string_to_number_fuzzer") {
   sources = [ "string_to_number_fuzzer.cc" ]
-  deps = [ "../../rtc_base:rtc_base_approved" ]
+  deps = [
+    "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:stringutils",
+  ]
   seed_corpus = "corpora/string_to_number-corpus"
 }
 
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index ed6b65d02d..b4e6244333 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -403,6 +403,7 @@ if (!build_with_chromium) {
         "../../../rtc_base:macromagic",
         "../../../rtc_base:rtc_base_approved",
         "../../../rtc_base:safe_conversions",
+        "../../../rtc_base:stringutils",
         "../../../rtc_base:task_queue_for_test",
         "../../../rtc_base:threading",
         "../../../rtc_base/synchronization:mutex",
@@ -670,6 +671,7 @@ if (!build_with_chromium) {
       "../../../rtc_base:rtc_base_approved",
       "../../../rtc_base:rtc_event",
       "../../../rtc_base:rtc_numerics",
+      "../../../rtc_base:stringutils",
       "../../../rtc_base/synchronization:mutex",
       "../../../rtc_tools:video_quality_analysis",
       "../../../system_wrappers",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 90648b250a..c9ba3e8296 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -209,6 +209,7 @@ rtc_source_set("video_legacy") {
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_numerics",
     "../rtc_base:rtc_task_queue",
+    "../rtc_base:stringutils",
     "../rtc_base/experiments:field_trial_parser",
     "../rtc_base/experiments:keyframe_interval_settings_experiment",
     "../rtc_base/synchronization:mutex",
@@ -477,6 +478,7 @@ rtc_library("video_stream_encoder_impl") {
     "../rtc_base:rtc_numerics",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:safe_conversions",
+    "../rtc_base:stringutils",
     "../rtc_base:timeutils",
     "../rtc_base/experiments:alr_experiment",
     "../rtc_base/experiments:balanced_degradation_settings",
@@ -569,6 +571,7 @@ if (rtc_include_tests) {
         "../rtc_base:rtc_base_tests_utils",
         "../rtc_base:rtc_event",
         "../rtc_base:rtc_numerics",
+        "../rtc_base:stringutils",
         "../rtc_base:task_queue_for_test",
         "../rtc_base/synchronization:mutex",
         "../rtc_base/task_utils:repeating_task",
@@ -906,6 +909,7 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_numerics",
       "../rtc_base:rtc_task_queue",
       "../rtc_base:safe_conversions",
+      "../rtc_base:stringutils",
       "../rtc_base:task_queue_for_test",
       "../rtc_base:threading",
       "../rtc_base/containers:flat_map",
diff --git a/video/adaptation/BUILD.gn b/video/adaptation/BUILD.gn
index d7d0959b01..7b77af3bee 100644
--- a/video/adaptation/BUILD.gn
+++ b/video/adaptation/BUILD.gn
@@ -56,6 +56,7 @@ rtc_library("video_adaptation") {
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
     "../../rtc_base:safe_conversions",
+    "../../rtc_base:stringutils",
     "../../rtc_base:timeutils",
     "../../rtc_base/experiments:balanced_degradation_settings",
     "../../rtc_base/experiments:field_trial_parser",