diff --git a/firmware/controllers/scheduling/pwm_generator_logic.cpp b/firmware/controllers/scheduling/pwm_generator_logic.cpp
index eb4a07187a..571afb4848 100644
--- a/firmware/controllers/scheduling/pwm_generator_logic.cpp
+++ b/firmware/controllers/scheduling/pwm_generator_logic.cpp
@@ -12,7 +12,6 @@
 #include "os_access.h"
 #include "pwm_generator_logic.h"
 #include "pwm_generator.h"
-#include "error_handling.h"
 #include "perf_trace.h"
 
 /**
diff --git a/firmware/hw_layer/ports/kinetis/mpu_util.cpp b/firmware/hw_layer/ports/kinetis/mpu_util.cpp
index 78e351df9b..78475108f3 100644
--- a/firmware/hw_layer/ports/kinetis/mpu_util.cpp
+++ b/firmware/hw_layer/ports/kinetis/mpu_util.cpp
@@ -12,7 +12,6 @@
 
 #include "mpu_util.h"
 #include "flash.h"
-#include "error_handling.h"
 #include "engine.h"
 #include "pin_repository.h"
 #include "os_util.h"
diff --git a/firmware/hw_layer/ports/stm32/stm32f4/mpu_util.cpp b/firmware/hw_layer/ports/stm32/stm32f4/mpu_util.cpp
index 8249294693..3585257993 100644
--- a/firmware/hw_layer/ports/stm32/stm32f4/mpu_util.cpp
+++ b/firmware/hw_layer/ports/stm32/stm32f4/mpu_util.cpp
@@ -11,7 +11,6 @@
 
 #include "mpu_util.h"
 #include "flash.h"
-#include "error_handling.h"
 #include "engine.h"
 #include "pin_repository.h"
 #include "stm32f4xx_hal_flash.h"
diff --git a/firmware/hw_layer/ports/stm32/stm32f7/mpu_util.cpp b/firmware/hw_layer/ports/stm32/stm32f7/mpu_util.cpp
index e2e11c76a3..bce4e43da2 100644
--- a/firmware/hw_layer/ports/stm32/stm32f7/mpu_util.cpp
+++ b/firmware/hw_layer/ports/stm32/stm32f7/mpu_util.cpp
@@ -8,7 +8,6 @@
 #include "global.h"
 #include "mpu_util.h"
 #include "flash.h"
-#include "error_handling.h"
 #include "engine.h"
 #include "pin_repository.h"
 #include "stm32f7xx_hal_flash.h"
diff --git a/firmware/util/containers/fl_stack.h b/firmware/util/containers/fl_stack.h
index 273c0828d1..a85a45fa5f 100644
--- a/firmware/util/containers/fl_stack.h
+++ b/firmware/util/containers/fl_stack.h
@@ -10,7 +10,6 @@
 #define FL_STACK_H_
 
 #include "global.h"
-#include "error_handling.h"
 
 template<typename T, int MAXSIZE>
 class FLStack {