diff --git a/lib/uart/usb_uart_bridge.c b/lib/uart/usb_uart_bridge.c
index 5333602..d527d8b 100644
--- a/lib/uart/usb_uart_bridge.c
+++ b/lib/uart/usb_uart_bridge.c
@@ -1,15 +1,4 @@
 #include "usb_uart_bridge.h"
-#include "usb_cdc.h"
-#include <cli/cli_vcp.h>
-#include <cli/cli.h>
-#include <toolbox/api_lock.h>
-#include <furi_hal.h>
-#include <furi_hal_usb_cdc.h>
-#include "yuricable_pro_max_asciiart.h"
-
-//TODO: FL-3276 port to new USART API
-#include <stm32wbxx_ll_lpuart.h>
-#include <stm32wbxx_ll_usart.h>
 
 #define USB_CDC_PKT_LEN CDC_DATA_SZ
 #define USB_UART_RX_BUF_SIZE (USB_CDC_PKT_LEN * 5)
diff --git a/lib/uart/usb_uart_bridge.h b/lib/uart/usb_uart_bridge.h
index 2b7879b..15b14f7 100644
--- a/lib/uart/usb_uart_bridge.h
+++ b/lib/uart/usb_uart_bridge.h
@@ -4,6 +4,17 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <log_saver.h>
+#include "usb_cdc.h"
+#include <cli/cli_vcp.h>
+#include <cli/cli.h>
+#include <toolbox/api_lock.h>
+#include <furi_hal.h>
+#include <furi_hal_usb_cdc.h>
+#include "yuricable_pro_max_asciiart.h"
+
+//TODO: FL-3276 port to new USART API
+#include <stm32wbxx_ll_lpuart.h>
+#include <stm32wbxx_ll_usart.h>
 
 #define COMMAND_LENGTH 16
 
diff --git a/yuricable_pro_max.h b/yuricable_pro_max.h
index 9c78956..cd2c6e0 100644
--- a/yuricable_pro_max.h
+++ b/yuricable_pro_max.h
@@ -2,7 +2,6 @@
 
 #include <gui/gui.h>
 #include "lib/sdq/sdq_device.c"
-#include "lib/uart/usb_uart_bridge.h"
 
 typedef enum { EventTypeKey } EventType;