From c5608f0202eb8ffd360e58db081fef248d675a6b Mon Sep 17 00:00:00 2001
From: Phil Nash <github@philnash.me>
Date: Thu, 7 Sep 2017 11:24:33 +0100
Subject: [PATCH] Changed all .hpp extensions to .h where there is now a
 corresponding .cpp

---
 include/catch.hpp                                         | 4 ++--
 include/internal/catch_approx.cpp                         | 2 +-
 include/internal/{catch_approx.hpp => catch_approx.h}     | 0
 include/internal/catch_capture_matchers.h                 | 2 +-
 include/internal/catch_commandline.cpp                    | 2 +-
 .../{catch_commandline.hpp => catch_commandline.h}        | 0
 include/internal/catch_config.hpp                         | 2 +-
 include/internal/catch_console_colour.cpp                 | 2 +-
 .../{catch_console_colour.hpp => catch_console_colour.h}  | 0
 include/internal/catch_external_interfaces.h              | 2 +-
 include/internal/catch_impl.hpp                           | 4 ++--
 include/internal/catch_interfaces_reporter.h              | 2 +-
 include/internal/catch_list.cpp                           | 4 ++--
 include/internal/catch_matchers.cpp                       | 2 +-
 include/internal/{catch_matchers.hpp => catch_matchers.h} | 0
 include/internal/catch_matchers_string.h                  | 2 +-
 include/internal/catch_matchers_vector.h                  | 2 +-
 include/internal/catch_registry_hub.cpp                   | 2 +-
 include/internal/catch_run_context.cpp                    | 2 +-
 .../{catch_run_context.hpp => catch_run_context.h}        | 8 ++++----
 include/internal/catch_section.h                          | 2 +-
 include/internal/catch_section_info.h                     | 2 +-
 include/internal/catch_session.cpp                        | 8 ++++----
 include/internal/catch_session.h                          | 2 +-
 include/internal/catch_tag_alias_registry.cpp             | 2 +-
 include/internal/catch_test_case_info.cpp                 | 2 +-
 include/internal/catch_test_case_registry_impl.cpp        | 2 +-
 ..._registry_impl.hpp => catch_test_case_registry_impl.h} | 4 ++--
 include/internal/catch_test_case_tracker.cpp              | 2 +-
 ...ch_test_case_tracker.hpp => catch_test_case_tracker.h} | 0
 include/internal/catch_test_registry.cpp                  | 4 ++--
 .../{catch_test_registry.hpp => catch_test_registry.h}    | 0
 include/internal/catch_test_spec.cpp                      | 2 +-
 .../internal/{catch_test_spec.hpp => catch_test_spec.h}   | 2 +-
 include/internal/catch_test_spec_parser.cpp               | 2 +-
 ...atch_test_spec_parser.hpp => catch_test_spec_parser.h} | 2 +-
 include/internal/catch_totals.cpp                         | 2 +-
 include/internal/{catch_totals.hpp => catch_totals.h}     | 0
 include/internal/catch_wildcard_pattern.cpp               | 2 +-
 ...atch_wildcard_pattern.hpp => catch_wildcard_pattern.h} | 0
 include/internal/catch_xmlwriter.cpp                      | 2 +-
 .../internal/{catch_xmlwriter.hpp => catch_xmlwriter.h}   | 0
 include/reporters/catch_reporter_compact.cpp              | 2 +-
 include/reporters/catch_reporter_console.cpp              | 2 +-
 include/reporters/catch_reporter_junit.cpp                | 2 +-
 include/reporters/catch_reporter_xml.cpp                  | 2 +-
 projects/SelfTest/CmdLineTests.cpp                        | 2 +-
 projects/SelfTest/MiscTests.cpp                           | 2 +-
 projects/SelfTest/PartTrackerTests.cpp                    | 2 +-
 projects/SelfTest/SurrogateCpps/catch_console_colour.cpp  | 2 +-
 .../SelfTest/SurrogateCpps/catch_test_case_tracker.cpp    | 2 +-
 projects/SelfTest/SurrogateCpps/catch_test_spec.cpp       | 2 +-
 projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp       | 2 +-
 53 files changed, 55 insertions(+), 55 deletions(-)
 rename include/internal/{catch_approx.hpp => catch_approx.h} (100%)
 rename include/internal/{catch_commandline.hpp => catch_commandline.h} (100%)
 rename include/internal/{catch_console_colour.hpp => catch_console_colour.h} (100%)
 rename include/internal/{catch_matchers.hpp => catch_matchers.h} (100%)
 rename include/internal/{catch_run_context.hpp => catch_run_context.h} (97%)
 rename include/internal/{catch_test_case_registry_impl.hpp => catch_test_case_registry_impl.h} (97%)
 rename include/internal/{catch_test_case_tracker.hpp => catch_test_case_tracker.h} (100%)
 rename include/internal/{catch_test_registry.hpp => catch_test_registry.h} (100%)
 rename include/internal/{catch_test_spec.hpp => catch_test_spec.h} (98%)
 rename include/internal/{catch_test_spec_parser.hpp => catch_test_spec_parser.h} (98%)
 rename include/internal/{catch_totals.hpp => catch_totals.h} (100%)
 rename include/internal/{catch_wildcard_pattern.hpp => catch_wildcard_pattern.h} (100%)
 rename include/internal/{catch_xmlwriter.hpp => catch_xmlwriter.h} (100%)

diff --git a/include/catch.hpp b/include/catch.hpp
index 61321400..118337c9 100644
--- a/include/catch.hpp
+++ b/include/catch.hpp
@@ -35,12 +35,12 @@
 #endif
 
 #include "internal/catch_tag_alias_autoregistrar.h"
-#include "internal/catch_test_registry.hpp"
+#include "internal/catch_test_registry.h"
 #include "internal/catch_capture.hpp"
 #include "internal/catch_section.h"
 #include "internal/catch_benchmark.h"
 #include "internal/catch_interfaces_exception.h"
-#include "internal/catch_approx.hpp"
+#include "internal/catch_approx.h"
 #include "internal/catch_compiler_capabilities.h"
 #include "internal/catch_string_manip.h"
 
diff --git a/include/internal/catch_approx.cpp b/include/internal/catch_approx.cpp
index 419a9cd6..51f4b243 100644
--- a/include/internal/catch_approx.cpp
+++ b/include/internal/catch_approx.cpp
@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_approx.hpp"
+#include "catch_approx.h"
 
 #include <limits>
 
diff --git a/include/internal/catch_approx.hpp b/include/internal/catch_approx.h
similarity index 100%
rename from include/internal/catch_approx.hpp
rename to include/internal/catch_approx.h
diff --git a/include/internal/catch_capture_matchers.h b/include/internal/catch_capture_matchers.h
index 3520ad2e..701ba1f6 100644
--- a/include/internal/catch_capture_matchers.h
+++ b/include/internal/catch_capture_matchers.h
@@ -9,7 +9,7 @@
 #define TWOBLUECUBES_CATCH_CAPTURE_MATCHERS_HPP_INCLUDED
 
 #include "catch_capture.hpp"
-#include "catch_matchers.hpp"
+#include "catch_matchers.h"
 #include "catch_matchers_string.h"
 #include "catch_matchers_vector.h"
 
diff --git a/include/internal/catch_commandline.cpp b/include/internal/catch_commandline.cpp
index 1410baa4..89329032 100644
--- a/include/internal/catch_commandline.cpp
+++ b/include/internal/catch_commandline.cpp
@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_commandline.hpp"
+#include "catch_commandline.h"
 
 #include "catch_string_manip.h"
 
diff --git a/include/internal/catch_commandline.hpp b/include/internal/catch_commandline.h
similarity index 100%
rename from include/internal/catch_commandline.hpp
rename to include/internal/catch_commandline.h
diff --git a/include/internal/catch_config.hpp b/include/internal/catch_config.hpp
index 80847be5..23e1d1ed 100644
--- a/include/internal/catch_config.hpp
+++ b/include/internal/catch_config.hpp
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
 
-#include "catch_test_spec_parser.hpp"
+#include "catch_test_spec_parser.h"
 #include "catch_interfaces_config.h"
 
 // Libstdc++ doesn't like incomplete classes for unique_ptr
diff --git a/include/internal/catch_console_colour.cpp b/include/internal/catch_console_colour.cpp
index a444b076..e33b8828 100644
--- a/include/internal/catch_console_colour.cpp
+++ b/include/internal/catch_console_colour.cpp
@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_console_colour.hpp"
+#include "catch_console_colour.h"
 #include "catch_enforce.h"
 #include "catch_errno_guard.h"
 #include "catch_interfaces_config.h"
diff --git a/include/internal/catch_console_colour.hpp b/include/internal/catch_console_colour.h
similarity index 100%
rename from include/internal/catch_console_colour.hpp
rename to include/internal/catch_console_colour.h
diff --git a/include/internal/catch_external_interfaces.h b/include/internal/catch_external_interfaces.h
index 4eb55256..7abc69fc 100644
--- a/include/internal/catch_external_interfaces.h
+++ b/include/internal/catch_external_interfaces.h
@@ -8,7 +8,7 @@
 #define TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
 
 #include "../reporters/catch_reporter_bases.hpp"
-#include "catch_console_colour.hpp"
+#include "catch_console_colour.h"
 #include "catch_reporter_registrars.hpp"
 
 #endif // TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
diff --git a/include/internal/catch_impl.hpp b/include/internal/catch_impl.hpp
index 5debe23c..ae512ce1 100644
--- a/include/internal/catch_impl.hpp
+++ b/include/internal/catch_impl.hpp
@@ -19,8 +19,8 @@
 
 #include "internal/catch_leak_detector.h"
 
-#include "catch_test_spec.hpp"
-#include "catch_test_case_tracker.hpp"
+#include "catch_test_spec.h"
+#include "catch_test_case_tracker.h"
 
 // Cpp files will be included in the single-header file here
 // ~*~* CATCH_CPP_STITCH_PLACE *~*~
diff --git a/include/internal/catch_interfaces_reporter.h b/include/internal/catch_interfaces_reporter.h
index be3044f9..d4fb9dbf 100644
--- a/include/internal/catch_interfaces_reporter.h
+++ b/include/internal/catch_interfaces_reporter.h
@@ -11,7 +11,7 @@
 #include "catch_section_info.h"
 #include "catch_common.h"
 #include "catch_config.hpp"
-#include "catch_totals.hpp"
+#include "catch_totals.h"
 #include "catch_test_case_info.h"
 #include "catch_assertionresult.h"
 #include "catch_message.h"
diff --git a/include/internal/catch_list.cpp b/include/internal/catch_list.cpp
index 8f2f291a..4391c441 100644
--- a/include/internal/catch_list.cpp
+++ b/include/internal/catch_list.cpp
@@ -15,8 +15,8 @@
 #include "catch_stream.h"
 #include "catch_text.h"
 
-#include "catch_console_colour.hpp"
-#include "catch_test_spec_parser.hpp"
+#include "catch_console_colour.h"
+#include "catch_test_spec_parser.h"
 #include "catch_tostring.h"
 #include "catch_string_manip.h"
 
diff --git a/include/internal/catch_matchers.cpp b/include/internal/catch_matchers.cpp
index 38ae8c77..8621114b 100644
--- a/include/internal/catch_matchers.cpp
+++ b/include/internal/catch_matchers.cpp
@@ -5,7 +5,7 @@
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_matchers.hpp"
+#include "catch_matchers.h"
 
 namespace Catch {
 namespace Matchers {
diff --git a/include/internal/catch_matchers.hpp b/include/internal/catch_matchers.h
similarity index 100%
rename from include/internal/catch_matchers.hpp
rename to include/internal/catch_matchers.h
diff --git a/include/internal/catch_matchers_string.h b/include/internal/catch_matchers_string.h
index eca35789..3306951b 100644
--- a/include/internal/catch_matchers_string.h
+++ b/include/internal/catch_matchers_string.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED
 
-#include "catch_matchers.hpp"
+#include "catch_matchers.h"
 
 #include <string>
 
diff --git a/include/internal/catch_matchers_vector.h b/include/internal/catch_matchers_vector.h
index 4bf39d70..85994fb0 100644
--- a/include/internal/catch_matchers_vector.h
+++ b/include/internal/catch_matchers_vector.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
 
-#include "catch_matchers.hpp"
+#include "catch_matchers.h"
 
 namespace Catch {
 namespace Matchers {
diff --git a/include/internal/catch_registry_hub.cpp b/include/internal/catch_registry_hub.cpp
index 7daa5572..74d92ec0 100644
--- a/include/internal/catch_registry_hub.cpp
+++ b/include/internal/catch_registry_hub.cpp
@@ -9,7 +9,7 @@
 #include "catch_interfaces_registry_hub.h"
 
 #include "catch_context.h"
-#include "catch_test_case_registry_impl.hpp"
+#include "catch_test_case_registry_impl.h"
 #include "catch_reporter_registry.hpp"
 #include "catch_exception_translator_registry.h"
 #include "catch_tag_alias_registry.h"
diff --git a/include/internal/catch_run_context.cpp b/include/internal/catch_run_context.cpp
index 7cb8f8dc..13054862 100644
--- a/include/internal/catch_run_context.cpp
+++ b/include/internal/catch_run_context.cpp
@@ -1,4 +1,4 @@
-#include "catch_run_context.hpp"
+#include "catch_run_context.h"
 #include "catch_context.h"
 #include "catch_enforce.h"
 #include "catch_random_number_generator.h"
diff --git a/include/internal/catch_run_context.hpp b/include/internal/catch_run_context.h
similarity index 97%
rename from include/internal/catch_run_context.hpp
rename to include/internal/catch_run_context.h
index 40e77d29..64314cb2 100644
--- a/include/internal/catch_run_context.hpp
+++ b/include/internal/catch_run_context.h
@@ -12,12 +12,12 @@
 #include "catch_interfaces_reporter.h"
 #include "catch_interfaces_exception.h"
 #include "catch_config.hpp"
-#include "catch_test_registry.hpp"
+#include "catch_test_registry.h"
 #include "catch_test_case_info.h"
 #include "catch_capture.hpp"
-#include "catch_totals.hpp"
-#include "catch_test_spec.hpp"
-#include "catch_test_case_tracker.hpp"
+#include "catch_totals.h"
+#include "catch_test_spec.h"
+#include "catch_test_case_tracker.h"
 #include "catch_timer.h"
 #include "catch_assertionhandler.h"
 #include "catch_fatal_condition.h"
diff --git a/include/internal/catch_section.h b/include/internal/catch_section.h
index e3b14564..1e5b1c3c 100644
--- a/include/internal/catch_section.h
+++ b/include/internal/catch_section.h
@@ -9,7 +9,7 @@
 #define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
 
 #include "catch_section_info.h"
-#include "catch_totals.hpp"
+#include "catch_totals.h"
 #include "catch_timer.h"
 
 #include <string>
diff --git a/include/internal/catch_section_info.h b/include/internal/catch_section_info.h
index a10b2b77..86681ba7 100644
--- a/include/internal/catch_section_info.h
+++ b/include/internal/catch_section_info.h
@@ -9,7 +9,7 @@
 #define TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED
 
 #include "catch_common.h"
-#include "catch_totals.hpp"
+#include "catch_totals.h"
 
 #include <string>
 
diff --git a/include/internal/catch_session.cpp b/include/internal/catch_session.cpp
index 54c9d783..d799b9ea 100644
--- a/include/internal/catch_session.cpp
+++ b/include/internal/catch_session.cpp
@@ -6,13 +6,13 @@
  */
 
 #include "catch_session.h"
-#include "catch_commandline.hpp"
-#include "catch_console_colour.hpp"
+#include "catch_commandline.h"
+#include "catch_console_colour.h"
 #include "catch_enforce.h"
 #include "catch_list.h"
-#include "catch_run_context.hpp"
+#include "catch_run_context.h"
 #include "catch_stream.h"
-#include "catch_test_spec.hpp"
+#include "catch_test_spec.h"
 #include "catch_version.h"
 #include "catch_interfaces_reporter.h"
 #include "catch_random_number_generator.h"
diff --git a/include/internal/catch_session.h b/include/internal/catch_session.h
index 492d6d31..dca8a051 100644
--- a/include/internal/catch_session.h
+++ b/include/internal/catch_session.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
 
-#include "catch_commandline.hpp"
+#include "catch_commandline.h"
 #include "catch_config.hpp"
 #include "catch_text.h"
 
diff --git a/include/internal/catch_tag_alias_registry.cpp b/include/internal/catch_tag_alias_registry.cpp
index f100ea9d..cfc98f17 100644
--- a/include/internal/catch_tag_alias_registry.cpp
+++ b/include/internal/catch_tag_alias_registry.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "catch_tag_alias_registry.h"
-#include "catch_console_colour.hpp"
+#include "catch_console_colour.h"
 #include "catch_enforce.h"
 #include "catch_interfaces_registry_hub.h"
 #include "catch_stream.h"
diff --git a/include/internal/catch_test_case_info.cpp b/include/internal/catch_test_case_info.cpp
index 54ecc2b6..f21b6ef6 100644
--- a/include/internal/catch_test_case_info.cpp
+++ b/include/internal/catch_test_case_info.cpp
@@ -8,7 +8,7 @@
 
 #include "catch_test_case_info.h"
 #include "catch_enforce.h"
-#include "catch_test_spec.hpp"
+#include "catch_test_spec.h"
 #include "catch_interfaces_testcase.h"
 #include "catch_string_manip.h"
 
diff --git a/include/internal/catch_test_case_registry_impl.cpp b/include/internal/catch_test_case_registry_impl.cpp
index 85385a9c..b9aae92c 100644
--- a/include/internal/catch_test_case_registry_impl.cpp
+++ b/include/internal/catch_test_case_registry_impl.cpp
@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_case_registry_impl.hpp"
+#include "catch_test_case_registry_impl.h"
 
 #include "catch_context.h"
 #include "catch_enforce.h"
diff --git a/include/internal/catch_test_case_registry_impl.hpp b/include/internal/catch_test_case_registry_impl.h
similarity index 97%
rename from include/internal/catch_test_case_registry_impl.hpp
rename to include/internal/catch_test_case_registry_impl.h
index f49ad970..77d4b9ee 100644
--- a/include/internal/catch_test_case_registry_impl.hpp
+++ b/include/internal/catch_test_case_registry_impl.h
@@ -8,8 +8,8 @@
 #ifndef TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
 
-#include "catch_test_registry.hpp"
-#include "catch_test_spec.hpp"
+#include "catch_test_registry.h"
+#include "catch_test_spec.h"
 #include "catch_interfaces_config.h"
 
 #include <vector>
diff --git a/include/internal/catch_test_case_tracker.cpp b/include/internal/catch_test_case_tracker.cpp
index 6960c75f..fb3f8d44 100644
--- a/include/internal/catch_test_case_tracker.cpp
+++ b/include/internal/catch_test_case_tracker.cpp
@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_case_tracker.hpp"
+#include "catch_test_case_tracker.h"
 
 #include "catch_enforce.h"
 
diff --git a/include/internal/catch_test_case_tracker.hpp b/include/internal/catch_test_case_tracker.h
similarity index 100%
rename from include/internal/catch_test_case_tracker.hpp
rename to include/internal/catch_test_case_tracker.h
diff --git a/include/internal/catch_test_registry.cpp b/include/internal/catch_test_registry.cpp
index 7a796cce..b1c07f2d 100644
--- a/include/internal/catch_test_registry.cpp
+++ b/include/internal/catch_test_registry.cpp
@@ -5,8 +5,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_registry.hpp"
-#include "catch_test_case_registry_impl.hpp"
+#include "catch_test_registry.h"
+#include "catch_test_case_registry_impl.h"
 #include "catch_interfaces_registry_hub.h"
 
 namespace Catch {
diff --git a/include/internal/catch_test_registry.hpp b/include/internal/catch_test_registry.h
similarity index 100%
rename from include/internal/catch_test_registry.hpp
rename to include/internal/catch_test_registry.h
diff --git a/include/internal/catch_test_spec.cpp b/include/internal/catch_test_spec.cpp
index c7f64f30..a1055c20 100644
--- a/include/internal/catch_test_spec.cpp
+++ b/include/internal/catch_test_spec.cpp
@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_spec.hpp"
+#include "catch_test_spec.h"
 #include "catch_string_manip.h"
 
 #include <algorithm>
diff --git a/include/internal/catch_test_spec.hpp b/include/internal/catch_test_spec.h
similarity index 98%
rename from include/internal/catch_test_spec.hpp
rename to include/internal/catch_test_spec.h
index 8967c5a9..e9ef3a31 100644
--- a/include/internal/catch_test_spec.hpp
+++ b/include/internal/catch_test_spec.h
@@ -13,7 +13,7 @@
 #pragma clang diagnostic ignored "-Wpadded"
 #endif
 
-#include "catch_wildcard_pattern.hpp"
+#include "catch_wildcard_pattern.h"
 #include "catch_test_case_info.h"
 
 #include <string>
diff --git a/include/internal/catch_test_spec_parser.cpp b/include/internal/catch_test_spec_parser.cpp
index fcfc44c9..61c9e4df 100644
--- a/include/internal/catch_test_spec_parser.cpp
+++ b/include/internal/catch_test_spec_parser.cpp
@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_spec_parser.hpp"
+#include "catch_test_spec_parser.h"
 
 namespace Catch {
 
diff --git a/include/internal/catch_test_spec_parser.hpp b/include/internal/catch_test_spec_parser.h
similarity index 98%
rename from include/internal/catch_test_spec_parser.hpp
rename to include/internal/catch_test_spec_parser.h
index 497253d2..87f7f31f 100644
--- a/include/internal/catch_test_spec_parser.hpp
+++ b/include/internal/catch_test_spec_parser.h
@@ -13,7 +13,7 @@
 #pragma clang diagnostic ignored "-Wpadded"
 #endif
 
-#include "catch_test_spec.hpp"
+#include "catch_test_spec.h"
 #include "catch_string_manip.h"
 #include "catch_interfaces_tag_alias_registry.h"
 
diff --git a/include/internal/catch_totals.cpp b/include/internal/catch_totals.cpp
index 3ddc6bab..0391fe82 100644
--- a/include/internal/catch_totals.cpp
+++ b/include/internal/catch_totals.cpp
@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_totals.hpp"
+#include "catch_totals.h"
 
 namespace Catch {
 
diff --git a/include/internal/catch_totals.hpp b/include/internal/catch_totals.h
similarity index 100%
rename from include/internal/catch_totals.hpp
rename to include/internal/catch_totals.h
diff --git a/include/internal/catch_wildcard_pattern.cpp b/include/internal/catch_wildcard_pattern.cpp
index 106e49b4..f7303568 100644
--- a/include/internal/catch_wildcard_pattern.cpp
+++ b/include/internal/catch_wildcard_pattern.cpp
@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_wildcard_pattern.hpp"
+#include "catch_wildcard_pattern.h"
 #include "catch_enforce.h"
 #include "catch_string_manip.h"
 
diff --git a/include/internal/catch_wildcard_pattern.hpp b/include/internal/catch_wildcard_pattern.h
similarity index 100%
rename from include/internal/catch_wildcard_pattern.hpp
rename to include/internal/catch_wildcard_pattern.h
diff --git a/include/internal/catch_xmlwriter.cpp b/include/internal/catch_xmlwriter.cpp
index acd9b282..a3316f46 100644
--- a/include/internal/catch_xmlwriter.cpp
+++ b/include/internal/catch_xmlwriter.cpp
@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_xmlwriter.hpp"
+#include "catch_xmlwriter.h"
 
 #include <iomanip>
 
diff --git a/include/internal/catch_xmlwriter.hpp b/include/internal/catch_xmlwriter.h
similarity index 100%
rename from include/internal/catch_xmlwriter.hpp
rename to include/internal/catch_xmlwriter.h
diff --git a/include/reporters/catch_reporter_compact.cpp b/include/reporters/catch_reporter_compact.cpp
index 80f3767d..74a09e4b 100644
--- a/include/reporters/catch_reporter_compact.cpp
+++ b/include/reporters/catch_reporter_compact.cpp
@@ -9,7 +9,7 @@
 #include "catch_reporter_bases.hpp"
 
 #include "../internal/catch_reporter_registrars.hpp"
-#include "../internal/catch_console_colour.hpp"
+#include "internal/catch_console_colour.h"
 
 namespace {
 
diff --git a/include/reporters/catch_reporter_console.cpp b/include/reporters/catch_reporter_console.cpp
index 63fad69a..a3662d9c 100644
--- a/include/reporters/catch_reporter_console.cpp
+++ b/include/reporters/catch_reporter_console.cpp
@@ -9,7 +9,7 @@
 #include "catch_reporter_bases.hpp"
 
 #include "../internal/catch_reporter_registrars.hpp"
-#include "../internal/catch_console_colour.hpp"
+#include "internal/catch_console_colour.h"
 #include "../internal/catch_version.h"
 #include "../internal/catch_text.h"
 #include "../internal/catch_stringref.h"
diff --git a/include/reporters/catch_reporter_junit.cpp b/include/reporters/catch_reporter_junit.cpp
index b40e9619..c0e2e3cf 100644
--- a/include/reporters/catch_reporter_junit.cpp
+++ b/include/reporters/catch_reporter_junit.cpp
@@ -10,7 +10,7 @@
 
 #include "../internal/catch_tostring.h"
 #include "../internal/catch_reporter_registrars.hpp"
-#include "../internal/catch_xmlwriter.hpp"
+#include "internal/catch_xmlwriter.h"
 #include "../internal/catch_timer.h"
 
 #include <assert.h>
diff --git a/include/reporters/catch_reporter_xml.cpp b/include/reporters/catch_reporter_xml.cpp
index 0033b310..abdfbce5 100644
--- a/include/reporters/catch_reporter_xml.cpp
+++ b/include/reporters/catch_reporter_xml.cpp
@@ -10,7 +10,7 @@
 
 #include "../internal/catch_capture.hpp"
 #include "../internal/catch_reporter_registrars.hpp"
-#include "../internal/catch_xmlwriter.hpp"
+#include "internal/catch_xmlwriter.h"
 #include "../internal/catch_timer.h"
 
 namespace Catch {
diff --git a/projects/SelfTest/CmdLineTests.cpp b/projects/SelfTest/CmdLineTests.cpp
index 50d4e9d5..c375d41b 100644
--- a/projects/SelfTest/CmdLineTests.cpp
+++ b/projects/SelfTest/CmdLineTests.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "catch.hpp"
-#include "internal/catch_test_spec_parser.hpp"
+#include "internal/catch_test_spec_parser.h"
 
 #ifdef __clang__
 #   pragma clang diagnostic ignored "-Wc++98-compat"
diff --git a/projects/SelfTest/MiscTests.cpp b/projects/SelfTest/MiscTests.cpp
index e3a9318b..2151d77c 100644
--- a/projects/SelfTest/MiscTests.cpp
+++ b/projects/SelfTest/MiscTests.cpp
@@ -13,7 +13,7 @@
 #   pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
 #endif
 
-#include "../include/internal/catch_xmlwriter.hpp"
+#include "internal/catch_xmlwriter.h"
 
 #include <iostream>
 #include <cerrno>
diff --git a/projects/SelfTest/PartTrackerTests.cpp b/projects/SelfTest/PartTrackerTests.cpp
index 26473de2..042c03a7 100644
--- a/projects/SelfTest/PartTrackerTests.cpp
+++ b/projects/SelfTest/PartTrackerTests.cpp
@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 #include "internal/catch_suppress_warnings.h"
-#include "internal/catch_test_case_tracker.hpp"
+#include "internal/catch_test_case_tracker.h"
 
 
 namespace Catch
diff --git a/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp b/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp
index c28aa011..a2377500 100644
--- a/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp
@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
 #include "internal/catch_suppress_warnings.h"
-#include "internal/catch_console_colour.hpp"
+#include "internal/catch_console_colour.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp b/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp
index bd67a8a7..0d697b0f 100644
--- a/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp
@@ -1,2 +1,2 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
-#include "internal/catch_test_case_tracker.hpp"
+#include "internal/catch_test_case_tracker.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp b/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp
index 9993b80a..8be135ec 100644
--- a/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp
@@ -1,3 +1,3 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
 #include "internal/catch_suppress_warnings.h"
-#include "internal/catch_test_spec.hpp"
+#include "internal/catch_test_spec.h"
diff --git a/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp b/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
index 169d2d70..930e3825 100644
--- a/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
@@ -1,4 +1,4 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
 #include "internal/catch_suppress_warnings.h"
-#include "internal/catch_xmlwriter.hpp"
+#include "internal/catch_xmlwriter.h"
 #include "internal/catch_reenable_warnings.h"