diff --git a/Marlin/MarlinSerial.cpp b/Marlin/MarlinSerial.cpp index 9ef900265..c1aa790da 100644 --- a/Marlin/MarlinSerial.cpp +++ b/Marlin/MarlinSerial.cpp @@ -21,18 +21,16 @@ */ /** - MarlinSerial.cpp - Hardware serial library for Wiring - Copyright (c) 2006 Nicholas Zambetti. All right reserved. - - Modified 23 November 2006 by David A. Mellis - Modified 28 September 2010 by Mark Sproul - Modified 14 February 2016 by Andreas Hardtung (added tx buffer) -*/ - + * MarlinSerial.cpp - Hardware serial library for Wiring + * Copyright (c) 2006 Nicholas Zambetti. All right reserved. + * + * Modified 23 November 2006 by David A. Mellis + * Modified 28 September 2010 by Mark Sproul + * Modified 14 February 2016 by Andreas Hardtung (added tx buffer) + */ #include "MarlinSerial.h" #include "stepper.h" - #include "Marlin.h" #ifndef USBCON diff --git a/Marlin/SdFatUtil.h b/Marlin/SdFatUtil.h index 9db81ac57..2e6435bbd 100644 --- a/Marlin/SdFatUtil.h +++ b/Marlin/SdFatUtil.h @@ -26,17 +26,16 @@ * * This file is part of the Arduino Sd2Card Library */ +#ifndef SdFatUtil_h +#define SdFatUtil_h + #include "Marlin.h" #if ENABLED(SDSUPPORT) -#ifndef SdFatUtil_h -#define SdFatUtil_h /** * \file * \brief Useful utility functions. */ -#include "Marlin.h" -#include "MarlinSerial.h" /** Store and print a string in flash memory.*/ #define PgmPrint(x) SerialPrint_P(PSTR(x)) /** Store and print a string in flash memory followed by a CR/LF.*/ @@ -51,7 +50,7 @@ namespace SdFatUtil { } using namespace SdFatUtil; // NOLINT -#endif //#define SdFatUtil_h +#endif // SDSUPPORT -#endif +#endif // SdFatUtil_h