--- a/src/xs_player.h	Mon Nov 05 17:53:22 2012 +0200
+++ b/src/xs_player.h	Mon Nov 05 18:42:57 2012 +0200
@@ -8,49 +8,49 @@
 extern "C" {
 #endif
 
-struct xs_status_t;
+struct XSEngineState;
 
 typedef struct {
     gint        plrIdent;
-    gboolean    (*plrProbe)(xs_file_t *);
-    gboolean    (*plrInit)(struct xs_status_t *);
-    void        (*plrClose)(struct xs_status_t *);
-    gboolean    (*plrInitSong)(struct xs_status_t *);
-    guint       (*plrFillBuffer)(struct xs_status_t *, gchar *, guint);
-    gboolean    (*plrLoadSID)(struct xs_status_t *, gchar *);
-    void        (*plrDeleteSID)(struct xs_status_t *);
-    xs_tuneinfo_t*    (*plrGetSIDInfo)(const gchar *);
-    gboolean    (*plrUpdateSIDInfo)(struct xs_status_t *);
-    void        (*plrFlush)(struct xs_status_t *);
-} xs_engine_t;
+    gboolean    (*plrProbe)(XSFile *);
+    gboolean    (*plrInit)(struct XSEngineState *);
+    void        (*plrClose)(struct XSEngineState *);
+    gboolean    (*plrInitSong)(struct XSEngineState *);
+    guint       (*plrFillBuffer)(struct XSEngineState *, gchar *, guint);
+    gboolean    (*plrLoadSID)(struct XSEngineState *, gchar *);
+    void        (*plrDeleteSID)(struct XSEngineState *);
+    XSTuneInfo*    (*plrGetSIDInfo)(const gchar *);
+    gboolean    (*plrUpdateSIDInfo)(struct XSEngineState *);
+    void        (*plrFlush)(struct XSEngineState *);
+} XSEngine;
 
 
-typedef struct xs_status_t {
+typedef struct XSEngineState {
     gint        audioFrequency,     /* Audio settings */
                 audioChannels,
                 audioBitsPerSample;
     AFormat     audioFormat;
 
     void        *sidEngine;         /* SID-emulation internal engine data */
-    xs_engine_t *sidPlayer;         /* Selected player engine */
+    XSEngine *sidPlayer;         /* Selected player engine */
     gboolean    isError,
                 isPlaying,
                 isInitialized;
     gint        currSong,           /* Current sub-tune */
                 lastTime;
 
-    xs_tuneinfo_t *tuneInfo;
-} xs_status_t;
+    XSTuneInfo *tuneInfo;
+} XSEngineState;
 
 
 /* Global variables
  */
 extern InputPlugin    xs_plugin_ip;
 
-extern xs_status_t    xs_status;
+extern XSEngineState    xs_status;
 XS_MUTEX_H(xs_status);
 
-gboolean xs_init_emu_engine(int *configured, xs_status_t *status);
+gboolean xs_init_emu_engine(int *configured, XSEngineState *status);
 
 #ifdef __cplusplus
 }