diff --git a/src/google/protobuf/compiler/cpp/file.cc b/src/google/protobuf/compiler/cpp/file.cc
index c2d261a93ae59..39962c8dd0660 100644
--- a/src/google/protobuf/compiler/cpp/file.cc
+++ b/src/google/protobuf/compiler/cpp/file.cc
@@ -175,6 +175,7 @@ void FileGenerator::GenerateFile(io::Printer* p, GeneratedFileType file_type,
              "protobuf_cpp_version", PROTOBUF_CPP_VERSION_STRING);
   }
   p->Print("\n");
+  p->Print(absl::StrCat("// New message - ", file_->name(), "\n"));
   p->Emit({{"cb", cb}, {"guard", guard}}, R"(
     #ifndef $guard$
     #define $guard$
diff --git a/src/google/protobuf/compiler/java/file.cc b/src/google/protobuf/compiler/java/file.cc
index ce56dbf7a1cc7..902b96baed33a 100644
--- a/src/google/protobuf/compiler/java/file.cc
+++ b/src/google/protobuf/compiler/java/file.cc
@@ -262,11 +262,9 @@ void FileGenerator::Generate(io::Printer* printer) {
   // fully-qualified names in the generated source.
   printer->Print(
       "// Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
-      "// NO CHECKED-IN PROTOBUF "
-      // Intentional line breaker
-      "GENCODE\n"
       "// source: $filename$\n",
       "filename", file_->name());
+  printer->Print(absl::StrCat("// New message - ", file_->name(), "\n"));
   if (options_.opensource_runtime) {
     printer->Print("// Protobuf Java Version: $protobuf_java_version$\n",
                    "protobuf_java_version", PROTOBUF_JAVA_VERSION_STRING);