Automated Code Change

PiperOrigin-RevId: 837971053

Author: protobuf-github-bot

src/google/protobuf/util/delimited_message_util.cc

@@ -10,7 +10,14 @@
 
 #include "google/protobuf/util/delimited_message_util.h"
 
+#include <climits>
+#include <cstddef>
+#include <cstdint>
+#include <ostream>
+
 #include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/io/zero_copy_stream_impl.h"
+#include "google/protobuf/message_lite.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/util/delimited_message_util_test.cc

@@ -10,13 +10,14 @@
 
 #include "google/protobuf/util/delimited_message_util.h"
 
+#include <cstddef>
 #include <sstream>
+#include <string>
 
-#include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
+#include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest_import.pb.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/util/field_comparator.cc

@@ -12,7 +12,6 @@
 #include <algorithm>
 #include <cfloat>
 #include <cmath>
-#include <limits>
 #include <string>
 
 #include "absl/log/absl_check.h"

src/google/protobuf/util/field_mask_util.cc

@@ -12,15 +12,18 @@
 #include <string>
 #include <vector>
 
+#include "google/protobuf/field_mask.pb.h"
 #include "absl/container/btree_map.h"
 #include "absl/log/absl_check.h"
 #include "absl/log/absl_log.h"
 #include "absl/log/die_if_null.h"
 #include "absl/memory/memory.h"
+#include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/message.h"
 
 // Must be included last.

src/google/protobuf/util/field_mask_util_test.cc

@@ -9,10 +9,13 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <string>
 #include <vector>
 
 #include "google/protobuf/field_mask.pb.h"
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
+#include "absl/base/log_severity.h"
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/unittest.pb.h"
 

src/google/protobuf/util/message_differencer.cc

@@ -12,11 +12,13 @@
 #include "google/protobuf/util/message_differencer.h"
 
 #include <algorithm>
+#include <cassert>
 #include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <limits>
 #include <memory>
+#include <string>
 #include <utility>
 #include <vector>
 
@@ -29,10 +31,9 @@
 #include "absl/strings/str_format.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/dynamic_message.h"
-#include "google/protobuf/generated_enum_reflection.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"
 #include "google/protobuf/map_field.h"
 #include "google/protobuf/message.h"
 #include "google/protobuf/text_format.h"

src/google/protobuf/util/message_differencer_unittest.cc

@@ -14,22 +14,26 @@
 #include "google/protobuf/util/message_differencer.h"
 
 #include <algorithm>
+#include <cstddef>
+#include <cstdlib>
+#include <memory>
 #include <random>
 #include <string>
 #include <vector>
 
-#include "google/protobuf/stubs/common.h"
 #include <gmock/gmock.h>
-#include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
+#include "absl/base/macros.h"
 #include "absl/functional/bind_front.h"
 #include "absl/log/absl_check.h"
 #include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
+#include "absl/synchronization/notification.h"
 #include "google/protobuf/any_test.pb.h"
 #include "google/protobuf/descriptor.h"
+#include "google/protobuf/io/zero_copy_stream_impl_lite.h"
 #include "google/protobuf/map_test_util.h"
 #include "google/protobuf/map_unittest.pb.h"
 #include "google/protobuf/message.h"
@@ -41,7 +45,6 @@
 #include "google/protobuf/util/message_differencer_unittest.pb.h"
 #include "google/protobuf/util/message_differencer_unittest_proto3.pb.h"
 #include "google/protobuf/wire_format.h"
-#include "google/protobuf/wire_format_lite.h"
 
 
 namespace google {

src/google/protobuf/util/time_util_test.cc

@@ -12,9 +12,9 @@
 
 #include "google/protobuf/duration.pb.h"
 #include "google/protobuf/timestamp.pb.h"
-#include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "google/protobuf/util/internal_timeval.h"  // IWYU pragma: keep for timeval
+#include "google/protobuf/util/time_util.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/util/type_resolver_util.cc

@@ -23,6 +23,7 @@
 #include "absl/strings/strip.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/strtod.h"
+#include "google/protobuf/repeated_ptr_field.h"
 #include "google/protobuf/util/type_resolver.h"
 
 // clang-format off

src/google/protobuf/util/type_resolver_util_test.cc

@@ -15,17 +15,18 @@
 #include "google/protobuf/type.pb.h"
 #include "google/protobuf/wrappers.pb.h"
 #include "google/protobuf/descriptor.pb.h"
+#include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "absl/log/absl_check.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/util/json_format_proto3.pb.h"
 #include "google/protobuf/map_unittest.pb.h"
+#include "google/protobuf/repeated_ptr_field.h"
 #include "google/protobuf/test_textproto.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_custom_options.pb.h"
-#include "google/protobuf/unittest_import.pb.h"
 #include "google/protobuf/util/type_resolver.h"
 
 namespace google {