From 30e947cb44e48f7c6b31785adbbc02117a67107b Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 25 Jan 2014 16:46:11 -0800
Subject: [PATCH] shared: Use full include path for shared headers

---
 src/shared/btsnoop.c | 2 +-
 src/shared/hci.c     | 5 ++---
 src/shared/hciemu.c  | 7 +++----
 src/shared/hfp.c     | 8 ++++----
 src/shared/pcap.c    | 3 +--
 src/shared/queue.c   | 4 ++--
 src/shared/ringbuf.c | 4 ++--
 7 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/shared/btsnoop.c b/src/shared/btsnoop.c
index 800a6fb6d..26ef240e7 100644
--- a/src/shared/btsnoop.c
+++ b/src/shared/btsnoop.c
@@ -32,7 +32,7 @@
 #include <arpa/inet.h>
 #include <sys/stat.h>
 
-#include "btsnoop.h"
+#include "src/shared/btsnoop.h"
 
 struct btsnoop_hdr {
 	uint8_t		id[8];		/* Identification Pattern */
diff --git a/src/shared/hci.c b/src/shared/hci.c
index be636de75..da300ac90 100644
--- a/src/shared/hci.c
+++ b/src/shared/hci.c
@@ -31,12 +31,11 @@
 #include <sys/socket.h>
 
 #include "monitor/bt.h"
+#include "monitor/mainloop.h"
 #include "src/shared/io.h"
 #include "src/shared/util.h"
 #include "src/shared/queue.h"
-#include "monitor/mainloop.h"
-
-#include "hci.h"
+#include "src/shared/hci.h"
 
 #define BTPROTO_HCI	1
 struct sockaddr_hci {
diff --git a/src/shared/hciemu.c b/src/shared/hciemu.c
index d2c4a2e8c..4b61d0854 100644
--- a/src/shared/hciemu.c
+++ b/src/shared/hciemu.c
@@ -40,12 +40,11 @@
 #include <bluetooth/hci.h>
 
 #include "monitor/bt.h"
-#include "src/shared/util.h"
-#include "src/shared/queue.h"
 #include "emulator/btdev.h"
 #include "emulator/bthost.h"
-
-#include "hciemu.h"
+#include "src/shared/util.h"
+#include "src/shared/queue.h"
+#include "src/shared/hciemu.h"
 
 struct hciemu {
 	int ref_count;
diff --git a/src/shared/hfp.c b/src/shared/hfp.c
index c1bfc30bb..43e88a6c1 100644
--- a/src/shared/hfp.c
+++ b/src/shared/hfp.c
@@ -30,10 +30,10 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "util.h"
-#include "ringbuf.h"
-#include "io.h"
-#include "hfp.h"
+#include "src/shared/util.h"
+#include "src/shared/ringbuf.h"
+#include "src/shared/io.h"
+#include "src/shared/hfp.h"
 
 struct hfp_gw {
 	int ref_count;
diff --git a/src/shared/pcap.c b/src/shared/pcap.c
index b38a952ee..585ce8ace 100644
--- a/src/shared/pcap.c
+++ b/src/shared/pcap.c
@@ -30,8 +30,7 @@
 #include <stdlib.h>
 
 #include "src/shared/util.h"
-
-#include "pcap.h"
+#include "src/shared/pcap.h"
 
 struct pcap_hdr {
 	uint32_t magic_number;	/* magic number */
diff --git a/src/shared/queue.c b/src/shared/queue.c
index a7cc8d551..f5be894ee 100644
--- a/src/shared/queue.c
+++ b/src/shared/queue.c
@@ -25,8 +25,8 @@
 #include <config.h>
 #endif
 
-#include "util.h"
-#include "queue.h"
+#include "src/shared/util.h"
+#include "src/shared/queue.h"
 
 struct queue_entry {
 	void *data;
diff --git a/src/shared/ringbuf.c b/src/shared/ringbuf.c
index fa783c184..3e5c7d33a 100644
--- a/src/shared/ringbuf.c
+++ b/src/shared/ringbuf.c
@@ -30,8 +30,8 @@
 #include <sys/uio.h>
 #include <sys/param.h>
 
-#include "util.h"
-#include "ringbuf.h"
+#include "src/shared/util.h"
+#include "src/shared/ringbuf.h"
 
 #ifndef MIN
 #define MIN(x,y) ((x)<(y)?(x):(y))
-- 
2.47.3