diff --git a/firmware/hw_layer/accelerometer.cpp b/firmware/hw_layer/accelerometer.cpp
index e51afe4850..ee871a3db4 100644
--- a/firmware/hw_layer/accelerometer.cpp
+++ b/firmware/hw_layer/accelerometer.cpp
@@ -18,11 +18,11 @@
 
 #include "accelerometer.h"
 #include "hardware.h"
-#include "mpu_util.h"
 
 EXTERN_ENGINE;
 
 #if EFI_MEMS || defined(__DOXYGEN__)
+#include "mpu_util.h"
 #include "lis302dl.h"
 
 static SPIDriver *driver;
diff --git a/firmware/hw_layer/board_test.cpp b/firmware/hw_layer/board_test.cpp
index f8ed14bcd1..e60bdacb84 100644
--- a/firmware/hw_layer/board_test.cpp
+++ b/firmware/hw_layer/board_test.cpp
@@ -21,8 +21,10 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "engine.h"
 #include "global.h"
+
+#if EFI_PROD_CODE || EFI_SIMULATOR
+#include "engine.h"
 #include "board_test.h"
 #include "pin_repository.h"
 #include "efiGpio.h"
@@ -229,3 +231,4 @@ void initBoardTest(void) {
 		chThdSleepSeconds(1);
 	}
 }
+#endif  /* EFI_PROD_CODE || EFI_SIMULATOR */
diff --git a/firmware/hw_layer/can_hw.h b/firmware/hw_layer/can_hw.h
index 9424502b12..5943a86186 100644
--- a/firmware/hw_layer/can_hw.h
+++ b/firmware/hw_layer/can_hw.h
@@ -8,7 +8,10 @@
 #ifndef CAN_HW_H_
 #define CAN_HW_H_
 
+#include "efifeatures.h"
+#if EFI_TUNER_STUDIO
 #include "tunerstudio_configuration.h"
+#endif /* EFI_TUNER_STUDIO */
 
 // CAN Bus ID for broadcast
 /**
@@ -33,13 +36,16 @@
 #define CAN_VAG_CLT 0x289
 
 void initCan(void);
-void stopCanPins(DECLARE_ENGINE_PARAMETER_SIGNATURE);
-void startCanPins(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 void commonTxInit(int eid);
 void sendCanMessage();
 void setCanType(int type);
 void setTxBit(int offset, int index);
+
+#if EFI_CAN_SUPPORT || defined(__DOXYGEN__)
+void stopCanPins(DECLARE_ENGINE_PARAMETER_SIGNATURE);
+void startCanPins(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 void enableFrankensoCan(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 void postCanState(TunerStudioOutputChannels *tsOutputChannels);
+#endif
 
 #endif /* CAN_HW_H_ */
diff --git a/firmware/hw_layer/cdm_ion_sense.cpp b/firmware/hw_layer/cdm_ion_sense.cpp
index db7da39426..7ae942aced 100644
--- a/firmware/hw_layer/cdm_ion_sense.cpp
+++ b/firmware/hw_layer/cdm_ion_sense.cpp
@@ -9,8 +9,10 @@
 
 #include "cdm_ion_sense.h"
 
+#if EFI_TUNER_STUDIO
 void ionPostState(TunerStudioOutputChannels *tsOutputChannels) {
 
 }
+#endif
 
 
diff --git a/firmware/hw_layer/cdm_ion_sense.h b/firmware/hw_layer/cdm_ion_sense.h
index d968647040..fd62fcbf49 100644
--- a/firmware/hw_layer/cdm_ion_sense.h
+++ b/firmware/hw_layer/cdm_ion_sense.h
@@ -9,8 +9,10 @@
 #define HW_LAYER_CDM_ION_SENSE_H_
 
 #include "global.h"
-#include "tunerstudio_configuration.h"
 
+#if EFI_TUNER_STUDIO
+#include "tunerstudio_configuration.h"
 void ionPostState(TunerStudioOutputChannels *tsOutputChannels);
+#endif
 
 #endif /* HW_LAYER_CDM_ION_SENSE_H_ */
diff --git a/firmware/hw_layer/pwm_generator.cpp b/firmware/hw_layer/pwm_generator.cpp
index e15eb02c76..dfe98ec30e 100644
--- a/firmware/hw_layer/pwm_generator.cpp
+++ b/firmware/hw_layer/pwm_generator.cpp
@@ -12,12 +12,14 @@
  *
  */
 
-#include "pwm_generator.h"
+#include "global.h"
 
+#if EFI_PROD_CODE || EFI_SIMULATOR
+#include "pwm_generator.h"
 #include "pin_repository.h"
 #include "datalogging.h"
 
-
 void initPwmGenerator(void) {
 }
 
+#endif
diff --git a/firmware/hw_layer/servo.cpp b/firmware/hw_layer/servo.cpp
index f1b62d33c7..c7d324a0dc 100644
--- a/firmware/hw_layer/servo.cpp
+++ b/firmware/hw_layer/servo.cpp
@@ -12,9 +12,12 @@
  * @author Andrey Belomutskiy, (c) 2012-2018
  */
 
+#include "engine.h"
+
+// todo: EFI_SERVO macro
+#if EFI_PROD_CODE || EFI_SIMULATOR
 #include "servo.h"
 #include "pin_repository.h"
-#include "engine.h"
 
 // todo: remove this hack once we have next incompatible configuration change
 #define TEMP_FOR_COMPATIBILITY GPIOA_0
@@ -81,5 +84,5 @@ void initServo(void) {
 
 	chThdCreateStatic(seThreadStack, sizeof(seThreadStack), NORMALPRIO, (tfunc_t)(void*) seThread, NULL);
 }
-
+#endif
 
diff --git a/firmware/hw_layer/stepper.cpp b/firmware/hw_layer/stepper.cpp
index f04a969fc4..5ba0b2bf95 100644
--- a/firmware/hw_layer/stepper.cpp
+++ b/firmware/hw_layer/stepper.cpp
@@ -7,9 +7,12 @@
  * @author Andrey Belomutskiy, (c) 2012-2018
  */
 
+#include "engine.h"
+
+// todo: EFI_STEPPER macro
+#if EFI_PROD_CODE || EFI_SIMULATOR
 #include "stepper.h"
 #include "pin_repository.h"
-#include "engine.h"
 #include "tps.h"
 #include "engine_controller.h"
 #include "adc_inputs.h"
@@ -181,3 +184,4 @@ void StepperMotor::initialize(brain_pin_e stepPin, brain_pin_e directionPin, pin
 	chThdCreateStatic(stThreadStack, sizeof(stThreadStack), NORMALPRIO, (tfunc_t)(void*) stThread, this);
 }
 
+#endif
diff --git a/firmware/hw_layer/trigger_input.cpp b/firmware/hw_layer/trigger_input.cpp
index ed6362fa0b..7959c84680 100644
--- a/firmware/hw_layer/trigger_input.cpp
+++ b/firmware/hw_layer/trigger_input.cpp
@@ -14,7 +14,7 @@
 
 #include "global.h"
 
-#if EFI_SHAFT_POSITION_INPUT || defined(__DOXYGEN__)
+#if (EFI_SHAFT_POSITION_INPUT && EFI_PROD_CODE) || defined(__DOXYGEN__)
 
 #include "trigger_input.h"
 #include "digital_input_hw.h"
@@ -193,4 +193,4 @@ void applyNewTriggerInputPins(void) {
 	rememberPrimaryChannel();
 }
 
-#endif /* EFI_SHAFT_POSITION_INPUT */
+#endif /* EFI_SHAFT_POSITION_INPUT && EFI_PROD_CODE */
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index d67a55df27..8145e172e8 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -64,6 +64,7 @@
 #define EFI_HIP_9011 TRUE
 #define EFI_CJ125 TRUE
 #define EFI_CAN_SUPPORT FALSE
+#define EFI_MAX_31855 FALSE
 #define EFI_ELECTRONIC_THROTTLE_BODY FALSE
 #define EFI_AUX_PID FALSE
 #define EFI_HAS_RESET FALSE