Fix missing port_def/port_undef includes

PiperOrigin-RevId: 612971492

src/google/protobuf/any_lite.cc

@@ -12,6 +12,9 @@
 #include "google/protobuf/generated_message_util.h"
 #include "google/protobuf/io/zero_copy_stream_impl_lite.h"
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 namespace google {
 namespace protobuf {
 namespace internal {
@@ -72,3 +75,5 @@ bool ParseAnyTypeUrl(absl::string_view type_url, std::string* full_type_name) {
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+
+#include "google/protobuf/port_undef.inc"

src/google/protobuf/arena_align.cc

@@ -10,6 +10,8 @@
 #include <cstddef>
 #include <cstdint>
 
+// No port_def include needed
+
 namespace google {
 namespace protobuf {
 namespace internal {

src/google/protobuf/arena_allocation_policy.h

@@ -11,6 +11,8 @@
 #include <cstddef>
 #include <cstdint>
 
+// No port_def include needed
+
 namespace google {
 namespace protobuf {
 namespace internal {

src/google/protobuf/arenaz_sampler.cc

@@ -221,3 +221,5 @@ void SetThreadSafeArenazGlobalNextSample(int64_t next_sample) {}
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+
+#include "google/protobuf/port_undef.inc"

src/google/protobuf/descriptor_database.cc

@@ -24,6 +24,9 @@
 #include "google/protobuf/descriptor.pb.h"
 
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 namespace google {
 namespace protobuf {
 
@@ -1035,3 +1038,5 @@ bool MergedDescriptorDatabase::FindAllFileNames(
 
 }  // namespace protobuf
 }  // namespace google
+
+#include "google/protobuf/port_undef.inc"

src/google/protobuf/descriptor_legacy.h

@@ -4,6 +4,8 @@
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/descriptor.h"
 
+// No port_def include needed
+
 namespace google {
 namespace protobuf {
 

src/google/protobuf/descriptor_lite.h

@@ -11,6 +11,8 @@
 #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_LITE_H__
 #define GOOGLE_PROTOBUF_DESCRIPTOR_LITE_H__
 
+// No port_def include needed
+
 namespace google {
 namespace protobuf {
 namespace internal {

src/google/protobuf/descriptor_visitor.h

@@ -12,6 +12,8 @@
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/generated_message_reflection.h"
 
+// No port_def include needed
+
 namespace google {
 namespace protobuf {
 namespace internal {

src/google/protobuf/extension_set_inl.h

@@ -12,6 +12,9 @@
 #include "google/protobuf/metadata_lite.h"
 #include "google/protobuf/parse_context.h"
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 namespace google {
 namespace protobuf {
 namespace internal {
@@ -259,5 +262,6 @@ const char* ExtensionSet::ParseMessageSetItemTmpl(
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+#include "google/protobuf/port_undef.inc"
 
 #endif  // GOOGLE_PROTOBUF_EXTENSION_SET_INL_H__

src/google/protobuf/field_access_listener.h

@@ -14,6 +14,9 @@
 #include "google/protobuf/port.h"
 
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 namespace google {
 namespace protobuf {
 
@@ -157,5 +160,6 @@ using AccessListener = NoOpAccessListener<T>;
 // All hooks are subject to approval by protobuf-team@.
 
 #endif  // !REPLACE_PROTO_LISTENER_IMPL
+#include "google/protobuf/port_undef.inc"
 
 #endif  // GOOGLE_PROTOBUF_FIELD_ACCESS_LISTENER_H__

src/google/protobuf/fully_verify_message_sets_opt_out.cc

@@ -1,3 +1,5 @@
+// No port_def include needed
+
 namespace google {
 namespace protobuf {
 namespace internal {

src/google/protobuf/generated_enum_util.cc

@@ -219,3 +219,5 @@ std::vector<uint32_t> GenerateEnumData(absl::Span<const int32_t> values) {
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+
+#include "google/protobuf/port_undef.inc"

src/google/protobuf/generated_message_tctable_full.cc

@@ -100,3 +100,5 @@ const char* TcParser::MessageSetWireFormatParseLoop(
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+
+#include "google/protobuf/port_undef.inc"

src/google/protobuf/generated_message_tctable_lite.cc

@@ -2957,3 +2957,5 @@ std::string TypeCardToString(uint16_t type_card) {
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+
+#include "google/protobuf/port_undef.inc"

src/google/protobuf/inlined_string_field.cc

@@ -116,3 +116,5 @@ void InlinedStringField::ClearToDefault(const LazyString& default_value,
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+
+#include "google/protobuf/port_undef.inc"

src/google/protobuf/internal_message_util.h

@@ -13,6 +13,9 @@
 
 #include "google/protobuf/message.h"
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 namespace google {
 namespace protobuf {
 namespace internal {
@@ -21,5 +24,6 @@ namespace internal {
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+#include "google/protobuf/port_undef.inc"
 
 #endif  // GOOGLE_PROTOBUF_INTERNAL_MESSAGE_UTIL_H__

src/google/protobuf/internal_visibility.h

@@ -7,6 +7,8 @@
 #ifndef GOOGLE_PROTOBUF_INTERNAL_VISIBILITY_H__
 #define GOOGLE_PROTOBUF_INTERNAL_VISIBILITY_H__
 
+// No port_def include needed
+
 namespace google {
 namespace protobuf {
 

src/google/protobuf/map_probe_benchmark.cc

@@ -18,6 +18,8 @@
 #include "absl/strings/string_view.h"
 #include "google/protobuf/map.h"
 
+// No port_def include needed
+
 namespace google::protobuf::internal {
 struct MapBenchmarkPeer {
   template <typename T>

src/google/protobuf/map_type_handler.h

@@ -17,6 +17,9 @@
 #include "google/protobuf/parse_context.h"
 #include "google/protobuf/wire_format_lite.h"
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 #ifdef SWIG
 #error "You cannot SWIG proto headers"
 #endif
@@ -373,5 +376,6 @@ struct MapEntryFuncs {
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+#include "google/protobuf/port_undef.inc"
 
 #endif  // GOOGLE_PROTOBUF_MAP_TYPE_HANDLER_H__

src/google/protobuf/metadata.h

@@ -8,6 +8,7 @@
 #ifndef GOOGLE_PROTOBUF_METADATA_H__
 #define GOOGLE_PROTOBUF_METADATA_H__
 
+// No port_def include needed
 // TODO: Remove this file and all instances where it gets imported.
 
 #endif  // GOOGLE_PROTOBUF_METADATA_H__

src/google/protobuf/package_info.h

@@ -41,3 +41,4 @@ namespace protobuf {
 // from combining the brackets. Which would mess with extract script
 }  // namespace protobuf
 }  // namespace google
+// No port_def include needed

src/google/protobuf/port.cc

@@ -27,3 +27,5 @@ void protobuf_assumption_failed(const char* pred, const char* file, int line) {
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+
+#include "google/protobuf/port_undef.inc"

src/google/protobuf/raw_ptr.cc

@@ -23,3 +23,5 @@ ABSL_CONST_INIT PROTOBUF_EXPORT
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+
+#include "google/protobuf/port_undef.inc"

src/google/protobuf/reflection_internal.h

@@ -13,6 +13,9 @@
 #include "google/protobuf/reflection.h"
 #include "google/protobuf/repeated_field.h"
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 namespace google {
 namespace protobuf {
 namespace internal {
@@ -347,5 +350,6 @@ class RepeatedPtrFieldMessageAccessor final
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+#include "google/protobuf/port_undef.inc"
 
 #endif  // GOOGLE_PROTOBUF_REFLECTION_INTERNAL_H__

src/google/protobuf/reflection_mode.cc

@@ -32,3 +32,5 @@ PROTOBUF_CONSTINIT PROTOBUF_THREAD_LOCAL ReflectionMode
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+
+#include "google/protobuf/port_undef.inc"

src/google/protobuf/service.cc

@@ -11,6 +11,8 @@
 
 #include "google/protobuf/service.h"
 
+// No port_def include needed
+
 namespace google {
 namespace protobuf {