Merge pull request #3739 from practicalswift/normalize-headers

diff --git a/stdlib/public/SwiftShims/DispatchShims.h b/stdlib/public/SwiftShims/DispatchShims.h
index 3b56e5e..c3af022 100644
--- a/stdlib/public/SwiftShims/DispatchShims.h
+++ b/stdlib/public/SwiftShims/DispatchShims.h
@@ -1,4 +1,4 @@
-//===--- DispatchShims.h - Compatibility declarations for Dispatch-*- C++ -*-===//
+//===--- DispatchShims.h - Compatibility decls. for Dispatch ----*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/stdlib/public/core/UnsafeRawPointer.swift.gyb b/stdlib/public/core/UnsafeRawPointer.swift.gyb
index 9d85c9e..5e186b9 100644
--- a/stdlib/public/core/UnsafeRawPointer.swift.gyb
+++ b/stdlib/public/core/UnsafeRawPointer.swift.gyb
@@ -1,4 +1,4 @@
-//===--- UnsafeRawPointer.swift.gyb --------------------------*- swift -*-===//
+//===--- UnsafeRawPointer.swift.gyb ---------------------------*- swift -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/stdlib/public/runtime/SwiftObject.h b/stdlib/public/runtime/SwiftObject.h
index 51ba9e0..bee584e 100644
--- a/stdlib/public/runtime/SwiftObject.h
+++ b/stdlib/public/runtime/SwiftObject.h
@@ -1,4 +1,4 @@
-//===--- SwiftObject.h - Native Swift Object root class -------------------===//
+//===--- SwiftObject.h - Native Swift Object root class ---------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/stdlib/public/runtime/SwiftValue.h b/stdlib/public/runtime/SwiftValue.h
index cce3b3e..b40471c 100644
--- a/stdlib/public/runtime/SwiftValue.h
+++ b/stdlib/public/runtime/SwiftValue.h
@@ -1,4 +1,4 @@
-//===--- SwiftValue.h - Boxed Swift value class ---------------------------===//
+//===--- SwiftValue.h - Boxed Swift value class -----------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/stdlib/public/stubs/DispatchShims.mm b/stdlib/public/stubs/DispatchShims.mm
index c9bafa4..ec3427e 100644
--- a/stdlib/public/stubs/DispatchShims.mm
+++ b/stdlib/public/stubs/DispatchShims.mm
@@ -1,4 +1,4 @@
-//===--- DispatchShims.mm - Dispatch helper shims --------------===//
+//===--- DispatchShims.mm - Dispatch helper shims -------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/test/1_stdlib/Inputs/FoundationBridge/FoundationBridge.h b/test/1_stdlib/Inputs/FoundationBridge/FoundationBridge.h
index 9d1570d..6c22def 100644
--- a/test/1_stdlib/Inputs/FoundationBridge/FoundationBridge.h
+++ b/test/1_stdlib/Inputs/FoundationBridge/FoundationBridge.h
@@ -1,4 +1,4 @@
-//===--- FoundationBridge.h -----------------------------------------------===//
+//===--- FoundationBridge.h -------------------------------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //