diff --git a/media/BUILD.gn b/media/BUILD.gn
index 0a62d4f27f..562d29baa1 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -227,6 +227,7 @@ rtc_static_library("rtc_audio_video") {
     "../modules/video_coding:video_codec_interface",
     "../modules/video_coding:video_coding",
     "../rtc_base:audio_format_to_string",
+    "../rtc_base:base64",
     "../rtc_base:checks",
   ]
 
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index 54b11032fa..ad26eb35ea 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -51,6 +51,7 @@ if (rtc_include_tests) {
         ":desktop_capture_mock",
         ":primitives",
         ":screen_drawer",
+        "../../rtc_base:base64",
         "../../rtc_base:rtc_base",
         "../../rtc_base:rtc_base_approved",
         "../../system_wrappers",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 90ab60a9c7..ad2a034a65 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -170,6 +170,7 @@ rtc_static_library("video_coding") {
     "../../api/video:video_frame_i420",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
+    "../../rtc_base:base64",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base",
     "../../rtc_base:rtc_base_approved",
diff --git a/p2p/BUILD.gn b/p2p/BUILD.gn
index 55e96cafc4..473281aa2f 100644
--- a/p2p/BUILD.gn
+++ b/p2p/BUILD.gn
@@ -85,6 +85,7 @@ rtc_static_library("rtc_p2p") {
     "../api:libjingle_peerconnection_api",
     "../api:ortc_api",
     "../logging:ice_log",
+    "../rtc_base:base64",
     "../rtc_base:checks",
     "../rtc_base:rtc_base",
     "../rtc_base:safe_minmax",
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 61aa750341..704b459c6f 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -80,6 +80,7 @@ rtc_static_library("rtc_pc_base") {
     "../media:rtc_media_base",
     "../modules/rtp_rtcp:rtp_rtcp_format",
     "../p2p:rtc_p2p",
+    "../rtc_base:base64",
     "../rtc_base:checks",
     "../rtc_base:rtc_base",
     "../rtc_base:rtc_task_queue",
@@ -205,6 +206,7 @@ rtc_static_library("peerconnection") {
     "../media:rtc_media_base",
     "../modules/congestion_controller/bbr",
     "../p2p:rtc_p2p",
+    "../rtc_base:base64",
     "../rtc_base:checks",
     "../rtc_base:rtc_base",
     "../rtc_base:rtc_base_approved",
@@ -488,6 +490,7 @@ if (rtc_include_tests) {
       "../api:mock_rtp",
       "../api/units:time_delta",
       "../logging:fake_rtc_event_log",
+      "../rtc_base:base64",
       "../rtc_base:checks",
       "../rtc_base:stringutils",
       "../test:fileutils",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 79db4f43ea..bcca5524c7 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -368,6 +368,7 @@ rtc_source_set("rtc_base_approved_generic") {
   data_deps = []
   deps = [
     ":atomicops",
+    ":base64",
     ":checks",
     ":criticalsection",
     ":logging",
@@ -389,8 +390,6 @@ rtc_source_set("rtc_base_approved_generic") {
   ]
 
   sources = [
-    "base64.cc",
-    "base64.h",
     "bind.h",
     "bitbuffer.cc",
     "bitbuffer.h",
@@ -490,6 +489,18 @@ if (is_mac && !build_with_chromium) {
   }
 }
 
+rtc_source_set("base64") {
+  visibility = [ "*" ]
+  sources = [
+    "base64.cc",
+    "base64.h",
+  ]
+
+  deps = [
+    ":checks",
+  ]
+}
+
 rtc_source_set("rtc_task_queue") {
   visibility = [ "*" ]
   deps = []
@@ -712,6 +723,7 @@ rtc_static_library("rtc_base_generic") {
   libs = []
   defines = []
   deps = [
+    ":base64",
     ":checks",
     ":stringutils",
     "..:webrtc_common",
@@ -1152,6 +1164,7 @@ if (rtc_include_tests) {
       sources += [ "win/windows_version_unittest.cc" ]
     }
     deps = [
+      ":base64",
       ":checks",
       ":rate_limiter",
       ":rtc_base",