diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index d3169be43a..9316294aad 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -199,7 +199,7 @@ static void draw_playlist_viewer_list(struct gui_wps *gwps,
     
     struct mp3entry *pid3;
     char buf[MAX_PATH*2], tempbuf[MAX_PATH];
-    char *filename;
+    const char *filename;
     
     gwps->display->set_viewport(viewer->vp);
     for(i=start_item; (i-start_item)<lines && i<=playlist_amount(); i++)
diff --git a/apps/mpeg.c b/apps/mpeg.c
index 7917015a9b..1ff46b049e 100644
--- a/apps/mpeg.c
+++ b/apps/mpeg.c
@@ -87,7 +87,7 @@ extern enum /* from mp3_playback.c */
 } mpeg_mode;
 #endif /* CONFIG_CODEC == MAS3587F */
 
-extern char* playlist_peek(int steps);
+extern const char* playlist_peek(int steps);
 extern bool playlist_check(int steps);
 extern int playlist_next(int steps);
 extern int playlist_amount(void);
@@ -929,7 +929,7 @@ static int new_file(int steps)
     }
     
     do {
-        char *trackname;
+        const char *trackname;
 
         trackname = playlist_peek( start + steps );
         if ( !trackname )
@@ -2741,7 +2741,7 @@ void audio_next(void)
     queue_remove_from_head(&mpeg_queue, MPEG_NEED_DATA);
     queue_post(&mpeg_queue, MPEG_NEXT, 0);
 #else /* SIMULATOR */
-    char* file;
+    const char* file;
     int steps = 1;
     int index;
 
@@ -2770,7 +2770,7 @@ void audio_prev(void)
     queue_remove_from_head(&mpeg_queue, MPEG_NEED_DATA);
     queue_post(&mpeg_queue, MPEG_PREV, 0);
 #else /* SIMULATOR */
-    char* file;
+    const char* file;
     int steps = -1;
     int index;
 
diff --git a/apps/playlist.c b/apps/playlist.c
index 21e1eed083..485601cd7e 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -2450,7 +2450,7 @@ bool playlist_check(int steps)
 
 /* get trackname of track that is "steps" away from current playing track.
    NULL is used to identify end of playlist */
-char* playlist_peek(int steps)
+const char* playlist_peek(int steps)
 {
     struct playlist_info* playlist = &current_playlist;
     int seek;
diff --git a/apps/playlist.h b/apps/playlist.h
index 331d2f9f2a..3ff32c7682 100644
--- a/apps/playlist.h
+++ b/apps/playlist.h
@@ -127,7 +127,7 @@ int playlist_add(const char *filename);
 int playlist_shuffle(int random_seed, int start_index);
 void playlist_start(int start_index, int offset);
 bool playlist_check(int steps);
-char *playlist_peek(int steps);
+const char *playlist_peek(int steps);
 int playlist_next(int steps);
 bool playlist_next_dir(int direction);
 int playlist_get_resume_info(int *resume_index);
diff --git a/apps/tree.c b/apps/tree.c
index 8fbc793bda..204ebb9ff5 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -1068,7 +1068,7 @@ bool bookmark_play(char *resume_file, int index, int offset, int seed,
         lastdir[0]='\0';
         if (playlist_create(resume_file, NULL) != -1)
         {
-            char* peek_filename;
+            const char* peek_filename;
             resume_directory(resume_file);
             if (global_settings.playlist_shuffle)
                 playlist_shuffle(seed, -1);