diff --git a/furi/core/common_defines.h b/furi/core/common_defines.h
index 5bd218d35..2b30c3b06 100644
--- a/furi/core/common_defines.h
+++ b/furi/core/common_defines.h
@@ -2,8 +2,6 @@
 
 #include "core_defines.h"
 #include <stdbool.h>
-#include <FreeRTOS.h>
-#include <task.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/furi/furi.h b/furi/furi.h
index b1299c9a9..422509055 100644
--- a/furi/furi.h
+++ b/furi/furi.h
@@ -21,9 +21,6 @@
 
 #include <furi_hal_gpio.h>
 
-// FreeRTOS timer, REMOVE AFTER REFACTORING
-#include <timers.h>
-
 // Workaround for math.h leaking through HAL in older versions
 #include <math.h>
 
diff --git a/targets/f7/src/main.c b/targets/f7/src/main.c
index 2c353f52b..ca705fe5e 100644
--- a/targets/f7/src/main.c
+++ b/targets/f7/src/main.c
@@ -2,7 +2,6 @@
 #include <furi_hal.h>
 #include <flipper.h>
 #include <alt_boot.h>
-#include <semphr.h>
 #include <update_util/update_operation.h>
 
 #define TAG "Main"