3 files changed, 13 insertions, 9 deletions

diff --git a/firmware/kernel.c b/firmware/kernel.c
index 2b4b09f52b..4d2f519171 100644
--- a/firmware/kernel.c
+++ b/firmware/kernel.c
@@ -26,7 +26,7 @@
 
 long current_tick = 0;
 
-void (*tick_funcs[MAX_NUM_TICK_TASKS])(void);
+static void (*tick_funcs[MAX_NUM_TICK_TASKS])(void);
 
 static void tick_start(unsigned int interval_in_ms);
 
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 8d0cedd9f9..fb27a3b904 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -67,11 +67,13 @@ static int get_unswapped_space(void);
 #define MPEG_SAVE_DATA    102
 #define MPEG_STOP_DONE    103
 
-enum
+#ifdef HAVE_MAS3587F
+static enum
 {
     MPEG_DECODER,
     MPEG_ENCODER
 } mpeg_mode;
+#endif
 
 extern char* playlist_peek(int steps);
 extern int playlist_next(int steps);
@@ -457,9 +459,9 @@ extern unsigned char mp3buf[];
 extern unsigned char mp3end[];
 
 static int mp3buflen;
-int mp3buf_write;
+static int mp3buf_write;
 static int mp3buf_swapwrite;
-int mp3buf_read;
+static int mp3buf_read;
 
 static int last_dma_chunk_size;
 
@@ -691,10 +693,12 @@ static void stop_dma(void)
 }
 
 #ifdef HAVE_MAS3587F
-long timing_info_index = 0;
-long timing_info[1024];
-bool inverted_pr;
-unsigned long num_rec_bytes;
+#ifdef DEBUG
+static long timing_info_index = 0;
+static long timing_info[1024];
+#endif
+static bool inverted_pr;
+static unsigned long num_rec_bytes;
 
 void drain_dma_buffer(void)
 {
diff --git a/firmware/powermgmt.h b/firmware/powermgmt.h
index ea6319c02e..b9686119c0 100644
--- a/firmware/powermgmt.h
+++ b/firmware/powermgmt.h
@@ -70,7 +70,6 @@ extern int charge_state;         /* tells what the charger is doing (for info di
 #define CURRENT_CHARGING  300    /* charging current */
 
 extern unsigned short power_history[POWER_HISTORY_LEN];
-void set_battery_capacity(int capacity); /* set local battery capacity value */
 
 /* Start up power management thread */
 void power_init(void);
@@ -85,6 +84,7 @@ int battery_time(void); /* minutes */
 bool battery_level_safe(void);
 
 void set_poweroff_timeout(int timeout);
+void set_battery_capacity(int capacity); /* set local battery capacity value */
 
 void set_sleep_timer(int seconds);
 int get_sleep_timer(void);