# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1206966127 -10800
# Node ID 41c619e96a1731141a6258fd9025adcb447119ea
# Parent  4d6045c20cc555dac985409b23380fc00b38a54d
Include cleanups, part #5.

diff -r 4d6045c20cc5 -r 41c619e96a17 src/jack/configure.c
--- a/src/jack/configure.c	Mon Mar 31 15:18:05 2008 +0300
+++ b/src/jack/configure.c	Mon Mar 31 15:22:07 2008 +0300
@@ -25,7 +25,6 @@
 #include "jack.h"
 
 #include <audacious/plugin.h>
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
 # include "config.h"
 
diff -r 4d6045c20cc5 -r 41c619e96a17 src/jack/jack.c
--- a/src/jack/jack.c	Mon Mar 31 15:18:05 2008 +0300
+++ b/src/jack/jack.c	Mon Mar 31 15:22:07 2008 +0300
@@ -7,7 +7,6 @@
  */
 
 #include <audacious/plugin.h>
-#include <audacious/configdb.h>
 #include <audacious/util.h>
 #include <dlfcn.h>
 #include <gtk/gtk.h>
diff -r 4d6045c20cc5 -r 41c619e96a17 src/null/null.c
--- a/src/null/null.c	Mon Mar 31 15:18:05 2008 +0300
+++ b/src/null/null.c	Mon Mar 31 15:22:07 2008 +0300
@@ -19,14 +19,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-
+#include "config.h"
 #include <glib.h>
-#include <audacious/i18n.h>
 #include <gtk/gtk.h>
 #include <audacious/plugin.h>
+#include <audacious/i18n.h>
 #include <audacious/util.h>
-#include <audacious/configdb.h>
-#include "../../config.h"
 
 static GTimer *timer;
 static gulong offset_time, written;
diff -r 4d6045c20cc5 -r 41c619e96a17 src/sndfile/plugin.c
--- a/src/sndfile/plugin.c	Mon Mar 31 15:18:05 2008 +0300
+++ b/src/sndfile/plugin.c	Mon Mar 31 15:22:07 2008 +0300
@@ -37,7 +37,6 @@
 #include <audacious/plugin.h>
 #include <audacious/util.h>
 #include <audacious/i18n.h>
-#include <audacious/main.h>
 #include <audacious/output.h>
 #include "plugin.h"
 
diff -r 4d6045c20cc5 -r 41c619e96a17 src/sun/configure.c
--- a/src/sun/configure.c	Mon Mar 31 15:18:05 2008 +0300
+++ b/src/sun/configure.c	Mon Mar 31 15:22:07 2008 +0300
@@ -23,7 +23,6 @@
 
 #include "sun.h"
 #include <audacious/util.h>
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
 
 #include "mixer.h"
diff -r 4d6045c20cc5 -r 41c619e96a17 src/sun/sun.c
--- a/src/sun/sun.c	Mon Mar 31 15:18:05 2008 +0300
+++ b/src/sun/sun.c	Mon Mar 31 15:22:07 2008 +0300
@@ -20,7 +20,6 @@
 #include <glib.h>
 
 #include "sun.h"
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
 
 #include <errno.h>
diff -r 4d6045c20cc5 -r 41c619e96a17 src/sun/sun.h
--- a/src/sun/sun.h	Mon Mar 31 15:18:05 2008 +0300
+++ b/src/sun/sun.h	Mon Mar 31 15:22:07 2008 +0300
@@ -36,7 +36,6 @@
 #include "audioio.h"
 
 #include <audacious/plugin.h>
-#include <audacious/configdb.h>
 
 /* Default path to audio device. */
 #ifndef SUN_DEV_AUDIO