3 files changed, 4 insertions, 7 deletions

diff --git a/apps/plugin.c b/apps/plugin.c
index 6641fe2ee1..c9278c8897 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -463,9 +463,7 @@ static const struct plugin_api rockbox_api = {
     lcd_remote_bitmap,
 #endif
 
-#if (CONFIG_LCD == LCD_IPODCOLOR || CONFIG_LCD == LCD_IPODNANO \
-     || CONFIG_LCD == LCD_H300 || CONFIG_LCD == LCD_IPODVIDEO) && \
-     !defined(SIMULATOR)
+#if defined(HAVE_LCD_COLOR) && !defined(SIMULATOR)
     lcd_yuv_blit,
 #endif
 
diff --git a/apps/plugin.h b/apps/plugin.h
index 9f17fa6480..505e7ec666 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -539,9 +539,7 @@ struct plugin_api {
     void (*lcd_remote_bitmap)(const fb_remote_data *src, int x, int y, int width,
                               int height);
 #endif
-#if (CONFIG_LCD == LCD_IPODCOLOR || CONFIG_LCD == LCD_IPODNANO \
-     || CONFIG_LCD == LCD_H300 || CONFIG_LCD == LCD_IPODVIDEO) && \
-     !defined(SIMULATOR)
+#if defined(HAVE_LCD_COLOR) && !defined(SIMULATOR)
     void (*lcd_yuv_blit)(unsigned char * const src[3],
                          int src_x, int src_y, int stride,
                          int x, int y, int width, int height);
diff --git a/apps/plugins/mpegplayer/video_out_rockbox.c b/apps/plugins/mpegplayer/video_out_rockbox.c
index 174921e837..cac5cf3d5c 100644
--- a/apps/plugins/mpegplayer/video_out_rockbox.c
+++ b/apps/plugins/mpegplayer/video_out_rockbox.c
@@ -201,7 +201,8 @@ static void rockbox_draw_frame (vo_instance_t * instance,
     (void)instance;
 
 #if (CONFIG_LCD == LCD_IPODCOLOR || CONFIG_LCD == LCD_IPODNANO \
-     || CONFIG_LCD == LCD_H300 || CONFIG_LCD == LCD_IPODVIDEO) \
+     || CONFIG_LCD == LCD_H300 || CONFIG_LCD == LCD_IPODVIDEO \
+     || CONFIG_LCD == LCD_X5) \
      && !defined(SIMULATOR)
     rb->lcd_yuv_blit(buf,
                     0,0,image_width,