diff --git a/AsyncDisplayKit/ASButtonNode.h b/AsyncDisplayKit/ASButtonNode.h
index 57b7caf130..8156496279 100644
--- a/AsyncDisplayKit/ASButtonNode.h
+++ b/AsyncDisplayKit/ASButtonNode.h
@@ -6,7 +6,8 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
+#import <AsyncDisplayKit/ASTextNode.h>
+#import <AsyncDisplayKit/ASImageNode.h>
 
 typedef enum : NSUInteger {
   ASButtonStateNormal,
diff --git a/AsyncDisplayKit/ASButtonNode.mm b/AsyncDisplayKit/ASButtonNode.mm
index 196216a6d5..0d4004411c 100644
--- a/AsyncDisplayKit/ASButtonNode.mm
+++ b/AsyncDisplayKit/ASButtonNode.mm
@@ -7,8 +7,9 @@
  */
 
 #import "ASButtonNode.h"
-
-#import <AsyncDisplayKit/ASThread.h>
+#import "ASStackLayoutSpec.h"
+#import "ASThread.h"
+#import "ASDisplayNode+Subclasses.h"
 
 @interface ASButtonNode ()
 {
diff --git a/AsyncDisplayKit/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm
index c044919bd0..8686ce6cca 100644
--- a/AsyncDisplayKit/ASCollectionView.mm
+++ b/AsyncDisplayKit/ASCollectionView.mm
@@ -9,7 +9,6 @@
 #import "ASAssert.h"
 #import "ASBatchFetching.h"
 #import "ASDelegateProxy.h"
-#import "ASCollectionView.h"
 #import "ASCollectionNode.h"
 #import "ASCollectionDataController.h"
 #import "ASCollectionViewLayoutController.h"
diff --git a/AsyncDisplayKit/ASControlNode+Subclasses.h b/AsyncDisplayKit/ASControlNode+Subclasses.h
index 085eb9bbaf..107de031e0 100644
--- a/AsyncDisplayKit/ASControlNode+Subclasses.h
+++ b/AsyncDisplayKit/ASControlNode+Subclasses.h
@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <AsyncDisplayKit/ASControlNode.h>
+#import "ASControlNode.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm
index 52f38cda9a..19c972f790 100644
--- a/AsyncDisplayKit/ASDisplayNode.mm
+++ b/AsyncDisplayKit/ASDisplayNode.mm
@@ -6,7 +6,6 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "ASDisplayNode.h"
 #import "ASDisplayNodeInternal.h"
 #import "ASDisplayNode+Subclasses.h"
 #import "ASDisplayNode+FrameworkPrivate.h"
@@ -49,6 +48,9 @@
 #define TIME_SCOPED(outVar)
 #endif
 
+@interface ASDisplayNode () <_ASDisplayLayerDelegate>
+@end
+
 @implementation ASDisplayNode
 
 // these dynamic properties all defined in ASLayoutOptionsPrivate.m
diff --git a/AsyncDisplayKit/ASMapNode.h b/AsyncDisplayKit/ASMapNode.h
index e0083506c8..0a8b0ebbd7 100644
--- a/AsyncDisplayKit/ASMapNode.h
+++ b/AsyncDisplayKit/ASMapNode.h
@@ -6,7 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
+#import <AsyncDisplayKit/ASImageNode.h>
 #import <MapKit/MapKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/AsyncDisplayKit/ASMapNode.mm b/AsyncDisplayKit/ASMapNode.mm
index 480360a1aa..ce4f3fc8e4 100644
--- a/AsyncDisplayKit/ASMapNode.mm
+++ b/AsyncDisplayKit/ASMapNode.mm
@@ -7,6 +7,8 @@
  */
 
 #import "ASMapNode.h"
+#import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
+#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 #import <AsyncDisplayKit/ASInsetLayoutSpec.h>
 #import <AsyncDisplayKit/ASCenterLayoutSpec.h>
 #import <AsyncDisplayKit/ASThread.h>
diff --git a/AsyncDisplayKit/ASPagerNode.m b/AsyncDisplayKit/ASPagerNode.m
index d4537d0a68..b8a52f735e 100644
--- a/AsyncDisplayKit/ASPagerNode.m
+++ b/AsyncDisplayKit/ASPagerNode.m
@@ -8,8 +8,7 @@
 
 #import "ASPagerNode.h"
 #import "ASDelegateProxy.h"
-
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
+#import "ASDisplayNode+Subclasses.h"
 
 @interface ASPagerNode () <ASCollectionDataSource, ASCollectionViewDelegateFlowLayout, ASDelegateProxyInterceptor> {
   UICollectionViewFlowLayout *_flowLayout;
diff --git a/AsyncDisplayKit/ASTableNode.h b/AsyncDisplayKit/ASTableNode.h
index 9ab36470a6..13d5c88fa8 100644
--- a/AsyncDisplayKit/ASTableNode.h
+++ b/AsyncDisplayKit/ASTableNode.h
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Facebook. All rights reserved.
 //
 
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
+#import <AsyncDisplayKit/ASTableView.h>
 
 /**
  * ASTableNode is a node based class that wraps an ASTableView. It can be used
diff --git a/AsyncDisplayKit/ASTableNode.m b/AsyncDisplayKit/ASTableNode.m
index f45f742d1e..2917b73cc8 100644
--- a/AsyncDisplayKit/ASTableNode.m
+++ b/AsyncDisplayKit/ASTableNode.m
@@ -6,7 +6,9 @@
 //  Copyright © 2015 Facebook. All rights reserved.
 //
 
+#import "ASFlowLayoutController.h"
 #import "ASTableNode.h"
+#import "ASDisplayNode+Subclasses.h"
 
 @interface _ASTablePendingState : NSObject
 @property (weak, nonatomic) id <ASTableDelegate>   delegate;
diff --git a/AsyncDisplayKit/ASTableView.mm b/AsyncDisplayKit/ASTableView.mm
index a5e65178d7..b2f6457f3d 100644
--- a/AsyncDisplayKit/ASTableView.mm
+++ b/AsyncDisplayKit/ASTableView.mm
@@ -6,9 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "ASTableView.h"
 #import "ASTableViewInternal.h"
-#import "ASTableNode.h"
 
 #import "ASAssert.h"
 #import "ASBatchFetching.h"
diff --git a/AsyncDisplayKit/ASTableViewInternal.h b/AsyncDisplayKit/ASTableViewInternal.h
index af940837e2..8d43beafb6 100644
--- a/AsyncDisplayKit/ASTableViewInternal.h
+++ b/AsyncDisplayKit/ASTableViewInternal.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Facebook. All rights reserved.
 //
 
-#import "ASTableView.h"
+#import "ASTableNode.h"
 
 @class ASDataController;
 
diff --git a/AsyncDisplayKit/AsyncDisplayKit.h b/AsyncDisplayKit/AsyncDisplayKit.h
index 0cb9a32f56..b854d7564a 100644
--- a/AsyncDisplayKit/AsyncDisplayKit.h
+++ b/AsyncDisplayKit/AsyncDisplayKit.h
@@ -52,8 +52,6 @@
 #import <AsyncDisplayKit/_ASAsyncTransaction.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer+Private.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionGroup.h>
-#import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/_ASDisplayView.h>
 #import <AsyncDisplayKit/ASAvailability.h>
 #import <AsyncDisplayKit/ASCollectionViewLayoutController.h>
 #import <AsyncDisplayKit/ASControlNode+Subclasses.h>
diff --git a/AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m b/AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m
index f98afbb97a..6168730878 100644
--- a/AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m
+++ b/AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m
@@ -9,7 +9,6 @@
 #import <UIKit/UIKit.h>
 
 #import "ASCollectionViewFlowLayoutInspector.h"
-
 #import "ASCollectionView.h"
 #import "ASAssert.h"
 #import "ASEqualityHelpers.h"
diff --git a/AsyncDisplayKit/Details/ASDataController+Subclasses.h b/AsyncDisplayKit/Details/ASDataController+Subclasses.h
index 23c28e9aa4..32d787910e 100644
--- a/AsyncDisplayKit/Details/ASDataController+Subclasses.h
+++ b/AsyncDisplayKit/Details/ASDataController+Subclasses.h
@@ -6,7 +6,10 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "ASDataController.h"
+#ifndef ASDataControllerSubclasses_Included
+#define ASDataControllerSubclasses_Included
+
+//#import "ASDataController.h"
 
 @interface ASDataController (Subclasses)
 
@@ -157,3 +160,5 @@
 - (void)willMoveSection:(NSInteger)section toSection:(NSInteger)newSection;
 
 @end
+
+#endif
diff --git a/AsyncDisplayKit/Details/ASDataController.h b/AsyncDisplayKit/Details/ASDataController.h
index 8b27d7e2d9..5710b22b4e 100644
--- a/AsyncDisplayKit/Details/ASDataController.h
+++ b/AsyncDisplayKit/Details/ASDataController.h
@@ -6,19 +6,21 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
+#ifndef ASDataController_Included
+#define ASDataController_Included
+
 #import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASDealloc2MainObject.h>
 #import <AsyncDisplayKit/ASDimension.h>
-#import "ASFlowLayoutController.h"
+#import <AsyncDisplayKit/ASFlowLayoutController.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 @class ASCellNode;
 @class ASDataController;
 
-FOUNDATION_EXPORT NSString * const ASDataControllerRowNodeKind;
-
 typedef NSUInteger ASDataControllerAnimationOptions;
+FOUNDATION_EXPORT NSString * const ASDataControllerRowNodeKind;
 
 /**
  Data source for data controller
@@ -192,3 +194,5 @@ typedef NSUInteger ASDataControllerAnimationOptions;
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif
diff --git a/AsyncDisplayKit/Details/ASRangeController.h b/AsyncDisplayKit/Details/ASRangeController.h
index 6e35cd41b1..3e8e00a534 100644
--- a/AsyncDisplayKit/Details/ASRangeController.h
+++ b/AsyncDisplayKit/Details/ASRangeController.h
@@ -10,7 +10,6 @@
 
 #import <AsyncDisplayKit/ASCellNode.h>
 #import <AsyncDisplayKit/ASDataController.h>
-#import <AsyncDisplayKit/ASFlowLayoutController.h>
 #import <AsyncDisplayKit/ASLayoutController.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/AsyncDisplayKit/Details/CGRect+ASConvenience.h b/AsyncDisplayKit/Details/CGRect+ASConvenience.h
index 9743eb49a0..a60b46be00 100644
--- a/AsyncDisplayKit/Details/CGRect+ASConvenience.h
+++ b/AsyncDisplayKit/Details/CGRect+ASConvenience.h
@@ -6,6 +6,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
+#import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
 
 #import "ASBaseDefines.h"
diff --git a/AsyncDisplayKit/Layout/ASLayoutOptions.h b/AsyncDisplayKit/Layout/ASLayoutOptions.h
index bda890ccd1..88036d1b49 100644
--- a/AsyncDisplayKit/Layout/ASLayoutOptions.h
+++ b/AsyncDisplayKit/Layout/ASLayoutOptions.h
@@ -9,7 +9,8 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <AsyncDisplayKit/ASLayoutSpec.h>
+#import <AsyncDisplayKit/ASStaticLayoutable.h>
+#import <AsyncDisplayKit/ASStackLayoutable.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec.mm b/AsyncDisplayKit/Layout/ASLayoutSpec.mm
index 376c606eea..dfe40084dc 100644
--- a/AsyncDisplayKit/Layout/ASLayoutSpec.mm
+++ b/AsyncDisplayKit/Layout/ASLayoutSpec.mm
@@ -8,7 +8,7 @@
  *
  */
 
-#import "ASLayoutSpec.h"
+#import "ASLayoutOptionsPrivate.h"
 
 #import "ASAssert.h"
 #import "ASBaseDefines.h"
@@ -16,7 +16,6 @@
 #import "ASInternalHelpers.h"
 #import "ASLayout.h"
 #import "ASLayoutOptions.h"
-#import "ASLayoutOptionsPrivate.h"
 #import "ASThread.h"
 
 #import <objc/runtime.h>
diff --git a/AsyncDisplayKit/Layout/ASStackLayoutSpec.mm b/AsyncDisplayKit/Layout/ASStackLayoutSpec.mm
index facbbb1e1c..76539bf57a 100644
--- a/AsyncDisplayKit/Layout/ASStackLayoutSpec.mm
+++ b/AsyncDisplayKit/Layout/ASStackLayoutSpec.mm
@@ -8,8 +8,6 @@
  *
  */
 
-#import "ASStackLayoutSpec.h"
-
 #import <numeric>
 #import <vector>
 
@@ -19,7 +17,6 @@
 #import "ASLayoutSpecUtilities.h"
 #import "ASStackBaselinePositionedLayout.h"
 #import "ASStackLayoutSpecUtilities.h"
-#import "ASStackPositionedLayout.h"
 #import "ASStackUnpositionedLayout.h"
 #import "ASThread.h"
 
diff --git a/AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm b/AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm
index ae9575593f..2d0edba4cd 100644
--- a/AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm
+++ b/AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm
@@ -14,7 +14,6 @@
 #import "ASLayoutOptions.h"
 #import "ASInternalHelpers.h"
 #import "ASLayout.h"
-#import "ASStaticLayoutable.h"
 
 @implementation ASStaticLayoutSpec
 
diff --git a/AsyncDisplayKit/Private/ASBasicImageDownloaderInternal.h b/AsyncDisplayKit/Private/ASBasicImageDownloaderInternal.h
index b6751a5d09..210fe397a3 100644
--- a/AsyncDisplayKit/Private/ASBasicImageDownloaderInternal.h
+++ b/AsyncDisplayKit/Private/ASBasicImageDownloaderInternal.h
@@ -6,9 +6,6 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "ASThread.h"
-
-
 @interface ASBasicImageDownloaderContext : NSObject
 
 + (ASBasicImageDownloaderContext *)contextForURL:(NSURL *)URL;
diff --git a/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm b/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm
index b0cabb67f8..2566d0e281 100644
--- a/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm
+++ b/AsyncDisplayKit/Private/ASDisplayNode+AsyncDisplay.mm
@@ -8,10 +8,14 @@
 
 #import "_ASCoreAnimationExtras.h"
 #import "_ASAsyncTransaction.h"
+#import "_ASDisplayLayer.h"
 #import "ASAssert.h"
 #import "ASDisplayNodeInternal.h"
 #import "ASDisplayNode+FrameworkPrivate.h"
 
+@interface ASDisplayNode () <_ASDisplayLayerDelegate>
+@end
+
 @implementation ASDisplayNode (AsyncDisplay)
 
 /**
diff --git a/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h b/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
index 126cd869d2..0c016d009c 100644
--- a/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
+++ b/AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
@@ -11,7 +11,6 @@
 // These methods must never be called or overridden by other classes.
 //
 
-#import "_ASDisplayLayer.h"
 #import "_AS-objc-internal.h"
 #import "ASDisplayNodeExtraIvars.h"
 #import "ASDisplayNode.h"
@@ -52,7 +51,7 @@ typedef NS_OPTIONS(NSUInteger, ASHierarchyState)
   ASHierarchyStateTransitioningSupernodes = 1 << 2
 };
 
-@interface ASDisplayNode () <_ASDisplayLayerDelegate>
+@interface ASDisplayNode ()
 {
 @protected
   ASInterfaceState _interfaceState;
diff --git a/AsyncDisplayKit/Private/ASDisplayNodeInternal.h b/AsyncDisplayKit/Private/ASDisplayNodeInternal.h
index c4c9d2ab6f..ca5a7ee1ca 100644
--- a/AsyncDisplayKit/Private/ASDisplayNodeInternal.h
+++ b/AsyncDisplayKit/Private/ASDisplayNodeInternal.h
@@ -11,7 +11,6 @@
 // These methods must never be called or overridden by other classes.
 //
 
-#import "_ASDisplayLayer.h"
 #import "_AS-objc-internal.h"
 #import "ASDisplayNodeExtraIvars.h"
 #import "ASDisplayNode.h"
@@ -19,6 +18,9 @@
 #import "ASThread.h"
 #import "ASLayoutOptions.h"
 
+@protocol _ASDisplayLayerDelegate;
+@class _ASDisplayLayer;
+
 BOOL ASDisplayNodeSubclassOverridesSelector(Class subclass, SEL selector);
 void ASDisplayNodeRespectThreadAffinityOfNode(ASDisplayNode *node, void (^block)());
 
@@ -39,7 +41,7 @@ typedef NS_OPTIONS(NSUInteger, ASDisplayNodeMethodOverrides)
 
 #define TIME_DISPLAYNODE_OPS (DEBUG || PROFILE)
 
-@interface ASDisplayNode () <_ASDisplayLayerDelegate>
+@interface ASDisplayNode ()
 {
 @protected
   // Protects access to _view, _layer, _pendingViewState, _subnodes, _supernode, and other properties which are accessed from multiple threads.
diff --git a/AsyncDisplayKit/Private/ASStackPositionedLayout.h b/AsyncDisplayKit/Private/ASStackPositionedLayout.h
index 211bda5b11..2ff9e5260b 100644
--- a/AsyncDisplayKit/Private/ASStackPositionedLayout.h
+++ b/AsyncDisplayKit/Private/ASStackPositionedLayout.h
@@ -10,7 +10,6 @@
 
 #import "ASLayout.h"
 #import "ASDimension.h"
-#import "ASStackLayoutSpec.h"
 #import "ASStackUnpositionedLayout.h"
 
 /** Represents a set of laid out and positioned stack layout children. */
diff --git a/AsyncDisplayKit/Private/_ASHierarchyChangeSet.h b/AsyncDisplayKit/Private/_ASHierarchyChangeSet.h
index b1f39cbf15..a2547ff017 100644
--- a/AsyncDisplayKit/Private/_ASHierarchyChangeSet.h
+++ b/AsyncDisplayKit/Private/_ASHierarchyChangeSet.h
@@ -7,7 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ASDataController.h"
+#import <AsyncDisplayKit/ASInternalHelpers.h>
+
+typedef NSUInteger ASDataControllerAnimationOptions;
 
 typedef NS_ENUM(NSInteger, _ASHierarchyChangeType) {
   _ASHierarchyChangeTypeReload,