--- a/src/xs_slsup.c	Mon Nov 05 17:53:22 2012 +0200
+++ b/src/xs_slsup.c	Mon Nov 05 18:42:57 2012 +0200
@@ -24,10 +24,10 @@
 #include "xs_config.h"
 
 
-static xs_sldb_t *xs_sldb_db = NULL;
+static XSSLDB *xs_sldb_db = NULL;
 XS_MUTEX(xs_sldb_db);
 
-static xs_stildb_t *xs_stildb_db = NULL;
+static XSSTILDB *xs_stildb_db = NULL;
 XS_MUTEX(xs_stildb_db);
 
 
@@ -49,7 +49,7 @@
         xs_stildb_free(xs_stildb_db);
 
     /* Allocate database */
-    xs_stildb_db = (xs_stildb_t *) g_malloc0(sizeof(xs_stildb_t));
+    xs_stildb_db = (XSSTILDB *) g_malloc0(sizeof(XSSTILDB));
     if (!xs_stildb_db) {
         XS_MUTEX_UNLOCK(xs_cfg);
         XS_MUTEX_UNLOCK(xs_stildb_db);
@@ -89,9 +89,9 @@
 }
 
 
-stil_node_t *xs_stil_get(gchar *filename)
+XSSTILNode *xs_stil_get(gchar *filename)
 {
-    stil_node_t *result;
+    XSSTILNode *result;
     gchar *tmpFilename;
 
     XS_MUTEX_LOCK(xs_stildb_db);
@@ -142,7 +142,7 @@
         xs_sldb_free(xs_sldb_db);
 
     /* Allocate database */
-    xs_sldb_db = (xs_sldb_t *) g_malloc0(sizeof(xs_sldb_t));
+    xs_sldb_db = (XSSLDB *) g_malloc0(sizeof(XSSLDB));
     if (!xs_sldb_db) {
         XS_MUTEX_UNLOCK(xs_cfg);
         XS_MUTEX_UNLOCK(xs_sldb_db);
@@ -182,9 +182,9 @@
 }
 
 
-sldb_node_t *xs_songlen_get(const gchar * filename)
+XSSLDBNode *xs_songlen_get(const gchar * filename)
 {
-    sldb_node_t *result;
+    XSSLDBNode *result;
 
     XS_MUTEX_LOCK(xs_sldb_db);
 
@@ -201,18 +201,18 @@
 
 /* Allocate a new tune information structure
  */
-xs_tuneinfo_t *xs_tuneinfo_new(const gchar * filename,
+XSTuneInfo *xs_tuneinfo_new(const gchar * filename,
         gint nsubTunes, gint startTune, const gchar * sidName,
         const gchar * sidComposer, const gchar * sidCopyright,
         gint loadAddr, gint initAddr, gint playAddr,
         gint dataFileLen, const gchar *sidFormat, gint sidModel)
 {
-    xs_tuneinfo_t *result;
-    sldb_node_t *tmpLength;
+    XSTuneInfo *result;
+    XSSLDBNode *tmpLength;
     gint i;
 
     /* Allocate structure */
-    result = (xs_tuneinfo_t *) g_malloc0(sizeof(xs_tuneinfo_t));
+    result = (XSTuneInfo *) g_malloc0(sizeof(XSTuneInfo));
     if (!result) {
         xs_error("Could not allocate memory for tuneinfo ('%s')\n",
             filename);
@@ -228,7 +228,7 @@
     }
 
     /* Allocate space for subtune information */
-    result->subTunes = g_malloc0(sizeof(xs_subtuneinfo_t) * (nsubTunes + 1));
+    result->subTunes = g_malloc0(sizeof(XSSubTuneInfo) * (nsubTunes + 1));
     if (!result->subTunes) {
         xs_error("Could not allocate memory for subtuneinfo ('%s', %i)\n",
             filename, nsubTunes);
@@ -273,7 +273,7 @@
 
 /* Free given tune information structure
  */
-void xs_tuneinfo_free(xs_tuneinfo_t * tune)
+void xs_tuneinfo_free(XSTuneInfo * tune)
 {
     if (!tune) return;