2 files changed, 7 insertions, 6 deletions

diff --git a/apps/bookmark.c b/apps/bookmark.c
index 28aecb4c23..434ac2aa95 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -857,8 +857,6 @@ static bool delete_bookmark(const char* bookmark_file_name, int bookmark_id)
 static void say_bookmark(const char* bookmark,
                          int bookmark_id, bool show_playlist_name)
 {
-    bool is_dir;
-
     if (!parse_bookmark(bookmark, true))
     {
         talk_id(LANG_BOOKMARK_INVALID, false);
@@ -867,9 +865,10 @@ static void say_bookmark(const char* bookmark,
 
     talk_number(bookmark_id + 1, false);
 
-    is_dir = (global_temp_buffer[0]
-              && global_temp_buffer[strlen(global_temp_buffer)-1] == '/');
 #if CONFIG_CODEC == SWCODEC
+    bool is_dir = (global_temp_buffer[0]
+              && global_temp_buffer[strlen(global_temp_buffer)-1] == '/');
+
     /* HWCODEC cannot enqueue voice file entries and .talk thumbnails
        together, because there is no guarantee that the same mp3
        parameters are used. */
diff --git a/apps/radio/radio.c b/apps/radio/radio.c
index d1a94ac295..5c0b884cd1 100644
--- a/apps/radio/radio.c
+++ b/apps/radio/radio.c
@@ -392,8 +392,8 @@ void radio_screen(void)
 #endif
 #if CONFIG_CODEC != SWCODEC
     int timeout = current_tick + HZ/10;
-    unsigned int last_seconds = 0;
 #if !defined(SIMULATOR)
+    unsigned int last_seconds = 0;
     unsigned int seconds = 0;
     struct audio_recording_options rec_options;
 #endif /* SIMULATOR */
@@ -547,8 +547,10 @@ void radio_screen(void)
                     rec_command(RECORDING_CMD_START);
                     update_type = SKIN_REFRESH_ALL;
                 }
-#endif /* SIMULATOR */
+#if CONFIG_CODEC != SWCODEC
                 last_seconds = 0;
+#endif
+#endif /* SIMULATOR */
                 break;
 #endif /* #ifdef FM_RECORD */