Index: libcxxabi/src/cxa_default_handlers.cpp
===================================================================
--- libcxxabi/src/cxa_default_handlers.cpp
+++ libcxxabi/src/cxa_default_handlers.cpp
@@ -14,8 +14,8 @@
 #include <cstdlib>
 #include "abort_message.h"
 #include "cxxabi.h"
-#include "cxa_handlers.hpp"
-#include "cxa_exception.hpp"
+#include "cxa_handlers.h"
+#include "cxa_exception.h"
 #include "private_typeinfo.h"
 #include "include/atomic_support.h"
 
Index: libcxxabi/src/cxa_exception.h
===================================================================
--- libcxxabi/src/cxa_exception.h
+++ libcxxabi/src/cxa_exception.h
@@ -1,4 +1,4 @@
-//===------------------------- cxa_exception.hpp --------------------------===//
+//===------------------------- cxa_exception.h ----------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
Index: libcxxabi/src/cxa_exception.cpp
===================================================================
--- libcxxabi/src/cxa_exception.cpp
+++ libcxxabi/src/cxa_exception.cpp
@@ -14,8 +14,8 @@
 
 #include <exception>        // for std::terminate
 #include <cstring>          // for memset
-#include "cxa_exception.hpp"
-#include "cxa_handlers.hpp"
+#include "cxa_exception.h"
+#include "cxa_handlers.h"
 #include "fallback_malloc.h"
 #include "include/atomic_support.h"
 
Index: libcxxabi/src/cxa_exception_storage.cpp
===================================================================
--- libcxxabi/src/cxa_exception_storage.cpp
+++ libcxxabi/src/cxa_exception_storage.cpp
@@ -10,7 +10,7 @@
 //  
 //===----------------------------------------------------------------------===//
 
-#include "cxa_exception.hpp"
+#include "cxa_exception.h"
 
 #include <__threading_support>
 
Index: libcxxabi/src/cxa_handlers.h
===================================================================
--- libcxxabi/src/cxa_handlers.h
+++ libcxxabi/src/cxa_handlers.h
@@ -1,4 +1,4 @@
-//===------------------------- cxa_handlers.cpp ---------------------------===//
+//===------------------------- cxa_handlers.h -----------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
Index: libcxxabi/src/cxa_handlers.cpp
===================================================================
--- libcxxabi/src/cxa_handlers.cpp
+++ libcxxabi/src/cxa_handlers.cpp
@@ -14,8 +14,8 @@
 #include <exception>
 #include "abort_message.h"
 #include "cxxabi.h"
-#include "cxa_handlers.hpp"
-#include "cxa_exception.hpp"
+#include "cxa_handlers.h"
+#include "cxa_exception.h"
 #include "private_typeinfo.h"
 #include "include/atomic_support.h"
 
Index: libcxxabi/src/cxa_noexception.cpp
===================================================================
--- libcxxabi/src/cxa_noexception.cpp
+++ libcxxabi/src/cxa_noexception.cpp
@@ -15,8 +15,8 @@
 #include "cxxabi.h"
 
 #include <exception>        // for std::terminate
-#include "cxa_exception.hpp"
-#include "cxa_handlers.hpp"
+#include "cxa_exception.h"
+#include "cxa_handlers.h"
 
 namespace __cxxabiv1 {
 
Index: libcxxabi/src/cxa_personality.cpp
===================================================================
--- libcxxabi/src/cxa_personality.cpp
+++ libcxxabi/src/cxa_personality.cpp
@@ -17,8 +17,8 @@
 #include <typeinfo>
 
 #include "__cxxabi_config.h"
-#include "cxa_exception.hpp"
-#include "cxa_handlers.hpp"
+#include "cxa_exception.h"
+#include "cxa_handlers.h"
 #include "private_typeinfo.h"
 #include "unwind.h"
 
Index: libcxxabi/src/cxa_unexpected.cpp
===================================================================
--- libcxxabi/src/cxa_unexpected.cpp
+++ libcxxabi/src/cxa_unexpected.cpp
@@ -8,7 +8,7 @@
 
 #include <exception>
 #include "cxxabi.h"
-#include "cxa_exception.hpp"
+#include "cxa_exception.h"
 
 namespace __cxxabiv1
 {
Index: libcxxabi/test/dynamic_cast14.pass.cpp
===================================================================
--- libcxxabi/test/dynamic_cast14.pass.cpp
+++ libcxxabi/test/dynamic_cast14.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <cassert>
-#include "support/timer.hpp"
+#include "support/timer.h"
 
 namespace t1
 {
Index: libcxxabi/test/dynamic_cast3.pass.cpp
===================================================================
--- libcxxabi/test/dynamic_cast3.pass.cpp
+++ libcxxabi/test/dynamic_cast3.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <cassert>
-#include "support/timer.hpp"
+#include "support/timer.h"
 
 // This test explicitly tests dynamic cast with types that have inaccessible
 // bases.
Index: libcxxabi/test/dynamic_cast5.pass.cpp
===================================================================
--- libcxxabi/test/dynamic_cast5.pass.cpp
+++ libcxxabi/test/dynamic_cast5.pass.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <cassert>
-#include "support/timer.hpp"
+#include "support/timer.h"
 
 // This test explicitly tests dynamic cast with types that have inaccessible
 // bases.
Index: libcxxabi/test/dynamic_cast_stress.pass.cpp
===================================================================
--- libcxxabi/test/dynamic_cast_stress.pass.cpp
+++ libcxxabi/test/dynamic_cast_stress.pass.cpp
@@ -10,7 +10,7 @@
 
 #include <cassert>
 #include <tuple>
-#include "support/timer.hpp"
+#include "support/timer.h"
 
 template <std::size_t Indx, std::size_t Depth>
 struct C
Index: libcxxabi/test/test_demangle.pass.cpp
===================================================================
--- libcxxabi/test/test_demangle.pass.cpp
+++ libcxxabi/test/test_demangle.pass.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "support/timer.hpp"
+#include "support/timer.h"
 #include <iostream>
 #include <string>
 #include <cstdlib>
Index: libcxxabi/test/test_exception_storage.pass.cpp
===================================================================
--- libcxxabi/test/test_exception_storage.pass.cpp
+++ libcxxabi/test/test_exception_storage.pass.cpp
@@ -12,7 +12,7 @@
 #include <__threading_support>
 #include <unistd.h>
 
-#include "../src/cxa_exception.hpp"
+#include "../src/cxa_exception.h"
 
 typedef __cxxabiv1::__cxa_eh_globals globals_t ;