diff --git a/apps/plugin.c b/apps/plugin.c
index 2fbfe346b3..c2b697fe0b 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -322,6 +322,7 @@ static const struct plugin_api rockbox_api = {
 #if CONFIG_CODEC != SWCODEC
     bitswap,
 #endif
+#endif
 #if CONFIG_CODEC == SWCODEC
     pcm_play_data,
     pcm_play_stop,
@@ -329,7 +330,6 @@ static const struct plugin_api rockbox_api = {
     pcm_is_playing,
     pcm_play_pause,
 #endif
-#endif
 #if CONFIG_CODEC == SWCODEC
     pcm_calculate_peaks,
 #endif
diff --git a/apps/plugin.h b/apps/plugin.h
index 6e9a1316d5..16781de0c1 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -418,6 +418,7 @@ struct plugin_api {
 #if CONFIG_CODEC != SWCODEC
     void (*bitswap)(unsigned char *data, int length);
 #endif
+#endif /* !SIMULATOR */
 #if CONFIG_CODEC == SWCODEC
     void (*pcm_play_data)(pcm_more_callback_type get_more,
             unsigned char* start, size_t size);
@@ -426,7 +427,6 @@ struct plugin_api {
     bool (*pcm_is_playing)(void);
     void (*pcm_play_pause)(bool play);
 #endif
-#endif /* !SIMULATOR */
 #if CONFIG_CODEC == SWCODEC
     void (*pcm_calculate_peaks)(int *left, int *right);
 #endif