diff --git a/Nimble.podspec b/Nimble.podspec
index f3fed7e2c..390bd0004 100644
--- a/Nimble.podspec
+++ b/Nimble.podspec
@@ -38,13 +38,12 @@ Pod::Spec.new do |s|
     "Carthage/Checkouts/CwlCatchException/Sources/CwlCatchExceptionSupport/include/CwlCatchException.h",
   ]
 
-  s.private_header_files = "Sources/NimbleObjectiveC/CurrentTestCaseTracker.h"
-
   s.exclude_files = "Sources/Nimble/Adapters/NonObjectiveC/*.swift"
   s.weak_framework = "XCTest"
   s.requires_arc = true
   s.compiler_flags = '-DPRODUCT_NAME=Nimble/Nimble'
   s.pod_target_xcconfig = {
+    'APPLICATION_EXTENSION_API_ONLY' => 'YES',
     'ENABLE_BITCODE' => 'NO',
     'OTHER_LDFLAGS' => '-weak-lswiftXCTest',
     'OTHER_SWIFT_FLAGS' => '$(inherited) -suppress-warnings',
diff --git a/Nimble.xcodeproj/project.pbxproj b/Nimble.xcodeproj/project.pbxproj
index 91ec26187..eba6712d9 100644
--- a/Nimble.xcodeproj/project.pbxproj
+++ b/Nimble.xcodeproj/project.pbxproj
@@ -633,7 +633,6 @@
 		DDB4D5EF19FE442800E9D9FE /* MatchTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MatchTest.swift; sourceTree = "<group>"; };
 		DDEFAEB31A93CBE6005CA37A /* ObjCAllPassTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjCAllPassTest.m; sourceTree = "<group>"; };
 		F8A1BE2B1CB3710900031679 /* XCTestObservationCenter+Register.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "XCTestObservationCenter+Register.m"; sourceTree = "<group>"; };
-		F8A1BE321CB3777F00031679 /* CurrentTestCaseTracker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CurrentTestCaseTracker.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -698,7 +697,6 @@
 		1F1871B91CA89E1B00A34BF2 /* NimbleObjectiveC */ = {
 			isa = PBXGroup;
 			children = (
-				F8A1BE321CB3777F00031679 /* CurrentTestCaseTracker.h */,
 				1F1871BC1CA89EDB00A34BF2 /* DSL.h */,
 				1F1871BD1CA89EDB00A34BF2 /* DSL.m */,
 				1F1871BE1CA89EDB00A34BF2 /* NMBExceptionCapture.h */,
@@ -1790,6 +1788,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -1855,6 +1854,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
diff --git a/Sources/NimbleObjectiveC/CurrentTestCaseTracker.h b/Sources/NimbleObjectiveC/CurrentTestCaseTracker.h
deleted file mode 100644
index 74398890f..000000000
--- a/Sources/NimbleObjectiveC/CurrentTestCaseTracker.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#import <XCTest/XCTest.h>
-
-#if __has_include("Nimble-Swift.h")
-#import "Nimble-Swift.h"
-#else
-#import <Nimble/Nimble-Swift.h>
-#endif
-
-SWIFT_CLASS("_TtC6Nimble22CurrentTestCaseTracker")
-@interface CurrentTestCaseTracker : NSObject <XCTestObservation>
-+ (CurrentTestCaseTracker *)sharedInstance;
-@end
-
-@interface CurrentTestCaseTracker (Register) @end
diff --git a/Sources/NimbleObjectiveC/DSL.m b/Sources/NimbleObjectiveC/DSL.m
index 4b099ac9a..670415b48 100644
--- a/Sources/NimbleObjectiveC/DSL.m
+++ b/Sources/NimbleObjectiveC/DSL.m
@@ -6,14 +6,6 @@
 #import <Nimble/Nimble-Swift.h>
 #endif
 
-SWIFT_CLASS("_TtC6Nimble7NMBWait")
-@interface NMBWait : NSObject
-
-+ (void)untilTimeout:(NSTimeInterval)timeout file:(NSString *)file line:(NSUInteger)line action:(void (^ _Nonnull)(void (^ _Nonnull)(void)))action;
-+ (void)untilFile:(NSString *)file line:(NSUInteger)line action:(void (^ _Nonnull)(void (^ _Nonnull)(void)))action;
-
-@end
-
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m b/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m
index 35f26fd00..fa5030a70 100644
--- a/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m
+++ b/Sources/NimbleObjectiveC/XCTestObservationCenter+Register.m
@@ -1,7 +1,12 @@
-#import "CurrentTestCaseTracker.h"
 #import <XCTest/XCTest.h>
 #import <objc/runtime.h>
 
+#if __has_include("Nimble-Swift.h")
+#import "Nimble-Swift.h"
+#else
+#import <Nimble/Nimble-Swift.h>
+#endif
+
 #pragma mark - Method Swizzling
 
 /// Swaps the implementations between two instance methods.