Internal change

PiperOrigin-RevId: 665382029

conformance/binary_json_conformance_suite.cc

@@ -36,8 +36,6 @@
 #include "google/protobuf/endian.h"
 #include "google/protobuf/json/json.h"
 #include "google/protobuf/test_messages_proto2.pb.h"
-#include "google/protobuf/test_messages_proto2.pb.h"
-#include "google/protobuf/test_messages_proto3.pb.h"
 #include "google/protobuf/test_messages_proto3.pb.h"
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/unknown_field_set.h"

conformance/conformance_cpp.cc

@@ -22,7 +22,6 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "conformance/conformance.pb.h"
-#include "conformance/conformance.pb.h"
 #include "conformance/test_protos/test_messages_edition2023.pb.h"
 #include "editions/golden/test_messages_proto2_editions.pb.h"
 #include "editions/golden/test_messages_proto3_editions.pb.h"
@@ -31,7 +30,6 @@
 #include "google/protobuf/message.h"
 #include "google/protobuf/test_messages_proto2.pb.h"
 #include "google/protobuf/test_messages_proto3.pb.h"
-#include "google/protobuf/test_messages_proto3.pb.h"
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/util/json_util.h"
 #include "google/protobuf/util/type_resolver.h"

conformance/conformance_test.cc

@@ -29,7 +29,6 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "conformance/conformance.pb.h"
-#include "conformance/conformance.pb.h"
 #include "failure_list_trie_node.h"
 #include "google/protobuf/descriptor_legacy.h"
 #include "google/protobuf/endian.h"

conformance/conformance_test.h

@@ -25,7 +25,6 @@
 #include "absl/container/btree_map.h"
 #include "absl/container/flat_hash_set.h"
 #include "conformance/conformance.pb.h"
-#include "conformance/conformance.pb.h"
 #include "failure_list_trie_node.h"
 #include "google/protobuf/descriptor.h"
 

conformance/conformance_test_runner.cc

@@ -55,7 +55,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "conformance/conformance.pb.h"
-#include "conformance/conformance.pb.h"
 #include "conformance_test.h"
 #include "google/protobuf/endian.h"
 

hpb_generator/gen_enums.cc

@@ -13,9 +13,9 @@
 #include <vector>
 
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor.h"
 #include "google/protobuf/compiler/hpb/gen_utils.h"
 #include "google/protobuf/compiler/hpb/names.h"
+#include "google/protobuf/descriptor.h"
 
 namespace google::protobuf::hpb_generator {
 

src/google/protobuf/compiler/command_line_interface_unittest.cc

@@ -51,6 +51,7 @@
 #include "google/protobuf/test_util2.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_custom_options.pb.h"
+#include "google/protobuf/unittest_import.pb.h"
 
 #ifdef GOOGLE_PROTOBUF_USE_BAZEL_GENERATED_PLUGIN_PATHS
 // This is needed because of https://github.com/bazelbuild/bazel/issues/19124.

src/google/protobuf/compiler/cpp/metadata_test.cc

@@ -12,7 +12,6 @@
 #include "google/protobuf/compiler/cpp/generator.h"
 #include "google/protobuf/compiler/command_line_interface.h"
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor.pb.h"
 #include <gtest/gtest.h>
 #include "absl/log/absl_check.h"
 #include "google/protobuf/compiler/annotation_test_util.h"

src/google/protobuf/compiler/csharp/csharp_generator_unittest.cc

@@ -8,8 +8,8 @@
 #include <memory>
 
 #include "google/protobuf/any.pb.h"
-#include "google/protobuf/compiler/command_line_interface.h"
 #include <gtest/gtest.h>
+#include "google/protobuf/compiler/command_line_interface.h"
 #include "google/protobuf/compiler/csharp/csharp_helpers.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/io/printer.h"

src/google/protobuf/descriptor_unittest.cc

@@ -30,7 +30,6 @@
 
 #include "google/protobuf/any.pb.h"
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor.pb.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "absl/base/log_severity.h"

src/google/protobuf/extension_set_unittest.cc

@@ -32,8 +32,8 @@
 #include "google/protobuf/test_util2.h"
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_mset.pb.h"
+#include "google/protobuf/unittest_mset_wire_format.pb.h"
 #include "google/protobuf/unittest_proto3_extensions.pb.h"
 #include "google/protobuf/wire_format.h"
 #include "google/protobuf/wire_format_lite.h"

src/google/protobuf/generated_message_reflection_unittest.cc

@@ -38,7 +38,6 @@
 #include "google/protobuf/message.h"
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_mset.pb.h"
 #include "google/protobuf/unittest_mset_wire_format.pb.h"
 #include "google/protobuf/unittest_proto3.pb.h"

src/google/protobuf/map_lite_test_util.cc

@@ -9,6 +9,7 @@
 
 #include "google/protobuf/map_lite_unittest.pb.h"
 #include "google/protobuf/map_test_util_impl.h"
+#include "google/protobuf/unittest_lite.pb.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/proto3_arena_unittest.cc

@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "google/protobuf/descriptor.pb.h"
 #include <gtest/gtest.h>
 #include "absl/log/absl_check.h"
 #include "absl/strings/match.h"

src/google/protobuf/test_util.inc

@@ -19,6 +19,7 @@
 #include "absl/log/absl_check.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/message.h"
+#include "google/protobuf/unittest_import.pb.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/test_util_lite.cc

@@ -13,6 +13,7 @@
 
 #include <gtest/gtest.h>
 #include "absl/strings/string_view.h"
+#include "google/protobuf/unittest_import_lite.pb.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/text_format_unittest.cc

@@ -45,7 +45,6 @@
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/test_util2.h"
 #include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_delimited.pb.h"
 #include "google/protobuf/unittest_mset.pb.h"
 #include "google/protobuf/unittest_mset_wire_format.pb.h"

src/google/protobuf/util/BUILD.bazel

@@ -208,6 +208,7 @@ cc_library(
     visibility = ["//:__subpackages__"],
     deps = [
         "//src/google/protobuf",
+        "//src/google/protobuf:any_cc_proto",
         "//src/google/protobuf:descriptor_legacy",
         "//src/google/protobuf:port",
         "//src/google/protobuf:source_context_cc_proto",

src/google/protobuf/util/type_resolver.h

@@ -12,6 +12,9 @@
 
 #include <string>
 
+// This inclusion is unused, but we cannot remove it without first fixing IWYU
+// issues in upstream dependencies.
+#include "google/protobuf/any.pb.h"  // IWYU pragma: keep
 #include "google/protobuf/type.pb.h"
 #include "absl/status/status.h"
 #include "google/protobuf/port.h"

src/google/protobuf/util/type_resolver_util.cc

@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include "google/protobuf/any.pb.h"
 #include "google/protobuf/source_context.pb.h"
 #include "google/protobuf/type.pb.h"
 #include "google/protobuf/wrappers.pb.h"