diff --git a/arch/arm/include/cxd56xx/pm.h b/arch/arm/include/cxd56xx/pm.h
index 40506dbbcb..5689b2a683 100644
--- a/arch/arm/include/cxd56xx/pm.h
+++ b/arch/arm/include/cxd56xx/pm.h
@@ -26,7 +26,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Pre-processor Prototypes
diff --git a/arch/arm/src/cxd56xx/cxd56_cpufifo.c b/arch/arm/src/cxd56xx/cxd56_cpufifo.c
index 4a8a4c36d5..91b71e23c7 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpufifo.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpufifo.c
@@ -25,7 +25,8 @@
 #include <nuttx/config.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
-#include <queue.h>
+#include <nuttx/queue.h>
+
 #include <assert.h>
 #include <debug.h>
 #include <errno.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_ge2d.c b/arch/arm/src/cxd56xx/cxd56_ge2d.c
index a05953c533..be8f61b31f 100644
--- a/arch/arm/src/cxd56xx/cxd56_ge2d.c
+++ b/arch/arm/src/cxd56xx/cxd56_ge2d.c
@@ -29,7 +29,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/semaphore.h>
 
-#include <queue.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_icc.c b/arch/arm/src/cxd56xx/cxd56_icc.c
index fe72812f0e..ca0622b272 100644
--- a/arch/arm/src/cxd56xx/cxd56_icc.c
+++ b/arch/arm/src/cxd56xx/cxd56_icc.c
@@ -27,10 +27,10 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/signal.h>
 #include <nuttx/semaphore.h>
 
-#include <queue.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_powermgr.c b/arch/arm/src/cxd56xx/cxd56_powermgr.c
index 38fa33a818..264d5ad0bc 100644
--- a/arch/arm/src/cxd56xx/cxd56_powermgr.c
+++ b/arch/arm/src/cxd56xx/cxd56_powermgr.c
@@ -28,13 +28,13 @@
 #include <nuttx/config.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mqueue.h>
+#include <nuttx/queue.h>
 
 #include <assert.h>
 #include <debug.h>
 #include <errno.h>
 #include <sched.h>
 #include <fcntl.h>
-#include <queue.h>
 
 #include <arch/chip/pm.h>
 
diff --git a/arch/arm/src/cxd56xx/cxd56_uart0.c b/arch/arm/src/cxd56xx/cxd56_uart0.c
index c0a2316be4..bb00f6191e 100644
--- a/arch/arm/src/cxd56xx/cxd56_uart0.c
+++ b/arch/arm/src/cxd56xx/cxd56_uart0.c
@@ -29,7 +29,6 @@
 #include <nuttx/irq.h>
 #include <nuttx/semaphore.h>
 
-#include <queue.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/arch/arm/src/gd32f4/gd32f4xx_enet.c b/arch/arm/src/gd32f4/gd32f4xx_enet.c
index ed9a9bd6d0..ce740d19a0 100644
--- a/arch/arm/src/gd32f4/gd32f4xx_enet.c
+++ b/arch/arm/src/gd32f4/gd32f4xx_enet.c
@@ -36,13 +36,13 @@
 #include <assert.h>
 #include <debug.h>
 #include <assert.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/phy.h>
diff --git a/arch/arm/src/imxrt/imxrt_edma.c b/arch/arm/src/imxrt/imxrt_edma.c
index d8b82e90d6..cb74c81afe 100644
--- a/arch/arm/src/imxrt/imxrt_edma.c
+++ b/arch/arm/src/imxrt/imxrt_edma.c
@@ -49,13 +49,13 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include <queue.h>
 #include <assert.h>
 #include <debug.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
+#include <nuttx/queue.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/semaphore.h>
 
diff --git a/arch/arm/src/kinetis/kinetis_edma.c b/arch/arm/src/kinetis/kinetis_edma.c
index 5a57f62f54..2785e72ec4 100644
--- a/arch/arm/src/kinetis/kinetis_edma.c
+++ b/arch/arm/src/kinetis/kinetis_edma.c
@@ -51,13 +51,13 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include <queue.h>
 #include <assert.h>
 #include <debug.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
+#include <nuttx/queue.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/semaphore.h>
 
diff --git a/arch/arm/src/lc823450/lc823450_usbdev.c b/arch/arm/src/lc823450/lc823450_usbdev.c
index 60a4b8b527..137d4beff2 100644
--- a/arch/arm/src/lc823450/lc823450_usbdev.c
+++ b/arch/arm/src/lc823450/lc823450_usbdev.c
@@ -32,7 +32,6 @@
 #include <errno.h>
 #include <debug.h>
 #include <stdio.h>
-#include <queue.h>
 #include <stddef.h>
 #ifdef CONFIG_SYSTEM_PROPERTY
 #  include <system_property.h>
@@ -41,6 +40,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/signal.h>
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/usbdev.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_emc.c b/arch/arm/src/lpc43xx/lpc43_emc.c
index 32327a5b53..90d5345b3a 100644
--- a/arch/arm/src/lpc43xx/lpc43_emc.c
+++ b/arch/arm/src/lpc43xx/lpc43_emc.c
@@ -31,7 +31,6 @@
 #include <time.h>
 #include <string.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <nuttx/arch.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c
index 412884a7a8..627194e7bd 100644
--- a/arch/arm/src/lpc43xx/lpc43_ethernet.c
+++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c
@@ -32,13 +32,13 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/mii.h>
diff --git a/arch/arm/src/lpc54xx/lpc54_ethernet.c b/arch/arm/src/lpc54xx/lpc54_ethernet.c
index 37ddb9c868..f6cf4c082a 100644
--- a/arch/arm/src/lpc54xx/lpc54_ethernet.c
+++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c
@@ -67,7 +67,6 @@
 #include <stdbool.h>
 #include <time.h>
 #include <string.h>
-#include <queue.h>
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
@@ -76,6 +75,7 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/clock.h>
diff --git a/arch/arm/src/phy62xx/phy62xx_ble.c b/arch/arm/src/phy62xx/phy62xx_ble.c
index a02b746a47..0d1b822664 100644
--- a/arch/arm/src/phy62xx/phy62xx_ble.c
+++ b/arch/arm/src/phy62xx/phy62xx_ble.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <queue.h>
 #include <debug.h>
 /* #include "OSAL.h" */
 
diff --git a/arch/arm/src/rp2040/rp2040_i2s.c b/arch/arm/src/rp2040/rp2040_i2s.c
index b28892d9a1..b2d47a824f 100644
--- a/arch/arm/src/rp2040/rp2040_i2s.c
+++ b/arch/arm/src/rp2040/rp2040_i2s.c
@@ -32,12 +32,12 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/spi/spi.h>
diff --git a/arch/arm/src/s32k1xx/s32k1xx_edma.c b/arch/arm/src/s32k1xx/s32k1xx_edma.c
index e0b0493ef3..3b11d66ad9 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_edma.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_edma.c
@@ -50,13 +50,13 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include <queue.h>
 #include <assert.h>
 #include <debug.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
+#include <nuttx/queue.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/semaphore.h>
 
diff --git a/arch/arm/src/s32k3xx/s32k3xx_edma.c b/arch/arm/src/s32k3xx/s32k3xx_edma.c
index 49d4e4cc30..0be0a0b8a9 100644
--- a/arch/arm/src/s32k3xx/s32k3xx_edma.c
+++ b/arch/arm/src/s32k3xx/s32k3xx_edma.c
@@ -53,13 +53,13 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include <queue.h>
 #include <assert.h>
 #include <debug.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
+#include <nuttx/queue.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/semaphore.h>
 
diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c
index 7bae2ab8b0..d68c4c0304 100644
--- a/arch/arm/src/sam34/sam_emac.c
+++ b/arch/arm/src/sam34/sam_emac.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c
index 413d3ee4e7..d3d4ef586a 100644
--- a/arch/arm/src/sama5/sam_emaca.c
+++ b/arch/arm/src/sama5/sam_emaca.c
@@ -59,7 +59,6 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c
index d473e5fe26..d3b1d25f81 100644
--- a/arch/arm/src/sama5/sam_emacb.c
+++ b/arch/arm/src/sama5/sam_emacb.c
@@ -45,7 +45,6 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c
index 0e056bc617..ba23706621 100644
--- a/arch/arm/src/sama5/sam_gmac.c
+++ b/arch/arm/src/sama5/sam_gmac.c
@@ -56,7 +56,6 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c
index fec601a074..cbb8ed2234 100644
--- a/arch/arm/src/sama5/sam_ssc.c
+++ b/arch/arm/src/sama5/sam_ssc.c
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <arch/board/board.h>
@@ -40,6 +39,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/audio/audio.h>
diff --git a/arch/arm/src/samd5e5/sam_gmac.c b/arch/arm/src/samd5e5/sam_gmac.c
index e05adcf4da..4807fc8d05 100644
--- a/arch/arm/src/samd5e5/sam_gmac.c
+++ b/arch/arm/src/samd5e5/sam_gmac.c
@@ -55,7 +55,6 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c
index 3620ddc191..12acaf201d 100644
--- a/arch/arm/src/samv7/sam_emac.c
+++ b/arch/arm/src/samv7/sam_emac.c
@@ -38,7 +38,6 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c
index 3fe21a89a4..e063c055bc 100644
--- a/arch/arm/src/samv7/sam_ssc.c
+++ b/arch/arm/src/samv7/sam_ssc.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <arch/board/board.h>
@@ -39,6 +38,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/audio/audio.h>
diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c
index 72eb309734..7fa8cd7e8c 100644
--- a/arch/arm/src/stm32/stm32_eth.c
+++ b/arch/arm/src/stm32/stm32_eth.c
@@ -33,13 +33,13 @@
 #include <assert.h>
 #include <debug.h>
 #include <assert.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/phy.h>
diff --git a/arch/arm/src/stm32/stm32_i2s.c b/arch/arm/src/stm32/stm32_i2s.c
index 41fc4f099f..3b81a90c8b 100644
--- a/arch/arm/src/stm32/stm32_i2s.c
+++ b/arch/arm/src/stm32/stm32_i2s.c
@@ -53,12 +53,12 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/spi/spi.h>
diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c
index 28e8beffd0..b16c578cc7 100644
--- a/arch/arm/src/stm32f7/stm32_ethernet.c
+++ b/arch/arm/src/stm32f7/stm32_ethernet.c
@@ -31,13 +31,13 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
diff --git a/arch/arm/src/stm32f7/stm32_sai.c b/arch/arm/src/stm32f7/stm32_sai.c
index ba1f9b0a90..24bb938818 100644
--- a/arch/arm/src/stm32f7/stm32_sai.c
+++ b/arch/arm/src/stm32f7/stm32_sai.c
@@ -46,13 +46,13 @@
 #include <stdbool.h>
 #include <errno.h>
 #include <assert.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <arch/board/board.h>
 
 #include <nuttx/wdog.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/audio/audio.h>
diff --git a/arch/arm/src/stm32h7/stm32_ethernet.c b/arch/arm/src/stm32h7/stm32_ethernet.c
index e79387d4db..6ff98cdc63 100644
--- a/arch/arm/src/stm32h7/stm32_ethernet.c
+++ b/arch/arm/src/stm32h7/stm32_ethernet.c
@@ -31,13 +31,13 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_sai.c b/arch/arm/src/stm32l4/stm32l4_sai.c
index ec910db1d0..7f1b22fa73 100644
--- a/arch/arm/src/stm32l4/stm32l4_sai.c
+++ b/arch/arm/src/stm32l4/stm32l4_sai.c
@@ -45,13 +45,13 @@
 #include <stdbool.h>
 #include <errno.h>
 #include <assert.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <arch/board/board.h>
 
-#include <nuttx/wdog.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
+#include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/audio/audio.h>
 #include <nuttx/audio/i2s.h>
diff --git a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c
index 6f55d1256a..db6b71e88f 100644
--- a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c
+++ b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c
@@ -32,13 +32,13 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/mii.h>
diff --git a/arch/renesas/src/rx65n/rx65n_cmtw0.c b/arch/renesas/src/rx65n/rx65n_cmtw0.c
index 93d0252a10..e5626a75c3 100644
--- a/arch/renesas/src/rx65n/rx65n_cmtw0.c
+++ b/arch/renesas/src/rx65n/rx65n_cmtw0.c
@@ -27,7 +27,6 @@
 #include <time.h>
 #include <string.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include "rx65n_cmtw0.h"
diff --git a/arch/renesas/src/rx65n/rx65n_eth.c b/arch/renesas/src/rx65n/rx65n_eth.c
index cf0c826e1e..4738242e77 100644
--- a/arch/renesas/src/rx65n/rx65n_eth.c
+++ b/arch/renesas/src/rx65n/rx65n_eth.c
@@ -33,13 +33,13 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/phy.h>
 #include <nuttx/net/mii.h>
diff --git a/arch/risc-v/src/common/riscv_percpu.c b/arch/risc-v/src/common/riscv_percpu.c
index d204d498c3..6b55e54c76 100644
--- a/arch/risc-v/src/common/riscv_percpu.c
+++ b/arch/risc-v/src/common/riscv_percpu.c
@@ -24,6 +24,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/spinlock.h>
 
 #include <arch/barriers.h>
@@ -32,8 +33,6 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include <queue.h>
-
 #include "riscv_internal.h"
 #include "riscv_percpu.h"
 
diff --git a/arch/risc-v/src/esp32c3/esp32c3_ble.c b/arch/risc-v/src/esp32c3/esp32c3_ble.c
index 1df5dc1b21..98b0d99c48 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_ble.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_ble.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/nuttx.h>
diff --git a/arch/risc-v/src/esp32c3/esp32c3_wlan.c b/arch/risc-v/src/esp32c3/esp32c3_wlan.c
index 92afdb05ef..921d63e19e 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_wlan.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_wlan.c
@@ -26,7 +26,6 @@
 
 #ifdef CONFIG_ESP32C3_WIFI
 
-#include <queue.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -36,6 +35,7 @@
 #include <nuttx/nuttx.h>
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/net/arp.h>
diff --git a/arch/risc-v/src/mpfs/mpfs_ethernet.c b/arch/risc-v/src/mpfs/mpfs_ethernet.c
index 24beddd763..602c0ef65b 100644
--- a/arch/risc-v/src/mpfs/mpfs_ethernet.c
+++ b/arch/risc-v/src/mpfs/mpfs_ethernet.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <arpa/inet.h>
diff --git a/arch/risc-v/src/mpfs/mpfs_userspace.c b/arch/risc-v/src/mpfs/mpfs_userspace.c
index e63e683149..95950c1b4a 100644
--- a/arch/risc-v/src/mpfs/mpfs_userspace.c
+++ b/arch/risc-v/src/mpfs/mpfs_userspace.c
@@ -26,8 +26,8 @@
 
 #include <stdint.h>
 #include <assert.h>
-#include <queue.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/userspace.h>
 
 #include <arch/board/board_memorymap.h>
diff --git a/arch/risc-v/src/rv32m1/rv32m1_gpio.c b/arch/risc-v/src/rv32m1/rv32m1_gpio.c
index 1901daa088..5df6c2501a 100644
--- a/arch/risc-v/src/rv32m1/rv32m1_gpio.c
+++ b/arch/risc-v/src/rv32m1/rv32m1_gpio.c
@@ -28,12 +28,12 @@
 #include <stdint.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 
 #include "riscv_internal.h"
 #include "chip.h"
diff --git a/arch/sim/src/sim/up_alsa.c b/arch/sim/src/sim/up_alsa.c
index d5cbabf161..80b59eb123 100644
--- a/arch/sim/src/sim/up_alsa.c
+++ b/arch/sim/src/sim/up_alsa.c
@@ -25,10 +25,10 @@
 #include <nuttx/config.h>
 #include <nuttx/audio/audio.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/nuttx.h>
 
 #include <debug.h>
-#include <queue.h>
 
 #include <alsa/asoundlib.h>
 
diff --git a/arch/sim/src/sim/up_hcisocket.c b/arch/sim/src/sim/up_hcisocket.c
index 1229da5758..a31298fb6d 100644
--- a/arch/sim/src/sim/up_hcisocket.c
+++ b/arch/sim/src/sim/up_hcisocket.c
@@ -33,10 +33,10 @@
 #include <assert.h>
 #include <debug.h>
 #include <errno.h>
-#include <queue.h>
 
 #include <nuttx/nuttx.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/net/bluetooth.h>
 #include <nuttx/wireless/bluetooth/bt_driver.h>
 #include <nuttx/wireless/bluetooth/bt_uart.h>
diff --git a/arch/sim/src/sim/up_oneshot.c b/arch/sim/src/sim/up_oneshot.c
index b642d031d8..ae0b1e7219 100644
--- a/arch/sim/src/sim/up_oneshot.c
+++ b/arch/sim/src/sim/up_oneshot.c
@@ -28,12 +28,12 @@
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
-#include <queue.h>
 
 #include <nuttx/nuttx.h>
 #include <nuttx/arch.h>
 #include <nuttx/clock.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/timers/oneshot.h>
 #include <nuttx/timers/arch_alarm.h>
 
diff --git a/arch/xtensa/src/esp32/esp32_ble.c b/arch/xtensa/src/esp32/esp32_ble.c
index 842fc66625..06445acb3d 100644
--- a/arch/xtensa/src/esp32/esp32_ble.c
+++ b/arch/xtensa/src/esp32/esp32_ble.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/nuttx.h>
diff --git a/arch/xtensa/src/esp32/esp32_wlan.c b/arch/xtensa/src/esp32/esp32_wlan.c
index db86734cca..6a84ba1933 100644
--- a/arch/xtensa/src/esp32/esp32_wlan.c
+++ b/arch/xtensa/src/esp32/esp32_wlan.c
@@ -26,7 +26,6 @@
 
 #ifdef CONFIG_ESP32_WIFI
 
-#include <queue.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -36,6 +35,7 @@
 #include <nuttx/nuttx.h>
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/wdog.h>
 #include <nuttx/wqueue.h>
diff --git a/drivers/audio/audio_null.c b/drivers/audio/audio_null.c
index c4d62010b9..8ed3fddc8b 100644
--- a/drivers/audio/audio_null.c
+++ b/drivers/audio/audio_null.c
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/drivers/audio/cs4344.c b/drivers/audio/cs4344.c
index 798df3007b..a29080d9ef 100644
--- a/drivers/audio/cs4344.c
+++ b/drivers/audio/cs4344.c
@@ -35,11 +35,11 @@
 #include <assert.h>
 #include <errno.h>
 #include <fixedmath.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/mqueue.h>
+#include <nuttx/queue.h>
 #include <nuttx/clock.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/fs/fs.h>
diff --git a/drivers/audio/cs43l22.c b/drivers/audio/cs43l22.c
index e805afb243..d458c6fb3b 100644
--- a/drivers/audio/cs43l22.c
+++ b/drivers/audio/cs43l22.c
@@ -35,11 +35,11 @@
 #include <assert.h>
 #include <errno.h>
 #include <fixedmath.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/mqueue.h>
+#include <nuttx/queue.h>
 #include <nuttx/clock.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/i2c/i2c_master.h>
diff --git a/drivers/audio/cxd56.c b/drivers/audio/cxd56.c
index 1aaf6a1ec9..ddffd9fe57 100644
--- a/drivers/audio/cxd56.c
+++ b/drivers/audio/cxd56.c
@@ -27,13 +27,13 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <math.h>
-#include <queue.h>
 #include <string.h>
 #include <inttypes.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/config.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mqueue.h>
diff --git a/drivers/audio/cxd56_src.c b/drivers/audio/cxd56_src.c
index 5e9b84f299..d9d6b266cc 100644
--- a/drivers/audio/cxd56_src.c
+++ b/drivers/audio/cxd56_src.c
@@ -25,7 +25,6 @@
 #include <debug.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <queue.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -34,6 +33,7 @@
 #include <nuttx/spinlock.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/mqueue.h>
+#include <nuttx/queue.h>
 
 #include "cxd56.h"
 #include "cxd56_src.h"
diff --git a/drivers/audio/vs1053.c b/drivers/audio/vs1053.c
index 782069b8d2..d722453fbc 100644
--- a/drivers/audio/vs1053.c
+++ b/drivers/audio/vs1053.c
@@ -36,11 +36,11 @@
 #include <assert.h>
 #include <debug.h>
 #include <errno.h>
-#include <queue.h>
 
 #include <nuttx/kmalloc.h>
 #include <nuttx/signal.h>
 #include <nuttx/mqueue.h>
+#include <nuttx/queue.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/audio/audio.h>
diff --git a/drivers/audio/wm8776.c b/drivers/audio/wm8776.c
index af31bf995f..2608fe0015 100644
--- a/drivers/audio/wm8776.c
+++ b/drivers/audio/wm8776.c
@@ -35,11 +35,11 @@
 #include <assert.h>
 #include <errno.h>
 #include <fixedmath.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/spinlock.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/clock.h>
 #include <nuttx/wqueue.h>
diff --git a/drivers/audio/wm8904.c b/drivers/audio/wm8904.c
index 0f974c7f3c..301a6124fa 100644
--- a/drivers/audio/wm8904.c
+++ b/drivers/audio/wm8904.c
@@ -40,11 +40,11 @@
 #include <assert.h>
 #include <errno.h>
 #include <fixedmath.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/clock.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
diff --git a/drivers/audio/wm8994.c b/drivers/audio/wm8994.c
index 8dee844bb7..d1215a1d6d 100644
--- a/drivers/audio/wm8994.c
+++ b/drivers/audio/wm8994.c
@@ -34,12 +34,12 @@
 #include <assert.h>
 #include <errno.h>
 #include <fixedmath.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/clock.h>
+#include <nuttx/queue.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/signal.h>
 #include <nuttx/mqueue.h>
diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c
index 8b567c7fb0..99b33a29c2 100644
--- a/drivers/net/encx24j600.c
+++ b/drivers/net/encx24j600.c
@@ -39,12 +39,12 @@
 #include <assert.h>
 #include <debug.h>
 #include <errno.h>
-#include <queue.h>
 
 #include <arpa/inet.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/spi/spi.h>
 #include <nuttx/wqueue.h>
diff --git a/drivers/power/pm/pm.h b/drivers/power/pm/pm.h
index 057cbcec98..17654ca93c 100644
--- a/drivers/power/pm/pm.h
+++ b/drivers/power/pm/pm.h
@@ -27,8 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
-
+#include <nuttx/queue.h>
 #include <nuttx/mutex.h>
 #include <nuttx/clock.h>
 #include <nuttx/power/pm.h>
diff --git a/drivers/power/pm/pm_changestate.c b/drivers/power/pm/pm_changestate.c
index 24f806f0e9..4c06b265a7 100644
--- a/drivers/power/pm/pm_changestate.c
+++ b/drivers/power/pm/pm_changestate.c
@@ -24,12 +24,12 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
 #include <assert.h>
 #include <stdlib.h>
 
 #include <nuttx/power/pm.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 
 #include "pm.h"
 
diff --git a/drivers/power/pm/pm_register.c b/drivers/power/pm/pm_register.c
index 901dc7f87c..61470c779b 100644
--- a/drivers/power/pm/pm_register.c
+++ b/drivers/power/pm/pm_register.c
@@ -24,10 +24,10 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
 #include <assert.h>
 
 #include <nuttx/init.h>
+#include <nuttx/queue.h>
 #include <nuttx/power/pm.h>
 
 #include "pm.h"
diff --git a/drivers/power/pm/pm_unregister.c b/drivers/power/pm/pm_unregister.c
index 400bafae6a..0aee6948fc 100644
--- a/drivers/power/pm/pm_unregister.c
+++ b/drivers/power/pm/pm_unregister.c
@@ -24,9 +24,9 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
 #include <assert.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/power/pm.h>
 
 #include "pm.h"
diff --git a/drivers/usbdev/adb.c b/drivers/usbdev/adb.c
index f6259746e4..5aa45f8ce3 100644
--- a/drivers/usbdev/adb.c
+++ b/drivers/usbdev/adb.c
@@ -23,22 +23,21 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/nuttx.h>
-#include <queue.h>
+
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
+#include <fcntl.h>
+#include <poll.h>
 
+#include <nuttx/nuttx.h>
 #include <nuttx/kmalloc.h>
-
+#include <nuttx/queue.h>
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/usbdev_trace.h>
 #include <nuttx/usb/adb.h>
-
 #include <nuttx/fs/fs.h>
-#include <fcntl.h>
-#include <poll.h>
 
 #ifdef CONFIG_USBADB_BOARD_SERIALSTR
 #include <nuttx/board.h>
diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c
index 9c6536b883..290c9c0028 100644
--- a/drivers/usbdev/cdcacm.c
+++ b/drivers/usbdev/cdcacm.c
@@ -33,11 +33,11 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/arch.h>
 #include <nuttx/serial/serial.h>
diff --git a/drivers/usbdev/cdcecm.c b/drivers/usbdev/cdcecm.c
index 3bf51ab19f..554459ebac 100644
--- a/drivers/usbdev/cdcecm.c
+++ b/drivers/usbdev/cdcecm.c
@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 
 #include <arpa/inet.h>
 
diff --git a/drivers/usbdev/pl2303.c b/drivers/usbdev/pl2303.c
index 5ec9a27273..b995babe55 100644
--- a/drivers/usbdev/pl2303.c
+++ b/drivers/usbdev/pl2303.c
@@ -35,12 +35,12 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/arch.h>
+#include <nuttx/queue.h>
 #include <nuttx/serial/serial.h>
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/usbdev.h>
diff --git a/drivers/usbdev/rndis.c b/drivers/usbdev/rndis.c
index 9ae1e7e5d6..2fa3467a1f 100644
--- a/drivers/usbdev/rndis.c
+++ b/drivers/usbdev/rndis.c
@@ -27,7 +27,6 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
 #include <assert.h>
 #include <debug.h>
 #include <errno.h>
@@ -36,6 +35,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/arp.h>
diff --git a/drivers/usbdev/usbmsc.c b/drivers/usbdev/usbmsc.c
index 5d4a9cca0f..22b525f4b8 100644
--- a/drivers/usbdev/usbmsc.c
+++ b/drivers/usbdev/usbmsc.c
@@ -55,13 +55,13 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/kthread.h>
 #include <nuttx/arch.h>
+#include <nuttx/queue.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/usb/usb.h>
 #include <nuttx/usb/storage.h>
diff --git a/drivers/usbdev/usbmsc.h b/drivers/usbdev/usbmsc.h
index 2e180b51e0..434a9ddff9 100644
--- a/drivers/usbdev/usbmsc.h
+++ b/drivers/usbdev/usbmsc.h
@@ -32,9 +32,9 @@
 #include <sys/types.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <queue.h>
 
 #include <nuttx/fs/fs.h>
+#include <nuttx/queue.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/usb/storage.h>
 #include <nuttx/usb/usbdev.h>
diff --git a/drivers/usbdev/usbmsc_scsi.c b/drivers/usbdev/usbmsc_scsi.c
index b0bde3d7d8..218d61bd33 100644
--- a/drivers/usbdev/usbmsc_scsi.c
+++ b/drivers/usbdev/usbmsc_scsi.c
@@ -51,12 +51,12 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/kthread.h>
 #include <nuttx/arch.h>
+#include <nuttx/queue.h>
 #include <nuttx/signal.h>
 #include <nuttx/scsi.h>
 #include <nuttx/usb/storage.h>
diff --git a/drivers/video/vnc/vnc_server.c b/drivers/video/vnc/vnc_server.c
index ef0bbfc3e3..8670084452 100644
--- a/drivers/video/vnc/vnc_server.c
+++ b/drivers/video/vnc/vnc_server.c
@@ -27,7 +27,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <queue.h>
 #include <assert.h>
 #include <errno.h>
 
@@ -52,6 +51,7 @@
 #include <netinet/in.h>
 
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/net/net.h>
 
 #include "vnc_server.h"
diff --git a/drivers/video/vnc/vnc_server.h b/drivers/video/vnc/vnc_server.h
index b57357bc2b..8f59b03abd 100644
--- a/drivers/video/vnc/vnc_server.h
+++ b/drivers/video/vnc/vnc_server.h
@@ -29,8 +29,8 @@
 
 #include <stdint.h>
 #include <pthread.h>
-#include <queue.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/video/fb.h>
 #include <nuttx/video/rfb.h>
 #include <nuttx/video/vnc.h>
diff --git a/drivers/video/vnc/vnc_updater.c b/drivers/video/vnc/vnc_updater.c
index c6b08080a7..38329ec39c 100644
--- a/drivers/video/vnc/vnc_updater.c
+++ b/drivers/video/vnc/vnc_updater.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <sched.h>
 #include <pthread.h>
-#include <queue.h>
 #include <assert.h>
 #include <errno.h>
 
@@ -48,6 +47,8 @@
 #endif
 #include <debug.h>
 
+#include <nuttx/queue.h>
+
 #include "vnc_server.h"
 
 /****************************************************************************
diff --git a/fs/aio/aio.h b/fs/aio/aio.h
index 00ca9e7196..dbe0b2fbb9 100644
--- a/fs/aio/aio.h
+++ b/fs/aio/aio.h
@@ -30,8 +30,8 @@
 #include <sys/types.h>
 #include <string.h>
 #include <aio.h>
-#include <queue.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/wqueue.h>
 
 #ifdef CONFIG_FS_AIO
diff --git a/fs/aio/aio_initialize.c b/fs/aio/aio_initialize.c
index ae7b7935ad..f8595c702f 100644
--- a/fs/aio/aio_initialize.c
+++ b/fs/aio/aio_initialize.c
@@ -26,10 +26,10 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <queue.h>
 
 #include <nuttx/sched.h>
 #include <nuttx/mutex.h>
+#include <nuttx/queue.h>
 
 #include "aio/aio.h"
 
diff --git a/fs/nfs/rpc_clnt.c b/fs/nfs/rpc_clnt.c
index 569af8a64c..1fbba587c3 100644
--- a/fs/nfs/rpc_clnt.c
+++ b/fs/nfs/rpc_clnt.c
@@ -80,7 +80,6 @@
 
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <queue.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
diff --git a/fs/semaphore/sem_unlink.c b/fs/semaphore/sem_unlink.c
index 3b82bf486d..c4703a62bb 100644
--- a/fs/semaphore/sem_unlink.c
+++ b/fs/semaphore/sem_unlink.c
@@ -27,7 +27,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <sched.h>
-#include <queue.h>
 #include <errno.h>
 #include <assert.h>
 
diff --git a/fs/spiffs/src/spiffs.h b/fs/spiffs/src/spiffs.h
index f011511868..d02e0dd051 100644
--- a/fs/spiffs/src/spiffs.h
+++ b/fs/spiffs/src/spiffs.h
@@ -55,8 +55,8 @@ extern "C"
 
 #include <sys/types.h>
 #include <sys/mount.h>
-#include <queue.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/mutex.h>
 #include <nuttx/mtd/mtd.h>
 
diff --git a/fs/spiffs/src/spiffs_vfs.c b/fs/spiffs/src/spiffs_vfs.c
index fb857a0a5b..305dc3159b 100644
--- a/fs/spiffs/src/spiffs_vfs.c
+++ b/fs/spiffs/src/spiffs_vfs.c
@@ -52,11 +52,11 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <assert.h>
-#include <queue.h>
 #include <debug.h>
 #include <inttypes.h>
 
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
 
diff --git a/include/nuttx/audio/audio.h b/include/nuttx/audio/audio.h
index 2ec4eb917d..435c282650 100644
--- a/include/nuttx/audio/audio.h
+++ b/include/nuttx/audio/audio.h
@@ -44,8 +44,7 @@
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/spi/spi.h>
-
-#include <queue.h>
+#include <nuttx/queue.h>
 
 #ifdef CONFIG_AUDIO
 
diff --git a/include/nuttx/can.h b/include/nuttx/can.h
index 86602b248a..dac52edda1 100644
--- a/include/nuttx/can.h
+++ b/include/nuttx/can.h
@@ -31,7 +31,7 @@
 #  include <nuttx/wqueue.h>
 #endif
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 #ifdef CONFIG_NET_CAN
 
diff --git a/include/nuttx/mm/mempool.h b/include/nuttx/mm/mempool.h
index fed167442a..408d9181a6 100644
--- a/include/nuttx/mm/mempool.h
+++ b/include/nuttx/mm/mempool.h
@@ -25,9 +25,9 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
 #include <sys/types.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/fs/procfs.h>
 #include <nuttx/spinlock.h>
 #include <nuttx/semaphore.h>
diff --git a/include/nuttx/modem/altmdm.h b/include/nuttx/modem/altmdm.h
index 7292ed1944..e5f0b85c98 100644
--- a/include/nuttx/modem/altmdm.h
+++ b/include/nuttx/modem/altmdm.h
@@ -28,8 +28,7 @@
 #include <nuttx/config.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/spi/spi.h>
-#include <queue.h>
-#include <debug.h>
+#include <nuttx/queue.h>
 #include <nuttx/irq.h>
 
 /****************************************************************************
diff --git a/include/nuttx/mqueue.h b/include/nuttx/mqueue.h
index 094a7db1b2..b6673a3b73 100644
--- a/include/nuttx/mqueue.h
+++ b/include/nuttx/mqueue.h
@@ -35,7 +35,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <mqueue.h>
-#include <queue.h>
 #include <poll.h>
 
 #if CONFIG_MQ_MAXMSGSIZE > 0
diff --git a/include/nuttx/net/mld.h b/include/nuttx/net/mld.h
index 300f73cd91..5472ff5e53 100644
--- a/include/nuttx/net/mld.h
+++ b/include/nuttx/net/mld.h
@@ -28,8 +28,8 @@
 
 #include <nuttx/config.h>
 #include <stdint.h>
-#include <queue.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/net/ip.h>
 #include <nuttx/net/icmpv6.h>
diff --git a/include/nuttx/net/net.h b/include/nuttx/net/net.h
index 47dde9ebf3..425af53ddc 100644
--- a/include/nuttx/net/net.h
+++ b/include/nuttx/net/net.h
@@ -33,8 +33,8 @@
 #include <stdbool.h>
 #include <stdarg.h>
 #include <semaphore.h>
-#include <queue.h>
 
+#include <nuttx/queue.h>
 #ifdef CONFIG_MM_IOB
 #  include <nuttx/mm/iob.h>
 #endif
diff --git a/include/nuttx/net/netdev.h b/include/nuttx/net/netdev.h
index 5b10a13a5b..75a0d15c06 100644
--- a/include/nuttx/net/netdev.h
+++ b/include/nuttx/net/netdev.h
@@ -52,7 +52,8 @@
 
 #include <sys/ioctl.h>
 #include <stdint.h>
-#include <queue.h>
+
+#include <nuttx/queue.h>
 
 #include <net/if.h>
 #include <net/ethernet.h>
diff --git a/include/nuttx/net/netlink.h b/include/nuttx/net/netlink.h
index 8b9d616f84..f2a28c37f0 100644
--- a/include/nuttx/net/netlink.h
+++ b/include/nuttx/net/netlink.h
@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 #include <netpacket/netlink.h>
 
diff --git a/include/nuttx/power/pm.h b/include/nuttx/power/pm.h
index e2c0cb8f46..dc7311c32e 100644
--- a/include/nuttx/power/pm.h
+++ b/include/nuttx/power/pm.h
@@ -54,11 +54,12 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 
 #include <stdbool.h>
 #include <time.h>
-#include <queue.h>
 
 #ifdef CONFIG_PM
 
diff --git a/include/queue.h b/include/nuttx/queue.h
similarity index 98%
rename from include/queue.h
rename to include/nuttx/queue.h
index f062e2783c..a1665c00fe 100644
--- a/include/queue.h
+++ b/include/nuttx/queue.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/queue.h
+ * include/nuttx/queue.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_QUEUE_H
-#define __INCLUDE_QUEUE_H
+#ifndef __INCLUDE_NUTTX_QUEUE_H
+#define __INCLUDE_NUTTX_QUEUE_H
 
 /****************************************************************************
  * Included Files
@@ -329,4 +329,4 @@ size_t dq_count(FAR dq_queue_t *queue);
 }
 #endif
 
-#endif /* __INCLUDE_QUEUE_H_ */
+#endif /* __INCLUDE_NUTTX_QUEUE_H_ */
diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h
index fbf8e5dced..12bbcf04af 100644
--- a/include/nuttx/sched.h
+++ b/include/nuttx/sched.h
@@ -29,7 +29,6 @@
 
 #include <sys/types.h>
 #include <stdint.h>
-#include <queue.h>
 #include <sched.h>
 #include <signal.h>
 #include <semaphore.h>
@@ -38,6 +37,7 @@
 
 #include <nuttx/clock.h>
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 #include <nuttx/mm/shm.h>
 #include <nuttx/fs/fs.h>
diff --git a/include/nuttx/wdog.h b/include/nuttx/wdog.h
index 79940d8c32..f69888f5fd 100644
--- a/include/nuttx/wdog.h
+++ b/include/nuttx/wdog.h
@@ -29,7 +29,6 @@
 
 #include <nuttx/clock.h>
 #include <stdint.h>
-#include <queue.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/include/nuttx/wqueue.h b/include/nuttx/wqueue.h
index 95522f109d..39c53323cc 100644
--- a/include/nuttx/wqueue.h
+++ b/include/nuttx/wqueue.h
@@ -29,9 +29,9 @@
 
 #include <sys/types.h>
 #include <stdint.h>
-#include <queue.h>
 
 #include <nuttx/clock.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 
 /****************************************************************************
diff --git a/include/sched.h b/include/sched.h
index f3cbcd92cc..e8fc0ed48e 100644
--- a/include/sched.h
+++ b/include/sched.h
@@ -32,7 +32,6 @@
 #include <stdbool.h>
 #include <strings.h>
 #include <time.h>
-#include "queue.h"
 
 /********************************************************************************
  * Pre-processor Definitions
diff --git a/libs/libc/libc.csv b/libs/libc/libc.csv
index 9c24f57388..2a1704a398 100644
--- a/libs/libc/libc.csv
+++ b/libs/libc/libc.csv
@@ -38,9 +38,9 @@
 "dlopen","dlfcn.h","defined(CONFIG_LIBC_DLFCN)","FAR void *","FAR const char *","int"
 "dlsym","dlfcn.h","defined(CONFIG_LIBC_DLFCN)","FAR void *","FAR void *","FAR const char *"
 "dlsymtab","dlfcn.h","defined(CONFIG_LIBC_DLFCN)","int","FAR const struct symtab_s *","int"
-"dq_addafter","queue.h","","void","FAR dq_entry_t *","FAR dq_entry_t *","FAR dq_queue_t *"
-"dq_remfirst","queue.h","","FAR dq_entry_t *","FAR dq_queue_t *"
-"dq_remlast","queue.h","","FAR dq_entry_t *","FAR dq_queue_t *"
+"dq_addafter","nuttx/queue.h","","void","FAR dq_entry_t *","FAR dq_entry_t *","FAR dq_queue_t *"
+"dq_remfirst","nuttx/queue.h","","FAR dq_entry_t *","FAR dq_queue_t *"
+"dq_remlast","nuttx/queue.h","","FAR dq_entry_t *","FAR dq_queue_t *"
 "ether_ntoa","netinet/ether.h","","FAR char *","FAR const struct ether_addr *"
 "fchdir","unistd.h","!defined(CONFIG_DISABLE_ENVIRON)","int","int"
 "fclose","stdio.h","defined(CONFIG_FILE_STREAM)","int","FAR FILE *"
@@ -212,10 +212,10 @@
 "sleep","unistd.h","","unsigned int","unsigned int"
 "snprintf","stdio.h","","int","FAR char *","size_t","FAR const IPTR char *","..."
 "sprintf","stdio.h","","int","FAR char *","FAR const IPTR char *","..."
-"sq_addafter","queue.h","","void","FAR sq_entry_t *","FAR sq_entry_t *","FAR sq_queue_t *"
-"sq_remafter","queue.h","","FAR sq_entry_t","FAR sq_entry_t *","FAR sq_queue_t *"
-"sq_remfirst","queue.h","","FAR sq_entry_t *","FAR sq_queue_t *"
-"sq_remlast","queue.h","","FAR sq_entry_t *","FAR sq_queue_t *"
+"sq_addafter","nuttx/queue.h","","void","FAR sq_entry_t *","FAR sq_entry_t *","FAR sq_queue_t *"
+"sq_remafter","nuttx/queue.h","","FAR sq_entry_t","FAR sq_entry_t *","FAR sq_queue_t *"
+"sq_remfirst","nuttx/queue.h","","FAR sq_entry_t *","FAR sq_queue_t *"
+"sq_remlast","nuttx/queue.h","","FAR sq_entry_t *","FAR sq_queue_t *"
 "srand","stdlib.h","","void","unsigned int"
 "sscanf","stdio.h","","int","FAR const IPTR char *","FAR const char *","..."
 "statvfs","sys/statvfs.h","","int","FAR const char *","FAR struct statvfs *"
diff --git a/libs/libc/netdb/lib_dnsnotify.c b/libs/libc/netdb/lib_dnsnotify.c
index fe6d0f7207..198cc774e6 100644
--- a/libs/libc/netdb/lib_dnsnotify.c
+++ b/libs/libc/netdb/lib_dnsnotify.c
@@ -25,7 +25,7 @@
 #include <nuttx/config.h>
 
 #include <nuttx/net/dns.h>
-#include <queue.h>
+#include <nuttx/queue.h>
 
 #include "libc.h"
 #include "netdb/lib_dns.h"
diff --git a/libs/libc/queue/dq_addafter.c b/libs/libc/queue/dq_addafter.c
index 5be17e48d9..7cee4d1b2a 100644
--- a/libs/libc/queue/dq_addafter.c
+++ b/libs/libc/queue/dq_addafter.c
@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/queue/dq_count.c b/libs/libc/queue/dq_count.c
index 6cb1555c77..5524aa6a63 100644
--- a/libs/libc/queue/dq_count.c
+++ b/libs/libc/queue/dq_count.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
+#include <nuttx/queue.h>
 #include <assert.h>
 
 /****************************************************************************
diff --git a/libs/libc/queue/dq_remafter.c b/libs/libc/queue/dq_remafter.c
index 25c6d83b75..baa9ed1b5b 100644
--- a/libs/libc/queue/dq_remafter.c
+++ b/libs/libc/queue/dq_remafter.c
@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/queue/dq_remfirst.c b/libs/libc/queue/dq_remfirst.c
index c5fb9596c7..da1936894f 100644
--- a/libs/libc/queue/dq_remfirst.c
+++ b/libs/libc/queue/dq_remfirst.c
@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/queue/dq_remlast.c b/libs/libc/queue/dq_remlast.c
index 74be820b17..decaa49fb6 100644
--- a/libs/libc/queue/dq_remlast.c
+++ b/libs/libc/queue/dq_remlast.c
@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/queue/sq_addafter.c b/libs/libc/queue/sq_addafter.c
index 134152a934..69addca8f0 100644
--- a/libs/libc/queue/sq_addafter.c
+++ b/libs/libc/queue/sq_addafter.c
@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/queue/sq_count.c b/libs/libc/queue/sq_count.c
index 2a8730770d..8ba926be56 100644
--- a/libs/libc/queue/sq_count.c
+++ b/libs/libc/queue/sq_count.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
+#include <nuttx/queue.h>
 #include <assert.h>
 
 /****************************************************************************
diff --git a/libs/libc/queue/sq_remafter.c b/libs/libc/queue/sq_remafter.c
index 12102b6223..bd8ae1357c 100644
--- a/libs/libc/queue/sq_remafter.c
+++ b/libs/libc/queue/sq_remafter.c
@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/queue/sq_remfirst.c b/libs/libc/queue/sq_remfirst.c
index 5c0536c563..893c188dd8 100644
--- a/libs/libc/queue/sq_remfirst.c
+++ b/libs/libc/queue/sq_remfirst.c
@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/queue/sq_remlast.c b/libs/libc/queue/sq_remlast.c
index 0c1b881538..f136143bb3 100644
--- a/libs/libc/queue/sq_remlast.c
+++ b/libs/libc/queue/sq_remlast.c
@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/wqueue/work_cancel.c b/libs/libc/wqueue/work_cancel.c
index 852b741835..39a2d97430 100644
--- a/libs/libc/wqueue/work_cancel.c
+++ b/libs/libc/wqueue/work_cancel.c
@@ -24,11 +24,11 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
 #include <assert.h>
 #include <errno.h>
 
 #include <nuttx/arch.h>
+#include <nuttx/queue.h>
 #include <nuttx/wqueue.h>
 
 #include "wqueue/wqueue.h"
diff --git a/libs/libc/wqueue/work_queue.c b/libs/libc/wqueue/work_queue.c
index 00c5c1aa8a..b2f61a5cd8 100644
--- a/libs/libc/wqueue/work_queue.c
+++ b/libs/libc/wqueue/work_queue.c
@@ -27,10 +27,10 @@
 #include <stdint.h>
 #include <signal.h>
 #include <assert.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <nuttx/clock.h>
+#include <nuttx/queue.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/semaphore.h>
 
diff --git a/libs/libc/wqueue/work_usrthread.c b/libs/libc/wqueue/work_usrthread.c
index f19fdf6f1a..27f69c90eb 100644
--- a/libs/libc/wqueue/work_usrthread.c
+++ b/libs/libc/wqueue/work_usrthread.c
@@ -30,10 +30,10 @@
 #include <sched.h>
 #include <errno.h>
 #include <assert.h>
-#include <queue.h>
 
 #include <nuttx/semaphore.h>
 #include <nuttx/clock.h>
+#include <nuttx/queue.h>
 #include <nuttx/wqueue.h>
 
 #include "wqueue/wqueue.h"
diff --git a/net/arp/arp.h b/net/arp/arp.h
index e466eab22d..4e760320e3 100644
--- a/net/arp/arp.h
+++ b/net/arp/arp.h
@@ -38,7 +38,6 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <netinet/in.h>
diff --git a/net/bluetooth/bluetooth.h b/net/bluetooth/bluetooth.h
index 2053584442..0dab176d9c 100644
--- a/net/bluetooth/bluetooth.h
+++ b/net/bluetooth/bluetooth.h
@@ -29,7 +29,6 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <queue.h>
 
 #include <nuttx/net/net.h>
 
diff --git a/net/can/can_conn.c b/net/can/can_conn.c
index dead5e9986..82917f7731 100644
--- a/net/can/can_conn.c
+++ b/net/can/can_conn.c
@@ -26,7 +26,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <queue.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -34,6 +33,7 @@
 #include <arch/irq.h>
 
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/net.h>
diff --git a/net/icmp/icmp.h b/net/icmp/icmp.h
index 4580334ea7..e72b4ae88b 100644
--- a/net/icmp/icmp.h
+++ b/net/icmp/icmp.h
@@ -29,7 +29,6 @@
 
 #include <sys/types.h>
 #include <stdint.h>
-#include <queue.h>
 #include <assert.h>
 
 #include <nuttx/mm/iob.h>
diff --git a/net/icmpv6/icmpv6.h b/net/icmpv6/icmpv6.h
index 487607afea..ad4d2fb23a 100644
--- a/net/icmpv6/icmpv6.h
+++ b/net/icmpv6/icmpv6.h
@@ -29,7 +29,6 @@
 
 #include <sys/types.h>
 #include <stdint.h>
-#include <queue.h>
 #include <assert.h>
 
 #include <nuttx/mm/iob.h>
diff --git a/net/ieee802154/ieee802154.h b/net/ieee802154/ieee802154.h
index 3981068aba..40b3388e85 100644
--- a/net/ieee802154/ieee802154.h
+++ b/net/ieee802154/ieee802154.h
@@ -28,7 +28,6 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
-#include <queue.h>
 #include <netpacket/ieee802154.h>
 
 #include <nuttx/net/net.h>
diff --git a/net/igmp/igmp_group.c b/net/igmp/igmp_group.c
index d2573d408f..e098acd723 100644
--- a/net/igmp/igmp_group.c
+++ b/net/igmp/igmp_group.c
@@ -50,7 +50,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <queue.h>
 #include <assert.h>
 #include <debug.h>
 
@@ -59,6 +58,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/wdog.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/ip.h>
diff --git a/net/local/local.h b/net/local/local.h
index aace9a92b9..6eb0e28aa9 100644
--- a/net/local/local.h
+++ b/net/local/local.h
@@ -31,11 +31,11 @@
 #include <sys/un.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include <queue.h>
 #include <stdint.h>
 #include <poll.h>
 
 #include <nuttx/fs/fs.h>
+#include <nuttx/queue.h>
 #include <nuttx/net/net.h>
 #include <nuttx/semaphore.h>
 
diff --git a/net/local/local_accept.c b/net/local/local_accept.c
index cef26ce3da..bcca1eb65f 100644
--- a/net/local/local_accept.c
+++ b/net/local/local_accept.c
@@ -28,10 +28,10 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/nuttx.h>
+#include <nuttx/queue.h>
 #include <nuttx/net/net.h>
 
 #include "socket/socket.h"
diff --git a/net/local/local_conn.c b/net/local/local_conn.c
index 8524dded71..1432054ce2 100644
--- a/net/local/local_conn.c
+++ b/net/local/local_conn.c
@@ -28,10 +28,10 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 
 #include "local/local.h"
 
diff --git a/net/local/local_connect.c b/net/local/local_connect.c
index feb562090a..9b20aa9fe8 100644
--- a/net/local/local_connect.c
+++ b/net/local/local_connect.c
@@ -28,9 +28,9 @@
 #include <unistd.h>
 #include <assert.h>
 #include <errno.h>
-#include <queue.h>
 #include <debug.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/net/net.h>
 
 #include <arch/irq.h>
diff --git a/net/local/local_listen.c b/net/local/local_listen.c
index c6ffbe85cb..a1eb5c3789 100644
--- a/net/local/local_listen.c
+++ b/net/local/local_listen.c
@@ -26,7 +26,6 @@
 #if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL_STREAM)
 
 #include <assert.h>
-#include <queue.h>
 #include <errno.h>
 #include <debug.h>
 
diff --git a/net/local/local_release.c b/net/local/local_release.c
index 7b10671ac1..ca1717ddbf 100644
--- a/net/local/local_release.c
+++ b/net/local/local_release.c
@@ -26,10 +26,10 @@
 #if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL)
 
 #include <errno.h>
-#include <queue.h>
 #include <assert.h>
 
 #include <nuttx/nuttx.h>
+#include <nuttx/queue.h>
 #include <nuttx/net/net.h>
 
 #include <arch/irq.h>
diff --git a/net/mld/mld.h b/net/mld/mld.h
index 685e694910..170b7220a6 100644
--- a/net/mld/mld.h
+++ b/net/mld/mld.h
@@ -92,7 +92,6 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/semaphore.h>
diff --git a/net/mld/mld_group.c b/net/mld/mld_group.c
index f76c1d0e0c..04a22cd714 100644
--- a/net/mld/mld_group.c
+++ b/net/mld/mld_group.c
@@ -27,7 +27,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <queue.h>
 #include <assert.h>
 #include <debug.h>
 
@@ -36,6 +35,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/wdog.h>
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/net/net.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/ip.h>
diff --git a/net/netlink/netlink.h b/net/netlink/netlink.h
index 1b734c770f..2a0fe5bfb4 100644
--- a/net/netlink/netlink.h
+++ b/net/netlink/netlink.h
@@ -28,10 +28,10 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
-#include <queue.h>
 #include <poll.h>
 
 #include <netpacket/netlink.h>
+#include <nuttx/queue.h>
 #include <nuttx/net/netlink.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/wqueue.h>
diff --git a/net/netlink/netlink_conn.c b/net/netlink/netlink_conn.c
index 168d2b9dc0..e245072d3f 100644
--- a/net/netlink/netlink_conn.c
+++ b/net/netlink/netlink_conn.c
@@ -26,7 +26,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <queue.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
@@ -34,6 +33,7 @@
 #include <arch/irq.h>
 
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/net/netconfig.h>
 #include <nuttx/net/net.h>
diff --git a/net/pkt/pkt.h b/net/pkt/pkt.h
index 2503a900e9..c2091837f4 100644
--- a/net/pkt/pkt.h
+++ b/net/pkt/pkt.h
@@ -28,7 +28,6 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
-#include <queue.h>
 
 #include <nuttx/net/net.h>
 
diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h
index 9647b92bca..a76634630c 100644
--- a/net/tcp/tcp.h
+++ b/net/tcp/tcp.h
@@ -28,9 +28,9 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
-#include <queue.h>
 
 #include <nuttx/clock.h>
+#include <nuttx/queue.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/mm/iob.h>
 #include <nuttx/net/ip.h>
diff --git a/net/tcp/tcp_backlog.c b/net/tcp/tcp_backlog.c
index e3c0a4d19b..b20317057d 100644
--- a/net/tcp/tcp_backlog.c
+++ b/net/tcp/tcp_backlog.c
@@ -28,10 +28,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <queue.h>
 #include <debug.h>
 
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 #include <nuttx/net/net.h>
 
 #include "devif/devif.h"
diff --git a/net/tcp/tcp_wrbuffer.c b/net/tcp/tcp_wrbuffer.c
index 2e8f3d8cca..8051057d7a 100644
--- a/net/tcp/tcp_wrbuffer.c
+++ b/net/tcp/tcp_wrbuffer.c
@@ -31,12 +31,12 @@
 #  define CONFIG_DEBUG_NET 1
 #endif
 
-#include <queue.h>
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/mm/iob.h>
diff --git a/net/udp/udp.h b/net/udp/udp.h
index cdee725683..a0abd66ab7 100644
--- a/net/udp/udp.h
+++ b/net/udp/udp.h
@@ -29,8 +29,8 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <queue.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/net/ip.h>
 #include <nuttx/net/net.h>
diff --git a/net/udp/udp_wrbuffer.c b/net/udp/udp_wrbuffer.c
index c1627493dc..57a510df4f 100644
--- a/net/udp/udp_wrbuffer.c
+++ b/net/udp/udp_wrbuffer.c
@@ -32,12 +32,12 @@
 #  define CONFIG_DEBUG_NET 1
 #endif
 
-#include <queue.h>
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/semaphore.h>
 #include <nuttx/net/net.h>
 #include <nuttx/mm/iob.h>
diff --git a/net/usrsock/usrsock.h b/net/usrsock/usrsock.h
index b5aa6de61c..061afc3b10 100644
--- a/net/usrsock/usrsock.h
+++ b/net/usrsock/usrsock.h
@@ -31,7 +31,6 @@
 
 #include <sys/types.h>
 #include <sys/uio.h>
-#include <queue.h>
 
 #include <nuttx/semaphore.h>
 
diff --git a/sched/group/group.h b/sched/group/group.h
index bb22403e8b..270936d0b5 100644
--- a/sched/group/group.h
+++ b/sched/group/group.h
@@ -29,7 +29,6 @@
 
 #include <sys/types.h>
 #include <stdbool.h>
-#include <queue.h>
 #include <sched.h>
 
 #include <nuttx/kmalloc.h>
diff --git a/sched/init/nx_smpstart.c b/sched/init/nx_smpstart.c
index bb7675dbf0..f0965f6ee9 100644
--- a/sched/init/nx_smpstart.c
+++ b/sched/init/nx_smpstart.c
@@ -26,7 +26,6 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#include <queue.h>
 #include <assert.h>
 #include <debug.h>
 
diff --git a/sched/paging/paging.h b/sched/paging/paging.h
index 17daae9e03..05196b8a34 100644
--- a/sched/paging/paging.h
+++ b/sched/paging/paging.h
@@ -26,7 +26,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <queue.h>
 
 #ifdef CONFIG_PAGING
 
diff --git a/sched/paging/pg_worker.c b/sched/paging/pg_worker.c
index a42cbfb3a3..2a08b8c1ca 100644
--- a/sched/paging/pg_worker.c
+++ b/sched/paging/pg_worker.c
@@ -27,11 +27,11 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <unistd.h>
-#include <queue.h>
 #include <assert.h>
 #include <errno.h>
 #include <debug.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/sched.h>
 #include <nuttx/arch.h>
 #include <nuttx/signal.h>
diff --git a/sched/pthread/pthread_create.c b/sched/pthread/pthread_create.c
index af9aec3dc1..7eff071fad 100644
--- a/sched/pthread/pthread_create.c
+++ b/sched/pthread/pthread_create.c
@@ -33,8 +33,8 @@
 #include <debug.h>
 #include <assert.h>
 #include <errno.h>
-#include <queue.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/sched.h>
 #include <nuttx/arch.h>
 #include <nuttx/semaphore.h>
diff --git a/sched/sched/sched.h b/sched/sched/sched.h
index c8225fe4ae..976c411583 100644
--- a/sched/sched/sched.h
+++ b/sched/sched/sched.h
@@ -29,10 +29,10 @@
 
 #include <sys/types.h>
 #include <stdbool.h>
-#include <queue.h>
 #include <sched.h>
 
 #include <nuttx/arch.h>
+#include <nuttx/queue.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/spinlock.h>
 
diff --git a/sched/sched/sched_addblocked.c b/sched/sched/sched_addblocked.c
index 72520e19b7..c894b5e813 100644
--- a/sched/sched/sched_addblocked.c
+++ b/sched/sched/sched_addblocked.c
@@ -24,9 +24,10 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
 #include <assert.h>
 
+#include <nuttx/queue.h>
+
 #include "sched/sched.h"
 
 /****************************************************************************
diff --git a/sched/sched/sched_addprioritized.c b/sched/sched/sched_addprioritized.c
index 464f37288b..6dfde44ce6 100644
--- a/sched/sched/sched_addprioritized.c
+++ b/sched/sched/sched_addprioritized.c
@@ -26,9 +26,10 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <queue.h>
 #include <assert.h>
 
+#include <nuttx/queue.h>
+
 #include "sched/sched.h"
 
 /****************************************************************************
diff --git a/sched/sched/sched_addreadytorun.c b/sched/sched/sched_addreadytorun.c
index 7f81868c84..031f4c7028 100644
--- a/sched/sched/sched_addreadytorun.c
+++ b/sched/sched/sched_addreadytorun.c
@@ -25,9 +25,10 @@
 #include <nuttx/config.h>
 
 #include <stdbool.h>
-#include <queue.h>
 #include <assert.h>
 
+#include <nuttx/queue.h>
+
 #include "irq/irq.h"
 #include "sched/sched.h"
 
diff --git a/sched/sched/sched_mergepending.c b/sched/sched/sched_mergepending.c
index 15bcdc810b..bb34799503 100644
--- a/sched/sched/sched_mergepending.c
+++ b/sched/sched/sched_mergepending.c
@@ -26,9 +26,10 @@
 
 #include <stdbool.h>
 #include <sched.h>
-#include <queue.h>
 #include <assert.h>
 
+#include <nuttx/queue.h>
+
 #ifdef CONFIG_SMP
 #  include <nuttx/spinlock.h>
 #endif
diff --git a/sched/sched/sched_mergeprioritized.c b/sched/sched/sched_mergeprioritized.c
index e2080c8c02..2298f7b812 100644
--- a/sched/sched/sched_mergeprioritized.c
+++ b/sched/sched/sched_mergeprioritized.c
@@ -26,9 +26,10 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <queue.h>
 #include <assert.h>
 
+#include <nuttx/queue.h>
+
 #include "sched/sched.h"
 
 /****************************************************************************
diff --git a/sched/sched/sched_removeblocked.c b/sched/sched/sched_removeblocked.c
index b5f479b227..be7e348bb5 100644
--- a/sched/sched/sched_removeblocked.c
+++ b/sched/sched/sched_removeblocked.c
@@ -24,9 +24,10 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
 #include <assert.h>
 
+#include <nuttx/queue.h>
+
 #include "sched/sched.h"
 
 /****************************************************************************
diff --git a/sched/sched/sched_removereadytorun.c b/sched/sched/sched_removereadytorun.c
index a8d08a510e..a3c2e06756 100644
--- a/sched/sched/sched_removereadytorun.c
+++ b/sched/sched/sched_removereadytorun.c
@@ -25,8 +25,9 @@
 #include <nuttx/config.h>
 
 #include <stdbool.h>
-#include <queue.h>
 #include <assert.h>
+
+#include <nuttx/queue.h>
 #include <nuttx/sched_note.h>
 
 #include "irq/irq.h"
diff --git a/sched/semaphore/semaphore.h b/sched/semaphore/semaphore.h
index 71578176ab..7a24f5e696 100644
--- a/sched/semaphore/semaphore.h
+++ b/sched/semaphore/semaphore.h
@@ -32,7 +32,6 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <queue.h>
 
 /****************************************************************************
  * Public Function Prototypes
diff --git a/sched/signal/sig_action.c b/sched/signal/sig_action.c
index cffd139df1..6768ec38ee 100644
--- a/sched/signal/sig_action.c
+++ b/sched/signal/sig_action.c
@@ -27,12 +27,12 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <signal.h>
-#include <queue.h>
 #include <sched.h>
 #include <assert.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/spinlock.h>
 
 #include "sched/sched.h"
diff --git a/sched/signal/sig_initialize.c b/sched/signal/sig_initialize.c
index 5b793889d8..a73c797d96 100644
--- a/sched/signal/sig_initialize.c
+++ b/sched/signal/sig_initialize.c
@@ -25,10 +25,10 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
-#include <queue.h>
 #include <assert.h>
 
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 
 #include "signal/signal.h"
 
diff --git a/sched/signal/signal.h b/sched/signal/signal.h
index f9409e9b67..e257f57dfd 100644
--- a/sched/signal/signal.h
+++ b/sched/signal/signal.h
@@ -29,10 +29,10 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <queue.h>
 #include <sched.h>
 
 #include <nuttx/kmalloc.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/sched/task/task_init.c b/sched/task/task_init.c
index 48000efc94..c5abafde65 100644
--- a/sched/task/task_init.c
+++ b/sched/task/task_init.c
@@ -27,11 +27,11 @@
 #include <sys/types.h>
 #include <stdint.h>
 #include <sched.h>
-#include <queue.h>
 #include <assert.h>
 #include <errno.h>
 
 #include <nuttx/arch.h>
+#include <nuttx/queue.h>
 #include <nuttx/sched.h>
 
 #include "sched/sched.h"
diff --git a/sched/task/task_terminate.c b/sched/task/task_terminate.c
index 90158e9288..c38709db69 100644
--- a/sched/task/task_terminate.c
+++ b/sched/task/task_terminate.c
@@ -26,9 +26,9 @@
 
 #include <sys/types.h>
 #include <assert.h>
-#include <queue.h>
 #include <errno.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/sched.h>
 #include <nuttx/irq.h>
 #include <nuttx/sched_note.h>
diff --git a/sched/task/task_vfork.c b/sched/task/task_vfork.c
index fa96154a98..59cc80b02f 100644
--- a/sched/task/task_vfork.c
+++ b/sched/task/task_vfork.c
@@ -30,9 +30,10 @@
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
-#include <queue.h>
 #include <debug.h>
 
+#include <nuttx/queue.h>
+
 #include "sched/sched.h"
 #include "environ/environ.h"
 #include "group/group.h"
diff --git a/sched/timer/timer_initialize.c b/sched/timer/timer_initialize.c
index dedf2b0d37..5502295154 100644
--- a/sched/timer/timer_initialize.c
+++ b/sched/timer/timer_initialize.c
@@ -27,10 +27,10 @@
 
 #include <sys/types.h>
 #include <time.h>
-#include <queue.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 
 #include "timer/timer.h"
 
diff --git a/sched/timer/timer_release.c b/sched/timer/timer_release.c
index 9660d85a2d..bfd85b6564 100644
--- a/sched/timer/timer_release.c
+++ b/sched/timer/timer_release.c
@@ -24,10 +24,10 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
+#include <nuttx/queue.h>
 #include <nuttx/kmalloc.h>
 
 #include "timer/timer.h"
diff --git a/sched/wdog/wd_initialize.c b/sched/wdog/wd_initialize.c
index 5b4f6246cc..8fe2aeef98 100644
--- a/sched/wdog/wd_initialize.c
+++ b/sched/wdog/wd_initialize.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 #include "wdog/wdog.h"
 
diff --git a/sched/wdog/wdog.h b/sched/wdog/wdog.h
index 76b7144196..d4178a09e3 100644
--- a/sched/wdog/wdog.h
+++ b/sched/wdog/wdog.h
@@ -32,6 +32,7 @@
 
 #include <nuttx/compiler.h>
 #include <nuttx/clock.h>
+#include <nuttx/queue.h>
 #include <nuttx/wdog.h>
 
 /****************************************************************************
diff --git a/sched/wqueue/kwork_cancel.c b/sched/wqueue/kwork_cancel.c
index 6bab1e76f2..340d861ce5 100644
--- a/sched/wqueue/kwork_cancel.c
+++ b/sched/wqueue/kwork_cancel.c
@@ -24,12 +24,12 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
 #include <assert.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
+#include <nuttx/queue.h>
 #include <nuttx/wqueue.h>
 
 #include "wqueue/wqueue.h"
diff --git a/sched/wqueue/kwork_queue.c b/sched/wqueue/kwork_queue.c
index 8890370d64..b21fe75f1f 100644
--- a/sched/wqueue/kwork_queue.c
+++ b/sched/wqueue/kwork_queue.c
@@ -25,13 +25,13 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
-#include <queue.h>
 #include <assert.h>
 #include <errno.h>
 
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <nuttx/clock.h>
+#include <nuttx/queue.h>
 #include <nuttx/wqueue.h>
 
 #include "wqueue/wqueue.h"
diff --git a/sched/wqueue/kwork_thread.c b/sched/wqueue/kwork_thread.c
index 04c3d3985c..4e5bbf185d 100644
--- a/sched/wqueue/kwork_thread.c
+++ b/sched/wqueue/kwork_thread.c
@@ -31,9 +31,9 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <assert.h>
-#include <queue.h>
 #include <debug.h>
 
+#include <nuttx/queue.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/kthread.h>
 #include <nuttx/semaphore.h>
diff --git a/sched/wqueue/wqueue.h b/sched/wqueue/wqueue.h
index 48b49da2cc..53323e78b9 100644
--- a/sched/wqueue/wqueue.h
+++ b/sched/wqueue/wqueue.h
@@ -28,9 +28,9 @@
 
 #include <sys/types.h>
 #include <stdbool.h>
-#include <queue.h>
 
 #include <nuttx/clock.h>
+#include <nuttx/queue.h>
 
 #ifdef CONFIG_SCHED_WORKQUEUE