diff --git a/source/common/quic/BUILD b/source/common/quic/BUILD
index ef15d3436155..18f719f70ce3 100644
--- a/source/common/quic/BUILD
+++ b/source/common/quic/BUILD
@@ -542,6 +542,7 @@ envoy_cc_library(
     hdrs = ["send_buffer_monitor.h"],
     tags = ["nofips"],
     deps = [
+        "//source/common/common:assert_lib",
         "@com_github_google_quiche//:quic_core_session_lib",
     ],
 )
@@ -551,7 +552,9 @@ envoy_cc_library(
     hdrs = ["envoy_quic_client_crypto_stream_factory.h"],
     tags = ["nofips"],
     deps = [
+        "//envoy/common:optref_lib",
         "//envoy/config:typed_config_interface",
+        "//envoy/network:transport_socket_interface",
         "@com_github_google_quiche//:quic_client_session_lib",
         "@com_github_google_quiche//:quic_core_http_spdy_session_lib",
     ],
@@ -607,6 +610,7 @@ envoy_cc_library(
     tags = ["nofips"],
     deps = [
         "//envoy/access_log:access_log_interface",
+        "//envoy/http:codec_interface",
         "//source/common/http:header_map_lib",
         "@com_github_google_quiche//:quic_core_ack_listener_interface_lib",
     ],
@@ -618,6 +622,7 @@ envoy_cc_library(
     hdrs = ["http_datagram_handler.h"],
     deps = [
         "//envoy/http:codec_interface",
+        "//source/common/buffer:buffer_lib",
         "//source/common/common:logger_lib",
         "//source/common/http:header_map_lib",
         "@com_github_google_quiche//:quic_core_http_spdy_session_lib",
diff --git a/source/common/quic/http_datagram_handler.cc b/source/common/quic/http_datagram_handler.cc
index 1af50e90a510..3ff34d2e524b 100644
--- a/source/common/quic/http_datagram_handler.cc
+++ b/source/common/quic/http_datagram_handler.cc
@@ -1,10 +1,12 @@
 #include "source/common/quic/http_datagram_handler.h"
 
+#include "source/common/buffer/buffer_impl.h"
 #include "source/common/common/logger.h"
 #include "source/common/http/header_map_impl.h"
 
 #include "absl/strings/string_view.h"
-#include "quiche/common/simple_buffer_allocator.h"
+#include "quiche/common/capsule.h"
+#include "quiche/common/quiche_buffer_allocator.h"
 #include "quiche/quic/core/http/quic_spdy_stream.h"
 
 namespace Envoy {
diff --git a/source/common/quic/send_buffer_monitor.cc b/source/common/quic/send_buffer_monitor.cc
index b949f0a89782..0eb32a561647 100644
--- a/source/common/quic/send_buffer_monitor.cc
+++ b/source/common/quic/send_buffer_monitor.cc
@@ -1,5 +1,7 @@
 #include "source/common/quic/send_buffer_monitor.h"
 
+#include "source/common/common/assert.h"
+
 namespace Envoy {
 namespace Quic {
 
diff --git a/test/common/quic/BUILD b/test/common/quic/BUILD
index 57d96dfbec4b..42d2ee0d70ad 100644
--- a/test/common/quic/BUILD
+++ b/test/common/quic/BUILD
@@ -395,6 +395,7 @@ envoy_cc_test_library(
     tags = ["nofips"],
     deps = [
         ":envoy_quic_h3_fuzz_proto_cc_proto",
+        "//source/common/common:assert_lib",
         "@com_github_google_quiche//:quic_test_tools_test_utils_lib",
     ],
 )
diff --git a/test/common/quic/envoy_quic_h3_fuzz_helper.h b/test/common/quic/envoy_quic_h3_fuzz_helper.h
index 755ce18bdb40..646602cefbd5 100644
--- a/test/common/quic/envoy_quic_h3_fuzz_helper.h
+++ b/test/common/quic/envoy_quic_h3_fuzz_helper.h
@@ -2,6 +2,8 @@
 
 #include <set>
 
+#include "source/common/common/assert.h"
+
 #include "test/common/quic/envoy_quic_h3_fuzz.pb.h"
 
 #include "quiche/quic/core/crypto/null_decrypter.h"