diff --git a/drivers/wireless/bluetooth/bt_uart.c b/drivers/wireless/bluetooth/bt_uart.c
index d7b4125d220..1b500278bf6 100644
--- a/drivers/wireless/bluetooth/bt_uart.c
+++ b/drivers/wireless/bluetooth/bt_uart.c
@@ -53,7 +53,6 @@
 #include <nuttx/wireless/bluetooth/bt_core.h>
 #include <nuttx/wireless/bluetooth/bt_hci.h>
 #include <nuttx/wireless/bluetooth/bt_driver.h>
-#include <nuttx/wireless/bluetooth/bt_uart.h>
 
 #include "bt_uart.h"
 
diff --git a/drivers/wireless/bluetooth/bt_uart.h b/drivers/wireless/bluetooth/bt_uart.h
index 8f738ba362f..0ea6c8fa1d1 100644
--- a/drivers/wireless/bluetooth/bt_uart.h
+++ b/drivers/wireless/bluetooth/bt_uart.h
@@ -48,6 +48,7 @@
 #include <stdbool.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/wireless/bluetooth/bt_driver.h>
+#include <nuttx/wireless/bluetooth/bt_uart.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -72,8 +73,6 @@
 
 /* This type defines the state data generic UART upper half driver */
 
-struct btuart_lowerhalf_s; /* Forward reference */
-
 struct btuart_upperhalf_s
 {
   /* This structure must appear first in the structure so that this structure
@@ -98,7 +97,5 @@ struct btuart_upperhalf_s
 
 /* Generic implementations of HCI UART methods */
 
-struct bt_buf_s;  /* Forward reference */
-
 int btuart_send(FAR const struct bt_driver_s *dev, FAR struct bt_buf_s *buf);
 int btuart_open(FAR const struct bt_driver_s *dev);
diff --git a/drivers/wireless/bluetooth/bt_uart_bcm4343x.c b/drivers/wireless/bluetooth/bt_uart_bcm4343x.c
index e1518cb934b..8c968941880 100644
--- a/drivers/wireless/bluetooth/bt_uart_bcm4343x.c
+++ b/drivers/wireless/bluetooth/bt_uart_bcm4343x.c
@@ -43,8 +43,6 @@
 #include <nuttx/kthread.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/serial/tioctl.h>
-#include <nuttx/wireless/bluetooth/bt_uart.h>
-#include <nuttx/wireless/bluetooth/bt_uart_shim.h>
 #include <termios.h>
 
 #include "bt_uart.h"
diff --git a/drivers/wireless/bluetooth/bt_uart_cc2564.c b/drivers/wireless/bluetooth/bt_uart_cc2564.c
index 7983cf35e25..97b04c6a05f 100644
--- a/drivers/wireless/bluetooth/bt_uart_cc2564.c
+++ b/drivers/wireless/bluetooth/bt_uart_cc2564.c
@@ -44,7 +44,6 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/wireless/bluetooth/bt_uart.h>
 
 #include "bt_uart.h"
 
diff --git a/drivers/wireless/bluetooth/bt_uart_generic.c b/drivers/wireless/bluetooth/bt_uart_generic.c
index 2d31b41180e..fcc7cfb7f88 100644
--- a/drivers/wireless/bluetooth/bt_uart_generic.c
+++ b/drivers/wireless/bluetooth/bt_uart_generic.c
@@ -45,16 +45,6 @@
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
-#include <nuttx/wireless/bluetooth/bt_uart.h>
-
-#if 0
-#include <stddef.h>
-#include <errno.h>
-
-#include <nuttx/wireless/bluetooth/bt_core.h>
-#include <nuttx/wireless/bluetooth/bt_hci.h>
-#include <nuttx/wireless/bluetooth/bt_driver.h>
-#endif
 
 #include "bt_uart.h"
 
diff --git a/include/nuttx/wireless/bluetooth/bt_buf.h b/include/nuttx/wireless/bluetooth/bt_buf.h
index 9a74b3817f5..f4d49dcc2a4 100644
--- a/include/nuttx/wireless/bluetooth/bt_buf.h
+++ b/include/nuttx/wireless/bluetooth/bt_buf.h
@@ -154,8 +154,6 @@ struct bt_bufferlist_s
  *
  ****************************************************************************/
 
-struct iob_s; /* Forward reference */
-
 FAR struct bt_buf_s *bt_buf_alloc(enum bt_buf_type_e type,
                                   FAR struct iob_s *iob,
                                   size_t reserve_head);