From 9b99e998a112a447144fec13387003598220602b Mon Sep 17 00:00:00 2001
From: Jakub Pawlowski <jpawlowski@google.com>
Date: Wed, 25 May 2016 14:46:19 -0700
Subject: [PATCH] Remove unnecesarry hash_map includes

Change-Id: I929b2ec88e33643f128a3a72130bdb091e0b2143
---
 bta/sys/bta_sys_main.c  | 2 --
 btcore/include/bdaddr.h | 3 +--
 btcore/src/bdaddr.c     | 1 +
 main/bte_main.c         | 2 --
 stack/btu/btu_init.c    | 2 --
 stack/btu/btu_task.c    | 1 -
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/bta/sys/bta_sys_main.c b/bta/sys/bta_sys_main.c
index af32cc933..320703e85 100644
--- a/bta/sys/bta_sys_main.c
+++ b/bta/sys/bta_sys_main.c
@@ -35,8 +35,6 @@
 #include "bt_common.h"
 #include "osi/include/alarm.h"
 #include "osi/include/fixed_queue.h"
-#include "osi/include/hash_functions.h"
-#include "osi/include/hash_map.h"
 #include "osi/include/log.h"
 #include "osi/include/osi.h"
 #include "osi/include/thread.h"
diff --git a/btcore/include/bdaddr.h b/btcore/include/bdaddr.h
index ec8a1ee1f..4fdc1ea91 100644
--- a/btcore/include/bdaddr.h
+++ b/btcore/include/bdaddr.h
@@ -21,8 +21,7 @@
 #include <hardware/bluetooth.h>
 #include <stdbool.h>
 #include <stddef.h>
-
-#include "osi/include/hash_map.h"
+#include "osi/include/hash_functions.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/btcore/src/bdaddr.c b/btcore/src/bdaddr.c
index ddbd9d3b3..754310e4b 100644
--- a/btcore/src/bdaddr.c
+++ b/btcore/src/bdaddr.c
@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include "btcore/include/bdaddr.h"
+#include "osi/include/hash_functions.h"
 
 bool bdaddr_is_empty(const bt_bdaddr_t *addr) {
   assert(addr != NULL);
diff --git a/main/bte_main.c b/main/bte_main.c
index 7ba2421d3..aa5e15a77 100644
--- a/main/bte_main.c
+++ b/main/bte_main.c
@@ -49,8 +49,6 @@
 #include "osi/include/alarm.h"
 #include "osi/include/fixed_queue.h"
 #include "osi/include/future.h"
-#include "osi/include/hash_functions.h"
-#include "osi/include/hash_map.h"
 #include "osi/include/log.h"
 #include "osi/include/osi.h"
 #include "osi/include/thread.h"
diff --git a/stack/btu/btu_init.c b/stack/btu/btu_init.c
index 688ed889d..e7917e250 100644
--- a/stack/btu/btu_init.c
+++ b/stack/btu/btu_init.c
@@ -30,8 +30,6 @@
 #include "l2c_int.h"
 #include "osi/include/alarm.h"
 #include "osi/include/fixed_queue.h"
-#include "osi/include/hash_functions.h"
-#include "osi/include/hash_map.h"
 #include "osi/include/log.h"
 #include "osi/include/thread.h"
 #include "sdpint.h"
diff --git a/stack/btu/btu_task.c b/stack/btu/btu_task.c
index 6c2a7a805..8a6db35d4 100644
--- a/stack/btu/btu_task.c
+++ b/stack/btu/btu_task.c
@@ -40,7 +40,6 @@
 #include "osi/include/alarm.h"
 #include "osi/include/fixed_queue.h"
 #include "osi/include/future.h"
-#include "osi/include/hash_map.h"
 #include "osi/include/log.h"
 #include "osi/include/osi.h"
 #include "osi/include/thread.h"
-- 
2.11.0