Revert "[cleanup] Remove useless includes."

This reverts commit be8b5348c76105f8fe869b0cae4065ddca106419.

Reason for revert: Breaks downstream project

Original change's description:
> [cleanup] Remove useless includes.
> 
> Manual cleanup guided by include-what-you-use diagnostic.
> 
> Bug: webrtc:8311
> Change-Id: I00be03392cc7ee005101427ea7dc701621ccea68
> Reviewed-on: https://webrtc-review.googlesource.com/c/103320
> Commit-Queue: Yves Gerey <yvesg@webrtc.org>
> Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#25013}

TBR=phoglund@google.com,phoglund@webrtc.org,yvesg@webrtc.org

Change-Id: I7a6e1cdfef685173b76f234ad598083043dcd9a0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:8311
Reviewed-on: https://webrtc-review.googlesource.com/c/104022
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25015}

api/audio_codecs/audio_encoder.h

@@ -11,6 +11,7 @@
 #ifndef API_AUDIO_CODECS_AUDIO_ENCODER_H_
 #define API_AUDIO_CODECS_AUDIO_ENCODER_H_
 
+#include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>

api/audio_codecs/audio_format.h

@@ -13,10 +13,10 @@
 
 #include <map>
 #include <string>
-// TODO(yvesg) Fix presubmit check and/or remove unused swap function.
 #include <utility>
 
 #include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
 #include "rtc_base/checks.h"
 
 namespace webrtc {

api/candidate.cc

@@ -10,7 +10,6 @@
 
 #include "api/candidate.h"
 
-#include "rtc_base/helpers.h"
 #include "rtc_base/strings/string_builder.h"
 
 namespace cricket {

api/candidate.h

@@ -18,6 +18,7 @@
 #include <string>
 
 #include "rtc_base/checks.h"
+#include "rtc_base/helpers.h"
 #include "rtc_base/network_constants.h"
 #include "rtc_base/socketaddress.h"
 

api/jsepicecandidate.h

@@ -15,6 +15,7 @@
 #define API_JSEPICECANDIDATE_H_
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "api/candidate.h"

api/mediaconstraintsinterface.h

@@ -24,6 +24,7 @@
 #include <string>
 #include <vector>
 
+#include "absl/types/optional.h"
 #include "api/peerconnectioninterface.h"
 
 namespace webrtc {

api/mediastreaminterface.h

@@ -24,11 +24,17 @@
 
 #include "absl/types/optional.h"
 #include "api/video/video_frame.h"
+// TODO(zhihuang): Remove unrelated headers once downstream applications stop
+// relying on them; they were previously transitively included by
+// mediachannel.h, which is no longer a dependency of this file.
 #include "api/video/video_sink_interface.h"
 #include "api/video/video_source_interface.h"
 #include "modules/audio_processing/include/audio_processing_statistics.h"
+#include "rtc_base/ratetracker.h"
 #include "rtc_base/refcount.h"
 #include "rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/timeutils.h"
 
 namespace webrtc {
 

api/peerconnectioninterface.h

@@ -69,6 +69,7 @@
 
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "api/asyncresolverfactory.h"
@@ -78,6 +79,7 @@
 #include "api/audio_options.h"
 #include "api/call/callfactoryinterface.h"
 #include "api/datachannelinterface.h"
+#include "api/dtmfsenderinterface.h"
 #include "api/fec_controller.h"
 #include "api/jsep.h"
 #include "api/mediastreaminterface.h"
@@ -92,6 +94,7 @@
 #include "api/transport/bitrate_settings.h"
 #include "api/transport/network_control.h"
 #include "api/turncustomizer.h"
+#include "api/umametrics.h"
 #include "logging/rtc_event_log/rtc_event_log_factory_interface.h"
 #include "media/base/mediaconfig.h"
 // TODO(bugs.webrtc.org/6353): cricket::VideoCapturer is deprecated and should

api/rtp_headers.cc

@@ -10,6 +10,14 @@
 
 #include "api/rtp_headers.h"
 
+#include <string.h>
+#include <algorithm>
+#include <limits>
+#include <type_traits>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/stringutils.h"
+
 namespace webrtc {
 
 RTPHeaderExtension::RTPHeaderExtension()

api/rtp_headers.h

@@ -13,7 +13,10 @@
 
 #include <stddef.h>
 #include <string.h>
+#include <string>
+#include <vector>
 
+#include "absl/types/optional.h"
 #include "api/array_view.h"
 #include "api/video/video_content_type.h"
 #include "api/video/video_frame_marking.h"
@@ -21,6 +24,8 @@
 #include "api/video/video_timing.h"
 
 #include "common_types.h"  // NOLINT(build/include)
+#include "rtc_base/checks.h"
+#include "rtc_base/deprecation.h"
 
 namespace webrtc {
 

api/rtpparameters.cc

@@ -12,6 +12,7 @@
 #include <algorithm>
 #include <string>
 
+#include "rtc_base/checks.h"
 #include "rtc_base/strings/string_builder.h"
 
 namespace webrtc {

api/rtpsenderinterface.h

@@ -24,6 +24,7 @@
 #include "api/proxy.h"
 #include "api/rtcerror.h"
 #include "api/rtpparameters.h"
+#include "rtc_base/deprecation.h"
 #include "rtc_base/refcount.h"
 #include "rtc_base/scoped_ref_ptr.h"
 

api/video/video_bitrate_allocation.cc

@@ -10,9 +10,12 @@
 
 #include "api/video/video_bitrate_allocation.h"
 
+#include <limits>
+
 #include "rtc_base/checks.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/strings/string_builder.h"
+#include "rtc_base/stringutils.h"
 
 namespace webrtc {
 

api/video/video_content_type.h

@@ -13,6 +13,8 @@
 
 #include <stdint.h>
 
+#include <string>
+
 namespace webrtc {
 
 enum class VideoContentType : uint8_t {

audio/channel_send.cc

@@ -29,7 +29,6 @@
 #include "modules/utility/include/process_thread.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/criticalsection.h"
-#include "rtc_base/event.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/location.h"
 #include "rtc_base/logging.h"

audio/null_audio_poller.cc

@@ -11,7 +11,6 @@
 #include "audio/null_audio_poller.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"  // for TimeMillis
 
 namespace webrtc {
 namespace internal {

common_video/include/incoming_video_stream.h

@@ -15,7 +15,6 @@
 #include "common_video/video_render_frames.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/task_queue.h"
-#include "rtc_base/thread_checker.h"
 
 namespace webrtc {
 

logging/rtc_event_log/rtc_event_log.h

@@ -12,6 +12,8 @@
 #define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_
 
 #include <memory>
+#include <string>
+#include <utility>
 
 #include "api/rtceventlogoutput.h"
 #include "logging/rtc_event_log/events/rtc_event.h"

modules/audio_mixer/audio_mixer_impl.h

@@ -17,7 +17,6 @@
 #include "api/audio/audio_mixer.h"
 #include "modules/audio_mixer/frame_combiner.h"
 #include "modules/audio_mixer/output_rate_calculator.h"
-#include "rtc_base/criticalsection.h"
 #include "rtc_base/race_checker.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_annotations.h"

modules/congestion_controller/rtp/send_side_congestion_controller.cc

@@ -21,7 +21,6 @@
 #include "modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "rtc_base/bind.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/event.h"
 #include "rtc_base/format_macros.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"

modules/rtp_rtcp/source/contributing_sources.h

@@ -18,8 +18,7 @@
 
 #include "absl/types/optional.h"
 #include "api/array_view.h"
-#include "api/rtpreceiverinterface.h"  // For RtpSource
-#include "rtc_base/timeutils.h"        // For kNumMillisecsPerSec
+#include "api/rtpreceiverinterface.h"
 
 namespace webrtc {
 

p2p/base/stunrequest.cc

@@ -19,7 +19,6 @@
 #include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/stringencode.h"
-#include "rtc_base/timeutils.h"  // For TimeMillis
 
 namespace cricket {
 

p2p/base/tcpport_unittest.cc

@@ -14,7 +14,6 @@
 #include "p2p/base/basicpacketsocketfactory.h"
 #include "p2p/base/tcpport.h"
 #include "rtc_base/gunit.h"
-#include "rtc_base/helpers.h"
 #include "rtc_base/thread.h"
 #include "rtc_base/virtualsocketserver.h"
 

pc/peerconnection.cc

@@ -22,7 +22,6 @@
 #include "api/jsepsessiondescription.h"
 #include "api/mediastreamproxy.h"
 #include "api/mediastreamtrackproxy.h"
-#include "api/umametrics.h"
 #include "call/call.h"
 #include "logging/rtc_event_log/icelogger.h"
 #include "logging/rtc_event_log/output/rtc_event_log_output_file.h"

pc/peerconnection_ice_unittest.cc

@@ -22,7 +22,6 @@
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "api/audio_codecs/builtin_audio_encoder_factory.h"
 #include "api/peerconnectionproxy.h"
-#include "api/umametrics.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
 #include "pc/test/fakeaudiocapturemodule.h"

pc/peerconnection_integrationtest.cc

@@ -28,7 +28,6 @@
 #include "api/peerconnectioninterface.h"
 #include "api/peerconnectionproxy.h"
 #include "api/rtpreceiverinterface.h"
-#include "api/umametrics.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
 #include "api/video_codecs/sdp_video_format.h"

pc/peerconnection_rtp_unittest.cc

@@ -17,7 +17,6 @@
 #include "api/jsep.h"
 #include "api/mediastreaminterface.h"
 #include "api/peerconnectioninterface.h"
-#include "api/umametrics.h"
 #include "api/video_codecs/builtin_video_decoder_factory.h"
 #include "api/video_codecs/builtin_video_encoder_factory.h"
 #include "pc/mediasession.h"

pc/statscollector_unittest.cc

@@ -22,7 +22,6 @@
 #include "pc/test/fakevideotracksource.h"
 #include "pc/videotrack.h"
 #include "rtc_base/fakesslidentity.h"
-#include "rtc_base/messagedigest.h"
 #include "rtc_base/third_party/base64/base64.h"
 #include "test/gtest.h"
 

pc/videotrack.h

@@ -17,7 +17,6 @@
 #include "media/base/videosourcebase.h"
 #include "pc/mediastreamtrack.h"
 #include "rtc_base/scoped_ref_ptr.h"
-#include "rtc_base/thread.h"
 #include "rtc_base/thread_checker.h"
 
 namespace webrtc {

pc/webrtcsdp_unittest.cc

@@ -22,7 +22,6 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/messagedigest.h"
 #include "rtc_base/stringencode.h"
 #include "rtc_base/stringutils.h"
 

rtc_base/BUILD.gn

@@ -565,9 +565,7 @@ if (rtc_enable_libevent) {
       ":checks",
       ":criticalsection",
       ":logging",
-      ":macromagic",
       ":platform_thread",
-      ":platform_thread_types",
       ":ptr_util",
       ":refcount",
       ":rtc_task_queue_api",

rtc_base/asynctcpsocket.cc

@@ -18,7 +18,6 @@
 #include "rtc_base/byteorder.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"  // for TimeMillis
 
 #if defined(WEBRTC_POSIX)
 #include <errno.h>

rtc_base/asynctcpsocket.h

@@ -13,12 +13,10 @@
 
 #include <memory>
 
-#include "rtc_base/asyncpacketsocket.h"  // for PacketOptions, AsyncPacketSo...
-#include "rtc_base/asyncsocket.h"        // for AsyncSocket
-#include "rtc_base/buffer.h"             // for Buffer
-#include "rtc_base/constructormagic.h"   // for RTC_DISALLOW_COPY_AND_ASSIGN
-#include "rtc_base/socket.h"             // for Socket, Socket::Option
-#include "rtc_base/socketaddress.h"      // for SocketAddress
+#include "rtc_base/asyncpacketsocket.h"
+#include "rtc_base/buffer.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/socketfactory.h"
 
 namespace rtc {
 

rtc_base/bitrateallocationstrategy.cc

@@ -10,7 +10,6 @@
 
 #include "rtc_base/bitrateallocationstrategy.h"
 #include <algorithm>
-#include <map>
 #include <utility>
 
 namespace rtc {

rtc_base/bitrateallocationstrategy.h

@@ -11,9 +11,12 @@
 #ifndef RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_
 #define RTC_BASE_BITRATEALLOCATIONSTRATEGY_H_
 
+#include <map>
+#include <memory>
 #include <string>
 #include <vector>
 #include "api/array_view.h"
+#include "rtc_base/checks.h"
 
 namespace rtc {
 

rtc_base/bytebuffer.cc

@@ -12,6 +12,8 @@
 
 #include <string.h>
 
+#include <algorithm>
+
 namespace rtc {
 
 ByteBufferWriter::ByteBufferWriter() : ByteBufferWriterT() {}

rtc_base/copyonwritebuffer.h

@@ -16,6 +16,7 @@
 
 #include "rtc_base/buffer.h"
 #include "rtc_base/checks.h"
+#include "rtc_base/refcount.h"
 #include "rtc_base/refcountedobject.h"
 #include "rtc_base/scoped_ref_ptr.h"
 

rtc_base/file.cc

@@ -10,6 +10,8 @@
 
 #include "rtc_base/file.h"
 
+#include <utility>
+
 namespace rtc {
 
 File::File(PlatformFile file) : file_(file) {}

rtc_base/filerotatingstream.cc

@@ -16,7 +16,6 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/fileutils.h"
-#include "rtc_base/logging.h"
 #include "rtc_base/pathutils.h"
 #include "rtc_base/strings/string_builder.h"
 

rtc_base/fileutils.cc

@@ -10,11 +10,12 @@
 
 #include "rtc_base/fileutils.h"
 
+#include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/pathutils.h"
+#include "rtc_base/stringutils.h"
 
 #if defined(WEBRTC_WIN)
-#include "rtc_base/stringutils.h"  // for ToUtf16
 #include "rtc_base/win32filesystem.h"
 #else
 #include "rtc_base/unixfilesystem.h"

rtc_base/fileutils.h

@@ -23,7 +23,9 @@
 #include <unistd.h>
 #endif  // WEBRTC_WIN
 
+#include "rtc_base/checks.h"
 #include "rtc_base/constructormagic.h"
+#include "rtc_base/platform_file.h"
 
 namespace rtc {
 

rtc_base/flags.cc

@@ -15,6 +15,7 @@
 #include <string.h>
 
 #include "rtc_base/checks.h"
+#include "rtc_base/stringutils.h"
 
 #if defined(WEBRTC_WIN)
 // clang-format off
@@ -22,8 +23,6 @@
 #include <windows.h>
 #include <shellapi.h> // must come after windows.h
 // clang-format on
-
-#include "rtc_base/stringutils.h"  // For ToUtf8
 #endif
 
 namespace {

rtc_base/flags.h

@@ -23,10 +23,7 @@
 #define RTC_BASE_FLAGS_H_
 
 #include "rtc_base/checks.h"
-
-#if defined(WEBRTC_WIN)
 #include "rtc_base/constructormagic.h"
-#endif
 
 namespace rtc {
 

rtc_base/httpcommon.cc

@@ -18,23 +18,17 @@
 #include <security.h>
 #endif
 
-#include <ctype.h>  // for isspace
-#include <stdio.h>  // for sprintf
 #include <algorithm>
-#include <utility>  // for pair
-#include <vector>
 
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/cryptstring.h"  // for CryptString
+#include "rtc_base/cryptstring.h"
 #include "rtc_base/httpcommon.h"
-#include "rtc_base/logging.h"
 #include "rtc_base/messagedigest.h"
 #include "rtc_base/socketaddress.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_base/stringutils.h"                // for strcpyn, _stricmp
-#include "rtc_base/third_party/base64/base64.h"  // for Base64
-#include "rtc_base/zero_memory.h"                // for ExplicitZeroMemory
+#include "rtc_base/third_party/base64/base64.h"
+#include "rtc_base/zero_memory.h"
 
 namespace rtc {
 namespace {

rtc_base/httpcommon.h

@@ -11,7 +11,14 @@
 #ifndef RTC_BASE_HTTPCOMMON_H_
 #define RTC_BASE_HTTPCOMMON_H_
 
+#include <map>
+#include <memory>
 #include <string>
+#include <vector>
+
+#include "rtc_base/checks.h"
+#include "rtc_base/stream.h"
+#include "rtc_base/stringutils.h"
 
 namespace rtc {
 

rtc_base/logging.cc

@@ -26,6 +26,7 @@
 static const int kMaxLogLineSize = 1024 - 60;
 #endif  // WEBRTC_MAC && !defined(WEBRTC_IOS) || WEBRTC_ANDROID
 
+#include <limits.h>
 #include <time.h>
 
 #include <algorithm>

rtc_base/logging.h

@@ -60,6 +60,7 @@
 #include "rtc_base/deprecation.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/system/inline.h"
+#include "rtc_base/thread_annotations.h"
 
 #if !defined(NDEBUG) || defined(DLOG_ALWAYS_ON)
 #define RTC_DLOG_IS_ON 1

rtc_base/memory/aligned_malloc.cc

@@ -10,8 +10,8 @@
 
 #include "rtc_base/memory/aligned_malloc.h"
 
-#include <stdlib.h>  // for free, malloc
-#include <string.h>  // for memcpy
+#include <stdlib.h>
+#include <cstring>
 
 #ifdef _WIN32
 #include <windows.h>

rtc_base/messagehandler.h

@@ -11,6 +11,7 @@
 #ifndef RTC_BASE_MESSAGEHANDLER_H_
 #define RTC_BASE_MESSAGEHANDLER_H_
 
+#include <memory>
 #include <utility>
 
 #include "rtc_base/constructormagic.h"

rtc_base/messagequeue.cc

@@ -8,14 +8,13 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include <algorithm>
-#include <utility>  // for move
 
 #include "rtc_base/atomicops.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/messagequeue.h"
+#include "rtc_base/stringencode.h"
 #include "rtc_base/thread.h"
-#include "rtc_base/timeutils.h"  // for TimeMillis, TimeDiff, TimeUntil
 #include "rtc_base/trace_event.h"
 
 namespace rtc {

rtc_base/messagequeue.h

@@ -17,6 +17,7 @@
 #include <list>
 #include <memory>
 #include <queue>
+#include <utility>
 #include <vector>
 
 #include "rtc_base/constructormagic.h"
@@ -27,6 +28,7 @@
 #include "rtc_base/socketserver.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread_annotations.h"
+#include "rtc_base/timeutils.h"
 
 namespace rtc {
 

rtc_base/nethelper.h

@@ -10,6 +10,7 @@
 #ifndef RTC_BASE_NETHELPER_H_
 #define RTC_BASE_NETHELPER_H_
 
+#include <cstdlib>
 #include <string>
 
 // This header contains helper functions and constants used by different types

rtc_base/nethelpers.cc

@@ -25,9 +25,10 @@
 #endif
 #endif  // defined(WEBRTC_POSIX) && !defined(__native_client__)
 
+#include "rtc_base/byteorder.h"
+#include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/signalthread.h"
-#include "rtc_base/third_party/sigslot/sigslot.h"  // for signal_with_thread...
 
 namespace rtc {
 

rtc_base/nethelpers.h

@@ -18,12 +18,12 @@
 #include <winsock2.h>  // NOLINT
 #endif
 
-#include <vector>
+#include <list>
 
 #include "rtc_base/asyncresolverinterface.h"
-#include "rtc_base/ipaddress.h"  // for IPAddress
 #include "rtc_base/signalthread.h"
 #include "rtc_base/socketaddress.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
 
 namespace rtc {
 

rtc_base/networkmonitor.cc

@@ -11,7 +11,6 @@
 #include "rtc_base/networkmonitor.h"
 
 #include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
 
 namespace {
 const uint32_t UPDATE_NETWORKS_MESSAGE = 1;

rtc_base/networkmonitor.h

@@ -11,6 +11,7 @@
 #ifndef RTC_BASE_NETWORKMONITOR_H_
 #define RTC_BASE_NETWORKMONITOR_H_
 
+#include "rtc_base/logging.h"
 #include "rtc_base/network_constants.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"
 #include "rtc_base/thread.h"

rtc_base/openssladapter.cc

@@ -23,7 +23,6 @@
 #include <openssl/x509v3.h>
 #include "rtc_base/openssl.h"
 
-#include "absl/memory/memory.h"  // for make_unique
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"

rtc_base/openssladapter.h

@@ -13,22 +13,19 @@
 
 #include <openssl/ossl_typ.h>
 
+#include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "rtc_base/asyncsocket.h"          // for AsyncSocket
-#include "rtc_base/buffer.h"               // for Buffer
-#include "rtc_base/messagehandler.h"       // for MessageHandler
-#include "rtc_base/messagequeue.h"         // for Message
-#include "rtc_base/opensslidentity.h"      // for SSL_CTX, OpenSSLIdentity
-#include "rtc_base/opensslsessioncache.h"  // for OpenSSLSessionCache
-#include "rtc_base/socket.h"               // for Socket::ConnState
-#include "rtc_base/socketaddress.h"        // for SocketAddress
-#include "rtc_base/ssladapter.h"           // for SSLAdapter, SSLAdapterFactory
-#include "rtc_base/sslcertificate.h"       // for SSLCertificateVerifier
-#include "rtc_base/sslidentity.h"          // for SSLIdentity
-#include "rtc_base/sslstreamadapter.h"     // for SSLMode, SSLRole, SSL_MODE...
+#include "absl/memory/memory.h"
+#include "rtc_base/buffer.h"
+#include "rtc_base/messagehandler.h"
+#include "rtc_base/messagequeue.h"
+#include "rtc_base/opensslcertificate.h"
+#include "rtc_base/opensslidentity.h"
+#include "rtc_base/opensslsessioncache.h"
+#include "rtc_base/ssladapter.h"
 
 namespace rtc {
 

rtc_base/opensslcertificate.h

@@ -11,16 +11,16 @@
 #ifndef RTC_BASE_OPENSSLCERTIFICATE_H_
 #define RTC_BASE_OPENSSLCERTIFICATE_H_
 
-#include <openssl/base.h>  // for X509, ssl_ctx_st
+#include <openssl/evp.h>
+#include <openssl/x509.h>
 
-#include <stddef.h>  // for size_t
-#include <stdint.h>  // for int64_t
+#include <memory>
 #include <string>
 
-#include "rtc_base/buffer.h"            // for Buffer
-#include "rtc_base/constructormagic.h"  // for RTC_DISALLOW_COPY_AND_ASSIGN
-#include "rtc_base/sslcertificate.h"    // for SSLCertificate
-#include "rtc_base/sslidentity.h"       // for SSLIdentityParams
+#include "rtc_base/checks.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/sslcertificate.h"
+#include "rtc_base/sslidentity.h"
 
 typedef struct ssl_ctx_st SSL_CTX;
 

rtc_base/openssldigest.h

@@ -11,8 +11,7 @@
 #ifndef RTC_BASE_OPENSSLDIGEST_H_
 #define RTC_BASE_OPENSSLDIGEST_H_
 
-#include <openssl/base.h>  // for EVP_MD, EVP_MD_CTX
-#include <string>
+#include <openssl/evp.h>
 
 #include "rtc_base/messagedigest.h"
 

rtc_base/opensslidentity.h

@@ -11,17 +11,16 @@
 #ifndef RTC_BASE_OPENSSLIDENTITY_H_
 #define RTC_BASE_OPENSSLIDENTITY_H_
 
-#include <openssl/base.h>  // for EVP_PKEY, ssl_ctx_st
+#include <openssl/evp.h>
+#include <openssl/x509.h>
 
-#include <ctime>   // for time_t
-#include <memory>  // for unique_ptr
+#include <memory>
 #include <string>
 
-#include "rtc_base/checks.h"              // for RTC_DCHECK
-#include "rtc_base/constructormagic.h"    // for RTC_DISALLOW_COPY_AND_ASSIGN
-#include "rtc_base/opensslcertificate.h"  // for OpenSSLCertificate
-#include "rtc_base/sslcertificate.h"      // for SSLCertChain
-#include "rtc_base/sslidentity.h"         // for SSLIdentity, KeyParams, SSL...
+#include "rtc_base/checks.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/opensslcertificate.h"
+#include "rtc_base/sslidentity.h"
 
 typedef struct ssl_ctx_st SSL_CTX;
 

rtc_base/opensslutility.h

@@ -13,6 +13,7 @@
 
 #include <openssl/ossl_typ.h>
 #include <string>
+#include "rtc_base/sslcertificate.h"
 
 namespace rtc {
 // The openssl namespace holds static helper methods. All methods related

rtc_base/pathutils.cc

@@ -15,9 +15,10 @@
 #include <tchar.h>
 #endif  // WEBRTC_WIN
 
-#include <string.h>  // for strchr
-
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
 #include "rtc_base/pathutils.h"
+#include "rtc_base/stringutils.h"
 
 namespace rtc {
 

rtc_base/pathutils.h

@@ -13,6 +13,8 @@
 
 #include <string>
 
+#include "rtc_base/checks.h"
+
 namespace rtc {
 
 ///////////////////////////////////////////////////////////////////////////////

rtc_base/platform_file.cc

@@ -10,9 +10,10 @@
 
 #include "rtc_base/platform_file.h"
 
+#include "rtc_base/stringutils.h"
+
 #if defined(WEBRTC_WIN)
 #include <io.h>
-#include "rtc_base/stringutils.h"  // For ToUtf16
 #else
 #include <fcntl.h>
 #include <sys/stat.h>

rtc_base/platform_thread.h

@@ -14,6 +14,7 @@
 #include <string>
 
 #include "rtc_base/constructormagic.h"
+#include "rtc_base/event.h"
 #include "rtc_base/platform_thread_types.h"
 #include "rtc_base/thread_checker.h"
 

rtc_base/proxyserver.cc

@@ -13,7 +13,6 @@
 #include <algorithm>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/logging.h"
 #include "rtc_base/socketfactory.h"
 
 namespace rtc {

rtc_base/race_checker.h

@@ -12,7 +12,7 @@
 #define RTC_BASE_RACE_CHECKER_H_
 
 #include "rtc_base/checks.h"
-#include "rtc_base/platform_thread_types.h"  // for PlatformThreadRef
+#include "rtc_base/platform_thread.h"
 #include "rtc_base/thread_annotations.h"
 
 namespace rtc {

rtc_base/ratetracker.cc

@@ -10,6 +10,8 @@
 
 #include "rtc_base/ratetracker.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "rtc_base/checks.h"

rtc_base/rtccertificate.cc

@@ -14,7 +14,6 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/refcountedobject.h"
-#include "rtc_base/timeutils.h"
 
 namespace rtc {
 

rtc_base/sequenced_task_checker_unittest.cc

@@ -12,7 +12,6 @@
 
 #include "rtc_base/checks.h"
 #include "rtc_base/constructormagic.h"
-#include "rtc_base/event.h"
 #include "rtc_base/platform_thread.h"
 #include "rtc_base/task_queue.h"
 #include "rtc_base/thread_checker.h"

rtc_base/signalthread.cc

@@ -12,7 +12,6 @@
 
 #include "absl/memory/memory.h"
 #include "rtc_base/checks.h"
-#include "rtc_base/nullsocketserver.h"
 
 namespace rtc {
 

rtc_base/signalthread.h

@@ -14,13 +14,10 @@
 #include <string>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/constructormagic.h"             // for RTC_DISALLOW_IMPLI...
-#include "rtc_base/criticalsection.h"              // for CriticalSection
-#include "rtc_base/messagehandler.h"               // for MessageHandler
-#include "rtc_base/messagequeue.h"                 // for Message
-#include "rtc_base/third_party/sigslot/sigslot.h"  // for has_slots, signal_...
-#include "rtc_base/thread.h"                       // for Thread
-#include "rtc_base/thread_annotations.h"           // for RTC_EXCLUSIVE_LOCK...
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/nullsocketserver.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
+#include "rtc_base/thread.h"
 
 namespace rtc {
 

rtc_base/socketadapters.cc

@@ -30,6 +30,7 @@
 #include "rtc_base/httpcommon.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/socketadapters.h"
+#include "rtc_base/stringencode.h"
 #include "rtc_base/strings/string_builder.h"
 #include "rtc_base/stringutils.h"
 #include "rtc_base/zero_memory.h"

rtc_base/socketadapters.h

@@ -11,11 +11,13 @@
 #ifndef RTC_BASE_SOCKETADAPTERS_H_
 #define RTC_BASE_SOCKETADAPTERS_H_
 
+#include <map>
 #include <string>
 
 #include "rtc_base/asyncsocket.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/cryptstring.h"
+#include "rtc_base/logging.h"
 
 namespace rtc {
 

rtc_base/socketaddress.h

@@ -15,6 +15,7 @@
 #ifdef UNIT_TEST
 #include <ostream>  // no-presubmit-check TODO(webrtc:8982)
 #endif              // UNIT_TEST
+#include <vector>
 #include "rtc_base/ipaddress.h"
 
 #undef SetPort

rtc_base/ssladapter_unittest.cc

@@ -15,7 +15,6 @@
 #include "absl/memory/memory.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/ipaddress.h"
-#include "rtc_base/messagedigest.h"
 #include "rtc_base/socketstream.h"
 #include "rtc_base/ssladapter.h"
 #include "rtc_base/sslidentity.h"

rtc_base/sslcertificate.cc

@@ -10,15 +10,16 @@
 
 #include "rtc_base/sslcertificate.h"
 
-#include <algorithm>  // for transform
+#include <ctime>
 #include <string>
 #include <utility>
 
-#include "absl/memory/memory.h"                  // for WrapUnique, make_unique
-#include "rtc_base/checks.h"                     // for FatalLogCall, RTC_DC...
-#include "rtc_base/opensslcertificate.h"         // for OpenSSLCertificate
-#include "rtc_base/sslfingerprint.h"             // for SSLFingerprint
-#include "rtc_base/third_party/base64/base64.h"  // for Base64
+#include "absl/memory/memory.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/opensslcertificate.h"
+#include "rtc_base/sslfingerprint.h"
+#include "rtc_base/third_party/base64/base64.h"
 
 namespace rtc {
 

rtc_base/sslcertificate.h

@@ -15,12 +15,15 @@
 #ifndef RTC_BASE_SSLCERTIFICATE_H_
 #define RTC_BASE_SSLCERTIFICATE_H_
 
+#include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "rtc_base/buffer.h"
 #include "rtc_base/constructormagic.h"
+#include "rtc_base/messagedigest.h"
+#include "rtc_base/timeutils.h"
 
 namespace rtc {
 

rtc_base/sslfingerprint.cc

@@ -13,6 +13,7 @@
 #include <ctype.h>
 #include <string>
 
+#include "rtc_base/helpers.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/messagedigest.h"
 #include "rtc_base/stringencode.h"

rtc_base/sslidentity.cc

@@ -11,15 +11,17 @@
 // Handling of certificates and keypairs for SSLStreamAdapter's peer mode.
 #include "rtc_base/sslidentity.h"
 
-#include <string.h>  // for strspn
 #include <ctime>
 #include <string>
+#include <utility>
 
-#include "rtc_base/checks.h"                     // for FatalLogCall, RTC_DC...
-#include "rtc_base/opensslidentity.h"            // for OpenSSLIdentity
-#include "rtc_base/strings/string_builder.h"     // for StringBuilder
-#include "rtc_base/third_party/base64/base64.h"  // for Base64, Base64::DO_P...
-#include "rtc_base/timeutils.h"                  // for TmToSeconds
+#include "absl/memory/memory.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/opensslidentity.h"
+#include "rtc_base/sslfingerprint.h"
+#include "rtc_base/strings/string_builder.h"
+#include "rtc_base/third_party/base64/base64.h"
 
 namespace rtc {
 

rtc_base/sslidentity.h

@@ -13,10 +13,16 @@
 #ifndef RTC_BASE_SSLIDENTITY_H_
 #define RTC_BASE_SSLIDENTITY_H_
 
-#include <ctime>
+#include <algorithm>
+#include <memory>
 #include <string>
+#include <vector>
 
+#include "rtc_base/buffer.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/messagedigest.h"
 #include "rtc_base/sslcertificate.h"
+#include "rtc_base/timeutils.h"
 
 namespace rtc {
 

rtc_base/sslidentity_unittest.cc

@@ -14,7 +14,6 @@
 #include "rtc_base/fakesslidentity.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/helpers.h"
-#include "rtc_base/messagedigest.h"
 #include "rtc_base/ssladapter.h"
 #include "rtc_base/sslfingerprint.h"
 #include "rtc_base/sslidentity.h"

rtc_base/sslstreamadapter_unittest.cc

@@ -17,7 +17,6 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/helpers.h"
-#include "rtc_base/messagedigest.h"
 #include "rtc_base/ssladapter.h"
 #include "rtc_base/sslidentity.h"
 #include "rtc_base/sslstreamadapter.h"

rtc_base/stream.cc

@@ -15,20 +15,21 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <string.h>  // for memcpy, memmove, strlen
 #include <algorithm>
 #include <string>
 
 #include "rtc_base/checks.h"
-#include "rtc_base/location.h"  // for RTC_FROM_HERE
+#include "rtc_base/logging.h"
 #include "rtc_base/messagequeue.h"
 #include "rtc_base/stream.h"
+#include "rtc_base/stringencode.h"
+#include "rtc_base/stringutils.h"
 #include "rtc_base/thread.h"
+#include "rtc_base/timeutils.h"
 
 #if defined(WEBRTC_WIN)
 #include <windows.h>
 #define fileno _fileno
-#include "rtc_base/stringutils.h"  // for ToUtf16
 #endif
 
 namespace rtc {

rtc_base/stream.h

@@ -18,6 +18,7 @@
 #include "rtc_base/buffer.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/criticalsection.h"
+#include "rtc_base/logging.h"
 #include "rtc_base/messagehandler.h"
 #include "rtc_base/messagequeue.h"
 #include "rtc_base/third_party/sigslot/sigslot.h"

rtc_base/stringencode.cc

@@ -10,6 +10,9 @@
 
 #include "rtc_base/stringencode.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/stringutils.h"

rtc_base/strings/string_builder.cc

@@ -10,12 +10,6 @@
 
 #include "rtc_base/strings/string_builder.h"
 
-#include <stdarg.h>  // for va_end, va_list, va_start
-#include <cstring>   // for strlen
-
-#include "rtc_base/checks.h"                // for FatalLogCall, RTC_DCHECK
-#include "rtc_base/numerics/safe_minmax.h"  // for SafeMin
-
 namespace rtc {
 
 SimpleStringBuilder::SimpleStringBuilder(rtc::ArrayView<char> buffer)

rtc_base/strings/string_builder.h

@@ -12,11 +12,13 @@
 #define RTC_BASE_STRINGS_STRING_BUILDER_H_
 
 #include <cstdio>
+#include <cstring>
 #include <string>
-#include <utility>
 
 #include "absl/strings/string_view.h"
 #include "api/array_view.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/numerics/safe_minmax.h"
 #include "rtc_base/stringencode.h"
 #include "rtc_base/stringutils.h"
 

rtc_base/stringutils.cc

@@ -7,10 +7,11 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-
-#include "rtc_base/stringutils.h"
+#include <algorithm>
+#include <cstdio>
 
 #include "rtc_base/checks.h"
+#include "rtc_base/stringutils.h"
 
 namespace rtc {
 

rtc_base/task_queue_libevent.cc

@@ -10,17 +10,11 @@
 
 #include "rtc_base/task_queue.h"
 
-#include <errno.h>  // for EAGAIN, errno
 #include <fcntl.h>
-#include <pthread.h>  // for pthread_getspecific
 #include <signal.h>
-#include <stdint.h>  // for uint32_t
-#include <time.h>    // for nanosleep, timespec
+#include <string.h>
 #include <unistd.h>
 #include <list>
-#include <memory>       // for unique_ptr, allocator
-#include <type_traits>  // for remove_reference<>::...
-#include <utility>      // for move
 
 #include "base/third_party/libevent/event.h"
 #include "rtc_base/checks.h"
@@ -28,13 +22,11 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/platform_thread_types.h"  // for CurrentThreadRef
 #include "rtc_base/refcount.h"
 #include "rtc_base/refcountedobject.h"
-#include "rtc_base/scoped_ref_ptr.h"  // for scoped_refptr
 #include "rtc_base/system/unused.h"
+#include "rtc_base/task_queue.h"
 #include "rtc_base/task_queue_posix.h"
-#include "rtc_base/thread_annotations.h"  // for RTC_GUARDED_BY
 #include "rtc_base/timeutils.h"
 
 namespace rtc {

rtc_base/third_party/sigslot/sigslot.h

@@ -96,6 +96,7 @@
 #ifndef RTC_BASE_THIRD_PARTY_SIGSLOT_SIGSLOT_H_
 #define RTC_BASE_THIRD_PARTY_SIGSLOT_SIGSLOT_H_
 
+#include <stdlib.h>
 #include <cstring>
 #include <list>
 #include <set>

rtc_base/thread.cc

@@ -24,11 +24,10 @@
 #pragma warning(disable : 4722)
 #endif
 
-#include <utility>  // for move
-
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/nullsocketserver.h"
+#include "rtc_base/platform_thread.h"
 #include "rtc_base/stringutils.h"
 #include "rtc_base/timeutils.h"
 #include "rtc_base/trace_event.h"

rtc_base/thread.h

@@ -11,9 +11,12 @@
 #ifndef RTC_BASE_THREAD_H_
 #define RTC_BASE_THREAD_H_
 
+#include <algorithm>
 #include <list>
 #include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 #if defined(WEBRTC_POSIX)
 #include <pthread.h>

rtc_base/thread_darwin.mm

@@ -13,7 +13,6 @@
 #import <Foundation/Foundation.h>
 
 #include "rtc_base/platform_thread.h"
-#include "rtc_base/timeutils.h"  // for TimeAfter, TimeUntil
 
 /*
  * This file contains platform-specific implementations for several

rtc_base/unixfilesystem.cc

@@ -47,7 +47,6 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/fileutils.h"
-#include "rtc_base/logging.h"
 #include "rtc_base/pathutils.h"
 #include "rtc_base/stream.h"
 #include "rtc_base/stringutils.h"

rtc_base/win32filesystem.cc

@@ -20,7 +20,6 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/fileutils.h"
-#include "rtc_base/logging.h"
 #include "rtc_base/pathutils.h"
 #include "rtc_base/stream.h"
 #include "rtc_base/stringutils.h"

rtc_base/win32socketserver.cc

@@ -16,7 +16,6 @@
 #include "rtc_base/byteorder.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
-#include "rtc_base/timeutils.h"  // For Time, TimeSince
 #include "rtc_base/win32window.h"
 
 namespace rtc {

sdk/android/BUILD.gn

@@ -829,7 +829,6 @@ if (is_android) {
       ":videoframe_jni",
       "//api:libjingle_peerconnection_api",
       "//api/video:video_frame",
-      "//rtc_base:rtc_base",
       "//rtc_base:rtc_base_approved",
       "//third_party/abseil-cpp/absl/memory",
     ]

sdk/android/native_api/video/videosource.h

@@ -14,7 +14,6 @@
 #include <jni.h>
 
 #include "api/mediastreaminterface.h"
-#include "rtc_base/thread.h"
 #include "sdk/android/native_api/jni/scoped_java_ref.h"
 
 namespace webrtc {