diff --git a/bluez5/attrib/att.c b/bluez5/attrib/att.c
index 826b3c1..7e589c6 100644
--- a/bluez5/attrib/att.c
+++ b/bluez5/attrib/att.c
@@ -32,8 +32,8 @@
 
 #include <glib.h>
 
-#include "lib/bluetooth.h"
-#include "lib/uuid.h"
+#include <bluetooth/bluetooth.h>
+#include "uuid.h"
 
 #include "src/shared/util.h"
 #include "att.h"
diff --git a/bluez5/attrib/gatt.c b/bluez5/attrib/gatt.c
index 480f874..4884de7 100644
--- a/bluez5/attrib/gatt.c
+++ b/bluez5/attrib/gatt.c
@@ -33,7 +33,7 @@
 
 #include "lib/sdp.h"
 #include "lib/sdp_lib.h"
-#include "lib/uuid.h"
+#include "uuid.h"
 
 #include "src/shared/util.h"
 #include "att.h"
diff --git a/bluez5/attrib/gattrib.c b/bluez5/attrib/gattrib.c
index 2e1e39a..d061813 100644
--- a/bluez5/attrib/gattrib.c
+++ b/bluez5/attrib/gattrib.c
@@ -33,7 +33,7 @@
 
 #include <glib.h>
 
-#include "lib/bluetooth.h"
+#include <bluetooth/bluetooth.h>
 
 #include "btio/btio.h"
 #include "src/log.h"
diff --git a/bluez5/attrib/gattrib.h b/bluez5/attrib/gattrib.h
index 611f952..9a82ade 100644
--- a/bluez5/attrib/gattrib.h
+++ b/bluez5/attrib/gattrib.h
@@ -28,6 +28,8 @@
 extern "C" {
 #endif
 
+#include <stdbool.h>
+
 #define GATTRIB_ALL_REQS 0xFE
 #define GATTRIB_ALL_HANDLES 0x0000
 
diff --git a/bluez5/btio/btio.c b/bluez5/btio/btio.c
index 969cd3a..bffbe56 100644
--- a/bluez5/btio/btio.c
+++ b/bluez5/btio/btio.c
@@ -36,7 +36,7 @@
 
 #include <glib.h>
 
-#include "lib/bluetooth.h"
+#include <bluetooth/bluetooth.h>
 #include "lib/l2cap.h"
 #include "lib/rfcomm.h"
 #include "lib/sco.h"
diff --git a/bluez5/lib/bluetooth.c b/bluez5/lib/bluetooth.c
index 3276b68..9890706 100644
--- a/bluez5/lib/bluetooth.c
+++ b/bluez5/lib/bluetooth.c
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <sys/socket.h>
 
-#include "bluetooth.h"
+#include <bluetooth/bluetooth.h>
 #include "hci.h"
 
 void baswap(bdaddr_t *dst, const bdaddr_t *src)
diff --git a/bluez5/src/log.c b/bluez5/src/log.c
index d2a20de..d783e0d 100644
--- a/bluez5/src/log.c
+++ b/bluez5/src/log.c
@@ -318,7 +318,7 @@ void __btd_log_init(const char *debug, int detach)
 
 	openlog(LOG_IDENT, option, LOG_DAEMON);
 
-	info("Bluetooth daemon %s", VERSION);
+	info("Bluetooth daemon %d.%d", BLUEZ_VERSION_MAJOR, BLUEZ_VERSION_MINOR);
 }
 
 void __btd_log_cleanup(void)
diff --git a/bluez5/src/shared/tester.c b/bluez5/src/shared/tester.c
index 80d6511..020880d 100644
--- a/bluez5/src/shared/tester.c
+++ b/bluez5/src/shared/tester.c
@@ -801,7 +801,7 @@ void tester_init(int *argc, char ***argv)
 	g_option_context_free(context);
 
 	if (option_version == TRUE) {
-		g_print("%s\n", VERSION);
+		g_print("%d.%d\n", BLUEZ_VERSION_MAJOR, BLUEZ_VERSION_MINOR);
 		exit(EXIT_SUCCESS);
 	}