diff --git a/media/BUILD.gn b/media/BUILD.gn
index cdae182406..95f19dc34d 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -257,10 +257,10 @@ rtc_static_library("rtc_audio_video") {
     "../api:libjingle_peerconnection_api",
     "../api:scoped_refptr",
     "../api:transport_api",
+    "../api/audio:audio_mixer_api",
     "../api/audio_codecs:audio_codecs_api",
     "../api/task_queue",
     "../api/task_queue:global_task_queue_factory",
-    "../api/video:builtin_video_bitrate_allocator_factory",
     "../api/video:video_bitrate_allocation",
     "../api/video:video_bitrate_allocator_factory",
     "../api/video:video_codec_constants",
@@ -275,7 +275,6 @@ rtc_static_library("rtc_audio_video") {
     "../modules/audio_device",
     "../modules/audio_device:audio_device_impl",
     "../modules/audio_mixer:audio_mixer_impl",
-    "../modules/audio_processing",
     "../modules/audio_processing:api",
     "../modules/audio_processing:gain_control_interface",
     "../modules/audio_processing/aec_dump",
diff --git a/media/engine/webrtc_media_engine.cc b/media/engine/webrtc_media_engine.cc
index 637db06a18..c69e17b1b3 100644
--- a/media/engine/webrtc_media_engine.cc
+++ b/media/engine/webrtc_media_engine.cc
@@ -15,9 +15,6 @@
 #include "absl/algorithm/container.h"
 #include "absl/memory/memory.h"
 #include "api/task_queue/global_task_queue_factory.h"
-#include "api/video/builtin_video_bitrate_allocator_factory.h"
-#include "api/video_codecs/video_decoder_factory.h"
-#include "api/video_codecs/video_encoder_factory.h"
 #include "media/engine/webrtc_voice_engine.h"
 #include "system_wrappers/include/field_trial.h"
 
diff --git a/media/engine/webrtc_media_engine.h b/media/engine/webrtc_media_engine.h
index b13cebefcb..53e0893aaf 100644
--- a/media/engine/webrtc_media_engine.h
+++ b/media/engine/webrtc_media_engine.h
@@ -15,19 +15,18 @@
 #include <string>
 #include <vector>
 
+#include "api/audio/audio_mixer.h"
+#include "api/audio_codecs/audio_decoder_factory.h"
+#include "api/audio_codecs/audio_encoder_factory.h"
+#include "api/bitrate_constraints.h"
+#include "api/rtp_parameters.h"
 #include "api/task_queue/task_queue_factory.h"
-#include "call/call.h"
+#include "api/video_codecs/video_decoder_factory.h"
+#include "api/video_codecs/video_encoder_factory.h"
+#include "media/base/codec.h"
 #include "media/base/media_engine.h"
 #include "modules/audio_device/include/audio_device.h"
-
-namespace webrtc {
-class AudioDecoderFactory;
-class AudioMixer;
-class AudioProcessing;
-class VideoDecoderFactory;
-class VideoEncoderFactory;
-class VideoBitrateAllocatorFactory;
-}  // namespace webrtc
+#include "modules/audio_processing/include/audio_processing.h"
 
 namespace cricket {