diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 100a338710..e10d8463fd 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -319,6 +319,11 @@ rtc_library("rtp_rtcp") {
   ]
 }
 
+rtc_source_set("rtp_rtcp_legacy") {
+  # TODO(bugs.webrtc.org/11581): The files "source/rtp_rtcp_impl.cc"
+  # and "source/rtp_rtcp_impl.h" should be moved to this target.
+}
+
 rtc_library("rtcp_transceiver") {
   visibility = [ "*" ]
   public = [
@@ -523,6 +528,7 @@ if (rtc_include_tests) {
       ":rtcp_transceiver",
       ":rtp_rtcp",
       ":rtp_rtcp_format",
+      ":rtp_rtcp_legacy",
       "../../api:array_view",
       "../../api:libjingle_peerconnection_api",
       "../../api:mock_frame_encryptor",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 8289023716..acd1616ee3 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -154,6 +154,25 @@ rtc_library("video") {
   }
 }
 
+rtc_source_set("video_legacy") {
+  # TODO(bugs.webrtc.org/11581): These files should be moved to this target:
+  #
+  # "call_stats.cc",
+  # "call_stats.h",
+  # "receive_statistics_proxy.cc",
+  # "receive_statistics_proxy.h",
+  # "rtp_streams_synchronizer.cc",
+  # "rtp_streams_synchronizer.h",
+  # "rtp_video_stream_receiver.cc",
+  # "rtp_video_stream_receiver.h",
+  # "video_quality_observer.cc",
+  # "video_quality_observer.h",
+  # "video_receive_stream.cc",
+  # "video_receive_stream.h",
+  # "video_stream_decoder.cc",
+  # "video_stream_decoder.h",
+}
+
 rtc_library("video_stream_decoder_impl") {
   visibility = [ "*" ]
 
@@ -571,6 +590,7 @@ if (rtc_include_tests) {
     ]
     deps = [
       ":video",
+      ":video_legacy",
       ":video_mocks",
       ":video_stream_decoder_impl",
       ":video_stream_encoder_impl",