diff --git a/api/video_codecs/test/BUILD.gn b/api/video_codecs/test/BUILD.gn
index c47e5b919e..cb810fcb8b 100644
--- a/api/video_codecs/test/BUILD.gn
+++ b/api/video_codecs/test/BUILD.gn
@@ -24,7 +24,6 @@ if (rtc_include_tests) {
       "../..:fec_controller_api",
       "../..:mock_video_encoder",
       "../../../api:scoped_refptr",
-      "../../../modules:module_api",
       "../../../modules/video_coding:video_codec_interface",
       "../../../modules/video_coding:video_coding_utility",
       "../../../modules/video_coding:webrtc_vp8",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index e496cebb90..cef43f4c3d 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -280,7 +280,6 @@ rtc_library("call") {
     "../logging:rtc_event_rtp_rtcp",
     "../logging:rtc_event_video",
     "../logging:rtc_stream_config",
-    "../modules:module_api",
     "../modules/congestion_controller",
     "../modules/pacing",
     "../modules/rtp_rtcp",
diff --git a/call/rtp_transport_controller_send_interface.h b/call/rtp_transport_controller_send_interface.h
index 602908e2a4..605ebfbd3e 100644
--- a/call/rtp_transport_controller_send_interface.h
+++ b/call/rtp_transport_controller_send_interface.h
@@ -40,19 +40,13 @@ class TaskQueue;
 }  // namespace rtc
 namespace webrtc {
 
-class CallStatsObserver;
 class FrameEncryptorInterface;
 class TargetTransferRateObserver;
 class Transport;
-class Module;
-class PacedSender;
 class PacketRouter;
 class RtpVideoSenderInterface;
-class RateLimiter;
 class RtcpBandwidthObserver;
 class RtpPacketSender;
-class SendDelayStats;
-class SendStatisticsProxy;
 
 struct RtpSenderObservers {
   RtcpRttStats* rtcp_rtt_stats;
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index b30d531076..b38e5995c0 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -332,7 +332,6 @@ if (rtc_enable_protobuf) {
       "../api/units:timestamp",
       "../api/video:video_frame",
       "../call:video_stream_api",
-      "../modules:module_api",
       "../modules:module_api_public",
       "../modules/audio_coding:audio_network_adaptor",
       "../modules/rtp_rtcp",
diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc
index aeedf8ce9d..59a722c7f3 100644
--- a/logging/rtc_event_log/rtc_event_log_parser.cc
+++ b/logging/rtc_event_log/rtc_event_log_parser.cc
@@ -31,7 +31,6 @@
 #include "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.h"
 #include "logging/rtc_event_log/rtc_event_processor.h"
 #include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
-#include "modules/include/module_common_types.h"
 #include "modules/include/module_common_types_public.h"
 #include "modules/rtp_rtcp/include/rtp_cvo.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
diff --git a/media/BUILD.gn b/media/BUILD.gn
index a3c1b92ae0..f653af7a61 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -240,7 +240,6 @@ rtc_library("rtc_internal_video_codecs") {
     "../api/video_codecs:video_codecs_api",
     "../call:call_interfaces",
     "../call:video_stream_api",
-    "../modules:module_api",
     "../modules/video_coding:video_codec_interface",
     "../modules/video_coding:webrtc_h264",
     "../modules/video_coding:webrtc_multiplex",
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index 6788bf69c9..3a5052dc7a 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -27,7 +27,6 @@ rtc_library("video_capture_module") {
   ]
 
   deps = [
-    "..:module_api",
     "../../api:scoped_refptr",
     "../../api/video:video_frame",
     "../../api/video:video_rtp_headers",
diff --git a/modules/video_capture/video_capture.h b/modules/video_capture/video_capture.h
index 8d2a8f5514..0f60092d72 100644
--- a/modules/video_capture/video_capture.h
+++ b/modules/video_capture/video_capture.h
@@ -13,7 +13,6 @@
 
 #include "api/video/video_rotation.h"
 #include "api/video/video_sink_interface.h"
-#include "modules/include/module.h"
 #include "modules/video_capture/video_capture_defines.h"
 
 namespace webrtc {
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 2d636cd5d1..b706c6b202 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -230,7 +230,6 @@ rtc_library("video_codec_interface") {
   ]
   deps = [
     ":codec_globals_headers",
-    "..:module_api",
     "../../api/video:video_frame",
     "../../api/video:video_rtp_headers",
     "../../api/video_codecs:video_codecs_api",
diff --git a/modules/video_coding/include/video_codec_interface.h b/modules/video_coding/include/video_codec_interface.h
index 09e208ec9a..b786be1693 100644
--- a/modules/video_coding/include/video_codec_interface.h
+++ b/modules/video_coding/include/video_codec_interface.h
@@ -18,7 +18,6 @@
 #include "api/video_codecs/video_decoder.h"
 #include "api/video_codecs/video_encoder.h"
 #include "common_video/generic_frame_descriptor/generic_frame_info.h"
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/codecs/h264/include/h264_globals.h"
 #include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
 #include "modules/video_coding/include/video_error_codes.h"
diff --git a/modules/video_processing/BUILD.gn b/modules/video_processing/BUILD.gn
index 871012ae18..daffd49cdf 100644
--- a/modules/video_processing/BUILD.gn
+++ b/modules/video_processing/BUILD.gn
@@ -26,7 +26,6 @@ rtc_library("video_processing") {
 
   deps = [
     ":denoiser_filter",
-    "..:module_api",
     "../../api:scoped_refptr",
     "../../api/video:video_frame",
     "../../api/video:video_rtp_headers",
@@ -51,7 +50,6 @@ rtc_source_set("denoiser_filter") {
   # Target that only exists to avoid cyclic depdency errors for the SSE2 and
   # Neon implementations below.
   sources = [ "util/denoiser_filter.h" ]
-  deps = [ "..:module_api" ]
 }
 
 if (build_video_processing_sse2) {
diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index c50c01dabd..00c87ef6f9 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -621,7 +621,6 @@ if (is_ios || is_mac) {
         "../common_video",
         "../media:rtc_h264_profile_id",
         "../media:rtc_media_base",
-        "../modules:module_api",
         "../modules/video_coding:video_codec_interface",
         "../rtc_base:checks",
         "../rtc_base:rtc_base_approved",
@@ -810,7 +809,6 @@ if (is_ios || is_mac) {
         ":helpers_objc",
         "../api/video:encoded_image",
         "../api/video_codecs:video_codecs_api",
-        "../modules:module_api",
         "../modules/video_coding:video_codec_interface",
         "../rtc_base",
       ]
@@ -968,7 +966,6 @@ if (is_ios || is_mac) {
         "../api/video_codecs:video_codecs_api",
         "../common_video",
         "../media:rtc_media_base",
-        "../modules:module_api",
         "../modules/audio_device:audio_device_api",
         "../modules/audio_processing",
         "../modules/audio_processing:api",
@@ -1039,7 +1036,6 @@ if (is_ios || is_mac) {
             "../common_video",
             "../media:rtc_media_base",
             "../media:rtc_media_tests_utils",
-            "../modules:module_api",
             "../rtc_base",
             "../rtc_base:gunit_helpers",
             "../system_wrappers",
@@ -1152,7 +1148,6 @@ if (is_ios || is_mac) {
           "../api/audio_codecs:builtin_audio_encoder_factory",
           "../api/video_codecs:video_codecs_api",
           "../media:rtc_media_base",
-          "../modules:module_api",
           "../modules/audio_device:audio_device_api",
           "../modules/audio_processing",
           "../modules/audio_processing:api",
@@ -1564,7 +1559,6 @@ if (is_ios || is_mac) {
         "../common_video",
         "../media:rtc_audio_video",
         "../media:rtc_media_base",
-        "../modules:module_api",
         "../modules/video_coding:video_codec_interface",
         "../rtc_base",
         "../rtc_base:checks",
@@ -1584,7 +1578,6 @@ if (is_ios || is_mac) {
       ]
       deps = [
         "../common_video",
-        "../modules:module_api",
         "../modules/video_coding:webrtc_h264",
         "../rtc_base:checks",
         "../rtc_base:rtc_base_approved",
@@ -1622,7 +1615,6 @@ if (is_ios || is_mac) {
         ":videocodec_objc",
         ":videoframebuffer_objc",
         "../common_video",
-        "../modules:module_api",
         "../modules/video_coding:video_codec_interface",
         "../rtc_base:checks",
         "../rtc_base:rtc_base_approved",
diff --git a/sdk/objc/native/src/objc_video_encoder_factory.mm b/sdk/objc/native/src/objc_video_encoder_factory.mm
index 0175319530..e51fc9d319 100644
--- a/sdk/objc/native/src/objc_video_encoder_factory.mm
+++ b/sdk/objc/native/src/objc_video_encoder_factory.mm
@@ -26,7 +26,6 @@
 #include "api/video/video_frame.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_encoder.h"
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/logging.h"
diff --git a/sdk/objc/unittests/objc_video_encoder_factory_tests.mm b/sdk/objc/unittests/objc_video_encoder_factory_tests.mm
index 728dc018e2..7c1594a109 100644
--- a/sdk/objc/unittests/objc_video_encoder_factory_tests.mm
+++ b/sdk/objc/unittests/objc_video_encoder_factory_tests.mm
@@ -19,7 +19,6 @@
 #import "base/RTCVideoEncoderFactory.h"
 #import "base/RTCVideoFrameBuffer.h"
 #import "components/video_frame_buffer/RTCCVPixelBuffer.h"
-#include "modules/include/module_common_types.h"
 #include "modules/video_coding/include/video_codec_interface.h"
 #include "modules/video_coding/include/video_error_codes.h"
 #include "rtc_base/gunit.h"