diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK
index c6bfc5cea..b2776f170 100644
--- a/ReactAndroid/src/main/jni/react/jni/BUCK
+++ b/ReactAndroid/src/main/jni/react/jni/BUCK
@@ -56,7 +56,9 @@ rn_xplat_cxx_library(
         "fbandroid//xplat/fbgloginit:fbgloginit",
         "xplat//fbsystrace:fbsystrace",
         react_native_xplat_target("cxxreact:bridge"),
+        react_native_xplat_target("cxxreact:jsbigstring"),
         react_native_xplat_target("cxxreact:module"),
+        react_native_xplat_target("jsinspector:jsinspector"),
         react_native_xplat_dep("jsi:jsi"),
         FBJNI_TARGET,
     ]) if not IS_OSS_BUILD else [],
diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK
index 1d0c7f55d..929d766b4 100644
--- a/ReactCommon/cxxreact/BUCK
+++ b/ReactCommon/cxxreact/BUCK
@@ -125,7 +125,6 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = get_apple_compiler_flags(),
     fbobjc_force_static = True,
     fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
-    force_static = True,
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE),
     preprocessor_flags = [
diff --git a/ReactCommon/cxxreact/tests/BUCK b/ReactCommon/cxxreact/tests/BUCK
index c6dc902d6..8e2282f24 100644
--- a/ReactCommon/cxxreact/tests/BUCK
+++ b/ReactCommon/cxxreact/tests/BUCK
@@ -27,6 +27,7 @@ jni_instrumentation_test_lib(
         "fbandroid//instrumentation_tests/...",
     ],
     deps = [
+        "xplat//folly:dynamic",
         "xplat//third-party/gmock:gtest",
         "xplat//third-party/linker_lib:android",
         "xplat//third-party/linker_lib:atomic",
diff --git a/ReactCommon/jsiexecutor/BUCK b/ReactCommon/jsiexecutor/BUCK
index c979a1a68..9850db4dc 100644
--- a/ReactCommon/jsiexecutor/BUCK
+++ b/ReactCommon/jsiexecutor/BUCK
@@ -32,8 +32,10 @@ cxx_library(
     ],
     xcode_public_headers_symlinks = True,
     deps = [
+        "xplat//fbsystrace:fbsystrace",
         react_native_xplat_dep("jsi:jsi"),
         react_native_xplat_dep("jsi:JSIDynamic"),
         react_native_xplat_target("cxxreact:bridge"),
+        react_native_xplat_target("cxxreact:jsbigstring"),
     ],
 )