diff --git a/nimble/controller/include/controller/ble_ll.h b/nimble/controller/include/controller/ble_ll.h
index 4d2e61680..249502328 100644
--- a/nimble/controller/include/controller/ble_ll.h
+++ b/nimble/controller/include/controller/ble_ll.h
@@ -491,8 +491,6 @@ ble_ll_usecs_to_ticks_round_up(uint32_t usecs)
     return os_cputime_usecs_to_ticks(usecs + 30);
 }
 
-#include "console/console.h"
-
 #define BLE_LL_LOG_ID_PHY_SETCHAN       (1)
 #define BLE_LL_LOG_ID_RX_START          (2)
 #define BLE_LL_LOG_ID_RX_END            (3)
diff --git a/nimble/controller/include/controller/ble_ll_conn.h b/nimble/controller/include/controller/ble_ll_conn.h
index 1d04acb13..b462590c7 100644
--- a/nimble/controller/include/controller/ble_ll_conn.h
+++ b/nimble/controller/include/controller/ble_ll_conn.h
@@ -26,7 +26,6 @@
 #include "controller/ble_ll_sched.h"
 #include "controller/ble_ll_ctrl.h"
 #include "controller/ble_phy.h"
-#include "hal/hal_timer.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/nimble/controller/src/ble_ll.c b/nimble/controller/src/ble_ll.c
index 453f42223..a9a39b571 100644
--- a/nimble/controller/src/ble_ll.c
+++ b/nimble/controller/src/ble_ll.c
@@ -18,6 +18,7 @@
  */
 
 #include <stdint.h>
+#include <stdlib.h>
 #include <assert.h>
 #include <string.h>
 #include "sysinit/sysinit.h"
@@ -25,7 +26,6 @@
 #include "os/os.h"
 #include "os/os_cputime.h"
 #include "stats/stats.h"
-#include "bsp/bsp.h"
 #include "nimble/ble.h"
 #include "nimble/nimble_opt.h"
 #include "nimble/hci_common.h"
diff --git a/nimble/controller/src/ble_ll_adv.c b/nimble/controller/src/ble_ll_adv.c
index a075ab20f..50567ad4d 100644
--- a/nimble/controller/src/ble_ll_adv.c
+++ b/nimble/controller/src/ble_ll_adv.c
@@ -22,7 +22,6 @@
 #include "syscfg/syscfg.h"
 #include "os/os.h"
 #include "os/os_cputime.h"
-#include "bsp/bsp.h"
 #include "ble/xcvr.h"
 #include "nimble/ble.h"
 #include "nimble/nimble_opt.h"
diff --git a/nimble/controller/src/ble_ll_conn.c b/nimble/controller/src/ble_ll_conn.c
index d5b0b47ee..1fb5a0104 100644
--- a/nimble/controller/src/ble_ll_conn.c
+++ b/nimble/controller/src/ble_ll_conn.c
@@ -18,10 +18,10 @@
  */
 
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include "syscfg/syscfg.h"
-#include "bsp/bsp.h"
 #include "os/os.h"
 #include "os/os_cputime.h"
 #include "nimble/ble.h"
diff --git a/nimble/controller/src/ble_ll_conn_hci.c b/nimble/controller/src/ble_ll_conn_hci.c
index bcbfae414..54d21586f 100644
--- a/nimble/controller/src/ble_ll_conn_hci.c
+++ b/nimble/controller/src/ble_ll_conn_hci.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <assert.h>
 #include "syscfg/syscfg.h"
-#include "bsp/bsp.h"
 #include "os/os.h"
 #include "nimble/ble.h"
 #include "nimble/nimble_opt.h"
diff --git a/nimble/controller/src/ble_ll_scan.c b/nimble/controller/src/ble_ll_scan.c
index 85b743b25..33a180ed5 100644
--- a/nimble/controller/src/ble_ll_scan.c
+++ b/nimble/controller/src/ble_ll_scan.c
@@ -18,10 +18,10 @@
  */
 
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include "syscfg/syscfg.h"
-#include "bsp/bsp.h"
 #include "os/os.h"
 #include "os/os_cputime.h"
 #include "nimble/ble.h"
diff --git a/nimble/controller/src/ble_ll_sched.c b/nimble/controller/src/ble_ll_sched.c
index e421806da..7f0c1a4a4 100644
--- a/nimble/controller/src/ble_ll_sched.c
+++ b/nimble/controller/src/ble_ll_sched.c
@@ -17,9 +17,9 @@
  * under the License.
  */
 #include <stdint.h>
+#include <stdlib.h>
 #include <assert.h>
 #include <string.h>
-#include "bsp/bsp.h"
 #include "os/os.h"
 #include "os/os_cputime.h"
 #include "ble/xcvr.h"
diff --git a/nimble/host/util/src/addr.c b/nimble/host/util/src/addr.c
index b797fd687..e0b7880ac 100644
--- a/nimble/host/util/src/addr.c
+++ b/nimble/host/util/src/addr.c
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-#include "hal/hal_bsp.h"
 #include "host/ble_hs.h"
 #include "host/util/util.h"