diff --git a/api/BUILD.gn b/api/BUILD.gn
index 94dd86507f..b45f3f3878 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -242,7 +242,7 @@ rtc_source_set("video_frame_api_i420") {
   deps = [
     ":video_frame_api",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base_approved",
+    "../rtc_base:rtc_base",
     "../system_wrappers",
     "//third_party/libyuv",
   ]
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 889d6c41d1..3751eb0d33 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -205,7 +205,7 @@ rtc_static_library("webrtc_h264") {
     "../../api/video_codecs:video_codecs_api",
     "../../media:rtc_media_base",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:rtc_base",
     "../../system_wrappers:metrics_api",
   ]
 
@@ -273,7 +273,7 @@ rtc_static_library("webrtc_stereo") {
     "../../api:video_frame_api_i420",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video:common_video",
-    "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:rtc_base",
     "../../system_wrappers",
   ]
 }
@@ -351,7 +351,7 @@ rtc_static_library("webrtc_vp9") {
     "..:module_api",
     "../../common_video",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base_approved",
+    "../../rtc_base:rtc_base",
     "../../system_wrappers",
   ]
   if (rtc_build_libvpx) {
@@ -501,7 +501,7 @@ if (rtc_include_tests) {
       "../../media:rtc_audio_video",
       "../../media:rtc_media_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base_approved",
+      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_tests_utils",
       "../../system_wrappers",
       "../../test:field_trial",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 41bd74e8d2..7349f17c40 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -570,6 +570,7 @@ rtc_static_library("rtc_base_generic") {
     "crc32.h",
     "cryptstring.cc",
     "cryptstring.h",
+    "dscp.h",
     "filerotatingstream.cc",
     "filerotatingstream.h",
     "fileutils.cc",
@@ -582,6 +583,7 @@ rtc_static_library("rtc_base_generic") {
     "httpcommon.h",
     "ipaddress.cc",
     "ipaddress.h",
+    "keep_ref_until_done.h",
     "messagedigest.cc",
     "messagedigest.h",
     "messagehandler.cc",
@@ -597,6 +599,7 @@ rtc_static_library("rtc_base_generic") {
     "network_constants.h",
     "networkmonitor.cc",
     "networkmonitor.h",
+    "networkroute.h",
     "nullsocketserver.cc",
     "nullsocketserver.h",
     "openssl.h",
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 8841ae0806..caf3e30fdc 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -69,7 +69,7 @@ rtc_source_set("video_test_common") {
     "../media:rtc_media_base",
     "../modules/video_capture:video_capture_module",
     "../rtc_base:checks",
-    "../rtc_base:rtc_base_approved",
+    "../rtc_base:rtc_base",
     "../rtc_base:rtc_task_queue",
     "../system_wrappers",
   ]