diff --git a/api/BUILD.gn b/api/BUILD.gn
index c170a76f45..f66101eee2 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -1200,6 +1200,7 @@ if (rtc_include_tests) {
       ":scoped_refptr",
       ":sequence_checker",
       ":time_controller",
+      "../rtc_base:buffer",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:platform_thread",
diff --git a/api/audio_codecs/BUILD.gn b/api/audio_codecs/BUILD.gn
index 8d7457620f..e102b27d8c 100644
--- a/api/audio_codecs/BUILD.gn
+++ b/api/audio_codecs/BUILD.gn
@@ -33,6 +33,7 @@ rtc_library("audio_codecs_api") {
     "..:bitrate_allocation",
     "..:scoped_refptr",
     "../../api:field_trials_view",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:refcount",
     "../../rtc_base:rtc_base_approved",
diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index ed6ec3eed0..fd76253557 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -86,6 +86,7 @@ rtc_library("audio") {
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../rtc_base",
     "../rtc_base:audio_format_to_string",
+    "../rtc_base:buffer",
     "../rtc_base:checks",
     "../rtc_base:location",
     "../rtc_base:logging",
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index e1068c3b1d..5b4be9f5bb 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -58,6 +58,7 @@ rtc_library("common_video") {
     "../rtc_base",
     "../rtc_base:bit_buffer",
     "../rtc_base:bitstream_reader",
+    "../rtc_base:buffer",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -121,6 +122,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../api/video_codecs:video_codecs_api",
       "../rtc_base",
       "../rtc_base:bit_buffer",
+      "../rtc_base:buffer",
       "../rtc_base:checks",
       "../rtc_base:logging",
       "../rtc_base:macromagic",
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 0b51b61690..46dd3d96a3 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -226,6 +226,7 @@ rtc_library("rtc_event_rtp_rtcp") {
     "../api/rtc_event_log",
     "../api/units:timestamp",
     "../modules/rtp_rtcp:rtp_rtcp_format",
+    "../rtc_base:buffer",
     "../rtc_base:checks",
     "../rtc_base:rtc_base_approved",
   ]
@@ -302,6 +303,7 @@ rtc_library("rtc_event_log_impl_encoder") {
     "../api/transport:network_control",
     "../rtc_base:bit_buffer",
     "../rtc_base:bitstream_reader",
+    "../rtc_base:buffer",
     "../rtc_base:checks",
     "../rtc_base:ignore_wundef",
     "../rtc_base:logging",
@@ -510,6 +512,7 @@ if (rtc_enable_protobuf) {
         "../call:call_interfaces",
         "../modules/audio_coding:audio_network_adaptor",
         "../modules/rtp_rtcp:rtp_rtcp_format",
+        "../rtc_base:buffer",
         "../rtc_base:checks",
         "../rtc_base:macromagic",
         "../rtc_base:random",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 3468569f78..4f3c8f1add 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -79,6 +79,7 @@ rtc_library("rtc_media_base") {
     "../modules/audio_processing:audio_processing_statistics",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../rtc_base",
+    "../rtc_base:buffer",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -294,6 +295,7 @@ rtc_library("rtc_audio_video") {
     "../modules/video_coding:video_coding_utility",
     "../rtc_base",
     "../rtc_base:audio_format_to_string",
+    "../rtc_base:buffer",
     "../rtc_base:checks",
     "../rtc_base:ignore_wundef",
     "../rtc_base:logging",
@@ -494,6 +496,7 @@ if (rtc_include_tests) {
       "../modules/video_coding:video_coding_utility",
       "../p2p:rtc_p2p",
       "../rtc_base",
+      "../rtc_base:buffer",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:macromagic",
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index aa06e7b56c..a6d86aca74 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -50,6 +50,7 @@ rtc_library("audio_coding") {
     "../../common_audio",
     "../../common_audio:common_audio_c",
     "../../rtc_base:audio_format_to_string",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
@@ -73,6 +74,7 @@ rtc_library("legacy_encoded_audio_frame") {
   deps = [
     "../../api:array_view",
     "../../api/audio_codecs:audio_codecs_api",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
   ]
@@ -89,6 +91,7 @@ rtc_library("webrtc_cng") {
   deps = [
     "../../api:array_view",
     "../../common_audio:common_audio_c",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:safe_conversions",
@@ -125,6 +128,7 @@ rtc_library("red") {
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/units:time_delta",
     "../../common_audio",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
@@ -147,6 +151,7 @@ rtc_library("g711") {
     "../../api:array_view",
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/units:time_delta",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
   ]
@@ -179,6 +184,7 @@ rtc_library("g722") {
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/audio_codecs/g722:audio_encoder_g722_config",
     "../../api/units:time_delta",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:safe_conversions",
@@ -213,6 +219,7 @@ rtc_library("ilbc") {
     "../../api/audio_codecs/ilbc:audio_encoder_ilbc_config",
     "../../api/units:time_delta",
     "../../common_audio",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
@@ -709,6 +716,7 @@ rtc_library("pcm16b") {
     ":legacy_encoded_audio_frame",
     "../../api:array_view",
     "../../api/audio_codecs:audio_codecs_api",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
   ]
@@ -758,6 +766,7 @@ rtc_library("webrtc_opus") {
     "../../api/audio_codecs:audio_codecs_api",
     "../../api/audio_codecs/opus:audio_encoder_opus_config",
     "../../common_audio",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
@@ -802,6 +811,7 @@ rtc_library("webrtc_multiopus") {
     "../../api/audio_codecs/opus:audio_decoder_opus_config",
     "../../api/audio_codecs/opus:audio_encoder_opus_config",
     "../../api/units:time_delta",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
@@ -1022,6 +1032,7 @@ rtc_library("neteq") {
     "../../common_audio",
     "../../common_audio:common_audio_c",
     "../../rtc_base:audio_format_to_string",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:gtest_prod",
     "../../rtc_base:logging",
@@ -1090,6 +1101,7 @@ rtc_library("neteq_tools_minimal") {
     "../../api/neteq:custom_neteq_factory",
     "../../api/neteq:default_neteq_controller_factory",
     "../../api/neteq:neteq_api",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:safe_conversions",
@@ -1128,6 +1140,7 @@ rtc_library("neteq_test_tools") {
     "../../api:rtp_headers",
     "../../common_audio",
     "../../rtc_base",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:stringutils",
@@ -1467,16 +1480,18 @@ if (rtc_include_tests) {
 
     defines = audio_coding_defines
 
-    deps = audio_coding_deps + [
-             "../../api:scoped_refptr",
-             ":audio_coding",
-             "../../api/audio_codecs:audio_codecs_api",
-             "../../api/audio_codecs:builtin_audio_decoder_factory",
-             ":neteq_tools",
-             "../../rtc_base:rtc_base_approved",
-             "../../test:test_support",
-             "//testing/gtest",
-           ]
+    deps = [
+      ":audio_coding",
+      ":neteq_tools",
+      "../../api:scoped_refptr",
+      "../../api/audio_codecs:audio_codecs_api",
+      "../../api/audio_codecs:builtin_audio_decoder_factory",
+      "../../rtc_base:rtc_base_approved",
+      "../../test:test_support",
+      "//testing/gtest",
+    ]
+
+    deps += audio_coding_deps
     absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
   }
 
@@ -1716,22 +1731,24 @@ if (rtc_include_tests) {
     rtc_executable("rtp_encode") {
       testonly = true
 
-      deps = audio_coding_deps + [
-               ":audio_coding",
-               ":audio_encoder_cng",
-               ":neteq_input_audio_tools",
-               "../../api/audio:audio_frame_api",
-               "../../api/audio_codecs/g711:audio_encoder_g711",
-               "../../api/audio_codecs/L16:audio_encoder_L16",
-               "../../api/audio_codecs/g722:audio_encoder_g722",
-               "../../api/audio_codecs/ilbc:audio_encoder_ilbc",
-               "../../api/audio_codecs/isac:audio_encoder_isac",
-               "../../api/audio_codecs/opus:audio_encoder_opus",
-               "../../rtc_base:safe_conversions",
-               "//third_party/abseil-cpp/absl/flags:flag",
-               "//third_party/abseil-cpp/absl/flags:parse",
-               "//third_party/abseil-cpp/absl/memory",
-             ]
+      deps = [
+        ":audio_coding",
+        ":audio_encoder_cng",
+        ":neteq_input_audio_tools",
+        "../../api/audio:audio_frame_api",
+        "../../api/audio_codecs/L16:audio_encoder_L16",
+        "../../api/audio_codecs/g711:audio_encoder_g711",
+        "../../api/audio_codecs/g722:audio_encoder_g722",
+        "../../api/audio_codecs/ilbc:audio_encoder_ilbc",
+        "../../api/audio_codecs/isac:audio_encoder_isac",
+        "../../api/audio_codecs/opus:audio_encoder_opus",
+        "../../rtc_base:safe_conversions",
+        "//third_party/abseil-cpp/absl/flags:flag",
+        "//third_party/abseil-cpp/absl/flags:parse",
+        "//third_party/abseil-cpp/absl/memory",
+      ]
+
+      deps += audio_coding_deps
 
       sources = [ "neteq/tools/rtp_encode.cc" ]
 
@@ -1741,11 +1758,14 @@ if (rtc_include_tests) {
     rtc_executable("rtp_jitter") {
       testonly = true
 
-      deps = audio_coding_deps + [
-               "../rtp_rtcp:rtp_rtcp_format",
-               "../../api:array_view",
-               "../../rtc_base:rtc_base_approved",
-             ]
+      deps = [
+        "../../api:array_view",
+        "../../rtc_base:buffer",
+        "../../rtc_base:rtc_base_approved",
+        "../rtp_rtcp:rtp_rtcp_format",
+      ]
+
+      deps += audio_coding_deps
 
       sources = [ "neteq/tools/rtp_jitter.cc" ]
 
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index 157e7db8a9..d4e70358f9 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -71,6 +71,7 @@ rtc_library("audio_device_buffer") {
     "../../api:sequence_checker",
     "../../api/task_queue",
     "../../common_audio:common_audio_c",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
@@ -188,6 +189,7 @@ rtc_library("audio_device_impl") {
     "../../common_audio",
     "../../common_audio:common_audio_c",
     "../../rtc_base",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
@@ -415,6 +417,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../../api/task_queue",
       "../../api/task_queue:default_task_queue_factory",
       "../../common_audio",
+      "../../rtc_base:buffer",
       "../../rtc_base:checks",
       "../../rtc_base:ignore_wundef",
       "../../rtc_base:logging",
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index afae083efc..f0ef4bbaa3 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -120,6 +120,7 @@ rtc_library("rtp_rtcp_format") {
     "../../common_video",
     "../../rtc_base:bit_buffer",
     "../../rtc_base:bitstream_reader",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:divide_round",
     "../../rtc_base:logging",
@@ -295,6 +296,7 @@ rtc_library("rtp_rtcp") {
     "../../modules/audio_coding:audio_coding_module_typedefs",
     "../../rtc_base:bit_buffer",
     "../../rtc_base:bitstream_reader",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:divide_round",
     "../../rtc_base:gtest_prod",
@@ -630,6 +632,7 @@ if (rtc_include_tests) {
       "../../common_video/test:utilities",
       "../../logging:mocks",
       "../../rtc_base:bit_buffer",
+      "../../rtc_base:buffer",
       "../../rtc_base:checks",
       "../../rtc_base:logging",
       "../../rtc_base:macromagic",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 3107777ef2..9f6cf70892 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -793,6 +793,7 @@ rtc_library("webrtc_vp9") {
     "../../common_video",
     "../../media:rtc_media_base",
     "../../rtc_base",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:stringutils",
@@ -940,6 +941,7 @@ if (rtc_include_tests) {
       "../../api/video:video_rtp_headers",
       "../../api/video_codecs:video_codecs_api",
       "../../common_video",
+      "../../rtc_base:buffer",
       "../../rtc_base:checks",
       "../../rtc_base:macromagic",
       "../../rtc_base:rtc_base_approved",
diff --git a/net/dcsctp/packet/BUILD.gn b/net/dcsctp/packet/BUILD.gn
index b8ce420577..546788a96c 100644
--- a/net/dcsctp/packet/BUILD.gn
+++ b/net/dcsctp/packet/BUILD.gn
@@ -277,6 +277,7 @@ if (rtc_include_tests) {
       ":sctp_packet",
       ":tlv_trait",
       "../../../api:array_view",
+      "../../../rtc_base:buffer",
       "../../../rtc_base:checks",
       "../../../rtc_base:gunit_helpers",
       "../../../rtc_base:rtc_base_approved",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 100fa8f884..eaabc0ee16 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -102,6 +102,7 @@ rtc_library("rtc_p2p") {
     "../logging:ice_log",
     "../rtc_base",
     "../rtc_base:async_resolver_interface",
+    "../rtc_base:buffer",
     "../rtc_base:callback_list",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
@@ -254,6 +255,7 @@ if (rtc_include_tests) {
       "../api/transport:stun_types",
       "../api/units:time_delta",
       "../rtc_base",
+      "../rtc_base:buffer",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:ip_address",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 60a4ca1a58..bf506eb1be 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -159,6 +159,7 @@ rtc_source_set("dtls_srtp_transport") {
     "../api:rtc_error",
     "../p2p:rtc_p2p",
     "../rtc_base",
+    "../rtc_base:buffer",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base/third_party/sigslot",
@@ -562,6 +563,7 @@ rtc_source_set("srtp_filter") {
     "../api:libjingle_peerconnection_api",
     "../api:sequence_checker",
     "../rtc_base",
+    "../rtc_base:buffer",
     "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:zero_memory",
@@ -620,6 +622,7 @@ rtc_source_set("srtp_transport") {
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:rtc_p2p",
     "../rtc_base",
+    "../rtc_base:buffer",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
@@ -2121,6 +2124,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../p2p:p2p_test_utils",
       "../p2p:rtc_p2p",
       "../rtc_base",
+      "../rtc_base:buffer",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:location",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index a06570a047..bc93673a2f 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -83,6 +83,7 @@ rtc_library("rtc_base_approved") {
   deps = [
     ":atomicops",
     ":bit_buffer",
+    ":buffer",
     ":checks",
     ":histogram_percentile_counter",
     ":location",
@@ -127,7 +128,7 @@ rtc_library("rtc_base_approved") {
 
   sources = [
     "bit_buffer.h",  # Transitional, use :bit_buffer
-    "buffer.h",
+    "buffer.h",  # Transitional, use :buffer
     "buffer_queue.cc",
     "buffer_queue.h",
     "byte_buffer.cc",
@@ -193,6 +194,18 @@ rtc_library("rtc_base_approved") {
   }
 }
 
+rtc_source_set("buffer") {
+  visibility = [ "*" ]
+  sources = [ "buffer.h" ]
+  deps = [
+    ":checks",
+    ":type_traits",
+    ":zero_memory",
+    "../api:array_view",
+  ]
+  absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
+}
+
 rtc_source_set("mod_ops") {
   visibility = [ "*" ]
   sources = [ "numerics/mod_ops.h" ]
@@ -1089,6 +1102,7 @@ rtc_library("rtc_base") {
   deps = [
     ":async_resolver_interface",
     ":async_socket",
+    ":buffer",
     ":callback_list",
     ":checks",
     ":ip_address",
@@ -1493,6 +1507,7 @@ if (rtc_include_tests) {
         "socket_unittest.h",
       ]
       deps = [
+        ":buffer",
         ":checks",
         ":gunit_helpers",
         ":ip_address",
@@ -1577,6 +1592,7 @@ if (rtc_include_tests) {
         ":bit_buffer",
         ":bitstream_reader",
         ":bounded_inline_vector",
+        ":buffer",
         ":checks",
         ":criticalsection",
         ":divide_round",
@@ -1736,6 +1752,7 @@ if (rtc_include_tests) {
       ]
       deps = [
         ":atomicops",
+        ":buffer",
         ":checks",
         ":gunit_helpers",
         ":ip_address",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 45cbb9e9cf..c108bbb0ca 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -401,6 +401,7 @@ rtc_library("video_test_support") {
     "../modules/video_coding:webrtc_h264",
     "../modules/video_coding:webrtc_vp8",
     "../modules/video_coding:webrtc_vp9",
+    "../rtc_base:buffer",
     "../rtc_base:checks",
     "../rtc_base:criticalsection",
     "../rtc_base:logging",
@@ -1081,6 +1082,7 @@ rtc_library("copy_to_file_audio_capturer") {
     "../api:array_view",
     "../common_audio",
     "../modules/audio_device:audio_device_impl",
+    "../rtc_base:buffer",
     "../rtc_base:rtc_base_approved",
   ]
   absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
diff --git a/test/fuzzers/BUILD.gn b/test/fuzzers/BUILD.gn
index 725810d25e..d079000836 100644
--- a/test/fuzzers/BUILD.gn
+++ b/test/fuzzers/BUILD.gn
@@ -343,6 +343,7 @@ rtc_library("audio_encoder_fuzzer") {
     ":fuzz_data_helper",
     "../../api:array_view",
     "../../api/audio_codecs:audio_codecs_api",
+    "../../rtc_base:buffer",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
   ]
@@ -569,6 +570,7 @@ webrtc_fuzzer_test("comfort_noise_decoder_fuzzer") {
   deps = [
     "../../api:array_view",
     "../../modules/audio_coding:webrtc_cng",
+    "../../rtc_base:buffer",
     "../../rtc_base:rtc_base_approved",
   ]
 }
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index 2c2f7d49f3..d1e8bf22d9 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -423,6 +423,7 @@ if (!build_with_chromium) {
       deps = [
         ":single_process_encoded_image_data_injector",
         "../../../api/video:encoded_image",
+        "../../../rtc_base:buffer",
         "../../../rtc_base:rtc_base_approved",
         "../../../test:test_support",
       ]
@@ -435,6 +436,7 @@ if (!build_with_chromium) {
       deps = [
         ":video_frame_tracking_id_injector",
         "../../../api/video:encoded_image",
+        "../../../rtc_base:buffer",
         "../../../rtc_base:rtc_base_approved",
         "../../../test:test_support",
       ]