Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Standardize include guard patterns to FILE_NAME_EXTENSION_INCLUDED

This commit also strips the old copyright comment header in touched
files, as those will also be replaced with a more standardized and
machine-friendly version.
Commit
a822cb9717b64b3b17047fe1ab4dc727c2ff39c4
Author
Martin Hořeňovský ·
Parents
c26693df237f

Files · Download .tar.gz

Changes

 src/catch2/benchmark/catch_benchmark.hpp                | 17 +++++------------
 src/catch2/benchmark/catch_chronometer.hpp              | 16 ++++------------
 src/catch2/benchmark/catch_clock.hpp                    | 16 ++++------------
 src/catch2/benchmark/catch_constructor.hpp              | 16 ++++------------
 src/catch2/benchmark/catch_environment.hpp              | 16 ++++------------
 src/catch2/benchmark/catch_estimate.hpp                 | 16 ++++------------
 src/catch2/benchmark/catch_execution_plan.hpp           | 16 ++++------------
 src/catch2/benchmark/catch_optimizer.hpp                | 16 ++++------------
 src/catch2/benchmark/catch_outlier_classification.hpp   | 15 ++++-----------
 src/catch2/benchmark/catch_sample_analysis.hpp          | 16 ++++------------
 src/catch2/benchmark/detail/catch_analyse.hpp           | 16 ++++------------
 .../benchmark/detail/catch_benchmark_function.hpp       | 16 ++++------------
 src/catch2/benchmark/detail/catch_complete_invoke.hpp   | 16 ++++------------
 src/catch2/benchmark/detail/catch_estimate_clock.hpp    | 16 ++++------------
 src/catch2/benchmark/detail/catch_measure.hpp           | 16 ++++------------
 src/catch2/benchmark/detail/catch_repeat.hpp            | 16 ++++------------
 src/catch2/benchmark/detail/catch_run_for_at_least.hpp  | 16 ++++------------
 src/catch2/benchmark/detail/catch_stats.hpp             | 16 ++++------------
 src/catch2/benchmark/detail/catch_timing.hpp            | 16 ++++------------
 src/catch2/catch_approx.hpp                             | 13 +++----------
 src/catch2/catch_assertion_info.hpp                     | 13 +++----------
 src/catch2/catch_assertion_result.hpp                   | 13 +++----------
 src/catch2/catch_config.hpp                             | 13 +++----------
 src/catch2/catch_message.hpp                            | 13 +++----------
 src/catch2/catch_reporter_registrars.hpp                | 14 +++-----------
 src/catch2/catch_section_info.hpp                       | 13 +++----------
 src/catch2/catch_session.hpp                            | 13 +++----------
 src/catch2/catch_tag_alias.hpp                          | 13 +++----------
 src/catch2/catch_tag_alias_autoregistrar.hpp            | 12 +++---------
 src/catch2/catch_template_test_macros.hpp               | 12 +++---------
 src/catch2/catch_test_case_info.hpp                     | 13 +++----------
 src/catch2/catch_test_macros.hpp                        | 11 +++--------
 src/catch2/catch_test_spec.hpp                          | 13 +++----------
 src/catch2/catch_timer.hpp                              | 13 +++----------
 src/catch2/catch_tostring.hpp                           | 13 +++----------
 src/catch2/catch_totals.hpp                             | 13 +++----------
 src/catch2/catch_version.hpp                            | 13 +++----------
 src/catch2/catch_version_macros.hpp                     | 11 +++--------
 src/catch2/generators/catch_generator_exception.hpp     | 11 +++--------
 src/catch2/generators/catch_generators.hpp              | 12 +++---------
 src/catch2/generators/catch_generators_adapters.hpp     | 12 +++---------
 src/catch2/generators/catch_generators_random.hpp       | 12 +++---------
 src/catch2/generators/catch_generators_range.hpp        | 12 +++---------
 src/catch2/interfaces/catch_interfaces_capture.hpp      | 13 +++----------
 src/catch2/interfaces/catch_interfaces_config.hpp       | 13 +++----------
 .../catch_interfaces_enum_values_registry.hpp           | 13 +++----------
 src/catch2/interfaces/catch_interfaces_exception.hpp    | 13 +++----------
 .../interfaces/catch_interfaces_generatortracker.hpp    | 13 +++----------
 src/catch2/interfaces/catch_interfaces_registry_hub.hpp | 13 +++----------
 src/catch2/interfaces/catch_interfaces_reporter.hpp     | 13 +++----------
 src/catch2/interfaces/catch_interfaces_runner.hpp       | 13 +++----------
 .../interfaces/catch_interfaces_tag_alias_registry.hpp  | 13 +++----------
 src/catch2/interfaces/catch_interfaces_testcase.hpp     | 13 +++----------
 src/catch2/internal/catch_assertion_handler.hpp         | 13 +++----------
 src/catch2/internal/catch_commandline.hpp               | 13 +++----------
 src/catch2/internal/catch_common.hpp                    | 14 +++-----------
 src/catch2/internal/catch_compiler_capabilities.hpp     | 14 +++-----------
 src/catch2/internal/catch_console_colour.hpp            | 13 +++----------
 src/catch2/internal/catch_container_nonmembers.hpp      |  9 +++------
 src/catch2/internal/catch_context.hpp                   | 13 +++----------
 src/catch2/internal/catch_debug_console.hpp             | 13 +++----------
 src/catch2/internal/catch_debugger.hpp                  | 14 +++-----------
 src/catch2/internal/catch_decomposer.hpp                | 13 +++----------
 src/catch2/internal/catch_enforce.hpp                   | 12 +++---------
 src/catch2/internal/catch_enum_values_registry.hpp      | 13 +++----------
 src/catch2/internal/catch_errno_guard.hpp               | 12 +++---------
 .../internal/catch_exception_translator_registry.hpp    | 13 +++----------
 src/catch2/internal/catch_fatal_condition_handler.hpp   | 14 +++-----------
 src/catch2/internal/catch_leak_detector.hpp             | 12 +++---------
 src/catch2/internal/catch_list.hpp                      | 13 +++----------
 src/catch2/internal/catch_meta.hpp                      | 14 +++-----------
 src/catch2/internal/catch_option.hpp                    | 13 +++----------
 src/catch2/internal/catch_output_redirect.hpp           | 12 +++---------
 src/catch2/internal/catch_platform.hpp                  | 14 +++-----------
 src/catch2/internal/catch_polyfills.hpp                 | 12 +++---------
 src/catch2/internal/catch_preprocessor.hpp              | 15 +++------------
 src/catch2/internal/catch_random_number_generator.hpp   | 12 +++---------
 src/catch2/internal/catch_reporter_registry.hpp         | 13 +++----------
 src/catch2/internal/catch_result_type.hpp               | 13 +++----------
 src/catch2/internal/catch_run_context.hpp               | 13 +++----------
 src/catch2/internal/catch_section.hpp                   | 13 +++----------
 src/catch2/internal/catch_singletons.hpp                | 12 +++---------
 .../internal/catch_startup_exception_registry.hpp       | 13 +++----------
 src/catch2/internal/catch_stream.hpp                    | 14 +++-----------
 src/catch2/internal/catch_string_manip.hpp              | 13 +++----------
 src/catch2/internal/catch_stringref.hpp                 | 12 +++---------
 src/catch2/internal/catch_tag_alias_registry.hpp        | 13 +++----------
 src/catch2/internal/catch_template_test_registry.hpp    | 10 +++-------
 src/catch2/internal/catch_test_case_registry_impl.hpp   | 13 +++----------
 src/catch2/internal/catch_test_case_tracker.hpp         | 13 +++----------
 src/catch2/internal/catch_test_macro_impl.hpp           | 13 +++----------
 src/catch2/internal/catch_test_registry.hpp             | 13 +++----------
 src/catch2/internal/catch_test_spec_parser.hpp          | 13 +++----------
 src/catch2/internal/catch_textflow.hpp                  |  6 +++---
 src/catch2/internal/catch_to_string.hpp                 | 12 +++---------
 src/catch2/internal/catch_uncaught_exceptions.hpp       | 13 +++----------
 src/catch2/internal/catch_wildcard_pattern.hpp          | 13 +++----------
 src/catch2/internal/catch_windows_h_proxy.hpp           | 13 +++----------
 src/catch2/internal/catch_xmlwriter.hpp                 | 13 +++----------
 src/catch2/matchers/catch_matchers.hpp                  | 10 +++-------
 .../matchers/catch_matchers_container_properties.hpp    |  9 +++------
 src/catch2/matchers/catch_matchers_contains.hpp         | 10 +++-------
 src/catch2/matchers/catch_matchers_exception.hpp        | 12 +++---------
 src/catch2/matchers/catch_matchers_floating.hpp         | 12 +++---------
 src/catch2/matchers/catch_matchers_predicate.hpp        | 12 +++---------
 src/catch2/matchers/catch_matchers_string.hpp           | 13 +++----------
 src/catch2/matchers/catch_matchers_templated.hpp        |  9 +++------
 src/catch2/matchers/catch_matchers_vector.hpp           | 13 +++----------
 src/catch2/matchers/internal/catch_matchers_impl.hpp    | 10 +++-------
 src/catch2/reporters/catch_reporter_automake.hpp        | 10 +++-------
 src/catch2/reporters/catch_reporter_compact.hpp         | 13 +++----------
 src/catch2/reporters/catch_reporter_console.hpp         | 13 +++----------
 src/catch2/reporters/catch_reporter_junit.hpp           | 12 +++---------
 src/catch2/reporters/catch_reporter_listening.hpp       | 12 +++---------
 src/catch2/reporters/catch_reporter_tap.hpp             | 10 +++-------
 src/catch2/reporters/catch_reporter_teamcity.hpp        | 10 +++-------
 src/catch2/reporters/catch_reporter_xml.hpp             | 12 +++---------
 117 files changed, 371 insertions(+), 1150 deletions(-)

diff --git a/src/catch2/benchmark/catch_benchmark.hpp b/src/catch2/benchmark/catch_benchmark.hpp
index e14281cf..95269bd6 100644
--- a/src/catch2/benchmark/catch_benchmark.hpp
+++ b/src/catch2/benchmark/catch_benchmark.hpp
@@ -1,14 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
-
- // Benchmark
-#ifndef TWOBLUECUBES_CATCH_BENCHMARK_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_BENCHMARK_HPP_INCLUDED
+// Adapted from donated nonius code.
+
+#ifndef CATCH_BENCHMARK_HPP_INCLUDED
+#define CATCH_BENCHMARK_HPP_INCLUDED
 
 #include <catch2/interfaces/catch_interfaces_config.hpp>
 #include <catch2/internal/catch_context.hpp>
@@ -134,4 +127,4 @@ namespace Catch {
 
 #endif
 
-#endif // TWOBLUECUBES_CATCH_BENCHMARK_HPP_INCLUDED
+#endif // CATCH_BENCHMARK_HPP_INCLUDED
diff --git a/src/catch2/benchmark/catch_chronometer.hpp b/src/catch2/benchmark/catch_chronometer.hpp
index 2c8705be..11ae459a 100644
--- a/src/catch2/benchmark/catch_chronometer.hpp
+++ b/src/catch2/benchmark/catch_chronometer.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
-// User-facing chronometer
-
-#ifndef TWOBLUECUBES_CATCH_CHRONOMETER_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_CHRONOMETER_HPP_INCLUDED
+#ifndef CATCH_CHRONOMETER_HPP_INCLUDED
+#define CATCH_CHRONOMETER_HPP_INCLUDED
 
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_optimizer.hpp>
@@ -72,4 +64,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_CHRONOMETER_HPP_INCLUDED
+#endif // CATCH_CHRONOMETER_HPP_INCLUDED
diff --git a/src/catch2/benchmark/catch_clock.hpp b/src/catch2/benchmark/catch_clock.hpp
index 32a3e868..c36988a0 100644
--- a/src/catch2/benchmark/catch_clock.hpp
+++ b/src/catch2/benchmark/catch_clock.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
-// Clocks
-
-#ifndef TWOBLUECUBES_CATCH_CLOCK_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_CLOCK_HPP_INCLUDED
+#ifndef CATCH_CLOCK_HPP_INCLUDED
+#define CATCH_CLOCK_HPP_INCLUDED
 
 #include <chrono>
 #include <ratio>
@@ -37,4 +29,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_CLOCK_HPP_INCLUDED
+#endif // CATCH_CLOCK_HPP_INCLUDED
diff --git a/src/catch2/benchmark/catch_constructor.hpp b/src/catch2/benchmark/catch_constructor.hpp
index 936a7467..a0008645 100644
--- a/src/catch2/benchmark/catch_constructor.hpp
+++ b/src/catch2/benchmark/catch_constructor.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
-// Constructor and destructor helpers
-
-#ifndef TWOBLUECUBES_CATCH_CONSTRUCTOR_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_CONSTRUCTOR_HPP_INCLUDED
+#ifndef CATCH_CONSTRUCTOR_HPP_INCLUDED
+#define CATCH_CONSTRUCTOR_HPP_INCLUDED
 
 #include <type_traits>
 
@@ -76,4 +68,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_CONSTRUCTOR_HPP_INCLUDED
+#endif // CATCH_CONSTRUCTOR_HPP_INCLUDED
diff --git a/src/catch2/benchmark/catch_environment.hpp b/src/catch2/benchmark/catch_environment.hpp
index 090efa82..2f137ed1 100644
--- a/src/catch2/benchmark/catch_environment.hpp
+++ b/src/catch2/benchmark/catch_environment.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
-// Environment information
-
-#ifndef TWOBLUECUBES_CATCH_ENVIRONMENT_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_ENVIRONMENT_HPP_INCLUDED
+#ifndef CATCH_ENVIRONMENT_HPP_INCLUDED
+#define CATCH_ENVIRONMENT_HPP_INCLUDED
 
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_outlier_classification.hpp>
@@ -35,4 +27,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_ENVIRONMENT_HPP_INCLUDED
+#endif // CATCH_ENVIRONMENT_HPP_INCLUDED
diff --git a/src/catch2/benchmark/catch_estimate.hpp b/src/catch2/benchmark/catch_estimate.hpp
index a3c913ce..b706d00b 100644
--- a/src/catch2/benchmark/catch_estimate.hpp
+++ b/src/catch2/benchmark/catch_estimate.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
- // Statistics estimates
-
-#ifndef TWOBLUECUBES_CATCH_ESTIMATE_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_ESTIMATE_HPP_INCLUDED
+#ifndef CATCH_ESTIMATE_HPP_INCLUDED
+#define CATCH_ESTIMATE_HPP_INCLUDED
 
 namespace Catch {
     namespace Benchmark {
@@ -28,4 +20,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_ESTIMATE_HPP_INCLUDED
+#endif // CATCH_ESTIMATE_HPP_INCLUDED
diff --git a/src/catch2/benchmark/catch_execution_plan.hpp b/src/catch2/benchmark/catch_execution_plan.hpp
index a920cda6..130470d2 100644
--- a/src/catch2/benchmark/catch_execution_plan.hpp
+++ b/src/catch2/benchmark/catch_execution_plan.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
- // Execution plan
-
-#ifndef TWOBLUECUBES_CATCH_EXECUTION_PLAN_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_EXECUTION_PLAN_HPP_INCLUDED
+#ifndef CATCH_EXECUTION_PLAN_HPP_INCLUDED
+#define CATCH_EXECUTION_PLAN_HPP_INCLUDED
 
 #include <catch2/interfaces/catch_interfaces_config.hpp>
 #include <catch2/benchmark/catch_clock.hpp>
@@ -55,4 +47,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_EXECUTION_PLAN_HPP_INCLUDED
+#endif // CATCH_EXECUTION_PLAN_HPP_INCLUDED
diff --git a/src/catch2/benchmark/catch_optimizer.hpp b/src/catch2/benchmark/catch_optimizer.hpp
index 194530c6..ae944d11 100644
--- a/src/catch2/benchmark/catch_optimizer.hpp
+++ b/src/catch2/benchmark/catch_optimizer.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
- // Hinting the optimizer
-
-#ifndef TWOBLUECUBES_CATCH_OPTIMIZER_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_OPTIMIZER_HPP_INCLUDED
+#ifndef CATCH_OPTIMIZER_HPP_INCLUDED
+#define CATCH_OPTIMIZER_HPP_INCLUDED
 
 #if defined(_MSC_VER)
 #   include <atomic> // atomic_thread_fence
@@ -68,4 +60,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_OPTIMIZER_HPP_INCLUDED
+#endif // CATCH_OPTIMIZER_HPP_INCLUDED
diff --git a/src/catch2/benchmark/catch_outlier_classification.hpp b/src/catch2/benchmark/catch_outlier_classification.hpp
index 66a0adf5..77e5569e 100644
--- a/src/catch2/benchmark/catch_outlier_classification.hpp
+++ b/src/catch2/benchmark/catch_outlier_classification.hpp
@@ -1,14 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
-// Outlier information
-#ifndef TWOBLUECUBES_CATCH_OUTLIERS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_OUTLIERS_HPP_INCLUDED
+#ifndef CATCH_OUTLIER_CLASSIFICATION_HPP_INCLUDED
+#define CATCH_OUTLIER_CLASSIFICATION_HPP_INCLUDED
 
 namespace Catch {
     namespace Benchmark {
@@ -26,4 +19,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_OUTLIERS_HPP_INCLUDED
+#endif // CATCH_OUTLIERS_CLASSIFICATION_HPP_INCLUDED
diff --git a/src/catch2/benchmark/catch_sample_analysis.hpp b/src/catch2/benchmark/catch_sample_analysis.hpp
index 98806864..cd2789e8 100644
--- a/src/catch2/benchmark/catch_sample_analysis.hpp
+++ b/src/catch2/benchmark/catch_sample_analysis.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
-// Benchmark results
-
-#ifndef TWOBLUECUBES_CATCH_BENCHMARK_RESULTS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_BENCHMARK_RESULTS_HPP_INCLUDED
+#ifndef CATCH_SAMPLE_ANALYSIS_HPP_INCLUDED
+#define CATCH_SAMPLE_ANALYSIS_HPP_INCLUDED
 
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_estimate.hpp>
@@ -47,4 +39,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_BENCHMARK_RESULTS_HPP_INCLUDED
+#endif // CATCH_SAMPLE_ANALYSIS_HPP_INCLUDED
diff --git a/src/catch2/benchmark/detail/catch_analyse.hpp b/src/catch2/benchmark/detail/catch_analyse.hpp
index 3e009429..5169e1e8 100644
--- a/src/catch2/benchmark/detail/catch_analyse.hpp
+++ b/src/catch2/benchmark/detail/catch_analyse.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
- // Run and analyse one benchmark
-
-#ifndef TWOBLUECUBES_CATCH_DETAIL_ANALYSE_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_DETAIL_ANALYSE_HPP_INCLUDED
+#ifndef CATCH_ANALYSE_HPP_INCLUDED
+#define CATCH_ANALYSE_HPP_INCLUDED
 
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_sample_analysis.hpp>
@@ -75,4 +67,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_DETAIL_ANALYSE_HPP_INCLUDED
+#endif // CATCH_ANALYSE_HPP_INCLUDED
diff --git a/src/catch2/benchmark/detail/catch_benchmark_function.hpp b/src/catch2/benchmark/detail/catch_benchmark_function.hpp
index 29c435bc..0a620091 100644
--- a/src/catch2/benchmark/detail/catch_benchmark_function.hpp
+++ b/src/catch2/benchmark/detail/catch_benchmark_function.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
- // Dumb std::function implementation for consistent call overhead
-
-#ifndef TWOBLUECUBES_CATCH_DETAIL_BENCHMARK_FUNCTION_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_DETAIL_BENCHMARK_FUNCTION_HPP_INCLUDED
+#ifndef CATCH_BENCHMARK_FUNCTION_HPP_INCLUDED
+#define CATCH_BENCHMARK_FUNCTION_HPP_INCLUDED
 
 #include <catch2/benchmark/catch_chronometer.hpp>
 #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
@@ -107,4 +99,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_DETAIL_BENCHMARK_FUNCTION_HPP_INCLUDED
+#endif // CATCH_BENCHMARK_FUNCTION_HPP_INCLUDED
diff --git a/src/catch2/benchmark/detail/catch_complete_invoke.hpp b/src/catch2/benchmark/detail/catch_complete_invoke.hpp
index 93b2e2a6..e3614951 100644
--- a/src/catch2/benchmark/detail/catch_complete_invoke.hpp
+++ b/src/catch2/benchmark/detail/catch_complete_invoke.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
-// Invoke with a special case for void
-
-#ifndef TWOBLUECUBES_CATCH_DETAIL_COMPLETE_INVOKE_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_DETAIL_COMPLETE_INVOKE_HPP_INCLUDED
+#ifndef CATCH_COMPLETE_INVOKE_HPP_INCLUDED
+#define CATCH_COMPLETE_INVOKE_HPP_INCLUDED
 
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/internal/catch_meta.hpp>
@@ -67,4 +59,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_DETAIL_COMPLETE_INVOKE_HPP_INCLUDED
+#endif // CATCH_COMPLETE_INVOKE_HPP_INCLUDED
diff --git a/src/catch2/benchmark/detail/catch_estimate_clock.hpp b/src/catch2/benchmark/detail/catch_estimate_clock.hpp
index e3e3e85d..44b4125c 100644
--- a/src/catch2/benchmark/detail/catch_estimate_clock.hpp
+++ b/src/catch2/benchmark/detail/catch_estimate_clock.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
- // Environment measurement
-
-#ifndef TWOBLUECUBES_CATCH_DETAIL_ESTIMATE_CLOCK_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_DETAIL_ESTIMATE_CLOCK_HPP_INCLUDED
+#ifndef CATCH_ESTIMATE_CLOCK_HPP_INCLUDED
+#define CATCH_ESTIMATE_CLOCK_HPP_INCLUDED
 
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_environment.hpp>
@@ -109,4 +101,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_DETAIL_ESTIMATE_CLOCK_HPP_INCLUDED
+#endif // CATCH_ESTIMATE_CLOCK_HPP_INCLUDED
diff --git a/src/catch2/benchmark/detail/catch_measure.hpp b/src/catch2/benchmark/detail/catch_measure.hpp
index 686150d1..2797d64f 100644
--- a/src/catch2/benchmark/detail/catch_measure.hpp
+++ b/src/catch2/benchmark/detail/catch_measure.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
-// Measure
-
-#ifndef TWOBLUECUBES_CATCH_DETAIL_MEASURE_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_DETAIL_MEASURE_HPP_INCLUDED
+#ifndef CATCH_MEASURE_HPP_INCLUDED
+#define CATCH_MEASURE_HPP_INCLUDED
 
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
@@ -32,4 +24,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_DETAIL_MEASURE_HPP_INCLUDED
+#endif // CATCH_MEASURE_HPP_INCLUDED
diff --git a/src/catch2/benchmark/detail/catch_repeat.hpp b/src/catch2/benchmark/detail/catch_repeat.hpp
index ab240792..35c3c216 100644
--- a/src/catch2/benchmark/detail/catch_repeat.hpp
+++ b/src/catch2/benchmark/detail/catch_repeat.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
-// repeat algorithm
-
-#ifndef TWOBLUECUBES_CATCH_DETAIL_REPEAT_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_DETAIL_REPEAT_HPP_INCLUDED
+#ifndef CATCH_REPEAT_HPP_INCLUDED
+#define CATCH_REPEAT_HPP_INCLUDED
 
 #include <type_traits>
 #include <utility>
@@ -34,4 +26,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_DETAIL_REPEAT_HPP_INCLUDED
+#endif // CATCH_REPEAT_HPP_INCLUDED
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 5efc539c..62263e97 100644
--- a/src/catch2/benchmark/detail/catch_run_for_at_least.hpp
+++ b/src/catch2/benchmark/detail/catch_run_for_at_least.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
-// Run a function for a minimum amount of time
-
-#ifndef TWOBLUECUBES_CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
+#ifndef CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
+#define CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
 
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_chronometer.hpp>
@@ -60,4 +52,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
+#endif // CATCH_RUN_FOR_AT_LEAST_HPP_INCLUDED
diff --git a/src/catch2/benchmark/detail/catch_stats.hpp b/src/catch2/benchmark/detail/catch_stats.hpp
index ee1e74d5..b1088e69 100644
--- a/src/catch2/benchmark/detail/catch_stats.hpp
+++ b/src/catch2/benchmark/detail/catch_stats.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
-// Statistical analysis tools
-
-#ifndef TWOBLUECUBES_CATCH_DETAIL_ANALYSIS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_DETAIL_ANALYSIS_HPP_INCLUDED
+#ifndef CATCH_STATS_HPP_INCLUDED
+#define CATCH_STATS_HPP_INCLUDED
 
 #include <catch2/benchmark/catch_estimate.hpp>
 #include <catch2/benchmark/catch_outlier_classification.hpp>
@@ -136,4 +128,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_DETAIL_ANALYSIS_HPP_INCLUDED
+#endif // CATCH_STATS_HPP_INCLUDED
diff --git a/src/catch2/benchmark/detail/catch_timing.hpp b/src/catch2/benchmark/detail/catch_timing.hpp
index 36e7d18d..d7b0bf0f 100644
--- a/src/catch2/benchmark/detail/catch_timing.hpp
+++ b/src/catch2/benchmark/detail/catch_timing.hpp
@@ -1,15 +1,7 @@
-/*
- *  Created by Joachim on 16/04/2019.
- *  Adapted from donated nonius code.
- *
- *  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)
- */
+// Adapted from donated nonius code.
 
-// Timing
-
-#ifndef TWOBLUECUBES_CATCH_DETAIL_TIMING_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_DETAIL_TIMING_HPP_INCLUDED
+#ifndef CATCH_TIMING_HPP_INCLUDED
+#define CATCH_TIMING_HPP_INCLUDED
 
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
@@ -29,4 +21,4 @@ namespace Catch {
     } // namespace Benchmark
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_DETAIL_TIMING_HPP_INCLUDED
+#endif // CATCH_TIMING_HPP_INCLUDED
diff --git a/src/catch2/catch_approx.hpp b/src/catch2/catch_approx.hpp
index e7be3c96..5aa9d984 100644
--- a/src/catch2/catch_approx.hpp
+++ b/src/catch2/catch_approx.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 28/04/2011.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
+#ifndef CATCH_APPROX_HPP_INCLUDED
+#define CATCH_APPROX_HPP_INCLUDED
 
 #include <catch2/catch_tostring.hpp>
 
@@ -125,4 +118,4 @@ struct StringMaker<Catch::Approx> {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
+#endif // CATCH_APPROX_HPP_INCLUDED
diff --git a/src/catch2/catch_assertion_info.hpp b/src/catch2/catch_assertion_info.hpp
index 1e94f21f..9c6f1d14 100644
--- a/src/catch2/catch_assertion_info.hpp
+++ b/src/catch2/catch_assertion_info.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 8/8/2017.
- *  Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_ASSERTIONINFO_H_INCLUDED
-#define TWOBLUECUBES_CATCH_ASSERTIONINFO_H_INCLUDED
+#ifndef CATCH_ASSERTION_INFO_HPP_INCLUDED
+#define CATCH_ASSERTION_INFO_HPP_INCLUDED
 
 #include <catch2/internal/catch_result_type.hpp>
 #include <catch2/internal/catch_common.hpp>
@@ -25,4 +18,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_ASSERTIONINFO_H_INCLUDED
+#endif // CATCH_ASSERTION_INFO_HPP_INCLUDED
diff --git a/src/catch2/catch_assertion_result.hpp b/src/catch2/catch_assertion_result.hpp
index b39e71f7..c42fb6f8 100644
--- a/src/catch2/catch_assertion_result.hpp
+++ b/src/catch2/catch_assertion_result.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 28/10/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_ASSERTIONRESULT_H_INCLUDED
-#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_H_INCLUDED
+#ifndef CATCH_ASSERTION_RESULT_HPP_INCLUDED
+#define CATCH_ASSERTION_RESULT_HPP_INCLUDED
 
 #include <string>
 #include <catch2/catch_assertion_info.hpp>
@@ -56,4 +49,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_ASSERTIONRESULT_H_INCLUDED
+#endif // CATCH_ASSERTION_RESULT_HPP_INCLUDED
diff --git a/src/catch2/catch_config.hpp b/src/catch2/catch_config.hpp
index 596726b5..a4cd1c88 100644
--- a/src/catch2/catch_config.hpp
+++ b/src/catch2/catch_config.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 08/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
+#ifndef CATCH_CONFIG_HPP_INCLUDED
+#define CATCH_CONFIG_HPP_INCLUDED
 
 #include <catch2/catch_test_spec.hpp>
 #include <catch2/interfaces/catch_interfaces_config.hpp>
@@ -121,4 +114,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
+#endif // CATCH_CONFIG_HPP_INCLUDED
diff --git a/src/catch2/catch_message.hpp b/src/catch2/catch_message.hpp
index 7f484d11..1c6b4045 100644
--- a/src/catch2/catch_message.hpp
+++ b/src/catch2/catch_message.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil Nash on 1/2/2013.
- *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED
-#define TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED
+#ifndef CATCH_MESSAGE_HPP_INCLUDED
+#define CATCH_MESSAGE_HPP_INCLUDED
 
 #include <catch2/internal/catch_result_type.hpp>
 #include <catch2/internal/catch_common.hpp>
@@ -139,4 +132,4 @@ namespace Catch {
 
 
 
-#endif // TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED
+#endif // CATCH_MESSAGE_HPP_INCLUDED
diff --git a/src/catch2/catch_reporter_registrars.hpp b/src/catch2/catch_reporter_registrars.hpp
index d892892c..adc8951c 100644
--- a/src/catch2/catch_reporter_registrars.hpp
+++ b/src/catch2/catch_reporter_registrars.hpp
@@ -1,13 +1,5 @@
-
-/*
- *  Created by Phil on 31/12/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
+#ifndef CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
+#define CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
 
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
@@ -77,4 +69,4 @@ namespace Catch {
 
 #endif // CATCH_CONFIG_DISABLE
 
-#endif // TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
+#endif // CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
diff --git a/src/catch2/catch_section_info.hpp b/src/catch2/catch_section_info.hpp
index 69648d0c..f9e22ab1 100644
--- a/src/catch2/catch_section_info.hpp
+++ b/src/catch2/catch_section_info.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 03/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED
-#define TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED
+#ifndef CATCH_SECTION_INFO_HPP_INCLUDED
+#define CATCH_SECTION_INFO_HPP_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
 #include <catch2/internal/catch_stringref.hpp>
@@ -38,4 +31,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED
+#endif // CATCH_SECTION_INFO_HPP_INCLUDED
diff --git a/src/catch2/catch_session.hpp b/src/catch2/catch_session.hpp
index 3c7f3c22..4a92a538 100644
--- a/src/catch2/catch_session.hpp
+++ b/src/catch2/catch_session.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 31/10/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
+#ifndef CATCH_SESSION_HPP_INCLUDED
+#define CATCH_SESSION_HPP_INCLUDED
 
 #include <catch2/internal/catch_commandline.hpp>
 #include <catch2/internal/catch_noncopyable.hpp>
@@ -59,4 +52,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
+#endif // CATCH_SESSION_HPP_INCLUDED
diff --git a/src/catch2/catch_tag_alias.hpp b/src/catch2/catch_tag_alias.hpp
index b05c9899..ee0dc1b7 100644
--- a/src/catch2/catch_tag_alias.hpp
+++ b/src/catch2/catch_tag_alias.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 27/6/2014.
- *  Copyright 2014 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TAG_ALIAS_H_INCLUDED
-#define TWOBLUECUBES_CATCH_TAG_ALIAS_H_INCLUDED
+#ifndef CATCH_TAG_ALIAS_HPP_INCLUDED
+#define CATCH_TAG_ALIAS_HPP_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
 
@@ -26,4 +19,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_TAG_ALIAS_H_INCLUDED
+#endif // CATCH_TAG_ALIAS_HPP_INCLUDED
diff --git a/src/catch2/catch_tag_alias_autoregistrar.hpp b/src/catch2/catch_tag_alias_autoregistrar.hpp
index a201e997..c0e5654e 100644
--- a/src/catch2/catch_tag_alias_autoregistrar.hpp
+++ b/src/catch2/catch_tag_alias_autoregistrar.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 27/07/2017.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TAG_ALIAS_AUTOREGISTRAR_H_INCLUDED
-#define TWOBLUECUBES_CATCH_TAG_ALIAS_AUTOREGISTRAR_H_INCLUDED
+#ifndef CATCH_TAG_ALIAS_AUTOREGISTRAR_HPP_INCLUDED
+#define CATCH_TAG_ALIAS_AUTOREGISTRAR_HPP_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
 
@@ -23,4 +17,4 @@ namespace Catch {
     namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
     CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
 
-#endif // TWOBLUECUBES_CATCH_TAG_ALIAS_AUTOREGISTRAR_H_INCLUDED
+#endif // CATCH_TAG_ALIAS_AUTOREGISTRAR_HPP_INCLUDED
diff --git a/src/catch2/catch_template_test_macros.hpp b/src/catch2/catch_template_test_macros.hpp
index 1babac40..4ae83a22 100644
--- a/src/catch2/catch_template_test_macros.hpp
+++ b/src/catch2/catch_template_test_macros.hpp
@@ -1,11 +1,5 @@
-/*
- *  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)
- */
-
-
-#ifndef TWOBLUECUBES_CATCH_TEMPLATE_TEST_MACROS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_TEMPLATE_TEST_MACROS_HPP_INCLUDED
+#ifndef CATCH_TEMPLATE_TEST_MACROS_HPP_INCLUDED
+#define CATCH_TEMPLATE_TEST_MACROS_HPP_INCLUDED
 
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/internal/catch_template_test_registry.hpp>
@@ -111,4 +105,4 @@
 #endif // end of user facing macro declarations
 
 
-#endif // TWOBLUECUBES_CATCH_TEMPLATE_TEST_MACROS_HPP_INCLUDED
+#endif // CATCH_TEMPLATE_TEST_MACROS_HPP_INCLUDED
diff --git a/src/catch2/catch_test_case_info.hpp b/src/catch2/catch_test_case_info.hpp
index 1d2c1b12..147829fb 100644
--- a/src/catch2/catch_test_case_info.hpp
+++ b/src/catch2/catch_test_case_info.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 29/10/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
-#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
+#ifndef CATCH_TEST_CASE_INFO_HPP_INCLUDED
+#define CATCH_TEST_CASE_INFO_HPP_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
 #include <catch2/internal/catch_noncopyable.hpp>
@@ -101,4 +94,4 @@ namespace Catch {
 #pragma clang diagnostic pop
 #endif
 
-#endif // TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
+#endif // CATCH_TEST_CASE_INFO_HPP_INCLUDED
diff --git a/src/catch2/catch_test_macros.hpp b/src/catch2/catch_test_macros.hpp
index 2514d200..a871c964 100644
--- a/src/catch2/catch_test_macros.hpp
+++ b/src/catch2/catch_test_macros.hpp
@@ -1,10 +1,5 @@
-/*
- *  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)
- */
-
-#ifndef TWOBLUECUBES_CATCH_TEST_MACROS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_TEST_MACROS_HPP_INCLUDED
+#ifndef CATCH_TEST_MACROS_HPP_INCLUDED
+#define CATCH_TEST_MACROS_HPP_INCLUDED
 
 #include <catch2/internal/catch_test_macro_impl.hpp>
 #include <catch2/catch_message.hpp>
@@ -203,4 +198,4 @@
 
 // end of user facing macros
 
-#endif // TWOBLUECUBES_CATCH_TEST_MACROS_HPP_INCLUDED
+#endif // CATCH_TEST_MACROS_HPP_INCLUDED
diff --git a/src/catch2/catch_test_spec.hpp b/src/catch2/catch_test_spec.hpp
index 7bb86512..523623f7 100644
--- a/src/catch2/catch_test_spec.hpp
+++ b/src/catch2/catch_test_spec.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 14/8/2012.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TEST_SPEC_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_TEST_SPEC_HPP_INCLUDED
+#ifndef CATCH_TEST_SPEC_HPP_INCLUDED
+#define CATCH_TEST_SPEC_HPP_INCLUDED
 
 #ifdef __clang__
 #pragma clang diagnostic push
@@ -85,4 +78,4 @@ namespace Catch {
 #pragma clang diagnostic pop
 #endif
 
-#endif // TWOBLUECUBES_CATCH_TEST_SPEC_HPP_INCLUDED
+#endif // CATCH_TEST_SPEC_HPP_INCLUDED
diff --git a/src/catch2/catch_timer.hpp b/src/catch2/catch_timer.hpp
index 74ab428e..0526598c 100644
--- a/src/catch2/catch_timer.hpp
+++ b/src/catch2/catch_timer.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 05/08/2013.
- *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
-#define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
+#ifndef CATCH_TIMER_HPP_INCLUDED
+#define CATCH_TIMER_HPP_INCLUDED
 
 #include <cstdint>
 
@@ -27,4 +20,4 @@ namespace Catch {
 
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
+#endif // CATCH_TIMER_HPP_INCLUDED
diff --git a/src/catch2/catch_tostring.hpp b/src/catch2/catch_tostring.hpp
index 2c803a49..957d5706 100644
--- a/src/catch2/catch_tostring.hpp
+++ b/src/catch2/catch_tostring.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 8/5/2012.
- *  Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED
-#define TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED
+#ifndef CATCH_TOSTRING_HPP_INCLUDED
+#define CATCH_TOSTRING_HPP_INCLUDED
 
 
 #include <vector>
@@ -647,4 +640,4 @@ namespace Catch { \
 #pragma warning(pop)
 #endif
 
-#endif // TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED
+#endif // CATCH_TOSTRING_HPP_INCLUDED
diff --git a/src/catch2/catch_totals.hpp b/src/catch2/catch_totals.hpp
index 56927283..e95163e2 100644
--- a/src/catch2/catch_totals.hpp
+++ b/src/catch2/catch_totals.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil Nash on 23/02/2012.
- *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED
+#ifndef CATCH_TOTALS_HPP_INCLUDED
+#define CATCH_TOTALS_HPP_INCLUDED
 
 #include <cstddef>
 
@@ -38,4 +31,4 @@ namespace Catch {
     };
 }
 
-#endif // TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED
+#endif // CATCH_TOTALS_HPP_INCLUDED
diff --git a/src/catch2/catch_version.hpp b/src/catch2/catch_version.hpp
index 018397f4..12f6bdc9 100644
--- a/src/catch2/catch_version.hpp
+++ b/src/catch2/catch_version.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 13/11/2012.
- *  Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_VERSION_H_INCLUDED
-#define TWOBLUECUBES_CATCH_VERSION_H_INCLUDED
+#ifndef CATCH_VERSION_HPP_INCLUDED
+#define CATCH_VERSION_HPP_INCLUDED
 
 #include <iosfwd>
 
@@ -36,4 +29,4 @@ namespace Catch {
     Version const& libraryVersion();
 }
 
-#endif // TWOBLUECUBES_CATCH_VERSION_H_INCLUDED
+#endif // CATCH_VERSION_HPP_INCLUDED
diff --git a/src/catch2/catch_version_macros.hpp b/src/catch2/catch_version_macros.hpp
index 5a9cc050..69f68518 100644
--- a/src/catch2/catch_version_macros.hpp
+++ b/src/catch2/catch_version_macros.hpp
@@ -1,13 +1,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)
- */
-
-#ifndef TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED
+#ifndef CATCH_VERSION_MACROS_HPP_INCLUDED
+#define CATCH_VERSION_MACROS_HPP_INCLUDED
 
 #define CATCH_VERSION_MAJOR 3
 #define CATCH_VERSION_MINOR 0
 #define CATCH_VERSION_PATCH 0
 
-#endif // TWOBLUECUBES_CATCH_VERSION_MACROS_HPP_INCLUDED
+#endif // CATCH_VERSION_MACROS_HPP_INCLUDED
diff --git a/src/catch2/generators/catch_generator_exception.hpp b/src/catch2/generators/catch_generator_exception.hpp
index ff84c4d8..3814d635 100644
--- a/src/catch2/generators/catch_generator_exception.hpp
+++ b/src/catch2/generators/catch_generator_exception.hpp
@@ -1,10 +1,5 @@
-/*
- *  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)
- */
-
-#ifndef TWOBLUECUBES_CATCH_GENERATOR_EXCEPTION_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_GENERATOR_EXCEPTION_HPP_INCLUDED
+#ifndef CATCH_GENERATOR_EXCEPTION_HPP_INCLUDED
+#define CATCH_GENERATOR_EXCEPTION_HPP_INCLUDED
 
 #include <exception>
 
@@ -26,4 +21,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_GENERATOR_EXCEPTION_HPP_INCLUDED
+#endif // CATCH_GENERATOR_EXCEPTION_HPP_INCLUDED
diff --git a/src/catch2/generators/catch_generators.hpp b/src/catch2/generators/catch_generators.hpp
index c08c811b..064479b6 100644
--- a/src/catch2/generators/catch_generators.hpp
+++ b/src/catch2/generators/catch_generators.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Phil Nash on 15/6/2018.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
+#ifndef CATCH_GENERATORS_HPP_INCLUDED
+#define CATCH_GENERATORS_HPP_INCLUDED
 
 #include <catch2/interfaces/catch_interfaces_generatortracker.hpp>
 #include <catch2/internal/catch_common.hpp>
@@ -214,4 +208,4 @@ namespace Detail {
                                  CATCH_INTERNAL_LINEINFO, \
                                  [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
 
-#endif // TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
+#endif // CATCH_GENERATORS_HPP_INCLUDED
diff --git a/src/catch2/generators/catch_generators_adapters.hpp b/src/catch2/generators/catch_generators_adapters.hpp
index d4ea46e3..11f26da3 100644
--- a/src/catch2/generators/catch_generators_adapters.hpp
+++ b/src/catch2/generators/catch_generators_adapters.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 23/2/2019.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_GENERATORS_GENERIC_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_GENERATORS_GENERIC_HPP_INCLUDED
+#ifndef CATCH_GENERATORS_ADAPTERS_HPP_INCLUDED
+#define CATCH_GENERATORS_ADAPTERS_HPP_INCLUDED
 
 #include <catch2/generators/catch_generators.hpp>
 #include <catch2/internal/catch_meta.hpp>
@@ -234,4 +228,4 @@ namespace Generators {
 } // namespace Catch
 
 
-#endif // TWOBLUECUBES_CATCH_GENERATORS_GENERIC_HPP_INCLUDED
+#endif // CATCH_GENERATORS_ADAPTERS_HPP_INCLUDED
diff --git a/src/catch2/generators/catch_generators_random.hpp b/src/catch2/generators/catch_generators_random.hpp
index eb6de023..1551b951 100644
--- a/src/catch2/generators/catch_generators_random.hpp
+++ b/src/catch2/generators/catch_generators_random.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 15/6/2018.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_GENERATORS_RANDOM_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_GENERATORS_RANDOM_HPP_INCLUDED
+#ifndef CATCH_GENERATORS_RANDOM_HPP_INCLUDED
+#define CATCH_GENERATORS_RANDOM_HPP_INCLUDED
 
 #include <catch2/internal/catch_context.hpp>
 #include <catch2/generators/catch_generators.hpp>
@@ -85,4 +79,4 @@ random(T a, T b) {
 } // namespace Catch
 
 
-#endif // TWOBLUECUBES_CATCH_GENERATORS_RANDOM_HPP_INCLUDED
+#endif // CATCH_GENERATORS_RANDOM_HPP_INCLUDED
diff --git a/src/catch2/generators/catch_generators_range.hpp b/src/catch2/generators/catch_generators_range.hpp
index ffb80377..64aa41c7 100644
--- a/src/catch2/generators/catch_generators_range.hpp
+++ b/src/catch2/generators/catch_generators_range.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 15/6/2018.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_GENERATORS_RANGE_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_GENERATORS_RANGE_HPP_INCLUDED
+#ifndef CATCH_GENERATORS_RANGE_HPP_INCLUDED
+#define CATCH_GENERATORS_RANGE_HPP_INCLUDED
 
 #include <catch2/generators/catch_generators.hpp>
 
@@ -106,4 +100,4 @@ GeneratorWrapper<ResultType> from_range(Container const& cnt) {
 } // namespace Catch
 
 
-#endif // TWOBLUECUBES_CATCH_GENERATORS_RANGE_HPP_INCLUDED
+#endif // CATCH_GENERATORS_RANGE_HPP_INCLUDED
diff --git a/src/catch2/interfaces/catch_interfaces_capture.hpp b/src/catch2/interfaces/catch_interfaces_capture.hpp
index 9a3e84f5..bfa12bde 100644
--- a/src/catch2/interfaces/catch_interfaces_capture.hpp
+++ b/src/catch2/interfaces/catch_interfaces_capture.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 07/01/2011.
- *  Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_INTERFACES_CAPTURE_H_INCLUDED
-#define TWOBLUECUBES_CATCH_INTERFACES_CAPTURE_H_INCLUDED
+#ifndef CATCH_INTERFACES_CAPTURE_HPP_INCLUDED
+#define CATCH_INTERFACES_CAPTURE_HPP_INCLUDED
 
 #include <string>
 #include <chrono>
@@ -93,4 +86,4 @@ namespace Catch {
     IResultCapture& getResultCapture();
 }
 
-#endif // TWOBLUECUBES_CATCH_INTERFACES_CAPTURE_H_INCLUDED
+#endif // CATCH_INTERFACES_CAPTURE_HPP_INCLUDED
diff --git a/src/catch2/interfaces/catch_interfaces_config.hpp b/src/catch2/interfaces/catch_interfaces_config.hpp
index f0f19167..16fa742e 100644
--- a/src/catch2/interfaces/catch_interfaces_config.hpp
+++ b/src/catch2/interfaces/catch_interfaces_config.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 05/06/2012.
- *  Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
-#define TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
+#ifndef CATCH_INTERFACES_CONFIG_HPP_INCLUDED
+#define CATCH_INTERFACES_CONFIG_HPP_INCLUDED
 
 #include <catch2/internal/catch_noncopyable.hpp>
 
@@ -85,4 +78,4 @@ namespace Catch {
     };
 }
 
-#endif // TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
+#endif // CATCH_INTERFACES_CONFIG_HPP_INCLUDED
diff --git a/src/catch2/interfaces/catch_interfaces_enum_values_registry.hpp b/src/catch2/interfaces/catch_interfaces_enum_values_registry.hpp
index 1a4fce26..ebd4f717 100644
--- a/src/catch2/interfaces/catch_interfaces_enum_values_registry.hpp
+++ b/src/catch2/interfaces/catch_interfaces_enum_values_registry.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 4/4/2019.
- *  Copyright 2019 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_INTERFACESENUMVALUESREGISTRY_H_INCLUDED
-#define TWOBLUECUBES_CATCH_INTERFACESENUMVALUESREGISTRY_H_INCLUDED
+#ifndef CATCH_INTERFACES_ENUM_VALUES_REGISTRY_HPP_INCLUDED
+#define CATCH_INTERFACES_ENUM_VALUES_REGISTRY_HPP_INCLUDED
 
 #include <catch2/internal/catch_stringref.hpp>
 
@@ -43,4 +36,4 @@ namespace Catch {
 
 } // Catch
 
-#endif //TWOBLUECUBES_CATCH_INTERFACESENUMVALUESREGISTRY_H_INCLUDED
+#endif // CATCH_INTERFACES_ENUM_VALUES_REGISTRY_HPP_INCLUDED
diff --git a/src/catch2/interfaces/catch_interfaces_exception.hpp b/src/catch2/interfaces/catch_interfaces_exception.hpp
index 31b6dc20..f6cb090d 100644
--- a/src/catch2/interfaces/catch_interfaces_exception.hpp
+++ b/src/catch2/interfaces/catch_interfaces_exception.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 20/04/2011.
- *  Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
-#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
+#ifndef CATCH_INTERFACES_EXCEPTION_HPP_INCLUDED
+#define CATCH_INTERFACES_EXCEPTION_HPP_INCLUDED
 
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
@@ -34,4 +27,4 @@ namespace Catch {
 
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
+#endif // CATCH_INTERFACES_EXCEPTION_HPP_INCLUDED
diff --git a/src/catch2/interfaces/catch_interfaces_generatortracker.hpp b/src/catch2/interfaces/catch_interfaces_generatortracker.hpp
index 88615ef5..6f22da4f 100644
--- a/src/catch2/interfaces/catch_interfaces_generatortracker.hpp
+++ b/src/catch2/interfaces/catch_interfaces_generatortracker.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil Nash on 26/6/2018.
- *
- *  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)
- */
-
-#ifndef TWOBLUECUBES_CATCH_INTERFACES_GENERATORTRACKER_INCLUDED
-#define TWOBLUECUBES_CATCH_INTERFACES_GENERATORTRACKER_INCLUDED
+#ifndef CATCH_INTERFACES_GENERATORTRACKER_HPP_INCLUDED
+#define CATCH_INTERFACES_GENERATORTRACKER_HPP_INCLUDED
 
 #include <catch2/internal/catch_unique_ptr.hpp>
 
@@ -42,4 +35,4 @@ namespace Catch {
 
 } // namespace Catch
 
-#endif //TWOBLUECUBES_CATCH_INTERFACES_GENERATORTRACKER_INCLUDED
+#endif // CATCH_INTERFACES_GENERATORTRACKER_HPP_INCLUDED
diff --git a/src/catch2/interfaces/catch_interfaces_registry_hub.hpp b/src/catch2/interfaces/catch_interfaces_registry_hub.hpp
index 14fa06a5..541e9939 100644
--- a/src/catch2/interfaces/catch_interfaces_registry_hub.hpp
+++ b/src/catch2/interfaces/catch_interfaces_registry_hub.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 5/8/2012.
- *  Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
-#define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
+#ifndef CATCH_INTERFACES_REGISTRY_HUB_HPP_INCLUDED
+#define CATCH_INTERFACES_REGISTRY_HUB_HPP_INCLUDED
 
 #include <catch2/internal/catch_unique_ptr.hpp>
 
@@ -60,4 +53,4 @@ namespace Catch {
 
 }
 
-#endif // TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
+#endif // CATCH_INTERFACES_REGISTRY_HUB_HPP_INCLUDED
diff --git a/src/catch2/interfaces/catch_interfaces_reporter.hpp b/src/catch2/interfaces/catch_interfaces_reporter.hpp
index 714166d0..00e9d771 100644
--- a/src/catch2/interfaces/catch_interfaces_reporter.hpp
+++ b/src/catch2/interfaces/catch_interfaces_reporter.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 31/12/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
-#define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
+#ifndef CATCH_INTERFACES_REPORTER_HPP_INCLUDED
+#define CATCH_INTERFACES_REPORTER_HPP_INCLUDED
 
 #include <catch2/catch_section_info.hpp>
 #include <catch2/internal/catch_common.hpp>
@@ -229,4 +222,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
+#endif // CATCH_INTERFACES_REPORTER_HPP_INCLUDED
diff --git a/src/catch2/interfaces/catch_interfaces_runner.hpp b/src/catch2/interfaces/catch_interfaces_runner.hpp
index a0deaf7e..c3953733 100644
--- a/src/catch2/interfaces/catch_interfaces_runner.hpp
+++ b/src/catch2/interfaces/catch_interfaces_runner.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 07/01/2011.
- *  Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED
-#define TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED
+#ifndef CATCH_INTERFACES_RUNNER_HPP_INCLUDED
+#define CATCH_INTERFACES_RUNNER_HPP_INCLUDED
 
 namespace Catch {
 
@@ -16,4 +9,4 @@ namespace Catch {
     };
 }
 
-#endif // TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED
+#endif // CATCH_INTERFACES_RUNNER_HPP_INCLUDED
diff --git a/src/catch2/interfaces/catch_interfaces_tag_alias_registry.hpp b/src/catch2/interfaces/catch_interfaces_tag_alias_registry.hpp
index 24bc535c..03a12305 100644
--- a/src/catch2/interfaces/catch_interfaces_tag_alias_registry.hpp
+++ b/src/catch2/interfaces/catch_interfaces_tag_alias_registry.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 27/6/2014.
- *  Copyright 2014 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_INTERFACES_TAG_ALIAS_REGISTRY_H_INCLUDED
-#define TWOBLUECUBES_CATCH_INTERFACES_TAG_ALIAS_REGISTRY_H_INCLUDED
+#ifndef CATCH_INTERFACES_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+#define CATCH_INTERFACES_TAG_ALIAS_REGISTRY_HPP_INCLUDED
 
 #include <string>
 
@@ -25,4 +18,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_INTERFACES_TAG_ALIAS_REGISTRY_H_INCLUDED
+#endif // CATCH_INTERFACES_TAG_ALIAS_REGISTRY_HPP_INCLUDED
diff --git a/src/catch2/interfaces/catch_interfaces_testcase.hpp b/src/catch2/interfaces/catch_interfaces_testcase.hpp
index aecc0871..e3e5a6be 100644
--- a/src/catch2/interfaces/catch_interfaces_testcase.hpp
+++ b/src/catch2/interfaces/catch_interfaces_testcase.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 07/01/2011.
- *  Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_INTERFACES_TESTCASE_H_INCLUDED
-#define TWOBLUECUBES_CATCH_INTERFACES_TESTCASE_H_INCLUDED
+#ifndef CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
+#define CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
 
 #include <vector>
 
@@ -38,4 +31,4 @@ namespace Catch {
 
 }
 
-#endif // TWOBLUECUBES_CATCH_INTERFACES_TESTCASE_H_INCLUDED
+#endif // CATCH_INTERFACES_TESTCASE_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_assertion_handler.hpp b/src/catch2/internal/catch_assertion_handler.hpp
index df687f5d..4014a326 100644
--- a/src/catch2/internal/catch_assertion_handler.hpp
+++ b/src/catch2/internal/catch_assertion_handler.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 8/8/2017.
- *  Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED
-#define TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED
+#ifndef CATCH_ASSERTION_HANDLER_HPP_INCLUDED
+#define CATCH_ASSERTION_HANDLER_HPP_INCLUDED
 
 #include <catch2/catch_assertion_info.hpp>
 #include <catch2/internal/catch_decomposer.hpp>
@@ -69,4 +62,4 @@ namespace Catch {
 
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_ASSERTIONHANDLER_H_INCLUDED
+#endif // CATCH_ASSERTION_HANDLER_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_commandline.hpp b/src/catch2/internal/catch_commandline.hpp
index f33b7e9e..87fe2db6 100644
--- a/src/catch2/internal/catch_commandline.hpp
+++ b/src/catch2/internal/catch_commandline.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 02/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED
+#ifndef CATCH_COMMANDLINE_HPP_INCLUDED
+#define CATCH_COMMANDLINE_HPP_INCLUDED
 
 #include <catch2/internal/catch_clara.hpp>
 
@@ -18,4 +11,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED
+#endif // CATCH_COMMANDLINE_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_common.hpp b/src/catch2/internal/catch_common.hpp
index cdbb7372..9388e5aa 100644
--- a/src/catch2/internal/catch_common.hpp
+++ b/src/catch2/internal/catch_common.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 29/10/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
-#define TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
+#ifndef CATCH_COMMON_HPP_INCLUDED
+#define CATCH_COMMON_HPP_INCLUDED
 
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_stringref.hpp>
@@ -69,5 +62,4 @@ namespace Catch {
 #define CATCH_INTERNAL_LINEINFO \
     ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
 
-#endif // TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
-
+#endif // CATCH_COMMON_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_compiler_capabilities.hpp b/src/catch2/internal/catch_compiler_capabilities.hpp
index d0e39229..80928aee 100644
--- a/src/catch2/internal/catch_compiler_capabilities.hpp
+++ b/src/catch2/internal/catch_compiler_capabilities.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 15/04/2013.
- *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
+#ifndef CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
+#define CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
 
 // Detect a number of compiler features - by compiler
 // The following features are defined:
@@ -377,5 +370,4 @@
 #define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
 #endif
 
-#endif // TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
-
+#endif // CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_console_colour.hpp b/src/catch2/internal/catch_console_colour.hpp
index 4f2c82e2..52e20efd 100644
--- a/src/catch2/internal/catch_console_colour.hpp
+++ b/src/catch2/internal/catch_console_colour.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 25/2/2012.
- *  Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
+#ifndef CATCH_CONSOLE_COLOUR_HPP_INCLUDED
+#define CATCH_CONSOLE_COLOUR_HPP_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
 
@@ -67,4 +60,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
+#endif // CATCH_CONSOLE_COLOUR_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_container_nonmembers.hpp b/src/catch2/internal/catch_container_nonmembers.hpp
index 6057452e..9e4a686b 100644
--- a/src/catch2/internal/catch_container_nonmembers.hpp
+++ b/src/catch2/internal/catch_container_nonmembers.hpp
@@ -1,8 +1,5 @@
-// 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)
-
-#ifndef TWOBLUECUBES_CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED
+#ifndef CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED
+#define CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED
 
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 
@@ -64,4 +61,4 @@ namespace Detail {
 
 
 
-#endif // TWOBLUECUBES_CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED
+#endif // CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_context.hpp b/src/catch2/internal/catch_context.hpp
index 9f446f24..093c4d8f 100644
--- a/src/catch2/internal/catch_context.hpp
+++ b/src/catch2/internal/catch_context.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 31/12/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_CONTEXT_H_INCLUDED
-#define TWOBLUECUBES_CATCH_CONTEXT_H_INCLUDED
+#ifndef CATCH_CONTEXT_HPP_INCLUDED
+#define CATCH_CONTEXT_HPP_INCLUDED
 
 namespace Catch {
 
@@ -56,4 +49,4 @@ namespace Catch {
     SimplePcg32& rng();
 }
 
-#endif // TWOBLUECUBES_CATCH_CONTEXT_H_INCLUDED
+#endif // CATCH_CONTEXT_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_debug_console.hpp b/src/catch2/internal/catch_debug_console.hpp
index 2c229a83..b358b68f 100644
--- a/src/catch2/internal/catch_debug_console.hpp
+++ b/src/catch2/internal/catch_debug_console.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Martin on 29/08/2017.
- *
- *  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)
- *
- */
-#ifndef TWOBLUECUBES_CATCH_DEBUG_CONSOLE_H_INCLUDED
-#define TWOBLUECUBES_CATCH_DEBUG_CONSOLE_H_INCLUDED
+#ifndef CATCH_DEBUG_CONSOLE_HPP_INCLUDED
+#define CATCH_DEBUG_CONSOLE_HPP_INCLUDED
 
 #include <string>
 
@@ -14,4 +7,4 @@ namespace Catch {
     void writeToDebugConsole( std::string const& text );
 }
 
-#endif // TWOBLUECUBES_CATCH_DEBUG_CONSOLE_H_INCLUDED
+#endif // CATCH_DEBUG_CONSOLE_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_debugger.hpp b/src/catch2/internal/catch_debugger.hpp
index c5f224dc..f20ab01b 100644
--- a/src/catch2/internal/catch_debugger.hpp
+++ b/src/catch2/internal/catch_debugger.hpp
@@ -1,13 +1,5 @@
-/*
- *  Created by Phil on 3/12/2013.
- *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- *
- */
-#ifndef TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED
-#define TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED
+#ifndef CATCH_DEBUGGER_HPP_INCLUDED
+#define CATCH_DEBUGGER_HPP_INCLUDED
 
 #include <catch2/internal/catch_platform.hpp>
 
@@ -62,4 +54,4 @@ namespace Catch {
     #endif
 #endif
 
-#endif // TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED
+#endif // CATCH_DEBUGGER_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_decomposer.hpp b/src/catch2/internal/catch_decomposer.hpp
index 94995bd2..383fc92d 100644
--- a/src/catch2/internal/catch_decomposer.hpp
+++ b/src/catch2/internal/catch_decomposer.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil Nash on 8/8/2017.
- *  Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED
-#define TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED
+#ifndef CATCH_DECOMPOSER_HPP_INCLUDED
+#define CATCH_DECOMPOSER_HPP_INCLUDED
 
 #include <catch2/catch_tostring.hpp>
 #include <catch2/internal/catch_stringref.hpp>
@@ -276,4 +269,4 @@ namespace Catch {
 #  pragma GCC diagnostic pop
 #endif
 
-#endif // TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED
+#endif // CATCH_DECOMPOSER_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_enforce.hpp b/src/catch2/internal/catch_enforce.hpp
index f9246653..a4c2a334 100644
--- a/src/catch2/internal/catch_enforce.hpp
+++ b/src/catch2/internal/catch_enforce.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 01/08/2017.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_ENFORCE_H_INCLUDED
-#define TWOBLUECUBES_CATCH_ENFORCE_H_INCLUDED
+#ifndef CATCH_ENFORCE_HPP_INCLUDED
+#define CATCH_ENFORCE_HPP_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
@@ -50,4 +44,4 @@ namespace Catch {
     do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
 
 
-#endif // TWOBLUECUBES_CATCH_ENFORCE_H_INCLUDED
+#endif // CATCH_ENFORCE_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_enum_values_registry.hpp b/src/catch2/internal/catch_enum_values_registry.hpp
index 3100136b..10aa0406 100644
--- a/src/catch2/internal/catch_enum_values_registry.hpp
+++ b/src/catch2/internal/catch_enum_values_registry.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 4/4/2019.
- *  Copyright 2019 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_ENUMVALUESREGISTRY_H_INCLUDED
-#define TWOBLUECUBES_CATCH_ENUMVALUESREGISTRY_H_INCLUDED
+#ifndef CATCH_ENUM_VALUES_REGISTRY_HPP_INCLUDED
+#define CATCH_ENUM_VALUES_REGISTRY_HPP_INCLUDED
 
 #include <catch2/interfaces/catch_interfaces_enum_values_registry.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
@@ -33,4 +26,4 @@ namespace Catch {
 
 } // Catch
 
-#endif //TWOBLUECUBES_CATCH_ENUMVALUESREGISTRY_H_INCLUDED
\ No newline at end of file
+#endif // CATCH_ENUM_VALUES_REGISTRY_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_errno_guard.hpp b/src/catch2/internal/catch_errno_guard.hpp
index 810ca99f..1ffa6bab 100644
--- a/src/catch2/internal/catch_errno_guard.hpp
+++ b/src/catch2/internal/catch_errno_guard.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 06/03/2017.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_ERRNO_GUARD_H_INCLUDED
-#define TWOBLUECUBES_CATCH_ERRNO_GUARD_H_INCLUDED
+#ifndef CATCH_ERRNO_GUARD_HPP_INCLUDED
+#define CATCH_ERRNO_GUARD_HPP_INCLUDED
 
 namespace Catch {
 
@@ -23,4 +17,4 @@ namespace Catch {
 
 }
 
-#endif // TWOBLUECUBES_CATCH_ERRNO_GUARD_H_INCLUDED
+#endif // CATCH_ERRNO_GUARD_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_exception_translator_registry.hpp b/src/catch2/internal/catch_exception_translator_registry.hpp
index 7c170c08..d08f6616 100644
--- a/src/catch2/internal/catch_exception_translator_registry.hpp
+++ b/src/catch2/internal/catch_exception_translator_registry.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 20/04/2011.
- *  Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
+#ifndef CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
+#define CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
 
 #include <catch2/interfaces/catch_interfaces_exception.hpp>
 #include <vector>
@@ -26,4 +19,4 @@ namespace Catch {
     };
 }
 
-#endif // TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
+#endif // CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_fatal_condition_handler.hpp b/src/catch2/internal/catch_fatal_condition_handler.hpp
index f9c94d85..639d01d1 100644
--- a/src/catch2/internal/catch_fatal_condition_handler.hpp
+++ b/src/catch2/internal/catch_fatal_condition_handler.hpp
@@ -1,13 +1,5 @@
-/*
- *  Created by Phil on 21/08/2014
- *  Copyright 2014 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- *
- */
-#ifndef TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
-#define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
+#ifndef CATCH_FATAL_CONDITION_HANDLER_HPP_INCLUDED
+#define CATCH_FATAL_CONDITION_HANDLER_HPP_INCLUDED
 
 #include <catch2/internal/catch_platform.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
@@ -64,4 +56,4 @@ namespace Catch {
 
 #endif
 
-#endif // TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
+#endif // CATCH_FATAL_CONDITION_HANDLER_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_leak_detector.hpp b/src/catch2/internal/catch_leak_detector.hpp
index 633457ac..2f292caa 100644
--- a/src/catch2/internal/catch_leak_detector.hpp
+++ b/src/catch2/internal/catch_leak_detector.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 12/07/2017.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_LEAK_DETECTOR_H_INCLUDED
-#define TWOBLUECUBES_CATCH_LEAK_DETECTOR_H_INCLUDED
+#ifndef CATCH_LEAK_DETECTOR_HPP_INCLUDED
+#define CATCH_LEAK_DETECTOR_HPP_INCLUDED
 
 namespace Catch {
 
@@ -15,4 +9,4 @@ namespace Catch {
     };
 
 }
-#endif // TWOBLUECUBES_CATCH_LEAK_DETECTOR_H_INCLUDED
+#endif // CATCH_LEAK_DETECTOR_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_list.hpp b/src/catch2/internal/catch_list.hpp
index 0c47d875..21cff7bd 100644
--- a/src/catch2/internal/catch_list.hpp
+++ b/src/catch2/internal/catch_list.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 5/11/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_LIST_H_INCLUDED
-#define TWOBLUECUBES_CATCH_LIST_H_INCLUDED
+#ifndef CATCH_LIST_HPP_INCLUDED
+#define CATCH_LIST_HPP_INCLUDED
 
 #include <catch2/internal/catch_stringref.hpp>
 
@@ -36,4 +29,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_LIST_H_INCLUDED
+#endif // CATCH_LIST_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_meta.hpp b/src/catch2/internal/catch_meta.hpp
index d1455e35..08f26674 100644
--- a/src/catch2/internal/catch_meta.hpp
+++ b/src/catch2/internal/catch_meta.hpp
@@ -1,13 +1,5 @@
-/*
- *  Created by Jozef on 02/12/2018.
- *  Copyright 2018 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-
-#ifndef TWOBLUECUBES_CATCH_META_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_META_HPP_INCLUDED
+#ifndef CATCH_META_HPP_INCLUDED
+#define CATCH_META_HPP_INCLUDED
 
 #include <type_traits>
 
@@ -46,4 +38,4 @@ namespace mpl_{
     struct na;
 }
 
-#endif // TWOBLUECUBES_CATCH_META_HPP_INCLUDED
+#endif // CATCH_META_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_option.hpp b/src/catch2/internal/catch_option.hpp
index d790b245..ae34c873 100644
--- a/src/catch2/internal/catch_option.hpp
+++ b/src/catch2/internal/catch_option.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 02/12/2012.
- *  Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED
+#ifndef CATCH_OPTION_HPP_INCLUDED
+#define CATCH_OPTION_HPP_INCLUDED
 
 namespace Catch {
 
@@ -70,4 +63,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED
+#endif // CATCH_OPTION_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_output_redirect.hpp b/src/catch2/internal/catch_output_redirect.hpp
index c3689ff7..ef4f2198 100644
--- a/src/catch2/internal/catch_output_redirect.hpp
+++ b/src/catch2/internal/catch_output_redirect.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 28/04/2018.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+#ifndef CATCH_OUTPUT_REDIRECT_HPP_INCLUDED
+#define CATCH_OUTPUT_REDIRECT_HPP_INCLUDED
 
 #include <catch2/internal/catch_platform.hpp>
 #include <catch2/internal/catch_stream.hpp>
@@ -113,4 +107,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+#endif // CATCH_OUTPUT_REDIRECT_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_platform.hpp b/src/catch2/internal/catch_platform.hpp
index 6d9b737e..9c295f2e 100644
--- a/src/catch2/internal/catch_platform.hpp
+++ b/src/catch2/internal/catch_platform.hpp
@@ -1,13 +1,5 @@
-/*
- *  Created by Phil on 16/8/2013.
- *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- *
- */
-#ifndef TWOBLUECUBES_CATCH_PLATFORM_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_PLATFORM_HPP_INCLUDED
+#ifndef CATCH_PLATFORM_HPP_INCLUDED
+#define CATCH_PLATFORM_HPP_INCLUDED
 
 #ifdef __APPLE__
 # include <TargetConditionals.h>
@@ -24,4 +16,4 @@
 #  define CATCH_PLATFORM_WINDOWS
 #endif
 
-#endif // TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
+#endif // CATCH_PLATFORM_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_polyfills.hpp b/src/catch2/internal/catch_polyfills.hpp
index ba4189ef..1e119b44 100644
--- a/src/catch2/internal/catch_polyfills.hpp
+++ b/src/catch2/internal/catch_polyfills.hpp
@@ -1,15 +1,9 @@
-/*
- *  Created by Martin on 17/11/2017.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_POLYFILLS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_POLYFILLS_HPP_INCLUDED
+#ifndef CATCH_POLYFILLS_HPP_INCLUDED
+#define CATCH_POLYFILLS_HPP_INCLUDED
 
 namespace Catch {
     bool isnan(float f);
     bool isnan(double d);
 }
 
-#endif // TWOBLUECUBES_CATCH_POLYFILLS_HPP_INCLUDED
+#endif // CATCH_POLYFILLS_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_preprocessor.hpp b/src/catch2/internal/catch_preprocessor.hpp
index a93d4f57..2b782a30 100644
--- a/src/catch2/internal/catch_preprocessor.hpp
+++ b/src/catch2/internal/catch_preprocessor.hpp
@@ -1,14 +1,5 @@
-
-/*
- *  Created by Jozef on 12/11/2018.
- *  Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-
-#ifndef TWOBLUECUBES_CATCH_PREPROCESSOR_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_PREPROCESSOR_HPP_INCLUDED
+#ifndef CATCH_PREPROCESSOR_HPP_INCLUDED
+#define CATCH_PREPROCESSOR_HPP_INCLUDED
 
 
 #if defined(__GNUC__)
@@ -241,4 +232,4 @@
 #define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
 #endif
 
-#endif // TWOBLUECUBES_CATCH_PREPROCESSOR_HPP_INCLUDED
+#endif // CATCH_PREPROCESSOR_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_random_number_generator.hpp b/src/catch2/internal/catch_random_number_generator.hpp
index 79d62794..b5922130 100644
--- a/src/catch2/internal/catch_random_number_generator.hpp
+++ b/src/catch2/internal/catch_random_number_generator.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 30/08/2017.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_RANDOM_NUMBER_GENERATOR_H_INCLUDED
-#define TWOBLUECUBES_CATCH_RANDOM_NUMBER_GENERATOR_H_INCLUDED
+#ifndef CATCH_RANDOM_NUMBER_GENERATOR_HPP_INCLUDED
+#define CATCH_RANDOM_NUMBER_GENERATOR_HPP_INCLUDED
 
 #include <cstdint>
 
@@ -55,4 +49,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_RANDOM_NUMBER_GENERATOR_H_INCLUDED
+#endif // CATCH_RANDOM_NUMBER_GENERATOR_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_reporter_registry.hpp b/src/catch2/internal/catch_reporter_registry.hpp
index 7a490a47..b64aff80 100644
--- a/src/catch2/internal/catch_reporter_registry.hpp
+++ b/src/catch2/internal/catch_reporter_registry.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 29/10/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_REPORTER_REGISTRY_H_INCLUDED
-#define TWOBLUECUBES_CATCH_REPORTER_REGISTRY_H_INCLUDED
+#ifndef CATCH_REPORTER_REGISTRY_HPP_INCLUDED
+#define CATCH_REPORTER_REGISTRY_HPP_INCLUDED
 
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter_registry.hpp>
@@ -35,4 +28,4 @@ namespace Catch {
     };
 }
 
-#endif // TWOBLUECUBES_CATCH_REPORTER_REGISTRY_H_INCLUDED
+#endif // CATCH_REPORTER_REGISTRY_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_result_type.hpp b/src/catch2/internal/catch_result_type.hpp
index 000b4f3d..8189a3fd 100644
--- a/src/catch2/internal/catch_result_type.hpp
+++ b/src/catch2/internal/catch_result_type.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 07/01/2011.
- *  Copyright 2011 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_RESULT_TYPE_H_INCLUDED
-#define TWOBLUECUBES_CATCH_RESULT_TYPE_H_INCLUDED
+#ifndef CATCH_RESULT_TYPE_HPP_INCLUDED
+#define CATCH_RESULT_TYPE_HPP_INCLUDED
 
 namespace Catch {
 
@@ -52,4 +45,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_RESULT_TYPE_H_INCLUDED
+#endif // CATCH_RESULT_TYPE_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_run_context.hpp b/src/catch2/internal/catch_run_context.hpp
index 99a945c1..32ae4a84 100644
--- a/src/catch2/internal/catch_run_context.hpp
+++ b/src/catch2/internal/catch_run_context.hpp
@@ -1,12 +1,5 @@
- /*
- *  Created by Phil on 22/10/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
+#ifndef CATCH_RUN_CONTEXT_HPP_INCLUDED
+#define CATCH_RUN_CONTEXT_HPP_INCLUDED
 
 #include <catch2/interfaces/catch_interfaces_runner.hpp>
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
@@ -148,4 +141,4 @@ namespace Catch {
     unsigned int rngSeed();
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
+#endif // CATCH_RUN_CONTEXT_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_section.hpp b/src/catch2/internal/catch_section.hpp
index fa0a64ae..782dad4f 100644
--- a/src/catch2/internal/catch_section.hpp
+++ b/src/catch2/internal/catch_section.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 03/12/2013.
- *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
-#define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
+#ifndef CATCH_SECTION_HPP_INCLUDED
+#define CATCH_SECTION_HPP_INCLUDED
 
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_noncopyable.hpp>
@@ -48,4 +41,4 @@ namespace Catch {
     if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
     CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
 
-#endif // TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
+#endif // CATCH_SECTION_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_singletons.hpp b/src/catch2/internal/catch_singletons.hpp
index fbc4b32c..6e6b3218 100644
--- a/src/catch2/internal/catch_singletons.hpp
+++ b/src/catch2/internal/catch_singletons.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Phil Nash on 15/6/2018.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_SINGLETONS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_SINGLETONS_HPP_INCLUDED
+#ifndef CATCH_SINGLETONS_HPP_INCLUDED
+#define CATCH_SINGLETONS_HPP_INCLUDED
 
 namespace Catch {
 
@@ -41,4 +35,4 @@ namespace Catch {
 
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_SINGLETONS_HPP_INCLUDED
+#endif // CATCH_SINGLETONS_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_startup_exception_registry.hpp b/src/catch2/internal/catch_startup_exception_registry.hpp
index 366312ad..c0503fc9 100644
--- a/src/catch2/internal/catch_startup_exception_registry.hpp
+++ b/src/catch2/internal/catch_startup_exception_registry.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Martin on 04/06/2017.
- *  Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_STARTUP_EXCEPTION_REGISTRY_H_INCLUDED
-#define TWOBLUECUBES_CATCH_STARTUP_EXCEPTION_REGISTRY_H_INCLUDED
+#ifndef CATCH_STARTUP_EXCEPTION_REGISTRY_HPP_INCLUDED
+#define CATCH_STARTUP_EXCEPTION_REGISTRY_HPP_INCLUDED
 
 
 #include <vector>
@@ -26,4 +19,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_STARTUP_EXCEPTION_REGISTRY_H_INCLUDED
+#endif // CATCH_STARTUP_EXCEPTION_REGISTRY_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_stream.hpp b/src/catch2/internal/catch_stream.hpp
index 98788fea..a6658b04 100644
--- a/src/catch2/internal/catch_stream.hpp
+++ b/src/catch2/internal/catch_stream.hpp
@@ -1,13 +1,5 @@
-/*
- *  Created by Phil on 2/12/2013.
- *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- *
- */
-#ifndef TWOBLUECUBES_CATCH_STREAM_H_INCLUDED
-#define TWOBLUECUBES_CATCH_STREAM_H_INCLUDED
+#ifndef CATCH_STREAM_HPP_INCLUDED
+#define CATCH_STREAM_HPP_INCLUDED
 
 #include <catch2/internal/catch_noncopyable.hpp>
 
@@ -67,4 +59,4 @@ namespace Catch {
     };
 }
 
-#endif // TWOBLUECUBES_CATCH_STREAM_H_INCLUDED
+#endif // CATCH_STREAM_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_string_manip.hpp b/src/catch2/internal/catch_string_manip.hpp
index 8570a8c0..e302344b 100644
--- a/src/catch2/internal/catch_string_manip.hpp
+++ b/src/catch2/internal/catch_string_manip.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 25/07/2017.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_STRING_MANIP_H_INCLUDED
-#define TWOBLUECUBES_CATCH_STRING_MANIP_H_INCLUDED
+#ifndef CATCH_STRING_MANIP_HPP_INCLUDED
+#define CATCH_STRING_MANIP_HPP_INCLUDED
 
 #include <catch2/internal/catch_stringref.hpp>
 
@@ -41,5 +35,4 @@ namespace Catch {
     };
 }
 
-#endif // TWOBLUECUBES_CATCH_STRING_MANIP_H_INCLUDED
-
+#endif // CATCH_STRING_MANIP_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_stringref.hpp b/src/catch2/internal/catch_stringref.hpp
index 773d6d33..5f1b6ca1 100644
--- a/src/catch2/internal/catch_stringref.hpp
+++ b/src/catch2/internal/catch_stringref.hpp
@@ -1,11 +1,5 @@
-/*
- *  Copyright 2016 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef CATCH_STRINGREF_H_INCLUDED
-#define CATCH_STRINGREF_H_INCLUDED
+#ifndef CATCH_STRINGREF_HPP_INCLUDED
+#define CATCH_STRINGREF_HPP_INCLUDED
 
 #include <cstddef>
 #include <string>
@@ -114,4 +108,4 @@ constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) n
     return Catch::StringRef( rawChars, size );
 }
 
-#endif // CATCH_STRINGREF_H_INCLUDED
+#endif // CATCH_STRINGREF_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_tag_alias_registry.hpp b/src/catch2/internal/catch_tag_alias_registry.hpp
index c76c8c1c..b656912b 100644
--- a/src/catch2/internal/catch_tag_alias_registry.hpp
+++ b/src/catch2/internal/catch_tag_alias_registry.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 27/6/2014.
- *  Copyright 2014 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_H_INCLUDED
-#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_H_INCLUDED
+#ifndef CATCH_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+#define CATCH_TAG_ALIAS_REGISTRY_HPP_INCLUDED
 
 #include <catch2/interfaces/catch_interfaces_tag_alias_registry.hpp>
 #include <catch2/catch_tag_alias.hpp>
@@ -29,4 +22,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_H_INCLUDED
+#endif // CATCH_TAG_ALIAS_REGISTRY_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_template_test_registry.hpp b/src/catch2/internal/catch_template_test_registry.hpp
index b716c5f7..8a78a9c4 100644
--- a/src/catch2/internal/catch_template_test_registry.hpp
+++ b/src/catch2/internal/catch_template_test_registry.hpp
@@ -1,9 +1,5 @@
-/*
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TEMPLATE_TEST_REGISTRY_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_TEMPLATE_TEST_REGISTRY_HPP_INCLUDED
+#ifndef CATCH_TEMPLATE_TEST_REGISTRY_HPP_INCLUDED
+#define CATCH_TEMPLATE_TEST_REGISTRY_HPP_INCLUDED
 
 #include <catch2/internal/catch_test_registry.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
@@ -325,4 +321,4 @@
         INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, TmplList )
 
 
-#endif // TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
+#endif // CATCH_TEMPLATE_TEST_REGISTRY_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_test_case_registry_impl.hpp b/src/catch2/internal/catch_test_case_registry_impl.hpp
index c06954b7..fddbdf81 100644
--- a/src/catch2/internal/catch_test_case_registry_impl.hpp
+++ b/src/catch2/internal/catch_test_case_registry_impl.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 7/1/2011
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
+#ifndef CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
+#define CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
 
 #include <catch2/internal/catch_test_registry.hpp>
 #include <catch2/interfaces/catch_interfaces_config.hpp>
@@ -72,4 +65,4 @@ namespace Catch {
 } // end namespace Catch
 
 
-#endif // TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
+#endif // CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_test_case_tracker.hpp b/src/catch2/internal/catch_test_case_tracker.hpp
index cfcb2309..404b160e 100644
--- a/src/catch2/internal/catch_test_case_tracker.hpp
+++ b/src/catch2/internal/catch_test_case_tracker.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil Nash on 23/7/2013
- *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
+#ifndef CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
+#define CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
 
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_common.hpp>
@@ -183,4 +176,4 @@ using TestCaseTracking::SectionTracker;
 
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
+#endif // CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_test_macro_impl.hpp b/src/catch2/internal/catch_test_macro_impl.hpp
index 07d0a7d8..e098eaef 100644
--- a/src/catch2/internal/catch_test_macro_impl.hpp
+++ b/src/catch2/internal/catch_test_macro_impl.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 18/10/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
+#ifndef CATCH_TEST_MACRO_IMPL_HPP_INCLUDED
+#define CATCH_TEST_MACRO_IMPL_HPP_INCLUDED
 
 #include <catch2/internal/catch_assertion_handler.hpp>
 #include <catch2/interfaces/catch_interfaces_capture.hpp>
@@ -141,4 +134,4 @@
 
 #endif // CATCH_CONFIG_DISABLE
 
-#endif // TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
+#endif // CATCH_TEST_MACRO_IMPL_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_test_registry.hpp b/src/catch2/internal/catch_test_registry.hpp
index f9dc6255..3a9b03fd 100644
--- a/src/catch2/internal/catch_test_registry.hpp
+++ b/src/catch2/internal/catch_test_registry.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 18/10/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
+#ifndef CATCH_TEST_REGISTRY_HPP_INCLUDED
+#define CATCH_TEST_REGISTRY_HPP_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
 #include <catch2/internal/catch_noncopyable.hpp>
@@ -114,4 +107,4 @@ struct AutoReg : Detail::NonCopyable {
         } while(false)
 
 
-#endif // TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
+#endif // CATCH_TEST_REGISTRY_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_test_spec_parser.hpp b/src/catch2/internal/catch_test_spec_parser.hpp
index c070ffc1..66b929a3 100644
--- a/src/catch2/internal/catch_test_spec_parser.hpp
+++ b/src/catch2/internal/catch_test_spec_parser.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 15/5/2013.
- *  Copyright 2014 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TEST_SPEC_PARSER_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_TEST_SPEC_PARSER_HPP_INCLUDED
+#ifndef CATCH_TEST_SPEC_PARSER_HPP_INCLUDED
+#define CATCH_TEST_SPEC_PARSER_HPP_INCLUDED
 
 #ifdef __clang__
 #pragma clang diagnostic push
@@ -79,4 +72,4 @@ namespace Catch {
 #pragma clang diagnostic pop
 #endif
 
-#endif // TWOBLUECUBES_CATCH_TEST_SPEC_PARSER_HPP_INCLUDED
\ No newline at end of file
+#endif // CATCH_TEST_SPEC_PARSER_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_textflow.hpp b/src/catch2/internal/catch_textflow.hpp
index 27f5184b..ec71a1f3 100644
--- a/src/catch2/internal/catch_textflow.hpp
+++ b/src/catch2/internal/catch_textflow.hpp
@@ -1,5 +1,5 @@
-#ifndef CATCH_CLARA_TEXTFLOW_HPP_INCLUDED
-#define CATCH_CLARA_TEXTFLOW_HPP_INCLUDED
+#ifndef CATCH_TEXTFLOW_HPP_INCLUDED
+#define CATCH_TEXTFLOW_HPP_INCLUDED
 
 #include <cassert>
 #include <catch2/internal/catch_console_width.hpp>
@@ -141,4 +141,4 @@ namespace Catch {
 
     } // namespace TextFlow
 } // namespace Catch
-#endif // CATCH_CLARA_TEXTFLOW_HPP_INCLUDED
+#endif // CATCH_TEXTFLOW_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_to_string.hpp b/src/catch2/internal/catch_to_string.hpp
index 986b3ab8..d5e272df 100644
--- a/src/catch2/internal/catch_to_string.hpp
+++ b/src/catch2/internal/catch_to_string.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 9/5/2018.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_TO_STRING_H_INCLUDED
-#define TWOBLUECUBES_CATCH_TO_STRING_H_INCLUDED
+#ifndef CATCH_TO_STRING_HPP_INCLUDED
+#define CATCH_TO_STRING_HPP_INCLUDED
 
 #include <string>
 
@@ -25,4 +19,4 @@ namespace Catch {
     }
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_TO_STRING_H_INCLUDED
+#endif // CATCH_TO_STRING_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_uncaught_exceptions.hpp b/src/catch2/internal/catch_uncaught_exceptions.hpp
index c68d680c..e2976a36 100644
--- a/src/catch2/internal/catch_uncaught_exceptions.hpp
+++ b/src/catch2/internal/catch_uncaught_exceptions.hpp
@@ -1,15 +1,8 @@
-/*
- *  Created by Josh on 1/2/2018.
- *  Copyright 2018 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_UNCAUGHT_EXCEPTIONS_H_INCLUDED
-#define TWOBLUECUBES_CATCH_UNCAUGHT_EXCEPTIONS_H_INCLUDED
+#ifndef CATCH_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
+#define CATCH_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
 
 namespace Catch {
     bool uncaught_exceptions();
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_UNCAUGHT_EXCEPTIONS_H_INCLUDED
+#endif // CATCH_UNCAUGHT_EXCEPTIONS_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_wildcard_pattern.hpp b/src/catch2/internal/catch_wildcard_pattern.hpp
index 749f62da..2a288be3 100644
--- a/src/catch2/internal/catch_wildcard_pattern.hpp
+++ b/src/catch2/internal/catch_wildcard_pattern.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 13/7/2015.
- *  Copyright 2015 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_WILDCARD_PATTERN_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_WILDCARD_PATTERN_HPP_INCLUDED
+#ifndef CATCH_WILDCARD_PATTERN_HPP_INCLUDED
+#define CATCH_WILDCARD_PATTERN_HPP_INCLUDED
 
 #include <catch2/internal/catch_case_sensitive.hpp>
 
@@ -36,4 +29,4 @@ namespace Catch
     };
 }
 
-#endif // TWOBLUECUBES_CATCH_WILDCARD_PATTERN_HPP_INCLUDED
+#endif // CATCH_WILDCARD_PATTERN_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_windows_h_proxy.hpp b/src/catch2/internal/catch_windows_h_proxy.hpp
index 079ebef0..1bd59c8e 100644
--- a/src/catch2/internal/catch_windows_h_proxy.hpp
+++ b/src/catch2/internal/catch_windows_h_proxy.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Martin on 16/01/2017.
- *
- *  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)
- */
-
-#ifndef TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED
-#define TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED
+#ifndef CATCH_WINDOWS_H_PROXY_HPP_INCLUDED
+#define CATCH_WINDOWS_H_PROXY_HPP_INCLUDED
 
 #include <catch2/internal/catch_platform.hpp>
 
@@ -36,4 +29,4 @@
 
 #endif // defined(CATCH_PLATFORM_WINDOWS)
 
-#endif // TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED
+#endif // CATCH_WINDOWS_H_PROXY_HPP_INCLUDED
diff --git a/src/catch2/internal/catch_xmlwriter.hpp b/src/catch2/internal/catch_xmlwriter.hpp
index 56de2e43..9d388e67 100644
--- a/src/catch2/internal/catch_xmlwriter.hpp
+++ b/src/catch2/internal/catch_xmlwriter.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 09/12/2010.
- *  Copyright 2010 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED
+#ifndef CATCH_XMLWRITER_HPP_INCLUDED
+#define CATCH_XMLWRITER_HPP_INCLUDED
 
 #include <catch2/internal/catch_stream.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
@@ -120,4 +113,4 @@ namespace Catch {
 
 }
 
-#endif // TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED
+#endif // CATCH_XMLWRITER_HPP_INCLUDED
diff --git a/src/catch2/matchers/catch_matchers.hpp b/src/catch2/matchers/catch_matchers.hpp
index 0d093e0c..87a85520 100644
--- a/src/catch2/matchers/catch_matchers.hpp
+++ b/src/catch2/matchers/catch_matchers.hpp
@@ -1,9 +1,5 @@
-/*
- * 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)
- */
-#ifndef TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
+#ifndef CATCH_MATCHERS_HPP_INCLUDED
+#define CATCH_MATCHERS_HPP_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
 #include <catch2/matchers/internal/catch_matchers_impl.hpp>
@@ -243,4 +239,4 @@ namespace Matchers {
 
 #endif // end of user facing macro declarations
 
-#endif // TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
+#endif // CATCH_MATCHERS_HPP_INCLUDED
diff --git a/src/catch2/matchers/catch_matchers_container_properties.hpp b/src/catch2/matchers/catch_matchers_container_properties.hpp
index c1047717..92eab293 100644
--- a/src/catch2/matchers/catch_matchers_container_properties.hpp
+++ b/src/catch2/matchers/catch_matchers_container_properties.hpp
@@ -1,8 +1,5 @@
-// 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)
-
-#ifndef TWOBLUECUBES_CATCH_MATCHERS_CONTAINER_PROPERTIES_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_MATCHERS_CONTAINER_PROPERTIES_HPP_INCLUDED
+#ifndef CATCH_MATCHERS_CONTAINER_PROPERTIES_HPP_INCLUDED
+#define CATCH_MATCHERS_CONTAINER_PROPERTIES_HPP_INCLUDED
 
 #include <catch2/matchers/catch_matchers_templated.hpp>
 #include <catch2/internal/catch_container_nonmembers.hpp>
@@ -83,4 +80,4 @@ namespace Catch {
     } // end namespace Matchers
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_MATCHERS_CONTAINER_PROPERTIES_HPP_INCLUDED
+#endif // CATCH_MATCHERS_CONTAINER_PROPERTIES_HPP_INCLUDED
diff --git a/src/catch2/matchers/catch_matchers_contains.hpp b/src/catch2/matchers/catch_matchers_contains.hpp
index 6b10a392..85d43738 100644
--- a/src/catch2/matchers/catch_matchers_contains.hpp
+++ b/src/catch2/matchers/catch_matchers_contains.hpp
@@ -1,9 +1,5 @@
-/*
- * 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)
- */
-#ifndef TWOBLUECUBES_CATCH_MATCHERS_CONTAINS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_MATCHERS_CONTAINS_HPP_INCLUDED
+#ifndef CATCH_MATCHERS_CONTAINS_HPP_INCLUDED
+#define CATCH_MATCHERS_CONTAINS_HPP_INCLUDED
 
 #include <catch2/matchers/catch_matchers_templated.hpp>
 
@@ -99,4 +95,4 @@ namespace Catch {
     }
 }
 
-#endif // TWOBLUECUBES_CATCH_MATCHERS_CONTAINS_HPP_INCLUDED
+#endif // CATCH_MATCHERS_CONTAINS_HPP_INCLUDED
diff --git a/src/catch2/matchers/catch_matchers_exception.hpp b/src/catch2/matchers/catch_matchers_exception.hpp
index 5688218f..aa751d14 100644
--- a/src/catch2/matchers/catch_matchers_exception.hpp
+++ b/src/catch2/matchers/catch_matchers_exception.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin Hořeňovský on 13/10/2019.
- *
- * 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)
- */
-#ifndef TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
+#ifndef CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
+#define CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
 
 #include <catch2/matchers/catch_matchers.hpp>
 
@@ -31,4 +25,4 @@ ExceptionMessageMatcher Message(std::string const& message);
 } // namespace Matchers
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
+#endif // CATCH_MATCHERS_EXCEPTION_HPP_INCLUDED
diff --git a/src/catch2/matchers/catch_matchers_floating.hpp b/src/catch2/matchers/catch_matchers_floating.hpp
index 221fa42d..ee278516 100644
--- a/src/catch2/matchers/catch_matchers_floating.hpp
+++ b/src/catch2/matchers/catch_matchers_floating.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 07/11/2017.
- *
- * 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)
- */
-#ifndef TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED
-#define TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED
+#ifndef CATCH_MATCHERS_FLOATING_HPP_INCLUDED
+#define CATCH_MATCHERS_FLOATING_HPP_INCLUDED
 
 #include <catch2/matchers/catch_matchers.hpp>
 
@@ -69,4 +63,4 @@ namespace Matchers {
 } // namespace Matchers
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_MATCHERS_FLOATING_H_INCLUDED
+#endif // CATCH_MATCHERS_FLOATING_HPP_INCLUDED
diff --git a/src/catch2/matchers/catch_matchers_predicate.hpp b/src/catch2/matchers/catch_matchers_predicate.hpp
index a0b736cb..8ad80f71 100644
--- a/src/catch2/matchers/catch_matchers_predicate.hpp
+++ b/src/catch2/matchers/catch_matchers_predicate.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin Hořeňovský on 03/04/2017.
- *
- * 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)
- */
-#ifndef TWOBLUECUBES_CATCH_MATCHERS_GENERIC_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_MATCHERS_GENERIC_HPP_INCLUDED
+#ifndef CATCH_MATCHERS_PREDICATE_HPP_INCLUDED
+#define CATCH_MATCHERS_PREDICATE_HPP_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
@@ -56,4 +50,4 @@ public:
 } // namespace Matchers
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_MATCHERS_GENERIC_HPP_INCLUDED
+#endif // CATCH_MATCHERS_PREDICATE_HPP_INCLUDED
diff --git a/src/catch2/matchers/catch_matchers_string.hpp b/src/catch2/matchers/catch_matchers_string.hpp
index fc074842..44cf37bb 100644
--- a/src/catch2/matchers/catch_matchers_string.hpp
+++ b/src/catch2/matchers/catch_matchers_string.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil Nash on 08/02/2017.
- *  Copyright (c) 2017 Two Blue Cubes Ltd. All rights reserved.
- *
- * 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)
- */
-#ifndef TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED
-#define TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED
+#ifndef CATCH_MATCHERS_STRING_HPP_INCLUDED
+#define CATCH_MATCHERS_STRING_HPP_INCLUDED
 
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/internal/catch_case_sensitive.hpp>
@@ -75,4 +68,4 @@ namespace Matchers {
 } // namespace Matchers
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED
+#endif // CATCH_MATCHERS_STRING_HPP_INCLUDED
diff --git a/src/catch2/matchers/catch_matchers_templated.hpp b/src/catch2/matchers/catch_matchers_templated.hpp
index c6476595..ecfb51bd 100644
--- a/src/catch2/matchers/catch_matchers_templated.hpp
+++ b/src/catch2/matchers/catch_matchers_templated.hpp
@@ -1,8 +1,5 @@
-// 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)
-
-#ifndef TWOBLUECUBES_CATCH_MATCHERS_TEMPLATED_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_MATCHERS_TEMPLATED_HPP_INCLUDED
+#ifndef CATCH_MATCHERS_TEMPLATED_HPP_INCLUDED
+#define CATCH_MATCHERS_TEMPLATED_HPP_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
@@ -291,4 +288,4 @@ namespace Matchers {
 } // namespace Matchers
 } // namespace Catch
 
-#endif //TWOBLUECUBES_CATCH_MATCHERS_TEMPLATES_HPP_INCLUDED
+#endif // CATCH_MATCHERS_TEMPLATED_HPP_INCLUDED
diff --git a/src/catch2/matchers/catch_matchers_vector.hpp b/src/catch2/matchers/catch_matchers_vector.hpp
index 5b1d8b98..e46665cb 100644
--- a/src/catch2/matchers/catch_matchers_vector.hpp
+++ b/src/catch2/matchers/catch_matchers_vector.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil Nash on 21/02/2017.
- *  Copyright (c) 2017 Two Blue Cubes Ltd. All rights reserved.
- *
- * 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)
- */
-#ifndef TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
-#define TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
+#ifndef CATCH_MATCHERS_VECTOR_HPP_INCLUDED
+#define CATCH_MATCHERS_VECTOR_HPP_INCLUDED
 
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/catch_approx.hpp>
@@ -191,4 +184,4 @@ namespace Matchers {
 } // namespace Matchers
 } // namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
+#endif // CATCH_MATCHERS_VECTOR_HPP_INCLUDED
diff --git a/src/catch2/matchers/internal/catch_matchers_impl.hpp b/src/catch2/matchers/internal/catch_matchers_impl.hpp
index fe548265..3e135445 100644
--- a/src/catch2/matchers/internal/catch_matchers_impl.hpp
+++ b/src/catch2/matchers/internal/catch_matchers_impl.hpp
@@ -1,9 +1,5 @@
-/*
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_CAPTURE_MATCHERS_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_CAPTURE_MATCHERS_HPP_INCLUDED
+#ifndef CATCH_MATCHERS_IMPL_HPP_INCLUDED
+#define CATCH_MATCHERS_IMPL_HPP_INCLUDED
 
 #include <catch2/internal/catch_test_macro_impl.hpp>
 #include <catch2/internal/catch_stringref.hpp>
@@ -82,4 +78,4 @@ namespace Catch {
     } while( false )
 
 
-#endif // TWOBLUECUBES_CATCH_CAPTURE_MATCHERS_HPP_INCLUDED
+#endif // CATCH_MATCHERS_IMPL_HPP_INCLUDED
diff --git a/src/catch2/reporters/catch_reporter_automake.hpp b/src/catch2/reporters/catch_reporter_automake.hpp
index 5eec5218..917ae18d 100644
--- a/src/catch2/reporters/catch_reporter_automake.hpp
+++ b/src/catch2/reporters/catch_reporter_automake.hpp
@@ -1,9 +1,5 @@
-/*
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
+#ifndef CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
+#define CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
 
 #include <catch2/reporters/catch_reporter_streaming_base.hpp>
 
@@ -33,4 +29,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
+#endif // CATCH_REPORTER_AUTOMAKE_HPP_INCLUDED
diff --git a/src/catch2/reporters/catch_reporter_compact.hpp b/src/catch2/reporters/catch_reporter_compact.hpp
index aaf974ce..1d497735 100644
--- a/src/catch2/reporters/catch_reporter_compact.hpp
+++ b/src/catch2/reporters/catch_reporter_compact.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Martin Moene on 2013-12-05.
- *  Copyright 2012 Martin Moene. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_REPORTER_COMPACT_H_INCLUDED
-#define TWOBLUECUBES_CATCH_REPORTER_COMPACT_H_INCLUDED
+#ifndef CATCH_REPORTER_COMPACT_HPP_INCLUDED
+#define CATCH_REPORTER_COMPACT_HPP_INCLUDED
 
 
 #include <catch2/reporters/catch_reporter_streaming_base.hpp>
@@ -36,4 +29,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_REPORTER_COMPACT_H_INCLUDED
+#endif // CATCH_REPORTER_COMPACT_HPP_INCLUDED
diff --git a/src/catch2/reporters/catch_reporter_console.hpp b/src/catch2/reporters/catch_reporter_console.hpp
index 908fd126..1d3c74e6 100644
--- a/src/catch2/reporters/catch_reporter_console.hpp
+++ b/src/catch2/reporters/catch_reporter_console.hpp
@@ -1,12 +1,5 @@
-/*
- *  Created by Phil on 5/12/2012.
- *  Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_REPORTER_CONSOLE_H_INCLUDED
-#define TWOBLUECUBES_CATCH_REPORTER_CONSOLE_H_INCLUDED
+#ifndef CATCH_REPORTER_CONSOLE_HPP_INCLUDED
+#define CATCH_REPORTER_CONSOLE_HPP_INCLUDED
 
 #include <catch2/reporters/catch_reporter_streaming_base.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
@@ -85,4 +78,4 @@ namespace Catch {
 #pragma warning(pop)
 #endif
 
-#endif // TWOBLUECUBES_CATCH_REPORTER_CONSOLE_H_INCLUDED
\ No newline at end of file
+#endif // CATCH_REPORTER_CONSOLE_HPP_INCLUDED
diff --git a/src/catch2/reporters/catch_reporter_junit.hpp b/src/catch2/reporters/catch_reporter_junit.hpp
index ab80f368..7e14fdb1 100644
--- a/src/catch2/reporters/catch_reporter_junit.hpp
+++ b/src/catch2/reporters/catch_reporter_junit.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 14/11/2017.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_REPORTER_JUNIT_H_INCLUDED
-#define TWOBLUECUBES_CATCH_REPORTER_JUNIT_H_INCLUDED
+#ifndef CATCH_REPORTER_JUNIT_HPP_INCLUDED
+#define CATCH_REPORTER_JUNIT_HPP_INCLUDED
 
 
 #include <catch2/reporters/catch_reporter_cumulative_base.hpp>
@@ -58,4 +52,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_REPORTER_JUNIT_H_INCLUDED
+#endif // CATCH_REPORTER_JUNIT_HPP_INCLUDED
diff --git a/src/catch2/reporters/catch_reporter_listening.hpp b/src/catch2/reporters/catch_reporter_listening.hpp
index 3aaaa739..6428b1d8 100644
--- a/src/catch2/reporters/catch_reporter_listening.hpp
+++ b/src/catch2/reporters/catch_reporter_listening.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 19/07/2017.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_MULTI_REPORTER_H_INCLUDED
-#define TWOBLUECUBES_CATCH_MULTI_REPORTER_H_INCLUDED
+#ifndef CATCH_REPORTER_LISTENING_HPP_INCLUDED
+#define CATCH_REPORTER_LISTENING_HPP_INCLUDED
 
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
 
@@ -57,4 +51,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_MULTI_REPORTER_H_INCLUDED
\ No newline at end of file
+#endif // CATCH_REPORTER_LISTENING_HPP_INCLUDED
diff --git a/src/catch2/reporters/catch_reporter_tap.hpp b/src/catch2/reporters/catch_reporter_tap.hpp
index 7c3365dc..de082c6a 100644
--- a/src/catch2/reporters/catch_reporter_tap.hpp
+++ b/src/catch2/reporters/catch_reporter_tap.hpp
@@ -1,9 +1,5 @@
-/*
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_REPORTER_TAP_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_REPORTER_TAP_HPP_INCLUDED
+#ifndef CATCH_REPORTER_TAP_HPP_INCLUDED
+#define CATCH_REPORTER_TAP_HPP_INCLUDED
 
 #include <catch2/reporters/catch_reporter_streaming_base.hpp>
 
@@ -36,4 +32,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_REPORTER_TAP_HPP_INCLUDED
+#endif // CATCH_REPORTER_TAP_HPP_INCLUDED
diff --git a/src/catch2/reporters/catch_reporter_teamcity.hpp b/src/catch2/reporters/catch_reporter_teamcity.hpp
index 69e2c31e..97d1e884 100644
--- a/src/catch2/reporters/catch_reporter_teamcity.hpp
+++ b/src/catch2/reporters/catch_reporter_teamcity.hpp
@@ -1,9 +1,5 @@
-/*
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_REPORTER_TEAMCITY_HPP_INCLUDED
-#define TWOBLUECUBES_CATCH_REPORTER_TEAMCITY_HPP_INCLUDED
+#ifndef CATCH_REPORTER_TEAMCITY_HPP_INCLUDED
+#define CATCH_REPORTER_TEAMCITY_HPP_INCLUDED
 
 #include <catch2/reporters/catch_reporter_streaming_base.hpp>
 #include <catch2/catch_timer.hpp>
@@ -66,4 +62,4 @@ namespace Catch {
 #   pragma clang diagnostic pop
 #endif
 
-#endif // TWOBLUECUBES_CATCH_REPORTER_TEAMCITY_HPP_INCLUDED
+#endif // CATCH_REPORTER_TEAMCITY_HPP_INCLUDED
diff --git a/src/catch2/reporters/catch_reporter_xml.hpp b/src/catch2/reporters/catch_reporter_xml.hpp
index 9a225126..8f1f9acc 100644
--- a/src/catch2/reporters/catch_reporter_xml.hpp
+++ b/src/catch2/reporters/catch_reporter_xml.hpp
@@ -1,11 +1,5 @@
-/*
- *  Created by Martin on 14/11/2017.
- *
- *  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)
- */
-#ifndef TWOBLUECUBES_CATCH_REPORTER_XML_H_INCLUDED
-#define TWOBLUECUBES_CATCH_REPORTER_XML_H_INCLUDED
+#ifndef CATCH_REPORTER_XML_HPP_INCLUDED
+#define CATCH_REPORTER_XML_HPP_INCLUDED
 
 #include <catch2/reporters/catch_reporter_streaming_base.hpp>
 
@@ -67,4 +61,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // TWOBLUECUBES_CATCH_REPORTER_XML_H_INCLUDED
+#endif // CATCH_REPORTER_XML_HPP_INCLUDED