diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index c6de08ffb4..0fd0ac8746 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -105,6 +105,7 @@ if (rtc_include_tests) {
       "../call:mock_rtp_interfaces",
       "../call:rtp_interfaces",
       "../call:rtp_receiver",
+      "../logging:mocks",
       "../modules/audio_device:mock_audio_device",
       "../modules/audio_mixer:audio_mixer_impl",
       "../modules/audio_processing:audio_processing_statistics",
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 5bf99da2a6..7c74a43f52 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -235,6 +235,7 @@ if (rtc_enable_protobuf) {
       }
     }
   }
+
   if (rtc_include_tests) {
     rtc_executable("rtc_event_log2text") {
       testonly = true
@@ -283,3 +284,14 @@ if (rtc_enable_protobuf) {
     }
   }
 }
+
+rtc_source_set("mocks") {
+  testonly = true
+  sources = [
+    "rtc_event_log/mock/mock_rtc_event_log.h",
+  ]
+  deps = [
+    ":rtc_event_log_api",
+    "../../test:test_support",
+  ]
+}
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 7012dff368..53043d978c 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -2150,6 +2150,7 @@ if (rtc_include_tests) {
       "../../api/audio_codecs/opus:audio_encoder_opus",
       "../../common_audio",
       "../../common_audio:mock_common_audio",
+      "../../logging:mocks",
       "../../logging:rtc_event_log_api",
       "../../rtc_base:checks",
       "../../rtc_base:protobuf_utils",
diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn
index 267211efa2..f50341dbd2 100644
--- a/modules/bitrate_controller/BUILD.gn
+++ b/modules/bitrate_controller/BUILD.gn
@@ -64,6 +64,7 @@ if (rtc_include_tests) {
     ]
     deps = [
       ":bitrate_controller",
+      "../../logging:mocks",
       "../../logging:rtc_event_log_api",
       "../../test:field_trial",
       "../../test:test_support",
diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn
index df6599f3c9..d3e2b0e62b 100644
--- a/modules/congestion_controller/BUILD.gn
+++ b/modules/congestion_controller/BUILD.gn
@@ -90,6 +90,7 @@ if (rtc_include_tests) {
     deps = [
       ":congestion_controller",
       ":mock_congestion_controller",
+      "../../logging:mocks",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index a5dd014e24..ef7ee11242 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -143,6 +143,7 @@ if (rtc_include_tests) {
       "../..:webrtc_common",
       "../../:typedefs",
       "../../api:optional",
+      "../../logging:mocks",
       "../../rtc_base:checks",
       "../../rtc_base:gtest_prod",
       "../../rtc_base:rtc_base",
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index efa36a12b2..f07ff1adc8 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -412,6 +412,7 @@ if (rtc_include_tests) {
       "../../api:video_frame_api",
       "../../call:rtp_receiver",
       "../../common_video:common_video",
+      "../../logging:mocks",
       "../../logging:rtc_event_log_api",
       "../../rtc_base:checks",
       "../../rtc_base:rate_limiter",