From 3917177c4067a33f38259b38a87d190a10c37e25 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon.janc@tieto.com>
Date: Tue, 22 Oct 2013 14:46:08 +0200
Subject: [PATCH] android/hal: Make hal.h self contained

---
 android/hal-av.c        | 3 ---
 android/hal-bluetooth.c | 5 -----
 android/hal-hidhost.c   | 3 ---
 android/hal-pan.c       | 3 ---
 android/hal-sock.c      | 3 ---
 android/hal.h           | 1 +
 6 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/android/hal-av.c b/android/hal-av.c
index ef450665e..b1c5276c6 100644
--- a/android/hal-av.c
+++ b/android/hal-av.c
@@ -18,9 +18,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include <hardware/bluetooth.h>
-#include <hardware/bt_av.h>
-
 #include "hal-log.h"
 #include "hal.h"
 
diff --git a/android/hal-bluetooth.c b/android/hal-bluetooth.c
index 5b070703c..6adf0cbb1 100644
--- a/android/hal-bluetooth.c
+++ b/android/hal-bluetooth.c
@@ -20,11 +20,6 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <hardware/bluetooth.h>
-#include <hardware/bt_sock.h>
-#include <hardware/bt_hh.h>
-#include <hardware/bt_pan.h>
-
 #include "hal-log.h"
 #include "hal.h"
 #include "hal-msg.h"
diff --git a/android/hal-hidhost.c b/android/hal-hidhost.c
index 79de4491e..e1a3e97d2 100644
--- a/android/hal-hidhost.c
+++ b/android/hal-hidhost.c
@@ -19,9 +19,6 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <hardware/bluetooth.h>
-#include <hardware/bt_hh.h>
-
 #include "hal-log.h"
 #include "hal.h"
 #include "hal-msg.h"
diff --git a/android/hal-pan.c b/android/hal-pan.c
index 645fe8c9b..f05a93bd5 100644
--- a/android/hal-pan.c
+++ b/android/hal-pan.c
@@ -18,9 +18,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include <hardware/bluetooth.h>
-#include <hardware/bt_pan.h>
-
 #include "hal-log.h"
 #include "hal.h"
 
diff --git a/android/hal-sock.c b/android/hal-sock.c
index dab3756f4..364663c90 100644
--- a/android/hal-sock.c
+++ b/android/hal-sock.c
@@ -17,9 +17,6 @@
 
 #include <stdlib.h>
 
-#include <hardware/bluetooth.h>
-#include <hardware/bt_sock.h>
-
 #include "hal-log.h"
 #include "hal.h"
 
diff --git a/android/hal.h b/android/hal.h
index d9843369c..e3c412256 100644
--- a/android/hal.h
+++ b/android/hal.h
@@ -15,6 +15,7 @@
  *
  */
 
+#include <hardware/bluetooth.h>
 #include <hardware/bt_sock.h>
 #include <hardware/bt_hh.h>
 #include <hardware/bt_pan.h>
-- 
2.47.3