Index: libcxx/test/std/input.output/filesystems/fs.enum/check_bitmask_types.h
===================================================================
--- libcxx/test/std/input.output/filesystems/fs.enum/check_bitmask_types.h
+++ libcxx/test/std/input.output/filesystems/fs.enum/check_bitmask_types.h
@@ -1,5 +1,5 @@
-#ifndef TEST_BITMASK_TYPE_HPP
-#define TEST_BITMASK_TYPE_HPP
+#ifndef TEST_BITMASK_TYPE_H
+#define TEST_BITMASK_TYPE_H
 
 #include <type_traits>
 #include <cassert>
Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp
===================================================================
--- libcxx/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp
+++ libcxx/test/std/input.output/filesystems/fs.enum/enum.copy_options.pass.cpp
@@ -16,7 +16,7 @@
 #include <type_traits>
 #include <cassert>
 
-#include "check_bitmask_types.hpp"
+#include "check_bitmask_types.h"
 #include "test_macros.h"
 
 
Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.directory_options.pass.cpp
===================================================================
--- libcxx/test/std/input.output/filesystems/fs.enum/enum.directory_options.pass.cpp
+++ libcxx/test/std/input.output/filesystems/fs.enum/enum.directory_options.pass.cpp
@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 
 #include "test_macros.h"
-#include "check_bitmask_types.hpp"
+#include "check_bitmask_types.h"
 
 
 constexpr fs::directory_options ME(int val) { return static_cast<fs::directory_options>(val); }
Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.perm_options.pass.cpp
===================================================================
--- libcxx/test/std/input.output/filesystems/fs.enum/enum.perm_options.pass.cpp
+++ libcxx/test/std/input.output/filesystems/fs.enum/enum.perm_options.pass.cpp
@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 
 #include "test_macros.h"
-#include "check_bitmask_types.hpp"
+#include "check_bitmask_types.h"
 
 
 constexpr fs::perm_options ME(int val) {
Index: libcxx/test/std/input.output/filesystems/fs.enum/enum.perms.pass.cpp
===================================================================
--- libcxx/test/std/input.output/filesystems/fs.enum/enum.perms.pass.cpp
+++ libcxx/test/std/input.output/filesystems/fs.enum/enum.perms.pass.cpp
@@ -18,7 +18,7 @@
 #include <sys/stat.h>
 
 #include "test_macros.h"
-#include "check_bitmask_types.hpp"
+#include "check_bitmask_types.h"
 
 
 constexpr fs::perms ME(int val) { return static_cast<fs::perms>(val); }
Index: libcxx/test/std/utilities/function.objects/comparisons/greater.pass.cpp
===================================================================
--- libcxx/test/std/utilities/function.objects/comparisons/greater.pass.cpp
+++ libcxx/test/std/utilities/function.objects/comparisons/greater.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "test_macros.h"
-#include "pointer_comparison_test_helper.hpp"
+#include "pointer_comparison_test_helper.h"
 
 int main(int, char**)
 {
Index: libcxx/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp
===================================================================
--- libcxx/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp
+++ libcxx/test/std/utilities/function.objects/comparisons/greater_equal.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "test_macros.h"
-#include "pointer_comparison_test_helper.hpp"
+#include "pointer_comparison_test_helper.h"
 
 int main(int, char**)
 {
Index: libcxx/test/std/utilities/function.objects/comparisons/less.pass.cpp
===================================================================
--- libcxx/test/std/utilities/function.objects/comparisons/less.pass.cpp
+++ libcxx/test/std/utilities/function.objects/comparisons/less.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "test_macros.h"
-#include "pointer_comparison_test_helper.hpp"
+#include "pointer_comparison_test_helper.h"
 
 int main(int, char**)
 {
Index: libcxx/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp
===================================================================
--- libcxx/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp
+++ libcxx/test/std/utilities/function.objects/comparisons/less_equal.pass.cpp
@@ -15,7 +15,7 @@
 #include <cassert>
 
 #include "test_macros.h"
-#include "pointer_comparison_test_helper.hpp"
+#include "pointer_comparison_test_helper.h"
 
 int main(int, char**)
 {
Index: libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.h
===================================================================
--- libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.h
+++ libcxx/test/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.h
@@ -1,5 +1,5 @@
-#ifndef POINTER_COMPARISON_TEST_HELPER_HPP
-#define POINTER_COMPARISON_TEST_HELPER_HPP
+#ifndef POINTER_COMPARISON_TEST_HELPER_H
+#define POINTER_COMPARISON_TEST_HELPER_H
 
 #include <vector>
 #include <memory>
@@ -36,4 +36,4 @@
     }
 }
 
-#endif // POINTER_COMPARISON_TEST_HELPER_HPP
+#endif // POINTER_COMPARISON_TEST_HELPER_H