# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1206961233 -10800
# Node ID 42a5c9d5830ba6263b67b8b46a7bdbc61bcc7c86
# Parent  1505a1e40090df0d0a6e8e4540211975c87d2671
Include cleanups, part #1.

diff -r 1505a1e40090 -r 42a5c9d5830b src/OSS/configure.c
--- a/src/OSS/configure.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/OSS/configure.c	Mon Mar 31 14:00:33 2008 +0300
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <audacious/configdb.h>
 #include <audacious/i18n.h>
 
 
diff -r 1505a1e40090 -r 42a5c9d5830b src/OSS/init.c
--- a/src/OSS/init.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/OSS/init.c	Mon Mar 31 14:00:33 2008 +0300
@@ -21,7 +21,6 @@
 
 #include <glib.h>
 #include <string.h>
-#include <audacious/configdb.h>
 #include "OSS.h"
 
 
diff -r 1505a1e40090 -r 42a5c9d5830b src/aac/libmp4.c
--- a/src/aac/libmp4.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/aac/libmp4.c	Mon Mar 31 14:00:33 2008 +0300
@@ -11,7 +11,6 @@
 #include <audacious/util.h>
 #include <audacious/i18n.h>
 #include <audacious/strings.h>
-#include <audacious/main.h>
 
 #define MP4_VERSION VERSION
 #define SBR_DEC
diff -r 1505a1e40090 -r 42a5c9d5830b src/alsa/alsa.h
--- a/src/alsa/alsa.h	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/alsa/alsa.h	Mon Mar 31 14:00:33 2008 +0300
@@ -26,8 +26,6 @@
 #include "config.h"
 
 #include <audacious/util.h>
-#include <audacious/configdb.h>
-#include <audacious/main.h>
 #include <audacious/plugin.h>
 #include <audacious/i18n.h>
 
diff -r 1505a1e40090 -r 42a5c9d5830b src/alsa/init.c
--- a/src/alsa/init.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/alsa/init.c	Mon Mar 31 14:00:33 2008 +0300
@@ -17,7 +17,6 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include <glib.h>
-#include <audacious/main.h>
 #include "alsa.h"
 #include <dlfcn.h>
 #include <ctype.h>
diff -r 1505a1e40090 -r 42a5c9d5830b src/cue/cuesheet.c
--- a/src/cue/cuesheet.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/cue/cuesheet.c	Mon Mar 31 14:00:33 2008 +0300
@@ -25,10 +25,8 @@
 #include <ctype.h>
 #include <audacious/plugin.h>
 #include <audacious/output.h>
-#include <audacious/playlist.h>
 #include <audacious/util.h>
 #include <audacious/strings.h>
-#include <audacious/main.h>
 
 #define MAX_CUE_LINE_LENGTH 1000
 #define MAX_CUE_TRACKS 1000
diff -r 1505a1e40090 -r 42a5c9d5830b src/m3u/m3u.c
--- a/src/m3u/m3u.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/m3u/m3u.c	Mon Mar 31 14:00:33 2008 +0300
@@ -34,10 +34,7 @@
 #include <sys/errno.h>
 
 #include <audacious/plugin.h>
-#include <audacious/main.h>
 #include <audacious/util.h>
-#include <audacious/playlist.h>
-#include <audacious/playlist_container.h>
 #include <audacious/strings.h>
 
 static void
diff -r 1505a1e40090 -r 42a5c9d5830b src/pls/pls.c
--- a/src/pls/pls.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/pls/pls.c	Mon Mar 31 14:00:33 2008 +0300
@@ -33,10 +33,7 @@
 #include <sys/stat.h>
 #include <sys/errno.h>
 
-#include <audacious/main.h>
 #include <audacious/util.h>
-#include <audacious/playlist.h>
-#include <audacious/playlist_container.h>
 #include <audacious/plugin.h>
 #include <audacious/strings.h>
 
diff -r 1505a1e40090 -r 42a5c9d5830b src/scrobbler/configure.c
--- a/src/scrobbler/configure.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/scrobbler/configure.c	Mon Mar 31 14:00:33 2008 +0300
@@ -4,7 +4,6 @@
 
 #include <audacious/util.h>
 #include <audacious/plugin.h>
-#include <audacious/configdb.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff -r 1505a1e40090 -r 42a5c9d5830b src/scrobbler/gtkstuff.c
--- a/src/scrobbler/gtkstuff.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/scrobbler/gtkstuff.c	Mon Mar 31 14:00:33 2008 +0300
@@ -1,5 +1,4 @@
 #include <audacious/util.h>
-#include <audacious/configdb.h>
 
 #include <glib.h>
 #include <audacious/i18n.h>
diff -r 1505a1e40090 -r 42a5c9d5830b src/scrobbler/plugin.c
--- a/src/scrobbler/plugin.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/scrobbler/plugin.c	Mon Mar 31 14:00:33 2008 +0300
@@ -9,11 +9,8 @@
 
 #include <audacious/plugin.h>
 #include <audacious/ui_preferences.h>
-#include <audacious/playlist.h>
-#include <audacious/configdb.h>
 #include <audacious/hook.h>
 #include <audacious/strings.h>
-#include <audacious/main.h>
 
 #include <unistd.h>
 #include <stdio.h>
diff -r 1505a1e40090 -r 42a5c9d5830b src/sid/xs_support.h
--- a/src/sid/xs_support.h	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/sid/xs_support.h	Mon Mar 31 14:00:33 2008 +0300
@@ -67,7 +67,6 @@
 /* VFS replacement functions
  */
 #ifdef __AUDACIOUS_NEWVFS__
-#include <audacious/vfs.h>
 #define t_xs_file VFSFile
 #define xs_fopen(a,b) aud_vfs_fopen(a,b)
 #define xs_fclose(a) aud_vfs_fclose(a)
@@ -79,7 +78,7 @@
 #define xs_fseek(a,b,c) aud_vfs_fseek(a,b,c)
 #else
 #define t_xs_file FILE
-#define xs_fopen(a,b)fopen(a,b)
+#define xs_fopen(a,b) fopen(a,b)
 #define xs_fclose(a) fclose(a)
 #define xs_fgetc(a) fgetc(a)
 #define xs_fread(a,b,c,d) fread(a,b,c,d)
diff -r 1505a1e40090 -r 42a5c9d5830b src/vorbis/configure.c
--- a/src/vorbis/configure.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/vorbis/configure.c	Mon Mar 31 14:00:33 2008 +0300
@@ -8,7 +8,6 @@
 #include <string.h>
 
 #include <audacious/plugin.h>
-#include <audacious/configdb.h>
 #include <audacious/util.h>
 #include <audacious/i18n.h>
 
diff -r 1505a1e40090 -r 42a5c9d5830b src/vorbis/vorbis.c
--- a/src/vorbis/vorbis.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/vorbis/vorbis.c	Mon Mar 31 14:00:33 2008 +0300
@@ -55,8 +55,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>
 #include <audacious/strings.h>
 
diff -r 1505a1e40090 -r 42a5c9d5830b src/vtx/about.c
--- a/src/vtx/about.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/vtx/about.c	Mon Mar 31 14:00:33 2008 +0300
@@ -1,10 +1,6 @@
 #include <audacious/plugin.h>
-#include <audacious/util.h>
-#include <audacious/plugin.h>
-
 #include <audacious/output.h>
 #include <audacious/util.h>
-#include <audacious/vfs.h>
 #include <audacious/strings.h>
 #include <audacious/i18n.h>
 
diff -r 1505a1e40090 -r 42a5c9d5830b src/vtx/ayemu_vtxfile.h
--- a/src/vtx/ayemu_vtxfile.h	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/vtx/ayemu_vtxfile.h	Mon Mar 31 14:00:33 2008 +0300
@@ -3,7 +3,7 @@
 
 #include <glib.h>
 #include <inttypes.h>
-#include <audacious/vfs.h>
+#include <audacious/plugin.h>
 #include "ayemu_8912.h"
 
 /* The following constants and data structure comes from
diff -r 1505a1e40090 -r 42a5c9d5830b src/vtx/info.c
--- a/src/vtx/info.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/vtx/info.c	Mon Mar 31 14:00:33 2008 +0300
@@ -1,13 +1,10 @@
-#include <audacious/plugin.h>
+#include "ayemu.h"
+#include "vtx.h"
 #include <audacious/util.h>
 #include <audacious/output.h>
-#include <audacious/vfs.h>
 #include <audacious/strings.h>
 #include <audacious/i18n.h>
 
-#include "ayemu.h"
-#include "vtx.h"
-
 void vtx_file_info(gchar *filename)
 {
   static GtkWidget *box;
diff -r 1505a1e40090 -r 42a5c9d5830b src/vtx/vtx.c
--- a/src/vtx/vtx.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/vtx/vtx.c	Mon Mar 31 14:00:33 2008 +0300
@@ -18,17 +18,13 @@
  */
 
 #include <audacious/plugin.h>
-
 #include <audacious/output.h>
 #include <audacious/util.h>
-#include <audacious/configdb.h>
-#include <audacious/vfs.h>
-#include <audacious/main.h>
 #include <audacious/strings.h>
 #include <audacious/i18n.h>
 
 #include "vtx.h"
-#include <ayemu.h>
+#include "ayemu.h"
 
 extern InputPlugin vtx_ip;
 
diff -r 1505a1e40090 -r 42a5c9d5830b src/vtx/vtx.h
--- a/src/vtx/vtx.h	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/vtx/vtx.h	Mon Mar 31 14:00:33 2008 +0300
@@ -3,8 +3,6 @@
 
 #include <config.h>
 
-#include <pthread.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff -r 1505a1e40090 -r 42a5c9d5830b src/wma/wma.c
--- a/src/wma/wma.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/wma/wma.c	Mon Mar 31 14:00:33 2008 +0300
@@ -40,7 +40,6 @@
 #include <audacious/util.h>
 #include <audacious/strings.h>
 #include <audacious/i18n.h>
-#include <audacious/main.h>
 
 #include "avcodec.h"
 #include "avformat.h"
diff -r 1505a1e40090 -r 42a5c9d5830b src/xspf/xspf.c
--- a/src/xspf/xspf.c	Mon Mar 31 12:57:49 2008 +0300
+++ b/src/xspf/xspf.c	Mon Mar 31 14:00:33 2008 +0300
@@ -34,11 +34,8 @@
 #include <sys/errno.h>
 
 #include <audacious/plugin.h>
-#include <audacious/main.h>
 #include <audacious/util.h>
 #include <audacious/strings.h>
-#include <audacious/playlist.h>
-#include <audacious/playlist_container.h>
 
 #include <libxml/tree.h>
 #include <libxml/parser.h>