diff --git a/include/internal/catch_assertionhandler.cpp b/include/internal/catch_assertionhandler.cpp
index 26f727a9..8ccd60f2 100644
--- a/include/internal/catch_assertionhandler.cpp
+++ b/include/internal/catch_assertionhandler.cpp
@@ -10,6 +10,7 @@
 #include "catch_assertionresult.h"
 #include "catch_interfaces_capture.h"
 #include "catch_interfaces_runner.h"
+#include "catch_interfaces_config.h"
 #include "catch_context.h"
 #include "catch_debugger.h"
 #include "catch_interfaces_registry_hub.h"
diff --git a/include/internal/catch_benchmark.cpp b/include/internal/catch_benchmark.cpp
index 34af42a5..51a844f6 100644
--- a/include/internal/catch_benchmark.cpp
+++ b/include/internal/catch_benchmark.cpp
@@ -8,6 +8,7 @@
 
 #include "catch_benchmark.h"
 #include "catch_capture.hpp"
+#include "catch_interfaces_reporter.h"
 
 namespace Catch {
 
diff --git a/include/internal/catch_capture.hpp b/include/internal/catch_capture.hpp
index 5332df35..8afcb74d 100644
--- a/include/internal/catch_capture.hpp
+++ b/include/internal/catch_capture.hpp
@@ -11,11 +11,6 @@
 #include "catch_assertionhandler.h"
 #include "catch_message.h"
 #include "catch_interfaces_capture.h"
-#include "catch_debugger.h"
-#include "catch_common.h"
-#include "catch_tostring.h"
-#include "catch_interfaces_runner.h"
-#include "catch_compiler_capabilities.h"
 
 
 #if defined(CATCH_CONFIG_FAST_COMPILE)
@@ -39,6 +34,8 @@
 
 #else // CATCH_CONFIG_FAST_COMPILE
 
+#include "catch_debugger.h"
+
 ///////////////////////////////////////////////////////////////////////////////
 // In the event of a failure works out if the debugger needs to be invoked
 // and/or an exception thrown and takes appropriate action.
diff --git a/include/internal/catch_interfaces_capture.h b/include/internal/catch_interfaces_capture.h
index 4d8766dd..e8000154 100644
--- a/include/internal/catch_interfaces_capture.h
+++ b/include/internal/catch_interfaces_capture.h
@@ -9,9 +9,6 @@
 #define TWOBLUECUBES_CATCH_INTERFACES_CAPTURE_H_INCLUDED
 
 #include <string>
-#include "catch_result_type.h"
-#include "catch_common.h"
-#include "catch_interfaces_reporter.h"
 
 namespace Catch {
 
@@ -23,6 +20,8 @@ namespace Catch {
     struct MessageInfo;
     class ScopedMessageBuilder;
     struct Counts;
+    struct BenchmarkInfo;
+    struct BenchmarkStats;
 
     struct IResultCapture {