5 files changed, 22 insertions, 5 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c
index 9135ea3424..4001e156c3 100644
--- a/apps/main_menu.c
+++ b/apps/main_menu.c
@@ -37,10 +37,14 @@
 
 #ifdef HAVE_LCD_BITMAP
 #include "games_menu.h"
-#include "screensavers_menu.h"
 #include "bmp.h"
 #include "icons.h"
-#endif
+
+#ifdef USE_SCREENSAVERS
+#include "screensavers_menu.h"
+#endif /* End USE_SCREENSAVERS */
+
+#endif /* End HAVE_LCD_BITMAP */
 
 int show_logo( void )
 {
@@ -159,17 +163,20 @@ Menu show_info(void)
 #endif
 
 #ifdef HAVE_LCD_CHARCELLS
-        snprintf(s, sizeof(s), "Batt: %d%%%s", battery_level(), battery_level_safe() ? "" : "!");
+        snprintf(s, sizeof(s), "Batt: %d%%%s", 
+                 battery_level(), battery_level_safe() ? "" : "!");
         lcd_puts(0, 1, s);
 #else
 #ifdef HAVE_CHARGE_CTRL
         if (charger_enabled)
             snprintf(s, sizeof(s), "Battery: charging");
         else
-            snprintf(s, sizeof(s), "Battery: %d%%%s", battery_level(), battery_level_safe() ? "" : " !!");
+            snprintf(s, sizeof(s), "Battery: %d%%%s", 
+                     battery_level(), battery_level_safe() ? "" : " !!");
         lcd_puts(0, 3, s);
 #else
-        snprintf(s, sizeof(s), "Battery: %d%%%s", battery_level(), battery_level_safe() ? "" : " !!");
+        snprintf(s, sizeof(s), "Battery: %d%%%s", 
+                 battery_level(), battery_level_safe() ? "" : " !!");
         lcd_puts(0, 3, s);
 #endif
 #endif
@@ -197,7 +204,9 @@ Menu main_menu(void)
         { "General Settings",   settings_menu     },
 #ifdef HAVE_LCD_BITMAP
         { "Games",              games_menu        },
+#ifdef USE_SCREENSAVERS
         { "Screensavers",       screensavers_menu },
+#endif /* end USE_SCREENSAVERS */
 #endif
         { "Info",               show_info         },
         { "Version",            show_credits      },
diff --git a/apps/recorder/blank.c b/apps/recorder/blank.c
index 2c59ec66bc..faa324f9c2 100644
--- a/apps/recorder/blank.c
+++ b/apps/recorder/blank.c
@@ -20,6 +20,7 @@
 #include "config.h"
 
 #ifdef HAVE_LCD_BITMAP
+#ifdef USE_SCREENSAVERS
 
 #include "lcd.h"
 #include "button.h"
@@ -90,6 +91,7 @@ Menu blank(void)
 }
 
 #endif
+#endif
 
 
 
diff --git a/apps/recorder/bounce.c b/apps/recorder/bounce.c
index cb080a0d00..cf269082f6 100644
--- a/apps/recorder/bounce.c
+++ b/apps/recorder/bounce.c
@@ -20,6 +20,7 @@
 #include "config.h"
 
 #ifdef HAVE_LCD_BITMAP
+#ifdef USE_SCREENSAVERS
 
 #include "lcd.h"
 #include "button.h"
@@ -132,3 +133,4 @@ Menu bounce(void)
 }
 
 #endif
+#endif
diff --git a/apps/recorder/boxes.c b/apps/recorder/boxes.c
index 9c38cd4e83..16667ecf3f 100644
--- a/apps/recorder/boxes.c
+++ b/apps/recorder/boxes.c
@@ -20,6 +20,7 @@
 #include "config.h"
 
 #ifdef HAVE_LCD_BITMAP
+#ifdef USE_SCREENSAVERS
 
 #include "boxes.h"
 #include "lcd.h"
@@ -126,3 +127,4 @@ Menu boxes(void)
 }
 
 #endif
+#endif
diff --git a/apps/screensavers_menu.c b/apps/screensavers_menu.c
index b184b916cc..6b53ebeabf 100644
--- a/apps/screensavers_menu.c
+++ b/apps/screensavers_menu.c
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #ifdef HAVE_LCD_BITMAP
+#ifdef USE_SCREENSAVERS
 
 #include <stdio.h>
 #include <stdbool.h>
@@ -52,3 +53,4 @@ Menu screensavers_menu(void)
 }
 
 #endif
+#endif