Overhaul header files / includes to eliminate circular references that Xcode 7 is angry about.

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,

AsyncDisplayKit/ASButtonNode.mm

@@ -7,8 +7,9 @@
  */
 
 #import "ASButtonNode.h"
-
+#import "ASStackLayoutSpec.h"
-#import <AsyncDisplayKit/ASThread.h>
+#import "ASThread.h"
+#import "ASDisplayNode+Subclasses.h"
 
 @interface ASButtonNode ()
 {

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"

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
 

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

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

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>

AsyncDisplayKit/ASPagerNode.m

@@ -8,8 +8,7 @@
 
 #import "ASPagerNode.h"
 #import "ASDelegateProxy.h"
-
+#import "ASDisplayNode+Subclasses.h"
-#import <AsyncDisplayKit/AsyncDisplayKit.h>
 
 @interface ASPagerNode () <ASCollectionDataSource, ASCollectionViewDelegateFlowLayout, ASDelegateProxyInterceptor> {
   UICollectionViewFlowLayout *_flowLayout;

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

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;

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"

AsyncDisplayKit/ASTableViewInternal.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2015 Facebook. All rights reserved.
 //
 
-#import "ASTableView.h"
+#import "ASTableNode.h"
 
 @class ASDataController;
 

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>

AsyncDisplayKit/Details/ASCollectionViewFlowLayoutInspector.m

@@ -9,7 +9,6 @@
 #import <UIKit/UIKit.h>
 
 #import "ASCollectionViewFlowLayoutInspector.h"
-
 #import "ASCollectionView.h"
 #import "ASAssert.h"
 #import "ASEqualityHelpers.h"

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

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

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

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"

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
 

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>

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"
 

AsyncDisplayKit/Layout/ASStaticLayoutSpec.mm

@@ -14,7 +14,6 @@
 #import "ASLayoutOptions.h"
 #import "ASInternalHelpers.h"
 #import "ASLayout.h"
-#import "ASStaticLayoutable.h"
 
 @implementation ASStaticLayoutSpec
 

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;

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)
 
 /**

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;

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.

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. */

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,