diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c
index 8ab91ef642..2a58d6ff21 100644
--- a/firmware/drivers/lcd-scroll.c
+++ b/firmware/drivers/lcd-scroll.c
@@ -24,8 +24,6 @@
 /* This file is meant to be #included by scroll_engine.c (twice if a remote
  * is present) */
 
-#include "misc.h"
-#include "settings.h"
 #ifndef LCDFN /* Not compiling for remote - define macros for main LCD. */
 #define LCDFN(fn) lcd_ ## fn
 #define LCDM(ma) LCD_ ## ma
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c
index c32f4632e2..74c08c1da5 100644
--- a/firmware/scroll_engine.c
+++ b/firmware/scroll_engine.c
@@ -32,6 +32,10 @@
 #include "usb.h"
 #include "lcd.h"
 #include "font.h"
+#if !defined(BOOTLOADER)
+#include "misc.h"
+#include "settings.h"
+#endif
 #ifdef HAVE_REMOTE_LCD
 #include "lcd-remote.h"
 #endif