# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1206968602 -10800
# Node ID 7b284f323ad87f10c84f5109172a2ab6e54328ee
# Parent  41c619e96a1731141a6258fd9025adcb447119ea
Include cleanups, part #6.

diff -r 41c619e96a17 -r 7b284f323ad8 src/CoreAudio/configure.c
--- a/src/CoreAudio/configure.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/CoreAudio/configure.c	Mon Mar 31 16:03:22 2008 +0300
@@ -18,9 +18,8 @@
  */
 
 #include "coreaudio.h"
-#include <audacious/configdb.h>
 #include <CoreAudio/CoreAudio.h>
-
+#include <audacious/plugin.h>
 #include <audacious/i18n.h>
 
 static GtkWidget *configure_win = NULL;
diff -r 41c619e96a17 -r 7b284f323ad8 src/CoreAudio/init.c
--- a/src/CoreAudio/init.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/CoreAudio/init.c	Mon Mar 31 16:03:22 2008 +0300
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include "coreaudio.h"
-#include <audacious/configdb.h>
+#include <audacious/plugin.h>
 
 OSXConfig osx_cfg;
 
diff -r 41c619e96a17 -r 7b284f323ad8 src/OSS4/OSS4.c
--- a/src/OSS4/OSS4.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/OSS4/OSS4.c	Mon Mar 31 16:03:22 2008 +0300
@@ -22,9 +22,9 @@
 #include "OSS4.h"
 
 #include <glib.h>
+#include <audacious/plugin.h>
 #include <audacious/i18n.h>
 #include <stdlib.h>
-#include <audacious/configdb.h>
 
 OutputPlugin oss_op = {
     .description = "OSS4 Output Plugin",                      /* Description */
diff -r 41c619e96a17 -r 7b284f323ad8 src/OSS4/configure.c
--- a/src/OSS4/configure.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/OSS4/configure.c	Mon Mar 31 16:03:22 2008 +0300
@@ -25,9 +25,7 @@
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <string.h>
-
-#include <audacious/configdb.h>
-#include <audacious/vfs.h>
+#include <audacious/plugin.h>
 #include <audacious/i18n.h>
 
 
diff -r 41c619e96a17 -r 7b284f323ad8 src/OSS4/init.c
--- a/src/OSS4/init.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/OSS4/init.c	Mon Mar 31 16:03:22 2008 +0300
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 #include <string.h>
-#include <audacious/configdb.h>
+#include <audacious/plugin.h>
 #include "OSS4.h"
 
 
diff -r 41c619e96a17 -r 7b284f323ad8 src/arts/arts.h
--- a/src/arts/arts.h	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/arts/arts.h	Mon Mar 31 16:03:22 2008 +0300
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include <audacious/plugin.h>
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
 # include "config.h"
 
diff -r 41c619e96a17 -r 7b284f323ad8 src/cdaudio-ng/cdaudio-ng.c
--- a/src/cdaudio-ng/cdaudio-ng.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/cdaudio-ng/cdaudio-ng.c	Mon Mar 31 16:03:22 2008 +0300
@@ -48,7 +48,6 @@
 #include <audacious/plugin.h>
 #include <audacious/i18n.h>
 #include <audacious/output.h>
-#include <audacious/playlist.h>
 #include <audacious/ui_plugin_menu.h>
 #include <audacious/util.h>
 
diff -r 41c619e96a17 -r 7b284f323ad8 src/dockalbumart/dockalbumart.c
--- a/src/dockalbumart/dockalbumart.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/dockalbumart/dockalbumart.c	Mon Mar 31 16:03:22 2008 +0300
@@ -29,7 +29,6 @@
 
 #include <audacious/plugin.h>
 #include <audacious/util.h>
-#include <audacious/playlist.h>
 
 #include "audacious_player.xpm"
 
diff -r 41c619e96a17 -r 7b284f323ad8 src/esd/configure.c
--- a/src/esd/configure.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/esd/configure.c	Mon Mar 31 16:03:22 2008 +0300
@@ -22,11 +22,11 @@
 #include "esdout.h"
 
 #include <glib.h>
+#include <audacious/plugin.h>
 #include <audacious/i18n.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
-#include <audacious/configdb.h>
 
 
 static GtkWidget *configure_win;
diff -r 41c619e96a17 -r 7b284f323ad8 src/esd/init.c
--- a/src/esd/init.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/esd/init.c	Mon Mar 31 16:03:22 2008 +0300
@@ -18,9 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <esd.h>
-
-#include <audacious/configdb.h>
-
+#include <audacious/plugin.h>
 #include "esdout.h"
 
 
diff -r 41c619e96a17 -r 7b284f323ad8 src/esd/mixer.c
--- a/src/esd/mixer.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/esd/mixer.c	Mon Mar 31 16:03:22 2008 +0300
@@ -23,9 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <esd.h>
-
-#include <audacious/configdb.h>
-
+#include <audacious/plugin.h>
+#include <audacious/util.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
@@ -45,7 +44,6 @@
 # define OSS_AVAILABLE FALSE
 #endif
 
-#include <audacious/util.h>
 
 #define QUERY_PLAYER_ID_ATTEMPTS 5
 
diff -r 41c619e96a17 -r 7b284f323ad8 src/hotkey/plugin.c
--- a/src/hotkey/plugin.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/hotkey/plugin.c	Mon Mar 31 16:03:22 2008 +0300
@@ -41,7 +41,6 @@
 #include <gdk/gdkx.h>
 #include <audacious/plugin.h>
 #include <audacious/auddrct.h>
-#include <audacious/configdb.h>
 
 #include <audacious/i18n.h>
 
diff -r 41c619e96a17 -r 7b284f323ad8 src/modplug/modplugbmp.cxx
--- a/src/modplug/modplugbmp.cxx	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/modplug/modplugbmp.cxx	Mon Mar 31 16:03:22 2008 +0300
@@ -15,7 +15,6 @@
 #include "stddefs.h"
 #include "archive/open.h"
 extern "C" {
-#include <audacious/configdb.h>
 #include <audacious/output.h>
 #include <audacious/strings.h>
 }
diff -r 41c619e96a17 -r 7b284f323ad8 src/mtp_up/mtp.c
--- a/src/mtp_up/mtp.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/mtp_up/mtp.c	Mon Mar 31 16:03:22 2008 +0300
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 #include <libmtp.h>
 #include <audacious/plugin.h>
-#include <audacious/playlist.h>
 #include <audacious/ui_plugin_menu.h>
 #include <audacious/i18n.h>
 
diff -r 41c619e96a17 -r 7b284f323ad8 src/musepack/libmpc.h
--- a/src/musepack/libmpc.h	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/musepack/libmpc.h	Mon Mar 31 16:03:22 2008 +0300
@@ -9,8 +9,6 @@
 #include <audacious/plugin.h>
 #include <audacious/output.h>
 #include <audacious/util.h>
-#include <audacious/configdb.h>
-#include <audacious/main.h>
 #include <audacious/i18n.h>
 }
 
diff -r 41c619e96a17 -r 7b284f323ad8 src/pulse_audio/pulse_audio.c
--- a/src/pulse_audio/pulse_audio.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/pulse_audio/pulse_audio.c	Mon Mar 31 16:03:22 2008 +0300
@@ -28,7 +28,6 @@
 
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
-#include <audacious/playlist.h>
 #include <audacious/util.h>
 #include <audacious/i18n.h>
 
diff -r 41c619e96a17 -r 7b284f323ad8 src/rootvis/config_backend.c
--- a/src/rootvis/config_backend.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/rootvis/config_backend.c	Mon Mar 31 16:03:22 2008 +0300
@@ -1,8 +1,7 @@
 #include <string.h>
-#include <audacious/configdb.h>
-
-#include <rootvis.h>
-#include <config.h>
+#include <audacious/plugin.h>
+#include "rootvis.h"
+#include "config.h"
 
 extern void config_def_init(void);
 extern void config_frontend_init(void);
diff -r 41c619e96a17 -r 7b284f323ad8 src/rootvis/config_frontend.c
--- a/src/rootvis/config_frontend.c	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/rootvis/config_frontend.c	Mon Mar 31 16:03:22 2008 +0300
@@ -1,9 +1,7 @@
 #include <stdarg.h>
 #include <string.h>
-
-#include <rootvis.h>
-
-#include <config_frontend.h>
+#include "rootvis.h"
+#include "config_frontend.h"
 
 extern GtkWidget *frontend_create_channel(int channel);
 extern GtkWidget *frontend_create_main(void);
diff -r 41c619e96a17 -r 7b284f323ad8 src/rootvis/config_frontend.h
--- a/src/rootvis/config_frontend.h	Mon Mar 31 15:22:07 2008 +0300
+++ b/src/rootvis/config_frontend.h	Mon Mar 31 16:03:22 2008 +0300
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 
 #define VBOX  	1
 #define HBOX  	2