diff --git a/src/connection.c b/src/connection.c
index 68ffebe0d8e230fc1a6880235e9c53778ca78786..b5c324d70135fc4b58eb3a4d72394df56327a772 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -46,7 +46,7 @@ typedef struct con_queue_tag {
 } con_queue_t;
 
 typedef struct _thread_queue_tag {
-	thread_t *thread_id;
+	thread_type *thread_id;
 	struct _thread_queue_tag *next;
 } thread_queue_t;
 
@@ -159,7 +159,7 @@ static void _signal_pool(void)
 	thread_cond_signal(&_pool_cond);
 }
 
-static void _push_thread(thread_queue_t **queue, thread_t *thread_id)
+static void _push_thread(thread_queue_t **queue, thread_type *thread_id)
 {
 	/* create item */
 	thread_queue_t *item = (thread_queue_t *)malloc(sizeof(thread_queue_t));
@@ -177,9 +177,9 @@ static void _push_thread(thread_queue_t **queue, thread_t *thread_id)
 	thread_mutex_unlock(&_queue_mutex);
 }
 
-static thread_t *_pop_thread(thread_queue_t **queue)
+static thread_type *_pop_thread(thread_queue_t **queue)
 {
-	thread_t *id;
+	thread_type *id;
 	thread_queue_t *item;
 
 	thread_mutex_lock(&_queue_mutex);
@@ -204,7 +204,7 @@ static void _build_pool(void)
 {
 	ice_config_t *config;
 	int i;
-    thread_t *tid;
+    thread_type *tid;
 	char buff[64];
 
 	config = config_get_config();
@@ -218,7 +218,7 @@ static void _build_pool(void)
 
 static void _destroy_pool(void)
 {
-	thread_t *id;
+	thread_type *id;
 	int i;
 
 	i = 0;
diff --git a/src/format.c b/src/format.c
index bf685eb0f599eccf5ad5f1e859dd40280781323a..1c6f827e877d0439c53dd5846db9a483d7e8ad6e 100644
--- a/src/format.c
+++ b/src/format.c
@@ -16,6 +16,7 @@
 #include "format_vorbis.h"
 #include "format_mp3.h"
 
+#include "log.h"
 #include "logging.h"
 #define CATMODULE "format"
 
diff --git a/src/fserve.c b/src/fserve.c
index 0da215c5d3a047b081c25d8d3309ef925396bdff..bd57fe993abc68b95acb339155f051c50ee0b3b6 100644
--- a/src/fserve.c
+++ b/src/fserve.c
@@ -50,7 +50,7 @@ static avl_tree *pending_tree;
 static avl_tree *mimetypes = NULL;
 
 static cond_t fserv_cond;
-static thread_t *fserv_thread;
+static thread_type *fserv_thread;
 static int run_fserv;
 static int fserve_clients;
 static int client_tree_changed=0;
diff --git a/src/slave.c b/src/slave.c
index 0bf89aff70544bebc31f1bd114d75cebc79117d4..f7b3c6952c7b628a3ec2ea886c434d719fd4a90a 100644
--- a/src/slave.c
+++ b/src/slave.c
@@ -45,7 +45,7 @@
 #define CATMODULE "slave"
 
 static void *_slave_thread(void *arg);
-thread_t *_slave_thread_id;
+thread_type *_slave_thread_id;
 static int _initialized = 0;
 
 void slave_initialize(void) {
diff --git a/src/stats.c b/src/stats.c
index 1d3a9efea2003bca7a6abce8e46810852b25c16c..7d188dcbece020b769c4fccf352551bec34175b7 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -33,7 +33,7 @@ typedef struct _event_listener_tag
 } event_listener_t;
 
 int _stats_running = 0;
-thread_t *_stats_thread_id;
+thread_type *_stats_thread_id;
 int _stats_threads = 0;
 
 stats_t _stats;