diff --git a/apps/plugin.c b/apps/plugin.c
index 81830a8823..f965a94fad 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -230,7 +230,9 @@ static const struct plugin_api rockbox_api = {
     mp3_play_pause,
     mp3_play_stop,
     mp3_is_playing,
+#if CONFIG_HWCODEC != MASNONE
     bitswap,
+#endif
 #endif
     
     /* playback control */
diff --git a/apps/plugin.h b/apps/plugin.h
index ada71bf059..d6e181393f 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -276,7 +276,9 @@ struct plugin_api {
     void (*mp3_play_pause)(bool play);
     void (*mp3_play_stop)(void);
     bool (*mp3_is_playing)(void);
+#if CONFIG_HWCODEC != MASNONE
     void (*bitswap)(unsigned char *data, int length);
+#endif
 #endif
 
     /* playback control */
diff --git a/apps/talk.c b/apps/talk.c
index b6e2ec57a1..a896ca3a1a 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -497,7 +497,9 @@ int talk_file(const char* filename, bool enqueue)
 
     if (size)
     {
+#if CONFIG_HWCODEC != MASNONE
         bitswap(p_thumbnail, size);
+#endif
         queue_clip(p_thumbnail, size, enqueue);
     }