diff --git a/nimble/host/include/host/ble_hs_stop.h b/nimble/host/include/host/ble_hs_stop.h
index d16c9c27b..e4feb62bf 100644
--- a/nimble/host/include/host/ble_hs_stop.h
+++ b/nimble/host/include/host/ble_hs_stop.h
@@ -64,7 +64,7 @@ struct ble_hs_stop_listener {
  *                              BLE_HS_EALREADY: Host already stopped; the
  *                                  provided callback does *not* get called.
  */
-int ble_hs_stop(struct ble_hs_stop_listener *listener, 
+int ble_hs_stop(struct ble_hs_stop_listener *listener,
                 ble_hs_stop_fn *fn, void *arg);
 
 #endif
diff --git a/nimble/host/src/ble_att.c b/nimble/host/src/ble_att.c
index 8aab7f919..5f119ac1c 100644
--- a/nimble/host/src/ble_att.c
+++ b/nimble/host/src/ble_att.c
@@ -20,6 +20,7 @@
 #include <stddef.h>
 #include <errno.h>
 #include "ble_hs_priv.h"
+#include "host/ble_att.h"
 
 #if NIMBLE_BLE_CONNECT
 static uint16_t ble_att_preferred_mtu_val;
diff --git a/nimble/host/src/ble_att_svr.c b/nimble/host/src/ble_att_svr.c
index 468768ac0..73e258dec 100644
--- a/nimble/host/src/ble_att_svr.c
+++ b/nimble/host/src/ble_att_svr.c
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <errno.h>
 #include "os/os.h"
+#include "host/ble_att.h"
 #include "nimble/ble.h"
 #include "host/ble_uuid.h"
 #include "ble_hs_priv.h"
diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c
index 3d8f3038a..621a88a0f 100644
--- a/nimble/host/src/ble_gap.c
+++ b/nimble/host/src/ble_gap.c
@@ -21,9 +21,11 @@
 #include <string.h>
 #include <errno.h>
 #include "nimble/nimble_opt.h"
+#include "host/ble_gap.h"
 #include "host/ble_hs_adv.h"
 #include "host/ble_hs_hci.h"
 #include "ble_hs_priv.h"
+#include "ble_gap_priv.h"
 
 #if MYNEWT
 #include "bsp/bsp.h"
diff --git a/nimble/host/src/ble_gattc.c b/nimble/host/src/ble_gattc.c
index b43a0af03..b0535fb81 100644
--- a/nimble/host/src/ble_gattc.c
+++ b/nimble/host/src/ble_gattc.c
@@ -56,6 +56,7 @@
 #include <string.h>
 #include "os/os_mempool.h"
 #include "nimble/ble.h"
+#include "host/ble_gatt.h"
 #include "host/ble_uuid.h"
 #include "host/ble_gap.h"
 #include "ble_hs_priv.h"
diff --git a/nimble/host/src/ble_gatts.c b/nimble/host/src/ble_gatts.c
index 83402e724..93809caa4 100644
--- a/nimble/host/src/ble_gatts.c
+++ b/nimble/host/src/ble_gatts.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "nimble/ble.h"
+#include "host/ble_gatt.h"
 #include "host/ble_uuid.h"
 #include "host/ble_store.h"
 #include "ble_hs_priv.h"
diff --git a/nimble/host/src/ble_gatts_lcl.c b/nimble/host/src/ble_gatts_lcl.c
index 938d73622..f824e9000 100644
--- a/nimble/host/src/ble_gatts_lcl.c
+++ b/nimble/host/src/ble_gatts_lcl.c
@@ -19,6 +19,7 @@
 
 #include <stddef.h>
 #include <string.h>
+#include "host/ble_gatt.h"
 #include "host/ble_uuid.h"
 #include "console/console.h"
 #include "nimble/ble.h"
diff --git a/nimble/host/src/ble_hs.c b/nimble/host/src/ble_hs.c
index 9f39c8e66..5e5c6442c 100644
--- a/nimble/host/src/ble_hs.c
+++ b/nimble/host/src/ble_hs.c
@@ -24,6 +24,7 @@
 #include "syscfg/syscfg.h"
 #include "stats/stats.h"
 #include "nimble/ble_hci_trans.h"
+#include "host/ble_hs.h"
 #include "ble_hs_priv.h"
 #include "ble_monitor_priv.h"
 #include "nimble/nimble_npl.h"
diff --git a/nimble/host/src/ble_hs_log.c b/nimble/host/src/ble_hs_log.c
index 7ec69469e..0670dca6e 100644
--- a/nimble/host/src/ble_hs_log.c
+++ b/nimble/host/src/ble_hs_log.c
@@ -19,6 +19,7 @@
 
 #include "os/os.h"
 #include "host/ble_hs.h"
+#include "host/ble_hs_log.h"
 
 struct log ble_hs_log;
 
diff --git a/nimble/host/src/ble_hs_mbuf.c b/nimble/host/src/ble_hs_mbuf.c
index 6e920f94f..f4d6a790f 100644
--- a/nimble/host/src/ble_hs_mbuf.c
+++ b/nimble/host/src/ble_hs_mbuf.c
@@ -18,6 +18,7 @@
  */
 
 #include "host/ble_hs.h"
+#include "host/ble_hs_mbuf.h"
 #include "ble_hs_priv.h"
 
 /**
diff --git a/nimble/host/src/ble_hs_stop.c b/nimble/host/src/ble_hs_stop.c
index b90d3ec6f..e48fff389 100644
--- a/nimble/host/src/ble_hs_stop.c
+++ b/nimble/host/src/ble_hs_stop.c
@@ -21,6 +21,7 @@
 #include "sysinit/sysinit.h"
 #include "syscfg/syscfg.h"
 #include "ble_hs_priv.h"
+#include "host/ble_hs_stop.h"
 #include "nimble/nimble_npl.h"
 #ifndef MYNEWT
 #include "nimble/nimble_port.h"
@@ -217,7 +218,7 @@ ble_hs_stop_begin(struct ble_hs_stop_listener *listener,
 }
 
 int
-ble_hs_stop(struct ble_hs_stop_listener *listener, 
+ble_hs_stop(struct ble_hs_stop_listener *listener,
             ble_hs_stop_fn *fn, void *arg)
 {
     int rc;
diff --git a/nimble/host/src/ble_ibeacon.c b/nimble/host/src/ble_ibeacon.c
index 0c6ef99d5..bbd353cc9 100644
--- a/nimble/host/src/ble_ibeacon.c
+++ b/nimble/host/src/ble_ibeacon.c
@@ -19,6 +19,7 @@
 
 #include <string.h>
 #include "host/ble_hs_adv.h"
+#include "host/ble_ibeacon.h"
 #include "ble_hs_priv.h"
 
 #define BLE_IBEACON_MFG_DATA_SIZE       25
diff --git a/nimble/host/src/ble_l2cap.c b/nimble/host/src/ble_l2cap.c
index bfbdadfcd..fb1a61761 100644
--- a/nimble/host/src/ble_l2cap.c
+++ b/nimble/host/src/ble_l2cap.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 #include "syscfg/syscfg.h"
 #include "os/os.h"
+#include "host/ble_l2cap.h"
 #include "nimble/ble.h"
 #include "nimble/hci_common.h"
 #include "ble_hs_priv.h"