diff --git a/Libraries/LinkingIOS/RCTLinkingManager.h b/Libraries/LinkingIOS/RCTLinkingManager.h
index f2ec63215..98e40beee 100644
--- a/Libraries/LinkingIOS/RCTLinkingManager.h
+++ b/Libraries/LinkingIOS/RCTLinkingManager.h
@@ -9,7 +9,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "RCTBridgeModule.h"
+#import "../../React/Base/RCTBridgeModule.h"
 
 @interface RCTLinkingManager : NSObject <RCTBridgeModule>
 
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
index b60a646e4..4e791c680 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
@@ -9,7 +9,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "RCTBridgeModule.h"
+#import "../../React/Base/RCTBridgeModule.h"
 
 @interface RCTPushNotificationManager : NSObject <RCTBridgeModule>
 
diff --git a/React/Base/RCTConvert.h b/React/Base/RCTConvert.h
index c8d6ecada..ba8ef6986 100644
--- a/React/Base/RCTConvert.h
+++ b/React/Base/RCTConvert.h
@@ -10,10 +10,11 @@
 #import <QuartzCore/QuartzCore.h>
 #import <UIKit/UIKit.h>
 
-#import "Layout.h"
-#import "RCTAnimationType.h"
+#import "../Layout/Layout.h"
+#import "../Views/RCTAnimationType.h"
+#import "../Views/RCTPointerEvents.h"
+
 #import "RCTLog.h"
-#import "RCTPointerEvents.h"
 
 /**
  * This class provides a collection of conversion functions for mapping
diff --git a/React/Modules/RCTUIManager.h b/React/Modules/RCTUIManager.h
index 894849ffc..c70dda9c6 100644
--- a/React/Modules/RCTUIManager.h
+++ b/React/Modules/RCTUIManager.h
@@ -9,10 +9,10 @@
 
 #import <UIKit/UIKit.h>
 
-#import "RCTBridge.h"
-#import "RCTBridgeModule.h"
-#import "RCTInvalidating.h"
-#import "RCTViewManager.h"
+#import "../Base/RCTBridge.h"
+#import "../Base/RCTBridgeModule.h"
+#import "../Base/RCTInvalidating.h"
+#import "../Views/RCTViewManager.h"
 
 @protocol RCTScrollableProtocol;
 
diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h
index 8d68855f7..6efb0c1d1 100644
--- a/React/Views/RCTShadowView.h
+++ b/React/Views/RCTShadowView.h
@@ -9,7 +9,8 @@
 
 #import <UIKit/UIKit.h>
 
-#import "Layout.h"
+#import "../Layout/Layout.h"
+
 #import "RCTViewNodeProtocol.h"
 
 @class RCTSparseArray;
diff --git a/React/Views/RCTViewManager.h b/React/Views/RCTViewManager.h
index 6f2188d3d..5c1c609d3 100644
--- a/React/Views/RCTViewManager.h
+++ b/React/Views/RCTViewManager.h
@@ -9,9 +9,9 @@
 
 #import <UIKit/UIKit.h>
 
-#import "RCTBridgeModule.h"
-#import "RCTConvert.h"
-#import "RCTLog.h"
+#import "../Base/RCTBridgeModule.h"
+#import "../Base/RCTConvert.h"
+#import "../Base/RCTLog.h"
 
 @class RCTBridge;
 @class RCTEventDispatcher;