diff --git a/unit/test-gobex.c b/unit/test-gobex.c
index c537ae9..22c6665 100644
--- a/unit/test-gobex.c
+++ b/unit/test-gobex.c
@@ -61,54 +61,6 @@ static gboolean test_timeout(gpointer user_data)
 	return FALSE;
 }
 
-static GObex *create_gobex(int fd, GObexTransportType transport_type,
-						gboolean close_on_unref)
-{
-	GIOChannel *io;
-	GObex *obex;
-
-	io = g_io_channel_unix_new(fd);
-	g_assert(io != NULL);
-
-	g_io_channel_set_close_on_unref(io, close_on_unref);
-
-	obex = g_obex_new(io, transport_type, -1, -1);
-	g_io_channel_unref(io);
-
-	return obex;
-}
-
-static void create_endpoints(GObex **obex, GIOChannel **io, int sock_type)
-{
-	GObexTransportType transport_type;
-	int sv[2];
-
-	if (socketpair(AF_UNIX, sock_type | SOCK_NONBLOCK, 0, sv) < 0) {
-		g_printerr("socketpair: %s", strerror(errno));
-		abort();
-	}
-
-	if (sock_type == SOCK_STREAM)
-		transport_type = G_OBEX_TRANSPORT_STREAM;
-	else
-		transport_type = G_OBEX_TRANSPORT_PACKET;
-
-	*obex = create_gobex(sv[0], transport_type, TRUE);
-	g_assert(*obex != NULL);
-
-	if (io == NULL) {
-		close(sv[1]);
-		return;
-	}
-
-	*io = g_io_channel_unix_new(sv[1]);
-	g_assert(*io != NULL);
-
-	g_io_channel_set_encoding(*io, NULL, NULL);
-	g_io_channel_set_buffered(*io, FALSE);
-	g_io_channel_set_close_on_unref(*io, TRUE);
-}
-
 static void connect_rsp(GObex *obex, GError *err, GObexPacket *rsp,
 							gpointer user_data)
 {
diff --git a/unit/util.c b/unit/util.c
index 7045e4f..7e23860 100644
--- a/unit/util.c
+++ b/unit/util.c
@@ -19,8 +19,13 @@
  *
  */
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
+#include <errno.h>
 
 #include <glib.h>
 
@@ -59,3 +64,51 @@ void assert_memequal(const void *mem1, size_t len1,
 
 	g_assert(0);
 }
+
+GObex *create_gobex(int fd, GObexTransportType transport_type,
+						gboolean close_on_unref)
+{
+	GIOChannel *io;
+	GObex *obex;
+
+	io = g_io_channel_unix_new(fd);
+	g_assert(io != NULL);
+
+	g_io_channel_set_close_on_unref(io, close_on_unref);
+
+	obex = g_obex_new(io, transport_type, -1, -1);
+	g_io_channel_unref(io);
+
+	return obex;
+}
+
+void create_endpoints(GObex **obex, GIOChannel **io, int sock_type)
+{
+	GObexTransportType transport_type;
+	int sv[2];
+
+	if (socketpair(AF_UNIX, sock_type | SOCK_NONBLOCK, 0, sv) < 0) {
+		g_printerr("socketpair: %s", strerror(errno));
+		abort();
+	}
+
+	if (sock_type == SOCK_STREAM)
+		transport_type = G_OBEX_TRANSPORT_STREAM;
+	else
+		transport_type = G_OBEX_TRANSPORT_PACKET;
+
+	*obex = create_gobex(sv[0], transport_type, TRUE);
+	g_assert(*obex != NULL);
+
+	if (io == NULL) {
+		close(sv[1]);
+		return;
+	}
+
+	*io = g_io_channel_unix_new(sv[1]);
+	g_assert(*io != NULL);
+
+	g_io_channel_set_encoding(*io, NULL, NULL);
+	g_io_channel_set_buffered(*io, FALSE);
+	g_io_channel_set_close_on_unref(*io, TRUE);
+}
diff --git a/unit/util.h b/unit/util.h
index cf41494..73b6372 100644
--- a/unit/util.h
+++ b/unit/util.h
@@ -19,6 +19,8 @@
  *
  */
 
+#include <gobex/gobex.h>
+
 enum {
 	TEST_ERROR_TIMEOUT,
 	TEST_ERROR_UNEXPECTED,
@@ -30,3 +32,7 @@ GQuark test_error_quark(void);
 void dump_bufs(const void *mem1, size_t len1, const void *mem2, size_t len2);
 void assert_memequal(const void *mem1, size_t len1,
 						const void *mem2, size_t len2);
+
+GObex *create_gobex(int fd, GObexTransportType transport_type,
+						gboolean close_on_unref);
+void create_endpoints(GObex **obex, GIOChannel **io, int sock_type);