diff --git a/src/measurement.c b/src/measurement.c
index e91b303..7d5354c 100644
--- a/src/measurement.c
+++ b/src/measurement.c
@@ -7,7 +7,6 @@
 #include "pinout.h"
 
 #include "measurement.h"
-#include "calibration.h"
 #include "flash_config.h"
 
 #define ADC_NUM_CHANNELS 6
@@ -94,15 +93,15 @@ void measurement_init(void)
 
 	// Convert calibration factors to fixed-point numbers for direct use
 	calibration_factors[ANALOG_INPUT_U_BAT] =
-		fxp_div(FXP_FROM_INT(CAL_FACTOR_U_BAT), FXP_FROM_INT(1000));
+		fxp_div(FXP_FROM_INT(FLASH_CONFIG_CAL_FACTOR_U_BAT), FXP_FROM_INT(1000));
 	calibration_factors[ANALOG_INPUT_U_SOLAR] =
-		fxp_div(FXP_FROM_INT(CAL_FACTOR_U_SOLAR), FXP_FROM_INT(1000));
+		fxp_div(FXP_FROM_INT(FLASH_CONFIG_CAL_FACTOR_U_SOLAR), FXP_FROM_INT(1000));
 	calibration_factors[ANALOG_INPUT_U_SW] =
-		fxp_div(FXP_FROM_INT(CAL_FACTOR_U_SW), FXP_FROM_INT(1000));
+		fxp_div(FXP_FROM_INT(FLASH_CONFIG_CAL_FACTOR_U_SW), FXP_FROM_INT(1000));
 	calibration_factors[ANALOG_INPUT_I_SOLAR] =
-		fxp_div(FXP_FROM_INT(CAL_FACTOR_I_SOLAR), FXP_FROM_INT(1000));
+		fxp_div(FXP_FROM_INT(FLASH_CONFIG_CAL_FACTOR_I_SOLAR), FXP_FROM_INT(1000));
 	calibration_factors[ANALOG_INPUT_I_LOAD] =
-		fxp_div(FXP_FROM_INT(CAL_FACTOR_I_LOAD), FXP_FROM_INT(1000));
+		fxp_div(FXP_FROM_INT(FLASH_CONFIG_CAL_FACTOR_I_LOAD), FXP_FROM_INT(1000));
 
 	// Convert and precalculate coefficients for exponential averaging
 	avg_alpha_i_solar = fxp_div(FXP_FROM_INT(FLASH_CONFIG_AVG_ALPHA_I_SOLAR), FXP_FROM_INT(1000));