# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1191339808 -10800
# Node ID e8ea3a76a84ea0a7d6fba700aa7a28d3caee346f
# Parent  a76855c7942e2ae05df9343f3235624a39db6d45
Various #include cleanups.

diff -r a76855c7942e -r e8ea3a76a84e src/OSS/configure.c
--- a/src/OSS/configure.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/OSS/configure.c	Tue Oct 02 18:43:28 2007 +0300
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include <audacious/configdb.h>
-#include <audacious/vfs.h>
 #include <audacious/i18n.h>
 
 
diff -r a76855c7942e -r e8ea3a76a84e src/cue/cuesheet.c
--- a/src/cue/cuesheet.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/cue/cuesheet.c	Tue Oct 02 18:43:28 2007 +0300
@@ -26,7 +26,6 @@
 #include <audacious/plugin.h>
 #include <audacious/output.h>
 #include <audacious/playlist.h>
-#include <audacious/vfs.h>
 #include <audacious/util.h>
 #include <audacious/strings.h>
 #include <audacious/main.h>
diff -r a76855c7942e -r e8ea3a76a84e src/daap/daap.c
--- a/src/daap/daap.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/daap/daap.c	Tue Oct 02 18:43:28 2007 +0300
@@ -20,7 +20,6 @@
 
 #include <glib.h>
 
-#include <audacious/vfs.h>
 #include <audacious/plugin.h>
 #include <audacious/discovery.h>
 
diff -r a76855c7942e -r e8ea3a76a84e src/dockalbumart/dockalbumart.c
--- a/src/dockalbumart/dockalbumart.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/dockalbumart/dockalbumart.c	Tue Oct 02 18:43:28 2007 +0300
@@ -30,7 +30,6 @@
 #include <audacious/plugin.h>
 #include <audacious/util.h>
 #include <audacious/playlist.h>
-#include <audacious/tuple.h>
 
 #include "audacious_player.xpm"
 
diff -r a76855c7942e -r e8ea3a76a84e src/flacng/flacng.h
--- a/src/flacng/flacng.h	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/flacng/flacng.h	Tue Oct 02 18:43:28 2007 +0300
@@ -19,12 +19,11 @@
 #ifndef FLACNG_H
 #define FLACNG_H
 
+#include "config.h"
 #include <glib.h>
 #include <audacious/plugin.h>
 #include <audacious/main.h>
-#include <audacious/vfs.h>
 #include <audacious/i18n.h>
-# include "config.h"
 
 #define OUTPUT_BLOCK_SIZE (8192u)
 #define MAX_SUPPORTED_CHANNELS (2u)
diff -r a76855c7942e -r e8ea3a76a84e src/flacng/plugin.c
--- a/src/flacng/plugin.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/flacng/plugin.c	Tue Oct 02 18:43:28 2007 +0300
@@ -17,10 +17,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "flacng.h"
 #include <audacious/util.h>
 #include <audacious/output.h>
 #include <glib/gi18n.h>
-#include "flacng.h"
 #include "tools.h"
 #include "plugin.h"
 #include "seekable_stream_callbacks.h"
diff -r a76855c7942e -r e8ea3a76a84e src/ladspa/ladspa.c
--- a/src/ladspa/ladspa.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/ladspa/ladspa.c	Tue Oct 02 18:43:28 2007 +0300
@@ -18,6 +18,8 @@
 
 /* BMP-ladspa port by Giacomo Lozito <city_hunter@users.sf.net> */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -31,7 +33,6 @@
 #include <audacious/configdb.h>
 #include <audacious/i18n.h>
 
-#include "../../config.h"
 #include "ladspa.h"
 
 #ifndef PATH_MAX
diff -r a76855c7942e -r e8ea3a76a84e src/madplug/plugin.h
--- a/src/madplug/plugin.h	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/madplug/plugin.h	Tue Oct 02 18:43:28 2007 +0300
@@ -40,7 +40,6 @@
 #include <audacious/main.h>
 #include <audacious/util.h>
 #include <audacious/strings.h>
-#include <audacious/vfs.h>
 #include <audacious/i18n.h>
 #include <audacious/id3tag.h>
 #include <mad.h>
diff -r a76855c7942e -r e8ea3a76a84e src/metronom/metronom.c
--- a/src/metronom/metronom.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/metronom/metronom.c	Tue Oct 02 18:43:28 2007 +0300
@@ -17,10 +17,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include <audacious/plugin.h>
 #include <audacious/util.h>
 #include <audacious/i18n.h>
-#include "../../config.h"
 #include <glib.h>
 #include <string.h>
 
diff -r a76855c7942e -r e8ea3a76a84e src/mms/mms.c
--- a/src/mms/mms.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/mms/mms.c	Tue Oct 02 18:43:28 2007 +0300
@@ -18,7 +18,6 @@
 
 #include <glib.h>
 
-#include <audacious/vfs.h>
 #include <audacious/plugin.h>
 #include <stdio.h>
 
diff -r a76855c7942e -r e8ea3a76a84e src/neon/neon.c
--- a/src/neon/neon.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/neon/neon.c	Tue Oct 02 18:43:28 2007 +0300
@@ -17,7 +17,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <audacious/vfs.h>
+#include "neon.h"
+
 #include <audacious/plugin.h>
 #include <audacious/configdb.h>
 
@@ -28,7 +29,6 @@
 #include <ne_auth.h>
 
 #include "debug.h"
-#include "neon.h"
 #include "rb.h"
 
 #define NBUFSIZ (128u*1024u)
diff -r a76855c7942e -r e8ea3a76a84e src/neon/neon.h
--- a/src/neon/neon.h	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/neon/neon.h	Tue Oct 02 18:43:28 2007 +0300
@@ -20,6 +20,8 @@
 #ifndef _NEON_PLUGIN_H
 #define _NEON_PLUGIN_H
 
+#include "config.h"
+
 #include <glib.h>
 #include <audacious/vfs.h>
 #include <ne_session.h>
diff -r a76855c7942e -r e8ea3a76a84e src/pls/pls.c
--- a/src/pls/pls.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/pls/pls.c	Tue Oct 02 18:43:28 2007 +0300
@@ -36,7 +36,6 @@
 #include <audacious/playlist.h>
 #include <audacious/playlist_container.h>
 #include <audacious/plugin.h>
-#include <audacious/vfs.h>
 #include <audacious/strings.h>
 
 static void
diff -r a76855c7942e -r e8ea3a76a84e src/shnplug/id3v2.c
--- a/src/shnplug/id3v2.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/shnplug/id3v2.c	Tue Oct 02 18:43:28 2007 +0300
@@ -20,13 +20,10 @@
  * $Id: id3v2.c,v 1.6 2007/03/23 05:49:48 jason Exp $
  */
 
+#include "config.h"
 #include <stdio.h>
 #include "shorten.h"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #define ID3V2_MAGIC "ID3"
 
 typedef struct {
diff -r a76855c7942e -r e8ea3a76a84e src/shnplug/shorten.h
--- a/src/shnplug/shorten.h	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/shnplug/shorten.h	Tue Oct 02 18:43:28 2007 +0300
@@ -13,9 +13,7 @@
 #ifndef _SHORTEN_H
 #define _SHORTEN_H
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdlib.h>
 #include <pthread.h>
diff -r a76855c7942e -r e8ea3a76a84e src/smb/smb.c
--- a/src/smb/smb.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/smb/smb.c	Tue Oct 02 18:43:28 2007 +0300
@@ -16,6 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include "config.h"
 #include <audacious/plugin.h>
 #include <stdio.h>
 
diff -r a76855c7942e -r e8ea3a76a84e src/tonegen/tonegen.c
--- a/src/tonegen/tonegen.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/tonegen/tonegen.c	Tue Oct 02 18:43:28 2007 +0300
@@ -17,11 +17,11 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include "config.h"
 #include <audacious/plugin.h>
 #include <audacious/output.h>
 #include <audacious/util.h>
 #include <audacious/i18n.h>
-#include "config.h"
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
diff -r a76855c7942e -r e8ea3a76a84e src/tta/libtta.c
--- a/src/tta/libtta.c	Tue Oct 02 18:42:14 2007 +0300
+++ b/src/tta/libtta.c	Tue Oct 02 18:43:28 2007 +0300
@@ -45,7 +45,6 @@
 #include <audacious/output.h>
 #include <audacious/strings.h>
 #include <audacious/i18n.h>
-
 #include <audacious/id3tag.h>
 
 #define  PLUGIN_VERSION "1.4"