diff --git a/Marlin/src/lcd/extui/ia_creality/FileNavigator.cpp b/Marlin/src/lcd/extui/ia_creality/FileNavigator.cpp
index 448d078cc4..4e2d294a9b 100644
--- a/Marlin/src/lcd/extui/ia_creality/FileNavigator.cpp
+++ b/Marlin/src/lcd/extui/ia_creality/FileNavigator.cpp
@@ -33,13 +33,11 @@
 
 #if DGUS_LCD_UI_IA_CREALITY
 
+#include "ia_creality_extui.h"
 #include "FileNavigator.h"
 
 using namespace ExtUI;
 
-#define DEBUG_OUT ENABLED(DEBUG_DWIN)
-#include "../../../core/debug_out.h"
-
 FileList  FileNavigator::filelist;                          // Instance of the Marlin file API
 char      FileNavigator::currentfoldername[MAX_PATH_LEN];   // Current folder path
 uint16_t  FileNavigator::lastindex;
@@ -124,8 +122,6 @@ void FileNavigator::getFiles(uint16_t index) {
       const int filelen = strlen(filelist.filename());
       if (filelen > 20) {
         char *buf = (char *)filelist.filename();
-        //char buf[filelen];
-        //strcpy(&buf[filelen], filelist.filename());
         buf[18] = '\0'; // cutoff at screen edge
         rtscheck.RTS_SndData(buf, (SDFILE_ADDR + (fcnt * 20)));
       }
diff --git a/Marlin/src/lcd/extui/ia_creality/FileNavigator.h b/Marlin/src/lcd/extui/ia_creality/FileNavigator.h
index 29f5628455..28d97c6746 100644
--- a/Marlin/src/lcd/extui/ia_creality/FileNavigator.h
+++ b/Marlin/src/lcd/extui/ia_creality/FileNavigator.h
@@ -30,9 +30,6 @@
  * Written by Insanity Automation
  * ***************************************/
 
-#include "creality_extui.h"
-#include "../ui_api.h"
-
 #define MAX_FOLDER_DEPTH   4    // Limit folder depth TFT has a limit for the file path
 #define MAX_CMND_LEN      16 * MAX_FOLDER_DEPTH // Maximum Length for a Panel command
 #define MAX_PATH_LEN      16 * MAX_FOLDER_DEPTH // Maximum number of characters in a SD file path
diff --git a/Marlin/src/lcd/extui/ia_creality/creality_extui.cpp b/Marlin/src/lcd/extui/ia_creality/creality_extui.cpp
index 15dcd84bb9..c9c064fdc8 100644
--- a/Marlin/src/lcd/extui/ia_creality/creality_extui.cpp
+++ b/Marlin/src/lcd/extui/ia_creality/creality_extui.cpp
@@ -34,16 +34,8 @@
 
 #if DGUS_LCD_UI_IA_CREALITY
 
-#include "creality_extui.h"
+#include "ia_creality_extui.h"
 #include "FileNavigator.h"
-#include "../ui_api.h"
-
-#include <HardwareSerial.h>
-#include <WString.h>
-#include <stdio.h>
-
-#define DEBUG_OUT ENABLED(DEBUG_DWIN)
-#include "../../../core/debug_out.h"
 
 namespace ExtUI {
   static uint16_t fileIndex   = 0;
diff --git a/Marlin/src/lcd/extui/ia_creality/creality_extui.h b/Marlin/src/lcd/extui/ia_creality/ia_creality_extui.h
similarity index 99%
rename from Marlin/src/lcd/extui/ia_creality/creality_extui.h
rename to Marlin/src/lcd/extui/ia_creality/ia_creality_extui.h
index 099f8c238a..0d93255663 100644
--- a/Marlin/src/lcd/extui/ia_creality/creality_extui.h
+++ b/Marlin/src/lcd/extui/ia_creality/ia_creality_extui.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /* ****************************************
- * lcd/extui/ia_creality/creality_extui.h
+ * lcd/extui/ia_creality/ia_creality_extui.h
  * ****************************************
  * Extensible_UI implementation for Creality DWIN
  * 10SPro, Max, CRX, and others
@@ -32,7 +32,6 @@
  * ***************************************/
 
 #include "string.h"
-#include <Arduino.h>
 #include "../ui_api.h"
 
 /*********************************/