android/hal: Make hal.h self contained

diff --git a/android/hal-av.c b/android/hal-av.c
index ef45066..b1c5276 100644 (file)
--- 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 5b07070..6adf0cb 100644 (file)
--- 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 79de449..e1a3e97 100644 (file)
--- 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 645fe8c..f05a93b 100644 (file)
--- 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 dab3756..364663c 100644 (file)
--- 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 d984336..e3c4122 100644 (file)
--- 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>