Delete unneeded includes of basictypes.h.

This is a kitchen-sink header, some pieces should be moved to byteorder.h, the rest likely deleted. Delete most includes of basictypes.h. In leaf headers, include stddef.h and stdint.h explicitly where needed. Bug: webrtc:6853 Change-Id: Ibc809936a8f94d418e4eb650da1e89c1b9142073 Reviewed-on: https://webrtc-review.googlesource.com/77721 Commit-Queue: Niels Moller <nisse@webrtc.org> Reviewed-by: Fredrik Solenberg <solenberg@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23333}
2018-05-21 11:46:20 +02:00 · 2018-05-21 11:46:20 +02:00 · 65ec0fc81e
commit 65ec0fc81e
parent 0ce868c60e
85 changed files with 20 additions and 90 deletions
--- a/api/datachannelinterface.h
+++ b/api/datachannelinterface.h
@ -16,7 +16,6 @@

 #include <string>

-#include "rtc_base/basictypes.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/copyonwritebuffer.h"
 #include "rtc_base/refcount.h"
--- a/api/statstypes.h
+++ b/api/statstypes.h
@ -20,7 +20,6 @@
 #include <string>
 #include <vector>

-#include "rtc_base/basictypes.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/refcount.h"
 #include "rtc_base/scoped_ref_ptr.h"
--- a/call/call.cc
+++ b/call/call.cc
@ -45,7 +45,6 @@
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "modules/utility/include/process_thread.h"
 #include "modules/video_coding/fec_controller_default.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/location.h"
--- a/call/rtcp_demuxer.h
+++ b/call/rtcp_demuxer.h
@ -17,7 +17,6 @@

 #include "api/array_view.h"
 #include "call/ssrc_binding_observer.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {

--- a/call/rtcp_demuxer_unittest.cc
+++ b/call/rtcp_demuxer_unittest.cc
@ -18,7 +18,6 @@
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/rtp_rtcp/source/rtcp_packet/bye.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/ptr_util.h"
 #include "test/gmock.h"
--- a/call/rtp_demuxer_unittest.cc
+++ b/call/rtp_demuxer_unittest.cc
@ -21,7 +21,6 @@
 #include "modules/rtp_rtcp/source/rtp_header_extensions.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/numerics/safe_conversions.h"
 #include "rtc_base/ptr_util.h"
--- a/call/rtp_rtcp_demuxer_helper.h
+++ b/call/rtp_rtcp_demuxer_helper.h
@ -17,7 +17,6 @@

 #include "api/array_view.h"
 #include "api/optional.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {

--- a/call/rtp_rtcp_demuxer_helper_unittest.cc
+++ b/call/rtp_rtcp_demuxer_helper_unittest.cc
@ -20,7 +20,6 @@
 #include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/buffer.h"
 #include "test/gtest.h"

--- a/call/ssrc_binding_observer.h
+++ b/call/ssrc_binding_observer.h
@ -12,8 +12,6 @@

 #include <string>

-#include "rtc_base/basictypes.h"
-
 namespace webrtc {

 // With newer versions of SDP, SSRC is often not explicitly signaled and must
--- a/media/base/mediachannel.h
+++ b/media/base/mediachannel.h
@ -33,7 +33,6 @@
 #include "media/base/streamparams.h"
 #include "modules/audio_processing/include/audio_processing_statistics.h"
 #include "rtc_base/asyncpacketsocket.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/copyonwritebuffer.h"
 #include "rtc_base/dscp.h"
--- a/media/base/testutils.h
+++ b/media/base/testutils.h
@ -18,7 +18,6 @@
 #include "media/base/videocapturer.h"
 #include "media/base/videocommon.h"
 #include "rtc_base/arraysize.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/sigslot.h"

 namespace rtc {
--- a/media/engine/fakewebrtcvideoengine.cc
+++ b/media/engine/fakewebrtcvideoengine.cc
@ -15,7 +15,6 @@
 #include "media/engine/webrtcvideodecoderfactory.h"
 #include "media/engine/webrtcvideoencoderfactory.h"
 #include "modules/video_coding/include/video_error_codes.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/gunit.h"
 #include "rtc_base/stringutils.h"

--- a/media/engine/simulcast.h
+++ b/media/engine/simulcast.h
@ -15,7 +15,6 @@
 #include <vector>

 #include "api/video_codecs/video_encoder_config.h"
-#include "rtc_base/basictypes.h"

 namespace cricket {

--- a/modules/audio_processing/agc2/agc2_common.h
+++ b/modules/audio_processing/agc2/agc2_common.h
@ -11,9 +11,10 @@
 #ifndef MODULES_AUDIO_PROCESSING_AGC2_AGC2_COMMON_H_
 #define MODULES_AUDIO_PROCESSING_AGC2_AGC2_COMMON_H_

+#include <stddef.h>
+
 #include <cmath>

-#include "rtc_base/basictypes.h"

 namespace webrtc {

--- a/modules/audio_processing/agc2/agc2_testing_common.h
+++ b/modules/audio_processing/agc2/agc2_testing_common.h
@ -16,7 +16,6 @@
 #include <limits>
 #include <vector>

-#include "rtc_base/basictypes.h"
 #include "rtc_base/checks.h"

 namespace webrtc {
--- a/modules/audio_processing/agc2/interpolated_gain_curve.h
+++ b/modules/audio_processing/agc2/interpolated_gain_curve.h
@ -14,7 +14,7 @@
 #include <array>

 #include "modules/audio_processing/agc2/agc2_common.h"
-#include "rtc_base/basictypes.h"
+
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/gtest_prod_util.h"

--- a/modules/congestion_controller/rtp/send_time_history.h
+++ b/modules/congestion_controller/rtp/send_time_history.h
@ -14,7 +14,6 @@
 #include <map>

 #include "modules/include/module_common_types.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/constructormagic.h"

 namespace webrtc {
--- a/modules/congestion_controller/send_time_history.h
+++ b/modules/congestion_controller/send_time_history.h
@ -14,7 +14,6 @@
 #include <map>

 #include "modules/include/module_common_types.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/constructormagic.h"

 namespace webrtc {
--- a/modules/pacing/bitrate_prober.h
+++ b/modules/pacing/bitrate_prober.h
@ -14,7 +14,6 @@
 #include <queue>

 #include "modules/include/module_common_types.h"
-#include "rtc_base/basictypes.h"
 #include "typedefs.h"  // NOLINT(build/include)

 namespace webrtc {
--- a/modules/rtp_rtcp/include/flexfec_receiver.h
+++ b/modules/rtp_rtcp/include/flexfec_receiver.h
@ -16,7 +16,6 @@
 #include "modules/rtp_rtcp/include/ulpfec_receiver.h"
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/sequenced_task_checker.h"
 #include "system_wrappers/include/clock.h"

--- a/modules/rtp_rtcp/include/flexfec_sender.h
+++ b/modules/rtp_rtcp/include/flexfec_sender.h
@ -23,7 +23,6 @@
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
 #include "modules/rtp_rtcp/source/ulpfec_generator.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/random.h"
 #include "system_wrappers/include/clock.h"

--- a/modules/rtp_rtcp/include/rtp_header_extension_map.h
+++ b/modules/rtp_rtcp/include/rtp_header_extension_map.h
@ -16,7 +16,6 @@
 #include "api/array_view.h"
 #include "api/rtpparameters.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/checks.h"

 namespace webrtc {
--- a/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h
+++ b/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h
@ -12,7 +12,6 @@
 #define MODULES_RTP_RTCP_MOCKS_MOCK_RECOVERED_PACKET_RECEIVER_H_

 #include "modules/rtp_rtcp/include/flexfec_receiver.h"
-#include "rtc_base/basictypes.h"
 #include "test/gmock.h"

 namespace webrtc {
--- a/modules/rtp_rtcp/source/fec_test_helper.h
+++ b/modules/rtp_rtcp/source/fec_test_helper.h
@ -15,7 +15,6 @@

 #include "modules/include/module_common_types.h"
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/random.h"

 namespace webrtc {
--- a/modules/rtp_rtcp/source/flexfec_header_reader_writer.h
+++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer.h
@ -12,7 +12,6 @@
 #define MODULES_RTP_RTCP_SOURCE_FLEXFEC_HEADER_READER_WRITER_H_

 #include "modules/rtp_rtcp/source/forward_error_correction.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {

--- a/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
+++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
@ -17,7 +17,6 @@
 #include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h"
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
 #include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/random.h"
 #include "rtc_base/scoped_ref_ptr.h"
--- a/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
@ -16,7 +16,6 @@
 #include "modules/rtp_rtcp/source/fec_test_helper.h"
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "rtc_base/basictypes.h"
 #include "test/gmock.h"
 #include "test/gtest.h"

--- a/modules/rtp_rtcp/source/forward_error_correction.h
+++ b/modules/rtp_rtcp/source/forward_error_correction.h
@ -19,7 +19,6 @@

 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/refcount.h"
 #include "rtc_base/scoped_ref_ptr.h"
--- a/modules/rtp_rtcp/source/rtcp_packet.h
+++ b/modules/rtp_rtcp/source/rtcp_packet.h
@ -11,7 +11,6 @@
 #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_
 #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_H_

-#include "rtc_base/basictypes.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/function_view.h"

--- a/modules/rtp_rtcp/source/rtcp_packet/common_header.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/common_header.h
@ -10,7 +10,8 @@
 #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMMON_HEADER_H_
 #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_COMMON_HEADER_H_

-#include "rtc_base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h
@ -15,7 +15,6 @@
 #include <vector>

 #include "modules/rtp_rtcp/source/rtcp_packet.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/constructormagic.h"

 namespace webrtc {
--- a/modules/rtp_rtcp/source/rtcp_packet/dlrr.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/dlrr.h
@ -12,9 +12,10 @@
 #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_DLRR_H_
 #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_DLRR_H_

-#include <vector>
+#include <stddef.h>
+#include <stdint.h>

-#include "rtc_base/basictypes.h"
+#include <vector>

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/fir.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/fir.h
@ -14,7 +14,6 @@
 #include <vector>

 #include "modules/rtp_rtcp/source/rtcp_packet/psfb.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/nack.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/nack.h
@ -14,7 +14,6 @@
 #include <vector>

 #include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/pli.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/pli.h
@ -11,7 +11,6 @@
 #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PLI_H_

 #include "modules/rtp_rtcp/source/rtcp_packet/psfb.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/psfb.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/psfb.h
@ -13,7 +13,6 @@
 #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_PSFB_H_

 #include "modules/rtp_rtcp/source/rtcp_packet.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h
@ -12,7 +12,6 @@
 #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RAPID_RESYNC_REQUEST_H_

 #include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h
@ -15,7 +15,6 @@

 #include "modules/rtp_rtcp/source/rtcp_packet.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/report_block.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/remb.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/remb.h
@ -14,7 +14,6 @@
 #include <vector>

 #include "modules/rtp_rtcp/source/rtcp_packet/psfb.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/report_block.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/report_block.h
@ -12,7 +12,8 @@
 #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REPORT_BLOCK_H_
 #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_REPORT_BLOCK_H_

-#include "rtc_base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/rrtr.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/rrtr.h
@ -12,7 +12,6 @@
 #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RRTR_H_
 #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RRTR_H_

-#include "rtc_base/basictypes.h"
 #include "system_wrappers/include/ntp_time.h"

 namespace webrtc {
--- a/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h
@ -13,7 +13,6 @@
 #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_RTPFB_H_

 #include "modules/rtp_rtcp/source/rtcp_packet.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/sdes.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/sdes.h
@ -15,7 +15,6 @@
 #include <vector>

 #include "modules/rtp_rtcp/source/rtcp_packet.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h
@ -11,9 +11,10 @@
 #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TARGET_BITRATE_H_
 #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TARGET_BITRATE_H_

-#include <vector>
+#include <stddef.h>
+#include <stdint.h>

-#include "rtc_base/basictypes.h"
+#include <vector>

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h
@ -11,7 +11,8 @@
 #ifndef MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_
 #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_TMMB_ITEM_H_

-#include "rtc_base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h
@ -15,7 +15,6 @@

 #include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h
@ -15,7 +15,6 @@

 #include "modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h
@ -13,7 +13,6 @@
 #define MODULES_RTP_RTCP_SOURCE_RTCP_PACKET_VOIP_METRIC_H_

 #include "modules/include/module_common_types.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {
 namespace rtcp {
--- a/modules/rtp_rtcp/source/rtp_fec_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_fec_unittest.cc
@ -17,7 +17,6 @@
 #include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h"
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
 #include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/random.h"
 #include "test/gtest.h"

--- a/modules/rtp_rtcp/source/rtp_packet.h
+++ b/modules/rtp_rtcp/source/rtp_packet.h
@ -14,7 +14,6 @@

 #include "api/array_view.h"
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/copyonwritebuffer.h"

 namespace webrtc {
--- a/modules/rtp_rtcp/source/ulpfec_generator.cc
+++ b/modules/rtp_rtcp/source/ulpfec_generator.cc
@ -17,7 +17,6 @@
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
 #include "modules/rtp_rtcp/source/rtp_utility.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/checks.h"

 namespace webrtc {
--- a/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc
+++ b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc
@ -17,7 +17,6 @@
 #include "modules/rtp_rtcp/source/fec_test_helper.h"
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
 #include "modules/rtp_rtcp/source/ulpfec_generator.h"
-#include "rtc_base/basictypes.h"
 #include "test/gtest.h"

 namespace webrtc {
--- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h
+++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h
@ -12,7 +12,6 @@
 #define MODULES_RTP_RTCP_SOURCE_ULPFEC_HEADER_READER_WRITER_H_

 #include "modules/rtp_rtcp/source/forward_error_correction.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {

--- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
+++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
@ -17,7 +17,6 @@
 #include "modules/rtp_rtcp/source/forward_error_correction.h"
 #include "modules/rtp_rtcp/source/forward_error_correction_internal.h"
 #include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/random.h"
 #include "rtc_base/scoped_ref_ptr.h"
--- a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h
+++ b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h
@ -14,7 +14,6 @@

 #include <vector>

-#include "rtc_base/basictypes.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/refcount.h"
--- a/modules/video_coding/h264_sprop_parameter_sets.cc
+++ b/modules/video_coding/h264_sprop_parameter_sets.cc
@ -14,7 +14,6 @@
 #include <vector>

 #include "rtc_base/base64.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/logging.h"

 namespace {
--- a/modules/video_coding/video_codec_initializer.cc
+++ b/modules/video_coding/video_codec_initializer.cc
@ -20,7 +20,6 @@
 #include "modules/video_coding/codecs/vp9/svc_rate_allocator.h"
 #include "modules/video_coding/include/video_coding_defines.h"
 #include "modules/video_coding/utility/default_video_bitrate_allocator.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/logging.h"
 #include "system_wrappers/include/clock.h"

--- a/p2p/base/pseudotcp.cc
+++ b/p2p/base/pseudotcp.cc
@ -18,7 +18,6 @@
 #include <set>

 #include "rtc_base/arraysize.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/bytebuffer.h"
 #include "rtc_base/byteorder.h"
 #include "rtc_base/checks.h"
--- a/p2p/base/pseudotcp.h
+++ b/p2p/base/pseudotcp.h
@ -13,7 +13,6 @@

 #include <list>

-#include "rtc_base/basictypes.h"
 #include "rtc_base/stream.h"

 namespace cricket {
--- a/p2p/base/stun.h
+++ b/p2p/base/stun.h
@ -18,7 +18,6 @@
 #include <string>
 #include <vector>

-#include "rtc_base/basictypes.h"
 #include "rtc_base/bytebuffer.h"
 #include "rtc_base/socketaddress.h"

--- a/p2p/stunprober/stunprober.h
+++ b/p2p/stunprober/stunprober.h
@ -16,7 +16,6 @@
 #include <vector>

 #include "rtc_base/asyncinvoker.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/bytebuffer.h"
 #include "rtc_base/callback.h"
 #include "rtc_base/constructormagic.h"
--- a/pc/rtpreceiver.h
+++ b/pc/rtpreceiver.h
@ -25,7 +25,6 @@
 #include "media/base/videobroadcaster.h"
 #include "pc/remoteaudiosource.h"
 #include "pc/videotracksource.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {

--- a/pc/rtpsender.h
+++ b/pc/rtpsender.h
@ -21,7 +21,6 @@

 #include "api/mediastreaminterface.h"
 #include "api/rtpsenderinterface.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/criticalsection.h"
 #include "media/base/audiosource.h"
 #include "media/base/mediachannel.h"
--- a/pc/srtpfilter.h
+++ b/pc/srtpfilter.h
@ -22,7 +22,6 @@
 #include "api/jsep.h"
 #include "api/optional.h"
 #include "pc/sessiondescription.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/criticalsection.h"
--- a/pc/srtpsession.h
+++ b/pc/srtpsession.h
@ -14,7 +14,6 @@
 #include <vector>

 #include "api/umametrics.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/scoped_ref_ptr.h"
 #include "rtc_base/thread_checker.h"

--- a/pc/test/fakeaudiocapturemodule.h
+++ b/pc/test/fakeaudiocapturemodule.h
@ -24,7 +24,6 @@

 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_device/include/audio_device.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/messagehandler.h"
 #include "rtc_base/scoped_ref_ptr.h"
--- a/rtc_base/bytebuffer.cc
+++ b/rtc_base/bytebuffer.cc
@ -14,8 +14,6 @@

 #include <algorithm>

-#include "rtc_base/basictypes.h"
-
 namespace rtc {

 ByteBufferWriter::ByteBufferWriter() : ByteBufferWriterT() {}
--- a/rtc_base/bytebuffer.h
+++ b/rtc_base/bytebuffer.h
@ -13,7 +13,6 @@

 #include <string>

-#include "rtc_base/basictypes.h"
 #include "rtc_base/buffer.h"
 #include "rtc_base/byteorder.h"
 #include "rtc_base/constructormagic.h"
--- a/rtc_base/crc32.h
+++ b/rtc_base/crc32.h
@ -11,9 +11,10 @@
 #ifndef RTC_BASE_CRC32_H_
 #define RTC_BASE_CRC32_H_

-#include <string>
+#include <stddef.h>
+#include <stdint.h>

-#include "rtc_base/basictypes.h"
+#include <string>

 namespace rtc {

--- a/rtc_base/helpers.h
+++ b/rtc_base/helpers.h
@ -12,7 +12,6 @@
 #define RTC_BASE_HELPERS_H_

 #include <string>
-#include "rtc_base/basictypes.h"

 namespace rtc {

--- a/rtc_base/httpcommon.h
+++ b/rtc_base/httpcommon.h
@ -15,7 +15,7 @@
 #include <memory>
 #include <string>
 #include <vector>
-#include "rtc_base/basictypes.h"
+
 #include "rtc_base/checks.h"
 #include "rtc_base/stream.h"
 #include "rtc_base/stringutils.h"
--- a/rtc_base/ipaddress.h
+++ b/rtc_base/ipaddress.h
@ -25,7 +25,6 @@
 #include <string>
 #include <vector>

-#include "rtc_base/basictypes.h"
 #include "rtc_base/byteorder.h"
 #if defined(WEBRTC_WIN)
 #include "rtc_base/win32.h"
--- a/rtc_base/logging.h
+++ b/rtc_base/logging.h
@ -55,7 +55,6 @@
 #include <CoreServices/CoreServices.h>
 #endif

-#include "rtc_base/basictypes.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/deprecation.h"
 #include "rtc_base/system/no_inline.h"
--- a/rtc_base/messagedigest.cc
+++ b/rtc_base/messagedigest.cc
@ -14,7 +14,6 @@

 #include <string.h>

-#include "rtc_base/basictypes.h"
 #include "rtc_base/openssldigest.h"
 #include "rtc_base/stringencode.h"

--- a/rtc_base/messagequeue.h
+++ b/rtc_base/messagequeue.h
@ -20,7 +20,6 @@
 #include <utility>
 #include <vector>

-#include "rtc_base/basictypes.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/criticalsection.h"
 #include "rtc_base/location.h"
--- a/rtc_base/physicalsocketserver.cc
+++ b/rtc_base/physicalsocketserver.cc
@ -45,7 +45,6 @@
 #include <map>

 #include "rtc_base/arraysize.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/byteorder.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
--- a/rtc_base/ratetracker.h
+++ b/rtc_base/ratetracker.h
@ -11,8 +11,8 @@
 #ifndef RTC_BASE_RATETRACKER_H_
 #define RTC_BASE_RATETRACKER_H_

+#include <stdint.h>
 #include <stdlib.h>
-#include "rtc_base/basictypes.h"

 namespace rtc {

--- a/rtc_base/socket.h
+++ b/rtc_base/socket.h
@ -26,7 +26,6 @@
 #endif

 #include "api/optional.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/socketaddress.h"

--- a/rtc_base/socketaddress.h
+++ b/rtc_base/socketaddress.h
@ -17,7 +17,6 @@
 #include <ostream>  // no-presubmit-check TODO(webrtc:8982)
 #endif              // UNIT_TEST
 #include <vector>
-#include "rtc_base/basictypes.h"
 #include "rtc_base/ipaddress.h"

 #undef SetPort
--- a/rtc_base/sslfingerprint.h
+++ b/rtc_base/sslfingerprint.h
@ -13,7 +13,6 @@

 #include <string>

-#include "rtc_base/basictypes.h"
 #include "rtc_base/copyonwritebuffer.h"
 #include "rtc_base/rtccertificate.h"
 #include "rtc_base/sslidentity.h"
--- a/rtc_base/stream.cc
+++ b/rtc_base/stream.cc
@ -18,7 +18,6 @@
 #include <algorithm>
 #include <string>

-#include "rtc_base/basictypes.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 #include "rtc_base/messagequeue.h"
--- a/rtc_base/win32.cc
+++ b/rtc_base/win32.cc
@ -15,7 +15,6 @@
 #include <algorithm>

 #include "rtc_base/arraysize.h"
-#include "rtc_base/basictypes.h"
 #include "rtc_base/byteorder.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
--- a/test/fuzzers/flexfec_receiver_fuzzer.cc
+++ b/test/fuzzers/flexfec_receiver_fuzzer.cc
@ -14,7 +14,6 @@
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {

--- a/test/fuzzers/ulpfec_receiver_fuzzer.cc
+++ b/test/fuzzers/ulpfec_receiver_fuzzer.cc
@ -14,7 +14,6 @@
 #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
 #include "modules/rtp_rtcp/source/byte_io.h"
 #include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "rtc_base/basictypes.h"

 namespace webrtc {

--- a/test/video_capturer.cc
+++ b/test/video_capturer.cc
@ -10,7 +10,6 @@

 #include "test/video_capturer.h"

-#include "rtc_base/basictypes.h"
 #include "rtc_base/constructormagic.h"

 namespace webrtc {