diff --git a/api/datachannelinterface.h b/api/datachannelinterface.h
index 4ab7efb740..afeb17377f 100644
--- 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"
diff --git a/api/statstypes.h b/api/statstypes.h
index 2e3de06904..4eac02df80 100644
--- 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"
diff --git a/call/call.cc b/call/call.cc
index 25f1cd9b24..e0105aba63 100644
--- 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"
diff --git a/call/rtcp_demuxer.h b/call/rtcp_demuxer.h
index 87b5816282..494e0cea4b 100644
--- 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 {
 
diff --git a/call/rtcp_demuxer_unittest.cc b/call/rtcp_demuxer_unittest.cc
index 0e1c95b9f5..c1e360cec7 100644
--- 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"
diff --git a/call/rtp_demuxer_unittest.cc b/call/rtp_demuxer_unittest.cc
index ef092ee98f..af6cbee3e9 100644
--- 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"
diff --git a/call/rtp_rtcp_demuxer_helper.h b/call/rtp_rtcp_demuxer_helper.h
index 32408e8a7a..fef7255c8a 100644
--- 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 {
 
diff --git a/call/rtp_rtcp_demuxer_helper_unittest.cc b/call/rtp_rtcp_demuxer_helper_unittest.cc
index cb8a092616..5fe827494b 100644
--- 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"
 
diff --git a/call/ssrc_binding_observer.h b/call/ssrc_binding_observer.h
index 73a8e8e586..ada505610f 100644
--- 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
diff --git a/media/base/mediachannel.h b/media/base/mediachannel.h
index e145fe6acd..e5a6df2090 100644
--- 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"
diff --git a/media/base/testutils.h b/media/base/testutils.h
index 2cee107b30..7db72b07ee 100644
--- 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 {
diff --git a/media/engine/fakewebrtcvideoengine.cc b/media/engine/fakewebrtcvideoengine.cc
index 96ab1d1dd1..18bd14ad89 100644
--- 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"
 
diff --git a/media/engine/simulcast.h b/media/engine/simulcast.h
index b47a5c15de..8708b9bc04 100644
--- 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 {
 
diff --git a/modules/audio_processing/agc2/agc2_common.h b/modules/audio_processing/agc2/agc2_common.h
index 3a499d98a2..a0919c848a 100644
--- 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 {
 
diff --git a/modules/audio_processing/agc2/agc2_testing_common.h b/modules/audio_processing/agc2/agc2_testing_common.h
index 8c4f400a98..7bfadbb3fc 100644
--- 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 {
diff --git a/modules/audio_processing/agc2/interpolated_gain_curve.h b/modules/audio_processing/agc2/interpolated_gain_curve.h
index ddceaaab93..fc5842bd2c 100644
--- 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"
 
diff --git a/modules/congestion_controller/rtp/send_time_history.h b/modules/congestion_controller/rtp/send_time_history.h
index 96b1271953..cfacf1f3b8 100644
--- 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 {
diff --git a/modules/congestion_controller/send_time_history.h b/modules/congestion_controller/send_time_history.h
index 366fec9d2c..99f9ca9770 100644
--- 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 {
diff --git a/modules/pacing/bitrate_prober.h b/modules/pacing/bitrate_prober.h
index c98de83a34..abef732245 100644
--- 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 {
diff --git a/modules/rtp_rtcp/include/flexfec_receiver.h b/modules/rtp_rtcp/include/flexfec_receiver.h
index 024d691bf9..f006111e11 100644
--- 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"
 
diff --git a/modules/rtp_rtcp/include/flexfec_sender.h b/modules/rtp_rtcp/include/flexfec_sender.h
index ac07b8da9e..57ba84124f 100644
--- 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"
 
diff --git a/modules/rtp_rtcp/include/rtp_header_extension_map.h b/modules/rtp_rtcp/include/rtp_header_extension_map.h
index efac056322..89a0ed526f 100644
--- 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 {
diff --git a/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h b/modules/rtp_rtcp/mocks/mock_recovered_packet_receiver.h
index 51a2bf12ac..d6442ad58a 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/fec_test_helper.h b/modules/rtp_rtcp/source/fec_test_helper.h
index 79dfb5eec1..004edf77d4 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer.h b/modules/rtp_rtcp/source/flexfec_header_reader_writer.h
index 3bb73f97bc..1d6ddda4b4 100644
--- 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 {
 
diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
index 0f0bf274fa..5da378cb01 100644
--- 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"
diff --git a/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc b/modules/rtp_rtcp/source/flexfec_receiver_unittest.cc
index 5cdcdf59d6..378cf7d6df 100644
--- 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"
 
diff --git a/modules/rtp_rtcp/source/forward_error_correction.h b/modules/rtp_rtcp/source/forward_error_correction.h
index 97acb393f3..1f06b296e9 100644
--- 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"
diff --git a/modules/rtp_rtcp/source/rtcp_packet.h b/modules/rtp_rtcp/source/rtcp_packet.h
index e773398553..11037cbd82 100644
--- 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"
 
diff --git a/modules/rtp_rtcp/source/rtcp_packet/common_header.h b/modules/rtp_rtcp/source/rtcp_packet/common_header.h
index b760d169f7..d91956e2e3 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h b/modules/rtp_rtcp/source/rtcp_packet/compound_packet.h
index fdf0a4fa9a..89b78148f7 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/dlrr.h b/modules/rtp_rtcp/source/rtcp_packet/dlrr.h
index f0f23022f5..6fe2099fd9 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/fir.h b/modules/rtp_rtcp/source/rtcp_packet/fir.h
index b37c4dacd7..6fbc54c7f2 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/nack.h b/modules/rtp_rtcp/source/rtcp_packet/nack.h
index cab77d4ff1..0e462f9892 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/pli.h b/modules/rtp_rtcp/source/rtcp_packet/pli.h
index e64b877a4a..fc3c20a8a8 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/psfb.h b/modules/rtp_rtcp/source/rtcp_packet/psfb.h
index 33b7f1c9ef..ae66a17238 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h
index 9f1772ad1a..1955b98f5c 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h b/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h
index 894e14e5c3..3dc7920585 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/remb.h b/modules/rtp_rtcp/source/rtcp_packet/remb.h
index b034a964fd..5f4aef8ea4 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/report_block.h b/modules/rtp_rtcp/source/rtcp_packet/report_block.h
index 766d59e26b..eb16640ae2 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/rrtr.h b/modules/rtp_rtcp/source/rtcp_packet/rrtr.h
index 9eae8c8922..a470b1a217 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h b/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h
index 4b08106af4..a0407411ab 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/sdes.h b/modules/rtp_rtcp/source/rtcp_packet/sdes.h
index 9010686b1a..70e9385b9b 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h b/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h
index a3793e320b..07e5da1a49 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h b/modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h
index 7185976fe0..dc5d1b2c2d 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h b/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h
index 75a349b6cd..ff7779d8ac 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h b/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h
index bc3ecde2a0..7482cb75cc 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h b/modules/rtp_rtcp/source/rtcp_packet/voip_metric.h
index 135dc45c76..c5588a47ce 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/rtp_fec_unittest.cc b/modules/rtp_rtcp/source/rtp_fec_unittest.cc
index 1abed150f1..ba18fc61d4 100644
--- 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"
 
diff --git a/modules/rtp_rtcp/source/rtp_packet.h b/modules/rtp_rtcp/source/rtp_packet.h
index 313e00a10f..acb58805ef 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/ulpfec_generator.cc b/modules/rtp_rtcp/source/ulpfec_generator.cc
index 85000eac9d..e5777edab8 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc
index b05775443c..39ead62ca5 100644
--- 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 {
diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h
index ac9fcc171b..fc83afdf0c 100644
--- 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 {
 
diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
index 9eaaf89b44..a1d1bd5fb2 100644
--- 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"
diff --git a/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h b/modules/video_coding/codecs/vp9/vp9_frame_buffer_pool.h
index fcb30af560..9b035eb94a 100644
--- 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"
diff --git a/modules/video_coding/h264_sprop_parameter_sets.cc b/modules/video_coding/h264_sprop_parameter_sets.cc
index be0d17ceff..a05a2a7ed1 100644
--- 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 {
diff --git a/modules/video_coding/video_codec_initializer.cc b/modules/video_coding/video_codec_initializer.cc
index f122070282..29ad4a8bff 100644
--- 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"
 
diff --git a/p2p/base/pseudotcp.cc b/p2p/base/pseudotcp.cc
index e15ec4056a..3ee0d5ea88 100644
--- 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"
diff --git a/p2p/base/pseudotcp.h b/p2p/base/pseudotcp.h
index b36a7d9ddb..0a8507aa54 100644
--- 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 {
diff --git a/p2p/base/stun.h b/p2p/base/stun.h
index e8195aa5db..02b7b786bc 100644
--- 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"
 
diff --git a/p2p/stunprober/stunprober.h b/p2p/stunprober/stunprober.h
index 718e202f01..ba3fc5892a 100644
--- 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"
diff --git a/pc/rtpreceiver.h b/pc/rtpreceiver.h
index da92298c4f..55ed29ecf1 100644
--- 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 {
 
diff --git a/pc/rtpsender.h b/pc/rtpsender.h
index 4077b9ca1f..739ed0f3a4 100644
--- 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"
diff --git a/pc/srtpfilter.h b/pc/srtpfilter.h
index 6a3644d5e9..977464013a 100644
--- 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"
diff --git a/pc/srtpsession.h b/pc/srtpsession.h
index af534bea22..ee0f8b2174 100644
--- 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"
 
diff --git a/pc/test/fakeaudiocapturemodule.h b/pc/test/fakeaudiocapturemodule.h
index db346d06c8..a1709dd777 100644
--- 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"
diff --git a/rtc_base/bytebuffer.cc b/rtc_base/bytebuffer.cc
index f152d4f1f1..b2d75182a4 100644
--- 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() {}
diff --git a/rtc_base/bytebuffer.h b/rtc_base/bytebuffer.h
index 740bff2c72..9036bcde6f 100644
--- 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"
diff --git a/rtc_base/crc32.h b/rtc_base/crc32.h
index a0ce4323e7..79c765f64f 100644
--- 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 {
 
diff --git a/rtc_base/helpers.h b/rtc_base/helpers.h
index 0100794154..c1abb2c8ac 100644
--- 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 {
 
diff --git a/rtc_base/httpcommon.h b/rtc_base/httpcommon.h
index 4dd1172403..08b9a377ab 100644
--- 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"
diff --git a/rtc_base/ipaddress.h b/rtc_base/ipaddress.h
index c965cf14e7..c7a7e708e1 100644
--- 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"
diff --git a/rtc_base/logging.h b/rtc_base/logging.h
index 1df8cd63f9..ff90a81645 100644
--- 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"
diff --git a/rtc_base/messagedigest.cc b/rtc_base/messagedigest.cc
index bf8d25dcbf..1e4c3850fb 100644
--- 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"
 
diff --git a/rtc_base/messagequeue.h b/rtc_base/messagequeue.h
index 70556438e3..c08b860705 100644
--- 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"
diff --git a/rtc_base/physicalsocketserver.cc b/rtc_base/physicalsocketserver.cc
index 1a4e5c96b1..594737e3e4 100644
--- 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"
diff --git a/rtc_base/ratetracker.h b/rtc_base/ratetracker.h
index 05eccffce0..ac9b88a5d1 100644
--- 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 {
 
diff --git a/rtc_base/socket.h b/rtc_base/socket.h
index ee2c73f08e..9b5ee7f76e 100644
--- 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"
 
diff --git a/rtc_base/socketaddress.h b/rtc_base/socketaddress.h
index 90919c2318..f221f9b142 100644
--- 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
diff --git a/rtc_base/sslfingerprint.h b/rtc_base/sslfingerprint.h
index b5e9b72bb4..b204bc77f3 100644
--- 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"
diff --git a/rtc_base/stream.cc b/rtc_base/stream.cc
index d9373535a5..3a96874dea 100644
--- 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"
diff --git a/rtc_base/win32.cc b/rtc_base/win32.cc
index cbf6fbb057..1c5585be3a 100644
--- 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"
diff --git a/test/fuzzers/flexfec_receiver_fuzzer.cc b/test/fuzzers/flexfec_receiver_fuzzer.cc
index 14208bd7ec..d96a328fa2 100644
--- 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 {
 
diff --git a/test/fuzzers/ulpfec_receiver_fuzzer.cc b/test/fuzzers/ulpfec_receiver_fuzzer.cc
index c850fec996..25b53edc4e 100644
--- 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 {
 
diff --git a/test/video_capturer.cc b/test/video_capturer.cc
index b48bc1afe2..c81c9f8a56 100644
--- 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 {