diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h
index 16faa8bc78c..c4f4b82c592 100644
--- a/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h
+++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h
@@ -81,7 +81,7 @@ struct LayoutMetrics {
 static LayoutMetrics const EmptyLayoutMetrics = {
     /* .frame = */ {{0, 0}, {-1.0, -1.0}}};
 
-#ifdef RN_DEBUG_STRING_CONVERTIBLE
+#if RN_DEBUG_STRING_CONVERTIBLE
 
 std::string getDebugName(LayoutMetrics const &object);
 std::vector<DebugStringConvertibleObject> getDebugProps(
diff --git a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h
index ca33c68f65f..4ded04e99f3 100644
--- a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h
+++ b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h
@@ -81,6 +81,7 @@ class DebugStringConvertible {
 
 #else
 
+struct DebugStringConvertibleOptions {};
 class DebugStringConvertible {};
 
 #endif
diff --git a/packages/react-native/ReactCommon/react/renderer/debug/flags.h b/packages/react-native/ReactCommon/react/renderer/debug/flags.h
index 0239bf6b0c7..279dcac9a6e 100644
--- a/packages/react-native/ReactCommon/react/renderer/debug/flags.h
+++ b/packages/react-native/ReactCommon/react/renderer/debug/flags.h
@@ -36,6 +36,10 @@
 #define RN_DEBUG_STRING_CONVERTIBLE 1
 #endif
 
+#ifndef RN_DEBUG_STRING_CONVERTIBLE
+#define RN_DEBUG_STRING_CONVERTIBLE 0
+#endif
+
 // Enables *very* verbose, noisy logs in the differ. Useful for debugging
 // specifically the differ, but not much else.
 //#define DEBUG_LOGS_DIFFER
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Transform.cpp b/packages/react-native/ReactCommon/react/renderer/graphics/Transform.cpp
index 56fb6431a0a..d38128bb55a 100644
--- a/packages/react-native/ReactCommon/react/renderer/graphics/Transform.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/graphics/Transform.cpp
@@ -14,7 +14,7 @@
 
 namespace facebook::react {
 
-#ifdef RN_DEBUG_STRING_CONVERTIBLE
+#if RN_DEBUG_STRING_CONVERTIBLE
 void Transform::print(Transform const &t, std::string prefix) {
   LOG(ERROR) << prefix << "[ " << t.matrix[0] << " " << t.matrix[1] << " "
              << t.matrix[2] << " " << t.matrix[3] << " ]";
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Transform.h b/packages/react-native/ReactCommon/react/renderer/graphics/Transform.h
index e0f29508f65..1fda78fd3c1 100644
--- a/packages/react-native/ReactCommon/react/renderer/graphics/Transform.h
+++ b/packages/react-native/ReactCommon/react/renderer/graphics/Transform.h
@@ -62,7 +62,7 @@ struct Transform {
   /**
    * For debugging only. Prints out the matrix.
    */
-#ifdef RN_DEBUG_STRING_CONVERTIBLE
+#if RN_DEBUG_STRING_CONVERTIBLE
   static void print(Transform const &t, std::string prefix);
 #endif
 
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.cpp
index 68a48d8e429..cee4ce27274 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.cpp
@@ -55,7 +55,7 @@ bool ShadowView::operator!=(const ShadowView &rhs) const {
   return !(*this == rhs);
 }
 
-#ifdef RN_DEBUG_STRING_CONVERTIBLE
+#if RN_DEBUG_STRING_CONVERTIBLE
 
 std::string getDebugName(ShadowView const &object) {
   return object.componentHandle == 0 ? "Invalid" : object.componentName;
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.cpp
index 7a5afeaa008..bb89ca25330 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.cpp
@@ -75,7 +75,7 @@ void StubViewTree::mutate(ShadowViewMutationList const &mutations) {
               << std::hash<ShadowView>{}((ShadowView)*stubView)
               << " old mutation hash: ##"
               << std::hash<ShadowView>{}(mutation.oldChildShadowView);
-#ifdef RN_DEBUG_STRING_CONVERTIBLE
+#if RN_DEBUG_STRING_CONVERTIBLE
           LOG(ERROR) << "StubView: "
                      << getDebugPropsDescription((ShadowView)*stubView, {});
           LOG(ERROR) << "OldChildShadowView: "
@@ -161,7 +161,7 @@ void StubViewTree::mutate(ShadowViewMutationList const &mutations) {
                 << std::hash<ShadowView>{}((ShadowView)*childStubView)
                 << " old mutation hash: ##"
                 << std::hash<ShadowView>{}(mutation.oldChildShadowView);
-#ifdef RN_DEBUG_STRING_CONVERTIBLE
+#if RN_DEBUG_STRING_CONVERTIBLE
             LOG(ERROR) << "ChildStubView: "
                        << getDebugPropsDescription(
                               (ShadowView)*childStubView, {});
@@ -228,7 +228,7 @@ void StubViewTree::mutate(ShadowViewMutationList const &mutations) {
               << std::hash<ShadowView>{}((ShadowView)*oldStubView)
               << " old mutation hash: ##"
               << std::hash<ShadowView>{}(mutation.oldChildShadowView);
-#ifdef RN_DEBUG_STRING_CONVERTIBLE
+#if RN_DEBUG_STRING_CONVERTIBLE
           LOG(ERROR) << "OldStubView: "
                      << getDebugPropsDescription((ShadowView)*oldStubView, {});
           LOG(ERROR) << "OldChildShadowView: "
diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
index 02607035ad4..5202e43f5ba 100644
--- a/packages/react-native/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
+++ b/packages/react-native/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
@@ -148,7 +148,7 @@ static void testShadowNodeTreeLifeCycle(
 
         // There are some issues getting `getDebugDescription` to compile
         // under test on Android for now.
-#ifdef RN_DEBUG_STRING_CONVERTIBLE
+#if RN_DEBUG_STRING_CONVERTIBLE
         LOG(ERROR) << "Shadow Tree before: \n"
                    << currentRootNode->getDebugDescription();
         LOG(ERROR) << "Shadow Tree after: \n"
@@ -300,7 +300,7 @@ static void testShadowNodeTreeLifeCycleExtensiveFlatteningUnflattening(
 
         // There are some issues getting `getDebugDescription` to compile
         // under test on Android for now.
-#ifdef RN_DEBUG_STRING_CONVERTIBLE
+#if RN_DEBUG_STRING_CONVERTIBLE
         LOG(ERROR) << "Shadow Tree before: \n"
                    << currentRootNode->getDebugDescription();
         LOG(ERROR) << "Shadow Tree after: \n"