diff --git a/src/format.h b/src/format.h
index a5733644..365e2a22 100644
--- a/src/format.h
+++ b/src/format.h
@@ -20,13 +20,11 @@
 
 #include <vorbis/codec.h>
 
+#include "icecasttypes.h"
 #include "client.h"
 #include "refbuf.h"
 #include "common/httpp/httpp.h"
 
-struct source_tag;
-struct _mount_proxy;
-
 typedef enum _format_type_tag
 {
     FORMAT_ERROR, /* No format, source not processable */
@@ -47,13 +45,13 @@ typedef struct _format_plugin_tag
     uint64_t    read_bytes;
     uint64_t    sent_bytes;
 
-    refbuf_t *(*get_buffer)(struct source_tag *);
+    refbuf_t *(*get_buffer)(source_t *);
     int (*write_buf_to_client)(client_t *client);
-    void (*write_buf_to_file)(struct source_tag *source, refbuf_t *refbuf);
-    int (*create_client_data)(struct source_tag *source, client_t *client);
+    void (*write_buf_to_file)(source_t *source, refbuf_t *refbuf);
+    int (*create_client_data)(source_t *source, client_t *client);
     void (*set_tag)(struct _format_plugin_tag *plugin, const char *tag, const char *value, const char *charset);
     void (*free_plugin)(struct _format_plugin_tag *self);
-    void (*apply_settings)(client_t *client, struct _format_plugin_tag *format, struct _mount_proxy *mount);
+    void (*apply_settings)(client_t *client, struct _format_plugin_tag *format, mount_proxy *mount);
 
     /* meta data */
     vorbis_comment vc;
@@ -64,16 +62,16 @@ typedef struct _format_plugin_tag
 
 format_type_t format_get_type(const char *contenttype);
 char *format_get_mimetype(format_type_t type);
-int format_get_plugin(format_type_t type, struct source_tag *source);
+int format_get_plugin(format_type_t type, source_t *source);
 
 int format_generic_write_to_client (client_t *client);
-int format_advance_queue (struct source_tag *source, client_t *client);
-int format_check_http_buffer (struct source_tag *source, client_t *client);
-int format_check_file_buffer (struct source_tag *source, client_t *client);
+int format_advance_queue (source_t *source, client_t *client);
+int format_check_http_buffer (source_t *source, client_t *client);
+int format_check_file_buffer (source_t *source, client_t *client);
 
 
 void format_send_general_headers(format_plugin_t *format, 
-        struct source_tag *source, client_t *client);
+        source_t *source, client_t *client);
 
 void format_set_vorbiscomment(format_plugin_t *plugin, const char *tag, const char *value);
 
diff --git a/src/format_mp3.c b/src/format_mp3.c
index 4fa9fbd8..ad399b72 100644
--- a/src/format_mp3.c
+++ b/src/format_mp3.c
@@ -55,7 +55,7 @@ static refbuf_t *mp3_get_no_meta (source_t *source);
 static int  format_mp3_create_client_data (source_t *source, client_t *client);
 static void free_mp3_client_data (client_t *client);
 static int format_mp3_write_buf_to_client(client_t *client);
-static void write_mp3_to_file (struct source_tag *source, refbuf_t *refbuf);
+static void write_mp3_to_file (source_t *source, refbuf_t *refbuf);
 static void mp3_set_tag (format_plugin_t *plugin, const char *tag, const char *in_value, const char *charset);
 static void format_mp3_apply_settings(client_t *client, format_plugin_t *format, mount_proxy *mount);
 
@@ -715,7 +715,7 @@ static void free_mp3_client_data (client_t *client)
 }
 
 
-static void write_mp3_to_file (struct source_tag *source, refbuf_t *refbuf)
+static void write_mp3_to_file (source_t *source, refbuf_t *refbuf)
 {
     if (refbuf->len == 0)
         return;
diff --git a/src/format_ogg.c b/src/format_ogg.c
index d905bfce..605279f8 100644
--- a/src/format_ogg.c
+++ b/src/format_ogg.c
@@ -60,7 +60,7 @@ static void format_ogg_free_plugin(format_plugin_t *plugin);
 static int create_ogg_client_data(source_t *source, client_t *client);
 static void free_ogg_client_data(client_t *client);
 
-static void write_ogg_to_file(struct source_tag *source, refbuf_t *refbuf);
+static void write_ogg_to_file(source_t *source, refbuf_t *refbuf);
 static refbuf_t *ogg_get_buffer(source_t *source);
 static int write_buf_to_client(client_t *client);
 
@@ -563,7 +563,7 @@ static int write_buf_to_client(client_t *client)
 }
 
 
-static int write_ogg_data (struct source_tag *source, refbuf_t *refbuf)
+static int write_ogg_data (source_t *source, refbuf_t *refbuf)
 {
     int ret = 1;
 
@@ -578,7 +578,7 @@ static int write_ogg_data (struct source_tag *source, refbuf_t *refbuf)
 }
 
 
-static void write_ogg_to_file (struct source_tag *source, refbuf_t *refbuf)
+static void write_ogg_to_file (source_t *source, refbuf_t *refbuf)
 {
     ogg_state_t *ogg_info = source->format->_state;