diff --git a/ReactAndroid/src/main/jni/first-party/fb/BUCK b/ReactAndroid/src/main/jni/first-party/fb/BUCK
index 857551cc02d..4ffcf0c9cb2 100644
--- a/ReactAndroid/src/main/jni/first-party/fb/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/fb/BUCK
@@ -2,7 +2,7 @@ include_defs("//ReactAndroid/DEFS")
 
 # This target is only used in open source
 if IS_OSS_BUILD:
-  fb_xplat_cxx_library(
+  cxx_library(
     name = 'jni',
     soname = 'libfb.$(ext)',
     srcs = glob(['*.cpp', 'jni/*.cpp', 'lyra/*.cpp']),
diff --git a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
index 0a8cc76675d..783e60f16b9 100644
--- a/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/fbgloginit/BUCK
@@ -2,7 +2,7 @@ include_defs("//ReactAndroid/DEFS")
 
 include_defs("//ReactCommon/DEFS")
 
-fb_xplat_cxx_library(
+cxx_library(
     name = "fbgloginit",
     srcs = [
         "glog_init.cpp",
diff --git a/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK b/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
index 269650e6529..467d19c9f4b 100644
--- a/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/jni-hack/BUCK
@@ -7,7 +7,7 @@ include_defs("//ReactAndroid/DEFS")
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-fb_xplat_cxx_library(
+cxx_library(
     name = "jni-hack",
     header_namespace = "",
     exported_headers = [
diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/BUCK b/ReactAndroid/src/main/jni/first-party/yogajni/BUCK
index b7fbdb563cf..afbd386b6b1 100644
--- a/ReactAndroid/src/main/jni/first-party/yogajni/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/yogajni/BUCK
@@ -2,7 +2,7 @@ include_defs("//ReactAndroid/DEFS")
 
 # This target is only used in open source
 if IS_OSS_BUILD:
-  fb_xplat_cxx_library(
+  cxx_library(
     name = 'jni',
     soname = 'libyoga.$(ext)',
     srcs = glob(['jni/*.cpp']),
diff --git a/ReactAndroid/src/main/jni/packagerconnection/BUCK b/ReactAndroid/src/main/jni/packagerconnection/BUCK
index b9df8816806..c55fd14279c 100644
--- a/ReactAndroid/src/main/jni/packagerconnection/BUCK
+++ b/ReactAndroid/src/main/jni/packagerconnection/BUCK
@@ -1,6 +1,6 @@
 include_defs("//ReactAndroid/DEFS")
 
-fb_xplat_cxx_library(
+cxx_library(
     name = "jni",
     srcs = glob(["*.cpp"]),
     headers = glob(
diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK
index a9570b42576..32878cae633 100644
--- a/ReactAndroid/src/main/jni/react/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/jni/BUCK
@@ -20,7 +20,7 @@ EXPORTED_HEADERS = [
     "WritableNativeMap.h",
 ]
 
-fb_xplat_cxx_library(
+cxx_library(
     name = "jni",
     srcs = glob(["*.cpp"]),
     headers = glob(
diff --git a/ReactAndroid/src/main/jni/react/perftests/BUCK b/ReactAndroid/src/main/jni/react/perftests/BUCK
index 55f21e6f9b7..347a578e4e8 100644
--- a/ReactAndroid/src/main/jni/react/perftests/BUCK
+++ b/ReactAndroid/src/main/jni/react/perftests/BUCK
@@ -1,6 +1,6 @@
 include_defs("//ReactAndroid/DEFS")
 
-fb_xplat_cxx_library(
+cxx_library(
     name = "perftests",
     srcs = ["OnLoad.cpp"],
     compiler_flags = [
diff --git a/ReactCommon/microprofiler/BUCK b/ReactCommon/microprofiler/BUCK
index b1c15c02a6c..8922e082af3 100644
--- a/ReactCommon/microprofiler/BUCK
+++ b/ReactCommon/microprofiler/BUCK
@@ -1,6 +1,6 @@
 include_defs("//ReactCommon/DEFS")
 
-fb_xplat_cxx_library(
+cxx_library(
     name = "microprofiler",
     srcs = [
         "MicroProfiler.cpp",
diff --git a/ReactCommon/yoga/BUCK b/ReactCommon/yoga/BUCK
index 65bfdf41853..6e6f1b2e998 100644
--- a/ReactCommon/yoga/BUCK
+++ b/ReactCommon/yoga/BUCK
@@ -1,4 +1,4 @@
-fb_xplat_cxx_library(
+cxx_library(
     name = "yoga",
     srcs = glob(["yoga/*.cpp"]),
     header_namespace = "",