3 files changed, 3 insertions, 28 deletions

diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index a6313b88bd..f8223f7af5 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -34,7 +34,6 @@
 #include "statusbar.h"
 #include "screen_access.h"
 #include "appevents.h"
-#include "gwps.h"
 
 static int statusbar_enabled = 0;
 
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index 18026292ad..fc68ce4267 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -29,7 +29,6 @@
 #include "storage.h"
 #include "lcd.h"
 #include "scrollbar.h"
-#include "gwps.h"
 #include "sprintf.h"
 #include "button.h"
 #include "system.h"
diff --git a/apps/status.c b/apps/status.c
index 9bdea15543..92f29c1b83 100644
--- a/apps/status.c
+++ b/apps/status.c
@@ -18,37 +18,14 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#include "string.h"
-#include "lcd.h"
-#include "debug.h"
-#include "kernel.h"
-#include "power.h"
-#include "thread.h"
-#include "settings.h"
+#include <string.h>
+#include <stdbool.h>
+#include "config.h"
 #include "status.h"
-#include "mp3_playback.h"
 #include "audio.h"
-#include "gwps.h"
-#if CONFIG_RTC
-#include "timefuncs.h"
-#endif
-#ifdef HAVE_LCD_BITMAP
-#include "icons.h"
-#include "font.h"
-#endif
-#include "powermgmt.h"
-#include "led.h"
-#include "sound.h"
-#if CONFIG_KEYPAD == IRIVER_H100_PAD
-#include "button.h"
-#endif
-#include "usb.h"
 #if CONFIG_TUNER
 #include "radio.h"
 #endif
-#if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC
-#include "pcm_record.h"
-#endif
 
 static enum playmode ff_mode;