--- a/src/xs_sidplay1.cc	Mon Nov 05 18:52:43 2012 +0200
+++ b/src/xs_sidplay1.cc	Mon Nov 05 18:53:20 2012 +0200
@@ -43,7 +43,7 @@
     sidTune *currTune;
     guint8 *buf;
     size_t bufSize;
-} xs_sidplay1_t;
+} XSSIDPlay1;
 
 
 /* We need to 'export' all this pseudo-C++ crap */
@@ -56,7 +56,7 @@
 #define TFUNCTION2  xs_sidplay1_updateinfo
 #define TTUNEINFO   sidTuneInfo
 #define TTUNE       sidTune
-#define TENGINE     xs_sidplay1_t
+#define TENGINE     XSSIDPlay1
 #include "xs_sidplay.h"
 
 
@@ -83,11 +83,11 @@
 gboolean xs_sidplay1_init(XSEngineState * state)
 {
     gint tmpFreq;
-    xs_sidplay1_t *engine;
+    XSSIDPlay1 *engine;
     assert(state);
 
     /* Allocate internal structures */
-    engine = (xs_sidplay1_t *) g_malloc0(sizeof(xs_sidplay1_t));
+    engine = (XSSIDPlay1 *) g_malloc0(sizeof(XSSIDPlay1));
     if (!engine) return FALSE;
 
     /* Initialize engine */
@@ -246,10 +246,10 @@
  */
 void xs_sidplay1_close(XSEngineState * state)
 {
-    xs_sidplay1_t *engine;
+    XSSIDPlay1 *engine;
     assert(state);
 
-    engine = (xs_sidplay1_t *) state->internal;
+    engine = (XSSIDPlay1 *) state->internal;
 
     /* Free internals */
     if (engine->currEng) {
@@ -273,10 +273,10 @@
  */
 gboolean xs_sidplay1_initsong(XSEngineState * state)
 {
-    xs_sidplay1_t *engine;
+    XSSIDPlay1 *engine;
     assert(state);
 
-    engine = (xs_sidplay1_t *) state->internal;
+    engine = (XSSIDPlay1 *) state->internal;
     if (!engine) return FALSE;
 
     if (!engine->currTune) {
@@ -299,10 +299,10 @@
  */
 guint xs_sidplay1_fillbuffer(XSEngineState * state, gchar * audioBuffer, guint audioBufSize)
 {
-    xs_sidplay1_t *engine;
+    XSSIDPlay1 *engine;
     assert(state);
 
-    engine = (xs_sidplay1_t *) state->internal;
+    engine = (XSSIDPlay1 *) state->internal;
     if (!engine) return 0;
 
     sidEmuFillBuffer(*engine->currEng, *engine->currTune, audioBuffer, audioBufSize);
@@ -315,11 +315,11 @@
  */
 gboolean xs_sidplay1_load(XSEngineState * state, gchar * filename)
 {
-    xs_sidplay1_t *engine;
+    XSSIDPlay1 *engine;
     assert(state);
     state->isInitialized = FALSE;
 
-    engine = (xs_sidplay1_t *) state->internal;
+    engine = (XSSIDPlay1 *) state->internal;
     if (!engine) return FALSE;
 
     /* Try to get the tune */
@@ -339,10 +339,10 @@
  */
 void xs_sidplay1_delete(XSEngineState * state)
 {
-    xs_sidplay1_t *engine;
+    XSSIDPlay1 *engine;
     assert(state);
 
-    engine = (xs_sidplay1_t *) state->internal;
+    engine = (XSSIDPlay1 *) state->internal;
     if (!engine) return;
     
     g_free(engine->buf);