diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index 11ac8a8d5d..09732202e2 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -163,6 +163,8 @@ rtc_source_set("audio_device_generic") {
     defines += [ "AUDIO_DEVICE_PLAYS_SINUS_TONE" ]
   }
   if (rtc_include_internal_audio_device) {
+    # TODO(bugs.webrtc.org/8850): remove this when the circular dependency will be fixed.
+    check_includes = false
     sources += [
       "audio_device_data_observer.cc",
       "audio_device_impl.cc",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 0dcb40e60a..59cffa37bb 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -471,6 +471,8 @@ if (rtc_include_tests) {
 
   if (is_ios || is_mac) {
     rtc_static_library("objc_codec_factory_helper") {
+      # TODO(bugs.webrtc.org/8850): remove this when the circular dependency will be fixed.
+      check_includes = false
       sources = [
         "codecs/test/objc_codec_factory_helper.h",
         "codecs/test/objc_codec_factory_helper.mm",