fix include paths

src/sdfat/BufferedPrint.h

@@ -28,7 +28,7 @@
  * \file
  * \brief Fast buffered print.
  */
-#include "common/FmtNumber.h"
+#include "./common/FmtNumber.h"
 /**
  * \class BufferedPrint
  * \brief Fast buffered print template.

src/sdfat/DigitalIO/DigitalPin.h

@@ -41,7 +41,7 @@ struct GpioPinMap_t {
 #define GPIO_PIN(reg, bit) {&PIN##reg, &DDR##reg, &PORT##reg, 1 << bit}
 
 // Include pin map for current board.
-#include "boards/GpioPinMap.h"
+#include "./boards/GpioPinMap.h"
 //------------------------------------------------------------------------------
 /** generate bad pin number error */
 void badPinNumber(void)

src/sdfat/DigitalIO/SoftSPI.h

@@ -18,7 +18,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 /**
- * @file 
+ * @file
  * @brief  Software SPI.
  *
  * @defgroup softSPI Software SPI
@@ -27,7 +27,7 @@
  */
 #ifndef SoftSPI_h
 #define SoftSPI_h
-#include "DigitalPin.h"
+#include "./DigitalPin.h"
 //------------------------------------------------------------------------------
 /** Nop for timing. */
 #define nop asm volatile ("nop\n\t")

src/sdfat/DigitalIO/boards/GpioPinMap.h

@@ -23,22 +23,22 @@
 ||defined(__AVR_ATmega168P__)\
 ||defined(__AVR_ATmega328P__)
 // 168 and 328 Arduinos
-#include "UnoGpioPinMap.h"
+#include "./UnoGpioPinMap.h"
 #elif defined(__AVR_ATmega1280__)\
 || defined(__AVR_ATmega2560__)
 // Mega ADK
-#include "MegaGpioPinMap.h"
+#include "./MegaGpioPinMap.h"
 #elif defined(__AVR_ATmega32U4__)
 #ifdef CORE_TEENSY
-#include "Teensy2GpioPinMap.h"
+#include "./Teensy2GpioPinMap.h"
 #else  // CORE_TEENSY
 // Leonardo or Yun
-#include "LeonardoGpioPinMap.h"
+#include "./LeonardoGpioPinMap.h"
 #endif  // CORE_TEENSY
 #elif defined(__AVR_AT90USB646__)\
 || defined(__AVR_AT90USB1286__)
 // Teensy++ 1.0 & 2.0
-#include "Teensy2ppGpioPinMap.h"
+#include "./Teensy2ppGpioPinMap.h"
 #elif defined(__AVR_ATmega1284P__)\
 || defined(__AVR_ATmega1284__)\
 || defined(__AVR_ATmega644P__)\
@@ -48,13 +48,13 @@
 || defined(__AVR_ATmega324__)\
 || defined(__AVR_ATmega16__)
 #ifdef ARDUINO_1284P_AVR_DEVELOPERS
-#include "AvrDevelopersGpioPinMap.h"
+#include "./AvrDevelopersGpioPinMap.h"
 #elif defined(ARDUINO_1284P_BOBUINO)
-#include "BobuinoGpioPinMap.h"
+#include "./BobuinoGpioPinMap.h"
 #elif defined(ARDUINO_1284P_SLEEPINGBEAUTY)
-#include "SleepingBeautyGpioPinMap.h"
+#include "./SleepingBeautyGpioPinMap.h"
 #elif defined(ARDUINO_1284P_STANDARD)
-#include "Standard1284GpioPinMap.h"
+#include "./Standard1284GpioPinMap.h"
 #else // ARDUINO_1284P_SLEEPINGBEAUTY
 #error Undefined variant 1284, 644, 324
 #endif  // ARDUINO_1284P_SLEEPINGBEAUTY

src/sdfat/ExFatLib/ExFatDbg.cpp

@@ -22,9 +22,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "ExFatVolume.h"
-#include "upcase.h"
-#include "ExFatFile.h"
+#include "./ExFatVolume.h"
+#include "./upcase.h"
+#include "./ExFatFile.h"
 #include "../common/FsDateTime.h"
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 //------------------------------------------------------------------------------

src/sdfat/ExFatLib/ExFatFile.cpp

@@ -24,9 +24,9 @@
  */
 #define DBG_FILE "ExFatFile.cpp"
 #include "../common/DebugMacros.h"
-#include "ExFatFile.h"
-#include "ExFatVolume.h"
-#include "upcase.h"
+#include "./ExFatFile.h"
+#include "./ExFatVolume.h"
+#include "./upcase.h"
 //-----------------------------------------------------------------------------
 bool ExFatFile::close() {
   bool rtn = sync();

src/sdfat/ExFatLib/ExFatFile.h

@@ -30,13 +30,13 @@
  */
 #include <limits.h>
 #include <string.h>
-#include "ExFatConfig.h"
+#include "./ExFatConfig.h"
 #include "../common/FsDateTime.h"
 #include "../common/FsStructs.h"
 #include "../common/FsApiConstants.h"
 #include "../common/FmtNumber.h"
-#include "ExFatTypes.h"
-#include "ExFatPartition.h"
+#include "./ExFatTypes.h"
+#include "./ExFatPartition.h"
 
 class ExFatVolume;
 

src/sdfat/ExFatLib/ExFatFilePrint.cpp

@@ -24,9 +24,9 @@
  */
 #define DBG_FILE "ExFatFilePrint.cpp"
 #include "../common/DebugMacros.h"
-#include "ExFatFile.h"
-#include "upcase.h"
-#include "ExFatVolume.h"
+#include "./ExFatFile.h"
+#include "./upcase.h"
+#include "./ExFatVolume.h"
 //-----------------------------------------------------------------------------
 size_t ExFatFile::printFileSize(print_t* pr) {
   uint64_t n = m_validLength;

src/sdfat/ExFatLib/ExFatFileWrite.cpp

@@ -24,9 +24,9 @@
  */
 #define DBG_FILE "ExFatFileWrite.cpp"
 #include "../common/DebugMacros.h"
-#include "ExFatFile.h"
-#include "ExFatVolume.h"
-#include "upcase.h"
+#include "./ExFatFile.h"
+#include "./ExFatVolume.h"
+#include "./upcase.h"
 //=============================================================================
 #if READ_ONLY
 bool ExFatFile::sync() {

src/sdfat/ExFatLib/ExFatFormatter.cpp

@@ -24,7 +24,7 @@
  */
 #define DBG_FILE "ExFatFormatter.cpp"
 #include "../common/DebugMacros.h"
-#include "ExFatFormatter.h"
+#include "./ExFatFormatter.h"
 //-----------------------------------------------------------------------------
 // Formatter assumes 512 byte sectors.
 const uint32_t BOOT_BACKUP_OFFSET = 12;

src/sdfat/ExFatLib/ExFatFormatter.h

@@ -24,10 +24,10 @@
  */
 #ifndef ExFatFormatter_h
 #define ExFatFormatter_h
-#include "ExFatConfig.h"
+#include "./ExFatConfig.h"
 #include "../common/SysCall.h"
 #include "../common/BlockDevice.h"
-#include "upcase.h"
+#include "./upcase.h"
 /**
  * \class ExFatFormatter
  * \brief Format an exFAT volume.

src/sdfat/ExFatLib/ExFatLib.h

@@ -24,7 +24,7 @@
  */
 #ifndef ExFatLib_h
 #define ExFatLib_h
-#include "ExFatVolume.h"
-#include "ExFatFile.h"
-#include "ExFatFormatter.h"
+#include "./ExFatVolume.h"
+#include "./ExFatFile.h"
+#include "./ExFatFormatter.h"
 #endif  // ExFatLib_h

src/sdfat/ExFatLib/ExFatPartition.cpp

@@ -24,7 +24,7 @@
  */
 #define DBG_FILE "ExFatPartition.cpp"
 #include "../common/DebugMacros.h"
-#include "ExFatVolume.h"
+#include "./ExFatVolume.h"
 #include "../common/FsStructs.h"
 //-----------------------------------------------------------------------------
 void FsCache::invalidate() {

src/sdfat/ExFatLib/ExFatPartition.h

@@ -30,8 +30,8 @@
  */
 #include "../common/SysCall.h"
 #include "../common/BlockDevice.h"
-#include "ExFatConfig.h"
-#include "ExFatTypes.h"
+#include "./ExFatConfig.h"
+#include "./ExFatTypes.h"
 /** Type for exFAT partition */
 const uint8_t FAT_TYPE_EXFAT = 64;
 

src/sdfat/ExFatLib/ExFatTypes.h

@@ -24,7 +24,7 @@
  */
 #ifndef ExFatTypes_h
 #define ExFatTypes_h
-#include "ExFatConfig.h"
+#include "./ExFatConfig.h"
 
 #if __cplusplus < 201103
 #warning no char16_t

src/sdfat/ExFatLib/ExFatVolume.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "ExFatVolume.h"
+#include "./ExFatVolume.h"
 ExFatVolume* ExFatVolume::m_cwv = nullptr;
 //----------------------------------------------------------------------------
 bool ExFatVolume::chdir(const ExChar_t* path) {

src/sdfat/ExFatLib/ExFatVolume.h

@@ -24,8 +24,8 @@
  */
 #ifndef ExFatVolume_h
 #define ExFatVolume_h
-#include "ExFatPartition.h"
-#include "ExFatFile.h"
+#include "./ExFatPartition.h"
+#include "./ExFatFile.h"
 //=============================================================================
 /**
  * \class ExFatVolume

src/sdfat/ExFatLib/upcase.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "upcase.h"
+#include "./upcase.h"
 
 #ifdef __AVR__
 #include <avr/pgmspace.h>

src/sdfat/ExFatLib/upcase.h

@@ -24,7 +24,7 @@
  */
 #ifndef upcase_h
 #define upcase_h
-#include "ExFatFile.h"
+#include "./ExFatFile.h"
 bool exFatCmpName(const DirName_t* unicode,
                   const char* name, size_t offset, size_t n);
 bool exFatCmpName(const DirName_t* unicode,

src/sdfat/FatLib/FatDbg.cpp

@@ -22,8 +22,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "FatVolume.h"
-#include "FatFile.h"
+#include "./FatVolume.h"
+#include "./FatFile.h"
 #include "../common/FsDateTime.h"
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 //------------------------------------------------------------------------------

src/sdfat/FatLib/FatFile.cpp

@@ -24,8 +24,8 @@
  */
 #define DBG_FILE "FatFile.cpp"
 #include "../common/DebugMacros.h"
-#include "FatFile.h"
-#include "FatVolume.h"
+#include "./FatFile.h"
+#include "./FatVolume.h"
 //------------------------------------------------------------------------------
 // Add a cluster to a file.
 bool FatFile::addCluster() {

src/sdfat/FatLib/FatFile.h

@@ -31,12 +31,12 @@
 #include <string.h>
 #include <stddef.h>
 #include <limits.h>
-#include "FatLibConfig.h"
+#include "./FatLibConfig.h"
 #include "../common/FmtNumber.h"
 #include "../common/FsApiConstants.h"
 #include "../common/FsDateTime.h"
 #include "../common/FsStructs.h"
-#include "FatPartition.h"
+#include "./FatPartition.h"
 class FatVolume;
 //------------------------------------------------------------------------------
 // Stuff to store strings in AVR flash.

src/sdfat/FatLib/FatFileLFN.cpp

@@ -24,8 +24,8 @@
  */
 #define DBG_FILE "FatFileLFN.cpp"
 #include "../common/DebugMacros.h"
-#include "FatFile.h"
-#include "FatVolume.h"
+#include "./FatFile.h"
+#include "./FatVolume.h"
 //------------------------------------------------------------------------------
 //
 uint8_t FatFile::lfnChecksum(uint8_t* name) {

src/sdfat/FatLib/FatFilePrint.cpp

@@ -25,7 +25,7 @@
 #include <math.h>
 #define DBG_FILE "FatFilePrint.cpp"
 #include "../common/DebugMacros.h"
-#include "FatFile.h"
+#include "./FatFile.h"
 //------------------------------------------------------------------------------
 static void printHex(print_t* pr, uint8_t w, uint16_t h) {
   char buf[5];

src/sdfat/FatLib/FatFileSFN.cpp

@@ -25,8 +25,8 @@
 #define DBG_FILE "FatFileSFN.cpp"
 #include "../common/DebugMacros.h"
 #include "../common/FsStructs.h"
-#include "FatFile.h"
-#include "FatVolume.h"
+#include "./FatFile.h"
+#include "./FatVolume.h"
 //------------------------------------------------------------------------------
 bool FatFile::getSFN(char* name) {
   uint8_t j = 0;

src/sdfat/FatLib/FatFormatter.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "FatFormatter.h"
+#include "./FatFormatter.h"
 // Set nonzero to use calculated CHS in MBR.  Should not be required.
 #define USE_LBA_TO_CHS 0
 

src/sdfat/FatLib/FatFormatter.h

@@ -24,7 +24,7 @@
  */
 #ifndef FatFormatter_h
 #define FatFormatter_h
-#include "FatFile.h"
+#include "./FatFile.h"
 #include "../common/SysCall.h"
 #include "../common/BlockDevice.h"
 #include "../common/FsStructs.h"

src/sdfat/FatLib/FatLib.h

@@ -24,7 +24,7 @@
  */
 #ifndef FatLib_h
 #define FatLib_h
-#include "FatVolume.h"
-#include "FatLibConfig.h"
-#include "FatFormatter.h"
+#include "./FatVolume.h"
+#include "./FatLibConfig.h"
+#include "./FatFormatter.h"
 #endif  // FatLib_h

src/sdfat/FatLib/FatLibConfig.h

@@ -28,5 +28,5 @@
  */
 #ifndef FatLibConfig_h
 #define FatLibConfig_h
-#include "SdFatConfig.h"
+#include "../SdFatConfig.h"
 #endif  // FatLibConfig_h

src/sdfat/FatLib/FatPartition.cpp

@@ -26,7 +26,7 @@
 #define DBG_FILE "FatPartition.cpp"
 #include "../common/DebugMacros.h"
 #include "../common/FsStructs.h"
-#include "FatPartition.h"
+#include "./FatPartition.h"
 //------------------------------------------------------------------------------
 cache_t* FatCache::read(uint32_t sector, uint8_t option) {
   if (m_lbn != sector) {

src/sdfat/FatLib/FatPartition.h

@@ -29,7 +29,7 @@
  * \brief FatPartition class
  */
 #include <stddef.h>
-#include "FatLibConfig.h"
+#include "./FatLibConfig.h"
 #include "../common/SysCall.h"
 #include "../common/BlockDevice.h"
 #include "../common/FsStructs.h"

src/sdfat/FatLib/FatVolume.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "FatVolume.h"
+#include "./FatVolume.h"
 FatVolume* FatVolume::m_cwv = nullptr;
 //----------------------------------------------------------------------------
 bool FatVolume::chdir(const char *path) {

src/sdfat/FatLib/FatVolume.h

@@ -24,8 +24,8 @@
  */
 #ifndef FatVolume_h
 #define FatVolume_h
-#include "FatPartition.h"
-#include "FatFile.h"
+#include "./FatPartition.h"
+#include "./FatFile.h"
 /**
  * \file
  * \brief FatVolume class

src/sdfat/FreeStack.cpp

@@ -23,7 +23,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #define FREE_STACK_CPP
-#include "FreeStack.h"
+#include "./FreeStack.h"
 #if defined(HAS_UNUSED_STACK) && HAS_UNUSED_STACK
 //------------------------------------------------------------------------------
 inline char* stackBegin() {

src/sdfat/FreeStack.h

@@ -47,7 +47,7 @@ inline int FreeStack() {
 #elif defined(ARDUINO_ARCH_APOLLO3)
 #define HAS_UNUSED_STACK 0
 #elif defined(PLATFORM_ID)  // Particle board
-#include "Arduino.h"
+#include <core/Arduino.h>
 inline int FreeStack() {
   return System.freeMemory();
 }

src/sdfat/FsLib/FsFile.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "FsLib.h"
+#include "./FsLib.h"
 //------------------------------------------------------------------------------
 FsBaseFile::FsBaseFile(const FsBaseFile& from) {
   m_fFile = nullptr;

src/sdfat/FsLib/FsFile.h

@@ -28,9 +28,9 @@
  * \file
  * \brief FsBaseFile include file.
  */
-#include "FsNew.h"
-#include "FatLib/FatLib.h"
-#include "ExFatLib/ExFatLib.h"
+#include "./FsNew.h"
+#include "../FatLib/FatLib.h"
+#include "../ExFatLib/ExFatLib.h"
 /**
  * \class FsBaseFile
  * \brief FsBaseFile class.

src/sdfat/FsLib/FsLib.h

@@ -28,6 +28,6 @@
  * \file
  * \brief FsLib include file.
  */
-#include "FsVolume.h"
-#include "FsFile.h"
+#include "./FsVolume.h"
+#include "./FsFile.h"
 #endif  // FsLib_h

src/sdfat/FsLib/FsNew.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "FsNew.h"
+#include "./FsNew.h"
 void* operator new(size_t size, newalign_t* ptr) {
   (void)size;
   return ptr;

src/sdfat/FsLib/FsVolume.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "FsLib.h"
+#include "./FsLib.h"
 FsVolume* FsVolume::m_cwv = nullptr;
 //------------------------------------------------------------------------------
 bool FsVolume::begin(BlockDevice* blockDev) {

src/sdfat/FsLib/FsVolume.h

@@ -28,7 +28,7 @@
  * \file
  * \brief FsVolume include file.
  */
-#include "FsNew.h"
+#include "./FsNew.h"
 #include "../FatLib/FatLib.h"
 #include "../ExFatLib/ExFatLib.h"
 

src/sdfat/MinimumSerial.cpp

@@ -22,9 +22,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "common/SysCall.h"
+#include "./common/SysCall.h"
 #if defined(UDR0) || defined(DOXYGEN)
-#include "MinimumSerial.h"
+#include "./MinimumSerial.h"
 const uint16_t MIN_2X_BAUD = F_CPU/(4*(2*0XFFF + 1)) + 1;
 //------------------------------------------------------------------------------
 int MinimumSerial::available() {

src/sdfat/MinimumSerial.h

@@ -28,7 +28,7 @@
  */
 #ifndef MinimumSerial_h
 #define MinimumSerial_h
-#include "common/SysCall.h"
+#include "./common/SysCall.h"
 //==============================================================================
 /**
  * \class MinimumSerial

src/sdfat/SdCard/SdCard.h

@@ -24,8 +24,8 @@
  */
 #ifndef SdCard_h
 #define SdCard_h
-#include "SdioCard.h"
-#include "SdSpiCard.h"
+#include "./SdioCard.h"
+#include "./SdSpiCard.h"
 #if HAS_SDIO_CLASS
 typedef SdCardInterface SdCard;
 #else  // HAS_SDIO_CLASS

src/sdfat/SdCard/SdCardInfo.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "SdCardInfo.h"
+#include "./SdCardInfo.h"
 //------------------------------------------------------------------------------
 #undef SD_CARD_ERROR
 #define SD_CARD_ERROR(e, m) case SD_CARD_ERROR_##e: pr->print(F(#e)); break;

src/sdfat/SdCard/SdCardInterface.h

@@ -25,7 +25,7 @@
 #ifndef SdCardInterface_h
 #define SdCardInterface_h
 #include "../common/BlockDeviceInterface.h"
-#include "SdCardInfo.h"
+#include "./SdCardInfo.h"
 /**
  * \class SdCardInterface
  * \brief Abstract interface for an SD card.

src/sdfat/SdCard/SdSpiCard.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "SdSpiCard.h"
+#include "./SdSpiCard.h"
 //==============================================================================
 // Debug aids
 #define DBG_PROFILE_STATS 0

src/sdfat/SdCard/SdSpiCard.h

@@ -30,8 +30,8 @@
 #define SdSpiCard_h
 #include <stddef.h>
 #include "../common/SysCall.h"
-#include "SdCardInfo.h"
-#include "SdCardInterface.h"
+#include "./SdCardInfo.h"
+#include "./SdCardInterface.h"
 #include "../SpiDriver/SdSpiDriver.h"
 //==============================================================================
 /**

src/sdfat/SdCard/SdioCard.h

@@ -25,7 +25,7 @@
 #ifndef SdioCard_h
 #define SdioCard_h
 #include "../common/SysCall.h"
-#include "SdCardInterface.h"
+#include "./SdCardInterface.h"
 
 #define FIFO_SDIO 0
 #define DMA_SDIO 1

src/sdfat/SdCard/SdioTeensy.cpp

@@ -23,9 +23,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #if defined(__MK64FX512__) || defined(__MK66FX1M0__) || defined(__IMXRT1062__)
-#include "SdioTeensy.h"
-#include "SdCardInfo.h"
-#include "SdioCard.h"
+#include "./SdioTeensy.h"
+#include "./SdCardInfo.h"
+#include "./SdioCard.h"
 //==============================================================================
 // limit of K66 due to errata KINETIS_K_0N65N.
 const uint32_t MAX_SDHC_COUNT = 0XFFFF;

src/sdfat/SdFat.h

@@ -28,11 +28,11 @@
  * \file
  * \brief main SdFs include file.
  */
-#include "common/SysCall.h"
-#include "SdCard/SdCard.h"
-#include "ExFatLib/ExFatLib.h"
-#include "FatLib/FatLib.h"
-#include "FsLib/FsLib.h"
+#include "./common/SysCall.h"
+#include "./SdCard/SdCard.h"
+#include "./ExFatLib/ExFatLib.h"
+#include "./FatLib/FatLib.h"
+#include "./FsLib/FsLib.h"
 #if INCLUDE_SDIOS
 #include "sdios.h"
 #endif  // INCLUDE_SDIOS
@@ -397,20 +397,20 @@ class SdFs : public SdBase<FsVolume> {
 /** Select type for SdFat. */
 typedef SdFat32 SdFat;
 /** Select type for File. */
-#if !defined(__has_include) || !__has_include(<FS.h>)
+#if !defined(__has_include) || !__has_include(<core/FS.h>)
 typedef File32 File;
 #endif
 /** Select type for SdBaseFile. */
 typedef FatFile SdBaseFile;
 #elif SDFAT_FILE_TYPE == 2
 typedef SdExFat SdFat;
-#if !defined(__has_include) || !__has_include(<FS.h>)
+#if !defined(__has_include) || !__has_include(<core/FS.h>)
 typedef ExFile File;
 #endif
 typedef ExFatFile SdBaseFile;
 #elif SDFAT_FILE_TYPE == 3
 typedef SdFs SdFat;
-#if !defined(__has_include) || !__has_include(<FS.h>)
+#if !defined(__has_include) || !__has_include(<core/FS.h>)
 typedef FsFile File;
 #endif
 typedef FsBaseFile SdBaseFile;

src/sdfat/SdFatConfig.h

@@ -43,7 +43,7 @@
 #define USE_BLOCK_DEVICE_INTERFACE 0
 //------------------------------------------------------------------------------
 #if ENABLE_ARDUINO_FEATURES
-#include "Arduino.h"
+#include <core/Arduino.h>
 #ifdef PLATFORM_ID
 // Only defined if a Particle device.
 #include "application.h"

src/sdfat/SpiDriver/SdSpiArduinoDriver.h

@@ -89,8 +89,8 @@ class SdSpiArduinoDriver {
 typedef SdSpiArduinoDriver SdSpiDriver;
 //------------------------------------------------------------------------------
 #ifndef SD_USE_CUSTOM_SPI
-#include "SdSpiLibDriver.h"
+#include "./SdSpiLibDriver.h"
 #elif defined(__AVR__)
-#include "SdSpiAvr.h"
+#include "./SdSpiAvr.h"
 #endif  // __AVR__
 #endif  // SdSpiArduinoDriver_h

src/sdfat/SpiDriver/SdSpiArtemis.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "SdSpiDriver.h"
+#include "./SdSpiDriver.h"
 #if defined(SD_USE_CUSTOM_SPI) && defined(ARDUINO_ARCH_APOLLO3)
 //------------------------------------------------------------------------------
 void SdSpiArduinoDriver::activate() {

src/sdfat/SpiDriver/SdSpiChipSelect.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "SdSpiDriver.h"
+#include "./SdSpiDriver.h"
 #if ENABLE_ARDUINO_FEATURES
 #if SD_CHIP_SELECT_MODE == 0
 //------------------------------------------------------------------------------

src/sdfat/SpiDriver/SdSpiDriver.h

@@ -68,7 +68,7 @@ void sdCsWrite(SdCsPin_t pin, bool level);
 /** SPI bus is share with other devices. */
 #define SHARED_SPI 0
 #if SPI_DRIVER_SELECT < 2
-#include "SPI.h"
+#include <spi/SPI.h>
 /** Port type for Arduino SPI hardware driver. */
 typedef SPIClass SpiPort_t;
 #elif SPI_DRIVER_SELECT == 2
@@ -131,11 +131,11 @@ class SdSpiConfig {
   SpiPort_t* spiPort;
 };
 #if SPI_DRIVER_SELECT < 2
-#include "SdSpiArduinoDriver.h"
+#include "./SdSpiArduinoDriver.h"
 #elif SPI_DRIVER_SELECT == 2
-#include "SdSpiSoftDriver.h"
+#include "./SdSpiSoftDriver.h"
 #elif SPI_DRIVER_SELECT == 3
-#include "SdSpiBaseClass.h"
+#include "./SdSpiBaseClass.h"
 typedef SdSpiBaseClass SdSpiDriver;
 #else  // SPI_DRIVER_SELECT
 #error Invalid SPI_DRIVER_SELECT

src/sdfat/SpiDriver/SdSpiDue.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "SdSpiDriver.h"
+#include "./SdSpiDriver.h"
 #if defined(SD_USE_CUSTOM_SPI) && defined(ARDUINO_SAM_DUE)
 /* Use SAM3X DMAC if nonzero */
 #define USE_SAM3X_DMAC 1

src/sdfat/SpiDriver/SdSpiESP.cpp

@@ -23,7 +23,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "SdSpiDriver.h"
+#include "./SdSpiDriver.h"
 #if defined(SD_USE_CUSTOM_SPI) && (defined(ESP8266) || defined(ESP32))
 #define ESP_UNALIGN_OK 1
 //------------------------------------------------------------------------------

src/sdfat/SpiDriver/SdSpiParticle.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "SdSpiDriver.h"
+#include "./SdSpiDriver.h"
 #if defined(SD_USE_CUSTOM_SPI) && defined(PLATFORM_ID)
 static volatile bool SPI_DMA_TransferCompleted = false;
 //-----------------------------------------------------------------------------

src/sdfat/SpiDriver/SdSpiSTM32.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "SdSpiDriver.h"
+#include "./SdSpiDriver.h"
 #if defined(SD_USE_CUSTOM_SPI)\
   && (defined(__STM32F1__) || defined(__STM32F4__))
 #if defined(__STM32F1__)

src/sdfat/SpiDriver/SdSpiTeensy3.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "SdSpiDriver.h"
+#include "./SdSpiDriver.h"
 #if defined(SD_USE_CUSTOM_SPI) &&  defined(__arm__) && defined(CORE_TEENSY)
 #define USE_BLOCK_TRANSFER 1
 //------------------------------------------------------------------------------

src/sdfat/common/BlockDevice.h

@@ -24,7 +24,7 @@
  */
 #ifndef BlockDevice_h
 #define  BlockDevice_h
-#include "SdCard/SdCard.h"
+#include "../SdCard/SdCard.h"
 #if HAS_SDIO_CLASS || USE_BLOCK_DEVICE_INTERFACE
 typedef BlockDeviceInterface BlockDevice;
 #else

src/sdfat/common/DebugMacros.h

@@ -28,7 +28,7 @@
 #define USE_DBG_MACROS 0
 
 #if USE_DBG_MACROS
-#include "Arduino.h"
+#include <core/Arduino.h>
 #ifndef DBG_FILE
 #error DBG_FILE not defined
 #endif  // DBG_FILE

src/sdfat/common/FmtNumber.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "FmtNumber.h"
+#include "./FmtNumber.h"
 // always use fmtBase10() - seems fast even on teensy 3.6.
 #define USE_FMT_BASE10 1
 

src/sdfat/common/FsDateTime.cpp

@@ -22,9 +22,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "SysCall.h"
-#include "FsDateTime.h"
-#include "FmtNumber.h"
+#include "./SysCall.h"
+#include "./FsDateTime.h"
+#include "./FmtNumber.h"
 
 static void dateTimeMs10(uint16_t* date, uint16_t* time, uint8_t* ms10) {
   *ms10 = 0;

src/sdfat/common/FsDateTime.h

@@ -25,7 +25,7 @@
 #ifndef FsDateTime_h
 #define FsDateTime_h
 #include <stdint.h>
-#include "SysCall.h"
+#include "./SysCall.h"
 /** Backward compatible definition. */
 #define FAT_DATE(y, m, d) FS_DATE(y, m, d)
 

src/sdfat/common/FsStructs.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "FsStructs.h"
+#include "./FsStructs.h"
 // bgnLba = relSector;
 // endLba = relSector + partSize - 1;
 void lbaToMbrChs(uint8_t* chs, uint32_t capacityMB, uint32_t lba) {

src/sdfat/common/PrintBasic.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "PrintBasic.h"
+#include "./PrintBasic.h"
 #include <math.h>
 
 size_t PrintBasic::print(long n, uint8_t base) {

src/sdfat/common/PrintTemplates.h

@@ -29,7 +29,7 @@
  * \brief templates for printf
  */
 #include <stdarg.h>
-#include "FmtNumber.h"
+#include "./FmtNumber.h"
 /** test for digit */
 #define isDigit(d) ('0' <= (d) && (d) <= '9')
 /** control for supported floating formats */

src/sdfat/common/SysCall.h

@@ -91,7 +91,7 @@ inline void SysCall::yield() {}
 #endif  // defined(PLATFORM_ID)
 //------------------------------------------------------------------------------
 #else  // ENABLE_ARDUINO_FEATURES
-#include "PrintBasic.h"
+#include "./PrintBasic.h"
 /** If not Arduino */
 typedef PrintBasic print_t;
 /** If not Arduino */

src/sdfat/common/SysCallBareUno.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "SysCall.h"
+#include "./SysCall.h"
 #if 0  // defined(__AVR_ATmega328P__) && !ENABLE_ARDUINO_FEATURES
 #include <avr/interrupt.h>
 

src/sdfat/iostream/ArduinoStream.h

@@ -28,8 +28,8 @@
  * \file
  * \brief ArduinoInStream and ArduinoOutStream classes
  */
-#include "SdFatConfig.h"
-#include "bufstream.h"
+#include "./SdFatConfig.h"
+#include "./bufstream.h"
 //==============================================================================
 /**
  * \class ArduinoInStream

src/sdfat/iostream/StdioStream.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "StdioStream.h"
+#include "./StdioStream.h"
 #include "../common/FmtNumber.h"
 //------------------------------------------------------------------------------
 int StdioStream::fclose() {

src/sdfat/iostream/StdioStream.h

@@ -29,7 +29,7 @@
  * \brief StdioStream class
  */
 #include <limits.h>
-#include "ios.h"
+#include "./ios.h"
 //------------------------------------------------------------------------------
 /** Total size of stream buffer. The entire buffer is used for output.
   * During input UNGETC_BUF_SIZE of this space is reserved for ungetc.

src/sdfat/iostream/StreamBaseClass.cpp

@@ -22,7 +22,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#include "fstream.h"
+#include "./fstream.h"
 //------------------------------------------------------------------------------
 int16_t StreamBaseClass::getch() {
   uint8_t c;

src/sdfat/iostream/bufstream.h

@@ -29,7 +29,7 @@
  * \brief \ref ibufstream and \ref obufstream classes
  */
 #include <string.h>
-#include "iostream.h"
+#include "./iostream.h"
 //==============================================================================
 /**
  * \class ibufstream

src/sdfat/iostream/fstream.h

@@ -25,10 +25,10 @@
 /**
  * \file
  * \brief iostreams for files.
- */ 
+ */
 #ifndef fstream_h
 #define fstream_h
-#include "iostream.h"
+#include "./iostream.h"
 //------------------------------------------------------------------------------
 /**
  * \class StreamBaseClass

src/sdfat/iostream/iostream.h

@@ -28,8 +28,8 @@
  * \file
  * \brief \ref iostream class
  */
-#include "istream.h"
-#include "ostream.h"
+#include "./istream.h"
+#include "./ostream.h"
 /** Skip white space
  * \param[in] is the Stream
  * \return The stream

src/sdfat/iostream/istream.cpp

@@ -24,7 +24,7 @@
  */
 #include <float.h>
 #include <ctype.h>
-#include "istream.h"
+#include "./istream.h"
 //------------------------------------------------------------------------------
 int istream::get() {
   int c;

src/sdfat/iostream/istream.h

@@ -28,7 +28,7 @@
  * \file
  * \brief \ref istream class
  */
-#include "ios.h"
+#include "./ios.h"
 
 /**
  * \class istream

src/sdfat/iostream/ostream.cpp

@@ -23,7 +23,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include <string.h>
-#include "ostream.h"
+#include "./ostream.h"
 #ifndef PSTR
 #define PSTR(x) x
 #endif  // PSTR

src/sdfat/iostream/ostream.h

@@ -28,7 +28,7 @@
  * \file
  * \brief \ref ostream class
  */
-#include "ios.h"
+#include "./ios.h"
 //==============================================================================
 /**
  * \class ostream

src/sdfat/sdios.h

@@ -28,7 +28,7 @@
  * \file
  * \brief C++ IO Streams features.
  */
-#include "iostream/ArduinoStream.h"
-#include "iostream/fstream.h"
-#include "iostream/StdioStream.h"
+#include "./iostream/ArduinoStream.h"
+#include "./iostream/fstream.h"
+#include "./iostream/StdioStream.h"
 #endif  // sdios_h