diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index 7a6d3af741..bf6ad4aea9 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -56,6 +56,7 @@ rtc_library("common_video") {
     "../api/video_codecs:bitstream_parser_api",
     "../api/video_codecs:video_codecs_api",
     "../rtc_base",
+    "../rtc_base:bit_buffer",
     "../rtc_base:bitstream_reader",
     "../rtc_base:checks",
     "../rtc_base:logging",
@@ -117,6 +118,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../api/video:video_rtp_headers",
       "../api/video_codecs:video_codecs_api",
       "../rtc_base",
+      "../rtc_base:bit_buffer",
       "../rtc_base:checks",
       "../rtc_base:logging",
       "../rtc_base:macromagic",
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 50c41c73f2..0b51b61690 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -269,6 +269,7 @@ rtc_library("rtc_event_number_encodings") {
   defines = []
 
   deps = [
+    "../rtc_base:bit_buffer",
     "../rtc_base:bitstream_reader",
     "../rtc_base:checks",
     "../rtc_base:ignore_wundef",
@@ -299,6 +300,7 @@ rtc_library("rtc_event_log_impl_encoder") {
     "../api:rtp_headers",
     "../api:rtp_parameters",
     "../api/transport:network_control",
+    "../rtc_base:bit_buffer",
     "../rtc_base:bitstream_reader",
     "../rtc_base:checks",
     "../rtc_base:ignore_wundef",
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 508d720ade..54dfac5dc7 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -118,6 +118,7 @@ rtc_library("rtp_rtcp_format") {
     "../../api/video:video_layers_allocation",
     "../../api/video:video_rtp_headers",
     "../../common_video",
+    "../../rtc_base:bit_buffer",
     "../../rtc_base:bitstream_reader",
     "../../rtc_base:checks",
     "../../rtc_base:divide_round",
@@ -292,6 +293,7 @@ rtc_library("rtp_rtcp") {
     "../../logging:rtc_event_audio",
     "../../logging:rtc_event_rtp_rtcp",
     "../../modules/audio_coding:audio_coding_module_typedefs",
+    "../../rtc_base:bit_buffer",
     "../../rtc_base:bitstream_reader",
     "../../rtc_base:checks",
     "../../rtc_base:divide_round",
@@ -623,6 +625,7 @@ if (rtc_include_tests) {
       "../../common_video/generic_frame_descriptor",
       "../../common_video/test:utilities",
       "../../logging:mocks",
+      "../../rtc_base:bit_buffer",
       "../../rtc_base:checks",
       "../../rtc_base:logging",
       "../../rtc_base:macromagic",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 69edda43d9..9167173f3e 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -82,6 +82,7 @@ rtc_library("rtc_base_approved") {
   visibility = [ "*" ]
   deps = [
     ":atomicops",
+    ":bit_buffer",
     ":checks",
     ":location",
     ":logging",
@@ -89,6 +90,7 @@ rtc_library("rtc_base_approved") {
     ":one_time_event",
     ":platform_thread",
     ":platform_thread_types",
+    ":race_checker",
     ":random",
     ":refcount",
     ":rtc_event",
@@ -118,8 +120,7 @@ rtc_library("rtc_base_approved") {
   public_deps = []  # no-presubmit-check TODO(webrtc:8603)
 
   sources = [
-    "bit_buffer.cc",
-    "bit_buffer.h",
+    "bit_buffer.h",  # Transitional, use :bit_buffer
     "buffer.h",
     "buffer_queue.cc",
     "buffer_queue.h",
@@ -138,8 +139,7 @@ rtc_library("rtc_base_approved") {
     "numerics/sample_counter.cc",
     "numerics/sample_counter.h",
     "one_time_event.h",  # Transitional, use :one_time_event
-    "race_checker.cc",
-    "race_checker.h",
+    "race_checker.h",  # Transitional, use :race_checker
     "random.h",  # Transitional, use :random
     "rate_statistics.cc",
     "rate_statistics.h",
@@ -217,6 +217,16 @@ rtc_source_set("macromagic") {
   deps = [ "system:arch" ]
 }
 
+rtc_library("bit_buffer") {
+  visibility = [ "*" ]
+  sources = [
+    "bit_buffer.cc",
+    "bit_buffer.h",
+  ]
+  deps = [ ":checks" ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/numeric:bits" ]
+}
+
 rtc_library("location") {
   visibility = [ "*" ]
   sources = [
@@ -226,6 +236,19 @@ rtc_library("location") {
   deps = [ "system:rtc_export" ]
 }
 
+rtc_library("race_checker") {
+  visibility = [ "*" ]
+  sources = [
+    "race_checker.cc",
+    "race_checker.h",
+  ]
+  deps = [
+    ":checks",
+    ":macromagic",
+    ":platform_thread_types",
+  ]
+}
+
 rtc_library("random") {
   visibility = [ "*" ]
   sources = [
@@ -1483,6 +1506,7 @@ if (rtc_include_tests) {
       }
       deps = [
         ":atomicops",
+        ":bit_buffer",
         ":bitstream_reader",
         ":bounded_inline_vector",
         ":checks",