diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..378eac2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8266203..01f7f8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ project(gattlib)
 
 find_package(PkgConfig REQUIRED)
 
-include_directories(include bluez/attrib bluez/btio bluez/src)
+include_directories(include bluez/attrib bluez/btio bluez/src bluez/lib)
 
 # Bluez specific files
 set(gattlib_SRCS bluez/attrib/att.c
diff --git a/bluez/attrib/att.c b/bluez/attrib/att.c
index c8e2e1d..95c456d 100644
--- a/bluez/attrib/att.c
+++ b/bluez/attrib/att.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
+#include "uuid.h"
 
 #include <glib.h>
 
diff --git a/bluez/attrib/gatt.c b/bluez/attrib/gatt.c
index 6f9a11d..1f3db8c 100644
--- a/bluez/attrib/gatt.c
+++ b/bluez/attrib/gatt.c
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <glib.h>
-#include <bluetooth/uuid.h>
+#include "uuid.h"
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
diff --git a/bluez/attrib/gattrib.c b/bluez/attrib/gattrib.c
index 875d3a2..534c107 100644
--- a/bluez/attrib/gattrib.c
+++ b/bluez/attrib/gattrib.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
+#include "uuid.h"
 
 #include "log.h"
 #include "att.h"
diff --git a/examples/gatttool/gatttool.c b/examples/gatttool/gatttool.c
index d50930f..e4a2b30 100644
--- a/examples/gatttool/gatttool.c
+++ b/examples/gatttool/gatttool.c
@@ -34,7 +34,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
-#include <bluetooth/uuid.h>
+#include "uuid.h"
 
 #include "att.h"
 #include "btio.h"
diff --git a/examples/gatttool/interactive.c b/examples/gatttool/interactive.c
index 81289f2..f8a7219 100644
--- a/examples/gatttool/interactive.c
+++ b/examples/gatttool/interactive.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <glib.h>
 
-#include <bluetooth/uuid.h>
+#include "uuid.h"
 
 #include <readline/readline.h>
 #include <readline/history.h>
diff --git a/examples/gatttool/utils.c b/examples/gatttool/utils.c
index 0d9e4c2..e011704 100644
--- a/examples/gatttool/utils.c
+++ b/examples/gatttool/utils.c
@@ -27,7 +27,7 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
 #include <bluetooth/hci_lib.h>
-#include <bluetooth/uuid.h>
+#include "uuid.h"
 #include <bluetooth/sdp.h>
 
 #include "gattlib.h"
diff --git a/include/gattlib.h b/include/gattlib.h
index 1caab31..9dd57f8 100644
--- a/include/gattlib.h
+++ b/include/gattlib.h
@@ -29,7 +29,7 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/sdp.h>
-#include <bluetooth/uuid.h>
+#include "uuid.h"
 
 #ifndef BDADDR_BREDR
   /* GattLib note: BD Address have only been introduced into Bluez v4.100.   */
diff --git a/src/gattlib_connect.c b/src/gattlib_connect.c
index 8b620d3..9fb9844 100644
--- a/src/gattlib_connect.c
+++ b/src/gattlib_connect.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
+#include "uuid.h"
 
 #include "gattlib_internal.h"