From 60a84c347dc25ab50f333653e70a631dbf0d40fb Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Tue, 8 Nov 2022 09:37:29 -0800
Subject: [PATCH] Internal change

PiperOrigin-RevId: 486974857
---
 conformance/binary_json_conformance_suite.cc                  | 2 +-
 conformance/conformance_test.h                                | 2 +-
 .../protobuf/compiler/command_line_interface_unittest.cc      | 2 +-
 src/google/protobuf/compiler/parser_unittest.cc               | 4 ++--
 src/google/protobuf/util/delimited_message_util_test.cc       | 2 +-
 src/google/protobuf/util/field_mask_util_test.cc              | 2 +-
 src/google/protobuf/util/type_resolver_util_test.cc           | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/conformance/binary_json_conformance_suite.cc b/conformance/binary_json_conformance_suite.cc
index 7c30b83b76..6951cca0a8 100644
--- a/conformance/binary_json_conformance_suite.cc
+++ b/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;
 
diff --git a/conformance/conformance_test.h b/conformance/conformance_test.h
index 527f0548cd..7539cf5445 100644
--- a/conformance/conformance_test.h
+++ b/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;
diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc
index 5d5b972609..b1e44821e0 100644
--- a/src/google/protobuf/compiler/command_line_interface_unittest.cc
+++ b/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.
diff --git a/src/google/protobuf/compiler/parser_unittest.cc b/src/google/protobuf/compiler/parser_unittest.cc
index 44cd8068c1..f267bb2197 100644
--- a/src/google/protobuf/compiler/parser_unittest.cc
+++ b/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 {
diff --git a/src/google/protobuf/util/delimited_message_util_test.cc b/src/google/protobuf/util/delimited_message_util_test.cc
index 954afb2f5e..4817c2f103 100644
--- a/src/google/protobuf/util/delimited_message_util_test.cc
+++ b/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 {
diff --git a/src/google/protobuf/util/field_mask_util_test.cc b/src/google/protobuf/util/field_mask_util_test.cc
index a67a0254f9..fbdebf7f0f 100644
--- a/src/google/protobuf/util/field_mask_util_test.cc
+++ b/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 {
diff --git a/src/google/protobuf/util/type_resolver_util_test.cc b/src/google/protobuf/util/type_resolver_util_test.cc
index ff1a3302b7..7da6de21c7 100644
--- a/src/google/protobuf/util/type_resolver_util_test.cc
+++ b/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 {