diff --git a/examples/ble_scan/ble_scan.c b/examples/ble_scan/ble_scan.c
index c97beda..2804c11 100644
--- a/examples/ble_scan/ble_scan.c
+++ b/examples/ble_scan/ble_scan.c
@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/queue.h>
+#include <unistd.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/hci.h>
diff --git a/examples/gatttool/gatttool.h b/examples/gatttool/gatttool.h
index b3949f2..87141bd 100644
--- a/examples/gatttool/gatttool.h
+++ b/examples/gatttool/gatttool.h
@@ -21,6 +21,8 @@
  *
  */
 
+#include <readline/readline.h>
+
 void notification_handler(uint16_t handle, const uint8_t* data, size_t data_length, void* user_data);
 void indication_handler(uint16_t handle, const uint8_t* data, size_t data_length, void* user_data);
 
diff --git a/examples/read_write/read_write.c b/examples/read_write/read_write.c
index 073547a..0468aed 100644
--- a/examples/read_write/read_write.c
+++ b/examples/read_write/read_write.c
@@ -2,7 +2,7 @@
  *
  *  GattLib - GATT Library
  *
- *  Copyright (C) 2016  Olivier Martin <olivier@labapart.org>
+ *  Copyright (C) 2016-2017  Olivier Martin <olivier@labapart.org>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -23,6 +23,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "gattlib.h"
 
diff --git a/include/gattlib_internal.h b/include/gattlib_internal.h
index 1cb3e55..687cd44 100644
--- a/include/gattlib_internal.h
+++ b/include/gattlib_internal.h
@@ -2,7 +2,7 @@
  *
  *  GattLib - GATT Library
  *
- *  Copyright (C) 2016  Olivier Martin <olivier@labapart.org>
+ *  Copyright (C) 2016-2017 Olivier Martin <olivier@labapart.org>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/gattlib_connect.c b/src/gattlib_connect.c
index 9fb9844..20e7119 100644
--- a/src/gattlib_connect.c
+++ b/src/gattlib_connect.c
@@ -2,7 +2,7 @@
  *
  *  GattLib - GATT Library
  *
- *  Copyright (C) 2016  Olivier Martin <olivier@labapart.org>
+ *  Copyright (C) 2016-2017 Olivier Martin <olivier@labapart.org>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,8 @@
 #include "att.h"
 #include "btio.h"
 #include "gattrib.h"
+#include "hci.h"
+#include "hci_lib.h"
 
 #define CONNECTION_TIMEOUT    2
 
diff --git a/src/gattlib_read_write.c b/src/gattlib_read_write.c
index cf46375..6e2d0d7 100644
--- a/src/gattlib_read_write.c
+++ b/src/gattlib_read_write.c
@@ -2,7 +2,7 @@
  *
  *  GattLib - GATT Library
  *
- *  Copyright (C) 2016  Olivier Martin <olivier@labapart.org>
+ *  Copyright (C) 2016-2017 Olivier Martin <olivier@labapart.org>
  *
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,8 @@
 #include "gattlib_internal.h"
 
 #include "att.h"
+#include "gattrib.h"
+#include "gatt.h"
 
 struct gattlib_result_read_uuid_t {
 	void*          buffer;