Start using piecemeal includes in test files

src/catch2/catch.hpp

@@ -11,14 +11,6 @@
 
 #include <catch2/catch_version_macros.hpp>
 
-#ifdef __clang__
-#    pragma clang system_header
-#elif defined __GNUC__
-#    pragma GCC system_header
-#endif
-
-
-
 #include <catch2/catch_suppress_warnings.h>
 
 #if !defined(CATCH_CONFIG_IMPL_ONLY)

src/catch2/catch_assertionhandler.cpp

@@ -16,6 +16,7 @@
 #include <catch2/catch_interfaces_registry_hub.h>
 #include <catch2/catch_capture_matchers.h>
 #include <catch2/catch_run_context.h>
+#include <catch2/catch_matchers_string.h>
 
 namespace Catch {
 

src/catch2/catch_capture_matchers.h

@@ -10,11 +10,6 @@
 
 #include <catch2/catch_capture.hpp>
 #include <catch2/catch_matchers.h>
-#include <catch2/catch_matchers_exception.hpp>
-#include <catch2/catch_matchers_floating.h>
-#include <catch2/catch_matchers_generic.hpp>
-#include <catch2/catch_matchers_string.h>
-#include <catch2/catch_matchers_vector.h>
 #include <catch2/catch_stringref.h>
 
 namespace Catch {

src/catch2/catch_decomposer.h

@@ -23,6 +23,14 @@
 #pragma warning(disable:4800) // Forcing result to true or false
 #endif
 
+#ifdef __clang__
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wsign-compare"
+#elif defined __GNUC__
+#  pragma GCC diagnostic push
+#  pragma clang diagnostic ignored "-Wsign-compare"
+#endif
+
 namespace Catch {
 
     struct ITransientExpression {
@@ -243,5 +251,10 @@ namespace Catch {
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
+#ifdef __clang__
+#  pragma clang diagnostic pop
+#elif defined __GNUC__
+#  pragma GCC diagnostic pop
+#endif
 
 #endif // TWOBLUECUBES_CATCH_DECOMPOSER_H_INCLUDED

src/catch2/catch_test_macros.hpp

@@ -7,6 +7,10 @@
 #define TWOBLUECUBES_CATCH_TEST_MACROS_HPP_INCLUDED
 
 #include <catch2/catch_capture.hpp>
+#include <catch2/catch_capture_matchers.h>
+#include <catch2/catch_interfaces_exception.h>
+#include <catch2/catch_preprocessor.hpp>
+#include <catch2/catch_section.h>
 #include <catch2/catch_test_registry.h>
 
 #if !defined(CATCH_CONFIG_DISABLE)

src/catch2/catch_tostring.h

@@ -649,6 +649,8 @@ struct ratio_string<std::milli> {
 }
 #endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
 
+#include <catch2/catch_interfaces_registry_hub.h>
+
 #define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
 namespace Catch { \
     template<> struct StringMaker<enumName> { \