libc: Move queue.h from include to include/nuttx

to avoid the conflict with libuv's queue.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>

arch/arm/include/cxd56xx/pm.h

@@ -26,7 +26,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Pre-processor Prototypes

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>

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>

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>

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>
 

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>

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>

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>
 

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>
 

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>

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>

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>

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>

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" */
 

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>

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>
 

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>
 

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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"

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>

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"
 

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>

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>

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>

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>

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"

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>
 

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>

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>
 

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>

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>

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>

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>

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>

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>

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"

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>

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>

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>

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>

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>

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>

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"
 

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"

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"

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>

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>

drivers/usbdev/cdcecm.c

@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <assert.h>
 #include <debug.h>
-#include <queue.h>
 
 #include <arpa/inet.h>
 

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>

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>

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>

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>

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>

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"

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>

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"
 
 /****************************************************************************

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

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"
 

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>

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>
 

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>
 

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>
 

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
 

include/nuttx/can.h

@@ -31,7 +31,7 @@
 #  include <nuttx/wqueue.h>
 #endif
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 #ifdef CONFIG_NET_CAN
 

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>

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>
 
 /****************************************************************************

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

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>

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

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>

include/nuttx/net/netlink.h

@@ -27,7 +27,7 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 #include <netpacket/netlink.h>
 

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
 

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_ */

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>

include/nuttx/wdog.h

@@ -29,7 +29,6 @@
 
 #include <nuttx/clock.h>
 #include <stdint.h>
-#include <queue.h>
 
 /****************************************************************************
  * Pre-processor Definitions

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>
 
 /****************************************************************************

include/sched.h

@@ -32,7 +32,6 @@
 #include <stdbool.h>
 #include <strings.h>
 #include <time.h>
-#include "queue.h"
 
 /********************************************************************************
  * Pre-processor Definitions

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 *"

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"

libs/libc/queue/dq_addafter.c

@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions

libs/libc/queue/dq_count.c

@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
+#include <nuttx/queue.h>
 #include <assert.h>
 
 /****************************************************************************

libs/libc/queue/dq_remafter.c

@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions

libs/libc/queue/dq_remfirst.c

@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions

libs/libc/queue/dq_remlast.c

@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions

libs/libc/queue/sq_addafter.c

@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <queue.h>
+#include <nuttx/queue.h>
 
 /****************************************************************************
  * Public Functions

libs/libc/queue/sq_count.c

@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include <queue.h>
+#include <nuttx/queue.h>
 #include <assert.h>
 
 /****************************************************************************