4 files changed, 8 insertions, 5 deletions

diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c
index b883349620..a788cbade2 100644
--- a/apps/gui/color_picker.c
+++ b/apps/gui/color_picker.c
@@ -32,6 +32,7 @@
 #include "splash.h"
 #include "action.h"
 #include "icon.h"
+#include "color_picker.h"
 
 /* structure for color info */
 struct rgb_pick
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 9582a48dc4..ed4ca17b2a 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -64,7 +64,7 @@
 
 /* draws the statusbar on the given wps-screen */
 #ifdef HAVE_LCD_BITMAP
-void gui_wps_statusbar_draw(struct gui_wps *wps, bool force)
+static void gui_wps_statusbar_draw(struct gui_wps *wps, bool force)
 {
     bool draw = global_settings.statusbar;
 
diff --git a/apps/gui/list.c b/apps/gui/list.c
index 2c849660d6..6b4229545d 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -38,6 +38,7 @@
 #include "misc.h"
 #include "talk.h"
 #include "viewport.h"
+#include "list.h"
 
 #ifdef HAVE_LCD_CHARCELLS
 #define SCROLL_LIMIT 1
diff --git a/apps/gui/splash.c b/apps/gui/splash.c
index c690777cc6..df0446e62d 100644
--- a/apps/gui/splash.c
+++ b/apps/gui/splash.c
@@ -25,6 +25,7 @@
 #include "lang.h"
 #include "settings.h"
 #include "talk.h"
+#include "splash.h"
 
 #ifndef MAX
 #define MAX(a, b) (((a)>(b))?(a):(b))
@@ -185,7 +186,7 @@ static void splash(struct screen * screen, const char *fmt, va_list ap)
 }
 
 void gui_splash(struct screen * screen, int ticks, 
-                const unsigned char *fmt, ...)
+                const char *fmt, ...)
 {
     va_list ap;
     va_start( ap, fmt );
@@ -196,21 +197,21 @@ void gui_splash(struct screen * screen, int ticks,
         sleep(ticks);
 }
 
-void gui_syncsplash(int ticks, const unsigned char *fmt, ...)
+void gui_syncsplash(int ticks, const char *fmt, ...)
 {
     va_list ap;
     int i;
 #if !defined(SIMULATOR) || CONFIG_CODEC == SWCODEC
     long id;
     /* fmt may be a so called virtual pointer. See settings.h. */
-    if((id = P2ID(fmt)) >= 0)
+    if((id = P2ID((unsigned char *)fmt)) >= 0)
         /* If fmt specifies a voicefont ID, and voice menus are
            enabled, then speak it. */
         cond_talk_ids_fq(id);
 #endif
     /* If fmt is a lang ID then get the corresponding string (which
        still might contain % place holders). */
-    fmt = P2STR(fmt);
+    fmt = P2STR((unsigned char *)fmt);
     va_start( ap, fmt );
     FOR_NB_SCREENS(i)
         splash(&(screens[i]), fmt, ap);