diff --git a/hpb/backend/upb/BUILD b/hpb/backend/upb/BUILD
index 5771bbf503fa7..4c415b6ca1542 100644
--- a/hpb/backend/upb/BUILD
+++ b/hpb/backend/upb/BUILD
@@ -75,7 +75,9 @@ cc_library(
     visibility = ["//hpb:__subpackages__"],
     deps = [
         ":interop",
+        "//hpb:ptr",
         "//hpb:status",
+        "//hpb/internal",
         "//hpb/internal:message_lock",
         "//hpb/internal:template_help",
         "//upb/base",
diff --git a/hpb/backend/upb/extension.h b/hpb/backend/upb/extension.h
index 3f8644ea16427..df7ee045dfc33 100644
--- a/hpb/backend/upb/extension.h
+++ b/hpb/backend/upb/extension.h
@@ -14,8 +14,10 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "hpb/backend/upb/interop.h"
+#include "hpb/internal/internal.h"
 #include "hpb/internal/message_lock.h"
 #include "hpb/internal/template_help.h"
+#include "hpb/ptr.h"
 #include "hpb/status.h"
 #include "upb/base/string_view.h"
 #include "upb/mem/arena.h"
diff --git a/hpb/backend/upb/repeated_field_iterator_test.cc b/hpb/backend/upb/repeated_field_iterator_test.cc
index d6789795df9bd..e1c8f74277368 100644
--- a/hpb/backend/upb/repeated_field_iterator_test.cc
+++ b/hpb/backend/upb/repeated_field_iterator_test.cc
@@ -9,7 +9,9 @@
 
 #include <algorithm>
 #include <array>
+#include <cstring>
 #include <numeric>
+#include <string>
 #include <tuple>
 #include <type_traits>
 #include <utility>