diff --git a/arch/arm/src/kinetis/kinetis_spi.c b/arch/arm/src/kinetis/kinetis_spi.c
index 1d1fdfabe0..9aa3b97846 100644
--- a/arch/arm/src/kinetis/kinetis_spi.c
+++ b/arch/arm/src/kinetis/kinetis_spi.c
@@ -72,10 +72,11 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <arch/irq.h>
 #include <nuttx/arch.h>
+#include <nuttx/semapore.h>
 #include <nuttx/spi/spi.h>
 
+#include <arch/irq.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c
index 8778a17007..98b76ea2e6 100644
--- a/arch/arm/src/kl/kl_spi.c
+++ b/arch/arm/src/kl/kl_spi.c
@@ -45,7 +45,9 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <nuttx/semapore.h>
 #include <nuttx/spi/spi.h>
+
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
diff --git a/drivers/power/pm.h b/drivers/power/pm.h
index 372c790034..838bed4dca 100644
--- a/drivers/power/pm.h
+++ b/drivers/power/pm.h
@@ -45,6 +45,7 @@
 #include <semaphore.h>
 #include <queue.h>
 
+#include <nuttx/semapore.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 52518d2f29..79e842a6ae 100644
--- a/drivers/power/pm_initialize.c
+++ b/drivers/power/pm_initialize.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * drivers/power/pm_initialize.c
  *
- *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2012, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,7 @@
 
 #include <semaphore.h>
 
+#include <nuttx/semapore.h>
 #include <nuttx/power/pm.h>
 
 #include "pm.h"
diff --git a/fs/nfs/nfs_util.c b/fs/nfs/nfs_util.c
index 59fd1eb8fa..8a469c42f7 100644
--- a/fs/nfs/nfs_util.c
+++ b/fs/nfs/nfs_util.c
@@ -52,6 +52,7 @@
 #include <assert.h>
 #include <debug.h>
 
+#include <nuttx/semapore.h>
 #include <nuttx/fs/dirent.h>
 
 #include "rpc.h"
diff --git a/graphics/nxterm/nxterm.h b/graphics/nxterm/nxterm.h
index a43838b747..3b91f6f218 100644
--- a/graphics/nxterm/nxterm.h
+++ b/graphics/nxterm/nxterm.h
@@ -45,8 +45,8 @@
 #include <stdint.h>
 #include <semaphore.h>
 
+#include <nuttx/semapore.h>
 #include <nuttx/fs/fs.h>
-
 #include <nuttx/nx/nx.h>
 #include <nuttx/nx/nxtk.h>
 #include <nuttx/nx/nxfonts.h>
diff --git a/graphics/vnc/server/vnc_fbdev.c b/graphics/vnc/server/vnc_fbdev.c
index 092013f60c..0683619b6c 100644
--- a/graphics/vnc/server/vnc_fbdev.c
+++ b/graphics/vnc/server/vnc_fbdev.c
@@ -537,7 +537,6 @@ static inline int vnc_wait_start(int display)
 
 static inline int vnc_wait_connect(int display)
 {
-  int errcode;
   int ret;
 
   /* Check if there has been a session allocated yet.  This is one of the
diff --git a/mm/mm_gran/mm_grancritical.c b/mm/mm_gran/mm_grancritical.c
index f009e902a1..105bb51ff0 100644
--- a/mm/mm_gran/mm_grancritical.c
+++ b/mm/mm_gran/mm_grancritical.c
@@ -43,6 +43,7 @@
 #include <assert.h>
 #include <errno.h>
 
+#include <nuttx/semaphore.h>
 #include <nuttx/irq.h>
 #include <nuttx/mm/gran.h>