diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
index d447077ef..0da530277 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/common/BUCK
@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library")
 
 rn_android_library(
     name = "common",
diff --git a/ReactAndroid/src/test/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/test/java/com/facebook/react/fabric/BUCK
index ea1a915c7..7470610e7 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/fabric/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/fabric/BUCK
@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "IS_OSS_BUILD", "YOGA_TARGET", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
+load("//tools/build_defs/oss:rn_defs.bzl", "IS_OSS_BUILD", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_robolectric_test")
 
 rn_robolectric_test(
     name = "fabric",
diff --git a/ReactCommon/fabric/attributedstring/BUCK b/ReactCommon/fabric/attributedstring/BUCK
index e32d580f9..e82d6463f 100644
--- a/ReactCommon/fabric/attributedstring/BUCK
+++ b/ReactCommon/fabric/attributedstring/BUCK
@@ -1,14 +1,14 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
     "APPLE",
+    "fb_xplat_cxx_test",
+    "get_apple_compiler_flags",
     "get_apple_inspector_flags",
     "react_native_xplat_target",
-    "get_apple_compiler_flags",
-    "subdir_glob",
-    "fb_xplat_cxx_test",
     "rn_xplat_cxx_library",
+    "subdir_glob",
 )
 
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
diff --git a/ReactCommon/fabric/components/activityindicator/BUCK b/ReactCommon/fabric/components/activityindicator/BUCK
index 44858b927..e26937e28 100644
--- a/ReactCommon/fabric/components/activityindicator/BUCK
+++ b/ReactCommon/fabric/components/activityindicator/BUCK
@@ -1,5 +1,5 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "subdir_glob", "fb_xplat_cxx_test", "get_apple_compiler_flags", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "fb_xplat_cxx_test", "get_apple_compiler_flags", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
 
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
diff --git a/ReactCommon/fabric/components/image/BUCK b/ReactCommon/fabric/components/image/BUCK
index 7cac31741..b8933ef7c 100644
--- a/ReactCommon/fabric/components/image/BUCK
+++ b/ReactCommon/fabric/components/image/BUCK
@@ -1,4 +1,4 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
diff --git a/ReactCommon/fabric/components/root/BUCK b/ReactCommon/fabric/components/root/BUCK
index 96c05abaa..8f3e2542d 100644
--- a/ReactCommon/fabric/components/root/BUCK
+++ b/ReactCommon/fabric/components/root/BUCK
@@ -1,14 +1,14 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
     "APPLE",
-    "subdir_glob",
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
+    "subdir_glob",
 )
 
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
diff --git a/ReactCommon/fabric/components/scrollview/BUCK b/ReactCommon/fabric/components/scrollview/BUCK
index 78edc3a52..f20ab9dd8 100644
--- a/ReactCommon/fabric/components/scrollview/BUCK
+++ b/ReactCommon/fabric/components/scrollview/BUCK
@@ -1,4 +1,4 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
diff --git a/ReactCommon/fabric/components/switch/BUCK b/ReactCommon/fabric/components/switch/BUCK
index 15f5ad09c..67c4adf00 100644
--- a/ReactCommon/fabric/components/switch/BUCK
+++ b/ReactCommon/fabric/components/switch/BUCK
@@ -1,14 +1,14 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
     "APPLE",
+    "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
-    "subdir_glob",
     "get_apple_inspector_flags",
     "react_native_xplat_target",
-    "fb_xplat_cxx_test",
     "rn_xplat_cxx_library",
+    "subdir_glob",
 )
 
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
diff --git a/ReactCommon/fabric/components/text/BUCK b/ReactCommon/fabric/components/text/BUCK
index 0471a8797..4d90e88ba 100644
--- a/ReactCommon/fabric/components/text/BUCK
+++ b/ReactCommon/fabric/components/text/BUCK
@@ -1,4 +1,4 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
diff --git a/ReactCommon/fabric/components/view/BUCK b/ReactCommon/fabric/components/view/BUCK
index e8bbb199d..71b2b16f7 100644
--- a/ReactCommon/fabric/components/view/BUCK
+++ b/ReactCommon/fabric/components/view/BUCK
@@ -1,4 +1,4 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
diff --git a/ReactCommon/fabric/core/BUCK b/ReactCommon/fabric/core/BUCK
index eda856227..2ff9b4bb8 100644
--- a/ReactCommon/fabric/core/BUCK
+++ b/ReactCommon/fabric/core/BUCK
@@ -1,5 +1,5 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "subdir_glob", "fb_xplat_cxx_test", "get_apple_compiler_flags", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "fb_xplat_cxx_test", "get_apple_compiler_flags", "get_apple_inspector_flags", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
 
 APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 
diff --git a/ReactCommon/fabric/debug/BUCK b/ReactCommon/fabric/debug/BUCK
index 9b7e9567e..a6e139200 100644
--- a/ReactCommon/fabric/debug/BUCK
+++ b/ReactCommon/fabric/debug/BUCK
@@ -1,7 +1,5 @@
 load(
     "//configurations/buck/apple:flag_defs.bzl",
-    "OBJC_ARC_PREPROCESSOR_FLAGS",
-    "get_application_ios_flags",
     "get_debug_preprocessor_flags",
 )
 load(
@@ -11,7 +9,6 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
-    "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
 )
diff --git a/ReactCommon/fabric/events/BUCK b/ReactCommon/fabric/events/BUCK
index edcb66e7b..b049a9c06 100644
--- a/ReactCommon/fabric/events/BUCK
+++ b/ReactCommon/fabric/events/BUCK
@@ -1,4 +1,4 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
diff --git a/ReactCommon/fabric/graphics/BUCK b/ReactCommon/fabric/graphics/BUCK
index 549213029..327bcf8f5 100644
--- a/ReactCommon/fabric/graphics/BUCK
+++ b/ReactCommon/fabric/graphics/BUCK
@@ -1,4 +1,4 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
@@ -6,7 +6,6 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
-    "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
 )
diff --git a/ReactCommon/fabric/imagemanager/BUCK b/ReactCommon/fabric/imagemanager/BUCK
index 25c8925f0..903eb6d72 100644
--- a/ReactCommon/fabric/imagemanager/BUCK
+++ b/ReactCommon/fabric/imagemanager/BUCK
@@ -1,13 +1,13 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",
     "APPLE",
-    "get_apple_inspector_flags",
+    "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
     "react_native_xplat_target",
     "rn_xplat_cxx_library",
-    "fb_xplat_cxx_test",
     "subdir_glob",
 )
 
diff --git a/ReactCommon/fabric/textlayoutmanager/BUCK b/ReactCommon/fabric/textlayoutmanager/BUCK
index 6ddd976c2..f44526e9d 100644
--- a/ReactCommon/fabric/textlayoutmanager/BUCK
+++ b/ReactCommon/fabric/textlayoutmanager/BUCK
@@ -1,4 +1,4 @@
-load("@xplat//configurations/buck/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_application_ios_flags", "get_debug_preprocessor_flags")
+load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags")
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
     "ANDROID",