From 55b96736f66a3615e5c4b79d25f4caeeb2a93cd3 Mon Sep 17 00:00:00 2001
From: Protobuf Team Bot <protobuf-github-bot@google.com>
Date: Fri, 24 Jul 2026 18:24:34 -0700
Subject: [PATCH] Internal change

PiperOrigin-RevId: 953649846
---
 hpb_generator/BUILD                  | 1 +
 hpb_generator/gen_enums.cc           | 3 ++-
 hpb_generator/gen_extensions.cc      | 1 +
 hpb_generator/gen_repeated_fields.cc | 5 -----
 hpb_generator/generator.cc           | 1 +
 hpb_generator/names.cc               | 2 ++
 hpb_generator/names.h                | 2 ++
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/hpb_generator/BUILD b/hpb_generator/BUILD
index 5ecea80584fe4..664aaf539cdd3 100644
--- a/hpb_generator/BUILD
+++ b/hpb_generator/BUILD
@@ -116,6 +116,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 ca1d69d12ca80..5f1162541e83c 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/keywords.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 2938ef0408129..2e3f60ed71c0c 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 a723ac5c4a106..c72b03cf14987 100644
--- a/hpb_generator/gen_repeated_fields.cc
+++ b/hpb_generator/gen_repeated_fields.cc
@@ -8,16 +8,11 @@
 #include "hpb_generator/gen_repeated_fields.h"
 
 #include <string>
-#include <vector>
 
 #include "google/protobuf/descriptor.pb.h"
 #include "absl/strings/str_cat.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 "google/protobuf/io/printer.h"
diff --git a/hpb_generator/generator.cc b/hpb_generator/generator.cc
index 50fbf97b42819..114e1f093cc40 100644
--- a/hpb_generator/generator.cc
+++ b/hpb_generator/generator.cc
@@ -24,6 +24,7 @@
 #include "hpb_generator/gen_utils.h"
 #include "hpb_generator/names.h"
 #include "google/protobuf/descriptor.h"
+#include "google/protobuf/io/printer.h"
 #include "upb_generator/c/names.h"
 #include "upb_generator/minitable/names.h"
 
diff --git a/hpb_generator/names.cc b/hpb_generator/names.cc
index 739983fabbf19..b7abea6902f6f 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 {