diff --git a/drivers/avr/spi_master.c b/drivers/avr/spi_master.c
index 19ca0ced44..4e8fd3bcdf 100644
--- a/drivers/avr/spi_master.c
+++ b/drivers/avr/spi_master.c
@@ -14,10 +14,8 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <avr/io.h>
-
 #include "spi_master.h"
-#include "quantum.h"
+
 #include "timer.h"
 
 #if defined(__AVR_AT90USB162__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)
diff --git a/drivers/avr/spi_master.h b/drivers/avr/spi_master.h
index 9203698dd5..8a30f47ae4 100644
--- a/drivers/avr/spi_master.h
+++ b/drivers/avr/spi_master.h
@@ -16,7 +16,9 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdbool.h>
+
+#include "gpio.h"
 
 typedef int16_t spi_status_t;
 
diff --git a/drivers/chibios/spi_master.c b/drivers/chibios/spi_master.c
index 8341b59a53..4852a6eba4 100644
--- a/drivers/chibios/spi_master.c
+++ b/drivers/chibios/spi_master.c
@@ -15,7 +15,7 @@
  */
 
 #include "spi_master.h"
-#include "quantum.h"
+
 #include "timer.h"
 
 static pin_t     currentSlavePin = NO_PIN;
diff --git a/drivers/chibios/spi_master.h b/drivers/chibios/spi_master.h
index 5953bef77f..e93580e319 100644
--- a/drivers/chibios/spi_master.h
+++ b/drivers/chibios/spi_master.h
@@ -18,7 +18,9 @@
 
 #include <ch.h>
 #include <hal.h>
-#include "quantum.h"
+#include <stdbool.h>
+
+#include "gpio.h"
 
 #ifndef SPI_DRIVER
 #    define SPI_DRIVER SPID2