diff --git a/React/CoreModules/BUCK b/React/CoreModules/BUCK
index 22ead8b1554..96039ea82f6 100644
--- a/React/CoreModules/BUCK
+++ b/React/CoreModules/BUCK
@@ -1,5 +1,5 @@
 load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_debug_preprocessor_flags", "get_fbobjc_enable_exception_lang_compiler_flags_DEPRECATED")
-load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "rn_apple_library", "rn_debug_flags", "subdir_glob")
+load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "rn_apple_library", "rn_debug_flags")
 load(
     "@fbsource//xplat/configurations/buck/apple/plugins/sad_xplat_hosted_configurations:react_module_registration.bzl",
     "react_module_plugin_providers",
@@ -13,7 +13,7 @@ rn_apple_library(
             "**/*.mm",
         ],
     ),
-    headers = ["CoreModulesPlugins.h"],
+    exported_headers = glob(["**/*.h"]),
     compiler_flags = [
         "-Wno-error=unguarded-availability-new",
         "-Wno-unknown-warning-option",
@@ -30,6 +30,7 @@ rn_apple_library(
         "Foundation",
         "UIKit",
     ],
+    header_path_prefix = "React",
     lang_compiler_flags = get_fbobjc_enable_exception_lang_compiler_flags_DEPRECATED(),
     link_whole = True,
     platform_preprocessor_flags = [(
@@ -47,53 +48,5 @@ rn_apple_library(
     exported_deps = [
         "fbsource//xplat/js/react-native-github:ReactInternalApple",
         "fbsource//xplat/js/react-native-github/Libraries/FBReactNativeSpec:FBReactNativeSpecApple",
-        ":CoreModulesAppleHeader",
-    ],
-)
-
-# Workaround: define exported headers target separately so that the header
-# namespace can be specified correctly.
-rn_apple_library(
-    name = "CoreModulesAppleHeader",
-    srcs = [],
-    header_namespace = "",
-    exported_headers = subdir_glob(
-        [
-            (
-                "",
-                "*.h",
-            ),
-        ],
-        exclude = ["CoreModulesPlugins.h"],
-        prefix = "React",
-    ),
-    compiler_flags = [
-        "-Wno-error=unguarded-availability-new",
-        "-Wno-unknown-warning-option",
-    ],
-    contacts = ["oncall+react_native@xmail.facebook.com"],
-    exported_linker_flags = [
-        "-weak_framework",
-        "UserNotifications",
-        "-weak_framework",
-        "WebKit",
-    ],
-    exported_preprocessor_flags = rn_debug_flags(),
-    frameworks = [
-        "Foundation",
-        "UIKit",
-    ],
-    lang_compiler_flags = get_fbobjc_enable_exception_lang_compiler_flags_DEPRECATED(),
-    link_whole = True,
-    platform_preprocessor_flags = [(
-        "linux",
-        ["-D PIC_MODIFIER=@PLT"],
-    )],
-    preprocessor_flags = OBJC_ARC_PREPROCESSOR_FLAGS + get_debug_preprocessor_flags() + rn_debug_flags() + [
-        "-DRN_DISABLE_OSS_PLUGIN_HEADER",
-    ],
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        "fbsource//xplat/js/react-native-github:ReactInternalApple",
     ],
 )
diff --git a/React/CoreModules/RCTPlatform.mm b/React/CoreModules/RCTPlatform.mm
index b28d70248c0..aa70b683fcc 100644
--- a/React/CoreModules/RCTPlatform.mm
+++ b/React/CoreModules/RCTPlatform.mm
@@ -5,10 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#import "RCTPlatform.h"
+
 #import <UIKit/UIKit.h>
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
-#import <React/RCTPlatform.h>
 #import <React/RCTUtils.h>
 #import <React/RCTVersion.h>