Internal change

PiperOrigin-RevId: 486974857

conformance/binary_json_conformance_suite.cc

@@ -31,7 +31,6 @@
 #include "binary_json_conformance_suite.h"
 
 #include "google/protobuf/text_format.h"
-#include "google/protobuf/wire_format_lite.h"
 #include "google/protobuf/util/json_util.h"
 #include "google/protobuf/util/type_resolver_util.h"
 #include "absl/status/status.h"
@@ -41,6 +40,7 @@
 #include "conformance_test.h"
 #include "google/protobuf/test_messages_proto2.pb.h"
 #include "google/protobuf/test_messages_proto3.pb.h"
+#include "google/protobuf/wire_format_lite.h"
 
 namespace proto2_messages = protobuf_test_messages::proto2;
 

conformance/conformance_test.h

@@ -43,9 +43,9 @@
 #include <vector>
 
 #include "google/protobuf/descriptor.h"
-#include "google/protobuf/wire_format_lite.h"
 #include "google/protobuf/util/type_resolver.h"
 #include "conformance/conformance.pb.h"
+#include "google/protobuf/wire_format_lite.h"
 
 namespace conformance {
 class ConformanceRequest;

src/google/protobuf/compiler/command_line_interface_unittest.cc

@@ -51,7 +51,6 @@
 #include "google/protobuf/testing/file.h"
 #include "google/protobuf/testing/file.h"
 #include "google/protobuf/any.pb.h"
-#include "google/protobuf/test_util2.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/testing/googletest.h"
@@ -69,6 +68,7 @@
 #include "google/protobuf/io/io_win32.h"
 #include "google/protobuf/io/printer.h"
 #include "google/protobuf/io/zero_copy_stream.h"
+#include "google/protobuf/test_util2.h"
 #include "google/protobuf/unittest_custom_options.pb.h"
 
 // Must be included last.

src/google/protobuf/compiler/parser_unittest.cc

@@ -40,19 +40,19 @@
 #include <vector>
 
 #include "google/protobuf/any.pb.h"
-#include "google/protobuf/test_util2.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_import.pb.h"
 #include "google/protobuf/unittest_import_public.pb.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/text_format.h"
-#include "google/protobuf/wire_format.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/substitute.h"
+#include "google/protobuf/test_util2.h"
 #include "google/protobuf/unittest_custom_options.pb.h"
+#include "google/protobuf/wire_format.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/util/delimited_message_util_test.cc

@@ -35,10 +35,10 @@
 
 #include <sstream>
 
-#include "google/protobuf/test_util.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
+#include "google/protobuf/test_util.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/util/field_mask_util_test.cc

@@ -35,11 +35,11 @@
 #include <vector>
 
 #include "google/protobuf/field_mask.pb.h"
-#include "google/protobuf/test_util.h"
 #include "google/protobuf/unittest.pb.h"
 #include <gtest/gtest.h>
 #include "google/protobuf/stubs/logging.h"
 #include "google/protobuf/stubs/common.h"
+#include "google/protobuf/test_util.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/util/type_resolver_util_test.cc

@@ -38,13 +38,13 @@
 
 #include "google/protobuf/type.pb.h"
 #include "google/protobuf/wrappers.pb.h"
-#include "google/protobuf/test_util.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/util/type_resolver.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "google/protobuf/util/json_format_proto3.pb.h"
 #include "google/protobuf/map_unittest.pb.h"
+#include "google/protobuf/test_util.h"
 #include "google/protobuf/unittest_custom_options.pb.h"
 
 namespace google {