diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index d420b96342..ec804ab41f 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -44,6 +44,7 @@
 #include "pcm_record.h"
 #endif
 #include "appevents.h"
+#include "timefuncs.h"
 
 /* FIXME: should be removed from icon.h to avoid redefinition,
    but still needed for compatibility with old system */
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index b413279332..73d2463c36 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -44,6 +44,9 @@
 #include "screens.h"
 #endif
 #include "quickscreen.h"
+#ifdef HAVE_DIRCACHE
+#include "dircache.h"
+#endif
 
 /***********************************/
 /*    TAGCACHE MENU                */
diff --git a/apps/plugin.h b/apps/plugin.h
index fd3e276dcd..e4b13f5770 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -92,6 +92,7 @@ void* plugin_get_buffer(size_t *buffer_size);
 #include "viewport.h"
 #include "ata_idle_notify.h"
 #include "settings_list.h"
+#include "timefuncs.h"
 
 #ifdef HAVE_ALBUMART
 #include "albumart.h"
diff --git a/apps/settings.h b/apps/settings.h
index 3ea9ee96e1..17d5acb51a 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -23,24 +23,13 @@
 #define __SETTINGS_H__
 
 #include <stdbool.h>
+#include <stddef.h>
 #include "inttypes.h"
 #include "config.h"
-#include "file.h"
-#include "dircache.h"
-#include "timefuncs.h"
-#include "tagcache.h"
-#ifndef __PCTOOL__
-#include "button.h"
-#endif
-
 #if CONFIG_CODEC == SWCODEC
 #include "audio.h"
 #endif
 
-#ifdef HAVE_BACKLIGHT_BRIGHTNESS
-#include "backlight.h" /* for [MIN|MAX]_BRIGHTNESS_SETTING */
-#endif
-
 struct opt_items {
     unsigned const char* string;
     int32_t voice_id;
diff --git a/apps/tagtree.c b/apps/tagtree.c
index 7777a9f16d..0a1cce0247 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -49,6 +49,7 @@
 #include "audio.h"
 #include "appevents.h"
 #include "storage.h"
+#include "dir_uncached.h"
 
 #define FILE_SEARCH_INSTRUCTIONS ROCKBOX_DIR "/tagnavi.config"