Internal change.

PiperOrigin-RevId: 559105716

conformance/binary_json_conformance_suite.cc

@@ -35,7 +35,6 @@
 #include <utility>
 #include <vector>
 
-#include "google/protobuf/text_format.h"
 #include "google/protobuf/util/json_util.h"
 #include "google/protobuf/util/type_resolver_util.h"
 #include "absl/log/absl_check.h"
@@ -48,6 +47,7 @@
 #include "google/protobuf/endian.h"
 #include "google/protobuf/test_messages_proto2.pb.h"
 #include "google/protobuf/test_messages_proto3.pb.h"
+#include "google/protobuf/text_format.h"
 #include "google/protobuf/wire_format_lite.h"
 
 namespace proto2_messages = protobuf_test_messages::proto2;

conformance/binary_json_conformance_suite.h

@@ -31,9 +31,9 @@
 #ifndef CONFORMANCE_BINARY_JSON_CONFORMANCE_SUITE_H
 #define CONFORMANCE_BINARY_JSON_CONFORMANCE_SUITE_H
 
-#include "google/protobuf/descriptor.h"
 #include "json/json.h"
 #include "conformance_test.h"
+#include "google/protobuf/descriptor.h"
 
 namespace google {
 namespace protobuf {

conformance/conformance_cpp.cc

@@ -36,8 +36,6 @@
 #include <string>
 #include <utility>
 
-#include "google/protobuf/message.h"
-#include "google/protobuf/text_format.h"
 #include "google/protobuf/util/json_util.h"
 #include "google/protobuf/util/type_resolver_util.h"
 #include "absl/log/absl_check.h"
@@ -47,9 +45,11 @@
 #include "conformance/conformance.pb.h"
 #include "conformance/conformance.pb.h"
 #include "google/protobuf/endian.h"
+#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/type_resolver.h"
 #include "google/protobuf/stubs/status_macros.h"
 

conformance/conformance_test.cc

@@ -35,8 +35,6 @@
 #include <fstream>
 #include <string>
 
-#include "google/protobuf/message.h"
-#include "google/protobuf/text_format.h"
 #include "google/protobuf/util/field_comparator.h"
 #include "google/protobuf/util/json_util.h"
 #include "google/protobuf/util/message_differencer.h"
@@ -47,6 +45,8 @@
 #include "conformance/conformance.pb.h"
 #include "conformance/conformance.pb.h"
 #include "google/protobuf/descriptor_legacy.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/text_format.h"
 
 using conformance::ConformanceRequest;
 using conformance::ConformanceResponse;

conformance/conformance_test.h

@@ -42,11 +42,11 @@
 #include <string>
 #include <vector>
 
-#include "google/protobuf/descriptor.h"
 #include "google/protobuf/util/type_resolver.h"
 #include "absl/container/btree_set.h"
 #include "absl/container/flat_hash_set.h"
 #include "conformance/conformance.pb.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/wire_format_lite.h"
 
 namespace conformance {

conformance/text_format_conformance_suite.cc

@@ -31,12 +31,12 @@
 #include "text_format_conformance_suite.h"
 
 #include "google/protobuf/any.pb.h"
-#include "google/protobuf/text_format.h"
 #include "absl/log/absl_log.h"
 #include "absl/strings/str_cat.h"
 #include "conformance_test.h"
 #include "google/protobuf/test_messages_proto2.pb.h"
 #include "google/protobuf/test_messages_proto3.pb.h"
+#include "google/protobuf/text_format.h"
 
 namespace proto2_messages = protobuf_test_messages::proto2;
 

src/google/protobuf/arenastring_unittest.cc

@@ -37,12 +37,11 @@
 #include <utility>
 #include <vector>
 
-#include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/message_lite.h"
 #include <gtest/gtest.h>
 #include "absl/log/absl_check.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/explicitly_constructed.h"
+#include "google/protobuf/generated_message_util.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/message_lite.h"

src/google/protobuf/compiler/code_generator.cc

@@ -36,13 +36,13 @@
 
 #include <utility>
 
-#include "google/protobuf/descriptor.h"
 #include "absl/log/absl_log.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
 #include "google/protobuf/compiler/plugin.pb.h"
+#include "google/protobuf/descriptor.h"
 
 namespace google {
 namespace protobuf {

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

@@ -49,13 +49,13 @@
 #include "google/protobuf/testing/file.h"
 #include "google/protobuf/compiler/cpp/generator.h"
 #include "google/protobuf/compiler/importer.h"
-#include "google/protobuf/descriptor.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/substitute.h"
 #include "google/protobuf/compiler/cpp/helpers.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/test_util2.h"
 

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

@@ -41,13 +41,13 @@
 #include <utility>
 #include <vector>
 
-#include "google/protobuf/descriptor.h"
 #include "absl/container/btree_map.h"
 #include "absl/container/btree_set.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/str_cat.h"
 #include "google/protobuf/compiler/cpp/helpers.h"
 #include "google/protobuf/compiler/cpp/names.h"
+#include "google/protobuf/descriptor.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/compiler/cpp/enum.h

@@ -37,8 +37,8 @@
 
 #include <string>
 
-#include "google/protobuf/descriptor.h"
 #include "google/protobuf/compiler/cpp/options.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/printer.h"
 
 namespace google {

src/google/protobuf/compiler/cpp/field.h

@@ -41,11 +41,11 @@
 #include <tuple>
 #include <vector>
 
-#include "google/protobuf/descriptor.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/log/absl_check.h"
 #include "google/protobuf/compiler/cpp/helpers.h"
 #include "google/protobuf/compiler/cpp/options.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/printer.h"
 
 namespace google {

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

@@ -45,8 +45,6 @@
 #include <vector>
 
 #include "google/protobuf/compiler/scc.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/dynamic_message.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/log/absl_check.h"
@@ -63,6 +61,7 @@
 #include "google/protobuf/compiler/cpp/options.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/descriptor.pb.h"
+#include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/io/printer.h"
 #include "google/protobuf/io/strtod.h"
 #include "google/protobuf/wire_format.h"

src/google/protobuf/compiler/cpp/message_layout_helper.h

@@ -35,8 +35,8 @@
 #ifndef GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_LAYOUT_HELPER_H__
 #define GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_LAYOUT_HELPER_H__
 
-#include "google/protobuf/descriptor.h"
 #include "google/protobuf/compiler/cpp/options.h"
+#include "google/protobuf/descriptor.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/compiler/cpp/parse_function_generator.h

@@ -34,10 +34,10 @@
 #include <string>
 #include <vector>
 
-#include "google/protobuf/descriptor.h"
 #include "absl/container/flat_hash_map.h"
 #include "google/protobuf/compiler/cpp/helpers.h"
 #include "google/protobuf/compiler/cpp/options.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/generated_message_tctable_gen.h"
 #include "google/protobuf/io/printer.h"
 #include "google/protobuf/wire_format_lite.h"

src/google/protobuf/compiler/cpp/service.h

@@ -37,9 +37,9 @@
 
 #include <string>
 
-#include "google/protobuf/descriptor.h"
 #include "absl/container/flat_hash_map.h"
 #include "google/protobuf/compiler/cpp/options.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/printer.h"
 
 namespace google {

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

@@ -34,7 +34,6 @@
 #include <utility>
 #include <vector>
 
-#include "google/protobuf/descriptor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
@@ -42,6 +41,7 @@
 #include "absl/types/optional.h"
 #include "google/protobuf/compiler/cpp/helpers.h"
 #include "google/protobuf/compiler/cpp/options.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/printer.h"
 
 namespace google {

src/google/protobuf/compiler/cpp/tracker.h

@@ -33,8 +33,8 @@
 
 #include <vector>
 
-#include "google/protobuf/descriptor.h"
 #include "google/protobuf/compiler/cpp/options.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/printer.h"
 
 namespace google {

src/google/protobuf/compiler/importer_unittest.cc

@@ -39,7 +39,6 @@
 #include "google/protobuf/testing/file.h"
 #include "google/protobuf/testing/file.h"
 #include "google/protobuf/testing/file.h"
-#include "google/protobuf/descriptor.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "absl/container/flat_hash_map.h"
@@ -47,6 +46,7 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/substitute.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 
 namespace google {

src/google/protobuf/compiler/parser_unittest.cc

@@ -42,7 +42,6 @@
 
 #include "google/protobuf/any.pb.h"
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/text_format.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "absl/container/flat_hash_map.h"
@@ -52,6 +51,7 @@
 #include "absl/strings/substitute.h"
 #include "google/protobuf/compiler/retention.h"
 #include "google/protobuf/test_util2.h"
+#include "google/protobuf/text_format.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_custom_options.pb.h"
 #include "google/protobuf/unittest_import.pb.h"

src/google/protobuf/descriptor_database_unittest.cc

@@ -40,11 +40,11 @@
 #include <memory>
 
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/text_format.h"
 #include <gmock/gmock.h>
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/text_format.h"
 
 
 namespace google {

src/google/protobuf/descriptor_unittest.cc

@@ -49,9 +49,6 @@
 #include "google/protobuf/compiler/parser.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor_database.h"
-#include "google/protobuf/dynamic_message.h"
-#include "google/protobuf/text_format.h"
 #include <gmock/gmock.h>
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
@@ -66,10 +63,13 @@
 #include "absl/strings/substitute.h"
 #include "google/protobuf/compiler/parser.h"
 #include "google/protobuf/cpp_features.pb.h"
+#include "google/protobuf/descriptor_database.h"
 #include "google/protobuf/descriptor_legacy.h"
+#include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/io/tokenizer.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
 #include "google/protobuf/test_textproto.h"
+#include "google/protobuf/text_format.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_custom_options.pb.h"
 #include "google/protobuf/unittest_features.pb.h"

src/google/protobuf/drop_unknown_fields_test.cc

@@ -30,9 +30,9 @@
 
 #include <memory>
 
+#include <gtest/gtest.h>
 #include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/message_lite.h"
-#include <gtest/gtest.h>
 #include "google/protobuf/unittest_drop_unknown_fields.pb.h"
 
 using unittest_drop_unknown_fields::Foo;

src/google/protobuf/dynamic_message_unittest.cc

@@ -45,9 +45,9 @@
 #include <memory>
 
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_no_field_presence.pb.h"

src/google/protobuf/extension_set_unittest.cc

@@ -36,18 +36,18 @@
 
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/arena.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/dynamic_message.h"
-#include "google/protobuf/text_format.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "absl/base/casts.h"
 #include "absl/strings/cord.h"
 #include "absl/strings/match.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/test_util2.h"
+#include "google/protobuf/text_format.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_mset.pb.h"
 #include "google/protobuf/wire_format.h"

src/google/protobuf/generated_message_reflection_unittest.cc

@@ -47,12 +47,12 @@
 #include <memory>
 
 #include "google/protobuf/arena.h"
-#include "google/protobuf/descriptor.h"
 #include <gmock/gmock.h>
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "absl/log/absl_check.h"
 #include "absl/strings/cord.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/map_test_util.h"
 #include "google/protobuf/map_unittest.pb.h"
 #include "google/protobuf/test_util.h"

src/google/protobuf/generated_message_tctable_lite_test.cc

@@ -30,10 +30,10 @@
 
 #include <cstddef>
 
-#include "google/protobuf/generated_message_tctable_impl.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "absl/types/optional.h"
+#include "google/protobuf/generated_message_tctable_impl.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/wire_format_lite.h"
 

src/google/protobuf/inlined_string_field_unittest.cc

@@ -38,10 +38,10 @@
 #include <utility>
 #include <vector>
 
-#include "google/protobuf/arenastring.h"
 #include <gtest/gtest.h>
 #include "absl/log/absl_check.h"
 #include "absl/strings/string_view.h"
+#include "google/protobuf/arenastring.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/message.h"

src/google/protobuf/json/internal/descriptor_traits.h

@@ -41,9 +41,6 @@
 #include <utility>
 
 #include "google/protobuf/type.pb.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/dynamic_message.h"
-#include "google/protobuf/message.h"
 #include "absl/algorithm/container.h"
 #include "absl/log/absl_log.h"
 #include "absl/status/status.h"
@@ -52,8 +49,11 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/json/internal/lexer.h"
 #include "google/protobuf/json/internal/untyped_message.h"
+#include "google/protobuf/message.h"
 #include "google/protobuf/stubs/status_macros.h"
 
 

src/google/protobuf/json/internal/lexer.h

@@ -42,12 +42,12 @@
 #include <string>
 #include <utility>
 
-#include "google/protobuf/descriptor.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/json/internal/message_path.h"
 #include "google/protobuf/json/internal/zero_copy_buffered_stream.h"

src/google/protobuf/json/internal/parser.cc

@@ -40,9 +40,6 @@
 #include <utility>
 
 #include "google/protobuf/type.pb.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/dynamic_message.h"
-#include "google/protobuf/message.h"
 #include "absl/base/attributes.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/log/absl_check.h"
@@ -58,12 +55,15 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/io/zero_copy_sink.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
 #include "google/protobuf/json/internal/descriptor_traits.h"
 #include "google/protobuf/json/internal/lexer.h"
 #include "google/protobuf/json/internal/parser_traits.h"
+#include "google/protobuf/message.h"
 #include "google/protobuf/util/type_resolver.h"
 #include "google/protobuf/stubs/status_macros.h"
 

src/google/protobuf/json/internal/parser.h

@@ -33,9 +33,9 @@
 
 #include <string>
 
-#include "google/protobuf/message.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/json/internal/lexer.h"
+#include "google/protobuf/message.h"
 #include "google/protobuf/util/type_resolver.h"
 
 namespace google {

src/google/protobuf/json/internal/unparser.cc

@@ -42,9 +42,6 @@
 #include <type_traits>
 #include <utility>
 
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/dynamic_message.h"
-#include "google/protobuf/message.h"
 #include "absl/log/absl_check.h"
 #include "absl/log/absl_log.h"
 #include "absl/status/status.h"
@@ -54,11 +51,14 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/json/internal/descriptor_traits.h"
 #include "google/protobuf/json/internal/unparser_traits.h"
 #include "google/protobuf/json/internal/writer.h"
+#include "google/protobuf/message.h"
 #include "google/protobuf/stubs/status_macros.h"
 
 // Must be included last.

src/google/protobuf/json/internal/unparser.h

@@ -33,9 +33,9 @@
 
 #include <string>
 
-#include "google/protobuf/message.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/json/internal/writer.h"
+#include "google/protobuf/message.h"
 #include "google/protobuf/util/type_resolver.h"
 
 namespace google {

src/google/protobuf/json/internal/untyped_message.h

@@ -40,9 +40,6 @@
 #include <vector>
 
 #include "google/protobuf/type.pb.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/dynamic_message.h"
-#include "google/protobuf/message.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
@@ -50,7 +47,10 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "absl/types/variant.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/message.h"
 #include "google/protobuf/util/type_resolver.h"
 #include "google/protobuf/wire_format.h"
 #include "google/protobuf/wire_format_lite.h"

src/google/protobuf/map_field_test.cc

@@ -31,10 +31,6 @@
 #include <memory>
 
 #include "google/protobuf/arena.h"
-#include "google/protobuf/map.h"
-#include "google/protobuf/map_field_inl.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/repeated_field.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "absl/container/flat_hash_map.h"
@@ -44,8 +40,12 @@
 #include "absl/synchronization/blocking_counter.h"
 #include "absl/types/optional.h"
 #include "google/protobuf/arena_test_util.h"
+#include "google/protobuf/map.h"
+#include "google/protobuf/map_field_inl.h"
 #include "google/protobuf/map_test_util.h"
 #include "google/protobuf/map_unittest.pb.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/repeated_field.h"
 #include "google/protobuf/unittest.pb.h"
 
 // Must be included last.

src/google/protobuf/no_field_presence_test.cc

@@ -31,8 +31,8 @@
 #include <string>
 
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor.h"
 #include <gtest/gtest.h>
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_no_field_presence.pb.h"
 

src/google/protobuf/preserve_unknown_enum_test.cc

@@ -28,9 +28,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+#include <gtest/gtest.h>
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/dynamic_message.h"
-#include <gtest/gtest.h>
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_preserve_unknown_enum.pb.h"
 #include "google/protobuf/unittest_preserve_unknown_enum2.pb.h"

src/google/protobuf/proto3_arena_unittest.cc

@@ -33,11 +33,11 @@
 #include <vector>
 
 #include "google/protobuf/arena.h"
-#include "google/protobuf/text_format.h"
 #include <gtest/gtest.h>
 #include "absl/strings/match.h"
 #include "google/protobuf/descriptor_legacy.h"
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/text_format.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_proto3_arena.pb.h"
 #include "google/protobuf/unittest_proto3_optional.pb.h"

src/google/protobuf/reflection_ops_unittest.cc

@@ -34,9 +34,9 @@
 
 #include "google/protobuf/reflection_ops.h"
 
-#include "google/protobuf/descriptor.h"
 #include <gtest/gtest.h>
 #include "absl/strings/str_join.h"
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/unittest.pb.h"
 

src/google/protobuf/repeated_field_reflection_unittest.cc

@@ -33,12 +33,12 @@
 // Test reflection methods for aggregate access to Repeated[Ptr]Fields.
 // This test proto2 methods on a proto2 layout.
 
-#include "google/protobuf/dynamic_message.h"
-#include "google/protobuf/reflection.h"
 #include <gtest/gtest.h>
 #include "absl/base/casts.h"
 #include "absl/strings/cord.h"
+#include "google/protobuf/dynamic_message.h"
 #include "google/protobuf/port.h"
+#include "google/protobuf/reflection.h"
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/unittest.pb.h"
 

src/google/protobuf/repeated_field_unittest.cc

@@ -52,7 +52,6 @@
 #include <utility>
 #include <vector>
 
-#include "google/protobuf/arena.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 #include "absl/log/absl_check.h"
@@ -65,7 +64,6 @@
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
 #include "google/protobuf/parse_context.h"
-#include "google/protobuf/repeated_field.h"
 #include "google/protobuf/repeated_ptr_field.h"
 #include "google/protobuf/unittest.pb.h"
 

src/google/protobuf/util/delimited_message_util.h

@@ -36,9 +36,9 @@
 
 #include <ostream>
 
-#include "google/protobuf/message_lite.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
+#include "google/protobuf/message_lite.h"
 
 // Must be included last.
 #include "google/protobuf/port_def.inc"

src/google/protobuf/util/field_comparator.cc

@@ -38,10 +38,10 @@
 #include <limits>
 #include <string>
 
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/message.h"
 #include "absl/log/absl_check.h"
 #include "absl/log/absl_log.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/message.h"
 #include "google/protobuf/util/message_differencer.h"
 
 // Must be included last.

src/google/protobuf/util/field_comparator_test.cc

@@ -34,8 +34,8 @@
 
 #include <limits>
 
-#include "google/protobuf/descriptor.h"
 #include <gtest/gtest.h>
+#include "google/protobuf/descriptor.h"
 #include "google/protobuf/unittest.pb.h"
 
 namespace google {

src/google/protobuf/util/message_differencer.cc

@@ -43,12 +43,6 @@
 #include <utility>
 
 #include "google/protobuf/descriptor.pb.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/dynamic_message.h"
-#include "google/protobuf/generated_enum_reflection.h"
-#include "google/protobuf/map_field.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/text_format.h"
 #include "absl/container/fixed_array.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/log/absl_check.h"
@@ -57,9 +51,15 @@
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #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/map_field.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/text_format.h"
 #include "google/protobuf/util/field_comparator.h"
 
 // Always include as last one, otherwise it can break compilation

src/google/protobuf/util/message_differencer.h

@@ -48,14 +48,14 @@
 #include <string>
 #include <vector>
 
-#include "google/protobuf/descriptor.h"  // FieldDescriptor
-#include "google/protobuf/message.h"     // Message
-#include "google/protobuf/unknown_field_set.h"
 #include "google/protobuf/stubs/common.h"
 #include "absl/container/fixed_array.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
 #include "absl/log/absl_check.h"
+#include "google/protobuf/descriptor.h"  // FieldDescriptor
+#include "google/protobuf/message.h"     // Message
+#include "google/protobuf/unknown_field_set.h"
 #include "google/protobuf/util/field_comparator.h"
 
 // Always include as last one, otherwise it can break compilation