code · pull · May 9, 2026 · May 9, 2026
diff --git a/packages/expo-modules-core/android/src/main/cpp/Exceptions.cpp b/packages/expo-modules-core/android/src/main/cpp/Exceptions.cpp
@@ -2,9 +2,6 @@
 
 #include "Exceptions.h"
 
-#include "JSIContext.h"
-#include "JSReferencesCache.h"
-
 namespace jni = facebook::jni;
 
 namespace expo {

diff --git a/packages/expo-modules-core/android/src/main/cpp/Exceptions.h b/packages/expo-modules-core/android/src/main/cpp/Exceptions.h
@@ -2,10 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <optional>
+#include "ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;

diff --git a/packages/expo-modules-core/android/src/main/cpp/ExpoHeader.pch b/packages/expo-modules-core/android/src/main/cpp/ExpoHeader.pch
@@ -1,11 +1,9 @@
 #pragma once
 
 #include <functional>
-#include <map>
 #include <memory>
 #include <optional>
 #include <type_traits>
-#include <unistd.h>
 #include <unordered_map>
 #include <vector>
 

diff --git a/packages/expo-modules-core/android/src/main/cpp/ExpoModulesHostObject.cpp b/packages/expo-modules-core/android/src/main/cpp/ExpoModulesHostObject.cpp
@@ -1,10 +1,9 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "ExpoHeader.pch"
 #include "ExpoModulesHostObject.h"
 #include "LazyObject.h"
 
-#include <folly/dynamic.h>
-#include <jsi/JSIDynamic.h>
 #include <react/bridging/LongLivedObject.h>
 
 namespace jsi = facebook::jsi;

diff --git a/packages/expo-modules-core/android/src/main/cpp/ExpoModulesHostObject.h b/packages/expo-modules-core/android/src/main/cpp/ExpoModulesHostObject.h
@@ -2,11 +2,9 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JSIContext.h"
 
-#include <jsi/jsi.h>
-
-#include <vector>
 #import <unordered_map>
 
 namespace jsi = facebook::jsi;

diff --git a/packages/expo-modules-core/android/src/main/cpp/JNIDeallocator.h b/packages/expo-modules-core/android/src/main/cpp/JNIDeallocator.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 

diff --git a/packages/expo-modules-core/android/src/main/cpp/JNIFunctionBody.cpp b/packages/expo-modules-core/android/src/main/cpp/JNIFunctionBody.cpp
@@ -2,7 +2,6 @@
 
 #include "JNIFunctionBody.h"
 #include "Exceptions.h"
-#include "JavaReferencesCache.h"
 
 namespace jni = facebook::jni;
 namespace react = facebook::react;

diff --git a/packages/expo-modules-core/android/src/main/cpp/JNIFunctionBody.h b/packages/expo-modules-core/android/src/main/cpp/JNIFunctionBody.h
@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <react/jni/ReadableNativeArray.h>
+#include "ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 namespace react = facebook::react;

diff --git a/packages/expo-modules-core/android/src/main/cpp/JNIInjector.cpp b/packages/expo-modules-core/android/src/main/cpp/JNIInjector.cpp
@@ -1,5 +1,6 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "ExpoHeader.pch"
 #include "RuntimeHolder.h"
 #include "JSIContext.h"
 #include "JavaScriptModuleObject.h"
@@ -26,7 +27,6 @@
 #endif
 
 #include <jni.h>
-#include <fbjni/fbjni.h>
 
 // Install all jni bindings
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {

diff --git a/packages/expo-modules-core/android/src/main/cpp/JNIUtils.cpp b/packages/expo-modules-core/android/src/main/cpp/JNIUtils.cpp
@@ -1,10 +1,10 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "ExpoHeader.pch"
 #include "JNIUtils.h"
 #include "EventEmitter.h"
 #include "JSIUtils.h"
 #include "types/JNIToJSIConverter.h"
-#include <jsi/JSIDynamic.h>
 #include "JSIContext.h"
 #include "Exceptions.h"
 

diff --git a/packages/expo-modules-core/android/src/main/cpp/JNIUtils.h b/packages/expo-modules-core/android/src/main/cpp/JNIUtils.h
@@ -2,12 +2,7 @@
 
 #pragma once
 
-#include <vector>
-#include <functional>
-
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-#include <react/jni/ReadableNativeMap.h>
+#include "ExpoHeader.pch"
 
 #include "JSIContext.h"
 #include "JavaScriptObject.h"

diff --git a/packages/expo-modules-core/android/src/main/cpp/JSIContext.cpp b/packages/expo-modules-core/android/src/main/cpp/JSIContext.cpp
@@ -1,21 +1,17 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "ExpoHeader.pch"
 #include "JSIContext.h"
 #include "Exceptions.h"
-#include "ExpoModulesHostObject.h"
 #include "JavaReferencesCache.h"
 #include "JSReferencesCache.h"
 #include "JSIUtils.h"
 #include "SharedObject.h"
-#include "SharedRef.h"
-#include "NativeModule.h"
 #include "decorators/JSDecoratorsBridgingObject.h"
 #include "decorators/JSClassesDecorator.h"
 
 #include <fbjni/detail/Meta.h>
-#include <fbjni/fbjni.h>
 
-#include <memory>
 #include <shared_mutex>
 
 namespace jni = facebook::jni;

diff --git a/packages/expo-modules-core/android/src/main/cpp/JSIContext.h b/packages/expo-modules-core/android/src/main/cpp/JSIContext.h
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JavaScriptRuntime.h"
 #include "JavaScriptModuleObject.h"
 #include "JavaScriptValue.h"
@@ -12,8 +13,6 @@
 #include "ThreadSafeJNIGlobalRef.h"
 #include "javaclasses/JSRunnable.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/CallInvoker.h>
 
@@ -24,10 +23,6 @@
 
 #endif
 
-#include <ReactCommon/NativeMethodCallInvokerHolder.h>
-
-#include <memory>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 namespace react = facebook::react;

diff --git a/packages/expo-modules-core/android/src/main/cpp/JSITypeConverter.h b/packages/expo-modules-core/android/src/main/cpp/JSITypeConverter.h
@@ -2,13 +2,9 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JSIObjectWrapper.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <type_traits>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 

diff --git a/packages/expo-modules-core/android/src/main/cpp/JSharedObject.h b/packages/expo-modules-core/android/src/main/cpp/JSharedObject.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
+#include "ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 

diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaCallback.cpp b/packages/expo-modules-core/android/src/main/cpp/JavaCallback.cpp
@@ -1,20 +1,11 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "ExpoHeader.pch"
 #include "JavaCallback.h"
 #include "JSIContext.h"
 #include "types/JNIToJSIConverter.h"
 #include "Exceptions.h"
 
-#include "JSIUtils.h"
-#include "JNIUtils.h"
-
-#include <fbjni/fbjni.h>
-#include <fbjni/fbjni.h>
-#include <folly/dynamic.h>
-#include <jsi/JSIDynamic.h>
-
-#include <functional>
-
 namespace expo {
 
 JavaCallback::CallbackContext::CallbackContext(
@@ -60,7 +51,6 @@ void JavaCallback::registerNatives() {
                  });
 }
 
-
 jni::local_ref<JavaCallback::javaobject> JavaCallback::newInstance(
   JSIContext *jsiContext,
   std::shared_ptr<CallbackContext> callbackContext

diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaCallback.h b/packages/expo-modules-core/android/src/main/cpp/JavaCallback.h
@@ -2,18 +2,12 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JNIDeallocator.h"
 #include "JSharedObject.h"
 #include "JavaScriptArrayBuffer.h"
 #include "NativeArrayBuffer.h"
 
-#include <jsi/jsi.h>
-#include <fbjni/fbjni.h>
-#include <folly/dynamic.h>
-#include <variant>
-
-#include <react/jni/WritableNativeArray.h>
-#include <react/jni/WritableNativeMap.h>
 #include <fbjni/detail/CoreClasses.h>
 #include <ReactCommon/CallInvoker.h>
 #include <react/bridging/LongLivedObject.h>

diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaReferencesCache.cpp b/packages/expo-modules-core/android/src/main/cpp/JavaReferencesCache.cpp
@@ -1,9 +1,8 @@
 // Copyright © 2021-present 650 Industries, Inc. (aka Expo)
 
+#include "ExpoHeader.pch"
 #include "JavaReferencesCache.h"
 
-#include <vector>
-
 namespace expo {
 
 JCache::JCache(JNIEnv *env) {

diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaReferencesCache.h b/packages/expo-modules-core/android/src/main/cpp/JavaReferencesCache.h
@@ -2,10 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-
-#include <memory>
-#include <unordered_map>
+#include "ExpoHeader.pch"
 
 namespace jni = facebook::jni;
 

diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptArrayBuffer.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptArrayBuffer.h
@@ -1,13 +1,10 @@
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JNIDeallocator.h"
 #include "JavaScriptRuntime.h"
 
 #include <fbjni/ByteBuffer.h>
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <memory>
 
 namespace expo {
 

diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptFunction.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptFunction.h
@@ -2,13 +2,11 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JSIObjectWrapper.h"
 #include "JavaScriptRuntime.h"
 #include "types/ExpectedType.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 
@@ -40,7 +38,6 @@ class JavaScriptFunction : public jni::HybridClass<JavaScriptFunction, Destructi
 
   std::shared_ptr<jsi::Function> get() override;
 
-
 private:
   friend HybridBase;
 

diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptModuleObject.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptModuleObject.h
@@ -2,11 +2,7 @@
 
 #pragma once
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <vector>
-#include <memory>
+#include "ExpoHeader.pch"
 
 #include "decorators/JSDecorator.h"
 

diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptObject.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptObject.h
@@ -2,18 +2,14 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JSIObjectWrapper.h"
 #include "JSITypeConverter.h"
 #include "JavaScriptRuntime.h"
 #include "JNIFunctionBody.h"
 #include "JNIDeallocator.h"
 #include "JSIUtils.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <memory>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;
 

diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptRuntime.cpp b/packages/expo-modules-core/android/src/main/cpp/JavaScriptRuntime.cpp
@@ -5,7 +5,6 @@
 #include "JavaScriptObject.h"
 #include "Exceptions.h"
 #include "JSIContext.h"
-#include "JSIUtils.h"
 
 namespace jsi = facebook::jsi;
 

diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptRuntime.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptRuntime.h
@@ -2,10 +2,9 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JNIDeallocator.h"
 
-#include <jsi/jsi.h>
-#include <fbjni/fbjni.h>
 #include <ReactCommon/CallInvoker.h>
 
 namespace jsi = facebook::jsi;

diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptTypedArray.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptTypedArray.h
@@ -1,13 +1,10 @@
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "TypedArray.h"
 #include "JavaScriptObject.h"
 
-#include <fbjni/fbjni.h>
 #include <fbjni/ByteBuffer.h>
-#include <jsi/jsi.h>
-
-#include <memory>
 
 namespace expo {
 

diff --git a/packages/expo-modules-core/android/src/main/cpp/JavaScriptValue.h b/packages/expo-modules-core/android/src/main/cpp/JavaScriptValue.h
@@ -2,16 +2,12 @@
 
 #pragma once
 
+#include "ExpoHeader.pch"
 #include "JSIObjectWrapper.h"
 #include "JavaScriptTypedArray.h"
 #include "JavaScriptArrayBuffer.h"
 #include "JNIDeallocator.h"
 
-#include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
-
-#include <memory>
-
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;