Internal change.

PiperOrigin-RevId: 559114085

src/google/protobuf/descriptor.h

@@ -62,7 +62,6 @@
 #include <vector>
 
 #include "google/protobuf/stubs/common.h"
-#include "google/protobuf/port.h"
 #include "absl/base/attributes.h"
 #include "absl/base/call_once.h"
 #include "absl/container/btree_map.h"

src/google/protobuf/extension_set.h

@@ -51,7 +51,6 @@
 #include "absl/log/absl_check.h"
 #include "google/protobuf/internal_visibility.h"
 #include "google/protobuf/port.h"
-#include "google/protobuf/port.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/parse_context.h"
 #include "google/protobuf/repeated_field.h"

src/google/protobuf/generated_enum_reflection.h

@@ -41,9 +41,9 @@
 
 #include <string>
 
-#include "google/protobuf/port.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/generated_enum_util.h"
+#include "google/protobuf/port.h"
 
 #ifdef SWIG
 #error "You cannot SWIG proto headers"

src/google/protobuf/generated_message_tctable_impl.h

@@ -37,13 +37,13 @@
 #include <type_traits>
 #include <utility>
 
-#include "google/protobuf/port.h"
 #include "google/protobuf/extension_set.h"
 #include "google/protobuf/generated_message_tctable_decl.h"
 #include "google/protobuf/map.h"
 #include "google/protobuf/message_lite.h"
 #include "google/protobuf/metadata_lite.h"
 #include "google/protobuf/parse_context.h"
+#include "google/protobuf/port.h"
 #include "google/protobuf/raw_ptr.h"
 #include "google/protobuf/repeated_field.h"
 #include "google/protobuf/repeated_ptr_field.h"

src/google/protobuf/inlined_string_field.h

@@ -34,12 +34,12 @@
 #include <string>
 #include <utility>
 
-#include "google/protobuf/port.h"
 #include "absl/log/absl_check.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/arenastring.h"
 #include "google/protobuf/explicitly_constructed.h"
 #include "google/protobuf/message_lite.h"
+#include "google/protobuf/port.h"
 
 // Must be included last.
 #include "google/protobuf/port_def.inc"

src/google/protobuf/map_entry.h

@@ -35,12 +35,12 @@
 #include <cstdint>
 #include <string>
 
-#include "google/protobuf/port.h"
 #include "google/protobuf/generated_message_reflection.h"
 #include "google/protobuf/map_type_handler.h"
 #include "google/protobuf/message.h"
 #include "google/protobuf/message_lite.h"
 #include "google/protobuf/parse_context.h"
+#include "google/protobuf/port.h"
 #include "google/protobuf/reflection_ops.h"
 #include "google/protobuf/unknown_field_set.h"
 #include "google/protobuf/wire_format_lite.h"

src/google/protobuf/map_field.cc

@@ -33,8 +33,8 @@
 #include <utility>
 #include <vector>
 
-#include "google/protobuf/port.h"
 #include "google/protobuf/map_field_inl.h"
+#include "google/protobuf/port.h"
 
 // Must be included last.
 #include "google/protobuf/port_def.inc"

src/google/protobuf/map_field.h

@@ -36,7 +36,6 @@
 #include <type_traits>
 
 #include "google/protobuf/arena.h"
-#include "google/protobuf/port.h"
 #include "absl/synchronization/mutex.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/generated_message_reflection.h"
@@ -46,6 +45,7 @@
 #include "google/protobuf/map_field_lite.h"
 #include "google/protobuf/map_type_handler.h"
 #include "google/protobuf/message.h"
+#include "google/protobuf/port.h"
 #include "google/protobuf/repeated_field.h"
 #include "google/protobuf/unknown_field_set.h"
 

src/google/protobuf/map_field_lite.h

@@ -33,12 +33,12 @@
 
 #include <type_traits>
 
-#include "google/protobuf/port.h"
 #include "absl/log/absl_check.h"
 #include "google/protobuf/internal_visibility.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/map.h"
 #include "google/protobuf/parse_context.h"
+#include "google/protobuf/port.h"
 #include "google/protobuf/wire_format_lite.h"
 
 // Must be included last.

src/google/protobuf/message.h

@@ -117,7 +117,6 @@
 
 #include "google/protobuf/stubs/common.h"
 #include "google/protobuf/arena.h"
-#include "google/protobuf/port.h"
 #include "absl/base/attributes.h"
 #include "absl/base/call_once.h"
 #include "absl/base/casts.h"

src/google/protobuf/message_lite.h

@@ -45,7 +45,6 @@
 
 #include "google/protobuf/stubs/common.h"
 #include "google/protobuf/arena.h"
-#include "google/protobuf/port.h"
 #include "absl/base/call_once.h"
 #include "absl/log/absl_check.h"
 #include "absl/strings/cord.h"

src/google/protobuf/metadata_lite.h

@@ -35,7 +35,6 @@
 
 #include "google/protobuf/arena.h"
 #include "google/protobuf/port.h"
-#include "google/protobuf/port.h"
 
 // Must be included last.
 #include "google/protobuf/port_def.inc"

src/google/protobuf/repeated_field.h

@@ -54,7 +54,6 @@
 #include <utility>
 
 #include "google/protobuf/arena.h"
-#include "google/protobuf/port.h"
 #include "absl/base/attributes.h"
 #include "absl/base/dynamic_annotations.h"
 #include "absl/base/optimization.h"

src/google/protobuf/repeated_ptr_field.h

@@ -55,7 +55,6 @@
 #include <utility>
 
 #include "google/protobuf/arena.h"
-#include "google/protobuf/port.h"
 #include "absl/base/attributes.h"
 #include "absl/log/absl_check.h"
 #include "google/protobuf/internal_visibility.h"

src/google/protobuf/text_format.h

@@ -43,7 +43,6 @@
 #include <string>
 #include <vector>
 
-#include "google/protobuf/port.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/cord.h"
 #include "absl/strings/string_view.h"

src/google/protobuf/unknown_field_set.h

@@ -44,7 +44,6 @@
 #include <vector>
 
 #include "google/protobuf/stubs/common.h"
-#include "google/protobuf/port.h"
 #include "absl/log/absl_check.h"
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"

src/google/protobuf/wire_format_lite.h

@@ -44,7 +44,6 @@
 #include <string>
 
 #include "google/protobuf/stubs/common.h"
-#include "google/protobuf/port.h"
 #include "absl/base/casts.h"
 #include "absl/log/absl_check.h"
 #include "absl/strings/string_view.h"