diff --git a/examples/DEPS b/examples/DEPS
index 5b37845590..b825892aeb 100644
--- a/examples/DEPS
+++ b/examples/DEPS
@@ -1,6 +1,7 @@
 include_rules = [
   "+api",
   "+common_video",
+  "+logging/rtc_event_log/rtc_event_log_factory.h",
   "+media",
   "+modules/audio_device",
   "+modules/video_capture",
diff --git a/examples/androidnativeapi/DEPS b/examples/androidnativeapi/DEPS
index 2d4c0d8bfb..5dbfcf1bb8 100644
--- a/examples/androidnativeapi/DEPS
+++ b/examples/androidnativeapi/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+logging/rtc_event_log/rtc_event_log_factory.h",
   "+modules/utility/include",
   "+sdk/android/native_api",
 ]
diff --git a/examples/androidnativeapi/jni/androidcallclient.cc b/examples/androidnativeapi/jni/androidcallclient.cc
index 8509f57555..e0dc8cc135 100644
--- a/examples/androidnativeapi/jni/androidcallclient.cc
+++ b/examples/androidnativeapi/jni/androidcallclient.cc
@@ -18,6 +18,7 @@
 #include "api/peerconnectioninterface.h"
 #include "api/video/builtin_video_bitrate_allocator_factory.h"
 #include "examples/androidnativeapi/generated_jni/jni/CallClient_jni.h"
+#include "logging/rtc_event_log/rtc_event_log_factory.h"
 #include "media/engine/internaldecoderfactory.h"
 #include "media/engine/internalencoderfactory.h"
 #include "media/engine/webrtcmediaengine.h"
diff --git a/examples/objcnativeapi/objc/objccallclient.mm b/examples/objcnativeapi/objc/objccallclient.mm
index c7b2af4212..54015b2202 100644
--- a/examples/objcnativeapi/objc/objccallclient.mm
+++ b/examples/objcnativeapi/objc/objccallclient.mm
@@ -22,6 +22,7 @@
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/peerconnectioninterface.h"
 #include "api/video/builtin_video_bitrate_allocator_factory.h"
+#include "logging/rtc_event_log/rtc_event_log_factory.h"
 #include "media/engine/webrtcmediaengine.h"
 #include "modules/audio_processing/include/audio_processing.h"
 #include "sdk/objc/native/api/video_capturer.h"
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index d450f624e2..14ce79acd0 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -41,7 +41,6 @@ rtc_source_set("rtc_event_log_api") {
     "../api:libjingle_logging_api",
     "../rtc_base:ptr_util",
     "../rtc_base:rtc_base_approved",
-    "../rtc_base:rtc_task_queue",
     "//third_party/abseil-cpp/absl/memory",
   ]
 }
@@ -158,7 +157,6 @@ rtc_source_set("rtc_event_video") {
 # TODO(eladalon): Break down into (1) encoder and (2) decoder; we don't need
 # the decoder code in the WebRTC library, only in unit tests and tools.
 rtc_static_library("rtc_event_log_impl_encoder") {
-  visibility = [ "*" ]
   sources = [
     "rtc_event_log/encoder/blob_encoding.cc",
     "rtc_event_log/encoder/blob_encoding.h",
@@ -225,6 +223,8 @@ rtc_source_set("rtc_event_log_impl_output") {
 }
 
 rtc_static_library("rtc_event_log_impl_base") {
+  # TODO(terelius): Should this really be visible? Currently used to instantiate
+  # the default event log factory.
   visibility = [ "*" ]
   sources = [
     "rtc_event_log/rtc_event_log_factory.cc",
diff --git a/logging/rtc_event_log/rtc_event_log.h b/logging/rtc_event_log/rtc_event_log.h
index 838423095c..8db0e625b8 100644
--- a/logging/rtc_event_log/rtc_event_log.h
+++ b/logging/rtc_event_log/rtc_event_log.h
@@ -16,7 +16,6 @@
 
 #include "api/rtceventlogoutput.h"
 #include "logging/rtc_event_log/events/rtc_event.h"
-#include "rtc_base/task_queue.h"
 
 namespace webrtc {
 
diff --git a/logging/rtc_event_log/rtc_event_log_factory.h b/logging/rtc_event_log/rtc_event_log_factory.h
index 713084f112..1480551faa 100644
--- a/logging/rtc_event_log/rtc_event_log_factory.h
+++ b/logging/rtc_event_log/rtc_event_log_factory.h
@@ -15,7 +15,6 @@
 
 #include "logging/rtc_event_log/rtc_event_log.h"
 #include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
-#include "rtc_base/task_queue.h"
 
 namespace webrtc {
 
diff --git a/logging/rtc_event_log/rtc_event_log_factory_interface.h b/logging/rtc_event_log/rtc_event_log_factory_interface.h
index 7aaed7513c..48ea3e568b 100644
--- a/logging/rtc_event_log/rtc_event_log_factory_interface.h
+++ b/logging/rtc_event_log/rtc_event_log_factory_interface.h
@@ -14,7 +14,6 @@
 #include <memory>
 
 #include "logging/rtc_event_log/rtc_event_log.h"
-#include "rtc_base/task_queue.h"
 
 namespace webrtc {
 
@@ -29,8 +28,6 @@ class RtcEventLogFactoryInterface {
       RtcEventLog::EncodingType encoding_type) = 0;
 };
 
-std::unique_ptr<RtcEventLogFactoryInterface> CreateRtcEventLogFactory();
-
 }  // namespace webrtc
 
 #endif  // LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_FACTORY_INTERFACE_H_
diff --git a/pc/peerconnection_integrationtest.cc b/pc/peerconnection_integrationtest.cc
index 26acf826a4..ea1b5eaabc 100644
--- a/pc/peerconnection_integrationtest.cc
+++ b/pc/peerconnection_integrationtest.cc
@@ -36,6 +36,7 @@
 #include "api/video_codecs/sdp_video_format.h"
 #include "call/call.h"
 #include "logging/rtc_event_log/fake_rtc_event_log_factory.h"
+#include "logging/rtc_event_log/rtc_event_log_factory.h"
 #include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
 #include "media/engine/fakewebrtcvideoengine.h"
 #include "media/engine/webrtcmediaengine.h"
diff --git a/pc/peerconnectioninterface_unittest.cc b/pc/peerconnectioninterface_unittest.cc
index 0528247f85..5b9f775607 100644
--- a/pc/peerconnectioninterface_unittest.cc
+++ b/pc/peerconnectioninterface_unittest.cc
@@ -42,6 +42,7 @@
 #include "api/video_codecs/video_encoder_factory.h"
 #include "logging/rtc_event_log/output/rtc_event_log_output_file.h"
 #include "logging/rtc_event_log/rtc_event_log.h"
+#include "logging/rtc_event_log/rtc_event_log_factory.h"
 #include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
 #include "media/base/codec.h"
 #include "media/base/fakevideocapturer.h"
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 1b47ba21ab..d5766faabb 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -918,6 +918,7 @@ if (is_ios || is_mac) {
         "../api/video:video_frame",
         "../api/video_codecs:video_codecs_api",
         "../common_video",
+        "../logging:rtc_event_log_impl_base",
         "../media:rtc_media_base",
         "../modules:module_api",
         "../modules/audio_device:audio_device_api",
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index c79dbae13f..03d3d0e5e5 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -1021,6 +1021,7 @@ if (is_android) {
       "../../api/video_codecs:video_codecs_api",
       "../../call:call_interfaces",
       "../../logging:rtc_event_log_api",
+      "../../logging:rtc_event_log_impl_base",
       "../../media:rtc_audio_video",
       "../../modules/audio_device:audio_device",
       "../../modules/audio_processing:api",
@@ -1502,6 +1503,7 @@ if (is_android) {
       "../../api/audio_codecs:builtin_audio_decoder_factory",
       "../../api/audio_codecs:builtin_audio_encoder_factory",
       "../../api/video:video_frame",
+      "../../logging:rtc_event_log_impl_base",
       "../../media:rtc_audio_video",
       "../../media:rtc_internal_video_codecs",
       "../../media:rtc_media_base",
diff --git a/sdk/android/native_unittests/peerconnection/DEPS b/sdk/android/native_unittests/peerconnection/DEPS
index 3c47a81522..ed77eb5d6d 100644
--- a/sdk/android/native_unittests/peerconnection/DEPS
+++ b/sdk/android/native_unittests/peerconnection/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+logging/rtc_event_log/rtc_event_log_factory.h",
   "+media/base",
   "+media/engine",
   "+modules/audio_processing/include/audio_processing.h",
diff --git a/sdk/android/native_unittests/peerconnection/peerconnectionfactory_unittest.cc b/sdk/android/native_unittests/peerconnection/peerconnectionfactory_unittest.cc
index 747786090c..5b902b7f15 100644
--- a/sdk/android/native_unittests/peerconnection/peerconnectionfactory_unittest.cc
+++ b/sdk/android/native_unittests/peerconnection/peerconnectionfactory_unittest.cc
@@ -12,6 +12,7 @@
 #include "absl/memory/memory.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "logging/rtc_event_log/rtc_event_log_factory.h"
 #include "media/base/mediaengine.h"
 #include "media/engine/internaldecoderfactory.h"
 #include "media/engine/internalencoderfactory.h"
diff --git a/sdk/android/src/jni/DEPS b/sdk/android/src/jni/DEPS
index 1cf4ba1916..ae33fa6830 100644
--- a/sdk/android/src/jni/DEPS
+++ b/sdk/android/src/jni/DEPS
@@ -2,7 +2,7 @@ include_rules = [
   "+third_party/libyuv",
   "+call/callfactoryinterface.h",
   "+common_video",
-  "+logging/rtc_event_log/rtc_event_log_factory_interface.h",
+  "+logging/rtc_event_log/rtc_event_log_factory.h",
   "+media/base",
   "+media/engine",
   "+modules/audio_device/include/audio_device.h",
diff --git a/sdk/android/src/jni/pc/media.cc b/sdk/android/src/jni/pc/media.cc
index dba85fbffa..d1d96279f2 100644
--- a/sdk/android/src/jni/pc/media.cc
+++ b/sdk/android/src/jni/pc/media.cc
@@ -14,7 +14,7 @@
 #include "api/call/callfactoryinterface.h"
 #include "api/video_codecs/video_decoder_factory.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
+#include "logging/rtc_event_log/rtc_event_log_factory.h"
 #include "media/engine/webrtcmediaengine.h"
 #include "modules/audio_device/include/audio_device.h"
 #include "modules/audio_processing/include/audio_processing.h"
diff --git a/sdk/objc/DEPS b/sdk/objc/DEPS
index df90ebbd23..f85688e0dd 100644
--- a/sdk/objc/DEPS
+++ b/sdk/objc/DEPS
@@ -7,6 +7,7 @@ include_rules = [
   "+common_video/h264",
   "+common_video/include",
   "+common_video/libyuv/include",
+  "+logging/rtc_event_log/rtc_event_log_factory.h",
   "+media",
   "+modules/video_coding",
   "+pc",
diff --git a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
index 48476f2368..726288491e 100644
--- a/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
+++ b/sdk/objc/api/peerconnection/RTCPeerConnectionFactory.mm
@@ -30,6 +30,7 @@
 // is not smart enough to take the #ifdef into account.
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"     // nogncheck
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"     // nogncheck
+#include "logging/rtc_event_log/rtc_event_log_factory.h"
 #include "media/engine/convert_legacy_video_factory.h"          // nogncheck
 #include "modules/audio_device/include/audio_device.h"          // nogncheck
 #include "modules/audio_processing/include/audio_processing.h"  // nogncheck