4 files changed, 10 insertions, 4 deletions

diff --git a/apps/codecs.c b/apps/codecs.c
index c31fd843b3..24490dd04b 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -138,8 +138,8 @@ struct codec_api ci = {
 #ifdef RB_PROFILE
     profile_thread,
     profstop,
-    profile_func_enter,
-    profile_func_exit,
+    __cyg_profile_func_enter,
+    __cyg_profile_func_exit,
 #endif
 
 #if defined(HAVE_RECORDING) && !defined(SIMULATOR)
diff --git a/apps/codecs/SOURCES b/apps/codecs/SOURCES
index 25ca5490d4..3038903f9e 100644
--- a/apps/codecs/SOURCES
+++ b/apps/codecs/SOURCES
@@ -7,7 +7,9 @@ wav.c
 a52.c
 mpc.c
 wavpack.c
+#ifndef RB_PROFILE
 alac.c
+#endif
 wma.c
 #if MEMORYSIZE > 1
 aac.c
diff --git a/apps/plugin.c b/apps/plugin.c
index a220e8c429..24082de637 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -335,8 +335,8 @@ static const struct plugin_api rockbox_api = {
 #ifdef RB_PROFILE
     profile_thread,
     profstop,
-    profile_func_enter,
-    profile_func_exit,
+    __cyg_profile_func_enter,
+    __cyg_profile_func_exit,
 #endif
 
 #ifdef SIMULATOR
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS
index 94614e2f12..1b3e2af252 100644
--- a/apps/plugins/SUBDIRS
+++ b/apps/plugins/SUBDIRS
@@ -33,14 +33,18 @@ pacbox
 /* For all the color targets */
 #if defined(HAVE_LCD_COLOR) || defined(MROBE_100) || \
     (LCD_DEPTH == 2) && !defined(ARCHOS_AV300)
+#ifndef RB_PROFILE
 doom
 #endif
+#endif
 
 /* For all the swcodec targets */
 #if CONFIG_CODEC == SWCODEC
 midi
 /* beatbox */
+#ifndef RB_PROFILE
 mpegplayer
 #endif
+#endif
 
 #endif /* IRIVER_IFP7XX_SERIES */