diff --git a/src/main/drivers/bus_i2c_config.c b/src/main/drivers/bus_i2c_config.c
index 0119c11b7c..207c60cdb0 100644
--- a/src/main/drivers/bus_i2c_config.c
+++ b/src/main/drivers/bus_i2c_config.c
@@ -39,23 +39,6 @@
 
 #include "pg/bus_i2c.h"
 
-// Backward compatibility for overclocking and internal pullup.
-// These will eventually be configurable through PG-based configurator
-// (and/or probably through some cli extension).
-
-#ifndef I2C1_OVERCLOCK
-#define I2C1_OVERCLOCK false
-#endif
-#ifndef I2C2_OVERCLOCK
-#define I2C2_OVERCLOCK false
-#endif
-#ifndef I2C3_OVERCLOCK
-#define I2C3_OVERCLOCK false
-#endif
-#ifndef I2C4_OVERCLOCK
-#define I2C4_OVERCLOCK false
-#endif
-
 void i2cHardwareConfigure(const i2cConfig_t *i2cConfig)
 {
     for (int index = 0 ; index < I2CDEV_COUNT ; index++) {
diff --git a/src/main/target/common_defaults_post.h b/src/main/target/common_defaults_post.h
index 66d2314d42..4710cae721 100644
--- a/src/main/target/common_defaults_post.h
+++ b/src/main/target/common_defaults_post.h
@@ -177,6 +177,19 @@
 
 #endif // I2C_FULL_RECONFIGURABILITY
 
+#ifndef I2C1_OVERCLOCK
+#define I2C1_OVERCLOCK false
+#endif
+#ifndef I2C2_OVERCLOCK
+#define I2C2_OVERCLOCK false
+#endif
+#ifndef I2C3_OVERCLOCK
+#define I2C3_OVERCLOCK false
+#endif
+#ifndef I2C4_OVERCLOCK
+#define I2C4_OVERCLOCK false
+#endif
+
 // Default values for internal pullup
 
 #if defined(USE_I2C_PULLUP)