diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index b025ebfdac..e49c30ce6b 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -97,6 +97,7 @@ rtc_library("rtc_base_approved") {
     ":refcount",
     ":rtc_event",
     ":safe_conversions",
+    ":sample_counter",
     ":stringutils",
     ":strong_alias",
     ":swap_queue",
@@ -138,8 +139,7 @@ rtc_library("rtc_base_approved") {
     "numerics/histogram_percentile_counter.h",
     "numerics/mod_ops.h",  # Transitional, use :mod_ops
     "numerics/moving_max_counter.h",  # Transitional, use :moving_max_counter
-    "numerics/sample_counter.cc",
-    "numerics/sample_counter.h",
+    "numerics/sample_counter.h",  # Transitional, use :sample_counter
     "one_time_event.h",  # Transitional, use :one_time_event
     "race_checker.h",  # Transitional, use :race_checker
     "random.h",  # Transitional, use :random
@@ -276,6 +276,19 @@ rtc_library("random") {
   ]
 }
 
+rtc_library("sample_counter") {
+  visibility = [ "*" ]
+  sources = [
+    "numerics/sample_counter.cc",
+    "numerics/sample_counter.h",
+  ]
+  deps = [
+    ":checks",
+    ":safe_conversions",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+}
+
 rtc_library("timestamp_aligner") {
   visibility = [ "*" ]
   sources = [
@@ -1549,6 +1562,7 @@ if (rtc_include_tests) {
         ":rtc_task_queue",
         ":safe_compare",
         ":safe_minmax",
+        ":sample_counter",
         ":sanitizer",
         ":socket",
         ":socket_address",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 40bf6cefe3..a63cba18be 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -115,6 +115,7 @@ rtc_library("video") {
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:mod_ops",
+    "../rtc_base:moving_max_counter",
     "../rtc_base:platform_thread",
     "../rtc_base:rate_limiter",
     "../rtc_base:rtc_base",
@@ -210,6 +211,7 @@ rtc_source_set("video_legacy") {
     "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
+    "../rtc_base:moving_max_counter",
     "../rtc_base:platform_thread",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_numerics",