4 files changed, 7 insertions, 2 deletions

diff --git a/apps/plugins/SOURCES.app_build b/apps/plugins/SOURCES.app_build
index e374062536..8a94e67a37 100644
--- a/apps/plugins/SOURCES.app_build
+++ b/apps/plugins/SOURCES.app_build
@@ -3,6 +3,7 @@
 #include "SOURCES"
 #else
 /* plugins common to all models */
+chopper.c
 credits.c
 properties.c
 random_folder_advance_config.c
diff --git a/apps/plugins/SUBDIRS.app_build b/apps/plugins/SUBDIRS.app_build
index 0e0285741f..32fda68425 100644
--- a/apps/plugins/SUBDIRS.app_build
+++ b/apps/plugins/SUBDIRS.app_build
@@ -8,6 +8,10 @@
  */
 #ifdef HAVE_LCD_BITMAP
 
+#if CONFIG_CODEC == SWCODEC && PLUGIN_BUFFER_SIZE > 0x20000
+fft
+#endif
+
 #ifdef HAVE_TAGCACHE
 pictureflow
 #endif
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index d819da421b..b2c3653aeb 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -180,7 +180,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define ACTION BUTTON_SELECT
 #define ACTIONTEXT "SELECT"
 
-#else
+#elif !defined(HAVE_TOUCHSCREEN)
 #error No keymap defined!
 #endif
 
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index b2ef8d8e33..1c4e1b4c20 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -266,7 +266,7 @@ GREY_INFO_STRUCT
 #   define FFT_FREQ_SCALE   BUTTON_DOWN
 #   define FFT_QUIT         BUTTON_BACK
 
-#else
+#elif !defined(HAVE_TOUCHSCREEN)
 #error No keymap defined!
 #endif