diff --git a/ReactCommon/react/renderer/graphics/BUCK b/ReactCommon/react/renderer/graphics/BUCK
index c41482d5a46..5c103d48d3f 100644
--- a/ReactCommon/react/renderer/graphics/BUCK
+++ b/ReactCommon/react/renderer/graphics/BUCK
@@ -14,6 +14,8 @@ load(
     "subdir_glob",
 )
 
+oncall("react_native")
+
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
 rn_xplat_cxx_library(
@@ -67,7 +69,7 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_exported_headers = subdir_glob(
         [
-            ("platform/ios", "*.h"),
+            ("platform/ios/react/renderer/graphics", "*.h"),
         ],
         prefix = "react/renderer/graphics",
     ),
diff --git a/ReactCommon/react/renderer/graphics/platform/ios/Float.h b/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/Float.h
similarity index 100%
rename from ReactCommon/react/renderer/graphics/platform/ios/Float.h
rename to ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/Float.h
diff --git a/ReactCommon/react/renderer/graphics/platform/ios/PlatformColorParser.h b/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/PlatformColorParser.h
similarity index 100%
rename from ReactCommon/react/renderer/graphics/platform/ios/PlatformColorParser.h
rename to ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/PlatformColorParser.h
diff --git a/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.h b/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h
similarity index 100%
rename from ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.h
rename to ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h
diff --git a/ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.mm b/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.mm
similarity index 100%
rename from ReactCommon/react/renderer/graphics/platform/ios/RCTPlatformColorUtils.mm
rename to ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.mm