diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index a0f3d7706e..a1b0c79eaa 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -38,7 +38,6 @@
 #include "lang.h"
 #include "sound.h"
 #include "misc.h"
-#include "talk.h"
 #include "viewport.h"
 
 #define ICON_PADDING 1
diff --git a/apps/gui/charcell/list.c b/apps/gui/charcell/list.c
index 151a225a0e..285cd3eacd 100644
--- a/apps/gui/charcell/list.c
+++ b/apps/gui/charcell/list.c
@@ -37,7 +37,6 @@
 #include "lang.h"
 #include "sound.h"
 #include "misc.h"
-#include "talk.h"
 
 void list_draw(struct screen *display, struct gui_synclist *gui_list)
 {
diff --git a/apps/menu.c b/apps/menu.c
index 4b568a0ecc..96140cf4f8 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -47,7 +47,6 @@
 #include "menus/exported_menus.h"
 #include "string.h"
 #include "root_menu.h"
-#include "bookmark.h"
 #include "audio.h"
 #include "viewport.h"
 #include "quickscreen.h"
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 781b6f488a..033f7e2675 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -36,7 +36,6 @@
 #ifdef HAVE_RECORDING
 #include "recording.h"
 #endif
-#include "bookmark.h"
 #include "yesno.h"
 #include "keyboard.h"
 #include "screens.h"
diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c
index 199c1e6081..87a61a9b83 100644
--- a/apps/menus/playlist_menu.c
+++ b/apps/menus/playlist_menu.c
@@ -1,4 +1,3 @@
-
 /***************************************************************************
  *             __________               __   ___.
  *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
@@ -21,8 +20,6 @@
  ****************************************************************************/
 
 #include <stdbool.h>
-#include <stddef.h>
-#include <limits.h>
 #include <string.h>
 #include "config.h"
 #include "lang.h"
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c
index f96a6ced4b..d71ca71928 100644
--- a/apps/menus/theme_menu.c
+++ b/apps/menus/theme_menu.c
@@ -32,7 +32,6 @@
 #ifdef HAVE_LCD_BITMAP
 #include "peakmeter.h"
 #endif
-#include "talk.h"
 #include "color_picker.h"
 #include "lcd.h"
 #include "lcd-remote.h"
diff --git a/apps/misc.c b/apps/misc.c
index b091cc6a6f..1715fe305b 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #else
 #include "sprintf.h"
-#include "appevents.h"
 #include "lang.h"
 #include "dir.h"
 #include "lcd-remote.h"
diff --git a/apps/playback.c b/apps/playback.c
index 16f4766958..be8377be14 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -67,7 +67,6 @@
 #include "albumart.h"
 #endif
 #include "lang.h"
-#include "bookmark.h"
 #include "misc.h"
 #include "sound.h"
 #include "metadata.h"
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 03e63f9077..848440a40c 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -56,7 +56,6 @@
 #include "wps.h"
 #include "bookmark.h"
 #include "playlist.h"
-#include "tagtree.h"
 #include "menus/exported_menus.h"
 #ifdef HAVE_RTC_ALARM
 #include "rtc.h"