diff --git a/webrtc/api/rtpreceiver.h b/webrtc/api/rtpreceiver.h index 4b3bd4d4ab..b6807c43b7 100644 --- a/webrtc/api/rtpreceiver.h +++ b/webrtc/api/rtpreceiver.h @@ -15,13 +15,14 @@ #ifndef WEBRTC_API_RTPRECEIVER_H_ #define WEBRTC_API_RTPRECEIVER_H_ +#include + #include #include "webrtc/api/mediastreaminterface.h" #include "webrtc/api/rtpreceiverinterface.h" #include "webrtc/api/remoteaudiosource.h" #include "webrtc/api/videotracksource.h" -#include "webrtc/base/basictypes.h" #include "webrtc/base/sigslot.h" #include "webrtc/media/base/videobroadcaster.h" #include "webrtc/pc/channel.h" diff --git a/webrtc/base/byteorder_unittest.cc b/webrtc/base/byteorder_unittest.cc index c3135aa7c9..6d9b44f9bb 100644 --- a/webrtc/base/byteorder_unittest.cc +++ b/webrtc/base/byteorder_unittest.cc @@ -8,9 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include "webrtc/base/byteorder.h" +#include -#include "webrtc/base/basictypes.h" +#include "webrtc/base/byteorder.h" #include "webrtc/base/gunit.h" namespace rtc { diff --git a/webrtc/base/network.h b/webrtc/base/network.h index 623ead06ff..52d7d35a2c 100644 --- a/webrtc/base/network.h +++ b/webrtc/base/network.h @@ -11,13 +11,14 @@ #ifndef WEBRTC_BASE_NETWORK_H_ #define WEBRTC_BASE_NETWORK_H_ +#include + #include #include #include #include #include -#include "webrtc/base/basictypes.h" #include "webrtc/base/ipaddress.h" #include "webrtc/base/networkmonitor.h" #include "webrtc/base/messagehandler.h" diff --git a/webrtc/base/rtccertificate.h b/webrtc/base/rtccertificate.h index 24170208eb..dfc76808ac 100644 --- a/webrtc/base/rtccertificate.h +++ b/webrtc/base/rtccertificate.h @@ -11,9 +11,10 @@ #ifndef WEBRTC_BASE_RTCCERTIFICATE_H_ #define WEBRTC_BASE_RTCCERTIFICATE_H_ +#include + #include -#include "webrtc/base/basictypes.h" #include "webrtc/base/refcount.h" #include "webrtc/base/scoped_ref_ptr.h" #include "webrtc/base/sslidentity.h" diff --git a/webrtc/base/systeminfo.h b/webrtc/base/systeminfo.h index 99d18b2960..2e5a0a101c 100644 --- a/webrtc/base/systeminfo.h +++ b/webrtc/base/systeminfo.h @@ -11,9 +11,9 @@ #ifndef WEBRTC_BASE_SYSTEMINFO_H__ #define WEBRTC_BASE_SYSTEMINFO_H__ -#include +#include -#include "webrtc/base/basictypes.h" +#include namespace rtc { diff --git a/webrtc/base/task.h b/webrtc/base/task.h index b2a6067153..4d54cfe879 100644 --- a/webrtc/base/task.h +++ b/webrtc/base/task.h @@ -11,8 +11,10 @@ #ifndef WEBRTC_BASE_TASK_H__ #define WEBRTC_BASE_TASK_H__ +#include + #include -#include "webrtc/base/basictypes.h" + #include "webrtc/base/sigslot.h" #include "webrtc/base/taskparent.h" diff --git a/webrtc/base/taskrunner.h b/webrtc/base/taskrunner.h index e0cf17513a..bd7b4ea858 100644 --- a/webrtc/base/taskrunner.h +++ b/webrtc/base/taskrunner.h @@ -11,9 +11,10 @@ #ifndef WEBRTC_BASE_TASKRUNNER_H__ #define WEBRTC_BASE_TASKRUNNER_H__ +#include + #include -#include "webrtc/base/basictypes.h" #include "webrtc/base/sigslot.h" #include "webrtc/base/taskparent.h" diff --git a/webrtc/base/timedelta.h b/webrtc/base/timedelta.h index fe8e6aae2a..71c7f9fc65 100644 --- a/webrtc/base/timedelta.h +++ b/webrtc/base/timedelta.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_BASE_TIMEDELTA_H_ #define WEBRTC_BASE_TIMEDELTA_H_ -#include "webrtc/base/basictypes.h" +#include + #include "webrtc/base/timeutils.h" // Convenience class to convert between different units of relative time. diff --git a/webrtc/base/timestampaligner.h b/webrtc/base/timestampaligner.h index 590499dab3..9c2cc7af59 100644 --- a/webrtc/base/timestampaligner.h +++ b/webrtc/base/timestampaligner.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_BASE_TIMESTAMPALIGNER_H_ #define WEBRTC_BASE_TIMESTAMPALIGNER_H_ -#include "webrtc/base/basictypes.h" +#include + #include "webrtc/base/constructormagic.h" namespace rtc { diff --git a/webrtc/base/timeutils.h b/webrtc/base/timeutils.h index f41bbb5ad0..be9edabf2d 100644 --- a/webrtc/base/timeutils.h +++ b/webrtc/base/timeutils.h @@ -11,10 +11,10 @@ #ifndef WEBRTC_BASE_TIMEUTILS_H_ #define WEBRTC_BASE_TIMEUTILS_H_ -#include +#include #include -#include "webrtc/base/basictypes.h" +#include namespace rtc { diff --git a/webrtc/base/window.h b/webrtc/base/window.h index b1f1724e63..e5b5d50882 100644 --- a/webrtc/base/window.h +++ b/webrtc/base/window.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_BASE_WINDOW_H_ #define WEBRTC_BASE_WINDOW_H_ -#include "webrtc/base/basictypes.h" +#include + #include "webrtc/base/stringencode.h" // Define platform specific window types. diff --git a/webrtc/call/flexfec_receive_stream.h b/webrtc/call/flexfec_receive_stream.h index 20a57f2c15..fe57643cb0 100644 --- a/webrtc/call/flexfec_receive_stream.h +++ b/webrtc/call/flexfec_receive_stream.h @@ -11,6 +11,8 @@ #ifndef WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ #define WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ +#include + #include #include diff --git a/webrtc/call/flexfec_receive_stream_unittest.cc b/webrtc/call/flexfec_receive_stream_unittest.cc index 07d3943257..c25858f02c 100644 --- a/webrtc/call/flexfec_receive_stream_unittest.cc +++ b/webrtc/call/flexfec_receive_stream_unittest.cc @@ -8,8 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include + #include "webrtc/base/array_view.h" -#include "webrtc/base/basictypes.h" #include "webrtc/call/flexfec_receive_stream_impl.h" #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" diff --git a/webrtc/examples/peerconnection/client/defaults.h b/webrtc/examples/peerconnection/client/defaults.h index f4d3bf52f7..ecfb9ba3da 100644 --- a/webrtc/examples/peerconnection/client/defaults.h +++ b/webrtc/examples/peerconnection/client/defaults.h @@ -12,9 +12,9 @@ #define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_DEFAULTS_H_ #pragma once -#include +#include -#include "webrtc/base/basictypes.h" +#include extern const char kAudioLabel[]; extern const char kVideoLabel[]; diff --git a/webrtc/media/base/streamparams.h b/webrtc/media/base/streamparams.h index a2d48c5178..75d82809cf 100644 --- a/webrtc/media/base/streamparams.h +++ b/webrtc/media/base/streamparams.h @@ -26,12 +26,13 @@ #ifndef WEBRTC_MEDIA_BASE_STREAMPARAMS_H_ #define WEBRTC_MEDIA_BASE_STREAMPARAMS_H_ +#include + #include #include #include #include -#include "webrtc/base/basictypes.h" #include "webrtc/base/constructormagic.h" namespace cricket { diff --git a/webrtc/media/base/videocapturer.h b/webrtc/media/base/videocapturer.h index 1f1da3a88c..76ab95a2b8 100644 --- a/webrtc/media/base/videocapturer.h +++ b/webrtc/media/base/videocapturer.h @@ -13,12 +13,13 @@ #ifndef WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ #define WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_ +#include + #include #include #include #include -#include "webrtc/base/basictypes.h" #include "webrtc/base/constructormagic.h" #include "webrtc/base/criticalsection.h" #include "webrtc/media/base/videosourceinterface.h" diff --git a/webrtc/media/base/videocommon.h b/webrtc/media/base/videocommon.h index 757100b07d..47cfb85629 100644 --- a/webrtc/media/base/videocommon.h +++ b/webrtc/media/base/videocommon.h @@ -13,9 +13,10 @@ #ifndef WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ // NOLINT #define WEBRTC_MEDIA_BASE_VIDEOCOMMON_H_ +#include + #include -#include "webrtc/base/basictypes.h" #include "webrtc/base/timeutils.h" namespace cricket { diff --git a/webrtc/media/devices/gtkvideorenderer.h b/webrtc/media/devices/gtkvideorenderer.h index 63a3ea900b..7e2c7ce5a8 100644 --- a/webrtc/media/devices/gtkvideorenderer.h +++ b/webrtc/media/devices/gtkvideorenderer.h @@ -14,9 +14,10 @@ #ifndef WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_ #define WEBRTC_MEDIA_DEVICES_GTKVIDEORENDERER_H_ +#include + #include -#include "webrtc/base/basictypes.h" #include "webrtc/media/base/videosinkinterface.h" typedef struct _GtkWidget GtkWidget; // forward declaration, defined in gtk.h diff --git a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h index f4cbe52bf2..013d1c1375 100644 --- a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h +++ b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_PLAYOUT_DELAY_ORACLE_H_ -#include "webrtc/base/basictypes.h" +#include + #include "webrtc/base/criticalsection.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/modules/include/module_common_types.h" diff --git a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h index afe47e53bc..56e4c157cf 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h @@ -10,7 +10,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_HEADER_EXTENSIONS_H_ -#include "webrtc/base/basictypes.h" +#include + #include "webrtc/common_video/rotation.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" diff --git a/webrtc/modules/rtp_rtcp/source/time_util.h b/webrtc/modules/rtp_rtcp/source/time_util.h index 5a9525ae62..7bac5268a9 100644 --- a/webrtc/modules/rtp_rtcp/source/time_util.h +++ b/webrtc/modules/rtp_rtcp/source/time_util.h @@ -11,7 +11,8 @@ #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_ #define WEBRTC_MODULES_RTP_RTCP_SOURCE_TIME_UTIL_H_ -#include "webrtc/base/basictypes.h" +#include + #include "webrtc/system_wrappers/include/ntp_time.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc b/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc index 29b6617481..6455670b0c 100644 --- a/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc +++ b/webrtc/modules/video_coding/h264_sprop_parameter_sets_unittest.cc @@ -10,8 +10,10 @@ #include "webrtc/modules/video_coding/h264_sprop_parameter_sets.h" +#include + #include -#include "webrtc/base/basictypes.h" + #include "webrtc/test/gtest.h" namespace webrtc { diff --git a/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc b/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc index cb701f20b6..482c8ec3cf 100644 --- a/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc +++ b/webrtc/modules/video_coding/utility/default_video_bitrate_allocator.cc @@ -9,8 +9,8 @@ */ #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" -#include "webrtc/base/basictypes.h" -#include "webrtc/base/constructormagic.h" + +#include namespace webrtc { diff --git a/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h b/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h index 149e866588..7f54f5cd28 100644 --- a/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h +++ b/webrtc/modules/video_coding/utility/simulcast_rate_allocator.h @@ -11,10 +11,11 @@ #ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_ #define WEBRTC_MODULES_VIDEO_CODING_UTILITY_SIMULCAST_RATE_ALLOCATOR_H_ +#include + #include #include -#include "webrtc/base/basictypes.h" #include "webrtc/base/constructormagic.h" #include "webrtc/common_video/include/video_bitrate_allocator.h" #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" diff --git a/webrtc/p2p/base/candidate.h b/webrtc/p2p/base/candidate.h index 4eb05f0c63..22d87b5811 100644 --- a/webrtc/p2p/base/candidate.h +++ b/webrtc/p2p/base/candidate.h @@ -13,6 +13,7 @@ #include #include +#include #include #include @@ -20,7 +21,6 @@ #include #include "webrtc/p2p/base/p2pconstants.h" -#include "webrtc/base/basictypes.h" #include "webrtc/base/helpers.h" #include "webrtc/base/network.h" #include "webrtc/base/socketaddress.h" diff --git a/webrtc/p2p/stunprober/stunprober_unittest.cc b/webrtc/p2p/stunprober/stunprober_unittest.cc index f5ee4bffef..e194e4f3ae 100644 --- a/webrtc/p2p/stunprober/stunprober_unittest.cc +++ b/webrtc/p2p/stunprober/stunprober_unittest.cc @@ -8,10 +8,11 @@ * be found in the AUTHORS file in the root of the source tree. */ +#include + #include #include "webrtc/base/asyncresolverinterface.h" -#include "webrtc/base/basictypes.h" #include "webrtc/base/bind.h" #include "webrtc/base/checks.h" #include "webrtc/base/gunit.h" diff --git a/webrtc/pc/currentspeakermonitor.h b/webrtc/pc/currentspeakermonitor.h index 730ded075b..14ed8762a8 100644 --- a/webrtc/pc/currentspeakermonitor.h +++ b/webrtc/pc/currentspeakermonitor.h @@ -14,9 +14,10 @@ #ifndef WEBRTC_PC_CURRENTSPEAKERMONITOR_H_ #define WEBRTC_PC_CURRENTSPEAKERMONITOR_H_ +#include + #include -#include "webrtc/base/basictypes.h" #include "webrtc/base/sigslot.h" namespace cricket { diff --git a/webrtc/pc/externalhmac.h b/webrtc/pc/externalhmac.h index f9f1a2cc6f..2666d90cb8 100644 --- a/webrtc/pc/externalhmac.h +++ b/webrtc/pc/externalhmac.h @@ -28,7 +28,8 @@ // functions and the corresponding authentication id using // crypto_kernel_replace_auth_type function. -#include "webrtc/base/basictypes.h" +#include + #ifdef HAVE_SRTP #include "third_party/libsrtp/crypto/include/auth.h" #endif // HAVE_SRTP diff --git a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h index 1e40341042..8df778e1d3 100644 --- a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h +++ b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h @@ -13,10 +13,11 @@ #include "webrtc/base/networkmonitor.h" +#include + #include #include "webrtc/sdk/android/src/jni/jni_helpers.h" -#include "webrtc/base/basictypes.h" #include "webrtc/base/thread_checker.h" namespace webrtc_jni { diff --git a/webrtc/system_wrappers/include/ntp_time.h b/webrtc/system_wrappers/include/ntp_time.h index 229666e8dd..9c554197b0 100644 --- a/webrtc/system_wrappers/include/ntp_time.h +++ b/webrtc/system_wrappers/include/ntp_time.h @@ -10,7 +10,8 @@ #ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ #define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_NTP_TIME_H_ -#include "webrtc/base/basictypes.h" +#include + #include "webrtc/system_wrappers/include/clock.h" namespace webrtc { diff --git a/webrtc/test/frame_utils.h b/webrtc/test/frame_utils.h index 28a7e45925..8600f431e5 100644 --- a/webrtc/test/frame_utils.h +++ b/webrtc/test/frame_utils.h @@ -10,7 +10,8 @@ #ifndef WEBRTC_TEST_FRAME_UTILS_H_ #define WEBRTC_TEST_FRAME_UTILS_H_ -#include "webrtc/base/basictypes.h" +#include + #include "webrtc/base/scoped_ref_ptr.h" namespace webrtc {