diff --git a/apps/enc_config.c b/apps/enc_config.c
index 3412e966e1..9d64536e5d 100644
--- a/apps/enc_config.c
+++ b/apps/enc_config.c
@@ -46,7 +46,7 @@ static int enc_menuitem_enteritem(int action,
 static void enc_rec_settings_changed(struct encoder_config *cfg);
 /* this is used by all encoder menu items,
    MUST be initialised before the call to do_menu() */
-struct menucallback_data {
+static struct menucallback_data {
     struct encoder_config *cfg;
     bool global;
 } menu_callback_data;
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index 869acc539c..107f7f4ae6 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -44,9 +44,8 @@
 #define SCROLLBAR_WIDTH 6
 #define ICON_PADDING 1
 
-/* globals */
-struct viewport title_text[NB_SCREENS], title_icons[NB_SCREENS],
-                list_text[NB_SCREENS], list_icons[NB_SCREENS];
+static struct viewport title_text[NB_SCREENS], title_icons[NB_SCREENS],
+                       list_text[NB_SCREENS], list_icons[NB_SCREENS];
 
 /* should probably be moved somewhere else */
 int list_title_height(struct gui_synclist *list, struct viewport *vp)
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index fb2e465006..3e85fd5509 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -82,8 +82,8 @@ bool peak_meter_enabled = true;
 
 /** Parameters **/
 /* Range */
-unsigned short peak_meter_range_min;  /* minimum of range in samples */
-unsigned short peak_meter_range_max;  /* maximum of range in samples */
+static unsigned short peak_meter_range_min;  /* minimum of range in samples */
+static unsigned short peak_meter_range_max;  /* maximum of range in samples */
 static unsigned short pm_range;       /* range width in samples */
 static bool pm_use_dbfs = true;       /* true if peakmeter displays dBfs */
 static bool level_check;              /* true if peeked at peakmeter before drawing */
diff --git a/apps/recorder/peakmeter.h b/apps/recorder/peakmeter.h
index 9b8b24afcf..9aa32905c1 100644
--- a/apps/recorder/peakmeter.h
+++ b/apps/recorder/peakmeter.h
@@ -76,9 +76,6 @@ extern void peak_meter_set_trigger_listener(void (*listener)(int status));
 extern void peak_meter_draw_trig(int x[], int y[], int trig_width[], 
                                       int nb_screens);
 
-extern unsigned short peak_meter_range_min;
-extern unsigned short peak_meter_range_max;
-
 #define DB_SCALE_SRC_VALUES_SIZE 12
 struct meter_scales{
     /* buffered peak values */
diff --git a/firmware/common/dircache.c b/firmware/common/dircache.c
index bf8ff45cff..d2a0b31600 100644
--- a/firmware/common/dircache.c
+++ b/firmware/common/dircache.c
@@ -48,7 +48,7 @@
 #define DIRCACHE_STOP  2
 
 #define MAX_OPEN_DIRS 8
-DIR_CACHED opendirs[MAX_OPEN_DIRS];
+static DIR_CACHED opendirs[MAX_OPEN_DIRS];
 
 static struct dircache_entry *fd_bindings[MAX_OPEN_FILES];
 static struct dircache_entry *dircache_root;
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c
index bcc6ba1da2..f37821730c 100644
--- a/firmware/drivers/audio/as3514.c
+++ b/firmware/drivers/audio/as3514.c
@@ -42,7 +42,7 @@ const struct sound_settings_info audiohw_settings[] = {
 };
 
 /* Shadow registers */
-struct as3514_info
+static struct as3514_info
 {
     int          vol_r;       /* Cached volume level (R) */
     int          vol_l;       /* Cached volume level (L) */
diff --git a/firmware/drivers/tuner/lv24020lp.c b/firmware/drivers/tuner/lv24020lp.c
index a1dc15f41d..31fe939add 100644
--- a/firmware/drivers/tuner/lv24020lp.c
+++ b/firmware/drivers/tuner/lv24020lp.c
@@ -246,7 +246,7 @@ static const int sw_cap_high = 191;
 static int coef_00, coef_01, coef_10, coef_11;
 
 /* DAC control register set values */
-int if_set, sd_set;
+static int if_set, sd_set;
 
 static inline bool tuner_awake(void)
 {
diff --git a/firmware/font.c b/firmware/font.c
index c58087daa3..d3d999ec75 100644
--- a/firmware/font.c
+++ b/firmware/font.c
@@ -61,8 +61,8 @@ static unsigned char *eofptr;
 /* Font cache structures */
 static struct font_cache font_cache_ui;
 static int fnt_file = -1;           /* >=0 if font is cached   */
-uint32_t file_width_offset;    /* offset to file width data    */
-uint32_t file_offset_offset;   /* offset to file offset data   */
+static uint32_t file_width_offset;    /* offset to file width data    */
+static uint32_t file_offset_offset;   /* offset to file offset data   */
 static void cache_create(int maxwidth, int height);
 static int long_offset = 0;
 static int glyph_file;
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c
index 4783e9f1ef..fac104e681 100644
--- a/firmware/scroll_engine.c
+++ b/firmware/scroll_engine.c
@@ -42,7 +42,7 @@ static void scroll_thread(void);
 static char scroll_stack[DEFAULT_STACK_SIZE*3];
 static const char scroll_name[] = "scroll";
 
-struct scrollinfo lcd_scroll[LCD_SCROLLABLE_LINES];
+static struct scrollinfo lcd_scroll[LCD_SCROLLABLE_LINES];
 
 #ifdef HAVE_REMOTE_LCD
 struct scrollinfo lcd_remote_scroll[LCD_REMOTE_SCROLLABLE_LINES];