From c92f31d834234d2dfccdd066e35f693ff98a98f0 Mon Sep 17 00:00:00 2001
From: Pieter De Baets <pieterdb@meta.com>
Date: Wed, 12 Jun 2024 07:24:40 -0700
Subject: [PATCH] Fix include directive to solve redefinition error (#44891)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/44891

Changelog: [Internal]

Reviewed By: cortinico, fabriziocucci, cipolleschi

Differential Revision: D58459144

fbshipit-source-id: a07280de01c9ff4333e5140c6b741d88c1c5d89a
---
 .../jni/react/turbomodule/ReactCommon/TurboModuleManager.h  | 2 +-
 packages/react-native/ReactCommon/react/bridging/Base.h     | 6 +++---
 .../ReactCommon/react/bridging/CallbackWrapper.h            | 6 +++---
 packages/react-native/ReactCommon/react/bridging/Function.h | 1 +
 .../nativemodule/core/ReactCommon/TurboModuleBinding.h      | 5 +++--
 .../react/nativemodule/core/ReactCommon/TurboModuleUtils.h  | 5 ++---
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
index 4e44a59edc3e31..49f28dab0326a4 100644
--- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
+++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.h
@@ -9,13 +9,13 @@
 
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/JavaTurboModule.h>
-#include <ReactCommon/LongLivedObject.h>
 #include <ReactCommon/NativeMethodCallInvokerHolder.h>
 #include <ReactCommon/RuntimeExecutor.h>
 #include <ReactCommon/TurboModule.h>
 #include <ReactCommon/TurboModuleManagerDelegate.h>
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
+#include <react/bridging/LongLivedObject.h>
 #include <react/jni/CxxModuleWrapper.h>
 #include <react/jni/JRuntimeExecutor.h>
 #include <memory>
diff --git a/packages/react-native/ReactCommon/react/bridging/Base.h b/packages/react-native/ReactCommon/react/bridging/Base.h
index f351872eef5dee..2858ea7833bf65 100644
--- a/packages/react-native/ReactCommon/react/bridging/Base.h
+++ b/packages/react-native/ReactCommon/react/bridging/Base.h
@@ -7,10 +7,8 @@
 
 #pragma once
 
-#include <react/bridging/Convert.h>
-
-#include <ReactCommon/CallInvoker.h>
 #include <jsi/jsi.h>
+#include <react/bridging/Convert.h>
 
 #include <cstdint>
 #include <memory>
@@ -18,6 +16,8 @@
 
 namespace facebook::react {
 
+class CallInvoker;
+
 template <typename T, typename = void>
 struct Bridging;
 
diff --git a/packages/react-native/ReactCommon/react/bridging/CallbackWrapper.h b/packages/react-native/ReactCommon/react/bridging/CallbackWrapper.h
index 122d9f75b7db0c..3f0d4c8129a117 100644
--- a/packages/react-native/ReactCommon/react/bridging/CallbackWrapper.h
+++ b/packages/react-native/ReactCommon/react/bridging/CallbackWrapper.h
@@ -11,12 +11,12 @@
 
 #include <memory>
 
-#include <ReactCommon/CallInvoker.h>
-
-#include "LongLivedObject.h"
+#include <react/bridging/LongLivedObject.h>
 
 namespace facebook::react {
 
+class CallInvoker;
+
 // Helper for passing jsi::Function arg to other methods.
 class CallbackWrapper : public LongLivedObject {
  private:
diff --git a/packages/react-native/ReactCommon/react/bridging/Function.h b/packages/react-native/ReactCommon/react/bridging/Function.h
index fc124bc0a7f266..bd1725f1401a70 100644
--- a/packages/react-native/ReactCommon/react/bridging/Function.h
+++ b/packages/react-native/ReactCommon/react/bridging/Function.h
@@ -10,6 +10,7 @@
 #include <react/bridging/Base.h>
 #include <react/bridging/CallbackWrapper.h>
 
+#include <ReactCommon/CallInvoker.h>
 #include <ReactCommon/SchedulerPriority.h>
 
 namespace facebook::react {
diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h
index d45a72f25ca282..0ed5c2b4da726d 100644
--- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h
+++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h
@@ -9,9 +9,10 @@
 
 #include <string>
 
-#include <ReactCommon/LongLivedObject.h>
-#include <ReactCommon/TurboModule.h>
 #include <jsi/jsi.h>
+#include <react/bridging/LongLivedObject.h>
+
+#include <ReactCommon/TurboModule.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h
index abc56408aee855..bc97820b0fdd2a 100644
--- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h
+++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h
@@ -11,9 +11,8 @@
 #include <string>
 
 #include <jsi/jsi.h>
-
-#include <ReactCommon/CallInvoker.h>
-#include <ReactCommon/CallbackWrapper.h>
+#include <react/bridging/CallbackWrapper.h>
+#include <react/bridging/LongLivedObject.h>
 
 namespace facebook::react {