diff --git a/hpb_generator/BUILD b/hpb_generator/BUILD
index 27aaf69c6922a..b0adef8eed91f 100644
--- a/hpb_generator/BUILD
+++ b/hpb_generator/BUILD
@@ -115,6 +115,7 @@ cc_library(
         "//src/google/protobuf",
         "//src/google/protobuf/compiler:code_generator",
         "@abseil-cpp//absl/log:absl_check",
+        "@abseil-cpp//absl/log:absl_log",
         "@abseil-cpp//absl/strings",
         "@abseil-cpp//absl/strings:string_view",
     ],
diff --git a/hpb_generator/gen_enums.cc b/hpb_generator/gen_enums.cc
index 3fb171e2ea2fe..013acd328aa80 100644
--- a/hpb_generator/gen_enums.cc
+++ b/hpb_generator/gen_enums.cc
@@ -8,6 +8,8 @@
 #include "hpb_generator/gen_enums.h"
 
 #include <algorithm>
+#include <cstddef>
+#include <cstdint>
 #include <deque>
 #include <limits>
 #include <string>
@@ -18,7 +20,6 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "hpb_generator/context.h"
-#include "hpb_generator/gen_utils.h"
 #include "hpb_generator/names.h"
 #include "google/protobuf/descriptor.h"
 
diff --git a/hpb_generator/gen_extensions.cc b/hpb_generator/gen_extensions.cc
index 4832be1d51bcb..70478d243ab43 100644
--- a/hpb_generator/gen_extensions.cc
+++ b/hpb_generator/gen_extensions.cc
@@ -7,6 +7,7 @@
 
 #include "hpb_generator/gen_extensions.h"
 
+#include <cassert>
 #include <string>
 #include <vector>
 
diff --git a/hpb_generator/gen_repeated_fields.cc b/hpb_generator/gen_repeated_fields.cc
index c8bc0432a954a..566c073ec4053 100644
--- a/hpb_generator/gen_repeated_fields.cc
+++ b/hpb_generator/gen_repeated_fields.cc
@@ -7,16 +7,9 @@
 
 #include "hpb_generator/gen_repeated_fields.h"
 
-#include <string>
-#include <vector>
-
 #include "google/protobuf/descriptor.pb.h"
 #include "absl/strings/string_view.h"
 #include "hpb_generator/context.h"
-#include "hpb_generator/gen_accessors.h"
-#include "hpb_generator/gen_enums.h"
-#include "hpb_generator/gen_extensions.h"
-#include "hpb_generator/gen_utils.h"
 #include "hpb_generator/names.h"
 #include "google/protobuf/descriptor.h"
 #include "upb_generator/c/names.h"
diff --git a/hpb_generator/names.cc b/hpb_generator/names.cc
index 1e4cbae7ceae2..4145d8bd1b638 100644
--- a/hpb_generator/names.cc
+++ b/hpb_generator/names.cc
@@ -10,7 +10,9 @@
 #include <string>
 
 #include "absl/log/absl_check.h"
+#include "absl/log/absl_log.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/str_replace.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/compiler/code_generator.h"
 #include "hpb_generator/keywords.h"
diff --git a/hpb_generator/names.h b/hpb_generator/names.h
index 9e24a4614e9ce..6da611cdc4157 100644
--- a/hpb_generator/names.h
+++ b/hpb_generator/names.h
@@ -11,7 +11,9 @@
 #include <string>
 
 #include "google/protobuf/descriptor.pb.h"
+#include "absl/strings/string_view.h"
 #include "hpb_generator/context.h"
+#include "google/protobuf/descriptor.h"
 
 namespace google {
 namespace protobuf {