From 87179b3f7e2a235d38913d6fd6b7dc94949bf987 Mon Sep 17 00:00:00 2001
From: Hanton Yang <hanton.yang@gmail.com>
Date: Wed, 14 Aug 2019 10:55:48 +0800
Subject: [PATCH] Remove unused headers

* Improve compilation time by reducing unnecessary compilation dependencies
* More clean code
---
 Source/ASButtonNode+Yoga.mm                                 | 1 -
 Source/ASMapNode.mm                                         | 1 -
 Source/ASTextNode2.mm                                       | 6 ------
 Source/Debug/AsyncDisplayKit+Debug.mm                       | 1 -
 Source/Details/ASBasicImageDownloader.mm                    | 1 -
 Source/Details/ASCollectionGalleryLayoutDelegate.mm         | 2 --
 Source/Details/ASCollectionLayoutContext.mm                 | 1 -
 Source/Details/ASCollectionLayoutState.mm                   | 2 --
 Source/Details/ASCollectionViewLayoutController.mm          | 2 --
 Source/Details/ASCollectionViewLayoutInspector.mm           | 1 -
 Source/Details/ASDataController.mm                          | 6 ------
 Source/Details/ASDelegateProxy.mm                           | 1 -
 Source/Details/ASElementMap.mm                              | 1 -
 Source/Details/ASIntegerMap.mm                              | 1 -
 Source/Details/ASPhotosFrameworkImageRequest.mm             | 2 --
 Source/Details/ASRangeController.mm                         | 5 -----
 Source/Details/Transactions/_ASAsyncTransaction.mm          | 1 -
 Source/Details/Transactions/_ASAsyncTransactionContainer.mm | 1 -
 Source/Details/Transactions/_ASAsyncTransactionGroup.mm     | 1 -
 Source/Details/_ASDisplayLayer.mm                           | 5 -----
 Source/Details/_ASDisplayView.mm                            | 4 ----
 Source/Details/_ASDisplayViewAccessiblity.mm                | 1 -
 Source/Layout/ASAbsoluteLayoutSpec.mm                       | 1 -
 Source/Layout/ASAsciiArtBoxCreator.mm                       | 1 -
 Source/Layout/ASBackgroundLayoutSpec.mm                     | 1 -
 Source/Layout/ASCenterLayoutSpec.mm                         | 2 --
 Source/Layout/ASCornerLayoutSpec.mm                         | 1 -
 Source/Layout/ASDimension.mm                                | 2 --
 Source/Layout/ASInsetLayoutSpec.mm                          | 1 -
 Source/Layout/ASLayout.mm                                   | 2 --
 Source/Layout/ASLayoutElement.mm                            | 6 ------
 Source/Layout/ASLayoutSpec+Subclasses.mm                    | 1 -
 Source/Layout/ASLayoutSpec.mm                               | 6 ------
 Source/Layout/ASOverlayLayoutSpec.mm                        | 1 -
 Source/Layout/ASRatioLayoutSpec.mm                          | 1 -
 Source/Layout/ASStackLayoutSpec.mm                          | 3 ---
 Source/Private/ASCollectionViewFlowLayoutInspector.mm       | 2 --
 Source/Private/ASDisplayNode+AsyncDisplay.mm                | 3 ---
 Source/Private/ASDisplayNode+UIViewBridge.mm                | 1 -
 Source/Private/ASImageNode+CGExtras.mm                      | 2 --
 Source/Private/ASInternalHelpers.mm                         | 5 -----
 Source/Private/ASLayoutTransition.mm                        | 1 -
 Source/Private/ASMutableElementMap.mm                       | 2 --
 Source/Private/ASTwoDimensionalArrayUtils.mm                | 1 -
 Source/Private/Layout/ASStackPositionedLayout.mm            | 1 -
 Source/Private/TextExperiment/Component/ASTextLayout.mm     | 2 --
 Source/Private/TextExperiment/String/ASTextAttribute.mm     | 1 -
 Source/Private/TextExperiment/Utility/ASTextUtilities.mm    | 1 -
 Source/Private/_ASCollectionGalleryLayoutItem.mm            | 1 -
 Source/Private/_ASCoreAnimationExtras.mm                    | 1 -
 Source/Private/_ASHierarchyChangeSet.mm                     | 3 ---
 Source/Private/_ASPendingState.mm                           | 3 ---
 Source/TextKit/ASTextKitComponents.mm                       | 1 -
 Source/TextKit/ASTextKitContext.mm                          | 2 --
 Source/TextKit/ASTextKitCoreTextAdditions.mm                | 2 --
 Source/TextKit/ASTextKitFontSizeAdjuster.mm                 | 1 -
 Source/TextKit/ASTextKitRenderer.mm                         | 2 --
 Source/UIImage+ASConvenience.mm                             | 1 -
 58 files changed, 115 deletions(-)

diff --git a/Source/ASButtonNode+Yoga.mm b/Source/ASButtonNode+Yoga.mm
index 466647556..f4493bc40 100644
--- a/Source/ASButtonNode+Yoga.mm
+++ b/Source/ASButtonNode+Yoga.mm
@@ -11,7 +11,6 @@
 #import <AsyncDisplayKit/ASButtonNode+Private.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
 #import <AsyncDisplayKit/ASStackLayoutSpecUtilities.h>
-#import <AsyncDisplayKit/ASThread.h>
 
 #if YOGA
 static void ASButtonNodeResolveHorizontalAlignmentForStyle(ASLayoutElementStyle *style, ASStackLayoutDirection _direction, ASHorizontalAlignment _horizontalAlignment, ASStackLayoutJustifyContent _justifyContent, ASStackLayoutAlignItems _alignItems) {
diff --git a/Source/ASMapNode.mm b/Source/ASMapNode.mm
index 554f51a03..c41141c0c 100644
--- a/Source/ASMapNode.mm
+++ b/Source/ASMapNode.mm
@@ -16,7 +16,6 @@
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 #import <AsyncDisplayKit/ASGraphicsContext.h>
-#import <AsyncDisplayKit/ASInsetLayoutSpec.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 #import <AsyncDisplayKit/ASLayout.h>
 #import <AsyncDisplayKit/ASThread.h>
diff --git a/Source/ASTextNode2.mm b/Source/ASTextNode2.mm
index 796fc0aec..1d5895032 100644
--- a/Source/ASTextNode2.mm
+++ b/Source/ASTextNode2.mm
@@ -20,15 +20,9 @@
 #import <AsyncDisplayKit/ASHighlightOverlayLayer.h>
 
 #import <AsyncDisplayKit/ASTextKitRenderer+Positioning.h>
-#import <AsyncDisplayKit/ASTextKitShadower.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
 
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 #import <AsyncDisplayKit/ASTextLayout.h>
-#import <AsyncDisplayKit/ASThread.h>
 
 @interface ASTextCacheValue : NSObject {
   @package
diff --git a/Source/Debug/AsyncDisplayKit+Debug.mm b/Source/Debug/AsyncDisplayKit+Debug.mm
index 8f4437447..c8b11298b 100644
--- a/Source/Debug/AsyncDisplayKit+Debug.mm
+++ b/Source/Debug/AsyncDisplayKit+Debug.mm
@@ -10,7 +10,6 @@
 #import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
 #import <AsyncDisplayKit/ASAbstractLayoutController.h>
 #import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASWeakSet.h>
 #import <AsyncDisplayKit/UIImage+ASConvenience.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 #import <AsyncDisplayKit/ASGraphicsContext.h>
diff --git a/Source/Details/ASBasicImageDownloader.mm b/Source/Details/ASBasicImageDownloader.mm
index 178d53211..927a2d0aa 100644
--- a/Source/Details/ASBasicImageDownloader.mm
+++ b/Source/Details/ASBasicImageDownloader.mm
@@ -9,7 +9,6 @@
 
 #import <AsyncDisplayKit/ASBasicImageDownloader.h>
 
-#import <Foundation/NSURLSession.h>
 #import <objc/runtime.h>
 
 #import <AsyncDisplayKit/ASBasicImageDownloaderInternal.h>
diff --git a/Source/Details/ASCollectionGalleryLayoutDelegate.mm b/Source/Details/ASCollectionGalleryLayoutDelegate.mm
index a67abd539..5ba74d61a 100644
--- a/Source/Details/ASCollectionGalleryLayoutDelegate.mm
+++ b/Source/Details/ASCollectionGalleryLayoutDelegate.mm
@@ -10,7 +10,6 @@
 
 #import <AsyncDisplayKit/_ASCollectionGalleryLayoutInfo.h>
 #import <AsyncDisplayKit/_ASCollectionGalleryLayoutItem.h>
-#import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASCellNode.h>
 #import <AsyncDisplayKit/ASCollectionElement.h>
 #import <AsyncDisplayKit/ASCollections.h>
@@ -19,7 +18,6 @@
 #import <AsyncDisplayKit/ASCollectionLayoutState.h>
 #import <AsyncDisplayKit/ASElementMap.h>
 #import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutRangeType.h>
 #import <AsyncDisplayKit/ASInsetLayoutSpec.h>
 #import <AsyncDisplayKit/ASStackLayoutSpec.h>
 
diff --git a/Source/Details/ASCollectionLayoutContext.mm b/Source/Details/ASCollectionLayoutContext.mm
index 350be998b..6f2ba7186 100644
--- a/Source/Details/ASCollectionLayoutContext.mm
+++ b/Source/Details/ASCollectionLayoutContext.mm
@@ -9,7 +9,6 @@
 #import <AsyncDisplayKit/ASCollectionLayoutContext.h>
 #import <AsyncDisplayKit/ASCollectionLayoutContext+Private.h>
 
-#import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASCollectionLayoutDelegate.h>
 #import <AsyncDisplayKit/ASCollectionLayoutCache.h>
 #import <AsyncDisplayKit/ASElementMap.h>
diff --git a/Source/Details/ASCollectionLayoutState.mm b/Source/Details/ASCollectionLayoutState.mm
index eb869b334..0f98b215a 100644
--- a/Source/Details/ASCollectionLayoutState.mm
+++ b/Source/Details/ASCollectionLayoutState.mm
@@ -7,9 +7,7 @@
 //
 
 #import <AsyncDisplayKit/ASCollectionLayoutState.h>
-#import <AsyncDisplayKit/ASCollectionLayoutState+Private.h>
 
-#import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASCellNode.h>
 #import <AsyncDisplayKit/ASCollectionElement.h>
 #import <AsyncDisplayKit/ASCollectionLayoutContext.h>
diff --git a/Source/Details/ASCollectionViewLayoutController.mm b/Source/Details/ASCollectionViewLayoutController.mm
index 497cae9fb..f252237db 100644
--- a/Source/Details/ASCollectionViewLayoutController.mm
+++ b/Source/Details/ASCollectionViewLayoutController.mm
@@ -12,8 +12,6 @@
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
 #import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-#import <AsyncDisplayKit/UICollectionViewLayout+ASConvenience.h>
 
 struct ASRangeGeometry {
   CGRect rangeBounds;
diff --git a/Source/Details/ASCollectionViewLayoutInspector.mm b/Source/Details/ASCollectionViewLayoutInspector.mm
index 04880923a..eb8375b0e 100644
--- a/Source/Details/ASCollectionViewLayoutInspector.mm
+++ b/Source/Details/ASCollectionViewLayoutInspector.mm
@@ -10,7 +10,6 @@
 #import <AsyncDisplayKit/ASCollectionViewLayoutInspector.h>
 
 #import <AsyncDisplayKit/ASCollectionView.h>
-#import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
 #import <AsyncDisplayKit/ASCollectionNode.h>
 
 #pragma mark - Helper Functions
diff --git a/Source/Details/ASDataController.mm b/Source/Details/ASDataController.mm
index d4fc5598c..2ec2eb699 100644
--- a/Source/Details/ASDataController.mm
+++ b/Source/Details/ASDataController.mm
@@ -9,26 +9,20 @@
 
 #import <AsyncDisplayKit/ASDataController.h>
 
-#include <atomic>
-
 #import <AsyncDisplayKit/_ASHierarchyChangeSet.h>
 #import <AsyncDisplayKit/_ASScopeTimer.h>
-#import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASCellNode.h>
 #import <AsyncDisplayKit/ASCollectionElement.h>
 #import <AsyncDisplayKit/ASCollectionLayoutContext.h>
-#import <AsyncDisplayKit/ASCollectionLayoutState.h>
 #import <AsyncDisplayKit/ASDispatch.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 #import <AsyncDisplayKit/ASElementMap.h>
 #import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLog.h>
 #import <AsyncDisplayKit/ASSignpost.h>
 #import <AsyncDisplayKit/ASMainSerialQueue.h>
 #import <AsyncDisplayKit/ASMutableElementMap.h>
 #import <AsyncDisplayKit/ASRangeManagingNode.h>
 #import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASTwoDimensionalArrayUtils.h>
 #import <AsyncDisplayKit/ASSection.h>
 
 #import <AsyncDisplayKit/ASInternalHelpers.h>
diff --git a/Source/Details/ASDelegateProxy.mm b/Source/Details/ASDelegateProxy.mm
index 40f1f306a..844fe6339 100644
--- a/Source/Details/ASDelegateProxy.mm
+++ b/Source/Details/ASDelegateProxy.mm
@@ -10,7 +10,6 @@
 #import <AsyncDisplayKit/ASDelegateProxy.h>
 #import <AsyncDisplayKit/ASTableNode.h>
 #import <AsyncDisplayKit/ASCollectionNode.h>
-#import <AsyncDisplayKit/ASAssert.h>
 
 // UIKit performs a class check for UIDataSourceModelAssociation protocol conformance rather than an instance check, so
 //  the implementation of conformsToProtocol: below never gets called. We need to declare the two as conforming to the protocol here, then
diff --git a/Source/Details/ASElementMap.mm b/Source/Details/ASElementMap.mm
index 791344f62..bac1b20fa 100644
--- a/Source/Details/ASElementMap.mm
+++ b/Source/Details/ASElementMap.mm
@@ -13,7 +13,6 @@
 #import <AsyncDisplayKit/ASTwoDimensionalArrayUtils.h>
 #import <AsyncDisplayKit/ASMutableElementMap.h>
 #import <AsyncDisplayKit/ASSection.h>
-#import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
 #import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 
 @interface ASElementMap () <ASDescriptionProvider>
diff --git a/Source/Details/ASIntegerMap.mm b/Source/Details/ASIntegerMap.mm
index b07a7a180..fdf0d528d 100644
--- a/Source/Details/ASIntegerMap.mm
+++ b/Source/Details/ASIntegerMap.mm
@@ -9,7 +9,6 @@
 #import "ASIntegerMap.h"
 #import <AsyncDisplayKit/ASAssert.h>
 #import <unordered_map>
-#import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
 #import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 
 /**
diff --git a/Source/Details/ASPhotosFrameworkImageRequest.mm b/Source/Details/ASPhotosFrameworkImageRequest.mm
index a7e0b4165..ac1d4773b 100644
--- a/Source/Details/ASPhotosFrameworkImageRequest.mm
+++ b/Source/Details/ASPhotosFrameworkImageRequest.mm
@@ -11,8 +11,6 @@
 
 #if AS_USE_PHOTOS
 
-#import <AsyncDisplayKit/ASBaseDefines.h>
-
 NSString *const ASPhotosURLScheme = @"ph";
 
 static NSString *const _ASPhotosURLQueryKeyWidth = @"width";
diff --git a/Source/Details/ASRangeController.mm b/Source/Details/ASRangeController.mm
index 810772fdd..83bc26284 100644
--- a/Source/Details/ASRangeController.mm
+++ b/Source/Details/ASRangeController.mm
@@ -16,14 +16,9 @@
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h> // Required for interfaceState and hierarchyState setter methods.
 #import <AsyncDisplayKit/ASElementMap.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
 #import <AsyncDisplayKit/ASSignpost.h>
-#import <AsyncDisplayKit/ASTwoDimensionalArrayUtils.h>
-#import <AsyncDisplayKit/ASWeakSet.h>
 
 #import <AsyncDisplayKit/ASCellNode+Internal.h>
-#import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/AsyncDisplayKit+Debug.h>
 
 #define AS_RANGECONTROLLER_LOG_UPDATE_FREQ 0
diff --git a/Source/Details/Transactions/_ASAsyncTransaction.mm b/Source/Details/Transactions/_ASAsyncTransaction.mm
index c147f5f26..a852eafc3 100644
--- a/Source/Details/Transactions/_ASAsyncTransaction.mm
+++ b/Source/Details/Transactions/_ASAsyncTransaction.mm
@@ -14,7 +14,6 @@
 #import <AsyncDisplayKit/ASThread.h>
 #import <list>
 #import <map>
-#import <mutex>
 
 #ifndef __STRICT_ANSI__
   #warning "Texture must be compiled with std=c++11 to prevent layout issues. gnu++ is not supported. This is hopefully temporary."
diff --git a/Source/Details/Transactions/_ASAsyncTransactionContainer.mm b/Source/Details/Transactions/_ASAsyncTransactionContainer.mm
index 4501a85fb..669a083bd 100644
--- a/Source/Details/Transactions/_ASAsyncTransactionContainer.mm
+++ b/Source/Details/Transactions/_ASAsyncTransactionContainer.mm
@@ -10,7 +10,6 @@
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer+Private.h>
 
-#import <AsyncDisplayKit/ASConfigurationInternal.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 #import <AsyncDisplayKit/_ASAsyncTransaction.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionGroup.h>
diff --git a/Source/Details/Transactions/_ASAsyncTransactionGroup.mm b/Source/Details/Transactions/_ASAsyncTransactionGroup.mm
index ae651d187..62cf4c7df 100644
--- a/Source/Details/Transactions/_ASAsyncTransactionGroup.mm
+++ b/Source/Details/Transactions/_ASAsyncTransactionGroup.mm
@@ -12,7 +12,6 @@
 #import <AsyncDisplayKit/_ASAsyncTransaction.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionGroup.h>
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
-#import <AsyncDisplayKit/_ASAsyncTransactionContainer+Private.h>
 
 @implementation _ASAsyncTransactionGroup {
   NSHashTable<id<ASAsyncTransactionContainer>> *_containers;
diff --git a/Source/Details/_ASDisplayLayer.mm b/Source/Details/_ASDisplayLayer.mm
index 6ced31685..89fc178aa 100644
--- a/Source/Details/_ASDisplayLayer.mm
+++ b/Source/Details/_ASDisplayLayer.mm
@@ -9,15 +9,10 @@
 
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 
-#import <objc/runtime.h>
-
 #import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASDisplayNode.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
-#import <AsyncDisplayKit/ASLog.h>
 
 @implementation _ASDisplayLayer
 {
diff --git a/Source/Details/_ASDisplayView.mm b/Source/Details/_ASDisplayView.mm
index 7509a704e..12863e053 100644
--- a/Source/Details/_ASDisplayView.mm
+++ b/Source/Details/_ASDisplayView.mm
@@ -8,17 +8,13 @@
 //
 
 #import <AsyncDisplayKit/_ASDisplayView.h>
-#import <AsyncDisplayKit/_ASDisplayViewAccessiblity.h>
 
 #import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
 #import <AsyncDisplayKit/ASDisplayNode+Convenience.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
 #import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 #import <AsyncDisplayKit/ASViewController.h>
 
 #pragma mark - _ASDisplayView
diff --git a/Source/Details/_ASDisplayViewAccessiblity.mm b/Source/Details/_ASDisplayViewAccessiblity.mm
index 814071620..858fd5ddc 100644
--- a/Source/Details/_ASDisplayViewAccessiblity.mm
+++ b/Source/Details/_ASDisplayViewAccessiblity.mm
@@ -14,7 +14,6 @@
 #import <AsyncDisplayKit/ASCollectionNode.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASDisplayNode+Ancestry.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
 #import <AsyncDisplayKit/ASTableNode.h>
 
diff --git a/Source/Layout/ASAbsoluteLayoutSpec.mm b/Source/Layout/ASAbsoluteLayoutSpec.mm
index 18a3a3a51..02b14df47 100644
--- a/Source/Layout/ASAbsoluteLayoutSpec.mm
+++ b/Source/Layout/ASAbsoluteLayoutSpec.mm
@@ -12,7 +12,6 @@
 #import <AsyncDisplayKit/ASCollections.h>
 #import <AsyncDisplayKit/ASLayout.h>
 #import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-#import <AsyncDisplayKit/ASLayoutSpecUtilities.h>
 #import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
 
 #pragma mark - ASAbsoluteLayoutSpec
diff --git a/Source/Layout/ASAsciiArtBoxCreator.mm b/Source/Layout/ASAsciiArtBoxCreator.mm
index 78eb572ea..998267b35 100644
--- a/Source/Layout/ASAsciiArtBoxCreator.mm
+++ b/Source/Layout/ASAsciiArtBoxCreator.mm
@@ -10,7 +10,6 @@
 #import <AsyncDisplayKit/ASAsciiArtBoxCreator.h>
 
 #import <CoreGraphics/CoreGraphics.h>
-#import <cmath>
 
 static const NSUInteger kDebugBoxPadding = 2;
 
diff --git a/Source/Layout/ASBackgroundLayoutSpec.mm b/Source/Layout/ASBackgroundLayoutSpec.mm
index 31dd75487..2de9f49ba 100644
--- a/Source/Layout/ASBackgroundLayoutSpec.mm
+++ b/Source/Layout/ASBackgroundLayoutSpec.mm
@@ -11,7 +11,6 @@
 
 #import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
 
-#import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASCollections.h>
 
 static NSUInteger const kForegroundChildIndex = 0;
diff --git a/Source/Layout/ASCenterLayoutSpec.mm b/Source/Layout/ASCenterLayoutSpec.mm
index 107f317c0..9bf29ea51 100644
--- a/Source/Layout/ASCenterLayoutSpec.mm
+++ b/Source/Layout/ASCenterLayoutSpec.mm
@@ -9,8 +9,6 @@
 
 #import <AsyncDisplayKit/ASCenterLayoutSpec.h>
 
-#import <AsyncDisplayKit/ASLayout.h>
-
 @implementation ASCenterLayoutSpec
 {
   ASCenterLayoutSpecCenteringOptions _centeringOptions;
diff --git a/Source/Layout/ASCornerLayoutSpec.mm b/Source/Layout/ASCornerLayoutSpec.mm
index 6663b2893..91a1ac87d 100644
--- a/Source/Layout/ASCornerLayoutSpec.mm
+++ b/Source/Layout/ASCornerLayoutSpec.mm
@@ -9,7 +9,6 @@
 #import <AsyncDisplayKit/ASCornerLayoutSpec.h>
 #import <AsyncDisplayKit/ASLayout.h>
 #import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNode.h>
 
 CGPoint as_calculatedCornerOriginIn(CGRect baseFrame, CGSize cornerSize, ASCornerLayoutLocation cornerLocation, CGPoint offset)
 {
diff --git a/Source/Layout/ASDimension.mm b/Source/Layout/ASDimension.mm
index d1a42462d..10af17cc6 100644
--- a/Source/Layout/ASDimension.mm
+++ b/Source/Layout/ASDimension.mm
@@ -11,8 +11,6 @@
 
 #import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
 
-#import <AsyncDisplayKit/ASAssert.h>
-
 #pragma mark - ASDimension
 
 ASDimension const ASDimensionAuto = {ASDimensionUnitAuto, 0};
diff --git a/Source/Layout/ASInsetLayoutSpec.mm b/Source/Layout/ASInsetLayoutSpec.mm
index 450480f1c..93fd6eea4 100644
--- a/Source/Layout/ASInsetLayoutSpec.mm
+++ b/Source/Layout/ASInsetLayoutSpec.mm
@@ -11,7 +11,6 @@
 
 #import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
 
-#import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 
 @interface ASInsetLayoutSpec ()
diff --git a/Source/Layout/ASLayout.mm b/Source/Layout/ASLayout.mm
index 055daa88f..3979c8426 100644
--- a/Source/Layout/ASLayout.mm
+++ b/Source/Layout/ASLayout.mm
@@ -13,13 +13,11 @@
 #import <queue>
 
 #import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/ASDimension.h>
 #import <AsyncDisplayKit/ASLayoutSpecUtilities.h>
 #import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
 
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 
 NSString *const ASThreadDictMaxConstraintSizeKey = @"kASThreadDictMaxConstraintSizeKey";
 
diff --git a/Source/Layout/ASLayoutElement.mm b/Source/Layout/ASLayoutElement.mm
index 8876ab1be..6944f86e1 100644
--- a/Source/Layout/ASLayoutElement.mm
+++ b/Source/Layout/ASLayoutElement.mm
@@ -8,15 +8,9 @@
 //
 
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
-#import <AsyncDisplayKit/ASAvailability.h>
-#import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutElement.h>
 #import <AsyncDisplayKit/ASThread.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 
-#import <atomic>
-
 using AS::MutexLocker;
 
 #if YOGA
diff --git a/Source/Layout/ASLayoutSpec+Subclasses.mm b/Source/Layout/ASLayoutSpec+Subclasses.mm
index 17ff53e6c..fb9daf3b6 100644
--- a/Source/Layout/ASLayoutSpec+Subclasses.mm
+++ b/Source/Layout/ASLayoutSpec+Subclasses.mm
@@ -9,7 +9,6 @@
 
 #import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
 
-#import <AsyncDisplayKit/ASLayoutSpec.h>
 #import <AsyncDisplayKit/ASLayoutSpecPrivate.h>
 
 #pragma mark - ASNullLayoutSpec
diff --git a/Source/Layout/ASLayoutSpec.mm b/Source/Layout/ASLayoutSpec.mm
index 2bcb92787..6bbdc9959 100644
--- a/Source/Layout/ASLayoutSpec.mm
+++ b/Source/Layout/ASLayoutSpec.mm
@@ -14,13 +14,7 @@
 
 #import <AsyncDisplayKit/ASCollections.h>
 #import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
-#import <AsyncDisplayKit/ASTraitCollection.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-
-#import <objc/runtime.h>
-#import <map>
-#import <vector>
 
 @implementation ASLayoutSpec
 
diff --git a/Source/Layout/ASOverlayLayoutSpec.mm b/Source/Layout/ASOverlayLayoutSpec.mm
index 27ffbeb8c..8a3640de2 100644
--- a/Source/Layout/ASOverlayLayoutSpec.mm
+++ b/Source/Layout/ASOverlayLayoutSpec.mm
@@ -9,7 +9,6 @@
 
 #import <AsyncDisplayKit/ASOverlayLayoutSpec.h>
 #import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
-#import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASCollections.h>
 
 static NSUInteger const kUnderlayChildIndex = 0;
diff --git a/Source/Layout/ASRatioLayoutSpec.mm b/Source/Layout/ASRatioLayoutSpec.mm
index 1580b2a60..ceda856cd 100644
--- a/Source/Layout/ASRatioLayoutSpec.mm
+++ b/Source/Layout/ASRatioLayoutSpec.mm
@@ -15,7 +15,6 @@
 
 #import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
 
-#import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 
 #pragma mark - ASRatioLayoutSpec
diff --git a/Source/Layout/ASStackLayoutSpec.mm b/Source/Layout/ASStackLayoutSpec.mm
index dffcbfb54..976cc0293 100644
--- a/Source/Layout/ASStackLayoutSpec.mm
+++ b/Source/Layout/ASStackLayoutSpec.mm
@@ -13,14 +13,11 @@
 #import <vector>
 
 #import <AsyncDisplayKit/ASCollections.h>
-#import <AsyncDisplayKit/ASDimension.h>
 #import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutElement.h>
 #import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
 #import <AsyncDisplayKit/ASLayoutSpecUtilities.h>
 #import <AsyncDisplayKit/ASLog.h>
 #import <AsyncDisplayKit/ASStackPositionedLayout.h>
-#import <AsyncDisplayKit/ASStackUnpositionedLayout.h>
 
 @implementation ASStackLayoutSpec
 
diff --git a/Source/Private/ASCollectionViewFlowLayoutInspector.mm b/Source/Private/ASCollectionViewFlowLayoutInspector.mm
index 8ba41ae42..f4625b32f 100644
--- a/Source/Private/ASCollectionViewFlowLayoutInspector.mm
+++ b/Source/Private/ASCollectionViewFlowLayoutInspector.mm
@@ -9,9 +9,7 @@
 
 #import <AsyncDisplayKit/ASCollectionViewFlowLayoutInspector.h>
 #import <AsyncDisplayKit/ASCollectionView.h>
-#import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASCollectionView+Undeprecated.h>
 #import <AsyncDisplayKit/ASCollectionNode.h>
 
 #define kDefaultItemSize CGSizeMake(50, 50)
diff --git a/Source/Private/ASDisplayNode+AsyncDisplay.mm b/Source/Private/ASDisplayNode+AsyncDisplay.mm
index 64dad77fc..5cd75b939 100644
--- a/Source/Private/ASDisplayNode+AsyncDisplay.mm
+++ b/Source/Private/ASDisplayNode+AsyncDisplay.mm
@@ -10,13 +10,10 @@
 #import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
 #import <AsyncDisplayKit/_ASAsyncTransaction.h>
 #import <AsyncDisplayKit/_ASDisplayLayer.h>
-#import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASGraphicsContext.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 #import <AsyncDisplayKit/ASSignpost.h>
-#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 
 using AS::MutexLocker;
 
diff --git a/Source/Private/ASDisplayNode+UIViewBridge.mm b/Source/Private/ASDisplayNode+UIViewBridge.mm
index 108f69077..4d4851ed9 100644
--- a/Source/Private/ASDisplayNode+UIViewBridge.mm
+++ b/Source/Private/ASDisplayNode+UIViewBridge.mm
@@ -13,7 +13,6 @@
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
-#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASPendingStateController.h>
 
 /**
diff --git a/Source/Private/ASImageNode+CGExtras.mm b/Source/Private/ASImageNode+CGExtras.mm
index db9871815..b7550c549 100644
--- a/Source/Private/ASImageNode+CGExtras.mm
+++ b/Source/Private/ASImageNode+CGExtras.mm
@@ -9,8 +9,6 @@
 
 #import <AsyncDisplayKit/ASImageNode+CGExtras.h>
 
-#import <cmath>
-
 // TODO rewrite these to be closer to the intended use -- take UIViewContentMode as param, CGRect destinationBounds, CGSize sourceSize.
 static CGSize _ASSizeFillWithAspectRatio(CGFloat aspectRatio, CGSize constraints);
 static CGSize _ASSizeFitWithAspectRatio(CGFloat aspectRatio, CGSize constraints);
diff --git a/Source/Private/ASInternalHelpers.mm b/Source/Private/ASInternalHelpers.mm
index 11610d95c..7811c3b6b 100644
--- a/Source/Private/ASInternalHelpers.mm
+++ b/Source/Private/ASInternalHelpers.mm
@@ -9,11 +9,6 @@
 
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 
-#import <UIKit/UIKit.h>
-
-#import <objc/runtime.h>
-#import <cmath>
-
 #import <AsyncDisplayKit/ASConfigurationInternal.h>
 #import <AsyncDisplayKit/ASRunLoopQueue.h>
 #import <AsyncDisplayKit/ASSignpost.h>
diff --git a/Source/Private/ASLayoutTransition.mm b/Source/Private/ASLayoutTransition.mm
index 7b4289be4..c9511a926 100644
--- a/Source/Private/ASLayoutTransition.mm
+++ b/Source/Private/ASLayoutTransition.mm
@@ -13,7 +13,6 @@
 
 #import <AsyncDisplayKit/ASLayout.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h> // Required for _removeFromSupernodeIfEqualTo:
-#import <AsyncDisplayKit/ASLog.h>
 
 #import <queue>
 
diff --git a/Source/Private/ASMutableElementMap.mm b/Source/Private/ASMutableElementMap.mm
index dffe47d0f..f7bf21084 100644
--- a/Source/Private/ASMutableElementMap.mm
+++ b/Source/Private/ASMutableElementMap.mm
@@ -10,10 +10,8 @@
 #import <AsyncDisplayKit/ASMutableElementMap.h>
 
 #import <AsyncDisplayKit/ASCollectionElement.h>
-#import <AsyncDisplayKit/ASDataController.h>
 #import <AsyncDisplayKit/ASElementMap.h>
 #import <AsyncDisplayKit/ASTwoDimensionalArrayUtils.h>
-#import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
 
 typedef NSMutableArray<NSMutableArray<ASCollectionElement *> *> ASMutableCollectionElementTwoDimensionalArray;
 
diff --git a/Source/Private/ASTwoDimensionalArrayUtils.mm b/Source/Private/ASTwoDimensionalArrayUtils.mm
index 67267b7a9..2a333349c 100644
--- a/Source/Private/ASTwoDimensionalArrayUtils.mm
+++ b/Source/Private/ASTwoDimensionalArrayUtils.mm
@@ -16,7 +16,6 @@
 
 // Import UIKit to get [NSIndexPath indexPathForItem:inSection:] which uses
 // tagged pointers.
-#import <UIKit/UIKit.h>
 
 #pragma mark - Public Methods
 
diff --git a/Source/Private/Layout/ASStackPositionedLayout.mm b/Source/Private/Layout/ASStackPositionedLayout.mm
index 727db5d2d..0e9d896e3 100644
--- a/Source/Private/Layout/ASStackPositionedLayout.mm
+++ b/Source/Private/Layout/ASStackPositionedLayout.mm
@@ -12,7 +12,6 @@
 #import <tgmath.h>
 #import <numeric>
 
-#import <AsyncDisplayKit/ASDimension.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 #import <AsyncDisplayKit/ASLayoutSpecUtilities.h>
 #import <AsyncDisplayKit/ASLayoutSpec+Subclasses.h>
diff --git a/Source/Private/TextExperiment/Component/ASTextLayout.mm b/Source/Private/TextExperiment/Component/ASTextLayout.mm
index 5105dca21..1567322ba 100644
--- a/Source/Private/TextExperiment/Component/ASTextLayout.mm
+++ b/Source/Private/TextExperiment/Component/ASTextLayout.mm
@@ -16,8 +16,6 @@
 #import <AsyncDisplayKit/NSAttributedString+ASText.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 
-#import <pthread.h>
-
 const CGSize ASTextContainerMaxSize = (CGSize){0x100000, 0x100000};
 
 typedef struct {
diff --git a/Source/Private/TextExperiment/String/ASTextAttribute.mm b/Source/Private/TextExperiment/String/ASTextAttribute.mm
index d1abadbe1..8af432271 100644
--- a/Source/Private/TextExperiment/String/ASTextAttribute.mm
+++ b/Source/Private/TextExperiment/String/ASTextAttribute.mm
@@ -8,7 +8,6 @@
 //
 
 #import "ASTextAttribute.h"
-#import <UIKit/UIKit.h>
 #import <CoreText/CoreText.h>
 #import <AsyncDisplayKit/NSAttributedString+ASText.h>
 
diff --git a/Source/Private/TextExperiment/Utility/ASTextUtilities.mm b/Source/Private/TextExperiment/Utility/ASTextUtilities.mm
index 8d0137718..7194dadd4 100644
--- a/Source/Private/TextExperiment/Utility/ASTextUtilities.mm
+++ b/Source/Private/TextExperiment/Utility/ASTextUtilities.mm
@@ -7,7 +7,6 @@
 //
 
 #import "ASTextUtilities.h"
-#import <Accelerate/Accelerate.h>
 
 NSCharacterSet *ASTextVerticalFormRotateCharacterSet() {
   static NSMutableCharacterSet *set;
diff --git a/Source/Private/_ASCollectionGalleryLayoutItem.mm b/Source/Private/_ASCollectionGalleryLayoutItem.mm
index e0faa1802..3e4320e3c 100644
--- a/Source/Private/_ASCollectionGalleryLayoutItem.mm
+++ b/Source/Private/_ASCollectionGalleryLayoutItem.mm
@@ -10,7 +10,6 @@
 
 #import <AsyncDisplayKit/ASCollectionElement.h>
 #import <AsyncDisplayKit/ASLayout.h>
-#import <AsyncDisplayKit/ASLayoutElementPrivate.h>
 #import <AsyncDisplayKit/ASLayoutElementStylePrivate.h>
 #import <AsyncDisplayKit/ASLayoutSpec.h>
 
diff --git a/Source/Private/_ASCoreAnimationExtras.mm b/Source/Private/_ASCoreAnimationExtras.mm
index a26266b29..e73c3ade4 100644
--- a/Source/Private/_ASCoreAnimationExtras.mm
+++ b/Source/Private/_ASCoreAnimationExtras.mm
@@ -9,7 +9,6 @@
 
 #import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASAssert.h>
 
 void ASDisplayNodeSetupLayerContentsWithResizableImage(CALayer *layer, UIImage *image)
 {
diff --git a/Source/Private/_ASHierarchyChangeSet.mm b/Source/Private/_ASHierarchyChangeSet.mm
index 2b264dd6b..825c6b8c0 100644
--- a/Source/Private/_ASHierarchyChangeSet.mm
+++ b/Source/Private/_ASHierarchyChangeSet.mm
@@ -11,12 +11,9 @@
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 #import <AsyncDisplayKit/ASCollections.h>
 #import <AsyncDisplayKit/NSIndexSet+ASHelpers.h>
-#import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASDisplayNode+Beta.h>
-#import <AsyncDisplayKit/ASObjectDescriptionHelpers.h>
 #import <unordered_map>
 #import <AsyncDisplayKit/ASDataController.h>
-#import <AsyncDisplayKit/ASBaseDefines.h>
 
 // If assertions are enabled and they haven't forced us to suppress the exception,
 // then throw, otherwise log.
diff --git a/Source/Private/_ASPendingState.mm b/Source/Private/_ASPendingState.mm
index c85ef4a96..29ebd2403 100644
--- a/Source/Private/_ASPendingState.mm
+++ b/Source/Private/_ASPendingState.mm
@@ -10,10 +10,7 @@
 #import <AsyncDisplayKit/_ASPendingState.h>
 
 #import <AsyncDisplayKit/_ASCoreAnimationExtras.h>
-#import <AsyncDisplayKit/_ASAsyncTransactionContainer.h>
-#import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASEqualityHelpers.h>
-#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
 
 #define __shouldSetNeedsDisplayForView(view) (flags.needsDisplay \
diff --git a/Source/TextKit/ASTextKitComponents.mm b/Source/TextKit/ASTextKitComponents.mm
index eeff17607..95ae1db83 100644
--- a/Source/TextKit/ASTextKitComponents.mm
+++ b/Source/TextKit/ASTextKitComponents.mm
@@ -9,7 +9,6 @@
 
 #import <AsyncDisplayKit/ASTextKitComponents.h>
 #import <AsyncDisplayKit/ASAssert.h>
-#import <AsyncDisplayKit/ASMainThreadDeallocation.h>
 
 #import <tgmath.h>
 
diff --git a/Source/TextKit/ASTextKitContext.mm b/Source/TextKit/ASTextKitContext.mm
index dfde01fe4..e5b16a696 100644
--- a/Source/TextKit/ASTextKitContext.mm
+++ b/Source/TextKit/ASTextKitContext.mm
@@ -14,8 +14,6 @@
 #import <AsyncDisplayKit/ASLayoutManager.h>
 #import <AsyncDisplayKit/ASThread.h>
 
-#include <memory>
-
 @implementation ASTextKitContext
 {
   // All TextKit operations (even non-mutative ones) must be executed serially.
diff --git a/Source/TextKit/ASTextKitCoreTextAdditions.mm b/Source/TextKit/ASTextKitCoreTextAdditions.mm
index df3df696c..a6c72d5d9 100644
--- a/Source/TextKit/ASTextKitCoreTextAdditions.mm
+++ b/Source/TextKit/ASTextKitCoreTextAdditions.mm
@@ -14,8 +14,6 @@
 #import <CoreText/CTFont.h>
 #import <CoreText/CTStringAttributes.h>
 
-#import <AsyncDisplayKit/ASAssert.h>
-
 #pragma mark - Public
 BOOL ASAttributeWithNameIsUnsupportedCoreTextAttribute(NSString *attributeName)
 {
diff --git a/Source/TextKit/ASTextKitFontSizeAdjuster.mm b/Source/TextKit/ASTextKitFontSizeAdjuster.mm
index aeea44d7c..30591a87d 100644
--- a/Source/TextKit/ASTextKitFontSizeAdjuster.mm
+++ b/Source/TextKit/ASTextKitFontSizeAdjuster.mm
@@ -13,7 +13,6 @@
 #if AS_ENABLE_TEXTNODE
 
 #import <tgmath.h>
-#import <mutex>
 
 #import <AsyncDisplayKit/ASLayoutManager.h>
 #import <AsyncDisplayKit/ASTextKitContext.h>
diff --git a/Source/TextKit/ASTextKitRenderer.mm b/Source/TextKit/ASTextKitRenderer.mm
index 5da78e1f7..34895cc3e 100644
--- a/Source/TextKit/ASTextKitRenderer.mm
+++ b/Source/TextKit/ASTextKitRenderer.mm
@@ -17,8 +17,6 @@
 #import <AsyncDisplayKit/ASTextKitShadower.h>
 #import <AsyncDisplayKit/ASTextKitTailTruncater.h>
 #import <AsyncDisplayKit/ASTextKitFontSizeAdjuster.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
-#import <AsyncDisplayKit/ASRunLoopQueue.h>
 
 //#define LOG(...) NSLog(__VA_ARGS__)
 #define LOG(...)
diff --git a/Source/UIImage+ASConvenience.mm b/Source/UIImage+ASConvenience.mm
index cacb4e4f1..3f0cc665e 100644
--- a/Source/UIImage+ASConvenience.mm
+++ b/Source/UIImage+ASConvenience.mm
@@ -9,7 +9,6 @@
 
 #import <AsyncDisplayKit/UIImage+ASConvenience.h>
 #import <AsyncDisplayKit/ASGraphicsContext.h>
-#import <AsyncDisplayKit/ASInternalHelpers.h>
 
 #pragma mark - ASDKFastImageNamed