diff --git a/api/audio_codecs/L16/BUILD.gn b/api/audio_codecs/L16/BUILD.gn
index b35e67bb4b..dbc3c86252 100644
--- a/api/audio_codecs/L16/BUILD.gn
+++ b/api/audio_codecs/L16/BUILD.gn
@@ -24,6 +24,7 @@ rtc_library("audio_encoder_L16") {
     "../../../api:field_trials_view",
     "../../../modules/audio_coding:pcm16b",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_conversions",
     "../../../rtc_base:safe_minmax",
     "../../../rtc_base/system:rtc_export",
   ]
@@ -45,6 +46,7 @@ rtc_library("audio_decoder_L16") {
     "../../../api:field_trials_view",
     "../../../modules/audio_coding:pcm16b",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_conversions",
     "../../../rtc_base/system:rtc_export",
   ]
   absl_deps = [
diff --git a/api/audio_codecs/g711/BUILD.gn b/api/audio_codecs/g711/BUILD.gn
index faac0471c0..b43db34cb1 100644
--- a/api/audio_codecs/g711/BUILD.gn
+++ b/api/audio_codecs/g711/BUILD.gn
@@ -24,6 +24,7 @@ rtc_library("audio_encoder_g711") {
     "../../../api:field_trials_view",
     "../../../modules/audio_coding:g711",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_conversions",
     "../../../rtc_base:safe_minmax",
     "../../../rtc_base/system:rtc_export",
   ]
@@ -45,6 +46,7 @@ rtc_library("audio_decoder_g711") {
     "../../../api:field_trials_view",
     "../../../modules/audio_coding:g711",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_conversions",
     "../../../rtc_base/system:rtc_export",
   ]
   absl_deps = [
diff --git a/api/audio_codecs/g722/BUILD.gn b/api/audio_codecs/g722/BUILD.gn
index 1441e6dedf..e2bbdaf9b7 100644
--- a/api/audio_codecs/g722/BUILD.gn
+++ b/api/audio_codecs/g722/BUILD.gn
@@ -30,6 +30,7 @@ rtc_library("audio_encoder_g722") {
     "../../../api:field_trials_view",
     "../../../modules/audio_coding:g722",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_conversions",
     "../../../rtc_base:safe_minmax",
     "../../../rtc_base/system:rtc_export",
   ]
@@ -51,6 +52,7 @@ rtc_library("audio_decoder_g722") {
     "../../../api:field_trials_view",
     "../../../modules/audio_coding:g722",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_conversions",
     "../../../rtc_base/system:rtc_export",
   ]
   absl_deps = [
diff --git a/api/audio_codecs/ilbc/BUILD.gn b/api/audio_codecs/ilbc/BUILD.gn
index 8dab307e99..80c106b3b4 100644
--- a/api/audio_codecs/ilbc/BUILD.gn
+++ b/api/audio_codecs/ilbc/BUILD.gn
@@ -30,6 +30,7 @@ rtc_library("audio_encoder_ilbc") {
     "../../../api:field_trials_view",
     "../../../modules/audio_coding:ilbc",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_conversions",
     "../../../rtc_base:safe_minmax",
   ]
   absl_deps = [
diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index 11b847f48c..43473837e3 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -30,6 +30,7 @@ rtc_library("video_rtp_headers") {
     "..:array_view",
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
     "../../rtc_base/system:rtc_export",
     "../units:data_rate",
     "../units:time_delta",
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 13cc409fcc..aaf47d86be 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -94,6 +94,7 @@ rtc_library("audio") {
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_event",
     "../rtc_base:rtc_task_queue",
+    "../rtc_base:safe_conversions",
     "../rtc_base:safe_minmax",
     "../rtc_base:threading",
     "../rtc_base/containers:flat_set",
diff --git a/audio/utility/BUILD.gn b/audio/utility/BUILD.gn
index 24ded1ae44..999a93bec9 100644
--- a/audio/utility/BUILD.gn
+++ b/audio/utility/BUILD.gn
@@ -28,6 +28,7 @@ rtc_library("audio_frame_operations") {
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
     "../../system_wrappers:field_trial",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/base:core_headers" ]
diff --git a/call/BUILD.gn b/call/BUILD.gn
index dff8881c3d..59513c8db4 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -493,6 +493,7 @@ if (rtc_include_tests) {
         "../rtc_base:rate_limiter",
         "../rtc_base:rtc_base_approved",
         "../rtc_base:rtc_event",
+        "../rtc_base:safe_conversions",
         "../rtc_base:task_queue_for_test",
         "../rtc_base/synchronization:mutex",
         "../system_wrappers",
diff --git a/call/adaptation/BUILD.gn b/call/adaptation/BUILD.gn
index 4c527354f8..ee264a22ad 100644
--- a/call/adaptation/BUILD.gn
+++ b/call/adaptation/BUILD.gn
@@ -49,6 +49,7 @@ rtc_library("resource_adaptation") {
     "../../rtc_base:refcount",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_task_queue",
+    "../../rtc_base:safe_conversions",
     "../../rtc_base/experiments:balanced_degradation_settings",
     "../../rtc_base/synchronization:mutex",
     "../../rtc_base/system:no_unique_address",
diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn
index 438419116b..7361b912a3 100644
--- a/common_audio/BUILD.gn
+++ b/common_audio/BUILD.gn
@@ -50,6 +50,7 @@ rtc_library("common_audio") {
     "../rtc_base:gtest_prod",
     "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
+    "../rtc_base:safe_conversions",
     "../rtc_base:sanitizer",
     "../rtc_base/memory:aligned_malloc",
     "../rtc_base/system:arch",
@@ -198,6 +199,7 @@ rtc_library("common_audio_cc") {
 
   deps = [
     "../rtc_base:rtc_base_approved",
+    "../rtc_base:safe_conversions",
     "../system_wrappers",
   ]
 }
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 43be36460e..66a7b007b5 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -304,6 +304,7 @@ rtc_library("rtc_event_log_impl_encoder") {
     "../rtc_base:ignore_wundef",
     "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
+    "../rtc_base:safe_conversions",
   ]
   absl_deps = [
     "//third_party/abseil-cpp/absl/memory",
@@ -371,6 +372,7 @@ if (rtc_enable_protobuf) {
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_event",
       "../rtc_base:rtc_task_queue",
+      "../rtc_base:safe_conversions",
       "../rtc_base:safe_minmax",
       "../rtc_base/system:no_unique_address",
     ]
@@ -452,6 +454,7 @@ if (rtc_enable_protobuf) {
       "../rtc_base:protobuf_utils",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_numerics",
+      "../rtc_base:safe_conversions",
       "../rtc_base/system:file_wrapper",
     ]
     absl_deps = [
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 966c758ca5..8c16e801c4 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -298,6 +298,7 @@ rtc_library("rtc_audio_video") {
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:rtc_task_queue",
+    "../rtc_base:safe_conversions",
     "../rtc_base:stringutils",
     "../rtc_base:threading",
     "../rtc_base/experiments:field_trial_parser",
@@ -609,6 +610,7 @@ if (rtc_include_tests) {
         "../rtc_base:rtc_base_tests_utils",
         "../rtc_base:rtc_event",
         "../rtc_base:rtc_task_queue",
+        "../rtc_base:safe_conversions",
         "../rtc_base:stringutils",
         "../rtc_base:threading",
         "../rtc_base/experiments:min_video_bitrate_experiment",
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index bc4679cd40..4b3474c2c4 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -54,6 +54,7 @@ rtc_library("audio_coding") {
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
     "../../rtc_base/synchronization:mutex",
     "../../system_wrappers",
     "../../system_wrappers:metrics",
@@ -180,6 +181,7 @@ rtc_library("g722") {
     "../../api/units:time_delta",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
   public_deps = [ ":g722_c" ]  # no-presubmit-check TODO(webrtc:8603)
@@ -214,6 +216,7 @@ rtc_library("ilbc") {
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
   public_deps = [ ":ilbc_c" ]  # no-presubmit-check TODO(webrtc:8603)
@@ -761,6 +764,7 @@ rtc_library("webrtc_opus") {
     "../../rtc_base:protobuf_utils",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
+    "../../rtc_base:safe_conversions",
     "../../rtc_base:safe_minmax",
     "../../system_wrappers:field_trial",
   ]
@@ -910,6 +914,7 @@ rtc_library("audio_network_adaptor") {
     "../../rtc_base:logging",
     "../../rtc_base:protobuf_utils",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
     "../../rtc_base/system:file_wrapper",
     "../../system_wrappers",
     "../../system_wrappers:field_trial",
@@ -1019,6 +1024,7 @@ rtc_library("neteq") {
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
     "../../rtc_base:safe_minmax",
     "../../rtc_base:sanitizer",
     "../../rtc_base/experiments:field_trial_parser",
@@ -1083,6 +1089,7 @@ rtc_library("neteq_tools_minimal") {
     "../../api/neteq:neteq_api",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
     "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp_format",
   ]
@@ -1160,6 +1167,7 @@ rtc_library("neteq_tools") {
     "../../api/audio_codecs:audio_codecs_api",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
     "../rtp_rtcp",
     "../rtp_rtcp:rtp_rtcp_format",
   ]
@@ -1795,6 +1803,7 @@ if (rtc_include_tests) {
         ":neteq_tools",
         "../../rtc_base:checks",
         "../../rtc_base:rtc_base_approved",
+        "../../rtc_base:safe_conversions",
         "../../test:fileutils",
         "../../test:test_main",
         "//testing/gtest",
@@ -1829,6 +1838,7 @@ if (rtc_include_tests) {
         ":neteq_quality_test_support",
         "../../rtc_base:checks",
         "../../rtc_base:rtc_base_approved",
+        "../../rtc_base:safe_conversions",
         "../../test:fileutils",
         "../../test:test_main",
         "//testing/gtest",
@@ -1847,6 +1857,7 @@ if (rtc_include_tests) {
         ":pcm16b",
         "../../rtc_base:checks",
         "../../rtc_base:rtc_base_approved",
+        "../../rtc_base:safe_conversions",
         "../../test:fileutils",
         "../../test:test_main",
         "//testing/gtest",
@@ -2092,6 +2103,7 @@ if (rtc_include_tests) {
         "../../rtc_base:rtc_base_approved",
         "../../rtc_base:rtc_base_tests_utils",
         "../../rtc_base:rtc_event",
+        "../../rtc_base:safe_conversions",
         "../../rtc_base:sanitizer",
         "../../rtc_base:timeutils",
         "../../rtc_base/synchronization:mutex",
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index 7549861860..aa2a1d2319 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -76,6 +76,7 @@ rtc_library("audio_device_buffer") {
     "../../rtc_base:macromagic",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_task_queue",
+    "../../rtc_base:safe_conversions",
     "../../rtc_base/synchronization:mutex",
     "../../system_wrappers",
     "../../system_wrappers:metrics",
@@ -156,6 +157,7 @@ rtc_source_set("audio_device_module_from_input_and_output") {
       "../../rtc_base:macromagic",
       "../../rtc_base:refcount",
       "../../rtc_base:rtc_base_approved",
+      "../../rtc_base:safe_conversions",
     ]
     absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
   }
@@ -185,6 +187,7 @@ rtc_library("audio_device_impl") {
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_event",
     "../../rtc_base:rtc_task_queue",
+    "../../rtc_base:safe_conversions",
     "../../rtc_base/synchronization:mutex",
     "../../rtc_base/system:arch",
     "../../rtc_base/system:file_wrapper",
@@ -406,6 +409,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../../rtc_base:macromagic",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_event",
+      "../../rtc_base:safe_conversions",
       "../../rtc_base/synchronization:mutex",
       "../../system_wrappers",
       "../../test:fileutils",
diff --git a/modules/audio_mixer/BUILD.gn b/modules/audio_mixer/BUILD.gn
index 93da77f306..e4b3830009 100644
--- a/modules/audio_mixer/BUILD.gn
+++ b/modules/audio_mixer/BUILD.gn
@@ -98,6 +98,7 @@ if (rtc_include_tests) {
       "../../api/audio:audio_frame_api",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
+      "../../rtc_base:safe_conversions",
     ]
   }
 
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index a87adc5d2f..b44624e6af 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -385,6 +385,7 @@ if (rtc_include_tests) {
         "../../rtc_base:rtc_base_approved",
         "../../rtc_base:rtc_base_tests_utils",
         "../../rtc_base:rtc_event",
+        "../../rtc_base:safe_conversions",
         "../../rtc_base:safe_minmax",
         "../../rtc_base:task_queue_for_test",
         "../../rtc_base:threading",
@@ -483,6 +484,7 @@ if (rtc_include_tests) {
       "../../rtc_base:protobuf_utils",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_event",
+      "../../rtc_base:safe_conversions",
       "../../system_wrappers",
       "../../test:perf_test",
       "../../test:test_support",
@@ -501,6 +503,7 @@ if (rtc_include_tests) {
       "../../rtc_base:checks",
       "../../rtc_base:logging",
       "../../rtc_base:rtc_base_approved",
+      "../../rtc_base:safe_conversions",
       "../../rtc_base:safe_minmax",
       "agc:gain_map",
     ]
@@ -543,6 +546,7 @@ if (rtc_include_tests) {
         "../../rtc_base:protobuf_utils",
         "../../rtc_base:rtc_base_approved",
         "../../rtc_base:rtc_json",
+        "../../rtc_base:safe_conversions",
         "../../rtc_base:task_queue_for_test",
         "../../rtc_base/system:file_wrapper",
         "../../system_wrappers",
diff --git a/modules/audio_processing/aecm/BUILD.gn b/modules/audio_processing/aecm/BUILD.gn
index 61e9affdea..5b1aad6175 100644
--- a/modules/audio_processing/aecm/BUILD.gn
+++ b/modules/audio_processing/aecm/BUILD.gn
@@ -20,6 +20,7 @@ rtc_library("aecm_core") {
     "../../../common_audio:common_audio_c",
     "../../../rtc_base:checks",
     "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_conversions",
     "../../../rtc_base:sanitizer",
     "../../../system_wrappers",
     "../utility:legacy_delay_estimator",
diff --git a/modules/audio_processing/test/conversational_speech/BUILD.gn b/modules/audio_processing/test/conversational_speech/BUILD.gn
index 64e0fcb10f..8785ce85ec 100644
--- a/modules/audio_processing/test/conversational_speech/BUILD.gn
+++ b/modules/audio_processing/test/conversational_speech/BUILD.gn
@@ -49,6 +49,7 @@ rtc_library("lib") {
     "../../../../rtc_base:checks",
     "../../../../rtc_base:logging",
     "../../../../rtc_base:rtc_base_approved",
+    "../../../../rtc_base:safe_conversions",
     "../../../../test:fileutils",
   ]
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn
index f7522b3048..ff89090aa4 100644
--- a/modules/congestion_controller/rtp/BUILD.gn
+++ b/modules/congestion_controller/rtp/BUILD.gn
@@ -31,6 +31,7 @@ rtc_library("control_handler") {
     "../../../api/units:time_delta",
     "../../../rtc_base:checks",
     "../../../rtc_base:logging",
+    "../../../rtc_base:safe_conversions",
     "../../../rtc_base:safe_minmax",
     "../../../rtc_base/system:no_unique_address",
     "../../../system_wrappers:field_trial",
@@ -91,6 +92,7 @@ if (rtc_include_tests) {
       "../../../rtc_base",
       "../../../rtc_base:checks",
       "../../../rtc_base:rtc_base_approved",
+      "../../../rtc_base:safe_conversions",
       "../../../rtc_base/network:sent_packet",
       "../../../system_wrappers",
       "../../../test:field_trial",
diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn
index aa7137b883..41e8c761ca 100644
--- a/modules/pacing/BUILD.gn
+++ b/modules/pacing/BUILD.gn
@@ -78,6 +78,7 @@ rtc_library("interval_budget") {
   deps = [
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
   ]
 }
 
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 991ddf3f11..7758738a42 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -124,6 +124,7 @@ rtc_library("rtp_rtcp_format") {
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
     "../../system_wrappers",
     "../video_coding:codec_globals_headers",
   ]
@@ -299,6 +300,7 @@ rtc_library("rtp_rtcp") {
     "../../rtc_base:rate_limiter",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
+    "../../rtc_base:safe_conversions",
     "../../rtc_base:safe_minmax",
     "../../rtc_base/containers:flat_map",
     "../../rtc_base/experiments:field_trial_parser",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index a7b8722bf0..734ebdcf6d 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -345,6 +345,7 @@ rtc_library("video_coding") {
     "../../rtc_base:rtc_event",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
+    "../../rtc_base:safe_conversions",
     "../../rtc_base:threading",
     "../../rtc_base/experiments:alr_experiment",
     "../../rtc_base/experiments:field_trial_parser",
@@ -446,6 +447,7 @@ rtc_library("video_coding_legacy") {
     "../../rtc_base:macromagic",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_event",
+    "../../rtc_base:safe_conversions",
     "../../rtc_base/memory:always_valid_pointer",
     "../../rtc_base/synchronization:mutex",
     "../../system_wrappers",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 464a367d2a..a5ec46c748 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -608,6 +608,7 @@ rtc_source_set("srtp_transport") {
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
+    "../rtc_base:safe_conversions",
     "../rtc_base/third_party/base64",
     "../rtc_base/third_party/sigslot",
   ]
@@ -2513,6 +2514,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base:rtc_event",
       "../rtc_base:rtc_json",
+      "../rtc_base:safe_conversions",
       "../rtc_base:socket_address",
       "../rtc_base:threading",
       "../rtc_base:timeutils",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 058e1ea1fe..d0551b7bd2 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -88,6 +88,7 @@ rtc_library("rtc_base_approved") {
     ":rtc_event",
     ":rtc_task_queue",
     ":safe_compare",
+    ":safe_conversions",
     ":type_traits",
     "../api:array_view",
     "../api:scoped_refptr",
@@ -179,7 +180,6 @@ rtc_library("rtc_base_approved") {
   public_deps += [  # no-presubmit-check TODO(webrtc:8603)
     ":platform_thread",
     ":platform_thread_types",
-    ":safe_conversions",
     ":stringutils",
     ":timeutils",
     "../api:sequence_checker",
@@ -943,6 +943,7 @@ rtc_library("rtc_base") {
     ":refcount",
     ":rtc_event",
     ":rtc_task_queue",
+    ":safe_conversions",
     ":socket",
     ":socket_address",
     ":socket_factory",
@@ -1562,6 +1563,7 @@ if (rtc_include_tests) {
         ":refcount",
         ":rtc_base_tests_utils",
         ":rtc_event",
+        ":safe_conversions",
         ":socket",
         ":socket_address",
         ":socket_factory",
diff --git a/rtc_base/experiments/BUILD.gn b/rtc_base/experiments/BUILD.gn
index 281767bc31..3f720d587a 100644
--- a/rtc_base/experiments/BUILD.gn
+++ b/rtc_base/experiments/BUILD.gn
@@ -206,6 +206,7 @@ rtc_library("rate_control_settings") {
   deps = [
     ":field_trial_parser",
     "..:logging",
+    "..:safe_conversions",
     "../:rtc_base_approved",
     "../../api:field_trials_view",
     "../../api/transport:field_trial_based_config",
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index bcc8dd7a54..ced97d9761 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -871,6 +871,7 @@ if (is_ios || is_mac) {
         "../modules/video_coding:video_codec_interface",
         "../rtc_base",
         "../rtc_base:refcount",
+        "../rtc_base:safe_conversions",
       ]
     }
 
@@ -1035,6 +1036,7 @@ if (is_ios || is_mac) {
         "../rtc_base:checks",
         "../rtc_base:logging",
         "../rtc_base:network_constants",
+        "../rtc_base:safe_conversions",
         "../stats:rtc_stats",
         "../system_wrappers:field_trial",
         "../system_wrappers:metrics",
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 5f328b70d4..9f9b49c959 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -695,6 +695,7 @@ if (current_os == "linux" || is_android) {
       "../../rtc_base:logging",
       "../../rtc_base:refcount",
       "../../rtc_base:rtc_task_queue",
+      "../../rtc_base:safe_conversions",
       "../../rtc_base:threading",
       "../../rtc_base/synchronization:mutex",
       "../../rtc_base/task_utils:to_queued_task",
@@ -801,6 +802,7 @@ if (current_os == "linux" || is_android) {
       "../../rtc_base:refcount",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_task_queue",
+      "../../rtc_base:safe_conversions",
       "../../rtc_base:threading",
       "../../system_wrappers:field_trial",
     ]
diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn
index cc7dcaca71..dc329b3c96 100644
--- a/system_wrappers/BUILD.gn
+++ b/system_wrappers/BUILD.gn
@@ -37,6 +37,7 @@ rtc_library("system_wrappers") {
     "../modules:module_api_public",
     "../rtc_base:checks",
     "../rtc_base:logging",
+    "../rtc_base:safe_conversions",
     "../rtc_base/synchronization:mutex",
     "../rtc_base/system:arch",
     "../rtc_base/system:rtc_export",
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 65db7ae299..e65bcc5d56 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -407,6 +407,7 @@ webrtc_fuzzer_test("neteq_signal_fuzzer") {
     "../../modules/audio_coding:neteq_tools_minimal",
     "../../modules/audio_coding:pcm16b",
     "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
   ]
 }
 
diff --git a/video/BUILD.gn b/video/BUILD.gn
index c9f5b6eccb..90648b250a 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -119,6 +119,7 @@ rtc_library("video") {
     "../rtc_base:rtc_event",
     "../rtc_base:rtc_numerics",
     "../rtc_base:rtc_task_queue",
+    "../rtc_base:safe_conversions",
     "../rtc_base:stringutils",
     "../rtc_base:threading",
     "../rtc_base:weak_ptr",
@@ -475,6 +476,7 @@ rtc_library("video_stream_encoder_impl") {
     "../rtc_base:rtc_event",
     "../rtc_base:rtc_numerics",
     "../rtc_base:rtc_task_queue",
+    "../rtc_base:safe_conversions",
     "../rtc_base:timeutils",
     "../rtc_base/experiments:alr_experiment",
     "../rtc_base/experiments:balanced_degradation_settings",
@@ -903,6 +905,7 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_event",
       "../rtc_base:rtc_numerics",
       "../rtc_base:rtc_task_queue",
+      "../rtc_base:safe_conversions",
       "../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 7bc48b4838..d7d0959b01 100644
--- a/video/adaptation/BUILD.gn
+++ b/video/adaptation/BUILD.gn
@@ -55,6 +55,7 @@ rtc_library("video_adaptation") {
     "../../rtc_base:rtc_event",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
+    "../../rtc_base:safe_conversions",
     "../../rtc_base:timeutils",
     "../../rtc_base/experiments:balanced_degradation_settings",
     "../../rtc_base/experiments:field_trial_parser",