diff --git a/apps/codecs.h b/apps/codecs.h
index 3a3970b83d..3823e72177 100644
--- a/apps/codecs.h
+++ b/apps/codecs.h
@@ -30,32 +30,23 @@
 #endif
 
 #include <stdbool.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include "config.h"
-#include "dir.h"
 #include "kernel.h"
-#include "font.h"
 #include "system.h"
 #include "id3.h"
-#include "mpeg.h"
 #include "audio.h"
-#include "mp3_playback.h"
 #ifdef RB_PROFILE
 #include "profile.h"
+#include "thread.h"
 #endif
 #if (CONFIG_CODEC == SWCODEC)
 #if !defined(SIMULATOR) && defined(HAVE_RECORDING)
 #include "pcm_record.h"
 #endif
 #include "dsp.h"
-#include "playback.h"
 #endif
 #include "settings.h"
-#include "thread.h"
-#include "playlist.h"
-#include "sound.h"
 
 #ifdef CODEC
 
diff --git a/apps/cuesheet.c b/apps/cuesheet.c
index 970959b5d2..afd0ba1ea6 100644
--- a/apps/cuesheet.c
+++ b/apps/cuesheet.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <atoi.h>
+#include <ctype.h>
 #include <string.h>
 #include "system.h"
 #include "audio.h"
diff --git a/apps/playback.h b/apps/playback.h
index cf7547ec26..9a8bd10390 100644
--- a/apps/playback.h
+++ b/apps/playback.h
@@ -20,8 +20,6 @@
 #ifndef _PLAYBACK_H
 #define _PLAYBACK_H
 
-#include <stdlib.h>
-#include <ctype.h>
 #include <stdbool.h>
 
 #include "id3.h"
diff --git a/apps/tagcache.c b/apps/tagcache.c
index e917d55f47..08e89eb5c6 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -54,6 +54,8 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
 #include "config.h"
 #include "thread.h"
 #include "kernel.h"
@@ -78,7 +80,6 @@
 #endif
 
 #ifdef __PCTOOL__
-#include <ctype.h>
 #define yield() do { } while(0)
 #define sim_sleep(timeout) do { } while(0)
 #define do_timed_yield() do { } while(0)