diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index ad09396013..03591cb76a 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -175,6 +175,7 @@ rtc_static_library("video_coding") {
     "../../rtc_base/third_party/base64",
     "../../rtc_base/time:timestamp_extrapolator",
     "../../system_wrappers",
+    "../../system_wrappers:event_wrapper",
     "../rtp_rtcp:rtp_rtcp_format",
     "../utility",
     "//third_party/abseil-cpp/absl/container:inlined_vector",
@@ -263,7 +264,6 @@ rtc_source_set("video_coding_utility") {
     "../../rtc_base/system:arch",
     "../../rtc_base/system:file_wrapper",
     "../../rtc_base/task_utils:repeating_task",
-    "../../system_wrappers",
     "../../system_wrappers:field_trial",
     "../rtp_rtcp:rtp_rtcp_format",
     "//third_party/abseil-cpp/absl/types:optional",
@@ -344,7 +344,6 @@ rtc_static_library("webrtc_multiplex") {
     "../../common_video",
     "../../rtc_base",
     "../../rtc_base:checks",
-    "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp_format",
   ]
 }
@@ -383,7 +382,6 @@ rtc_static_library("webrtc_vp8") {
     "../../rtc_base/experiments:cpu_speed_experiment",
     "../../rtc_base/experiments:field_trial_parser",
     "../../rtc_base/experiments:rate_control_settings",
-    "../../system_wrappers",
     "../../system_wrappers:field_trial",
     "../../system_wrappers:metrics",
     "//third_party/abseil-cpp/absl/memory",
@@ -417,7 +415,6 @@ rtc_static_library("webrtc_vp8_temporal_layers") {
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
-    "../../system_wrappers",
     "../../system_wrappers:field_trial",
     "../../system_wrappers:metrics",
     "//third_party/abseil-cpp/absl/memory",
@@ -474,7 +471,6 @@ rtc_static_library("webrtc_vp9") {
     "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base/experiments:rate_control_settings",
-    "../../system_wrappers",
     "../../system_wrappers:field_trial",
     "../rtp_rtcp:rtp_rtcp_format",
     "//third_party/abseil-cpp/absl/memory",
@@ -865,6 +861,7 @@ if (rtc_include_tests) {
       "../../rtc_base:task_queue_for_test",
       "../../rtc_base/experiments:jitter_upper_bound_experiment",
       "../../system_wrappers",
+      "../../system_wrappers:event_wrapper",
       "../../system_wrappers:field_trial",
       "../../system_wrappers:metrics",
       "../../test:field_trial",
diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn
index 9f8cd1ba59..6c681f290b 100644
--- a/system_wrappers/BUILD.gn
+++ b/system_wrappers/BUILD.gn
@@ -17,14 +17,12 @@ rtc_static_library("system_wrappers") {
   sources = [
     "include/clock.h",
     "include/cpu_info.h",
-    "include/event_wrapper.h",
     "include/ntp_time.h",
     "include/rtp_to_ntp_estimator.h",
     "include/sleep.h",
     "source/clock.cc",
     "source/cpu_features.cc",
     "source/cpu_info.cc",
-    "source/event.cc",
     "source/rtp_to_ntp_estimator.cc",
     "source/sleep.cc",
   ]
@@ -106,6 +104,20 @@ rtc_source_set("field_trial") {
   }
 }
 
+rtc_source_set("event_wrapper") {
+  visibility = [
+    "../modules/video_coding",
+    "../modules/video_coding:video_coding_unittests",
+  ]
+  sources = [
+    "include/event_wrapper.h",
+    "source/event.cc",
+  ]
+  deps = [
+    "../rtc_base:rtc_event",
+  ]
+}
+
 rtc_source_set("metrics") {
   visibility = [ "*" ]
   public = [