diff --git a/libc/src/threads/linux/mtx_unlock.cpp b/libc/src/threads/linux/mtx_unlock.cpp
@@ -1,4 +1,4 @@
-//===---------- Linux implementation of the mtx_unlock function -----------===//
+//===-- Linux implementation of the mtx_unlock function -------------------===//
 //
 // 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/linux/thrd_create.cpp b/libc/src/threads/linux/thrd_create.cpp
@@ -1,4 +1,4 @@
-//===---------- Linux implementation of the thrd_create function ----------===//
+//===-- Linux implementation of the thrd_create function ------------------===//
 //
 // 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/linux/thrd_join.cpp b/libc/src/threads/linux/thrd_join.cpp
@@ -1,4 +1,4 @@
-//===----------- Linux implementation of the thrd_join function -----------===//
+//===-- Linux implementation of the thrd_join function --------------------===//
 //
 // 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/linux/thread_start_args.h.def b/libc/src/threads/linux/thread_start_args.h.def
@@ -1,4 +1,4 @@
-//===---- Implementation of the get_start_args_addr function -----*- C++ -*===//
+//===-- Implementation of the get_start_args_addr 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/test/config/linux/x86_64/syscall_test.cpp b/libc/test/config/linux/x86_64/syscall_test.cpp
@@ -1,4 +1,4 @@
-//===------------------ Unittests for x86_64 syscalls ---------------------===//
+//===-- Unittests for x86_64 syscalls -------------------------------------===//
 //
 // 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/test/loader/linux/args_test.cpp b/libc/test/loader/linux/args_test.cpp
@@ -1,4 +1,4 @@
-//===----------------- Loader test to check args to main ------------------===//
+//===-- Loader test to check args to main ---------------------------------===//
 //
 // 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/test/loader/linux/main_without_args.cpp b/libc/test/loader/linux/main_without_args.cpp
@@ -1,4 +1,4 @@
-//===----------------- Loader test for main without args ------------------===//
+//===-- Loader test for main without args ---------------------------------===//
 //
 // 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/test/loader/linux/main_without_envp.cpp b/libc/test/loader/linux/main_without_envp.cpp
@@ -1,4 +1,4 @@
-//===----------------- Loader test for main without envp ------------------===//
+//===-- Loader test for main without envp ---------------------------------===//
 //
 // 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/test/src/assert/assert_test.cpp b/libc/test/src/assert/assert_test.cpp
@@ -1,4 +1,4 @@
-//===---------------------- Unittests for assert --------------------------===//
+//===-- Unittests for assert ----------------------------------------------===//
 //
 // 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/test/src/errno/errno_test.cpp b/libc/test/src/errno/errno_test.cpp
@@ -1,4 +1,4 @@
-//===---------------------- Unittests for errno --------------------------===//
+//===-- Unittests for errno -----------------------------------------------===//
 //
 // 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/test/src/signal/raise_test.cpp b/libc/test/src/signal/raise_test.cpp
@@ -1,4 +1,4 @@
-//===----------------------- Unittests for raise --------------------------===//
+//===-- Unittests for raise -----------------------------------------------===//
 //
 // 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/test/src/signal/sigaction_test.cpp b/libc/test/src/signal/sigaction_test.cpp
@@ -1,4 +1,4 @@
-//===----------------------- Unittests for sigaction ----------------------===//
+//===-- Unittests for sigaction -------------------------------------------===//
 //
 // 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/test/src/signal/sigaddset_test.cpp b/libc/test/src/signal/sigaddset_test.cpp
@@ -1,4 +1,4 @@
-//===----------------------- Unittests for sigaddset ----------------------===//
+//===-- Unittests for sigaddset -------------------------------------------===//
 //
 // 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/test/src/signal/sigdelset_test.cpp b/libc/test/src/signal/sigdelset_test.cpp
@@ -1,4 +1,4 @@
-//===--------------------- Unittests for sigdelset ------------------------===//
+//===-- Unittests for sigdelset -------------------------------------------===//
 //
 // 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/test/src/signal/sigfillset_test.cpp b/libc/test/src/signal/sigfillset_test.cpp
@@ -1,4 +1,4 @@
-//===-------------------- Unittests for sigfillset ------------------------===//
+//===-- Unittests for sigfillset ------------------------------------------===//
 //
 // 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/test/src/signal/signal_test.cpp b/libc/test/src/signal/signal_test.cpp
@@ -1,4 +1,4 @@
-//===------------------------ Unittests for signal ------------------------===//
+//===-- Unittests for signal ----------------------------------------------===//
 //
 // 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/test/src/signal/sigprocmask_test.cpp b/libc/test/src/signal/sigprocmask_test.cpp
@@ -1,4 +1,4 @@
-//===--------------------- Unittests for sigprocmask ----------------------===//
+//===-- Unittests for sigprocmask -----------------------------------------===//
 //
 // 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/test/src/stdlib/_Exit_test.cpp b/libc/test/src/stdlib/_Exit_test.cpp
@@ -1,4 +1,4 @@
-//===----------------------- Unittests for _Exit --------------------------===//
+//===-- Unittests for _Exit -----------------------------------------------===//
 //
 // 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/test/src/stdlib/abort_test.cpp b/libc/test/src/stdlib/abort_test.cpp
@@ -1,4 +1,4 @@
-//===----------------------- Unittests for abort --------------------------===//
+//===-- Unittests for abort -----------------------------------------------===//
 //
 // 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/test/src/string/memory_utils/memcpy_utils_test.cpp b/libc/test/src/string/memory_utils/memcpy_utils_test.cpp
@@ -1,4 +1,4 @@
-//===-------------------- Unittests for memory_utils ----------------------===//
+//===-- Unittests for memory_utils ----------------------------------------===//
 //
 // 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/test/src/string/memory_utils/utils_test.cpp b/libc/test/src/string/memory_utils/utils_test.cpp
@@ -1,4 +1,4 @@
-//===-------------------- Unittests for memory_utils ----------------------===//
+//===-- Unittests for memory_utils ----------------------------------------===//
 //
 // 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/test/src/string/strcat_test.cpp b/libc/test/src/string/strcat_test.cpp
@@ -1,4 +1,4 @@
-//===---------------------- Unittests for strcat --------------------------===//
+//===-- Unittests for strcat ----------------------------------------------===//
 //
 // 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/test/src/string/strcpy_test.cpp b/libc/test/src/string/strcpy_test.cpp
@@ -1,4 +1,4 @@
-//===----------------------- Unittests for strcpy -------------------------===//
+//===-- Unittests for strcpy ----------------------------------------------===//
 //
 // 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/test/src/string/strlen_test.cpp b/libc/test/src/string/strlen_test.cpp
@@ -1,4 +1,4 @@
-//===----------------------- Unittests for strlen -------------------------===//
+//===-- Unittests for strlen ----------------------------------------------===//
 //
 // 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/test/src/sys/mman/linux/mmap_test.cpp b/libc/test/src/sys/mman/linux/mmap_test.cpp
@@ -1,4 +1,4 @@
-//===------------------ Unittests for mmap and munmap ---------------------===//
+//===-- Unittests for mmap and munmap -------------------------------------===//
 //
 // 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/test/src/threads/mtx_test.cpp b/libc/test/src/threads/mtx_test.cpp
@@ -1,4 +1,4 @@
-//===---------------------- Unittests for mtx_t ---------------------------===//
+//===-- Unittests for mtx_t -----------------------------------------------===//
 //
 // 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/test/src/threads/thrd_test.cpp b/libc/test/src/threads/thrd_test.cpp
@@ -1,4 +1,4 @@
-//===---------------------- Unittests for thrd_t --------------------------===//
+//===-- Unittests for thrd_t ----------------------------------------------===//
 //
 // 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
@@ -1,11 +1,14 @@
-//===--------- 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.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
+#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 @@ template <class T, size_t N> struct Array {
 
 } // 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
@@ -1,11 +1,14 @@
-//===----------------- 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.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
+#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 @@ template <typename T> class MutableArrayRef : public ArrayRef<T> {
 
 } // 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
@@ -1,11 +1,14 @@
-//===----------------- 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.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef LLVM_LIBC_UTILS_CPP_STRINGREF_H
+#define LLVM_LIBC_UTILS_CPP_STRINGREF_H
+
 #include "ArrayRef.h"
 
 namespace __llvm_libc {
@@ -17,3 +20,5 @@ class StringRef : public ArrayRef<char> {
 
 } // namespace cpp
 } // namespace __llvm_libc
+
+#endif // LLVM_LIBC_UTILS_CPP_STRINGREF_H
diff --git a/libc/utils/CPP/TypeTraits.h b/libc/utils/CPP/TypeTraits.h
@@ -1,11 +1,14 @@
-//===----------------- 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.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
+#ifndef LLVM_LIBC_UTILS_CPP_TYPETRAITS_H
+#define LLVM_LIBC_UTILS_CPP_TYPETRAITS_H
+
 namespace __llvm_libc {
 namespace cpp {
 
@@ -45,3 +48,5 @@ template <typename T> struct IsSame<T, T> : public TrueValue {};
 
 } // namespace cpp
 } // namespace __llvm_libc
+
+#endif // LLVM_LIBC_UTILS_CPP_TYPETRAITS_H
diff --git a/libc/utils/HdrGen/Command.cpp b/libc/utils/HdrGen/Command.cpp
@@ -1,4 +1,4 @@
-//===-------- Base class for header generation commands ---------*- C++ -*-===//
+//===-- Base class for header generation commands -------------------------===//
 //
 // 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/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.cpp b/libc/utils/HdrGen/Generator.cpp
@@ -1,4 +1,4 @@
-//===---- Implementation of the main header generation class -----*- C++ -*===//
+//===-- Implementation of the main header generation class ----------------===//
 //
 // 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
@@ -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.cpp b/libc/utils/HdrGen/IncludeFileCommand.cpp
@@ -1,4 +1,4 @@
-//===----------- Implementation of IncludeFileCommand -----------*- C++ -*-===//
+//===-- Implementation of IncludeFileCommand ------------------------------===//
 //
 // 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
@@ -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/Main.cpp b/libc/utils/HdrGen/Main.cpp
@@ -1,4 +1,4 @@
-//===---------------- "main" function of libc-hdrgen ------------*- C++ -*-===//
+//===-- "main" function of libc-hdrgen ------------------------------------===//
 //
 // 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.cpp b/libc/utils/HdrGen/PublicAPICommand.cpp
@@ -1,4 +1,4 @@
-//===--------------- Implementation of PublicAPICommand ----------*-C++ -*-===//
+//===-- Implementation of PublicAPICommand --------------------------------===//
 //
 // 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
@@ -1,11 +1,14 @@
-//===---------- 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.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
+#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 @@ class PublicAPICommand : public Command {
 };
 
 } // namespace llvm_libc
+
+#endif // LLVM_LIBC_UTILS_HDRGEN_PUBLICAPICOMMAND_H
diff --git 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.cpp b/libc/utils/UnitTest/Test.cpp
@@ -1,4 +1,4 @@
-//===--------- Implementation of the base class for libc unittests --------===//
+//===-- Implementation of the base class for libc unittests ---------------===//
 //
 // 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
@@ -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.cpp b/libc/utils/benchmarks/JSON.cpp
@@ -1,4 +1,4 @@
-//===-------- JSON serialization routines ---------------------------------===//
+//===-- JSON serialization routines ---------------------------------------===//
 //
 // 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
@@ -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/JSONTest.cpp b/libc/utils/benchmarks/JSONTest.cpp
@@ -1,3 +1,11 @@
+//===-- JSON Tests --------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
 #include "JSON.h"
 #include "LibcBenchmark.h"
 #include "LibcMemoryBenchmark.h"

diff --git a/libc/utils/benchmarks/LibcBenchmark.cpp b/libc/utils/benchmarks/LibcBenchmark.cpp
@@ -1,4 +1,4 @@
-//===-------- `Benchmark` function ----------------------------------------===//
+//===-- Benchmark function -----------------------------------------------===//
 //
 // 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/LibcBenchmark.h b/libc/utils/benchmarks/LibcBenchmark.h
@@ -1,4 +1,4 @@
-//===-------- `Benchmark` function ------------------------------*- C++ -*-===//
+//===-- Benchmark 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/benchmarks/LibcBenchmarkTest.cpp b/libc/utils/benchmarks/LibcBenchmarkTest.cpp
@@ -1,3 +1,11 @@
+//===-- Benchmark function tests -----------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
 #include "LibcBenchmark.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Optional.h"

diff --git a/libc/utils/benchmarks/LibcMemoryBenchmark.cpp b/libc/utils/benchmarks/LibcMemoryBenchmark.cpp
@@ -1,4 +1,4 @@
-//===-------- Benchmark memory specific tools -----------------------------===//
+//===-- Benchmark memory specific tools -----------------------------------===//
 //
 // 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
@@ -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.cpp b/libc/utils/benchmarks/LibcMemoryBenchmarkMain.cpp
@@ -1,4 +1,4 @@
-//===-------- Benchmark  --------------------------------------------------===//
+//===-- Benchmark ---------------------------------------------------------===//
 //
 // 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
@@ -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/benchmarks/LibcMemoryBenchmarkTest.cpp b/libc/utils/benchmarks/LibcMemoryBenchmarkTest.cpp
@@ -1,3 +1,11 @@
+//===-- Benchmark Memory Test ---------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
 #include "LibcMemoryBenchmark.h"
 #include "llvm/Support/Alignment.h"
 #include "gmock/gmock.h"

diff --git a/libc/utils/benchmarks/Memcmp.cpp b/libc/utils/benchmarks/Memcmp.cpp
@@ -1,4 +1,4 @@
-//===-------- Benchmark memcmp implementation -----------------------------===//
+//===-- Benchmark memcmp implementation -----------------------------------===//
 //
 // 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/Memcpy.cpp b/libc/utils/benchmarks/Memcpy.cpp
@@ -1,4 +1,4 @@
-//===-------- Benchmark memcpy implementation -----------------------------===//
+//===-- Benchmark memcpy implementation -----------------------------------===//
 //
 // 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/Memset.cpp b/libc/utils/benchmarks/Memset.cpp
@@ -1,4 +1,4 @@
-//===-------- Benchmark memset implementation -----------------------------===//
+//===-- Benchmark memset implementation -----------------------------------===//
 //
 // 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
@@ -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/ExecuteFunctionUnix.cpp b/libc/utils/testutils/ExecuteFunctionUnix.cpp
@@ -1,4 +1,4 @@
-//===------- ExecuteFunction implementation for Unix-like Systems ---------===//
+//===-- ExecuteFunction implementation for Unix-like Systems --------------===//
 //
 // 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.cpp b/libc/utils/testutils/StreamWrapper.cpp
@@ -1,4 +1,4 @@
-//===--------------------------- StreamWrapper.cpp ------------------------===//
+//===-- StreamWrapper.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/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.