diff --git a/Builds/CMake/RippledCore.cmake b/Builds/CMake/RippledCore.cmake
index 20a8da865..3d8ad1955 100644
--- a/Builds/CMake/RippledCore.cmake
+++ b/Builds/CMake/RippledCore.cmake
@@ -6,8 +6,7 @@
 include(target_protobuf_sources)
 
 file (GLOB_RECURSE rb_headers
-  src/ripple/beast/*.h
-  src/ripple/beast/*.hpp)
+  src/ripple/beast/*.h)
 
 # Protocol buffers cannot participate in a unity build,
 # because all the generated sources
@@ -462,22 +461,22 @@ install (
   DESTINATION include/ripple/beast)
 install (
   FILES
-    src/ripple/beast/unit_test/amount.hpp
-    src/ripple/beast/unit_test/dstream.hpp
-    src/ripple/beast/unit_test/global_suites.hpp
-    src/ripple/beast/unit_test/match.hpp
-    src/ripple/beast/unit_test/recorder.hpp
-    src/ripple/beast/unit_test/reporter.hpp
-    src/ripple/beast/unit_test/results.hpp
-    src/ripple/beast/unit_test/runner.hpp
-    src/ripple/beast/unit_test/suite_info.hpp
-    src/ripple/beast/unit_test/suite_list.hpp
-    src/ripple/beast/unit_test/suite.hpp
-    src/ripple/beast/unit_test/thread.hpp
+    src/ripple/beast/unit_test/amount.h
+    src/ripple/beast/unit_test/dstream.h
+    src/ripple/beast/unit_test/global_suites.h
+    src/ripple/beast/unit_test/match.h
+    src/ripple/beast/unit_test/recorder.h
+    src/ripple/beast/unit_test/reporter.h
+    src/ripple/beast/unit_test/results.h
+    src/ripple/beast/unit_test/runner.h
+    src/ripple/beast/unit_test/suite_info.h
+    src/ripple/beast/unit_test/suite_list.h
+    src/ripple/beast/unit_test/suite.h
+    src/ripple/beast/unit_test/thread.h
   DESTINATION include/ripple/beast/unit_test)
 install (
   FILES
-    src/ripple/beast/unit_test/detail/const_container.hpp
+    src/ripple/beast/unit_test/detail/const_container.h
   DESTINATION include/ripple/beast/unit_test/detail)
 install (
   FILES
diff --git a/src/ripple/beast/test/fail_counter.hpp b/src/ripple/beast/test/fail_counter.h
similarity index 100%
rename from src/ripple/beast/test/fail_counter.hpp
rename to src/ripple/beast/test/fail_counter.h
diff --git a/src/ripple/beast/test/fail_stream.hpp b/src/ripple/beast/test/fail_stream.h
similarity index 100%
rename from src/ripple/beast/test/fail_stream.hpp
rename to src/ripple/beast/test/fail_stream.h
diff --git a/src/ripple/beast/test/pipe_stream.hpp b/src/ripple/beast/test/pipe_stream.h
similarity index 100%
rename from src/ripple/beast/test/pipe_stream.hpp
rename to src/ripple/beast/test/pipe_stream.h
diff --git a/src/ripple/beast/test/sig_wait.hpp b/src/ripple/beast/test/sig_wait.h
similarity index 100%
rename from src/ripple/beast/test/sig_wait.hpp
rename to src/ripple/beast/test/sig_wait.h
diff --git a/src/ripple/beast/test/string_iostream.hpp b/src/ripple/beast/test/string_iostream.h
similarity index 100%
rename from src/ripple/beast/test/string_iostream.hpp
rename to src/ripple/beast/test/string_iostream.h
diff --git a/src/ripple/beast/test/string_istream.hpp b/src/ripple/beast/test/string_istream.h
similarity index 100%
rename from src/ripple/beast/test/string_istream.hpp
rename to src/ripple/beast/test/string_istream.h
diff --git a/src/ripple/beast/test/string_ostream.hpp b/src/ripple/beast/test/string_ostream.h
similarity index 100%
rename from src/ripple/beast/test/string_ostream.hpp
rename to src/ripple/beast/test/string_ostream.h
diff --git a/src/ripple/beast/test/test_allocator.hpp b/src/ripple/beast/test/test_allocator.h
similarity index 100%
rename from src/ripple/beast/test/test_allocator.hpp
rename to src/ripple/beast/test/test_allocator.h
diff --git a/src/ripple/beast/test/yield_to.hpp b/src/ripple/beast/test/yield_to.h
similarity index 100%
rename from src/ripple/beast/test/yield_to.hpp
rename to src/ripple/beast/test/yield_to.h
diff --git a/src/ripple/beast/unit_test/amount.hpp b/src/ripple/beast/unit_test/amount.h
similarity index 100%
rename from src/ripple/beast/unit_test/amount.hpp
rename to src/ripple/beast/unit_test/amount.h
diff --git a/src/ripple/beast/unit_test/detail/const_container.hpp b/src/ripple/beast/unit_test/detail/const_container.h
similarity index 100%
rename from src/ripple/beast/unit_test/detail/const_container.hpp
rename to src/ripple/beast/unit_test/detail/const_container.h
diff --git a/src/ripple/beast/unit_test/dstream.hpp b/src/ripple/beast/unit_test/dstream.h
similarity index 100%
rename from src/ripple/beast/unit_test/dstream.hpp
rename to src/ripple/beast/unit_test/dstream.h
diff --git a/src/ripple/beast/unit_test/global_suites.hpp b/src/ripple/beast/unit_test/global_suites.h
similarity index 100%
rename from src/ripple/beast/unit_test/global_suites.hpp
rename to src/ripple/beast/unit_test/global_suites.h
diff --git a/src/ripple/beast/unit_test/match.hpp b/src/ripple/beast/unit_test/match.h
similarity index 100%
rename from src/ripple/beast/unit_test/match.hpp
rename to src/ripple/beast/unit_test/match.h
diff --git a/src/ripple/beast/unit_test/recorder.hpp b/src/ripple/beast/unit_test/recorder.h
similarity index 100%
rename from src/ripple/beast/unit_test/recorder.hpp
rename to src/ripple/beast/unit_test/recorder.h
diff --git a/src/ripple/beast/unit_test/reporter.hpp b/src/ripple/beast/unit_test/reporter.h
similarity index 100%
rename from src/ripple/beast/unit_test/reporter.hpp
rename to src/ripple/beast/unit_test/reporter.h
diff --git a/src/ripple/beast/unit_test/results.hpp b/src/ripple/beast/unit_test/results.h
similarity index 100%
rename from src/ripple/beast/unit_test/results.hpp
rename to src/ripple/beast/unit_test/results.h
diff --git a/src/ripple/beast/unit_test/runner.hpp b/src/ripple/beast/unit_test/runner.h
similarity index 100%
rename from src/ripple/beast/unit_test/runner.hpp
rename to src/ripple/beast/unit_test/runner.h
diff --git a/src/ripple/beast/unit_test/suite.hpp b/src/ripple/beast/unit_test/suite.h
similarity index 100%
rename from src/ripple/beast/unit_test/suite.hpp
rename to src/ripple/beast/unit_test/suite.h
diff --git a/src/ripple/beast/unit_test/suite_info.hpp b/src/ripple/beast/unit_test/suite_info.h
similarity index 100%
rename from src/ripple/beast/unit_test/suite_info.hpp
rename to src/ripple/beast/unit_test/suite_info.h
diff --git a/src/ripple/beast/unit_test/suite_list.hpp b/src/ripple/beast/unit_test/suite_list.h
similarity index 100%
rename from src/ripple/beast/unit_test/suite_list.hpp
rename to src/ripple/beast/unit_test/suite_list.h
diff --git a/src/ripple/beast/unit_test/thread.hpp b/src/ripple/beast/unit_test/thread.h
similarity index 100%
rename from src/ripple/beast/unit_test/thread.hpp
rename to src/ripple/beast/unit_test/thread.h