diff --git a/firmware/common/diacritic.c b/firmware/common/diacritic.c
index 7a2b63dfb6..7a0d97b79b 100644
--- a/firmware/common/diacritic.c
+++ b/firmware/common/diacritic.c
@@ -46,6 +46,7 @@ struct diac_range
 #define DIAC_RANGE_ENTRY(first_diac, first_non_diac, is_rtl) \
  { first_diac, ((first_non_diac - first_diac) & DIAC_CNT) | (is_rtl * DIAC_RTL)}
 
+#ifndef BOOTLOADER
 /* Sorted by Unicode value */
 static const struct diac_range diac_ranges[] =
 {
@@ -194,7 +195,7 @@ static const struct diac_range diac_ranges[] =
 };
 
 #define MRU_MAX_LEN 32
-#ifndef BOOTLOADER
+
 bool is_diacritic(const unsigned short char_code, bool *is_rtl)
 {
     static uint8_t mru_len = 0;
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c
index 74c08c1da5..2991b78326 100644
--- a/firmware/scroll_engine.c
+++ b/firmware/scroll_engine.c
@@ -41,11 +41,13 @@
 #endif
 #include "scroll_engine.h"
 
+#if !defined(BOOTLOADER)
 static const char scroll_tick_table[18] = {
  /* Hz values [f(x)=100.8/(x+.048)]:
     1, 1.25, 1.55, 2, 2.5, 3.12, 4, 5, 6.25, 8.33, 10, 12.5, 16.7, 20, 25, 33, 49.2, 96.2 */
     100, 80, 64, 50, 40, 32, 25, 20, 16, 12, 10, 8, 6, 5, 4, 3, 2, 1
 };
+#endif
 
 #include "drivers/lcd-scroll.c"