2 files changed, 9 insertions, 22 deletions

diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 13751a9b1c..2ec8f520cf 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -19,42 +19,31 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#include "font.h"
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
+#include "misc.h"
+#include "font.h"
 #include "system.h"
-#include "settings.h"
-#include "settings_list.h"
 #include "rbunicode.h"
-#include "rtc.h"
-#include "audio.h"
-#include "status.h"
-#include "power.h"
-#include "powermgmt.h"
-#include "sound.h"
+#ifdef DEBUG
 #include "debug.h"
-#ifdef HAVE_LCD_CHARCELLS
-#include "hwcompat.h"
 #endif
 #include "abrepeat.h"
-#include "mp3_playback.h"
 #include "lang.h"
-#include "misc.h"
-#include "splash.h"
 #include "scrollbar.h"
-#include "led.h"
-#include "lcd.h"
+#include "screen_access.h"
+
 #ifdef HAVE_LCD_BITMAP
 #include "peakmeter.h"
 /* Image stuff */
 #include "bmp.h"
+#ifdef HAVE_ALBUMART
 #include "albumart.h"
 #endif
-#include "dsp.h"
-#include "action.h"
+#endif
+
 #include "cuesheet.h"
-#include "playlist.h"
 #if CONFIG_CODEC == SWCODEC
 #include "playback.h"
 #endif
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 5156dd7ce7..fad6912336 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -29,7 +29,6 @@
 #include "settings_list.h"
 #include "rbunicode.h"
 #include "timefuncs.h"
-#include "audio.h"
 #include "status.h"
 #include "power.h"
 #include "powermgmt.h"
@@ -39,7 +38,6 @@
 #include "hwcompat.h"
 #endif
 #include "abrepeat.h"
-#include "mp3_playback.h"
 #include "lang.h"
 #include "misc.h"
 #include "led.h"