From 0023943439148f4c3bfdab2d437345bd87da5a60 Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Sun, 17 May 2009 14:50:19 +0000 Subject: Fix duplicate #includes git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20977 a1c6a512-1295-4272-9138-f99709370657 --- apps/alarm_menu.c | 1 - apps/gui/gwps.c | 1 - apps/gui/list.c | 1 - apps/gui/wps_parser.c | 4 ---- apps/iap.c | 1 - apps/menus/eq_menu.c | 2 -- apps/menus/playlist_menu.c | 1 - apps/misc.c | 5 +---- apps/playback.c | 1 - apps/playlist_viewer.c | 1 - apps/plugin.h | 1 - apps/plugins/lib/pluginlib_bmp.c | 1 - apps/recorder/radio.c | 1 - apps/recorder/recording.c | 1 - apps/screens.c | 1 - apps/tagcache.c | 2 -- apps/talk.c | 1 - apps/tree.c | 1 - 18 files changed, 1 insertion(+), 26 deletions(-) (limited to 'apps') diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c index ad8e1d755c..413d176c7e 100644 --- a/apps/alarm_menu.c +++ b/apps/alarm_menu.c @@ -37,7 +37,6 @@ #include "screens.h" #include "talk.h" #include "lang.h" -#include "power.h" #include "alarm_menu.h" #include "splash.h" #include "viewport.h" diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index c89a6fcbb4..fcd7be4fa9 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c @@ -46,7 +46,6 @@ #include "icons.h" #include "peakmeter.h" #endif -#include "action.h" #include "lang.h" #include "bookmark.h" #include "misc.h" diff --git a/apps/gui/list.c b/apps/gui/list.c index 393c9bf69e..732529f416 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c @@ -38,7 +38,6 @@ #include "misc.h" #include "talk.h" #include "viewport.h" -#include "list.h" #ifdef HAVE_LCD_CHARCELLS #define SCROLL_LIMIT 1 diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index bd599509ae..14c8d30c6a 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c @@ -29,7 +29,6 @@ #ifdef __PCTOOL__ #ifdef WPSEDITOR #include "proxy.h" -#include "settings.h" #include "sysfont.h" #else #include "checkwps.h" @@ -42,13 +41,10 @@ #include #include -#include #include "font.h" #include "gwps.h" -#ifndef __PCTOOL__ #include "settings.h" -#endif #include "settings_list.h" #ifdef HAVE_LCD_BITMAP diff --git a/apps/iap.c b/apps/iap.c index 4d0c473800..51f5e5900b 100644 --- a/apps/iap.c +++ b/apps/iap.c @@ -38,7 +38,6 @@ #include "metadata.h" #include "gwps.h" -#include "button.h" #include "action.h" #define RX_BUFLEN 260 diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c index 587447a5e3..6087ebfd5b 100644 --- a/apps/menus/eq_menu.c +++ b/apps/menus/eq_menu.c @@ -41,11 +41,9 @@ #include "sound.h" #include "dsp.h" #include "tree.h" -#include "talk.h" #include "screen_access.h" #include "keyboard.h" #include "gui/scrollbar.h" -#include "eq_menu.h" #include "menu_common.h" #include "viewport.h" diff --git a/apps/menus/playlist_menu.c b/apps/menus/playlist_menu.c index 6345df9624..199c1e6081 100644 --- a/apps/menus/playlist_menu.c +++ b/apps/menus/playlist_menu.c @@ -31,7 +31,6 @@ #include "menu.h" #include "playlist_menu.h" -#include "menu.h" #include "file.h" #include "keyboard.h" #include "playlist.h" diff --git a/apps/misc.c b/apps/misc.c index d7a64b3733..930afe34f8 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -20,6 +20,7 @@ ****************************************************************************/ #include #include +#include #include "config.h" #include "misc.h" #include "lcd.h" @@ -27,14 +28,10 @@ #ifdef __PCTOOL__ #include #include -#ifdef WPSEDITOR -#include "string.h" -#endif #else #include "sprintf.h" #include "appevents.h" #include "lang.h" -#include "string.h" #include "dir.h" #include "lcd-remote.h" #include "errno.h" diff --git a/apps/playback.c b/apps/playback.c index 10908821e9..16c04e1f5b 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -77,7 +77,6 @@ #ifdef HAVE_RECORDING #include "recording.h" -#include "talk.h" #include "pcm_record.h" #endif diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 60a122d1e1..961d2cdf12 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c @@ -49,7 +49,6 @@ #include "list.h" #include "splash.h" #include "playlist_menu.h" -#include "action.h" /* Maximum number of tracks we can have loaded at one time */ #define MAX_PLAYLIST_ENTRIES 200 diff --git a/apps/plugin.h b/apps/plugin.h index f48e7e23ee..3dc63f7420 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -66,7 +66,6 @@ void* plugin_get_buffer(size_t *buffer_size); #include "dsp.h" #include "codecs.h" #include "playback.h" -#include "metadata.h" #ifdef HAVE_RECORDING #include "recording.h" #endif diff --git a/apps/plugins/lib/pluginlib_bmp.c b/apps/plugins/lib/pluginlib_bmp.c index 6b1a54291c..00c8cbbec0 100644 --- a/apps/plugins/lib/pluginlib_bmp.c +++ b/apps/plugins/lib/pluginlib_bmp.c @@ -24,7 +24,6 @@ #include "lcd.h" #include "file.h" -#include "lcd.h" #include "system.h" #if LCD_DEPTH > 1 /* save is only available for color, resize for >1bpp */ diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index c802e760d8..68c45c4f01 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c @@ -58,7 +58,6 @@ #include "splash.h" #include "yesno.h" #include "buttonbar.h" -#include "power.h" #include "tree.h" #include "dir.h" #include "action.h" diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 354179c4fb..5b5dc55b40 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -73,7 +73,6 @@ #include "screen_access.h" #include "action.h" #include "radio.h" -#include "sound_menu.h" #include "viewport.h" #include "list.h" #include "general.h" diff --git a/apps/screens.c b/apps/screens.c index fb71866589..bc13a4d804 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -42,7 +42,6 @@ #include "power.h" #include "system.h" #include "powermgmt.h" -#include "action.h" #include "talk.h" #include "misc.h" #include "metadata.h" diff --git a/apps/tagcache.c b/apps/tagcache.c index 84e8875968..055f439446 100644 --- a/apps/tagcache.c +++ b/apps/tagcache.c @@ -69,7 +69,6 @@ #include "string.h" #include "usb.h" #include "metadata.h" -#include "metadata.h" #include "tagcache.h" #include "buffer.h" #include "crc32.h" @@ -77,7 +76,6 @@ #include "settings.h" #include "dir.h" #include "structec.h" -#include "tagcache.h" #ifndef __PCTOOL__ #include "lang.h" diff --git a/apps/talk.c b/apps/talk.c index 44ba063655..73c26073b7 100644 --- a/apps/talk.c +++ b/apps/talk.c @@ -44,7 +44,6 @@ #include "playback.h" #endif #include "debug.h" -#include "kernel.h" /* Memory layout varies between targets because the diff --git a/apps/tree.c b/apps/tree.c index 482c5b7c1b..84224efa85 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -72,7 +72,6 @@ #include "list.h" #include "splash.h" #include "buttonbar.h" -#include "action.h" #include "quickscreen.h" #include "root_menu.h" -- cgit v1.2.3