Index: firmware/target/sh/archos/i2c-archos.c
===================================================================
--- firmware/target/sh/archos/i2c-archos.c	(revision 31001)
+++ firmware/target/sh/archos/i2c-archos.c	(working copy)
@@ -234,6 +234,7 @@
     return x;
 }
 
+#if 0 /* Currently unused, left for reference and future use */
 int i2c_read(int address, unsigned char* buf, int count )
 {
     int i,x=0;
@@ -250,3 +251,4 @@
     i2c_stop();
     return x;
 }
+#endif
Index: firmware/target/sh/archos/audio-archos.c
===================================================================
--- firmware/target/sh/archos/audio-archos.c	(revision 31001)
+++ firmware/target/sh/archos/audio-archos.c	(working copy)
@@ -461,6 +461,7 @@
 
 /* new functions, to be exported to plugin API */
 
+#if CONFIG_CODEC == MAS3587F
 void mp3_play_init(void)
 {
 #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
@@ -471,6 +472,7 @@
     callback_for_more = NULL;
     mp3_reset_playtime();
 }
+#endif
 
 void mp3_play_data(const unsigned char* start, int size,
     void (*get_more)(unsigned char** start, size_t* size) /* callback fn */
@@ -536,6 +538,7 @@
 #endif
 }
 
+#if 0 /* Currently unused, left for reference and future use */
 long mp3_get_playtime(void)
 {
     if (paused)
@@ -543,12 +546,15 @@
     else
         return cumulative_ticks + current_tick - playstart_tick;
 }
+#endif
 
+#if CONFIG_CODEC == MAS3587F
 void mp3_reset_playtime(void)
 {
     cumulative_ticks = 0;
     playstart_tick = current_tick;
 }
+#endif
 
 bool mp3_is_playing(void)
 {
Index: firmware/target/sh/archos/mascodec-archos.c
===================================================================
--- firmware/target/sh/archos/mascodec-archos.c	(revision 31001)
+++ firmware/target/sh/archos/mascodec-archos.c	(working copy)
@@ -30,6 +30,7 @@
 
 static int mas_devread(unsigned long *dest, int len);
 
+#if 0 /* Currently unused, left for reference and future use */
 int mas_default_read(unsigned short *buf)
 {
     unsigned char *dest = (unsigned char *)buf;
@@ -62,7 +63,9 @@
     i2c_end();
     return ret;
 }
+#endif
 
+#if CONFIG_CODEC == MAS3507D
 int mas_run(unsigned short address)
 {
     int ret = 0;
@@ -83,6 +86,7 @@
     i2c_end();
     return ret;
 }
+#endif
 
 /* note: 'len' is number of 32-bit words, not number of bytes! */
 int mas_readmem(int bank, int addr, unsigned long* dest, int len)
@@ -307,6 +311,7 @@
 }
 
 #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
+#if 0 /* Currently unused, left for reference and future use */
 int mas_direct_config_read(unsigned char reg)
 {
     int ret = 0;
@@ -340,6 +345,7 @@
     i2c_end();
     return ret;
 }
+#endif
 
 int mas_direct_config_write(unsigned char reg, unsigned int val)
 {
Index: firmware/export/mascodec.h
===================================================================
--- firmware/export/mascodec.h	(revision 31001)
+++ firmware/export/mascodec.h	(working copy)
@@ -21,14 +21,16 @@
 #ifndef _MASCODEC_H_
 #define _MASCODEC_H_
 
-int mas_default_read(unsigned short *buf);
+/* unused: int mas_default_read(unsigned short *buf); */
+#if CONFIG_CODEC == MAS3507D
 int mas_run(unsigned short address);
+#endif
 int mas_readmem(int bank, int addr, unsigned long* dest, int len);
 int mas_writemem(int bank, int addr, const unsigned long* src, int len);
 int mas_readreg(int reg);
 int mas_writereg(int reg, unsigned int val);
 void mas_reset(void);
-int mas_direct_config_read(unsigned char reg);
+/* unused: int mas_direct_config_read(unsigned char reg); */
 int mas_direct_config_write(unsigned char reg, unsigned int val);
 int mas_codec_writereg(int reg, unsigned int val);
 int mas_codec_readreg(int reg);