diff --git a/lib/rbcodec/metadata/metadata_common.c b/lib/rbcodec/metadata/metadata_common.c
index 2586b2b65e..202da49522 100644
--- a/lib/rbcodec/metadata/metadata_common.c
+++ b/lib/rbcodec/metadata/metadata_common.c
@@ -252,7 +252,7 @@ bool skip_id3v2(int fd, struct mp3entry *id3)
     return success;
 }
 
-#ifndef ROCKBOX /*codecs can be built without rockbox */
+#if !defined(ROCKBOX) || defined(WARBLE) /*codecs can be built without rockbox */
 /* returns match index from option list
  * returns -1 if option was not found
  * option list is array of char pointers with the final item set to null
diff --git a/tools/configure b/tools/configure
index 67c0b6a418..ac657e38c9 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4280,7 +4280,7 @@ fi
       toolset='';
       t_cpu='';
       GCCOPTS='';
-      extradefines="$extradefines  -DDEBUG"
+      extradefines="$extradefines  -DDEBUG -DWARBLE"
       output='warble.'${modelname};
       echo "Warble build selected"
       ;;