You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/02/01 14:27:54 UTC
[incubator-nuttx] branch master updated: Replace #include
to #include
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 5c80b94 Replace #include <semaphore.h> to #include <nuttx/semaphore.h>
5c80b94 is described below
commit 5c80b94820243eeb6f5878fcbaf87410b26054b8
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sat Feb 1 15:17:32 2020 +0800
Replace #include <semaphore.h> to #include <nuttx/semaphore.h>
Since the kernel side should call nxsem_xxx instead and remove the unused inclusion
---
arch/arm/src/a1x/a1x_serial.c | 1 -
arch/arm/src/am335x/am335x_i2c.c | 21 +++------------------
arch/arm/src/am335x/am335x_lcdc.c | 2 +-
arch/arm/src/am335x/am335x_serial.c | 1 -
arch/arm/src/c5471/c5471_serial.c | 1 -
arch/arm/src/cxd56xx/cxd56_dmac.c | 2 +-
arch/arm/src/cxd56xx/cxd56_emmc.c | 2 +-
arch/arm/src/cxd56xx/cxd56_ge2d.c | 3 ++-
arch/arm/src/cxd56xx/cxd56_icc.c | 3 ++-
arch/arm/src/cxd56xx/cxd56_scu.c | 2 +-
arch/arm/src/cxd56xx/cxd56_sdhci.c | 2 +-
arch/arm/src/cxd56xx/cxd56_serial.c | 1 -
arch/arm/src/cxd56xx/cxd56_sfc.c | 2 +-
arch/arm/src/cxd56xx/cxd56_sph.c | 3 ++-
arch/arm/src/cxd56xx/cxd56_spi.c | 6 +++---
arch/arm/src/cxd56xx/cxd56_sysctl.c | 3 ++-
arch/arm/src/cxd56xx/cxd56_uart0.c | 3 ++-
arch/arm/src/cxd56xx/cxd56_udmac.c | 2 +-
arch/arm/src/dm320/dm320_serial.c | 1 -
arch/arm/src/efm32/efm32_adc.c | 1 -
arch/arm/src/efm32/efm32_dma.c | 2 +-
arch/arm/src/efm32/efm32_i2c.c | 1 -
arch/arm/src/efm32/efm32_leserial.c | 1 -
arch/arm/src/efm32/efm32_serial.c | 1 -
arch/arm/src/efm32/efm32_spi.c | 1 -
arch/arm/src/efm32/efm32_usbhost.c | 1 -
arch/arm/src/imx1/imx_serial.c | 1 -
arch/arm/src/imx1/imx_spi.c | 1 -
arch/arm/src/imx6/imx_ecspi.c | 1 -
arch/arm/src/imx6/imx_serial.c | 2 +-
arch/arm/src/imxrt/imxrt_edma.c | 2 +-
arch/arm/src/imxrt/imxrt_ehci.c | 1 -
arch/arm/src/imxrt/imxrt_enc.c | 1 -
arch/arm/src/imxrt/imxrt_lpi2c.c | 1 -
arch/arm/src/imxrt/imxrt_lpspi.c | 1 -
arch/arm/src/imxrt/imxrt_serial.c | 1 -
arch/arm/src/imxrt/imxrt_usdhc.c | 1 -
arch/arm/src/kinetis/kinetis_lpserial.c | 1 -
arch/arm/src/kinetis/kinetis_sdhc.c | 1 -
arch/arm/src/kinetis/kinetis_serial.c | 1 -
arch/arm/src/kinetis/kinetis_spi.c | 1 -
arch/arm/src/kl/kl_serial.c | 1 -
arch/arm/src/kl/kl_spi.c | 1 -
arch/arm/src/lc823450/lc823450_adc.c | 2 +-
arch/arm/src/lc823450/lc823450_dma.c | 2 +-
arch/arm/src/lc823450/lc823450_i2c.c | 1 -
arch/arm/src/lc823450/lc823450_i2s.c | 1 -
arch/arm/src/lc823450/lc823450_mtd.c | 2 +-
arch/arm/src/lc823450/lc823450_sddrv_dep.c | 3 +--
arch/arm/src/lc823450/lc823450_serial.c | 2 +-
arch/arm/src/lc823450/lc823450_spi.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c | 1 -
arch/arm/src/lpc17xx_40xx/lpc17_40_can.c | 1 -
arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c | 1 -
arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c | 1 -
arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c | 1 -
arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c | 1 -
arch/arm/src/lpc214x/lpc214x_serial.c | 1 -
arch/arm/src/lpc2378/lpc23xx_serial.c | 1 -
arch/arm/src/lpc2378/lpc23xx_spi.c | 2 +-
arch/arm/src/lpc31xx/lpc31_ehci.c | 1 -
arch/arm/src/lpc31xx/lpc31_serial.c | 1 -
arch/arm/src/lpc31xx/lpc31_spi.c | 2 +-
arch/arm/src/lpc43xx/lpc43_adc.c | 1 -
arch/arm/src/lpc43xx/lpc43_aes.c | 1 -
arch/arm/src/lpc43xx/lpc43_can.c | 1 -
arch/arm/src/lpc43xx/lpc43_dac.c | 1 -
arch/arm/src/lpc43xx/lpc43_ehci.c | 1 -
arch/arm/src/lpc43xx/lpc43_sdmmc.c | 1 -
arch/arm/src/lpc43xx/lpc43_serial.c | 1 -
arch/arm/src/lpc43xx/lpc43_spi.c | 2 +-
arch/arm/src/lpc43xx/lpc43_ssp.c | 2 +-
arch/arm/src/lpc54xx/lpc54_sdmmc.c | 1 -
arch/arm/src/lpc54xx/lpc54_serial.c | 1 -
arch/arm/src/lpc54xx/lpc54_spi_master.c | 2 +-
arch/arm/src/lpc54xx/lpc54_usb0_ohci.c | 1 -
arch/arm/src/max326xx/max32660/max32660_serial.c | 1 -
arch/arm/src/max326xx/max32660/max32660_spim.c | 1 -
arch/arm/src/nrf52/nrf52832_errdata.c | 1 -
arch/arm/src/nrf52/nrf52_i2c.c | 1 -
arch/arm/src/nrf52/nrf52_serial.c | 1 -
arch/arm/src/nrf52/nrf52_spi.c | 17 ++---------------
arch/arm/src/nuc1xx/nuc_serial.c | 1 -
arch/arm/src/s32k1xx/s32k1xx_edma.c | 2 +-
arch/arm/src/s32k1xx/s32k1xx_lpi2c.c | 1 -
arch/arm/src/s32k1xx/s32k1xx_lpspi.c | 1 -
arch/arm/src/s32k1xx/s32k1xx_serial.c | 1 -
arch/arm/src/sam34/sam4cm_tc.c | 2 +-
arch/arm/src/sam34/sam_aes.c | 2 +-
arch/arm/src/sam34/sam_dmac.c | 2 +-
arch/arm/src/sam34/sam_hsmci.c | 1 -
arch/arm/src/sam34/sam_serial.c | 1 -
arch/arm/src/sam34/sam_spi.c | 1 -
arch/arm/src/sama5/sam_adc.c | 2 +-
arch/arm/src/sama5/sam_can.c | 2 +-
arch/arm/src/sama5/sam_dbgu.c | 1 -
arch/arm/src/sama5/sam_dmac.c | 2 +-
arch/arm/src/sama5/sam_ehci.c | 1 -
arch/arm/src/sama5/sam_flexcom_serial.c | 1 -
arch/arm/src/sama5/sam_hsmci.c | 1 -
arch/arm/src/sama5/sam_nand.c | 2 --
arch/arm/src/sama5/sam_nand.h | 2 +-
arch/arm/src/sama5/sam_ohci.c | 1 -
arch/arm/src/sama5/sam_pmecc.c | 2 +-
arch/arm/src/sama5/sam_serial.c | 2 +-
arch/arm/src/sama5/sam_spi.c | 1 -
arch/arm/src/sama5/sam_ssc.c | 2 +-
arch/arm/src/sama5/sam_tc.c | 2 +-
arch/arm/src/sama5/sam_trng.c | 2 +-
arch/arm/src/sama5/sam_tsd.c | 1 -
arch/arm/src/sama5/sam_xdmac.c | 2 +-
arch/arm/src/samd2l2/sam_adc.c | 2 --
arch/arm/src/samd2l2/sam_dmac.c | 2 +-
arch/arm/src/samd2l2/sam_serial.c | 1 -
arch/arm/src/samd2l2/sam_spi.c | 2 +-
arch/arm/src/samd5e5/sam_dmac.c | 2 +-
arch/arm/src/samd5e5/sam_serial.c | 1 -
arch/arm/src/samd5e5/sam_spi.c | 2 +-
arch/arm/src/samv7/sam_dac.c | 1 -
arch/arm/src/samv7/sam_hsmci.c | 1 -
arch/arm/src/samv7/sam_mcan.c | 1 -
arch/arm/src/samv7/sam_progmem.c | 2 +-
arch/arm/src/samv7/sam_qspi.c | 1 -
arch/arm/src/samv7/sam_serial.c | 1 -
arch/arm/src/samv7/sam_spi.c | 1 -
arch/arm/src/samv7/sam_spi_slave.c | 2 +-
arch/arm/src/samv7/sam_ssc.c | 2 +-
arch/arm/src/samv7/sam_tc.c | 2 +-
arch/arm/src/samv7/sam_xdmac.c | 2 +-
arch/arm/src/stm32/stm32_1wire.c | 1 -
arch/arm/src/stm32/stm32_adc.c | 2 +-
arch/arm/src/stm32/stm32_aes.c | 2 +-
arch/arm/src/stm32/stm32_can.c | 1 -
arch/arm/src/stm32/stm32_capture.c | 1 -
arch/arm/src/stm32/stm32_dac.c | 1 -
arch/arm/src/stm32/stm32_dma2d.c | 1 -
arch/arm/src/stm32/stm32_dma_v1.c | 2 +-
arch/arm/src/stm32/stm32_dma_v2.c | 2 +-
arch/arm/src/stm32/stm32_hciuart.c | 1 -
arch/arm/src/stm32/stm32_i2c.c | 1 -
arch/arm/src/stm32/stm32_i2c_alt.c | 1 -
arch/arm/src/stm32/stm32_i2c_v2.c | 1 -
arch/arm/src/stm32/stm32_i2s.c | 2 +-
arch/arm/src/stm32/stm32_ltdc.h | 1 -
arch/arm/src/stm32/stm32_otgfshost.c | 1 -
arch/arm/src/stm32/stm32_otghshost.c | 1 -
arch/arm/src/stm32/stm32_sdadc.c | 1 -
arch/arm/src/stm32/stm32_sdio.c | 1 -
arch/arm/src/stm32/stm32_serial.c | 1 -
arch/arm/src/stm32/stm32_spi.c | 1 -
arch/arm/src/stm32/stm32_tim.c | 1 -
arch/arm/src/stm32/stm32f10xxf30xx_flash.c | 2 +-
arch/arm/src/stm32/stm32f20xxf40xx_flash.c | 2 +-
arch/arm/src/stm32/stm32f40xxx_i2c.c | 1 -
arch/arm/src/stm32/stm32l15xx_flash.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_adc.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_aes.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_dma_v1.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_i2c.c | 1 -
arch/arm/src/stm32f0l0g0/stm32_serial_v1.c | 1 -
arch/arm/src/stm32f0l0g0/stm32_serial_v2.c | 1 -
arch/arm/src/stm32f0l0g0/stm32_spi.c | 1 -
arch/arm/src/stm32f0l0g0/stm32_tim.c | 1 -
arch/arm/src/stm32f7/stm32_adc.c | 1 -
arch/arm/src/stm32f7/stm32_can.c | 1 -
arch/arm/src/stm32f7/stm32_capture.c | 1 -
arch/arm/src/stm32f7/stm32_dma.c | 2 +-
arch/arm/src/stm32f7/stm32_dma2d.c | 1 -
arch/arm/src/stm32f7/stm32_flash.c | 2 +-
arch/arm/src/stm32f7/stm32_i2c.c | 1 -
arch/arm/src/stm32f7/stm32_ltdc.h | 1 -
arch/arm/src/stm32f7/stm32_otghost.c | 1 -
arch/arm/src/stm32f7/stm32_qspi.c | 1 -
arch/arm/src/stm32f7/stm32_sai.c | 1 -
arch/arm/src/stm32f7/stm32_sdmmc.c | 1 -
arch/arm/src/stm32f7/stm32_serial.c | 1 -
arch/arm/src/stm32f7/stm32_spi.c | 1 -
arch/arm/src/stm32f7/stm32_tim.c | 1 -
arch/arm/src/stm32h7/stm32_flash.c | 2 +-
arch/arm/src/stm32h7/stm32_i2c.c | 1 -
arch/arm/src/stm32h7/stm32_otghost.c | 1 -
arch/arm/src/stm32h7/stm32_qspi.c | 1 -
arch/arm/src/stm32h7/stm32_sdmmc.c | 1 -
arch/arm/src/stm32h7/stm32_serial.c | 1 -
arch/arm/src/stm32h7/stm32_spi.c | 1 -
arch/arm/src/stm32h7/stm32_tim.c | 1 -
arch/arm/src/stm32l4/stm32l4_1wire.c | 1 -
arch/arm/src/stm32l4/stm32l4_can.c | 1 -
arch/arm/src/stm32l4/stm32l4_dac.c | 1 -
arch/arm/src/stm32l4/stm32l4_flash.c | 2 +-
arch/arm/src/stm32l4/stm32l4_i2c.c | 1 -
arch/arm/src/stm32l4/stm32l4_otgfshost.c | 1 -
arch/arm/src/stm32l4/stm32l4_qspi.c | 1 -
arch/arm/src/stm32l4/stm32l4_sai.c | 2 +-
arch/arm/src/stm32l4/stm32l4_sdmmc.c | 1 -
arch/arm/src/stm32l4/stm32l4_serial.c | 1 -
arch/arm/src/stm32l4/stm32l4_spi.c | 1 -
arch/arm/src/stm32l4/stm32l4_tim.c | 1 -
arch/arm/src/stm32l4/stm32l4x6xx_dma.c | 2 +-
arch/arm/src/str71x/str71x_serial.c | 1 -
arch/arm/src/tiva/common/tiva_adclow.c | 2 +-
arch/arm/src/tiva/common/tiva_hciuart.c | 1 -
arch/arm/src/tiva/common/tiva_i2c.c | 1 -
arch/arm/src/tiva/common/tiva_serial.c | 1 -
arch/arm/src/tiva/common/tiva_ssi.c | 1 -
arch/arm/src/tms570/tms570_serial.c | 1 -
arch/arm/src/xmc4/xmc4_serial.c | 1 -
arch/arm/src/xmc4/xmc4_spi.c | 1 -
arch/avr/src/at32uc3/at32uc3_serial.c | 1 -
arch/avr/src/at90usb/at90usb_serial.c | 1 -
arch/avr/src/atmega/atmega_serial.c | 1 -
arch/avr/src/avr/up_spi.c | 2 +-
arch/mips/src/pic32mx/pic32mx-serial.c | 1 -
arch/mips/src/pic32mx/pic32mx-spi.c | 2 +-
arch/mips/src/pic32mz/pic32mz-i2c.c | 1 -
arch/mips/src/pic32mz/pic32mz-serial.c | 1 -
arch/mips/src/pic32mz/pic32mz-spi.c | 2 +-
arch/mips/src/pic32mz/pic32mz-timer.c | 1 -
arch/misoc/src/common/misoc_serial.c | 1 -
arch/or1k/src/mor1kx/mor1kx_serial.c | 1 -
arch/renesas/src/m16c/m16c_serial.c | 1 -
arch/renesas/src/rx65n/rx65n_serial.c | 1 -
arch/renesas/src/sh1/sh1_serial.c | 1 -
arch/risc-v/src/gap8/gap8_uart.c | 1 -
arch/risc-v/src/nr5m100/nr5_serial.c | 1 -
arch/sim/src/sim/up_ioexpander.c | 1 -
arch/sim/src/sim/up_qspiflash.c | 1 -
arch/sim/src/sim/up_simsmp.c | 1 -
arch/sim/src/sim/up_spiflash.c | 1 -
arch/sim/src/sim/up_touchscreen.c | 1 -
arch/sim/src/sim/up_uartwait.c | 2 --
arch/x86/src/qemu/qemu_keypad.c | 1 -
arch/xtensa/src/esp32/esp32_serial.c | 1 -
arch/z16/src/z16f/z16f_espi.c | 2 +-
arch/z16/src/z16f/z16f_serial.c | 1 -
arch/z80/src/ez80/ez80_i2c.c | 2 +-
arch/z80/src/ez80/ez80_serial.c | 1 -
arch/z80/src/ez80/ez80_spi.c | 2 +-
arch/z80/src/z180/z180_scc.c | 1 -
arch/z80/src/z8/z8_i2c.c | 2 +-
arch/z80/src/z8/z8_serial.c | 1 -
audio/audio.c | 4 ++--
audio/pcm_decode.c | 1 -
boards/arm/cxd56xx/common/src/cxd56_imageproc.c | 2 +-
boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c | 1 -
boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c | 1 -
boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c | 1 -
boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c | 1 -
boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c | 1 -
boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c | 1 -
boards/arm/cxd56xx/drivers/sensors/kx022_scu.c | 1 -
boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c | 1 -
boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c | 1 -
boards/arm/cxd56xx/spresense/src/cxd56_power.c | 2 +-
.../arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c | 2 +-
boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c | 2 +-
.../arm/max326xx/max32660-evsys/src/max326_mmcsd.c | 1 -
boards/arm/sam34/sam4l-xplained/src/sam_slcd.c | 2 +-
boards/arm/samv7/samv71-xult/src/sam_ili9488.c | 2 +-
.../stm32/mikroe-stm32f4/src/stm32_touchscreen.c | 2 +-
boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c | 1 -
boards/arm/stm32/stm32butterfly2/src/stm32_mmcsd.c | 2 +-
.../arm/stm32/stm32f103-minimum/src/stm32_mmcsd.c | 1 -
boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c | 1 -
boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c | 2 +-
.../arm/stm32l4/nucleo-l476rg/src/stm32_spimmcsd.c | 1 -
boards/arm/str71x/olimex-strp711/src/str71_spi.c | 2 +-
.../tms570/tms570ls31x-usb-kit/src/tms570_sdmmc.c | 1 -
.../pic32mx/pic32mx7mmb/src/pic32_touchscreen.c | 2 +-
.../mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c | 2 +-
boards/sim/sim/sim/src/sim_touchscreen.c | 2 +-
boards/z80/ez80/makerlisp/src/ez80_spimmcsd.c | 1 -
drivers/1wire/1wire_internal.h | 2 +-
drivers/analog/ad5410.c | 1 -
drivers/analog/adc.c | 2 --
drivers/analog/ads1255.c | 1 -
drivers/analog/comp.c | 2 --
drivers/analog/dac.c | 2 --
drivers/analog/dac7554.c | 1 -
drivers/analog/dac7571.c | 1 -
drivers/analog/lmp92001.c | 1 -
drivers/analog/ltc1867l.c | 2 +-
drivers/analog/opamp.c | 2 --
drivers/audio/tone.c | 2 +-
drivers/bch/bch.h | 3 ++-
drivers/bch/bchlib_sem.c | 2 --
drivers/can/can.c | 2 --
drivers/can/mcp2515.c | 1 -
drivers/i2c/i2c_driver.c | 2 +-
drivers/input/ads7843e.c | 2 --
drivers/input/ads7843e.h | 2 +-
drivers/input/ft5x06.c | 2 +-
drivers/input/max11802.c | 2 --
drivers/input/max11802.h | 2 +-
drivers/input/mxt.c | 1 -
drivers/input/stmpe811.h | 3 +--
drivers/input/stmpe811_tsc.c | 1 -
drivers/input/tsc2007.c | 2 +-
drivers/ioexpander/pca9555.c | 1 -
drivers/ioexpander/pca9555.h | 4 +---
drivers/ioexpander/pcf8574.c | 1 -
drivers/ioexpander/pcf8574.h | 4 +---
drivers/ioexpander/skeleton.c | 2 +-
drivers/ioexpander/tca64xx.c | 1 -
drivers/ioexpander/tca64xx.h | 4 +---
drivers/lcd/tda19988.c | 1 -
drivers/leds/rgbled.c | 2 +-
drivers/loop/losetup.c | 2 +-
drivers/mmcsd/mmcsd_sdio.c | 2 +-
drivers/modem/altair/altmdm_spi.h | 1 -
drivers/modem/altair/altmdm_sys.c | 1 -
drivers/modem/altair/altmdm_sys.h | 2 +-
drivers/mtd/mtd_nand.c | 1 -
drivers/net/phy_notify.c | 2 +-
drivers/net/telnet.c | 1 -
drivers/pipes/pipe.c | 2 +-
drivers/pipes/pipe_common.c | 1 -
drivers/power/battery_charger.c | 1 -
drivers/power/battery_gauge.c | 1 -
drivers/power/motor.c | 2 --
drivers/power/pm.h | 1 -
drivers/power/pm_initialize.c | 3 ---
drivers/power/powerled.c | 2 --
drivers/power/smps.c | 2 --
drivers/rwbuffer.c | 2 +-
drivers/sensors/adxl345.h | 3 +--
drivers/sensors/adxl372.c | 3 +--
drivers/sensors/ak09912.c | 2 +-
drivers/sensors/bmg160.c | 3 +--
drivers/sensors/dhtxx.c | 3 +--
drivers/sensors/kxtj9.c | 2 +-
drivers/sensors/lis3dh.c | 3 +--
drivers/sensors/lis3dsh.c | 3 +--
drivers/sensors/lis3mdl.c | 3 +--
drivers/sensors/lsm330_spi.c | 3 +--
drivers/sensors/mlx90393.c | 3 +--
drivers/sensors/qencoder.c | 2 +-
drivers/sensors/xen1210.h | 3 +--
drivers/sensors/zerocross.c | 2 +-
drivers/serial/pty.c | 1 -
drivers/serial/serial.c | 1 -
drivers/serial/serial_dma.c | 1 -
drivers/serial/serial_io.c | 1 -
drivers/serial/uart_16550.c | 1 -
drivers/spi/spi_bitbang.c | 1 -
drivers/spi/spi_driver.c | 2 +-
drivers/syslog/syslog_device.c | 2 +-
drivers/timers/oneshot.c | 2 +-
drivers/timers/pwm.c | 1 -
drivers/timers/rtc.c | 2 +-
drivers/timers/timer.c | 2 +-
drivers/timers/watchdog.c | 2 +-
drivers/usbdev/cdcacm.c | 1 -
drivers/usbdev/pl2303.c | 1 -
drivers/usbdev/usbmsc.c | 1 -
drivers/usbdev/usbmsc.h | 2 +-
drivers/usbhost/usbhost_cdcacm.c | 2 +-
drivers/usbhost/usbhost_hidkbd.c | 1 -
drivers/usbhost/usbhost_hidmouse.c | 1 -
drivers/usbhost/usbhost_hub.c | 2 +-
drivers/usbhost/usbhost_max3421e.c | 1 -
drivers/usbhost/usbhost_skeleton.c | 2 +-
drivers/usbhost/usbhost_storage.c | 2 +-
drivers/usbhost/usbhost_xboxcontroller.c | 2 +-
drivers/video/video_framebuff.h | 2 +-
drivers/wireless/bluetooth/bt_uart_bcm4343x.c | 1 -
drivers/wireless/bluetooth/bt_uart_shim.c | 1 -
drivers/wireless/gs2200m.c | 1 -
drivers/wireless/ieee80211/bcm43xxx/bcmf_cdc.c | 1 -
drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h | 2 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c | 1 -
drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h | 2 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.c | 2 +-
drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.c | 3 ---
drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.h | 3 ++-
drivers/wireless/ieee802154/at86rf23x/at86rf23x.c | 2 +-
drivers/wireless/ieee802154/mrf24j40/mrf24j40.c | 3 ---
drivers/wireless/ieee802154/mrf24j40/mrf24j40.h | 2 +-
.../wireless/ieee802154/mrf24j40/mrf24j40_radif.c | 2 --
drivers/wireless/ieee802154/xbee/xbee.c | 2 --
drivers/wireless/ieee802154/xbee/xbee.h | 2 +-
drivers/wireless/ieee802154/xbee/xbee_mac.h | 1 -
drivers/wireless/lpwan/sx127x/sx127x.c | 2 +-
drivers/wireless/nrf24l01.c | 2 +-
drivers/wireless/spirit/drivers/spirit_netdev.c | 2 +-
fs/aio/aio_initialize.c | 2 +-
fs/driver/fs_blockproxy.c | 2 +-
fs/driver/fs_mtdproxy.c | 2 +-
fs/fat/fs_fat32.c | 1 -
fs/fat/fs_fat32.h | 2 +-
fs/fat/fs_fat32util.c | 1 -
fs/hostfs/hostfs.c | 1 -
fs/hostfs/hostfs.h | 3 ++-
fs/inode/fs_filedetach.c | 2 +-
fs/inode/fs_files.c | 2 +-
fs/inode/fs_inode.c | 2 +-
fs/mmap/fs_rammap.h | 2 +-
fs/nfs/nfs_mount.h | 1 +
fs/nfs/nfs_util.c | 1 -
fs/nfs/nfs_vfsops.c | 1 -
fs/nxffs/nxffs.h | 2 +-
fs/nxffs/nxffs_dirent.c | 1 -
fs/nxffs/nxffs_ioctl.c | 1 -
fs/nxffs/nxffs_read.c | 1 -
fs/nxffs/nxffs_stat.c | 1 -
fs/nxffs/nxffs_truncate.c | 2 --
fs/nxffs/nxffs_unlink.c | 1 -
fs/nxffs/nxffs_write.c | 1 -
fs/semaphore/sem_close.c | 1 -
fs/semaphore/sem_open.c | 1 -
fs/semaphore/sem_unlink.c | 2 +-
fs/smartfs/smartfs.h | 2 +-
fs/smartfs/smartfs_smart.c | 1 -
fs/smartfs/smartfs_utils.c | 1 -
fs/spiffs/src/spiffs_vfs.c | 1 -
fs/tmpfs/fs_tmpfs.c | 1 -
fs/tmpfs/fs_tmpfs.h | 2 +-
fs/unionfs/fs_unionfs.c | 2 +-
fs/userfs/fs_userfs.c | 2 +-
fs/vfs/fs_fdopen.c | 2 +-
fs/vfs/fs_poll.c | 1 -
graphics/nxmu/nxmu.h | 1 -
graphics/nxmu/nxmu_server.c | 1 -
graphics/nxterm/nxterm.h | 1 -
graphics/nxterm/nxterm_redraw.c | 1 -
graphics/nxterm/nxterm_register.c | 1 -
graphics/nxterm/nxterm_resize.c | 1 -
graphics/nxterm/nxterm_scroll.c | 1 -
graphics/nxterm/nxterm_sem.c | 1 -
graphics/vnc/server/vnc_fbdev.c | 1 -
graphics/vnc/server/vnc_server.c | 2 --
graphics/vnc/server/vnc_server.h | 2 +-
graphics/vnc/server/vnc_updater.c | 3 ---
include/nuttx/analog/adc.h | 3 ++-
include/nuttx/analog/comp.h | 3 ++-
include/nuttx/analog/dac.h | 3 ++-
include/nuttx/analog/opamp.h | 3 ++-
include/nuttx/audio/audio.h | 3 ++-
include/nuttx/can/can.h | 2 +-
include/nuttx/drivers/rwbuffer.h | 3 ++-
include/nuttx/mtd/hamming.h | 1 -
include/nuttx/mtd/nand.h | 2 +-
include/nuttx/nx/nxmu.h | 1 -
include/nuttx/power/battery_charger.h | 2 +-
include/nuttx/power/battery_gauge.h | 2 +-
include/nuttx/power/motor.h | 1 +
include/nuttx/power/powerled.h | 1 +
include/nuttx/power/smps.h | 1 +
include/nuttx/serial/serial.h | 2 +-
include/nuttx/spi/spi_bitbang.h | 3 +--
include/nuttx/usb/usbhost_devaddr.h | 3 ++-
include/nuttx/wireless/cc1101.h | 2 +-
.../nuttx/wireless/ieee802154/ieee802154_radio.h | 1 -
include/nuttx/wqueue.h | 1 -
include/stdio.h | 1 -
libs/libc/audio/lib_buffer.c | 6 ++----
libs/libc/misc/lib_filesem.c | 1 -
libs/libc/misc/lib_streamsem.c | 1 -
libs/libc/modlib/modlib_registry.c | 1 -
libs/libc/netdb/lib_dnsinit.c | 1 -
libs/libc/pthread/pthread_condinit.c | 2 --
libs/libc/pthread/pthread_rwlock.c | 2 --
libs/libc/pthread/pthread_rwlock_rdlock.c | 2 --
libs/libc/pthread/pthread_rwlock_wrlock.c | 2 --
libs/libc/semaphore/sem_getvalue.c | 1 -
libs/libc/semaphore/sem_init.c | 1 -
libs/libc/stdio/lib_vfprintf.c | 1 -
libs/libc/stdio/lib_vfscanf.c | 1 -
libs/libc/stdio/lib_vsscanf.c | 1 -
libs/libc/stdlib/lib_mkstemp.c | 1 -
libs/libc/userfs/lib_userfs.c | 6 +++---
libs/libc/wqueue/work_lock.c | 1 -
libs/libnx/nxcontext.h | 1 -
libs/libnx/nxfonts/nxfonts_cache.c | 3 +--
libs/libnx/nxmu/nx_connect.c | 2 --
libs/libnx/nxmu/nx_getrectangle.c | 2 +-
libs/libnx/nxmu/nxmu_semtake.c | 1 -
libs/libnx/nxtk/nxtk_events.c | 1 -
libs/libnx/nxtk/nxtk_setsubwindows.c | 1 -
mm/iob/iob.h | 2 +-
mm/iob/iob_alloc.c | 1 -
mm/iob/iob_alloc_qentry.c | 1 -
mm/iob/iob_free.c | 1 -
mm/iob/iob_free_qentry.c | 1 -
mm/iob/iob_initialize.c | 1 -
mm/iob/iob_navail.c | 1 -
mm/mm_gran/mm_gran.h | 2 +-
mm/mm_gran/mm_grancritical.c | 1 -
mm/mm_heap/mm_sem.c | 1 -
mm/shm/shm.h | 2 +-
mm/shm/shmctl.c | 1 -
mm/shm/shmget.c | 1 -
net/arp/arp.h | 2 +-
net/arp/arp_notify.c | 2 --
net/arp/arp_send.c | 2 --
net/bluetooth/bluetooth_conn.c | 1 -
net/bluetooth/bluetooth_container.c | 1 -
net/icmp/icmp_sendto.c | 1 -
net/icmpv6/icmpv6.h | 2 +-
net/icmpv6/icmpv6_neighbor.c | 1 -
net/icmpv6/icmpv6_notify.c | 2 --
net/icmpv6/icmpv6_poll.c | 1 -
net/icmpv6/icmpv6_rnotify.c | 2 --
net/icmpv6/icmpv6_sendto.c | 1 -
net/ieee802154/ieee802154_conn.c | 1 -
net/ieee802154/ieee802154_container.c | 1 -
net/local/local.h | 2 +-
net/local/local_accept.c | 1 -
net/local/local_conn.c | 2 --
net/local/local_connect.c | 1 -
net/local/local_release.c | 2 --
net/mld/mld.h | 2 +-
net/mld/mld_group.c | 1 -
net/mld/mld_poll.c | 1 -
net/netdev/netdev_carrier.c | 1 -
net/netdev/netdev_register.c | 1 -
net/netdev/netdev_unregister.c | 1 -
net/netlink/netlink.h | 2 +-
net/route/net_cacheroute.c | 1 -
net/route/net_fileroute.c | 1 -
net/sixlowpan/sixlowpan_reassbuf.c | 1 -
net/sixlowpan/sixlowpan_send.c | 1 -
net/sixlowpan/sixlowpan_tcpsend.c | 8 ++++----
net/tcp/tcp_accept.c | 1 -
net/tcp/tcp_sendfile.c | 2 +-
net/tcp/tcp_txdrain.c | 3 ++-
net/udp/udp_txdrain.c | 3 ++-
net/usrsock/usrsock.h | 3 ++-
net/usrsock/usrsock_accept.c | 1 -
net/usrsock/usrsock_bind.c | 1 -
net/usrsock/usrsock_close.c | 1 -
net/usrsock/usrsock_connect.c | 1 -
net/usrsock/usrsock_event.c | 1 -
net/usrsock/usrsock_getpeername.c | 1 -
net/usrsock/usrsock_getsockname.c | 1 -
net/usrsock/usrsock_getsockopt.c | 1 -
net/usrsock/usrsock_ioctl.c | 1 -
net/usrsock/usrsock_listen.c | 1 -
net/usrsock/usrsock_recvfrom.c | 1 -
net/usrsock/usrsock_sendto.c | 1 -
net/usrsock/usrsock_setsockopt.c | 1 -
net/usrsock/usrsock_socket.c | 1 -
sched/pthread/pthread_initialize.c | 1 -
sched/pthread/pthread_mutexdestroy.c | 1 -
sched/pthread/pthread_mutextrylock.c | 1 -
sched/sched/sched_waitpid.c | 1 -
sched/semaphore/sem_destroy.c | 1 -
sched/semaphore/sem_holder.c | 1 -
sched/semaphore/sem_post.c | 1 -
sched/semaphore/sem_reset.c | 1 -
sched/semaphore/sem_setprotocol.c | 2 --
sched/semaphore/sem_tickwait.c | 2 --
sched/semaphore/sem_timedwait.c | 2 --
sched/semaphore/sem_trywait.c | 1 -
sched/semaphore/sem_wait.c | 1 -
sched/semaphore/semaphore.h | 2 +-
sched/signal/sig_deliver.c | 1 -
sched/task/task_spawnparms.c | 2 +-
sched/wqueue/kwork_notifier.c | 2 +-
wireless/bluetooth/bt_hcicore.c | 1 -
wireless/bluetooth/bt_hcicore.h | 2 +-
wireless/ieee802154/mac802154.c | 1 -
wireless/pktradio/pktradio_metadata.c | 2 +-
566 files changed, 239 insertions(+), 664 deletions(-)
diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c
index 3fc7455..0bd511f 100644
--- a/arch/arm/src/a1x/a1x_serial.c
+++ b/arch/arm/src/a1x/a1x_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/am335x/am335x_i2c.c b/arch/arm/src/am335x/am335x_i2c.c
index e787d83..90f2df4 100644
--- a/arch/arm/src/am335x/am335x_i2c.c
+++ b/arch/arm/src/am335x/am335x_i2c.c
@@ -47,7 +47,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
@@ -455,21 +454,7 @@ static inline void am335x_i2c_modifyreg(FAR struct am335x_i2c_priv_s *priv,
static inline void am335x_i2c_sem_wait(FAR struct am335x_i2c_priv_s *priv)
{
- int ret;
-
- do
- {
- /* Take the semaphore (perhaps waiting) */
-
- ret = nxsem_wait(&priv->sem_excl);
-
- /* The only case that an error should occur here is if the wait was
- * awakened by a signal.
- */
-
- DEBUGASSERT(ret == OK || ret == -EINTR);
- }
- while (ret == -EINTR);
+ nxsem_wait_uninterruptible(&priv->sem_excl);
}
/****************************************************************************
@@ -1226,7 +1211,7 @@ static int am335x_i2c_isr_process(struct am335x_i2c_priv_s *priv)
* and wake it up
*/
- sem_post(&priv->sem_isr);
+ nxsem_post(&priv->sem_isr);
priv->intstate = INTSTATE_DONE;
}
#else
@@ -1261,7 +1246,7 @@ static int am335x_i2c_isr_process(struct am335x_i2c_priv_s *priv)
* and wake it up
*/
- sem_post(&priv->sem_isr);
+ nxsem_post(&priv->sem_isr);
priv->intstate = INTSTATE_DONE;
}
#else
diff --git a/arch/arm/src/am335x/am335x_lcdc.c b/arch/arm/src/am335x/am335x_lcdc.c
index b3cd35c..2420564 100644
--- a/arch/arm/src/am335x/am335x_lcdc.c
+++ b/arch/arm/src/am335x/am335x_lcdc.c
@@ -48,11 +48,11 @@
#include <stdint.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/video/fb.h>
#include "up_arch.h"
diff --git a/arch/arm/src/am335x/am335x_serial.c b/arch/arm/src/am335x/am335x_serial.c
index 3260cb7..2926fcf 100644
--- a/arch/arm/src/am335x/am335x_serial.c
+++ b/arch/arm/src/am335x/am335x_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/c5471/c5471_serial.c b/arch/arm/src/c5471/c5471_serial.c
index 7ae1c28..1b47bcd 100644
--- a/arch/arm/src/c5471/c5471_serial.c
+++ b/arch/arm/src/c5471/c5471_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_dmac.c b/arch/arm/src/cxd56xx/cxd56_dmac.c
index 1554c75..03a737b 100644
--- a/arch/arm/src/cxd56xx/cxd56_dmac.c
+++ b/arch/arm/src/cxd56xx/cxd56_dmac.c
@@ -40,11 +40,11 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <semaphore.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/irq.h>
+#include <nuttx/semaphore.h>
#include "cxd56_dmac.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_emmc.c b/arch/arm/src/cxd56xx/cxd56_emmc.c
index 494649c..e0659b7 100644
--- a/arch/arm/src/cxd56xx/cxd56_emmc.c
+++ b/arch/arm/src/cxd56xx/cxd56_emmc.c
@@ -36,7 +36,6 @@
#include <nuttx/config.h>
#include <sys/types.h>
-#include <semaphore.h>
#include <stdint.h>
#include <string.h>
#include <errno.h>
@@ -45,6 +44,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/irq.h>
+#include <nuttx/semaphore.h>
#include <arch/board/board.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_ge2d.c b/arch/arm/src/cxd56xx/cxd56_ge2d.c
index b5e6e7f..19460b4 100644
--- a/arch/arm/src/cxd56xx/cxd56_ge2d.c
+++ b/arch/arm/src/cxd56xx/cxd56_ge2d.c
@@ -42,8 +42,9 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/irq.h>
+#include <nuttx/semaphore.h>
+
#include <queue.h>
-#include <semaphore.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 802297a..f54200b 100644
--- a/arch/arm/src/cxd56xx/cxd56_icc.c
+++ b/arch/arm/src/cxd56xx/cxd56_icc.c
@@ -42,8 +42,9 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/irq.h>
+#include <nuttx/semaphore.h>
+
#include <queue.h>
-#include <semaphore.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_scu.c b/arch/arm/src/cxd56xx/cxd56_scu.c
index 28721e9..f4cdb4d 100644
--- a/arch/arm/src/cxd56xx/cxd56_scu.c
+++ b/arch/arm/src/cxd56xx/cxd56_scu.c
@@ -40,12 +40,12 @@
#include <nuttx/config.h>
#include <nuttx/kmalloc.h>
#include <nuttx/irq.h>
+#include <nuttx/semaphore.h>
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_sdhci.c b/arch/arm/src/cxd56xx/cxd56_sdhci.c
index d4bf549..0e71ffe 100644
--- a/arch/arm/src/cxd56xx/cxd56_sdhci.c
+++ b/arch/arm/src/cxd56xx/cxd56_sdhci.c
@@ -44,7 +44,6 @@
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
@@ -59,6 +58,7 @@
#include <nuttx/mmcsd.h>
#include <nuttx/kmalloc.h>
#include <nuttx/irq.h>
+#include <nuttx/semaphore.h>
#include <arch/board/board.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_serial.c b/arch/arm/src/cxd56xx/cxd56_serial.c
index 2a31811..d6d2960 100644
--- a/arch/arm/src/cxd56xx/cxd56_serial.c
+++ b/arch/arm/src/cxd56xx/cxd56_serial.c
@@ -45,7 +45,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_sfc.c b/arch/arm/src/cxd56xx/cxd56_sfc.c
index 91c7c69..1c53725 100644
--- a/arch/arm/src/cxd56xx/cxd56_sfc.c
+++ b/arch/arm/src/cxd56xx/cxd56_sfc.c
@@ -37,7 +37,7 @@
#include <nuttx/arch.h>
#include <nuttx/mtd/mtd.h>
-#include <semaphore.h>
+
#include <stdint.h>
#include <string.h>
#include <errno.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_sph.c b/arch/arm/src/cxd56xx/cxd56_sph.c
index c08a317..83299f8 100644
--- a/arch/arm/src/cxd56xx/cxd56_sph.c
+++ b/arch/arm/src/cxd56xx/cxd56_sph.c
@@ -42,7 +42,8 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/irq.h>
-#include <semaphore.h>
+#include <nuttx/semaphore.h>
+
#include <stdio.h>
#include <stdint.h>
#include <string.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_spi.c b/arch/arm/src/cxd56xx/cxd56_spi.c
index 8d40e1e..7b57443 100644
--- a/arch/arm/src/cxd56xx/cxd56_spi.c
+++ b/arch/arm/src/cxd56xx/cxd56_spi.c
@@ -43,7 +43,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <string.h>
@@ -51,6 +50,7 @@
#include <arch/board/board.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
@@ -1315,7 +1315,7 @@ void cxd56_spi_dmaconfig(int port, int chtype, DMA_HANDLE handle,
if (!priv->dmaenable)
{
- sem_init(&priv->dmasem, 0, 0);
+ nxsem_init(&priv->dmasem, 0, 0);
priv->dmaenable = true;
}
}
@@ -1328,7 +1328,7 @@ void cxd56_spi_dmaconfig(int port, int chtype, DMA_HANDLE handle,
if (!priv->dmaenable)
{
- sem_init(&priv->dmasem, 0, 0);
+ nxsem_init(&priv->dmasem, 0, 0);
priv->dmaenable = true;
}
}
diff --git a/arch/arm/src/cxd56xx/cxd56_sysctl.c b/arch/arm/src/cxd56xx/cxd56_sysctl.c
index def7d5c..01ebda5 100644
--- a/arch/arm/src/cxd56xx/cxd56_sysctl.c
+++ b/arch/arm/src/cxd56xx/cxd56_sysctl.c
@@ -38,11 +38,12 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
#include <nuttx/fs/ioctl.h>
+#include <nuttx/semaphore.h>
+
#include <stdio.h>
#include <string.h>
#include <debug.h>
#include <errno.h>
-#include <semaphore.h>
#include "cxd56_icc.h"
#include "cxd56_sysctl.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_uart0.c b/arch/arm/src/cxd56xx/cxd56_uart0.c
index 3ca4943..2dcbb92 100644
--- a/arch/arm/src/cxd56xx/cxd56_uart0.c
+++ b/arch/arm/src/cxd56xx/cxd56_uart0.c
@@ -42,8 +42,9 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/irq.h>
+#include <nuttx/semaphore.h>
+
#include <queue.h>
-#include <semaphore.h>
#include <stdio.h>
#include <stdint.h>
#include <string.h>
diff --git a/arch/arm/src/cxd56xx/cxd56_udmac.c b/arch/arm/src/cxd56xx/cxd56_udmac.c
index 258c50a..47cac8f 100644
--- a/arch/arm/src/cxd56xx/cxd56_udmac.c
+++ b/arch/arm/src/cxd56xx/cxd56_udmac.c
@@ -44,12 +44,12 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "cxd56_clock.h"
diff --git a/arch/arm/src/dm320/dm320_serial.c b/arch/arm/src/dm320/dm320_serial.c
index 8492cf7..f45fc7a 100644
--- a/arch/arm/src/dm320/dm320_serial.c
+++ b/arch/arm/src/dm320/dm320_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c
index 888fdcb..25a9005b 100644
--- a/arch/arm/src/efm32/efm32_adc.c
+++ b/arch/arm/src/efm32/efm32_adc.c
@@ -47,7 +47,6 @@
#include <stdbool.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c
index 8bb9cb7..64db22d 100644
--- a/arch/arm/src/efm32/efm32_dma.c
+++ b/arch/arm/src/efm32/efm32_dma.c
@@ -42,12 +42,12 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "hardware/efm32_cmu.h"
diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c
index 74f6c37..7504aa0 100644
--- a/arch/arm/src/efm32/efm32_i2c.c
+++ b/arch/arm/src/efm32/efm32_i2c.c
@@ -65,7 +65,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c
index 3c48b5c..fcd8760 100644
--- a/arch/arm/src/efm32/efm32_leserial.c
+++ b/arch/arm/src/efm32/efm32_leserial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c
index db5c48a7..286f498 100644
--- a/arch/arm/src/efm32/efm32_serial.c
+++ b/arch/arm/src/efm32/efm32_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c
index 929c84a..9c4a619 100644
--- a/arch/arm/src/efm32/efm32_spi.c
+++ b/arch/arm/src/efm32/efm32_spi.c
@@ -44,7 +44,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c
index 0dbe111..347b592 100644
--- a/arch/arm/src/efm32/efm32_usbhost.c
+++ b/arch/arm/src/efm32/efm32_usbhost.c
@@ -44,7 +44,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/imx1/imx_serial.c b/arch/arm/src/imx1/imx_serial.c
index ab0f500..8bd3072 100644
--- a/arch/arm/src/imx1/imx_serial.c
+++ b/arch/arm/src/imx1/imx_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <fixedmath.h>
#include <errno.h>
diff --git a/arch/arm/src/imx1/imx_spi.c b/arch/arm/src/imx1/imx_spi.c
index 1374799..1296b54 100644
--- a/arch/arm/src/imx1/imx_spi.c
+++ b/arch/arm/src/imx1/imx_spi.c
@@ -41,7 +41,6 @@
#include <sys/types.h>
#include <stdint.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/imx6/imx_ecspi.c b/arch/arm/src/imx6/imx_ecspi.c
index a1631e3..97e53ad 100644
--- a/arch/arm/src/imx6/imx_ecspi.c
+++ b/arch/arm/src/imx6/imx_ecspi.c
@@ -46,7 +46,6 @@
#include <sys/types.h>
#include <stdint.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/imx6/imx_serial.c b/arch/arm/src/imx6/imx_serial.c
index 41bae86..d8ee7d2 100644
--- a/arch/arm/src/imx6/imx_serial.c
+++ b/arch/arm/src/imx6/imx_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
@@ -52,6 +51,7 @@
#include <nuttx/arch.h>
#include <nuttx/init.h>
#include <nuttx/fs/ioctl.h>
+#include <nuttx/semaphore.h>
#include <nuttx/serial/serial.h>
#include "chip.h"
diff --git a/arch/arm/src/imxrt/imxrt_edma.c b/arch/arm/src/imxrt/imxrt_edma.c
index 7d69c4a..c28b8fd 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 <semaphore.h>
#include <queue.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "up_internal.h"
diff --git a/arch/arm/src/imxrt/imxrt_ehci.c b/arch/arm/src/imxrt/imxrt_ehci.c
index 3005066..a01444d 100644
--- a/arch/arm/src/imxrt/imxrt_ehci.c
+++ b/arch/arm/src/imxrt/imxrt_ehci.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/imxrt/imxrt_enc.c b/arch/arm/src/imxrt/imxrt_enc.c
index b8463c1..336608f 100644
--- a/arch/arm/src/imxrt/imxrt_enc.c
+++ b/arch/arm/src/imxrt/imxrt_enc.c
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <assert.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.c b/arch/arm/src/imxrt/imxrt_lpi2c.c
index 2209f82..c1a2e08 100644
--- a/arch/arm/src/imxrt/imxrt_lpi2c.c
+++ b/arch/arm/src/imxrt/imxrt_lpi2c.c
@@ -44,7 +44,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/imxrt/imxrt_lpspi.c b/arch/arm/src/imxrt/imxrt_lpspi.c
index efd66b1..6cfa9af 100644
--- a/arch/arm/src/imxrt/imxrt_lpspi.c
+++ b/arch/arm/src/imxrt/imxrt_lpspi.c
@@ -68,7 +68,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/imxrt/imxrt_serial.c b/arch/arm/src/imxrt/imxrt_serial.c
index e05afd7..7d1e1bd 100644
--- a/arch/arm/src/imxrt/imxrt_serial.c
+++ b/arch/arm/src/imxrt/imxrt_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/imxrt/imxrt_usdhc.c b/arch/arm/src/imxrt/imxrt_usdhc.c
index 4debdd3..e98548b 100644
--- a/arch/arm/src/imxrt/imxrt_usdhc.c
+++ b/arch/arm/src/imxrt/imxrt_usdhc.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/kinetis/kinetis_lpserial.c b/arch/arm/src/kinetis/kinetis_lpserial.c
index 9c4d9dc..3b2cbcd 100644
--- a/arch/arm/src/kinetis/kinetis_lpserial.c
+++ b/arch/arm/src/kinetis/kinetis_lpserial.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index 4ebcd4d..3ae1fd4 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c
index b26eee2..09c06ad 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -45,7 +45,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/kinetis/kinetis_spi.c b/arch/arm/src/kinetis/kinetis_spi.c
index 4b0a75e..82f2412 100644
--- a/arch/arm/src/kinetis/kinetis_spi.c
+++ b/arch/arm/src/kinetis/kinetis_spi.c
@@ -68,7 +68,6 @@
#include <stdint.h>
#include <limits.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/kl/kl_serial.c b/arch/arm/src/kl/kl_serial.c
index 7fa7afe..7072286 100644
--- a/arch/arm/src/kl/kl_serial.c
+++ b/arch/arm/src/kl/kl_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c
index 33baeff..59c712e 100644
--- a/arch/arm/src/kl/kl_spi.c
+++ b/arch/arm/src/kl/kl_spi.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/lc823450/lc823450_adc.c b/arch/arm/src/lc823450/lc823450_adc.c
index 518651d..c6df309 100644
--- a/arch/arm/src/lc823450/lc823450_adc.c
+++ b/arch/arm/src/lc823450/lc823450_adc.c
@@ -47,7 +47,6 @@
#include <stdbool.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
@@ -61,6 +60,7 @@
#include <nuttx/fs/ioctl.h>
#include <nuttx/analog/adc.h>
#include <nuttx/analog/ioctl.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "lc823450_adc.h"
diff --git a/arch/arm/src/lc823450/lc823450_dma.c b/arch/arm/src/lc823450/lc823450_dma.c
index 9780264..bb52228 100644
--- a/arch/arm/src/lc823450/lc823450_dma.c
+++ b/arch/arm/src/lc823450/lc823450_dma.c
@@ -39,11 +39,11 @@
#include <nuttx/config.h>
#include <nuttx/kmalloc.h>
+#include <nuttx/semaphore.h>
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/lc823450/lc823450_i2c.c b/arch/arm/src/lc823450/lc823450_i2c.c
index 62e1ed3..2d14b91 100644
--- a/arch/arm/src/lc823450/lc823450_i2c.c
+++ b/arch/arm/src/lc823450/lc823450_i2c.c
@@ -46,7 +46,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lc823450/lc823450_i2s.c b/arch/arm/src/lc823450/lc823450_i2s.c
index d55a61d..e04bf4f 100644
--- a/arch/arm/src/lc823450/lc823450_i2s.c
+++ b/arch/arm/src/lc823450/lc823450_i2s.c
@@ -40,7 +40,6 @@
#include <arch/board/board.h>
#include <nuttx/config.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lc823450/lc823450_mtd.c b/arch/arm/src/lc823450/lc823450_mtd.c
index db4b499..4e26b64 100644
--- a/arch/arm/src/lc823450/lc823450_mtd.c
+++ b/arch/arm/src/lc823450/lc823450_mtd.c
@@ -48,11 +48,11 @@
#include <assert.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/mtd/mtd.h>
+#include <nuttx/semaphore.h>
#include <arch/board/board.h>
#include "lc823450_mtd.h"
diff --git a/arch/arm/src/lc823450/lc823450_sddrv_dep.c b/arch/arm/src/lc823450/lc823450_sddrv_dep.c
index 06b27b3..4ebe294 100644
--- a/arch/arm/src/lc823450/lc823450_sddrv_dep.c
+++ b/arch/arm/src/lc823450/lc823450_sddrv_dep.c
@@ -42,7 +42,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
@@ -51,6 +50,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
#include <nuttx/clock.h>
+#include <nuttx/semaphore.h>
#include <nuttx/signal.h>
#include "up_arch.h"
@@ -62,7 +62,6 @@
#include "lc823450_timer.h"
#ifdef CONFIG_LC823450_SDC_DMA
-# include <semaphore.h>
# include "lc823450_dma.h"
#endif /* CONFIG_LC823450_SDC_DMA */
diff --git a/arch/arm/src/lc823450/lc823450_serial.c b/arch/arm/src/lc823450/lc823450_serial.c
index a518ea7..781a9ff 100644
--- a/arch/arm/src/lc823450/lc823450_serial.c
+++ b/arch/arm/src/lc823450/lc823450_serial.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
@@ -53,6 +52,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/fs/ioctl.h>
+#include <nuttx/semaphore.h>
#include <nuttx/serial/serial.h>
#include <arch/board/board.h>
diff --git a/arch/arm/src/lc823450/lc823450_spi.c b/arch/arm/src/lc823450/lc823450_spi.c
index df0aff7..cd77975 100644
--- a/arch/arm/src/lc823450/lc823450_spi.c
+++ b/arch/arm/src/lc823450/lc823450_spi.c
@@ -44,12 +44,12 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_arch.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c
index 9c4bde7..6ba1d44 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c
@@ -49,7 +49,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
index c3a0154..e7888ac 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
@@ -50,7 +50,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
index 158d59e..e9f2069 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
@@ -48,7 +48,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c
index 0651bc6..15c69b0 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c
@@ -42,13 +42,13 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
index 9bcd260..5e087aa 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c
index 26c1689..8f8e03c 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c
index 76f5cbb..0d367ad 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c
@@ -43,13 +43,13 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c
index f6ab07c..48f6c7c 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c
@@ -42,13 +42,13 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c
index 682c170..3dcd11a 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c
@@ -45,7 +45,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c
index af29938..26c7642 100644
--- a/arch/arm/src/lpc214x/lpc214x_serial.c
+++ b/arch/arm/src/lpc214x/lpc214x_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c
index 32c5c16..e9fd113 100644
--- a/arch/arm/src/lpc2378/lpc23xx_serial.c
+++ b/arch/arm/src/lpc2378/lpc23xx_serial.c
@@ -49,7 +49,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc2378/lpc23xx_spi.c b/arch/arm/src/lpc2378/lpc23xx_spi.c
index c1e3bfd..251b9bf 100644
--- a/arch/arm/src/lpc2378/lpc23xx_spi.c
+++ b/arch/arm/src/lpc2378/lpc23xx_spi.c
@@ -47,13 +47,13 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index 7e778e8..1c351b3 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c
index a4f93d5..3ca5ae0 100644
--- a/arch/arm/src/lpc31xx/lpc31_serial.c
+++ b/arch/arm/src/lpc31xx/lpc31_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc31xx/lpc31_spi.c b/arch/arm/src/lpc31xx/lpc31_spi.c
index e9b4906..48bb1ea 100644
--- a/arch/arm/src/lpc31xx/lpc31_spi.c
+++ b/arch/arm/src/lpc31xx/lpc31_spi.c
@@ -43,11 +43,11 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include <arch/board/board.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_adc.c b/arch/arm/src/lpc43xx/lpc43_adc.c
index 921364d..52ae52b 100644
--- a/arch/arm/src/lpc43xx/lpc43_adc.c
+++ b/arch/arm/src/lpc43xx/lpc43_adc.c
@@ -54,7 +54,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_aes.c b/arch/arm/src/lpc43xx/lpc43_aes.c
index da22ed2..e231a99 100644
--- a/arch/arm/src/lpc43xx/lpc43_aes.c
+++ b/arch/arm/src/lpc43xx/lpc43_aes.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_can.c b/arch/arm/src/lpc43xx/lpc43_can.c
index b744609..e210c56 100644
--- a/arch/arm/src/lpc43xx/lpc43_can.c
+++ b/arch/arm/src/lpc43xx/lpc43_can.c
@@ -41,7 +41,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_dac.c b/arch/arm/src/lpc43xx/lpc43_dac.c
index 582c8f6..4a19d89 100644
--- a/arch/arm/src/lpc43xx/lpc43_dac.c
+++ b/arch/arm/src/lpc43xx/lpc43_dac.c
@@ -53,7 +53,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c
index 6999614..3c652e8 100644
--- a/arch/arm/src/lpc43xx/lpc43_ehci.c
+++ b/arch/arm/src/lpc43xx/lpc43_ehci.c
@@ -42,7 +42,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.c b/arch/arm/src/lpc43xx/lpc43_sdmmc.c
index ff5ce44..09fae53 100644
--- a/arch/arm/src/lpc43xx/lpc43_sdmmc.c
+++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.c
@@ -47,7 +47,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c
index 664aa74..8344e1a 100644
--- a/arch/arm/src/lpc43xx/lpc43_serial.c
+++ b/arch/arm/src/lpc43xx/lpc43_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c
index c8c5a96..dcd6474 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spi.c
@@ -42,12 +42,12 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c
index fe5433b..1370cab 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.c
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.c
@@ -42,13 +42,13 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
index bf3952d..5823344 100644
--- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c
+++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
@@ -52,7 +52,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc54xx/lpc54_serial.c b/arch/arm/src/lpc54xx/lpc54_serial.c
index 2c93bae..701e699 100644
--- a/arch/arm/src/lpc54xx/lpc54_serial.c
+++ b/arch/arm/src/lpc54xx/lpc54_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/lpc54xx/lpc54_spi_master.c b/arch/arm/src/lpc54xx/lpc54_spi_master.c
index dd2755d..99821ae 100644
--- a/arch/arm/src/lpc54xx/lpc54_spi_master.c
+++ b/arch/arm/src/lpc54xx/lpc54_spi_master.c
@@ -52,12 +52,12 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c
index 6582216..64f28ba 100644
--- a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c
+++ b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c
@@ -44,7 +44,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/max326xx/max32660/max32660_serial.c b/arch/arm/src/max326xx/max32660/max32660_serial.c
index c61f4dc..e951bc2 100644
--- a/arch/arm/src/max326xx/max32660/max32660_serial.c
+++ b/arch/arm/src/max326xx/max32660/max32660_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/max326xx/max32660/max32660_spim.c b/arch/arm/src/max326xx/max32660/max32660_spim.c
index cf7fbc2..29fd55d 100644
--- a/arch/arm/src/max326xx/max32660/max32660_spim.c
+++ b/arch/arm/src/max326xx/max32660/max32660_spim.c
@@ -66,7 +66,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/nrf52/nrf52832_errdata.c b/arch/arm/src/nrf52/nrf52832_errdata.c
index ee0f792..128da9a 100644
--- a/arch/arm/src/nrf52/nrf52832_errdata.c
+++ b/arch/arm/src/nrf52/nrf52832_errdata.c
@@ -47,7 +47,6 @@
#include <nuttx/fs/fs.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/drivers/drivers.h>
diff --git a/arch/arm/src/nrf52/nrf52_i2c.c b/arch/arm/src/nrf52/nrf52_i2c.c
index d5291f3..679f462 100644
--- a/arch/arm/src/nrf52/nrf52_i2c.c
+++ b/arch/arm/src/nrf52/nrf52_i2c.c
@@ -41,7 +41,6 @@
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
diff --git a/arch/arm/src/nrf52/nrf52_serial.c b/arch/arm/src/nrf52/nrf52_serial.c
index 70c8e76..0630607 100644
--- a/arch/arm/src/nrf52/nrf52_serial.c
+++ b/arch/arm/src/nrf52/nrf52_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/nrf52/nrf52_spi.c b/arch/arm/src/nrf52/nrf52_spi.c
index c5a1aaa..4cff4ff 100644
--- a/arch/arm/src/nrf52/nrf52_spi.c
+++ b/arch/arm/src/nrf52/nrf52_spi.c
@@ -480,24 +480,11 @@ static int nrf52_spi_lock(FAR struct spi_dev_s *dev, bool lock)
if (lock)
{
- /* Take the semaphore (perhaps waiting) */
-
- do
- {
- ret = nxsem_wait(&priv->exclsem);
-
- /* The only case that an error should occur here is if the wait
- * was awakened by a signal.
- */
-
- DEBUGASSERT(ret == OK || ret == -EINTR);
- }
- while (ret == -EINTR);
+ ret = nxsem_wait_uninterruptible(&priv->exclsem);
}
else
{
- (void)nxsem_post(&priv->exclsem);
- ret = OK;
+ ret = nxsem_post(&priv->exclsem);
}
return ret;
diff --git a/arch/arm/src/nuc1xx/nuc_serial.c b/arch/arm/src/nuc1xx/nuc_serial.c
index 797920f..a56ab6e 100644
--- a/arch/arm/src/nuc1xx/nuc_serial.c
+++ b/arch/arm/src/nuc1xx/nuc_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/s32k1xx/s32k1xx_edma.c b/arch/arm/src/s32k1xx/s32k1xx_edma.c
index 2efaf4b..1726940 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_edma.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_edma.c
@@ -49,13 +49,13 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <queue.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "up_internal.h"
diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c b/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c
index eff2fad..1356972 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c
@@ -44,7 +44,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpspi.c b/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
index 5c79610..f9e7d1e 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
@@ -67,7 +67,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/s32k1xx/s32k1xx_serial.c b/arch/arm/src/s32k1xx/s32k1xx_serial.c
index 678383f..041915f 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_serial.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/sam34/sam4cm_tc.c b/arch/arm/src/sam34/sam4cm_tc.c
index 6141803..91050f7 100644
--- a/arch/arm/src/sam34/sam4cm_tc.c
+++ b/arch/arm/src/sam34/sam4cm_tc.c
@@ -53,12 +53,12 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <arch/board/board.h>
#include "up_arch.h"
diff --git a/arch/arm/src/sam34/sam_aes.c b/arch/arm/src/sam34/sam_aes.c
index 3eabf7f..cee3d83 100644
--- a/arch/arm/src/sam34/sam_aes.c
+++ b/arch/arm/src/sam34/sam_aes.c
@@ -43,12 +43,12 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/crypto/crypto.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <arch/board/board.h>
#include "up_internal.h"
diff --git a/arch/arm/src/sam34/sam_dmac.c b/arch/arm/src/sam34/sam_dmac.c
index 892a659..f8f1995 100644
--- a/arch/arm/src/sam34/sam_dmac.c
+++ b/arch/arm/src/sam34/sam_dmac.c
@@ -43,12 +43,12 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "up_internal.h"
diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c
index 483c8f3..064e334 100644
--- a/arch/arm/src/sam34/sam_hsmci.c
+++ b/arch/arm/src/sam34/sam_hsmci.c
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/sam34/sam_serial.c b/arch/arm/src/sam34/sam_serial.c
index a54c970..00dae5b 100644
--- a/arch/arm/src/sam34/sam_serial.c
+++ b/arch/arm/src/sam34/sam_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c
index d0aaa7d..53b7915 100644
--- a/arch/arm/src/sam34/sam_spi.c
+++ b/arch/arm/src/sam34/sam_spi.c
@@ -46,7 +46,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/sama5/sam_adc.c b/arch/arm/src/sama5/sam_adc.c
index cbb3ec6..9b0fcfe 100644
--- a/arch/arm/src/sama5/sam_adc.c
+++ b/arch/arm/src/sama5/sam_adc.c
@@ -55,7 +55,6 @@
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
@@ -66,6 +65,7 @@
#include <nuttx/wqueue.h>
#include <nuttx/analog/adc.h>
#include <nuttx/analog/ioctl.h>
+#include <nuttx/semaphore.h>
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/sama5/sam_can.c b/arch/arm/src/sama5/sam_can.c
index fb60e08..874c059 100644
--- a/arch/arm/src/sama5/sam_can.c
+++ b/arch/arm/src/sama5/sam_can.c
@@ -54,13 +54,13 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/arch.h>
#include <nuttx/can/can.h>
+#include <nuttx/semaphore.h>
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/sama5/sam_dbgu.c b/arch/arm/src/sama5/sam_dbgu.c
index 81294c4..ce0dca1 100644
--- a/arch/arm/src/sama5/sam_dbgu.c
+++ b/arch/arm/src/sama5/sam_dbgu.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c
index 54c7d94..22834d8 100644
--- a/arch/arm/src/sama5/sam_dmac.c
+++ b/arch/arm/src/sama5/sam_dmac.c
@@ -42,12 +42,12 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "up_internal.h"
diff --git a/arch/arm/src/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c
index b2b3050..8f933d1 100644
--- a/arch/arm/src/sama5/sam_ehci.c
+++ b/arch/arm/src/sama5/sam_ehci.c
@@ -42,7 +42,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/sama5/sam_flexcom_serial.c b/arch/arm/src/sama5/sam_flexcom_serial.c
index 54076ca..b9645c3 100644
--- a/arch/arm/src/sama5/sam_flexcom_serial.c
+++ b/arch/arm/src/sama5/sam_flexcom_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c
index f51c184..b4116fa 100644
--- a/arch/arm/src/sama5/sam_hsmci.c
+++ b/arch/arm/src/sama5/sam_hsmci.c
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/sama5/sam_nand.c b/arch/arm/src/sama5/sam_nand.c
index d6219f8..230b054 100644
--- a/arch/arm/src/sama5/sam_nand.c
+++ b/arch/arm/src/sama5/sam_nand.c
@@ -52,13 +52,11 @@
#include <sys/types.h>
#include <stdint.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
#include <nuttx/arch.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/mtd/mtd.h>
#include <nuttx/mtd/nand.h>
diff --git a/arch/arm/src/sama5/sam_nand.h b/arch/arm/src/sama5/sam_nand.h
index 6d7101a..2f6c70a 100644
--- a/arch/arm/src/sama5/sam_nand.h
+++ b/arch/arm/src/sama5/sam_nand.h
@@ -45,10 +45,10 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <debug.h>
#include <nuttx/mtd/nand_raw.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "chip.h"
diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c
index fb3da59..24c16ee 100644
--- a/arch/arm/src/sama5/sam_ohci.c
+++ b/arch/arm/src/sama5/sam_ohci.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/sama5/sam_pmecc.c b/arch/arm/src/sama5/sam_pmecc.c
index f9b6661..b3d7d7b 100644
--- a/arch/arm/src/sama5/sam_pmecc.c
+++ b/arch/arm/src/sama5/sam_pmecc.c
@@ -52,13 +52,13 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/mtd/nand_model.h>
#include <nuttx/mtd/nand_scheme.h>
+#include <nuttx/semaphore.h>
#include "sam_pmecc.h"
#include "sam_nand.h"
diff --git a/arch/arm/src/sama5/sam_serial.c b/arch/arm/src/sama5/sam_serial.c
index 4b1e3b5..0338862 100644
--- a/arch/arm/src/sama5/sam_serial.c
+++ b/arch/arm/src/sama5/sam_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
@@ -55,6 +54,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/fs/ioctl.h>
+#include <nuttx/semaphore.h>
#include <nuttx/serial/serial.h>
#include <arch/board/board.h>
diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c
index a1058c4..f6da1fa 100644
--- a/arch/arm/src/sama5/sam_spi.c
+++ b/arch/arm/src/sama5/sam_spi.c
@@ -49,7 +49,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c
index a01bc11..b4750d1 100644
--- a/arch/arm/src/sama5/sam_ssc.c
+++ b/arch/arm/src/sama5/sam_ssc.c
@@ -44,7 +44,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <queue.h>
@@ -59,6 +58,7 @@
#include <nuttx/wqueue.h>
#include <nuttx/audio/audio.h>
#include <nuttx/audio/i2s.h>
+#include <nuttx/semaphore.h>
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/sama5/sam_tc.c b/arch/arm/src/sama5/sam_tc.c
index ef104c1..f219207 100644
--- a/arch/arm/src/sama5/sam_tc.c
+++ b/arch/arm/src/sama5/sam_tc.c
@@ -53,12 +53,12 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <arch/board/board.h>
#include "up_arch.h"
diff --git a/arch/arm/src/sama5/sam_trng.c b/arch/arm/src/sama5/sam_trng.c
index 8b4cb77..6ba33ff 100644
--- a/arch/arm/src/sama5/sam_trng.c
+++ b/arch/arm/src/sama5/sam_trng.c
@@ -52,9 +52,9 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/drivers/drivers.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "up_internal.h"
diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c
index 7d2952a..0f44420 100644
--- a/arch/arm/src/sama5/sam_tsd.c
+++ b/arch/arm/src/sama5/sam_tsd.c
@@ -54,7 +54,6 @@
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <poll.h>
#include <errno.h>
diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c
index 490353e..2467c63 100644
--- a/arch/arm/src/sama5/sam_xdmac.c
+++ b/arch/arm/src/sama5/sam_xdmac.c
@@ -42,12 +42,12 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "up_internal.h"
diff --git a/arch/arm/src/samd2l2/sam_adc.c b/arch/arm/src/samd2l2/sam_adc.c
index bf626fd..9467c00 100644
--- a/arch/arm/src/samd2l2/sam_adc.c
+++ b/arch/arm/src/samd2l2/sam_adc.c
@@ -45,14 +45,12 @@
#include <stdbool.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/signal.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/analog/adc.h>
#include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/samd2l2/sam_dmac.c b/arch/arm/src/samd2l2/sam_dmac.c
index 799c3ca..5ee49f9 100644
--- a/arch/arm/src/samd2l2/sam_dmac.c
+++ b/arch/arm/src/samd2l2/sam_dmac.c
@@ -42,12 +42,12 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "up_internal.h"
diff --git a/arch/arm/src/samd2l2/sam_serial.c b/arch/arm/src/samd2l2/sam_serial.c
index dbf57a4..95f23c3 100644
--- a/arch/arm/src/samd2l2/sam_serial.c
+++ b/arch/arm/src/samd2l2/sam_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/samd2l2/sam_spi.c b/arch/arm/src/samd2l2/sam_spi.c
index 230ac61..a92975b 100644
--- a/arch/arm/src/samd2l2/sam_spi.c
+++ b/arch/arm/src/samd2l2/sam_spi.c
@@ -48,7 +48,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
@@ -57,6 +56,7 @@
#include <nuttx/arch.h>
#include <nuttx/wdog.h>
#include <nuttx/clock.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
diff --git a/arch/arm/src/samd5e5/sam_dmac.c b/arch/arm/src/samd5e5/sam_dmac.c
index 1b6b69b..cdbf6fe 100644
--- a/arch/arm/src/samd5e5/sam_dmac.c
+++ b/arch/arm/src/samd5e5/sam_dmac.c
@@ -42,12 +42,12 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <arch/samd5e5/chip.h>
#include "up_arch.h"
diff --git a/arch/arm/src/samd5e5/sam_serial.c b/arch/arm/src/samd5e5/sam_serial.c
index 7afeeed..880dfb5 100644
--- a/arch/arm/src/samd5e5/sam_serial.c
+++ b/arch/arm/src/samd5e5/sam_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/samd5e5/sam_spi.c b/arch/arm/src/samd5e5/sam_spi.c
index 8edb2e3..ad61eaa 100644
--- a/arch/arm/src/samd5e5/sam_spi.c
+++ b/arch/arm/src/samd5e5/sam_spi.c
@@ -44,7 +44,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
@@ -53,6 +52,7 @@
#include <nuttx/arch.h>
#include <nuttx/wdog.h>
#include <nuttx/clock.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
diff --git a/arch/arm/src/samv7/sam_dac.c b/arch/arm/src/samv7/sam_dac.c
index 1cf795d..6c61c75 100644
--- a/arch/arm/src/samv7/sam_dac.c
+++ b/arch/arm/src/samv7/sam_dac.c
@@ -42,7 +42,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c
index dda5464..59b7894 100644
--- a/arch/arm/src/samv7/sam_hsmci.c
+++ b/arch/arm/src/samv7/sam_hsmci.c
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c
index ab67d5f..e36a9a3 100644
--- a/arch/arm/src/samv7/sam_mcan.c
+++ b/arch/arm/src/samv7/sam_mcan.c
@@ -48,7 +48,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/samv7/sam_progmem.c b/arch/arm/src/samv7/sam_progmem.c
index de8feda..8045869 100644
--- a/arch/arm/src/samv7/sam_progmem.c
+++ b/arch/arm/src/samv7/sam_progmem.c
@@ -40,10 +40,10 @@
#include <nuttx/config.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <arch/samv7/chip.h>
#include "up_arch.h"
diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c
index 5197cff..1be3523 100644
--- a/arch/arm/src/samv7/sam_qspi.c
+++ b/arch/arm/src/samv7/sam_qspi.c
@@ -44,7 +44,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/samv7/sam_serial.c b/arch/arm/src/samv7/sam_serial.c
index c57bc55..170b814 100644
--- a/arch/arm/src/samv7/sam_serial.c
+++ b/arch/arm/src/samv7/sam_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c
index bbcaf64..118f86d 100644
--- a/arch/arm/src/samv7/sam_spi.c
+++ b/arch/arm/src/samv7/sam_spi.c
@@ -45,7 +45,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c
index b0605e8..6b53aef 100644
--- a/arch/arm/src/samv7/sam_spi_slave.c
+++ b/arch/arm/src/samv7/sam_spi_slave.c
@@ -42,7 +42,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
@@ -50,6 +49,7 @@
#include <nuttx/arch.h>
#include <nuttx/kmalloc.h>
#include <nuttx/irq.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/slave.h>
#include "up_arch.h"
diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c
index 9cf024d..4c2987c 100644
--- a/arch/arm/src/samv7/sam_ssc.c
+++ b/arch/arm/src/samv7/sam_ssc.c
@@ -44,7 +44,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <queue.h>
@@ -59,6 +58,7 @@
#include <nuttx/wqueue.h>
#include <nuttx/audio/audio.h>
#include <nuttx/audio/i2s.h>
+#include <nuttx/semaphore.h>
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/samv7/sam_tc.c b/arch/arm/src/samv7/sam_tc.c
index 1e68215..b153d52 100644
--- a/arch/arm/src/samv7/sam_tc.c
+++ b/arch/arm/src/samv7/sam_tc.c
@@ -54,12 +54,12 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <arch/board/board.h>
#include "up_arch.h"
diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c
index 24e4d5f..79bb300 100644
--- a/arch/arm/src/samv7/sam_xdmac.c
+++ b/arch/arm/src/samv7/sam_xdmac.c
@@ -42,12 +42,12 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <arch/samv7/chip.h>
#include "up_arch.h"
diff --git a/arch/arm/src/stm32/stm32_1wire.c b/arch/arm/src/stm32/stm32_1wire.c
index fe2a1d6..ddd9e04 100644
--- a/arch/arm/src/stm32/stm32_1wire.c
+++ b/arch/arm/src/stm32/stm32_1wire.c
@@ -48,7 +48,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c
index f1f3cf3..c911231 100644
--- a/arch/arm/src/stm32/stm32_adc.c
+++ b/arch/arm/src/stm32/stm32_adc.c
@@ -49,7 +49,6 @@
#include <stdbool.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
@@ -60,6 +59,7 @@
#include <nuttx/arch.h>
#include <nuttx/analog/adc.h>
#include <nuttx/analog/ioctl.h>
+#include <nuttx/semaphore.h>
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/stm32/stm32_aes.c b/arch/arm/src/stm32/stm32_aes.c
index 7115bdf..d37c413 100644
--- a/arch/arm/src/stm32/stm32_aes.c
+++ b/arch/arm/src/stm32/stm32_aes.c
@@ -43,13 +43,13 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/crypto/crypto.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <arch/board/board.h>
#include "up_internal.h"
diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c
index 1f3a4cf..6a3863d 100644
--- a/arch/arm/src/stm32/stm32_can.c
+++ b/arch/arm/src/stm32/stm32_can.c
@@ -46,7 +46,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_capture.c b/arch/arm/src/stm32/stm32_capture.c
index 9d6089b..f2077e6 100644
--- a/arch/arm/src/stm32/stm32_capture.c
+++ b/arch/arm/src/stm32/stm32_capture.c
@@ -44,7 +44,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_dac.c b/arch/arm/src/stm32/stm32_dac.c
index 41e7b46..5368a14 100644
--- a/arch/arm/src/stm32/stm32_dac.c
+++ b/arch/arm/src/stm32/stm32_dac.c
@@ -46,7 +46,6 @@
#include <stdbool.h>
#include <string.h>
#include <math.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_dma2d.c b/arch/arm/src/stm32/stm32_dma2d.c
index 5b67a62..d0a2697 100644
--- a/arch/arm/src/stm32/stm32_dma2d.c
+++ b/arch/arm/src/stm32/stm32_dma2d.c
@@ -46,7 +46,6 @@
#include <string.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <nuttx/irq.h>
#include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/stm32/stm32_dma_v1.c b/arch/arm/src/stm32/stm32_dma_v1.c
index 600b075..8dce8b7 100644
--- a/arch/arm/src/stm32/stm32_dma_v1.c
+++ b/arch/arm/src/stm32/stm32_dma_v1.c
@@ -41,12 +41,12 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "up_internal.h"
diff --git a/arch/arm/src/stm32/stm32_dma_v2.c b/arch/arm/src/stm32/stm32_dma_v2.c
index d8c9723..329c2ed 100644
--- a/arch/arm/src/stm32/stm32_dma_v2.c
+++ b/arch/arm/src/stm32/stm32_dma_v2.c
@@ -41,12 +41,12 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "up_internal.h"
diff --git a/arch/arm/src/stm32/stm32_hciuart.c b/arch/arm/src/stm32/stm32_hciuart.c
index bf0ec80..51d9301 100644
--- a/arch/arm/src/stm32/stm32_hciuart.c
+++ b/arch/arm/src/stm32/stm32_hciuart.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c
index 2100d2f..a12e835 100644
--- a/arch/arm/src/stm32/stm32_i2c.c
+++ b/arch/arm/src/stm32/stm32_i2c.c
@@ -78,7 +78,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_i2c_alt.c b/arch/arm/src/stm32/stm32_i2c_alt.c
index ad35866..9f7a8a3 100644
--- a/arch/arm/src/stm32/stm32_i2c_alt.c
+++ b/arch/arm/src/stm32/stm32_i2c_alt.c
@@ -85,7 +85,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_i2c_v2.c b/arch/arm/src/stm32/stm32_i2c_v2.c
index 47f74fd..46ae6de 100644
--- a/arch/arm/src/stm32/stm32_i2c_v2.c
+++ b/arch/arm/src/stm32/stm32_i2c_v2.c
@@ -221,7 +221,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_i2s.c b/arch/arm/src/stm32/stm32_i2s.c
index c0d9994..ac5af48 100644
--- a/arch/arm/src/stm32/stm32_i2s.c
+++ b/arch/arm/src/stm32/stm32_i2s.c
@@ -64,13 +64,13 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <queue.h>
#include <debug.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include <arch/board/board.h>
diff --git a/arch/arm/src/stm32/stm32_ltdc.h b/arch/arm/src/stm32/stm32_ltdc.h
index c35cc68..d224adf 100644
--- a/arch/arm/src/stm32/stm32_ltdc.h
+++ b/arch/arm/src/stm32/stm32_ltdc.h
@@ -44,7 +44,6 @@
#include <nuttx/config.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <nuttx/video/fb.h>
#include <nuttx/nx/nxglib.h>
diff --git a/arch/arm/src/stm32/stm32_otgfshost.c b/arch/arm/src/stm32/stm32_otgfshost.c
index da3245c..9d55997 100644
--- a/arch/arm/src/stm32/stm32_otgfshost.c
+++ b/arch/arm/src/stm32/stm32_otgfshost.c
@@ -44,7 +44,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_otghshost.c b/arch/arm/src/stm32/stm32_otghshost.c
index 76fa756..9e992a9 100644
--- a/arch/arm/src/stm32/stm32_otghshost.c
+++ b/arch/arm/src/stm32/stm32_otghshost.c
@@ -44,7 +44,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_sdadc.c b/arch/arm/src/stm32/stm32_sdadc.c
index a7f1fa0..281df35 100644
--- a/arch/arm/src/stm32/stm32_sdadc.c
+++ b/arch/arm/src/stm32/stm32_sdadc.c
@@ -49,7 +49,6 @@
#include <stdbool.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c
index 0f9a754..6607b7b 100644
--- a/arch/arm/src/stm32/stm32_sdio.c
+++ b/arch/arm/src/stm32/stm32_sdio.c
@@ -42,7 +42,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c
index c1075d5..c7efe3c 100644
--- a/arch/arm/src/stm32/stm32_serial.c
+++ b/arch/arm/src/stm32/stm32_serial.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c
index 930c4be..8a636f4 100644
--- a/arch/arm/src/stm32/stm32_spi.c
+++ b/arch/arm/src/stm32/stm32_spi.c
@@ -64,7 +64,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32_tim.c b/arch/arm/src/stm32/stm32_tim.c
index bacc0e1..91944cb 100644
--- a/arch/arm/src/stm32/stm32_tim.c
+++ b/arch/arm/src/stm32/stm32_tim.c
@@ -49,7 +49,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32f10xxf30xx_flash.c b/arch/arm/src/stm32/stm32f10xxf30xx_flash.c
index 5e79fae..8af8e7c 100644
--- a/arch/arm/src/stm32/stm32f10xxf30xx_flash.c
+++ b/arch/arm/src/stm32/stm32f10xxf30xx_flash.c
@@ -47,9 +47,9 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/arch/arm/src/stm32/stm32f20xxf40xx_flash.c b/arch/arm/src/stm32/stm32f20xxf40xx_flash.c
index 83c88a0..f43ff48 100644
--- a/arch/arm/src/stm32/stm32f20xxf40xx_flash.c
+++ b/arch/arm/src/stm32/stm32f20xxf40xx_flash.c
@@ -47,9 +47,9 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/arch/arm/src/stm32/stm32f40xxx_i2c.c b/arch/arm/src/stm32/stm32f40xxx_i2c.c
index 90b6c10..2a3028d 100644
--- a/arch/arm/src/stm32/stm32f40xxx_i2c.c
+++ b/arch/arm/src/stm32/stm32f40xxx_i2c.c
@@ -77,7 +77,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32/stm32l15xx_flash.c b/arch/arm/src/stm32/stm32l15xx_flash.c
index 67b7dda..672112e 100644
--- a/arch/arm/src/stm32/stm32l15xx_flash.c
+++ b/arch/arm/src/stm32/stm32l15xx_flash.c
@@ -50,9 +50,9 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/arch/arm/src/stm32f0l0g0/stm32_adc.c b/arch/arm/src/stm32f0l0g0/stm32_adc.c
index ef8019e..88aa511 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_adc.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_adc.c
@@ -45,7 +45,6 @@
#include <stdbool.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
@@ -56,6 +55,7 @@
#include <nuttx/arch.h>
#include <nuttx/analog/adc.h>
#include <nuttx/analog/ioctl.h>
+#include <nuttx/semaphore.h>
#include "up_internal.h"
#include "up_arch.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_aes.c b/arch/arm/src/stm32f0l0g0/stm32_aes.c
index 70284a0..73bffb7 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_aes.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_aes.c
@@ -43,13 +43,13 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/crypto/crypto.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <arch/board/board.h>
#include "up_internal.h"
diff --git a/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c b/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c
index 6ff4061..c7e74d7 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c
@@ -42,12 +42,12 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <arch/chip/chip.h>
diff --git a/arch/arm/src/stm32f0l0g0/stm32_i2c.c b/arch/arm/src/stm32f0l0g0/stm32_i2c.c
index edcf891..c4e3b11 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_i2c.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_i2c.c
@@ -221,7 +221,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c b/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c
index 66d40c4..5bbbf35 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c b/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c
index 66e5e87..db90e59 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f0l0g0/stm32_spi.c b/arch/arm/src/stm32f0l0g0/stm32_spi.c
index 69aefae..fb782f1 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_spi.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_spi.c
@@ -72,7 +72,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f0l0g0/stm32_tim.c b/arch/arm/src/stm32f0l0g0/stm32_tim.c
index 2f68ee0..ed0821c 100644
--- a/arch/arm/src/stm32f0l0g0/stm32_tim.c
+++ b/arch/arm/src/stm32f0l0g0/stm32_tim.c
@@ -44,7 +44,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f7/stm32_adc.c b/arch/arm/src/stm32f7/stm32_adc.c
index 7262f8c..50fd4ef 100644
--- a/arch/arm/src/stm32f7/stm32_adc.c
+++ b/arch/arm/src/stm32f7/stm32_adc.c
@@ -52,7 +52,6 @@
#include <stdbool.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f7/stm32_can.c b/arch/arm/src/stm32f7/stm32_can.c
index bc5606c..31092b5 100644
--- a/arch/arm/src/stm32f7/stm32_can.c
+++ b/arch/arm/src/stm32f7/stm32_can.c
@@ -46,7 +46,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f7/stm32_capture.c b/arch/arm/src/stm32f7/stm32_capture.c
index faf2cf8..3f8cead 100644
--- a/arch/arm/src/stm32f7/stm32_capture.c
+++ b/arch/arm/src/stm32f7/stm32_capture.c
@@ -44,7 +44,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c
index 092aa1a..4a4f252 100644
--- a/arch/arm/src/stm32f7/stm32_dma.c
+++ b/arch/arm/src/stm32f7/stm32_dma.c
@@ -42,12 +42,12 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <arch/stm32f7/chip.h>
#include "up_arch.h"
diff --git a/arch/arm/src/stm32f7/stm32_dma2d.c b/arch/arm/src/stm32f7/stm32_dma2d.c
index 26d634a..713742c 100644
--- a/arch/arm/src/stm32f7/stm32_dma2d.c
+++ b/arch/arm/src/stm32f7/stm32_dma2d.c
@@ -46,7 +46,6 @@
#include <string.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <nuttx/irq.h>
#include <nuttx/kmalloc.h>
diff --git a/arch/arm/src/stm32f7/stm32_flash.c b/arch/arm/src/stm32f7/stm32_flash.c
index 075a395..68f583d 100644
--- a/arch/arm/src/stm32f7/stm32_flash.c
+++ b/arch/arm/src/stm32f7/stm32_flash.c
@@ -52,9 +52,9 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/arch/arm/src/stm32f7/stm32_i2c.c b/arch/arm/src/stm32f7/stm32_i2c.c
index 2a3cfcb..7629b9a 100644
--- a/arch/arm/src/stm32f7/stm32_i2c.c
+++ b/arch/arm/src/stm32f7/stm32_i2c.c
@@ -233,7 +233,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f7/stm32_ltdc.h b/arch/arm/src/stm32f7/stm32_ltdc.h
index 27dcd79..c2cebe4 100644
--- a/arch/arm/src/stm32f7/stm32_ltdc.h
+++ b/arch/arm/src/stm32f7/stm32_ltdc.h
@@ -44,7 +44,6 @@
#include <nuttx/config.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <nuttx/video/fb.h>
#include <nuttx/nx/nxglib.h>
diff --git a/arch/arm/src/stm32f7/stm32_otghost.c b/arch/arm/src/stm32f7/stm32_otghost.c
index fd4f877..bbf61b3 100644
--- a/arch/arm/src/stm32f7/stm32_otghost.c
+++ b/arch/arm/src/stm32f7/stm32_otghost.c
@@ -45,7 +45,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f7/stm32_qspi.c b/arch/arm/src/stm32f7/stm32_qspi.c
index ec9dd7c..0605915 100644
--- a/arch/arm/src/stm32f7/stm32_qspi.c
+++ b/arch/arm/src/stm32f7/stm32_qspi.c
@@ -46,7 +46,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f7/stm32_sai.c b/arch/arm/src/stm32f7/stm32_sai.c
index 9894643..e25e4c1 100644
--- a/arch/arm/src/stm32f7/stm32_sai.c
+++ b/arch/arm/src/stm32f7/stm32_sai.c
@@ -43,7 +43,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <queue.h>
diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c
index 0f9c9e5..3a76314 100644
--- a/arch/arm/src/stm32f7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32f7/stm32_sdmmc.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f7/stm32_serial.c b/arch/arm/src/stm32f7/stm32_serial.c
index 2b36ab2..3c7505f 100644
--- a/arch/arm/src/stm32f7/stm32_serial.c
+++ b/arch/arm/src/stm32f7/stm32_serial.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f7/stm32_spi.c b/arch/arm/src/stm32f7/stm32_spi.c
index d81db34..8fbbaa2 100644
--- a/arch/arm/src/stm32f7/stm32_spi.c
+++ b/arch/arm/src/stm32f7/stm32_spi.c
@@ -67,7 +67,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32f7/stm32_tim.c b/arch/arm/src/stm32f7/stm32_tim.c
index 8ad9fd1..2b624e2 100644
--- a/arch/arm/src/stm32f7/stm32_tim.c
+++ b/arch/arm/src/stm32f7/stm32_tim.c
@@ -50,7 +50,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32h7/stm32_flash.c b/arch/arm/src/stm32h7/stm32_flash.c
index 0ab7263..e676697 100644
--- a/arch/arm/src/stm32h7/stm32_flash.c
+++ b/arch/arm/src/stm32h7/stm32_flash.c
@@ -58,9 +58,9 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/arch/arm/src/stm32h7/stm32_i2c.c b/arch/arm/src/stm32h7/stm32_i2c.c
index ca1797e..858094a 100644
--- a/arch/arm/src/stm32h7/stm32_i2c.c
+++ b/arch/arm/src/stm32h7/stm32_i2c.c
@@ -204,7 +204,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32h7/stm32_otghost.c b/arch/arm/src/stm32h7/stm32_otghost.c
index 3fc1123..8226922 100644
--- a/arch/arm/src/stm32h7/stm32_otghost.c
+++ b/arch/arm/src/stm32h7/stm32_otghost.c
@@ -46,7 +46,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32h7/stm32_qspi.c b/arch/arm/src/stm32h7/stm32_qspi.c
index 81d9c67..5b4edc7 100644
--- a/arch/arm/src/stm32h7/stm32_qspi.c
+++ b/arch/arm/src/stm32h7/stm32_qspi.c
@@ -46,7 +46,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32h7/stm32_sdmmc.c b/arch/arm/src/stm32h7/stm32_sdmmc.c
index a395a77..8abf6e0 100644
--- a/arch/arm/src/stm32h7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32h7/stm32_sdmmc.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32h7/stm32_serial.c b/arch/arm/src/stm32h7/stm32_serial.c
index 47d9ff3..ecc3f32 100644
--- a/arch/arm/src/stm32h7/stm32_serial.c
+++ b/arch/arm/src/stm32h7/stm32_serial.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32h7/stm32_spi.c b/arch/arm/src/stm32h7/stm32_spi.c
index b142203..c1b9026 100644
--- a/arch/arm/src/stm32h7/stm32_spi.c
+++ b/arch/arm/src/stm32h7/stm32_spi.c
@@ -68,7 +68,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32h7/stm32_tim.c b/arch/arm/src/stm32h7/stm32_tim.c
index 57d28a4..a81b6c1 100644
--- a/arch/arm/src/stm32h7/stm32_tim.c
+++ b/arch/arm/src/stm32h7/stm32_tim.c
@@ -51,7 +51,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_1wire.c b/arch/arm/src/stm32l4/stm32l4_1wire.c
index a3320bd..d9478f4 100644
--- a/arch/arm/src/stm32l4/stm32l4_1wire.c
+++ b/arch/arm/src/stm32l4/stm32l4_1wire.c
@@ -49,7 +49,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c
index d50b99a..1e252dc 100644
--- a/arch/arm/src/stm32l4/stm32l4_can.c
+++ b/arch/arm/src/stm32l4/stm32l4_can.c
@@ -50,7 +50,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_dac.c b/arch/arm/src/stm32l4/stm32l4_dac.c
index 69dfe16..43dee04 100644
--- a/arch/arm/src/stm32l4/stm32l4_dac.c
+++ b/arch/arm/src/stm32l4/stm32l4_dac.c
@@ -44,7 +44,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_flash.c b/arch/arm/src/stm32l4/stm32l4_flash.c
index dcb75e6..fc4488a 100644
--- a/arch/arm/src/stm32l4/stm32l4_flash.c
+++ b/arch/arm/src/stm32l4/stm32l4_flash.c
@@ -51,8 +51,8 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
#include <nuttx/progmem.h>
+#include <nuttx/semaphore.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <string.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_i2c.c b/arch/arm/src/stm32l4/stm32l4_i2c.c
index f3b6570..1c970f9 100644
--- a/arch/arm/src/stm32l4/stm32l4_i2c.c
+++ b/arch/arm/src/stm32l4/stm32l4_i2c.c
@@ -259,7 +259,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_otgfshost.c b/arch/arm/src/stm32l4/stm32l4_otgfshost.c
index b667505..99b7824 100644
--- a/arch/arm/src/stm32l4/stm32l4_otgfshost.c
+++ b/arch/arm/src/stm32l4/stm32l4_otgfshost.c
@@ -45,7 +45,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c
index 0d76713..ad47d50 100644
--- a/arch/arm/src/stm32l4/stm32l4_qspi.c
+++ b/arch/arm/src/stm32l4/stm32l4_qspi.c
@@ -44,7 +44,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_sai.c b/arch/arm/src/stm32l4/stm32l4_sai.c
index 5f63414..bfa1983 100644
--- a/arch/arm/src/stm32l4/stm32l4_sai.c
+++ b/arch/arm/src/stm32l4/stm32l4_sai.c
@@ -43,7 +43,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <queue.h>
@@ -56,6 +55,7 @@
#include <nuttx/wqueue.h>
#include <nuttx/audio/audio.h>
#include <nuttx/audio/i2s.h>
+#include <nuttx/semaphore.h>
#include "stm32l4_dma.h"
#include "stm32l4_gpio.h"
diff --git a/arch/arm/src/stm32l4/stm32l4_sdmmc.c b/arch/arm/src/stm32l4/stm32l4_sdmmc.c
index 3320a0b..e811579 100644
--- a/arch/arm/src/stm32l4/stm32l4_sdmmc.c
+++ b/arch/arm/src/stm32l4/stm32l4_sdmmc.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_serial.c b/arch/arm/src/stm32l4/stm32l4_serial.c
index c3bd0f2..4d64efe 100644
--- a/arch/arm/src/stm32l4/stm32l4_serial.c
+++ b/arch/arm/src/stm32l4/stm32l4_serial.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c
index 5286f30..3c31aa6 100644
--- a/arch/arm/src/stm32l4/stm32l4_spi.c
+++ b/arch/arm/src/stm32l4/stm32l4_spi.c
@@ -72,7 +72,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stddef.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32l4/stm32l4_tim.c b/arch/arm/src/stm32l4/stm32l4_tim.c
index 0556916..46e6063 100644
--- a/arch/arm/src/stm32l4/stm32l4_tim.c
+++ b/arch/arm/src/stm32l4/stm32l4_tim.c
@@ -50,7 +50,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/stm32l4/stm32l4x6xx_dma.c b/arch/arm/src/stm32l4/stm32l4x6xx_dma.c
index 69d07e6..78a1c0a 100644
--- a/arch/arm/src/stm32l4/stm32l4x6xx_dma.c
+++ b/arch/arm/src/stm32l4/stm32l4x6xx_dma.c
@@ -43,13 +43,13 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <arch/irq.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "up_internal.h"
diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c
index 49429bf..d2d40b9 100644
--- a/arch/arm/src/str71x/str71x_serial.c
+++ b/arch/arm/src/str71x/str71x_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/tiva/common/tiva_adclow.c b/arch/arm/src/tiva/common/tiva_adclow.c
index ba4dee3..b3de392 100644
--- a/arch/arm/src/tiva/common/tiva_adclow.c
+++ b/arch/arm/src/tiva/common/tiva_adclow.c
@@ -64,7 +64,6 @@
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
@@ -74,6 +73,7 @@
#include <nuttx/signal.h>
#include <nuttx/analog/adc.h>
#include <nuttx/analog/ioctl.h>
+#include <nuttx/semaphore.h>
#include <arch/board/board.h>
diff --git a/arch/arm/src/tiva/common/tiva_hciuart.c b/arch/arm/src/tiva/common/tiva_hciuart.c
index 266b865..837e0c6 100644
--- a/arch/arm/src/tiva/common/tiva_hciuart.c
+++ b/arch/arm/src/tiva/common/tiva_hciuart.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/tiva/common/tiva_i2c.c b/arch/arm/src/tiva/common/tiva_i2c.c
index 5ccbf47..047e91f 100644
--- a/arch/arm/src/tiva/common/tiva_i2c.c
+++ b/arch/arm/src/tiva/common/tiva_i2c.c
@@ -50,7 +50,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/arm/src/tiva/common/tiva_serial.c b/arch/arm/src/tiva/common/tiva_serial.c
index 539f18f..c852c8b 100644
--- a/arch/arm/src/tiva/common/tiva_serial.c
+++ b/arch/arm/src/tiva/common/tiva_serial.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/tiva/common/tiva_ssi.c b/arch/arm/src/tiva/common/tiva_ssi.c
index abe534b..68874f7 100644
--- a/arch/arm/src/tiva/common/tiva_ssi.c
+++ b/arch/arm/src/tiva/common/tiva_ssi.c
@@ -42,7 +42,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/tms570/tms570_serial.c b/arch/arm/src/tms570/tms570_serial.c
index 3ab2808..0d711e9 100644
--- a/arch/arm/src/tms570/tms570_serial.c
+++ b/arch/arm/src/tms570/tms570_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/xmc4/xmc4_serial.c b/arch/arm/src/xmc4/xmc4_serial.c
index 59ca8f9..697c328 100644
--- a/arch/arm/src/xmc4/xmc4_serial.c
+++ b/arch/arm/src/xmc4/xmc4_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/arm/src/xmc4/xmc4_spi.c b/arch/arm/src/xmc4/xmc4_spi.c
index 19ef76f..26e1fa8 100644
--- a/arch/arm/src/xmc4/xmc4_spi.c
+++ b/arch/arm/src/xmc4/xmc4_spi.c
@@ -45,7 +45,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/arch/avr/src/at32uc3/at32uc3_serial.c b/arch/avr/src/at32uc3/at32uc3_serial.c
index 11dd635..a4d02d6 100644
--- a/arch/avr/src/at32uc3/at32uc3_serial.c
+++ b/arch/avr/src/at32uc3/at32uc3_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/avr/src/at90usb/at90usb_serial.c b/arch/avr/src/at90usb/at90usb_serial.c
index e9e4df8..fad319d 100644
--- a/arch/avr/src/at90usb/at90usb_serial.c
+++ b/arch/avr/src/at90usb/at90usb_serial.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/avr/src/atmega/atmega_serial.c b/arch/avr/src/atmega/atmega_serial.c
index 69466d8..b3bfa80 100644
--- a/arch/avr/src/atmega/atmega_serial.c
+++ b/arch/avr/src/atmega/atmega_serial.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/avr/src/avr/up_spi.c b/arch/avr/src/avr/up_spi.c
index accc86d..d9f8a97 100644
--- a/arch/avr/src/avr/up_spi.c
+++ b/arch/avr/src/avr/up_spi.c
@@ -42,13 +42,13 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include <avr/io.h>
diff --git a/arch/mips/src/pic32mx/pic32mx-serial.c b/arch/mips/src/pic32mx/pic32mx-serial.c
index ae63369..a4f47b2 100644
--- a/arch/mips/src/pic32mx/pic32mx-serial.c
+++ b/arch/mips/src/pic32mx/pic32mx-serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/mips/src/pic32mx/pic32mx-spi.c b/arch/mips/src/pic32mx/pic32mx-spi.c
index df13e59..4f8070d 100644
--- a/arch/mips/src/pic32mx/pic32mx-spi.c
+++ b/arch/mips/src/pic32mx/pic32mx-spi.c
@@ -42,13 +42,13 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
diff --git a/arch/mips/src/pic32mz/pic32mz-i2c.c b/arch/mips/src/pic32mz/pic32mz-i2c.c
index b67772c..6371606 100644
--- a/arch/mips/src/pic32mz/pic32mz-i2c.c
+++ b/arch/mips/src/pic32mz/pic32mz-i2c.c
@@ -44,7 +44,6 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/mips/src/pic32mz/pic32mz-serial.c b/arch/mips/src/pic32mz/pic32mz-serial.c
index 7f1452d..a2670c0 100644
--- a/arch/mips/src/pic32mz/pic32mz-serial.c
+++ b/arch/mips/src/pic32mz/pic32mz-serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/mips/src/pic32mz/pic32mz-spi.c b/arch/mips/src/pic32mz/pic32mz-spi.c
index 3c700da..64042a6 100644
--- a/arch/mips/src/pic32mz/pic32mz-spi.c
+++ b/arch/mips/src/pic32mz/pic32mz-spi.c
@@ -43,13 +43,13 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
diff --git a/arch/mips/src/pic32mz/pic32mz-timer.c b/arch/mips/src/pic32mz/pic32mz-timer.c
index c7c38d6..50b2ed1 100644
--- a/arch/mips/src/pic32mz/pic32mz-timer.c
+++ b/arch/mips/src/pic32mz/pic32mz-timer.c
@@ -47,7 +47,6 @@
#include <stdio.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/misoc/src/common/misoc_serial.c b/arch/misoc/src/common/misoc_serial.c
index 75077d3..e23d86d 100644
--- a/arch/misoc/src/common/misoc_serial.c
+++ b/arch/misoc/src/common/misoc_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/or1k/src/mor1kx/mor1kx_serial.c b/arch/or1k/src/mor1kx/mor1kx_serial.c
index 2966725..8398002 100644
--- a/arch/or1k/src/mor1kx/mor1kx_serial.c
+++ b/arch/or1k/src/mor1kx/mor1kx_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/renesas/src/m16c/m16c_serial.c b/arch/renesas/src/m16c/m16c_serial.c
index dc618ad..c26c181 100644
--- a/arch/renesas/src/m16c/m16c_serial.c
+++ b/arch/renesas/src/m16c/m16c_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/renesas/src/rx65n/rx65n_serial.c b/arch/renesas/src/rx65n/rx65n_serial.c
index 689d023..dff998c 100644
--- a/arch/renesas/src/rx65n/rx65n_serial.c
+++ b/arch/renesas/src/rx65n/rx65n_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/renesas/src/sh1/sh1_serial.c b/arch/renesas/src/sh1/sh1_serial.c
index a314af9..59954df 100644
--- a/arch/renesas/src/sh1/sh1_serial.c
+++ b/arch/renesas/src/sh1/sh1_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/risc-v/src/gap8/gap8_uart.c b/arch/risc-v/src/gap8/gap8_uart.c
index e7a9858..54cc577 100644
--- a/arch/risc-v/src/gap8/gap8_uart.c
+++ b/arch/risc-v/src/gap8/gap8_uart.c
@@ -50,7 +50,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/risc-v/src/nr5m100/nr5_serial.c b/arch/risc-v/src/nr5m100/nr5_serial.c
index 93583f9..ad75be2 100644
--- a/arch/risc-v/src/nr5m100/nr5_serial.c
+++ b/arch/risc-v/src/nr5m100/nr5_serial.c
@@ -48,7 +48,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/sim/src/sim/up_ioexpander.c b/arch/sim/src/sim/up_ioexpander.c
index 1384038..7f9180b 100644
--- a/arch/sim/src/sim/up_ioexpander.c
+++ b/arch/sim/src/sim/up_ioexpander.c
@@ -39,7 +39,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/sim/src/sim/up_qspiflash.c b/arch/sim/src/sim/up_qspiflash.c
index d887ced..bffc36e 100644
--- a/arch/sim/src/sim/up_qspiflash.c
+++ b/arch/sim/src/sim/up_qspiflash.c
@@ -43,7 +43,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <string.h>
diff --git a/arch/sim/src/sim/up_simsmp.c b/arch/sim/src/sim/up_simsmp.c
index 1135ac9..3dbd975 100644
--- a/arch/sim/src/sim/up_simsmp.c
+++ b/arch/sim/src/sim/up_simsmp.c
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <pthread.h>
-#include <semaphore.h>
#include <signal.h>
#include <errno.h>
diff --git a/arch/sim/src/sim/up_spiflash.c b/arch/sim/src/sim/up_spiflash.c
index d81822d..e97e088 100644
--- a/arch/sim/src/sim/up_spiflash.c
+++ b/arch/sim/src/sim/up_spiflash.c
@@ -42,7 +42,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <string.h>
diff --git a/arch/sim/src/sim/up_touchscreen.c b/arch/sim/src/sim/up_touchscreen.c
index bcfff4d..7bf2628 100644
--- a/arch/sim/src/sim/up_touchscreen.c
+++ b/arch/sim/src/sim/up_touchscreen.c
@@ -46,7 +46,6 @@
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <poll.h>
#include <errno.h>
#include <assert.h>
diff --git a/arch/sim/src/sim/up_uartwait.c b/arch/sim/src/sim/up_uartwait.c
index 3052b41..f35abc8 100644
--- a/arch/sim/src/sim/up_uartwait.c
+++ b/arch/sim/src/sim/up_uartwait.c
@@ -37,8 +37,6 @@
* Included Files
****************************************************************************/
-#include <semaphore.h>
-
#include <nuttx/semaphore.h>
#include "up_internal.h"
diff --git a/arch/x86/src/qemu/qemu_keypad.c b/arch/x86/src/qemu/qemu_keypad.c
index 0af9879..f694f9a 100644
--- a/arch/x86/src/qemu/qemu_keypad.c
+++ b/arch/x86/src/qemu/qemu_keypad.c
@@ -44,7 +44,6 @@
#include <nuttx/fs/fs.h>
#include <stdint.h>
-#include <semaphore.h>
#include <errno.h>
#include <unistd.h>
#include <sched.h>
diff --git a/arch/xtensa/src/esp32/esp32_serial.c b/arch/xtensa/src/esp32/esp32_serial.c
index 64c5640..f44e89a 100644
--- a/arch/xtensa/src/esp32/esp32_serial.c
+++ b/arch/xtensa/src/esp32/esp32_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/z16/src/z16f/z16f_espi.c b/arch/z16/src/z16f/z16f_espi.c
index a04d9fe..e433c4f 100644
--- a/arch/z16/src/z16f/z16f_espi.c
+++ b/arch/z16/src/z16f/z16f_espi.c
@@ -41,13 +41,13 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/irq.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_arch.h"
diff --git a/arch/z16/src/z16f/z16f_serial.c b/arch/z16/src/z16f/z16f_serial.c
index 5210f72..46122e4 100644
--- a/arch/z16/src/z16f/z16f_serial.c
+++ b/arch/z16/src/z16f/z16f_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/z80/src/ez80/ez80_i2c.c b/arch/z80/src/ez80/ez80_i2c.c
index b5ef5ad..91d2557 100644
--- a/arch/z80/src/ez80/ez80_i2c.c
+++ b/arch/z80/src/ez80/ez80_i2c.c
@@ -43,11 +43,11 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
+#include <nuttx/semaphore.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/kmalloc.h>
#include <arch/io.h>
diff --git a/arch/z80/src/ez80/ez80_serial.c b/arch/z80/src/ez80/ez80_serial.c
index 6f37011..edd56aa 100644
--- a/arch/z80/src/ez80/ez80_serial.c
+++ b/arch/z80/src/ez80/ez80_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/z80/src/ez80/ez80_spi.c b/arch/z80/src/ez80/ez80_spi.c
index 1f64e1e..27af964 100644
--- a/arch/z80/src/ez80/ez80_spi.c
+++ b/arch/z80/src/ez80/ez80_spi.c
@@ -42,13 +42,13 @@
#include <sys/types.h>
#include <stdint.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include <arch/io.h>
diff --git a/arch/z80/src/z180/z180_scc.c b/arch/z80/src/z180/z180_scc.c
index 2e2e642..22b8207 100644
--- a/arch/z80/src/z180/z180_scc.c
+++ b/arch/z80/src/z180/z180_scc.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/arch/z80/src/z8/z8_i2c.c b/arch/z80/src/z8/z8_i2c.c
index 883e717..3ec07fe 100644
--- a/arch/z80/src/z8/z8_i2c.c
+++ b/arch/z80/src/z8/z8_i2c.c
@@ -42,11 +42,11 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
+#include <nuttx/semaphore.h>
#include <nuttx/i2c/i2c_master.h>
#include <nuttx/kmalloc.h>
#include <arch/board/board.h>
diff --git a/arch/z80/src/z8/z8_serial.c b/arch/z80/src/z8/z8_serial.c
index 4bf7ed7..827a349 100644
--- a/arch/z80/src/z8/z8_serial.c
+++ b/arch/z80/src/z8/z8_serial.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/audio/audio.c b/audio/audio.c
index dc624b9..716a1ac 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -46,7 +46,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
+#include <mqueue.h>
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
@@ -57,7 +57,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
#include <nuttx/audio/audio.h>
-#include <mqueue.h>
+#include <nuttx/semaphore.h>
#include <arch/irq.h>
diff --git a/audio/pcm_decode.c b/audio/pcm_decode.c
index d8df0ee..c35c9b3 100644
--- a/audio/pcm_decode.c
+++ b/audio/pcm_decode.c
@@ -49,7 +49,6 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/boards/arm/cxd56xx/common/src/cxd56_imageproc.c b/boards/arm/cxd56xx/common/src/cxd56_imageproc.c
index 80b358f..4dc81c2 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_imageproc.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_imageproc.c
@@ -43,11 +43,11 @@
#include <string.h>
#include <fcntl.h>
#include <time.h>
-#include <semaphore.h>
#include <errno.h>
#include <nuttx/arch.h>
#include <nuttx/board.h>
+#include <nuttx/semaphore.h>
#include <debug.h>
diff --git a/boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c b/boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c
index de22ae1..bb470bc 100644
--- a/boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/ak09912_scu.c
@@ -44,7 +44,6 @@
#include <fixedmath.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <arch/types.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
diff --git a/boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c b/boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c
index 8322fb8..79c5a06 100644
--- a/boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/apds9930_scu.c
@@ -44,7 +44,6 @@
#include <fixedmath.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <arch/types.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
diff --git a/boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c b/boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c
index 6e98ed1..00f640a 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bh1721fvc_scu.c
@@ -44,7 +44,6 @@
#include <fixedmath.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <arch/types.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
diff --git a/boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c b/boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c
index 5d41bd8..dbfeedd 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bh1745nuc_scu.c
@@ -44,7 +44,6 @@
#include <fixedmath.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <arch/types.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
diff --git a/boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c b/boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c
index b202b32..a679a83 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bm1383glv_scu.c
@@ -44,7 +44,6 @@
#include <fixedmath.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <arch/types.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
diff --git a/boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c b/boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c
index 4bf18b6..157c399 100644
--- a/boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/bm1422gmv_scu.c
@@ -44,7 +44,6 @@
#include <fixedmath.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <arch/types.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
diff --git a/boards/arm/cxd56xx/drivers/sensors/kx022_scu.c b/boards/arm/cxd56xx/drivers/sensors/kx022_scu.c
index 1d45997..c4b7bb8 100644
--- a/boards/arm/cxd56xx/drivers/sensors/kx022_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/kx022_scu.c
@@ -44,7 +44,6 @@
#include <fixedmath.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <arch/types.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
diff --git a/boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c b/boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c
index 96ccaa7..997a593 100644
--- a/boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/lt1pa01_scu.c
@@ -44,7 +44,6 @@
#include <fixedmath.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <arch/types.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
diff --git a/boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c b/boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c
index 1929b4c..bd3d539 100644
--- a/boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c
+++ b/boards/arm/cxd56xx/drivers/sensors/rpr0521rs_scu.c
@@ -44,7 +44,6 @@
#include <fixedmath.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <arch/types.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_power.c b/boards/arm/cxd56xx/spresense/src/cxd56_power.c
index a706bc6..0c15c95 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_power.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_power.c
@@ -45,9 +45,9 @@
#include <errno.h>
#include <assert.h>
#include <debug.h>
-#include <semaphore.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include "chip.h"
#include "up_arch.h"
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c
index 4973d60..89a70fa 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c
+++ b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c
@@ -66,13 +66,13 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
diff --git a/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c b/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c
index 642c174..7786b59 100644
--- a/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c
+++ b/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c
@@ -67,13 +67,13 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
#include <arch/board/board.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "up_internal.h"
diff --git a/boards/arm/max326xx/max32660-evsys/src/max326_mmcsd.c b/boards/arm/max326xx/max32660-evsys/src/max326_mmcsd.c
index f9c2b1c..cf592f9 100644
--- a/boards/arm/max326xx/max32660-evsys/src/max326_mmcsd.c
+++ b/boards/arm/max326xx/max32660-evsys/src/max326_mmcsd.c
@@ -40,7 +40,6 @@
#include <unistd.h>
#include <sched.h>
-#include <semaphore.h>
#include <time.h>
#include <debug.h>
diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
index ce91bde..7bcd538 100644
--- a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
+++ b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c
@@ -47,7 +47,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <poll.h>
#include <errno.h>
#include <debug.h>
@@ -57,6 +56,7 @@
#include <nuttx/fs/fs.h>
#include <nuttx/lcd/slcd_ioctl.h>
#include <nuttx/lcd/slcd_codec.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "sam_gpio.h"
diff --git a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
index c1c0a02..671cff8 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
@@ -124,7 +124,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
@@ -135,6 +134,7 @@
#include <nuttx/clock.h>
#include <nuttx/lcd/lcd.h>
#include <nuttx/lcd/ili9488.h>
+#include <nuttx/semaphore.h>
#include <nuttx/video/rgbcolors.h>
#include <nuttx/irq.h>
diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c
index 44924d7..5e4da34 100644
--- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c
+++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c
@@ -44,7 +44,6 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <sched.h>
#include <assert.h>
#include <errno.h>
@@ -56,6 +55,7 @@
#include <nuttx/wqueue.h>
#include <nuttx/fs/fs.h>
#include <nuttx/input/touchscreen.h>
+#include <nuttx/semaphore.h>
#include <arch/board/board.h>
#include "up_arch.h"
diff --git a/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c b/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c
index 3b0c5cf..0dce60d 100644
--- a/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c
+++ b/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c
@@ -44,7 +44,6 @@
#include <nuttx/spi/spi.h>
#include <pthread.h>
#include <sched.h>
-#include <semaphore.h>
#include <time.h>
#include <unistd.h>
diff --git a/boards/arm/stm32/stm32butterfly2/src/stm32_mmcsd.c b/boards/arm/stm32/stm32butterfly2/src/stm32_mmcsd.c
index 4480266..8b0527d 100644
--- a/boards/arm/stm32/stm32butterfly2/src/stm32_mmcsd.c
+++ b/boards/arm/stm32/stm32butterfly2/src/stm32_mmcsd.c
@@ -40,13 +40,13 @@
#include <pthread.h>
#include <sched.h>
-#include <semaphore.h>
#include <time.h>
#include <unistd.h>
#include <debug.h>
#include <nuttx/mmcsd.h>
#include <nuttx/signal.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include "stm32.h"
diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_mmcsd.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_mmcsd.c
index fd570e7..da0de98 100644
--- a/boards/arm/stm32/stm32f103-minimum/src/stm32_mmcsd.c
+++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_mmcsd.c
@@ -42,7 +42,6 @@
#include <nuttx/spi/spi.h>
#include <pthread.h>
#include <sched.h>
-#include <semaphore.h>
#include <time.h>
#include <unistd.h>
diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c b/boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c
index cacd15a..d6f2f70 100644
--- a/boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c
+++ b/boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c
@@ -48,7 +48,6 @@
#include <nuttx/spi/spi.h>
#include <pthread.h>
#include <sched.h>
-#include <semaphore.h>
#include <time.h>
#include <unistd.h>
diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
index bbd74fe..1ff5738 100644
--- a/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
+++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c
@@ -51,7 +51,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <poll.h>
#include <errno.h>
#include <debug.h>
@@ -61,6 +60,7 @@
#include <nuttx/fs/fs.h>
#include <nuttx/lcd/slcd_ioctl.h>
#include <nuttx/lcd/slcd_codec.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "stm32_gpio.h"
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spimmcsd.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spimmcsd.c
index 72d8d2f..eb757c8 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spimmcsd.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spimmcsd.c
@@ -42,7 +42,6 @@
#include <nuttx/spi/spi.h>
#include <pthread.h>
#include <sched.h>
-#include <semaphore.h>
#include <time.h>
#include <unistd.h>
diff --git a/boards/arm/str71x/olimex-strp711/src/str71_spi.c b/boards/arm/str71x/olimex-strp711/src/str71_spi.c
index b76a089..8f4a702 100644
--- a/boards/arm/str71x/olimex-strp711/src/str71_spi.c
+++ b/boards/arm/str71x/olimex-strp711/src/str71_spi.c
@@ -43,13 +43,13 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/irq.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include <arch/board/board.h>
diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_sdmmc.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_sdmmc.c
index aff121f..ff46826 100644
--- a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_sdmmc.c
+++ b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_sdmmc.c
@@ -42,7 +42,6 @@
#include <nuttx/spi/spi.h>
#include <pthread.h>
#include <sched.h>
-#include <semaphore.h>
#include <time.h>
#include <unistd.h>
diff --git a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c
index feea862..0159317 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c
+++ b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c
@@ -42,7 +42,6 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <sched.h>
#include <assert.h>
#include <errno.h>
@@ -53,6 +52,7 @@
#include <nuttx/wqueue.h>
#include <nuttx/fs/fs.h>
#include <nuttx/input/touchscreen.h>
+#include <nuttx/semaphore.h>
#include <arch/board/board.h>
#include "up_arch.h"
diff --git a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c
index c17c4dc..803a900 100644
--- a/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c
+++ b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c
@@ -75,7 +75,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <ctype.h>
#include <poll.h>
#include <errno.h>
@@ -87,6 +86,7 @@
#include <nuttx/lcd/hd4478ou.h>
#include <nuttx/lcd/slcd_ioctl.h>
#include <nuttx/lcd/slcd_codec.h>
+#include <nuttx/semaphore.h>
#include "up_arch.h"
#include "pic32mx-ioport.h"
diff --git a/boards/sim/sim/sim/src/sim_touchscreen.c b/boards/sim/sim/sim/src/sim_touchscreen.c
index cc7cb0c..e830c0a 100644
--- a/boards/sim/sim/sim/src/sim_touchscreen.c
+++ b/boards/sim/sim/sim/src/sim_touchscreen.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <sched.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
@@ -52,6 +51,7 @@
#include <nuttx/board.h>
#include <nuttx/video/fb.h>
#include <nuttx/input/touchscreen.h>
+#include <nuttx/semaphore.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxglib.h>
diff --git a/boards/z80/ez80/makerlisp/src/ez80_spimmcsd.c b/boards/z80/ez80/makerlisp/src/ez80_spimmcsd.c
index 178bb2c..b455b7f 100644
--- a/boards/z80/ez80/makerlisp/src/ez80_spimmcsd.c
+++ b/boards/z80/ez80/makerlisp/src/ez80_spimmcsd.c
@@ -40,7 +40,6 @@
#include <pthread.h>
#include <sched.h>
-#include <semaphore.h>
#include <time.h>
#include <unistd.h>
#include <debug.h>
diff --git a/drivers/1wire/1wire_internal.h b/drivers/1wire/1wire_internal.h
index c981d93..62f8082 100644
--- a/drivers/1wire/1wire_internal.h
+++ b/drivers/1wire/1wire_internal.h
@@ -43,7 +43,7 @@
#include <nuttx/config.h>
#include <stdbool.h>
-#include <semaphore.h>
+#include <nuttx/semaphore.h>
#include <nuttx/power/pm.h>
/****************************************************************************
diff --git a/drivers/analog/ad5410.c b/drivers/analog/ad5410.c
index efffa0f..3796434 100644
--- a/drivers/analog/ad5410.c
+++ b/drivers/analog/ad5410.c
@@ -45,7 +45,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/drivers/analog/adc.c b/drivers/analog/adc.c
index a9fc980..208b200 100644
--- a/drivers/analog/adc.c
+++ b/drivers/analog/adc.c
@@ -51,14 +51,12 @@
#include <stdbool.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
-#include <nuttx/semaphore.h>
#include <nuttx/analog/adc.h>
#include <nuttx/random.h>
diff --git a/drivers/analog/ads1255.c b/drivers/analog/ads1255.c
index b815706..af5d093 100644
--- a/drivers/analog/ads1255.c
+++ b/drivers/analog/ads1255.c
@@ -49,7 +49,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/drivers/analog/comp.c b/drivers/analog/comp.c
index a85fbd8..a200fe4 100644
--- a/drivers/analog/comp.c
+++ b/drivers/analog/comp.c
@@ -42,14 +42,12 @@
#include <sys/types.h>
#include <stdint.h>
#include <unistd.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <errno.h>
#include <debug.h>
#include <poll.h>
#include <nuttx/arch.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/analog/comp.h>
diff --git a/drivers/analog/dac.c b/drivers/analog/dac.c
index 0dfbbce..a5512f5 100644
--- a/drivers/analog/dac.c
+++ b/drivers/analog/dac.c
@@ -50,14 +50,12 @@
#include <stdbool.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/signal.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/analog/dac.h>
diff --git a/drivers/analog/dac7554.c b/drivers/analog/dac7554.c
index 3fdb66a..8aa4669 100644
--- a/drivers/analog/dac7554.c
+++ b/drivers/analog/dac7554.c
@@ -49,7 +49,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/drivers/analog/dac7571.c b/drivers/analog/dac7571.c
index f2a7956..b151c41 100644
--- a/drivers/analog/dac7571.c
+++ b/drivers/analog/dac7571.c
@@ -48,7 +48,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/drivers/analog/lmp92001.c b/drivers/analog/lmp92001.c
index b4a1115..27d531a 100644
--- a/drivers/analog/lmp92001.c
+++ b/drivers/analog/lmp92001.c
@@ -47,7 +47,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/drivers/analog/ltc1867l.c b/drivers/analog/ltc1867l.c
index 209c3e0..af67ef9 100644
--- a/drivers/analog/ltc1867l.c
+++ b/drivers/analog/ltc1867l.c
@@ -48,7 +48,6 @@
#include <stdio.h>
#include <string.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
@@ -58,6 +57,7 @@
#include <nuttx/analog/adc.h>
#include <nuttx/analog/ioctl.h>
#include <nuttx/analog/ltc1867l.h>
+#include <nuttx/semaphore.h>
#if defined(CONFIG_ADC_LTC1867L)
diff --git a/drivers/analog/opamp.c b/drivers/analog/opamp.c
index 82fd60d..be4154b 100644
--- a/drivers/analog/opamp.c
+++ b/drivers/analog/opamp.c
@@ -42,13 +42,11 @@
#include <sys/types.h>
#include <stdint.h>
#include <unistd.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/analog/opamp.h>
diff --git a/drivers/audio/tone.c b/drivers/audio/tone.c
index 3d83267..c916618 100644
--- a/drivers/audio/tone.c
+++ b/drivers/audio/tone.c
@@ -53,7 +53,6 @@
#include <ctype.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
@@ -65,6 +64,7 @@
#include <nuttx/timers/pwm.h>
#include <nuttx/timers/oneshot.h>
#include <nuttx/audio/tone.h>
+#include <nuttx/semaphore.h>
#include <arch/irq.h>
diff --git a/drivers/bch/bch.h b/drivers/bch/bch.h
index 6ab72b0..0813fae 100644
--- a/drivers/bch/bch.h
+++ b/drivers/bch/bch.h
@@ -45,7 +45,8 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
+
+#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
/****************************************************************************
diff --git a/drivers/bch/bchlib_sem.c b/drivers/bch/bchlib_sem.c
index 3cdc308..1495a93 100644
--- a/drivers/bch/bchlib_sem.c
+++ b/drivers/bch/bchlib_sem.c
@@ -43,8 +43,6 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
-
#include "bch.h"
/****************************************************************************
diff --git a/drivers/can/can.c b/drivers/can/can.c
index e847294..bd9569c 100644
--- a/drivers/can/can.c
+++ b/drivers/can/can.c
@@ -48,7 +48,6 @@
#include <stdbool.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <assert.h>
#include <poll.h>
@@ -57,7 +56,6 @@
#include <nuttx/arch.h>
#include <nuttx/signal.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/can/can.h>
#include <nuttx/kmalloc.h>
diff --git a/drivers/can/mcp2515.c b/drivers/can/mcp2515.c
index 487ab4b..c58fcc4 100644
--- a/drivers/can/mcp2515.c
+++ b/drivers/can/mcp2515.c
@@ -46,7 +46,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <strings.h>
diff --git a/drivers/i2c/i2c_driver.c b/drivers/i2c/i2c_driver.c
index 00f8eba..e46313c 100644
--- a/drivers/i2c/i2c_driver.c
+++ b/drivers/i2c/i2c_driver.c
@@ -42,7 +42,6 @@
#include <sys/types.h>
#include <stdbool.h>
#include <stdio.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
@@ -50,6 +49,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c/i2c_master.h>
+#include <nuttx/semaphore.h>
#ifdef CONFIG_I2C_DRIVER
diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c
index d07b59b..d13bd1e 100644
--- a/drivers/input/ads7843e.c
+++ b/drivers/input/ads7843e.c
@@ -58,7 +58,6 @@
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <poll.h>
#include <errno.h>
#include <assert.h>
@@ -73,7 +72,6 @@
#include <nuttx/wqueue.h>
#include <nuttx/random.h>
-#include <nuttx/semaphore.h>
#include <nuttx/input/touchscreen.h>
#include <nuttx/input/ads7843e.h>
diff --git a/drivers/input/ads7843e.h b/drivers/input/ads7843e.h
index e2f341d..e30ac40 100644
--- a/drivers/input/ads7843e.h
+++ b/drivers/input/ads7843e.h
@@ -53,12 +53,12 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include <semaphore.h>
#include <poll.h>
#include <nuttx/wqueue.h>
#include <nuttx/wdog.h>
#include <nuttx/clock.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include <nuttx/input/ads7843e.h>
diff --git a/drivers/input/ft5x06.c b/drivers/input/ft5x06.c
index fc39cac..1e2cb85 100644
--- a/drivers/input/ft5x06.c
+++ b/drivers/input/ft5x06.c
@@ -66,7 +66,6 @@
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <poll.h>
#include <errno.h>
#include <assert.h>
@@ -77,6 +76,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c/i2c_master.h>
+#include <nuttx/semaphore.h>
#include <nuttx/wqueue.h>
#include <nuttx/wdog.h>
diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c
index 68a65a2..d5180c3 100644
--- a/drivers/input/max11802.c
+++ b/drivers/input/max11802.c
@@ -51,7 +51,6 @@
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <poll.h>
#include <errno.h>
#include <assert.h>
@@ -66,7 +65,6 @@
#include <nuttx/spi/spi.h>
#include <nuttx/random.h>
-#include <nuttx/semaphore.h>
#include <nuttx/input/touchscreen.h>
#include <nuttx/input/max11802.h>
diff --git a/drivers/input/max11802.h b/drivers/input/max11802.h
index 66846f6..1a2dc41 100644
--- a/drivers/input/max11802.h
+++ b/drivers/input/max11802.h
@@ -48,12 +48,12 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include <semaphore.h>
#include <poll.h>
#include <nuttx/wqueue.h>
#include <nuttx/wdog.h>
#include <nuttx/clock.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include <nuttx/input/max11802.h>
diff --git a/drivers/input/mxt.c b/drivers/input/mxt.c
index 1d81514..df42105 100644
--- a/drivers/input/mxt.c
+++ b/drivers/input/mxt.c
@@ -52,7 +52,6 @@
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <poll.h>
#include <errno.h>
#include <assert.h>
diff --git a/drivers/input/stmpe811.h b/drivers/input/stmpe811.h
index f44b64c..dccdf48 100644
--- a/drivers/input/stmpe811.h
+++ b/drivers/input/stmpe811.h
@@ -46,8 +46,7 @@
#include <nuttx/config.h>
-#include <semaphore.h>
-
+#include <nuttx/semaphore.h>
#include <nuttx/wdog.h>
#include <nuttx/clock.h>
#include <nuttx/wqueue.h>
diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c
index 1bdc453..ecc15bf 100644
--- a/drivers/input/stmpe811_tsc.c
+++ b/drivers/input/stmpe811_tsc.c
@@ -50,7 +50,6 @@
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <poll.h>
#include <errno.h>
diff --git a/drivers/input/tsc2007.c b/drivers/input/tsc2007.c
index 3b99fe4..5c5de5b 100644
--- a/drivers/input/tsc2007.c
+++ b/drivers/input/tsc2007.c
@@ -56,7 +56,6 @@
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <poll.h>
#include <errno.h>
#include <assert.h>
@@ -67,6 +66,7 @@
#include <nuttx/arch.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c/i2c_master.h>
+#include <nuttx/semaphore.h>
#include <nuttx/wqueue.h>
#include <nuttx/random.h>
diff --git a/drivers/ioexpander/pca9555.c b/drivers/ioexpander/pca9555.c
index 0c3174a..177f4e7 100644
--- a/drivers/ioexpander/pca9555.c
+++ b/drivers/ioexpander/pca9555.c
@@ -43,7 +43,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/drivers/ioexpander/pca9555.h b/drivers/ioexpander/pca9555.h
index dc8c133..ad7f3b2 100644
--- a/drivers/ioexpander/pca9555.h
+++ b/drivers/ioexpander/pca9555.h
@@ -46,11 +46,9 @@
#include <nuttx/config.h>
-#include <semaphore.h>
-
#include <nuttx/wdog.h>
#include <nuttx/clock.h>
-
+#include <nuttx/semaphore.h>
#include <nuttx/wqueue.h>
#include <nuttx/ioexpander/ioexpander.h>
#include <nuttx/ioexpander/pca9555.h>
diff --git a/drivers/ioexpander/pcf8574.c b/drivers/ioexpander/pcf8574.c
index 54653e6..010ce99 100644
--- a/drivers/ioexpander/pcf8574.c
+++ b/drivers/ioexpander/pcf8574.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/drivers/ioexpander/pcf8574.h b/drivers/ioexpander/pcf8574.h
index 9ef0976..0963032 100644
--- a/drivers/ioexpander/pcf8574.h
+++ b/drivers/ioexpander/pcf8574.h
@@ -42,11 +42,9 @@
#include <nuttx/config.h>
-#include <semaphore.h>
-
#include <nuttx/wdog.h>
#include <nuttx/clock.h>
-
+#include <nuttx/semaphore.h>
#include <nuttx/wqueue.h>
#include <nuttx/ioexpander/ioexpander.h>
#include <nuttx/ioexpander/pcf8574.h>
diff --git a/drivers/ioexpander/skeleton.c b/drivers/ioexpander/skeleton.c
index 8469dd9..56e0dd4 100644
--- a/drivers/ioexpander/skeleton.c
+++ b/drivers/ioexpander/skeleton.c
@@ -39,12 +39,12 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/kmalloc.h>
+#include <nuttx/semaphore.h>
#include <nuttx/ioexpander/ioexpander.h>
#include <nuttx/ioexpander/skeleton.h>
diff --git a/drivers/ioexpander/tca64xx.c b/drivers/ioexpander/tca64xx.c
index 8aea715..82f5531 100644
--- a/drivers/ioexpander/tca64xx.c
+++ b/drivers/ioexpander/tca64xx.c
@@ -44,7 +44,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/drivers/ioexpander/tca64xx.h b/drivers/ioexpander/tca64xx.h
index c77ed6b..28c59e5 100644
--- a/drivers/ioexpander/tca64xx.h
+++ b/drivers/ioexpander/tca64xx.h
@@ -46,11 +46,9 @@
#include <nuttx/config.h>
-#include <semaphore.h>
-
#include <nuttx/wdog.h>
#include <nuttx/clock.h>
-
+#include <nuttx/semaphore.h>
#include <nuttx/wqueue.h>
#include <nuttx/ioexpander/ioexpander.h>
#include <nuttx/ioexpander/tca64xx.h>
diff --git a/drivers/lcd/tda19988.c b/drivers/lcd/tda19988.c
index defed9d..db8fa2c 100644
--- a/drivers/lcd/tda19988.c
+++ b/drivers/lcd/tda19988.c
@@ -49,7 +49,6 @@
#include <stdbool.h>
#include <string.h>
#include <poll.h>
-#include <semaphore.h>
#include <errno.h>
#include <nuttx/kmalloc.h>
diff --git a/drivers/leds/rgbled.c b/drivers/leds/rgbled.c
index 404c297..128aed9 100644
--- a/drivers/leds/rgbled.c
+++ b/drivers/leds/rgbled.c
@@ -46,7 +46,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
@@ -57,6 +56,7 @@
#include <nuttx/arch.h>
#include <nuttx/timers/pwm.h>
#include <nuttx/leds/rgbled.h>
+#include <nuttx/semaphore.h>
#include <arch/irq.h>
diff --git a/drivers/loop/losetup.c b/drivers/loop/losetup.c
index 5a4d678..385eb0c 100644
--- a/drivers/loop/losetup.c
+++ b/drivers/loop/losetup.c
@@ -53,13 +53,13 @@
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/fs/loop.h>
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/drivers/mmcsd/mmcsd_sdio.c b/drivers/mmcsd/mmcsd_sdio.c
index 6d579f9..dd8a81a 100644
--- a/drivers/mmcsd/mmcsd_sdio.c
+++ b/drivers/mmcsd/mmcsd_sdio.c
@@ -54,7 +54,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
@@ -66,6 +65,7 @@
#include <nuttx/drivers/rwbuffer.h>
#include <nuttx/sdio.h>
#include <nuttx/mmcsd.h>
+#include <nuttx/semaphore.h>
#include "mmcsd.h"
#include "mmcsd_sdio.h"
diff --git a/drivers/modem/altair/altmdm_spi.h b/drivers/modem/altair/altmdm_spi.h
index 0aa9769..4ff6d49 100644
--- a/drivers/modem/altair/altmdm_spi.h
+++ b/drivers/modem/altair/altmdm_spi.h
@@ -41,7 +41,6 @@
****************************************************************************/
#include <nuttx/config.h>
-#include <semaphore.h>
#include "altmdm_dev.h"
#include "altmdm_sys.h"
diff --git a/drivers/modem/altair/altmdm_sys.c b/drivers/modem/altair/altmdm_sys.c
index 1cad10c..f4cb8e4 100644
--- a/drivers/modem/altair/altmdm_sys.c
+++ b/drivers/modem/altair/altmdm_sys.c
@@ -40,7 +40,6 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/irq.h>
-#include <nuttx/semaphore.h>
#include <signal.h>
#include "altmdm_dev.h"
diff --git a/drivers/modem/altair/altmdm_sys.h b/drivers/modem/altair/altmdm_sys.h
index 320e086..33b5a4e 100644
--- a/drivers/modem/altair/altmdm_sys.h
+++ b/drivers/modem/altair/altmdm_sys.h
@@ -43,7 +43,7 @@
****************************************************************************/
#include <time.h>
-#include <semaphore.h>
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/drivers/mtd/mtd_nand.c b/drivers/mtd/mtd_nand.c
index 7f5a278..55ec2a2 100644
--- a/drivers/mtd/mtd_nand.c
+++ b/drivers/mtd/mtd_nand.c
@@ -49,7 +49,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/drivers/net/phy_notify.c b/drivers/net/phy_notify.c
index 4f5cc93..3ceda17 100644
--- a/drivers/net/phy_notify.c
+++ b/drivers/net/phy_notify.c
@@ -51,12 +51,12 @@
#include <stdio.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/irq.h>
+#include <nuttx/semaphore.h>
#include <nuttx/signal.h>
#include <nuttx/net/phy.h>
diff --git a/drivers/net/telnet.c b/drivers/net/telnet.c
index 9d142fe..206349f 100644
--- a/drivers/net/telnet.c
+++ b/drivers/net/telnet.c
@@ -55,7 +55,6 @@
#include <unistd.h>
#include <stdlib.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <string.h>
#include <poll.h>
#include <errno.h>
diff --git a/drivers/pipes/pipe.c b/drivers/pipes/pipe.c
index 4a06688..d595d16 100644
--- a/drivers/pipes/pipe.c
+++ b/drivers/pipes/pipe.c
@@ -43,12 +43,12 @@
#include <stdio.h>
#include <unistd.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <errno.h>
#include <nuttx/fs/fs.h>
#include <nuttx/drivers/drivers.h>
+#include <nuttx/semaphore.h>
#include "pipe_common.h"
diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c
index 0ecb54c..2b4c80a 100644
--- a/drivers/pipes/pipe_common.c
+++ b/drivers/pipes/pipe_common.c
@@ -48,7 +48,6 @@
#include <stdlib.h>
#include <string.h>
#include <sched.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <errno.h>
#include <assert.h>
diff --git a/drivers/power/battery_charger.c b/drivers/power/battery_charger.c
index f77c85c..f9c430b 100644
--- a/drivers/power/battery_charger.c
+++ b/drivers/power/battery_charger.c
@@ -44,7 +44,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/power/battery_charger.h>
#include <nuttx/power/battery_ioctl.h>
diff --git a/drivers/power/battery_gauge.c b/drivers/power/battery_gauge.c
index b56c6a9..a081368 100644
--- a/drivers/power/battery_gauge.c
+++ b/drivers/power/battery_gauge.c
@@ -44,7 +44,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/power/battery_gauge.h>
#include <nuttx/power/battery_ioctl.h>
diff --git a/drivers/power/motor.c b/drivers/power/motor.c
index 2e8061b..8fc04e5 100644
--- a/drivers/power/motor.c
+++ b/drivers/power/motor.c
@@ -43,13 +43,11 @@
#include <sys/types.h>
#include <stdint.h>
#include <unistd.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/power/motor.h>
diff --git a/drivers/power/pm.h b/drivers/power/pm.h
index 99543bd..4d585c7 100644
--- a/drivers/power/pm.h
+++ b/drivers/power/pm.h
@@ -43,7 +43,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <queue.h>
#include <nuttx/semaphore.h>
diff --git a/drivers/power/pm_initialize.c b/drivers/power/pm_initialize.c
index ba068fd..56e66a3 100644
--- a/drivers/power/pm_initialize.c
+++ b/drivers/power/pm_initialize.c
@@ -40,9 +40,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
-
-#include <nuttx/semaphore.h>
#include <nuttx/power/pm.h>
#include "pm.h"
diff --git a/drivers/power/powerled.c b/drivers/power/powerled.c
index 14f8b0c..f10f64f 100644
--- a/drivers/power/powerled.c
+++ b/drivers/power/powerled.c
@@ -43,13 +43,11 @@
#include <sys/types.h>
#include <stdint.h>
#include <unistd.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/power/powerled.h>
diff --git a/drivers/power/smps.c b/drivers/power/smps.c
index 819034d..a898785 100644
--- a/drivers/power/smps.c
+++ b/drivers/power/smps.c
@@ -43,13 +43,11 @@
#include <sys/types.h>
#include <stdint.h>
#include <unistd.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/power/smps.h>
diff --git a/drivers/rwbuffer.c b/drivers/rwbuffer.c
index a4459c5..889683f 100644
--- a/drivers/rwbuffer.c
+++ b/drivers/rwbuffer.c
@@ -47,11 +47,11 @@
#include <string.h>
#include <time.h>
#include <assert.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/kmalloc.h>
+#include <nuttx/semaphore.h>
#include <nuttx/wqueue.h>
#include <nuttx/drivers/rwbuffer.h>
diff --git a/drivers/sensors/adxl345.h b/drivers/sensors/adxl345.h
index e91fc6b..8b61010 100644
--- a/drivers/sensors/adxl345.h
+++ b/drivers/sensors/adxl345.h
@@ -44,11 +44,10 @@
#include <nuttx/config.h>
-#include <semaphore.h>
-
#include <nuttx/wdog.h>
#include <nuttx/clock.h>
#include <nuttx/wqueue.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/adxl345.h>
#if defined(CONFIG_SENSORS_ADXL345)
diff --git a/drivers/sensors/adxl372.c b/drivers/sensors/adxl372.c
index 6539cb4..003023c 100644
--- a/drivers/sensors/adxl372.c
+++ b/drivers/sensors/adxl372.c
@@ -46,11 +46,10 @@
#include <errno.h>
#include <debug.h>
#include <string.h>
-#include <semaphore.h>
#include <nuttx/kmalloc.h>
-
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/adxl372.h>
/****************************************************************************
diff --git a/drivers/sensors/ak09912.c b/drivers/sensors/ak09912.c
index 01457c1..de1293e 100644
--- a/drivers/sensors/ak09912.c
+++ b/drivers/sensors/ak09912.c
@@ -44,11 +44,11 @@
#include <fixedmath.h>
#include <errno.h>
#include <debug.h>
-#include <semaphore.h>
#include <arch/types.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c/i2c_master.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/ak09912.h>
#include <nuttx/wdog.h>
#include <nuttx/irq.h>
diff --git a/drivers/sensors/bmg160.c b/drivers/sensors/bmg160.c
index 9258189..8dfd164 100644
--- a/drivers/sensors/bmg160.c
+++ b/drivers/sensors/bmg160.c
@@ -44,12 +44,11 @@
#include <errno.h>
#include <debug.h>
#include <string.h>
-#include <semaphore.h>
#include <nuttx/kmalloc.h>
#include <nuttx/wqueue.h>
-
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/bmg160.h>
#include <nuttx/random.h>
diff --git a/drivers/sensors/dhtxx.c b/drivers/sensors/dhtxx.c
index c79eb8e..59908f4 100644
--- a/drivers/sensors/dhtxx.c
+++ b/drivers/sensors/dhtxx.c
@@ -48,10 +48,9 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/signal.h>
-#include <nuttx/semaphore.h>
#include <nuttx/time.h>
#include <nuttx/clock.h>
-
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/dhtxx.h>
/*****************************************************************************
diff --git a/drivers/sensors/kxtj9.c b/drivers/sensors/kxtj9.c
index c34e348..96f5c66 100644
--- a/drivers/sensors/kxtj9.c
+++ b/drivers/sensors/kxtj9.c
@@ -43,7 +43,6 @@
#include <errno.h>
#include <stdlib.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
@@ -51,6 +50,7 @@
#include <nuttx/signal.h>
#include <nuttx/fs/fs.h>
#include <nuttx/i2c/i2c_master.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/kxtj9.h>
#include <nuttx/random.h>
diff --git a/drivers/sensors/lis3dh.c b/drivers/sensors/lis3dh.c
index 050d75b..bd86f03 100644
--- a/drivers/sensors/lis3dh.c
+++ b/drivers/sensors/lis3dh.c
@@ -42,13 +42,12 @@
#include <errno.h>
#include <debug.h>
#include <string.h>
-#include <semaphore.h>
#include <nuttx/kmalloc.h>
#include <nuttx/wqueue.h>
#include <nuttx/random.h>
-
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/lis3dh.h>
#include <nuttx/sensors/ioctl.h>
diff --git a/drivers/sensors/lis3dsh.c b/drivers/sensors/lis3dsh.c
index 35e4a8e..3d3a1c8 100644
--- a/drivers/sensors/lis3dsh.c
+++ b/drivers/sensors/lis3dsh.c
@@ -45,13 +45,12 @@
#include <errno.h>
#include <debug.h>
#include <string.h>
-#include <semaphore.h>
#include <nuttx/kmalloc.h>
#include <nuttx/wqueue.h>
#include <nuttx/random.h>
-
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/lis3dsh.h>
#if defined(CONFIG_SPI) && defined(CONFIG_LIS3DSH)
diff --git a/drivers/sensors/lis3mdl.c b/drivers/sensors/lis3mdl.c
index 351c556..bcd8953 100644
--- a/drivers/sensors/lis3mdl.c
+++ b/drivers/sensors/lis3mdl.c
@@ -43,13 +43,12 @@
#include <errno.h>
#include <debug.h>
#include <string.h>
-#include <semaphore.h>
#include <nuttx/kmalloc.h>
#include <nuttx/wqueue.h>
#include <nuttx/random.h>
-
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/lis3mdl.h>
#if defined(CONFIG_SPI) && defined(CONFIG_SENSORS_LIS3MDL)
diff --git a/drivers/sensors/lsm330_spi.c b/drivers/sensors/lsm330_spi.c
index b269306..a942726 100644
--- a/drivers/sensors/lsm330_spi.c
+++ b/drivers/sensors/lsm330_spi.c
@@ -46,11 +46,10 @@
#include <errno.h>
#include <debug.h>
#include <string.h>
-#include <semaphore.h>
#include <nuttx/kmalloc.h>
-
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/lsm330.h>
/****************************************************************************
diff --git a/drivers/sensors/mlx90393.c b/drivers/sensors/mlx90393.c
index 3cdc281..36684f6 100644
--- a/drivers/sensors/mlx90393.c
+++ b/drivers/sensors/mlx90393.c
@@ -43,12 +43,11 @@
#include <errno.h>
#include <debug.h>
#include <string.h>
-#include <semaphore.h>
#include <nuttx/kmalloc.h>
#include <nuttx/wqueue.h>
-
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/mlx90393.h>
#include <nuttx/random.h>
diff --git a/drivers/sensors/qencoder.c b/drivers/sensors/qencoder.c
index f754ea3..6d45769 100644
--- a/drivers/sensors/qencoder.c
+++ b/drivers/sensors/qencoder.c
@@ -45,7 +45,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
@@ -54,6 +53,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/qencoder.h>
#include <arch/irq.h>
diff --git a/drivers/sensors/xen1210.h b/drivers/sensors/xen1210.h
index 22ac335..5035ce8 100644
--- a/drivers/sensors/xen1210.h
+++ b/drivers/sensors/xen1210.h
@@ -42,11 +42,10 @@
#include <nuttx/config.h>
-#include <semaphore.h>
-
#include <nuttx/wdog.h>
#include <nuttx/clock.h>
#include <nuttx/wqueue.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/xen1210.h>
#if defined(CONFIG_SENSORS_XEN1210)
diff --git a/drivers/sensors/zerocross.c b/drivers/sensors/zerocross.c
index da732ec..9929cec 100644
--- a/drivers/sensors/zerocross.c
+++ b/drivers/sensors/zerocross.c
@@ -45,7 +45,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
@@ -55,6 +54,7 @@
#include <nuttx/arch.h>
#include <nuttx/signal.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/sensors/zerocross.h>
#include <nuttx/irq.h>
diff --git a/drivers/serial/pty.c b/drivers/serial/pty.c
index 8693778..470202f 100644
--- a/drivers/serial/pty.c
+++ b/drivers/serial/pty.c
@@ -88,7 +88,6 @@
#include <stdbool.h>
#include <unistd.h>
#include <sched.h>
-#include <semaphore.h>
#include <termios.h>
#include <stdio.h>
#include <string.h>
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index f6df6e9..2d9a761 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -55,7 +55,6 @@
#include <nuttx/clock.h>
#include <nuttx/sched.h>
#include <nuttx/signal.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/serial/serial.h>
#include <nuttx/fs/ioctl.h>
diff --git a/drivers/serial/serial_dma.c b/drivers/serial/serial_dma.c
index 7e831c9..c549efc 100644
--- a/drivers/serial/serial_dma.c
+++ b/drivers/serial/serial_dma.c
@@ -41,7 +41,6 @@
#include <sys/types.h>
#include <stdint.h>
-#include <semaphore.h>
#include <debug.h>
#include <nuttx/serial/serial.h>
diff --git a/drivers/serial/serial_io.c b/drivers/serial/serial_io.c
index 1bed068..575b90d 100644
--- a/drivers/serial/serial_io.c
+++ b/drivers/serial/serial_io.c
@@ -47,7 +47,6 @@
#include <sys/types.h>
#include <stdint.h>
#include <signal.h>
-#include <semaphore.h>
#include <debug.h>
#include <nuttx/serial/serial.h>
diff --git a/drivers/serial/uart_16550.c b/drivers/serial/uart_16550.c
index a9050ef..ef634d2 100644
--- a/drivers/serial/uart_16550.c
+++ b/drivers/serial/uart_16550.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c
index f228d12..e9314ba 100644
--- a/drivers/spi/spi_bitbang.c
+++ b/drivers/spi/spi_bitbang.c
@@ -39,7 +39,6 @@
#include <nuttx/config.h>
#include <stdlib.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/drivers/spi/spi_driver.c b/drivers/spi/spi_driver.c
index c3b2a57..bdc0c7d 100644
--- a/drivers/spi/spi_driver.c
+++ b/drivers/spi/spi_driver.c
@@ -42,13 +42,13 @@
#include <sys/types.h>
#include <stdbool.h>
#include <stdio.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi_transfer.h>
#ifdef CONFIG_SPI_DRIVER
diff --git a/drivers/syslog/syslog_device.c b/drivers/syslog/syslog_device.c
index 2587213..0036588 100644
--- a/drivers/syslog/syslog_device.c
+++ b/drivers/syslog/syslog_device.c
@@ -47,13 +47,13 @@
#include <string.h>
#include <sched.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <nuttx/arch.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/syslog/syslog.h>
#include "syslog.h"
diff --git a/drivers/timers/oneshot.c b/drivers/timers/oneshot.c
index eb95ce0..e4c047d 100644
--- a/drivers/timers/oneshot.c
+++ b/drivers/timers/oneshot.c
@@ -43,13 +43,13 @@
#include <stdint.h>
#include <stdbool.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <assert.h>
#include <debug.h>
#include <nuttx/kmalloc.h>
#include <nuttx/signal.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/timers/oneshot.h>
#ifdef CONFIG_ONESHOT
diff --git a/drivers/timers/pwm.c b/drivers/timers/pwm.c
index 8e3e081..060082f 100644
--- a/drivers/timers/pwm.c
+++ b/drivers/timers/pwm.c
@@ -45,7 +45,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
diff --git a/drivers/timers/rtc.c b/drivers/timers/rtc.c
index defd8d2..4b62ae3 100644
--- a/drivers/timers/rtc.c
+++ b/drivers/timers/rtc.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <sys/types.h>
-#include <semaphore.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
@@ -50,6 +49,7 @@
#include <nuttx/signal.h>
#include <nuttx/clock.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/timers/rtc.h>
/****************************************************************************
diff --git a/drivers/timers/timer.c b/drivers/timers/timer.c
index 1be1837..3b68f31 100644
--- a/drivers/timers/timer.c
+++ b/drivers/timers/timer.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
@@ -54,6 +53,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/signal.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/timers/timer.h>
#ifdef CONFIG_TIMER
diff --git a/drivers/timers/watchdog.c b/drivers/timers/watchdog.c
index d61098f..c3e6d9d 100644
--- a/drivers/timers/watchdog.c
+++ b/drivers/timers/watchdog.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
@@ -53,6 +52,7 @@
#include <nuttx/irq.h>
#include <nuttx/kmalloc.h>
#include <nuttx/power/pm.h>
+#include <nuttx/semaphore.h>
#include <nuttx/wdog.h>
#include <nuttx/wqueue.h>
#include <nuttx/timers/watchdog.h>
diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c
index f30d866..9db75fa 100644
--- a/drivers/usbdev/cdcacm.c
+++ b/drivers/usbdev/cdcacm.c
@@ -45,7 +45,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <queue.h>
diff --git a/drivers/usbdev/pl2303.c b/drivers/usbdev/pl2303.c
index 61d1021..6850a63 100644
--- a/drivers/usbdev/pl2303.c
+++ b/drivers/usbdev/pl2303.c
@@ -47,7 +47,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <queue.h>
diff --git a/drivers/usbdev/usbmsc.c b/drivers/usbdev/usbmsc.c
index 8c1b013..10340ef 100644
--- a/drivers/usbdev/usbmsc.c
+++ b/drivers/usbdev/usbmsc.c
@@ -75,7 +75,6 @@
#include <nuttx/kmalloc.h>
#include <nuttx/kthread.h>
#include <nuttx/arch.h>
-#include <nuttx/semaphore.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 227a357..b39c2a0 100644
--- a/drivers/usbdev/usbmsc.h
+++ b/drivers/usbdev/usbmsc.h
@@ -48,9 +48,9 @@
#include <stdint.h>
#include <stdbool.h>
#include <queue.h>
-#include <semaphore.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/usb/storage.h>
#include <nuttx/usb/usbdev.h>
diff --git a/drivers/usbhost/usbhost_cdcacm.c b/drivers/usbhost/usbhost_cdcacm.c
index 431b9c9..2152b4a 100644
--- a/drivers/usbhost/usbhost_cdcacm.c
+++ b/drivers/usbhost/usbhost_cdcacm.c
@@ -44,7 +44,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
@@ -55,6 +54,7 @@
#include <nuttx/wqueue.h>
#include <nuttx/clock.h>
#include <nuttx/fs/ioctl.h>
+#include <nuttx/semaphore.h>
#include <nuttx/serial/serial.h>
#include <nuttx/usb/usb.h>
diff --git a/drivers/usbhost/usbhost_hidkbd.c b/drivers/usbhost/usbhost_hidkbd.c
index 0ac3c5b..de7af2b 100644
--- a/drivers/usbhost/usbhost_hidkbd.c
+++ b/drivers/usbhost/usbhost_hidkbd.c
@@ -46,7 +46,6 @@
#include <unistd.h>
#include <string.h>
#include <poll.h>
-#include <semaphore.h>
#include <signal.h>
#include <time.h>
#include <fcntl.h>
diff --git a/drivers/usbhost/usbhost_hidmouse.c b/drivers/usbhost/usbhost_hidmouse.c
index 283b79f..9d69019 100644
--- a/drivers/usbhost/usbhost_hidmouse.c
+++ b/drivers/usbhost/usbhost_hidmouse.c
@@ -44,7 +44,6 @@
#include <stdio.h>
#include <string.h>
#include <poll.h>
-#include <semaphore.h>
#include <signal.h>
#include <fcntl.h>
#include <assert.h>
diff --git a/drivers/usbhost/usbhost_hub.c b/drivers/usbhost/usbhost_hub.c
index 5ac558d..4c31f0f 100644
--- a/drivers/usbhost/usbhost_hub.c
+++ b/drivers/usbhost/usbhost_hub.c
@@ -43,7 +43,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
@@ -54,6 +53,7 @@
#include <nuttx/signal.h>
#include <nuttx/wqueue.h>
#include <nuttx/clock.h>
+#include <nuttx/semaphore.h>
#include <nuttx/usb/usb.h>
#include <nuttx/usb/usbhost.h>
diff --git a/drivers/usbhost/usbhost_max3421e.c b/drivers/usbhost/usbhost_max3421e.c
index 2190947..6267065 100644
--- a/drivers/usbhost/usbhost_max3421e.c
+++ b/drivers/usbhost/usbhost_max3421e.c
@@ -50,7 +50,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
diff --git a/drivers/usbhost/usbhost_skeleton.c b/drivers/usbhost/usbhost_skeleton.c
index a6348d5..b1ee01d 100644
--- a/drivers/usbhost/usbhost_skeleton.c
+++ b/drivers/usbhost/usbhost_skeleton.c
@@ -42,7 +42,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
@@ -51,6 +50,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/fs.h>
#include <nuttx/arch.h>
+#include <nuttx/semaphore.h>
#include <nuttx/wqueue.h>
#include <nuttx/usb/usb.h>
diff --git a/drivers/usbhost/usbhost_storage.c b/drivers/usbhost/usbhost_storage.c
index d23150d..710d43b 100644
--- a/drivers/usbhost/usbhost_storage.c
+++ b/drivers/usbhost/usbhost_storage.c
@@ -43,7 +43,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
@@ -55,6 +54,7 @@
#include <nuttx/wqueue.h>
#include <nuttx/scsi.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/usb/usb.h>
#include <nuttx/usb/usbhost.h>
diff --git a/drivers/usbhost/usbhost_xboxcontroller.c b/drivers/usbhost/usbhost_xboxcontroller.c
index b348610..796c89a 100644
--- a/drivers/usbhost/usbhost_xboxcontroller.c
+++ b/drivers/usbhost/usbhost_xboxcontroller.c
@@ -43,7 +43,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
@@ -56,6 +55,7 @@
#include <nuttx/arch.h>
#include <nuttx/wqueue.h>
#include <nuttx/signal.h>
+#include <nuttx/semaphore.h>
#include <nuttx/usb/usb.h>
#include <nuttx/usb/usbhost.h>
diff --git a/drivers/video/video_framebuff.h b/drivers/video/video_framebuff.h
index aaeaf50..1eeb085 100644
--- a/drivers/video/video_framebuff.h
+++ b/drivers/video/video_framebuff.h
@@ -37,7 +37,7 @@
#define __VIDEO_VIDEO_FRAMEBUFF_H__
#include <nuttx/video/video.h>
-#include <semaphore.h>
+#include <nuttx/semaphore.h>
struct vbuf_container_s
{
diff --git a/drivers/wireless/bluetooth/bt_uart_bcm4343x.c b/drivers/wireless/bluetooth/bt_uart_bcm4343x.c
index 2cdb557..9378769 100644
--- a/drivers/wireless/bluetooth/bt_uart_bcm4343x.c
+++ b/drivers/wireless/bluetooth/bt_uart_bcm4343x.c
@@ -43,7 +43,6 @@
#include <errno.h>
#include <fcntl.h>
#include <poll.h>
-#include <semaphore.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/drivers/wireless/bluetooth/bt_uart_shim.c b/drivers/wireless/bluetooth/bt_uart_shim.c
index 40d3940..a3a666a 100644
--- a/drivers/wireless/bluetooth/bt_uart_shim.c
+++ b/drivers/wireless/bluetooth/bt_uart_shim.c
@@ -43,7 +43,6 @@
#include <errno.h>
#include <fcntl.h>
#include <poll.h>
-#include <semaphore.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/drivers/wireless/gs2200m.c b/drivers/wireless/gs2200m.c
index f02d216..bea69b6 100644
--- a/drivers/wireless/gs2200m.c
+++ b/drivers/wireless/gs2200m.c
@@ -47,7 +47,6 @@
#include <errno.h>
#include <debug.h>
#include <poll.h>
-#include <semaphore.h>
#include <nuttx/ascii.h>
#include <nuttx/arch.h>
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_cdc.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_cdc.c
index 2fa2019..e828c51 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_cdc.c
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_cdc.c
@@ -46,7 +46,6 @@
#include <nuttx/arch.h>
#include <stddef.h>
#include <string.h>
-#include <semaphore.h>
#include "bcmf_driver.h"
#include "bcmf_ioctl.h"
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h
index 810d8e0..d2529be 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h
@@ -38,9 +38,9 @@
#include <stdbool.h>
#include <stdint.h>
-#include <semaphore.h>
#include <nuttx/net/netdev.h>
+#include <nuttx/semaphore.h>
#include <net/if.h>
#include <nuttx/wdog.h>
#include <nuttx/wqueue.h>
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c
index 8ef869e..3dc4fdd 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c
@@ -46,7 +46,6 @@
#include <debug.h>
#include <errno.h>
#include <queue.h>
-#include <semaphore.h>
#include <assert.h>
#include <nuttx/kmalloc.h>
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h
index 8365828..e61ae78 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.h
@@ -45,9 +45,9 @@
#include <stdint.h>
#include <stdbool.h>
#include <queue.h>
-#include <semaphore.h>
#include <nuttx/sdio.h>
+#include <nuttx/semaphore.h>
#include "bcmf_driver.h"
#include "bcmf_sdio_core.h"
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.c
index 2054775..96c36a0 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.c
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.c
@@ -45,10 +45,10 @@
#include <assert.h>
#include <nuttx/arch.h>
+
#include <stddef.h>
#include <string.h>
#include <queue.h>
-#include <semaphore.h>
#include "bcmf_sdio.h"
#include "bcmf_core.h"
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.c
index 3e49de9..b5c60e6 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.c
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.c
@@ -40,13 +40,10 @@
#include <stdint.h>
#include <string.h>
#include <time.h>
-#include <semaphore.h>
#include <debug.h>
#include <stdio.h>
#include <queue.h>
-#include <nuttx/semaphore.h>
-
#include "bcmf_utils.h"
/****************************************************************************
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.h
index 26851bb..a4e9529 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.h
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_utils.h
@@ -41,9 +41,10 @@
****************************************************************************/
#include <stdint.h>
-#include <semaphore.h>
#include <queue.h>
+#include <nuttx/semaphore.h>
+
#define container_of(ptr, type, member) \
(type *)((uint8_t *)(ptr) - offsetof(type, member))
diff --git a/drivers/wireless/ieee802154/at86rf23x/at86rf23x.c b/drivers/wireless/ieee802154/at86rf23x/at86rf23x.c
index b1bde8f..2a5416d 100644
--- a/drivers/wireless/ieee802154/at86rf23x/at86rf23x.c
+++ b/drivers/wireless/ieee802154/at86rf23x/at86rf23x.c
@@ -47,12 +47,12 @@
#include <stdint.h>
#include <string.h>
#include <errno.h>
-#include <semaphore.h>
#include <nuttx/arch.h>
#include <nuttx/kmalloc.h>
#include <nuttx/wqueue.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include <nuttx/wireless/ieee802154/at86rf23x.h>
diff --git a/drivers/wireless/ieee802154/mrf24j40/mrf24j40.c b/drivers/wireless/ieee802154/mrf24j40/mrf24j40.c
index 49f9e38..0603115 100644
--- a/drivers/wireless/ieee802154/mrf24j40/mrf24j40.c
+++ b/drivers/wireless/ieee802154/mrf24j40/mrf24j40.c
@@ -47,14 +47,11 @@
#include <stdint.h>
#include <string.h>
#include <errno.h>
-#include <semaphore.h>
#include <sys/types.h>
#include <nuttx/kmalloc.h>
#include <nuttx/wqueue.h>
-#include <nuttx/semaphore.h>
-
#include <nuttx/mm/iob.h>
#include <nuttx/wireless/ieee802154/mrf24j40.h>
diff --git a/drivers/wireless/ieee802154/mrf24j40/mrf24j40.h b/drivers/wireless/ieee802154/mrf24j40/mrf24j40.h
index b07714c..88e0adb 100644
--- a/drivers/wireless/ieee802154/mrf24j40/mrf24j40.h
+++ b/drivers/wireless/ieee802154/mrf24j40/mrf24j40.h
@@ -44,8 +44,8 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
+#include <nuttx/semaphore.h>
#include <nuttx/wqueue.h>
#include <nuttx/spi/spi.h>
diff --git a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_radif.c b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_radif.c
index a8f4b8e..9d2b828 100644
--- a/drivers/wireless/ieee802154/mrf24j40/mrf24j40_radif.c
+++ b/drivers/wireless/ieee802154/mrf24j40/mrf24j40_radif.c
@@ -46,10 +46,8 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <nuttx/arch.h>
-
#include <nuttx/wireless/ieee802154/ieee802154_radio.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
diff --git a/drivers/wireless/ieee802154/xbee/xbee.c b/drivers/wireless/ieee802154/xbee/xbee.c
index ac5c8c2..1bf7ebf 100644
--- a/drivers/wireless/ieee802154/xbee/xbee.c
+++ b/drivers/wireless/ieee802154/xbee/xbee.c
@@ -45,11 +45,9 @@
#include <stdint.h>
#include <string.h>
#include <errno.h>
-#include <semaphore.h>
#include <nuttx/kmalloc.h>
#include <nuttx/wqueue.h>
-#include <nuttx/semaphore.h>
#include <nuttx/mm/iob.h>
#include "xbee.h"
diff --git a/drivers/wireless/ieee802154/xbee/xbee.h b/drivers/wireless/ieee802154/xbee/xbee.h
index 03545db..8510280 100644
--- a/drivers/wireless/ieee802154/xbee/xbee.h
+++ b/drivers/wireless/ieee802154/xbee/xbee.h
@@ -44,9 +44,9 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <nuttx/wqueue.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
diff --git a/drivers/wireless/ieee802154/xbee/xbee_mac.h b/drivers/wireless/ieee802154/xbee/xbee_mac.h
index 3caf121..6fc1979 100644
--- a/drivers/wireless/ieee802154/xbee/xbee_mac.h
+++ b/drivers/wireless/ieee802154/xbee/xbee_mac.h
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <nuttx/wqueue.h>
#include <nuttx/spi/spi.h>
diff --git a/drivers/wireless/lpwan/sx127x/sx127x.c b/drivers/wireless/lpwan/sx127x/sx127x.c
index 6282878..d799104 100644
--- a/drivers/wireless/lpwan/sx127x/sx127x.c
+++ b/drivers/wireless/lpwan/sx127x/sx127x.c
@@ -44,13 +44,13 @@
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
-#include <semaphore.h>
#include <poll.h>
#include <debug.h>
#include <time.h>
#include <fcntl.h>
#include <nuttx/kmalloc.h>
+#include <nuttx/semaphore.h>
#include <nuttx/signal.h>
#include <nuttx/wqueue.h>
diff --git a/drivers/wireless/nrf24l01.c b/drivers/wireless/nrf24l01.c
index a479948..c5e5949 100644
--- a/drivers/wireless/nrf24l01.c
+++ b/drivers/wireless/nrf24l01.c
@@ -56,12 +56,12 @@
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
-#include <semaphore.h>
#include <poll.h>
#include <debug.h>
#include <fcntl.h>
#include <nuttx/kmalloc.h>
+#include <nuttx/semaphore.h>
#include <nuttx/signal.h>
#ifdef CONFIG_WL_NRF24L01_RXSUPPORT
diff --git a/drivers/wireless/spirit/drivers/spirit_netdev.c b/drivers/wireless/spirit/drivers/spirit_netdev.c
index 3d2d91a..7fac9b5 100644
--- a/drivers/wireless/spirit/drivers/spirit_netdev.c
+++ b/drivers/wireless/spirit/drivers/spirit_netdev.c
@@ -117,10 +117,10 @@
#include <stdint.h>
#include <string.h>
#include <errno.h>
-#include <semaphore.h>
#include <nuttx/arch.h>
#include <nuttx/kmalloc.h>
+#include <nuttx/semaphore.h>
#include <nuttx/wqueue.h>
#include <nuttx/fs/fs.h>
#include <nuttx/mm/iob.h>
diff --git a/fs/aio/aio_initialize.c b/fs/aio/aio_initialize.c
index 0b892c7..090e1e1 100644
--- a/fs/aio/aio_initialize.c
+++ b/fs/aio/aio_initialize.c
@@ -39,12 +39,12 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <queue.h>
#include <nuttx/sched.h>
+#include <nuttx/semaphore.h>
#include "aio/aio.h"
diff --git a/fs/driver/fs_blockproxy.c b/fs/driver/fs_blockproxy.c
index 65141c2..6fd0f53 100644
--- a/fs/driver/fs_blockproxy.c
+++ b/fs/driver/fs_blockproxy.c
@@ -46,7 +46,6 @@
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <assert.h>
@@ -55,6 +54,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#if !defined(CONFIG_DISABLE_MOUNTPOINT) && \
!defined(CONFIG_DISABLE_PSEUDOFS_OPERATIONS)
diff --git a/fs/driver/fs_mtdproxy.c b/fs/driver/fs_mtdproxy.c
index 66bba12..0eab9da 100644
--- a/fs/driver/fs_mtdproxy.c
+++ b/fs/driver/fs_mtdproxy.c
@@ -43,7 +43,6 @@
#include <sys/stat.h>
#include <stdio.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <assert.h>
@@ -51,6 +50,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/mtd/mtd.h>
+#include <nuttx/semaphore.h>
#include "driver/driver.h"
diff --git a/fs/fat/fs_fat32.c b/fs/fat/fs_fat32.c
index 705e504..6373e07 100644
--- a/fs/fat/fs_fat32.c
+++ b/fs/fat/fs_fat32.c
@@ -54,7 +54,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <fcntl.h>
#include <errno.h>
diff --git a/fs/fat/fs_fat32.h b/fs/fat/fs_fat32.h
index 78e2ae9..6da8fc8 100644
--- a/fs/fat/fs_fat32.h
+++ b/fs/fat/fs_fat32.h
@@ -46,11 +46,11 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <time.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs/dirent.h>
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/fs/fat/fs_fat32util.c b/fs/fat/fs_fat32util.c
index 0b718fc..fda4205 100644
--- a/fs/fat/fs_fat32util.c
+++ b/fs/fat/fs_fat32util.c
@@ -52,7 +52,6 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/fs/hostfs/hostfs.c b/fs/hostfs/hostfs.c
index e2cec8b..5409f41 100644
--- a/fs/hostfs/hostfs.c
+++ b/fs/hostfs/hostfs.c
@@ -46,7 +46,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <fcntl.h>
#include <errno.h>
diff --git a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h
index bf50133..2dff01c 100644
--- a/fs/hostfs/hostfs.h
+++ b/fs/hostfs/hostfs.h
@@ -45,7 +45,8 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
+
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/fs/inode/fs_filedetach.c b/fs/inode/fs_filedetach.c
index 61b86b4..8203e49 100644
--- a/fs/inode/fs_filedetach.c
+++ b/fs/inode/fs_filedetach.c
@@ -39,12 +39,12 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <nuttx/sched.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include "inode/inode.h"
diff --git a/fs/inode/fs_files.c b/fs/inode/fs_files.c
index 58bab7a..342de6f 100644
--- a/fs/inode/fs_files.c
+++ b/fs/inode/fs_files.c
@@ -42,13 +42,13 @@
#include <sys/types.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <sched.h>
#include <errno.h>
#include <nuttx/fs/fs.h>
#include <nuttx/kmalloc.h>
+#include <nuttx/semaphore.h>
#include "inode/inode.h"
diff --git a/fs/inode/fs_inode.c b/fs/inode/fs_inode.c
index 5c9423d..6b10870 100644
--- a/fs/inode/fs_inode.c
+++ b/fs/inode/fs_inode.c
@@ -41,11 +41,11 @@
#include <nuttx/config.h>
#include <unistd.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include "inode/inode.h"
diff --git a/fs/mmap/fs_rammap.h b/fs/mmap/fs_rammap.h
index f09e418..bbe7662 100644
--- a/fs/mmap/fs_rammap.h
+++ b/fs/mmap/fs_rammap.h
@@ -45,7 +45,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
-#include <semaphore.h>
+#include <nuttx/semaphore.h>
#ifdef CONFIG_FS_RAMMAP
diff --git a/fs/nfs/nfs_mount.h b/fs/nfs/nfs_mount.h
index 8f1f7be..8984de7 100644
--- a/fs/nfs/nfs_mount.h
+++ b/fs/nfs/nfs_mount.h
@@ -49,6 +49,7 @@
****************************************************************************/
#include <sys/socket.h>
+#include <nuttx/semaphore.h>
#include "rpc.h"
diff --git a/fs/nfs/nfs_util.c b/fs/nfs/nfs_util.c
index c2c2e26..594f6f2 100644
--- a/fs/nfs/nfs_util.c
+++ b/fs/nfs/nfs_util.c
@@ -52,7 +52,6 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/dirent.h>
#include "rpc.h"
diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c
index c02fd8e..6e69a70 100644
--- a/fs/nfs/nfs_vfsops.c
+++ b/fs/nfs/nfs_vfsops.c
@@ -59,7 +59,6 @@
#include <string.h>
#include <fcntl.h>
#include <time.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/fs/nxffs/nxffs.h b/fs/nxffs/nxffs.h
index 32a6483..d1338fa 100644
--- a/fs/nxffs/nxffs.h
+++ b/fs/nxffs/nxffs.h
@@ -48,10 +48,10 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <nuttx/mtd/mtd.h>
#include <nuttx/fs/nxffs.h>
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/fs/nxffs/nxffs_dirent.c b/fs/nxffs/nxffs_dirent.c
index 4c21b1e..90d3b1d 100644
--- a/fs/nxffs/nxffs_dirent.c
+++ b/fs/nxffs/nxffs_dirent.c
@@ -47,7 +47,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/mtd/mtd.h>
#include <nuttx/fs/dirent.h>
diff --git a/fs/nxffs/nxffs_ioctl.c b/fs/nxffs/nxffs_ioctl.c
index aca5bf3..13af4d8 100644
--- a/fs/nxffs/nxffs_ioctl.c
+++ b/fs/nxffs/nxffs_ioctl.c
@@ -46,7 +46,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/mtd/mtd.h>
diff --git a/fs/nxffs/nxffs_read.c b/fs/nxffs/nxffs_read.c
index 80e4ec6..d7a8570 100644
--- a/fs/nxffs/nxffs_read.c
+++ b/fs/nxffs/nxffs_read.c
@@ -48,7 +48,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/mtd/mtd.h>
diff --git a/fs/nxffs/nxffs_stat.c b/fs/nxffs/nxffs_stat.c
index 81c9624..9ac3bea1 100644
--- a/fs/nxffs/nxffs_stat.c
+++ b/fs/nxffs/nxffs_stat.c
@@ -50,7 +50,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/mtd/mtd.h>
diff --git a/fs/nxffs/nxffs_truncate.c b/fs/nxffs/nxffs_truncate.c
index cb51301..c1a73dd 100644
--- a/fs/nxffs/nxffs_truncate.c
+++ b/fs/nxffs/nxffs_truncate.c
@@ -46,8 +46,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
-
#include "nxffs.h"
#ifdef __NO_TRUNCATE_SUPPORT__
diff --git a/fs/nxffs/nxffs_unlink.c b/fs/nxffs/nxffs_unlink.c
index e588503..f80ef16 100644
--- a/fs/nxffs/nxffs_unlink.c
+++ b/fs/nxffs/nxffs_unlink.c
@@ -46,7 +46,6 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/mtd/mtd.h>
diff --git a/fs/nxffs/nxffs_write.c b/fs/nxffs/nxffs_write.c
index 324ee18..6e5a36c 100644
--- a/fs/nxffs/nxffs_write.c
+++ b/fs/nxffs/nxffs_write.c
@@ -48,7 +48,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/mtd/mtd.h>
diff --git a/fs/semaphore/sem_close.c b/fs/semaphore/sem_close.c
index 9b435fe..1e8233d 100644
--- a/fs/semaphore/sem_close.c
+++ b/fs/semaphore/sem_close.c
@@ -39,7 +39,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <sched.h>
#include <errno.h>
diff --git a/fs/semaphore/sem_open.c b/fs/semaphore/sem_open.c
index 4c0fcf5..8aa21a4 100644
--- a/fs/semaphore/sem_open.c
+++ b/fs/semaphore/sem_open.c
@@ -44,7 +44,6 @@
#include <stdarg.h>
#include <stdio.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <string.h>
#include <sched.h>
#include <errno.h>
diff --git a/fs/semaphore/sem_unlink.c b/fs/semaphore/sem_unlink.c
index 0c56e94..fa9ce5f 100644
--- a/fs/semaphore/sem_unlink.c
+++ b/fs/semaphore/sem_unlink.c
@@ -41,13 +41,13 @@
#include <stdbool.h>
#include <stdio.h>
-#include <semaphore.h>
#include <sched.h>
#include <queue.h>
#include <errno.h>
#include <assert.h>
#include <nuttx/kmalloc.h>
+#include <nuttx/semaphore.h>
#include "inode/inode.h"
#include "semaphore/semaphore.h"
diff --git a/fs/smartfs/smartfs.h b/fs/smartfs/smartfs.h
index ddf285d..fe6fd24 100644
--- a/fs/smartfs/smartfs.h
+++ b/fs/smartfs/smartfs.h
@@ -45,10 +45,10 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <nuttx/mtd/mtd.h>
#include <nuttx/fs/smart.h>
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/fs/smartfs/smartfs_smart.c b/fs/smartfs/smartfs_smart.c
index 4d142d0..e9e6905 100644
--- a/fs/smartfs/smartfs_smart.c
+++ b/fs/smartfs/smartfs_smart.c
@@ -46,7 +46,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <fcntl.h>
#include <errno.h>
diff --git a/fs/smartfs/smartfs_utils.c b/fs/smartfs/smartfs_utils.c
index 6b70a23..41ff779 100644
--- a/fs/smartfs/smartfs_utils.c
+++ b/fs/smartfs/smartfs_utils.c
@@ -45,7 +45,6 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/fs/spiffs/src/spiffs_vfs.c b/fs/spiffs/src/spiffs_vfs.c
index 1befd98..812bb80 100644
--- a/fs/spiffs/src/spiffs_vfs.c
+++ b/fs/spiffs/src/spiffs_vfs.c
@@ -51,7 +51,6 @@
#include <string.h>
#include <fcntl.h>
#include <dirent.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <queue.h>
diff --git a/fs/tmpfs/fs_tmpfs.c b/fs/tmpfs/fs_tmpfs.c
index 5700a9f..19f36b4 100644
--- a/fs/tmpfs/fs_tmpfs.c
+++ b/fs/tmpfs/fs_tmpfs.c
@@ -45,7 +45,6 @@
#include <string.h>
#include <fcntl.h>
#include <dirent.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/fs/tmpfs/fs_tmpfs.h b/fs/tmpfs/fs_tmpfs.h
index 8e4b1a3..b96efcb 100644
--- a/fs/tmpfs/fs_tmpfs.h
+++ b/fs/tmpfs/fs_tmpfs.h
@@ -43,9 +43,9 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include <semaphore.h>
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/fs/unionfs/fs_unionfs.c b/fs/unionfs/fs_unionfs.c
index 39a6ac0..c135156 100644
--- a/fs/unionfs/fs_unionfs.c
+++ b/fs/unionfs/fs_unionfs.c
@@ -49,7 +49,6 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <fixedmath.h>
@@ -60,6 +59,7 @@
#include <nuttx/fs/unionfs.h>
#include <nuttx/fs/dirent.h>
#include <nuttx/fs/ioctl.h>
+#include <nuttx/semaphore.h>
#include "inode/inode.h"
diff --git a/fs/userfs/fs_userfs.c b/fs/userfs/fs_userfs.c
index 2d45a8f..7d01df1 100644
--- a/fs/userfs/fs_userfs.c
+++ b/fs/userfs/fs_userfs.c
@@ -48,7 +48,6 @@
#include <stdbool.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
@@ -62,6 +61,7 @@
#include <nuttx/fs/dirent.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/net/net.h>
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/fs/vfs/fs_fdopen.c b/fs/vfs/fs_fdopen.c
index f054d51..a2ba6e1 100644
--- a/fs/vfs/fs_fdopen.c
+++ b/fs/vfs/fs_fdopen.c
@@ -41,11 +41,11 @@
#include <stdio.h>
#include <string.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <errno.h>
#include <nuttx/kmalloc.h>
+#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include <nuttx/net/net.h>
diff --git a/fs/vfs/fs_poll.c b/fs/vfs/fs_poll.c
index dbc04e9..f6098f4 100644
--- a/fs/vfs/fs_poll.c
+++ b/fs/vfs/fs_poll.c
@@ -42,7 +42,6 @@
#include <stdbool.h>
#include <poll.h>
#include <time.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/graphics/nxmu/nxmu.h b/graphics/nxmu/nxmu.h
index 205f63f..315ed65 100644
--- a/graphics/nxmu/nxmu.h
+++ b/graphics/nxmu/nxmu.h
@@ -45,7 +45,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <mqueue.h>
-#include <semaphore.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxmu.h>
diff --git a/graphics/nxmu/nxmu_server.c b/graphics/nxmu/nxmu_server.c
index 2d846cf..47ec68a 100644
--- a/graphics/nxmu/nxmu_server.c
+++ b/graphics/nxmu/nxmu_server.c
@@ -42,7 +42,6 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
-#include <semaphore.h>
#include <mqueue.h>
#include <fcntl.h>
#include <assert.h>
diff --git a/graphics/nxterm/nxterm.h b/graphics/nxterm/nxterm.h
index 27f6011..f2753d2 100644
--- a/graphics/nxterm/nxterm.h
+++ b/graphics/nxterm/nxterm.h
@@ -43,7 +43,6 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include <semaphore.h>
#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
diff --git a/graphics/nxterm/nxterm_redraw.c b/graphics/nxterm/nxterm_redraw.c
index f7d6c5b..ea905cb 100644
--- a/graphics/nxterm/nxterm_redraw.c
+++ b/graphics/nxterm/nxterm_redraw.c
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/graphics/nxterm/nxterm_register.c b/graphics/nxterm/nxterm_register.c
index 31e32d5..507ebff 100644
--- a/graphics/nxterm/nxterm_register.c
+++ b/graphics/nxterm/nxterm_register.c
@@ -48,7 +48,6 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h>
#include "nxterm.h"
diff --git a/graphics/nxterm/nxterm_resize.c b/graphics/nxterm/nxterm_resize.c
index 26bbf8e..3518e7e 100644
--- a/graphics/nxterm/nxterm_resize.c
+++ b/graphics/nxterm/nxterm_resize.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/graphics/nxterm/nxterm_scroll.c b/graphics/nxterm/nxterm_scroll.c
index 56cb25a..bb9bb57 100644
--- a/graphics/nxterm/nxterm_scroll.c
+++ b/graphics/nxterm/nxterm_scroll.c
@@ -44,7 +44,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
diff --git a/graphics/nxterm/nxterm_sem.c b/graphics/nxterm/nxterm_sem.c
index 9b1a705..eab1cda 100644
--- a/graphics/nxterm/nxterm_sem.c
+++ b/graphics/nxterm/nxterm_sem.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <unistd.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/graphics/vnc/server/vnc_fbdev.c b/graphics/vnc/server/vnc_fbdev.c
index 6c21d16..7cc4fe2 100644
--- a/graphics/vnc/server/vnc_fbdev.c
+++ b/graphics/vnc/server/vnc_fbdev.c
@@ -62,7 +62,6 @@
#include <debug.h>
#include <nuttx/kthread.h>
-#include <nuttx/semaphore.h>
#include <nuttx/video/fb.h>
#include <nuttx/video/vnc.h>
diff --git a/graphics/vnc/server/vnc_server.c b/graphics/vnc/server/vnc_server.c
index aaf6c98..e1f5c61 100644
--- a/graphics/vnc/server/vnc_server.c
+++ b/graphics/vnc/server/vnc_server.c
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <stdlib.h>
-#include <semaphore.h>
#include <string.h>
#include <queue.h>
#include <assert.h>
@@ -68,7 +67,6 @@
#include <netinet/in.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include "vnc_server.h"
diff --git a/graphics/vnc/server/vnc_server.h b/graphics/vnc/server/vnc_server.h
index 3bf5216..8543af2 100644
--- a/graphics/vnc/server/vnc_server.h
+++ b/graphics/vnc/server/vnc_server.h
@@ -43,7 +43,6 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include <semaphore.h>
#include <pthread.h>
#include <queue.h>
@@ -53,6 +52,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/nx/nx.h>
#include <nuttx/net/net.h>
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/graphics/vnc/server/vnc_updater.c b/graphics/vnc/server/vnc_updater.c
index 7f06c9a..b80001c 100644
--- a/graphics/vnc/server/vnc_updater.c
+++ b/graphics/vnc/server/vnc_updater.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <string.h>
-#include <semaphore.h>
#include <sched.h>
#include <pthread.h>
#include <queue.h>
@@ -64,8 +63,6 @@
#endif
#include <debug.h>
-#include <nuttx/semaphore.h>
-
#include "vnc_server.h"
/****************************************************************************
diff --git a/include/nuttx/analog/adc.h b/include/nuttx/analog/adc.h
index c1eea3e..6f4f963 100644
--- a/include/nuttx/analog/adc.h
+++ b/include/nuttx/analog/adc.h
@@ -54,8 +54,9 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
+
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#include <nuttx/i2c/i2c_master.h>
diff --git a/include/nuttx/analog/comp.h b/include/nuttx/analog/comp.h
index 4b22da7..7ae1213 100644
--- a/include/nuttx/analog/comp.h
+++ b/include/nuttx/analog/comp.h
@@ -46,8 +46,9 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
+
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
#ifndef CONFIG_DEV_COMP_NPOLLWAITERS
# define CONFIG_DEV_COMP_NPOLLWAITERS 2
diff --git a/include/nuttx/analog/dac.h b/include/nuttx/analog/dac.h
index f51057a..deaf2dd 100644
--- a/include/nuttx/analog/dac.h
+++ b/include/nuttx/analog/dac.h
@@ -53,9 +53,10 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
+
#include <nuttx/fs/fs.h>
#include <nuttx/i2c/i2c_master.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
/****************************************************************************
diff --git a/include/nuttx/analog/opamp.h b/include/nuttx/analog/opamp.h
index a0f3d55..da35752 100644
--- a/include/nuttx/analog/opamp.h
+++ b/include/nuttx/analog/opamp.h
@@ -46,8 +46,9 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
+
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
/************************************************************************************
* Public Types
diff --git a/include/nuttx/audio/audio.h b/include/nuttx/audio/audio.h
index f306cf2..3f1c103 100644
--- a/include/nuttx/audio/audio.h
+++ b/include/nuttx/audio/audio.h
@@ -57,9 +57,10 @@
#include <nuttx/compiler.h>
#include <nuttx/fs/ioctl.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
+
#include <queue.h>
-#include <semaphore.h>
#ifdef CONFIG_AUDIO
diff --git a/include/nuttx/can/can.h b/include/nuttx/can/can.h
index 165204d..7c7bb5c 100644
--- a/include/nuttx/can/can.h
+++ b/include/nuttx/can/can.h
@@ -47,11 +47,11 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <nuttx/list.h>
#include <nuttx/fs/fs.h>
#include <nuttx/fs/ioctl.h>
+#include <nuttx/semaphore.h>
#ifdef CONFIG_CAN_TXREADY
# include <nuttx/wqueue.h>
diff --git a/include/nuttx/drivers/rwbuffer.h b/include/nuttx/drivers/rwbuffer.h
index eb2ced7..89f09e9 100644
--- a/include/nuttx/drivers/rwbuffer.h
+++ b/include/nuttx/drivers/rwbuffer.h
@@ -44,7 +44,8 @@
#include <sys/types.h>
#include <stdint.h>
-#include <semaphore.h>
+
+#include <nuttx/semaphore.h>
#include <nuttx/wqueue.h>
#if defined(CONFIG_DRVR_WRITEBUFFER) || defined(CONFIG_DRVR_READAHEAD)
diff --git a/include/nuttx/mtd/hamming.h b/include/nuttx/mtd/hamming.h
index 706cb12..e745e63 100644
--- a/include/nuttx/mtd/hamming.h
+++ b/include/nuttx/mtd/hamming.h
@@ -50,7 +50,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <nuttx/mtd/mtd.h>
#include <nuttx/mtd/nand_raw.h>
diff --git a/include/nuttx/mtd/nand.h b/include/nuttx/mtd/nand.h
index ab3b737..fd769bb 100644
--- a/include/nuttx/mtd/nand.h
+++ b/include/nuttx/mtd/nand.h
@@ -50,10 +50,10 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <nuttx/mtd/mtd.h>
#include <nuttx/mtd/nand_raw.h>
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/include/nuttx/nx/nxmu.h b/include/nuttx/nx/nxmu.h
index 7c37996..df64573 100644
--- a/include/nuttx/nx/nxmu.h
+++ b/include/nuttx/nx/nxmu.h
@@ -45,7 +45,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <mqueue.h>
-#include <semaphore.h>
#include <nuttx/semaphore.h>
#include <nuttx/nx/nx.h>
diff --git a/include/nuttx/power/battery_charger.h b/include/nuttx/power/battery_charger.h
index e17618b..c67b445 100644
--- a/include/nuttx/power/battery_charger.h
+++ b/include/nuttx/power/battery_charger.h
@@ -43,9 +43,9 @@
#include <nuttx/config.h>
#include <nuttx/fs/ioctl.h>
+#include <nuttx/semaphore.h>
#include <stdbool.h>
-#include <semaphore.h>
#ifdef CONFIG_BATTERY_CHARGER
diff --git a/include/nuttx/power/battery_gauge.h b/include/nuttx/power/battery_gauge.h
index d6bd280..5088c05 100644
--- a/include/nuttx/power/battery_gauge.h
+++ b/include/nuttx/power/battery_gauge.h
@@ -43,9 +43,9 @@
#include <nuttx/config.h>
#include <nuttx/fs/ioctl.h>
+#include <nuttx/semaphore.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <fixedmath.h>
#ifdef CONFIG_BATTERY_GAUGE
diff --git a/include/nuttx/power/motor.h b/include/nuttx/power/motor.h
index b64d6e5..6268171 100644
--- a/include/nuttx/power/motor.h
+++ b/include/nuttx/power/motor.h
@@ -59,6 +59,7 @@
#include <nuttx/compiler.h>
#include <nuttx/power/power_ioctl.h>
+#include <nuttx/semaphore.h>
#ifdef CONFIG_DRIVERS_MOTOR
diff --git a/include/nuttx/power/powerled.h b/include/nuttx/power/powerled.h
index 3994cba..182b9af 100644
--- a/include/nuttx/power/powerled.h
+++ b/include/nuttx/power/powerled.h
@@ -53,6 +53,7 @@
#include <nuttx/compiler.h>
#include <nuttx/power/power_ioctl.h>
+#include <nuttx/semaphore.h>
#ifdef CONFIG_DRIVERS_POWERLED
diff --git a/include/nuttx/power/smps.h b/include/nuttx/power/smps.h
index 3f54a51..23aa2e8 100644
--- a/include/nuttx/power/smps.h
+++ b/include/nuttx/power/smps.h
@@ -61,6 +61,7 @@
#include <nuttx/compiler.h>
#include <nuttx/power/power_ioctl.h>
+#include <nuttx/semaphore.h>
#ifdef CONFIG_DRIVERS_SMPS
diff --git a/include/nuttx/serial/serial.h b/include/nuttx/serial/serial.h
index 2549c3d..410bf37 100644
--- a/include/nuttx/serial/serial.h
+++ b/include/nuttx/serial/serial.h
@@ -45,13 +45,13 @@
#include <sys/types.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#ifdef CONFIG_SERIAL_TERMIOS
# include <termios.h>
#endif
#include <nuttx/fs/fs.h>
+#include <nuttx/semaphore.h>
/************************************************************************************
* Pre-processor Definitions
diff --git a/include/nuttx/spi/spi_bitbang.h b/include/nuttx/spi/spi_bitbang.h
index 15b761c..25392b0 100644
--- a/include/nuttx/spi/spi_bitbang.h
+++ b/include/nuttx/spi/spi_bitbang.h
@@ -42,8 +42,7 @@
#include <nuttx/config.h>
-#include <semaphore.h>
-
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
#ifdef CONFIG_SPI_BITBANG
diff --git a/include/nuttx/usb/usbhost_devaddr.h b/include/nuttx/usb/usbhost_devaddr.h
index 20e6f6f..9909141 100644
--- a/include/nuttx/usb/usbhost_devaddr.h
+++ b/include/nuttx/usb/usbhost_devaddr.h
@@ -50,7 +50,8 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include <semaphore.h>
+
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/include/nuttx/wireless/cc1101.h b/include/nuttx/wireless/cc1101.h
index 0a91aa3..269fe8f 100644
--- a/include/nuttx/wireless/cc1101.h
+++ b/include/nuttx/wireless/cc1101.h
@@ -45,9 +45,9 @@
#include <stdint.h>
#include <stdbool.h>
#include <poll.h>
-#include <semaphore.h>
#include <nuttx/wqueue.h>
+#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
/****************************************************************************
diff --git a/include/nuttx/wireless/ieee802154/ieee802154_radio.h b/include/nuttx/wireless/ieee802154/ieee802154_radio.h
index 89051d8..a9cbe3b 100644
--- a/include/nuttx/wireless/ieee802154/ieee802154_radio.h
+++ b/include/nuttx/wireless/ieee802154/ieee802154_radio.h
@@ -46,7 +46,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
diff --git a/include/nuttx/wqueue.h b/include/nuttx/wqueue.h
index 42d73f7..50d3d0b 100644
--- a/include/nuttx/wqueue.h
+++ b/include/nuttx/wqueue.h
@@ -45,7 +45,6 @@
#include <sys/types.h>
#include <stdint.h>
-#include <semaphore.h>
#include <queue.h>
#include <nuttx/clock.h>
diff --git a/include/stdio.h b/include/stdio.h
index cd8384b..3cc81ae 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -46,7 +46,6 @@
#include <sys/types.h>
#include <stdarg.h>
#include <sched.h>
-#include <semaphore.h>
#include <time.h>
#include <nuttx/fs/fs.h>
diff --git a/libs/libc/audio/lib_buffer.c b/libs/libc/audio/lib_buffer.c
index bc551dc..88fd735 100644
--- a/libs/libc/audio/lib_buffer.c
+++ b/libs/libc/audio/lib_buffer.c
@@ -45,11 +45,9 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/audio/audio.h>
#include <nuttx/usb/audio.h>
@@ -135,7 +133,7 @@ int apb_alloc(FAR struct audio_buf_desc_s *bufdesc)
apb->session = bufdesc->session;
#endif
- nxsem_init(&apb->sem, 0, 1);
+ _SEM_INIT(&apb->sem, 0, 1);
ret = sizeof(struct audio_buf_desc_s);
}
@@ -162,7 +160,7 @@ void apb_free(FAR struct ap_buffer_s *apb)
if (refcount <= 1)
{
audinfo("Freeing %p\n", apb);
- nxsem_destroy(&apb->sem);
+ _SEM_DESTROY(&apb->sem);
lib_ufree(apb);
}
}
diff --git a/libs/libc/misc/lib_filesem.c b/libs/libc/misc/lib_filesem.c
index 247b7b3..25214b9 100644
--- a/libs/libc/misc/lib_filesem.c
+++ b/libs/libc/misc/lib_filesem.c
@@ -41,7 +41,6 @@
#include <sys/types.h>
#include <unistd.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
diff --git a/libs/libc/misc/lib_streamsem.c b/libs/libc/misc/lib_streamsem.c
index 11f0f6f..3b23482 100644
--- a/libs/libc/misc/lib_streamsem.c
+++ b/libs/libc/misc/lib_streamsem.c
@@ -42,7 +42,6 @@
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#include <semaphore.h>
#include <errno.h>
#include <nuttx/semaphore.h>
diff --git a/libs/libc/modlib/modlib_registry.c b/libs/libc/modlib/modlib_registry.c
index 384e3e3..d97ec38 100644
--- a/libs/libc/modlib/modlib_registry.c
+++ b/libs/libc/modlib/modlib_registry.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <string.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
diff --git a/libs/libc/netdb/lib_dnsinit.c b/libs/libc/netdb/lib_dnsinit.c
index 4ff9689..5e1ebbf 100644
--- a/libs/libc/netdb/lib_dnsinit.c
+++ b/libs/libc/netdb/lib_dnsinit.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
diff --git a/libs/libc/pthread/pthread_condinit.c b/libs/libc/pthread/pthread_condinit.c
index 896c5b5..b01e782 100644
--- a/libs/libc/pthread/pthread_condinit.c
+++ b/libs/libc/pthread/pthread_condinit.c
@@ -44,8 +44,6 @@
#include <debug.h>
#include <errno.h>
-#include <nuttx/semaphore.h>
-
/****************************************************************************
* Public Functions
****************************************************************************/
diff --git a/libs/libc/pthread/pthread_rwlock.c b/libs/libc/pthread/pthread_rwlock.c
index 11388b3..d9e915b 100644
--- a/libs/libc/pthread/pthread_rwlock.c
+++ b/libs/libc/pthread/pthread_rwlock.c
@@ -44,8 +44,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
-
/****************************************************************************
* Public Functions
****************************************************************************/
diff --git a/libs/libc/pthread/pthread_rwlock_rdlock.c b/libs/libc/pthread/pthread_rwlock_rdlock.c
index 20553b6..48fe5c6 100644
--- a/libs/libc/pthread/pthread_rwlock_rdlock.c
+++ b/libs/libc/pthread/pthread_rwlock_rdlock.c
@@ -44,8 +44,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
-
/****************************************************************************
* Private Functions
****************************************************************************/
diff --git a/libs/libc/pthread/pthread_rwlock_wrlock.c b/libs/libc/pthread/pthread_rwlock_wrlock.c
index e5c65f9..520ded4 100644
--- a/libs/libc/pthread/pthread_rwlock_wrlock.c
+++ b/libs/libc/pthread/pthread_rwlock_wrlock.c
@@ -44,8 +44,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
-
/****************************************************************************
* Private Functions
****************************************************************************/
diff --git a/libs/libc/semaphore/sem_getvalue.c b/libs/libc/semaphore/sem_getvalue.c
index 3f83405..41503a3 100644
--- a/libs/libc/semaphore/sem_getvalue.c
+++ b/libs/libc/semaphore/sem_getvalue.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <sys/types.h>
-#include <semaphore.h>
#include <errno.h>
#include <nuttx/semaphore.h>
diff --git a/libs/libc/semaphore/sem_init.c b/libs/libc/semaphore/sem_init.c
index 786f1f7..a5c916e 100644
--- a/libs/libc/semaphore/sem_init.c
+++ b/libs/libc/semaphore/sem_init.c
@@ -41,7 +41,6 @@
#include <sys/types.h>
#include <limits.h>
-#include <semaphore.h>
#include <errno.h>
#include <nuttx/semaphore.h>
diff --git a/libs/libc/stdio/lib_vfprintf.c b/libs/libc/stdio/lib_vfprintf.c
index 9f4063a..a014d36 100644
--- a/libs/libc/stdio/lib_vfprintf.c
+++ b/libs/libc/stdio/lib_vfprintf.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <stdio.h>
-#include <semaphore.h>
#include "libc.h"
diff --git a/libs/libc/stdio/lib_vfscanf.c b/libs/libc/stdio/lib_vfscanf.c
index 044632d..d07b23d 100644
--- a/libs/libc/stdio/lib_vfscanf.c
+++ b/libs/libc/stdio/lib_vfscanf.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <stdio.h>
-#include <semaphore.h>
#include <nuttx/streams.h>
diff --git a/libs/libc/stdio/lib_vsscanf.c b/libs/libc/stdio/lib_vsscanf.c
index 298ea13..979a019 100644
--- a/libs/libc/stdio/lib_vsscanf.c
+++ b/libs/libc/stdio/lib_vsscanf.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <stdio.h>
-#include <semaphore.h>
#include <nuttx/streams.h>
diff --git a/libs/libc/stdlib/lib_mkstemp.c b/libs/libc/stdlib/lib_mkstemp.c
index 2d1c198..83696e9 100644
--- a/libs/libc/stdlib/lib_mkstemp.c
+++ b/libs/libc/stdlib/lib_mkstemp.c
@@ -45,7 +45,6 @@
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <nuttx/semaphore.h>
diff --git a/libs/libc/userfs/lib_userfs.c b/libs/libc/userfs/lib_userfs.c
index b6041b0..2800220 100644
--- a/libs/libc/userfs/lib_userfs.c
+++ b/libs/libc/userfs/lib_userfs.c
@@ -47,7 +47,6 @@
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
@@ -55,6 +54,7 @@
#include <netinet/in.h>
#include <nuttx/fs/userfs.h>
+#include <nuttx/semaphore.h>
/****************************************************************************
* Private Types
@@ -97,7 +97,7 @@ static inline uint16_t userfs_server_portno(void)
{
int ret;
- ret = nxsem_wait(&g_userfs_exclsem);
+ ret = _SEM_WAIT(&g_userfs_exclsem);
if (ret >= 0)
{
/* Get the next instance number.
@@ -108,7 +108,7 @@ static inline uint16_t userfs_server_portno(void)
*/
ret = USERFS_SERVER_PORTBASE | g_userfs_next_instance++;
- nxsem_post(&g_userfs_exclsem);
+ _SEM_POST(&g_userfs_exclsem);
}
return ret;
diff --git a/libs/libc/wqueue/work_lock.c b/libs/libc/wqueue/work_lock.c
index ef10e15..90612f2 100644
--- a/libs/libc/wqueue/work_lock.c
+++ b/libs/libc/wqueue/work_lock.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <pthread.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/libs/libnx/nxcontext.h b/libs/libnx/nxcontext.h
index d4827253..910c9cc 100644
--- a/libs/libnx/nxcontext.h
+++ b/libs/libnx/nxcontext.h
@@ -46,7 +46,6 @@
#include <stdbool.h>
#include <stdio.h>
#include <limits.h>
-#include <semaphore.h>
#include <nuttx/streams.h>
diff --git a/libs/libnx/nxfonts/nxfonts_cache.c b/libs/libnx/nxfonts/nxfonts_cache.c
index bca20ef..c23c581 100644
--- a/libs/libnx/nxfonts/nxfonts_cache.c
+++ b/libs/libnx/nxfonts/nxfonts_cache.c
@@ -41,7 +41,6 @@
#include <sys/types.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
@@ -755,7 +754,7 @@ FCACHE nxf_cache_connect(enum nx_fontid_e fontid,
/* Initialize the mutual exclusion semaphore */
- nxsem_init(&priv->fsem, 0, 1);
+ _SEM_INIT(&priv->fsem, 0, 1);
/* Add the new font cache to the list of font caches */
diff --git a/libs/libnx/nxmu/nx_connect.c b/libs/libnx/nxmu/nx_connect.c
index 210b6ba..018410d 100644
--- a/libs/libnx/nxmu/nx_connect.c
+++ b/libs/libnx/nxmu/nx_connect.c
@@ -43,13 +43,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <mqueue.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/signal.h>
-#include <nuttx/semaphore.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxmu.h>
diff --git a/libs/libnx/nxmu/nx_getrectangle.c b/libs/libnx/nxmu/nx_getrectangle.c
index cc92506..2eb2c41 100644
--- a/libs/libnx/nxmu/nx_getrectangle.c
+++ b/libs/libnx/nxmu/nx_getrectangle.c
@@ -116,7 +116,7 @@ int nx_getrectangle(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
* priority inheritance enabled.
*/
- nxsem_setprotocol(&sem_done, SEM_PRIO_NONE);
+ _SEM_SETPROTOCOL(&sem_done, SEM_PRIO_NONE);
/* Forward the fill command to the server */
diff --git a/libs/libnx/nxmu/nxmu_semtake.c b/libs/libnx/nxmu/nxmu_semtake.c
index b2126a8..c9a523e 100644
--- a/libs/libnx/nxmu/nxmu_semtake.c
+++ b/libs/libnx/nxmu/nxmu_semtake.c
@@ -44,7 +44,6 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxmu.h>
diff --git a/libs/libnx/nxtk/nxtk_events.c b/libs/libnx/nxtk/nxtk_events.c
index 89aaa2e..78bb6d7 100644
--- a/libs/libnx/nxtk/nxtk_events.c
+++ b/libs/libnx/nxtk/nxtk_events.c
@@ -43,7 +43,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
#include <assert.h>
diff --git a/libs/libnx/nxtk/nxtk_setsubwindows.c b/libs/libnx/nxtk/nxtk_setsubwindows.c
index 698fc63..1f2cc69 100644
--- a/libs/libnx/nxtk/nxtk_setsubwindows.c
+++ b/libs/libnx/nxtk/nxtk_setsubwindows.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <stdlib.h>
-#include <semaphore.h>
#include <debug.h>
#include <errno.h>
diff --git a/mm/iob/iob.h b/mm/iob/iob.h
index 9604ba8..dbbfec4 100644
--- a/mm/iob/iob.h
+++ b/mm/iob/iob.h
@@ -42,10 +42,10 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <debug.h>
#include <nuttx/mm/iob.h>
+#include <nuttx/semaphore.h>
#ifdef CONFIG_MM_IOB
diff --git a/mm/iob/iob_alloc.c b/mm/iob/iob_alloc.c
index 3aa995f..942ae27 100644
--- a/mm/iob/iob_alloc.c
+++ b/mm/iob/iob_alloc.c
@@ -39,7 +39,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/mm/iob/iob_alloc_qentry.c b/mm/iob/iob_alloc_qentry.c
index 1c96928..699040e 100644
--- a/mm/iob/iob_alloc_qentry.c
+++ b/mm/iob/iob_alloc_qentry.c
@@ -39,7 +39,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/mm/iob/iob_free.c b/mm/iob/iob_free.c
index fdee7cf..6e78392 100644
--- a/mm/iob/iob_free.c
+++ b/mm/iob/iob_free.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <debug.h>
diff --git a/mm/iob/iob_free_qentry.c b/mm/iob/iob_free_qentry.c
index e08daee..fc6de92 100644
--- a/mm/iob/iob_free_qentry.c
+++ b/mm/iob/iob_free_qentry.c
@@ -39,7 +39,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <assert.h>
#include <nuttx/irq.h>
diff --git a/mm/iob/iob_initialize.c b/mm/iob/iob_initialize.c
index f0d54fa..4837635 100644
--- a/mm/iob/iob_initialize.c
+++ b/mm/iob/iob_initialize.c
@@ -41,7 +41,6 @@
#include <stdbool.h>
-#include <nuttx/semaphore.h>
#include <nuttx/mm/iob.h>
#include "iob.h"
diff --git a/mm/iob/iob_navail.c b/mm/iob/iob_navail.c
index 7592613..e610484 100644
--- a/mm/iob/iob_navail.c
+++ b/mm/iob/iob_navail.c
@@ -41,7 +41,6 @@
#include <stdbool.h>
-#include <nuttx/semaphore.h>
#include <nuttx/mm/iob.h>
#include "iob.h"
diff --git a/mm/mm_gran/mm_gran.h b/mm/mm_gran/mm_gran.h
index a252e6a..154ba10 100644
--- a/mm/mm_gran/mm_gran.h
+++ b/mm/mm_gran/mm_gran.h
@@ -43,10 +43,10 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include <semaphore.h>
#include <arch/types.h>
#include <nuttx/mm/gran.h>
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/mm/mm_gran/mm_grancritical.c b/mm/mm_gran/mm_grancritical.c
index 8dc9648..0f5a4b7 100644
--- a/mm/mm_gran/mm_grancritical.c
+++ b/mm/mm_gran/mm_grancritical.c
@@ -43,7 +43,6 @@
#include <assert.h>
#include <errno.h>
-#include <nuttx/semaphore.h>
#include <nuttx/irq.h>
#include <nuttx/mm/gran.h>
diff --git a/mm/mm_heap/mm_sem.c b/mm/mm_heap/mm_sem.c
index 4f6d1d9..1b8f772 100644
--- a/mm/mm_heap/mm_sem.c
+++ b/mm/mm_heap/mm_sem.c
@@ -41,7 +41,6 @@
#include <nuttx/config.h>
#include <unistd.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
diff --git a/mm/shm/shm.h b/mm/shm/shm.h
index 4bd3bf3..2a87e46 100644
--- a/mm/shm/shm.h
+++ b/mm/shm/shm.h
@@ -45,9 +45,9 @@
#include <sys/ipc.h>
#include <sys/shm.h>
#include <stdint.h>
-#include <semaphore.h>
#include <nuttx/addrenv.h>
+#include <nuttx/semaphore.h>
#ifdef CONFIG_MM_SHM
diff --git a/mm/shm/shmctl.c b/mm/shm/shmctl.c
index 34e4dfe..9fc71d8 100644
--- a/mm/shm/shmctl.c
+++ b/mm/shm/shmctl.c
@@ -43,7 +43,6 @@
#include <sys/ipc.h>
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <time.h>
#include <errno.h>
#include <assert.h>
diff --git a/mm/shm/shmget.c b/mm/shm/shmget.c
index 1fc1c10..467d1e6 100644
--- a/mm/shm/shmget.c
+++ b/mm/shm/shmget.c
@@ -42,7 +42,6 @@
#include <sys/shm.h>
#include <sys/ipc.h>
#include <unistd.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
diff --git a/net/arp/arp.h b/net/arp/arp.h
index 3214b36..9390098 100644
--- a/net/arp/arp.h
+++ b/net/arp/arp.h
@@ -53,13 +53,13 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include <semaphore.h>
#include <queue.h>
#include <errno.h>
#include <netinet/in.h>
#include <nuttx/net/netdev.h>
+#include <nuttx/semaphore.h>
/****************************************************************************
* Pre-processor Definitions
diff --git a/net/arp/arp_notify.c b/net/arp/arp_notify.c
index 4176b9c..4cbd2b0 100644
--- a/net/arp/arp_notify.c
+++ b/net/arp/arp_notify.c
@@ -39,7 +39,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
@@ -47,7 +46,6 @@
#include <netinet/in.h>
#include <nuttx/irq.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include "arp/arp.h"
diff --git a/net/arp/arp_send.c b/net/arp/arp_send.c
index f3696ef..c52c38a 100644
--- a/net/arp/arp_send.c
+++ b/net/arp/arp_send.c
@@ -41,13 +41,11 @@
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <debug.h>
#include <netinet/in.h>
#include <net/if.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/ip.h>
diff --git a/net/bluetooth/bluetooth_conn.c b/net/bluetooth/bluetooth_conn.c
index 372cdbb..bef7fbf 100644
--- a/net/bluetooth/bluetooth_conn.c
+++ b/net/bluetooth/bluetooth_conn.c
@@ -37,7 +37,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <errno.h>
diff --git a/net/bluetooth/bluetooth_container.c b/net/bluetooth/bluetooth_container.c
index ff78734..a4a81f1 100644
--- a/net/bluetooth/bluetooth_container.c
+++ b/net/bluetooth/bluetooth_container.c
@@ -42,7 +42,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/net/icmp/icmp_sendto.c b/net/icmp/icmp_sendto.c
index 5cf638e..f11dd6e 100644
--- a/net/icmp/icmp_sendto.c
+++ b/net/icmp/icmp_sendto.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <debug.h>
diff --git a/net/icmpv6/icmpv6.h b/net/icmpv6/icmpv6.h
index c82b53d..a0cdf47 100644
--- a/net/icmpv6/icmpv6.h
+++ b/net/icmpv6/icmpv6.h
@@ -44,13 +44,13 @@
#include <sys/types.h>
#include <stdint.h>
-#include <semaphore.h>
#include <queue.h>
#include <assert.h>
#include <nuttx/mm/iob.h>
#include <nuttx/net/ip.h>
#include <nuttx/net/netdev.h>
+#include <nuttx/semaphore.h>
#if defined(CONFIG_NET_ICMPv6) && !defined(CONFIG_NET_ICMPv6_NO_STACK)
diff --git a/net/icmpv6/icmpv6_neighbor.c b/net/icmpv6/icmpv6_neighbor.c
index 359fa1d..a57d7a1 100644
--- a/net/icmpv6/icmpv6_neighbor.c
+++ b/net/icmpv6/icmpv6_neighbor.c
@@ -41,7 +41,6 @@
#include <unistd.h>
#include <string.h>
-#include <semaphore.h>
#include <debug.h>
#include <netinet/in.h>
diff --git a/net/icmpv6/icmpv6_notify.c b/net/icmpv6/icmpv6_notify.c
index f883a35..a394a06 100644
--- a/net/icmpv6/icmpv6_notify.c
+++ b/net/icmpv6/icmpv6_notify.c
@@ -40,14 +40,12 @@
#include <nuttx/config.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <netinet/in.h>
#include <nuttx/irq.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include "icmpv6/icmpv6.h"
diff --git a/net/icmpv6/icmpv6_poll.c b/net/icmpv6/icmpv6_poll.c
index f50fd6a..9c21be8 100644
--- a/net/icmpv6/icmpv6_poll.c
+++ b/net/icmpv6/icmpv6_poll.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#if defined(CONFIG_NET_ICMPv6_SOCKET) || defined(CONFIG_NET_ICMPv6_NEIGHBOR)
-#include <semaphore.h>
#include <debug.h>
#include <nuttx/net/netconfig.h>
diff --git a/net/icmpv6/icmpv6_rnotify.c b/net/icmpv6/icmpv6_rnotify.c
index d6ff6fa..e69be2a 100644
--- a/net/icmpv6/icmpv6_rnotify.c
+++ b/net/icmpv6/icmpv6_rnotify.c
@@ -40,14 +40,12 @@
#include <nuttx/config.h>
#include <string.h>
-#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <netinet/in.h>
#include <nuttx/irq.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/netdev.h>
diff --git a/net/icmpv6/icmpv6_sendto.c b/net/icmpv6/icmpv6_sendto.c
index 2d17a98..02ea696 100644
--- a/net/icmpv6/icmpv6_sendto.c
+++ b/net/icmpv6/icmpv6_sendto.c
@@ -44,7 +44,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <debug.h>
diff --git a/net/ieee802154/ieee802154_conn.c b/net/ieee802154/ieee802154_conn.c
index 4ae52f5..0d28bf8 100644
--- a/net/ieee802154/ieee802154_conn.c
+++ b/net/ieee802154/ieee802154_conn.c
@@ -37,7 +37,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <errno.h>
diff --git a/net/ieee802154/ieee802154_container.c b/net/ieee802154/ieee802154_container.c
index a3b069d..ad8b9b8 100644
--- a/net/ieee802154/ieee802154_container.c
+++ b/net/ieee802154/ieee802154_container.c
@@ -42,7 +42,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/net/local/local.h b/net/local/local.h
index 4eb0aaa..426602e 100644
--- a/net/local/local.h
+++ b/net/local/local.h
@@ -46,13 +46,13 @@
#include <sys/un.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <queue.h>
#include <stdint.h>
#include <poll.h>
#include <nuttx/fs/fs.h>
#include <nuttx/net/net.h>
+#include <nuttx/semaphore.h>
#ifdef CONFIG_NET_LOCAL
diff --git a/net/local/local_accept.c b/net/local/local_accept.c
index e847f1c..8f03700 100644
--- a/net/local/local_accept.c
+++ b/net/local/local_accept.c
@@ -46,7 +46,6 @@
#include <queue.h>
#include <debug.h>
-#include <nuttx/semaphore.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 918835d..d4c506d 100644
--- a/net/local/local_conn.c
+++ b/net/local/local_conn.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL)
-#include <semaphore.h>
#include <string.h>
#include <assert.h>
#include <errno.h>
@@ -48,7 +47,6 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/semaphore.h>
#include "local/local.h"
diff --git a/net/local/local_connect.c b/net/local/local_connect.c
index 5df1700..1ad4c29 100644
--- a/net/local/local_connect.c
+++ b/net/local/local_connect.c
@@ -46,7 +46,6 @@
#include <queue.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <arch/irq.h>
diff --git a/net/local/local_release.c b/net/local/local_release.c
index 425c9e1..4190f97 100644
--- a/net/local/local_release.c
+++ b/net/local/local_release.c
@@ -40,12 +40,10 @@
#include <nuttx/config.h>
#if defined(CONFIG_NET) && defined(CONFIG_NET_LOCAL)
-#include <semaphore.h>
#include <errno.h>
#include <queue.h>
#include <assert.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <arch/irq.h>
diff --git a/net/mld/mld.h b/net/mld/mld.h
index e43f124..36ec393 100644
--- a/net/mld/mld.h
+++ b/net/mld/mld.h
@@ -108,9 +108,9 @@
#include <sys/types.h>
#include <queue.h>
-#include <semaphore.h>
#include <debug.h>
+#include <nuttx/semaphore.h>
#include <nuttx/wqueue.h>
#include <nuttx/net/ip.h>
diff --git a/net/mld/mld_group.c b/net/mld/mld_group.c
index f1c0f34..364fd15 100644
--- a/net/mld/mld_group.c
+++ b/net/mld/mld_group.c
@@ -49,7 +49,6 @@
#include <nuttx/arch.h>
#include <nuttx/wdog.h>
#include <nuttx/kmalloc.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/ip.h>
diff --git a/net/mld/mld_poll.c b/net/mld/mld_poll.c
index e9caf7d..bc04cc2 100644
--- a/net/mld/mld_poll.c
+++ b/net/mld/mld_poll.c
@@ -40,7 +40,6 @@
#include <assert.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/netconfig.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/netstats.h>
diff --git a/net/netdev/netdev_carrier.c b/net/netdev/netdev_carrier.c
index 771352a..ffccd8a 100644
--- a/net/netdev/netdev_carrier.c
+++ b/net/netdev/netdev_carrier.c
@@ -41,7 +41,6 @@
#include <sys/socket.h>
#include <stdio.h>
-#include <semaphore.h>
#include <assert.h>
#include <string.h>
#include <errno.h>
diff --git a/net/netdev/netdev_register.c b/net/netdev/netdev_register.c
index ec1d227..3b00ee6 100644
--- a/net/netdev/netdev_register.c
+++ b/net/netdev/netdev_register.c
@@ -42,7 +42,6 @@
#include <sys/socket.h>
#include <stdio.h>
-#include <semaphore.h>
#include <assert.h>
#include <string.h>
#include <errno.h>
diff --git a/net/netdev/netdev_unregister.c b/net/netdev/netdev_unregister.c
index aeb43dc..7830135 100644
--- a/net/netdev/netdev_unregister.c
+++ b/net/netdev/netdev_unregister.c
@@ -41,7 +41,6 @@
#include <sys/socket.h>
#include <stdio.h>
-#include <semaphore.h>
#include <assert.h>
#include <string.h>
#include <errno.h>
diff --git a/net/netlink/netlink.h b/net/netlink/netlink.h
index 9232f87..f7012c1 100644
--- a/net/netlink/netlink.h
+++ b/net/netlink/netlink.h
@@ -44,11 +44,11 @@
#include <sys/types.h>
#include <queue.h>
-#include <semaphore.h>
#include <poll.h>
#include <netpacket/netlink.h>
#include <nuttx/net/netlink.h>
+#include <nuttx/semaphore.h>
#include "devif/devif.h"
#include "socket/socket.h"
diff --git a/net/route/net_cacheroute.c b/net/route/net_cacheroute.c
index 96d5ad4..5e97871 100644
--- a/net/route/net_cacheroute.c
+++ b/net/route/net_cacheroute.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/net/route/net_fileroute.c b/net/route/net_fileroute.c
index 13ce42a..40b91de 100644
--- a/net/route/net_fileroute.c
+++ b/net/route/net_fileroute.c
@@ -42,7 +42,6 @@
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
diff --git a/net/sixlowpan/sixlowpan_reassbuf.c b/net/sixlowpan/sixlowpan_reassbuf.c
index 4e124e0..7cd36ab 100644
--- a/net/sixlowpan/sixlowpan_reassbuf.c
+++ b/net/sixlowpan/sixlowpan_reassbuf.c
@@ -42,7 +42,6 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/net/sixlowpan/sixlowpan_send.c b/net/sixlowpan/sixlowpan_send.c
index fe9b102..ad9528a 100644
--- a/net/sixlowpan/sixlowpan_send.c
+++ b/net/sixlowpan/sixlowpan_send.c
@@ -39,7 +39,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
diff --git a/net/sixlowpan/sixlowpan_tcpsend.c b/net/sixlowpan/sixlowpan_tcpsend.c
index dc7b51c..a7ff900 100644
--- a/net/sixlowpan/sixlowpan_tcpsend.c
+++ b/net/sixlowpan/sixlowpan_tcpsend.c
@@ -44,10 +44,10 @@
#include <errno.h>
#include <debug.h>
-#include "nuttx/semaphore.h"
-#include "nuttx/net/netdev.h"
-#include "nuttx/net/radiodev.h"
-#include "nuttx/net/netstats.h"
+#include <nuttx/semaphore.h>
+#include <nuttx/net/netdev.h>
+#include <nuttx/net/radiodev.h>
+#include <nuttx/net/netstats.h>
#include "netdev/netdev.h"
#include "devif/devif.h"
diff --git a/net/tcp/tcp_accept.c b/net/tcp/tcp_accept.c
index 1b74d8e..94a9b90 100644
--- a/net/tcp/tcp_accept.c
+++ b/net/tcp/tcp_accept.c
@@ -43,7 +43,6 @@
#include <sys/types.h>
#include <sys/socket.h>
-#include <semaphore.h>
#include <string.h>
#include <errno.h>
#include <assert.h>
diff --git a/net/tcp/tcp_sendfile.c b/net/tcp/tcp_sendfile.c
index d5cbba0..cba883f 100644
--- a/net/tcp/tcp_sendfile.c
+++ b/net/tcp/tcp_sendfile.c
@@ -582,7 +582,7 @@ errout_datacb:
errout_locked:
- nxsem_destroy(&state. snd_sem);
+ nxsem_destroy(&state.snd_sem);
net_unlock();
if (ret < 0)
diff --git a/net/tcp/tcp_txdrain.c b/net/tcp/tcp_txdrain.c
index 3c90470..d5ff3b2 100644
--- a/net/tcp/tcp_txdrain.c
+++ b/net/tcp/tcp_txdrain.c
@@ -40,11 +40,12 @@
#include <nuttx/config.h>
#include <sys/types.h>
-#include <semaphore.h>
#include <sched.h>
#include <assert.h>
#include <errno.h>
+#include <nuttx/semaphore.h>
+
#include "tcp/tcp.h"
#if defined(CONFIG_NET_TCP_WRITE_BUFFERS) && defined(CONFIG_NET_TCP_NOTIFIER)
diff --git a/net/udp/udp_txdrain.c b/net/udp/udp_txdrain.c
index 162935b..d425397 100644
--- a/net/udp/udp_txdrain.c
+++ b/net/udp/udp_txdrain.c
@@ -40,11 +40,12 @@
#include <nuttx/config.h>
#include <sys/types.h>
-#include <semaphore.h>
#include <sched.h>
#include <assert.h>
#include <errno.h>
+#include <nuttx/semaphore.h>
+
#include "udp/udp.h"
#if defined(CONFIG_NET_UDP_WRITE_BUFFERS) && defined(CONFIG_NET_UDP_NOTIFIER)
diff --git a/net/usrsock/usrsock.h b/net/usrsock/usrsock.h
index 1bacb9c..d480db2 100644
--- a/net/usrsock/usrsock.h
+++ b/net/usrsock/usrsock.h
@@ -47,7 +47,8 @@
#include <sys/types.h>
#include <sys/uio.h>
#include <queue.h>
-#include <semaphore.h>
+
+#include <nuttx/semaphore.h>
#include "devif/devif.h"
#include "socket/socket.h"
diff --git a/net/usrsock/usrsock_accept.c b/net/usrsock/usrsock_accept.c
index 707ae8a..38357ee 100644
--- a/net/usrsock/usrsock_accept.c
+++ b/net/usrsock/usrsock_accept.c
@@ -44,7 +44,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_bind.c b/net/usrsock/usrsock_bind.c
index fad6fe3..e9d508f 100644
--- a/net/usrsock/usrsock_bind.c
+++ b/net/usrsock/usrsock_bind.c
@@ -49,7 +49,6 @@
#include <arch/irq.h>
#include <sys/socket.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_close.c b/net/usrsock/usrsock_close.c
index 651174c..15e5188 100644
--- a/net/usrsock/usrsock_close.c
+++ b/net/usrsock/usrsock_close.c
@@ -49,7 +49,6 @@
#include <arch/irq.h>
#include <sys/socket.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_connect.c b/net/usrsock/usrsock_connect.c
index 7ebd904..4197f41 100644
--- a/net/usrsock/usrsock_connect.c
+++ b/net/usrsock/usrsock_connect.c
@@ -49,7 +49,6 @@
#include <arch/irq.h>
#include <sys/socket.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_event.c b/net/usrsock/usrsock_event.c
index f05df9e..62f307c 100644
--- a/net/usrsock/usrsock_event.c
+++ b/net/usrsock/usrsock_event.c
@@ -49,7 +49,6 @@
#include <arch/irq.h>
#include <sys/socket.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_getpeername.c b/net/usrsock/usrsock_getpeername.c
index 3518d16..2b884d0 100644
--- a/net/usrsock/usrsock_getpeername.c
+++ b/net/usrsock/usrsock_getpeername.c
@@ -49,7 +49,6 @@
#include <arch/irq.h>
#include <sys/socket.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_getsockname.c b/net/usrsock/usrsock_getsockname.c
index 47931b0..ce2b44e 100644
--- a/net/usrsock/usrsock_getsockname.c
+++ b/net/usrsock/usrsock_getsockname.c
@@ -49,7 +49,6 @@
#include <arch/irq.h>
#include <sys/socket.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_getsockopt.c b/net/usrsock/usrsock_getsockopt.c
index cc91165..e8b4d9c 100644
--- a/net/usrsock/usrsock_getsockopt.c
+++ b/net/usrsock/usrsock_getsockopt.c
@@ -50,7 +50,6 @@
#include <arch/irq.h>
#include <sys/socket.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_ioctl.c b/net/usrsock/usrsock_ioctl.c
index 4f5b225..f881ed6 100644
--- a/net/usrsock/usrsock_ioctl.c
+++ b/net/usrsock/usrsock_ioctl.c
@@ -47,7 +47,6 @@
#include <debug.h>
#include <sys/socket.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_listen.c b/net/usrsock/usrsock_listen.c
index d1e5b5d..3094588 100644
--- a/net/usrsock/usrsock_listen.c
+++ b/net/usrsock/usrsock_listen.c
@@ -44,7 +44,6 @@
#include <errno.h>
#include <debug.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_recvfrom.c b/net/usrsock/usrsock_recvfrom.c
index 1b3e353..2f12f10 100644
--- a/net/usrsock/usrsock_recvfrom.c
+++ b/net/usrsock/usrsock_recvfrom.c
@@ -49,7 +49,6 @@
#include <arch/irq.h>
#include <sys/socket.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_sendto.c b/net/usrsock/usrsock_sendto.c
index 3906cf5..ed302a8 100644
--- a/net/usrsock/usrsock_sendto.c
+++ b/net/usrsock/usrsock_sendto.c
@@ -49,7 +49,6 @@
#include <arch/irq.h>
#include <sys/socket.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_setsockopt.c b/net/usrsock/usrsock_setsockopt.c
index a1db18e..ef36fcb 100644
--- a/net/usrsock/usrsock_setsockopt.c
+++ b/net/usrsock/usrsock_setsockopt.c
@@ -50,7 +50,6 @@
#include <arch/irq.h>
#include <sys/socket.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/net/usrsock/usrsock_socket.c b/net/usrsock/usrsock_socket.c
index a515a64..dec3961 100644
--- a/net/usrsock/usrsock_socket.c
+++ b/net/usrsock/usrsock_socket.c
@@ -49,7 +49,6 @@
#include <arch/irq.h>
#include <sys/socket.h>
-#include <nuttx/semaphore.h>
#include <nuttx/net/net.h>
#include <nuttx/net/usrsock.h>
diff --git a/sched/pthread/pthread_initialize.c b/sched/pthread/pthread_initialize.c
index 83bf7cb..92f94b4 100644
--- a/sched/pthread/pthread_initialize.c
+++ b/sched/pthread/pthread_initialize.c
@@ -42,7 +42,6 @@
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
diff --git a/sched/pthread/pthread_mutexdestroy.c b/sched/pthread/pthread_mutexdestroy.c
index f5112a6..bbf21f2 100644
--- a/sched/pthread/pthread_mutexdestroy.c
+++ b/sched/pthread/pthread_mutexdestroy.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <pthread.h>
-#include <semaphore.h>
#include <signal.h>
#include <sched.h>
#include <errno.h>
diff --git a/sched/pthread/pthread_mutextrylock.c b/sched/pthread/pthread_mutextrylock.c
index 88c57d7..dab0c10 100644
--- a/sched/pthread/pthread_mutextrylock.c
+++ b/sched/pthread/pthread_mutextrylock.c
@@ -41,7 +41,6 @@
#include <unistd.h>
#include <pthread.h>
-#include <semaphore.h>
#include <sched.h>
#include <assert.h>
#include <errno.h>
diff --git a/sched/sched/sched_waitpid.c b/sched/sched/sched_waitpid.c
index 13dcfc2..77718f1 100644
--- a/sched/sched/sched_waitpid.c
+++ b/sched/sched/sched_waitpid.c
@@ -41,7 +41,6 @@
#include <nuttx/config.h>
#include <sys/wait.h>
-#include <semaphore.h>
#include <signal.h>
#include <errno.h>
diff --git a/sched/semaphore/sem_destroy.c b/sched/semaphore/sem_destroy.c
index 0541d99..e24282d 100644
--- a/sched/semaphore/sem_destroy.c
+++ b/sched/semaphore/sem_destroy.c
@@ -39,7 +39,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <errno.h>
#include "semaphore/semaphore.h"
diff --git a/sched/semaphore/sem_holder.c b/sched/semaphore/sem_holder.c
index 49ef518..7845409 100644
--- a/sched/semaphore/sem_holder.c
+++ b/sched/semaphore/sem_holder.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <sched.h>
#include <assert.h>
#include <debug.h>
diff --git a/sched/semaphore/sem_post.c b/sched/semaphore/sem_post.c
index 2bb2237..63d6669 100644
--- a/sched/semaphore/sem_post.c
+++ b/sched/semaphore/sem_post.c
@@ -41,7 +41,6 @@
#include <nuttx/config.h>
#include <limits.h>
-#include <semaphore.h>
#include <errno.h>
#include <sched.h>
diff --git a/sched/semaphore/sem_reset.c b/sched/semaphore/sem_reset.c
index 052f901..1bcfc02 100644
--- a/sched/semaphore/sem_reset.c
+++ b/sched/semaphore/sem_reset.c
@@ -39,7 +39,6 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <sched.h>
#include <assert.h>
diff --git a/sched/semaphore/sem_setprotocol.c b/sched/semaphore/sem_setprotocol.c
index 0841d52..b999e2c 100644
--- a/sched/semaphore/sem_setprotocol.c
+++ b/sched/semaphore/sem_setprotocol.c
@@ -42,8 +42,6 @@
#include <assert.h>
#include <errno.h>
-#include <nuttx/semaphore.h>
-
#include "semaphore/semaphore.h"
#ifdef CONFIG_PRIORITY_INHERITANCE
diff --git a/sched/semaphore/sem_tickwait.c b/sched/semaphore/sem_tickwait.c
index f134424..dacb564 100644
--- a/sched/semaphore/sem_tickwait.c
+++ b/sched/semaphore/sem_tickwait.c
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <unistd.h>
-#include <semaphore.h>
#include <time.h>
#include <errno.h>
#include <debug.h>
@@ -50,7 +49,6 @@
#include <nuttx/arch.h>
#include <nuttx/clock.h>
#include <nuttx/wdog.h>
-#include <nuttx/semaphore.h>
#include "sched/sched.h"
#include "semaphore/semaphore.h"
diff --git a/sched/semaphore/sem_timedwait.c b/sched/semaphore/sem_timedwait.c
index 5455a20..7827389 100644
--- a/sched/semaphore/sem_timedwait.c
+++ b/sched/semaphore/sem_timedwait.c
@@ -41,7 +41,6 @@
#include <stdint.h>
#include <unistd.h>
-#include <semaphore.h>
#include <time.h>
#include <errno.h>
#include <debug.h>
@@ -50,7 +49,6 @@
#include <nuttx/arch.h>
#include <nuttx/wdog.h>
#include <nuttx/cancelpt.h>
-#include <nuttx/semaphore.h>
#include "sched/sched.h"
#include "clock/clock.h"
diff --git a/sched/semaphore/sem_trywait.c b/sched/semaphore/sem_trywait.c
index 8e7389e..8de1526 100644
--- a/sched/semaphore/sem_trywait.c
+++ b/sched/semaphore/sem_trywait.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <sched.h>
#include <errno.h>
diff --git a/sched/semaphore/sem_wait.c b/sched/semaphore/sem_wait.c
index 59244ab..b67249a 100644
--- a/sched/semaphore/sem_wait.c
+++ b/sched/semaphore/sem_wait.c
@@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <errno.h>
#include <assert.h>
diff --git a/sched/semaphore/semaphore.h b/sched/semaphore/semaphore.h
index 72f7abb..7008db8 100644
--- a/sched/semaphore/semaphore.h
+++ b/sched/semaphore/semaphore.h
@@ -42,10 +42,10 @@
#include <nuttx/config.h>
#include <nuttx/compiler.h>
+#include <nuttx/semaphore.h>
#include <stdint.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <sched.h>
#include <queue.h>
diff --git a/sched/signal/sig_deliver.c b/sched/signal/sig_deliver.c
index 17057cd..7eadc32 100644
--- a/sched/signal/sig_deliver.c
+++ b/sched/signal/sig_deliver.c
@@ -50,7 +50,6 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include "semaphore/semaphore.h"
#include "signal/signal.h"
/****************************************************************************
diff --git a/sched/task/task_spawnparms.c b/sched/task/task_spawnparms.c
index aa3ab13..78293b2 100644
--- a/sched/task/task_spawnparms.c
+++ b/sched/task/task_spawnparms.c
@@ -39,11 +39,11 @@
#include <nuttx/config.h>
-#include <semaphore.h>
#include <fcntl.h>
#include <spawn.h>
#include <debug.h>
+#include <nuttx/semaphore.h>
#include <nuttx/signal.h>
#include <nuttx/spawn.h>
#include <nuttx/fs/fs.h>
diff --git a/sched/wqueue/kwork_notifier.c b/sched/wqueue/kwork_notifier.c
index 0eff257..d43b2e3 100644
--- a/sched/wqueue/kwork_notifier.c
+++ b/sched/wqueue/kwork_notifier.c
@@ -197,7 +197,7 @@ static void work_notifier_worker(FAR void *arg)
/* Put the notification to the free list */
- while (nxsem_wait(&g_notifier_sem) < 0);
+ nxsem_wait_uninterruptible(&g_notifier_sem);
dq_addlast((FAR dq_entry_t *)notifier, &g_notifier_free);
nxsem_post(&g_notifier_sem);
}
diff --git a/wireless/bluetooth/bt_hcicore.c b/wireless/bluetooth/bt_hcicore.c
index 98301ee..60e1202 100644
--- a/wireless/bluetooth/bt_hcicore.c
+++ b/wireless/bluetooth/bt_hcicore.c
@@ -56,7 +56,6 @@
#include <nuttx/clock.h>
#include <nuttx/kthread.h>
-#include <nuttx/semaphore.h>
#include <nuttx/wqueue.h>
#include <nuttx/net/bluetooth.h>
#include <nuttx/wireless/bluetooth/bt_core.h>
diff --git a/wireless/bluetooth/bt_hcicore.h b/wireless/bluetooth/bt_hcicore.h
index 437bb5c..2b91785 100644
--- a/wireless/bluetooth/bt_hcicore.h
+++ b/wireless/bluetooth/bt_hcicore.h
@@ -49,9 +49,9 @@
#include <nuttx/config.h>
#include <stdbool.h>
-#include <semaphore.h>
#include <mqueue.h>
+#include <nuttx/semaphore.h>
#include <nuttx/wireless/bluetooth/bt_driver.h>
/****************************************************************************
diff --git a/wireless/ieee802154/mac802154.c b/wireless/ieee802154/mac802154.c
index 9e42343..46cd256 100644
--- a/wireless/ieee802154/mac802154.c
+++ b/wireless/ieee802154/mac802154.c
@@ -52,7 +52,6 @@
#include <nuttx/kmalloc.h>
#include <nuttx/wqueue.h>
-#include <nuttx/semaphore.h>
#include <nuttx/mm/iob.h>
diff --git a/wireless/pktradio/pktradio_metadata.c b/wireless/pktradio/pktradio_metadata.c
index 38cb53e..c5ee5fc 100644
--- a/wireless/pktradio/pktradio_metadata.c
+++ b/wireless/pktradio/pktradio_metadata.c
@@ -42,12 +42,12 @@
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
-#include <semaphore.h>
#include <assert.h>
#include <errno.h>
#include <nuttx/kmalloc.h>
#include <nuttx/mm/iob.h>
+#include <nuttx/semaphore.h>
#include <nuttx/wireless/pktradio.h>