diff --git a/src/google/protobuf/internal_message_util.cc b/src/google/protobuf/internal_message_util.cc
index 9f27f9376c..9f955464ed 100644
--- a/src/google/protobuf/internal_message_util.cc
+++ b/src/google/protobuf/internal_message_util.cc
@@ -17,6 +17,10 @@
 #include "google/protobuf/reflection_visit_fields.h"
 
 
+// clang-format off
+#include "google/protobuf/port_def.inc"
+// clang-format on
+
 namespace google {
 namespace protobuf {
 namespace internal {
@@ -25,3 +29,5 @@ namespace internal {
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google
+
+#include "google/protobuf/port_undef.inc"
diff --git a/src/google/protobuf/reflection_visit_field_info.h b/src/google/protobuf/reflection_visit_field_info.h
index 97562336d2..fa43e4b312 100644
--- a/src/google/protobuf/reflection_visit_field_info.h
+++ b/src/google/protobuf/reflection_visit_field_info.h
@@ -22,6 +22,10 @@
 #include "google/protobuf/wire_format_lite.h"
 
 
+// clang-format off
+#include "google/protobuf/port_def.inc"
+// clang-format on
+
 namespace google {
 namespace protobuf {
 namespace internal {
@@ -1415,4 +1419,6 @@ struct MapDynamicFieldInfo {
 }  // namespace protobuf
 }  // namespace google
 
+#include "google/protobuf/port_undef.inc"
+
 #endif  // GOOGLE_PROTOBUF_REFLECTION_VISIT_FIELD_INFO_H__