diff --git a/src/main/config/config_streamer.c b/src/main/config/config_streamer.c
index a22a3cd06..b9d34aa94 100644
--- a/src/main/config/config_streamer.c
+++ b/src/main/config/config_streamer.c
@@ -53,6 +53,7 @@ extern uint8_t __config_end;
 #  define FLASH_PAGE_SIZE                 ((uint32_t)0x8000)
 # elif defined(UNIT_TEST)
 #  define FLASH_PAGE_SIZE                 (0x400)
+// SIMULATOR
 # elif defined(SIMULATOR_BUILD)
 #  define FLASH_PAGE_SIZE                 (0x400)
 # else
@@ -87,9 +88,7 @@ void config_streamer_start(config_streamer_t *c, uintptr_t base, int size)
     FLASH_ClearFlag(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
 #elif defined(STM32F7)
     // NOP
-#elif defined(UNIT_TEST)
-    // NOP
-#elif defined(SIMULATOR_BUILD)
+#elif defined(UNIT_TEST) || defined(SIMULATOR_BUILD)
     // NOP
 #else
 # error "Unsupported CPU"
diff --git a/src/main/drivers/bus_i2c.h b/src/main/drivers/bus_i2c.h
index bbabedcc3..8f2658b26 100644
--- a/src/main/drivers/bus_i2c.h
+++ b/src/main/drivers/bus_i2c.h
@@ -17,12 +17,15 @@
 
 #pragma once
 
+#include "platform.h"
+
+#include "io_types.h"
+#include "rcc_types.h"
+
 #define I2C_SHORT_TIMEOUT            ((uint32_t)0x1000)
 #define I2C_LONG_TIMEOUT             ((uint32_t)(10 * I2C_SHORT_TIMEOUT))
 #define I2C_DEFAULT_TIMEOUT          I2C_SHORT_TIMEOUT
 
-#include "io_types.h"
-#include "rcc_types.h"
 
 #ifndef I2C_DEVICE
 #define I2C_DEVICE I2CINVALID
@@ -40,9 +43,7 @@ typedef enum I2CDevice {
 } I2CDevice;
 
 typedef struct i2cDevice_s {
-#if !defined(SIMULATOR_BUILD)
     I2C_TypeDef *dev;
-#endif
     ioTag_t scl;
     ioTag_t sda;
     rccPeriphTag_t rcc;
diff --git a/src/main/drivers/io.h b/src/main/drivers/io.h
index 0db1245bb..1bd308b12 100644
--- a/src/main/drivers/io.h
+++ b/src/main/drivers/io.h
@@ -79,17 +79,7 @@
 #define IOCFG_IN_FLOATING    IO_CONFIG(GPIO_Mode_IN,  0, 0,             GPIO_PuPd_NOPULL)
 #define IOCFG_IPU_25         IO_CONFIG(GPIO_Mode_IN,  GPIO_Speed_25MHz, 0, GPIO_PuPd_UP)
 
-#elif defined(UNIT_TEST)
-
-# define IOCFG_OUT_PP         0
-# define IOCFG_OUT_OD         0
-# define IOCFG_AF_PP          0
-# define IOCFG_AF_OD          0
-# define IOCFG_IPD            0
-# define IOCFG_IPU            0
-# define IOCFG_IN_FLOATING    0
-
-#elif defined(SIMULATOR_BUILD)
+#elif defined(UNIT_TEST) || defined(SIMULATOR_BUILD)
 
 # define IOCFG_OUT_PP         0
 # define IOCFG_OUT_OD         0
diff --git a/src/main/drivers/timer.h b/src/main/drivers/timer.h
index 69897ad8f..a35c626af 100644
--- a/src/main/drivers/timer.h
+++ b/src/main/drivers/timer.h
@@ -45,12 +45,7 @@ typedef uint16_t timCCR_t;
 typedef uint16_t timCCER_t;
 typedef uint16_t timSR_t;
 typedef uint16_t timCNT_t;
-#elif defined(UNIT_TEST)
-typedef uint32_t timCCR_t;
-typedef uint32_t timCCER_t;
-typedef uint32_t timSR_t;
-typedef uint32_t timCNT_t;
-#elif defined(SIMULATOR_BUILD)
+#elif defined(UNIT_TEST) || defined(SIMULATOR_BUILD)
 typedef uint32_t timCCR_t;
 typedef uint32_t timCCER_t;
 typedef uint32_t timSR_t;
diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c
index 82146dd29..6c0cf3b10 100644
--- a/src/main/fc/fc_core.c
+++ b/src/main/fc/fc_core.c
@@ -603,7 +603,7 @@ void taskMainPidLoop(timeUs_t currentTimeUs)
     static uint8_t pidUpdateCountdown;
 
 #if defined(SIMULATOR_BUILD) && defined(SIMULATOR_GYROPID_SYNC)
-	if(lockMainPID() != 0) return;
+    if(lockMainPID() != 0) return;
 #endif
 
     if (debugMode == DEBUG_CYCLETIME) {
diff --git a/src/main/flight/imu.h b/src/main/flight/imu.h
index 8fcd8136c..25f84b67f 100644
--- a/src/main/flight/imu.h
+++ b/src/main/flight/imu.h
@@ -76,9 +76,9 @@ void imuInit(void);
 #ifdef SIMULATOR_BUILD
 void imuSetAttitudeRPY(float roll, float pitch, float yaw);  // in deg
 void imuSetAttitudeQuat(float w, float x, float y, float z);
-#endif
-#if defined(SIMULATOR_BUILD) && defined(SIMULATOR_IMU_SYNC)
+#if defined(SIMULATOR_IMU_SYNC)
 void imuSetHasNewData(uint32_t dt);
 #endif
+#endif