diff --git a/docs/reporters.md b/docs/reporters.md
index 703234b1..92710622 100644
--- a/docs/reporters.md
+++ b/docs/reporters.md
@@ -22,7 +22,7 @@ Because of the way the junit format is structured the run must complete before a
 * `xml` writes an xml format tailored to Catch. Unlike `junit` this is a streaming format so results are delivered progressively.
 
 There are a few additional reporters, for specific build systems, in the Catch repository (in `include\reporters`) which you can `#include` in your project if you would like to make use of them.
-Do this in one source file - typically the same one you have `CATCH_CONFIG_MAIN` or `CATCH_CONFIG_RUNNER`.
+Do this in one source file - the same one you have `CATCH_CONFIG_MAIN` or `CATCH_CONFIG_RUNNER`.
 
 * `teamcity` writes the native, streaming, format that [TeamCity](https://www.jetbrains.com/teamcity/) understands.
 Use this when building as part of a TeamCity build to see results as they happen.
diff --git a/include/catch.hpp b/include/catch.hpp
index 40ee9da1..2d3edb58 100644
--- a/include/catch.hpp
+++ b/include/catch.hpp
@@ -28,7 +28,6 @@
 #  endif
 #endif
 
-#include "internal/catch_notimplemented_exception.h"
 #include "internal/catch_context.h"
 #include "internal/catch_test_registry.hpp"
 #include "internal/catch_capture.hpp"
diff --git a/include/internal/catch_impl.hpp b/include/internal/catch_impl.hpp
index 637df27b..a62ce3c0 100644
--- a/include/internal/catch_impl.hpp
+++ b/include/internal/catch_impl.hpp
@@ -16,6 +16,10 @@
 #pragma clang diagnostic ignored "-Wweak-vtables"
 #endif
 
+
+#include "internal/catch_notimplemented_exception.h"
+
+
 // Temporary hack to fix separately provided reporters
 #include "../reporters/catch_reporter_bases.hpp"
 #include "catch_reporter_registrars.hpp"
diff --git a/projects/SelfTest/ExceptionTests.cpp b/projects/SelfTest/ExceptionTests.cpp
index 50822ded..14828d47 100644
--- a/projects/SelfTest/ExceptionTests.cpp
+++ b/projects/SelfTest/ExceptionTests.cpp
@@ -181,15 +181,6 @@ TEST_CASE( "Unexpected exceptions can be translated", "[.][failing][!throws]"  )
         throw double( 3.14 );
 }
 
-inline int thisFunctionNotImplemented( int ) {
-    CATCH_NOT_IMPLEMENTED;
-}
-
-TEST_CASE( "NotImplemented exception", "[!throws]" )
-{
-    REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) );
-}
-
 TEST_CASE( "Exception messages can be tested for", "[!throws]" ) {
     using namespace Catch::Matchers;
     SECTION( "exact match" )