diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d9205d65..f06941cc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -204,14 +204,14 @@ CheckFileList(INTERNAL_FILES ${SOURCES_DIR}/internal)
 set(REPORTER_HEADERS
     ${SOURCES_DIR}/reporters/catch_reporter_automake.hpp
     ${SOURCES_DIR}/reporters/catch_reporter_bases.hpp
-    ${SOURCES_DIR}/reporters/catch_reporter_compact.h
-    ${SOURCES_DIR}/reporters/catch_reporter_console.h
-    ${SOURCES_DIR}/reporters/catch_reporter_junit.h
-    ${SOURCES_DIR}/reporters/catch_reporter_listening.h
+    ${SOURCES_DIR}/reporters/catch_reporter_compact.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_console.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_junit.hpp
+    ${SOURCES_DIR}/reporters/catch_reporter_listening.hpp
     ${SOURCES_DIR}/reporters/catch_reporter_sonarqube.hpp
     ${SOURCES_DIR}/reporters/catch_reporter_tap.hpp
     ${SOURCES_DIR}/reporters/catch_reporter_teamcity.hpp
-    ${SOURCES_DIR}/reporters/catch_reporter_xml.h
+    ${SOURCES_DIR}/reporters/catch_reporter_xml.hpp
 )
 set(REPORTER_SOURCES
     ${SOURCES_DIR}/reporters/catch_reporter_automake.cpp
diff --git a/src/catch2/catch_interfaces_reporter.cpp b/src/catch2/catch_interfaces_reporter.cpp
index 4fa753c0..0072463e 100644
--- a/src/catch2/catch_interfaces_reporter.cpp
+++ b/src/catch2/catch_interfaces_reporter.cpp
@@ -7,7 +7,6 @@
 
 #include <catch2/catch_interfaces_reporter.h>
 #include <catch2/catch_console_colour.h>
-#include <catch2/reporters/catch_reporter_listening.h>
 #include <catch2/catch_list.h>
 #include <catch2/catch_text.h>
 
diff --git a/src/catch2/catch_reporter_registry.cpp b/src/catch2/catch_reporter_registry.cpp
index 58ef5f4d..c7fb52ea 100644
--- a/src/catch2/catch_reporter_registry.cpp
+++ b/src/catch2/catch_reporter_registry.cpp
@@ -8,13 +8,13 @@
 
 #include <catch2/catch_reporter_registrars.hpp>
 #include <catch2/reporters/catch_reporter_automake.hpp>
-#include <catch2/reporters/catch_reporter_compact.h>
-#include <catch2/reporters/catch_reporter_console.h>
-#include <catch2/reporters/catch_reporter_junit.h>
+#include <catch2/reporters/catch_reporter_compact.hpp>
+#include <catch2/reporters/catch_reporter_console.hpp>
+#include <catch2/reporters/catch_reporter_junit.hpp>
 #include <catch2/reporters/catch_reporter_sonarqube.hpp>
 #include <catch2/reporters/catch_reporter_tap.hpp>
 #include <catch2/reporters/catch_reporter_teamcity.hpp>
-#include <catch2/reporters/catch_reporter_xml.h>
+#include <catch2/reporters/catch_reporter_xml.hpp>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_session.cpp b/src/catch2/catch_session.cpp
index c839eacf..01e4fd87 100644
--- a/src/catch2/catch_session.cpp
+++ b/src/catch2/catch_session.cpp
@@ -21,7 +21,7 @@
 #include <catch2/catch_text.h>
 #include <catch2/catch_stream.h>
 #include <catch2/catch_windows_h_proxy.h>
-#include <catch2/reporters/catch_reporter_listening.h>
+#include <catch2/reporters/catch_reporter_listening.hpp>
 
 #include <cstdlib>
 #include <iomanip>
diff --git a/src/catch2/reporters/catch_reporter_compact.cpp b/src/catch2/reporters/catch_reporter_compact.cpp
index 13731e43..236af682 100644
--- a/src/catch2/reporters/catch_reporter_compact.cpp
+++ b/src/catch2/reporters/catch_reporter_compact.cpp
@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <catch2/reporters/catch_reporter_compact.h>
+#include <catch2/reporters/catch_reporter_compact.hpp>
 
 #include <catch2/catch_console_colour.h>
 
diff --git a/src/catch2/reporters/catch_reporter_compact.h b/src/catch2/reporters/catch_reporter_compact.hpp
similarity index 100%
rename from src/catch2/reporters/catch_reporter_compact.h
rename to src/catch2/reporters/catch_reporter_compact.hpp
diff --git a/src/catch2/reporters/catch_reporter_console.cpp b/src/catch2/reporters/catch_reporter_console.cpp
index f7b924ae..9e5c7322 100644
--- a/src/catch2/reporters/catch_reporter_console.cpp
+++ b/src/catch2/reporters/catch_reporter_console.cpp
@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <catch2/reporters/catch_reporter_console.h>
+#include <catch2/reporters/catch_reporter_console.hpp>
 
 #include <catch2/catch_reporter_registrars.hpp>
 #include <catch2/catch_console_colour.h>
diff --git a/src/catch2/reporters/catch_reporter_console.h b/src/catch2/reporters/catch_reporter_console.hpp
similarity index 100%
rename from src/catch2/reporters/catch_reporter_console.h
rename to src/catch2/reporters/catch_reporter_console.hpp
diff --git a/src/catch2/reporters/catch_reporter_junit.cpp b/src/catch2/reporters/catch_reporter_junit.cpp
index b7aec37e..49a6aa54 100644
--- a/src/catch2/reporters/catch_reporter_junit.cpp
+++ b/src/catch2/reporters/catch_reporter_junit.cpp
@@ -8,7 +8,7 @@
 
 #include <catch2/reporters/catch_reporter_bases.hpp>
 
-#include <catch2/reporters/catch_reporter_junit.h>
+#include <catch2/reporters/catch_reporter_junit.hpp>
 
 #include <catch2/catch_tostring.h>
 #include <catch2/catch_reporter_registrars.hpp>
diff --git a/src/catch2/reporters/catch_reporter_junit.h b/src/catch2/reporters/catch_reporter_junit.hpp
similarity index 100%
rename from src/catch2/reporters/catch_reporter_junit.h
rename to src/catch2/reporters/catch_reporter_junit.hpp
diff --git a/src/catch2/reporters/catch_reporter_listening.cpp b/src/catch2/reporters/catch_reporter_listening.cpp
index 08f30659..87aae74d 100644
--- a/src/catch2/reporters/catch_reporter_listening.cpp
+++ b/src/catch2/reporters/catch_reporter_listening.cpp
@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
- #include <catch2/reporters/catch_reporter_listening.h>
+ #include <catch2/reporters/catch_reporter_listening.hpp>
 #include <cassert>
 
 namespace Catch {
diff --git a/src/catch2/reporters/catch_reporter_listening.h b/src/catch2/reporters/catch_reporter_listening.hpp
similarity index 100%
rename from src/catch2/reporters/catch_reporter_listening.h
rename to src/catch2/reporters/catch_reporter_listening.hpp
diff --git a/src/catch2/reporters/catch_reporter_xml.cpp b/src/catch2/reporters/catch_reporter_xml.cpp
index b798b54f..f6274937 100644
--- a/src/catch2/reporters/catch_reporter_xml.cpp
+++ b/src/catch2/reporters/catch_reporter_xml.cpp
@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <catch2/reporters/catch_reporter_xml.h>
+#include <catch2/reporters/catch_reporter_xml.hpp>
 
 #include <catch2/catch_capture.hpp>
 #include <catch2/catch_reporter_registrars.hpp>
diff --git a/src/catch2/reporters/catch_reporter_xml.h b/src/catch2/reporters/catch_reporter_xml.hpp
similarity index 100%
rename from src/catch2/reporters/catch_reporter_xml.h
rename to src/catch2/reporters/catch_reporter_xml.hpp