diff --git a/YogaKit/Source/UIView+Yoga.h b/YogaKit/Source/UIView+Yoga.h
index b3c2c2f9..078e4d75 100644
--- a/YogaKit/Source/UIView+Yoga.h
+++ b/YogaKit/Source/UIView+Yoga.h
@@ -8,10 +8,10 @@
 #import <TargetConditionals.h>
 
 #if TARGET_OS_OSX
-#import <AppKit/AppKit.h>
+@import AppKit;
 #define UIView NSView
 #else
-#import <UIKit/UIKit.h>
+@import UIKit;
 #endif
 
 #import "YogaKit.h"
diff --git a/YogaKit/Source/UIView+Yoga.m b/YogaKit/Source/UIView+Yoga.m
index e472c9c7..d47954b4 100644
--- a/YogaKit/Source/UIView+Yoga.m
+++ b/YogaKit/Source/UIView+Yoga.m
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <objc/runtime.h>
 #import "UIView+Yoga.h"
 #import "YGLayout+Private.h"
+@import ObjectiveC;
 
 static const void* kYGYogaAssociatedKey = &kYGYogaAssociatedKey;
 
diff --git a/YogaKit/Source/YogaKit.h b/YogaKit/Source/YogaKit.h
index 5e4f3631..8235f325 100644
--- a/YogaKit/Source/YogaKit.h
+++ b/YogaKit/Source/YogaKit.h
@@ -8,9 +8,9 @@
 #import <TargetConditionals.h>
 
 #if TARGET_OS_OSX
-#import <AppKit/AppKit.h>
+@import AppKit;
 #else
-#import <UIKit/UIKit.h>
+@import UIKit;
 #endif
 
 #import "../../yoga/YGEnums.h"
diff --git a/YogaKit/Source/modulemap/YogaKit-umbrella.h b/YogaKit/Source/modulemap/YogaKit-umbrella.h
deleted file mode 100644
index eab3f408..00000000
--- a/YogaKit/Source/modulemap/YogaKit-umbrella.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#import "../YogaKit.h"
-#import "../UIView+Yoga.h"
diff --git a/YogaKit/Source/modulemap/module.modulemap b/YogaKit/Source/modulemap/module.modulemap
index c956df7d..0ffc9ecf 100644
--- a/YogaKit/Source/modulemap/module.modulemap
+++ b/YogaKit/Source/modulemap/module.modulemap
@@ -1,4 +1,5 @@
 module YogaKit {
-    umbrella header "YogaKit-umbrella.h"
+    header "../YogaKit.h"
+    header "../UIView+Yoga.h"
     export *
 }
diff --git a/yoga/modulemap/Yoga-umbrella.h b/yoga/modulemap/Yoga-umbrella.h
deleted file mode 100644
index 2c8877ac..00000000
--- a/yoga/modulemap/Yoga-umbrella.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifdef __OBJC__
-#import <Foundation/Foundation.h>
-#endif
-
-#import "../YGEnums.h"
-#import "../YGMacros.h"
-#import "../YGValue.h"
-#import "../Yoga.h"
diff --git a/yoga/modulemap/module.modulemap b/yoga/modulemap/module.modulemap
index 89ae11c1..590f7ded 100644
--- a/yoga/modulemap/module.modulemap
+++ b/yoga/modulemap/module.modulemap
@@ -1,4 +1,7 @@
 module Yoga [extern_c] {
-    umbrella header "Yoga-umbrella.h"
+    header "../Yoga.h"
+    header "../YGValue.h"
+    header "../YGMacros.h"
+    header "../YGEnums.h"
     export *
 }