diff --git a/apps/plugins/grayscale.c b/apps/plugins/grayscale.c
index 1154c15ebb..ff94e6ae8c 100644
--- a/apps/plugins/grayscale.c
+++ b/apps/plugins/grayscale.c
@@ -22,7 +22,7 @@
 #ifndef SIMULATOR /* not for simulator by now */
 #include "plugin.h"
 
-#if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4)
+#if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) && (CONFIG_LCD != LCD_IPOD2BPP)
 #include "gray.h"
 
 PLUGIN_HEADER
diff --git a/firmware/SOURCES b/firmware/SOURCES
index b8bf378074..53923b3c35 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -116,7 +116,7 @@ drivers/mas.c
 #ifdef IRIVER_H300_SERIES
 drivers/pcf50606.c
 #endif
-#if defined(APPLE_IPODCOLOR) || defined(APPLE_IPODNANO) || defined(APPLE_IPODVIDEO) || defined(APPLE_IPOD3G) || defined(APPLE_IPOD4G)
+#ifdef IPOD_ARCH
 drivers/pcf50605.c
 #endif
 #if (CONFIG_RTC == RTC_M41ST84W) || (CONFIG_RTC == RTC_PCF50606)
diff --git a/firmware/export/pcf50605.h b/firmware/export/pcf50605.h
index 8da64f3325..95fcaff8fb 100644
--- a/firmware/export/pcf50605.h
+++ b/firmware/export/pcf50605.h
@@ -20,7 +20,7 @@
 #ifndef PCF50605_H
 #define PCF50605_H
 
-#if defined(APPLE_IPODCOLOR) || defined(APPLE_IPODNANO)
+#ifdef IPOD_ARCH
 int pcf50605_read(int address);
 void pcf50605_read_multiple(int address, unsigned char* buf, int count);
 int pcf50605_write(int address, unsigned char val);