Bluetooth: hci.h: Do not include conn.h

Commit 0f06c7d introduced the inclusion of conn.h in hci.h. This is in fact not required because bluetooth.h has forward declarations of many of the structs present in conn.h, including struct bt_conn. As part of this change, include the necessary Bluetooth headers required by hci_core.h. Fixes zephyrproject-rtos#58214. Signed-off-by: Carles Cufi <[email protected]>
carlescufi · Jun 8, 2023 · a07a00d · a07a00d
1 parent 54aa6f1
commit a07a00d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/include/zephyr/bluetooth/hci.h b/include/zephyr/bluetooth/hci.h
@@ -17,8 +17,8 @@
 #include <zephyr/sys/util.h>
 #include <zephyr/net/buf.h>
 #include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/hci_err.h>
-#include <zephyr/bluetooth/conn.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/subsys/bluetooth/host/hci_core.h b/subsys/bluetooth/host/hci_core.h
@@ -7,6 +7,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+
 /* LL connection parameters */
 #define LE_CONN_LATENCY		0x0000
 #define LE_CONN_TIMEOUT		0x002a