diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index f938e43b26..f90c136b98 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -87,6 +87,7 @@ rtc_library("audio") {
     "../rtc_base",
     "../rtc_base:audio_format_to_string",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:rate_limiter",
diff --git a/audio/voip/BUILD.gn b/audio/voip/BUILD.gn
index 5311d7242b..b45065f004 100644
--- a/audio/voip/BUILD.gn
+++ b/audio/voip/BUILD.gn
@@ -48,6 +48,7 @@ rtc_library("audio_channel") {
     "../../modules/rtp_rtcp:rtp_rtcp_format",
     "../../modules/utility",
     "../../rtc_base:criticalsection",
+    "../../rtc_base:location",
     "../../rtc_base:logging",
     "../../rtc_base:refcount",
     "../../rtc_base:rtc_base_approved",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index b46ff62c0c..ed7b9c1f11 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -210,6 +210,7 @@ rtc_library("rtp_sender") {
     "../modules/video_coding:video_codec_interface",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:random",
@@ -318,6 +319,7 @@ rtc_library("call") {
     "../modules/utility",
     "../modules/video_coding",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:rate_limiter",
diff --git a/modules/pacing/BUILD.gn b/modules/pacing/BUILD.gn
index 30390e2ce3..728a7a6473 100644
--- a/modules/pacing/BUILD.gn
+++ b/modules/pacing/BUILD.gn
@@ -48,6 +48,7 @@ rtc_library("pacing") {
     "../../logging:rtc_event_bwe",
     "../../logging:rtc_event_pacing",
     "../../rtc_base:checks",
+    "../../rtc_base:location",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
     "../../rtc_base:rtc_base_approved",
diff --git a/modules/utility/BUILD.gn b/modules/utility/BUILD.gn
index b8453c432c..dd48ce4d27 100644
--- a/modules/utility/BUILD.gn
+++ b/modules/utility/BUILD.gn
@@ -35,6 +35,7 @@ rtc_library("utility") {
     "../../api/task_queue",
     "../../common_audio",
     "../../rtc_base:checks",
+    "../../rtc_base:location",
     "../../rtc_base:logging",
     "../../rtc_base:platform_thread",
     "../../rtc_base:rtc_base_approved",
@@ -51,6 +52,7 @@ rtc_library("mock_process_thread") {
   sources = [ "include/mock/mock_process_thread.h" ]
   deps = [
     ":utility",
+    "../../rtc_base:location",
     "../../rtc_base:rtc_base_approved",
     "../../test:test_support",
   ]
@@ -66,6 +68,7 @@ if (rtc_include_tests) {
       "..:module_api",
       "../../api/task_queue",
       "../../api/task_queue:task_queue_test",
+      "../../rtc_base:location",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:timeutils",
       "../../test:test_support",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 7c4da550f9..260c9f619b 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -444,6 +444,7 @@ rtc_library("video_coding_legacy") {
     "../../common_video",
     "../../modules/rtp_rtcp:rtp_video_header",
     "../../rtc_base:checks",
+    "../../rtc_base:location",
     "../../rtc_base:logging",
     "../../rtc_base:macromagic",
     "../../rtc_base:one_time_event",
@@ -1259,6 +1260,7 @@ if (rtc_include_tests) {
       "../../media:rtc_media_base",
       "../../rtc_base",
       "../../rtc_base:checks",
+      "../../rtc_base:location",
       "../../rtc_base:platform_thread",
       "../../rtc_base:random",
       "../../rtc_base:refcount",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index ae987c5d95..4c6f83a99b 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -105,6 +105,7 @@ rtc_library("rtc_p2p") {
     "../rtc_base:callback_list",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:net_helpers",
@@ -255,6 +256,7 @@ if (rtc_include_tests) {
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:ip_address",
+      "../rtc_base:location",
       "../rtc_base:logging",
       "../rtc_base:macromagic",
       "../rtc_base:net_helpers",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 732ec21c04..62c7939512 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -48,6 +48,7 @@ rtc_library("proxy") {
   deps = [
     "../api:scoped_refptr",
     "../api/task_queue",
+    "../rtc_base:location",
     "../rtc_base:refcount",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:rtc_event",
@@ -82,6 +83,7 @@ rtc_source_set("channel") {
     "../p2p:rtc_p2p",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:rtc_base_approved",
@@ -132,6 +134,7 @@ rtc_source_set("channel_manager") {
     "../media:rtc_media_config",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:macromagic",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:threading",
@@ -312,6 +315,7 @@ rtc_source_set("jsep_transport_controller") {
     "../rtc_base",
     "../rtc_base:callback_list",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
@@ -515,6 +519,7 @@ rtc_source_set("sctp_transport") {
     "../p2p:rtc_p2p",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:rtc_base_approved",
@@ -883,6 +888,7 @@ rtc_library("sctp_data_channel") {
     "../media:rtc_data_sctp_transport_internal",
     "../media:rtc_media_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
@@ -964,6 +970,7 @@ rtc_source_set("data_channel_controller") {
     "../media:rtc_media_base",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:rtc_base_approved",
@@ -1033,6 +1040,7 @@ rtc_source_set("rtc_stats_collector") {
     "../p2p:rtc_p2p",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:network_constants",
     "../rtc_base:refcount",
@@ -1115,6 +1123,7 @@ rtc_source_set("sdp_offer_answer") {
     "../p2p:rtc_p2p",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
@@ -1214,6 +1223,7 @@ rtc_source_set("peer_connection") {
     "../rtc_base",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:network_constants",
@@ -1300,6 +1310,7 @@ rtc_source_set("stats_collector") {
     "../p2p:rtc_p2p",
     "../rtc_base:checks",
     "../rtc_base:ip_address",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:network_constants",
@@ -1396,6 +1407,7 @@ rtc_source_set("webrtc_session_description_factory") {
     "../api:sequence_checker",
     "../p2p:rtc_p2p",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:refcount",
     "../rtc_base:rtc_base",
@@ -1490,6 +1502,7 @@ rtc_source_set("peer_connection_factory") {
     "../pc:session_description",
     "../pc:video_track",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
@@ -1518,6 +1531,7 @@ rtc_library("peer_connection_message_handler") {
     "../api:sequence_checker",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:threading",
   ]
 }
@@ -1563,6 +1577,7 @@ rtc_library("rtp_transceiver") {
     "../api/task_queue",
     "../media:rtc_media_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
@@ -1697,6 +1712,7 @@ rtc_library("audio_rtp_receiver") {
     "../media:rtc_media_base",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
     "../rtc_base:threading",
@@ -1737,6 +1753,7 @@ rtc_library("video_rtp_receiver") {
     "../media:rtc_media_base",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
@@ -1802,6 +1819,7 @@ rtc_library("video_track") {
     "../media:rtc_media_base",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
     "../rtc_base:rtc_base_approved",
@@ -1849,6 +1867,7 @@ rtc_library("remote_audio_source") {
     "../media:rtc_media_base",
     "../rtc_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:rtc_base_approved",
     "../rtc_base:safe_conversions",
@@ -1884,6 +1903,7 @@ rtc_library("rtp_sender") {
     "../api/crypto:frame_encryptor_interface",
     "../media:rtc_media_base",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
@@ -1936,6 +1956,7 @@ rtc_library("dtmf_sender") {
     "../api:scoped_refptr",
     "../api:sequence_checker",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
@@ -2099,6 +2120,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
+      "../rtc_base:location",
       "../rtc_base:logging",
       "../rtc_base:macromagic",
       "../rtc_base:refcount",
@@ -2162,6 +2184,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
+      "../rtc_base:location",
       "../rtc_base:refcount",
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base:socket_address",
@@ -2347,6 +2370,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:ip_address",
+      "../rtc_base:location",
       "../rtc_base:logging",
       "../rtc_base:macromagic",
       "../rtc_base:network_constants",
@@ -2525,6 +2549,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
       "../rtc_base:ip_address",
+      "../rtc_base:location",
       "../rtc_base:logging",
       "../rtc_base:macromagic",
       "../rtc_base:refcount",
@@ -2628,6 +2653,7 @@ if (rtc_include_tests && !build_with_chromium) {
       "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
+      "../rtc_base:location",
       "../rtc_base:logging",
       "../rtc_base:macromagic",
       "../rtc_base:refcount",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index d640df1ecc..20a864de03 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -83,6 +83,7 @@ rtc_library("rtc_base_approved") {
   deps = [
     ":atomicops",
     ":checks",
+    ":location",
     ":logging",
     ":macromagic",
     ":one_time_event",
@@ -125,8 +126,7 @@ rtc_library("rtc_base_approved") {
     "copy_on_write_buffer.h",
     "event_tracer.cc",
     "event_tracer.h",
-    "location.cc",
-    "location.h",
+    "location.h",  # Transitional, use :location
     "numerics/histogram_percentile_counter.cc",
     "numerics/histogram_percentile_counter.h",
     "numerics/mod_ops.h",
@@ -202,6 +202,15 @@ rtc_source_set("macromagic") {
   deps = [ "system:arch" ]
 }
 
+rtc_library("location") {
+  visibility = [ "*" ]
+  sources = [
+    "location.cc",
+    "location.h",
+  ]
+  deps = [ "system:rtc_export" ]
+}
+
 rtc_library("random") {
   visibility = [ "*" ]
   sources = [
@@ -819,6 +828,7 @@ rtc_library("threading") {
     ":checks",
     ":criticalsection",
     ":ip_address",
+    ":location",
     ":logging",
     ":macromagic",
     ":network_constants",
@@ -950,6 +960,7 @@ rtc_library("rtc_base") {
     ":callback_list",
     ":checks",
     ":ip_address",
+    ":location",
     ":logging",
     ":macromagic",
     ":network_constants",
@@ -1248,6 +1259,7 @@ rtc_library("rtc_base_tests_utils") {
     ":async_socket",
     ":checks",
     ":ip_address",
+    ":location",
     ":logging",
     ":macromagic",
     ":rtc_base",
@@ -1284,6 +1296,7 @@ rtc_library("task_queue_for_test") {
   ]
   deps = [
     ":checks",
+    ":location",
     ":macromagic",
     ":rtc_base_approved",
     ":rtc_event",
@@ -1350,6 +1363,7 @@ if (rtc_include_tests) {
         ":checks",
         ":gunit_helpers",
         ":ip_address",
+        ":location",
         ":logging",
         ":macromagic",
         ":net_helpers",
@@ -1434,6 +1448,7 @@ if (rtc_include_tests) {
         ":divide_round",
         ":gunit_helpers",
         ":ip_address",
+        ":location",
         ":logging",
         ":macromagic",
         ":null_socket_server",
diff --git a/rtc_base/synchronization/BUILD.gn b/rtc_base/synchronization/BUILD.gn
index 5f2b04ef6f..5890e75e46 100644
--- a/rtc_base/synchronization/BUILD.gn
+++ b/rtc_base/synchronization/BUILD.gn
@@ -86,6 +86,7 @@ if (rtc_include_tests) {
         ":yield",
         ":yield_policy",
         "..:checks",
+        "..:location",
         "..:macromagic",
         "..:platform_thread",
         "..:rtc_base",
diff --git a/test/pc/e2e/BUILD.gn b/test/pc/e2e/BUILD.gn
index b99a597332..69e771744e 100644
--- a/test/pc/e2e/BUILD.gn
+++ b/test/pc/e2e/BUILD.gn
@@ -344,6 +344,7 @@ if (!build_with_chromium) {
         "../../../api/units:timestamp",
         "../../../rtc_base:checks",
         "../../../rtc_base:criticalsection",
+        "../../../rtc_base:location",
         "../../../rtc_base:logging",
         "../../../rtc_base:rtc_base_approved",
         "../../../rtc_base:task_queue_for_test",
diff --git a/test/time_controller/BUILD.gn b/test/time_controller/BUILD.gn
index 91d33a5688..f0e7f170cb 100644
--- a/test/time_controller/BUILD.gn
+++ b/test/time_controller/BUILD.gn
@@ -62,6 +62,7 @@ if (rtc_include_tests) {
       "../../api:time_controller",
       "../../api/units:time_delta",
       "../../rtc_base",
+      "../../rtc_base:location",
       "../../rtc_base:macromagic",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_event",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index ef48e14696..58af94bdd4 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -111,6 +111,7 @@ rtc_library("video") {
     "../modules/video_processing",
     "../rtc_base:atomicops",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:platform_thread",
@@ -205,6 +206,7 @@ rtc_source_set("video_legacy") {
     "../modules/video_coding:video_coding_utility",
     "../modules/video_coding/deprecated:nack_module",
     "../rtc_base:checks",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:platform_thread",
@@ -477,6 +479,7 @@ rtc_library("video_stream_encoder_impl") {
     "../modules/video_coding/svc:svc_rate_allocator",
     "../rtc_base:checks",
     "../rtc_base:criticalsection",
+    "../rtc_base:location",
     "../rtc_base:logging",
     "../rtc_base:macromagic",
     "../rtc_base:refcount",
@@ -908,6 +911,7 @@ if (rtc_include_tests) {
       "../rtc_base",
       "../rtc_base:checks",
       "../rtc_base:gunit_helpers",
+      "../rtc_base:location",
       "../rtc_base:logging",
       "../rtc_base:macromagic",
       "../rtc_base:platform_thread",
@@ -982,6 +986,7 @@ if (rtc_include_tests) {
       "../modules/utility",
       "../modules/video_coding",
       "../modules/video_coding:video_codec_interface",
+      "../rtc_base:location",
       "../rtc_base:logging",
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_event",