diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp
index 9db7d77c90f8fbbb8b1774034e49a2692d4397f4..995c6bdd106c2a8999f16ace939ef9c9d5312c6f 100644
--- a/Marlin/src/Marlin.cpp
+++ b/Marlin/src/Marlin.cpp
@@ -374,8 +374,6 @@ bool pin_is_protected(const int8_t pin) {
   return false;
 }
 
-#include "gcode/control/M111.h"
-
 #if ENABLED(HOST_KEEPALIVE_FEATURE)
   #include "gcode/host/M113.h"
 #endif
diff --git a/Marlin/src/gcode/control/M111.h b/Marlin/src/gcode/control/M111.cpp
similarity index 94%
rename from Marlin/src/gcode/control/M111.h
rename to Marlin/src/gcode/control/M111.cpp
index 748796da6535a114d15b5f1e61d6032848dde3a3..1850ed2db8a97916c28d5fa3d202e9780a2b03c7 100644
--- a/Marlin/src/gcode/control/M111.h
+++ b/Marlin/src/gcode/control/M111.cpp
@@ -20,10 +20,12 @@
  *
  */
 
+#include "../gcode.h"
+
 /**
  * M111: Set the debug level
  */
-void gcode_M111() {
+void GcodeSuite::M111() {
   if (parser.seen('S')) marlin_debug_flags = parser.byteval('S');
 
   const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO,
@@ -50,7 +52,7 @@ void gcode_M111() {
     for (uint8_t i = 0; i < COUNT(debug_strings); i++) {
       if (TEST(marlin_debug_flags, i)) {
         if (comma++) SERIAL_CHAR(',');
-        serialprintPGM((char*)pgm_read_word(&debug_strings[i]));
+        serialprintPGM((char*)pgm_read_ptr(&debug_strings[i]));
       }
     }
   }
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index 822c31786db1bc5e208d4b47bf60d816251a090e..f9f508ffd1ca097fae0535971f6dfcdd509d89ff 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -124,7 +124,6 @@ extern void gcode_M83();
 extern void gcode_M85();
 extern void gcode_M92();
 extern void gcode_M100();
-extern void gcode_M111();
 extern void gcode_M113();
 extern void gcode_M114();
 extern void gcode_M115();
@@ -449,9 +448,7 @@ void GcodeSuite::process_next_command() {
 
       case 110: M110(); break;    // M110: Set Current Line Number
 
-      case 111: // M111: Set debug level
-        gcode_M111();
-        break;
+      case 111: M111(); break;    // M111: Set debug level
 
       #if DISABLED(EMERGENCY_PARSER)
         case 108: M108(); break;  // M108: Cancel Waiting