From 6fdc9b2ca6e2ce020f2a1c35fa55188030d364a6 Mon Sep 17 00:00:00 2001
From: Protobuf Team Bot <protobuf-github-bot@google.com>
Date: Thu, 25 Jun 2026 18:47:26 -0700
Subject: [PATCH] Automated Code Change

PiperOrigin-RevId: 938309247
---
 src/google/protobuf/io/printer_death_test.cc  | 7 +------
 src/google/protobuf/io/printer_unittest.cc    | 2 ++
 src/google/protobuf/io/tokenizer_unittest.cc  | 8 ++++++--
 src/google/protobuf/io/zero_copy_sink.cc      | 1 +
 src/google/protobuf/io/zero_copy_sink.h       | 1 +
 src/google/protobuf/io/zero_copy_sink_test.cc | 3 ++-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/google/protobuf/io/printer_death_test.cc b/src/google/protobuf/io/printer_death_test.cc
index 3c2712887c72d..917b5040e44e4 100644
--- a/src/google/protobuf/io/printer_death_test.cc
+++ b/src/google/protobuf/io/printer_death_test.cc
@@ -9,23 +9,18 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-#include <ostream>
+#include <cstddef>
 #include <string>
-#include <tuple>
 #include <vector>
 
 #include "google/protobuf/descriptor.pb.h"
-#include <gmock/gmock.h>
-#include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "absl/container/flat_hash_map.h"
 #include "absl/log/absl_check.h"
-#include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "google/protobuf/io/printer.h"
 #include "google/protobuf/io/zero_copy_stream.h"
-#include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
 
 namespace google {
diff --git a/src/google/protobuf/io/printer_unittest.cc b/src/google/protobuf/io/printer_unittest.cc
index f1c31c9473c4a..e37e43a5ce227 100644
--- a/src/google/protobuf/io/printer_unittest.cc
+++ b/src/google/protobuf/io/printer_unittest.cc
@@ -11,6 +11,7 @@
 
 #include "google/protobuf/io/printer.h"
 
+#include <cstddef>
 #include <ostream>
 #include <string>
 #include <vector>
@@ -23,6 +24,7 @@
 #include "absl/strings/str_join.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "absl/types/span.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
 
diff --git a/src/google/protobuf/io/tokenizer_unittest.cc b/src/google/protobuf/io/tokenizer_unittest.cc
index e166d92fe2281..78ae4f7f88101 100644
--- a/src/google/protobuf/io/tokenizer_unittest.cc
+++ b/src/google/protobuf/io/tokenizer_unittest.cc
@@ -14,16 +14,20 @@
 #include <math.h>
 
 #include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
 #include <limits>
+#include <ostream>
 #include <string>
 #include <vector>
 
 #include <gmock/gmock.h>
 #include "absl/base/macros.h"
 #include "absl/strings/escaping.h"
+#include "absl/strings/string_view.h"
 #include "absl/strings/substitute.h"
-#include "google/protobuf/io/zero_copy_stream_impl.h"
-#include "google/protobuf/testing/googletest.h"
+#include "google/protobuf/io/zero_copy_stream_impl_lite.h"
 #include <gtest/gtest.h>
 
 namespace google {
diff --git a/src/google/protobuf/io/zero_copy_sink.cc b/src/google/protobuf/io/zero_copy_sink.cc
index 60d0a45832543..4f43ee0be725d 100644
--- a/src/google/protobuf/io/zero_copy_sink.cc
+++ b/src/google/protobuf/io/zero_copy_sink.cc
@@ -9,6 +9,7 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <cstring>
 
 namespace google {
 namespace protobuf {
diff --git a/src/google/protobuf/io/zero_copy_sink.h b/src/google/protobuf/io/zero_copy_sink.h
index 7cd9308b38820..2961b10935f5c 100644
--- a/src/google/protobuf/io/zero_copy_sink.h
+++ b/src/google/protobuf/io/zero_copy_sink.h
@@ -10,6 +10,7 @@
 
 #include <cstddef>
 
+#include "absl/strings/string_view.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/port.h"
 
diff --git a/src/google/protobuf/io/zero_copy_sink_test.cc b/src/google/protobuf/io/zero_copy_sink_test.cc
index d0eeb2b165367..559857ba73604 100644
--- a/src/google/protobuf/io/zero_copy_sink_test.cc
+++ b/src/google/protobuf/io/zero_copy_sink_test.cc
@@ -7,8 +7,8 @@
 
 #include "google/protobuf/io/zero_copy_sink.h"
 
-#include <algorithm>
 #include <array>
+#include <cstddef>
 #include <cstdint>
 #include <string>
 #include <vector>
@@ -18,6 +18,7 @@
 #include "absl/strings/escaping.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
+#include "google/protobuf/io/zero_copy_stream.h"
 
 namespace google {
 namespace protobuf {