diff --git a/submodules/AsyncDisplayKit/BUILD b/submodules/AsyncDisplayKit/BUILD
index 725364d30b..8ff32fdb93 100644
--- a/submodules/AsyncDisplayKit/BUILD
+++ b/submodules/AsyncDisplayKit/BUILD
@@ -6,13 +6,14 @@ ASYNCDISPLAYKIT_EXPORTED_HEADERS = glob([
   "Source/Base/*.h",
   "Source/Debug/AsyncDisplayKit+Debug.h",
   "Source/TextKit/ASTextNodeTypes.h",
-  "Source/TextKit/ASTextKitComponents.h"
-], exclude = ["Source/AsyncDisplayKit.h"])
+  "Source/TextKit/ASTextKitComponents.h",
+], exclude = ["_Source/AsyncDisplayKit.h"]
+)
 
 ASYNCDISPLAYKIT_PRIVATE_HEADERS = glob([
     "Source/**/*.h"
   ],
-  exclude = ASYNCDISPLAYKIT_EXPORTED_HEADERS + ["Source/AsyncDisplayKit.h"],
+  exclude = ASYNCDISPLAYKIT_EXPORTED_HEADERS + ["_Source/AsyncDisplayKit.h"],
 )
 
 exported_headers_rule_name = "AsyncDisplayKit_ExportedHeaders"
@@ -48,7 +49,7 @@ objc_library(
         "Source/**/*.m",
         "Source/**/*.mm",
         "Source/Base/*.m",
-    ]) + private_headers,
+    ]) + ASYNCDISPLAYKIT_EXPORTED_HEADERS + ASYNCDISPLAYKIT_PRIVATE_HEADERS + private_headers,
     hdrs = exported_headers,
     defines = [
         "MINIMAL_ASDK",
diff --git a/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.mm b/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.mm
index 0b96f07264..195e478c22 100644
--- a/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.mm
+++ b/submodules/AsyncDisplayKit/Source/ASButtonNode+Yoga.mm
@@ -6,6 +6,8 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
+#if YOGA
+
 #import "AsyncDisplayKit/ASAvailability.h"
 #import "ASButtonNode+Yoga.h"
 #import <AsyncDisplayKit/ASButtonNode+Private.h>
@@ -13,7 +15,6 @@
 #import <AsyncDisplayKit/ASStackLayoutSpecUtilities.h>
 #import <AsyncDisplayKit/ASThread.h>
 
-#if YOGA
 static void ASButtonNodeResolveHorizontalAlignmentForStyle(ASLayoutElementStyle *style, ASStackLayoutDirection _direction, ASHorizontalAlignment _horizontalAlignment, ASStackLayoutJustifyContent _justifyContent, ASStackLayoutAlignItems _alignItems) {
   if (_direction == ASStackLayoutDirectionHorizontal) {
     style.justifyContent = justifyContent(_horizontalAlignment, _justifyContent);
@@ -97,6 +98,8 @@ static void ASButtonNodeResolveVerticalAlignmentForStyle(ASLayoutElementStyle *s
 
 #else
 
+#import <AsyncDisplayKit/ASButtonNode+Private.h>
+
 @implementation ASButtonNode (Yoga)
 
 - (void)updateYogaLayoutIfNeeded {}
diff --git a/submodules/AsyncDisplayKit/Source/Details/ASTraitCollection.mm b/submodules/AsyncDisplayKit/Source/Details/ASTraitCollection.mm
index 8a65399dde..efabee7257 100644
--- a/submodules/AsyncDisplayKit/Source/Details/ASTraitCollection.mm
+++ b/submodules/AsyncDisplayKit/Source/Details/ASTraitCollection.mm
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import <AsyncDisplayKit/Base/ASAvailability.h>
+#import <AsyncDisplayKit/ASAvailability.h>
 #import <AsyncDisplayKit/ASAvailability.h>
 #import <AsyncDisplayKit/ASHashing.h>
 #import <AsyncDisplayKit/ASTraitCollection.h>