diff --git a/gobex/gobex.c b/gobex/gobex.c
index d41f859..80a8bc4 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -36,6 +36,8 @@
 
 #define G_OBEX_HDR_TYPE(id)	((id) & 0xc0)
 
+#define G_OBEX_FINAL		0x80
+
 struct _GObexHeader {
 	guint8 id;
 	gboolean extdata;
diff --git a/gobex/gobex.h b/gobex/gobex.h
index f2e4033..5e3612f 100644
--- a/gobex/gobex.h
+++ b/gobex/gobex.h
@@ -33,7 +33,6 @@
 #define G_OBEX_OP_SETPATH		0x05
 #define G_OBEX_OP_SESSION		0x07
 #define G_OBEX_OP_ABORT			0x7f
-#define G_OBEX_FINAL			0x80
 
 /* Header ID's */
 #define G_OBEX_HDR_ID_COUNT		0xc0
diff --git a/unit/test-gobex.c b/unit/test-gobex.c
index cd0451e..ae830fc 100644
--- a/unit/test-gobex.c
+++ b/unit/test-gobex.c
@@ -28,9 +28,11 @@
 
 #include <gobex/gobex.h>
 
+#define FINAL_BIT 0x80
+
 static GMainLoop *mainloop = NULL;
 
-static uint8_t pkt_connect_req[] = { G_OBEX_OP_CONNECT | G_OBEX_FINAL,
+static uint8_t pkt_connect_req[] = { G_OBEX_OP_CONNECT | FINAL_BIT,
 					0x00, 0x07, 0x01, 0x00, 0x10, 0x00 };
 
 static uint8_t hdr_connid[] = { G_OBEX_HDR_ID_CONNECTION, 1, 2, 3, 4 };