diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 8e1abdd161..2a742408d2 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -52,7 +52,9 @@
 #ifdef HAVE_TAGCACHE
 #include "tagcache.h"
 #endif
+#ifdef HAVE_REMOTE_LCD
 #include "lcd-remote.h"
+#endif
 #include "crc32.h"
 #include "logf.h"
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index a55ccc3221..760e13cff7 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -22,7 +22,9 @@
 #include <stdlib.h>
 #include "config.h"
 #include "lcd.h"
+#ifdef HAVE_REMOTE_LCD
 #include "lcd-remote.h"
+#endif
 #include "font.h"
 #include "viewport.h"
 #include "screen_access.h"
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 957307d8a8..3e1443d02e 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -35,7 +35,9 @@
 #endif
 #include "talk.h"
 #include "lcd.h"
+#ifdef HAVE_REMOTE_LCD
 #include "lcd-remote.h"
+#endif
 #ifdef HAVE_TOUCHSCREEN
 #include "screens.h"
 #endif
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c
index 5e04191ed1..93511f8197 100644
--- a/apps/menus/theme_menu.c
+++ b/apps/menus/theme_menu.c
@@ -32,7 +32,9 @@
 #include "list.h"
 #include "color_picker.h"
 #include "lcd.h"
+#ifdef HAVE_REMOTE_LCD
 #include "lcd-remote.h"
+#endif
 #include "backdrop.h"
 #include "exported_menus.h"
 #include "appevents.h"
diff --git a/apps/misc.c b/apps/misc.c
index 30c747113c..3c55395a42 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -33,7 +33,9 @@
 #ifndef __PCTOOL__
 #include "lang.h"
 #include "dir.h"
+#ifdef HAVE_REMOTE_LCD
 #include "lcd-remote.h"
+#endif
 #include "timefuncs.h"
 #include "screens.h"
 #include "usb_screen.h"
diff --git a/apps/screen_access.c b/apps/screen_access.c
index cd58654f7c..5ab08b7fc5 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -22,7 +22,9 @@
 #include <stdio.h>
 #include "config.h"
 #include <lcd.h>
+#ifdef HAVE_REMOTE_LCD
 #include <lcd-remote.h>
+#endif
 #include <scroll_engine.h>
 #include <font.h>
 #include <button.h>
@@ -356,7 +358,7 @@ struct screen screens[NB_SCREENS] =
         .has_buttonbar=false,
 #endif
     }
-#endif /* HAVE_REMOTE_LCD */
+#endif /* NB_SCREENS == 2 */
 };
 
 #ifdef HAVE_LCD_BITMAP