diff --git a/ComponentKit/Components/CKAnimationComponent+Internal.h b/ComponentKit/Components/CKAnimationComponent+Internal.h
index ad14fb98d..4cac175b3 100644
--- a/ComponentKit/Components/CKAnimationComponent+Internal.h
+++ b/ComponentKit/Components/CKAnimationComponent+Internal.h
@@ -9,6 +9,9 @@
  */
 
 #import <ComponentKit/CKAnimationComponent.h>
+#import <ComponentKit/CKDefines.h>
+
+#if CK_NOT_SWIFT
 
 @interface CKAnimationComponent (Internal)
 
@@ -23,3 +26,5 @@
          animationOnFinalUnmount:(CAAnimation *)animationOnFinalUnmount;
 
 @end
+
+#endif
diff --git a/ComponentKit/Core/CKComponentAnimationPredicates.h b/ComponentKit/Core/CKComponentAnimationPredicates.h
index 70c2dec13..f19b4ddfb 100644
--- a/ComponentKit/Core/CKComponentAnimationPredicates.h
+++ b/ComponentKit/Core/CKComponentAnimationPredicates.h
@@ -8,8 +8,14 @@
 *
 */
 
+#import <ComponentKit/CKDefines.h>
+
+#if CK_NOT_SWIFT
+
 #import <unordered_set>
 
 #import <ComponentKit/CKComponentScopeTypes.h>
 
 auto CKComponentAnimationPredicates() -> std::unordered_set<CKMountablePredicate>;
+
+#endif
diff --git a/ComponentKit/Core/CKMountAnimationGuard.h b/ComponentKit/Core/CKMountAnimationGuard.h
index 0f6d2e388..db37278c6 100644
--- a/ComponentKit/Core/CKMountAnimationGuard.h
+++ b/ComponentKit/Core/CKMountAnimationGuard.h
@@ -9,6 +9,9 @@
  */
 
 #import <QuartzCore/QuartzCore.h>
+#import <ComponentKit/CKDefines.h>
+
+#if CK_NOT_SWIFT
 
 /** Used by CKComponent internally to block animations when configuring a new or recycled view */
 class CKMountAnimationGuard {
@@ -73,3 +76,5 @@ class CKMountAnimationGuard {
     return NO;
   }
 };
+
+#endif
diff --git a/ComponentKit/Core/Swift/CKComponentSize_SwiftBridge+Internal.h b/ComponentKit/Core/Swift/CKComponentSize_SwiftBridge+Internal.h
index d79dc9aac..c974a4fdc 100644
--- a/ComponentKit/Core/Swift/CKComponentSize_SwiftBridge+Internal.h
+++ b/ComponentKit/Core/Swift/CKComponentSize_SwiftBridge+Internal.h
@@ -8,10 +8,13 @@
  *
  */
 
+#import <ComponentKit/CKDefines.h>
 #import <ComponentKit/CKComponentSize_SwiftBridge.h>
 
 #import <ComponentKit/CKComponentSize.h>
 
+#if CK_NOT_SWIFT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface CKComponentSize_SwiftBridge ()
@@ -21,3 +24,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif
diff --git a/ComponentKit/Core/Swift/CKDimension_SwiftBridge+Internal.h b/ComponentKit/Core/Swift/CKDimension_SwiftBridge+Internal.h
index 8d11684ea..1eb7072e0 100644
--- a/ComponentKit/Core/Swift/CKDimension_SwiftBridge+Internal.h
+++ b/ComponentKit/Core/Swift/CKDimension_SwiftBridge+Internal.h
@@ -12,6 +12,8 @@
 
 #import <ComponentKit/CKDimension.h>
 
+#if CK_NOT_SWIFT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface CKDimension_SwiftBridge ()
@@ -23,3 +25,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif
diff --git a/ComponentKit/Core/Swift/CKSizeRange_SwiftBridge+Internal.h b/ComponentKit/Core/Swift/CKSizeRange_SwiftBridge+Internal.h
index aa2997c10..a34ca9e7c 100644
--- a/ComponentKit/Core/Swift/CKSizeRange_SwiftBridge+Internal.h
+++ b/ComponentKit/Core/Swift/CKSizeRange_SwiftBridge+Internal.h
@@ -8,10 +8,13 @@
  *
  */
 
+#import <ComponentKit/CKDefines.h>
 #import <ComponentKit/CKSizeRange_SwiftBridge.h>
 
 #import <ComponentKit/CKSizeRange.h>
 
+#if CK_NOT_SWIFT
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface CKSizeRange_SwiftBridge ()
@@ -23,3 +26,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif
diff --git a/ComponentKit/DataSources/CKCollectionViewDataSourceCell.h b/ComponentKit/DataSources/CKCollectionViewDataSourceCell.h
index 89d667ead..88c7cfda5 100644
--- a/ComponentKit/DataSources/CKCollectionViewDataSourceCell.h
+++ b/ComponentKit/DataSources/CKCollectionViewDataSourceCell.h
@@ -10,10 +10,13 @@
 
 #import <UIKit/UIKit.h>
 
+#import <ComponentKit/CKDefines.h>
 #import <ComponentKit/CKNonNull.h>
 
 @class CKComponentRootView;
 
 @interface CKCollectionViewDataSourceCell : UICollectionViewCell
+#if CK_NOT_SWIFT
 @property (nonatomic, assign, readonly) CK::NonNull<CKComponentRootView *> rootView;
+#endif
 @end
diff --git a/ComponentKit/DataSources/CKCollectionViewDataSourceListener.h b/ComponentKit/DataSources/CKCollectionViewDataSourceListener.h
index c724a6e21..eb8f7f4b6 100644
--- a/ComponentKit/DataSources/CKCollectionViewDataSourceListener.h
+++ b/ComponentKit/DataSources/CKCollectionViewDataSourceListener.h
@@ -10,8 +10,6 @@
 
 #import <ComponentKit/CKDefines.h>
 
-#if CK_NOT_SWIFT
-
 @class CKCollectionViewDataSource;
 @class CKDataSourceAppliedChanges;
 @class CKDataSourceState;
@@ -33,5 +31,3 @@
          withState:(CKDataSourceState *)state;
 
 @end
-
-#endif
diff --git a/ComponentKit/DataSources/Common/CKComponentAnnouncerBase.h b/ComponentKit/DataSources/Common/CKComponentAnnouncerBase.h
index 6afea43d6..7b3dda5bd 100644
--- a/ComponentKit/DataSources/Common/CKComponentAnnouncerBase.h
+++ b/ComponentKit/DataSources/Common/CKComponentAnnouncerBase.h
@@ -8,10 +8,6 @@
  *
  */
 
-#import <ComponentKit/CKDefines.h>
-
-#if CK_NOT_SWIFT
-
 #import <Foundation/Foundation.h>
 
 /**
@@ -23,5 +19,3 @@
  */
 @interface CKComponentAnnouncerBase : NSObject
 @end
-
-#endif
diff --git a/ComponentKit/TransactionalDataSources/Common/Internal/CKDataSourceSplitChangesetModification.h b/ComponentKit/TransactionalDataSources/Common/Internal/CKDataSourceSplitChangesetModification.h
index cd8fc3681..b75cd8962 100644
--- a/ComponentKit/TransactionalDataSources/Common/Internal/CKDataSourceSplitChangesetModification.h
+++ b/ComponentKit/TransactionalDataSources/Common/Internal/CKDataSourceSplitChangesetModification.h
@@ -10,9 +10,12 @@
 
 #import <Foundation/Foundation.h>
 
+#import <ComponentKit/CKDefines.h>
 #import <ComponentKit/CKDataSource.h>
 #import <ComponentKit/CKDataSourceStateModifying.h>
 
+#if CK_NOT_SWIFT
+
 @class CKDataSourceChangeset;
 
 @protocol CKComponentStateListener;
@@ -28,3 +31,5 @@
 @property (nonatomic, readonly, strong) CKDataSourceChangeset *changeset;
 
 @end
+
+#endif