diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index 916e7da5e6..d0b1b9ba8e 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -79,6 +79,7 @@ rtc_static_library("builtin_video_encoder_factory") {
     ":video_codecs_api",
     "../../media:rtc_internal_video_codecs",
     "../../media:rtc_media_base",
+    "../../media:rtc_vp8_encoder_simulcast_proxy",
     "../../rtc_base:ptr_util",
     "../../rtc_base/system:rtc_export",
     "//third_party/abseil-cpp/absl/memory",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 3bce800d97..cf843bc932 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -190,6 +190,24 @@ rtc_static_library("rtc_simulcast_encoder_adapter") {
   }
 }
 
+rtc_static_library("rtc_vp8_encoder_simulcast_proxy") {
+  visibility = [ "*" ]
+  defines = []
+  libs = []
+  sources = [
+    "engine/vp8_encoder_simulcast_proxy.cc",
+    "engine/vp8_encoder_simulcast_proxy.h",
+  ]
+  deps = [
+    ":rtc_simulcast_encoder_adapter",
+    "../api/video_codecs:video_codecs_api",
+  ]
+  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" ]
+  }
+}
+
 rtc_static_library("rtc_internal_video_codecs") {
   visibility = [ "*" ]
   allow_poison = [ "software_video_codecs" ]
@@ -198,6 +216,7 @@ rtc_static_library("rtc_internal_video_codecs") {
   deps = [
     ":rtc_h264_profile_id",
     ":rtc_simulcast_encoder_adapter",
+    ":rtc_vp8_encoder_simulcast_proxy",
     "../modules/video_coding:video_codec_interface",
     "//third_party/abseil-cpp/absl/memory",
   ]
@@ -214,7 +233,9 @@ rtc_static_library("rtc_internal_video_codecs") {
     "engine/scopedvideodecoder.h",
     "engine/scopedvideoencoder.cc",
     "engine/scopedvideoencoder.h",
-    "engine/vp8_encoder_simulcast_proxy.cc",
+
+    # TODO(bugs.webrtc.org/7925): stop exporting this header once downstream
+    # targets depend on :rtc_vp8_encoder_simulcast_proxy directly.
     "engine/vp8_encoder_simulcast_proxy.h",
     "engine/webrtcvideodecoderfactory.h",
     "engine/webrtcvideoencoderfactory.h",
@@ -599,6 +620,7 @@ if (rtc_include_tests) {
       ":rtc_media_base",
       ":rtc_media_tests_utils",
       ":rtc_simulcast_encoder_adapter",
+      ":rtc_vp8_encoder_simulcast_proxy",
       ":rtc_vp9_profile",
       "../api:create_simulcast_test_fixture_api",
       "../api:libjingle_peerconnection_api",
diff --git a/media/engine/vp8_encoder_simulcast_proxy.cc b/media/engine/vp8_encoder_simulcast_proxy.cc
index 3279bdd7b4..ff03e9a31f 100644
--- a/media/engine/vp8_encoder_simulcast_proxy.cc
+++ b/media/engine/vp8_encoder_simulcast_proxy.cc
@@ -11,7 +11,6 @@
 #include "media/engine/vp8_encoder_simulcast_proxy.h"
 
 #include "media/engine/simulcast_encoder_adapter.h"
-#include "rtc_base/checks.h"
 
 namespace webrtc {
 VP8EncoderSimulcastProxy::VP8EncoderSimulcastProxy(VideoEncoderFactory* factory,
diff --git a/media/engine/vp8_encoder_simulcast_proxy.h b/media/engine/vp8_encoder_simulcast_proxy.h
index 685bcbed6e..da65bcca6b 100644
--- a/media/engine/vp8_encoder_simulcast_proxy.h
+++ b/media/engine/vp8_encoder_simulcast_proxy.h
@@ -16,8 +16,8 @@
 #include <vector>
 
 #include "api/video_codecs/sdp_video_format.h"
+#include "api/video_codecs/video_encoder.h"
 #include "api/video_codecs/video_encoder_factory.h"
-#include "modules/video_coding/codecs/vp8/include/vp8.h"
 
 namespace webrtc {
 
diff --git a/video/BUILD.gn b/video/BUILD.gn
index 08aa53ee31..a00290763e 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -213,6 +213,7 @@ if (rtc_include_tests) {
       "../logging:rtc_event_log_impl_output",
       "../media:rtc_audio_video",
       "../media:rtc_internal_video_codecs",
+      "../media:rtc_vp8_encoder_simulcast_proxy",
       "../modules/audio_device:audio_device_api",
       "../modules/audio_device:audio_device_module_from_input_and_output",
       "../modules/audio_device:windows_core_audio_utility",