diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt
index e3da9e4aa448b3..3abec5c2435a41 100644
--- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt
+++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PrepareBoostTask.kt
@@ -33,7 +33,9 @@ abstract class PrepareBoostTask : DefaultTask() {
       it.from(project.file("src/main/jni/third-party/boost"))
       it.include(
           "CMakeLists.txt",
+          "boost_${boostVersion.get()}/boost/**/*.h",
           "boost_${boostVersion.get()}/boost/**/*.hpp",
+          "boost/boost/**/*.h",
           "boost/boost/**/*.hpp",
           "asm/**/*.S")
       it.includeEmptyDirs = false
diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
index f30392dd3ebc1c..08b3562bcad549 100644
--- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
+++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
@@ -70,6 +70,19 @@ abstract class PreparePrefabHeadersTask : DefaultTask() {
           it.include("boost/cstdint.hpp")
           it.include("boost/utility.hpp")
           it.include("boost/version.hpp")
+          // Extra files for kv-storage
+          it.include("boost/*.hpp")
+          it.include("boost/align/**/*.hpp")
+          it.include("boost/container/**/*.hpp")
+          it.include("boost/intrusive/**/*.hpp")
+          it.include("boost/iterator/**/*.hpp")
+          it.include("boost/lockfree/**/*.hpp")
+          it.include("boost/move/**/*.hpp")
+          it.include("boost/mp11/**/*.hpp")
+          it.include("boost/mpl/**/*.hpp")
+          it.include("boost/parameter/**/*.hpp")
+          it.include("boost/type_traits/**/*.hpp")
+          it.include("boost/utility/**/*.hpp")
           it.into(File(outputFolder.asFile, headerPrefix))
         }
       }