diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp
index 1fb8bad94db..cbd69e2f491 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.cpp
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include <memory>
 #include <string>
 
 #include <fbjni/fbjni.h>
@@ -18,6 +17,8 @@
 namespace facebook {
 namespace react {
 
+using namespace facebook::jni;
+
 ComponentNameResolverManager::ComponentNameResolverManager(
     jni::alias_ref<ComponentNameResolverManager::javaobject> jThis,
     RuntimeExecutor runtimeExecutor,
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h
index 4ae4081509a..e8a12858317 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/jni/ComponentNameResolverManager.h
@@ -10,20 +10,14 @@
 #include <ReactCommon/CallInvokerHolder.h>
 #include <ReactCommon/RuntimeExecutor.h>
 #include <fbjni/fbjni.h>
-#include <jsi/jsi.h>
 #include <react/jni/JRuntimeExecutor.h>
-#include <memory>
 #include <set>
-#include <unordered_map>
-
-using namespace facebook::jni;
-using namespace facebook::jsi;
 
 namespace facebook {
 namespace react {
 
 class ComponentNameResolverManager
-    : public jni::HybridClass<ComponentNameResolverManager> {
+    : public facebook::jni::HybridClass<ComponentNameResolverManager> {
  public:
   static auto constexpr kJavaDescriptor =
       "Lcom/facebook/react/uimanager/ComponentNameResolverManager;";
@@ -31,28 +25,29 @@ class ComponentNameResolverManager
   constexpr static auto ComponentNameResolverJavaDescriptor =
       "com/facebook/react/uimanager/ComponentNameResolver";
 
-  static jni::local_ref<jhybriddata> initHybrid(
-      jni::alias_ref<jhybridobject> jThis,
-      jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
-      jni::alias_ref<jobject> componentNameResolver);
+  static facebook::jni::local_ref<jhybriddata> initHybrid(
+      facebook::jni::alias_ref<jhybridobject> jThis,
+      facebook::jni::alias_ref<JRuntimeExecutor::javaobject> runtimeExecutor,
+      facebook::jni::alias_ref<jobject> componentNameResolver);
 
   static void registerNatives();
 
  private:
   friend HybridBase;
-  jni::global_ref<ComponentNameResolverManager::javaobject> javaPart_;
+  facebook::jni::global_ref<ComponentNameResolverManager::javaobject> javaPart_;
   RuntimeExecutor runtimeExecutor_;
 
-  jni::global_ref<jobject> componentNameResolver_;
+  facebook::jni::global_ref<jobject> componentNameResolver_;
 
   std::set<std::string> componentNames_;
 
   void installJSIBindings();
 
   explicit ComponentNameResolverManager(
-      jni::alias_ref<ComponentNameResolverManager::jhybridobject> jThis,
+      facebook::jni::alias_ref<ComponentNameResolverManager::jhybridobject>
+          jThis,
       RuntimeExecutor runtimeExecutor,
-      jni::alias_ref<jobject> componentNameResolver);
+      facebook::jni::alias_ref<jobject> componentNameResolver);
 };
 
 } // namespace react