--- a/src/xs_support.h	Tue Sep 25 11:29:00 2007 +0000
+++ b/src/xs_support.h	Thu Oct 18 00:15:05 2007 +0000
@@ -16,7 +16,6 @@
 #include <audacious/plugin.h>
 #include <audacious/output.h>
 #include <audacious/util.h>
-#include <audacious/tuple.h>
 #define HAVE_MEMSET
 #else
 #include <xmms/plugin.h>
@@ -71,14 +70,14 @@
 #ifdef __AUDACIOUS_NEWVFS__
 #include <audacious/vfs.h>
 #define t_xs_file VFSFile
-#define xs_fopen(a,b) vfs_fopen(a,b)
-#define xs_fclose(a) vfs_fclose(a)
-#define xs_fgetc(a) vfs_getc(a)
-#define xs_fread(a,b,c,d) vfs_fread(a,b,c,d)
-#define xs_feof(a) vfs_feof(a)
+#define xs_fopen(a,b) aud_vfs_fopen(a,b)
+#define xs_fclose(a) aud_vfs_fclose(a)
+#define xs_fgetc(a) aud_vfs_getc(a)
+#define xs_fread(a,b,c,d) aud_vfs_fread(a,b,c,d)
+#define xs_feof(a) aud_vfs_feof(a)
 #define xs_ferror(a) (0)
-#define xs_ftell(a) vfs_ftell(a)
-#define xs_fseek(a,b,c) vfs_fseek(a,b,c)
+#define xs_ftell(a) aud_vfs_ftell(a)
+#define xs_fseek(a,b,c) aud_vfs_fseek(a,b,c)
 #else
 #define t_xs_file FILE
 t_xs_file *xs_fopen(const gchar *, const gchar *);