diff --git a/libraries/I2S/src/I2S.cpp b/libraries/I2S/src/I2S.cpp
index 00837e202..e3b1464dd 100644
--- a/libraries/I2S/src/I2S.cpp
+++ b/libraries/I2S/src/I2S.cpp
@@ -38,9 +38,13 @@ static I2SDevice_SAMD21G18x i2sd(*I2S);
 #include "I2S.h"
 
 #ifdef USE_TINYUSB
-// For Serial when selecting TinyUSB
+// For Serial when selecting TinyUSB; the Arduino builder discovers and links
+// the library from this include. PlatformIO never resolves it (framework-
+// bundled libraries get no lib_deps include paths), so skip it there.
+#ifndef PLATFORMIO
 #include <Adafruit_TinyUSB.h>
 #endif
+#endif
 
 
 int I2SClass::_beginCount = 0;
diff --git a/libraries/SAMD_AnalogCorrection/src/SAMD_AnalogCorrection.cpp b/libraries/SAMD_AnalogCorrection/src/SAMD_AnalogCorrection.cpp
index e39ab43e3..919fd784a 100644
--- a/libraries/SAMD_AnalogCorrection/src/SAMD_AnalogCorrection.cpp
+++ b/libraries/SAMD_AnalogCorrection/src/SAMD_AnalogCorrection.cpp
@@ -20,9 +20,13 @@
 #include "SAMD_AnalogCorrection.h"
 
 #ifdef USE_TINYUSB
-// For Serial when selecting TinyUSB
+// For Serial when selecting TinyUSB; the Arduino builder discovers and links
+// the library from this include. PlatformIO never resolves it (framework-
+// bundled libraries get no lib_deps include paths), so skip it there.
+#ifndef PLATFORMIO
 #include <Adafruit_TinyUSB.h>
 #endif
+#endif
 
 void analogReadCorrection (int offset, uint16_t gain)
 {
diff --git a/libraries/SPI/SPI.cpp b/libraries/SPI/SPI.cpp
index 0393752d7..0037241bb 100644
--- a/libraries/SPI/SPI.cpp
+++ b/libraries/SPI/SPI.cpp
@@ -23,9 +23,13 @@
 #include <assert.h>
 
 #ifdef USE_TINYUSB
-// For Serial when selecting TinyUSB
+// For Serial when selecting TinyUSB; the Arduino builder discovers and links
+// the library from this include. PlatformIO never resolves it (framework-
+// bundled libraries get no lib_deps include paths), so skip it there.
+#ifndef PLATFORMIO
 #include <Adafruit_TinyUSB.h>
 #endif
+#endif
 
 #define SPI_IMODE_NONE   0
 #define SPI_IMODE_EXTINT 1
diff --git a/libraries/Servo/src/samd/Servo.cpp b/libraries/Servo/src/samd/Servo.cpp
index ba07e70a7..3b1302b47 100644
--- a/libraries/Servo/src/samd/Servo.cpp
+++ b/libraries/Servo/src/samd/Servo.cpp
@@ -22,9 +22,13 @@
 #include <Servo.h>
 
 #ifdef USE_TINYUSB
-// For Serial when selecting TinyUSB
+// For Serial when selecting TinyUSB; the Arduino builder discovers and links
+// the library from this include. PlatformIO never resolves it (framework-
+// bundled libraries get no lib_deps include paths), so skip it there.
+#ifndef PLATFORMIO
 #include <Adafruit_TinyUSB.h>
 #endif
+#endif
 
 #if defined(__SAMD51__)
  // Different prescalers depending on FCPU (avoid overflowing 16-bit counter)
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
index da9732c59..6943bfde3 100644
--- a/libraries/Wire/Wire.cpp
+++ b/libraries/Wire/Wire.cpp
@@ -25,9 +25,13 @@ extern "C" {
 #include <wiring_private.h>
 
 #ifdef USE_TINYUSB
-// For Serial when selecting TinyUSB
+// For Serial when selecting TinyUSB; the Arduino builder discovers and links
+// the library from this include. PlatformIO never resolves it (framework-
+// bundled libraries get no lib_deps include paths), so skip it there.
+#ifndef PLATFORMIO
 #include <Adafruit_TinyUSB.h>
 #endif
+#endif
 
 #include "Wire.h"
 
diff --git a/platform.txt b/platform.txt
index bcebfe664..002aefdef 100644
--- a/platform.txt
+++ b/platform.txt
@@ -20,7 +20,7 @@
 # https://arduino.github.io/arduino-cli/0.33/platform-specification/
 
 name=Adafruit SAMD (32-bits ARM Cortex-M0+ and Cortex-M4) Boards
-version=1.7.17
+version=1.7.18
 
 # Compile variables
 # -----------------