2 files changed, 6 insertions, 2 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 809644b3d2..79a0752c4a 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -1771,7 +1771,7 @@ static bool dbg_fm_radio(void)
 #endif /* CONFIG_TUNER */
 #endif /* !SIMULATOR */
 
-#ifdef HAVE_LCD_BITMAP
+#if defined(HAVE_LCD_BITMAP) && !defined(APPLICATION)
 extern bool do_screendump_instead_of_usb;
 
 static bool dbg_screendump(void)
@@ -2057,8 +2057,10 @@ static const struct the_menu_item menuitems[] = {
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
         { "View battery", view_battery },
 #endif
+#ifndef APPLICATION
         { "Screendump", dbg_screendump },
 #endif
+#endif
 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
         { "View HW info", dbg_hw_info },
 #endif
diff --git a/apps/main.c b/apps/main.c
index 9d83c62965..50da787b17 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -131,7 +131,9 @@
 #endif
 
 #if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA))
+#ifdef SIMULATOR
 #include "sim_tasks.h"
+#endif
 #include "system-sdl.h"
 #define HAVE_ARGV_MAIN
 /* Don't use SDL_main on windows -> no more stdio redirection */
@@ -360,7 +362,7 @@ static void init(void)
     button_init();
     powermgmt_init();
     backlight_init();
-#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA))
+#ifdef SIMULATOR
     sim_tasks_init();
 #endif
 #if (CONFIG_PLATFORM & PLATFORM_ANDROID)