diff --git a/flang/runtime/buffer.cpp b/flang/runtime/buffer.cpp
--- a/flang/runtime/buffer.cpp
+++ b/flang/runtime/buffer.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/buffer.cpp --------------------------------------*- C++ -*-===//
+//===-- runtime/buffer.cpp ------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/character.cpp b/flang/runtime/character.cpp
--- a/flang/runtime/character.cpp
+++ b/flang/runtime/character.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/character.cpp -----------------------------------*- C++ -*-===//
+//===-- runtime/character.cpp ---------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/connection.cpp b/flang/runtime/connection.cpp
--- a/flang/runtime/connection.cpp
+++ b/flang/runtime/connection.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/connection.cpp ----------------------------------*- C++ -*-===//
+//===-- runtime/connection.cpp --------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/edit-input.cpp b/flang/runtime/edit-input.cpp
--- a/flang/runtime/edit-input.cpp
+++ b/flang/runtime/edit-input.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/edit-input.cpp ----------------------------------*- C++ -*-===//
+//===-- runtime/edit-input.cpp --------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/edit-output.cpp b/flang/runtime/edit-output.cpp
--- a/flang/runtime/edit-output.cpp
+++ b/flang/runtime/edit-output.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/edit-output.cpp ---------------------------------*- C++ -*-===//
+//===-- runtime/edit-output.cpp -------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/environment.cpp b/flang/runtime/environment.cpp
--- a/flang/runtime/environment.cpp
+++ b/flang/runtime/environment.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/environment.cpp ---------------------------------*- C++ -*-===//
+//===-- runtime/environment.cpp -------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/file.cpp b/flang/runtime/file.cpp
--- a/flang/runtime/file.cpp
+++ b/flang/runtime/file.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/file.cpp ----------------------------------------*- C++ -*-===//
+//===-- runtime/file.cpp --------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/format.cpp b/flang/runtime/format.cpp
--- a/flang/runtime/format.cpp
+++ b/flang/runtime/format.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/format.cpp --------------------------------------*- C++ -*-===//
+//===-- runtime/format.cpp ------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/internal-unit.cpp b/flang/runtime/internal-unit.cpp
--- a/flang/runtime/internal-unit.cpp
+++ b/flang/runtime/internal-unit.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/internal-unit.cpp -------------------------------*- C++ -*-===//
+//===-- runtime/internal-unit.cpp -----------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/io-api.cpp b/flang/runtime/io-api.cpp
--- a/flang/runtime/io-api.cpp
+++ b/flang/runtime/io-api.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/io-api.cpp --------------------------------------*- C++ -*-===//
+//===-- runtime/io-api.cpp ------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/io-error.cpp b/flang/runtime/io-error.cpp
--- a/flang/runtime/io-error.cpp
+++ b/flang/runtime/io-error.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/io-error.cpp ------------------------------------*- C++ -*-===//
+//===-- runtime/io-error.cpp ----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/io-stmt.cpp b/flang/runtime/io-stmt.cpp
--- a/flang/runtime/io-stmt.cpp
+++ b/flang/runtime/io-stmt.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/io-stmt.cpp -------------------------------------*- C++ -*-===//
+//===-- runtime/io-stmt.cpp -----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/iostat.cpp b/flang/runtime/iostat.cpp
--- a/flang/runtime/iostat.cpp
+++ b/flang/runtime/iostat.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/iostat.cpp --------------------------------------*- C++ -*-===//
+//===-- runtime/iostat.cpp ------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/main.cpp b/flang/runtime/main.cpp
--- a/flang/runtime/main.cpp
+++ b/flang/runtime/main.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/main.cpp ----------------------------------------*- C++ -*-===//
+//===-- runtime/main.cpp --------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/memory.cpp b/flang/runtime/memory.cpp
--- a/flang/runtime/memory.cpp
+++ b/flang/runtime/memory.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/memory.cpp --------------------------------------*- C++ -*-===//
+//===-- runtime/memory.cpp ------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/namelist.cpp b/flang/runtime/namelist.cpp
--- a/flang/runtime/namelist.cpp
+++ b/flang/runtime/namelist.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/namelist.cpp ------------------------------------*- C++ -*-===//
+//===-- runtime/namelist.cpp ----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/numeric.cpp b/flang/runtime/numeric.cpp
--- a/flang/runtime/numeric.cpp
+++ b/flang/runtime/numeric.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/numeric.cpp -------------------------------------*- C++ -*-===//
+//===-- runtime/numeric.cpp -----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/stat.cpp b/flang/runtime/stat.cpp
--- a/flang/runtime/stat.cpp
+++ b/flang/runtime/stat.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/stat.cpp ----------------------------------------*- C++ -*-===//
+//===-- runtime/stat.cpp --------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/stop.cpp b/flang/runtime/stop.cpp
--- a/flang/runtime/stop.cpp
+++ b/flang/runtime/stop.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/stop.cpp ----------------------------------------*- C++ -*-===//
+//===-- runtime/stop.cpp --------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/terminator.cpp b/flang/runtime/terminator.cpp
--- a/flang/runtime/terminator.cpp
+++ b/flang/runtime/terminator.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/terminate.cpp -----------------------------------*- C++ -*-===//
+//===-- runtime/terminate.cpp ---------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/tools.cpp b/flang/runtime/tools.cpp
--- a/flang/runtime/tools.cpp
+++ b/flang/runtime/tools.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/tools.cpp ---------------------------------------*- C++ -*-===//
+//===-- runtime/tools.cpp -------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/unit-map.cpp b/flang/runtime/unit-map.cpp
--- a/flang/runtime/unit-map.cpp
+++ b/flang/runtime/unit-map.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/unit-map.cpp ------------------------------------*- C++ -*-===//
+//===-- runtime/unit-map.cpp ----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/flang/runtime/unit.cpp b/flang/runtime/unit.cpp
--- a/flang/runtime/unit.cpp
+++ b/flang/runtime/unit.cpp
@@ -1,4 +1,4 @@
-//===-- runtime/unit.cpp ----------------------------------------*- C++ -*-===//
+//===-- runtime/unit.cpp --------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.