6 files changed, 9 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 559ae8519f..6b6db68023 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -68,6 +68,7 @@
 #include "wps_internals.h"
 #include "skin_engine.h"
 #include "statusbar-skinned.h"
+#include "skin_display.h"
 
 void skin_render(struct gui_wps *gwps, unsigned refresh_mode);
 
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index d81ccf62b3..ed7771529e 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -90,7 +90,7 @@ static enum screen_type curr_screen;
 static struct skin_element *curr_viewport_element;
 static struct skin_viewport *curr_vp;
 
-struct line *curr_line;
+static struct line *curr_line;
 
 static int follow_lang_direction = 0;
 
@@ -1173,7 +1173,7 @@ static int convert_viewport(struct wps_data *data, struct skin_element* element)
     
 }
 
-int skin_element_callback(struct skin_element* element, void* data)
+static int skin_element_callback(struct skin_element* element, void* data)
 {
     struct wps_data *wps_data = (struct wps_data *)data;
     struct wps_token *token;
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c
index e05f97ff4e..b56fabeaa0 100644
--- a/apps/gui/skin_engine/skin_render.c
+++ b/apps/gui/skin_engine/skin_render.c
@@ -322,7 +322,7 @@ static void fix_line_alignment(struct skin_draw_info *info, struct skin_element
 }
     
 /* Draw a LINE element onto the display */
-bool skin_render_line(struct skin_element* line, struct skin_draw_info *info)
+static bool skin_render_line(struct skin_element* line, struct skin_draw_info *info)
 {
     bool needs_update = false;
     int last_value, value;
@@ -471,8 +471,8 @@ bool skin_render_alternator(struct skin_element* element, struct skin_draw_info
     return changed_lines || ret;
 }
 
-void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps,
-                          struct skin_viewport* skin_viewport, unsigned long refresh_type)
+static void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps,
+                                 struct skin_viewport* skin_viewport, unsigned long refresh_type)
 {
     struct screen *display = gwps->display;
     char linebuf[MAX_LINE];
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c
index 8eb082d50f..213d8a1777 100644
--- a/apps/gui/statusbar-skinned.c
+++ b/apps/gui/statusbar-skinned.c
@@ -48,7 +48,7 @@ static struct wps_sync_data sb_skin_sync_data        = { .do_full_update = false
 
 /* initial setup of wps_data  */
 static int update_delay = DEFAULT_UPDATE_DELAY;
-struct wps_token *found_token;
+static struct wps_token *found_token;
 static int set_title_worker(char* title, enum themable_icons icon, 
                             struct wps_data *data, struct skin_element *root)
 {
diff --git a/firmware/target/arm/as3525/usb-drv-as3525.c b/firmware/target/arm/as3525/usb-drv-as3525.c
index bee9689ae3..0ababd857d 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525.c
+++ b/firmware/target/arm/as3525/usb-drv-as3525.c
@@ -476,7 +476,7 @@ char *make_hex(char *data, int len)
 }
 #endif
 
-void ep_send(int ep, void *ptr, int len)
+static void ep_send(int ep, void *ptr, int len)
 {
     struct usb_dev_dma_desc *uc_desc = endpoints[ep][0].uc_desc;
 
diff --git a/firmware/target/arm/as3525/usb-drv-as3525v2.c b/firmware/target/arm/as3525/usb-drv-as3525v2.c
index 1514e765cb..a1ea7e30ab 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525v2.c
+++ b/firmware/target/arm/as3525/usb-drv-as3525v2.c
@@ -100,7 +100,7 @@ static struct usb_endpoint endpoints[USB_NUM_ENDPOINTS][2];
 /* setup packet for EP0 */
 static struct usb_ctrlrequest ep0_setup_pkt USB_DEVBSS_ATTR;
 /* state of EP0 */
-enum ep0state ep0_state;
+static enum ep0state ep0_state;
 
 void usb_attach(void)
 {