diff --git a/firmware/console/status_loop.cpp b/firmware/console/status_loop.cpp
index d8b2e20dd3..fff1d30dff 100644
--- a/firmware/console/status_loop.cpp
+++ b/firmware/console/status_loop.cpp
@@ -58,6 +58,7 @@
 #include "lcd_controller.h"
 #include "settings.h"
 #include "can_hw.h"
+#include "cdm_ion_sense.h"
 
 extern afr_Map3D_t afrMap;
 extern bool main_loop_started;
@@ -101,6 +102,7 @@ extern int maxTriggerReentraint;
 extern uint32_t maxLockedDuration;
 #define FULL_LOGGING_KEY "fl"
 
+
 static char LOGGING_BUFFER[1800] CCM_OPTIONAL;
 static Logging logger("status loop", LOGGING_BUFFER, sizeof(LOGGING_BUFFER));
 
@@ -666,13 +668,13 @@ extern int invalidHip9011ResponsesCount;
 void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ENGINE_PARAMETER_SUFFIX) {
 #if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
 	int rpm = getRpmE(engine);
-#else
+#else /* EFI_SHAFT_POSITION_INPUT */
 	int rpm = 0;
-#endif
+#endif /* EFI_SHAFT_POSITION_INPUT */
 
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
 	executorStatistics();
-#endif
+#endif /* EFI_PROD_CODE */
 
 	float tps = getTPS(PASS_ENGINE_PARAMETER_SIGNATURE);
 	float coolant = getCoolantTemperature(PASS_ENGINE_PARAMETER_SIGNATURE);
@@ -845,6 +847,9 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
 			tsOutputChannels->debugFloatField2 = instantRpm / GET_RPM();
 		}
 		break;
+	case DBG_ION:
+		//ionPostState(tsOutputChannels);
+		break;
 	default:
 		;
 	}
diff --git a/firmware/hw_layer/HIP9011.h b/firmware/hw_layer/HIP9011.h
index badd509387..705a898b61 100644
--- a/firmware/hw_layer/HIP9011.h
+++ b/firmware/hw_layer/HIP9011.h
@@ -3,7 +3,7 @@
  * @brief	HIP9011/TPIC8101 driver
  *
  * @date Nov 27, 2013
- * @author Andrey Belomutskiy, (c) 2012-2017
+ * @author Andrey Belomutskiy, (c) 2012-2019
  */
 
 #ifndef HIP9011_H_
diff --git a/firmware/hw_layer/board_test.cpp b/firmware/hw_layer/board_test.cpp
index e60bdacb84..cb85bf28b1 100644
--- a/firmware/hw_layer/board_test.cpp
+++ b/firmware/hw_layer/board_test.cpp
@@ -23,7 +23,7 @@
 
 #include "global.h"
 
-#if EFI_PROD_CODE || EFI_SIMULATOR
+#if EFI_PROD_CODE
 #include "engine.h"
 #include "board_test.h"
 #include "pin_repository.h"
@@ -231,4 +231,4 @@ void initBoardTest(void) {
 		chThdSleepSeconds(1);
 	}
 }
-#endif  /* EFI_PROD_CODE || EFI_SIMULATOR */
+#endif  /* EFI_PROD_CODE */
diff --git a/firmware/hw_layer/digital_input_exti.cpp b/firmware/hw_layer/digital_input_exti.cpp
index b7e575f383..ffa0f3e920 100644
--- a/firmware/hw_layer/digital_input_exti.cpp
+++ b/firmware/hw_layer/digital_input_exti.cpp
@@ -5,10 +5,11 @@
  * @author Andrey Belomutskiy, (c) 2012-2018
  */
 
-#include "digital_input_exti.h"
-#include "efiGpio.h"
+#include "global.h"
 
 #if HAL_USE_EXT || defined(__DOXYGEN__)
+#include "digital_input_exti.h"
+#include "efiGpio.h"
 
 /**
  * EXTI is a funny thing: you can only use same pin on one port. For example, you can use
diff --git a/firmware/hw_layer/digital_input_hw.cpp b/firmware/hw_layer/digital_input_hw.cpp
index 23c7282df4..3fc5ccc196 100644
--- a/firmware/hw_layer/digital_input_hw.cpp
+++ b/firmware/hw_layer/digital_input_hw.cpp
@@ -25,11 +25,11 @@
  */
 
 #include "digital_input_hw.h"
-#include "mpu_util.h"
 #include "fl_stack.h"
 
 #if EFI_ICU_INPUTS || defined(__DOXYGEN__)
 
+#include "mpu_util.h"
 #include "eficonsole.h"
 #include "pin_repository.h"
 
diff --git a/firmware/hw_layer/hardware.cpp b/firmware/hw_layer/hardware.cpp
index c756f36982..2e66cdb077 100644
--- a/firmware/hw_layer/hardware.cpp
+++ b/firmware/hw_layer/hardware.cpp
@@ -7,26 +7,27 @@
  */
 
 #include "global.h"
+
+#include "trigger_input.h"
+#include "servo.h"
+
+#if EFI_PROD_CODE
 #include "adc_inputs.h"
 #include "can_hw.h"
-#include "console_io.h"
 #include "hardware.h"
 #include "io_pins.h"
-#include "pin_repository.h"
 #include "rtc_helper.h"
 #include "rfiutil.h"
 #include "injector_central.h"
 #include "vehicle_speed.h"
 #include "yaw_rate_sensor.h"
-
-#include "trigger_input.h"
-#include "eficonsole.h"
+#include "pin_repository.h"
 #include "max31855.h"
-#include "mpu_util.h"
 #include "accelerometer.h"
-#include "servo.h"
+#include "eficonsole.h"
+#include "console_io.h"
 
-#if EFI_PROD_CODE
+#include "mpu_util.h"
 //#include "usb_msd.h"
 
 #include "AdcConfiguration.h"
@@ -45,7 +46,7 @@
 #include "svnversion.h"
 #include "engine_configuration.h"
 #include "aux_pid.h"
-#endif /* EFI_PROD_CODE */
+
 
 #if EFI_SPEED_DENSITY
 #include "map_averaging.h"
@@ -499,3 +500,5 @@ void initHardware(Logging *l) {
 }
 
 #endif /* EFI_PROD_CODE */
+
+#endif  /* EFI_PROD_CODE || EFI_SIMULATOR */
diff --git a/firmware/hw_layer/io_pins.cpp b/firmware/hw_layer/io_pins.cpp
index 1928d04380..81afa82551 100644
--- a/firmware/hw_layer/io_pins.cpp
+++ b/firmware/hw_layer/io_pins.cpp
@@ -7,8 +7,9 @@
  * @author Andrey Belomutskiy, (c) 2012-2018
  */
 
-//#include "board.h"
 #include "global.h"
+
+#if EFI_PROD_CODE
 #include "io_pins.h"
 #include "efiGpio.h"
 
@@ -88,3 +89,4 @@ void efiIcuStart(ICUDriver *icup, const ICUConfig *config) {
 	icuStart(icup, config);
 }
 #endif /* HAL_USE_ICU */
+#endif
diff --git a/firmware/hw_layer/joystick.cpp b/firmware/hw_layer/joystick.cpp
index 3caef1803c..5a01634baa 100644
--- a/firmware/hw_layer/joystick.cpp
+++ b/firmware/hw_layer/joystick.cpp
@@ -17,12 +17,12 @@
  */
 
 #include "engine.h"
+
+#if HAL_USE_EXT || defined(__DOXYGEN__)
 #include "joystick.h"
 #include "pin_repository.h"
 #include "digital_input_exti.h"
 
-#if HAL_USE_EXT || defined(__DOXYGEN__)
-
 EXTERN_ENGINE
 ;
 
diff --git a/firmware/hw_layer/max31855.cpp b/firmware/hw_layer/max31855.cpp
index 6e222181c6..c797788462 100644
--- a/firmware/hw_layer/max31855.cpp
+++ b/firmware/hw_layer/max31855.cpp
@@ -16,9 +16,9 @@
 #include "max31855.h"
 
 #include "hardware.h"
-#include "mpu_util.h"
 
 #if EFI_PROD_CODE
+#include "mpu_util.h"
 #include "settings.h"
 #include "pin_repository.h"
 #endif /* EFI_PROD_CODE */
diff --git a/firmware/hw_layer/pin_repository.cpp b/firmware/hw_layer/pin_repository.cpp
index 4bbf675d56..2d8fe44203 100644
--- a/firmware/hw_layer/pin_repository.cpp
+++ b/firmware/hw_layer/pin_repository.cpp
@@ -10,6 +10,7 @@
  */
 
 #include "global.h"
+#if EFI_PROD_CODE
 #include "pin_repository.h"
 #include "eficonsole.h"
 #include "memstreams.h"
@@ -184,3 +185,4 @@ void unmarkPin(brain_pin_e brainPin) {
 	}
 }
 
+#endif
diff --git a/firmware/hw_layer/stm32f4/mpu_util.cpp b/firmware/hw_layer/stm32f4/mpu_util.cpp
index a6710462a7..818e11e837 100644
--- a/firmware/hw_layer/stm32f4/mpu_util.cpp
+++ b/firmware/hw_layer/stm32f4/mpu_util.cpp
@@ -6,6 +6,9 @@
  */
 
 #include "global.h"
+
+#if EFI_PROD_CODE
+
 #include "mpu_util.h"
 #include "error_handling.h"
 #include "engine.h"
@@ -411,3 +414,5 @@ CANDriver * detectCanDevice(brain_pin_e pinRx, brain_pin_e pinTx) {
 
 #endif /* EFI_CAN_SUPPORT */
 
+#endif /* EFI_PROD_CODE */
+
diff --git a/simulator/Makefile b/simulator/Makefile
index fbc158f13c..9689fae23b 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -141,9 +141,8 @@ CPPSRC = $(UTILSRC_CPP) \
 	$(CONTROLLERS_SRC_CPP) \
 	$(PROJECT_DIR)/development/sensor_chart.cpp \
 	$(PROJECT_DIR)/development/trigger_emulator.cpp \
-	$(PROJECT_DIR)/hw_layer/stepper.cpp \
-		  $(PROJECT_DIR)/hw_layer/HIP9011.cpp \
-		  $(PROJECT_DIR)/hw_layer/sensors/CJ125.cpp \
+	$(HW_LAYER_EMS_CPP) \
+	$(PROJECT_DIR)/hw_layer/sensors/CJ125.cpp \
 	$(TRIGGER_SRC_CPP) \
 	$(TRIGGER_DECODERS_SRC_CPP) \
 	$(SYSTEMSRC_CPP) \
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index 8145e172e8..01e158a2a6 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -67,6 +67,8 @@
 #define EFI_MAX_31855 FALSE
 #define EFI_ELECTRONIC_THROTTLE_BODY FALSE
 #define EFI_AUX_PID FALSE
+#define EFI_ICU_INPUTS FALSE
+#define EFI_UART_GPS FALSE
 #define EFI_HAS_RESET FALSE
 #define EXTREME_TERM_LOGGING FALSE
 #define DEBUG_FUEL FALSE
diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index a9fe0fb5dc..aa8b44ad35 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -120,7 +120,7 @@ CPPSRC = $(UTILSRC_CPP) \
 	$(TEST_SRC_CPP) \
 	$(SYSTEMSRC_CPP) \
 	$(PROJECT_DIR)/controllers/error_handling.cpp \
-		  $(PROJECT_DIR)/hw_layer/HIP9011.cpp \
+	$(HW_LAYER_EMS_CPP) \
 		  $(PROJECT_DIR)/hw_layer/sensors/CJ125.cpp \
 	$(TRIGGER_SRC_CPP) \
 	main.cpp