diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h
index 095c60b26432..7300b59588cd 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h
@@ -9,9 +9,9 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/RendererCore.h>
 #include <glog/logging.h>
 #include <react/renderer/components/modal/ModalHostViewShadowNode.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h
index 0219d44ca775..0b767161d136 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h
@@ -9,10 +9,10 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
+#include <React/View.h>
 #include <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
 #include <react/renderer/components/FBReactNativeSpec/Props.h>
 #include <react/renderer/components/modal/ModalHostViewState.h>
-#include <react/renderer/components/view/ConcreteViewShadowNode.h>
 
 namespace facebook::react {
 
diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
index 4b12b0539692..f85268778d7e 100644
--- a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
+++ b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
@@ -9,7 +9,7 @@
 
 #include <react/cxxstableapi/FrameworksGuard.h>
 
-#include <react/renderer/core/graphicsConversions.h>
+#include <React/RendererCore.h>
 #include <react/renderer/graphics/Float.h>
 #include "ModalHostViewUtils.h"
 
diff --git a/packages/react-native/ReactCommon/react/renderer/core/conversions.h b/packages/react-native/ReactCommon/react/renderer/core/conversions.h
index ef7c241da78b..74e5fe9e01a3 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/conversions.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/conversions.h
@@ -22,6 +22,8 @@ inline std::string toString(const LayoutDirection &layoutDirection)
       return "ltr";
     case LayoutDirection::RightToLeft:
       return "rtl";
+    default:
+      return "undefined";
   }
 }
 
@@ -34,6 +36,8 @@ inline int toInt(const LayoutDirection &layoutDirection)
       return 1;
     case LayoutDirection::RightToLeft:
       return 2;
+    default:
+      return 0;
   }
 }
 
@@ -48,6 +52,8 @@ inline int toInt(const DisplayType &displayType)
       return 2;
     case DisplayType::Grid:
       return 3;
+    default:
+      return 0;
   }
 }
 
@@ -62,6 +68,8 @@ inline std::string toString(const DisplayType &displayType)
       return "contents";
     case DisplayType::Grid:
       return "grid";
+    default:
+      return "none";
   }
 }