diff --git a/src/main/drivers/stm32/platform_mcu.h b/src/main/drivers/stm32/platform_mcu.h
index 684f70aad4..d4cd57e99e 100644
--- a/src/main/drivers/stm32/platform_mcu.h
+++ b/src/main/drivers/stm32/platform_mcu.h
@@ -252,87 +252,3 @@ extern uint8_t _dmaram_end__;
 
 #define USE_TIMER_MGMT
 #define USE_TIMER_AF
-
-#ifdef STM32F4
-#ifndef I2C1_SCL_PIN
-#define I2C1_SCL_PIN PB6
-#endif
-#ifndef I2C1_SDA_PIN
-#define I2C1_SDA_PIN PB7
-#endif
-#ifndef I2C2_SCL_PIN
-#define I2C2_SCL_PIN PB10
-#endif
-#ifndef I2C2_SDA_PIN
-#define I2C2_SDA_PIN PB11
-#endif
-#ifndef I2C3_SCL_PIN
-#define I2C3_SCL_PIN PA8
-#endif
-#ifndef I2C3_SDA_PIN
-#define I2C3_SDA_PIN PC9
-#endif
-#endif // STM32F4
-
-#ifdef STM32F7
-#ifndef I2C1_SCL_PIN
-#define I2C1_SCL_PIN PB6
-#endif
-#ifndef I2C1_SDA_PIN
-#define I2C1_SDA_PIN PB7
-#endif
-#ifndef I2C2_SCL_PIN
-#define I2C2_SCL_PIN PB10
-#endif
-#ifndef I2C2_SDA_PIN
-#define I2C2_SDA_PIN PB11
-#endif
-#ifndef I2C3_SCL_PIN
-#define I2C3_SCL_PIN PA8
-#endif
-#ifndef I2C3_SDA_PIN
-#define I2C3_SDA_PIN PB4
-#endif
-#ifndef I2C4_SCL_PIN
-#define I2C4_SCL_PIN PD12
-#endif
-#ifndef I2C4_SDA_PIN
-#define I2C4_SDA_PIN PD13
-#endif
-#endif // STM32F7
-
-#ifndef SPI1_SCK_PIN
-#define SPI1_SCK_PIN    PA5
-#define SPI1_SDI_PIN    PA6
-#define SPI1_SDO_PIN    PA7
-#endif
-
-#ifndef SPI2_SCK_PIN
-#define SPI2_SCK_PIN    PB13
-#define SPI2_SDI_PIN    PB14
-#define SPI2_SDO_PIN    PB15
-#endif
-
-#ifndef SPI3_SCK_PIN
-#define SPI3_SCK_PIN    PB3
-#define SPI3_SDI_PIN    PB4
-#define SPI3_SDO_PIN    PB5
-#endif
-
-#ifndef SPI4_SCK_PIN
-#define SPI4_SCK_PIN    NONE
-#define SPI4_SDI_PIN    NONE
-#define SPI4_SDO_PIN    NONE
-#endif
-
-#ifndef SPI5_SCK_PIN
-#define SPI5_SCK_PIN    NONE
-#define SPI5_SDI_PIN   NONE
-#define SPI5_SDO_PIN   NONE
-#endif
-
-#ifndef SPI6_SCK_PIN
-#define SPI6_SCK_PIN    NONE
-#define SPI6_SDI_PIN   NONE
-#define SPI6_SDO_PIN   NONE
-#endif
diff --git a/src/main/pg/bus_spi.c b/src/main/pg/bus_spi.c
index 4e71600190..1a24e9a5b7 100644
--- a/src/main/pg/bus_spi.c
+++ b/src/main/pg/bus_spi.c
@@ -31,6 +31,42 @@
 
 #include "bus_spi.h"
 
+#ifndef SPI1_SCK_PIN
+#define SPI1_SCK_PIN    NONE
+#define SPI1_SDI_PIN    NONE
+#define SPI1_SDO_PIN    NONE
+#endif
+
+#ifndef SPI2_SCK_PIN
+#define SPI2_SCK_PIN    NONE
+#define SPI2_SDI_PIN    NONE
+#define SPI2_SDO_PIN    NONE
+#endif
+
+#ifndef SPI3_SCK_PIN
+#define SPI3_SCK_PIN    NONE
+#define SPI3_SDI_PIN    NONE
+#define SPI3_SDO_PIN    NONE
+#endif
+
+#ifndef SPI4_SCK_PIN
+#define SPI4_SCK_PIN    NONE
+#define SPI4_SDI_PIN    NONE
+#define SPI4_SDO_PIN    NONE
+#endif
+
+#ifndef SPI5_SCK_PIN
+#define SPI5_SCK_PIN    NONE
+#define SPI5_SDI_PIN    NONE
+#define SPI5_SDO_PIN    NONE
+#endif
+
+#ifndef SPI6_SCK_PIN
+#define SPI6_SCK_PIN    NONE
+#define SPI6_SDI_PIN    NONE
+#define SPI6_SDO_PIN    NONE
+#endif
+
 typedef struct spiDefaultConfig_s {
     SPIDevice device;
     ioTag_t sck;
diff --git a/src/main/pg/flash.c b/src/main/pg/flash.c
index e28b570744..8cc6c3b558 100644
--- a/src/main/pg/flash.c
+++ b/src/main/pg/flash.c
@@ -39,6 +39,14 @@
 #define FLASH_CS_PIN NONE
 #endif
 
+#ifndef FLASH_SPI_INSTANCE
+#define FLASH_SPI_INSTANCE NULL
+#endif
+
+#ifndef FLASH_QUADSPI_INSTANCE
+#define FLASH_QUADSPI_INSTANCE NULL
+#endif
+
 PG_REGISTER_WITH_RESET_FN(flashConfig_t, flashConfig, PG_FLASH_CONFIG, 0);
 
 void pgResetFn_flashConfig(flashConfig_t *flashConfig)
diff --git a/src/main/target/common_defaults_post.h b/src/main/target/common_defaults_post.h
index fb56828839..8758d1e371 100644
--- a/src/main/target/common_defaults_post.h
+++ b/src/main/target/common_defaults_post.h
@@ -24,30 +24,6 @@
 #define DEBUG_MODE DEBUG_NONE
 #endif
 
-// pg/flash
-
-#ifdef USE_FLASH_M25P16
-#ifndef FLASH_CS_PIN
-#define FLASH_CS_PIN                    NONE
-#endif
-
-#ifndef FLASH_SPI_INSTANCE
-#define FLASH_SPI_INSTANCE              NULL
-#endif
-#endif
-
-// pg/flash
-
-#ifdef USE_FLASH_M25P16
-#ifndef FLASH_CS_PIN
-#define FLASH_CS_PIN                    NONE
-#endif
-
-#ifndef FLASH_SPI_INSTANCE
-#define FLASH_SPI_INSTANCE              NULL
-#endif
-#endif
-
 #ifndef I2C1_CLOCKSPEED
 #define I2C1_CLOCKSPEED 800
 #endif