--- a/src/xs_support.h	Wed Mar 26 08:55:29 2008 +0200
+++ b/src/xs_support.h	Wed Apr 02 19:46:59 2008 +0300
@@ -16,7 +16,6 @@
 #include <audacious/plugin.h>
 #include <audacious/output.h>
 #include <audacious/util.h>
-#define HAVE_MEMSET
 #else
 #include <xmms/plugin.h>
 #include <xmms/util.h>
@@ -68,8 +67,7 @@
 /* VFS replacement functions
  */
 #ifdef __AUDACIOUS_NEWVFS__
-#include <audacious/vfs.h>
-#define t_xs_file VFSFile
+#define xs_file_t VFSFile
 #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)
@@ -79,18 +77,18 @@
 #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 *);
-gint	xs_fclose(t_xs_file *);
-gint	xs_fgetc(t_xs_file *);
-size_t	xs_fread(void *, size_t, size_t, t_xs_file *);
-gint	xs_feof(t_xs_file *);
-gint	xs_ferror(t_xs_file *);
-glong	xs_ftell(t_xs_file *);
-gint	xs_fseek(t_xs_file *, glong, gint);
+#define xs_file_t FILE
+#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)
+#define xs_feof(a) feof(a)
+#define xs_ferror(a) ferror(a)
+#define xs_ftell(a) ftell(a)
+#define xs_fseek(a,b,c) fseek(a,b,c)
 #endif
-guint16 xs_fread_be16(t_xs_file *);
-guint32 xs_fread_be32(t_xs_file *);
+guint16 xs_fread_be16(xs_file_t *);
+guint32 xs_fread_be32(xs_file_t *);
 gint	xs_fload_buffer(const gchar *, guint8 **, size_t *);
 
 
@@ -105,12 +103,6 @@
 void	xs_findeol(const gchar *, size_t *);
 void	xs_findnum(const gchar *, size_t *);
 
-#ifdef HAVE_MEMSET
-#define	xs_memset memset
-#else
-void	*xs_memset(void *, int, size_t);
-#endif
-
 #ifdef __cplusplus
 }
 #endif