diff --git a/firmware/SOURCES b/firmware/SOURCES
index 434a237f6c..db17fff19c 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -846,11 +846,13 @@ target/arm/philips/hdd6330/powermgmt-hdd6330.c
 target/arm/usb-fw-pp502x.c
 #endif /* PHILIPS_HDD6330 */
 
-#ifdef IAUDIO_X5
+#if defined(IAUDIO_X5) || defined(IAUDIO_M5)
 target/coldfire/pcf50606-coldfire.c
 target/coldfire/iaudio/adc-iaudio.c
 target/coldfire/iaudio/ata-iaudio.c
+#ifdef HAVE_FMRADIO_IN
 target/coldfire/iaudio/fmradio_i2c-iaudio.c
+#endif
 target/coldfire/iaudio/lcd-remote-as-iaudio.S
 target/coldfire/iaudio/lcd-remote-iaudio.c
 target/coldfire/iaudio/pcf50606-iaudio.c
@@ -858,38 +860,25 @@ target/coldfire/iaudio/power-x5m5.c
 target/coldfire/iaudio/powermgmt-iaudio.c
 target/coldfire/iaudio/system-iaudio.c
 target/coldfire/iaudio/usb-iaudio.c
+#ifndef BOOTLOADER
+target/coldfire/iaudio/audio-iaudio.c
+#endif
+#endif /* IAUDIO_X5 || IAUDIO_M5 */
+
+#ifdef IAUDIO_X5
 target/coldfire/iaudio/x5/backlight-x5.c
 target/coldfire/iaudio/x5/button-x5.c
 target/coldfire/iaudio/x5/ds2411-x5.c
 target/coldfire/iaudio/x5/lcd-as-x5.S
 target/coldfire/iaudio/x5/lcd-x5.c
 target/coldfire/iaudio/x5/m5636-x5.c
-#ifndef BOOTLOADER
-target/coldfire/iaudio/audio-iaudio.c
-#endif
 #endif /* IAUDIO_X5 */
 
 #ifdef IAUDIO_M5
-target/coldfire/pcf50606-coldfire.c
-target/coldfire/iaudio/adc-iaudio.c
-target/coldfire/iaudio/ata-iaudio.c
-#ifdef HAVE_FMRADIO_IN  /* FM radio mod */
-target/coldfire/iaudio/fmradio_i2c-iaudio.c
-#endif
-target/coldfire/iaudio/lcd-remote-as-iaudio.S
-target/coldfire/iaudio/lcd-remote-iaudio.c
 target/coldfire/iaudio/m5/backlight-m5.c
 target/coldfire/iaudio/m5/button-m5.c
 target/coldfire/iaudio/m5/lcd-as-m5.S
 target/coldfire/iaudio/m5/lcd-m5.c
-target/coldfire/iaudio/pcf50606-iaudio.c
-target/coldfire/iaudio/power-x5m5.c
-target/coldfire/iaudio/powermgmt-iaudio.c
-target/coldfire/iaudio/system-iaudio.c
-target/coldfire/iaudio/usb-iaudio.c
-#ifndef BOOTLOADER
-target/coldfire/iaudio/audio-iaudio.c
-#endif
 #endif /* IAUDIO_M5 */
 
 #ifdef IAUDIO_M3