diff --git a/input/device.c b/input/device.c
index e2c48b9..0e3f4a9 100644
--- a/input/device.c
+++ b/input/device.c
@@ -37,6 +37,7 @@
 #include <bluetooth/hidp.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
+#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
diff --git a/input/device.h b/input/device.h
index c14b81a..509a353 100644
--- a/input/device.h
+++ b/input/device.h
@@ -21,9 +21,6 @@
  *
  */
 
-#define HSP_HS_UUID		"00001108-0000-1000-8000-00805F9B34FB"
-#define HID_UUID		"00001124-0000-1000-8000-00805f9b34fb"
-
 #define L2CAP_PSM_HIDP_CTRL	0x11
 #define L2CAP_PSM_HIDP_INTR	0x13
 
diff --git a/input/manager.c b/input/manager.c
index 4ac5686..5cc552b 100644
--- a/input/manager.c
+++ b/input/manager.c
@@ -31,6 +31,7 @@
 #include <bluetooth/hci.h>
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
+#include <bluetooth/uuid.h>
 
 #include <gdbus.h>
 
diff --git a/input/server.c b/input/server.c
index 17e7547..86e2ac8 100644
--- a/input/server.c
+++ b/input/server.c
@@ -30,6 +30,7 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
+#include <bluetooth/uuid.h>
 
 #include <glib.h>
 #include <dbus/dbus.h>
diff --git a/lib/uuid.h b/lib/uuid.h
index 32f51b7..7e34259 100644
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -75,6 +75,9 @@ extern "C" {
 #define HDP_SOURCE_UUID		"00001401-0000-1000-8000-00805f9b34fb"
 #define HDP_SINK_UUID		"00001402-0000-1000-8000-00805f9b34fb"
 
+#define HSP_HS_UUID		"00001108-0000-1000-8000-00805f9b34fb"
+#define HID_UUID		"00001124-0000-1000-8000-00805f9b34fb"
+
 typedef struct {
 	enum {
 		BT_UUID_UNSPEC = 0,