diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
index 6147d43f17..6428b77398 100644
--- a/Marlin/src/MarlinCore.h
+++ b/Marlin/src/MarlinCore.h
@@ -23,10 +23,6 @@
 
 #include "inc/MarlinConfig.h"
 
-#ifdef DEBUG_GCODE_PARSER
-  #include "gcode/parser.h"
-#endif
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index cd190387b0..16cee3481d 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -21,10 +21,6 @@
  */
 #pragma once
 
-/**
- * gcode.h - Temporary container for all gcode handlers
- */
-
 /**
  * -----------------
  * G-Codes in Marlin
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
index e41e51bee4..2a2df68b1d 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
@@ -33,6 +33,7 @@
 #include "../../marlinui.h"
 #include "../../../MarlinCore.h"
 
+#include "../../../gcode/gcode.h"
 #include "../../../module/temperature.h"
 #include "../../../module/planner.h"
 #include "../../../module/settings.h"
@@ -180,6 +181,7 @@ bool probe_deployed = false;
 CrealityDWINClass CrealityDWIN;
 
 #if HAS_MESH
+
   struct Mesh_Settings {
     bool viewer_asymmetric_range = false;
     bool viewer_print_value = false;
@@ -362,7 +364,7 @@ CrealityDWINClass CrealityDWIN;
       if (v_min > 3e+10F) v_min = 0.0000001;
       if (v_max > 3e+10F) v_max = 0.0000001;
       if (range > 3e+10F) range = 0.0000001;
-      char msg[32];
+      char msg[46];
       if (viewer_asymmetric_range) {
         dtostrf(-v_min, 1, 3, str_1);
         dtostrf( v_max, 1, 3, str_2);
@@ -378,7 +380,8 @@ CrealityDWINClass CrealityDWIN;
 
   };
   Mesh_Settings mesh_conf;
-#endif
+
+#endif // HAS_MESH
 
 /* General Display Functions */