diff --git a/include/nuttx/addrenv.h b/include/nuttx/addrenv.h
index a3887476f7..4748bef90b 100644
--- a/include/nuttx/addrenv.h
+++ b/include/nuttx/addrenv.h
@@ -29,6 +29,8 @@
 
 #include <nuttx/config.h>
 
+#ifndef __ASSEMBLY__
+
 #ifdef CONFIG_BUILD_KERNEL
 #  include <signal.h>
 #endif
@@ -40,6 +42,8 @@
 
 #include <arch/arch.h>
 
+#endif /* __ASSEMBLY__ */
+
 #ifdef CONFIG_ARCH_ADDRENV
 
 /****************************************************************************
@@ -241,6 +245,9 @@
      (CONFIG_ARCH_PGPOOL_VBASE + CONFIG_ARCH_PGPOOL_SIZE)
 
 #endif
+
+#ifndef __ASSEMBLY__
+
 /****************************************************************************
  * Public Type Definitions
  ****************************************************************************/
@@ -251,8 +258,6 @@ struct tcb_s;                  /* Forward reference to TCB */
  * Public Types
  ****************************************************************************/
 
-#ifndef __ASSEMBLY__
-
 struct addrenv_s
 {
   struct arch_addrenv_s addrenv; /* The address environment page directory  */