diff --git a/Libraries/ART/ARTNode.h b/Libraries/ART/ARTNode.h
index b918fad25..0ade1f21b 100644
--- a/Libraries/ART/ARTNode.h
+++ b/Libraries/ART/ARTNode.h
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "UIView+React.h"
+#import <React/UIView+React.h>
 
 /**
  * ART nodes are implemented as empty UIViews but this is just an implementation detail to fit
diff --git a/Libraries/ART/ARTSurfaceView.m b/Libraries/ART/ARTSurfaceView.m
index 0bb3cc846..96191360a 100644
--- a/Libraries/ART/ARTSurfaceView.m
+++ b/Libraries/ART/ARTSurfaceView.m
@@ -9,8 +9,9 @@
 
 #import "ARTSurfaceView.h"
 
+#import <React/RCTLog.h>
+
 #import "ARTNode.h"
-#import "RCTLog.h"
 
 @implementation ARTSurfaceView
 
diff --git a/Libraries/ART/Brushes/ARTBrush.m b/Libraries/ART/Brushes/ARTBrush.m
index ab0281e82..1cc762b65 100644
--- a/Libraries/ART/Brushes/ARTBrush.m
+++ b/Libraries/ART/Brushes/ARTBrush.m
@@ -9,7 +9,7 @@
 
 #import "ARTBrush.h"
 
-#import "RCTDefines.h"
+#import <React/RCTDefines.h>
 
 @implementation ARTBrush
 
diff --git a/Libraries/ART/Brushes/ARTLinearGradient.m b/Libraries/ART/Brushes/ARTLinearGradient.m
index e34fd59fd..f8412163b 100644
--- a/Libraries/ART/Brushes/ARTLinearGradient.m
+++ b/Libraries/ART/Brushes/ARTLinearGradient.m
@@ -9,8 +9,9 @@
 
 #import "ARTLinearGradient.h"
 
+#import <React/RCTLog.h>
+
 #import "RCTConvert+ART.h"
-#import "RCTLog.h"
 
 @implementation ARTLinearGradient
 {
diff --git a/Libraries/ART/Brushes/ARTPattern.m b/Libraries/ART/Brushes/ARTPattern.m
index a0e6d5a5d..0d720613b 100644
--- a/Libraries/ART/Brushes/ARTPattern.m
+++ b/Libraries/ART/Brushes/ARTPattern.m
@@ -9,8 +9,9 @@
 
 #import "ARTPattern.h"
 
+#import <React/RCTLog.h>
+
 #import "RCTConvert+ART.h"
-#import "RCTLog.h"
 
 @implementation ARTPattern
 {
diff --git a/Libraries/ART/Brushes/ARTRadialGradient.m b/Libraries/ART/Brushes/ARTRadialGradient.m
index cb3ae65a2..1dd449595 100644
--- a/Libraries/ART/Brushes/ARTRadialGradient.m
+++ b/Libraries/ART/Brushes/ARTRadialGradient.m
@@ -9,8 +9,9 @@
 
 #import "ARTRadialGradient.h"
 
+#import <React/RCTLog.h>
+
 #import "RCTConvert+ART.h"
-#import "RCTLog.h"
 
 @implementation ARTRadialGradient
 {
diff --git a/Libraries/ART/Brushes/ARTSolidColor.m b/Libraries/ART/Brushes/ARTSolidColor.m
index bfeff00bd..900621cfb 100644
--- a/Libraries/ART/Brushes/ARTSolidColor.m
+++ b/Libraries/ART/Brushes/ARTSolidColor.m
@@ -9,8 +9,9 @@
 
 #import "ARTSolidColor.h"
 
+#import <React/RCTLog.h>
+
 #import "RCTConvert+ART.h"
-#import "RCTLog.h"
 
 @implementation ARTSolidColor
 {
diff --git a/Libraries/ART/RCTConvert+ART.h b/Libraries/ART/RCTConvert+ART.h
index 3cbd0e787..ef46e4e93 100644
--- a/Libraries/ART/RCTConvert+ART.h
+++ b/Libraries/ART/RCTConvert+ART.h
@@ -9,10 +9,11 @@
 
 #import <QuartzCore/QuartzCore.h>
 
+#import <React/RCTConvert.h>
+
 #import "ARTBrush.h"
 #import "ARTCGFloatArray.h"
 #import "ARTTextFrame.h"
-#import "RCTConvert.h"
 
 @interface RCTConvert (ART)
 
diff --git a/Libraries/ART/RCTConvert+ART.m b/Libraries/ART/RCTConvert+ART.m
index 5bb959b30..704f12697 100644
--- a/Libraries/ART/RCTConvert+ART.m
+++ b/Libraries/ART/RCTConvert+ART.m
@@ -9,12 +9,13 @@
 
 #import "RCTConvert+ART.h"
 
+#import <React/RCTFont.h>
+#import <React/RCTLog.h>
+
 #import "ARTLinearGradient.h"
 #import "ARTPattern.h"
 #import "ARTRadialGradient.h"
 #import "ARTSolidColor.h"
-#import "RCTLog.h"
-#import "RCTFont.h"
 
 @implementation RCTConvert (ART)
 
diff --git a/Libraries/ART/ViewManagers/ARTNodeManager.h b/Libraries/ART/ViewManagers/ARTNodeManager.h
index 1097eefde..22f2ef166 100644
--- a/Libraries/ART/ViewManagers/ARTNodeManager.h
+++ b/Libraries/ART/ViewManagers/ARTNodeManager.h
@@ -7,8 +7,9 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "ARTNode.h"
-#import "RCTViewManager.h"
+#import <React/RCTViewManager.h>
+
+@class ARTNode;
 
 @interface ARTNodeManager : RCTViewManager
 
diff --git a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
index 6d8e14004..fc36435ed 100644
--- a/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
+++ b/Libraries/ART/ViewManagers/ARTSurfaceViewManager.h
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "RCTViewManager.h"
+#import <React/RCTViewManager.h>
 
 @interface ARTSurfaceViewManager : RCTViewManager