diff --git a/arch/arm/src/kinetis/kinetis_spi.c b/arch/arm/src/kinetis/kinetis_spi.c
index 9aa3b97846a..3fc63b901e4 100644
--- a/arch/arm/src/kinetis/kinetis_spi.c
+++ b/arch/arm/src/kinetis/kinetis_spi.c
@@ -73,7 +73,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/semapore.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/spi/spi.h>
 
 #include <arch/irq.h>
diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c
index 98b76ea2e61..81cda9c9da5 100644
--- a/arch/arm/src/kl/kl_spi.c
+++ b/arch/arm/src/kl/kl_spi.c
@@ -45,7 +45,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/semapore.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/spi/spi.h>
 
 #include <arch/irq.h>
diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c
index ca54bd38547..261357c618d 100644
--- a/arch/arm/src/samv7/sam_twihs.c
+++ b/arch/arm/src/samv7/sam_twihs.c
@@ -979,7 +979,7 @@ errout:
 * Description:
 *   Perform an I2C bus reset in an attempt to break loose stuck I2C devices.
 *   This function can be called from inside the driver while the TWIHS device is
-*   already locked, so we must not handle any semapores inside.
+*   already locked, so we must not handle any semaphores inside.
 *   To initiate a bus reset from outside the driver use twi_reset(dev).
 *
 * Input Parameters:
diff --git a/drivers/power/pm.h b/drivers/power/pm.h
index 838bed4dcaf..472b42a9485 100644
--- a/drivers/power/pm.h
+++ b/drivers/power/pm.h
@@ -45,7 +45,7 @@
 #include <semaphore.h>
 #include <queue.h>
 
-#include <nuttx/semapore.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/clock.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/power/pm.h>
diff --git a/drivers/power/pm_initialize.c b/drivers/power/pm_initialize.c
index 79e842a6aea..83b67645f7d 100644
--- a/drivers/power/pm_initialize.c
+++ b/drivers/power/pm_initialize.c
@@ -41,7 +41,7 @@
 
 #include <semaphore.h>
 
-#include <nuttx/semapore.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/power/pm.h>
 
 #include "pm.h"
diff --git a/fs/nfs/nfs_util.c b/fs/nfs/nfs_util.c
index 8a469c42f7f..8a6967cbbea 100644
--- a/fs/nfs/nfs_util.c
+++ b/fs/nfs/nfs_util.c
@@ -52,7 +52,7 @@
 #include <assert.h>
 #include <debug.h>
 
-#include <nuttx/semapore.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/fs/dirent.h>
 
 #include "rpc.h"
diff --git a/graphics/nxterm/nxterm.h b/graphics/nxterm/nxterm.h
index 3b91f6f2187..ea3cb1ef0cf 100644
--- a/graphics/nxterm/nxterm.h
+++ b/graphics/nxterm/nxterm.h
@@ -45,7 +45,7 @@
 #include <stdint.h>
 #include <semaphore.h>
 
-#include <nuttx/semapore.h>
+#include <nuttx/semaphore.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxtk.h>