diff --git a/Makefile b/Makefile
index 8b21dd817e..225b9893ab 100644
--- a/Makefile
+++ b/Makefile
@@ -473,6 +473,17 @@ targets:
 test junittest:
 	$(V0) cd src/test && $(MAKE) $@
 
+
+check-target-independence:
+	$(V1)for test_target in $(VALID_TARGETS); do \
+		FOUND=$$(grep -rP "\W$${test_target}\W" src/main/ | grep -vP "(\/\/)|(\/\*).*\W$${test_target}\W" | grep -vP "^src/main/target"); \
+		if [ "$${FOUND}" != "" ]; then \
+			echo "Target dependencies found:"; \
+			echo "$${FOUND}"; \
+			exit 1; \
+		fi; \
+	done
+
 # rebuild everything when makefile changes
 $(TARGET_OBJS) : Makefile
 
diff --git a/src/main/drivers/adc.h b/src/main/drivers/adc.h
index df74581eff..befbd244e1 100644
--- a/src/main/drivers/adc.h
+++ b/src/main/drivers/adc.h
@@ -91,6 +91,6 @@ uint16_t adcInternalReadVrefint(void);
 uint16_t adcInternalReadTempsensor(void);
 #endif
 
-#ifndef SITL
+#if !defined(SIMULATOR_BUILD)
 ADCDevice adcDeviceByInstance(ADC_TypeDef *instance);
 #endif
diff --git a/src/main/drivers/system_stm32f10x.c b/src/main/drivers/system_stm32f10x.c
index 22d278cbc2..2b52cd33ad 100644
--- a/src/main/drivers/system_stm32f10x.c
+++ b/src/main/drivers/system_stm32f10x.c
@@ -74,7 +74,7 @@ void systemInit(void)
 
     SetSysClock(false);
 
-#ifdef CC3D
+#if defined(OPBL)
     /* Accounts for OP Bootloader, set the Vector Table base address as specified in .ld file */
     extern void *isr_vector_table_base;
 
diff --git a/src/main/drivers/timer.c b/src/main/drivers/timer.c
index 091dcac99a..8ac2adb220 100644
--- a/src/main/drivers/timer.c
+++ b/src/main/drivers/timer.c
@@ -774,7 +774,7 @@ void timerInit(void)
 {
     memset(timerConfig, 0, sizeof (timerConfig));
 
-#ifdef CC3D
+#if defined(PARTIAL_REMAP_TIM3)
     GPIO_PinRemapConfig(GPIO_PartialRemap_TIM3, ENABLE);
 #endif
 
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index dcce15e03c..59a924ea9f 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -437,7 +437,7 @@ void init(void)
     beeperInit(beeperDevConfig());
 #endif
 /* temp until PGs are implemented. */
-#if defined(USE_INVERTER) && !defined(SITL)
+#if defined(USE_INVERTER) && !defined(SIMULATOR_BUILD)
     initInverters(serialPinConfig());
 #endif
 
@@ -782,10 +782,6 @@ void init(void)
     }
 #endif
 
-#ifdef CJMCU
-    LED2_ON;
-#endif
-
 #ifdef USE_RCDEVICE
     rcdeviceInit();
 #endif // USE_RCDEVICE
diff --git a/src/main/fc/fc_rc.c b/src/main/fc/fc_rc.c
index eb20e99a22..fb18850485 100644
--- a/src/main/fc/fc_rc.c
+++ b/src/main/fc/fc_rc.c
@@ -238,12 +238,12 @@ FAST_CODE NOINLINE void processRcCommand(void)
 
     if (isRXDataNew || updatedChannel) {
         const uint8_t maxUpdatedAxis = isRXDataNew ? FD_YAW : MIN(updatedChannel, FD_YAW); // throttle channel doesn't require rate calculation
-#if defined(SITL)
+#if defined(SIMULATOR_BUILD)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
 #endif
         for (int axis = FD_ROLL; axis <= maxUpdatedAxis; axis++) {
-#if defined(SITL)
+#if defined(SIMULATOR_BUILD)
 #pragma GCC diagnostic pop
 #endif
             calculateSetpointRate(axis);
diff --git a/src/main/io/serial.c b/src/main/io/serial.c
index 8aba7aa9da..f0612f783c 100644
--- a/src/main/io/serial.c
+++ b/src/main/io/serial.c
@@ -41,7 +41,7 @@
 #include "drivers/serial_softserial.h"
 #endif
 
-#ifdef SITL
+#if defined(SIMULATOR_BUILD)
 #include "drivers/serial_tcp.h"
 #endif
 
@@ -377,8 +377,8 @@ serialPort_t *openSerialPort(
 #ifdef USE_UART8
         case SERIAL_PORT_USART8:
 #endif
-#ifdef SITL
-            // SITL emulates serial ports over TCP
+#if defined(SIMULATOR_BUILD)
+            // emulate serial ports over TCP
             serialPort = serTcpOpen(SERIAL_PORT_IDENTIFIER_TO_UARTDEV(identifier), rxCallback, rxCallbackData, baudRate, mode, options);
 #else
             serialPort = uartOpen(SERIAL_PORT_IDENTIFIER_TO_UARTDEV(identifier), rxCallback, rxCallbackData, baudRate, mode, options);
@@ -446,7 +446,7 @@ void serialInit(bool softserialEnabled, serialPortIdentifier_e serialPortToDisab
             }
         }
 
-#ifndef SITL
+#if !defined(SIMULATOR_BUILD)
         else if (serialPortUsageList[index].identifier <= SERIAL_PORT_USART8) {
             int resourceIndex = SERIAL_PORT_IDENTIFIER_TO_INDEX(serialPortUsageList[index].identifier);
             if (!(serialPinConfig()->ioTagTx[resourceIndex] || serialPinConfig()->ioTagRx[resourceIndex])) {
diff --git a/src/main/osd_slave/osd_slave_init.c b/src/main/osd_slave/osd_slave_init.c
index a448f4d293..7c72d46094 100644
--- a/src/main/osd_slave/osd_slave_init.c
+++ b/src/main/osd_slave/osd_slave_init.c
@@ -185,7 +185,7 @@ void init(void)
     busSwitchInit();
 #endif
 
-#if defined(USE_UART) && !defined(SITL)
+#if defined(USE_UART) && !defined(SIMULATOR_BUILD)
     uartPinConfigure(serialPinConfig());
 #endif
 
diff --git a/src/main/platform.h b/src/main/platform.h
index 472df98cde..000d0b9bcf 100644
--- a/src/main/platform.h
+++ b/src/main/platform.h
@@ -22,7 +22,7 @@
 
 #define NOINLINE __attribute__((noinline))
 
-#if !defined(UNIT_TEST) && !defined(SITL) && !(USBD_DEBUG_LEVEL > 0)
+#if !defined(UNIT_TEST) && !defined(SIMULATOR_BUILD) && !(USBD_DEBUG_LEVEL > 0)
 #pragma GCC poison sprintf snprintf
 #endif
 
@@ -98,7 +98,7 @@
 #define STM32F1
 #endif
 
-#elif defined(SITL)
+#elif defined(SIMULATOR_BUILD)
 
 // Nop
 
diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c
index b39bf04191..2aaa4ff8af 100644
--- a/src/main/sensors/compass.c
+++ b/src/main/sensors/compass.c
@@ -115,8 +115,7 @@ void pgResetFn_compassConfig(compassConfig_t *compassConfig)
 static int16_t magADCRaw[XYZ_AXIS_COUNT];
 static uint8_t magInit = 0;
 
-#if !defined(SITL)
-
+#if !defined(SIMULATOR_BUILD)
 bool compassDetect(magDev_t *dev)
 {
     magSensor_e magHardware = MAG_NONE;
@@ -257,7 +256,7 @@ bool compassDetect(magDev_t *dev)
 
     return false;
 }
-#endif // !SITL
+#endif // !SIMULATOR_BUILD
 
 bool compassInit(void)
 {
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index e958cce0ef..e47eeee045 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -131,5 +131,7 @@
 #define TARGET_IO_PORTB         0xffff
 #define TARGET_IO_PORTC         ( BIT(14) )
 
+#define PARTIAL_REMAP_TIM3
+
 #define USABLE_TIMER_CHANNEL_COUNT 12
 #define USED_TIMERS             ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) )