diff --git a/quiche/quic/core/congestion_control/bbr2_probe_rtt.cc b/quiche/quic/core/congestion_control/bbr2_probe_rtt.cc
index f425fd4..f7ce351 100644
--- a/quiche/quic/core/congestion_control/bbr2_probe_rtt.cc
+++ b/quiche/quic/core/congestion_control/bbr2_probe_rtt.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/core/congestion_control/bbr2_probe_rtt.h"
 
+#include <algorithm>
+#include <ostream>
+
 #include "quiche/quic/core/congestion_control/bbr2_sender.h"
 #include "quiche/quic/core/quic_time.h"
 #include "quiche/quic/platform/api/quic_logging.h"
diff --git a/quiche/quic/core/congestion_control/bbr2_sender.cc b/quiche/quic/core/congestion_control/bbr2_sender.cc
index 6f884d8..c7f5ca2 100644
--- a/quiche/quic/core/congestion_control/bbr2_sender.cc
+++ b/quiche/quic/core/congestion_control/bbr2_sender.cc
@@ -4,7 +4,11 @@
 
 #include "quiche/quic/core/congestion_control/bbr2_sender.h"
 
+#include <algorithm>
 #include <cstddef>
+#include <ostream>
+#include <sstream>
+#include <string>
 
 #include "quiche/quic/core/congestion_control/bandwidth_sampler.h"
 #include "quiche/quic/core/congestion_control/bbr2_drain.h"
diff --git a/quiche/quic/core/congestion_control/bbr2_simulator_test.cc b/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
index 76bd106..7bae93d 100644
--- a/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
+++ b/quiche/quic/core/congestion_control/bbr2_simulator_test.cc
@@ -2,10 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <algorithm>
+#include <array>
 #include <memory>
 #include <optional>
 #include <sstream>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "quiche/quic/core/congestion_control/bbr2_misc.h"
diff --git a/quiche/quic/core/congestion_control/bbr2_startup.cc b/quiche/quic/core/congestion_control/bbr2_startup.cc
index 3c84f51..a7d327f 100644
--- a/quiche/quic/core/congestion_control/bbr2_startup.cc
+++ b/quiche/quic/core/congestion_control/bbr2_startup.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/core/congestion_control/bbr2_startup.h"
 
+#include <algorithm>
+#include <ostream>
+
 #include "quiche/quic/core/congestion_control/bbr2_misc.h"
 #include "quiche/quic/core/congestion_control/bbr2_sender.h"
 #include "quiche/quic/core/quic_bandwidth.h"
diff --git a/quiche/quic/core/congestion_control/bbr_sender.cc b/quiche/quic/core/congestion_control/bbr_sender.cc
index 322e7aa..34bb068 100644
--- a/quiche/quic/core/congestion_control/bbr_sender.cc
+++ b/quiche/quic/core/congestion_control/bbr_sender.cc
@@ -5,6 +5,7 @@
 #include "quiche/quic/core/congestion_control/bbr_sender.h"
 
 #include <algorithm>
+#include <ostream>
 #include <sstream>
 #include <string>
 
diff --git a/quiche/quic/core/congestion_control/bbr_sender_test.cc b/quiche/quic/core/congestion_control/bbr_sender_test.cc
index 696e364..607f115 100644
--- a/quiche/quic/core/congestion_control/bbr_sender_test.cc
+++ b/quiche/quic/core/congestion_control/bbr_sender_test.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <map>
 #include <memory>
+#include <string>
 #include <utility>
 
 #include "quiche/quic/core/congestion_control/rtt_stats.h"
diff --git a/quiche/quic/core/congestion_control/cubic_bytes_test.cc b/quiche/quic/core/congestion_control/cubic_bytes_test.cc
index 4899d51..710cd88 100644
--- a/quiche/quic/core/congestion_control/cubic_bytes_test.cc
+++ b/quiche/quic/core/congestion_control/cubic_bytes_test.cc
@@ -4,6 +4,7 @@
 
 #include "quiche/quic/core/congestion_control/cubic_bytes.h"
 
+#include <cmath>
 #include <cstdint>
 
 #include "quiche/quic/platform/api/quic_flags.h"
diff --git a/quiche/quic/core/congestion_control/general_loss_algorithm.cc b/quiche/quic/core/congestion_control/general_loss_algorithm.cc
index b92dc09..6a841b6 100644
--- a/quiche/quic/core/congestion_control/general_loss_algorithm.cc
+++ b/quiche/quic/core/congestion_control/general_loss_algorithm.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/core/congestion_control/general_loss_algorithm.h"
 
+#include <algorithm>
+
 #include "quiche/quic/core/congestion_control/rtt_stats.h"
 #include "quiche/quic/core/quic_packets.h"
 #include "quiche/quic/platform/api/quic_bug_tracker.h"
diff --git a/quiche/quic/core/congestion_control/general_loss_algorithm_test.cc b/quiche/quic/core/congestion_control/general_loss_algorithm_test.cc
index 4ec8a52..1bebb8a 100644
--- a/quiche/quic/core/congestion_control/general_loss_algorithm_test.cc
+++ b/quiche/quic/core/congestion_control/general_loss_algorithm_test.cc
@@ -6,6 +6,8 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <optional>
+#include <vector>
 
 #include "quiche/quic/core/congestion_control/rtt_stats.h"
 #include "quiche/quic/core/quic_unacked_packet_map.h"
diff --git a/quiche/quic/core/congestion_control/pacing_sender.cc b/quiche/quic/core/congestion_control/pacing_sender.cc
index 0f70955..687bf47 100644
--- a/quiche/quic/core/congestion_control/pacing_sender.cc
+++ b/quiche/quic/core/congestion_control/pacing_sender.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/core/congestion_control/pacing_sender.h"
 
+#include <algorithm>
+
 #include "quiche/quic/core/quic_bandwidth.h"
 #include "quiche/quic/platform/api/quic_flag_utils.h"
 #include "quiche/quic/platform/api/quic_flags.h"
diff --git a/quiche/quic/core/congestion_control/rtt_stats.cc b/quiche/quic/core/congestion_control/rtt_stats.cc
index c3b0103..9d937b6 100644
--- a/quiche/quic/core/congestion_control/rtt_stats.cc
+++ b/quiche/quic/core/congestion_control/rtt_stats.cc
@@ -4,6 +4,7 @@
 
 #include "quiche/quic/core/congestion_control/rtt_stats.h"
 
+#include <algorithm>
 #include <cstdlib>  // std::abs
 
 #include "quiche/quic/platform/api/quic_flag_utils.h"
diff --git a/quiche/quic/core/congestion_control/rtt_stats_test.cc b/quiche/quic/core/congestion_control/rtt_stats_test.cc
index e18e9ba..bbd1e3c 100644
--- a/quiche/quic/core/congestion_control/rtt_stats_test.cc
+++ b/quiche/quic/core/congestion_control/rtt_stats_test.cc
@@ -5,6 +5,7 @@
 #include "quiche/quic/core/congestion_control/rtt_stats.h"
 
 #include <cmath>
+#include <vector>
 
 #include "quiche/quic/platform/api/quic_test.h"
 #include "quiche/quic/test_tools/quic_test_utils.h"
diff --git a/quiche/quic/core/congestion_control/send_algorithm_test.cc b/quiche/quic/core/congestion_control/send_algorithm_test.cc
index 76e61a3..e80bbdb 100644
--- a/quiche/quic/core/congestion_control/send_algorithm_test.cc
+++ b/quiche/quic/core/congestion_control/send_algorithm_test.cc
@@ -5,8 +5,10 @@
 #include <algorithm>
 #include <map>
 #include <memory>
+#include <ostream>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "quiche/quic/core/congestion_control/rtt_stats.h"
diff --git a/quiche/quic/core/congestion_control/uber_loss_algorithm.cc b/quiche/quic/core/congestion_control/uber_loss_algorithm.cc
index cdd8547..1dd5b5f 100644
--- a/quiche/quic/core/congestion_control/uber_loss_algorithm.cc
+++ b/quiche/quic/core/congestion_control/uber_loss_algorithm.cc
@@ -5,6 +5,8 @@
 #include "quiche/quic/core/congestion_control/uber_loss_algorithm.h"
 
 #include <algorithm>
+#include <memory>
+#include <utility>
 
 #include "quiche/quic/core/crypto/crypto_protocol.h"
 #include "quiche/quic/platform/api/quic_bug_tracker.h"
diff --git a/quiche/quic/core/congestion_control/uber_loss_algorithm_test.cc b/quiche/quic/core/congestion_control/uber_loss_algorithm_test.cc
index e2ada18..b9e9fc4 100644
--- a/quiche/quic/core/congestion_control/uber_loss_algorithm_test.cc
+++ b/quiche/quic/core/congestion_control/uber_loss_algorithm_test.cc
@@ -7,6 +7,7 @@
 #include <memory>
 #include <optional>
 #include <utility>
+#include <vector>
 
 #include "quiche/quic/core/congestion_control/rtt_stats.h"
 #include "quiche/quic/core/crypto/crypto_protocol.h"
diff --git a/quiche/quic/core/crypto/aead_base_encrypter.cc b/quiche/quic/core/crypto/aead_base_encrypter.cc
index 481eaa9..928343f 100644
--- a/quiche/quic/core/crypto/aead_base_encrypter.cc
+++ b/quiche/quic/core/crypto/aead_base_encrypter.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/core/crypto/aead_base_encrypter.h"
 
+#include <algorithm>
+
 #include "absl/base/macros.h"
 #include "absl/strings/string_view.h"
 #include "openssl/crypto.h"
diff --git a/quiche/quic/core/crypto/aes_128_gcm_encrypter_test.cc b/quiche/quic/core/crypto/aes_128_gcm_encrypter_test.cc
index 2c04aa7..5c98615 100644
--- a/quiche/quic/core/crypto/aes_128_gcm_encrypter_test.cc
+++ b/quiche/quic/core/crypto/aes_128_gcm_encrypter_test.cc
@@ -6,6 +6,7 @@
 
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "absl/base/macros.h"
 #include "absl/strings/escaping.h"
diff --git a/quiche/quic/core/crypto/aes_base_decrypter.cc b/quiche/quic/core/crypto/aes_base_decrypter.cc
index 2962854..1a05286 100644
--- a/quiche/quic/core/crypto/aes_base_decrypter.cc
+++ b/quiche/quic/core/crypto/aes_base_decrypter.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/core/crypto/aes_base_decrypter.h"
 
+#include <string>
+
 #include "absl/strings/string_view.h"
 #include "openssl/aes.h"
 #include "quiche/quic/platform/api/quic_bug_tracker.h"
diff --git a/quiche/quic/core/crypto/aes_base_encrypter.cc b/quiche/quic/core/crypto/aes_base_encrypter.cc
index 89ab645..f37fc2d 100644
--- a/quiche/quic/core/crypto/aes_base_encrypter.cc
+++ b/quiche/quic/core/crypto/aes_base_encrypter.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/core/crypto/aes_base_encrypter.h"
 
+#include <string>
+
 #include "absl/strings/string_view.h"
 #include "openssl/aes.h"
 #include "quiche/quic/platform/api/quic_bug_tracker.h"
diff --git a/quiche/quic/core/crypto/cert_compressor.cc b/quiche/quic/core/crypto/cert_compressor.cc
index 4357b9c..51302c0 100644
--- a/quiche/quic/core/crypto/cert_compressor.cc
+++ b/quiche/quic/core/crypto/cert_compressor.cc
@@ -8,6 +8,7 @@
 #include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "absl/strings/string_view.h"
 #include "quiche/quic/core/quic_utils.h"
diff --git a/quiche/quic/core/crypto/cert_compressor_test.cc b/quiche/quic/core/crypto/cert_compressor_test.cc
index d98f4c7..57ecc68 100644
--- a/quiche/quic/core/crypto/cert_compressor_test.cc
+++ b/quiche/quic/core/crypto/cert_compressor_test.cc
@@ -6,6 +6,7 @@
 
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "absl/strings/escaping.h"
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/core/crypto/certificate_util.cc b/quiche/quic/core/crypto/certificate_util.cc
index 1f2ce87..3e59987 100644
--- a/quiche/quic/core/crypto/certificate_util.cc
+++ b/quiche/quic/core/crypto/certificate_util.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/core/crypto/certificate_util.h"
 
+#include <string>
+#include <vector>
+
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/core/crypto/certificate_util_test.cc b/quiche/quic/core/crypto/certificate_util_test.cc
index 06d5c4f..4fee179 100644
--- a/quiche/quic/core/crypto/certificate_util_test.cc
+++ b/quiche/quic/core/crypto/certificate_util_test.cc
@@ -4,6 +4,11 @@
 
 #include "quiche/quic/core/crypto/certificate_util.h"
 
+#include <memory>
+#include <optional>
+#include <string>
+#include <utility>
+
 #include "openssl/ssl.h"
 #include "quiche/quic/core/crypto/certificate_view.h"
 #include "quiche/quic/platform/api/quic_test.h"
diff --git a/quiche/quic/core/crypto/certificate_view.cc b/quiche/quic/core/crypto/certificate_view.cc
index 5e83ae7..f5e485e 100644
--- a/quiche/quic/core/crypto/certificate_view.cc
+++ b/quiche/quic/core/crypto/certificate_view.cc
@@ -6,9 +6,12 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <istream>
 #include <memory>
 #include <optional>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/strings/escaping.h"
 #include "absl/strings/match.h"
diff --git a/quiche/quic/core/crypto/certificate_view_der_fuzzer.cc b/quiche/quic/core/crypto/certificate_view_der_fuzzer.cc
index 81c91eb..2ed6606 100644
--- a/quiche/quic/core/crypto/certificate_view_der_fuzzer.cc
+++ b/quiche/quic/core/crypto/certificate_view_der_fuzzer.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <memory>
 #include <string>
 
 #include "quiche/quic/core/crypto/certificate_view.h"
diff --git a/quiche/quic/core/crypto/certificate_view_test.cc b/quiche/quic/core/crypto/certificate_view_test.cc
index 109a205..a1159e8 100644
--- a/quiche/quic/core/crypto/certificate_view_test.cc
+++ b/quiche/quic/core/crypto/certificate_view_test.cc
@@ -8,6 +8,7 @@
 #include <memory>
 #include <sstream>
 #include <string>
+#include <vector>
 
 #include "absl/algorithm/container.h"
 #include "absl/strings/escaping.h"
diff --git a/quiche/quic/core/crypto/chacha20_poly1305_encrypter.cc b/quiche/quic/core/crypto/chacha20_poly1305_encrypter.cc
index 1adad07..f259dea 100644
--- a/quiche/quic/core/crypto/chacha20_poly1305_encrypter.cc
+++ b/quiche/quic/core/crypto/chacha20_poly1305_encrypter.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/core/crypto/chacha20_poly1305_encrypter.h"
 
+#include <limits>
+
 #include "openssl/evp.h"
 
 namespace quic {
diff --git a/quiche/quic/core/crypto/chacha20_poly1305_tls_encrypter.cc b/quiche/quic/core/crypto/chacha20_poly1305_tls_encrypter.cc
index fe6f6b4..0d7c69b 100644
--- a/quiche/quic/core/crypto/chacha20_poly1305_tls_encrypter.cc
+++ b/quiche/quic/core/crypto/chacha20_poly1305_tls_encrypter.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/core/crypto/chacha20_poly1305_tls_encrypter.h"
 
+#include <limits>
+
 #include "openssl/evp.h"
 
 namespace quic {
diff --git a/quiche/quic/core/crypto/chacha_base_decrypter.cc b/quiche/quic/core/crypto/chacha_base_decrypter.cc
index a90c9ef..d24bbc2 100644
--- a/quiche/quic/core/crypto/chacha_base_decrypter.cc
+++ b/quiche/quic/core/crypto/chacha_base_decrypter.cc
@@ -5,6 +5,7 @@
 #include "quiche/quic/core/crypto/chacha_base_decrypter.h"
 
 #include <cstdint>
+#include <string>
 
 #include "absl/base/macros.h"
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/core/crypto/chacha_base_encrypter.cc b/quiche/quic/core/crypto/chacha_base_encrypter.cc
index 8473451..68274da 100644
--- a/quiche/quic/core/crypto/chacha_base_encrypter.cc
+++ b/quiche/quic/core/crypto/chacha_base_encrypter.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/core/crypto/chacha_base_encrypter.h"
 
+#include <string>
+
 #include "absl/base/macros.h"
 #include "absl/strings/string_view.h"
 #include "openssl/chacha.h"
diff --git a/quiche/quic/core/crypto/client_proof_source.cc b/quiche/quic/core/crypto/client_proof_source.cc
index 94c6490..71b4754 100644
--- a/quiche/quic/core/crypto/client_proof_source.cc
+++ b/quiche/quic/core/crypto/client_proof_source.cc
@@ -4,6 +4,11 @@
 
 #include "quiche/quic/core/crypto/client_proof_source.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/core/crypto/client_proof_source_test.cc b/quiche/quic/core/crypto/client_proof_source_test.cc
index 36b9dff..ed2a50d 100644
--- a/quiche/quic/core/crypto/client_proof_source_test.cc
+++ b/quiche/quic/core/crypto/client_proof_source_test.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/core/crypto/client_proof_source.h"
 
+#include <string>
+
 #include "quiche/quic/platform/api/quic_expect_bug.h"
 #include "quiche/quic/platform/api/quic_test.h"
 #include "quiche/quic/test_tools/test_certificates.h"
diff --git a/quiche/quic/core/crypto/crypto_framer.cc b/quiche/quic/core/crypto/crypto_framer.cc
index 57a949e..1fbe19e 100644
--- a/quiche/quic/core/crypto/crypto_framer.cc
+++ b/quiche/quic/core/crypto/crypto_framer.cc
@@ -4,6 +4,7 @@
 
 #include "quiche/quic/core/crypto/crypto_framer.h"
 
+#include <memory>
 #include <string>
 #include <utility>
 
diff --git a/quiche/quic/core/crypto/crypto_handshake_message_test.cc b/quiche/quic/core/crypto/crypto_handshake_message_test.cc
index bdc051c..ef0d740 100644
--- a/quiche/quic/core/crypto/crypto_handshake_message_test.cc
+++ b/quiche/quic/core/crypto/crypto_handshake_message_test.cc
@@ -4,6 +4,9 @@
 
 #include "quiche/quic/core/crypto/crypto_handshake_message.h"
 
+#include <utility>
+#include <vector>
+
 #include "quiche/quic/core/crypto/crypto_handshake.h"
 #include "quiche/quic/core/crypto/crypto_protocol.h"
 #include "quiche/quic/platform/api/quic_test.h"
diff --git a/quiche/quic/core/crypto/crypto_secret_boxer.cc b/quiche/quic/core/crypto/crypto_secret_boxer.cc
index 2be495d..6860bec 100644
--- a/quiche/quic/core/crypto/crypto_secret_boxer.cc
+++ b/quiche/quic/core/crypto/crypto_secret_boxer.cc
@@ -5,7 +5,10 @@
 #include "quiche/quic/core/crypto/crypto_secret_boxer.h"
 
 #include <cstdint>
+#include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/strings/string_view.h"
 #include "openssl/aead.h"
diff --git a/quiche/quic/core/crypto/crypto_utils.cc b/quiche/quic/core/crypto/crypto_utils.cc
index f19c327..ad224c2 100644
--- a/quiche/quic/core/crypto/crypto_utils.cc
+++ b/quiche/quic/core/crypto/crypto_utils.cc
@@ -4,9 +4,12 @@
 
 #include "quiche/quic/core/crypto/crypto_utils.h"
 
+#include <algorithm>
 #include <memory>
+#include <optional>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "absl/base/macros.h"
 #include "absl/strings/str_cat.h"
diff --git a/quiche/quic/core/crypto/crypto_utils_test.cc b/quiche/quic/core/crypto/crypto_utils_test.cc
index 6bc17cf..707c3e2 100644
--- a/quiche/quic/core/crypto/crypto_utils_test.cc
+++ b/quiche/quic/core/crypto/crypto_utils_test.cc
@@ -4,6 +4,7 @@
 
 #include "quiche/quic/core/crypto/crypto_utils.h"
 
+#include <memory>
 #include <string>
 
 #include "absl/base/macros.h"
diff --git a/quiche/quic/core/crypto/curve25519_key_exchange.cc b/quiche/quic/core/crypto/curve25519_key_exchange.cc
index 5340b41..e2401f9 100644
--- a/quiche/quic/core/crypto/curve25519_key_exchange.cc
+++ b/quiche/quic/core/crypto/curve25519_key_exchange.cc
@@ -6,6 +6,7 @@
 
 #include <cstdint>
 #include <cstring>
+#include <memory>
 #include <string>
 
 #include "absl/memory/memory.h"
diff --git a/quiche/quic/core/crypto/key_exchange.cc b/quiche/quic/core/crypto/key_exchange.cc
index 38dea00..45781da 100644
--- a/quiche/quic/core/crypto/key_exchange.cc
+++ b/quiche/quic/core/crypto/key_exchange.cc
@@ -4,6 +4,8 @@
 
 #include "quiche/quic/core/crypto/key_exchange.h"
 
+#include <memory>
+
 #include "absl/strings/string_view.h"
 #include "quiche/quic/core/crypto/curve25519_key_exchange.h"
 #include "quiche/quic/core/crypto/p256_key_exchange.h"
diff --git a/quiche/quic/core/crypto/null_decrypter.cc b/quiche/quic/core/crypto/null_decrypter.cc
index af0c444..f684491 100644
--- a/quiche/quic/core/crypto/null_decrypter.cc
+++ b/quiche/quic/core/crypto/null_decrypter.cc
@@ -5,6 +5,8 @@
 #include "quiche/quic/core/crypto/null_decrypter.h"
 
 #include <cstdint>
+#include <limits>
+#include <string>
 
 #include "absl/numeric/int128.h"
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/core/crypto/null_encrypter.cc b/quiche/quic/core/crypto/null_encrypter.cc
index 87a3f32..abaa458 100644
--- a/quiche/quic/core/crypto/null_encrypter.cc
+++ b/quiche/quic/core/crypto/null_encrypter.cc
@@ -4,6 +4,10 @@
 
 #include "quiche/quic/core/crypto/null_encrypter.h"
 
+#include <algorithm>
+#include <limits>
+#include <string>
+
 #include "absl/numeric/int128.h"
 #include "absl/strings/string_view.h"
 #include "quiche/quic/core/quic_data_writer.h"
diff --git a/quiche/quic/core/crypto/proof_source.cc b/quiche/quic/core/crypto/proof_source.cc
index b340bc5..4114216 100644
--- a/quiche/quic/core/crypto/proof_source.cc
+++ b/quiche/quic/core/crypto/proof_source.cc
@@ -4,7 +4,9 @@
 
 #include "quiche/quic/core/crypto/proof_source.h"
 
+#include <memory>
 #include <string>
+#include <vector>
 
 #include "quiche/quic/platform/api/quic_bug_tracker.h"
 
diff --git a/quiche/quic/core/crypto/proof_source_x509.cc b/quiche/quic/core/crypto/proof_source_x509.cc
index c14722b..bd43786 100644
--- a/quiche/quic/core/crypto/proof_source_x509.cc
+++ b/quiche/quic/core/crypto/proof_source_x509.cc
@@ -6,6 +6,8 @@
 
 #include <memory>
 #include <optional>
+#include <string>
+#include <utility>
 
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
diff --git a/quiche/quic/core/crypto/proof_source_x509_test.cc b/quiche/quic/core/crypto/proof_source_x509_test.cc
index 6db9c75..666859c 100644
--- a/quiche/quic/core/crypto/proof_source_x509_test.cc
+++ b/quiche/quic/core/crypto/proof_source_x509_test.cc
@@ -5,6 +5,8 @@
 #include "quiche/quic/core/crypto/proof_source_x509.h"
 
 #include <memory>
+#include <string>
+#include <utility>
 
 #include "absl/strings/string_view.h"
 #include "openssl/ssl.h"
diff --git a/quiche/quic/core/crypto/quic_client_session_cache.cc b/quiche/quic/core/crypto/quic_client_session_cache.cc
index 32f115d..287d2c0 100644
--- a/quiche/quic/core/crypto/quic_client_session_cache.cc
+++ b/quiche/quic/core/crypto/quic_client_session_cache.cc
@@ -4,6 +4,10 @@
 
 #include "quiche/quic/core/crypto/quic_client_session_cache.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include "quiche/quic/core/quic_clock.h"
 
 namespace quic {
diff --git a/quiche/quic/core/crypto/quic_client_session_cache_test.cc b/quiche/quic/core/crypto/quic_client_session_cache_test.cc
index 82877d6..8438515 100644
--- a/quiche/quic/core/crypto/quic_client_session_cache_test.cc
+++ b/quiche/quic/core/crypto/quic_client_session_cache_test.cc
@@ -4,7 +4,10 @@
 
 #include "quiche/quic/core/crypto/quic_client_session_cache.h"
 
+#include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "quiche/quic/platform/api/quic_test.h"
 #include "quiche/quic/test_tools/mock_clock.h"
diff --git a/quiche/quic/core/crypto/quic_compressed_certs_cache.cc b/quiche/quic/core/crypto/quic_compressed_certs_cache.cc
index dabbf24..e4c6caf 100644
--- a/quiche/quic/core/crypto/quic_compressed_certs_cache.cc
+++ b/quiche/quic/core/crypto/quic_compressed_certs_cache.cc
@@ -4,7 +4,9 @@
 
 #include "quiche/quic/core/crypto/quic_compressed_certs_cache.h"
 
+#include <memory>
 #include <string>
+#include <utility>
 
 namespace quic {
 
diff --git a/quiche/quic/core/crypto/quic_compressed_certs_cache_test.cc b/quiche/quic/core/crypto/quic_compressed_certs_cache_test.cc
index b98f9f2..b68fa65 100644
--- a/quiche/quic/core/crypto/quic_compressed_certs_cache_test.cc
+++ b/quiche/quic/core/crypto/quic_compressed_certs_cache_test.cc
@@ -5,6 +5,7 @@
 #include "quiche/quic/core/crypto/quic_compressed_certs_cache.h"
 
 #include <string>
+#include <vector>
 
 #include "absl/strings/str_cat.h"
 #include "quiche/quic/core/crypto/cert_compressor.h"
diff --git a/quiche/quic/core/crypto/quic_crypto_client_config.cc b/quiche/quic/core/crypto/quic_crypto_client_config.cc
index 3458c69..e0026e8 100644
--- a/quiche/quic/core/crypto/quic_crypto_client_config.cc
+++ b/quiche/quic/core/crypto/quic_crypto_client_config.cc
@@ -7,6 +7,8 @@
 #include <algorithm>
 #include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "absl/base/macros.h"
 #include "absl/memory/memory.h"
diff --git a/quiche/quic/core/crypto/quic_crypto_client_config_test.cc b/quiche/quic/core/crypto/quic_crypto_client_config_test.cc
index 7556592..0367111 100644
--- a/quiche/quic/core/crypto/quic_crypto_client_config_test.cc
+++ b/quiche/quic/core/crypto/quic_crypto_client_config_test.cc
@@ -5,6 +5,7 @@
 #include "quiche/quic/core/crypto/quic_crypto_client_config.h"
 
 #include <string>
+#include <vector>
 
 #include "absl/strings/string_view.h"
 #include "quiche/quic/core/crypto/proof_verifier.h"