diff --git a/src/main/drivers/adc_impl.h b/src/main/drivers/adc_impl.h
index 66baa5da9c..add1083bf2 100644
--- a/src/main/drivers/adc_impl.h
+++ b/src/main/drivers/adc_impl.h
@@ -20,10 +20,14 @@
 
 #pragma once
 
+#include "platform.h"
 #include "drivers/adc.h"
 #include "drivers/dma.h"
 #include "drivers/io_types.h"
-#include "drivers/rcc_types.h"
+
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc_types.h"
+#endif
 
 #if defined(STM32F4) || defined(STM32F7)
 #define ADC_TAG_MAP_COUNT 16
@@ -73,8 +77,8 @@ typedef struct adcTagMap_s {
 #define ADC_DEVICES_345 ((1 << ADCDEV_3)|(1 << ADCDEV_4)|(1 << ADCDEV_5))
 
 typedef struct adcDevice_s {
-#if !defined(SIMULATOR_BUILD)
     ADC_TypeDef* ADCx;
+#if PLATFORM_TRAIT_RCC
     rccPeriphTag_t rccADC;
 #endif
 #if !defined(USE_DMA_SPEC)
diff --git a/src/main/drivers/bus_i2c.h b/src/main/drivers/bus_i2c.h
index 91751dda24..0b34ea2e94 100644
--- a/src/main/drivers/bus_i2c.h
+++ b/src/main/drivers/bus_i2c.h
@@ -23,7 +23,6 @@
 #include "platform.h"
 
 #include "drivers/io_types.h"
-#include "drivers/rcc_types.h"
 
 #ifndef I2C_DEVICE
 #define I2C_DEVICE I2CINVALID
diff --git a/src/main/drivers/bus_i2c_impl.h b/src/main/drivers/bus_i2c_impl.h
index 34f932e248..2ce413685b 100644
--- a/src/main/drivers/bus_i2c_impl.h
+++ b/src/main/drivers/bus_i2c_impl.h
@@ -23,7 +23,10 @@
 #include "platform.h"
 
 #include "drivers/io_types.h"
-#include "drivers/rcc_types.h"
+
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc_types.h"
+#endif
 
 #define I2C_TIMEOUT_US          10000
 #define I2C_TIMEOUT_SYS_TICKS   (I2C_TIMEOUT_US / 1000)
diff --git a/src/main/drivers/bus_quadspi.c b/src/main/drivers/bus_quadspi.c
index 4944e12d0d..7ce4069cd4 100644
--- a/src/main/drivers/bus_quadspi.c
+++ b/src/main/drivers/bus_quadspi.c
@@ -32,7 +32,10 @@
 #include "drivers/bus_quadspi_impl.h"
 #include "drivers/exti.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc.h"
+#endif
 
 #include "pg/bus_quadspi.h"
 
@@ -264,7 +267,9 @@ void quadSpiPinConfigure(const quadSpiConfig_t *pConfig)
 
         if (haveResources) {
             pDev->dev = hw->reg;
+#if PLATFORM_TRAIT_RCC
             pDev->rcc = hw->rcc;
+#endif
         }
     }
 }
diff --git a/src/main/drivers/bus_quadspi.h b/src/main/drivers/bus_quadspi.h
index 6defb3514f..7fdb75cceb 100644
--- a/src/main/drivers/bus_quadspi.h
+++ b/src/main/drivers/bus_quadspi.h
@@ -23,7 +23,6 @@
 #pragma once
 
 #include "drivers/io_types.h"
-#include "drivers/rcc_types.h"
 
 #include "pg/pg.h"
 #include "pg/pg_ids.h"
diff --git a/src/main/drivers/bus_quadspi_impl.h b/src/main/drivers/bus_quadspi_impl.h
index eda709b918..b226f2723a 100644
--- a/src/main/drivers/bus_quadspi_impl.h
+++ b/src/main/drivers/bus_quadspi_impl.h
@@ -22,17 +22,19 @@
 
 #pragma once
 
+#include "platform.h"
+
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc_types.h"
+#endif
+
 typedef struct quadSpiPinDef_s {
     ioTag_t pin;
-#if defined(STM32H7)
+#if QUADSPI_TRAIT_AF_PIN
     uint8_t af;
 #endif
 } quadSpiPinDef_t;
 
-#if defined(STM32H7)
-#define MAX_QUADSPI_PIN_SEL 3
-#endif
-
 typedef struct quadSpiHardware_s {
     QUADSPIDevice device;
     QUADSPI_TypeDef *reg;
@@ -48,7 +50,9 @@ typedef struct quadSpiHardware_s {
     quadSpiPinDef_t bk2IO3Pins[MAX_QUADSPI_PIN_SEL];
     quadSpiPinDef_t bk2CSPins[MAX_QUADSPI_PIN_SEL];
 
+#if PLATFORM_TRAIT_RCC
     rccPeriphTag_t rcc;
+#endif
 } quadSpiHardware_t;
 
 extern const quadSpiHardware_t quadSpiHardware[];
@@ -78,9 +82,12 @@ typedef struct QUADSPIDevice_s {
     uint8_t bk2IO3AF;
     uint8_t bk2CSAF;
 #endif
+
+#if PLATFORM_TRAIT_RCC
     rccPeriphTag_t rcc;
+#endif
     volatile uint16_t errorCount;
-#if defined(USE_HAL_DRIVER)
+#if QUADSPI_TRAIT_HANDLE
     QSPI_HandleTypeDef hquadSpi;
 #endif
 } quadSpiDevice_t;
diff --git a/src/main/drivers/bus_spi_impl.h b/src/main/drivers/bus_spi_impl.h
index 556303da52..4b5106c8c4 100644
--- a/src/main/drivers/bus_spi_impl.h
+++ b/src/main/drivers/bus_spi_impl.h
@@ -20,6 +20,12 @@
 
 #pragma once
 
+#include "platform.h"
+
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc_types.h"
+#endif
+
 #define SPI_TIMEOUT_US  10000
 
 #define BUS_SPI_FREE   0x0
@@ -40,9 +46,11 @@ typedef struct spiHardware_s {
 #if SPI_TRAIT_AF_PORT
     uint8_t af;
 #endif
+
 #if PLATFORM_TRAIT_RCC
     rccPeriphTag_t rcc;
 #endif
+
 #ifdef USE_DMA
     uint8_t dmaIrqHandler;
 #endif
@@ -59,7 +67,8 @@ typedef struct SPIDevice_s {
     uint8_t sckAF;
     uint8_t misoAF;
     uint8_t mosiAF;
-#else
+#endif
+#if SPI_TRAIT_AF_PORT
     uint8_t af;
 #endif
 #if SPI_TRAIT_HANDLE
diff --git a/src/main/drivers/io.c b/src/main/drivers/io.c
index 7c766d9430..25f905143a 100644
--- a/src/main/drivers/io.c
+++ b/src/main/drivers/io.c
@@ -22,7 +22,6 @@
 
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
 
 #include "common/utils.h"
 
diff --git a/src/main/drivers/rangefinder/rangefinder_hcsr04.c b/src/main/drivers/rangefinder/rangefinder_hcsr04.c
index 72d3e201b8..dc01608565 100644
--- a/src/main/drivers/rangefinder/rangefinder_hcsr04.c
+++ b/src/main/drivers/rangefinder/rangefinder_hcsr04.c
@@ -30,7 +30,6 @@
 #include "drivers/exti.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
 #include "drivers/time.h"
 
 #include "drivers/rangefinder/rangefinder.h"
diff --git a/src/main/drivers/rx/rx_spi.c b/src/main/drivers/rx/rx_spi.c
index 05c6e803ea..19e7d69a1e 100644
--- a/src/main/drivers/rx/rx_spi.c
+++ b/src/main/drivers/rx/rx_spi.c
@@ -35,7 +35,6 @@
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
 #include "drivers/system.h"
 #include "drivers/time.h"
 
diff --git a/src/main/drivers/serial_uart.c b/src/main/drivers/serial_uart.c
index fb5c5291e3..172719885e 100644
--- a/src/main/drivers/serial_uart.c
+++ b/src/main/drivers/serial_uart.c
@@ -42,7 +42,6 @@
 
 #include "drivers/dma.h"
 #include "drivers/dma_reqmap.h"
-#include "drivers/rcc.h"
 #include "drivers/serial.h"
 #include "drivers/serial_impl.h"
 #include "drivers/serial_uart.h"
diff --git a/src/main/drivers/serial_uart_impl.h b/src/main/drivers/serial_uart_impl.h
index 9a6304129c..988a2858b2 100644
--- a/src/main/drivers/serial_uart_impl.h
+++ b/src/main/drivers/serial_uart_impl.h
@@ -33,6 +33,10 @@
 
 #include "platform.h"
 
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc_types.h"
+#endif
+
 #ifndef UART_RX_BUFFER_SIZE
 #define UART_RX_BUFFER_SIZE     256
 #endif
diff --git a/src/main/drivers/serial_uart_pinconfig.c b/src/main/drivers/serial_uart_pinconfig.c
index 8d9b348354..896f0dce95 100644
--- a/src/main/drivers/serial_uart_pinconfig.c
+++ b/src/main/drivers/serial_uart_pinconfig.c
@@ -36,7 +36,6 @@
 
 #include "build/build_config.h"
 
-#include "drivers/rcc.h"
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
 #include "drivers/serial_uart_impl.h"
diff --git a/src/main/drivers/timer.h b/src/main/drivers/timer.h
index 40bae0689c..13bfec69c5 100644
--- a/src/main/drivers/timer.h
+++ b/src/main/drivers/timer.h
@@ -25,7 +25,11 @@
 
 #include "drivers/dma.h"
 #include "drivers/io_types.h"
-#include "drivers/rcc_types.h"
+
+#if PLATFORM_TRAIT_RCC
+#include "platform/rcc_types.h"
+#endif
+
 #include "drivers/resource.h"
 
 #ifdef USE_TIMER
@@ -69,7 +73,9 @@ typedef struct timerOvrHandlerRec_s {
 
 typedef struct timerDef_s {
     TIM_TypeDef *TIMx;
+#if PLATFORM_TRAIT_RCC
     rccPeriphTag_t rcc;
+#endif
     uint8_t inputIrq;
 } timerDef_t;
 
@@ -180,7 +186,9 @@ uint32_t timerClock(const TIM_TypeDef *tim);
 void configTimeBase(TIM_TypeDef *tim, uint16_t period, uint32_t hz);  // TODO - just for migration
 void timerReconfigureTimeBase(TIM_TypeDef *tim, uint16_t period, uint32_t hz);
 
+#if PLATFORM_TRAIT_RCC
 rccPeriphTag_t timerRCC(const TIM_TypeDef *tim);
+#endif
 uint8_t timerInputIrq(const TIM_TypeDef *tim);
 
 #if defined(USE_TIMER_MGMT)
diff --git a/src/main/pg/bus_i2c.h b/src/main/pg/bus_i2c.h
index f460c48aa8..a8827f760f 100644
--- a/src/main/pg/bus_i2c.h
+++ b/src/main/pg/bus_i2c.h
@@ -22,7 +22,6 @@
 
 #include "drivers/bus_i2c.h"
 #include "drivers/io_types.h"
-#include "drivers/rcc_types.h"
 
 #include "pg/pg.h"
 
diff --git a/src/platform/APM32/adc_apm32f4xx.c b/src/platform/APM32/adc_apm32f4xx.c
index 2b93c1eba6..f577804602 100644
--- a/src/platform/APM32/adc_apm32f4xx.c
+++ b/src/platform/APM32/adc_apm32f4xx.c
@@ -32,7 +32,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/dma.h"
 #include "drivers/sensor.h"
 #include "drivers/adc.h"
diff --git a/src/platform/APM32/bus_i2c_apm32.c b/src/platform/APM32/bus_i2c_apm32.c
index 12eb1d803a..3b51cee474 100644
--- a/src/platform/APM32/bus_i2c_apm32.c
+++ b/src/platform/APM32/bus_i2c_apm32.c
@@ -31,7 +31,7 @@
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
diff --git a/src/platform/APM32/bus_i2c_apm32_init.c b/src/platform/APM32/bus_i2c_apm32_init.c
index 12dd1227d8..45fe92bfaa 100644
--- a/src/platform/APM32/bus_i2c_apm32_init.c
+++ b/src/platform/APM32/bus_i2c_apm32_init.c
@@ -30,7 +30,7 @@
 #include "drivers/io.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
diff --git a/src/platform/APM32/bus_spi_apm32.c b/src/platform/APM32/bus_spi_apm32.c
index 6b15adf29d..2b9a484975 100644
--- a/src/platform/APM32/bus_spi_apm32.c
+++ b/src/platform/APM32/bus_spi_apm32.c
@@ -35,7 +35,7 @@
 #include "drivers/bus_spi_impl.h"
 #include "drivers/dma.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 // Use DMA if possible if this many bytes are to be transferred
 #define SPI_DMA_THRESHOLD 8
diff --git a/src/platform/APM32/dma_apm32f4xx.c b/src/platform/APM32/dma_apm32f4xx.c
index 3c571a75e5..403f592fa4 100644
--- a/src/platform/APM32/dma_apm32f4xx.c
+++ b/src/platform/APM32/dma_apm32f4xx.c
@@ -29,7 +29,7 @@
 
 #include "drivers/nvic.h"
 #include "drivers/dma.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"
 
 /*
diff --git a/src/platform/APM32/io_apm32.c b/src/platform/APM32/io_apm32.c
index d744117646..482a6b8fd8 100644
--- a/src/platform/APM32/io_apm32.c
+++ b/src/platform/APM32/io_apm32.c
@@ -23,7 +23,7 @@
 
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "common/utils.h"
 
diff --git a/src/platform/APM32/light_ws2811strip_apm32.c b/src/platform/APM32/light_ws2811strip_apm32.c
index 2ef5cbcb30..c2cafd8ba7 100644
--- a/src/platform/APM32/light_ws2811strip_apm32.c
+++ b/src/platform/APM32/light_ws2811strip_apm32.c
@@ -32,7 +32,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/system.h"
 #include "drivers/timer.h"
 
diff --git a/src/platform/APM32/pwm_output_dshot_apm32.c b/src/platform/APM32/pwm_output_dshot_apm32.c
index 499897394f..203df9fefc 100644
--- a/src/platform/APM32/pwm_output_dshot_apm32.c
+++ b/src/platform/APM32/pwm_output_dshot_apm32.c
@@ -41,7 +41,7 @@
 #include "drivers/motor.h"
 #include "drivers/pwm_output.h"
 #include "pwm_output_dshot_shared.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/time.h"
 #include "drivers/timer.h"
 #include "drivers/system.h"
diff --git a/src/platform/APM32/rcm_apm32.c b/src/platform/APM32/rcm_apm32.c
index 96ecd59ac5..160dbfd723 100644
--- a/src/platform/APM32/rcm_apm32.c
+++ b/src/platform/APM32/rcm_apm32.c
@@ -20,7 +20,7 @@
  */
 
 #include "platform.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState)
 {
diff --git a/src/platform/APM32/serial_uart_apm32.c b/src/platform/APM32/serial_uart_apm32.c
index e676ca2f93..eb6da0f291 100644
--- a/src/platform/APM32/serial_uart_apm32.c
+++ b/src/platform/APM32/serial_uart_apm32.c
@@ -39,7 +39,7 @@
 #include "common/utils.h"
 #include "drivers/inverter.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
diff --git a/src/platform/APM32/serial_uart_apm32f4xx.c b/src/platform/APM32/serial_uart_apm32f4xx.c
index 2c5151b62f..7978e6315e 100644
--- a/src/platform/APM32/serial_uart_apm32f4xx.c
+++ b/src/platform/APM32/serial_uart_apm32f4xx.c
@@ -36,7 +36,7 @@
 #include "drivers/io.h"
 #include "drivers/dma.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
diff --git a/src/platform/APM32/timer_apm32.c b/src/platform/APM32/timer_apm32.c
index 12ef8f197b..5e52ec654c 100644
--- a/src/platform/APM32/timer_apm32.c
+++ b/src/platform/APM32/timer_apm32.c
@@ -37,7 +37,7 @@
 #include "drivers/io.h"
 #include "drivers/dma.h"
 
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/timer.h"
 #include "drivers/timer_impl.h"
diff --git a/src/platform/APM32/timer_apm32f4xx.c b/src/platform/APM32/timer_apm32f4xx.c
index 708e6f3e29..e67e450306 100644
--- a/src/platform/APM32/timer_apm32f4xx.c
+++ b/src/platform/APM32/timer_apm32f4xx.c
@@ -30,7 +30,7 @@
 #include "timer_def.h"
 
 #include "apm32f4xx.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 
 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
diff --git a/src/platform/APM32/transponder_ir_io_apm32.c b/src/platform/APM32/transponder_ir_io_apm32.c
index 799ccb8494..ff4d778736 100644
--- a/src/platform/APM32/transponder_ir_io_apm32.c
+++ b/src/platform/APM32/transponder_ir_io_apm32.c
@@ -31,7 +31,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 #include "drivers/transponder_ir_arcitimer.h"
 #include "drivers/transponder_ir_erlt.h"
diff --git a/src/platform/AT32/adc_at32f43x.c b/src/platform/AT32/adc_at32f43x.c
index 31b6a45b55..13e13b3c5e 100644
--- a/src/platform/AT32/adc_at32f43x.c
+++ b/src/platform/AT32/adc_at32f43x.c
@@ -54,7 +54,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"
 #include "drivers/dma.h"
 
diff --git a/src/platform/AT32/bus_i2c_atbsp.c b/src/platform/AT32/bus_i2c_atbsp.c
index daa9f4bc9a..1ddef8d7a0 100644
--- a/src/platform/AT32/bus_i2c_atbsp.c
+++ b/src/platform/AT32/bus_i2c_atbsp.c
@@ -31,7 +31,7 @@
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
diff --git a/src/platform/AT32/bus_i2c_atbsp_init.c b/src/platform/AT32/bus_i2c_atbsp_init.c
index 0d3d4c2542..0e3c6aa740 100644
--- a/src/platform/AT32/bus_i2c_atbsp_init.c
+++ b/src/platform/AT32/bus_i2c_atbsp_init.c
@@ -30,7 +30,7 @@
 #include "drivers/io.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
diff --git a/src/platform/AT32/bus_spi_at32bsp.c b/src/platform/AT32/bus_spi_at32bsp.c
index 4182e195f1..fed36d685e 100644
--- a/src/platform/AT32/bus_spi_at32bsp.c
+++ b/src/platform/AT32/bus_spi_at32bsp.c
@@ -35,7 +35,7 @@
 #include "drivers/bus_spi_impl.h"
 #include "drivers/exti.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 // Use DMA if possible if this many bytes are to be transferred
 #define SPI_DMA_THRESHOLD 8
diff --git a/src/platform/AT32/camera_control_at32.c b/src/platform/AT32/camera_control_at32.c
index 12a69d18ca..05f8ef7b98 100644
--- a/src/platform/AT32/camera_control_at32.c
+++ b/src/platform/AT32/camera_control_at32.c
@@ -28,7 +28,7 @@
 #include "drivers/camera_control_impl.h"
 #include "drivers/nvic.h"
 #include "drivers/pwm_output.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #ifdef CAMERA_CONTROL_SOFTWARE_PWM_AVAILABLE
 #include "build/atomic.h"
diff --git a/src/platform/AT32/dma_at32f43x.c b/src/platform/AT32/dma_at32f43x.c
index e233713a42..94710fb68d 100644
--- a/src/platform/AT32/dma_at32f43x.c
+++ b/src/platform/AT32/dma_at32f43x.c
@@ -29,7 +29,7 @@
 
 #include "drivers/nvic.h"
 #include "drivers/dma.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"
 
 /*
diff --git a/src/platform/AT32/io_at32.c b/src/platform/AT32/io_at32.c
index 5905f4055f..b5759f99f7 100644
--- a/src/platform/AT32/io_at32.c
+++ b/src/platform/AT32/io_at32.c
@@ -23,7 +23,7 @@
 
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "common/utils.h"
 
diff --git a/src/platform/AT32/light_ws2811strip_at32f43x.c b/src/platform/AT32/light_ws2811strip_at32f43x.c
index 1827556d30..e4afd9f202 100644
--- a/src/platform/AT32/light_ws2811strip_at32f43x.c
+++ b/src/platform/AT32/light_ws2811strip_at32f43x.c
@@ -35,7 +35,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 
 #include "drivers/light_ws2811strip.h"
diff --git a/src/platform/AT32/pwm_output_dshot.c b/src/platform/AT32/pwm_output_dshot.c
index 2d4722da04..eff7db614e 100644
--- a/src/platform/AT32/pwm_output_dshot.c
+++ b/src/platform/AT32/pwm_output_dshot.c
@@ -33,7 +33,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/time.h"
 #include "drivers/timer.h"
 #include "drivers/system.h"
diff --git a/src/platform/AT32/rcc_at32.c b/src/platform/AT32/rcc_at32.c
index d3b2d1a4f1..87f8030d4d 100644
--- a/src/platform/AT32/rcc_at32.c
+++ b/src/platform/AT32/rcc_at32.c
@@ -23,7 +23,7 @@
  */
 
 #include "platform.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState)
 {
diff --git a/src/platform/AT32/serial_uart_at32bsp.c b/src/platform/AT32/serial_uart_at32bsp.c
index 0875364108..1752de4f71 100644
--- a/src/platform/AT32/serial_uart_at32bsp.c
+++ b/src/platform/AT32/serial_uart_at32bsp.c
@@ -41,7 +41,7 @@
 #include "common/utils.h"
 #include "drivers/inverter.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/dma.h"
 
diff --git a/src/platform/AT32/serial_uart_at32f43x.c b/src/platform/AT32/serial_uart_at32f43x.c
index 61733f5266..13f85194fd 100644
--- a/src/platform/AT32/serial_uart_at32f43x.c
+++ b/src/platform/AT32/serial_uart_at32f43x.c
@@ -31,7 +31,7 @@
 #include "drivers/dma.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
diff --git a/src/platform/AT32/timer_at32bsp.c b/src/platform/AT32/timer_at32bsp.c
index 6336ad1a2a..a6da1cb51c 100644
--- a/src/platform/AT32/timer_at32bsp.c
+++ b/src/platform/AT32/timer_at32bsp.c
@@ -35,7 +35,7 @@
 #include "drivers/nvic.h"
 
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/system.h"
 #include "drivers/timer.h"
 #include "drivers/timer_impl.h"
diff --git a/src/platform/AT32/timer_at32f43x.c b/src/platform/AT32/timer_at32f43x.c
index 13c4b99b87..e2e8ecc8d4 100644
--- a/src/platform/AT32/timer_at32f43x.c
+++ b/src/platform/AT32/timer_at32f43x.c
@@ -28,7 +28,7 @@
 #include "timer_def.h"
 #include "drivers/dma.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 
 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
diff --git a/src/platform/SIMULATOR/include/platform/platform.h b/src/platform/SIMULATOR/include/platform/platform.h
index 7fdf22c0f5..4331c71989 100644
--- a/src/platform/SIMULATOR/include/platform/platform.h
+++ b/src/platform/SIMULATOR/include/platform/platform.h
@@ -35,3 +35,5 @@
 #define SERIAL_TRAIT_PIN_CONFIG 0
 
 #define I2CDEV_COUNT        0
+
+typedef void* ADC_TypeDef; // Dummy definition for ADC_TypeDef
diff --git a/src/platform/STM32/adc_stm32f4xx.c b/src/platform/STM32/adc_stm32f4xx.c
index 1a9de8f69d..f8c46d83e6 100644
--- a/src/platform/STM32/adc_stm32f4xx.c
+++ b/src/platform/STM32/adc_stm32f4xx.c
@@ -31,7 +31,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/dma.h"
 #include "drivers/sensor.h"
 #include "drivers/adc.h"
diff --git a/src/platform/STM32/adc_stm32f7xx.c b/src/platform/STM32/adc_stm32f7xx.c
index f631543c47..0ef61b3f32 100644
--- a/src/platform/STM32/adc_stm32f7xx.c
+++ b/src/platform/STM32/adc_stm32f7xx.c
@@ -30,7 +30,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/sensor.h"
 
 #include "drivers/adc.h"
diff --git a/src/platform/STM32/adc_stm32g4xx.c b/src/platform/STM32/adc_stm32g4xx.c
index 26e6ac9e6b..c378d9cbbd 100644
--- a/src/platform/STM32/adc_stm32g4xx.c
+++ b/src/platform/STM32/adc_stm32g4xx.c
@@ -31,7 +31,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"
 #include "drivers/dma.h"
 
diff --git a/src/platform/STM32/adc_stm32h7xx.c b/src/platform/STM32/adc_stm32h7xx.c
index 643fff600e..96a3327628 100644
--- a/src/platform/STM32/adc_stm32h7xx.c
+++ b/src/platform/STM32/adc_stm32h7xx.c
@@ -31,7 +31,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"
 #include "drivers/dma.h"
 
diff --git a/src/platform/STM32/bus_i2c_hal.c b/src/platform/STM32/bus_i2c_hal.c
index bdb3c5fd39..915cc9a7cf 100644
--- a/src/platform/STM32/bus_i2c_hal.c
+++ b/src/platform/STM32/bus_i2c_hal.c
@@ -30,7 +30,7 @@
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
diff --git a/src/platform/STM32/bus_i2c_hal_init.c b/src/platform/STM32/bus_i2c_hal_init.c
index 650c034244..d41926a470 100644
--- a/src/platform/STM32/bus_i2c_hal_init.c
+++ b/src/platform/STM32/bus_i2c_hal_init.c
@@ -29,7 +29,7 @@
 #include "drivers/io.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
diff --git a/src/platform/STM32/bus_i2c_stm32f4xx.c b/src/platform/STM32/bus_i2c_stm32f4xx.c
index 2d7be2dfb5..3a27d75edd 100644
--- a/src/platform/STM32/bus_i2c_stm32f4xx.c
+++ b/src/platform/STM32/bus_i2c_stm32f4xx.c
@@ -30,7 +30,7 @@
 #include "drivers/io.h"
 #include "drivers/time.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/bus_i2c.h"
 #include "drivers/bus_i2c_impl.h"
diff --git a/src/platform/STM32/bus_quadspi_hal.c b/src/platform/STM32/bus_quadspi_hal.c
index bc119ee796..efb7226f93 100644
--- a/src/platform/STM32/bus_quadspi_hal.c
+++ b/src/platform/STM32/bus_quadspi_hal.c
@@ -33,7 +33,7 @@
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "pg/bus_quadspi.h"
 
diff --git a/src/platform/STM32/bus_spi_ll.c b/src/platform/STM32/bus_spi_ll.c
index 9e3d3ea21c..2a12575335 100644
--- a/src/platform/STM32/bus_spi_ll.c
+++ b/src/platform/STM32/bus_spi_ll.c
@@ -34,7 +34,7 @@
 #include "drivers/bus_spi_impl.h"
 #include "drivers/dma.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 // Use DMA if possible if this many bytes are to be transferred
 #define SPI_DMA_THRESHOLD 8
diff --git a/src/platform/STM32/bus_spi_stdperiph.c b/src/platform/STM32/bus_spi_stdperiph.c
index 5fcf671528..9bb02fba80 100644
--- a/src/platform/STM32/bus_spi_stdperiph.c
+++ b/src/platform/STM32/bus_spi_stdperiph.c
@@ -35,7 +35,7 @@
 #include "drivers/bus_spi_impl.h"
 #include "drivers/exti.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 // Use DMA if possible if this many bytes are to be transferred
 #define SPI_DMA_THRESHOLD 8
diff --git a/src/platform/STM32/dma_stm32f7xx.c b/src/platform/STM32/dma_stm32f7xx.c
index 14ece8e35c..eb432a39d7 100644
--- a/src/platform/STM32/dma_stm32f7xx.c
+++ b/src/platform/STM32/dma_stm32f7xx.c
@@ -28,7 +28,7 @@
 
 #include "drivers/nvic.h"
 #include "drivers/dma.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"
 
 /*
diff --git a/src/platform/STM32/dma_stm32g4xx.c b/src/platform/STM32/dma_stm32g4xx.c
index 6e0d805038..d8e9d25672 100644
--- a/src/platform/STM32/dma_stm32g4xx.c
+++ b/src/platform/STM32/dma_stm32g4xx.c
@@ -28,7 +28,7 @@
 
 #include "drivers/nvic.h"
 #include "drivers/dma.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"
 
 /*
diff --git a/src/platform/STM32/dma_stm32h7xx.c b/src/platform/STM32/dma_stm32h7xx.c
index 52d7aa1a27..9ecbc185a9 100644
--- a/src/platform/STM32/dma_stm32h7xx.c
+++ b/src/platform/STM32/dma_stm32h7xx.c
@@ -28,7 +28,7 @@
 
 #include "drivers/nvic.h"
 #include "drivers/dma.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/resource.h"
 
 /*
diff --git a/src/platform/STM32/include/platform/platform.h b/src/platform/STM32/include/platform/platform.h
index 53ea0cf11b..3f9e13e5a1 100644
--- a/src/platform/STM32/include/platform/platform.h
+++ b/src/platform/STM32/include/platform/platform.h
@@ -441,3 +441,10 @@ extern uint8_t _dmaram_end__;
 #else
 #define I2CDEV_COUNT 4
 #endif
+
+// QUAD SPI
+#if defined(STM32H7)
+#define QUADSPI_TRAIT_AF_PIN 1
+#define QUADSPI_TRAIT_HANDLE 1
+#define MAX_QUADSPI_PIN_SEL 3
+#endif
diff --git a/src/platform/STM32/io_stm32.c b/src/platform/STM32/io_stm32.c
index 2557f09764..abcde9cf92 100644
--- a/src/platform/STM32/io_stm32.c
+++ b/src/platform/STM32/io_stm32.c
@@ -22,7 +22,7 @@
 
 #include "drivers/io.h"
 #include "drivers/io_impl.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "common/utils.h"
 
diff --git a/src/platform/STM32/light_ws2811strip_hal.c b/src/platform/STM32/light_ws2811strip_hal.c
index bdb9487851..c5f885c1b2 100644
--- a/src/platform/STM32/light_ws2811strip_hal.c
+++ b/src/platform/STM32/light_ws2811strip_hal.c
@@ -31,7 +31,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/system.h"
 #include "drivers/timer.h"
 
diff --git a/src/platform/STM32/light_ws2811strip_stdperiph.c b/src/platform/STM32/light_ws2811strip_stdperiph.c
index 1b4dbf9017..13723de3f5 100644
--- a/src/platform/STM32/light_ws2811strip_stdperiph.c
+++ b/src/platform/STM32/light_ws2811strip_stdperiph.c
@@ -34,7 +34,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 
 #include "drivers/light_ws2811strip.h"
diff --git a/src/platform/STM32/pwm_output_dshot.c b/src/platform/STM32/pwm_output_dshot.c
index dcf2bba859..506a147364 100644
--- a/src/platform/STM32/pwm_output_dshot.c
+++ b/src/platform/STM32/pwm_output_dshot.c
@@ -32,7 +32,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/time.h"
 #include "drivers/timer.h"
 #include "drivers/system.h"
diff --git a/src/platform/STM32/pwm_output_dshot_hal.c b/src/platform/STM32/pwm_output_dshot_hal.c
index 3e6fe722a3..0c82414916 100644
--- a/src/platform/STM32/pwm_output_dshot_hal.c
+++ b/src/platform/STM32/pwm_output_dshot_hal.c
@@ -40,7 +40,7 @@
 #include "drivers/motor.h"
 #include "drivers/pwm_output.h"
 #include "pwm_output_dshot_shared.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/time.h"
 #include "drivers/timer.h"
 #include "drivers/system.h"
diff --git a/src/platform/STM32/rcc_stm32.c b/src/platform/STM32/rcc_stm32.c
index f8afd03f36..17f10fbb52 100644
--- a/src/platform/STM32/rcc_stm32.c
+++ b/src/platform/STM32/rcc_stm32.c
@@ -19,7 +19,7 @@
  */
 
 #include "platform.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 void RCC_ClockCmd(rccPeriphTag_t periphTag, FunctionalState NewState)
 {
diff --git a/src/platform/STM32/sdio_f4xx.c b/src/platform/STM32/sdio_f4xx.c
index ec64647c3f..3aba6decb5 100644
--- a/src/platform/STM32/sdio_f4xx.c
+++ b/src/platform/STM32/sdio_f4xx.c
@@ -44,7 +44,7 @@
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/dma.h"
 #include "drivers/light_led.h"
 
diff --git a/src/platform/STM32/sdio_f7xx.c b/src/platform/STM32/sdio_f7xx.c
index 2f1bc62b5c..112028e6f8 100644
--- a/src/platform/STM32/sdio_f7xx.c
+++ b/src/platform/STM32/sdio_f7xx.c
@@ -41,7 +41,7 @@
 #include "drivers/io_impl.h"
 #include "drivers/nvic.h"
 #include "drivers/time.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/dma.h"
 #include "drivers/light_led.h"
 
diff --git a/src/platform/STM32/serial_uart_hal.c b/src/platform/STM32/serial_uart_hal.c
index f319bce78c..862bdb68d6 100644
--- a/src/platform/STM32/serial_uart_hal.c
+++ b/src/platform/STM32/serial_uart_hal.c
@@ -42,7 +42,7 @@
 #include "drivers/nvic.h"
 #include "drivers/inverter.h"
 #include "drivers/dma.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
diff --git a/src/platform/STM32/serial_uart_stdperiph.c b/src/platform/STM32/serial_uart_stdperiph.c
index b65275c427..b028371dff 100644
--- a/src/platform/STM32/serial_uart_stdperiph.c
+++ b/src/platform/STM32/serial_uart_stdperiph.c
@@ -42,7 +42,7 @@
 #include "common/utils.h"
 #include "drivers/inverter.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
diff --git a/src/platform/STM32/serial_uart_stm32f4xx.c b/src/platform/STM32/serial_uart_stm32f4xx.c
index d289a1e671..a2ab2fc714 100644
--- a/src/platform/STM32/serial_uart_stm32f4xx.c
+++ b/src/platform/STM32/serial_uart_stm32f4xx.c
@@ -35,7 +35,7 @@
 #include "drivers/io.h"
 #include "drivers/dma.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
diff --git a/src/platform/STM32/serial_uart_stm32f7xx.c b/src/platform/STM32/serial_uart_stm32f7xx.c
index 3205cf8620..ad67a92f0e 100644
--- a/src/platform/STM32/serial_uart_stm32f7xx.c
+++ b/src/platform/STM32/serial_uart_stm32f7xx.c
@@ -33,7 +33,7 @@
 #include "drivers/dma.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
diff --git a/src/platform/STM32/serial_uart_stm32g4xx.c b/src/platform/STM32/serial_uart_stm32g4xx.c
index 211e6f41fa..2042df06dd 100644
--- a/src/platform/STM32/serial_uart_stm32g4xx.c
+++ b/src/platform/STM32/serial_uart_stm32g4xx.c
@@ -31,7 +31,7 @@
 #include "drivers/dma.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
diff --git a/src/platform/STM32/serial_uart_stm32h7xx.c b/src/platform/STM32/serial_uart_stm32h7xx.c
index bbed4b6ed0..898fdf0937 100644
--- a/src/platform/STM32/serial_uart_stm32h7xx.c
+++ b/src/platform/STM32/serial_uart_stm32h7xx.c
@@ -33,7 +33,7 @@
 #include "drivers/dma.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/serial.h"
 #include "drivers/serial_uart.h"
diff --git a/src/platform/STM32/timer_hal.c b/src/platform/STM32/timer_hal.c
index c9e9180f6c..e4ea1a413a 100644
--- a/src/platform/STM32/timer_hal.c
+++ b/src/platform/STM32/timer_hal.c
@@ -36,7 +36,7 @@
 #include "drivers/io.h"
 #include "drivers/dma.h"
 
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "drivers/timer.h"
 #include "drivers/timer_impl.h"
diff --git a/src/platform/STM32/timer_stdperiph.c b/src/platform/STM32/timer_stdperiph.c
index 8e0c2bc95a..c5ecefba24 100644
--- a/src/platform/STM32/timer_stdperiph.c
+++ b/src/platform/STM32/timer_stdperiph.c
@@ -34,12 +34,13 @@
 #include "drivers/nvic.h"
 
 #include "drivers/io.h"
-#include "drivers/rcc.h"
 #include "drivers/system.h"
 
 #include "drivers/timer.h"
 #include "drivers/timer_impl.h"
 
+#include "platform/rcc.h"
+
 #define TIM_N(n) (1 << (n))
 
 /*
diff --git a/src/platform/STM32/timer_stm32f4xx.c b/src/platform/STM32/timer_stm32f4xx.c
index 4bc5b1d2db..ed193e64f7 100644
--- a/src/platform/STM32/timer_stm32f4xx.c
+++ b/src/platform/STM32/timer_stm32f4xx.c
@@ -29,7 +29,7 @@
 #include "timer_def.h"
 
 #include "stm32f4xx.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 
 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
diff --git a/src/platform/STM32/timer_stm32f7xx.c b/src/platform/STM32/timer_stm32f7xx.c
index 464873c89c..92f958929d 100644
--- a/src/platform/STM32/timer_stm32f7xx.c
+++ b/src/platform/STM32/timer_stm32f7xx.c
@@ -29,7 +29,7 @@
 #include "timer_def.h"
 
 #include "stm32f7xx.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 
 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
diff --git a/src/platform/STM32/timer_stm32g4xx.c b/src/platform/STM32/timer_stm32g4xx.c
index e93f79fbe2..c2256e6c67 100644
--- a/src/platform/STM32/timer_stm32g4xx.c
+++ b/src/platform/STM32/timer_stm32g4xx.c
@@ -29,7 +29,7 @@
 #include "timer_def.h"
 
 #include "stm32g4xx.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 
 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
diff --git a/src/platform/STM32/timer_stm32h5xx.c b/src/platform/STM32/timer_stm32h5xx.c
index e4d06b9335..c9edec4ba6 100644
--- a/src/platform/STM32/timer_stm32h5xx.c
+++ b/src/platform/STM32/timer_stm32h5xx.c
@@ -30,7 +30,7 @@
 #include "timer_def.h"
 
 #include "stm32h5xx.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 
 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
diff --git a/src/platform/STM32/timer_stm32h7xx.c b/src/platform/STM32/timer_stm32h7xx.c
index 3462e9d7f2..4fa37a0423 100644
--- a/src/platform/STM32/timer_stm32h7xx.c
+++ b/src/platform/STM32/timer_stm32h7xx.c
@@ -29,7 +29,7 @@
 #include "timer_def.h"
 
 #include "stm32h7xx.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 
 const timerDef_t timerDefinitions[HARDWARE_TIMER_DEFINITION_COUNT] = {
diff --git a/src/platform/STM32/transponder_ir_io_hal.c b/src/platform/STM32/transponder_ir_io_hal.c
index 1f3f203407..51ae36da97 100644
--- a/src/platform/STM32/transponder_ir_io_hal.c
+++ b/src/platform/STM32/transponder_ir_io_hal.c
@@ -30,7 +30,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 #include "drivers/transponder_ir_arcitimer.h"
 #include "drivers/transponder_ir_erlt.h"
diff --git a/src/platform/STM32/transponder_ir_io_stdperiph.c b/src/platform/STM32/transponder_ir_io_stdperiph.c
index 0d4170cc0f..03d6c735c0 100644
--- a/src/platform/STM32/transponder_ir_io_stdperiph.c
+++ b/src/platform/STM32/transponder_ir_io_stdperiph.c
@@ -30,7 +30,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/timer.h"
 #include "drivers/transponder_ir_arcitimer.h"
 #include "drivers/transponder_ir_erlt.h"
diff --git a/src/platform/common/stm32/bus_spi_pinconfig.c b/src/platform/common/stm32/bus_spi_pinconfig.c
index 02cc24ac9a..52d2d456c2 100644
--- a/src/platform/common/stm32/bus_spi_pinconfig.c
+++ b/src/platform/common/stm32/bus_spi_pinconfig.c
@@ -33,7 +33,7 @@
 #include "drivers/dma.h"
 #include "drivers/exti.h"
 #include "drivers/io.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 
 #include "pg/bus_spi.h"
 
diff --git a/src/main/drivers/rcc.h b/src/platform/common/stm32/platform/rcc.h
similarity index 99%
rename from src/main/drivers/rcc.h
rename to src/platform/common/stm32/platform/rcc.h
index cdd2e3d1dd..69641b5e2d 100644
--- a/src/main/drivers/rcc.h
+++ b/src/platform/common/stm32/platform/rcc.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "rcc_types.h"
+#include "platform/rcc_types.h"
 
 enum rcc_reg {
     RCC_EMPTY = 0,   // make sure that default value (0) does not enable anything
diff --git a/src/main/drivers/rcc_types.h b/src/platform/common/stm32/platform/rcc_types.h
similarity index 100%
rename from src/main/drivers/rcc_types.h
rename to src/platform/common/stm32/platform/rcc_types.h
diff --git a/src/platform/common/stm32/pwm_output_dshot_shared.c b/src/platform/common/stm32/pwm_output_dshot_shared.c
index ccf2ab661d..1bf57ee98d 100644
--- a/src/platform/common/stm32/pwm_output_dshot_shared.c
+++ b/src/platform/common/stm32/pwm_output_dshot_shared.c
@@ -33,7 +33,7 @@
 #include "drivers/dma_reqmap.h"
 #include "drivers/io.h"
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/time.h"
 #include "drivers/timer.h"
 #if defined(STM32F4)
diff --git a/src/platform/common/stm32/serial_uart_hw.c b/src/platform/common/stm32/serial_uart_hw.c
index 74e32147cf..1103a80db6 100644
--- a/src/platform/common/stm32/serial_uart_hw.c
+++ b/src/platform/common/stm32/serial_uart_hw.c
@@ -33,7 +33,7 @@
 #include "build/build_config.h"
 
 #include "drivers/nvic.h"
-#include "drivers/rcc.h"
+#include "platform/rcc.h"
 #include "drivers/inverter.h"
 #include "drivers/serial.h"
 #include "drivers/serial_impl.h"