Revert header reorg.

Marlin/src/HAL/HAL_AVR/endstop_interrupts.h

@@ -38,9 +38,9 @@
 #ifndef _ENDSTOP_INTERRUPTS_H_
 #define _ENDSTOP_INTERRUPTS_H_
 
-#include "../../module/endstops.h"
-#include "../../inc/MarlinConfig.h"
+#include "../../core/macros.h"
 #include <stdint.h>
+#include "../../module/endstops.h"
 
 // One ISR for all EXT-Interrupts
 void endstop_ISR(void) { endstops.update(); }

Marlin/src/HAL/HAL_DUE/DebugMonitor_Due.cpp

@@ -22,13 +22,13 @@
 
 #ifdef ARDUINO_ARCH_SAM
 
+#include "../../core/macros.h"
 #include "../../core/serial.h"
+#include <stdarg.h>
 
 #include "../shared/backtrace/unwinder.h"
 #include "../shared/backtrace/unwmemaccess.h"
 
-#include <stdarg.h>
-
 // Debug monitor that dumps to the Programming port all status when
 // an exception or WDT timeout happens - And then resets the board
 

Marlin/src/HAL/HAL_DUE/usb/conf_usb.h

@@ -47,8 +47,9 @@
 #ifndef _CONF_USB_H_
 #define _CONF_USB_H_
 
-#include "../../../core/macros.h"       /* For ENABLED, DISABLED, MIN, MAX */
-#include "../../../../Configuration.h"  /* For SDSUPPORT and CUSTOM_MACHINE_NAME definition - We just need the name, no C++ allowed! */
+#undef UNUSED                           /* To avoid a macro clash as macros.h already defines it */
+#include "../../../core/macros.h"       /* For ENABLED()/DISABLED() */
+#include "../../../../Configuration.h"  /* For CUSTOM_MACHINE_NAME definition - We just need the name, no C++ allowed! */
 #include "compiler.h"
 
 /**

Marlin/src/HAL/HAL_LPC1768/spi_pins.h

@@ -23,7 +23,7 @@
 #ifndef SPI_PINS_LPC1768_H
 #define SPI_PINS_LPC1768_H
 
-#include "../../inc/MarlinConfigPre.h"
+#include "src/core/macros.h"
 
 #if ENABLED(SDSUPPORT) && ENABLED(DOGLCD) && (LCD_PINS_D4 == SCK_PIN || LCD_PINS_ENABLE == MOSI_PIN || DOGLCD_SCK == SCK_PIN || DOGLCD_MOSI == MOSI_PIN)
   #define LPC_SOFTWARE_SPI  // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently