diff --git a/mh_z19_uart.c b/mh_z19_uart.c
index 81825e9..4c6ad17 100644
--- a/mh_z19_uart.c
+++ b/mh_z19_uart.c
@@ -1,7 +1,7 @@
 #include "mh_z19_uart.h"
-#include <furi_hal_uart.h>
 #include <furi_hal_console.h>
 
+#include "mh_z19_app_i.h"
 #include "mh_z19_uart_tools.h"
 
 void mh_z19_app_uart_init(MhZ19App* app) {
diff --git a/mh_z19_uart.h b/mh_z19_uart.h
index 4eaed96..7a9da5a 100644
--- a/mh_z19_uart.h
+++ b/mh_z19_uart.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "mh_z19_app_i.h"
+#include <furi_hal_uart.h>
+#include "mh_z19_app.h"
 
 void mh_z19_app_uart_callback(UartIrqEvent event, uint8_t data, void* context);
 int32_t mh_z19_app_uart_listener_worker(void* context);
diff --git a/mh_z19_ui.c b/mh_z19_ui.c
index 2caa8a7..4051b71 100644
--- a/mh_z19_ui.c
+++ b/mh_z19_ui.c
@@ -1,5 +1,7 @@
 #include "mh_z19_ui.h"
 
+#include "mh_z19_app_i.h"
+
 void mh_z19_app_input_callback(InputEvent* event, void* context) {
     furi_assert(context);
     MhZ19App* app = context;
diff --git a/mh_z19_ui.h b/mh_z19_ui.h
index 17ad249..ec21d26 100644
--- a/mh_z19_ui.h
+++ b/mh_z19_ui.h
@@ -2,7 +2,6 @@
 
 #include <gui/gui.h>
 #include <input/input.h>
-#include "mh_z19_app_i.h"
 
 void mh_z19_app_draw_callback(Canvas* canvas, void* context);
 void mh_z19_app_input_callback(InputEvent* event, void* context);