diff --git a/build/source_list.bzl b/build/source_list.bzl
index a884643..1db4c11 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -1458,6 +1458,7 @@
     "common/platform/default/quiche_platform_impl/quiche_server_stats_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_stack_trace_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_testvalue_impl.h",
+    "common/platform/default/quiche_platform_impl/quiche_thread_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_time_utils_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_udp_socket_platform_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_url_utils_impl.h",
@@ -1487,7 +1488,6 @@
     "common/platform/default/quiche_platform_impl/quiche_test_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_test_loopback_impl.h",
     "common/platform/default/quiche_platform_impl/quiche_test_output_impl.h",
-    "common/platform/default/quiche_platform_impl/quiche_thread_impl.h",
 ]
 default_platform_impl_test_support_srcs = [
     "common/platform/default/quiche_platform_impl/quiche_test_impl.cc",
diff --git a/build/source_list.gni b/build/source_list.gni
index 6a59ba3..1a4a39c 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -1462,6 +1462,7 @@
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_server_stats_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_stack_trace_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_testvalue_impl.h",
+    "src/quiche/common/platform/default/quiche_platform_impl/quiche_thread_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_time_utils_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_udp_socket_platform_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_url_utils_impl.h",
@@ -1491,7 +1492,6 @@
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_test_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_test_loopback_impl.h",
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_test_output_impl.h",
-    "src/quiche/common/platform/default/quiche_platform_impl/quiche_thread_impl.h",
 ]
 default_platform_impl_test_support_srcs = [
     "src/quiche/common/platform/default/quiche_platform_impl/quiche_test_impl.cc",
diff --git a/build/source_list.json b/build/source_list.json
index 6cf0923..5db7d3a 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -1461,6 +1461,7 @@
     "quiche/common/platform/default/quiche_platform_impl/quiche_server_stats_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_stack_trace_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_testvalue_impl.h",
+    "quiche/common/platform/default/quiche_platform_impl/quiche_thread_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_time_utils_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_udp_socket_platform_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_url_utils_impl.h"
@@ -1489,8 +1490,7 @@
     "quiche/common/platform/default/quiche_platform_impl/quiche_expect_bug_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_test_impl.h",
     "quiche/common/platform/default/quiche_platform_impl/quiche_test_loopback_impl.h",
-    "quiche/common/platform/default/quiche_platform_impl/quiche_test_output_impl.h",
-    "quiche/common/platform/default/quiche_platform_impl/quiche_thread_impl.h"
+    "quiche/common/platform/default/quiche_platform_impl/quiche_test_output_impl.h"
   ],
   "default_platform_impl_test_support_srcs": [
     "quiche/common/platform/default/quiche_platform_impl/quiche_test_impl.cc",
diff --git a/quiche/BUILD.bazel b/quiche/BUILD.bazel
index 94dcf51..e3bf35d 100644
--- a/quiche/BUILD.bazel
+++ b/quiche/BUILD.bazel
@@ -110,6 +110,7 @@
         "@boringssl//:crypto",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/base:log_severity",
+        "@com_google_absl//absl/container:btree",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/debugging:stacktrace",
@@ -156,6 +157,7 @@
         "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/flags:parse",
         "@com_google_absl//absl/flags:usage",
+        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest",
     ],
 )
@@ -289,6 +291,7 @@
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
+        "@com_google_absl//absl/time",
         "@com_google_absl//absl/types:optional",
         "@com_google_absl//absl/types:span",
         "@com_google_absl//absl/types:variant",
diff --git a/quiche/balsa/http_validation_policy.h b/quiche/balsa/http_validation_policy.h
index 1710510..74fe42f 100644
--- a/quiche/balsa/http_validation_policy.h
+++ b/quiche/balsa/http_validation_policy.h
@@ -5,6 +5,7 @@
 #ifndef QUICHE_BALSA_HTTP_VALIDATION_POLICY_H_
 #define QUICHE_BALSA_HTTP_VALIDATION_POLICY_H_
 
+#include <cstdint>
 #include <ostream>
 
 #include "quiche/common/platform/api/quiche_export.h"