Fix duplicate #includes

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20977 a1c6a512-1295-4272-9138-f99709370657
author: Bertrik Sikken <bertrik@sikken.nl> 2009-05-17 14:50:19 +0000
committer: Bertrik Sikken <bertrik@sikken.nl> 2009-05-17 14:50:19 +0000
commit: 0023943439148f4c3bfdab2d437345bd87da5a60 (patch)
tree: f37a6df0867a4f255f655d085e5a09c635c62604
parent: b4e2db5cc544c4609f4a20fc3ef111070cf00815 (diff)
download: rockbox-0023943439148f4c3bfdab2d437345bd87da5a60.tar.gz
rockbox-0023943439148f4c3bfdab2d437345bd87da5a60.zip
29 files changed, 2 insertions, 39 deletions
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 <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 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 <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 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"
diff --git a/firmware/drivers/synaptics-mep.c b/firmware/drivers/synaptics-mep.c
index a14e875cc1..57aeefeadf 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 ea56d7e6a0..4623f57004 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 320af7ca66..ae158b811d 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 6c02d750f7..6c2a8c059c 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 bdfc42ef98..727842834f 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 d6d151763b..5831cdfc31 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 53b159a2ec..6710f39281 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 cdd4fb71ec..45f9fae478 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 090e485178..0e69cbd420 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 ad00275520..6cdca5b35d 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 1dc453b800..97945397b2 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"
author	Bertrik Sikken <bertrik@sikken.nl>	2009-05-17 14:50:19 +0000
committer	Bertrik Sikken <bertrik@sikken.nl>	2009-05-17 14:50:19 +0000
commit	0023943439148f4c3bfdab2d437345bd87da5a60 (patch)
tree	f37a6df0867a4f255f655d085e5a09c635c62604
parent	b4e2db5cc544c4609f4a20fc3ef111070cf00815 (diff)
download	rockbox-0023943439148f4c3bfdab2d437345bd87da5a60.tar.gz rockbox-0023943439148f4c3bfdab2d437345bd87da5a60.zip

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 @@
37	#include "screens.h"	37	#include "screens.h"
38	#include "talk.h"	38	#include "talk.h"
39	#include "lang.h"	39	#include "lang.h"
40	#include "power.h"
41	#include "alarm_menu.h"	40	#include "alarm_menu.h"
42	#include "splash.h"	41	#include "splash.h"
43	#include "viewport.h"	42	#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 @@
46	#include "icons.h"	46	#include "icons.h"
47	#include "peakmeter.h"	47	#include "peakmeter.h"
48	#endif	48	#endif
49	#include "action.h"
50	#include "lang.h"	49	#include "lang.h"
51	#include "bookmark.h"	50	#include "bookmark.h"
52	#include "misc.h"	51	#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 @@
38	#include "misc.h"	38	#include "misc.h"
39	#include "talk.h"	39	#include "talk.h"
40	#include "viewport.h"	40	#include "viewport.h"
41	#include "list.h"
42		41
43	#ifdef HAVE_LCD_CHARCELLS	42	#ifdef HAVE_LCD_CHARCELLS
44	#define SCROLL_LIMIT 1	43	#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 @@
29	#ifdef __PCTOOL__	29	#ifdef __PCTOOL__
30	#ifdef WPSEDITOR	30	#ifdef WPSEDITOR
31	#include "proxy.h"	31	#include "proxy.h"
32	#include "settings.h"
33	#include "sysfont.h"	32	#include "sysfont.h"
34	#else	33	#else
35	#include "checkwps.h"	34	#include "checkwps.h"
@@ -42,13 +41,10 @@
42		41
43	#include <ctype.h>	42	#include <ctype.h>
44	#include <stdbool.h>	43	#include <stdbool.h>
45	#include <string.h>
46	#include "font.h"	44	#include "font.h"
47		45
48	#include "gwps.h"	46	#include "gwps.h"
49	#ifndef __PCTOOL__
50	#include "settings.h"	47	#include "settings.h"
51	#endif
52	#include "settings_list.h"	48	#include "settings_list.h"
53		49
54	#ifdef HAVE_LCD_BITMAP	50	#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 @@
38	#include "metadata.h"	38	#include "metadata.h"
39	#include "gwps.h"	39	#include "gwps.h"
40		40
41	#include "button.h"
42	#include "action.h"	41	#include "action.h"
43		42
44	#define RX_BUFLEN 260	43	#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 @@
41	#include "sound.h"	41	#include "sound.h"
42	#include "dsp.h"	42	#include "dsp.h"
43	#include "tree.h"	43	#include "tree.h"
44	#include "talk.h"
45	#include "screen_access.h"	44	#include "screen_access.h"
46	#include "keyboard.h"	45	#include "keyboard.h"
47	#include "gui/scrollbar.h"	46	#include "gui/scrollbar.h"
48	#include "eq_menu.h"
49	#include "menu_common.h"	47	#include "menu_common.h"
50	#include "viewport.h"	48	#include "viewport.h"
51		49


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 @@
31	#include "menu.h"	31	#include "menu.h"
32	#include "playlist_menu.h"	32	#include "playlist_menu.h"
33		33
34	#include "menu.h"
35	#include "file.h"	34	#include "file.h"
36	#include "keyboard.h"	35	#include "keyboard.h"
37	#include "playlist.h"	36	#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 @@
20	****************************************************************************/	20	****************************************************************************/
21	#include <stdlib.h>	21	#include <stdlib.h>
22	#include <ctype.h>	22	#include <ctype.h>
		23	#include <string.h>
23	#include "config.h"	24	#include "config.h"
24	#include "misc.h"	25	#include "misc.h"
25	#include "lcd.h"	26	#include "lcd.h"
@@ -27,14 +28,10 @@
27	#ifdef __PCTOOL__	28	#ifdef __PCTOOL__
28	#include <stdarg.h>	29	#include <stdarg.h>
29	#include <stdio.h>	30	#include <stdio.h>
30	#ifdef WPSEDITOR
31	#include "string.h"
32	#endif
33	#else	31	#else
34	#include "sprintf.h"	32	#include "sprintf.h"
35	#include "appevents.h"	33	#include "appevents.h"
36	#include "lang.h"	34	#include "lang.h"
37	#include "string.h"
38	#include "dir.h"	35	#include "dir.h"
39	#include "lcd-remote.h"	36	#include "lcd-remote.h"
40	#include "errno.h"	37	#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 @@
77		77
78	#ifdef HAVE_RECORDING	78	#ifdef HAVE_RECORDING
79	#include "recording.h"	79	#include "recording.h"
80	#include "talk.h"
81	#include "pcm_record.h"	80	#include "pcm_record.h"
82	#endif	81	#endif
83		82


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 @@
49	#include "list.h"	49	#include "list.h"
50	#include "splash.h"	50	#include "splash.h"
51	#include "playlist_menu.h"	51	#include "playlist_menu.h"
52	#include "action.h"
53		52
54	/* Maximum number of tracks we can have loaded at one time */	53	/* Maximum number of tracks we can have loaded at one time */
55	#define MAX_PLAYLIST_ENTRIES 200	54	#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);
66	#include "dsp.h"	66	#include "dsp.h"
67	#include "codecs.h"	67	#include "codecs.h"
68	#include "playback.h"	68	#include "playback.h"
69	#include "metadata.h"
70	#ifdef HAVE_RECORDING	69	#ifdef HAVE_RECORDING
71	#include "recording.h"	70	#include "recording.h"
72	#endif	71	#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 @@
24		24
25	#include "lcd.h"	25	#include "lcd.h"
26	#include "file.h"	26	#include "file.h"
27	#include "lcd.h"
28	#include "system.h"	27	#include "system.h"
29		28
30	#if LCD_DEPTH > 1 /* save is only available for color, resize for >1bpp */	29	#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 @@
58	#include "splash.h"	58	#include "splash.h"
59	#include "yesno.h"	59	#include "yesno.h"
60	#include "buttonbar.h"	60	#include "buttonbar.h"
61	#include "power.h"
62	#include "tree.h"	61	#include "tree.h"
63	#include "dir.h"	62	#include "dir.h"
64	#include "action.h"	63	#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 @@
73	#include "screen_access.h"	73	#include "screen_access.h"
74	#include "action.h"	74	#include "action.h"
75	#include "radio.h"	75	#include "radio.h"
76	#include "sound_menu.h"
77	#include "viewport.h"	76	#include "viewport.h"
78	#include "list.h"	77	#include "list.h"
79	#include "general.h"	78	#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 @@
42	#include "power.h"	42	#include "power.h"
43	#include "system.h"	43	#include "system.h"
44	#include "powermgmt.h"	44	#include "powermgmt.h"
45	#include "action.h"
46	#include "talk.h"	45	#include "talk.h"
47	#include "misc.h"	46	#include "misc.h"
48	#include "metadata.h"	47	#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 @@
69	#include "string.h"	69	#include "string.h"
70	#include "usb.h"	70	#include "usb.h"
71	#include "metadata.h"	71	#include "metadata.h"
72	#include "metadata.h"
73	#include "tagcache.h"	72	#include "tagcache.h"
74	#include "buffer.h"	73	#include "buffer.h"
75	#include "crc32.h"	74	#include "crc32.h"
@@ -77,7 +76,6 @@
77	#include "settings.h"	76	#include "settings.h"
78	#include "dir.h"	77	#include "dir.h"
79	#include "structec.h"	78	#include "structec.h"
80	#include "tagcache.h"
81		79
82	#ifndef __PCTOOL__	80	#ifndef __PCTOOL__
83	#include "lang.h"	81	#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 @@
44	#include "playback.h"	44	#include "playback.h"
45	#endif	45	#endif
46	#include "debug.h"	46	#include "debug.h"
47	#include "kernel.h"
48		47
49		48
50	/* Memory layout varies between targets because the	49	/* 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 @@
72	#include "list.h"	72	#include "list.h"
73	#include "splash.h"	73	#include "splash.h"
74	#include "buttonbar.h"	74	#include "buttonbar.h"
75	#include "action.h"
76	#include "quickscreen.h"	75	#include "quickscreen.h"
77		76
78	#include "root_menu.h"	77	#include "root_menu.h"


diff --git a/firmware/drivers/synaptics-mep.c b/firmware/drivers/synaptics-mep.c index a14e875cc1..57aeefeadf 100644 --- a/firmware/drivers/synaptics-mep.c +++ b/firmware/drivers/synaptics-mep.c
@@ -24,7 +24,6 @@
24	#include "cpu.h"	24	#include "cpu.h"
25	#include "system.h"	25	#include "system.h"
26	#include "kernel.h"	26	#include "kernel.h"
27	#include "system.h"
28		27
29	#define LOGF_ENABLE	28	#define LOGF_ENABLE
30	#include "logf.h"	29	#include "logf.h"


diff --git a/firmware/export/cpu.h b/firmware/export/cpu.h index ea56d7e6a0..4623f57004 100644 --- a/firmware/export/cpu.h +++ b/firmware/export/cpu.h
@@ -65,6 +65,4 @@
65	#if CONFIG_CPU == AS3525	65	#if CONFIG_CPU == AS3525
66	#include "as3525.h"	66	#include "as3525.h"
67	#endif	67	#endif
68	#if CONFIG_CPU == JZ4732	68
69	#include "jz4740.h"
70	#endif


diff --git a/firmware/target/arm/imx31/gigabeat-s/button-imx31.c b/firmware/target/arm/imx31/gigabeat-s/button-imx31.c index 320af7ca66..ae158b811d 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 @@
24	#include "system.h"	24	#include "system.h"
25	#include "button.h"	25	#include "button.h"
26	#include "backlight.h"	26	#include "backlight.h"
27	#include "system.h"
28	#include "backlight-target.h"	27	#include "backlight-target.h"
29	#include "avic-imx31.h"	28	#include "avic-imx31.h"
30	#include "ccm-imx31.h"	29	#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 6c02d750f7..6c2a8c059c 100644 --- a/firmware/target/arm/ipod/button-1g-3g.c +++ b/firmware/target/arm/ipod/button-1g-3g.c
@@ -38,7 +38,6 @@
38	#include "backlight.h"	38	#include "backlight.h"
39	#include "serial.h"	39	#include "serial.h"
40	#include "power.h"	40	#include "power.h"
41	#include "system.h"
42	#include "powermgmt.h"	41	#include "powermgmt.h"
43	#include "hwcompat.h"	42	#include "hwcompat.h"
44		43


diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c index bdfc42ef98..727842834f 100644 --- a/firmware/target/arm/ipod/button-clickwheel.c +++ b/firmware/target/arm/ipod/button-clickwheel.c
@@ -38,7 +38,6 @@
38	#include "backlight.h"	38	#include "backlight.h"
39	#include "serial.h"	39	#include "serial.h"
40	#include "power.h"	40	#include "power.h"
41	#include "system.h"
42	#include "powermgmt.h"	41	#include "powermgmt.h"
43		42
44	#define WHEEL_FAST_OFF_TIMEOUT 250000 /* timeout for acceleration = 250ms */	43	#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 d6d151763b..5831cdfc31 100644 --- a/firmware/target/arm/ipod/button-mini1g.c +++ b/firmware/target/arm/ipod/button-mini1g.c
@@ -38,7 +38,6 @@
38	#include "backlight.h"	38	#include "backlight.h"
39	#include "serial.h"	39	#include "serial.h"
40	#include "power.h"	40	#include "power.h"
41	#include "system.h"
42	#include "powermgmt.h"	41	#include "powermgmt.h"
43		42
44	/* Variable to use for setting button status in interrupt handler */	43	/* 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 53b159a2ec..6710f39281 100644 --- a/firmware/target/arm/iriver/h10/button-h10.c +++ b/firmware/target/arm/iriver/h10/button-h10.c
@@ -30,7 +30,6 @@
30	#include "kernel.h"	30	#include "kernel.h"
31	#include "backlight.h"	31	#include "backlight.h"
32	#include "adc.h"	32	#include "adc.h"
33	#include "system.h"
34		33
35		34
36	void button_init_device(void)	35	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 cdd4fb71ec..45f9fae478 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 @@
28	#include "kernel.h"	28	#include "kernel.h"
29	#include "backlight.h"	29	#include "backlight.h"
30	#include "adc.h"	30	#include "adc.h"
31	#include "system.h"
32		31
33		32
34	void button_init_device(void)	33	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 090e485178..0e69cbd420 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 @@
26	#include "kernel.h"	26	#include "kernel.h"
27	#include "backlight.h"	27	#include "backlight.h"
28	#include "adc.h"	28	#include "adc.h"
29	#include "system.h"
30	#include "backlight-target.h"	29	#include "backlight-target.h"
31		30
32	static bool headphones_detect;	31	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 ad00275520..6cdca5b35d 100644 --- a/firmware/target/arm/tatung/tpj1022/button-tpj1022.c +++ b/firmware/target/arm/tatung/tpj1022/button-tpj1022.c
@@ -28,7 +28,6 @@
28	#include "button.h"	28	#include "button.h"
29	#include "kernel.h"	29	#include "kernel.h"
30	#include "backlight.h"	30	#include "backlight.h"
31	#include "system.h"
32		31
33	void button_init_device(void)	32	void button_init_device(void)
34	{	33	{


diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c index 1dc453b800..97945397b2 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 @@
25	#include "config.h"	25	#include "config.h"
26	#include "cpu.h"	26	#include "cpu.h"
27	#include "string.h"	27	#include "string.h"
28	#include "lcd.h"
29	#include "kernel.h"	28	#include "kernel.h"
30	#include "memory.h"	29	#include "memory.h"
31	#include "system-target.h"	30	#include "system-target.h"