--- a/src/xmms-sid.h	Sat Feb 17 16:35:01 2007 +0000
+++ b/src/xmms-sid.h	Tue Feb 20 16:53:05 2007 +0000
@@ -20,8 +20,8 @@
    with this program; if not, write to the Free Software Foundation, Inc.,
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#ifndef _XMMS_SID_H
-#define _XMMS_SID_H
+#ifndef XMMS_SID_H
+#define XMMS_SID_H
 
 #include "xs_support.h"
 #include <pthread.h>
@@ -165,50 +165,10 @@
 } t_xs_tuneinfo;
 
 
-struct t_xs_status;
-
-typedef struct {
-	gint		plrIdent;
-	gboolean	(*plrIsOurFile)(t_xs_file *);
-	gboolean	(*plrInit)(struct t_xs_status *);
-	void		(*plrClose)(struct t_xs_status *);
-	gboolean	(*plrInitSong)(struct t_xs_status *);
-	guint		(*plrFillBuffer)(struct t_xs_status *, gchar *, guint);
-	gboolean	(*plrLoadSID)(struct t_xs_status *, gchar *);
-	void		(*plrDeleteSID)(struct t_xs_status *);
-	t_xs_tuneinfo*	(*plrGetSIDInfo)(gchar *);
-	gboolean	(*plrUpdateSIDInfo)(struct t_xs_status *);
-} t_xs_player;
-
-
-typedef struct t_xs_status {
-	gint		audioFrequency,		/* Audio settings */
-			audioChannels,
-			audioBitsPerSample,
-			oversampleFactor;	/* Factor of oversampling */
-	AFormat		audioFormat;
-	gboolean	oversampleEnable;	/* TRUE after sidEngine initialization,
-						if xs_cfg.oversampleEnable == TRUE and
-						emulation backend supports oversampling.
-						*/
-	void		*sidEngine;		/* SID-emulation internal engine data */
-	t_xs_player	*sidPlayer;		/* Selected player engine */
-	gboolean	isError, isPlaying, isInitialized;
-	gint		currSong,		/* Current sub-tune */
-			lastTime;
-
-	t_xs_tuneinfo	*tuneInfo;
-} t_xs_status;
-
-
 /* Global variables
  */
 extern InputPlugin	xs_plugin_ip;
 
-extern t_xs_status	xs_status;
-XS_MUTEX_H(xs_status);
-
-
 
 /* Plugin function prototypes
  */
@@ -250,4 +210,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* _XMMS_SID_H */
+#endif /* XMMS_SID_H */