diff --git a/apps/cuesheet.c b/apps/cuesheet.c
index 1acb9af5cf..aace64a8fc 100644
--- a/apps/cuesheet.c
+++ b/apps/cuesheet.c
@@ -31,7 +31,6 @@
 #include "sprintf.h"
 #include "misc.h"
 #include "screens.h"
-#include "splash.h"
 #include "list.h"
 #include "action.h"
 #include "lang.h"
diff --git a/apps/filetree.c b/apps/filetree.c
index 0ceb5c0941..2cb9239c2a 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -41,7 +41,6 @@
 #include "rolo.h"
 #include "sprintf.h"
 #include "splash.h"
-#include "yesno.h"
 #include "cuesheet.h"
 #include "filetree.h"
 #include "misc.h"
diff --git a/apps/gui/pitchscreen.c b/apps/gui/pitchscreen.c
index db50a5d866..b34824ebad 100644
--- a/apps/gui/pitchscreen.c
+++ b/apps/gui/pitchscreen.c
@@ -33,6 +33,9 @@
 #include "screens.h"
 #include "statusbar.h"
 #include "viewport.h"
+#include "font.h"
+#include "system.h"
+#include "misc.h"
 #include "pitchscreen.h"
 
 #define PITCH_MODE_ABSOLUTE 1
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index b39105dc72..455fc1812d 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -38,7 +38,7 @@
 #include "quickscreen.h"
 #include "talk.h"
 #include "list.h"
-#include "splash.h"
+#include "option_select.h"
 
 static struct viewport vps[NB_SCREENS][QUICKSCREEN_ITEM_COUNT];
 static struct viewport vp_icons[NB_SCREENS];
diff --git a/apps/gui/quickscreen.h b/apps/gui/quickscreen.h
index cf7f577429..a44c206c50 100644
--- a/apps/gui/quickscreen.h
+++ b/apps/gui/quickscreen.h
@@ -26,7 +26,6 @@
 #ifndef _GUI_QUICKSCREEN_H_
 #define _GUI_QUICKSCREEN_H_
 
-#include "option_select.h"
 #include "screen_access.h"
 
 enum QUICKSCREEN_ITEM {
diff --git a/apps/gui/viewport.h b/apps/gui/viewport.h
index d27692c498..76ed327f69 100644
--- a/apps/gui/viewport.h
+++ b/apps/gui/viewport.h
@@ -22,10 +22,6 @@
 
 #include "config.h"
 #include "lcd.h"
-#include "font.h"
-#include "kernel.h"
-#include "system.h"
-#include "misc.h"
 #include "screen_access.h"
 
 /* return the number of text lines in the vp viewport */
diff --git a/apps/gui/yesno.h b/apps/gui/yesno.h
index 801a925ee4..2c146e4853 100644
--- a/apps/gui/yesno.h
+++ b/apps/gui/yesno.h
@@ -22,8 +22,6 @@
 #ifndef _GUI_YESNO_H_
 #define _GUI_YESNO_H_
 
-#include "screen_access.h"
-
 enum yesno_res
 {
     YESNO_YES,
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c
index 1b386816c2..e5d89a696b 100644
--- a/apps/menus/eq_menu.c
+++ b/apps/menus/eq_menu.c
@@ -40,7 +40,6 @@
 #include "talk.h"
 #include "misc.h"
 #include "sound.h"
-#include "splash.h"
 #include "dsp.h"
 #include "tree.h"
 #include "talk.h"
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c
index 6d5abed622..1b70570ae4 100644
--- a/apps/menus/time_menu.c
+++ b/apps/menus/time_menu.c
@@ -32,10 +32,8 @@
 #include "menu.h"
 #include "misc.h"
 #include "exported_menus.h"
-#include "yesno.h"
 #include "keyboard.h"
 #include "talk.h"
-#include "splash.h"
 #include "version.h"
 #include "time.h"
 #include "viewport.h"
@@ -43,6 +41,8 @@
 #include "alarm_menu.h"
 #include "screens.h"
 #include "radio.h"
+#include "font.h"
+#include "system.h"
 
 static int timedate_set(void)
 {
diff --git a/apps/tagcache.c b/apps/tagcache.c
index e7f3294dbf..2b2881a9b8 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -80,7 +80,6 @@
 #include "tagcache.h"
 
 #ifndef __PCTOOL__
-#include "splash.h"
 #include "lang.h"
 #include "eeprom_settings.h"
 #endif