From 449510392d7a5b3cb87b49adfc6fbac162d599e8 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia <wavexx@thregr.org>
Date: Sat, 12 Jun 2021 15:09:03 +0200
Subject: [PATCH] Untangle a bit some recursive include mess

---
 Firmware/Marlin_main.cpp | 1 +
 Firmware/cardreader.cpp  | 2 ++
 Firmware/mmu.cpp         | 1 +
 Firmware/temperature.cpp | 2 ++
 Firmware/ultralcd.cpp    | 1 +
 Firmware/ultralcd.h      | 6 ------
 Firmware/util.cpp        | 1 +
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 54d0b9c24..afb9672d4 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -66,6 +66,7 @@
 
 #include "menu.h"
 #include "ultralcd.h"
+#include "conv2str.h"
 #include "backlight.h"
 
 #include "planner.h"
diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp
index a86c49e16..caf759f11 100644
--- a/Firmware/cardreader.cpp
+++ b/Firmware/cardreader.cpp
@@ -2,6 +2,8 @@
 #include "cmdqueue.h"
 #include "cardreader.h"
 #include "ultralcd.h"
+#include "conv2str.h"
+#include "menu.h"
 #include "stepper.h"
 #include "temperature.h"
 #include "language.h"
diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp
index a94711395..cbaee9b8b 100755
--- a/Firmware/mmu.cpp
+++ b/Firmware/mmu.cpp
@@ -11,6 +11,7 @@
 #include "cardreader.h"
 #include "cmdqueue.h"
 #include "ultralcd.h"
+#include "menu.h"
 #include "sound.h"
 #include "printers.h"
 #include <avr/pgmspace.h>
diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
index 35b05f0e8..1d0dfdb69 100755
--- a/Firmware/temperature.cpp
+++ b/Firmware/temperature.cpp
@@ -32,6 +32,8 @@
 #include "Marlin.h"
 #include "cmdqueue.h"
 #include "ultralcd.h"
+#include "menu.h"
+#include "conv2str.h"
 #include "sound.h"
 #include "temperature.h"
 #include "cardreader.h"
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 1820d0e62..c98637879 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5,6 +5,7 @@
 
 #include "temperature.h"
 #include "ultralcd.h"
+#include "conv2str.h"
 #include "fsensor.h"
 #include "Marlin.h"
 #include "language.h"
diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h
index 3aab932d8..d87810011 100755
--- a/Firmware/ultralcd.h
+++ b/Firmware/ultralcd.h
@@ -1,15 +1,9 @@
 #ifndef ULTRALCD_H
 #define ULTRALCD_H
 
-#include "Marlin.h"
-#include "lcd.h"
-#include "conv2str.h"
-#include "menu.h"
 #include "mesh_bed_calibration.h"
 #include "config.h"
 
-#include "config.h"
-
 extern void menu_lcd_longpress_func(void);
 extern void menu_lcd_charsetup_func(void);
 extern void menu_lcd_lcdupdate_func(void);
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index cf9b05b70..5ce21cd0a 100644
--- a/Firmware/util.cpp
+++ b/Firmware/util.cpp
@@ -1,6 +1,7 @@
 #include "Configuration.h"
 
 #include "ultralcd.h"
+#include "menu.h"
 #include "sound.h"
 #include "language.h"
 #include "util.h"