diff --git a/Marlin/pins_AZTEEG_X3_PRO.h b/Marlin/pins_AZTEEG_X3_PRO.h
index 247a688c5..38dd145f9 100644
--- a/Marlin/pins_AZTEEG_X3_PRO.h
+++ b/Marlin/pins_AZTEEG_X3_PRO.h
@@ -76,23 +76,7 @@
 //on a Delta with 1 servo. Running through the Z servo endstop in code. 
 //Physical wire attachment was done on EXT1 on the GND, 5V, and D47 pins.
 //
- #undef SERVO0_PIN
- #undef SERVO1_PIN
- #undef SERVO2_PIN
- #undef SERVO3_PIN
-
- #if HAS_SERVOS
-   #define SERVO0_PIN       47
-   #if NUM_SERVOS > 1
-     #define SERVO1_PIN     -1
-     #if NUM_SERVOS > 2
-       #define SERVO2_PIN   -1
-       #if NUM_SERVOS > 3
-         #define SERVO3_PIN -1
-       #endif
-     #endif
-   #endif
- #endif
+#define SERVO0_PIN         47
 
 //LCD Pins//
 
diff --git a/Marlin/pins_MEGACONTROLLER.h b/Marlin/pins_MEGACONTROLLER.h
index 5bd008a57..d12fcb218 100644
--- a/Marlin/pins_MEGACONTROLLER.h
+++ b/Marlin/pins_MEGACONTROLLER.h
@@ -10,18 +10,10 @@
   #error Mega Controller supports up to 2 extruders. Comment this line to keep going.
 #endif
 
-#ifdef NUM_SERVOS
-   #define SERVO0_PIN         30
-   #if NUM_SERVOS > 1
-     #define SERVO1_PIN       31
-     #if NUM_SERVOS > 2
-       #define SERVO2_PIN     32
-       #if NUM_SERVOS > 3
-         #define SERVO3_PIN   33
-       #endif
-     #endif
-   #endif
-#endif // NUM_SERVOS
+#define SERVO0_PIN 30
+#define SERVO1_PIN 31
+#define SERVO2_PIN 32
+#define SERVO3_PIN 33
 
 #define X_STEP_PIN 62//A8
 #define X_DIR_PIN 63//A9
diff --git a/Marlin/pins_MEGATRONICS_3.h b/Marlin/pins_MEGATRONICS_3.h
index 10bbb0dc3..90591622d 100644
--- a/Marlin/pins_MEGATRONICS_3.h
+++ b/Marlin/pins_MEGATRONICS_3.h
@@ -14,18 +14,10 @@
 #endif
 
 // Servo support
-#if HAS_SERVOS
-  #define SERVO0_PIN       46 //AUX3-6
-  #if NUM_SERVOS > 1
-    #define SERVO1_PIN     47 //AUX3-5
-    #if NUM_SERVOS > 2
-      #define SERVO2_PIN   48 //AUX3-4
-      #if NUM_SERVOS > 3
-        #define SERVO2_PIN 49 //AUX3-3
-      #endif
-    #endif
-  #endif
-#endif
+#define SERVO0_PIN         46 //AUX3-6
+#define SERVO1_PIN         47 //AUX3-5
+#define SERVO2_PIN         48 //AUX3-4
+#define SERVO2_PIN         49 //AUX3-3
 
 #define X_STEP_PIN         58
 #define X_DIR_PIN          57
diff --git a/Marlin/pins_RAMBO.h b/Marlin/pins_RAMBO.h
index e85f03777..1d68cd66e 100644
--- a/Marlin/pins_RAMBO.h
+++ b/Marlin/pins_RAMBO.h
@@ -9,18 +9,10 @@
 #define LARGE_FLASH true
 
 // Servo support
-#if HAS_SERVOS
-  #define SERVO0_PIN       22 //motor header MX1
-  #if NUM_SERVOS > 1
-    #define SERVO1_PIN     23 //Motor header MX2
-    #if NUM_SERVOS > 2
-      #define SERVO2_PIN   24 //Motor header MX3
-      #if NUM_SERVOS > 3
-        #define SERVO2_PIN  5 //pwm header pin 5
-      #endif
-    #endif
-  #endif
-#endif
+#define SERVO0_PIN 22 // Motor header MX1
+#define SERVO1_PIN 23 // Motor header MX2
+#define SERVO2_PIN 24 // Motor header MX3
+#define SERVO2_PIN  5 // PWM header pin 5
 
 #if ENABLED(Z_PROBE_SLED)
   #define SLED_PIN         -1
diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h
index be3d105c3..c7f5945ca 100644
--- a/Marlin/pins_RAMPS_13.h
+++ b/Marlin/pins_RAMPS_13.h
@@ -18,6 +18,11 @@
 
 #define LARGE_FLASH true
 
+#define SERVO0_PIN         11
+#define SERVO1_PIN          6
+#define SERVO2_PIN          5
+#define SERVO3_PIN          4
+
 #define X_STEP_PIN         54
 #define X_DIR_PIN          55
 #define X_ENABLE_PIN       38
@@ -122,19 +127,6 @@
 
 #define TEMP_BED_PIN         14   // ANALOG NUMBERING
 
-#if HAS_SERVOS
-  #define SERVO0_PIN         11
-  #if NUM_SERVOS > 1
-    #define SERVO1_PIN        6
-    #if NUM_SERVOS > 2
-      #define SERVO2_PIN      5
-      #if NUM_SERVOS > 3
-        #define SERVO3_PIN    4
-      #endif
-    #endif
-  #endif
-#endif
-
 #if ENABLED(Z_PROBE_SLED)
   #define SLED_PIN           -1
 #endif
diff --git a/Marlin/pins_SANGUINOLOLU_11.h b/Marlin/pins_SANGUINOLOLU_11.h
index 32e8a8fc2..cc0099a53 100644
--- a/Marlin/pins_SANGUINOLOLU_11.h
+++ b/Marlin/pins_SANGUINOLOLU_11.h
@@ -37,19 +37,6 @@
   #define SLED_PIN         -1
 #endif
 
-#if HAS_SERVOS
-  #define SERVO0_PIN       -1
-  #if NUM_SERVOS > 1
-    #define SERVO1_PIN     -1
-    #if NUM_SERVOS > 2
-      #define SERVO2_PIN   -1
-      #if NUM_SERVOS > 3
-        #define SERVO3_PIN -1
-      #endif
-    #endif
-  #endif
-#endif
-
 #define PS_ON_PIN          -1
 #define KILL_PIN           -1
 
diff --git a/Marlin/pins_SAV_MKI.h b/Marlin/pins_SAV_MKI.h
index f66f035ef..f067a75f4 100644
--- a/Marlin/pins_SAV_MKI.h
+++ b/Marlin/pins_SAV_MKI.h
@@ -108,6 +108,4 @@
   #define HOME_PIN           EXT_AUX_A4_IO
 #endif // SAV_3DLCD || SAV_3DGLCD
 
-#if HAS_SERVOS
-  #define SERVO0_PIN       41 // In teensy's pin definition for pinMode (in servo.cpp)
-#endif
+#define SERVO0_PIN         41 // In teensy's pin definition for pinMode (in servo.cpp)
diff --git a/Marlin/pins_ULTIMAKER.h b/Marlin/pins_ULTIMAKER.h
index a272b1908..a11d23759 100644
--- a/Marlin/pins_ULTIMAKER.h
+++ b/Marlin/pins_ULTIMAKER.h
@@ -8,6 +8,8 @@
 
 #define LARGE_FLASH true
 
+#define SERVO0_PIN 13 // untested
+
 #define X_STEP_PIN 25
 #define X_DIR_PIN 23
 #define X_MIN_PIN 22
@@ -53,7 +55,6 @@
 #define PS_ON_PIN          12
 #define KILL_PIN           -1
 #define SUICIDE_PIN        54  //PIN that has to be turned on right after start, to keep power flowing.
-#define SERVO0_PIN         13  // untested
 
 #if ENABLED(ULTRA_LCD)