diff --git a/health/hdp_manager.c b/health/hdp_manager.c
index cccb1a6..ffaed5d 100644
--- a/health/hdp_manager.c
+++ b/health/hdp_manager.c
@@ -26,6 +26,7 @@
 
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
+#include <bluetooth/uuid.h>
 
 #include <btio.h>
 #include <adapter.h>
diff --git a/health/hdp_types.h b/health/hdp_types.h
index 9a6776f..7f8b015 100644
--- a/health/hdp_types.h
+++ b/health/hdp_types.h
@@ -23,10 +23,6 @@
 #ifndef __HDP_TYPES_H__
 #define __HDP_TYPES_H__
 
-#define HDP_UUID		"00001400-0000-1000-8000-00805F9B34FB"
-#define HDP_SOURCE_UUID		"00001401-0000-1000-8000-00805F9B34FB"
-#define HDP_SINK_UUID		"00001402-0000-1000-8000-00805F9B34FB"
-
 #define MANAGER_PATH		"/org/bluez"
 
 #define HEALTH_MANAGER		"org.bluez.HealthManager"
diff --git a/health/hdp_util.c b/health/hdp_util.c
index 3b48e44..744e390 100644
--- a/health/hdp_util.c
+++ b/health/hdp_util.c
@@ -35,6 +35,7 @@
 
 #include <sdpd.h>
 #include <bluetooth/sdp_lib.h>
+#include <bluetooth/uuid.h>
 #include <sdp-client.h>
 #include <glib-helper.h>
 
diff --git a/lib/uuid.h b/lib/uuid.h
index 1ed90e0..32f51b7 100644
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -71,6 +71,10 @@ extern "C" {
 
 #define RFCOMM_UUID_STR		"00000003-0000-1000-8000-00805f9b34fb"
 
+#define HDP_UUID		"00001400-0000-1000-8000-00805f9b34fb"
+#define HDP_SOURCE_UUID		"00001401-0000-1000-8000-00805f9b34fb"
+#define HDP_SINK_UUID		"00001402-0000-1000-8000-00805f9b34fb"
+
 typedef struct {
 	enum {
 		BT_UUID_UNSPEC = 0,