diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index e49c30ce6b..09efa1c753 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -84,6 +84,7 @@ rtc_library("rtc_base_approved") {
     ":atomicops",
     ":bit_buffer",
     ":checks",
+    ":histogram_percentile_counter",
     ":location",
     ":logging",
     ":macromagic",
@@ -135,8 +136,8 @@ rtc_library("rtc_base_approved") {
     "event_tracer.cc",
     "event_tracer.h",
     "location.h",  # Transitional, use :location
-    "numerics/histogram_percentile_counter.cc",
-    "numerics/histogram_percentile_counter.h",
+    "numerics/histogram_percentile_counter.h",  # Transitional, use
+                                                # :histogram_percentile_counter
     "numerics/mod_ops.h",  # Transitional, use :mod_ops
     "numerics/moving_max_counter.h",  # Transitional, use :moving_max_counter
     "numerics/sample_counter.h",  # Transitional, use :sample_counter
@@ -242,6 +243,16 @@ rtc_library("bit_buffer") {
   absl_deps = [ "//third_party/abseil-cpp/absl/numeric:bits" ]
 }
 
+rtc_library("histogram_percentile_counter") {
+  visibility = [ "*" ]
+  sources = [
+    "numerics/histogram_percentile_counter.cc",
+    "numerics/histogram_percentile_counter.h",
+  ]
+  deps = [ ":checks" ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+}
+
 rtc_library("location") {
   visibility = [ "*" ]
   sources = [
@@ -1542,6 +1553,7 @@ if (rtc_include_tests) {
         ":criticalsection",
         ":divide_round",
         ":gunit_helpers",
+        ":histogram_percentile_counter",
         ":ip_address",
         ":location",
         ":logging",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index a63cba18be..513bc55d97 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -124,6 +124,7 @@ rtc_library("video") {
     "../rtc_base:rtc_numerics",
     "../rtc_base:rtc_task_queue",
     "../rtc_base:safe_conversions",
+    "../rtc_base:sample_counter",
     "../rtc_base:stringutils",
     "../rtc_base:threading",
     "../rtc_base:timeutils",
@@ -216,6 +217,7 @@ rtc_source_set("video_legacy") {
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_numerics",
     "../rtc_base:rtc_task_queue",
+    "../rtc_base:sample_counter",
     "../rtc_base:stringutils",
     "../rtc_base:timeutils",
     "../rtc_base/experiments:field_trial_parser",