diff --git a/call/BUILD.gn b/call/BUILD.gn
index 740450466a..0b83d117e0 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -154,6 +154,12 @@ rtc_static_library("call") {
 }
 
 rtc_source_set("video_stream_api") {
+  # TODO(bugs.webrtc.org/6828): Remove dependency cycle:
+  # //call:video_stream_api ->
+  # //media:rtc_media_base ->
+  # //call:call_interfaces ->
+  # //call:video_stream_api
+  check_includes = false
   sources = [
     "video_config.cc",
     "video_config.h",
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index 669fa7a541..c4b810ea40 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -16,6 +16,13 @@ config("common_video_config") {
 }
 
 rtc_static_library("common_video") {
+  # TODO(bugs.webrtc.org/6828): Remove dependency cycle:
+  # //common_video:common_video ->
+  # //media:rtc_media_base ->
+  # //call:call_interfaces ->
+  # //call:video_stream_api ->
+  # //common_video:common_video
+  check_includes = false
   sources = [
     "bitrate_adjuster.cc",
     "h264/h264_bitstream_parser.cc",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index f59cbb63eb..e24c8cfb57 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -86,13 +86,11 @@ rtc_static_library("rtc_media_base") {
     "base/videocapturerfactory.h",
     "base/videocommon.cc",
     "base/videocommon.h",
+    "base/videosinkinterface.h",
     "base/videosourcebase.cc",
     "base/videosourcebase.h",
-
-    # TODO(aleloi): add "base/videosinkinterface.h"
     "base/videosourceinterface.cc",
-
-    # TODO(aleloi): add "base/videosourceinterface.h"
+    "base/videosourceinterface.h",
   ]
 
   if (!build_with_chromium && is_clang) {
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index 31a4b65a3a..9a44967fcd 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -30,6 +30,7 @@ rtc_static_library("video_capture_module") {
     "../..:webrtc_common",
     "../../api:video_frame_api_i420",
     "../../common_video",
+    "../../media:rtc_media_base",
     "../../rtc_base:rtc_base_approved",
     "../../system_wrappers",
   ]
diff --git a/test/BUILD.gn b/test/BUILD.gn
index 7eb896da85..c9f8cfc2dc 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -566,6 +566,7 @@ rtc_source_set("test_common") {
     "../call:video_stream_api",
     "../common_video",
     "../logging:rtc_event_log_api",
+    "../media:rtc_media_base",
     "../modules/audio_device:mock_audio_device",
     "../modules/audio_mixer:audio_mixer_impl",
     "../modules/audio_processing",
@@ -653,6 +654,7 @@ rtc_source_set("test_renderer_generic") {
     ":test_support",
     "..:webrtc_common",
     "../common_video",
+    "../media:rtc_media_base",
     "../modules/media_file",
     "../rtc_base:rtc_base_approved",
     "//testing/gtest",