diff --git a/lib/yoga/src/main/cpp/yoga/Yoga.cpp b/lib/yoga/src/main/cpp/yoga/Yoga.cpp
index 63678fa63d7..f144c1508ba 100644
--- a/lib/yoga/src/main/cpp/yoga/Yoga.cpp
+++ b/lib/yoga/src/main/cpp/yoga/Yoga.cpp
@@ -805,7 +805,7 @@ void YGNodePrint(const YGNodeConstRef nodeRef, const YGPrintOptions options) {
   const auto node = resolveRef(nodeRef);
   std::string str;
   yoga::nodeToString(str, node, options, 0);
-  yoga::log(node, YGLogLevelDebug, str.c_str());
+  yoga::log(node, LogLevel::Debug, str.c_str());
 }
 #endif
 
diff --git a/lib/yoga/src/main/cpp/yoga/algorithm/CalculateLayout.cpp b/lib/yoga/src/main/cpp/yoga/algorithm/CalculateLayout.cpp
index f39c6285de7..a7c21d081f7 100644
--- a/lib/yoga/src/main/cpp/yoga/algorithm/CalculateLayout.cpp
+++ b/lib/yoga/src/main/cpp/yoga/algorithm/CalculateLayout.cpp
@@ -2526,14 +2526,14 @@ bool calculateLayoutInternal(
     if (gPrintChanges && gPrintSkips) {
       yoga::log(
           node,
-          YGLogLevelVerbose,
+          LogLevel::Verbose,
           "%s%d.{[skipped] ",
           spacerWithLength(depth),
           depth);
       node->print();
       yoga::log(
           node,
-          YGLogLevelVerbose,
+          LogLevel::Verbose,
           "wm: %s, hm: %s, aw: %f ah: %f => d: (%f, %f) %s\n",
           measureModeName(widthMeasureMode, performLayout),
           measureModeName(heightMeasureMode, performLayout),
@@ -2547,7 +2547,7 @@ bool calculateLayoutInternal(
     if (gPrintChanges) {
       yoga::log(
           node,
-          YGLogLevelVerbose,
+          LogLevel::Verbose,
           "%s%d.{%s",
           spacerWithLength(depth),
           depth,
@@ -2555,7 +2555,7 @@ bool calculateLayoutInternal(
       node->print();
       yoga::log(
           node,
-          YGLogLevelVerbose,
+          LogLevel::Verbose,
           "wm: %s, hm: %s, aw: %f ah: %f %s\n",
           measureModeName(widthMeasureMode, performLayout),
           measureModeName(heightMeasureMode, performLayout),
@@ -2582,7 +2582,7 @@ bool calculateLayoutInternal(
     if (gPrintChanges) {
       yoga::log(
           node,
-          YGLogLevelVerbose,
+          LogLevel::Verbose,
           "%s%d.}%s",
           spacerWithLength(depth),
           depth,
@@ -2590,7 +2590,7 @@ bool calculateLayoutInternal(
       node->print();
       yoga::log(
           node,
-          YGLogLevelVerbose,
+          LogLevel::Verbose,
           "wm: %s, hm: %s, d: (%f, %f) %s\n",
           measureModeName(widthMeasureMode, performLayout),
           measureModeName(heightMeasureMode, performLayout),
@@ -2609,7 +2609,7 @@ bool calculateLayoutInternal(
       if (layout->nextCachedMeasurementsIndex ==
           LayoutResults::MaxCachedMeasurements) {
         if (gPrintChanges) {
-          yoga::log(node, YGLogLevelVerbose, "Out of cache entries!\n");
+          yoga::log(node, LogLevel::Verbose, "Out of cache entries!\n");
         }
         layout->nextCachedMeasurementsIndex = 0;
       }
diff --git a/lib/yoga/src/main/cpp/yoga/config/Config.cpp b/lib/yoga/src/main/cpp/yoga/config/Config.cpp
index 85f715bcd8d..721588ee0a8 100644
--- a/lib/yoga/src/main/cpp/yoga/config/Config.cpp
+++ b/lib/yoga/src/main/cpp/yoga/config/Config.cpp
@@ -96,10 +96,10 @@ void Config::setLogger(YGLogger logger) {
 
 void Config::log(
     const yoga::Node* node,
-    YGLogLevel logLevel,
+    LogLevel logLevel,
     const char* format,
     va_list args) const {
-  logger_(this, node, logLevel, format, args);
+  logger_(this, node, unscopedEnum(logLevel), format, args);
 }
 
 void Config::setCloneNodeCallback(YGCloneNodeFunc cloneNode) {
diff --git a/lib/yoga/src/main/cpp/yoga/config/Config.h b/lib/yoga/src/main/cpp/yoga/config/Config.h
index e910ea04bcf..227aa598bf9 100644
--- a/lib/yoga/src/main/cpp/yoga/config/Config.h
+++ b/lib/yoga/src/main/cpp/yoga/config/Config.h
@@ -12,6 +12,7 @@
 #include <yoga/Yoga.h>
 #include <yoga/enums/Errata.h>
 #include <yoga/enums/ExperimentalFeature.h>
+#include <yoga/enums/LogLevel.h>
 
 // Tag struct used to form the opaque YGConfigRef for the public C API
 struct YGConfig {};
@@ -67,7 +68,7 @@ class YG_EXPORT Config : public ::YGConfig {
   void setLogger(YGLogger logger);
   void log(
       const yoga::Node* node,
-      YGLogLevel logLevel,
+      LogLevel logLevel,
       const char* format,
       va_list args) const;
 
diff --git a/lib/yoga/src/main/cpp/yoga/debug/AssertFatal.cpp b/lib/yoga/src/main/cpp/yoga/debug/AssertFatal.cpp
index d83c8cc56e8..2388a744539 100644
--- a/lib/yoga/src/main/cpp/yoga/debug/AssertFatal.cpp
+++ b/lib/yoga/src/main/cpp/yoga/debug/AssertFatal.cpp
@@ -22,7 +22,7 @@ namespace facebook::yoga {
 
 void assertFatal(const bool condition, const char* message) {
   if (!condition) {
-    yoga::log(YGLogLevelFatal, "%s\n", message);
+    yoga::log(LogLevel::Fatal, "%s\n", message);
     fatalWithMessage(message);
   }
 }
@@ -32,7 +32,7 @@ void assertFatalWithNode(
     const bool condition,
     const char* message) {
   if (!condition) {
-    yoga::log(node, YGLogLevelFatal, "%s\n", message);
+    yoga::log(node, LogLevel::Fatal, "%s\n", message);
     fatalWithMessage(message);
   }
 }
@@ -42,7 +42,7 @@ void assertFatalWithConfig(
     const bool condition,
     const char* message) {
   if (!condition) {
-    yoga::log(config, YGLogLevelFatal, "%s\n", message);
+    yoga::log(config, LogLevel::Fatal, "%s\n", message);
     fatalWithMessage(message);
   }
 }
diff --git a/lib/yoga/src/main/cpp/yoga/debug/Log.cpp b/lib/yoga/src/main/cpp/yoga/debug/Log.cpp
index c16547ae345..9b525d8a8e2 100644
--- a/lib/yoga/src/main/cpp/yoga/debug/Log.cpp
+++ b/lib/yoga/src/main/cpp/yoga/debug/Log.cpp
@@ -18,18 +18,18 @@ namespace {
 void vlog(
     const yoga::Config* config,
     const yoga::Node* node,
-    YGLogLevel level,
+    LogLevel level,
     const char* format,
     va_list args) {
   if (config == nullptr) {
-    getDefaultLogger()(nullptr, node, level, format, args);
+    getDefaultLogger()(nullptr, node, unscopedEnum(level), format, args);
   } else {
     config->log(node, level, format, args);
   }
 }
 } // namespace
 
-void log(YGLogLevel level, const char* format, ...) noexcept {
+void log(LogLevel level, const char* format, ...) noexcept {
   va_list args;
   va_start(args, format);
   vlog(nullptr, nullptr, level, format, args);
@@ -38,7 +38,7 @@ void log(YGLogLevel level, const char* format, ...) noexcept {
 
 void log(
     const yoga::Node* node,
-    YGLogLevel level,
+    LogLevel level,
     const char* format,
     ...) noexcept {
   va_list args;
@@ -50,7 +50,7 @@ void log(
 
 void log(
     const yoga::Config* config,
-    YGLogLevel level,
+    LogLevel level,
     const char* format,
     ...) noexcept {
   va_list args;
diff --git a/lib/yoga/src/main/cpp/yoga/debug/Log.h b/lib/yoga/src/main/cpp/yoga/debug/Log.h
index 59a8b2e0db8..94dc0e0cedf 100644
--- a/lib/yoga/src/main/cpp/yoga/debug/Log.h
+++ b/lib/yoga/src/main/cpp/yoga/debug/Log.h
@@ -9,23 +9,23 @@
 
 #include <yoga/Yoga.h>
 
-#include <yoga/YGEnums.h>
 #include <yoga/config/Config.h>
+#include <yoga/enums/LogLevel.h>
 #include <yoga/node/Node.h>
 
 namespace facebook::yoga {
 
-void log(YGLogLevel level, const char* format, ...) noexcept;
+void log(LogLevel level, const char* format, ...) noexcept;
 
 void log(
     const yoga::Node* node,
-    YGLogLevel level,
+    LogLevel level,
     const char* message,
     ...) noexcept;
 
 void log(
     const yoga::Config* config,
-    YGLogLevel level,
+    LogLevel level,
     const char* format,
     ...) noexcept;