Apply #pragma once, misc cleanup (#12322)

* Apply #pragma once in headers
* Adjust some thermistors formatting
* Misc cleanup and formatting

Marlin/src/HAL/HAL_AVR/HAL.h

@@ -16,9 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#pragma once
-#ifndef _HAL_AVR_H_
-#define _HAL_AVR_H_
 
 // --------------------------------------------------------------------------
 // Includes
@@ -374,5 +372,3 @@ inline void HAL_adc_init(void) {
 
 // AVR compatibility
 #define strtof strtod
-
-#endif // _HAL_AVR_H_

Marlin/src/HAL/HAL_AVR/MarlinSerial.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * MarlinSerial.h - Hardware serial library for Wiring
@@ -30,9 +31,6 @@
  * Templatized 01 October 2018 by Eduardo José Tagle to allow multiple instances
  */
 
-#ifndef _MARLINSERIAL_H_
-#define _MARLINSERIAL_H_
-
 #include "../shared/MarlinSerial.h"
 
 #include <WString.h>
@@ -281,5 +279,3 @@
 #if defined(USBCON) && ENABLED(BLUETOOTH)
   extern HardwareSerial bluetoothSerial;
 #endif
-
-#endif // _MARLINSERIAL_H_

Marlin/src/HAL/HAL_AVR/SanityCheck.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _SANITYCHECK_AVR_8_BIT_H_
-#define _SANITYCHECK_AVR_8_BIT_H_
 
 /**
  * Test AVR specific configuration values for errors at compile-time.
@@ -116,5 +114,3 @@
     || defined(E4_HARDWARE_SERIAL) )
   #error "Select hardware UART for TMC2208 to use both TMC2208 and ENDSTOP_INTERRUPTS_FEATURE."
 #endif
-
-#endif // _SANITYCHECK_AVR_8_BIT_H_

Marlin/src/HAL/HAL_AVR/ServoTimers.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * ServoTimers.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
@@ -39,9 +40,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _SERVOTIMERS_H_
-#define _SERVOTIMERS_H_
-
 /**
  * Defines for 16 bit timers used with  Servo library
  *
@@ -91,5 +89,3 @@ typedef enum {
   #endif
   _Nbr_16timers
 } timer16_Sequence_t;
-
-#endif // _SERVOTIMERS_H_

Marlin/src/HAL/HAL_AVR/endstop_interrupts.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Endstop Interrupts
@@ -35,9 +36,6 @@
  * (Located in Marlin/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino)
  */
 
-#ifndef _ENDSTOP_INTERRUPTS_H_
-#define _ENDSTOP_INTERRUPTS_H_
-
 #include "../../core/macros.h"
 #include <stdint.h>
 #include "../../module/endstops.h"
@@ -256,5 +254,3 @@ void setup_endstop_interrupts( void ) {
 
   // If we arrive here without raising an assertion, each pin has either an EXT-interrupt or a PCI.
 }
-
-#endif // _ENDSTOP_INTERRUPTS_H_

Marlin/src/HAL/HAL_AVR/fastio_1280.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Pin mapping for the 1280 and 2560
@@ -28,9 +29,6 @@
  *   Logical Pin   : 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx xx
  */
 
-#ifndef _FASTIO_1280_H_
-#define _FASTIO_1280_H_
-
 #include "fastio_AVR.h"
 
 // change for your board
@@ -1111,5 +1109,3 @@
 #define PL7_WPORT   PORTL
 #define PL7_DDR     DDRL
 #define PL7_PWM     NULL
-
-#endif // _FASTIO_1280_H_

Marlin/src/HAL/HAL_AVR/fastio_1281.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Pin mapping for the 1281 and 2561
@@ -27,9 +28,6 @@
  *   Port:        A0 A1 A2 A3 A4 A5 A6 A7 B0 B1 B2 B3 B4 B5 B6 B7 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 E2 E3 E4 E5 E6 E7 F0 F1 F2 F3 F4 F5 F6 F7 G0 G1 G2 G3 G4 G5
  */
 
-#ifndef _FASTIO_1281_H_
-#define _FASTIO_1281_H_
-
 #include "fastio_AVR.h"
 
 // change for your board
@@ -715,5 +713,3 @@
 #define PG5_WPORT   PORTG
 #define PG5_DDR     DDRG
 #define PG5_PWM     &OCR0B
-
-#endif // _FASTIO_1281_H_

Marlin/src/HAL/HAL_AVR/fastio_168.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Pin mapping for the 168, 328, and 328P
@@ -27,9 +28,6 @@
  *   Port:        B0 B1 B2 B3 B4 B5 C0 C1 C2 C3 C4 C5 C6 C7 D0 D1 D2 D3 D4 D5 D6 D7
  */
 
-#ifndef _FASTIO_168_H_
-#define _FASTIO_168_H_
-
 #include "fastio_AVR.h"
 
 #define DEBUG_LED   AIO5
@@ -357,5 +355,3 @@
 #define PD7_WPORT   PORTD
 #define PD7_DDR     DDRD
 #define PD7_PWM     NULL
-
-#endif // _FASTIO_168_H_

Marlin/src/HAL/HAL_AVR/fastio_644.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Pin mapping for the 644, 644p, 644pa, and 1284p
@@ -53,9 +54,6 @@
  *                        +--------+
  */
 
-#ifndef _FASTIO_644_H_
-#define _FASTIO_644_H_
-
 #include "fastio_AVR.h"
 
 #define DEBUG_LED   DIO0
@@ -552,5 +550,3 @@
 #define PD7_WPORT   PORTD
 #define PD7_DDR     DDRD
 #define PD7_PWM     OCR2A
-
-#endif // _FASTIO_644_H_

Marlin/src/HAL/HAL_AVR/fastio_AT90USB.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Pin mapping (Teensy) for AT90USB646, 647, 1286, and 1287
@@ -28,9 +29,6 @@
  *            The logical pins 46 and 47 are not supported by Teensyduino, but are supported below as E2 and E3
  */
 
-#ifndef _FASTIO_AT90USB_H_
-#define _FASTIO_AT90USB_H_
-
 #include "fastio_AVR.h"
 
 // change for your board
@@ -697,5 +695,3 @@
 #define TIMER3A 5
 #define TIMER3B 4
 #define TIMER3C 3
-
-#endif // _FASTIO_AT90USB_H_

Marlin/src/HAL/HAL_AVR/fastio_AVR.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Fast I/O Routines for AVR
@@ -26,9 +27,6 @@
  * Contributed by Triffid_Hunter and modified by Kliment, thinkyhead, Bob-the-Kuhn, et.al.
  */
 
-#ifndef _FASTIO_ARDUINO_H_
-#define _FASTIO_ARDUINO_H_
-
 #include <avr/io.h>
 #include "../../core/macros.h"
 
@@ -312,5 +310,3 @@ enum ClockSource2 : char {
 
 // finally - the macro that tells us if a pin is an available hardware PWM
 #define USEABLE_HARDWARE_PWM(p) (PWM_PINS(p) && !PWM_CHK(p))
-
-#endif // _FASTIO_ARDUINO_H_

Marlin/src/HAL/HAL_AVR/math_AVR.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _MATH_AVR_H_
-#define _MATH_AVR_H_
 
 /**
  * Optimized math functions for AVR
@@ -113,5 +111,3 @@ static FORCE_INLINE uint16_t MultiU16X8toH16(uint8_t charIn1, uint16_t intIn2) {
   );
   return intRes;
 }
-
-#endif // _MATH_AVR_H_

Marlin/src/HAL/HAL_AVR/pinsDebug.h

@@ -19,14 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * PWM print routines for Atmel 8 bit AVR CPUs
  */
 
-#ifndef _PINSDEBUG_AVR_8_BIT_
-#define _PINSDEBUG_AVR_8_BIT_
-
 #include "../../inc/MarlinConfig.h"
 
 #define NUMBER_PINS_TOTAL NUM_DIGITAL_PINS
@@ -406,5 +404,3 @@ static void pwm_details(uint8_t pin) {
 #endif
 
 #define PRINT_PIN(p) do {sprintf_P(buffer, PSTR("%3d "), p); SERIAL_ECHO(buffer);} while (0)
-
-#endif // _PINSDEBUG_AVR_8_BIT_

Marlin/src/HAL/HAL_AVR/pinsDebug_Teensyduino.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _PINSDEBUG_TEENSYSUINO_H_
-#define _PINSDEBUG_TEENSYSUINO_H_
 
 //
 //  some of the pin mapping functions of the Teensduino extension to the Arduino IDE
@@ -111,5 +109,3 @@ const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
                                              // disable the PWMs so we can use it as is
 
 // portModeRegister(pin) is OK
-
-#endif // _PINSDEBUG_TEENSYSUINO_H_

Marlin/src/HAL/HAL_AVR/pinsDebug_plus_70.h

@@ -20,14 +20,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Structures for 2560 family boards that use more than 70 pins
  */
 
-#ifndef _PINSDEBUG_PLUS_70_H_
-#define _PINSDEBUG_PLUS_70_H_
-
 #undef NUM_DIGITAL_PINS
 #if MB(BQ_ZUM_MEGA_3D)
   #define NUM_DIGITAL_PINS            85
@@ -336,6 +334,3 @@ const uint8_t PROGMEM digital_pin_to_timer_PGM_plus_70[] = {
  *  PCINT14 J5 76
  *  PCINT15 J6 77
  */
-
-
-#endif // _PINSDEBUG_PLUS_70_H_

Marlin/src/HAL/HAL_AVR/spi_pins.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _SPI_PINS_H_
-#define _SPI_PINS_H_
 
 /**
  * Define SPI Pins: SCK, MISO, MOSI, SS
@@ -65,6 +63,3 @@
 #ifndef SS_PIN
   #define SS_PIN   AVR_SS_PIN
 #endif
-
-
-#endif // _SPI_PINS_H_

Marlin/src/HAL/HAL_AVR/watchdog_AVR.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _WATCHDOG_AVR_H_
-#define _WATCHDOG_AVR_H_
 
 #include <avr/wdt.h>
 
@@ -31,5 +29,3 @@ void watchdog_init();
 // Reset watchdog. MUST be called at least every 4 seconds after the
 // first watchdog_init or AVR will go into emergency procedures.
 inline void watchdog_reset() { wdt_reset(); }
-
-#endif // _WATCHDOG_AVR_H_

Marlin/src/HAL/HAL_DUE/HAL.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Description: HAL for Arduino Due and compatible (SAM3X8E)
@@ -26,9 +27,6 @@
  * For ARDUINO_ARCH_SAM
  */
 
-#ifndef _HAL_DUE_H
-#define _HAL_DUE_H
-
 #define CPU_32_BIT
 
 #include <stdint.h>
@@ -189,5 +187,3 @@ char *dtostrf (double __val, signed char __width, unsigned char __prec, char *__
 #ifdef __cplusplus
   }
 #endif
-
-#endif // _HAL_DUE_H

Marlin/src/HAL/HAL_DUE/HAL_timers_Due.h

@@ -18,6 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * HAL for Arduino Due and compatible (SAM3X8E)
@@ -25,9 +26,6 @@
  * For ARDUINO_ARCH_SAM
  */
 
-#ifndef _HAL_TIMERS_DUE_H
-#define _HAL_TIMERS_DUE_H
-
 // --------------------------------------------------------------------------
 // Includes
 // --------------------------------------------------------------------------
@@ -120,5 +118,3 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
 }
 
 #define HAL_timer_isr_epilogue(TIMER_NUM)
-
-#endif // _HAL_TIMERS_DUE_H

Marlin/src/HAL/HAL_DUE/InterruptVectors_Due.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * InterruptVectors_Due.h
@@ -35,11 +36,6 @@
  * Copyright (c) 2017 Eduardo José Tagle. All right reserved
  */
 
-#ifndef INTERRUPTVECTORS_DUE_H
-#define INTERRUPTVECTORS_DUE_H
-
-#include "../../inc/MarlinConfig.h"
-
 #ifdef ARDUINO_ARCH_SAM
 
 // ISR handler type
@@ -49,4 +45,3 @@ typedef void (*pfnISR_Handler)(void);
 pfnISR_Handler install_isr(IRQn_Type irq, pfnISR_Handler newHandler);
 
 #endif // ARDUINO_ARCH_SAM
-#endif // INTERRUPTVECTORS_DUE_H

Marlin/src/HAL/HAL_DUE/MarlinSerialUSB_Due.h

@@ -19,15 +19,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * MarlinSerialUSB_Due.h - Hardware Serial over USB (CDC) library for Arduino DUE
  * Copyright (c) 2017 Eduardo José Tagle. All right reserved
  */
 
-#ifndef MARLINSERIALUSB_DUE_H
-#define MARLINSERIALUSB_DUE_H
-
 #include "../../inc/MarlinConfig.h"
 
 #if SERIAL_PORT == -1
@@ -92,4 +90,3 @@ private:
 extern MarlinSerialUSB customizedSerial1;
 
 #endif // SERIAL_PORT == -1
-#endif // MARLINSERIAL_DUE_H

Marlin/src/HAL/HAL_DUE/endstop_interrupts.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Endstop Interrupts
@@ -34,9 +35,6 @@
  * (Located in Marlin/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino)
  */
 
-#ifndef _ENDSTOP_INTERRUPTS_H_
-#define _ENDSTOP_INTERRUPTS_H_
-
 #include "../../module/endstops.h"
 
 // One ISR for all EXT-Interrupts
@@ -82,5 +80,3 @@ void setup_endstop_interrupts(void) {
     attachInterrupt(digitalPinToInterrupt(Z_MIN_PROBE_PIN), endstop_ISR, CHANGE);
   #endif
 }
-
-#endif //_ENDSTOP_INTERRUPTS_H_

Marlin/src/HAL/HAL_DUE/fastio_Due.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Fast I/O Routines for SAM3X8E
@@ -36,9 +37,6 @@
  * leads to less efficient compiled code!!
  */
 
-#ifndef _FASTIO_DUE_H
-#define _FASTIO_DUE_H
-
 #include <pins_arduino.h>
 
 /**
@@ -495,5 +493,3 @@
   #define DIO100_PIN 11
   #define DIO100_WPORT PIOC
 #endif
-
-#endif // _FASTIO_DUE_H

Marlin/src/HAL/HAL_DUE/spi_pins.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef SPI_PINS_H_
-#define SPI_PINS_H_
 
 /**
  * Define SPI Pins: SCK, MISO, MOSI, SS
@@ -61,5 +59,3 @@
 
 /* A.28, A.29, B.21, C.26, C.29 */
 #define SS_PIN            SDSS
-
-#endif /* SPI_PINS_H_ */

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

@@ -40,15 +40,12 @@
  * \asf_license_stop
  *
  */
-/*
+#pragma once
+
+/**
  * Support and FAQ: visit <a href="http://www.atmel.com/design-support/">Atmel Support</a>
  */
 
-#ifndef ARDUINO_DUE_X_H_INCLUDED
-#define ARDUINO_DUE_X_H_INCLUDED
-
-/* ------------------------------------------------------------------------ */
-
 /**
  *  \page arduino_due_x_opfreq "Arduino Due/X - Operating frequencies"
  *  This page lists several definition related to the board operating frequency
@@ -98,6 +95,3 @@
 /*! Active level of the USB_VBOF output pin. */
 #define USB_VBOF_ACTIVE_LEVEL       LOW
 /* ------------------------------------------------------------------------ */
-
-
-#endif /* ARDUINO_DUE_X_H_INCLUDED */

Marlin/src/HAL/HAL_DUE/watchdog_Due.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef WATCHDOG_DUE_H
-#define WATCHDOG_DUE_H
 
 // Arduino Due core now has watchdog support
 
@@ -33,5 +31,3 @@ void watchdog_init();
 // Reset watchdog. MUST be called at least every 4 seconds after the
 // first watchdog_init or AVR will go into emergency procedures.
 inline void watchdog_reset() { watchdogReset(); }
-
-#endif // WATCHDOG_DUE_H

Marlin/src/HAL/HAL_ESP32/HAL.h

@@ -16,14 +16,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 /**
  * Description: HAL for Espressif ESP32 WiFi
  */
 
-#ifndef _HAL_ESP32_H
-#define _HAL_ESP32_H
-
 #define CPU_32_BIT
 
 // --------------------------------------------------------------------------
@@ -123,5 +121,3 @@ void HAL_adc_start_conversion (uint8_t adc_pin);
 #define HAL_INIT 1
 void HAL_idletask(void);
 void HAL_init(void);
-
-#endif // _HAL_ESP32_H

Marlin/src/HAL/HAL_ESP32/HAL_timers_ESP32.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _HAL_TIMERS_ESP32_H
-#define _HAL_TIMERS_ESP32_H
 
 // --------------------------------------------------------------------------
 // Includes
@@ -104,5 +102,3 @@ bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 #define HAL_timer_isr_prologue(TIMER_NUM)
 #define HAL_timer_isr_epilogue(TIMER_NUM)
-
-#endif // _HAL_TIMERS_ESP32_H

Marlin/src/HAL/HAL_ESP32/endstop_interrupts.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Endstop Interrupts
@@ -34,9 +35,6 @@
  * (Located in Marlin/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino)
  */
 
-#ifndef _ENDSTOP_INTERRUPTS_H_
-#define _ENDSTOP_INTERRUPTS_H_
-
 #include "../../module/endstops.h"
 
 // One ISR for all EXT-Interrupts
@@ -77,5 +75,3 @@ void setup_endstop_interrupts(void) {
     attachInterrupt(digitalPinToInterrupt(Z_MIN_PROBE_PIN), endstop_ISR, CHANGE);
   #endif
 }
-
-#endif //_ENDSTOP_INTERRUPTS_H_

Marlin/src/HAL/HAL_ESP32/fastio_ESP32.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _FASTIO_ESP32_H
-#define _FASTIO_ESP32_H
 
 /**
  * Utility functions
@@ -64,9 +62,3 @@
 // TWI (I2C)
 #define SCL        5
 #define SDA        4
-
-//
-// pins
-//
-
-#endif // _FASTIO_ESP32_H

Marlin/src/HAL/HAL_ESP32/ota.h

@@ -16,11 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
+#pragma once
-#ifndef _HAL_OTA_H
-#define _HAL_OTA_H
 
 void OTA_init();
 void OTA_handle();
-
-#endif

Marlin/src/HAL/HAL_ESP32/spi_pins.h

@@ -16,13 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef SPI_PINS_H_
-#define SPI_PINS_H_
 
 #define SS_PIN    5
 #define SCK_PIN  18
 #define MISO_PIN 19
 #define MOSI_PIN 23
-
-#endif // SPI_PINS_H_

Marlin/src/HAL/HAL_ESP32/watchdog_ESP32.h

@@ -19,14 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef WATCHDOG_ESP32_H
-#define WATCHDOG_ESP32_H
 
 // Initialize watchdog with a 4 second interrupt time
 void watchdog_init();
 
 // Reset watchdog.
-inline void watchdog_reset() {};
+inline void watchdog_reset() { }
-
-#endif // WATCHDOG_ESP32_H

Marlin/src/HAL/HAL_LPC1768/HAL.h

@@ -19,15 +19,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * HAL_LPC1768/HAL.h
  * Hardware Abstraction Layer for NXP LPC1768
  */
 
-#ifndef _HAL_LPC1768_H_
-#define _HAL_LPC1768_H_
-
 #define CPU_32_BIT
 #define HAL_INIT
 
@@ -156,5 +154,3 @@ int16_t PARSED_PIN_INDEX(const char code, const int16_t dval);
 
 #define HAL_IDLETASK 1
 void HAL_idletask(void);
-
-#endif // _HAL_LPC1768_H_

Marlin/src/HAL/HAL_LPC1768/HAL_timers.h

@@ -18,15 +18,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  *
  * HAL For LPC1768
  */
 
-#ifndef _HAL_TIMERS_H
-#define _HAL_TIMERS_H
-
 // --------------------------------------------------------------------------
 // Includes
 // --------------------------------------------------------------------------
@@ -166,5 +164,3 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
 }
 
 #define HAL_timer_isr_epilogue(TIMER_NUM)
-
-#endif // _HAL_TIMERS_H

Marlin/src/HAL/HAL_LPC1768/MarlinSerial.h

@@ -19,9 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
-#ifndef MARLINSERIAL_H
-#define MARLINSERIAL_H
 #include <HardwareSerial.h>
 #include <WString.h>
 
@@ -33,7 +32,6 @@
 #ifndef SERIAL_PORT
   #define SERIAL_PORT 0
 #endif
-
 #ifndef RX_BUFFER_SIZE
   #define RX_BUFFER_SIZE 128
 #endif
@@ -67,5 +65,3 @@ extern MarlinSerial MSerial;
 extern MarlinSerial MSerial1;
 extern MarlinSerial MSerial2;
 extern MarlinSerial MSerial3;
-
-#endif // MARLINSERIAL_H

Marlin/src/HAL/HAL_LPC1768/MarlinServo.h

@@ -38,6 +38,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
+#pragma once
 
 /**
  * Based on "servo.h - Interrupt driven Servo library for Arduino using 16 bit timers -
@@ -47,12 +48,9 @@
  *
  */
 
-#ifndef SERVO_PRIVATE_H
-#define SERVO_PRIVATE_H
-
 #include <Servo.h>
 
-class MarlinServo: public Servo  {
+class MarlinServo: public Servo {
   public:
   void move(const int value) {
     constexpr uint16_t servo_delay[] = SERVO_DELAY;
@@ -70,5 +68,3 @@ class MarlinServo: public Servo  {
 };
 
 #define HAL_SERVO_LIB MarlinServo
-
-#endif // SERVO_PRIVATE_H

Marlin/src/HAL/HAL_LPC1768/endstop_interrupts.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Endstop Interrupts
@@ -34,9 +35,6 @@
  * (Located in Marlin/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino)
  */
 
-#ifndef _ENDSTOP_INTERRUPTS_H_
-#define _ENDSTOP_INTERRUPTS_H_
-
 #include "../../module/endstops.h"
 
 // One ISR for all EXT-Interrupts
@@ -104,5 +102,3 @@ void setup_endstop_interrupts(void) {
     attachInterrupt(digitalPinToInterrupt(Z_MIN_PROBE_PIN), endstop_ISR, CHANGE);
   #endif
 }
-
-#endif //_ENDSTOP_INTERRUPTS_H_

Marlin/src/HAL/HAL_LPC1768/fastio.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Fast I/O Routines for LPC1768/9
@@ -32,9 +33,6 @@
  * For TARGET LPC1768
  */
 
-#ifndef _FASTIO_LPC1768_H
-#define _FASTIO_LPC1768_H
-
 #include <Arduino.h>
 
 #define USEABLE_HARDWARE_PWM(pin) TRUE // all pins are PWM capable
@@ -123,5 +121,3 @@
 
 // Shorthand
 #define OUT_WRITE(IO,V)   do{ SET_OUTPUT(IO); WRITE(IO,V); }while(0)
-
-#endif // _FASTIO_LPC1768_H

Marlin/src/HAL/HAL_LPC1768/include/digipot_mcp4451_I2C_routines.h

@@ -19,13 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 // adapted from  I2C/master/master.c example
 //   https://www-users.cs.york.ac.uk/~pcc/MCP/HAPR-Course-web/CMSIS/examples/html/master_8c_source.html
 
-#ifndef _DIGIPOT_MCP4451_I2C_ROUTINES_H_
-#define _DIGIPOT_MCP4451_I2C_ROUTINES_H_
-
 #define USEDI2CDEV_M  1  // use I2C1 controller
 
 #if USEDI2CDEV_M == 0
@@ -53,5 +51,3 @@ uint8_t digipot_mcp4451_send_byte(uint8_t data);
 #ifdef __cplusplus
   }
 #endif
-
-#endif // _DIGIPOT_MCP4451_I2C_ROUTINES_H_

Marlin/src/HAL/HAL_LPC1768/spi_pins.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef SPI_PINS_LPC1768_H
-#define SPI_PINS_LPC1768_H
 
 #include "src/core/macros.h"
 
@@ -54,5 +52,3 @@
   #undef SDSS
   #define SDSS              SS_PIN
 #endif
-
-#endif // SPI_PINS_LPC1768_H

Marlin/src/HAL/HAL_LPC1768/watchdog.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef WATCHDOG_LPC1768_H
-#define WATCHDOG_LPC1768_H
 
 #define RST_POWER_ON   1
 #define RST_EXTERNAL   2
@@ -34,5 +32,3 @@ void watchdog_init(void);
 void watchdog_reset(void);
 void HAL_clear_reset_source(void);
 uint8_t HAL_get_reset_source(void);
-
-#endif /* WATCHDOG_H */

Marlin/src/HAL/HAL_STM32F1/HAL.h

@@ -20,14 +20,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * HAL for stm32duino.com based on Libmaple and compatible (STM32F1)
  */
 
-#ifndef _HAL_STM32F1_H
-#define _HAL_STM32F1_H
-
 #define CPU_32_BIT
 #undef DEBUG_NONE
 
@@ -251,5 +249,3 @@ void HAL_enable_AdcFreerun(void);
 
 #define JTAG_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY)
 #define JTAGSWD_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE)
-
-#endif // _HAL_STM32F1_H

Marlin/src/HAL/HAL_STM32F1/HAL_Servo_Stm32f1.h

@@ -20,9 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef HAL_SERVO_STM32F1_H
-#define HAL_SERVO_STM32F1_H
 
 // Pin number of unattached pins
 #define NOT_ATTACHED                    (-1)
@@ -53,5 +51,3 @@ class libServo {
     int32_t minAngle;
     int32_t maxAngle;
 };
-
-#endif // HAL_SERVO_STM32F1_H

Marlin/src/HAL/HAL_STM32F1/HAL_timers_Stm32f1.h

@@ -19,14 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * HAL for stm32duino.com based on Libmaple and compatible (STM32F1)
  */
 
-#ifndef _HAL_TIMERS_STM32F1_H
-#define _HAL_TIMERS_STM32F1_H
-
 // --------------------------------------------------------------------------
 // Includes
 // --------------------------------------------------------------------------
@@ -167,5 +165,3 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
 }
 
 #define HAL_timer_isr_epilogue(TIMER_NUM)
-
-#endif // _HAL_TIMERS_STM32F1_H

Marlin/src/HAL/HAL_STM32F1/endstop_interrupts.h

@@ -20,6 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Endstop interrupts for Libmaple STM32F1 based targets.
@@ -46,9 +47,6 @@
  * (Located in Marlin/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino)
  */
 
-#ifndef _ENDSTOP_INTERRUPTS_H_
-#define _ENDSTOP_INTERRUPTS_H_
-
 #include "../../module/endstops.h"
 
 // One ISR for all EXT-Interrupts
@@ -89,5 +87,3 @@ void setup_endstop_interrupts(void) {
     attachInterrupt(Z_MIN_PROBE_PIN, endstop_ISR, CHANGE);
   #endif
 }
-
-#endif //_ENDSTOP_INTERRUPTS_H_

Marlin/src/HAL/HAL_STM32F1/fastio_Stm32f1.h

@@ -20,15 +20,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Fast I/O interfaces for STM32F1
  * These use GPIO functions instead of Direct Port Manipulation, as on AVR.
  */
 
-#ifndef _FASTIO_STM32F1_H
-#define _FASTIO_STM32F1_H
-
 #include <libmaple/gpio.h>
 
 #define READ(IO)              (PIN_MAP[IO].gpio_device->regs->IDR & (1U << PIN_MAP[IO].gpio_bit) ? HIGH : LOW)
@@ -52,5 +50,3 @@
 
 #define PWM_PIN(p) true
 #define USEABLE_HARDWARE_PWM(p) PWM_PIN(p)
-
-#endif // _FASTIO_STM32F1_H

Marlin/src/HAL/HAL_STM32F1/spi_pins.h

@@ -16,14 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * HAL for stm32duino.com based on Libmaple and compatible (STM32F1)
  */
 
-#ifndef SPI_PINS_H_
-#define SPI_PINS_H_
-
 /**
  * Define SPI Pins: SCK, MISO, MOSI, SS
  *
@@ -33,5 +31,3 @@
 #define MISO_PIN  PA6
 #define MOSI_PIN  PA7
 #define SS_PIN    PA4
-
-#endif // SPI_PINS_H_

Marlin/src/HAL/HAL_STM32F1/watchdog_Stm32f1.h

@@ -19,14 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * HAL for stm32duino.com based on Libmaple and compatible (STM32F1)
  */
 
-#ifndef WATCHDOG_STM32F1_H
-#define WATCHDOG_STM32F1_H
-
 #include <libmaple/iwdg.h>
 
 #include "../../inc/MarlinConfig.h"
@@ -51,5 +49,3 @@ inline void watchdog_reset() {
   #endif
   iwdg_feed();
 }
-
-#endif // WATCHDOG_STM32F1_H

Marlin/src/HAL/HAL_STM32F4/EEPROM_Emul/eeprom_emul.h

@@ -45,10 +45,7 @@
   *
   ******************************************************************************
   */
-
+#pragma once
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __EEEPROM_EMUL_H
-#define __EEEPROM_EMUL_H
 
 // --------------------------------------------------------------------------
 // Includes
@@ -112,6 +109,4 @@ uint16_t EE_Initialize(void);
 uint16_t EE_ReadVariable(uint16_t VirtAddress, uint16_t* Data);
 uint16_t EE_WriteVariable(uint16_t VirtAddress, uint16_t Data);
 
-#endif /* __EEEPROM_H */
-
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Marlin/src/HAL/HAL_STM32F4/HAL.h

@@ -20,9 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _HAL_STM32F4_H
-#define _HAL_STM32F4_H
 
 #define CPU_32_BIT
 #undef DEBUG_NONE
@@ -251,5 +249,3 @@ void HAL_enable_AdcFreerun(void);
 
 #define JTAG_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_SW_ONLY)
 #define JTAGSWD_DISABLE() afio_cfg_debug_ports(AFIO_DEBUG_NONE)
-
-#endif // _HAL_STM32F4_H

Marlin/src/HAL/HAL_STM32F4/HAL_Servo_STM32F4.h

@@ -20,22 +20,18 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef HAL_SERVO_STM32F4_H
-#define HAL_SERVO_STM32F4_H
 
 #include <Servo.h>
 
 // Inherit and expand on the official library
 class libServo : public Servo {
-public:
+  public:
     int8_t attach(const int pin);
     int8_t attach(const int pin, const int min, const int max);
     void move(const int value);
-private:
+  private:
     uint16_t min_ticks;
     uint16_t max_ticks;
     uint8_t servoIndex;               // index into the channel data for this servo
 };
-
-#endif // HAL_SERVO_STM32F4_H

Marlin/src/HAL/HAL_STM32F4/HAL_timers_STM32F4.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _HAL_TIMERS_STM32F4_H
-#define _HAL_TIMERS_STM32F4_H
 
 // --------------------------------------------------------------------------
 // Includes
@@ -130,5 +128,3 @@ FORCE_INLINE static hal_timer_t HAL_timer_get_compare(const uint8_t timer_num) {
 #endif
 
 #define HAL_timer_isr_epilogue(TIMER_NUM)
-
-#endif // _HAL_TIMERS_STM32F4_H

Marlin/src/HAL/HAL_STM32F4/endstop_interrupts.h

@@ -20,9 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _ENDSTOP_INTERRUPTS_H_
-#define _ENDSTOP_INTERRUPTS_H_
 
 #include "../../module/endstops.h"
 
@@ -64,5 +62,3 @@ void setup_endstop_interrupts(void) {
     attachInterrupt(Z_MIN_PROBE_PIN, endstop_ISR, CHANGE);
   #endif
 }
-
-#endif //_ENDSTOP_INTERRUPTS_H_

Marlin/src/HAL/HAL_STM32F4/fastio_STM32F4.h

@@ -20,15 +20,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Fast I/O interfaces for STM32F4
  * These use GPIO functions instead of Direct Port Manipulation, as on AVR.
  */
 
-#ifndef _FASTIO_STM32F4_H
-#define _FASTIO_STM32F4_H
-
 #undef _BV
 #define _BV(b) (1 << (b))
 
@@ -151,5 +149,3 @@
 #define PE13 _STM32_PIN(E, 13)
 #define PE14 _STM32_PIN(E, 14)
 #define PE15 _STM32_PIN(E, 15)
-
-#endif // _FASTIO_STM32F4_H

Marlin/src/HAL/HAL_STM32F4/watchdog_STM32F4.h

@@ -19,15 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef WATCHDOG_STM32F4_H
-#define WATCHDOG_STM32F4_H
-
-#include "../../inc/MarlinConfig.h"
 
 extern IWDG_HandleTypeDef hiwdg;
 
 void watchdog_init();
 void watchdog_reset();
-
-#endif // WATCHDOG_STM32F1_H

Marlin/src/HAL/HAL_STM32F7/EEPROM_Emul/eeprom_emul.h

@@ -45,10 +45,7 @@
   *
   ******************************************************************************
   */
-
+#pragma once
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __EEEPROM_EMUL_H
-#define __EEEPROM_EMUL_H
 
 // --------------------------------------------------------------------------
 // Includes
@@ -113,6 +110,4 @@ uint16_t EE_Initialize(void);
 uint16_t EE_ReadVariable(uint16_t VirtAddress, uint16_t* Data);
 uint16_t EE_WriteVariable(uint16_t VirtAddress, uint16_t Data);
 
-#endif /* __EEEPROM_H */
-
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Marlin/src/HAL/HAL_STM32F7/HAL.h

@@ -20,9 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _HAL_STM32F7_H
-#define _HAL_STM32F7_H
 
 #define CPU_32_BIT
 #undef DEBUG_NONE
@@ -234,5 +232,3 @@ void HAL_enable_AdcFreerun(void);
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
-
-#endif // _HAL_STM32F7_H

Marlin/src/HAL/HAL_STM32F7/HAL_Servo_STM32F7.h

@@ -20,9 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef HAL_SERVO_STM32F7_H
-#define HAL_SERVO_STM32F7_H
 
 #include <../../libraries/Servo/src/Servo.h>
 
@@ -37,5 +35,3 @@ private:
     uint16_t max_ticks;
     uint8_t servoIndex;               // index into the channel data for this servo
 };
-
-#endif // HAL_SERVO_STM32F7_H

Marlin/src/HAL/HAL_STM32F7/HAL_timers_STM32F7.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _HAL_TIMERS_STM32F7_H
-#define _HAL_TIMERS_STM32F7_H
 
 // --------------------------------------------------------------------------
 // Includes
@@ -101,5 +99,3 @@ hal_timer_t HAL_timer_get_compare(const uint8_t timer_num);
 uint32_t HAL_timer_get_count(const uint8_t timer_num);
 void HAL_timer_isr_prologue(const uint8_t timer_num);
 #define HAL_timer_isr_epilogue(TIMER_NUM)
-
-#endif // _HAL_TIMERS_STM32F7_H

Marlin/src/HAL/HAL_STM32F7/TMC2660.h

@@ -24,12 +24,9 @@
  * THE SOFTWARE.
  *
  */
+#pragma once
 
-#include "../../inc/MarlinConfig.h"
+#include <stdint.h>
-
-// ensure this library description is only included once
-#ifndef _TMC26XSTEPPER_H_
-#define _TMC26XSTEPPER_H_
 
 //! return value for TMC26XStepper.getOverTemperature() if there is a overtemperature situation in the TMC chip
 /*!
@@ -601,5 +598,3 @@ class TMC26XStepper {
     // SPI sender
     inline void send262(uint32_t datagram);
 };
-
-#endif // _TMC26XSTEPPER_H_

Marlin/src/HAL/HAL_STM32F7/endstop_interrupts.h

@@ -20,11 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-
-
-#ifndef _ENDSTOP_INTERRUPTS_H_
-#define _ENDSTOP_INTERRUPTS_H_
 
 #include "../../module/endstops.h"
 
@@ -66,5 +62,3 @@ void setup_endstop_interrupts(void) {
     attachInterrupt(Z_MIN_PROBE_PIN, endstop_ISR, CHANGE);
   #endif
 }
-
-#endif //_ENDSTOP_INTERRUPTS_H_

Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h

@@ -20,15 +20,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Fast I/O interfaces for STM32F7
  * These use GPIO functions instead of Direct Port Manipulation, as on AVR.
  */
 
-#ifndef _FASTIO_STM32F7_H
-#define _FASTIO_STM32F7_H
-
 #define _BV(b) (1 << (b))
 
 #define READ(IO)                digitalRead(IO)
@@ -186,5 +184,3 @@
 #define PG13 _STM32_PIN(G, 13)
 #define PG14 _STM32_PIN(G, 14)
 #define PG15 _STM32_PIN(G, 15)
-
-#endif // _FASTIO_STM32F7_H

Marlin/src/HAL/HAL_STM32F7/watchdog_STM32F7.h

@@ -19,15 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef WATCHDOG_STM32F7_H
-#define WATCHDOG_STM32F7_H
-
-#include "../../inc/MarlinConfig.h"
 
 extern IWDG_HandleTypeDef hiwdg;
 
 void watchdog_init();
 void watchdog_reset();
-
-#endif // WATCHDOG_STM32F1_H

Marlin/src/HAL/HAL_TEENSY35_36/HAL.h

@@ -19,14 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Description: HAL for Teensy 3.5 and Teensy 3.6
  */
 
-#ifndef _HAL_TEENSY_H
-#define _HAL_TEENSY_H
-
 #define CPU_32_BIT
 
 // --------------------------------------------------------------------------
@@ -167,9 +165,3 @@ uint16_t HAL_adc_get_result(void);
 #define GET_PIN_MAP_PIN(index) index
 #define GET_PIN_MAP_INDEX(pin) pin
 #define PARSED_PIN_INDEX(code, dval) parser.intval(code, dval)
-
-// --------------------------------------------------------------------------
-//
-// --------------------------------------------------------------------------
-
-#endif // _HAL_TEENSY_H

Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.h

@@ -1,5 +1,25 @@
-#ifndef _HAL_SERVO_TEENSY_H_
+/**
-#define _HAL_SERVO_TEENSY_H_
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
 
 #include <Servo.h>
 
@@ -14,5 +34,3 @@ class libServo : public Servo {
      uint16_t max_ticks;
      uint8_t servoIndex;               // index into the channel data for this servo
 };
-
-#endif // _HAL_SERVO_TEENSY_H_

Marlin/src/HAL/HAL_TEENSY35_36/HAL_timers_Teensy.h

@@ -1,23 +1,23 @@
-/* **************************************************************************
+/**
-
+ * Marlin 3D Printer Firmware
- Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
- Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
- Copyright (c) 2016 Bob Cousins bobcousins42@googlemail.com
+ * Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
- Copyright (c) 2015-2016 Nico Tonnhofer wurstnase.reprap@gmail.com
+ *
-
+ * This program is free software: you can redistribute it and/or modify
- This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
- it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
- the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
- (at your option) any later version.
+ *
-
+ * This program is distributed in the hope that it will be useful,
- This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
- GNU General Public License for more details.
+ *
-
+ * You should have received a copy of the GNU General Public License
- You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
-****************************************************************************/
+#pragma once
 
 /**
  * Description: HAL for
@@ -25,9 +25,6 @@
  * Teensy3.6 (__MK66FX1M0__)
  */
 
-#ifndef _HAL_TIMERS_TEENSY_H
-#define _HAL_TIMERS_TEENSY_H
-
 // --------------------------------------------------------------------------
 // Includes
 // --------------------------------------------------------------------------
@@ -108,5 +105,3 @@ bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
 #define HAL_timer_isr_epilogue(TIMER_NUM)
-
-#endif // _HAL_TIMERS_TEENSY_H

Marlin/src/HAL/HAL_TEENSY35_36/endstop_interrupts.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Endstop Interrupts
@@ -34,9 +35,6 @@
  * (Located in Marlin/buildroot/share/pin_interrupt_test/pin_interrupt_test.ino)
  */
 
-#ifndef _ENDSTOP_INTERRUPTS_H_
-#define _ENDSTOP_INTERRUPTS_H_
-
 #include "../../module/endstops.h"
 
 // One ISR for all EXT-Interrupts
@@ -81,5 +79,3 @@ void setup_endstop_interrupts( void ) {
     attachInterrupt(digitalPinToInterrupt(Z_MIN_PROBE_PIN), endstop_ISR, CHANGE);
   #endif
 }
-
-#endif //_ENDSTOP_INTERRUPTS_H_

Marlin/src/HAL/HAL_TEENSY35_36/fastio_Teensy.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Fast I/O Routines for Teensy 3.5 and Teensy 3.6
@@ -26,9 +27,6 @@
  * Contributed by Triffid_Hunter and modified by Kliment, thinkyhead, Bob-the-Kuhn, et.al.
  */
 
-#ifndef _FASTIO_TEENSY_H
-#define _FASTIO_TEENSY_H
-
 #ifndef MASK
   #define MASK(PIN) (1 << PIN)
 #endif
@@ -91,5 +89,3 @@
  */
 
 #define DIO0_PIN 8
-
-#endif  /* _FASTIO_TEENSY_H */

Marlin/src/HAL/HAL_TEENSY35_36/spi_pins.h

@@ -19,13 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef SPI_PINS_H_
-#define SPI_PINS_H_
 
 #define SCK_PIN   13
 #define MISO_PIN  12
 #define MOSI_PIN  11
-#define SS_PIN    20 //SDSS // A.28, A.29, B.21, C.26, C.29
+#define SS_PIN    20 // SDSS // A.28, A.29, B.21, C.26, C.29
-
-#endif /* SPI_PINS_H_ */

Marlin/src/HAL/HAL_TEENSY35_36/watchdog_Teensy.h

@@ -19,13 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef WATCHDOG_TEENSY_H
-#define WATCHDOG_TEENSY_H
-
-#include "HAL.h"
-
-// Arduino Due core now has watchdog support
 
 void watchdog_init();
 
@@ -34,5 +28,3 @@ inline void watchdog_reset() {
   WDOG_REFRESH = 0xA602;
   WDOG_REFRESH = 0xB480;
 }
-
-#endif // WATCHDOG_TEENSY_H

Marlin/src/HAL/platforms.h

@@ -1,7 +1,25 @@
-#ifndef _HAL_PLATFORMS_H_
+/**
-#define _HAL_PLATFORMS_H_
+ * Marlin 3D Printer Firmware
-
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
-#ifndef HAL_PLATFORM
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
 
 #ifdef __AVR__
   #define HAL_PLATFORM HAL_AVR
@@ -27,10 +45,6 @@
   #error "Unsupported Platform!"
 #endif
 
-#endif // HAL_PLATFORM
-
 #define XSTR_(M) #M
 #define XSTR(M) XSTR_(M)
 #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL_PLATFORM/NAME)
-
-#endif // _HAL_PLATFORMS_H_

Marlin/src/HAL/shared/HAL_SPI.h

@@ -19,15 +19,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * HAL/HAL_SPI.h
  * Core Marlin definitions for SPI, implemented in the HALs
  */
 
-#ifndef _HAL_SPI_H_
-#define _HAL_SPI_H_
-
 #include <stdint.h>
 
 /**
@@ -78,5 +76,3 @@ void spiRead(uint8_t* buf, uint16_t nbyte);
 void spiSendBlock(uint8_t token, const uint8_t* buf);
 /** Begin SPI transaction, set clock, bit order, data mode */
 void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode);
-
-#endif // _HAL_SPI_H_

Marlin/src/HAL/shared/backtrace/backtrace.h

@@ -19,11 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _BACKTRACE_H_
-#define _BACKTRACE_H_
 
 // Perform a backtrace to the serial port
 void backtrace(void);
-
-#endif

Marlin/src/HAL/shared/backtrace/unwarm.h

@@ -11,8 +11,7 @@
  * File Description: Internal interface between the ARM unwinding sub-modules.
  **************************************************************************/
 
-#ifndef UNWARM_H
+#pragma once
-#define UNWARM_H
 
 #include "unwinder.h"
 
@@ -139,5 +138,3 @@ bool UnwReportRetAddr(UnwState * const state, uint32_t addr);
 bool UnwMemWriteRegister(UnwState * const state, const uint32_t addr, const RegData * const reg);
 bool UnwMemReadRegister(UnwState * const state, const uint32_t addr, RegData * const reg);
 void UnwMemHashGC(UnwState * const state);
-
-#endif // UNWARM_H

Marlin/src/HAL/shared/backtrace/unwarmbytab.h

@@ -12,8 +12,7 @@
  * File Description: Interface to the memory tracking sub-system.
  **************************************************************************/
 
-#ifndef UNWARMBYTAB_H
+#pragma once
-#define UNWARMBYTAB_H
 
 #include "unwarm.h"
 
@@ -30,5 +29,3 @@ typedef struct {
 } UnwTabEntry;
 
 UnwResult UnwindByTableStart(UnwindFrame* frame, const UnwindCallbacks *cb, void *data);
-
-#endif // UNWARMBYTAB_H

Marlin/src/HAL/shared/backtrace/unwarmmem.h

@@ -12,14 +12,10 @@
  * File Description: Interface to the memory tracking sub-system.
  **************************************************************************/
 
-#ifndef UNWARMMEM_H
+#pragma once
-#define UNWARMMEM_H
 
 #include "unwarm.h"
 
 bool UnwMemHashRead(MemData * const memData, uint32_t addr, uint32_t * const data, bool * const tracked);
 bool UnwMemHashWrite(MemData * const memData, uint32_t addr, uint32_t val, bool valValid);
 void UnwMemHashGC(UnwState * const state);
-
-#endif
-

Marlin/src/HAL/shared/backtrace/unwinder.h

@@ -13,8 +13,7 @@
  * Interface to the ARM stack unwinding module.
  **************************************************************************/
 
-#ifndef UNWINDER_H
+#pragma once
-#define UNWINDER_H
 
 #include <stdint.h>
 
@@ -171,5 +170,3 @@ typedef struct {
  * get function names in the traceback. Otherwise, you will not.
  */
 UnwResult UnwindStart(UnwindFrame* frame, const UnwindCallbacks *cb, void *data);
-
-#endif /* UNWINDER_H */

Marlin/src/HAL/shared/backtrace/unwmemaccess.h

@@ -12,8 +12,7 @@
  * File Description: Utility functions to access memory
  **************************************************************************/
 
-#ifndef UNWMEMACCESS_H
+#pragma once
-#define UNWMEMACCESS_H
 
 #include "unwarm.h"
 #include <stdint.h>
@@ -21,6 +20,3 @@
 bool UnwReadW(const uint32_t a, uint32_t *v);
 bool UnwReadH(const uint32_t a, uint16_t *v);
 bool UnwReadB(const uint32_t a, uint8_t *v);
-
-#endif
-

Marlin/src/HAL/shared/math_32bit.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef MATH_32BIT_H
-#define MATH_32BIT_H
 
 #include "../../core/macros.h"
 
@@ -31,5 +29,3 @@
 static FORCE_INLINE uint32_t MultiU32X24toH32(uint32_t longIn1, uint32_t longIn2) {
   return ((uint64_t)longIn1 * longIn2 + 0x00800000) >> 24;
 }
-
-#endif // MATH_32BIT_H

Marlin/src/HAL/shared/servo_private.h

@@ -19,6 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * servo_private.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2
@@ -39,9 +40,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef SERVO_PRIVATE_H
-#define SERVO_PRIVATE_H
-
 #include <stdint.h>
 
 // Architecture specific include
@@ -98,5 +96,3 @@ extern ServoInfo_t servo_info[MAX_SERVOS];
 
 extern void initISR(timer16_Sequence_t timer);
 extern void finISR(timer16_Sequence_t timer);
-
-#endif // SERVO_PRIVATE_H

Marlin/src/Marlin.h

@@ -19,8 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#ifndef __MARLIN_H__
+#pragma once
-#define __MARLIN_H__
 
 #include "inc/MarlinConfig.h"
 
@@ -242,5 +241,3 @@ void protected_pin_err();
 #if HAS_SUICIDE
   inline void suicide() { OUT_WRITE(SUICIDE_PIN, LOW); }
 #endif
-
-#endif // __MARLIN_H__

Marlin/src/core/boards.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef BOARDS_H
-#define BOARDS_H
 
 #define BOARD_UNKNOWN -1
 
@@ -247,5 +245,3 @@
 #define BOARD_ESP32            1900
 
 #define MB(board) (defined(BOARD_##board) && MOTHERBOARD==BOARD_##board)
-
-#endif // __BOARDS_H

Marlin/src/core/enum.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef __ENUM_H__
-#define __ENUM_H__
 
 /**
  * Axis indices as enumerated constants
@@ -68,5 +66,3 @@ typedef enum {
   TEMPUNIT_K,
   TEMPUNIT_F
 } TempUnit;
-
-#endif // __ENUM_H__

Marlin/src/core/serial.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef __SERIAL_H__
-#define __SERIAL_H__
 
 #include "../inc/MarlinConfigPre.h"
 #include HAL_PATH(../HAL, HAL.h)
@@ -246,5 +244,3 @@ void serial_error_start();
   void print_xyz(PGM_P prefix, PGM_P suffix, const float xyz[]);
   #define DEBUG_POS(SUFFIX,VAR) do { print_xyz(PSTR("  " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); } while(0)
 #endif
-
-#endif // __SERIAL_H__

Marlin/src/core/utility.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef __UTILITY_H__
-#define __UTILITY_H__
 
 #include "../inc/MarlinConfigPre.h"
 
@@ -102,5 +100,3 @@ void safe_delay(millis_t ms);
 #if ENABLED(DEBUG_LEVELING_FEATURE)
   void log_machine_info();
 #endif
-
-#endif // __UTILITY_H__

Marlin/src/feature/I2CPositionEncoder.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef I2CPOSENC_H
-#define I2CPOSENC_H
 
 #include "../inc/MarlinConfig.h"
 
@@ -331,5 +329,3 @@ class I2CPositionEncodersMgr {
 };
 
 extern I2CPositionEncodersMgr I2CPEM;
-
-#endif //I2CPOSENC_H

Marlin/src/feature/baricuda.h

@@ -19,11 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef __BARICUDA_H__
-#define __BARICUDA_H__
 
 extern uint8_t baricuda_valve_pressure,
                baricuda_e_to_p_pressure;
-
-#endif // __BARICUDA_H__

Marlin/src/feature/bedlevel/abl/abl.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef __ABL_H__
-#define __ABL_H__
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -47,5 +45,3 @@
   #endif
 
 #endif // AUTO_BED_LEVELING_BILINEAR
-
-#endif // __ABL_H__

Marlin/src/feature/bedlevel/bedlevel.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef __BEDLEVEL_H__
-#define __BEDLEVEL_H__
 
 #include "../../inc/MarlinConfigPre.h"
 
@@ -85,5 +83,3 @@ void reset_bed_level();
 #elif HAS_ABL
   #include "abl/abl.h"
 #endif
-
-#endif // __BEDLEVEL_H__

Marlin/src/feature/bedlevel/mbl/mesh_bed_leveling.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef _MESH_BED_LEVELING_H_
-#define _MESH_BED_LEVELING_H_
 
 #include "../../../inc/MarlinConfig.h"
 
@@ -120,5 +118,3 @@ public:
 };
 
 extern mesh_bed_leveling mbl;
-
-#endif // _MESH_BED_LEVELING_H_

Marlin/src/feature/bedlevel/ubl/ubl.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef UNIFIED_BED_LEVELING_H
-#define UNIFIED_BED_LEVELING_H
 
 //#define UBL_DEVEL_DEBUGGING
 
@@ -372,5 +370,3 @@ class unified_bed_leveling {
 }; // class unified_bed_leveling
 
 extern unified_bed_leveling ubl;
-
-#endif // UNIFIED_BED_LEVELING_H

Marlin/src/feature/caselight.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef __CASELIGHT_H__
-#define __CASELIGHT_H__
 
 extern uint8_t case_light_brightness;
 extern bool case_light_on;
@@ -29,5 +27,3 @@ extern uint8_t case_light_brightness_sav;   // saves brighness info when case_li
 extern bool case_light_arg_flag;  // flag to notify if S or P argument type
 
 void update_case_light();
-
-#endif // __CASELIGHT_H__

Marlin/src/feature/controllerfan.h

@@ -19,10 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef __CONTROLLERFAN_H__
-#define __CONTROLLERFAN_H__
 
 void controllerfan_update();
-
-#endif // __CONTROLLERFAN_H__

Marlin/src/feature/dac/dac_dac084s085.h

@@ -1,5 +1,25 @@
-#ifndef DAC084S085_H
+/**
-#define DAC084S085_H
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#pragma once
 
 class dac084s085 {
   public:
@@ -9,5 +29,3 @@ class dac084s085 {
   private:
     static void cshigh();
 };
-
-#endif // DAC084S085_H

Marlin/src/feature/dac/dac_mcp4728.h

@@ -19,14 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * Arduino library for MicroChip MCP4728 I2C D/A converter.
  */
 
-#ifndef DAC_MCP4728_H
-#define DAC_MCP4728_H
-
 #include <Wire.h>
 
 #define defaultVDD     DAC_STEPPER_MAX //was 5000 but differs with internal Vref
@@ -57,5 +55,3 @@ uint8_t mcp4728_fastWrite();
 uint8_t mcp4728_simpleCommand(byte simpleCommand);
 uint8_t mcp4728_getDrvPct(uint8_t channel);
 void mcp4728_setDrvPct(uint8_t pct[XYZE]);
-
-#endif // DAC_MCP4728_H

Marlin/src/feature/dac/stepper_dac.h

@@ -19,31 +19,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * stepper_dac.h   - To set stepper current via DAC
- *
- * Part of Marlin
- *
- * Copyright (c) 2016 MarlinFirmware
- *
- * Marlin is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Marlin is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Marlin.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef STEPPER_DAC_H
-#define STEPPER_DAC_H
-
 #include "dac_mcp4728.h"
 
 int dac_init();
@@ -53,5 +34,3 @@ void dac_print_values();
 void dac_commit_eeprom();
 uint8_t dac_current_get_percent(AxisEnum axis);
 void dac_current_set_percents(const uint8_t pct[XYZE]);
-
-#endif // STEPPER_DAC_H

Marlin/src/feature/digipot/digipot.h

@@ -19,11 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef __DIGIPOT_H__
-#define __DIGIPOT_H__
 
 void digipot_i2c_set_current(const uint8_t channel, const float current);
 void digipot_i2c_init();
-
-#endif // __DIGIPOT_H__

Marlin/src/feature/fanmux.h

@@ -19,15 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
  * feature/fanmux.h - Cooling Fan Multiplexer support functions
  */
 
-#ifndef _FANMUX_H_
-#define _FANMUX_H_
-
 extern void fanmux_switch(const uint8_t e);
 extern void fanmux_init(void);
-
-#endif // _FANMUX_H_

Marlin/src/feature/filwidth.h

@@ -19,9 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#pragma once
-#ifndef __FILWIDTH_H__
-#define __FILWIDTH_H__
 
 #include "../inc/MarlinConfig.h"
 
@@ -31,5 +29,3 @@ extern float filament_width_nominal,                        // Nominal filament
 extern uint8_t meas_delay_cm;                               // Distance delay setting
 extern int8_t measurement_delay[MAX_MEASUREMENT_DELAY + 1], // Ring buffer to delayed measurement. Store extruder factor after subtracting 100
               filwidth_delay_index[2];                      // Indexes into ring buffer
-
-#endif // __FILWIDTH_H__