diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index c5923ae843..c1c77c7d89 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -1,41 +1,45 @@
 battery_test.c
+chessclock.c
+favorites.c
+firmware_flash.c
+helloworld.c
+metronome.c
+rockbox_flash.c
+search.c
+sort.c
+stopwatch.c
+vbrfix.c
+viewer.c
+#ifdef HAVE_LCD_BITMAP
 bounce.c
 calculator.c
 calendar.c
-chessclock.c
 chip8.c
 clock.c
 cube.c
-euroconverter.c
-favorites.c
-firmware_flash.c
 flipit.c
 grayscale.c
-helloworld.c
-jackpot.c
 jpeg.c
 mandelbrot.c
-metronome.c
 minesweeper.c
 mosaique.c
-nim.c
 oscillograph.c
 pong.c
 rockblox.c
-rockbox_flash.c
-search.c
 sliding_puzzle.c
 snake.c
 snake2.c
 snow.c
 sokoban.c
 solitaire.c
-sort.c
 splitedit.c
 star.c
-stopwatch.c
-vbrfix.c
 video.c
-viewer.c
 vu_meter.c
 wormlet.c
+#endif
+#ifdef HAVE_LCD_CHARCELLS
+euroconverter.c
+jackpot.c
+nim.c
+#endif
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES
index 31467cca50..3873d2659b 100644
--- a/apps/plugins/lib/SOURCES
+++ b/apps/plugins/lib/SOURCES
@@ -1,4 +1,5 @@
 configfile.c
+#ifdef HAVE_LCD_BITMAP
 gray_black_display.c
 gray_blockfuncs.c
 gray_clear_display.c
@@ -28,3 +29,4 @@ gray_set_drawmode.c
 gray_set_foreground.c
 gray_setfont.c
 gray_verline.c
+#endif
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 04fa25de34..63ae6148c2 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -24,21 +24,33 @@ common/timefuncs.c
 debug.c
 drivers/adc.c
 drivers/ata.c
+#ifdef HAVE_MMC
 drivers/ata_mmc.c
+#endif
 drivers/button.c
 drivers/dac.c
 drivers/fat.c
+#ifdef CONFIG_TUNER
 drivers/fmradio.c
+#endif
 drivers/i2c.c
+#ifdef HAVE_LCD_CHARCELLS
 drivers/lcd-player-charset.c
 drivers/lcd-player.c
+#endif
+#ifdef HAVE_LCD_BITMAP
 drivers/lcd-recorder.c
+#endif
 drivers/led.c
 drivers/mas.c
 drivers/power.c
+#ifdef HAVE_RTC
 drivers/rtc.c
+#endif
 drivers/serial.c
+#ifdef HAVE_LCD_BITMAP
 font.c
+#endif
 hwcompat.c
 id3.c
 kernel.c