diff --git a/apps/misc.c b/apps/misc.c
index a0817d7e27..dfee05fb5a 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -264,7 +264,9 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter)
 #endif
     {
         bool batt_safe = battery_level_safe();
+#if CONFIG_CODEC != SWCODEC || defined(HAVE_RECORDING)
         int audio_stat = audio_status();
+#endif
 
         FOR_NB_SCREENS(i)
         {
diff --git a/apps/plugin.c b/apps/plugin.c
index 10cb9263a4..bfb7f0e9c1 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -778,9 +778,10 @@ static const struct plugin_api rockbox_api = {
 
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
-
+#if CONFIG_CODEC == SWCODEC
     mixer_channel_status,
     mixer_channel_get_buffer,
+#endif
 };
 
 int plugin_load(const char* plugin, const void* parameter)
diff --git a/apps/plugin.h b/apps/plugin.h
index 113296c19a..aa39829daf 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -908,8 +908,10 @@ struct plugin_api {
 
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
+#if CONFIG_CODEC == SWCODEC
     enum channel_status (*mixer_channel_status)(enum pcm_mixer_channel channel);
     void * (*mixer_channel_get_buffer)(enum pcm_mixer_channel channel, int *count);
+#endif
 };
 
 /* plugin header */