--- a/src/xs_length.c	Mon Nov 05 17:53:22 2012 +0200
+++ b/src/xs_length.c	Mon Nov 05 18:42:57 2012 +0200
@@ -30,7 +30,7 @@
 
 /* Free memory allocated for given SLDB node
  */
-static void xs_sldb_node_free(sldb_node_t *node)
+static void xs_sldb_node_free(XSSLDBNode *node)
 {
     if (node) {
         /* Nothing much to do here ... */
@@ -42,7 +42,7 @@
 
 /* Insert given node to db linked list
  */
-static void xs_sldb_node_insert(xs_sldb_t *db, sldb_node_t *node)
+static void xs_sldb_node_insert(XSSLDB *db, XSSLDBNode *node)
 {
     assert(db);
 
@@ -100,15 +100,15 @@
 
 /* Parse one SLDB definition line, return SLDB node
  */
-sldb_node_t * xs_sldb_read_entry(gchar *inLine)
+XSSLDBNode * xs_sldb_read_entry(gchar *inLine)
 {
     size_t linePos;
     gint i;
     gboolean isOK;
-    sldb_node_t *tmnode;
+    XSSLDBNode *tmnode;
 
     /* Allocate new node */
-    tmnode = (sldb_node_t *) g_malloc0(sizeof(sldb_node_t));
+    tmnode = (XSSLDBNode *) g_malloc0(sizeof(XSSLDBNode));
     if (!tmnode) {
         xs_error("Error allocating new node. Fatal error.\n");
         return NULL;
@@ -191,12 +191,12 @@
 
 /* Read database to memory
  */
-gint xs_sldb_read(xs_sldb_t *db, const gchar *dbFilename)
+gint xs_sldb_read(XSSLDB *db, const gchar *dbFilename)
 {
     FILE *inFile;
     gchar inLine[XS_BUF_SIZE];
     size_t lineNum;
-    sldb_node_t *tmnode;
+    XSSLDBNode *tmnode;
     assert(db);
 
     /* Try to open the file */
@@ -269,16 +269,16 @@
 {
     /* We assume here that we never ever get NULL-pointers or similar */
     return xs_sldb_cmphash(
-        (*(sldb_node_t **) node1)->md5Hash,
-        (*(sldb_node_t **) node2)->md5Hash);
+        (*(XSSLDBNode **) node1)->md5Hash,
+        (*(XSSLDBNode **) node2)->md5Hash);
 }
 
 
 /* (Re)create index
  */
-gint xs_sldb_index(xs_sldb_t * db)
+gint xs_sldb_index(XSSLDB * db)
 {
-    sldb_node_t *pCurr;
+    XSSLDBNode *pCurr;
     size_t i;
     assert(db);
 
@@ -299,7 +299,7 @@
     /* Check number of nodes */
     if (db->n > 0) {
         /* Allocate memory for index-table */
-        db->pindex = (sldb_node_t **) g_malloc(sizeof(sldb_node_t *) * db->n);
+        db->pindex = (XSSLDBNode **) g_malloc(sizeof(XSSLDBNode *) * db->n);
         if (!db->pindex)
             return -1;
 
@@ -312,7 +312,7 @@
         }
 
         /* Sort the indexes */
-        qsort(db->pindex, db->n, sizeof(sldb_node_t *), xs_sldb_cmp);
+        qsort(db->pindex, db->n, sizeof(XSSLDBNode *), xs_sldb_cmp);
     }
 
     return 0;
@@ -321,9 +321,9 @@
 
 /* Free a given song-length database
  */
-void xs_sldb_free(xs_sldb_t * db)
+void xs_sldb_free(XSSLDB * db)
 {
-    sldb_node_t *pCurr, *next;
+    XSSLDBNode *pCurr, *next;
 
     if (!db)
         return;
@@ -377,7 +377,7 @@
 
 static gint xs_get_sid_hash(const gchar *filename, xs_md5hash_t hash)
 {
-    xs_file_t *inFile;
+    XSFile *inFile;
     xs_md5state_t inState;
     psidv1_header_t psidH;
     psidv2_header_t psidH2;
@@ -494,9 +494,9 @@
 
 /* Get node from db index via binary search
  */
-sldb_node_t *xs_sldb_get(xs_sldb_t *db, const gchar *filename)
+XSSLDBNode *xs_sldb_get(XSSLDB *db, const gchar *filename)
 {
-    sldb_node_t keyItem, *key, **item;
+    XSSLDBNode keyItem, *key, **item;
 
     /* Check the database pointers */
     if (!db || !db->nodes || !db->pindex)