[Cleanup] Add missing #include. Remove useless ones. IWYU part 2.
This is a follow-up to
https://webrtc-review.googlesource.com/c/src/+/106280.
This time the whole code base is covered.
Some files may have not been fixed though, whenever the IWYU tool
was breaking the build.
Bug: webrtc:8311
Change-Id: I2c31f552a87e887d33931d46e87b6208b1e483ef
Reviewed-on: https://webrtc-review.googlesource.com/c/111965
Commit-Queue: Yves Gerey <yvesg@google.com>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25830}diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index c88815f..741863d 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -84,7 +84,7 @@
"system:arch",
"system:unused",
"third_party/base64",
- "//third_party/abseil-cpp/absl/memory:memory",
+ "//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/types:optional",
]
@@ -994,7 +994,7 @@
":rtc_base",
":rtc_base_tests_utils",
":timeutils",
- "//third_party/abseil-cpp/absl/memory:memory",
+ "//third_party/abseil-cpp/absl/memory",
]
}
@@ -1070,6 +1070,7 @@
":gunit_helpers",
":rtc_base",
":rtc_base_tests_utils",
+ "../test:test_support",
"third_party/sigslot",
]
}
@@ -1117,6 +1118,7 @@
"../system_wrappers:system_wrappers",
"../test:fileutils",
"../test:test_support",
+ "third_party/sigslot:sigslot",
"//testing/gtest",
"//third_party/abseil-cpp/absl/memory",
]
@@ -1193,11 +1195,13 @@
":stringutils",
":testclient",
"../api:array_view",
+ "../api/units:time_delta",
"../system_wrappers:system_wrappers",
"../test:fileutils",
"../test:test_support",
"memory:unittests",
"third_party/base64",
+ "third_party/sigslot:sigslot",
"//third_party/abseil-cpp/absl/memory",
]
}
@@ -1219,6 +1223,7 @@
":rtc_task_queue",
":rtc_task_queue_for_test",
"../test:test_support",
+ "//third_party/abseil-cpp/absl/memory",
]
}
@@ -1253,6 +1258,7 @@
":rtc_task_queue",
":weak_ptr",
"../test:test_support",
+ "//third_party/abseil-cpp/absl/memory",
]
}
diff --git a/rtc_base/asyncpacketsocket.h b/rtc_base/asyncpacketsocket.h
index 44d6c67..b35ba0c 100644
--- a/rtc_base/asyncpacketsocket.h
+++ b/rtc_base/asyncpacketsocket.h
@@ -14,6 +14,7 @@
#include "rtc_base/constructormagic.h"
#include "rtc_base/deprecation.h"
#include "rtc_base/dscp.h"
+#include "rtc_base/network/sent_packet.h"
#include "rtc_base/socket.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/timeutils.h"
diff --git a/rtc_base/asyncsocket.h b/rtc_base/asyncsocket.h
index 0abdc27..c23929f 100644
--- a/rtc_base/asyncsocket.h
+++ b/rtc_base/asyncsocket.h
@@ -11,7 +11,11 @@
#ifndef RTC_BASE_ASYNCSOCKET_H_
#define RTC_BASE_ASYNCSOCKET_H_
+#include <stddef.h>
+#include <stdint.h>
+
#include "rtc_base/socket.h"
+#include "rtc_base/socketaddress.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
diff --git a/rtc_base/asynctcpsocket.cc b/rtc_base/asynctcpsocket.cc
index 666b335..f15b524 100644
--- a/rtc_base/asynctcpsocket.cc
+++ b/rtc_base/asynctcpsocket.cc
@@ -10,14 +10,16 @@
#include "rtc_base/asynctcpsocket.h"
+#include <stdint.h>
#include <string.h>
-
#include <algorithm>
#include <memory>
#include "rtc_base/byteorder.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
+#include "rtc_base/network/sent_packet.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/timeutils.h" // for TimeMillis
#if defined(WEBRTC_POSIX)
diff --git a/rtc_base/asyncudpsocket.cc b/rtc_base/asyncudpsocket.cc
index 2f9011c..a83403b 100644
--- a/rtc_base/asyncudpsocket.cc
+++ b/rtc_base/asyncudpsocket.cc
@@ -9,8 +9,15 @@
*/
#include "rtc_base/asyncudpsocket.h"
+
+#include <stdint.h>
+#include <string>
+
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
+#include "rtc_base/network/sent_packet.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
+#include "rtc_base/timeutils.h"
namespace rtc {
diff --git a/rtc_base/base64_unittest.cc b/rtc_base/base64_unittest.cc
index bdf8559..a3ebc14 100644
--- a/rtc_base/base64_unittest.cc
+++ b/rtc_base/base64_unittest.cc
@@ -9,10 +9,14 @@
*/
#include "rtc_base/third_party/base64/base64.h"
-#include "rtc_base/gunit.h"
-#include "rtc_base/logging.h"
+#include <stdio.h>
+#include <string.h>
+#include <algorithm>
+
+#include "rtc_base/logging.h"
#include "rtc_base/testbase64.h"
+#include "test/gtest.h"
using namespace std;
using namespace rtc;
diff --git a/rtc_base/bind_unittest.cc b/rtc_base/bind_unittest.cc
index ed0913f..f0c6801 100644
--- a/rtc_base/bind_unittest.cc
+++ b/rtc_base/bind_unittest.cc
@@ -8,13 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <type_traits>
+#include <string>
#include "rtc_base/bind.h"
-#include "rtc_base/gunit.h"
-
#include "rtc_base/refcount.h"
#include "rtc_base/refcountedobject.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/bitbuffer_unittest.cc b/rtc_base/bitbuffer_unittest.cc
index a3f140f..0696c42 100644
--- a/rtc_base/bitbuffer_unittest.cc
+++ b/rtc_base/bitbuffer_unittest.cc
@@ -9,9 +9,12 @@
*/
#include "rtc_base/bitbuffer.h"
+
+#include <limits>
+
#include "rtc_base/arraysize.h"
#include "rtc_base/bytebuffer.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/bitrateallocationstrategy_unittest.cc b/rtc_base/bitrateallocationstrategy_unittest.cc
index f4c7ee7..618a603 100644
--- a/rtc_base/bitrateallocationstrategy_unittest.cc
+++ b/rtc_base/bitrateallocationstrategy_unittest.cc
@@ -9,7 +9,10 @@
*/
#include "rtc_base/bitrateallocationstrategy.h"
-#include "rtc_base/gunit.h"
+
+#include <cstdint>
+
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/buffer.h b/rtc_base/buffer.h
index f9291b9..e95636a 100644
--- a/rtc_base/buffer.h
+++ b/rtc_base/buffer.h
@@ -11,6 +11,7 @@
#ifndef RTC_BASE_BUFFER_H_
#define RTC_BASE_BUFFER_H_
+#include <stdint.h>
#include <algorithm>
#include <cstring>
#include <memory>
diff --git a/rtc_base/buffer_unittest.cc b/rtc_base/buffer_unittest.cc
index b2f47c1..40d9edc 100644
--- a/rtc_base/buffer_unittest.cc
+++ b/rtc_base/buffer_unittest.cc
@@ -10,12 +10,12 @@
#include "rtc_base/buffer.h"
-#include "api/array_view.h"
-#include "rtc_base/gunit.h"
-
-#include <type_traits>
+#include <cstdint>
#include <utility>
+#include "api/array_view.h"
+#include "test/gtest.h"
+
namespace rtc {
namespace {
diff --git a/rtc_base/bufferqueue_unittest.cc b/rtc_base/bufferqueue_unittest.cc
index 11d115f..d21e22e 100644
--- a/rtc_base/bufferqueue_unittest.cc
+++ b/rtc_base/bufferqueue_unittest.cc
@@ -9,7 +9,10 @@
*/
#include "rtc_base/bufferqueue.h"
-#include "rtc_base/gunit.h"
+
+#include <string.h>
+
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/bytebuffer_unittest.cc b/rtc_base/bytebuffer_unittest.cc
index 718f35c..8fb02ff 100644
--- a/rtc_base/bytebuffer_unittest.cc
+++ b/rtc_base/bytebuffer_unittest.cc
@@ -9,9 +9,12 @@
*/
#include "rtc_base/bytebuffer.h"
+
+#include <string.h>
+
#include "rtc_base/arraysize.h"
#include "rtc_base/byteorder.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/byteorder_unittest.cc b/rtc_base/byteorder_unittest.cc
index 75509de..7aac17b 100644
--- a/rtc_base/byteorder_unittest.cc
+++ b/rtc_base/byteorder_unittest.cc
@@ -11,7 +11,7 @@
#include <stdint.h>
#include "rtc_base/byteorder.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/callback_unittest.cc b/rtc_base/callback_unittest.cc
index ae86a4c..54480bd 100644
--- a/rtc_base/callback_unittest.cc
+++ b/rtc_base/callback_unittest.cc
@@ -9,10 +9,11 @@
*/
#include "rtc_base/callback.h"
+
#include "rtc_base/bind.h"
-#include "rtc_base/gunit.h"
#include "rtc_base/keep_ref_until_done.h"
#include "rtc_base/refcount.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/cancelable_task_handle.cc b/rtc_base/cancelable_task_handle.cc
index 372e766..2267242 100644
--- a/rtc_base/cancelable_task_handle.cc
+++ b/rtc_base/cancelable_task_handle.cc
@@ -12,6 +12,8 @@
#include <utility>
+#include "rtc_base/checks.h"
+#include "rtc_base/refcount.h"
#include "rtc_base/refcounter.h"
#include "rtc_base/sequenced_task_checker.h"
#include "rtc_base/thread_annotations.h"
diff --git a/rtc_base/copyonwritebuffer_unittest.cc b/rtc_base/copyonwritebuffer_unittest.cc
index 24a57d4..9062611 100644
--- a/rtc_base/copyonwritebuffer_unittest.cc
+++ b/rtc_base/copyonwritebuffer_unittest.cc
@@ -9,7 +9,10 @@
*/
#include "rtc_base/copyonwritebuffer.h"
-#include "rtc_base/gunit.h"
+
+#include <cstdint>
+
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/cpu_time.cc b/rtc_base/cpu_time.cc
index ad91eca..13a68db 100644
--- a/rtc_base/cpu_time.cc
+++ b/rtc_base/cpu_time.cc
@@ -9,6 +9,7 @@
*/
#include "rtc_base/cpu_time.h"
+
#include "rtc_base/logging.h"
#include "rtc_base/timeutils.h"
diff --git a/rtc_base/cpu_time_unittest.cc b/rtc_base/cpu_time_unittest.cc
index f473069..d362506 100644
--- a/rtc_base/cpu_time_unittest.cc
+++ b/rtc_base/cpu_time_unittest.cc
@@ -9,11 +9,9 @@
*/
#include "rtc_base/cpu_time.h"
-#include <algorithm>
-#include <memory>
+
#include "rtc_base/platform_thread.h"
#include "rtc_base/timeutils.h"
-#include "system_wrappers/include/cpu_info.h"
#include "system_wrappers/include/sleep.h"
#include "test/gtest.h"
diff --git a/rtc_base/crc32_unittest.cc b/rtc_base/crc32_unittest.cc
index 752bc9f..60997b2 100644
--- a/rtc_base/crc32_unittest.cc
+++ b/rtc_base/crc32_unittest.cc
@@ -9,10 +9,11 @@
*/
#include "rtc_base/crc32.h"
-#include "rtc_base/gunit.h"
#include <string>
+#include "test/gtest.h"
+
namespace rtc {
TEST(Crc32Test, TestBasic) {
diff --git a/rtc_base/criticalsection_unittest.cc b/rtc_base/criticalsection_unittest.cc
index 6016f85..6357736 100644
--- a/rtc_base/criticalsection_unittest.cc
+++ b/rtc_base/criticalsection_unittest.cc
@@ -8,8 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stddef.h>
+#include <stdint.h>
#include <memory>
#include <set>
+#include <utility>
#include <vector>
#include "rtc_base/arraysize.h"
@@ -17,9 +20,12 @@
#include "rtc_base/checks.h"
#include "rtc_base/criticalsection.h"
#include "rtc_base/event.h"
-#include "rtc_base/gunit.h"
+#include "rtc_base/location.h"
+#include "rtc_base/messagehandler.h"
+#include "rtc_base/messagequeue.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/thread.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/data_rate_limiter_unittest.cc b/rtc_base/data_rate_limiter_unittest.cc
index 8c410fe..efd4728 100644
--- a/rtc_base/data_rate_limiter_unittest.cc
+++ b/rtc_base/data_rate_limiter_unittest.cc
@@ -9,7 +9,8 @@
*/
#include "rtc_base/data_rate_limiter.h"
-#include "rtc_base/gunit.h"
+
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/event_unittest.cc b/rtc_base/event_unittest.cc
index a65111b..3111887 100644
--- a/rtc_base/event_unittest.cc
+++ b/rtc_base/event_unittest.cc
@@ -9,8 +9,9 @@
*/
#include "rtc_base/event.h"
-#include "rtc_base/gunit.h"
+
#include "rtc_base/platform_thread.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/experiments/congestion_controller_experiment_unittest.cc b/rtc_base/experiments/congestion_controller_experiment_unittest.cc
index 7f929e6..a72abca 100644
--- a/rtc_base/experiments/congestion_controller_experiment_unittest.cc
+++ b/rtc_base/experiments/congestion_controller_experiment_unittest.cc
@@ -9,8 +9,9 @@
*/
#include "rtc_base/experiments/congestion_controller_experiment.h"
-#include "rtc_base/gunit.h"
+
#include "test/field_trial.h"
+#include "test/gtest.h"
namespace webrtc {
TEST(CongestionControllerExperimentTest, BbrDisabledByDefault) {
diff --git a/rtc_base/experiments/cpu_speed_experiment.cc b/rtc_base/experiments/cpu_speed_experiment.cc
index f39540c..114c27f 100644
--- a/rtc_base/experiments/cpu_speed_experiment.cc
+++ b/rtc_base/experiments/cpu_speed_experiment.cc
@@ -10,6 +10,7 @@
#include "rtc_base/experiments/cpu_speed_experiment.h"
+#include <stdio.h>
#include <string>
#include "rtc_base/logging.h"
diff --git a/rtc_base/experiments/field_trial_units_unittest.cc b/rtc_base/experiments/field_trial_units_unittest.cc
index 57022c2..94cbdb8 100644
--- a/rtc_base/experiments/field_trial_units_unittest.cc
+++ b/rtc_base/experiments/field_trial_units_unittest.cc
@@ -9,9 +9,10 @@
*/
#include <string>
+#include "absl/types/optional.h"
#include "rtc_base/experiments/field_trial_parser.h"
#include "rtc_base/experiments/field_trial_units.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace webrtc {
namespace {
diff --git a/rtc_base/experiments/jitter_upper_bound_experiment.cc b/rtc_base/experiments/jitter_upper_bound_experiment.cc
index b3e9230..84a17bf 100644
--- a/rtc_base/experiments/jitter_upper_bound_experiment.cc
+++ b/rtc_base/experiments/jitter_upper_bound_experiment.cc
@@ -10,7 +10,7 @@
#include "rtc_base/experiments/jitter_upper_bound_experiment.h"
-#include <algorithm>
+#include <stdio.h>
#include <string>
#include "rtc_base/logging.h"
diff --git a/rtc_base/experiments/normalize_simulcast_size_experiment.cc b/rtc_base/experiments/normalize_simulcast_size_experiment.cc
index 9ce5f57..ddf0683 100644
--- a/rtc_base/experiments/normalize_simulcast_size_experiment.cc
+++ b/rtc_base/experiments/normalize_simulcast_size_experiment.cc
@@ -10,6 +10,7 @@
#include "rtc_base/experiments/normalize_simulcast_size_experiment.h"
+#include <stdio.h>
#include <string>
#include "rtc_base/logging.h"
diff --git a/rtc_base/experiments/normalize_simulcast_size_experiment_unittest.cc b/rtc_base/experiments/normalize_simulcast_size_experiment_unittest.cc
index c37b809..34e0742 100644
--- a/rtc_base/experiments/normalize_simulcast_size_experiment_unittest.cc
+++ b/rtc_base/experiments/normalize_simulcast_size_experiment_unittest.cc
@@ -10,8 +10,8 @@
#include "rtc_base/experiments/normalize_simulcast_size_experiment.h"
-#include "rtc_base/gunit.h"
#include "test/field_trial.h"
+#include "test/gtest.h"
namespace webrtc {
diff --git a/rtc_base/experiments/quality_scaling_experiment.cc b/rtc_base/experiments/quality_scaling_experiment.cc
index c13de3f..4a50115 100644
--- a/rtc_base/experiments/quality_scaling_experiment.cc
+++ b/rtc_base/experiments/quality_scaling_experiment.cc
@@ -9,6 +9,7 @@
*/
#include "rtc_base/experiments/quality_scaling_experiment.h"
+#include <stdio.h>
#include <string>
#include "rtc_base/logging.h"
diff --git a/rtc_base/experiments/quality_scaling_experiment_unittest.cc b/rtc_base/experiments/quality_scaling_experiment_unittest.cc
index 15aadd6..7a345b6 100644
--- a/rtc_base/experiments/quality_scaling_experiment_unittest.cc
+++ b/rtc_base/experiments/quality_scaling_experiment_unittest.cc
@@ -10,8 +10,8 @@
#include "rtc_base/experiments/quality_scaling_experiment.h"
-#include "rtc_base/gunit.h"
#include "test/field_trial.h"
+#include "test/gtest.h"
namespace webrtc {
namespace {
diff --git a/rtc_base/experiments/rtt_mult_experiment.cc b/rtc_base/experiments/rtt_mult_experiment.cc
index f8f7f2a..beb577c 100644
--- a/rtc_base/experiments/rtt_mult_experiment.cc
+++ b/rtc_base/experiments/rtt_mult_experiment.cc
@@ -9,6 +9,7 @@
*/
#include "rtc_base/experiments/rtt_mult_experiment.h"
+#include <stdio.h>
#include <algorithm>
#include <string>
diff --git a/rtc_base/experiments/rtt_mult_experiment_unittest.cc b/rtc_base/experiments/rtt_mult_experiment_unittest.cc
index 0cd86d1..9442cea 100644
--- a/rtc_base/experiments/rtt_mult_experiment_unittest.cc
+++ b/rtc_base/experiments/rtt_mult_experiment_unittest.cc
@@ -9,8 +9,9 @@
*/
#include "rtc_base/experiments/rtt_mult_experiment.h"
-#include "rtc_base/gunit.h"
+
#include "test/field_trial.h"
+#include "test/gtest.h"
namespace webrtc {
diff --git a/rtc_base/fakeclock.h b/rtc_base/fakeclock.h
index 2da8c61..5a0bbee 100644
--- a/rtc_base/fakeclock.h
+++ b/rtc_base/fakeclock.h
@@ -11,8 +11,11 @@
#ifndef RTC_BASE_FAKECLOCK_H_
#define RTC_BASE_FAKECLOCK_H_
+#include <stdint.h>
+
#include "api/units/time_delta.h"
#include "rtc_base/criticalsection.h"
+#include "rtc_base/thread_annotations.h"
#include "rtc_base/timeutils.h"
namespace rtc {
diff --git a/rtc_base/fakesslidentity.cc b/rtc_base/fakesslidentity.cc
index 62ac9dd..4799679 100644
--- a/rtc_base/fakesslidentity.cc
+++ b/rtc_base/fakesslidentity.cc
@@ -10,7 +10,6 @@
#include "rtc_base/fakesslidentity.h"
-#include <algorithm>
#include <string>
#include <utility>
diff --git a/rtc_base/file_unittest.cc b/rtc_base/file_unittest.cc
index 5a72e5d..151771b 100644
--- a/rtc_base/file_unittest.cc
+++ b/rtc_base/file_unittest.cc
@@ -8,12 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <limits>
-#include <memory>
+#include <string.h>
#include <string>
#include "rtc_base/file.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
#include "test/testsupport/fileutils.h"
#if defined(WEBRTC_WIN)
diff --git a/rtc_base/filerotatingstream.cc b/rtc_base/filerotatingstream.cc
index b1dc5ff..325c6bb 100644
--- a/rtc_base/filerotatingstream.cc
+++ b/rtc_base/filerotatingstream.cc
@@ -25,6 +25,7 @@
#endif // WEBRTC_WIN
#include "absl/strings/match.h"
+#include "absl/types/optional.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
diff --git a/rtc_base/filerotatingstream_unittest.cc b/rtc_base/filerotatingstream_unittest.cc
index 172be57..bf52aa3 100644
--- a/rtc_base/filerotatingstream_unittest.cc
+++ b/rtc_base/filerotatingstream_unittest.cc
@@ -8,12 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <string.h>
+#include <cstdint>
#include <memory>
#include "rtc_base/arraysize.h"
-#include "rtc_base/checks.h"
#include "rtc_base/filerotatingstream.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
#include "test/testsupport/fileutils.h"
namespace rtc {
diff --git a/rtc_base/firewallsocketserver.cc b/rtc_base/firewallsocketserver.cc
index 2a28124..0552481 100644
--- a/rtc_base/firewallsocketserver.cc
+++ b/rtc_base/firewallsocketserver.cc
@@ -10,7 +10,11 @@
#include "rtc_base/firewallsocketserver.h"
+#include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
#include <algorithm>
+#include <string>
#include "rtc_base/asyncsocket.h"
#include "rtc_base/checks.h"
diff --git a/rtc_base/firewallsocketserver.h b/rtc_base/firewallsocketserver.h
index 0e96823..64a4311 100644
--- a/rtc_base/firewallsocketserver.h
+++ b/rtc_base/firewallsocketserver.h
@@ -12,7 +12,12 @@
#define RTC_BASE_FIREWALLSOCKETSERVER_H_
#include <vector>
+
+#include "rtc_base/asyncsocket.h"
#include "rtc_base/criticalsection.h"
+#include "rtc_base/ipaddress.h"
+#include "rtc_base/socket.h"
+#include "rtc_base/socketaddress.h"
#include "rtc_base/socketserver.h"
namespace rtc {
diff --git a/rtc_base/function_view_unittest.cc b/rtc_base/function_view_unittest.cc
index d0cfeb3..535fae8 100644
--- a/rtc_base/function_view_unittest.cc
+++ b/rtc_base/function_view_unittest.cc
@@ -12,7 +12,7 @@
#include <utility>
#include "rtc_base/function_view.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/helpers.cc b/rtc_base/helpers.cc
index b9372b9..d8ea89f 100644
--- a/rtc_base/helpers.cc
+++ b/rtc_base/helpers.cc
@@ -10,15 +10,13 @@
#include "rtc_base/helpers.h"
+#include <openssl/rand.h>
+#include <cstdint>
#include <limits>
#include <memory>
-#include <openssl/rand.h>
-
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/third_party/base64/base64.h"
-#include "rtc_base/timeutils.h"
// Protect against max macro inclusion.
#undef max
diff --git a/rtc_base/helpers_unittest.cc b/rtc_base/helpers_unittest.cc
index 3e8729c..1feb9de 100644
--- a/rtc_base/helpers_unittest.cc
+++ b/rtc_base/helpers_unittest.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <string.h>
#include <string>
#include "rtc_base/buffer.h"
-#include "rtc_base/gunit.h"
#include "rtc_base/helpers.h"
-#include "rtc_base/ssladapter.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/httpcommon.cc b/rtc_base/httpcommon.cc
index 4fa5f41..13d0c1a 100644
--- a/rtc_base/httpcommon.cc
+++ b/rtc_base/httpcommon.cc
@@ -14,25 +14,24 @@
#include <windows.h>
#include <winsock2.h>
#include <ws2tcpip.h>
+
#define SECURITY_WIN32
#include <security.h>
#endif
#include <ctype.h> // for isspace
#include <stdio.h> // for sprintf
-#include <algorithm>
#include <utility> // for pair
#include <vector>
#include "absl/strings/match.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/checks.h"
#include "rtc_base/cryptstring.h" // for CryptString
#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"
#include "rtc_base/third_party/base64/base64.h" // for Base64
#include "rtc_base/zero_memory.h" // for ExplicitZeroMemory
diff --git a/rtc_base/ipaddress.h b/rtc_base/ipaddress.h
index 614fd8f..8189d1f 100644
--- a/rtc_base/ipaddress.h
+++ b/rtc_base/ipaddress.h
@@ -23,7 +23,6 @@
#endif
#include <string.h>
#include <string>
-#include <vector>
#include "rtc_base/byteorder.h"
#if defined(WEBRTC_WIN)
diff --git a/rtc_base/ipaddress_unittest.cc b/rtc_base/ipaddress_unittest.cc
index 30312d0..6ac1a40 100644
--- a/rtc_base/ipaddress_unittest.cc
+++ b/rtc_base/ipaddress_unittest.cc
@@ -9,7 +9,8 @@
*/
#include "rtc_base/ipaddress.h"
-#include "rtc_base/gunit.h"
+
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/key_derivation.cc b/rtc_base/key_derivation.cc
index 288e407..6c9a254 100644
--- a/rtc_base/key_derivation.cc
+++ b/rtc_base/key_derivation.cc
@@ -11,6 +11,7 @@
#include "rtc_base/key_derivation.h"
#include "absl/memory/memory.h"
+#include "rtc_base/checks.h"
#include "rtc_base/openssl_key_derivation_hkdf.h"
namespace rtc {
diff --git a/rtc_base/key_derivation.h b/rtc_base/key_derivation.h
index fa329ae..d98c667 100644
--- a/rtc_base/key_derivation.h
+++ b/rtc_base/key_derivation.h
@@ -11,6 +11,8 @@
#ifndef RTC_BASE_KEY_DERIVATION_H_
#define RTC_BASE_KEY_DERIVATION_H_
+#include <stddef.h>
+#include <stdint.h>
#include <memory>
#include "absl/types/optional.h"
diff --git a/rtc_base/location.cc b/rtc_base/location.cc
index c95ad9c..d3c911f 100644
--- a/rtc_base/location.cc
+++ b/rtc_base/location.cc
@@ -10,6 +10,8 @@
#include "rtc_base/location.h"
+#include <stdio.h>
+
namespace rtc {
Location::Location(const char* function_name, const char* file_and_line)
diff --git a/rtc_base/logging_unittest.cc b/rtc_base/logging_unittest.cc
index 4de1cf2..42d586a 100644
--- a/rtc_base/logging_unittest.cc
+++ b/rtc_base/logging_unittest.cc
@@ -9,13 +9,17 @@
*/
#include "rtc_base/logging.h"
+
+#include <string.h>
+#include <algorithm>
+
#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
#include "rtc_base/event.h"
-#include "rtc_base/gunit.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/stream.h"
-#include "test/testsupport/fileutils.h"
+#include "rtc_base/timeutils.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/memory/aligned_array.h b/rtc_base/memory/aligned_array.h
index dcdef12..c67d87d 100644
--- a/rtc_base/memory/aligned_array.h
+++ b/rtc_base/memory/aligned_array.h
@@ -11,6 +11,8 @@
#ifndef RTC_BASE_MEMORY_ALIGNED_ARRAY_H_
#define RTC_BASE_MEMORY_ALIGNED_ARRAY_H_
+#include <stddef.h>
+
#include "rtc_base/checks.h"
#include "rtc_base/memory/aligned_malloc.h"
diff --git a/rtc_base/memory_stream.cc b/rtc_base/memory_stream.cc
index 541de07..e71c0e6 100644
--- a/rtc_base/memory_stream.cc
+++ b/rtc_base/memory_stream.cc
@@ -8,8 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <errno.h>
+#include <string.h>
#include <algorithm>
+#include "rtc_base/checks.h"
#include "rtc_base/memory_stream.h"
namespace rtc {
diff --git a/rtc_base/memory_stream.h b/rtc_base/memory_stream.h
index 936f71b..4df2b60 100644
--- a/rtc_base/memory_stream.h
+++ b/rtc_base/memory_stream.h
@@ -11,6 +11,8 @@
#ifndef RTC_BASE_MEMORY_STREAM_H_
#define RTC_BASE_MEMORY_STREAM_H_
+#include <stddef.h>
+
#include "rtc_base/stream.h"
namespace rtc {
diff --git a/rtc_base/memory_usage.cc b/rtc_base/memory_usage.cc
index 9cd36d3..20db9f3 100644
--- a/rtc_base/memory_usage.cc
+++ b/rtc_base/memory_usage.cc
@@ -13,15 +13,13 @@
#if defined(WEBRTC_LINUX)
#include <unistd.h>
#include <cstdio>
-#include <cstdlib>
-#include <cstring>
#elif defined(WEBRTC_MAC)
#include <mach/mach.h>
#elif defined(WEBRTC_WIN)
// clang-format off
// clang formating would change include order.
#include <windows.h>
-#include <psapi.h> // must come after windows.h
+#include <psapi.h> // must come after windows.h
// clang-format on
#endif
diff --git a/rtc_base/memory_usage_unittest.cc b/rtc_base/memory_usage_unittest.cc
index 9c82f98..a928efb 100644
--- a/rtc_base/memory_usage_unittest.cc
+++ b/rtc_base/memory_usage_unittest.cc
@@ -9,7 +9,7 @@
*/
#include "rtc_base/memory_usage.h"
-#include <cstdio>
+
#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/messagedigest_unittest.cc b/rtc_base/messagedigest_unittest.cc
index 5524b18..623fafb 100644
--- a/rtc_base/messagedigest_unittest.cc
+++ b/rtc_base/messagedigest_unittest.cc
@@ -9,8 +9,9 @@
*/
#include "rtc_base/messagedigest.h"
-#include "rtc_base/gunit.h"
+
#include "rtc_base/stringencode.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/nat_unittest.cc b/rtc_base/nat_unittest.cc
index ee94427..8031dff 100644
--- a/rtc_base/nat_unittest.cc
+++ b/rtc_base/nat_unittest.cc
@@ -8,21 +8,34 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <string.h>
#include <algorithm>
#include <memory>
#include <string>
+#include <vector>
#include "absl/memory/memory.h"
+#include "rtc_base/asyncpacketsocket.h"
+#include "rtc_base/asyncsocket.h"
#include "rtc_base/asynctcpsocket.h"
+#include "rtc_base/asyncudpsocket.h"
#include "rtc_base/gunit.h"
+#include "rtc_base/ipaddress.h"
#include "rtc_base/logging.h"
#include "rtc_base/natserver.h"
#include "rtc_base/natsocketfactory.h"
+#include "rtc_base/nattypes.h"
#include "rtc_base/nethelpers.h"
#include "rtc_base/network.h"
#include "rtc_base/physicalsocketserver.h"
+#include "rtc_base/socketaddress.h"
+#include "rtc_base/socketfactory.h"
+#include "rtc_base/socketserver.h"
#include "rtc_base/testclient.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
+#include "rtc_base/thread.h"
#include "rtc_base/virtualsocketserver.h"
+#include "test/gtest.h"
using namespace rtc;
diff --git a/rtc_base/natsocketfactory.h b/rtc_base/natsocketfactory.h
index 97961d4..ecbd2f8 100644
--- a/rtc_base/natsocketfactory.h
+++ b/rtc_base/natsocketfactory.h
@@ -11,14 +11,19 @@
#ifndef RTC_BASE_NATSOCKETFACTORY_H_
#define RTC_BASE_NATSOCKETFACTORY_H_
+#include <stddef.h>
#include <map>
#include <memory>
#include <set>
-#include <string>
+#include "rtc_base/asyncsocket.h"
#include "rtc_base/constructormagic.h"
+#include "rtc_base/messagequeue.h"
#include "rtc_base/natserver.h"
+#include "rtc_base/nattypes.h"
+#include "rtc_base/socket.h"
#include "rtc_base/socketaddress.h"
+#include "rtc_base/socketfactory.h"
#include "rtc_base/socketserver.h"
namespace rtc {
@@ -80,6 +85,7 @@
class NATSocketServer : public SocketServer, public NATInternalSocketFactory {
public:
class Translator;
+
// holds a list of NATs
class TranslatorMap : private std::map<SocketAddress, Translator*> {
public:
diff --git a/rtc_base/nullsocketserver_unittest.cc b/rtc_base/nullsocketserver_unittest.cc
index f1d65ea..5d4a251 100644
--- a/rtc_base/nullsocketserver_unittest.cc
+++ b/rtc_base/nullsocketserver_unittest.cc
@@ -9,7 +9,17 @@
*/
#include "rtc_base/nullsocketserver.h"
+
+#include <stdint.h>
+#include <memory>
+
#include "rtc_base/gunit.h"
+#include "rtc_base/location.h"
+#include "rtc_base/messagehandler.h"
+#include "rtc_base/messagequeue.h"
+#include "rtc_base/thread.h"
+#include "rtc_base/timeutils.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/numerics/histogram_percentile_counter.h b/rtc_base/numerics/histogram_percentile_counter.h
index 7e5743f..f52513c 100644
--- a/rtc_base/numerics/histogram_percentile_counter.h
+++ b/rtc_base/numerics/histogram_percentile_counter.h
@@ -11,6 +11,7 @@
#ifndef RTC_BASE_NUMERICS_HISTOGRAM_PERCENTILE_COUNTER_H_
#define RTC_BASE_NUMERICS_HISTOGRAM_PERCENTILE_COUNTER_H_
+#include <stddef.h>
#include <stdint.h>
#include <map>
#include <vector>
diff --git a/rtc_base/numerics/histogram_percentile_counter_unittest.cc b/rtc_base/numerics/histogram_percentile_counter_unittest.cc
index a004dba..6fdaa36 100644
--- a/rtc_base/numerics/histogram_percentile_counter_unittest.cc
+++ b/rtc_base/numerics/histogram_percentile_counter_unittest.cc
@@ -10,6 +10,7 @@
#include "rtc_base/numerics/histogram_percentile_counter.h"
+#include <cstdint>
#include <utility>
#include <vector>
diff --git a/rtc_base/numerics/mod_ops.h b/rtc_base/numerics/mod_ops.h
index 90d3ed8..65618b4 100644
--- a/rtc_base/numerics/mod_ops.h
+++ b/rtc_base/numerics/mod_ops.h
@@ -12,7 +12,6 @@
#define RTC_BASE_NUMERICS_MOD_OPS_H_
#include <algorithm>
-#include <limits>
#include <type_traits>
#include "rtc_base/checks.h"
diff --git a/rtc_base/numerics/mod_ops_unittest.cc b/rtc_base/numerics/mod_ops_unittest.cc
index 7b03e65..3bd2034 100644
--- a/rtc_base/numerics/mod_ops_unittest.cc
+++ b/rtc_base/numerics/mod_ops_unittest.cc
@@ -9,6 +9,9 @@
*/
#include "rtc_base/numerics/mod_ops.h"
+
+#include <stdint.h>
+
#include "test/gtest.h"
namespace webrtc {
diff --git a/rtc_base/numerics/moving_average.h b/rtc_base/numerics/moving_average.h
index 770e47d..1ae26ff 100644
--- a/rtc_base/numerics/moving_average.h
+++ b/rtc_base/numerics/moving_average.h
@@ -11,6 +11,8 @@
#ifndef RTC_BASE_NUMERICS_MOVING_AVERAGE_H_
#define RTC_BASE_NUMERICS_MOVING_AVERAGE_H_
+#include <stddef.h>
+#include <stdint.h>
#include <vector>
#include "absl/types/optional.h"
diff --git a/rtc_base/numerics/moving_median_filter.h b/rtc_base/numerics/moving_median_filter.h
index b5c5fce..dba3cd2 100644
--- a/rtc_base/numerics/moving_median_filter.h
+++ b/rtc_base/numerics/moving_median_filter.h
@@ -11,6 +11,7 @@
#ifndef RTC_BASE_NUMERICS_MOVING_MEDIAN_FILTER_H_
#define RTC_BASE_NUMERICS_MOVING_MEDIAN_FILTER_H_
+#include <stddef.h>
#include <list>
#include "rtc_base/checks.h"
diff --git a/rtc_base/numerics/moving_median_filter_unittest.cc b/rtc_base/numerics/moving_median_filter_unittest.cc
index 5a6eb3d..41684b2 100644
--- a/rtc_base/numerics/moving_median_filter_unittest.cc
+++ b/rtc_base/numerics/moving_median_filter_unittest.cc
@@ -9,6 +9,9 @@
*/
#include "rtc_base/numerics/moving_median_filter.h"
+
+#include <stdint.h>
+
#include "test/gtest.h"
namespace webrtc {
diff --git a/rtc_base/numerics/percentile_filter.h b/rtc_base/numerics/percentile_filter.h
index cba4463..4781963 100644
--- a/rtc_base/numerics/percentile_filter.h
+++ b/rtc_base/numerics/percentile_filter.h
@@ -12,7 +12,6 @@
#define RTC_BASE_NUMERICS_PERCENTILE_FILTER_H_
#include <stdint.h>
-
#include <iterator>
#include <set>
diff --git a/rtc_base/numerics/percentile_filter_unittest.cc b/rtc_base/numerics/percentile_filter_unittest.cc
index 11fb4a5..66121e4 100644
--- a/rtc_base/numerics/percentile_filter_unittest.cc
+++ b/rtc_base/numerics/percentile_filter_unittest.cc
@@ -8,8 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <stdlib.h>
#include <algorithm>
#include <climits>
+#include <cstdint>
#include <random>
#include "rtc_base/constructormagic.h"
diff --git a/rtc_base/numerics/sample_counter_unittest.cc b/rtc_base/numerics/sample_counter_unittest.cc
index 4085370..57812fc 100644
--- a/rtc_base/numerics/sample_counter_unittest.cc
+++ b/rtc_base/numerics/sample_counter_unittest.cc
@@ -10,8 +10,7 @@
#include "rtc_base/numerics/sample_counter.h"
-#include <utility>
-#include <vector>
+#include <initializer_list>
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/rtc_base/numerics/sequence_number_util.h b/rtc_base/numerics/sequence_number_util.h
index c55513a..9a7361d 100644
--- a/rtc_base/numerics/sequence_number_util.h
+++ b/rtc_base/numerics/sequence_number_util.h
@@ -11,12 +11,13 @@
#ifndef RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_
#define RTC_BASE_NUMERICS_SEQUENCE_NUMBER_UTIL_H_
+#include <stdint.h>
#include <limits>
#include <type_traits>
#include "absl/types/optional.h"
+#include "rtc_base/checks.h"
#include "rtc_base/numerics/mod_ops.h"
-#include "rtc_base/numerics/safe_compare.h"
namespace webrtc {
diff --git a/rtc_base/numerics/sequence_number_util_unittest.cc b/rtc_base/numerics/sequence_number_util_unittest.cc
index beb2b52..881e017 100644
--- a/rtc_base/numerics/sequence_number_util_unittest.cc
+++ b/rtc_base/numerics/sequence_number_util_unittest.cc
@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <cstdint>
+#include <iterator>
#include <set>
#include "rtc_base/numerics/sequence_number_util.h"
diff --git a/rtc_base/onetimeevent_unittest.cc b/rtc_base/onetimeevent_unittest.cc
index 49cae07..2334cb5 100644
--- a/rtc_base/onetimeevent_unittest.cc
+++ b/rtc_base/onetimeevent_unittest.cc
@@ -9,7 +9,8 @@
*/
#include "rtc_base/onetimeevent.h"
-#include "rtc_base/gunit.h"
+
+#include "test/gtest.h"
namespace webrtc {
diff --git a/rtc_base/physicalsocketserver_unittest.cc b/rtc_base/physicalsocketserver_unittest.cc
index 4b36cd5..c253cc6 100644
--- a/rtc_base/physicalsocketserver_unittest.cc
+++ b/rtc_base/physicalsocketserver_unittest.cc
@@ -9,16 +9,18 @@
*/
#include <signal.h>
-#include <stdarg.h>
+#include <algorithm>
#include <memory>
#include "rtc_base/gunit.h"
+#include "rtc_base/ipaddress.h"
#include "rtc_base/logging.h"
#include "rtc_base/networkmonitor.h"
#include "rtc_base/physicalsocketserver.h"
#include "rtc_base/socket_unittest.h"
#include "rtc_base/testutils.h"
#include "rtc_base/thread.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/proxyserver.cc b/rtc_base/proxyserver.cc
index 71c4879..638ce0d 100644
--- a/rtc_base/proxyserver.cc
+++ b/rtc_base/proxyserver.cc
@@ -10,6 +10,7 @@
#include "rtc_base/proxyserver.h"
+#include <stddef.h>
#include <algorithm>
#include "rtc_base/checks.h"
diff --git a/rtc_base/rate_limiter_unittest.cc b/rtc_base/rate_limiter_unittest.cc
index ac0625f..cb9b5b4 100644
--- a/rtc_base/rate_limiter_unittest.cc
+++ b/rtc_base/rate_limiter_unittest.cc
@@ -8,13 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <algorithm>
#include <memory>
#include "rtc_base/event.h"
#include "rtc_base/platform_thread.h"
#include "rtc_base/rate_limiter.h"
-#include "rtc_base/task_queue.h"
#include "system_wrappers/include/clock.h"
#include "test/gtest.h"
diff --git a/rtc_base/rate_statistics_unittest.cc b/rtc_base/rate_statistics_unittest.cc
index 62f1486..822767e 100644
--- a/rtc_base/rate_statistics_unittest.cc
+++ b/rtc_base/rate_statistics_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <algorithm>
+#include <cstdlib>
#include "rtc_base/rate_statistics.h"
#include "test/gtest.h"
diff --git a/rtc_base/ratetracker_unittest.cc b/rtc_base/ratetracker_unittest.cc
index 58102df..ff74a37 100644
--- a/rtc_base/ratetracker_unittest.cc
+++ b/rtc_base/ratetracker_unittest.cc
@@ -9,7 +9,8 @@
*/
#include "rtc_base/ratetracker.h"
-#include "rtc_base/gunit.h"
+
+#include "test/gtest.h"
namespace rtc {
namespace {
diff --git a/rtc_base/refcountedobject.h b/rtc_base/refcountedobject.h
index da3ed9f..3b21004 100644
--- a/rtc_base/refcountedobject.h
+++ b/rtc_base/refcountedobject.h
@@ -10,6 +10,7 @@
#ifndef RTC_BASE_REFCOUNTEDOBJECT_H_
#define RTC_BASE_REFCOUNTEDOBJECT_H_
+#include <type_traits>
#include <utility>
#include "rtc_base/constructormagic.h"
diff --git a/rtc_base/refcountedobject_unittest.cc b/rtc_base/refcountedobject_unittest.cc
index 4744525..71ff426 100644
--- a/rtc_base/refcountedobject_unittest.cc
+++ b/rtc_base/refcountedobject_unittest.cc
@@ -8,11 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
#include <string>
+#include <utility>
-#include "rtc_base/gunit.h"
#include "rtc_base/refcount.h"
#include "rtc_base/refcountedobject.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/rollingaccumulator.h b/rtc_base/rollingaccumulator.h
index f6215c5..9ad8159 100644
--- a/rtc_base/rollingaccumulator.h
+++ b/rtc_base/rollingaccumulator.h
@@ -11,6 +11,7 @@
#ifndef RTC_BASE_ROLLINGACCUMULATOR_H_
#define RTC_BASE_ROLLINGACCUMULATOR_H_
+#include <stddef.h>
#include <algorithm>
#include <vector>
diff --git a/rtc_base/rollingaccumulator_unittest.cc b/rtc_base/rollingaccumulator_unittest.cc
index 91ed853..38716f2 100644
--- a/rtc_base/rollingaccumulator_unittest.cc
+++ b/rtc_base/rollingaccumulator_unittest.cc
@@ -9,7 +9,8 @@
*/
#include "rtc_base/rollingaccumulator.h"
-#include "rtc_base/gunit.h"
+
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/rtccertificate_unittest.cc b/rtc_base/rtccertificate_unittest.cc
index bb88d8a..f5a777c 100644
--- a/rtc_base/rtccertificate_unittest.cc
+++ b/rtc_base/rtccertificate_unittest.cc
@@ -8,18 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <time.h>
#include <memory>
#include <utility>
#include "rtc_base/checks.h"
-#include "rtc_base/fakesslidentity.h"
-#include "rtc_base/gunit.h"
-#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/rtccertificate.h"
#include "rtc_base/sslidentity.h"
-#include "rtc_base/thread.h"
#include "rtc_base/timeutils.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/rtccertificategenerator_unittest.cc b/rtc_base/rtccertificategenerator_unittest.cc
index 3929128..e3c820b 100644
--- a/rtc_base/rtccertificategenerator_unittest.cc
+++ b/rtc_base/rtccertificategenerator_unittest.cc
@@ -15,9 +15,9 @@
#include "absl/types/optional.h"
#include "rtc_base/checks.h"
#include "rtc_base/gunit.h"
-#include "rtc_base/logging.h"
#include "rtc_base/refcountedobject.h"
#include "rtc_base/thread.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/sanitizer_unittest.cc b/rtc_base/sanitizer_unittest.cc
index 8dc6068..ffbfed7 100644
--- a/rtc_base/sanitizer_unittest.cc
+++ b/rtc_base/sanitizer_unittest.cc
@@ -10,8 +10,10 @@
#include "rtc_base/sanitizer.h"
-#include "rtc_base/gunit.h"
+#include <stdint.h>
+
#include "rtc_base/logging.h"
+#include "test/gtest.h"
#if RTC_HAS_MSAN
#include <sanitizer/msan_interface.h>
diff --git a/rtc_base/sequenced_task_checker_unittest.cc b/rtc_base/sequenced_task_checker_unittest.cc
index 7b7247c..02918cd 100644
--- a/rtc_base/sequenced_task_checker_unittest.cc
+++ b/rtc_base/sequenced_task_checker_unittest.cc
@@ -10,6 +10,9 @@
#include "rtc_base/sequenced_task_checker.h"
+#include <memory>
+#include <utility>
+
#include "rtc_base/checks.h"
#include "rtc_base/constructormagic.h"
#include "rtc_base/event.h"
diff --git a/rtc_base/signalthread_unittest.cc b/rtc_base/signalthread_unittest.cc
index 078710b..97c7eec 100644
--- a/rtc_base/signalthread_unittest.cc
+++ b/rtc_base/signalthread_unittest.cc
@@ -13,7 +13,9 @@
#include "rtc_base/constructormagic.h"
#include "rtc_base/gunit.h"
#include "rtc_base/signalthread.h"
+#include "rtc_base/socketserver.h"
#include "rtc_base/thread.h"
+#include "test/gtest.h"
using namespace rtc;
diff --git a/rtc_base/sigslot_unittest.cc b/rtc_base/sigslot_unittest.cc
index 2f3de40..d5d8e00 100644
--- a/rtc_base/sigslot_unittest.cc
+++ b/rtc_base/sigslot_unittest.cc
@@ -9,8 +9,9 @@
*/
#include "rtc_base/third_party/sigslot/sigslot.h"
-#include "rtc_base/gunit.h"
+
#include "rtc_base/sigslotrepeater.h"
+#include "test/gtest.h"
// This function, when passed a has_slots or signalx, will break the build if
// its threading requirement is not single threaded
diff --git a/rtc_base/sigslottester_unittest.cc b/rtc_base/sigslottester_unittest.cc
index 8fde268..b8d5735 100644
--- a/rtc_base/sigslottester_unittest.cc
+++ b/rtc_base/sigslottester_unittest.cc
@@ -12,8 +12,8 @@
#include <string>
-#include "rtc_base/gunit.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/socket.h b/rtc_base/socket.h
index e7e8210..84a0e84 100644
--- a/rtc_base/socket.h
+++ b/rtc_base/socket.h
@@ -26,7 +26,6 @@
#endif
#include "rtc_base/constructormagic.h"
-#include "rtc_base/network/sent_packet.h"
#include "rtc_base/socketaddress.h"
// Rather than converting errors into a private namespace,
diff --git a/rtc_base/socket_unittest.cc b/rtc_base/socket_unittest.cc
index cbc5eb5..79259a5 100644
--- a/rtc_base/socket_unittest.cc
+++ b/rtc_base/socket_unittest.cc
@@ -8,20 +8,32 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <errno.h>
+#include <stdint.h>
+#include <string.h>
#include <memory>
-#include "rtc_base/socket_unittest.h"
-
#include "absl/memory/memory.h"
#include "rtc_base/arraysize.h"
+#include "rtc_base/asyncpacketsocket.h"
+#include "rtc_base/asyncsocket.h"
#include "rtc_base/asyncudpsocket.h"
#include "rtc_base/buffer.h"
#include "rtc_base/gunit.h"
+#include "rtc_base/location.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/messagehandler.h"
+#include "rtc_base/messagequeue.h"
#include "rtc_base/nethelpers.h"
+#include "rtc_base/socket.h"
+#include "rtc_base/socket_unittest.h"
+#include "rtc_base/socketaddress.h"
#include "rtc_base/socketserver.h"
#include "rtc_base/testclient.h"
#include "rtc_base/testutils.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
+#include "rtc_base/timeutils.h"
namespace rtc {
diff --git a/rtc_base/socketaddress_unittest.cc b/rtc_base/socketaddress_unittest.cc
index b7a2d92..d2420fc 100644
--- a/rtc_base/socketaddress_unittest.cc
+++ b/rtc_base/socketaddress_unittest.cc
@@ -12,9 +12,11 @@
#include <netinet/in.h> // for sockaddr_in
#endif
-#include "rtc_base/gunit.h"
+#include <string.h>
+
#include "rtc_base/ipaddress.h"
#include "rtc_base/socketaddress.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/socketstream.h b/rtc_base/socketstream.h
index f781af1..6047fcd 100644
--- a/rtc_base/socketstream.h
+++ b/rtc_base/socketstream.h
@@ -11,9 +11,12 @@
#ifndef RTC_BASE_SOCKETSTREAM_H_
#define RTC_BASE_SOCKETSTREAM_H_
+#include <stddef.h>
+
#include "rtc_base/asyncsocket.h"
#include "rtc_base/constructormagic.h"
#include "rtc_base/stream.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
diff --git a/rtc_base/sslidentity_unittest.cc b/rtc_base/sslidentity_unittest.cc
index ba53d17..d2ec157 100644
--- a/rtc_base/sslidentity_unittest.cc
+++ b/rtc_base/sslidentity_unittest.cc
@@ -8,17 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <string.h>
#include <memory>
#include <string>
+#include <vector>
+#include "rtc_base/checks.h"
#include "rtc_base/fakesslidentity.h"
-#include "rtc_base/gunit.h"
#include "rtc_base/helpers.h"
+#include "rtc_base/logging.h"
#include "rtc_base/messagedigest.h"
-#include "rtc_base/ssladapter.h"
#include "rtc_base/sslfingerprint.h"
#include "rtc_base/sslidentity.h"
#include "rtc_base/stringutils.h"
+#include "test/gtest.h"
using rtc::SSLIdentity;
diff --git a/rtc_base/sslstreamadapter.h b/rtc_base/sslstreamadapter.h
index 25f4f33..3fff6bc 100644
--- a/rtc_base/sslstreamadapter.h
+++ b/rtc_base/sslstreamadapter.h
@@ -11,12 +11,16 @@
#ifndef RTC_BASE_SSLSTREAMADAPTER_H_
#define RTC_BASE_SSLSTREAMADAPTER_H_
+#include <stddef.h>
+#include <stdint.h>
#include <memory>
#include <string>
#include <vector>
+#include "rtc_base/sslcertificate.h"
#include "rtc_base/sslidentity.h"
#include "rtc_base/stream.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
diff --git a/rtc_base/stream_unittest.cc b/rtc_base/stream_unittest.cc
index 2ca2526..0a80562 100644
--- a/rtc_base/stream_unittest.cc
+++ b/rtc_base/stream_unittest.cc
@@ -9,7 +9,10 @@
*/
#include "rtc_base/stream.h"
-#include "rtc_base/gunit.h"
+
+#include <string.h>
+
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/string_to_number_unittest.cc b/rtc_base/string_to_number_unittest.cc
index f7bf484..fe5f88e 100644
--- a/rtc_base/string_to_number_unittest.cc
+++ b/rtc_base/string_to_number_unittest.cc
@@ -10,11 +10,11 @@
#include "rtc_base/string_to_number.h"
+#include <stdint.h>
#include <limits>
#include <string>
-#include <type_traits>
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/stringencode_unittest.cc b/rtc_base/stringencode_unittest.cc
index f21c4cb..ab871a5 100644
--- a/rtc_base/stringencode_unittest.cc
+++ b/rtc_base/stringencode_unittest.cc
@@ -9,12 +9,12 @@
*/
#include "rtc_base/stringencode.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/gunit.h"
-#include "rtc_base/stringutils.h"
+#include <string.h>
#include <sstream> // no-presubmit-check TODO(webrtc:8982)
+#include "test/gtest.h"
+
namespace rtc {
class HexEncodeTest : public testing::Test {
diff --git a/rtc_base/strings/json_unittest.cc b/rtc_base/strings/json_unittest.cc
index 2215769..82d26f1 100644
--- a/rtc_base/strings/json_unittest.cc
+++ b/rtc_base/strings/json_unittest.cc
@@ -12,7 +12,7 @@
#include <vector>
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/strings/string_builder_unittest.cc b/rtc_base/strings/string_builder_unittest.cc
index 878e128..6d8b9f2 100644
--- a/rtc_base/strings/string_builder_unittest.cc
+++ b/rtc_base/strings/string_builder_unittest.cc
@@ -10,8 +10,9 @@
#include "rtc_base/strings/string_builder.h"
+#include <string.h>
+
#include "rtc_base/checks.h"
-#include "rtc_base/stringutils.h"
#include "test/gmock.h"
#include "test/gtest.h"
diff --git a/rtc_base/stringutils_unittest.cc b/rtc_base/stringutils_unittest.cc
index 663e976..cf9debe 100644
--- a/rtc_base/stringutils_unittest.cc
+++ b/rtc_base/stringutils_unittest.cc
@@ -9,7 +9,8 @@
*/
#include "rtc_base/stringutils.h"
-#include "rtc_base/gunit.h"
+
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/swap_queue.h b/rtc_base/swap_queue.h
index 172f2f5..53d4219 100644
--- a/rtc_base/swap_queue.h
+++ b/rtc_base/swap_queue.h
@@ -11,7 +11,7 @@
#ifndef RTC_BASE_SWAP_QUEUE_H_
#define RTC_BASE_SWAP_QUEUE_H_
-#include <algorithm>
+#include <stddef.h>
#include <utility>
#include <vector>
@@ -19,6 +19,7 @@
#include "rtc_base/constructormagic.h"
#include "rtc_base/criticalsection.h"
#include "rtc_base/system/unused.h"
+#include "rtc_base/thread_annotations.h"
namespace webrtc {
diff --git a/rtc_base/swap_queue_unittest.cc b/rtc_base/swap_queue_unittest.cc
index 28f870b..199ac6b 100644
--- a/rtc_base/swap_queue_unittest.cc
+++ b/rtc_base/swap_queue_unittest.cc
@@ -10,6 +10,7 @@
#include "rtc_base/swap_queue.h"
+#include <cstdint>
#include <vector>
#include "test/gtest.h"
diff --git a/rtc_base/task_queue.h b/rtc_base/task_queue.h
index 888e203..ea89b25 100644
--- a/rtc_base/task_queue.h
+++ b/rtc_base/task_queue.h
@@ -11,6 +11,7 @@
#ifndef RTC_BASE_TASK_QUEUE_H_
#define RTC_BASE_TASK_QUEUE_H_
+#include <stdint.h>
#include <memory>
#include <type_traits>
#include <utility>
@@ -233,6 +234,7 @@
private:
class Impl;
+
const scoped_refptr<Impl> impl_;
RTC_DISALLOW_COPY_AND_ASSIGN(TaskQueue);
diff --git a/rtc_base/task_queue_for_test.h b/rtc_base/task_queue_for_test.h
index 9162e81..5cd4e83 100644
--- a/rtc_base/task_queue_for_test.h
+++ b/rtc_base/task_queue_for_test.h
@@ -11,11 +11,11 @@
#ifndef RTC_BASE_TASK_QUEUE_FOR_TEST_H_
#define RTC_BASE_TASK_QUEUE_FOR_TEST_H_
-#include <utility>
-
#include "rtc_base/checks.h"
+#include "rtc_base/constructormagic.h"
#include "rtc_base/event.h"
#include "rtc_base/task_queue.h"
+#include "rtc_base/thread_annotations.h"
namespace rtc {
namespace test {
diff --git a/rtc_base/task_queue_unittest.cc b/rtc_base/task_queue_unittest.cc
index 0af39a5..9825635 100644
--- a/rtc_base/task_queue_unittest.cc
+++ b/rtc_base/task_queue_unittest.cc
@@ -15,14 +15,18 @@
// clang-format on
#endif
+#include <stdint.h>
#include <memory>
+#include <utility>
#include <vector>
+#include "absl/memory/memory.h"
#include "rtc_base/bind.h"
#include "rtc_base/event.h"
-#include "rtc_base/gunit.h"
+#include "rtc_base/task_queue.h"
#include "rtc_base/task_queue_for_test.h"
#include "rtc_base/timeutils.h"
+#include "test/gtest.h"
using rtc::test::TaskQueueForTest;
diff --git a/rtc_base/testclient.cc b/rtc_base/testclient.cc
index a5b90dd..00363ba 100644
--- a/rtc_base/testclient.cc
+++ b/rtc_base/testclient.cc
@@ -10,6 +10,9 @@
#include "rtc_base/testclient.h"
+#include <string.h>
+#include <utility>
+
#include "absl/memory/memory.h"
#include "rtc_base/gunit.h"
#include "rtc_base/thread.h"
diff --git a/rtc_base/testclient_unittest.cc b/rtc_base/testclient_unittest.cc
index b3a6c80..742da74 100644
--- a/rtc_base/testclient_unittest.cc
+++ b/rtc_base/testclient_unittest.cc
@@ -9,12 +9,19 @@
*/
#include "rtc_base/testclient.h"
+
+#include <utility>
+
#include "absl/memory/memory.h"
-#include "rtc_base/gunit.h"
+#include "rtc_base/asyncsocket.h"
+#include "rtc_base/asynctcpsocket.h"
+#include "rtc_base/asyncudpsocket.h"
+#include "rtc_base/logging.h"
#include "rtc_base/nethelpers.h"
-#include "rtc_base/physicalsocketserver.h"
+#include "rtc_base/socketserver.h"
#include "rtc_base/testechoserver.h"
#include "rtc_base/thread.h"
+#include "test/gtest.h"
using namespace rtc;
diff --git a/rtc_base/testechoserver.cc b/rtc_base/testechoserver.cc
index a5eb7de..1e1fb59 100644
--- a/rtc_base/testechoserver.cc
+++ b/rtc_base/testechoserver.cc
@@ -10,6 +10,8 @@
#include "rtc_base/testechoserver.h"
+#include "rtc_base/socketserver.h"
+
namespace rtc {
TestEchoServer::TestEchoServer(Thread* thread, const SocketAddress& addr)
diff --git a/rtc_base/testechoserver.h b/rtc_base/testechoserver.h
index 9ffd786..f1342fd 100644
--- a/rtc_base/testechoserver.h
+++ b/rtc_base/testechoserver.h
@@ -11,12 +11,18 @@
#ifndef RTC_BASE_TESTECHOSERVER_H_
#define RTC_BASE_TESTECHOSERVER_H_
+#include <stddef.h>
+#include <stdint.h>
+#include <algorithm>
#include <list>
#include <memory>
+#include "rtc_base/asyncpacketsocket.h"
+#include "rtc_base/asyncsocket.h"
#include "rtc_base/asynctcpsocket.h"
#include "rtc_base/constructormagic.h"
#include "rtc_base/socketaddress.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
namespace rtc {
diff --git a/rtc_base/testutils.h b/rtc_base/testutils.h
index ac74203..5a2a3bd 100644
--- a/rtc_base/testutils.h
+++ b/rtc_base/testutils.h
@@ -13,13 +13,12 @@
// Utilities for testing rtc infrastructure in unittests
-#include <algorithm>
#include <map>
-#include <memory>
-#include <vector>
+#include <utility>
+
#include "rtc_base/asyncsocket.h"
-#include "rtc_base/checks.h"
#include "rtc_base/stream.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
namespace webrtc {
namespace testing {
diff --git a/rtc_base/thread_checker_unittest.cc b/rtc_base/thread_checker_unittest.cc
index 9c0942f..52397a9 100644
--- a/rtc_base/thread_checker_unittest.cc
+++ b/rtc_base/thread_checker_unittest.cc
@@ -11,10 +11,12 @@
// Borrowed from Chromium's src/base/threading/thread_checker_unittest.cc.
#include <memory>
+#include <utility>
#include "rtc_base/checks.h"
#include "rtc_base/constructormagic.h"
#include "rtc_base/nullsocketserver.h"
+#include "rtc_base/socketserver.h"
#include "rtc_base/task_queue.h"
#include "rtc_base/thread.h"
#include "rtc_base/thread_checker.h"
diff --git a/rtc_base/timestampaligner_unittest.cc b/rtc_base/timestampaligner_unittest.cc
index 8ba5be9..b57f480 100644
--- a/rtc_base/timestampaligner_unittest.cc
+++ b/rtc_base/timestampaligner_unittest.cc
@@ -9,13 +9,13 @@
*/
#include <math.h>
-
#include <algorithm>
#include <limits>
-#include "rtc_base/gunit.h"
#include "rtc_base/random.h"
#include "rtc_base/timestampaligner.h"
+#include "rtc_base/timeutils.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/timeutils_unittest.cc b/rtc_base/timeutils_unittest.cc
index 577efda..9e7de06 100644
--- a/rtc_base/timeutils_unittest.cc
+++ b/rtc_base/timeutils_unittest.cc
@@ -9,11 +9,17 @@
*/
#include "rtc_base/timeutils.h"
+
+#include <memory>
+
+#include "api/units/time_delta.h"
#include "rtc_base/event.h"
#include "rtc_base/fakeclock.h"
-#include "rtc_base/gunit.h"
#include "rtc_base/helpers.h"
+#include "rtc_base/location.h"
+#include "rtc_base/messagehandler.h"
#include "rtc_base/thread.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/unittest_main.cc b/rtc_base/unittest_main.cc
index 5fd3a99..981f680 100644
--- a/rtc_base/unittest_main.cc
+++ b/rtc_base/unittest_main.cc
@@ -15,13 +15,13 @@
#endif
#include "rtc_base/flags.h"
-#include "rtc_base/gunit.h"
#include "rtc_base/logging.h"
#include "rtc_base/ssladapter.h"
#include "rtc_base/sslstreamadapter.h"
#include "system_wrappers/include/field_trial.h"
#include "system_wrappers/include/metrics.h"
#include "test/field_trial.h"
+#include "test/gtest.h"
#if defined(WEBRTC_WIN)
#include "rtc_base/win32socketinit.h"
diff --git a/rtc_base/virtualsocket_unittest.cc b/rtc_base/virtualsocket_unittest.cc
index d44f46a..6c0ce24 100644
--- a/rtc_base/virtualsocket_unittest.cc
+++ b/rtc_base/virtualsocket_unittest.cc
@@ -9,23 +9,39 @@
*/
#include <math.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
#include <time.h>
#if defined(WEBRTC_POSIX)
#include <netinet/in.h>
#endif
+#include <algorithm>
#include <memory>
+#include <utility>
#include "absl/memory/memory.h"
#include "rtc_base/arraysize.h"
+#include "rtc_base/asyncpacketsocket.h"
+#include "rtc_base/asyncsocket.h"
+#include "rtc_base/asyncudpsocket.h"
#include "rtc_base/fakeclock.h"
#include "rtc_base/gunit.h"
+#include "rtc_base/ipaddress.h"
+#include "rtc_base/location.h"
#include "rtc_base/logging.h"
+#include "rtc_base/messagehandler.h"
+#include "rtc_base/messagequeue.h"
+#include "rtc_base/socket.h"
+#include "rtc_base/socketaddress.h"
#include "rtc_base/testclient.h"
#include "rtc_base/testutils.h"
+#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
#include "rtc_base/timeutils.h"
#include "rtc_base/virtualsocketserver.h"
+#include "test/gtest.h"
using namespace rtc;
diff --git a/rtc_base/weak_ptr_unittest.cc b/rtc_base/weak_ptr_unittest.cc
index 66f2b4d..8f09a33 100644
--- a/rtc_base/weak_ptr_unittest.cc
+++ b/rtc_base/weak_ptr_unittest.cc
@@ -8,12 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <memory>
#include <string>
+#include "absl/memory/memory.h"
#include "rtc_base/event.h"
-#include "rtc_base/gunit.h"
#include "rtc_base/task_queue.h"
#include "rtc_base/weak_ptr.h"
+#include "test/gtest.h"
namespace rtc {
diff --git a/rtc_base/zero_memory_unittest.cc b/rtc_base/zero_memory_unittest.cc
index 0f49670..74d95f4 100644
--- a/rtc_base/zero_memory_unittest.cc
+++ b/rtc_base/zero_memory_unittest.cc
@@ -10,9 +10,10 @@
#include "rtc_base/zero_memory.h"
+#include <stdint.h>
+
#include "api/array_view.h"
-#include "rtc_base/buffer.h"
-#include "rtc_base/gunit.h"
+#include "test/gtest.h"
namespace rtc {