diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index d9aaf135ae..554c87f7db 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -101,13 +101,13 @@
 //#define SONAR_ECHO_PIN          PB0
 //#define SONAR_TRIGGER_PIN       PB5
 
-#undef MAG
+#undef USE_MAG
 
 #ifdef CC3D_OPBL
 #define SKIP_CLI_COMMAND_HELP
 //#undef USE_SERVOS
-#undef BARO
-#undef SONAR
+#undef USE_BARO
+#undef USE_SONAR
 #undef USE_SERIAL_4WAY_BLHELI_INTERFACE
 //#undef USE_SERIALRX_SPEKTRUM   // SRXL, DSM2 and DSMX protocol
 //#undef USE_SERIALRX_SBUS       // Frsky and Futaba receivers
diff --git a/src/main/target/CJMCU/target.h b/src/main/target/CJMCU/target.h
index c28b4396b7..1a77791952 100644
--- a/src/main/target/CJMCU/target.h
+++ b/src/main/target/CJMCU/target.h
@@ -120,10 +120,6 @@
 #define USE_QUAD_MIXER_ONLY
 #undef USE_SERVOS
 
-#if (FLASH_SIZE <= 64)
-#undef BLACKBOX
-#endif
-
 // Number of available PWM outputs
 //#define MAX_PWM_OUTPUT_PORTS    4
 
diff --git a/src/main/target/EACHIF3/target.h b/src/main/target/EACHIF3/target.h
index 043dff7b9d..6547cd7e82 100644
--- a/src/main/target/EACHIF3/target.h
+++ b/src/main/target/EACHIF3/target.h
@@ -95,9 +95,9 @@
 #define VBAT_SCALE_DEFAULT      40
 
 
-#undef GPS
-#undef MAG
-#undef SONAR
+#undef USE_GPS
+#undef USE_MAG
+#undef USE_SONAR
 #undef USE_SERVOS
 #undef BEEPER
 
diff --git a/src/test/unit/flight_imu_unittest.cc b/src/test/unit/flight_imu_unittest.cc
index 0c2d675837..84b66c19a1 100644
--- a/src/test/unit/flight_imu_unittest.cc
+++ b/src/test/unit/flight_imu_unittest.cc
@@ -20,8 +20,6 @@
 #include <limits.h>
 #include <cmath>
 
-#undef BARO
-
 extern "C" {
     #include "build/debug.h"