diff --git a/arch/z80/src/Makefile.zdsiil b/arch/z80/src/Makefile.zdsiil
index bce2662b7f..8a58f2939c 100644
--- a/arch/z80/src/Makefile.zdsiil
+++ b/arch/z80/src/Makefile.zdsiil
@@ -42,7 +42,7 @@ ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
 
 WSCHEDSRCDIR = ${shell cygpath -w $(SCHEDSRCDIR)}
 WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
-USRINCLUDES = -usrinc:'.;$(WSCHEDSRCDIR);$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
+USRINCLUDES = -usrinc:'.;$(WSCHEDSRCDIR);$(WARCHSRCDIR)$(DELIM)chip;$(WARCHSRCDIR)$(DELIM)common'
 
 INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
 CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
diff --git a/arch/z80/src/Makefile.zdsiiw b/arch/z80/src/Makefile.zdsiiw
index d66a8f8005..b1503485a8 100644
--- a/arch/z80/src/Makefile.zdsiiw
+++ b/arch/z80/src/Makefile.zdsiiw
@@ -39,7 +39,7 @@
 
 SCHEDSRCDIR = $(TOPDIR)$(DELIM)sched
 ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
-USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common"
+USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR)$(DELIM)chip;$(ARCHSRCDIR)$(DELIM)common"
 
 INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
 CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index 4f836eb630..eb286638ff 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -48,6 +48,7 @@
 #include <nuttx/drivers/drivers.h>
 #include <nuttx/fs/loop.h>
 #include <nuttx/net/loopback.h>
+#include <nuttx/net/telnet.h>
 #include <nuttx/net/tun.h>
 #include <nuttx/syslog/syslog.h>
 #include <nuttx/syslog/syslog_console.h>
diff --git a/arch/z80/src/ez80/ez80_initialstate.c b/arch/z80/src/ez80/ez80_initialstate.c
index 727ba368be..577b6ceff2 100644
--- a/arch/z80/src/ez80/ez80_initialstate.c
+++ b/arch/z80/src/ez80/ez80_initialstate.c
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <nuttx/arch.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/arch/z80/src/ez80/ez80_lowuart.c b/arch/z80/src/ez80/ez80_lowuart.c
index 062419b54a..92131a9afa 100644
--- a/arch/z80/src/ez80/ez80_lowuart.c
+++ b/arch/z80/src/ez80/ez80_lowuart.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "common/up_internal.h"
 
 #ifdef USE_LOWSERIALINIT
diff --git a/arch/z80/src/ez80/ez80_serial.c b/arch/z80/src/ez80/ez80_serial.c
index 1aa7a50c63..8b43caaf5c 100644
--- a/arch/z80/src/ez80/ez80_serial.c
+++ b/arch/z80/src/ez80/ez80_serial.c
@@ -53,7 +53,7 @@
 #include <nuttx/serial/serial.h>
 #include <arch/io.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER
@@ -154,6 +154,7 @@ static uart_dev_t g_uart0port =
   { 0 },                    /* closesem */
   { 0 },                    /* xmitsem */
   { 0 },                    /* recvsem */
+  { 0 },                    /* pollsem */
   {
     { 0 },                  /* xmit.sem */
     0,                      /* xmit.head */
@@ -170,6 +171,7 @@ static uart_dev_t g_uart0port =
   },
   &g_uart_ops,              /* ops */
   &g_uart0priv,             /* priv */
+  NULL,                     /* pollfds */
 };
 #endif
 
@@ -199,6 +201,7 @@ static uart_dev_t g_uart1port =
   { 0 },                    /* closesem */
   { 0 },                    /* xmitsem */
   { 0 },                    /* recvsem */
+  { 0 },                    /* pollsem */
   {
     { 0 },                  /* xmit.sem */
     0,                      /* xmit.head */
@@ -215,6 +218,7 @@ static uart_dev_t g_uart1port =
   },
   &g_uart_ops,              /* ops */
   &g_uart1priv,             /* priv */
+  NULL,                     /* pollfds */
 };
 #endif
 
diff --git a/arch/z80/src/ez80/ez80_timerisr.c b/arch/z80/src/ez80/ez80_timerisr.c
index 411c844799..6aee7ebdb0 100644
--- a/arch/z80/src/ez80/ez80_timerisr.c
+++ b/arch/z80/src/ez80/ez80_timerisr.c
@@ -45,7 +45,7 @@
 #include <arch/io.h>
 #include <nuttx/arch.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "clock/clock.h"
 #include "up_internal.h"
 
diff --git a/arch/z80/src/z8/chip.h b/arch/z80/src/z8/chip.h
index 1e9035a3bf..20d4477246 100644
--- a/arch/z80/src/z8/chip.h
+++ b/arch/z80/src/z8/chip.h
@@ -1,6 +1,6 @@
 /************************************************************************************
  * arch/z80/src/z8/chip.h
- * arch/z80/src/chip/chip.h
+ * arch/z80/src/chip.h
  *
  *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/arch/z80/src/z8/z8_initialstate.c b/arch/z80/src/z8/z8_initialstate.c
index 17299e17a5..9e36896e49 100644
--- a/arch/z80/src/z8/z8_initialstate.c
+++ b/arch/z80/src/z8/z8_initialstate.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 #include "up_arch.h"
 
diff --git a/arch/z80/src/z8/z8_lowuart.c b/arch/z80/src/z8/z8_lowuart.c
index a568a94a9b..f8e99c740a 100644
--- a/arch/z80/src/z8/z8_lowuart.c
+++ b/arch/z80/src/z8/z8_lowuart.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "common/up_internal.h"
 
 #ifdef USE_LOWSERIALINIT
diff --git a/arch/z80/src/z8/z8_serial.c b/arch/z80/src/z8/z8_serial.c
index 443226259d..cef30e31d5 100644
--- a/arch/z80/src/z8/z8_serial.c
+++ b/arch/z80/src/z8/z8_serial.c
@@ -53,7 +53,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/serial/serial.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER
@@ -163,6 +163,7 @@ static uart_dev_t g_uart0port =
   { 0 },                    /* closesem */
   { 0 },                    /* xmitsem */
   { 0 },                    /* recvsem */
+  { 0 },                    /* pollsem */
   {
     { 0 },                  /* xmit.sem */
     0,                      /* xmit.head */
@@ -179,6 +180,7 @@ static uart_dev_t g_uart0port =
   },
   &g_uart_ops,              /* ops */
   &g_uart0priv,             /* priv */
+  NULL,                     /* pollfds */
 };
 
 /* This describes the state of the DM320 uart1 port. */
@@ -208,6 +210,7 @@ static uart_dev_t g_uart1port =
   { 0 },                    /* closesem */
   { 0 },                    /* xmitsem */
   { 0 },                    /* recvsem */
+  { 0 },                    /* pollsem */
   {
     { 0 },                  /* xmit.sem */
     0,                      /* xmit.head */
@@ -224,6 +227,7 @@ static uart_dev_t g_uart1port =
   },
   &g_uart_ops,              /* ops */
   &g_uart1priv,             /* priv */
+  NULL,                     /* pollfds */
 };
 
 /* Now, which one with be tty0/console and which tty1? */
diff --git a/arch/z80/src/z8/z8_timerisr.c b/arch/z80/src/z8/z8_timerisr.c
index 0363eaef20..a38598af36 100644
--- a/arch/z80/src/z8/z8_timerisr.c
+++ b/arch/z80/src/z8/z8_timerisr.c
@@ -45,7 +45,7 @@
 
 #include <nuttx/arch.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "clock/clock.h"
 #include "up_internal.h"
 
diff --git a/include/signal.h b/include/signal.h
index aa2507ed29..c87c4dc7f4 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -53,14 +53,13 @@
 /********************************************************************************
  * Pre-processor Definitions
  ********************************************************************************/
-
 /* Signal set management definitions and macros. */
 
 #define NULL_SIGNAL_SET ((sigset_t)0x00000000)
 #define ALL_SIGNAL_SET  ((sigset_t)0xffffffff)
 #define MIN_SIGNO       0
 #define MAX_SIGNO       31
-#define GOOD_SIGNO(s)   ((((unsigned)(s))<=MAX_SIGNO))
+#define GOOD_SIGNO(s)   ((((unsigned)(s)) <= MAX_SIGNO))
 #define SIGNO2SET(s)    ((sigset_t)1 << (s))
 
 /* All signals are "real time" signals */
@@ -75,7 +74,7 @@
  * following table.
  *
  * This is not POSIX compliant behavior!  Per OpenGroup.org:  The following
- * signals and default signal action s must be supported on all
+ * signals and default signal actions must be supported on all
  * implementations:
  *
  *   ---------- ------- ----------------------------------------------------