diff --git a/src/catch2/benchmark/catch_benchmark.hpp b/src/catch2/benchmark/catch_benchmark.hpp
index 3c061210..aef42c90 100644
--- a/src/catch2/benchmark/catch_benchmark.hpp
+++ b/src/catch2/benchmark/catch_benchmark.hpp
@@ -10,20 +10,20 @@
 #ifndef TWOBLUECUBES_CATCH_BENCHMARK_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_BENCHMARK_HPP_INCLUDED
 
-#include "../catch_config.hpp"
-#include "../catch_context.h"
-#include "../catch_interfaces_reporter.h"
-#include "../catch_test_registry.h"
+#include <catch2/catch_config.hpp>
+#include <catch2/catch_context.h>
+#include <catch2/catch_interfaces_reporter.h>
+#include <catch2/catch_test_registry.h>
 
-#include "catch_chronometer.hpp"
-#include "catch_clock.hpp"
-#include "catch_environment.hpp"
-#include "catch_execution_plan.hpp"
-#include "detail/catch_estimate_clock.hpp"
-#include "detail/catch_complete_invoke.hpp"
-#include "detail/catch_analyse.hpp"
-#include "detail/catch_benchmark_function.hpp"
-#include "detail/catch_run_for_at_least.hpp"
+#include <catch2/benchmark/catch_chronometer.hpp>
+#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/catch_environment.hpp>
+#include <catch2/benchmark/catch_execution_plan.hpp>
+#include <catch2/benchmark/detail/catch_estimate_clock.hpp>
+#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
+#include <catch2/benchmark/detail/catch_analyse.hpp>
+#include <catch2/benchmark/detail/catch_benchmark_function.hpp>
+#include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
 
 #include <algorithm>
 #include <functional>
diff --git a/src/catch2/benchmark/catch_chronometer.hpp b/src/catch2/benchmark/catch_chronometer.hpp
index 1022017d..19a7ec05 100644
--- a/src/catch2/benchmark/catch_chronometer.hpp
+++ b/src/catch2/benchmark/catch_chronometer.hpp
@@ -11,10 +11,10 @@
 #ifndef TWOBLUECUBES_CATCH_CHRONOMETER_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_CHRONOMETER_HPP_INCLUDED
 
-#include "catch_clock.hpp"
-#include "catch_optimizer.hpp"
-#include "detail/catch_complete_invoke.hpp"
-#include "../catch_meta.hpp"
+#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/catch_optimizer.hpp>
+#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
+#include <catch2/catch_meta.hpp>
 
 namespace Catch {
     namespace Benchmark {
diff --git a/src/catch2/benchmark/catch_environment.hpp b/src/catch2/benchmark/catch_environment.hpp
index 55951249..090efa82 100644
--- a/src/catch2/benchmark/catch_environment.hpp
+++ b/src/catch2/benchmark/catch_environment.hpp
@@ -11,8 +11,8 @@
 #ifndef TWOBLUECUBES_CATCH_ENVIRONMENT_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_ENVIRONMENT_HPP_INCLUDED
 
-#include "catch_clock.hpp"
-#include "catch_outlier_classification.hpp"
+#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/catch_outlier_classification.hpp>
 
 namespace Catch {
     namespace Benchmark {
diff --git a/src/catch2/benchmark/catch_execution_plan.hpp b/src/catch2/benchmark/catch_execution_plan.hpp
index e56c83aa..dcada8c8 100644
--- a/src/catch2/benchmark/catch_execution_plan.hpp
+++ b/src/catch2/benchmark/catch_execution_plan.hpp
@@ -11,12 +11,12 @@
 #ifndef TWOBLUECUBES_CATCH_EXECUTION_PLAN_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_EXECUTION_PLAN_HPP_INCLUDED
 
-#include "../catch_config.hpp"
-#include "catch_clock.hpp"
-#include "catch_environment.hpp"
-#include "detail/catch_benchmark_function.hpp"
-#include "detail/catch_repeat.hpp"
-#include "detail/catch_run_for_at_least.hpp"
+#include <catch2/catch_config.hpp>
+#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/catch_environment.hpp>
+#include <catch2/benchmark/detail/catch_benchmark_function.hpp>
+#include <catch2/benchmark/detail/catch_repeat.hpp>
+#include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
 
 #include <algorithm>
 
diff --git a/src/catch2/benchmark/catch_sample_analysis.hpp b/src/catch2/benchmark/catch_sample_analysis.hpp
index 4550d0bc..98806864 100644
--- a/src/catch2/benchmark/catch_sample_analysis.hpp
+++ b/src/catch2/benchmark/catch_sample_analysis.hpp
@@ -11,9 +11,9 @@
 #ifndef TWOBLUECUBES_CATCH_BENCHMARK_RESULTS_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_BENCHMARK_RESULTS_HPP_INCLUDED
 
-#include "catch_clock.hpp"
-#include "catch_estimate.hpp"
-#include "catch_outlier_classification.hpp"
+#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/catch_estimate.hpp>
+#include <catch2/benchmark/catch_outlier_classification.hpp>
 
 #include <algorithm>
 #include <vector>
diff --git a/src/catch2/benchmark/detail/catch_analyse.hpp b/src/catch2/benchmark/detail/catch_analyse.hpp
index a3becbe4..3e009429 100644
--- a/src/catch2/benchmark/detail/catch_analyse.hpp
+++ b/src/catch2/benchmark/detail/catch_analyse.hpp
@@ -11,9 +11,9 @@
 #ifndef TWOBLUECUBES_CATCH_DETAIL_ANALYSE_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_DETAIL_ANALYSE_HPP_INCLUDED
 
-#include "../catch_clock.hpp"
-#include "../catch_sample_analysis.hpp"
-#include "catch_stats.hpp"
+#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/catch_sample_analysis.hpp>
+#include <catch2/benchmark/detail/catch_stats.hpp>
 
 #include <algorithm>
 #include <iterator>
diff --git a/src/catch2/benchmark/detail/catch_benchmark_function.hpp b/src/catch2/benchmark/detail/catch_benchmark_function.hpp
index 60c7f1d6..e25ae220 100644
--- a/src/catch2/benchmark/detail/catch_benchmark_function.hpp
+++ b/src/catch2/benchmark/detail/catch_benchmark_function.hpp
@@ -11,9 +11,9 @@
 #ifndef TWOBLUECUBES_CATCH_DETAIL_BENCHMARK_FUNCTION_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_DETAIL_BENCHMARK_FUNCTION_HPP_INCLUDED
 
-#include "../catch_chronometer.hpp"
-#include "catch_complete_invoke.hpp"
-#include "../../catch_meta.hpp"
+#include <catch2/benchmark/catch_chronometer.hpp>
+#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
+#include <catch2/catch_meta.hpp>
 
 #include <cassert>
 #include <type_traits>
diff --git a/src/catch2/benchmark/detail/catch_complete_invoke.hpp b/src/catch2/benchmark/detail/catch_complete_invoke.hpp
index abeb2ac7..8306cc0f 100644
--- a/src/catch2/benchmark/detail/catch_complete_invoke.hpp
+++ b/src/catch2/benchmark/detail/catch_complete_invoke.hpp
@@ -11,7 +11,7 @@
 #ifndef TWOBLUECUBES_CATCH_DETAIL_COMPLETE_INVOKE_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_DETAIL_COMPLETE_INVOKE_HPP_INCLUDED
 
-#include "../../catch_enforce.h"
+#include <catch2/catch_enforce.h>
 
 #include <type_traits>
 #include <utility>
diff --git a/src/catch2/benchmark/detail/catch_estimate_clock.hpp b/src/catch2/benchmark/detail/catch_estimate_clock.hpp
index 055c5825..f244f745 100644
--- a/src/catch2/benchmark/detail/catch_estimate_clock.hpp
+++ b/src/catch2/benchmark/detail/catch_estimate_clock.hpp
@@ -11,12 +11,12 @@
 #ifndef TWOBLUECUBES_CATCH_DETAIL_ESTIMATE_CLOCK_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_DETAIL_ESTIMATE_CLOCK_HPP_INCLUDED
 
-#include "../catch_clock.hpp"
-#include "../catch_environment.hpp"
-#include "catch_stats.hpp"
-#include "catch_measure.hpp"
-#include "catch_run_for_at_least.hpp"
-#include "../catch_clock.hpp"
+#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/catch_environment.hpp>
+#include <catch2/benchmark/detail/catch_stats.hpp>
+#include <catch2/benchmark/detail/catch_measure.hpp>
+#include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
+#include <catch2/benchmark/catch_clock.hpp>
 
 #include <algorithm>
 #include <iterator>
diff --git a/src/catch2/benchmark/detail/catch_measure.hpp b/src/catch2/benchmark/detail/catch_measure.hpp
index 62ed2809..9cee9793 100644
--- a/src/catch2/benchmark/detail/catch_measure.hpp
+++ b/src/catch2/benchmark/detail/catch_measure.hpp
@@ -11,9 +11,9 @@
 #ifndef TWOBLUECUBES_CATCH_DETAIL_MEASURE_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_DETAIL_MEASURE_HPP_INCLUDED
 
-#include "../catch_clock.hpp"
-#include "catch_complete_invoke.hpp"
-#include "catch_timing.hpp"
+#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
+#include <catch2/benchmark/detail/catch_timing.hpp>
 
 #include <utility>
 
diff --git a/src/catch2/benchmark/detail/catch_run_for_at_least.hpp b/src/catch2/benchmark/detail/catch_run_for_at_least.hpp
index a41c6b46..24107c67 100644
--- a/src/catch2/benchmark/detail/catch_run_for_at_least.hpp
+++ b/src/catch2/benchmark/detail/catch_run_for_at_least.hpp
@@ -11,12 +11,12 @@
 #ifndef TWOBLUECUBES_CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
 
-#include "../catch_clock.hpp"
-#include "../catch_chronometer.hpp"
-#include "catch_measure.hpp"
-#include "catch_complete_invoke.hpp"
-#include "catch_timing.hpp"
-#include "../../catch_meta.hpp"
+#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/catch_chronometer.hpp>
+#include <catch2/benchmark/detail/catch_measure.hpp>
+#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
+#include <catch2/benchmark/detail/catch_timing.hpp>
+#include <catch2/catch_meta.hpp>
 
 #include <utility>
 #include <type_traits>
diff --git a/src/catch2/benchmark/detail/catch_stats.cpp b/src/catch2/benchmark/detail/catch_stats.cpp
index b85b740e..f82fb0b7 100644
--- a/src/catch2/benchmark/detail/catch_stats.cpp
+++ b/src/catch2/benchmark/detail/catch_stats.cpp
@@ -10,9 +10,9 @@
 
 #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
 
-#include "catch_stats.hpp"
+#include <catch2/benchmark/detail/catch_stats.hpp>
 
-#include "../../catch_compiler_capabilities.h"
+#include <catch2/catch_compiler_capabilities.h>
 
 #include <cassert>
 #include <random>
diff --git a/src/catch2/benchmark/detail/catch_stats.hpp b/src/catch2/benchmark/detail/catch_stats.hpp
index e686c1aa..6fca2c49 100644
--- a/src/catch2/benchmark/detail/catch_stats.hpp
+++ b/src/catch2/benchmark/detail/catch_stats.hpp
@@ -11,9 +11,9 @@
 #ifndef TWOBLUECUBES_CATCH_DETAIL_ANALYSIS_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_DETAIL_ANALYSIS_HPP_INCLUDED
 
-#include "../catch_clock.hpp"
-#include "../catch_estimate.hpp"
-#include "../catch_outlier_classification.hpp"
+#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/catch_estimate.hpp>
+#include <catch2/benchmark/catch_outlier_classification.hpp>
 
 #include <algorithm>
 #include <functional>
diff --git a/src/catch2/benchmark/detail/catch_timing.hpp b/src/catch2/benchmark/detail/catch_timing.hpp
index 073cb742..1e849194 100644
--- a/src/catch2/benchmark/detail/catch_timing.hpp
+++ b/src/catch2/benchmark/detail/catch_timing.hpp
@@ -11,8 +11,8 @@
 #ifndef TWOBLUECUBES_CATCH_DETAIL_TIMING_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_DETAIL_TIMING_HPP_INCLUDED
 
-#include "../catch_clock.hpp"
-#include "catch_complete_invoke.hpp"
+#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 
 #include <tuple>
 #include <type_traits>
diff --git a/src/catch2/catch.hpp b/src/catch2/catch.hpp
index fdaccec8..e8936937 100644
--- a/src/catch2/catch.hpp
+++ b/src/catch2/catch.hpp
@@ -19,7 +19,7 @@
 #    pragma GCC system_header
 #endif
 
-#include "catch_suppress_warnings.h"
+#include <catch2/catch_suppress_warnings.h>
 
 #if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
 #  define CATCH_IMPL
@@ -39,7 +39,7 @@
 #endif
 
 #if !defined(CATCH_CONFIG_IMPL_ONLY)
-#include "catch_platform.h"
+#include <catch2/catch_platform.h>
 
 #ifdef CATCH_IMPL
 #  ifndef CLARA_CONFIG_MAIN
@@ -48,49 +48,49 @@
 #  endif
 #endif
 
-#include "catch_user_interfaces.h"
-#include "catch_tag_alias_autoregistrar.h"
-#include "catch_test_registry.h"
-#include "catch_capture.hpp"
-#include "catch_section.h"
-#include "catch_interfaces_exception.h"
-#include "catch_approx.h"
-#include "catch_compiler_capabilities.h"
-#include "catch_string_manip.h"
+#include <catch2/catch_user_interfaces.h>
+#include <catch2/catch_tag_alias_autoregistrar.h>
+#include <catch2/catch_test_registry.h>
+#include <catch2/catch_capture.hpp>
+#include <catch2/catch_section.h>
+#include <catch2/catch_interfaces_exception.h>
+#include <catch2/catch_approx.h>
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_string_manip.h>
 
 #ifndef CATCH_CONFIG_DISABLE_MATCHERS
-#include "catch_capture_matchers.h"
+#include <catch2/catch_capture_matchers.h>
 #endif
-#include "catch_generators.hpp"
-#include "catch_generators_generic.hpp"
-#include "catch_generators_specific.hpp"
+#include <catch2/catch_generators.hpp>
+#include <catch2/catch_generators_generic.hpp>
+#include <catch2/catch_generators_specific.hpp>
 
 // These files are included here so the single_include script doesn't put them
 // in the conditionally compiled sections
-#include "catch_test_case_info.h"
-#include "catch_interfaces_runner.h"
+#include <catch2/catch_test_case_info.h>
+#include <catch2/catch_interfaces_runner.h>
 
 #ifdef __OBJC__
-#include "catch_objc.hpp"
+#include <catch2/catch_objc.hpp>
 #endif
 
 // Benchmarking needs the externally-facing parts of reporters to work
 #if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#include "catch_external_interfaces.h"
+#include <catch2/catch_external_interfaces.h>
 #endif
 
 #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#include "benchmark/catch_benchmark.hpp"
+#include <catch2/benchmark/catch_benchmark.hpp>
 #endif
 
 #endif // ! CATCH_CONFIG_IMPL_ONLY
 
 #ifdef CATCH_IMPL
-#include "catch_impl.hpp"
+#include <catch2/catch_impl.hpp>
 #endif
 
 #ifdef CATCH_CONFIG_MAIN
-#include "catch_default_main.hpp"
+#include <catch2/catch_default_main.hpp>
 #endif
 
 
@@ -485,6 +485,6 @@ using Catch::Detail::Approx;
 
 #endif // ! CATCH_CONFIG_IMPL_ONLY
 
-#include "catch_reenable_warnings.h"
+#include <catch2/catch_reenable_warnings.h>
 
 #endif // TWOBLUECUBES_CATCH_HPP_INCLUDED
diff --git a/src/catch2/catch_approx.cpp b/src/catch2/catch_approx.cpp
index 32b5e043..c1a9170f 100644
--- a/src/catch2/catch_approx.cpp
+++ b/src/catch2/catch_approx.cpp
@@ -6,8 +6,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_approx.h"
-#include "catch_enforce.h"
+#include <catch2/catch_approx.h>
+#include <catch2/catch_enforce.h>
 
 #include <cmath>
 #include <limits>
diff --git a/src/catch2/catch_approx.h b/src/catch2/catch_approx.h
index 4522e5ad..8a53b0ef 100644
--- a/src/catch2/catch_approx.h
+++ b/src/catch2/catch_approx.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
 
-#include "catch_tostring.h"
+#include <catch2/catch_tostring.h>
 
 #include <type_traits>
 
diff --git a/src/catch2/catch_assertionhandler.cpp b/src/catch2/catch_assertionhandler.cpp
index 77c3f1d4..2f2e8ecd 100644
--- a/src/catch2/catch_assertionhandler.cpp
+++ b/src/catch2/catch_assertionhandler.cpp
@@ -6,15 +6,15 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_assertionhandler.h"
-#include "catch_assertionresult.h"
-#include "catch_interfaces_runner.h"
-#include "catch_interfaces_config.h"
-#include "catch_context.h"
-#include "catch_debugger.h"
-#include "catch_interfaces_registry_hub.h"
-#include "catch_capture_matchers.h"
-#include "catch_run_context.h"
+#include <catch2/catch_assertionhandler.h>
+#include <catch2/catch_assertionresult.h>
+#include <catch2/catch_interfaces_runner.h>
+#include <catch2/catch_interfaces_config.h>
+#include <catch2/catch_context.h>
+#include <catch2/catch_debugger.h>
+#include <catch2/catch_interfaces_registry_hub.h>
+#include <catch2/catch_capture_matchers.h>
+#include <catch2/catch_run_context.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_assertionhandler.h b/src/catch2/catch_assertionhandler.h
index 3089e662..6afbf93a 100644
--- a/src/catch2/catch_assertionhandler.h
+++ b/src/catch2/catch_assertionhandler.h
@@ -8,9 +8,9 @@
 #ifndef TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED
 #define TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED
 
-#include "catch_assertioninfo.h"
-#include "catch_decomposer.h"
-#include "catch_interfaces_capture.h"
+#include <catch2/catch_assertioninfo.h>
+#include <catch2/catch_decomposer.h>
+#include <catch2/catch_interfaces_capture.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_assertioninfo.h b/src/catch2/catch_assertioninfo.h
index 342842c5..37ea1d14 100644
--- a/src/catch2/catch_assertioninfo.h
+++ b/src/catch2/catch_assertioninfo.h
@@ -8,9 +8,9 @@
 #ifndef TWOBLUECUBES_CATCH_ASSERTIONINFO_H_INCLUDED
 #define TWOBLUECUBES_CATCH_ASSERTIONINFO_H_INCLUDED
 
-#include "catch_result_type.h"
-#include "catch_common.h"
-#include "catch_stringref.h"
+#include <catch2/catch_result_type.h>
+#include <catch2/catch_common.h>
+#include <catch2/catch_stringref.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_assertionresult.cpp b/src/catch2/catch_assertionresult.cpp
index 608a9add..2ec757f9 100644
--- a/src/catch2/catch_assertionresult.cpp
+++ b/src/catch2/catch_assertionresult.cpp
@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_assertionresult.h"
+#include <catch2/catch_assertionresult.h>
 
 namespace Catch {
     AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
diff --git a/src/catch2/catch_assertionresult.h b/src/catch2/catch_assertionresult.h
index 3c91ea58..37ef83a0 100644
--- a/src/catch2/catch_assertionresult.h
+++ b/src/catch2/catch_assertionresult.h
@@ -9,11 +9,11 @@
 #define TWOBLUECUBES_CATCH_ASSERTIONRESULT_H_INCLUDED
 
 #include <string>
-#include "catch_assertioninfo.h"
-#include "catch_result_type.h"
-#include "catch_common.h"
-#include "catch_stringref.h"
-#include "catch_assertionhandler.h"
+#include <catch2/catch_assertioninfo.h>
+#include <catch2/catch_result_type.h>
+#include <catch2/catch_common.h>
+#include <catch2/catch_stringref.h>
+#include <catch2/catch_assertionhandler.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_capture.hpp b/src/catch2/catch_capture.hpp
index e47cc464..3ecbab05 100644
--- a/src/catch2/catch_capture.hpp
+++ b/src/catch2/catch_capture.hpp
@@ -8,10 +8,10 @@
 #ifndef TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
 
-#include "catch_assertionhandler.h"
-#include "catch_interfaces_capture.h"
-#include "catch_message.h"
-#include "catch_stringref.h"
+#include <catch2/catch_assertionhandler.h>
+#include <catch2/catch_interfaces_capture.h>
+#include <catch2/catch_message.h>
+#include <catch2/catch_stringref.h>
 
 #if !defined(CATCH_CONFIG_DISABLE)
 
diff --git a/src/catch2/catch_capture_matchers.cpp b/src/catch2/catch_capture_matchers.cpp
index 6f320449..ad51baca 100644
--- a/src/catch2/catch_capture_matchers.cpp
+++ b/src/catch2/catch_capture_matchers.cpp
@@ -5,8 +5,8 @@
  *  Distributed under the Boost Software License, Version 1.0. (See accompanying
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
-#include "catch_capture_matchers.h"
-#include "catch_interfaces_registry_hub.h"
+#include <catch2/catch_capture_matchers.h>
+#include <catch2/catch_interfaces_registry_hub.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_capture_matchers.h b/src/catch2/catch_capture_matchers.h
index 5386e5e1..7c8c8fa6 100644
--- a/src/catch2/catch_capture_matchers.h
+++ b/src/catch2/catch_capture_matchers.h
@@ -8,14 +8,14 @@
 #ifndef TWOBLUECUBES_CATCH_CAPTURE_MATCHERS_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_CAPTURE_MATCHERS_HPP_INCLUDED
 
-#include "catch_capture.hpp"
-#include "catch_matchers.h"
-#include "catch_matchers_exception.hpp"
-#include "catch_matchers_floating.h"
-#include "catch_matchers_generic.hpp"
-#include "catch_matchers_string.h"
-#include "catch_matchers_vector.h"
-#include "catch_stringref.h"
+#include <catch2/catch_capture.hpp>
+#include <catch2/catch_matchers.h>
+#include <catch2/catch_matchers_exception.hpp>
+#include <catch2/catch_matchers_floating.h>
+#include <catch2/catch_matchers_generic.hpp>
+#include <catch2/catch_matchers_string.h>
+#include <catch2/catch_matchers_vector.h>
+#include <catch2/catch_stringref.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_clara.h b/src/catch2/catch_clara.h
index e5275747..35494929 100644
--- a/src/catch2/catch_clara.h
+++ b/src/catch2/catch_clara.h
@@ -23,7 +23,7 @@
 #pragma clang diagnostic ignored "-Wshadow"
 #endif
 
-#include "external/clara.hpp"
+#include <catch2/external/clara.hpp>
 
 #ifdef __clang__
 #pragma clang diagnostic pop
diff --git a/src/catch2/catch_commandline.cpp b/src/catch2/catch_commandline.cpp
index 0008c577..434664c8 100644
--- a/src/catch2/catch_commandline.cpp
+++ b/src/catch2/catch_commandline.cpp
@@ -6,12 +6,12 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_commandline.h"
+#include <catch2/catch_commandline.h>
 
-#include "catch_string_manip.h"
+#include <catch2/catch_string_manip.h>
 
-#include "catch_interfaces_registry_hub.h"
-#include "catch_interfaces_reporter.h"
+#include <catch2/catch_interfaces_registry_hub.h>
+#include <catch2/catch_interfaces_reporter.h>
 
 #include <fstream>
 #include <ctime>
diff --git a/src/catch2/catch_commandline.h b/src/catch2/catch_commandline.h
index b73cfa2d..3761f2ff 100644
--- a/src/catch2/catch_commandline.h
+++ b/src/catch2/catch_commandline.h
@@ -8,8 +8,8 @@
 #ifndef TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED
 
-#include "catch_config.hpp"
-#include "catch_clara.h"
+#include <catch2/catch_config.hpp>
+#include <catch2/catch_clara.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_common.cpp b/src/catch2/catch_common.cpp
index d35ac064..12819963 100644
--- a/src/catch2/catch_common.cpp
+++ b/src/catch2/catch_common.cpp
@@ -6,9 +6,9 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_common.h"
-#include "catch_context.h"
-#include "catch_interfaces_config.h"
+#include <catch2/catch_common.h>
+#include <catch2/catch_context.h>
+#include <catch2/catch_interfaces_config.h>
 
 #include <cstring>
 #include <ostream>
diff --git a/src/catch2/catch_common.h b/src/catch2/catch_common.h
index afa3909b..392576d6 100644
--- a/src/catch2/catch_common.h
+++ b/src/catch2/catch_common.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
 #define TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
 
-#include "catch_compiler_capabilities.h"
+#include <catch2/catch_compiler_capabilities.h>
 
 #define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
 #define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
diff --git a/src/catch2/catch_compiler_capabilities.h b/src/catch2/catch_compiler_capabilities.h
index 18128a83..97d08faa 100644
--- a/src/catch2/catch_compiler_capabilities.h
+++ b/src/catch2/catch_compiler_capabilities.h
@@ -25,7 +25,7 @@
 // Many features, at point of detection, define an _INTERNAL_ macro, so they
 // can be combined, en-mass, with the _NO_ forms later.
 
-#include "catch_platform.h"
+#include <catch2/catch_platform.h>
 
 #ifdef __cplusplus
 
diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp
index 6a5e5f38..6d579af4 100644
--- a/src/catch2/catch_config.cpp
+++ b/src/catch2/catch_config.cpp
@@ -5,9 +5,9 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_config.hpp"
-#include "catch_enforce.h"
-#include "catch_stringref.h"
+#include <catch2/catch_config.hpp>
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_stringref.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_config.hpp b/src/catch2/catch_config.hpp
index 2074d933..85a7c84c 100644
--- a/src/catch2/catch_config.hpp
+++ b/src/catch2/catch_config.hpp
@@ -8,11 +8,11 @@
 #ifndef TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
 
-#include "catch_test_spec_parser.h"
-#include "catch_interfaces_config.h"
+#include <catch2/catch_test_spec_parser.h>
+#include <catch2/catch_interfaces_config.h>
 
 // Libstdc++ doesn't like incomplete classes for unique_ptr
-#include "catch_stream.h"
+#include <catch2/catch_stream.h>
 
 #include <memory>
 #include <vector>
diff --git a/src/catch2/catch_console_colour.cpp b/src/catch2/catch_console_colour.cpp
index 1c4799f8..030b4b7c 100644
--- a/src/catch2/catch_console_colour.cpp
+++ b/src/catch2/catch_console_colour.cpp
@@ -13,15 +13,15 @@
 #endif
 
 
-#include "catch_console_colour.h"
-#include "catch_enforce.h"
-#include "catch_errno_guard.h"
-#include "catch_interfaces_config.h"
-#include "catch_stream.h"
-#include "catch_context.h"
-#include "catch_platform.h"
-#include "catch_debugger.h"
-#include "catch_windows_h_proxy.h"
+#include <catch2/catch_console_colour.h>
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_errno_guard.h>
+#include <catch2/catch_interfaces_config.h>
+#include <catch2/catch_stream.h>
+#include <catch2/catch_context.h>
+#include <catch2/catch_platform.h>
+#include <catch2/catch_debugger.h>
+#include <catch2/catch_windows_h_proxy.h>
 
 #include <sstream>
 
diff --git a/src/catch2/catch_console_colour.h b/src/catch2/catch_console_colour.h
index ec653424..b26459e1 100644
--- a/src/catch2/catch_console_colour.h
+++ b/src/catch2/catch_console_colour.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
 
-#include "catch_common.h"
+#include <catch2/catch_common.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_context.cpp b/src/catch2/catch_context.cpp
index e444a6b3..6dbc7a3d 100644
--- a/src/catch2/catch_context.cpp
+++ b/src/catch2/catch_context.cpp
@@ -5,9 +5,9 @@
  *  Distributed under the Boost Software License, Version 1.0. (See accompanying
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
-#include "catch_context.h"
-#include "catch_common.h"
-#include "catch_random_number_generator.h"
+#include <catch2/catch_context.h>
+#include <catch2/catch_common.h>
+#include <catch2/catch_random_number_generator.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_debug_console.cpp b/src/catch2/catch_debug_console.cpp
index a341d810..8dac5b0c 100644
--- a/src/catch2/catch_debug_console.cpp
+++ b/src/catch2/catch_debug_console.cpp
@@ -6,11 +6,11 @@
  *
  */
 
-#include "catch_debug_console.h"
-#include "catch_compiler_capabilities.h"
-#include "catch_stream.h"
-#include "catch_platform.h"
-#include "catch_windows_h_proxy.h"
+#include <catch2/catch_debug_console.h>
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_stream.h>
+#include <catch2/catch_platform.h>
+#include <catch2/catch_windows_h_proxy.h>
 
 #if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
 #include <android/log.h>
diff --git a/src/catch2/catch_debugger.cpp b/src/catch2/catch_debugger.cpp
index f04900a4..140f0204 100644
--- a/src/catch2/catch_debugger.cpp
+++ b/src/catch2/catch_debugger.cpp
@@ -7,10 +7,10 @@
  *
  */
 
-#include "catch_debugger.h"
-#include "catch_errno_guard.h"
-#include "catch_stream.h"
-#include "catch_platform.h"
+#include <catch2/catch_debugger.h>
+#include <catch2/catch_errno_guard.h>
+#include <catch2/catch_stream.h>
+#include <catch2/catch_platform.h>
 
 #ifdef CATCH_PLATFORM_MAC
 
diff --git a/src/catch2/catch_debugger.h b/src/catch2/catch_debugger.h
index db3ff681..e0e7ec1f 100644
--- a/src/catch2/catch_debugger.h
+++ b/src/catch2/catch_debugger.h
@@ -9,7 +9,7 @@
 #ifndef TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED
 #define TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED
 
-#include "catch_platform.h"
+#include <catch2/catch_platform.h>
 
 namespace Catch {
     bool isDebuggerActive();
diff --git a/src/catch2/catch_decomposer.cpp b/src/catch2/catch_decomposer.cpp
index 8c19629b..c2c48153 100644
--- a/src/catch2/catch_decomposer.cpp
+++ b/src/catch2/catch_decomposer.cpp
@@ -6,8 +6,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_decomposer.h"
-#include "catch_config.hpp"
+#include <catch2/catch_decomposer.h>
+#include <catch2/catch_config.hpp>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_decomposer.h b/src/catch2/catch_decomposer.h
index 08075f0e..e42cfa79 100644
--- a/src/catch2/catch_decomposer.h
+++ b/src/catch2/catch_decomposer.h
@@ -8,9 +8,9 @@
 #ifndef TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED
 #define TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED
 
-#include "catch_tostring.h"
-#include "catch_stringref.h"
-#include "catch_meta.hpp"
+#include <catch2/catch_tostring.h>
+#include <catch2/catch_stringref.h>
+#include <catch2/catch_meta.hpp>
 
 #include <iosfwd>
 
diff --git a/src/catch2/catch_default_main.hpp b/src/catch2/catch_default_main.hpp
index 17ad090a..9e605159 100644
--- a/src/catch2/catch_default_main.hpp
+++ b/src/catch2/catch_default_main.hpp
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
 
-#include "catch_session.h"
+#include <catch2/catch_session.h>
 
 #ifndef __OBJC__
 
diff --git a/src/catch2/catch_enforce.cpp b/src/catch2/catch_enforce.cpp
index 903d43be..06aaad14 100644
--- a/src/catch2/catch_enforce.cpp
+++ b/src/catch2/catch_enforce.cpp
@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_enforce.h"
+#include <catch2/catch_enforce.h>
 
 #include <stdexcept>
 
diff --git a/src/catch2/catch_enforce.h b/src/catch2/catch_enforce.h
index 0484724d..846d629b 100644
--- a/src/catch2/catch_enforce.h
+++ b/src/catch2/catch_enforce.h
@@ -7,9 +7,9 @@
 #ifndef TWOBLUECUBES_CATCH_ENFORCE_H_INCLUDED
 #define TWOBLUECUBES_CATCH_ENFORCE_H_INCLUDED
 
-#include "catch_common.h"
-#include "catch_compiler_capabilities.h"
-#include "catch_stream.h"
+#include <catch2/catch_common.h>
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_stream.h>
 
 #include <exception>
 
diff --git a/src/catch2/catch_enum_values_registry.cpp b/src/catch2/catch_enum_values_registry.cpp
index fb060f5b..f7d11860 100644
--- a/src/catch2/catch_enum_values_registry.cpp
+++ b/src/catch2/catch_enum_values_registry.cpp
@@ -5,9 +5,9 @@
  *  Distributed under the Boost Software License, Version 1.0. (See accompanying
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
-#include "catch_enum_values_registry.h"
-#include "catch_string_manip.h"
-#include "catch_stream.h"
+#include <catch2/catch_enum_values_registry.h>
+#include <catch2/catch_string_manip.h>
+#include <catch2/catch_stream.h>
 
 #include <map>
 #include <cassert>
diff --git a/src/catch2/catch_enum_values_registry.h b/src/catch2/catch_enum_values_registry.h
index ae252fbf..b057bb40 100644
--- a/src/catch2/catch_enum_values_registry.h
+++ b/src/catch2/catch_enum_values_registry.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_ENUMVALUESREGISTRY_H_INCLUDED
 #define TWOBLUECUBES_CATCH_ENUMVALUESREGISTRY_H_INCLUDED
 
-#include "catch_interfaces_enum_values_registry.h"
+#include <catch2/catch_interfaces_enum_values_registry.h>
 
 #include <vector>
 #include <memory>
diff --git a/src/catch2/catch_errno_guard.cpp b/src/catch2/catch_errno_guard.cpp
index 070583bc..a7303e9c 100644
--- a/src/catch2/catch_errno_guard.cpp
+++ b/src/catch2/catch_errno_guard.cpp
@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_errno_guard.h"
+#include <catch2/catch_errno_guard.h>
 
 #include <cerrno>
 
diff --git a/src/catch2/catch_exception_translator_registry.cpp b/src/catch2/catch_exception_translator_registry.cpp
index cef36e51..744621e6 100644
--- a/src/catch2/catch_exception_translator_registry.cpp
+++ b/src/catch2/catch_exception_translator_registry.cpp
@@ -6,10 +6,10 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_exception_translator_registry.h"
-#include "catch_assertionhandler.h"
-#include "catch_compiler_capabilities.h"
-#include "catch_enforce.h"
+#include <catch2/catch_exception_translator_registry.h>
+#include <catch2/catch_assertionhandler.h>
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_enforce.h>
 
 #ifdef __OBJC__
 #import "Foundation/Foundation.h"
diff --git a/src/catch2/catch_exception_translator_registry.h b/src/catch2/catch_exception_translator_registry.h
index bb07c131..2708baf2 100644
--- a/src/catch2/catch_exception_translator_registry.h
+++ b/src/catch2/catch_exception_translator_registry.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
 
-#include "catch_interfaces_exception.h"
+#include <catch2/catch_interfaces_exception.h>
 #include <vector>
 #include <string>
 #include <memory>
diff --git a/src/catch2/catch_external_interfaces.h b/src/catch2/catch_external_interfaces.h
index 27e7b5c5..94704fdd 100644
--- a/src/catch2/catch_external_interfaces.h
+++ b/src/catch2/catch_external_interfaces.h
@@ -7,14 +7,14 @@
 #ifndef TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
 #define TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
 
-#include "reporters/catch_reporter_bases.hpp"
-#include "catch_console_colour.h"
-#include "catch_reporter_registrars.hpp"
+#include <catch2/reporters/catch_reporter_bases.hpp>
+#include <catch2/catch_console_colour.h>
+#include <catch2/catch_reporter_registrars.hpp>
 
 // Allow users to base their work off existing reporters
-#include "reporters/catch_reporter_compact.h"
-#include "reporters/catch_reporter_console.h"
-#include "reporters/catch_reporter_junit.h"
-#include "reporters/catch_reporter_xml.h"
+#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_xml.h>
 
 #endif // TWOBLUECUBES_CATCH_EXTERNAL_INTERFACES_H_INCLUDED
diff --git a/src/catch2/catch_fatal_condition.cpp b/src/catch2/catch_fatal_condition.cpp
index 1eb6bb87..9fbd26e3 100644
--- a/src/catch2/catch_fatal_condition.cpp
+++ b/src/catch2/catch_fatal_condition.cpp
@@ -7,10 +7,10 @@
  *
  */
 
-#include "catch_fatal_condition.h"
+#include <catch2/catch_fatal_condition.h>
 
-#include "catch_context.h"
-#include "catch_interfaces_capture.h"
+#include <catch2/catch_context.h>
+#include <catch2/catch_interfaces_capture.h>
 
 #if defined(__GNUC__)
 #    pragma GCC diagnostic push
diff --git a/src/catch2/catch_fatal_condition.h b/src/catch2/catch_fatal_condition.h
index a64fa628..cabd7cab 100644
--- a/src/catch2/catch_fatal_condition.h
+++ b/src/catch2/catch_fatal_condition.h
@@ -9,9 +9,9 @@
 #ifndef TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
 #define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
 
-#include "catch_platform.h"
-#include "catch_compiler_capabilities.h"
-#include "catch_windows_h_proxy.h"
+#include <catch2/catch_platform.h>
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_windows_h_proxy.h>
 
 
 #if defined( CATCH_CONFIG_WINDOWS_SEH )
diff --git a/src/catch2/catch_generators.cpp b/src/catch2/catch_generators.cpp
index 5fbe2d23..0cf55a8d 100644
--- a/src/catch2/catch_generators.cpp
+++ b/src/catch2/catch_generators.cpp
@@ -5,9 +5,9 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_generators.hpp"
-#include "catch_random_number_generator.h"
-#include "catch_interfaces_capture.h"
+#include <catch2/catch_generators.hpp>
+#include <catch2/catch_random_number_generator.h>
+#include <catch2/catch_interfaces_capture.h>
 
 #include <limits>
 #include <set>
diff --git a/src/catch2/catch_generators.hpp b/src/catch2/catch_generators.hpp
index fd491696..3756a719 100644
--- a/src/catch2/catch_generators.hpp
+++ b/src/catch2/catch_generators.hpp
@@ -7,9 +7,9 @@
 #ifndef TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
 
-#include "catch_interfaces_generatortracker.h"
-#include "catch_common.h"
-#include "catch_enforce.h"
+#include <catch2/catch_interfaces_generatortracker.h>
+#include <catch2/catch_common.h>
+#include <catch2/catch_enforce.h>
 
 #include <memory>
 #include <vector>
diff --git a/src/catch2/catch_generators_generic.hpp b/src/catch2/catch_generators_generic.hpp
index c3410147..3cfa9202 100644
--- a/src/catch2/catch_generators_generic.hpp
+++ b/src/catch2/catch_generators_generic.hpp
@@ -7,8 +7,8 @@
 #ifndef TWOBLUECUBES_CATCH_GENERATORS_GENERIC_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_GENERATORS_GENERIC_HPP_INCLUDED
 
-#include "catch_generators.hpp"
-#include "catch_meta.hpp"
+#include <catch2/catch_generators.hpp>
+#include <catch2/catch_meta.hpp>
 
 namespace Catch {
 namespace Generators {
diff --git a/src/catch2/catch_generators_specific.hpp b/src/catch2/catch_generators_specific.hpp
index dee8e711..0e497c3e 100644
--- a/src/catch2/catch_generators_specific.hpp
+++ b/src/catch2/catch_generators_specific.hpp
@@ -7,10 +7,10 @@
 #ifndef TWOBLUECUBES_CATCH_GENERATORS_SPECIFIC_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_GENERATORS_SPECIFIC_HPP_INCLUDED
 
-#include "catch_context.h"
-#include "catch_generators.hpp"
-#include "catch_interfaces_config.h"
-#include "catch_random_number_generator.h"
+#include <catch2/catch_context.h>
+#include <catch2/catch_generators.hpp>
+#include <catch2/catch_interfaces_config.h>
+#include <catch2/catch_random_number_generator.h>
 
 #include <random>
 
diff --git a/src/catch2/catch_impl.hpp b/src/catch2/catch_impl.hpp
index 0b29a39f..681110dc 100644
--- a/src/catch2/catch_impl.hpp
+++ b/src/catch2/catch_impl.hpp
@@ -14,10 +14,10 @@
 #endif
 
 // Keep these here for external reporters
-#include "catch_test_spec.h"
-#include "catch_test_case_tracker.h"
+#include <catch2/catch_test_spec.h>
+#include <catch2/catch_test_case_tracker.h>
 
-#include "catch_leak_detector.h"
+#include <catch2/catch_leak_detector.h>
 
 // Cpp files will be included in the single-header file here
 // ~*~* CATCH_CPP_STITCH_PLACE *~*~
diff --git a/src/catch2/catch_interfaces_capture.cpp b/src/catch2/catch_interfaces_capture.cpp
index 3c090bfe..f73d270c 100644
--- a/src/catch2/catch_interfaces_capture.cpp
+++ b/src/catch2/catch_interfaces_capture.cpp
@@ -1,4 +1,4 @@
-#include "catch_interfaces_capture.h"
+#include <catch2/catch_interfaces_capture.h>
 
 namespace Catch {
     IResultCapture::~IResultCapture() = default;
diff --git a/src/catch2/catch_interfaces_capture.h b/src/catch2/catch_interfaces_capture.h
index 8c25c8cf..49fda7aa 100644
--- a/src/catch2/catch_interfaces_capture.h
+++ b/src/catch2/catch_interfaces_capture.h
@@ -11,8 +11,8 @@
 #include <string>
 #include <chrono>
 
-#include "catch_stringref.h"
-#include "catch_result_type.h"
+#include <catch2/catch_stringref.h>
+#include <catch2/catch_result_type.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_interfaces_config.cpp b/src/catch2/catch_interfaces_config.cpp
index 6617da69..b1f4238a 100644
--- a/src/catch2/catch_interfaces_config.cpp
+++ b/src/catch2/catch_interfaces_config.cpp
@@ -1,4 +1,4 @@
-#include "catch_interfaces_config.h"
+#include <catch2/catch_interfaces_config.h>
 
 namespace Catch {
     IConfig::~IConfig() = default;
diff --git a/src/catch2/catch_interfaces_config.h b/src/catch2/catch_interfaces_config.h
index f8cbf71c..3122a48b 100644
--- a/src/catch2/catch_interfaces_config.h
+++ b/src/catch2/catch_interfaces_config.h
@@ -8,8 +8,8 @@
 #ifndef TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
 #define TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
 
-#include "catch_common.h"
-#include "catch_option.hpp"
+#include <catch2/catch_common.h>
+#include <catch2/catch_option.hpp>
 
 #include <iosfwd>
 #include <string>
diff --git a/src/catch2/catch_interfaces_enum_values_registry.h b/src/catch2/catch_interfaces_enum_values_registry.h
index 81592c9b..b6134942 100644
--- a/src/catch2/catch_interfaces_enum_values_registry.h
+++ b/src/catch2/catch_interfaces_enum_values_registry.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_INTERFACESENUMVALUESREGISTRY_H_INCLUDED
 #define TWOBLUECUBES_CATCH_INTERFACESENUMVALUESREGISTRY_H_INCLUDED
 
-#include "catch_stringref.h"
+#include <catch2/catch_stringref.h>
 
 #include <vector>
 
diff --git a/src/catch2/catch_interfaces_exception.cpp b/src/catch2/catch_interfaces_exception.cpp
index 705d8c87..b1851d91 100644
--- a/src/catch2/catch_interfaces_exception.cpp
+++ b/src/catch2/catch_interfaces_exception.cpp
@@ -1,4 +1,4 @@
-#include "catch_interfaces_exception.h"
+#include <catch2/catch_interfaces_exception.h>
 
 namespace Catch {
     IExceptionTranslator::~IExceptionTranslator() = default;
diff --git a/src/catch2/catch_interfaces_exception.h b/src/catch2/catch_interfaces_exception.h
index d3254d5f..0afbd67b 100644
--- a/src/catch2/catch_interfaces_exception.h
+++ b/src/catch2/catch_interfaces_exception.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
 #define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
 
-#include "catch_interfaces_registry_hub.h"
+#include <catch2/catch_interfaces_registry_hub.h>
 
 #if defined(CATCH_CONFIG_DISABLE)
     #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
diff --git a/src/catch2/catch_interfaces_registry_hub.cpp b/src/catch2/catch_interfaces_registry_hub.cpp
index 7a22d649..7ab51d03 100644
--- a/src/catch2/catch_interfaces_registry_hub.cpp
+++ b/src/catch2/catch_interfaces_registry_hub.cpp
@@ -1,4 +1,4 @@
-#include "catch_interfaces_registry_hub.h"
+#include <catch2/catch_interfaces_registry_hub.h>
 
 namespace Catch {
     IRegistryHub::~IRegistryHub() = default;
diff --git a/src/catch2/catch_interfaces_registry_hub.h b/src/catch2/catch_interfaces_registry_hub.h
index 7797c18b..91069cfd 100644
--- a/src/catch2/catch_interfaces_registry_hub.h
+++ b/src/catch2/catch_interfaces_registry_hub.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
 #define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
 
-#include "catch_common.h"
+#include <catch2/catch_common.h>
 
 #include <string>
 #include <memory>
diff --git a/src/catch2/catch_interfaces_reporter.cpp b/src/catch2/catch_interfaces_reporter.cpp
index e48b950e..815ffeb7 100644
--- a/src/catch2/catch_interfaces_reporter.cpp
+++ b/src/catch2/catch_interfaces_reporter.cpp
@@ -5,11 +5,11 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_interfaces_reporter.h"
-#include "catch_console_colour.h"
-#include "reporters/catch_reporter_listening.h"
-#include "catch_list.h"
-#include "catch_text.h"
+#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>
 
 #include <algorithm>
 #include <iomanip>
diff --git a/src/catch2/catch_interfaces_reporter.h b/src/catch2/catch_interfaces_reporter.h
index 345a2001..36129741 100644
--- a/src/catch2/catch_interfaces_reporter.h
+++ b/src/catch2/catch_interfaces_reporter.h
@@ -8,19 +8,19 @@
 #ifndef TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
 #define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
 
-#include "catch_section_info.h"
-#include "catch_common.h"
-#include "catch_config.hpp"
-#include "catch_totals.h"
-#include "catch_test_case_info.h"
-#include "catch_assertionresult.h"
-#include "catch_message.h"
-#include "catch_option.hpp"
-#include "catch_stringref.h"
+#include <catch2/catch_section_info.h>
+#include <catch2/catch_common.h>
+#include <catch2/catch_config.hpp>
+#include <catch2/catch_totals.h>
+#include <catch2/catch_test_case_info.h>
+#include <catch2/catch_assertionresult.h>
+#include <catch2/catch_message.h>
+#include <catch2/catch_option.hpp>
+#include <catch2/catch_stringref.h>
 
 #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#include "benchmark/catch_estimate.hpp"
-#include "benchmark/catch_outlier_classification.hpp"
+#include <catch2/benchmark/catch_estimate.hpp>
+#include <catch2/benchmark/catch_outlier_classification.hpp>
 #endif // CATCH_CONFIG_ENABLE_BENCHMARKING
 
 
diff --git a/src/catch2/catch_interfaces_runner.cpp b/src/catch2/catch_interfaces_runner.cpp
index 8d419a14..3b9df251 100644
--- a/src/catch2/catch_interfaces_runner.cpp
+++ b/src/catch2/catch_interfaces_runner.cpp
@@ -1,4 +1,4 @@
-#include "catch_interfaces_runner.h"
+#include <catch2/catch_interfaces_runner.h>
 
 namespace Catch {
     IRunner::~IRunner() = default;
diff --git a/src/catch2/catch_interfaces_testcase.cpp b/src/catch2/catch_interfaces_testcase.cpp
index 9b35e034..2635b85a 100644
--- a/src/catch2/catch_interfaces_testcase.cpp
+++ b/src/catch2/catch_interfaces_testcase.cpp
@@ -1,4 +1,4 @@
-#include "catch_interfaces_testcase.h"
+#include <catch2/catch_interfaces_testcase.h>
 
 namespace Catch {
     ITestInvoker::~ITestInvoker() = default;
diff --git a/src/catch2/catch_leak_detector.cpp b/src/catch2/catch_leak_detector.cpp
index 7a30e8a1..67e6c49c 100644
--- a/src/catch2/catch_leak_detector.cpp
+++ b/src/catch2/catch_leak_detector.cpp
@@ -5,8 +5,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
- #include "catch_leak_detector.h"
- #include "catch_interfaces_registry_hub.h"
+ #include <catch2/catch_leak_detector.h>
+ #include <catch2/catch_interfaces_registry_hub.h>
 
 
 #ifdef CATCH_CONFIG_WINDOWS_CRTDBG
diff --git a/src/catch2/catch_list.cpp b/src/catch2/catch_list.cpp
index cd003433..91f58187 100644
--- a/src/catch2/catch_list.cpp
+++ b/src/catch2/catch_list.cpp
@@ -6,20 +6,20 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_list.h"
+#include <catch2/catch_list.h>
 
-#include "catch_interfaces_registry_hub.h"
-#include "catch_interfaces_reporter.h"
-#include "catch_interfaces_testcase.h"
+#include <catch2/catch_interfaces_registry_hub.h>
+#include <catch2/catch_interfaces_reporter.h>
+#include <catch2/catch_interfaces_testcase.h>
 
-#include "catch_context.h"
-#include "catch_stream.h"
-#include "catch_text.h"
+#include <catch2/catch_context.h>
+#include <catch2/catch_stream.h>
+#include <catch2/catch_text.h>
 
-#include "catch_console_colour.h"
-#include "catch_test_spec_parser.h"
-#include "catch_tostring.h"
-#include "catch_string_manip.h"
+#include <catch2/catch_console_colour.h>
+#include <catch2/catch_test_spec_parser.h>
+#include <catch2/catch_tostring.h>
+#include <catch2/catch_string_manip.h>
 
 #include <limits>
 #include <algorithm>
diff --git a/src/catch2/catch_list.h b/src/catch2/catch_list.h
index 17df5355..08bf2dda 100644
--- a/src/catch2/catch_list.h
+++ b/src/catch2/catch_list.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_LIST_H_INCLUDED
 #define TWOBLUECUBES_CATCH_LIST_H_INCLUDED
 
-#include "catch_config.hpp"
+#include <catch2/catch_config.hpp>
 
 #include <set>
 #include <string>
diff --git a/src/catch2/catch_matchers.cpp b/src/catch2/catch_matchers.cpp
index 32104a11..df280796 100644
--- a/src/catch2/catch_matchers.cpp
+++ b/src/catch2/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.h"
+#include <catch2/catch_matchers.h>
 
 namespace Catch {
 namespace Matchers {
diff --git a/src/catch2/catch_matchers.h b/src/catch2/catch_matchers.h
index 5b69c4a8..78d9e84e 100644
--- a/src/catch2/catch_matchers.h
+++ b/src/catch2/catch_matchers.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
 
-#include "catch_common.h"
+#include <catch2/catch_common.h>
 
 #include <string>
 #include <vector>
diff --git a/src/catch2/catch_matchers_exception.cpp b/src/catch2/catch_matchers_exception.cpp
index b18810e8..2623193d 100644
--- a/src/catch2/catch_matchers_exception.cpp
+++ b/src/catch2/catch_matchers_exception.cpp
@@ -5,7 +5,7 @@
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_matchers_exception.hpp"
+#include <catch2/catch_matchers_exception.hpp>
 
 
 namespace Catch {
diff --git a/src/catch2/catch_matchers_exception.hpp b/src/catch2/catch_matchers_exception.hpp
index a80b3607..b0f3d32d 100644
--- a/src/catch2/catch_matchers_exception.hpp
+++ b/src/catch2/catch_matchers_exception.hpp
@@ -7,7 +7,7 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
 
-#include "catch_matchers.h"
+#include <catch2/catch_matchers.h>
 
 namespace Catch {
 namespace Matchers {
diff --git a/src/catch2/catch_matchers_floating.cpp b/src/catch2/catch_matchers_floating.cpp
index c226fc56..153591c0 100644
--- a/src/catch2/catch_matchers_floating.cpp
+++ b/src/catch2/catch_matchers_floating.cpp
@@ -5,11 +5,11 @@
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_matchers_floating.h"
-#include "catch_enforce.h"
-#include "catch_polyfills.hpp"
-#include "catch_to_string.hpp"
-#include "catch_tostring.h"
+#include <catch2/catch_matchers_floating.h>
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_polyfills.hpp>
+#include <catch2/catch_to_string.hpp>
+#include <catch2/catch_tostring.h>
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/catch2/catch_matchers_floating.h b/src/catch2/catch_matchers_floating.h
index 0f2ff49f..dc1bebe0 100644
--- a/src/catch2/catch_matchers_floating.h
+++ b/src/catch2/catch_matchers_floating.h
@@ -7,7 +7,7 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED
 
-#include "catch_matchers.h"
+#include <catch2/catch_matchers.h>
 
 namespace Catch {
 namespace Matchers {
diff --git a/src/catch2/catch_matchers_generic.cpp b/src/catch2/catch_matchers_generic.cpp
index 300102e0..de262ae8 100644
--- a/src/catch2/catch_matchers_generic.cpp
+++ b/src/catch2/catch_matchers_generic.cpp
@@ -1,4 +1,4 @@
-#include "catch_matchers_generic.hpp"
+#include <catch2/catch_matchers_generic.hpp>
 
 std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
     if (desc.empty()) {
diff --git a/src/catch2/catch_matchers_generic.hpp b/src/catch2/catch_matchers_generic.hpp
index eaef5485..d39d1bbe 100644
--- a/src/catch2/catch_matchers_generic.hpp
+++ b/src/catch2/catch_matchers_generic.hpp
@@ -7,9 +7,9 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_GENERIC_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_GENERIC_HPP_INCLUDED
 
-#include "catch_common.h"
-#include "catch_matchers.h"
-#include "catch_meta.hpp"
+#include <catch2/catch_common.h>
+#include <catch2/catch_matchers.h>
+#include <catch2/catch_meta.hpp>
 
 #include <string>
 #include <utility>
diff --git a/src/catch2/catch_matchers_string.cpp b/src/catch2/catch_matchers_string.cpp
index 1e3e72fd..024cf549 100644
--- a/src/catch2/catch_matchers_string.cpp
+++ b/src/catch2/catch_matchers_string.cpp
@@ -6,9 +6,9 @@
  * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_matchers_string.h"
-#include "catch_string_manip.h"
-#include "catch_tostring.h"
+#include <catch2/catch_matchers_string.h>
+#include <catch2/catch_string_manip.h>
+#include <catch2/catch_tostring.h>
 
 #include <regex>
 
diff --git a/src/catch2/catch_matchers_string.h b/src/catch2/catch_matchers_string.h
index fdbc03ce..075a7e94 100644
--- a/src/catch2/catch_matchers_string.h
+++ b/src/catch2/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.h"
+#include <catch2/catch_matchers.h>
 
 #include <string>
 
diff --git a/src/catch2/catch_matchers_vector.h b/src/catch2/catch_matchers_vector.h
index 2dc8a715..13ac907d 100644
--- a/src/catch2/catch_matchers_vector.h
+++ b/src/catch2/catch_matchers_vector.h
@@ -8,8 +8,8 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
 
-#include "catch_matchers.h"
-#include "catch_approx.h"
+#include <catch2/catch_matchers.h>
+#include <catch2/catch_approx.h>
 
 #include <algorithm>
 
diff --git a/src/catch2/catch_message.cpp b/src/catch2/catch_message.cpp
index 8f391bcb..bd0b60ba 100644
--- a/src/catch2/catch_message.cpp
+++ b/src/catch2/catch_message.cpp
@@ -6,10 +6,10 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_message.h"
-#include "catch_interfaces_capture.h"
-#include "catch_uncaught_exceptions.h"
-#include "catch_enforce.h"
+#include <catch2/catch_message.h>
+#include <catch2/catch_interfaces_capture.h>
+#include <catch2/catch_uncaught_exceptions.h>
+#include <catch2/catch_enforce.h>
 
 #include <cassert>
 #include <stack>
diff --git a/src/catch2/catch_message.h b/src/catch2/catch_message.h
index 748f5ac5..b27376b5 100644
--- a/src/catch2/catch_message.h
+++ b/src/catch2/catch_message.h
@@ -8,11 +8,11 @@
 #ifndef TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED
 #define TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED
 
-#include "catch_result_type.h"
-#include "catch_common.h"
-#include "catch_stream.h"
-#include "catch_interfaces_capture.h"
-#include "catch_tostring.h"
+#include <catch2/catch_result_type.h>
+#include <catch2/catch_common.h>
+#include <catch2/catch_stream.h>
+#include <catch2/catch_interfaces_capture.h>
+#include <catch2/catch_tostring.h>
 
 #include <string>
 #include <vector>
diff --git a/src/catch2/catch_objc.hpp b/src/catch2/catch_objc.hpp
index 24d2e34a..5b7c275c 100644
--- a/src/catch2/catch_objc.hpp
+++ b/src/catch2/catch_objc.hpp
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED
 
-#include "catch_objc_arc.hpp"
+#include <catch2/catch_objc_arc.hpp>
 
 #import <objc/runtime.h>
 
@@ -17,9 +17,9 @@
 // NB. Any general catch headers included here must be included
 // in catch.hpp first to make sure they are included by the single
 // header for non obj-usage
-#include "catch_test_case_info.h"
-#include "catch_string_manip.h"
-#include "catch_tostring.h"
+#include <catch2/catch_test_case_info.h>
+#include <catch2/catch_string_manip.h>
+#include <catch2/catch_tostring.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 // This protocol is really only here for (self) documenting purposes, since
diff --git a/src/catch2/catch_output_redirect.cpp b/src/catch2/catch_output_redirect.cpp
index 1308bfe3..10ecfe22 100644
--- a/src/catch2/catch_output_redirect.cpp
+++ b/src/catch2/catch_output_redirect.cpp
@@ -5,8 +5,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_output_redirect.h"
-#include "catch_enforce.h"
+#include <catch2/catch_output_redirect.h>
+#include <catch2/catch_enforce.h>
 
 #include <cstdio>
 #include <cstring>
diff --git a/src/catch2/catch_output_redirect.h b/src/catch2/catch_output_redirect.h
index 3d1c2d45..a6cd0594 100644
--- a/src/catch2/catch_output_redirect.h
+++ b/src/catch2/catch_output_redirect.h
@@ -7,8 +7,8 @@
 #ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
 #define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
 
-#include "catch_platform.h"
-#include "catch_stream.h"
+#include <catch2/catch_platform.h>
+#include <catch2/catch_stream.h>
 
 #include <cstdio>
 #include <iosfwd>
diff --git a/src/catch2/catch_polyfills.cpp b/src/catch2/catch_polyfills.cpp
index 68a2c827..65399d8d 100644
--- a/src/catch2/catch_polyfills.cpp
+++ b/src/catch2/catch_polyfills.cpp
@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_polyfills.hpp"
+#include <catch2/catch_polyfills.hpp>
 
 #include <cmath>
 
diff --git a/src/catch2/catch_random_number_generator.cpp b/src/catch2/catch_random_number_generator.cpp
index 1ef08d4c..472dcab3 100644
--- a/src/catch2/catch_random_number_generator.cpp
+++ b/src/catch2/catch_random_number_generator.cpp
@@ -5,10 +5,10 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_random_number_generator.h"
-#include "catch_context.h"
-#include "catch_run_context.h"
-#include "catch_interfaces_config.h"
+#include <catch2/catch_random_number_generator.h>
+#include <catch2/catch_context.h>
+#include <catch2/catch_run_context.h>
+#include <catch2/catch_interfaces_config.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_registry_hub.cpp b/src/catch2/catch_registry_hub.cpp
index dc84e605..f49506a2 100644
--- a/src/catch2/catch_registry_hub.cpp
+++ b/src/catch2/catch_registry_hub.cpp
@@ -6,16 +6,16 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_interfaces_registry_hub.h"
+#include <catch2/catch_interfaces_registry_hub.h>
 
-#include "catch_context.h"
-#include "catch_test_case_registry_impl.h"
-#include "catch_reporter_registry.h"
-#include "catch_exception_translator_registry.h"
-#include "catch_tag_alias_registry.h"
-#include "catch_startup_exception_registry.h"
-#include "catch_singletons.hpp"
-#include "catch_enum_values_registry.h"
+#include <catch2/catch_context.h>
+#include <catch2/catch_test_case_registry_impl.h>
+#include <catch2/catch_reporter_registry.h>
+#include <catch2/catch_exception_translator_registry.h>
+#include <catch2/catch_tag_alias_registry.h>
+#include <catch2/catch_startup_exception_registry.h>
+#include <catch2/catch_singletons.hpp>
+#include <catch2/catch_enum_values_registry.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_reporter_registrars.hpp b/src/catch2/catch_reporter_registrars.hpp
index 842c82e8..99be5577 100644
--- a/src/catch2/catch_reporter_registrars.hpp
+++ b/src/catch2/catch_reporter_registrars.hpp
@@ -9,7 +9,7 @@
 #ifndef TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
 
-#include "catch_interfaces_registry_hub.h"
+#include <catch2/catch_interfaces_registry_hub.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_reporter_registry.cpp b/src/catch2/catch_reporter_registry.cpp
index 235fab1a..3808e5b3 100644
--- a/src/catch2/catch_reporter_registry.cpp
+++ b/src/catch2/catch_reporter_registry.cpp
@@ -4,7 +4,7 @@
  *  Distributed under the Boost Software License, Version 1.0. (See accompanying
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
-#include "catch_reporter_registry.h"
+#include <catch2/catch_reporter_registry.h>
 
 #include <catch2/catch_reporter_registrars.hpp>
 #include <catch2/reporters/catch_reporter_compact.h>
diff --git a/src/catch2/catch_reporter_registry.h b/src/catch2/catch_reporter_registry.h
index 31fd01f8..e6aa86f4 100644
--- a/src/catch2/catch_reporter_registry.h
+++ b/src/catch2/catch_reporter_registry.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_REPORTER_REGISTRY_H_INCLUDED
 #define TWOBLUECUBES_CATCH_REPORTER_REGISTRY_H_INCLUDED
 
-#include "catch_interfaces_reporter.h"
+#include <catch2/catch_interfaces_reporter.h>
 
 #include <map>
 
diff --git a/src/catch2/catch_result_type.cpp b/src/catch2/catch_result_type.cpp
index 0f62f1b8..6c4c9a89 100644
--- a/src/catch2/catch_result_type.cpp
+++ b/src/catch2/catch_result_type.cpp
@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_result_type.h"
+#include <catch2/catch_result_type.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_run_context.cpp b/src/catch2/catch_run_context.cpp
index 054008d6..fe24ba10 100644
--- a/src/catch2/catch_run_context.cpp
+++ b/src/catch2/catch_run_context.cpp
@@ -1,10 +1,10 @@
-#include "catch_run_context.h"
-#include "catch_compiler_capabilities.h"
-#include "catch_context.h"
-#include "catch_enforce.h"
-#include "catch_random_number_generator.h"
-#include "catch_stream.h"
-#include "catch_output_redirect.h"
+#include <catch2/catch_run_context.h>
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_context.h>
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_random_number_generator.h>
+#include <catch2/catch_stream.h>
+#include <catch2/catch_output_redirect.h>
 
 #include <cassert>
 #include <algorithm>
diff --git a/src/catch2/catch_run_context.h b/src/catch2/catch_run_context.h
index 6e6e3733..348ef32a 100644
--- a/src/catch2/catch_run_context.h
+++ b/src/catch2/catch_run_context.h
@@ -8,20 +8,20 @@
 #ifndef TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
 
-#include "catch_interfaces_generatortracker.h"
-#include "catch_interfaces_runner.h"
-#include "catch_interfaces_reporter.h"
-#include "catch_interfaces_exception.h"
-#include "catch_config.hpp"
-#include "catch_test_registry.h"
-#include "catch_test_case_info.h"
-#include "catch_capture.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"
+#include <catch2/catch_interfaces_generatortracker.h>
+#include <catch2/catch_interfaces_runner.h>
+#include <catch2/catch_interfaces_reporter.h>
+#include <catch2/catch_interfaces_exception.h>
+#include <catch2/catch_config.hpp>
+#include <catch2/catch_test_registry.h>
+#include <catch2/catch_test_case_info.h>
+#include <catch2/catch_capture.hpp>
+#include <catch2/catch_totals.h>
+#include <catch2/catch_test_spec.h>
+#include <catch2/catch_test_case_tracker.h>
+#include <catch2/catch_timer.h>
+#include <catch2/catch_assertionhandler.h>
+#include <catch2/catch_fatal_condition.h>
 
 #include <string>
 
diff --git a/src/catch2/catch_section.cpp b/src/catch2/catch_section.cpp
index 0646d36f..9872cacf 100644
--- a/src/catch2/catch_section.cpp
+++ b/src/catch2/catch_section.cpp
@@ -6,9 +6,9 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_section.h"
-#include "catch_capture.hpp"
-#include "catch_uncaught_exceptions.h"
+#include <catch2/catch_section.h>
+#include <catch2/catch_capture.hpp>
+#include <catch2/catch_uncaught_exceptions.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_section.h b/src/catch2/catch_section.h
index cc2b323d..75a5b3ea 100644
--- a/src/catch2/catch_section.h
+++ b/src/catch2/catch_section.h
@@ -8,10 +8,10 @@
 #ifndef TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
 #define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
 
-#include "catch_compiler_capabilities.h"
-#include "catch_section_info.h"
-#include "catch_totals.h"
-#include "catch_timer.h"
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_section_info.h>
+#include <catch2/catch_totals.h>
+#include <catch2/catch_timer.h>
 
 #include <string>
 
diff --git a/src/catch2/catch_section_info.h b/src/catch2/catch_section_info.h
index 50a31aeb..ca06f79c 100644
--- a/src/catch2/catch_section_info.h
+++ b/src/catch2/catch_section_info.h
@@ -8,9 +8,9 @@
 #ifndef TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED
 #define TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED
 
-#include "catch_common.h"
-#include "catch_stringref.h"
-#include "catch_totals.h"
+#include <catch2/catch_common.h>
+#include <catch2/catch_stringref.h>
+#include <catch2/catch_totals.h>
 
 #include <string>
 
diff --git a/src/catch2/catch_session.cpp b/src/catch2/catch_session.cpp
index 3c52b7a7..f086fb22 100644
--- a/src/catch2/catch_session.cpp
+++ b/src/catch2/catch_session.cpp
@@ -5,23 +5,23 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_session.h"
-#include "catch_commandline.h"
-#include "catch_console_colour.h"
-#include "catch_enforce.h"
-#include "catch_list.h"
-#include "catch_context.h"
-#include "catch_run_context.h"
-#include "catch_stream.h"
-#include "catch_test_spec.h"
-#include "catch_version.h"
-#include "catch_interfaces_reporter.h"
-#include "catch_random_number_generator.h"
-#include "catch_startup_exception_registry.h"
-#include "catch_text.h"
-#include "catch_stream.h"
-#include "catch_windows_h_proxy.h"
-#include "reporters/catch_reporter_listening.h"
+#include <catch2/catch_session.h>
+#include <catch2/catch_commandline.h>
+#include <catch2/catch_console_colour.h>
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_list.h>
+#include <catch2/catch_context.h>
+#include <catch2/catch_run_context.h>
+#include <catch2/catch_stream.h>
+#include <catch2/catch_test_spec.h>
+#include <catch2/catch_version.h>
+#include <catch2/catch_interfaces_reporter.h>
+#include <catch2/catch_random_number_generator.h>
+#include <catch2/catch_startup_exception_registry.h>
+#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 <cstdlib>
 #include <iomanip>
diff --git a/src/catch2/catch_session.h b/src/catch2/catch_session.h
index a648bf4a..abb9b062 100644
--- a/src/catch2/catch_session.h
+++ b/src/catch2/catch_session.h
@@ -8,9 +8,9 @@
 #ifndef TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
 
-#include "catch_commandline.h"
-#include "catch_config.hpp"
-#include "catch_text.h"
+#include <catch2/catch_commandline.h>
+#include <catch2/catch_config.hpp>
+#include <catch2/catch_text.h>
 
 #include <memory>
 
diff --git a/src/catch2/catch_singletons.cpp b/src/catch2/catch_singletons.cpp
index e5367cad..67354517 100644
--- a/src/catch2/catch_singletons.cpp
+++ b/src/catch2/catch_singletons.cpp
@@ -5,7 +5,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_singletons.hpp"
+#include <catch2/catch_singletons.hpp>
 
 #include <vector>
 
diff --git a/src/catch2/catch_startup_exception_registry.cpp b/src/catch2/catch_startup_exception_registry.cpp
index 3c5bd22f..38eb6666 100644
--- a/src/catch2/catch_startup_exception_registry.cpp
+++ b/src/catch2/catch_startup_exception_registry.cpp
@@ -6,8 +6,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_startup_exception_registry.h"
-#include "catch_compiler_capabilities.h"
+#include <catch2/catch_startup_exception_registry.h>
+#include <catch2/catch_compiler_capabilities.h>
 
 namespace Catch {
 void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
diff --git a/src/catch2/catch_stream.cpp b/src/catch2/catch_stream.cpp
index 3e907c63..6c8e2828 100644
--- a/src/catch2/catch_stream.cpp
+++ b/src/catch2/catch_stream.cpp
@@ -7,12 +7,12 @@
  *
  */
 
-#include "catch_common.h"
-#include "catch_enforce.h"
-#include "catch_stream.h"
-#include "catch_debug_console.h"
-#include "catch_stringref.h"
-#include "catch_singletons.hpp"
+#include <catch2/catch_common.h>
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_stream.h>
+#include <catch2/catch_debug_console.h>
+#include <catch2/catch_stringref.h>
+#include <catch2/catch_singletons.hpp>
 
 #include <cstdio>
 #include <iostream>
diff --git a/src/catch2/catch_string_manip.cpp b/src/catch2/catch_string_manip.cpp
index 65be34d0..93190f5a 100644
--- a/src/catch2/catch_string_manip.cpp
+++ b/src/catch2/catch_string_manip.cpp
@@ -5,8 +5,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_string_manip.h"
-#include "catch_stringref.h"
+#include <catch2/catch_string_manip.h>
+#include <catch2/catch_stringref.h>
 
 #include <algorithm>
 #include <ostream>
diff --git a/src/catch2/catch_string_manip.h b/src/catch2/catch_string_manip.h
index cdb7be5f..61595896 100644
--- a/src/catch2/catch_string_manip.h
+++ b/src/catch2/catch_string_manip.h
@@ -7,7 +7,7 @@
 #ifndef TWOBLUECUBES_CATCH_STRING_MANIP_H_INCLUDED
 #define TWOBLUECUBES_CATCH_STRING_MANIP_H_INCLUDED
 
-#include "catch_stringref.h"
+#include <catch2/catch_stringref.h>
 
 #include <string>
 #include <iosfwd>
diff --git a/src/catch2/catch_stringref.cpp b/src/catch2/catch_stringref.cpp
index ad26b34c..3402d1c8 100644
--- a/src/catch2/catch_stringref.cpp
+++ b/src/catch2/catch_stringref.cpp
@@ -5,8 +5,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_enforce.h"
-#include "catch_stringref.h"
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_stringref.h>
 
 #include <algorithm>
 #include <ostream>
diff --git a/src/catch2/catch_tag_alias.cpp b/src/catch2/catch_tag_alias.cpp
index 2ea4540e..aa7d5393 100644
--- a/src/catch2/catch_tag_alias.cpp
+++ b/src/catch2/catch_tag_alias.cpp
@@ -1,4 +1,4 @@
-#include "catch_tag_alias.h"
+#include <catch2/catch_tag_alias.h>
 
 namespace Catch {
     TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}    
diff --git a/src/catch2/catch_tag_alias.h b/src/catch2/catch_tag_alias.h
index a9e6eb37..01692ae6 100644
--- a/src/catch2/catch_tag_alias.h
+++ b/src/catch2/catch_tag_alias.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_TAG_ALIAS_H_INCLUDED
 #define TWOBLUECUBES_CATCH_TAG_ALIAS_H_INCLUDED
 
-#include "catch_common.h"
+#include <catch2/catch_common.h>
 
 #include <string>
 
diff --git a/src/catch2/catch_tag_alias_autoregistrar.cpp b/src/catch2/catch_tag_alias_autoregistrar.cpp
index 6a292edf..6f09d083 100644
--- a/src/catch2/catch_tag_alias_autoregistrar.cpp
+++ b/src/catch2/catch_tag_alias_autoregistrar.cpp
@@ -1,6 +1,6 @@
-#include "catch_tag_alias_autoregistrar.h"
-#include "catch_compiler_capabilities.h"
-#include "catch_interfaces_registry_hub.h"
+#include <catch2/catch_tag_alias_autoregistrar.h>
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_interfaces_registry_hub.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_tag_alias_autoregistrar.h b/src/catch2/catch_tag_alias_autoregistrar.h
index ebba8e25..b104ace6 100644
--- a/src/catch2/catch_tag_alias_autoregistrar.h
+++ b/src/catch2/catch_tag_alias_autoregistrar.h
@@ -7,7 +7,7 @@
 #ifndef TWOBLUECUBES_CATCH_TAG_ALIAS_AUTOREGISTRAR_H_INCLUDED
 #define TWOBLUECUBES_CATCH_TAG_ALIAS_AUTOREGISTRAR_H_INCLUDED
 
-#include "catch_common.h"
+#include <catch2/catch_common.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_tag_alias_registry.cpp b/src/catch2/catch_tag_alias_registry.cpp
index 98aea26a..7f850353 100644
--- a/src/catch2/catch_tag_alias_registry.cpp
+++ b/src/catch2/catch_tag_alias_registry.cpp
@@ -6,11 +6,11 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_tag_alias_registry.h"
-#include "catch_console_colour.h"
-#include "catch_enforce.h"
-#include "catch_interfaces_registry_hub.h"
-#include "catch_string_manip.h"
+#include <catch2/catch_tag_alias_registry.h>
+#include <catch2/catch_console_colour.h>
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_interfaces_registry_hub.h>
+#include <catch2/catch_string_manip.h>
 
 #include <sstream>
 
diff --git a/src/catch2/catch_tag_alias_registry.h b/src/catch2/catch_tag_alias_registry.h
index d3bb8ffb..3936b8e6 100644
--- a/src/catch2/catch_tag_alias_registry.h
+++ b/src/catch2/catch_tag_alias_registry.h
@@ -8,8 +8,8 @@
 #ifndef TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_H_INCLUDED
 #define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_H_INCLUDED
 
-#include "catch_interfaces_tag_alias_registry.h"
-#include "catch_tag_alias.h"
+#include <catch2/catch_interfaces_tag_alias_registry.h>
+#include <catch2/catch_tag_alias.h>
 
 #include <map>
 
diff --git a/src/catch2/catch_test_case_info.cpp b/src/catch2/catch_test_case_info.cpp
index 35a57e6c..15519dc9 100644
--- a/src/catch2/catch_test_case_info.cpp
+++ b/src/catch2/catch_test_case_info.cpp
@@ -6,11 +6,11 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_case_info.h"
-#include "catch_enforce.h"
-#include "catch_test_spec.h"
-#include "catch_interfaces_testcase.h"
-#include "catch_string_manip.h"
+#include <catch2/catch_test_case_info.h>
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_test_spec.h>
+#include <catch2/catch_interfaces_testcase.h>
+#include <catch2/catch_string_manip.h>
 
 #include <cctype>
 #include <exception>
diff --git a/src/catch2/catch_test_case_info.h b/src/catch2/catch_test_case_info.h
index 5016e5d0..540966e6 100644
--- a/src/catch2/catch_test_case_info.h
+++ b/src/catch2/catch_test_case_info.h
@@ -8,9 +8,9 @@
 #ifndef TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
 #define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
 
-#include "catch_common.h"
-#include "catch_stringref.h"
-#include "catch_test_registry.h"
+#include <catch2/catch_common.h>
+#include <catch2/catch_stringref.h>
+#include <catch2/catch_test_registry.h>
 
 #include <string>
 #include <vector>
diff --git a/src/catch2/catch_test_case_registry_impl.cpp b/src/catch2/catch_test_case_registry_impl.cpp
index 6891a53b..cc7a9e4b 100644
--- a/src/catch2/catch_test_case_registry_impl.cpp
+++ b/src/catch2/catch_test_case_registry_impl.cpp
@@ -5,15 +5,15 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_case_registry_impl.h"
+#include <catch2/catch_test_case_registry_impl.h>
 
-#include "catch_context.h"
-#include "catch_enforce.h"
-#include "catch_interfaces_registry_hub.h"
-#include "catch_random_number_generator.h"
-#include "catch_run_context.h"
-#include "catch_string_manip.h"
-#include "catch_test_case_info.h"
+#include <catch2/catch_context.h>
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_interfaces_registry_hub.h>
+#include <catch2/catch_random_number_generator.h>
+#include <catch2/catch_run_context.h>
+#include <catch2/catch_string_manip.h>
+#include <catch2/catch_test_case_info.h>
 
 #include <sstream>
 
diff --git a/src/catch2/catch_test_case_registry_impl.h b/src/catch2/catch_test_case_registry_impl.h
index d6fa6e14..d2b3e099 100644
--- a/src/catch2/catch_test_case_registry_impl.h
+++ b/src/catch2/catch_test_case_registry_impl.h
@@ -8,9 +8,9 @@
 #ifndef TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
 
-#include "catch_test_registry.h"
-#include "catch_test_spec.h"
-#include "catch_interfaces_config.h"
+#include <catch2/catch_test_registry.h>
+#include <catch2/catch_test_spec.h>
+#include <catch2/catch_interfaces_config.h>
 
 #include <vector>
 #include <set>
diff --git a/src/catch2/catch_test_case_tracker.cpp b/src/catch2/catch_test_case_tracker.cpp
index 77bd65cb..1781a8db 100644
--- a/src/catch2/catch_test_case_tracker.cpp
+++ b/src/catch2/catch_test_case_tracker.cpp
@@ -5,10 +5,10 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_case_tracker.h"
+#include <catch2/catch_test_case_tracker.h>
 
-#include "catch_enforce.h"
-#include "catch_string_manip.h"
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_string_manip.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/catch2/catch_test_case_tracker.h b/src/catch2/catch_test_case_tracker.h
index 563dbef2..8522116e 100644
--- a/src/catch2/catch_test_case_tracker.h
+++ b/src/catch2/catch_test_case_tracker.h
@@ -8,8 +8,8 @@
 #ifndef TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
 
-#include "catch_compiler_capabilities.h"
-#include "catch_common.h"
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_common.h>
 
 #include <string>
 #include <vector>
diff --git a/src/catch2/catch_test_registry.cpp b/src/catch2/catch_test_registry.cpp
index 2794a7cc..5199203b 100644
--- a/src/catch2/catch_test_registry.cpp
+++ b/src/catch2/catch_test_registry.cpp
@@ -5,10 +5,10 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_registry.h"
-#include "catch_compiler_capabilities.h"
-#include "catch_test_case_registry_impl.h"
-#include "catch_interfaces_registry_hub.h"
+#include <catch2/catch_test_registry.h>
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_test_case_registry_impl.h>
+#include <catch2/catch_interfaces_registry_hub.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_test_registry.h b/src/catch2/catch_test_registry.h
index c902cf61..bca9bb5d 100644
--- a/src/catch2/catch_test_registry.h
+++ b/src/catch2/catch_test_registry.h
@@ -8,12 +8,12 @@
 #ifndef TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
 
-#include "catch_common.h"
-#include "catch_interfaces_testcase.h"
-#include "catch_compiler_capabilities.h"
-#include "catch_stringref.h"
-#include "catch_preprocessor.hpp"
-#include "catch_meta.hpp"
+#include <catch2/catch_common.h>
+#include <catch2/catch_interfaces_testcase.h>
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_stringref.h>
+#include <catch2/catch_preprocessor.hpp>
+#include <catch2/catch_meta.hpp>
 
 #include <memory>
 
diff --git a/src/catch2/catch_test_spec.cpp b/src/catch2/catch_test_spec.cpp
index 6c63d4ce..e3fd7f1b 100644
--- a/src/catch2/catch_test_spec.cpp
+++ b/src/catch2/catch_test_spec.cpp
@@ -5,9 +5,9 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_test_spec.h"
-#include "catch_string_manip.h"
-#include "catch_interfaces_config.h"
+#include <catch2/catch_test_spec.h>
+#include <catch2/catch_string_manip.h>
+#include <catch2/catch_interfaces_config.h>
 
 #include <algorithm>
 #include <string>
diff --git a/src/catch2/catch_test_spec.h b/src/catch2/catch_test_spec.h
index a9fa3543..e47e8ea3 100644
--- a/src/catch2/catch_test_spec.h
+++ b/src/catch2/catch_test_spec.h
@@ -13,8 +13,8 @@
 #pragma clang diagnostic ignored "-Wpadded"
 #endif
 
-#include "catch_wildcard_pattern.h"
-#include "catch_test_case_info.h"
+#include <catch2/catch_wildcard_pattern.h>
+#include <catch2/catch_test_case_info.h>
 
 #include <string>
 #include <vector>
diff --git a/src/catch2/catch_test_spec_parser.cpp b/src/catch2/catch_test_spec_parser.cpp
index dac9b584..0f37b35c 100644
--- a/src/catch2/catch_test_spec_parser.cpp
+++ b/src/catch2/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.h"
+#include <catch2/catch_test_spec_parser.h>
 
 
 namespace Catch {
diff --git a/src/catch2/catch_test_spec_parser.h b/src/catch2/catch_test_spec_parser.h
index 05882377..42e030d5 100644
--- a/src/catch2/catch_test_spec_parser.h
+++ b/src/catch2/catch_test_spec_parser.h
@@ -13,9 +13,9 @@
 #pragma clang diagnostic ignored "-Wpadded"
 #endif
 
-#include "catch_test_spec.h"
-#include "catch_string_manip.h"
-#include "catch_interfaces_tag_alias_registry.h"
+#include <catch2/catch_test_spec.h>
+#include <catch2/catch_string_manip.h>
+#include <catch2/catch_interfaces_tag_alias_registry.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_text.h b/src/catch2/catch_text.h
index eeafe8e2..eefbf53d 100644
--- a/src/catch2/catch_text.h
+++ b/src/catch2/catch_text.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_TEXT_H_INCLUDED
 #define TWOBLUECUBES_CATCH_TEXT_H_INCLUDED
 
-#include "catch_clara.h"
+#include <catch2/catch_clara.h>
 
 namespace Catch {
     using namespace clara::TextFlow;
diff --git a/src/catch2/catch_timer.cpp b/src/catch2/catch_timer.cpp
index ca383a2d..a21b1834 100644
--- a/src/catch2/catch_timer.cpp
+++ b/src/catch2/catch_timer.cpp
@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_timer.h"
+#include <catch2/catch_timer.h>
 
 #include <chrono>
 
diff --git a/src/catch2/catch_to_string.hpp b/src/catch2/catch_to_string.hpp
index 3e2b5879..662fd6a1 100644
--- a/src/catch2/catch_to_string.hpp
+++ b/src/catch2/catch_to_string.hpp
@@ -9,8 +9,8 @@
 
 #include <string>
 
-#include "catch_compiler_capabilities.h"
-#include "catch_stream.h"
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_stream.h>
 
 namespace Catch {
     template <typename T>
diff --git a/src/catch2/catch_tostring.cpp b/src/catch2/catch_tostring.cpp
index a289c341..913cd22b 100644
--- a/src/catch2/catch_tostring.cpp
+++ b/src/catch2/catch_tostring.cpp
@@ -17,10 +17,10 @@
 #define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
 #endif
 
-#include "catch_tostring.h"
-#include "catch_interfaces_config.h"
-#include "catch_context.h"
-#include "catch_polyfills.hpp"
+#include <catch2/catch_tostring.h>
+#include <catch2/catch_interfaces_config.h>
+#include <catch2/catch_context.h>
+#include <catch2/catch_polyfills.hpp>
 
 #include <cmath>
 #include <iomanip>
diff --git a/src/catch2/catch_tostring.h b/src/catch2/catch_tostring.h
index 640fc8cb..947c269b 100644
--- a/src/catch2/catch_tostring.h
+++ b/src/catch2/catch_tostring.h
@@ -13,16 +13,16 @@
 #include <cstddef>
 #include <type_traits>
 #include <string>
-#include "catch_compiler_capabilities.h"
-#include "catch_stream.h"
-#include "catch_interfaces_enum_values_registry.h"
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_stream.h>
+#include <catch2/catch_interfaces_enum_values_registry.h>
 
 #ifdef CATCH_CONFIG_CPP17_STRING_VIEW
 #include <string_view>
 #endif
 
 #ifdef __OBJC__
-#include "catch_objc_arc.hpp"
+#include <catch2/catch_objc_arc.hpp>
 #endif
 
 #ifdef _MSC_VER
diff --git a/src/catch2/catch_totals.cpp b/src/catch2/catch_totals.cpp
index 0391fe82..4ef05524 100644
--- a/src/catch2/catch_totals.cpp
+++ b/src/catch2/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.h"
+#include <catch2/catch_totals.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_uncaught_exceptions.cpp b/src/catch2/catch_uncaught_exceptions.cpp
index b990ccd8..ea75fe36 100644
--- a/src/catch2/catch_uncaught_exceptions.cpp
+++ b/src/catch2/catch_uncaught_exceptions.cpp
@@ -6,8 +6,8 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_compiler_capabilities.h"
-#include "catch_uncaught_exceptions.h"
+#include <catch2/catch_compiler_capabilities.h>
+#include <catch2/catch_uncaught_exceptions.h>
 #include <exception>
 
 namespace Catch {
diff --git a/src/catch2/catch_version.cpp b/src/catch2/catch_version.cpp
index 625e1150..a617ae14 100644
--- a/src/catch2/catch_version.cpp
+++ b/src/catch2/catch_version.cpp
@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_version.h"
+#include <catch2/catch_version.h>
 #include <ostream>
 
 namespace Catch {
diff --git a/src/catch2/catch_wildcard_pattern.cpp b/src/catch2/catch_wildcard_pattern.cpp
index 95e5d3f0..5936e676 100644
--- a/src/catch2/catch_wildcard_pattern.cpp
+++ b/src/catch2/catch_wildcard_pattern.cpp
@@ -5,9 +5,9 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_wildcard_pattern.h"
-#include "catch_enforce.h"
-#include "catch_string_manip.h"
+#include <catch2/catch_wildcard_pattern.h>
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_string_manip.h>
 
 namespace Catch {
 
diff --git a/src/catch2/catch_wildcard_pattern.h b/src/catch2/catch_wildcard_pattern.h
index 5d508f7b..4594f62c 100644
--- a/src/catch2/catch_wildcard_pattern.h
+++ b/src/catch2/catch_wildcard_pattern.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_WILDCARD_PATTERN_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_WILDCARD_PATTERN_HPP_INCLUDED
 
-#include "catch_common.h"
+#include <catch2/catch_common.h>
 
 
 namespace Catch
diff --git a/src/catch2/catch_windows_h_proxy.h b/src/catch2/catch_windows_h_proxy.h
index a7a19c8e..b5adee56 100644
--- a/src/catch2/catch_windows_h_proxy.h
+++ b/src/catch2/catch_windows_h_proxy.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED
 #define TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED
 
-#include "catch_platform.h"
+#include <catch2/catch_platform.h>
 
 #if defined(CATCH_PLATFORM_WINDOWS)
 
diff --git a/src/catch2/catch_xmlwriter.cpp b/src/catch2/catch_xmlwriter.cpp
index b0d81ab7..3b96035b 100644
--- a/src/catch2/catch_xmlwriter.cpp
+++ b/src/catch2/catch_xmlwriter.cpp
@@ -5,9 +5,9 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_xmlwriter.h"
+#include <catch2/catch_xmlwriter.h>
 
-#include "catch_enforce.h"
+#include <catch2/catch_enforce.h>
 
 #include <iomanip>
 #include <type_traits>
diff --git a/src/catch2/catch_xmlwriter.h b/src/catch2/catch_xmlwriter.h
index f551b233..f0a00c57 100644
--- a/src/catch2/catch_xmlwriter.h
+++ b/src/catch2/catch_xmlwriter.h
@@ -8,8 +8,8 @@
 #ifndef TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED
 
-#include "catch_stream.h"
-#include "catch_compiler_capabilities.h"
+#include <catch2/catch_stream.h>
+#include <catch2/catch_compiler_capabilities.h>
 
 #include <vector>
 
diff --git a/src/catch2/reporters/catch_reporter_bases.cpp b/src/catch2/reporters/catch_reporter_bases.cpp
index 19ba7df9..60785a69 100644
--- a/src/catch2/reporters/catch_reporter_bases.cpp
+++ b/src/catch2/reporters/catch_reporter_bases.cpp
@@ -6,9 +6,9 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "../catch_interfaces_reporter.h"
-#include "../catch_errno_guard.h"
-#include "catch_reporter_bases.hpp"
+#include <catch2/catch_interfaces_reporter.h>
+#include <catch2/catch_errno_guard.h>
+#include <catch2/reporters/catch_reporter_bases.hpp>
 
 #include <cstring>
 #include <cfloat>
diff --git a/src/catch2/reporters/catch_reporter_bases.hpp b/src/catch2/reporters/catch_reporter_bases.hpp
index 5d3980ac..0fbcfe4c 100644
--- a/src/catch2/reporters/catch_reporter_bases.hpp
+++ b/src/catch2/reporters/catch_reporter_bases.hpp
@@ -8,8 +8,8 @@
 #ifndef TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED
 
-#include "../catch_enforce.h"
-#include "../catch_interfaces_reporter.h"
+#include <catch2/catch_enforce.h>
+#include <catch2/catch_interfaces_reporter.h>
 
 #include <algorithm>
 #include <cstring>
diff --git a/src/catch2/reporters/catch_reporter_compact.cpp b/src/catch2/reporters/catch_reporter_compact.cpp
index 2b9b35cf..13731e43 100644
--- a/src/catch2/reporters/catch_reporter_compact.cpp
+++ b/src/catch2/reporters/catch_reporter_compact.cpp
@@ -5,9 +5,9 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_reporter_compact.h"
+#include <catch2/reporters/catch_reporter_compact.h>
 
-#include "../catch_console_colour.h"
+#include <catch2/catch_console_colour.h>
 
 namespace {
 
diff --git a/src/catch2/reporters/catch_reporter_compact.h b/src/catch2/reporters/catch_reporter_compact.h
index b1725070..52fef299 100644
--- a/src/catch2/reporters/catch_reporter_compact.h
+++ b/src/catch2/reporters/catch_reporter_compact.h
@@ -9,7 +9,7 @@
 #define TWOBLUECUBES_CATCH_REPORTER_COMPACT_H_INCLUDED
 
 
-#include "catch_reporter_bases.hpp"
+#include <catch2/reporters/catch_reporter_bases.hpp>
 
 
 namespace Catch {
diff --git a/src/catch2/reporters/catch_reporter_console.cpp b/src/catch2/reporters/catch_reporter_console.cpp
index 35698ef7..0b407346 100644
--- a/src/catch2/reporters/catch_reporter_console.cpp
+++ b/src/catch2/reporters/catch_reporter_console.cpp
@@ -6,13 +6,13 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_reporter_console.h"
+#include <catch2/reporters/catch_reporter_console.h>
 
-#include "../catch_reporter_registrars.hpp"
-#include "../catch_console_colour.h"
-#include "../catch_version.h"
-#include "../catch_text.h"
-#include "../catch_stringref.h"
+#include <catch2/catch_reporter_registrars.hpp>
+#include <catch2/catch_console_colour.h>
+#include <catch2/catch_version.h>
+#include <catch2/catch_text.h>
+#include <catch2/catch_stringref.h>
 
 #include <cfloat>
 #include <cstdio>
diff --git a/src/catch2/reporters/catch_reporter_console.h b/src/catch2/reporters/catch_reporter_console.h
index e952daff..34c14f8f 100644
--- a/src/catch2/reporters/catch_reporter_console.h
+++ b/src/catch2/reporters/catch_reporter_console.h
@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_REPORTER_CONSOLE_H_INCLUDED
 #define TWOBLUECUBES_CATCH_REPORTER_CONSOLE_H_INCLUDED
 
-#include "catch_reporter_bases.hpp"
+#include <catch2/reporters/catch_reporter_bases.hpp>
 
 #if defined(_MSC_VER)
 #pragma warning(push)
diff --git a/src/catch2/reporters/catch_reporter_junit.cpp b/src/catch2/reporters/catch_reporter_junit.cpp
index 3531d3e4..9e4691a1 100644
--- a/src/catch2/reporters/catch_reporter_junit.cpp
+++ b/src/catch2/reporters/catch_reporter_junit.cpp
@@ -6,13 +6,13 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_reporter_bases.hpp"
+#include <catch2/reporters/catch_reporter_bases.hpp>
 
-#include "catch_reporter_junit.h"
+#include <catch2/reporters/catch_reporter_junit.h>
 
-#include "../catch_tostring.h"
-#include "../catch_reporter_registrars.hpp"
-#include "../catch_text.h"
+#include <catch2/catch_tostring.h>
+#include <catch2/catch_reporter_registrars.hpp>
+#include <catch2/catch_text.h>
 
 #include <cassert>
 #include <sstream>
diff --git a/src/catch2/reporters/catch_reporter_junit.h b/src/catch2/reporters/catch_reporter_junit.h
index 2475b4ab..fd7923bf 100644
--- a/src/catch2/reporters/catch_reporter_junit.h
+++ b/src/catch2/reporters/catch_reporter_junit.h
@@ -8,9 +8,9 @@
 #define TWOBLUECUBES_CATCH_REPORTER_JUNIT_H_INCLUDED
 
 
-#include "catch_reporter_bases.hpp"
-#include "../catch_xmlwriter.h"
-#include "../catch_timer.h"
+#include <catch2/reporters/catch_reporter_bases.hpp>
+#include <catch2/catch_xmlwriter.h>
+#include <catch2/catch_timer.h>
 
 namespace Catch {
 
diff --git a/src/catch2/reporters/catch_reporter_listening.cpp b/src/catch2/reporters/catch_reporter_listening.cpp
index 0a8afadb..0eb70e12 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 "catch_reporter_listening.h"
+ #include <catch2/reporters/catch_reporter_listening.h>
 #include <cassert>
 
 namespace Catch {
diff --git a/src/catch2/reporters/catch_reporter_listening.h b/src/catch2/reporters/catch_reporter_listening.h
index 828a1a04..94c22951 100644
--- a/src/catch2/reporters/catch_reporter_listening.h
+++ b/src/catch2/reporters/catch_reporter_listening.h
@@ -7,7 +7,7 @@
 #ifndef TWOBLUECUBES_CATCH_MULTI_REPORTER_H_INCLUDED
 #define TWOBLUECUBES_CATCH_MULTI_REPORTER_H_INCLUDED
 
-#include "../catch_interfaces_reporter.h"
+#include <catch2/catch_interfaces_reporter.h>
 
 namespace Catch {
 
diff --git a/src/catch2/reporters/catch_reporter_xml.cpp b/src/catch2/reporters/catch_reporter_xml.cpp
index d02488e5..de0781c7 100644
--- a/src/catch2/reporters/catch_reporter_xml.cpp
+++ b/src/catch2/reporters/catch_reporter_xml.cpp
@@ -6,11 +6,11 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include "catch_reporter_xml.h"
+#include <catch2/reporters/catch_reporter_xml.h>
 
-#include "../catch_capture.hpp"
-#include "../catch_reporter_registrars.hpp"
-#include "../catch_list.h"
+#include <catch2/catch_capture.hpp>
+#include <catch2/catch_reporter_registrars.hpp>
+#include <catch2/catch_list.h>
 
 #if defined(_MSC_VER)
 #pragma warning(push)
diff --git a/src/catch2/reporters/catch_reporter_xml.h b/src/catch2/reporters/catch_reporter_xml.h
index 97867da8..4146ab20 100644
--- a/src/catch2/reporters/catch_reporter_xml.h
+++ b/src/catch2/reporters/catch_reporter_xml.h
@@ -7,10 +7,10 @@
 #ifndef TWOBLUECUBES_CATCH_REPORTER_XML_H_INCLUDED
 #define TWOBLUECUBES_CATCH_REPORTER_XML_H_INCLUDED
 
-#include "catch_reporter_bases.hpp"
+#include <catch2/reporters/catch_reporter_bases.hpp>
 
-#include "../catch_xmlwriter.h"
-#include "../catch_timer.h"
+#include <catch2/catch_xmlwriter.h>
+#include <catch2/catch_timer.h>
 
 
 namespace Catch {