Fix duplicate #includes

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20977 a1c6a512-1295-4272-9138-f99709370657

29 files changed, 2 insertions, 39 deletions

diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c
index ad8e1d7..413d176 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 c89a6fc..fcd7be4 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 393c9bf..732529f 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 bd59950..14c8d30 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 <ctype.h>
 #include <stdbool.h>
-#include <string.h>
 #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 4d0c473..51f5e59 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 587447a..6087ebf 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 6345df9..199c1e6 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 d7a64b3..930afe3 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -20,6 +20,7 @@
  ****************************************************************************/
 #include <stdlib.h>
 #include <ctype.h>
+#include <string.h>
 #include "config.h"
 #include "misc.h"
 #include "lcd.h"
@@ -27,14 +28,10 @@
 #ifdef __PCTOOL__
 #include <stdarg.h>
 #include <stdio.h>
-#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 1090882..16c04e1 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 60a122d..961d2cd 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 f48e7e2..3dc63f7 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 6b1a542..00c8cbb 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 c802e76..68c45c4 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 354179c..5b5dc55 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 fb71866..bc13a4d 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 84e8875..055f439 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 44ba063..73c2607 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 482c5b7..84224ef 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"
diff --git a/firmware/drivers/synaptics-mep.c b/firmware/drivers/synaptics-mep.c
index a14e875..57aeefe 100644
--- a/firmware/drivers/synaptics-mep.c
+++ b/firmware/drivers/synaptics-mep.c
@@ -24,7 +24,6 @@
 #include "cpu.h"
 #include "system.h"
 #include "kernel.h"
-#include "system.h"
 
 #define LOGF_ENABLE
 #include "logf.h"
diff --git a/firmware/export/cpu.h b/firmware/export/cpu.h
index ea56d7e..4623f57 100644
--- a/firmware/export/cpu.h
+++ b/firmware/export/cpu.h
@@ -65,6 +65,4 @@
 #if CONFIG_CPU == AS3525
 #include "as3525.h"
 #endif
-#if CONFIG_CPU == JZ4732
-#include "jz4740.h"
-#endif
+
diff --git a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c b/firmware/target/arm/imx31/gigabeat-s/button-imx31.c
index 320af7c..ae158b8 100644
--- a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/button-imx31.c
@@ -24,7 +24,6 @@
 #include "system.h"
 #include "button.h"
 #include "backlight.h"
-#include "system.h"
 #include "backlight-target.h"
 #include "avic-imx31.h"
 #include "ccm-imx31.h"
diff --git a/firmware/target/arm/ipod/button-1g-3g.c b/firmware/target/arm/ipod/button-1g-3g.c
index 6c02d75..6c2a8c0 100644
--- a/firmware/target/arm/ipod/button-1g-3g.c
+++ b/firmware/target/arm/ipod/button-1g-3g.c
@@ -38,7 +38,6 @@
 #include "backlight.h"
 #include "serial.h"
 #include "power.h"
-#include "system.h"
 #include "powermgmt.h"
 #include "hwcompat.h"
 
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c
index bdfc42e..7278428 100644
--- a/firmware/target/arm/ipod/button-clickwheel.c
+++ b/firmware/target/arm/ipod/button-clickwheel.c
@@ -38,7 +38,6 @@
 #include "backlight.h"
 #include "serial.h"
 #include "power.h"
-#include "system.h"
 #include "powermgmt.h"
 
 #define WHEEL_FAST_OFF_TIMEOUT   250000 /* timeout for acceleration = 250ms */
diff --git a/firmware/target/arm/ipod/button-mini1g.c b/firmware/target/arm/ipod/button-mini1g.c
index d6d1517..5831cdf 100644
--- a/firmware/target/arm/ipod/button-mini1g.c
+++ b/firmware/target/arm/ipod/button-mini1g.c
@@ -38,7 +38,6 @@
 #include "backlight.h"
 #include "serial.h"
 #include "power.h"
-#include "system.h"
 #include "powermgmt.h"
 
 /* Variable to use for setting button status in interrupt handler */
diff --git a/firmware/target/arm/iriver/h10/button-h10.c b/firmware/target/arm/iriver/h10/button-h10.c
index 53b159a..6710f39 100644
--- a/firmware/target/arm/iriver/h10/button-h10.c
+++ b/firmware/target/arm/iriver/h10/button-h10.c
@@ -30,7 +30,6 @@
 #include "kernel.h"
 #include "backlight.h"
 #include "adc.h"
-#include "system.h"
 
 
 void button_init_device(void)
diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c
index cdd4fb7..45f9fae 100644
--- a/firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c
+++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-ifp7xx.c
@@ -28,7 +28,6 @@
 #include "kernel.h"
 #include "backlight.h"
 #include "adc.h"
-#include "system.h"
 
 
 void button_init_device(void)
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
index 090e485..0e69cbd 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
@@ -26,7 +26,6 @@
 #include "kernel.h"
 #include "backlight.h"
 #include "adc.h"
-#include "system.h"
 #include "backlight-target.h"
 
 static bool headphones_detect;
diff --git a/firmware/target/arm/tatung/tpj1022/button-tpj1022.c b/firmware/target/arm/tatung/tpj1022/button-tpj1022.c
index ad00275..6cdca5b 100644
--- a/firmware/target/arm/tatung/tpj1022/button-tpj1022.c
+++ b/firmware/target/arm/tatung/tpj1022/button-tpj1022.c
@@ -28,7 +28,6 @@
 #include "button.h"
 #include "kernel.h"
 #include "backlight.h"
-#include "system.h"
 
 void button_init_device(void)
 {
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
index 1dc453b..9794539 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c
@@ -25,7 +25,6 @@
 #include "config.h"
 #include "cpu.h"
 #include "string.h"
-#include "lcd.h"
 #include "kernel.h"
 #include "memory.h"
 #include "system-target.h"