diff --git a/quiche/quic/qbone/qbone_packet_processor.cc b/quiche/quic/qbone/qbone_packet_processor.cc
index 1ddd02b..8ac86ee 100644
--- a/quiche/quic/qbone/qbone_packet_processor.cc
+++ b/quiche/quic/qbone/qbone_packet_processor.cc
@@ -10,6 +10,7 @@
 
 #include <cstdint>
 #include <cstring>
+#include <string>
 
 #include "absl/base/optimization.h"
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/qbone/qbone_packet_processor_test.cc b/quiche/quic/qbone/qbone_packet_processor_test.cc
index c35f28c..ec424e2 100644
--- a/quiche/quic/qbone/qbone_packet_processor_test.cc
+++ b/quiche/quic/qbone/qbone_packet_processor_test.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/qbone/qbone_packet_processor.h"
 
+#include <memory>
+#include <string>
 #include <utility>
 
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/qbone/qbone_packet_processor_test_tools.cc b/quiche/quic/qbone/qbone_packet_processor_test_tools.cc
index 9a73188..d486ac5 100644
--- a/quiche/quic/qbone/qbone_packet_processor_test_tools.cc
+++ b/quiche/quic/qbone/qbone_packet_processor_test_tools.cc
@@ -6,6 +6,8 @@
 
 #include <netinet/ip6.h>
 
+#include <string>
+
 namespace quic {
 
 std::string PrependIPv6HeaderForTest(const std::string& body, int hops) {
diff --git a/quiche/quic/qbone/qbone_server_session.cc b/quiche/quic/qbone/qbone_server_session.cc
index cbe9583..4c4ec18 100644
--- a/quiche/quic/qbone/qbone_server_session.cc
+++ b/quiche/quic/qbone/qbone_server_session.cc
@@ -4,6 +4,7 @@
 
 #include "quiche/quic/qbone/qbone_server_session.h"
 
+#include <memory>
 #include <string>
 #include <utility>
 
diff --git a/quiche/quic/qbone/qbone_session_base.cc b/quiche/quic/qbone/qbone_session_base.cc
index 36517b7..31cf8e1 100644
--- a/quiche/quic/qbone/qbone_session_base.cc
+++ b/quiche/quic/qbone/qbone_session_base.cc
@@ -7,6 +7,8 @@
 #include <netinet/icmp6.h>
 #include <netinet/ip6.h>
 
+#include <limits>
+#include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/qbone/qbone_session_test.cc b/quiche/quic/qbone/qbone_session_test.cc
index 46a41d9..1a8fd31 100644
--- a/quiche/quic/qbone/qbone_session_test.cc
+++ b/quiche/quic/qbone/qbone_session_test.cc
@@ -2,8 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <functional>
 #include <memory>
+#include <queue>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "absl/strings/string_view.h"
 #include "quiche/quic/core/io/quic_default_event_loop.h"
diff --git a/quiche/quic/qbone/qbone_stream_test.cc b/quiche/quic/qbone/qbone_stream_test.cc
index 7ab4dad..d9501cd 100644
--- a/quiche/quic/qbone/qbone_stream_test.cc
+++ b/quiche/quic/qbone/qbone_stream_test.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/qbone/qbone_stream.h"
 
+#include <memory>
+#include <optional>
+#include <string>
 #include <utility>
 
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/test_tools/crypto_test_utils_test.cc b/quiche/quic/test_tools/crypto_test_utils_test.cc
index 51bcc9e..1c78944 100644
--- a/quiche/quic/test_tools/crypto_test_utils_test.cc
+++ b/quiche/quic/test_tools/crypto_test_utils_test.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/test_tools/crypto_test_utils.h"
 
+#include <memory>
+#include <string>
 #include <utility>
 
 #include "absl/strings/escaping.h"
diff --git a/quiche/quic/test_tools/failing_proof_source.cc b/quiche/quic/test_tools/failing_proof_source.cc
index 55ae06e..f65b528 100644
--- a/quiche/quic/test_tools/failing_proof_source.cc
+++ b/quiche/quic/test_tools/failing_proof_source.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/test_tools/failing_proof_source.h"
 
+#include <memory>
+#include <string>
+
 #include "absl/strings/string_view.h"
 
 namespace quic {
diff --git a/quiche/quic/test_tools/fake_proof_source.cc b/quiche/quic/test_tools/fake_proof_source.cc
index 43c5a72..04e4e80 100644
--- a/quiche/quic/test_tools/fake_proof_source.cc
+++ b/quiche/quic/test_tools/fake_proof_source.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/test_tools/fake_proof_source.h"
 
+#include <memory>
+#include <string>
 #include <utility>
 
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/test_tools/first_flight.cc b/quiche/quic/test_tools/first_flight.cc
index 820dbbb..8a8316c 100644
--- a/quiche/quic/test_tools/first_flight.cc
+++ b/quiche/quic/test_tools/first_flight.cc
@@ -5,6 +5,7 @@
 #include "quiche/quic/test_tools/first_flight.h"
 
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "quiche/quic/core/crypto/quic_crypto_client_config.h"
diff --git a/quiche/quic/test_tools/fuzzing/quic_framer_fuzzer.cc b/quiche/quic/test_tools/fuzzing/quic_framer_fuzzer.cc
index 7b1e09f..7251c1d 100644
--- a/quiche/quic/test_tools/fuzzing/quic_framer_fuzzer.cc
+++ b/quiche/quic/test_tools/fuzzing/quic_framer_fuzzer.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <memory>
+
 #include "absl/strings/string_view.h"
 #include "quiche/quic/core/crypto/crypto_framer.h"
 #include "quiche/quic/core/crypto/crypto_handshake_message.h"
diff --git a/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc b/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc
index 0ee8c23..9fff371 100644
--- a/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc
+++ b/quiche/quic/test_tools/fuzzing/quic_framer_process_data_packet_fuzzer.cc
@@ -5,8 +5,11 @@
 #include <fuzzer/FuzzedDataProvider.h>
 
 #include <algorithm>
+#include <array>
 #include <cstdint>
+#include <memory>
 #include <string>
+#include <vector>
 
 #include "absl/base/macros.h"
 #include "quiche/quic/core/crypto/null_decrypter.h"
diff --git a/quiche/quic/test_tools/mock_quic_dispatcher.cc b/quiche/quic/test_tools/mock_quic_dispatcher.cc
index 527047e..99a876e 100644
--- a/quiche/quic/test_tools/mock_quic_dispatcher.cc
+++ b/quiche/quic/test_tools/mock_quic_dispatcher.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/test_tools/mock_quic_dispatcher.h"
 
+#include <memory>
+#include <utility>
+
 #include "quiche/quic/test_tools/quic_test_utils.h"
 
 namespace quic {
diff --git a/quiche/quic/test_tools/packet_dropping_test_writer.cc b/quiche/quic/test_tools/packet_dropping_test_writer.cc
index 5987338..fa3eb73 100644
--- a/quiche/quic/test_tools/packet_dropping_test_writer.cc
+++ b/quiche/quic/test_tools/packet_dropping_test_writer.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/test_tools/packet_dropping_test_writer.h"
 
+#include <memory>
+#include <utility>
+
 #include "quiche/quic/platform/api/quic_logging.h"
 
 namespace quic {
diff --git a/quiche/quic/test_tools/qpack/qpack_decoder_test_utils.cc b/quiche/quic/test_tools/qpack/qpack_decoder_test_utils.cc
index 2b39dcd..ad8d4eb 100644
--- a/quiche/quic/test_tools/qpack/qpack_decoder_test_utils.cc
+++ b/quiche/quic/test_tools/qpack/qpack_decoder_test_utils.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <string>
 #include <utility>
 
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/test_tools/qpack/qpack_offline_decoder.cc b/quiche/quic/test_tools/qpack/qpack_offline_decoder.cc
index da7a865..73d5007 100644
--- a/quiche/quic/test_tools/qpack/qpack_offline_decoder.cc
+++ b/quiche/quic/test_tools/qpack/qpack_offline_decoder.cc
@@ -27,8 +27,11 @@
 #include "quiche/quic/test_tools/qpack/qpack_offline_decoder.h"
 
 #include <cstdint>
+#include <memory>
+#include <optional>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "absl/strings/match.h"
 #include "absl/strings/numbers.h"
diff --git a/quiche/quic/test_tools/quic_coalesced_packet_peer.cc b/quiche/quic/test_tools/quic_coalesced_packet_peer.cc
index eeb1621..daa64f0 100644
--- a/quiche/quic/test_tools/quic_coalesced_packet_peer.cc
+++ b/quiche/quic/test_tools/quic_coalesced_packet_peer.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/test_tools/quic_coalesced_packet_peer.h"
 
+#include <string>
+
 namespace quic {
 namespace test {
 
diff --git a/quiche/quic/test_tools/quic_config_peer.cc b/quiche/quic/test_tools/quic_config_peer.cc
index a3e9acc..165fd72 100644
--- a/quiche/quic/test_tools/quic_config_peer.cc
+++ b/quiche/quic/test_tools/quic_config_peer.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/test_tools/quic_config_peer.h"
 
+#include <utility>
+
 #include "quiche/quic/core/quic_config.h"
 #include "quiche/quic/core/quic_connection_id.h"
 
diff --git a/quiche/quic/test_tools/quic_connection_peer.cc b/quiche/quic/test_tools/quic_connection_peer.cc
index e21019b..18c3bf0 100644
--- a/quiche/quic/test_tools/quic_connection_peer.cc
+++ b/quiche/quic/test_tools/quic_connection_peer.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/test_tools/quic_connection_peer.h"
 
+#include <memory>
+#include <string>
+
 #include "absl/strings/string_view.h"
 #include "quiche/quic/core/congestion_control/send_algorithm_interface.h"
 #include "quiche/quic/core/quic_packet_writer.h"
diff --git a/quiche/quic/test_tools/quic_crypto_server_config_peer.cc b/quiche/quic/test_tools/quic_crypto_server_config_peer.cc
index 48c8aed..c63b0c5 100644
--- a/quiche/quic/test_tools/quic_crypto_server_config_peer.cc
+++ b/quiche/quic/test_tools/quic_crypto_server_config_peer.cc
@@ -4,6 +4,11 @@
 
 #include "quiche/quic/test_tools/quic_crypto_server_config_peer.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "absl/strings/string_view.h"
 #include "quiche/quic/test_tools/mock_clock.h"
 #include "quiche/quic/test_tools/mock_random.h"
diff --git a/quiche/quic/test_tools/quic_dispatcher_peer.cc b/quiche/quic/test_tools/quic_dispatcher_peer.cc
index f08c2d7..d4d7c07 100644
--- a/quiche/quic/test_tools/quic_dispatcher_peer.cc
+++ b/quiche/quic/test_tools/quic_dispatcher_peer.cc
@@ -4,6 +4,11 @@
 
 #include "quiche/quic/test_tools/quic_dispatcher_peer.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "quiche/quic/core/quic_dispatcher.h"
 #include "quiche/quic/core/quic_packet_writer_wrapper.h"
 
diff --git a/quiche/quic/test_tools/quic_framer_peer.cc b/quiche/quic/test_tools/quic_framer_peer.cc
index 1c23468..25e90a0 100644
--- a/quiche/quic/test_tools/quic_framer_peer.cc
+++ b/quiche/quic/test_tools/quic_framer_peer.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/test_tools/quic_framer_peer.h"
 
+#include <string>
+
 #include "quiche/quic/core/quic_framer.h"
 #include "quiche/quic/core/quic_packets.h"
 
diff --git a/quiche/quic/test_tools/quic_packet_creator_peer.cc b/quiche/quic/test_tools/quic_packet_creator_peer.cc
index f7f75ba..0847b32 100644
--- a/quiche/quic/test_tools/quic_packet_creator_peer.cc
+++ b/quiche/quic/test_tools/quic_packet_creator_peer.cc
@@ -4,6 +4,10 @@
 
 #include "quiche/quic/test_tools/quic_packet_creator_peer.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include "quiche/quic/core/frames/quic_frame.h"
 #include "quiche/quic/core/quic_packet_creator.h"
 #include "quiche/quic/core/quic_types.h"
diff --git a/quiche/quic/test_tools/quic_session_peer.cc b/quiche/quic/test_tools/quic_session_peer.cc
index 981af9f..228f27d 100644
--- a/quiche/quic/test_tools/quic_session_peer.cc
+++ b/quiche/quic/test_tools/quic_session_peer.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/test_tools/quic_session_peer.h"
 
+#include <memory>
+#include <utility>
+
 #include "absl/container/flat_hash_map.h"
 #include "quiche/quic/core/quic_session.h"
 #include "quiche/quic/core/quic_stream.h"
diff --git a/quiche/quic/test_tools/quic_spdy_session_peer.cc b/quiche/quic/test_tools/quic_spdy_session_peer.cc
index 4da7254..f42d9ae 100644
--- a/quiche/quic/test_tools/quic_spdy_session_peer.cc
+++ b/quiche/quic/test_tools/quic_spdy_session_peer.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/test_tools/quic_spdy_session_peer.h"
 
+#include <utility>
+
 
 #include "quiche/quic/core/http/quic_spdy_session.h"
 #include "quiche/quic/core/qpack/qpack_receive_stream.h"
diff --git a/quiche/quic/test_tools/quic_spdy_stream_peer.cc b/quiche/quic/test_tools/quic_spdy_stream_peer.cc
index 15806b3..89f6085 100644
--- a/quiche/quic/test_tools/quic_spdy_stream_peer.cc
+++ b/quiche/quic/test_tools/quic_spdy_stream_peer.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/test_tools/quic_spdy_stream_peer.h"
 
+#include <utility>
+
 #include "quiche/quic/core/http/quic_spdy_stream.h"
 #include "quiche/quic/test_tools/quic_test_utils.h"
 
diff --git a/quiche/quic/test_tools/quic_stream_sequencer_buffer_peer.cc b/quiche/quic/test_tools/quic_stream_sequencer_buffer_peer.cc
index 679bd91..56982e5 100644
--- a/quiche/quic/test_tools/quic_stream_sequencer_buffer_peer.cc
+++ b/quiche/quic/test_tools/quic_stream_sequencer_buffer_peer.cc
@@ -5,6 +5,8 @@
 #include "quiche/quic/test_tools/quic_stream_sequencer_buffer_peer.h"
 
 #include <cstddef>
+#include <limits>
+#include <string>
 
 #include "quiche/quic/platform/api/quic_flags.h"
 #include "quiche/quic/platform/api/quic_logging.h"
diff --git a/quiche/quic/test_tools/quic_test_backend.cc b/quiche/quic/test_tools/quic_test_backend.cc
index 9f45e86..a37ff36 100644
--- a/quiche/quic/test_tools/quic_test_backend.cc
+++ b/quiche/quic/test_tools/quic_test_backend.cc
@@ -6,6 +6,9 @@
 
 #include <cstring>
 #include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
diff --git a/quiche/quic/test_tools/quic_test_client.cc b/quiche/quic/test_tools/quic_test_client.cc
index d0d0a2e..198906b 100644
--- a/quiche/quic/test_tools/quic_test_client.cc
+++ b/quiche/quic/test_tools/quic_test_client.cc
@@ -5,6 +5,8 @@
 #include "quiche/quic/test_tools/quic_test_client.h"
 
 #include <memory>
+#include <optional>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/quiche/quic/test_tools/quic_test_server.cc b/quiche/quic/test_tools/quic_test_server.cc
index 1fb87c7..a02b849 100644
--- a/quiche/quic/test_tools/quic_test_server.cc
+++ b/quiche/quic/test_tools/quic_test_server.cc
@@ -4,6 +4,7 @@
 
 #include "quiche/quic/test_tools/quic_test_server.h"
 
+#include <memory>
 #include <utility>
 
 #include "absl/memory/memory.h"
diff --git a/quiche/quic/test_tools/quic_test_utils.cc b/quiche/quic/test_tools/quic_test_utils.cc
index 58277df..e3ec0a2 100644
--- a/quiche/quic/test_tools/quic_test_utils.cc
+++ b/quiche/quic/test_tools/quic_test_utils.cc
@@ -7,7 +7,10 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
+#include <limits>
 #include <memory>
+#include <optional>
+#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/quiche/quic/test_tools/quic_test_utils_test.cc b/quiche/quic/test_tools/quic_test_utils_test.cc
index 16ca977..e90f14f 100644
--- a/quiche/quic/test_tools/quic_test_utils_test.cc
+++ b/quiche/quic/test_tools/quic_test_utils_test.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/test_tools/quic_test_utils.h"
 
+#include <string>
+
 #include "quiche/quic/platform/api/quic_test.h"
 
 namespace quic {
diff --git a/quiche/quic/test_tools/quic_time_wait_list_manager_peer.cc b/quiche/quic/test_tools/quic_time_wait_list_manager_peer.cc
index b8c38ca..9c39add 100644
--- a/quiche/quic/test_tools/quic_time_wait_list_manager_peer.cc
+++ b/quiche/quic/test_tools/quic_time_wait_list_manager_peer.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/test_tools/quic_time_wait_list_manager_peer.h"
 
+#include <memory>
+#include <utility>
+
 namespace quic {
 namespace test {
 
diff --git a/quiche/quic/test_tools/send_algorithm_test_utils.cc b/quiche/quic/test_tools/send_algorithm_test_utils.cc
index 2ca1791..0171b29 100644
--- a/quiche/quic/test_tools/send_algorithm_test_utils.cc
+++ b/quiche/quic/test_tools/send_algorithm_test_utils.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/test_tools/send_algorithm_test_utils.h"
 
+#include <string>
+
 #include "absl/strings/str_cat.h"
 #include "quiche/quic/platform/api/quic_logging.h"
 #include "quiche/quic/platform/api/quic_test.h"
diff --git a/quiche/quic/test_tools/server_thread.cc b/quiche/quic/test_tools/server_thread.cc
index 1cafb8a..9c561e4 100644
--- a/quiche/quic/test_tools/server_thread.cc
+++ b/quiche/quic/test_tools/server_thread.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/test_tools/server_thread.h"
 
+#include <memory>
+#include <utility>
+
 #include "quiche/quic/core/quic_default_clock.h"
 #include "quiche/quic/core/quic_dispatcher.h"
 #include "quiche/quic/test_tools/crypto_test_utils.h"
diff --git a/quiche/quic/test_tools/simple_data_producer.cc b/quiche/quic/test_tools/simple_data_producer.cc
index f0adc68..d788ec3 100644
--- a/quiche/quic/test_tools/simple_data_producer.cc
+++ b/quiche/quic/test_tools/simple_data_producer.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/test_tools/simple_data_producer.h"
 
+#include <memory>
+#include <string>
 #include <utility>
 
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/test_tools/simple_quic_framer.cc b/quiche/quic/test_tools/simple_quic_framer.cc
index 54ae4b3..6d177d1 100644
--- a/quiche/quic/test_tools/simple_quic_framer.cc
+++ b/quiche/quic/test_tools/simple_quic_framer.cc
@@ -5,7 +5,10 @@
 #include "quiche/quic/test_tools/simple_quic_framer.h"
 
 #include <memory>
+#include <optional>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "absl/memory/memory.h"
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/test_tools/simple_session_cache.cc b/quiche/quic/test_tools/simple_session_cache.cc
index 05f433d..977a107 100644
--- a/quiche/quic/test_tools/simple_session_cache.cc
+++ b/quiche/quic/test_tools/simple_session_cache.cc
@@ -5,6 +5,8 @@
 #include "quiche/quic/test_tools/simple_session_cache.h"
 
 #include <memory>
+#include <string>
+#include <utility>
 
 #include "quiche/quic/core/crypto/quic_crypto_client_config.h"
 
diff --git a/quiche/quic/test_tools/simple_session_notifier_test.cc b/quiche/quic/test_tools/simple_session_notifier_test.cc
index 513394c..0d488d2 100644
--- a/quiche/quic/test_tools/simple_session_notifier_test.cc
+++ b/quiche/quic/test_tools/simple_session_notifier_test.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/test_tools/simple_session_notifier.h"
 
+#include <memory>
+#include <string>
 #include <utility>
 
 #include "quiche/quic/core/crypto/null_encrypter.h"
diff --git a/quiche/quic/test_tools/simulator/actor.cc b/quiche/quic/test_tools/simulator/actor.cc
index 213d861..dcfda8d 100644
--- a/quiche/quic/test_tools/simulator/actor.cc
+++ b/quiche/quic/test_tools/simulator/actor.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/test_tools/simulator/actor.h"
 
+#include <string>
+#include <utility>
+
 #include "quiche/quic/test_tools/simulator/simulator.h"
 
 namespace quic {