# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1206965885 -10800
# Node ID 4d6045c20cc555dac985409b23380fc00b38a54d
# Parent  194c2f8c2a920fcec3200a0a3300e84c2391708c
Include cleanups, part #4.

diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/alarm/alarm.c
--- a/src/alarm/alarm.c	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/alarm/alarm.c	Mon Mar 31 15:18:05 2008 +0300
@@ -40,7 +40,6 @@
 #include <stdio.h>
 #include <audacious/plugin.h>
 #include <audacious/auddrct.h>
-#include <audacious/configdb.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <pthread.h>
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/blur_scope/blur_scope.c
--- a/src/blur_scope/blur_scope.c	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/blur_scope/blur_scope.c	Mon Mar 31 15:18:05 2008 +0300
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <audacious/plugin.h>
 #include <audacious/util.h>
-#include <audacious/configdb.h>
 #include "blur_scope.h"
 #include "bscope_logo.xpm"
 
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/blur_scope/config.c
--- a/src/blur_scope/config.c	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/blur_scope/config.c	Mon Mar 31 15:18:05 2008 +0300
@@ -5,7 +5,6 @@
 #include <gtk/gtk.h>
 
 #include <audacious/plugin.h>
-#include <audacious/configdb.h>
 #include "blur_scope.h"
 
 
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/echo_plugin/echo.c
--- a/src/echo_plugin/echo.c	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/echo_plugin/echo.c	Mon Mar 31 15:18:05 2008 +0300
@@ -1,14 +1,12 @@
+#include "config.h"
 #include <audacious/plugin.h>
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <audacious/i18n.h>
-#include <audacious/configdb.h>
 #include "echo.h"
 
-#include "../../config.h"
 
 static void init(void);
 static void cleanup(void);
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/echo_plugin/gui.c
--- a/src/echo_plugin/gui.c	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/echo_plugin/gui.c	Mon Mar 31 15:18:05 2008 +0300
@@ -4,7 +4,6 @@
 #include <audacious/plugin.h>
 #include <audacious/i18n.h>
 #include <audacious/util.h>
-#include <audacious/configdb.h>
 #include "echo.h"
 
 static const char *echo_about_text =
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/filewriter/filewriter.h
--- a/src/filewriter/filewriter.h	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/filewriter/filewriter.h	Mon Mar 31 15:18:05 2008 +0300
@@ -29,13 +29,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <audacious/main.h>
 #include <audacious/plugin.h>
-#include <audacious/playlist.h>
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
 #include <audacious/util.h>
-#include <audacious/vfs.h>
 
 struct format_info { 
     AFormat format;
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/sexypsf/plugin.c
--- a/src/sexypsf/plugin.c	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/sexypsf/plugin.c	Mon Mar 31 15:18:05 2008 +0300
@@ -18,7 +18,6 @@
 
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/main.h>
 #include <audacious/util.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/sndstretch/sndstretch_xmms.c
--- a/src/sndstretch/sndstretch_xmms.c	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/sndstretch/sndstretch_xmms.c	Mon Mar 31 15:18:05 2008 +0300
@@ -25,7 +25,6 @@
 #include "FB_logo.xpm"
 
 #include "config.h"
-#include <audacious/configdb.h>
 #include <audacious/plugin.h>
 #include <audacious/i18n.h>
 #include <gtk/gtk.h>
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/statusicon/si.c
--- a/src/statusicon/si.c	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/statusicon/si.c	Mon Mar 31 15:18:05 2008 +0300
@@ -24,7 +24,6 @@
 #include "si_cfg.h"
 #include "si_common.h"
 #include <audacious/auddrct.h>
-#include <audacious/playlist.h>
 
 
 GeneralPlugin *statusicon_gplist[] = { &si_gp, NULL };
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/statusicon/si_cfg.c
--- a/src/statusicon/si_cfg.c	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/statusicon/si_cfg.c	Mon Mar 31 15:18:05 2008 +0300
@@ -21,7 +21,6 @@
 #include "si_cfg.h"
 #include "si_common.h"
 #include <audacious/plugin.h>
-#include <audacious/configdb.h>
 
 si_cfg_t si_cfg;
 
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/statusicon/si_ui.c
--- a/src/statusicon/si_ui.c	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/statusicon/si_ui.c	Mon Mar 31 15:18:05 2008 +0300
@@ -23,8 +23,6 @@
 #include "si_cfg.h"
 #include "si_common.h"
 #include "gtktrayicon.h"
-#include <audacious/playlist.h>
-#include <audacious/main.h>
 #include <audacious/ui_fileinfopopup.h>
 #include <audacious/util.h>
 #include <audacious/i18n.h>
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/timidity/xmms-timidity.c
--- a/src/timidity/xmms-timidity.c	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/timidity/xmms-timidity.c	Mon Mar 31 15:18:05 2008 +0300
@@ -20,8 +20,6 @@
 #include "config.h"
 
 #include <audacious/util.h>
-#include <audacious/configdb.h>
-#include <audacious/main.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <string.h>
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/wavpack/libwavpack.cxx
--- a/src/wavpack/libwavpack.cxx	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/wavpack/libwavpack.cxx	Mon Mar 31 15:18:05 2008 +0300
@@ -11,10 +11,7 @@
 #include <wavpack/wavpack.h>
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/configdb.h>
-#include <audacious/main.h>
 #include <audacious/util.h>
-#include <audacious/vfs.h>
 }
 #include <glib.h>
 #include <gtk/gtk.h>
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/wavpack/tags.cxx
--- a/src/wavpack/tags.cxx	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/wavpack/tags.cxx	Mon Mar 31 15:18:05 2008 +0300
@@ -5,7 +5,6 @@
 #include <fcntl.h>
 #include <wchar.h>
 #include <audacious/util.h>
-#include <audacious/vfs.h>
 #include <audacious/plugin.h>
 #include "tags.h"
 
diff -r 194c2f8c2a92 -r 4d6045c20cc5 src/wavpack/ui.cxx
--- a/src/wavpack/ui.cxx	Mon Mar 31 15:11:29 2008 +0300
+++ b/src/wavpack/ui.cxx	Mon Mar 31 15:18:05 2008 +0300
@@ -9,7 +9,6 @@
 extern "C" {
 #include <wavpack/wavpack.h>
 #include <audacious/plugin.h>
-#include <audacious/configdb.h>
 #include <audacious/util.h>
 #include <audacious/i18n.h>
 }