diff --git a/api/transport/BUILD.gn b/api/transport/BUILD.gn
index 81eafddc3f..1f1f5ca529 100644
--- a/api/transport/BUILD.gn
+++ b/api/transport/BUILD.gn
@@ -99,6 +99,7 @@ rtc_source_set("stun_types") {
 
   deps = [
     "../../api:array_view",
+    "../../rtc_base:byte_order",
     "../../rtc_base:checks",
     "../../rtc_base:ip_address",
     "../../rtc_base:logging",
@@ -141,6 +142,7 @@ if (rtc_include_tests) {
     deps = [
       ":stun_types",
       "../../rtc_base",
+      "../../rtc_base:byte_order",
       "../../rtc_base:macromagic",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:socket_address",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 4f3c8f1add..c3bb5f0b43 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -80,6 +80,7 @@ rtc_library("rtc_media_base") {
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../rtc_base",
     "../rtc_base:buffer",
+    "../rtc_base:byte_order",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -296,6 +297,7 @@ rtc_library("rtc_audio_video") {
     "../rtc_base",
     "../rtc_base:audio_format_to_string",
     "../rtc_base:buffer",
+    "../rtc_base:byte_order",
     "../rtc_base:checks",
     "../rtc_base:ignore_wundef",
     "../rtc_base:logging",
@@ -497,6 +499,7 @@ if (rtc_include_tests) {
       "../p2p:rtc_p2p",
       "../rtc_base",
       "../rtc_base:buffer",
+      "../rtc_base:byte_order",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:macromagic",
@@ -611,6 +614,7 @@ if (rtc_include_tests) {
         "../modules/video_coding/codecs/av1:libaom_av1_encoder_if_supported",
         "../p2p:p2p_test_utils",
         "../rtc_base",
+        "../rtc_base:byte_order",
         "../rtc_base:checks",
         "../rtc_base:gunit_helpers",
         "../rtc_base:logging",
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index a6d86aca74..8e10910aba 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -129,6 +129,7 @@ rtc_library("red") {
     "../../api/units:time_delta",
     "../../common_audio",
     "../../rtc_base:buffer",
+    "../../rtc_base:byte_order",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:rtc_base_approved",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index c965fbb12a..393c301fd5 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -104,6 +104,7 @@ rtc_library("rtc_p2p") {
     "../rtc_base:async_resolver_interface",
     "../rtc_base:buffer",
     "../rtc_base:buffer_queue",
+    "../rtc_base:byte_order",
     "../rtc_base:callback_list",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index bf506eb1be..7e5b352ed9 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -589,6 +589,7 @@ rtc_source_set("srtp_session") {
     "../api:sequence_checker",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../rtc_base",
+    "../rtc_base:byte_order",
     "../rtc_base:checks",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
@@ -2125,6 +2126,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../p2p:rtc_p2p",
       "../rtc_base",
       "../rtc_base:buffer",
+      "../rtc_base:byte_order",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:location",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 40be8c6c69..cb3aaf009f 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -85,6 +85,7 @@ rtc_library("rtc_base_approved") {
     ":bit_buffer",
     ":buffer",
     ":buffer_queue",
+    ":byte_order",
     ":checks",
     ":histogram_percentile_counter",
     ":location",
@@ -133,7 +134,7 @@ rtc_library("rtc_base_approved") {
     "buffer_queue.h",  # Transitional, use :buffer_queue
     "byte_buffer.cc",
     "byte_buffer.h",
-    "byte_order.h",
+    "byte_order.h",  # Transitional, use :byte_order
     "copy_on_write_buffer.cc",
     "copy_on_write_buffer.h",
     "event_tracer.cc",
@@ -206,6 +207,12 @@ rtc_source_set("buffer") {
   absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
 }
 
+rtc_source_set("byte_order") {
+  visibility = [ "*" ]
+  sources = [ "byte_order.h" ]
+  deps = [ "system:arch" ]
+}
+
 rtc_source_set("mod_ops") {
   visibility = [ "*" ]
   sources = [ "numerics/mod_ops.h" ]
@@ -904,6 +911,7 @@ rtc_library("ip_address") {
     "ip_address.h",
   ]
   deps = [
+    ":byte_order",
     ":net_helpers",
     ":rtc_base_approved",
     ":stringutils",
@@ -922,6 +930,7 @@ rtc_library("socket_address") {
     "socket_address.h",
   ]
   deps = [
+    ":byte_order",
     ":checks",
     ":ip_address",
     ":logging",
@@ -984,6 +993,7 @@ rtc_library("threading") {
   deps = [
     ":async_resolver_interface",
     ":atomicops",
+    ":byte_order",
     ":checks",
     ":criticalsection",
     ":ip_address",
@@ -1090,6 +1100,7 @@ if (is_win) {
     ]
 
     deps = [
+      ":byte_order",
       ":checks",
       ":logging",
       ":macromagic",
@@ -1117,6 +1128,7 @@ rtc_library("rtc_base") {
     ":async_resolver_interface",
     ":async_socket",
     ":buffer",
+    ":byte_order",
     ":callback_list",
     ":checks",
     ":ip_address",
@@ -1608,6 +1620,7 @@ if (rtc_include_tests) {
         ":bounded_inline_vector",
         ":buffer",
         ":buffer_queue",
+        ":byte_order",
         ":checks",
         ":criticalsection",
         ":divide_round",