diff --git a/Marlin/src/core/types.h b/Marlin/src/core/types.h
index 520e876315..c48e0ffe68 100644
--- a/Marlin/src/core/types.h
+++ b/Marlin/src/core/types.h
@@ -543,7 +543,7 @@ struct XYval {
     FI void set(const T px, const T py)           { x = px; y = py; }
     FI void set(const T (&arr)[2])                { x = arr[0]; y = arr[1]; }
   #endif
-  #if NUM_AXES > XY
+  #if NUM_AXES > 2
     FI void set(const T (&arr)[NUM_AXES])         { x = arr[0]; y = arr[1]; }
   #endif
   #if LOGICAL_AXES > NUM_AXES
@@ -1334,7 +1334,7 @@ public:
 
 // Axis names for G-code parsing, reports, etc.
 constexpr xyze_char_t axis_codes LOGICAL_AXIS_ARRAY('E', 'X', 'Y', 'Z', AXIS4_NAME, AXIS5_NAME, AXIS6_NAME, AXIS7_NAME, AXIS8_NAME, AXIS9_NAME);
-#if NUM_AXES <= XYZ && !HAS_EXTRUDERS
+#if NUM_AXES <= 3 && !HAS_EXTRUDERS
   #define AXIS_CHAR(A) ((char)('X' + A))
   #define IAXIS_CHAR AXIS_CHAR
 #else
diff --git a/Marlin/src/gcode/host/M115.cpp b/Marlin/src/gcode/host/M115.cpp
index 5ed52dbba1..19d0ae9b63 100644
--- a/Marlin/src/gcode/host/M115.cpp
+++ b/Marlin/src/gcode/host/M115.cpp
@@ -85,7 +85,7 @@ void GcodeSuite::M115() {
     " MACHINE_TYPE:" MACHINE_NAME
     " KINEMATICS:" MACHINE_KINEMATICS
     " EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS)
-    #if NUM_AXES != XYZ
+    #if NUM_AXES != 3
       " AXIS_COUNT:" STRINGIFY(NUM_AXES)
     #endif
     #if defined(MACHINE_UUID) || ENABLED(HAS_STM32_UID)
diff --git a/Marlin/src/inc/Conditionals-1-axes.h b/Marlin/src/inc/Conditionals-1-axes.h
index 8744547153..1ad256b3b8 100644
--- a/Marlin/src/inc/Conditionals-1-axes.h
+++ b/Marlin/src/inc/Conditionals-1-axes.h
@@ -258,7 +258,7 @@
   #if NUM_AXES >= XY
     #define HAS_Y_AXIS 1
     #define HAS_B_AXIS 1
-    #if NUM_AXES >= XYZ
+    #if NUM_AXES >= 3
       #define HAS_Z_AXIS 1
       #define HAS_C_AXIS 1
       #if NUM_AXES >= 4