diff --git a/flang/runtime/buffer.cpp b/flang/runtime/buffer.cpp
index d5081ee7a182..15c83bfd2492 100644
--- 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
index b927febd812c..d88db565b8aa 100644
--- 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
index dc6823a83024..29d3220f43fc 100644
--- 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
index 06f5b4dd6b9d..004c3ca35f05 100644
--- 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
index 38449671a138..d9634b839949 100644
--- 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
index 2b62e8a729a5..badcbbca562f 100644
--- 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
index 98844a5bf3e8..faf40518a332 100644
--- 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
index e46cada81aa6..f219c29aaed1 100644
--- 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
index 9c29123f7ab9..0c1d696c3528 100644
--- 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
index 8996b44669dd..d902bfea3e68 100644
--- 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
index 19342c5aa427..529a51c24643 100644
--- 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
index cd4a6cc62cd5..edea5dc6ac66 100644
--- 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
index 9fe6d22de85d..15a487765e6d 100644
--- 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
index d01a8bffc7f2..bc3c04439310 100644
--- 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
index 21cd210308a2..4fa599b748b8 100644
--- 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
index 4aee148cd1f3..42140c5d9502 100644
--- 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
index abdf03d6cd71..fa3cbb4e4f16 100644
--- 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
index f02053ad1d86..5fb68d23aa8b 100644
--- 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
index d417f44d175f..b448e2e7ccfa 100644
--- 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
index 24b61ea05034..f242ac6f2de2 100644
--- 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
index 07f38cdf3efa..f281f134c0eb 100644
--- 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
index 2a7e414b3fac..497cef23d47c 100644
--- 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
index c08b8b7b5330..33eda31fbb45 100644
--- 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.