diff --git a/apps/playback.c b/apps/playback.c
index 5c2fc7f8ce..c57855eeac 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -115,7 +115,7 @@ static enum audio_buffer_state
 /** Main state control **/
 static bool ff_rw_mode SHAREDBSS_ATTR = false; /* Pre-ff-rewind mode (A,O-) */
 
-enum play_status
+static enum play_status
 {
     PLAY_STOPPED = 0,
     PLAY_PLAYING = AUDIO_STATUS_PLAY,
@@ -268,7 +268,7 @@ enum track_load_status
 /** Track change controls **/
 
 /* What sort of skip is pending globally? */
-enum track_skip_type
+static enum track_skip_type
 {
     /* Relative to what user is intended to see: */
     /* Codec: +0, Track List: +0, Playlist: +0 */
diff --git a/firmware/core_alloc.c b/firmware/core_alloc.c
index 53e5bf4a97..df1b4d3213 100644
--- a/firmware/core_alloc.c
+++ b/firmware/core_alloc.c
@@ -19,7 +19,7 @@ extern unsigned char audiobufend[];
 /* defined in linker script */
 extern unsigned char audiobuffer[];
 #else /* PLATFORM_HOSTED */
-unsigned char audiobuffer[((MEMORYSIZE)*1024-768)*1024];
+static unsigned char audiobuffer[((MEMORYSIZE)*1024-768)*1024];
 unsigned char *audiobufend = audiobuffer + sizeof(audiobuffer);
 extern unsigned char *audiobufend;
 #endif
diff --git a/firmware/drivers/ramdisk.c b/firmware/drivers/ramdisk.c
index c1f8824c93..44235c4575 100644
--- a/firmware/drivers/ramdisk.c
+++ b/firmware/drivers/ramdisk.c
@@ -27,9 +27,9 @@
 #define SECTOR_SIZE 512
 #define NUM_SECTORS 16384
 
-unsigned char ramdisk[SECTOR_SIZE * NUM_SECTORS];
+static unsigned char ramdisk[SECTOR_SIZE * NUM_SECTORS];
 
-long last_disk_activity = -1;
+static long last_disk_activity = -1;
 
 int ramdisk_read_sectors(IF_MD(int drive,)
                      unsigned long start,
diff --git a/firmware/logf.c b/firmware/logf.c
index 2fdbfa0f0c..0f05c6590d 100644
--- a/firmware/logf.c
+++ b/firmware/logf.c
@@ -52,7 +52,7 @@
 #include "ata_idle_notify.h"
 
 unsigned char logdiskfbuffer[MAX_LOGDISKF_SIZE];
-int logdiskfindex;
+static int logdiskfindex;
 #endif
 
 /* Only provide all this if asked to */
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 61cf1b34c4..35c5c639f6 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -56,7 +56,7 @@
 #endif
 
 /** Shared by sim **/
-int last_sent_battery_level = 100;
+static int last_sent_battery_level = 100;
 /* battery level (0-100%) */
 int battery_percent = -1;
 void send_battery_level_event(void);
diff --git a/firmware/target/hosted/filesystem-app.c b/firmware/target/hosted/filesystem-app.c
index bcc880eab0..0c9943b635 100644
--- a/firmware/target/hosted/filesystem-app.c
+++ b/firmware/target/hosted/filesystem-app.c
@@ -41,7 +41,7 @@
 static const char rbhome[] = "/sdcard";
 #elif (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA)) \
         && !defined(__PCTOOL__)
-const char *rbhome;
+static const char *rbhome;
 #else
 /* YPR0, YPR1 */
 static const char rbhome[] = HOME_DIR;
diff --git a/firmware/target/sh/archos/recorder/powermgmt-recorder.c b/firmware/target/sh/archos/recorder/powermgmt-recorder.c
index 1e78b8d155..ca6067a4cc 100644
--- a/firmware/target/sh/archos/recorder/powermgmt-recorder.c
+++ b/firmware/target/sh/archos/recorder/powermgmt-recorder.c
@@ -85,8 +85,8 @@ static int wrcount = 0;
  */
 int long_delta;                     /* long term delta battery voltage */
 int short_delta;                    /* short term delta battery voltage */
-bool disk_activity_last_cycle = false;  /* flag set to aid charger time
-                                         * calculation */
+static bool disk_activity_last_cycle = false;  /* flag set to aid charger time
+                                                * calculation */
 char power_message[POWER_MESSAGE_LEN] = ""; /* message that's shown in
                                            debug menu */
                                         /* percentage at which charging