--- a/src/xmms-sid.c	Mon Nov 05 17:53:22 2012 +0200
+++ b/src/xmms-sid.c	Mon Nov 05 18:42:57 2012 +0200
@@ -44,7 +44,7 @@
 /*
  * Global variables
  */
-xs_status_t xs_status;
+XSEngineState xs_status;
 XS_MUTEX(xs_status);
 static XS_THREAD_T xs_decode_thread;
 
@@ -190,7 +190,7 @@
 
     /* Try to detect via detection routine, if required */
     if (xs_cfg.detectMagic) {
-        xs_file_t *f;
+        XSFile *f;
         if ((f = xs_fopen(filename, "rb")) != NULL) {
             if (xs_status.sidPlayer->plrProbe(f))
                 return TRUE;
@@ -228,8 +228,8 @@
  */
 void *xs_playthread(void *argPointer)
 {
-    xs_status_t myStatus;
-    xs_tuneinfo_t *myTune;
+    XSEngineState myStatus;
+    XSTuneInfo *myTune;
     gboolean audioOpen = FALSE, doPlay = FALSE, isFound = FALSE;
     gint audioGot, songLength, i;
     gchar *audioBuffer = NULL, *tmpTitle;
@@ -239,7 +239,7 @@
     /* Initialize */
     XSDEBUG("entering player thread\n");
     XS_MUTEX_LOCK(xs_status);
-    memcpy(&myStatus, &xs_status, sizeof(xs_status_t));
+    memcpy(&myStatus, &xs_status, sizeof(XSEngineState));
     myTune = xs_status.tuneInfo;
     for (i = 0; i <= myTune->nsubTunes; i++)
         myTune->subTunes[i].tunePlayed = FALSE;
@@ -826,7 +826,7 @@
  */
 void xs_get_song_info(gchar * songFilename, gchar ** songTitle, gint * songLength)
 {
-    xs_tuneinfo_t *info;
+    XSTuneInfo *info;
     
     XS_MUTEX_LOCK(xs_status);