diff --git a/firmware/rolo.c b/firmware/rolo.c
index 5cc4f1d212..f4db832b2b 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -219,7 +219,6 @@ extern unsigned long loadaddress;
  * Filename must be a fully defined filename including the path and extension
  *
  ***************************************************************************/
-#if defined(CPU_COLDFIRE) || defined(CPU_ARM) || defined(CPU_MIPS)
 int rolo_load(const char* filename)
 {
     unsigned char* ramstart = (void*)&loadaddress;
@@ -323,7 +322,7 @@ int rolo_load(const char* filename)
     /* never reached */
     return 0;
 }
-#endif /* CPU_COLDFIRE | CPU_ARM | CPU_MIPS  */
+
 #else  /* !defined(IRIVER_IFP7XX_SERIES) */
 int rolo_load(const char* filename)
 {
diff --git a/lib/rbcodec/codecs/libtremor/oggmalloc.c b/lib/rbcodec/codecs/libtremor/oggmalloc.c
index 783e0f7240..31d88f191d 100644
--- a/lib/rbcodec/codecs/libtremor/oggmalloc.c
+++ b/lib/rbcodec/codecs/libtremor/oggmalloc.c
@@ -1,7 +1,7 @@
 #include "os_types.h"
 #include <tlsf.h>
 
-#if defined(CPU_ARM) || defined(CPU_COLDFIRE) || defined(CPU_MIPS)
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #include <setjmp.h>
 extern jmp_buf rb_jump_buf;
 #define LONGJMP(x)  longjmp(rb_jump_buf, x)
@@ -31,7 +31,7 @@ void *ogg_malloc(size_t size)
 
     if (x == NULL)
         LONGJMP(1);
-    
+
     return x;
 }
 
@@ -41,7 +41,7 @@ void *ogg_calloc(size_t nmemb, size_t size)
 
     if (x == NULL)
         LONGJMP(1);
-    
+
     return x;
 }
 
@@ -51,7 +51,7 @@ void *ogg_realloc(void *ptr, size_t size)
 
     if (x == NULL)
         LONGJMP(1);
-    
+
     return x;
 }
 
diff --git a/lib/rbcodec/codecs/vorbis.c b/lib/rbcodec/codecs/vorbis.c
index 83c9d5b31d..ce1f4ba893 100644
--- a/lib/rbcodec/codecs/vorbis.c
+++ b/lib/rbcodec/codecs/vorbis.c
@@ -28,7 +28,7 @@
 
 CODEC_HEADER
 
-#if defined(CPU_ARM) || defined(CPU_COLDFIRE) || defined(CPU_MIPS)
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
 #include <setjmp.h>
 jmp_buf rb_jump_buf;
 #endif
@@ -135,7 +135,7 @@ enum codec_status codec_run(void)
     ogg_int64_t vf_pcmlengths[2];
     intptr_t param;
 
-#if defined(CPU_ARM) || defined(CPU_COLDFIRE) || defined(CPU_MIPS)
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
     if (setjmp(rb_jump_buf) != 0) {
         /* malloc failed; finish with this track */
         goto done;
@@ -153,7 +153,7 @@ enum codec_status codec_run(void)
 
     /* Open a non-seekable stream */
     error = ov_open_callbacks(ci, &vf, NULL, 0, callbacks);
-    
+
     /* If the non-seekable open was successful, we need to supply the missing
      * data to make it seekable.  This is a hack, but it's reasonable since we
      * don't want to run the whole file through the buffer before we start