diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 2785838a8f..f170caf1ea 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -300,6 +300,7 @@ rtc_library("rtp_rtcp") {
     "../../rtc_base:gtest_prod",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
+    "../../rtc_base:mod_ops",
     "../../rtc_base:one_time_event",
     "../../rtc_base:race_checker",
     "../../rtc_base:random",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 77162ef3fd..e1b525c188 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -116,6 +116,7 @@ rtc_library("packet_buffer") {
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
+    "../../rtc_base:mod_ops",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../rtp_rtcp:rtp_rtcp_format",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 9167173f3e..b025ebfdac 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -87,6 +87,8 @@ rtc_library("rtc_base_approved") {
     ":location",
     ":logging",
     ":macromagic",
+    ":mod_ops",
+    ":moving_max_counter",
     ":one_time_event",
     ":platform_thread",
     ":platform_thread_types",
@@ -134,8 +136,8 @@ rtc_library("rtc_base_approved") {
     "location.h",  # Transitional, use :location
     "numerics/histogram_percentile_counter.cc",
     "numerics/histogram_percentile_counter.h",
-    "numerics/mod_ops.h",
-    "numerics/moving_max_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",
     "one_time_event.h",  # Transitional, use :one_time_event
@@ -190,6 +192,19 @@ rtc_library("rtc_base_approved") {
   }
 }
 
+rtc_source_set("mod_ops") {
+  visibility = [ "*" ]
+  sources = [ "numerics/mod_ops.h" ]
+  deps = [ ":checks" ]
+}
+
+rtc_source_set("moving_max_counter") {
+  visibility = [ "*" ]
+  sources = [ "numerics/moving_max_counter.h" ]
+  deps = [ ":checks" ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
+}
+
 rtc_source_set("one_time_event") {
   visibility = [ "*" ]
   sources = [ "one_time_event.h" ]
@@ -718,6 +733,7 @@ rtc_library("rtc_numerics") {
   ]
   deps = [
     ":checks",
+    ":mod_ops",
     ":rtc_base_approved",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
@@ -1517,6 +1533,8 @@ if (rtc_include_tests) {
         ":location",
         ":logging",
         ":macromagic",
+        ":mod_ops",
+        ":moving_max_counter",
         ":null_socket_server",
         ":one_time_event",
         ":platform_thread",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 08002e8f61..40bf6cefe3 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -114,6 +114,7 @@ rtc_library("video") {
     "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
+    "../rtc_base:mod_ops",
     "../rtc_base:platform_thread",
     "../rtc_base:rate_limiter",
     "../rtc_base:rtc_base",
@@ -254,6 +255,7 @@ rtc_library("video_stream_decoder_impl") {
     "../modules/video_coding",
     "../modules/video_coding:timing",
     "../rtc_base:logging",
+    "../rtc_base:mod_ops",
     "../rtc_base:platform_thread",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_task_queue",