Drop unneeded inclusion of module_common_types.h

And also drop dependency on module_api, where possible. With this
change, common_video/ no longer depends on
libjingle_peerconnection_api.

Bug: None
Change-Id: Icc0648559bef5b7f549e81d58f2a5f97c0af3abf
Reviewed-on: https://webrtc-review.googlesource.com/c/103782
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24991}
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index 5bc4eb4..a58141b 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -48,7 +48,6 @@
     "../api/video:video_frame",
     "../api/video:video_frame_i420",
     "../media:rtc_h264_profile_id",
-    "../modules:module_api",
     "../rtc_base:checks",
     "../rtc_base:rtc_base",
     "../rtc_base:rtc_task_queue",
diff --git a/common_video/video_render_frames.cc b/common_video/video_render_frames.cc
index 02a105a..376d8e0 100644
--- a/common_video/video_render_frames.cc
+++ b/common_video/video_render_frames.cc
@@ -12,7 +12,6 @@
 
 #include <utility>
 
-#include "modules/include/module_common_types.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/timeutils.h"
 
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 883a46e..252aec4 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -261,7 +261,6 @@
         "../logging:rtc_event_log_impl_base",
         "../logging:rtc_event_log_parser",
         "../logging:rtc_stream_config",
-        "../modules:module_api",
         "../modules/audio_coding:ana_debug_dump_proto",
         "../modules/audio_coding:audio_network_adaptor",
         "../modules/audio_coding:neteq_tools",
diff --git a/rtc_tools/event_log_visualizer/analyzer.cc b/rtc_tools/event_log_visualizer/analyzer.cc
index a055981..43cbd69 100644
--- a/rtc_tools/event_log_visualizer/analyzer.cc
+++ b/rtc_tools/event_log_visualizer/analyzer.cc
@@ -37,7 +37,6 @@
 #include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
 #include "modules/congestion_controller/include/receive_side_congestion_controller.h"
 #include "modules/congestion_controller/include/send_side_congestion_controller.h"
-#include "modules/include/module_common_types.h"
 #include "modules/pacing/packet_router.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 76ba9a6..63c5bd2 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -580,7 +580,6 @@
       "../../media:rtc_h264_profile_id",
       "../../media:rtc_internal_video_codecs",
       "../../media:rtc_media_base",
-      "../../modules:module_api",
       "../../modules/utility:utility",
       "../../modules/video_coding:codec_globals_headers",
       "../../modules/video_coding:video_codec_interface",
diff --git a/sdk/android/src/jni/videoencoderwrapper.cc b/sdk/android/src/jni/videoencoderwrapper.cc
index 1d0f0bb..6381c63 100644
--- a/sdk/android/src/jni/videoencoderwrapper.cc
+++ b/sdk/android/src/jni/videoencoderwrapper.cc
@@ -13,7 +13,6 @@
 #include <utility>
 
 #include "common_video/h264/h264_common.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 "modules/video_coding/utility/vp8_header_parser.h"
diff --git a/video/rtp_video_stream_receiver.h b/video/rtp_video_stream_receiver.h
index 72ffcc7..ca5d7a0 100644
--- a/video/rtp_video_stream_receiver.h
+++ b/video/rtp_video_stream_receiver.h
@@ -23,7 +23,6 @@
 #include "call/rtp_packet_sink_interface.h"
 #include "call/syncable.h"
 #include "call/video_receive_stream.h"
-#include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/include/receive_statistics.h"
 #include "modules/rtp_rtcp/include/remote_ntp_time_estimator.h"
 #include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
diff --git a/video/send_delay_stats.h b/video/send_delay_stats.h
index 81442bc..3337899 100644
--- a/video/send_delay_stats.h
+++ b/video/send_delay_stats.h
@@ -17,7 +17,6 @@
 
 #include "call/video_send_stream.h"
 #include "common_types.h"  // NOLINT(build/include)
-#include "modules/include/module_common_types.h"
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/thread_annotations.h"
 #include "system_wrappers/include/clock.h"