diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index eaabc0ee16..c965fbb12a 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -103,6 +103,7 @@ rtc_library("rtc_p2p") {
     "../rtc_base",
     "../rtc_base:async_resolver_interface",
     "../rtc_base:buffer",
+    "../rtc_base:buffer_queue",
     "../rtc_base:callback_list",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index bc93673a2f..40be8c6c69 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -84,6 +84,7 @@ rtc_library("rtc_base_approved") {
     ":atomicops",
     ":bit_buffer",
     ":buffer",
+    ":buffer_queue",
     ":checks",
     ":histogram_percentile_counter",
     ":location",
@@ -129,8 +130,7 @@ rtc_library("rtc_base_approved") {
   sources = [
     "bit_buffer.h",  # Transitional, use :bit_buffer
     "buffer.h",  # Transitional, use :buffer
-    "buffer_queue.cc",
-    "buffer_queue.h",
+    "buffer_queue.h",  # Transitional, use :buffer_queue
     "byte_buffer.cc",
     "byte_buffer.h",
     "byte_order.h",
@@ -256,6 +256,20 @@ rtc_library("bit_buffer") {
   absl_deps = [ "//third_party/abseil-cpp/absl/numeric:bits" ]
 }
 
+rtc_library("buffer_queue") {
+  visibility = [ "*" ]
+  sources = [
+    "buffer_queue.cc",
+    "buffer_queue.h",
+  ]
+  deps = [
+    ":buffer",
+    ":macromagic",
+    "../api:sequence_checker",
+    "system:no_unique_address",
+  ]
+}
+
 rtc_library("histogram_percentile_counter") {
   visibility = [ "*" ]
   sources = [
@@ -1593,6 +1607,7 @@ if (rtc_include_tests) {
         ":bitstream_reader",
         ":bounded_inline_vector",
         ":buffer",
+        ":buffer_queue",
         ":checks",
         ":criticalsection",
         ":divide_round",
@@ -1753,6 +1768,7 @@ if (rtc_include_tests) {
       deps = [
         ":atomicops",
         ":buffer",
+        ":buffer_queue",
         ":checks",
         ":gunit_helpers",
         ":ip_address",