diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index e440261f1f..271f7fbfd8 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -68,6 +68,7 @@ void Engine::updateSlowSensors(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 
 	engineState.updateSlowSensors(PASS_ENGINE_PARAMETER_SIGNATURE);
 
+	// todo: move this logic somewhere to sensors folder?
 	if (engineConfiguration->fuelLevelSensor != EFI_ADC_NONE) {
 		float fuelLevelVoltage = getVoltageDivided("fuel", engineConfiguration->fuelLevelSensor);
 		sensors.fuelTankGauge = interpolate(boardConfiguration->fuelLevelEmptyTankVoltage, 0,
diff --git a/firmware/controllers/core/fsio_core.cpp b/firmware/controllers/core/fsio_core.cpp
index acf86b6d8a..c2eebcb29f 100644
--- a/firmware/controllers/core/fsio_core.cpp
+++ b/firmware/controllers/core/fsio_core.cpp
@@ -19,7 +19,7 @@
 
 #include "fsio_core.h"
 #include "fsio_impl.h"
-#include "adc_inputs.h"
+#include "analog_input.h"
 
 extern fsio8_Map3D_f32t fsioTable1;
 extern fsio8_Map3D_u8t fsioTable2;
diff --git a/firmware/controllers/sensors/allsensors.h b/firmware/controllers/sensors/allsensors.h
index e5a40a8496..44afc3e74b 100644
--- a/firmware/controllers/sensors/allsensors.h
+++ b/firmware/controllers/sensors/allsensors.h
@@ -22,9 +22,7 @@
 #include "oil_pressure.h"
 #include "adc_inputs.h"
 
-#if EFI_PROD_CODE || EFI_SIMULATOR
-#include "adc_inputs.h"
-#endif
+#include "analog_input.h"
 
 void initSensors(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX);
 
diff --git a/firmware/controllers/sensors/analog_input.h b/firmware/controllers/sensors/analog_input.h
new file mode 100644
index 0000000000..35b4575402
--- /dev/null
+++ b/firmware/controllers/sensors/analog_input.h
@@ -0,0 +1,20 @@
+/*
+ * analog_input.h
+ *
+ * @date Nov 24, 2017
+ * @author Andrey Belomutskiy, (c) 2012-2017
+ */
+
+#ifndef CONTROLLERS_SENSORS_ANALOG_INPUT_H_
+#define CONTROLLERS_SENSORS_ANALOG_INPUT_H_
+
+#if EFI_PROD_CODE
+#include "adc_inputs.h"
+#endif
+
+#if EFI_SIMULATOR
+#include "adc_math.h"
+#endif
+
+
+#endif /* CONTROLLERS_SENSORS_ANALOG_INPUT_H_ */
diff --git a/firmware/controllers/sensors/ego.cpp b/firmware/controllers/sensors/ego.cpp
index 7a8caf6fe8..b0b0c87c1c 100644
--- a/firmware/controllers/sensors/ego.cpp
+++ b/firmware/controllers/sensors/ego.cpp
@@ -10,8 +10,8 @@
  */
 #include "ego.h"
 #include "interpolation.h"
-#include "adc_inputs.h"
 #include "engine.h"
+#include "analog_input.h"
 
 EXTERN_ENGINE;
 
diff --git a/firmware/controllers/sensors/maf.cpp b/firmware/controllers/sensors/maf.cpp
index 7eb249e3e7..8c4c775806 100644
--- a/firmware/controllers/sensors/maf.cpp
+++ b/firmware/controllers/sensors/maf.cpp
@@ -1,6 +1,6 @@
 #include "main.h"
 #include "engine.h"
-#include "adc_inputs.h"
+#include "analog_input.h"
 #include "maf.h"
 
 EXTERN_ENGINE
diff --git a/firmware/controllers/sensors/map.cpp b/firmware/controllers/sensors/map.cpp
index 6ce1f4ba11..c7228cf50c 100644
--- a/firmware/controllers/sensors/map.cpp
+++ b/firmware/controllers/sensors/map.cpp
@@ -7,7 +7,7 @@
 #include "main.h"
 #include "engine_configuration.h"
 #include "engine_math.h"
-#include "adc_inputs.h"
+#include "analog_input.h"
 #include "interpolation.h"
 #include "error_handling.h"
 #include "map.h"
diff --git a/firmware/controllers/sensors/oil_pressure.cpp b/firmware/controllers/sensors/oil_pressure.cpp
index c1f2e9b2a0..08dec51f1f 100644
--- a/firmware/controllers/sensors/oil_pressure.cpp
+++ b/firmware/controllers/sensors/oil_pressure.cpp
@@ -1,9 +1,10 @@
 /**
  *  @author Matthew Kennedy, (c) 2017
  */
+#include "main.h"
 #include "oil_pressure.h"
 #include "interpolation.h"
-#include "adc_inputs.h"
+#include "analog_input.h"
 #include "engine.h"
 
 EXTERN_ENGINE;
@@ -23,4 +24,4 @@ float getOilPressure(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
     float volts = getVoltageDivided("oilp", sensor->hwChannel);
 
     return interpolate(sensor->v1, sensor->value1, sensor->v2, sensor->value2, volts);
-}
\ No newline at end of file
+}
diff --git a/firmware/controllers/sensors/thermistors.cpp b/firmware/controllers/sensors/thermistors.cpp
index 6c2052a4e7..bd33e62c35 100644
--- a/firmware/controllers/sensors/thermistors.cpp
+++ b/firmware/controllers/sensors/thermistors.cpp
@@ -12,7 +12,7 @@
 
 #include "main.h"
 #include "thermistors.h"
-#include "adc_inputs.h"
+#include "analog_input.h"
 #include "engine_configuration.h"
 #include "engine_math.h"
 
diff --git a/firmware/controllers/sensors/tps.cpp b/firmware/controllers/sensors/tps.cpp
index 44dce87e46..cc152e69de 100644
--- a/firmware/controllers/sensors/tps.cpp
+++ b/firmware/controllers/sensors/tps.cpp
@@ -1,12 +1,10 @@
 /**
  * @author Andrey Belomutskiy, (c) 2012-2017
  */
-#include "main.h"
+#include "engine.h"
 #include "tps.h"
-#include "engine_configuration.h"
 #include "interpolation.h"
-#include "adc_inputs.h"
-#include "allsensors.h"
+#include "analog_input.h"
 
 	EXTERN_ENGINE;
 
diff --git a/firmware/controllers/sensors/voltage.cpp b/firmware/controllers/sensors/voltage.cpp
index 700e10bc58..e6ed4dd7ec 100644
--- a/firmware/controllers/sensors/voltage.cpp
+++ b/firmware/controllers/sensors/voltage.cpp
@@ -9,7 +9,7 @@
 
 #include "main.h"
 #include "engine.h"
-#include "adc_inputs.h"
+#include "analog_input.h"
 #include "voltage.h"
 
 EXTERN_ENGINE;
diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index 6d37124442..ad1279b858 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -24,6 +24,7 @@
 #include "engine_math.h"
 #include "alternatorController.h"
 #include "idle_thread.h"
+#include "allsensors.h"
 
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
 #include "vehicle_speed.h"
diff --git a/firmware/hw_layer/algo/adc_math.h b/firmware/hw_layer/algo/adc_math.h
index a4abd27d1e..0af7edf09e 100644
--- a/firmware/hw_layer/algo/adc_math.h
+++ b/firmware/hw_layer/algo/adc_math.h
@@ -1,7 +1,8 @@
 /**
  * @file	adc_math.h
  *
- * todo: all this looks to be about internal ADC, merge this file with
+ * todo: all this looks to be about internal ADC, merge this file with adc_inputs.h?
+ * these macro are also used in simulator so maybe not really merging with adc_inputs.h until simulator get's it's own implementation?
  *
  * @date Mar 18, 2014
  * @author Andrey Belomutskiy, (c) 2012-2017