diff --git a/libc/include/__llvm-libc-common.h b/libc/include/__llvm-libc-common.h
--- a/libc/include/__llvm-libc-common.h
+++ b/libc/include/__llvm-libc-common.h
@@ -1,4 +1,4 @@
-//===------- Common definitions for LLVM-libc public header files- --------===//
+//===-- Common definitions for LLVM-libc public header files- -------------===//
 //
 // 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/libc/include/__posix-types.h b/libc/include/__posix-types.h
--- a/libc/include/__posix-types.h
+++ b/libc/include/__posix-types.h
@@ -1,4 +1,4 @@
-//===----------------- Definitions of common POSIX types ------------------===//
+//===-- Definitions of common POSIX types ---------------------------------===//
 //
 // 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/libc/include/ctype.h b/libc/include/ctype.h
--- a/libc/include/ctype.h
+++ b/libc/include/ctype.h
@@ -1,4 +1,4 @@
-//===---------------- C standard library header ctype.h -----------------*-===//
+//===-- C standard library header ctype.h -------------------------------*-===//
 //
 // 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/libc/src/assert/assert.h b/libc/src/assert/assert.h
--- a/libc/src/assert/assert.h
+++ b/libc/src/assert/assert.h
@@ -1,4 +1,4 @@
-//===-------------------- Internal header for assert ----------*- C++ -*---===//
+//===-- Internal header for assert ------------------------------*- C++ -*-===//
 //
 // 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/libc/src/errno/llvmlibc_errno.h b/libc/src/errno/llvmlibc_errno.h
--- a/libc/src/errno/llvmlibc_errno.h
+++ b/libc/src/errno/llvmlibc_errno.h
@@ -1,4 +1,4 @@
-//===------------------ Implementation header for errno -------------------===//
+//===-- Implementation header for errno -------------------------*- C++ -*-===//
 //
 // 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/libc/src/math/round.h b/libc/src/math/round.h
--- a/libc/src/math/round.h
+++ b/libc/src/math/round.h
@@ -1,4 +1,4 @@
-//===------------------ Implementation header for round -------------------===//
+//===-- Implementation header for round -------------------------*- C++ -*-===//
 //
 // 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/libc/src/signal/linux/signal.h b/libc/src/signal/linux/signal.h
--- a/libc/src/signal/linux/signal.h
+++ b/libc/src/signal/linux/signal.h
@@ -1,4 +1,4 @@
-//===----------------- Internal header for Linux signals ------------------===//
+//===-- Internal header for Linux signals -----------------------*- C++ -*-===//
 //
 // 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/libc/src/signal/raise.h b/libc/src/signal/raise.h
--- a/libc/src/signal/raise.h
+++ b/libc/src/signal/raise.h
@@ -1,4 +1,4 @@
-//===------------- Implementation header for raise function ------ *-C++-* ===//
+//===-- Implementation header for raise function ----------------*- C++ -*-===//
 //
 // 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/libc/src/signal/sigaction.h b/libc/src/signal/sigaction.h
--- a/libc/src/signal/sigaction.h
+++ b/libc/src/signal/sigaction.h
@@ -1,4 +1,4 @@
-//===------------ Implementation header for sigaction --------*- C++ -*--===//
+//===-- Implementation header for sigaction ---------------------*- C++ -*-===//
 //
 // 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/libc/src/signal/sigaddset.h b/libc/src/signal/sigaddset.h
--- a/libc/src/signal/sigaddset.h
+++ b/libc/src/signal/sigaddset.h
@@ -1,4 +1,4 @@
-//===------------- Implementation header for sigaddset ---------*- C++ -*--===//
+//===-- Implementation header for sigaddset ---------------------*- C++ -*-===//
 //
 // 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/libc/src/signal/sigdelset.h b/libc/src/signal/sigdelset.h
--- a/libc/src/signal/sigdelset.h
+++ b/libc/src/signal/sigdelset.h
@@ -1,4 +1,4 @@
-//===------------- Implementation header for sigdelset ---------*- C++ -*--===//
+//===-- Implementation header for sigdelset ---------------------*- C++ -*-===//
 //
 // 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/libc/src/signal/sigemptyset.h b/libc/src/signal/sigemptyset.h
--- a/libc/src/signal/sigemptyset.h
+++ b/libc/src/signal/sigemptyset.h
@@ -1,4 +1,4 @@
-//===------------ Implementation header for sigemptyset --------*- C++ -*--===//
+//===-- Implementation header for sigemptyset -------------------*- C++ -*-===//
 //
 // 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/libc/src/signal/sigfillset.h b/libc/src/signal/sigfillset.h
--- a/libc/src/signal/sigfillset.h
+++ b/libc/src/signal/sigfillset.h
@@ -1,4 +1,4 @@
-//===------------- Implementation header for sigfillset --------*- C++ -*--===//
+//===-- Implementation header for sigfillset --------------------*- C++ -*-===//
 //
 // 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/libc/src/signal/signal.h b/libc/src/signal/signal.h
--- a/libc/src/signal/signal.h
+++ b/libc/src/signal/signal.h
@@ -1,4 +1,4 @@
-//===------------- Implementation header for signal ------------*- C++ -*--===//
+//===-- Implementation header for signal ------------------------*- C++ -*-===//
 //
 // 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/libc/src/signal/sigprocmask.h b/libc/src/signal/sigprocmask.h
--- a/libc/src/signal/sigprocmask.h
+++ b/libc/src/signal/sigprocmask.h
@@ -1,4 +1,4 @@
-//===------------ Implementation header for sigprocmask --------*- C++ -*--===//
+//===-- Implementation header for sigprocmask -------------------*- C++ -*-===//
 //
 // 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/libc/src/stdlib/_Exit.h b/libc/src/stdlib/_Exit.h
--- a/libc/src/stdlib/_Exit.h
+++ b/libc/src/stdlib/_Exit.h
@@ -1,4 +1,4 @@
-//===----------------- Implementation header for _Exit ---------*- C++ -*--===//
+//===-- Implementation header for _Exit -------------------------*- C++ -*-===//
 //
 // 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/libc/src/stdlib/abort.h b/libc/src/stdlib/abort.h
--- a/libc/src/stdlib/abort.h
+++ b/libc/src/stdlib/abort.h
@@ -1,4 +1,4 @@
-//===----------------- Implementation header for abort ---------*- C++ -*--===//
+//===-- Implementation header for abort -------------------------*- C++ -*-===//
 //
 // 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/libc/src/string/memcpy.h b/libc/src/string/memcpy.h
--- a/libc/src/string/memcpy.h
+++ b/libc/src/string/memcpy.h
@@ -1,4 +1,4 @@
-//===----------------- Implementation header for memcpy -------------------===//
+//===-- Implementation header for memcpy ------------------------*- C++ -*-===//
 //
 // 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/libc/src/string/memory_utils/memcpy_utils.h b/libc/src/string/memory_utils/memcpy_utils.h
--- a/libc/src/string/memory_utils/memcpy_utils.h
+++ b/libc/src/string/memory_utils/memcpy_utils.h
@@ -1,4 +1,4 @@
-//===---------------------------- Memcpy utils ----------------------------===//
+//===-- Memcpy utils --------------------------------------------*- C++ -*-===//
 //
 // 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/libc/src/string/memory_utils/utils.h b/libc/src/string/memory_utils/utils.h
--- a/libc/src/string/memory_utils/utils.h
+++ b/libc/src/string/memory_utils/utils.h
@@ -1,4 +1,4 @@
-//===---------------------------- Memory utils ----------------------------===//
+//===-- Memory utils --------------------------------------------*- C++ -*-===//
 //
 // 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/libc/src/string/strcat.h b/libc/src/string/strcat.h
--- a/libc/src/string/strcat.h
+++ b/libc/src/string/strcat.h
@@ -1,4 +1,4 @@
-//===----------------- Implementation header for strcat -------------------===//
+//===-- Implementation header for strcat ------------------------*- C++ -*-===//
 //
 // 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/libc/src/string/strcpy.h b/libc/src/string/strcpy.h
--- a/libc/src/string/strcpy.h
+++ b/libc/src/string/strcpy.h
@@ -1,4 +1,4 @@
-//===----------------- Implementation header for strcpy -------------------===//
+//===-- Implementation header for strcpy ------------------------*- C++ -*-===//
 //
 // 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/libc/src/string/strlen.h b/libc/src/string/strlen.h
--- a/libc/src/string/strlen.h
+++ b/libc/src/string/strlen.h
@@ -1,4 +1,4 @@
-//===----------------- Implementation header for strlen -------------------===//
+//===-- Implementation header for strlen ------------------------*- C++ -*-===//
 //
 // 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/libc/src/sys/mman/mmap.h b/libc/src/sys/mman/mmap.h
--- a/libc/src/sys/mman/mmap.h
+++ b/libc/src/sys/mman/mmap.h
@@ -1,4 +1,4 @@
-//===-------------- Implementation header for mmap function ------ *-C++-* ===//
+//===-- Implementation header for mmap function -----------------*- C++ -*-===//
 //
 // 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/libc/src/sys/mman/munmap.h b/libc/src/sys/mman/munmap.h
--- a/libc/src/sys/mman/munmap.h
+++ b/libc/src/sys/mman/munmap.h
@@ -1,4 +1,4 @@
-//===-------------- Implementation header for mumap function ----- *-C++-* ===//
+//===-- Implementation header for mumap function ----------------*- C++ -*-===//
 //
 // 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/libc/src/threads/mtx_init.h b/libc/src/threads/mtx_init.h
--- a/libc/src/threads/mtx_init.h
+++ b/libc/src/threads/mtx_init.h
@@ -1,4 +1,4 @@
-//===---------- Implementation header for mtx_init function ------ *-C++-* ===//
+//===-- Implementation header for mtx_init function -------------*- C++ -*-===//
 //
 // 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/libc/src/threads/mtx_lock.h b/libc/src/threads/mtx_lock.h
--- a/libc/src/threads/mtx_lock.h
+++ b/libc/src/threads/mtx_lock.h
@@ -1,4 +1,4 @@
-//===---------- Implementation header for mtx_lock function ------ *-C++-* ===//
+//===-- Implementation header for mtx_lock function -------------*- C++ -*-===//
 //
 // 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/libc/src/threads/mtx_unlock.h b/libc/src/threads/mtx_unlock.h
--- a/libc/src/threads/mtx_unlock.h
+++ b/libc/src/threads/mtx_unlock.h
@@ -1,4 +1,4 @@
-//===-------- Implementation header for mtx_unlock function ------ *-C++-* ===//
+//===-- Implementation header for mtx_unlock function -----------*- C++ -*-===//
 //
 // 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/libc/src/threads/thrd_create.h b/libc/src/threads/thrd_create.h
--- a/libc/src/threads/thrd_create.h
+++ b/libc/src/threads/thrd_create.h
@@ -1,4 +1,4 @@
-//===------- Implementation header for thrd_create function ------ *-C++-* ===//
+//===-- Implementation header for thrd_create function ----------*- C++ -*-===//
 //
 // 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/libc/src/threads/thrd_join.h b/libc/src/threads/thrd_join.h
--- a/libc/src/threads/thrd_join.h
+++ b/libc/src/threads/thrd_join.h
@@ -1,4 +1,4 @@
-//===-------- Implementation header for thrd_join function ------- *-C++-* ===//
+//===-- Implementation header for thrd_join function ------------*- C++ -*-===//
 //
 // 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/libc/utils/CPP/Array.h b/libc/utils/CPP/Array.h
--- a/libc/utils/CPP/Array.h
+++ b/libc/utils/CPP/Array.h
@@ -1,4 +1,4 @@
-//===--------- A self contained equivalent of std::array --------*- C++ -*-===//
+//===-- A self contained equivalent of std::array ---------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,6 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef LLVM_LIBC_UTILS_CPP_ARRAY_H
+#define LLVM_LIBC_UTILS_CPP_ARRAY_H
+
 #include <stddef.h> // For size_t.
 
 namespace __llvm_libc {
@@ -45,3 +48,5 @@
 
 } // namespace cpp
 } // namespace __llvm_libc
+
+#endif // LLVM_LIBC_UTILS_CPP_ARRAY_H
diff --git a/libc/utils/CPP/ArrayRef.h b/libc/utils/CPP/ArrayRef.h
--- a/libc/utils/CPP/ArrayRef.h
+++ b/libc/utils/CPP/ArrayRef.h
@@ -1,4 +1,4 @@
-//===----------------- Self contained ArrayRef type -------------*- C++ -*-===//
+//===-- Self contained ArrayRef type ----------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,6 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef LLVM_LIBC_UTILS_CPP_ARRAYREF_H
+#define LLVM_LIBC_UTILS_CPP_ARRAYREF_H
+
 #include "Array.h"
 
 #include <stddef.h> // For size_t.
@@ -88,3 +91,5 @@
 
 } // namespace cpp
 } // namespace __llvm_libc
+
+#endif // LLVM_LIBC_UTILS_CPP_ARRAYREF_H
diff --git a/libc/utils/CPP/StringRef.h b/libc/utils/CPP/StringRef.h
--- a/libc/utils/CPP/StringRef.h
+++ b/libc/utils/CPP/StringRef.h
@@ -1,4 +1,4 @@
-//===----------------- A standalone StringRef type  -------------*- C++ -*-===//
+//===-- A standalone StringRef type  ----------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,7 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ArrayRef.h"
+#ifndef LLVM_LIBC_UTILS_CPP_STRINGREF_H
+#define LLVM_LIBC_UTILS_CPP_STRINGREF_H
 
 namespace __llvm_libc {
 namespace cpp {
@@ -17,3 +18,5 @@
 
 } // namespace cpp
 } // namespace __llvm_libc
+
+#endif // LLVM_LIBC_UTILS_CPP_STRINGREF_H
\ No newline at end of file
diff --git a/libc/utils/CPP/TypeTraits.h b/libc/utils/CPP/TypeTraits.h
--- a/libc/utils/CPP/TypeTraits.h
+++ b/libc/utils/CPP/TypeTraits.h
@@ -1,4 +1,4 @@
-//===----------------- Self contained C++ type traits -----------*- C++ -*-===//
+//===-- Self contained C++ type traits --------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,6 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef LLVM_LIBC_UTILS_CPP_TYPETRAITS_H
+#define LLVM_LIBC_UTILS_CPP_TYPETRAITS_H
+
 namespace __llvm_libc {
 namespace cpp {
 
@@ -45,3 +48,5 @@
 
 } // namespace cpp
 } // namespace __llvm_libc
+
+#endif // LLVM_LIBC_UTILS_CPP_TYPETRAITS_H
diff --git a/libc/utils/HdrGen/Command.h b/libc/utils/HdrGen/Command.h
--- a/libc/utils/HdrGen/Command.h
+++ b/libc/utils/HdrGen/Command.h
@@ -1,4 +1,4 @@
-//===-------- Base class for header generation commands ---------*- C++ -*-===//
+//===-- Base class for header generation commands ---------------*- C++ -*-===//
 //
 // 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/libc/utils/HdrGen/Generator.h b/libc/utils/HdrGen/Generator.h
--- a/libc/utils/HdrGen/Generator.h
+++ b/libc/utils/HdrGen/Generator.h
@@ -1,4 +1,4 @@
-//===------------- - The main header generation class -----------*- C++ -*-===//
+//===-- The main header generation class ------------------------*- C++ -*-===//
 //
 // 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/libc/utils/HdrGen/IncludeFileCommand.h b/libc/utils/HdrGen/IncludeFileCommand.h
--- a/libc/utils/HdrGen/IncludeFileCommand.h
+++ b/libc/utils/HdrGen/IncludeFileCommand.h
@@ -1,4 +1,4 @@
-//===-------- Class which implements the %%include_file command -*- C++ -*-===//
+//===-- Class which implements the %%include_file command -------*- C++ -*-===//
 //
 // 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/libc/utils/HdrGen/PublicAPICommand.h b/libc/utils/HdrGen/PublicAPICommand.h
--- a/libc/utils/HdrGen/PublicAPICommand.h
+++ b/libc/utils/HdrGen/PublicAPICommand.h
@@ -1,4 +1,4 @@
-//===---------- Implementation of PublicAPICommand --------------*- C++ -*-===//
+//===-- Implementation of PublicAPICommand ----------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -6,6 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef LLVM_LIBC_UTILS_HDRGEN_PUBLICAPICOMMAND_H
+#define LLVM_LIBC_UTILS_HDRGEN_PUBLICAPICOMMAND_H
+
 #include "Command.h"
 
 #include "llvm/ADT/StringRef.h"
@@ -34,3 +37,5 @@
 };
 
 } // namespace llvm_libc
+
+#endif // LLVM_LIBC_UTILS_HDRGEN_PUBLICAPICOMMAND_H
diff --git a/libc/utils/UnitTest/ErrnoSetterMatcher.h b/libc/utils/UnitTest/ErrnoSetterMatcher.h
--- a/libc/utils/UnitTest/ErrnoSetterMatcher.h
+++ b/libc/utils/UnitTest/ErrnoSetterMatcher.h
@@ -1,4 +1,4 @@
-//===--------------------- ErrnoSetterMatcher.h -----------------*- C++ -*-===//
+//===-- ErrnoSetterMatcher.h ------------------------------------*- C++ -*-===//
 //
 // 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/libc/utils/UnitTest/Test.h b/libc/utils/UnitTest/Test.h
--- a/libc/utils/UnitTest/Test.h
+++ b/libc/utils/UnitTest/Test.h
@@ -1,4 +1,4 @@
-//===------------------ Base class for libc unittests -----------*- C++ -*-===//
+//===-- Base class for libc unittests ---------------------------*- C++ -*-===//
 //
 // 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/libc/utils/benchmarks/JSON.h b/libc/utils/benchmarks/JSON.h
--- a/libc/utils/benchmarks/JSON.h
+++ b/libc/utils/benchmarks/JSON.h
@@ -1,4 +1,4 @@
-//===-------- JSON serialization routines -----------------------*- C++ -*-===//
+//===-- JSON serialization routines -----------------------------*- C++ -*-===//
 //
 // 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/libc/utils/benchmarks/LibcMemoryBenchmark.h b/libc/utils/benchmarks/LibcMemoryBenchmark.h
--- a/libc/utils/benchmarks/LibcMemoryBenchmark.h
+++ b/libc/utils/benchmarks/LibcMemoryBenchmark.h
@@ -1,4 +1,4 @@
-//===-------- Benchmark memory specific tools -------------------*- C++ -*-===//
+//===-- Benchmark memory specific tools -------------------------*- C++ -*-===//
 //
 // 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/libc/utils/benchmarks/LibcMemoryBenchmarkMain.h b/libc/utils/benchmarks/LibcMemoryBenchmarkMain.h
--- a/libc/utils/benchmarks/LibcMemoryBenchmarkMain.h
+++ b/libc/utils/benchmarks/LibcMemoryBenchmarkMain.h
@@ -1,4 +1,4 @@
-//===-------- BenchmarkRunner interface -------------------------*- C++ -*-===//
+//===-- BenchmarkRunner interface -------------------------------*- C++ -*-===//
 //
 // 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/libc/utils/testutils/ExecuteFunction.h b/libc/utils/testutils/ExecuteFunction.h
--- a/libc/utils/testutils/ExecuteFunction.h
+++ b/libc/utils/testutils/ExecuteFunction.h
@@ -1,4 +1,4 @@
-//===---------------------- ExecuteFunction.h -------------------*- C++ -*-===//
+//===--- ExecuteFunction.h --------------------------------------*- C++ -*-===//
 //
 // 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/libc/utils/testutils/StreamWrapper.h b/libc/utils/testutils/StreamWrapper.h
--- a/libc/utils/testutils/StreamWrapper.h
+++ b/libc/utils/testutils/StreamWrapper.h
@@ -1,4 +1,4 @@
-//===------------------------ StreamWrapper.h -------------------*- C++ -*-===//
+//===-- StreamWrapper.h -----------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.