diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h
index 206db77a88..a09735cc14 100644
--- a/src/main/target/common_post.h
+++ b/src/main/target/common_post.h
@@ -281,8 +281,10 @@
 #endif
 
 #if defined(USE_SERIALRX_SBUS) || defined(USE_SERIALRX_FPORT)
+#if !defined(USE_SBUS_CHANNELS)
 #define USE_SBUS_CHANNELS
 #endif
+#endif
 
 #if !defined(USE_TELEMETRY_SMARTPORT) && !defined(USE_TELEMETRY_CRSF) && !defined(USE_TELEMETRY_GHST)
 #undef USE_MSP_OVER_TELEMETRY
@@ -312,37 +314,55 @@
 #endif
 
 #ifdef USE_FLASH
+#if !defined(USE_FLASH_TOOLS)
 #define USE_FLASH_TOOLS
+#endif
+#if !defined(USE_FLASHFS)
 #define USE_FLASHFS
 #endif
+#endif
 
 #if (defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25Q128FV)) && !defined(USE_FLASH_M25P16)
+#if !defined(USE_FLASH_M25P16)
 #define USE_FLASH_M25P16
 #endif
+#endif
 
 #if defined(USE_FLASH_W25M02G) && !defined(USE_FLASH_W25N01G)
+#if !defined(USE_FLASH_W25N01G)
 #define USE_FLASH_W25N01G
 #endif
+#endif
 
 #if (defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25N01G)) && !defined(USE_FLASH_W25M)
+#if !defined(USE_FLASH_W25M)
 #define USE_FLASH_W25M
 #endif
+#endif
 
 #if defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25M) || defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25Q128FV)
+#if !defined(USE_FLASH_CHIP)
 #define USE_FLASH_CHIP
 #endif
+#endif
 
 #if defined(USE_SPI) && (defined(USE_FLASH_M25P16) || defined(USE_FLASH_W25M512) || defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25M02G))
+#if !defined(USE_FLASH_SPI)
 #define USE_FLASH_SPI
 #endif
+#endif
 
 #if defined(USE_QUADSPI) && (defined(USE_FLASH_W25Q128FV) || defined(USE_FLASH_W25N01G))
+#if !defined(USE_FLASH_QUADSPI)
 #define USE_FLASH_QUADSPI
 #endif
+#endif
 
-#if defined(USE_OCTOSPI) && (defined(USE_FLASH_W25Q128FV))
+#if defined(USE_OCTOSPI) && defined(USE_FLASH_W25Q128FV)
+#if !defined(USE_FLASH_OCTOSPI)
 #define USE_FLASH_OCTOSPI
 #endif
+#endif
 
 #ifndef USE_FLASH_CHIP
 #undef USE_FLASH_TOOLS