diff --git a/.gn b/.gn
index 4b2edf0ffc..0976bb8486 100644
--- a/.gn
+++ b/.gn
@@ -28,6 +28,7 @@ check_targets = [
   "//webrtc/common_video/*",
   "//webrtc/common_audio/*",
   "//webrtc/examples/*",
+  "//webrtc/logging/*",
   "//webrtc/media/*",
   "//webrtc/modules/*",
   "//webrtc/stats/*",
diff --git a/webrtc/logging/BUILD.gn b/webrtc/logging/BUILD.gn
index 52d421e426..0cf5731bbc 100644
--- a/webrtc/logging/BUILD.gn
+++ b/webrtc/logging/BUILD.gn
@@ -23,9 +23,19 @@ group("logging") {
 }
 
 rtc_source_set("rtc_event_log_api") {
+  # TODO(kjellander): Remove (bugs.webrtc.org/7257)
+  # Enabling GN check triggers cyclic dependency error:
+  #  //webrtc/logging:rtc_event_log_api ->
+  #  //webrtc/modules/audio_coding:audio_network_adaptor ->
+  #  //webrtc/logging:rtc_event_log_api
+  check_includes = false
   sources = [
     "rtc_event_log/rtc_event_log.h",
   ]
+  deps = [
+    "../base:rtc_base_approved",
+    "../call:call_interfaces",
+  ]
 }
 
 rtc_static_library("rtc_event_log_impl") {
@@ -41,9 +51,11 @@ rtc_static_library("rtc_event_log_impl") {
   deps = [
     ":rtc_event_log_api",
     "..:webrtc_common",
+    "../base:rtc_base_approved",
     "../call:call_interfaces",
     "../modules/audio_coding:audio_network_adaptor",
     "../modules/rtp_rtcp",
+    "../system_wrappers",
   ]
 
   if (rtc_enable_protobuf) {
@@ -71,14 +83,21 @@ if (rtc_enable_protobuf) {
     ]
 
     public_deps = [
+      ":rtc_event_log_api",
       ":rtc_event_log_proto",
       "..:webrtc_common",
+      "../call:call_interfaces",
+      "../modules/rtp_rtcp:rtp_rtcp",
+      "../system_wrappers",
     ]
 
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
+    deps = [
+      "../base:rtc_base_approved",
+    ]
   }
 
   if (rtc_include_tests) {
@@ -92,9 +111,12 @@ if (rtc_enable_protobuf) {
       deps = [
         ":rtc_event_log_impl",
         ":rtc_event_log_parser",
+        "../base:rtc_base_approved",
+        "../base:rtc_base_tests_utils",
         "../call",
         "../modules/rtp_rtcp",
         "../system_wrappers:metrics_default",
+        "../test:test_support",
         "//testing/gmock",
         "//testing/gtest",
       ]
@@ -137,6 +159,7 @@ if (rtc_enable_protobuf) {
         ":rtc_event_log_impl",
         ":rtc_event_log_parser",
         "../base:rtc_base_approved",
+        "../call:call_interfaces",
 
         # TODO(kwiberg): Remove this dependency.
         "../api/audio_codecs:audio_codecs_api",