diff --git a/gobex/gobex-transfer.c b/gobex/gobex-transfer.c
index c664118..a3931a5 100644
--- a/gobex/gobex-transfer.c
+++ b/gobex/gobex-transfer.c
@@ -189,30 +189,21 @@ static struct transfer *transfer_new(GObex *obex, guint8 opcode,
 	return transfer;
 }
 
-guint g_obex_put_req(GObex *obex, const char *type, const char *name,
-			GObexDataProducer data_func,
+guint g_obex_put_req(GObex *obex, GObexDataProducer data_func,
 			GObexFunc complete_func, gpointer user_data,
-			GError **err)
+			GError **err, guint8 first_hdr_id, ...)
 {
-	GObexPacket *req;
-	GObexHeader *hdr;
 	struct transfer *transfer;
+	GObexPacket *req;
+	va_list args;
 
 	transfer = transfer_new(obex, G_OBEX_OP_PUT, complete_func, user_data);
 	transfer->data_producer = data_func;
 
-	req = g_obex_packet_new(G_OBEX_OP_PUT, TRUE, G_OBEX_HDR_INVALID);
-
-	if (type) {
-		hdr = g_obex_header_new_bytes(G_OBEX_HDR_TYPE,
-					(char *) type, strlen(type) + 1);
-		g_obex_packet_add_header(req, hdr);
-	}
-
-	if (name) {
-		hdr = g_obex_header_new_unicode(G_OBEX_HDR_NAME, name);
-		g_obex_packet_add_header(req, hdr);
-	}
+	va_start(args, first_hdr_id);
+	req = g_obex_packet_new_valist(G_OBEX_OP_PUT, TRUE,
+							first_hdr_id, args);
+	va_end(args);
 
 	g_obex_packet_add_body(req, put_get_data, transfer);
 
@@ -226,12 +217,24 @@ guint g_obex_put_req(GObex *obex, const char *type, const char *name,
 	return transfer->id;
 }
 
-static void transfer_put_req(GObex *obex, GObexPacket *req, gpointer user_data)
+static void transfer_abort_req(GObex *obex, GObexPacket *req, gpointer user_data)
 {
 	struct transfer *transfer = user_data;
-	guint8 rspcode = G_OBEX_RSP_CONTINUE;
-	GError *err = NULL;
 	GObexPacket *rsp;
+	GError *err;
+
+	err = g_error_new(G_OBEX_ERROR, G_OBEX_ERROR_CANCELLED,
+						"Request was aborted");
+	rsp = g_obex_packet_new(G_OBEX_RSP_SUCCESS, TRUE, G_OBEX_HDR_INVALID);
+	g_obex_send(obex, rsp, NULL);
+
+	transfer_complete(transfer, err);
+	g_error_free(err);
+}
+
+static guint8 put_get_bytes(struct transfer *transfer, GObexPacket *req)
+{
+	guint8 rspcode = G_OBEX_RSP_CONTINUE;
 	GObexHeader *body;
 
 	body = g_obex_packet_get_header(req, G_OBEX_HDR_BODY);
@@ -250,8 +253,20 @@ static void transfer_put_req(GObex *obex, GObexPacket *req, gpointer user_data)
 			transfer->data_consumer(buf, len, transfer->user_data);
 	}
 
-	rsp = g_obex_packet_new(rspcode, TRUE, G_OBEX_HDR_INVALID);
-	if (!g_obex_send(obex, rsp, &err)) {
+	return rspcode;
+}
+
+static void transfer_put_req_first(struct transfer *transfer, GObexPacket *req,
+					guint8 first_hdr_id, va_list args)
+{
+	GError *err = NULL;
+	GObexPacket *rsp;
+	guint8 rspcode;
+
+	rspcode = put_get_bytes(transfer, req);
+
+	rsp = g_obex_packet_new_valist(rspcode, TRUE, first_hdr_id, args);
+	if (!g_obex_send(transfer->obex, rsp, &err)) {
 		transfer_complete(transfer, err);
 		g_error_free(err);
 	}
@@ -260,32 +275,41 @@ static void transfer_put_req(GObex *obex, GObexPacket *req, gpointer user_data)
 		transfer_complete(transfer, NULL);
 }
 
-static void transfer_abort_req(GObex *obex, GObexPacket *req, gpointer user_data)
+static void transfer_put_req(GObex *obex, GObexPacket *req, gpointer user_data)
 {
 	struct transfer *transfer = user_data;
+	GError *err = NULL;
 	GObexPacket *rsp;
-	GError *err;
+	guint8 rspcode;
 
-	err = g_error_new(G_OBEX_ERROR, G_OBEX_ERROR_CANCELLED,
-						"Request was aborted");
-	rsp = g_obex_packet_new(G_OBEX_RSP_SUCCESS, TRUE, G_OBEX_HDR_INVALID);
-	g_obex_send(obex, rsp, NULL);
+	rspcode = put_get_bytes(transfer, req);
 
-	transfer_complete(transfer, err);
-	g_error_free(err);
+	rsp = g_obex_packet_new(rspcode, TRUE, G_OBEX_HDR_INVALID);
+	if (!g_obex_send(obex, rsp, &err)) {
+		transfer_complete(transfer, err);
+		g_error_free(err);
+	}
+
+	if (rspcode == G_OBEX_RSP_SUCCESS)
+		transfer_complete(transfer, NULL);
 }
 
 guint g_obex_put_rsp(GObex *obex, GObexPacket *req,
 			GObexDataConsumer data_func, GObexFunc complete_func,
-			gpointer user_data, GError **err)
+			gpointer user_data, GError **err,
+			guint8 first_hdr_id, ...)
 {
 	struct transfer *transfer;
+	va_list args;
 	gint id;
 
 	transfer = transfer_new(obex, G_OBEX_OP_PUT, complete_func, user_data);
 	transfer->data_consumer = data_func;
 
-	transfer_put_req(obex, req, transfer);
+
+	va_start(args, first_hdr_id);
+	transfer_put_req_first(transfer, req, first_hdr_id, args);
+	va_end(args);
 	if (!g_slist_find(transfers, transfer))
 		return 0;
 
@@ -300,29 +324,21 @@ guint g_obex_put_rsp(GObex *obex, GObexPacket *req,
 	return transfer->id;
 }
 
-guint g_obex_get_req(GObex *obex, const char *type, const char *name,
-			GObexDataConsumer data_func, GObexFunc complete_func,
-			gpointer user_data, GError **err)
+guint g_obex_get_req(GObex *obex, GObexDataConsumer data_func,
+			GObexFunc complete_func, gpointer user_data,
+			GError **err, guint8 first_hdr_id, ...)
 {
 	struct transfer *transfer;
 	GObexPacket *req;
-	GObexHeader *hdr;
+	va_list args;
 
 	transfer = transfer_new(obex, G_OBEX_OP_GET, complete_func, user_data);
 	transfer->data_consumer = data_func;
 
-	req = g_obex_packet_new(G_OBEX_OP_GET, TRUE, G_OBEX_HDR_INVALID);
-
-	if (type) {
-		hdr = g_obex_header_new_bytes(G_OBEX_HDR_TYPE,
-					(char *) type, strlen(type) + 1);
-		g_obex_packet_add_header(req, hdr);
-	}
-
-	if (name) {
-		hdr = g_obex_header_new_unicode(G_OBEX_HDR_NAME, name);
-		g_obex_packet_add_header(req, hdr);
-	}
+	va_start(args, first_hdr_id);
+	req = g_obex_packet_new_valist(G_OBEX_OP_GET, TRUE,
+							first_hdr_id, args);
+	va_end(args);
 
 	transfer->req_id = g_obex_send_req(obex, req, -1, transfer_response,
 								transfer, err);
diff --git a/gobex/gobex-transfer.h b/gobex/gobex-transfer.h
index 2dff42e..29385ab 100644
--- a/gobex/gobex-transfer.h
+++ b/gobex/gobex-transfer.h
@@ -27,17 +27,18 @@
 #include <gobex/gobex.h>
 #include <gobex/gobex-defs.h>
 
-guint g_obex_put_req(GObex *obex, const char *type, const char *name,
-			GObexDataProducer data_func, GObexFunc complete_func,
-			gpointer user_data, GError **err);
+guint g_obex_put_req(GObex *obex, GObexDataProducer data_func,
+			GObexFunc complete_func, gpointer user_data,
+			GError **err, guint8 first_hdr_id, ...);
 
-guint g_obex_get_req(GObex *obex, const char *type, const char *name,
-			GObexDataConsumer data_func, GObexFunc complete_func,
-			gpointer user_data, GError **err);
+guint g_obex_get_req(GObex *obex, GObexDataConsumer data_func,
+			GObexFunc complete_func, gpointer user_data,
+			GError **err, guint8 first_hdr_id, ...);
 
 guint g_obex_put_rsp(GObex *obex, GObexPacket *req,
 			GObexDataConsumer data_func, GObexFunc complete_func,
-			gpointer user_data, GError **err);
+			gpointer user_data, GError **err,
+			guint8 first_hdr_id, ...);
 
 guint g_obex_get_rsp(GObex *obex, GObexDataProducer data_func,
 			GObexFunc complete_func, gpointer user_data,
diff --git a/tools/obex-client-tool.c b/tools/obex-client-tool.c
index f352294..9b3279a 100644
--- a/tools/obex-client-tool.c
+++ b/tools/obex-client-tool.c
@@ -159,8 +159,9 @@ static void cmd_put(int argc, char **argv)
 	data = g_new0(struct put_data, 1);
 	data->fd = fd;
 
-	g_obex_put_req(obex, NULL, argv[1], put_data_cb, put_complete, data,
-									&err);
+	g_obex_put_req(obex, put_data_cb, put_complete, data, &err,
+						G_OBEX_HDR_NAME, argv[1],
+						G_OBEX_HDR_INVALID);
 	if (err != NULL) {
 		g_printerr("put failed: %s\n", err->message);
 		g_error_free(err);
diff --git a/tools/obex-server-tool.c b/tools/obex-server-tool.c
index 6d2e75b..39ec18a 100644
--- a/tools/obex-server-tool.c
+++ b/tools/obex-server-tool.c
@@ -103,7 +103,8 @@ static void handle_put(GObex *obex, GObexPacket *req, gpointer user_data)
 	g_print("put type \"%s\" name \"%s\"\n", type ? type : "",
 							name ? name : "");
 
-	g_obex_put_rsp(obex, req, recv_data, put_complete, NULL, &err);
+	g_obex_put_rsp(obex, req, recv_data, put_complete, NULL, &err,
+							G_OBEX_HDR_INVALID);
 	if (err != NULL) {
 		g_printerr("Unable to send response: %s\n", err->message);
 		g_error_free(err);
diff --git a/unit/test-gobex-transfer.c b/unit/test-gobex-transfer.c
index 595a49c..89ea1c5 100644
--- a/unit/test-gobex-transfer.c
+++ b/unit/test-gobex-transfer.c
@@ -63,6 +63,7 @@ static guint8 get_rsp_first[] = { G_OBEX_RSP_CONTINUE | FINAL_BIT, 0x00, 0x10,
 static guint8 get_rsp_last[] = { G_OBEX_RSP_SUCCESS | FINAL_BIT, 0x00, 0x06,
 					G_OBEX_HDR_BODY_END, 0x00, 0x03 };
 
+static guint8 hdr_type[] = "foo/bar";
 static guint8 body_data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
 
 static void transfer_complete(GObex *obex, GError *err, gpointer user_data)
@@ -126,8 +127,10 @@ static void test_put_req(void)
 
 	timer_id = g_timeout_add_seconds(1, test_timeout, &d);
 
-	g_obex_put_req(obex, "foo/bar", "file.txt", provide_data,
-						transfer_complete, &d, &d.err);
+	g_obex_put_req(obex, provide_data, transfer_complete, &d, &d.err,
+				G_OBEX_HDR_TYPE, hdr_type, sizeof(hdr_type),
+				G_OBEX_HDR_NAME, "file.txt",
+				G_OBEX_HDR_INVALID);
 	g_assert_no_error(d.err);
 
 	g_main_loop_run(d.mainloop);
@@ -174,8 +177,8 @@ static void handle_put(GObex *obex, GObexPacket *req, gpointer user_data)
 		return;
 	}
 
-	id = g_obex_put_rsp(obex, req, rcv_data, transfer_complete, d,
-								&d->err);
+	id = g_obex_put_rsp(obex, req, rcv_data, transfer_complete, d, &d->err,
+							G_OBEX_HDR_INVALID);
 	if (id == 0)
 		g_main_loop_quit(d->mainloop);
 }
@@ -242,8 +245,10 @@ static void test_get_req(void)
 
 	timer_id = g_timeout_add_seconds(1, test_timeout, &d);
 
-	g_obex_get_req(obex, "foo/bar", "file.txt", rcv_data,
-						transfer_complete, &d, &d.err);
+	g_obex_get_req(obex, rcv_data, transfer_complete, &d, &d.err,
+				G_OBEX_HDR_TYPE, hdr_type, sizeof(hdr_type),
+				G_OBEX_HDR_NAME, "file.txt",
+				G_OBEX_HDR_INVALID);
 	g_assert_no_error(d.err);
 
 	g_main_loop_run(d.mainloop);
@@ -343,8 +348,10 @@ static void test_put_req_delay(void)
 
 	timer_id = g_timeout_add_seconds(1, test_timeout, &d);
 
-	g_obex_put_req(obex, "foo/bar", "file.txt", provide_data,
-						transfer_complete, &d, &d.err);
+	g_obex_put_req(obex, provide_data, transfer_complete, &d, &d.err,
+					G_OBEX_HDR_TYPE, hdr_type, sizeof(hdr_type),
+					G_OBEX_HDR_NAME, "file.txt",
+					G_OBEX_HDR_INVALID);
 	g_assert_no_error(d.err);
 
 	g_main_loop_run(d.mainloop);