diff --git a/api/units/BUILD.gn b/api/units/BUILD.gn
index 66a85fff5c..42ce2f36cc 100644
--- a/api/units/BUILD.gn
+++ b/api/units/BUILD.gn
@@ -19,7 +19,8 @@ rtc_source_set("data_rate") {
     ":data_size",
     ":time_delta",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
+    "../../rtc_base:stringutils",
   ]
 }
 
@@ -32,7 +33,8 @@ rtc_source_set("data_size") {
 
   deps = [
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
+    "../../rtc_base:stringutils",
   ]
 }
 
@@ -45,7 +47,8 @@ rtc_source_set("time_delta") {
 
   deps = [
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
+    "../../rtc_base:stringutils",
   ]
 }
 
@@ -59,7 +62,8 @@ rtc_source_set("timestamp") {
   deps = [
     ":time_delta",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:safe_conversions",
+    "../../rtc_base:stringutils",
   ]
 }
 
diff --git a/rtc_base/experiments/BUILD.gn b/rtc_base/experiments/BUILD.gn
index 5c2e4a7a04..3afaa85a23 100644
--- a/rtc_base/experiments/BUILD.gn
+++ b/rtc_base/experiments/BUILD.gn
@@ -28,11 +28,11 @@ rtc_static_library("field_trial_parser") {
     "field_trial_units.h",
   ]
   deps = [
-    "../:rtc_base_approved",
     "../../api/units:data_rate",
     "../../api/units:data_size",
     "../../api/units:time_delta",
     "../../rtc_base:checks",
+    "../../rtc_base:logging",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 }