diff --git a/src/google/protobuf/compiler/cpp/file.cc b/src/google/protobuf/compiler/cpp/file.cc
index c781959be559f..acc2be0e3ba50 100644
--- a/src/google/protobuf/compiler/cpp/file.cc
+++ b/src/google/protobuf/compiler/cpp/file.cc
@@ -47,6 +47,7 @@
 #include "google/protobuf/io/printer.h"
 
 // Must be last.
+#include "google/protobuf/port.h"
 #include "google/protobuf/port_def.inc"
 
 namespace google {
@@ -254,8 +255,10 @@ void FileGenerator::GenerateSharedHeaderCode(io::Printer* p) {
                      {"messages", [&] { GenerateMessageDefinitions(p); }},
                      {"services", [&] { GenerateServiceDefinitions(p); }},
                      {"extensions", [&] { GenerateExtensionIdentifiers(p); }},
-                     {"inline_fns",
-                      [&] { GenerateInlineFunctionDefinitions(p); }},
+                     {"inline_defs",
+                      [&] {
+                        GenerateInlineFunctionDefinitions(p);
+                      }},
                  },
                  R"(
                    $enums$
@@ -272,7 +275,7 @@ void FileGenerator::GenerateSharedHeaderCode(io::Printer* p) {
 
                    $hrule_thick$
 
-                   $inline_fns$
+                   $inline_defs$
 
                    // @@protoc_insertion_point(namespace_scope)
                  )");
@@ -1651,6 +1654,7 @@ void FileGenerator::GenerateLibraryIncludes(io::Printer* p) {
   if (HasGeneratedMethods(file_, options_)) {
     IncludeFile("third_party/protobuf/generated_message_tctable_decl.h", p);
   }
+
   IncludeFile("third_party/protobuf/generated_message_util.h", p);
   IncludeFile("third_party/protobuf/metadata_lite.h", p);
 
diff --git a/src/google/protobuf/port.h b/src/google/protobuf/port.h
index 5f9e909a00333..2c0b29454a009 100644
--- a/src/google/protobuf/port.h
+++ b/src/google/protobuf/port.h
@@ -522,6 +522,7 @@ class alignas(8) GlobalEmptyString {
 PROTOBUF_EXPORT extern GlobalEmptyString fixed_address_empty_string;
 #endif
 
+
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google