diff --git a/arch/z80/src/ez80/ez80_lowuart.c b/arch/z80/src/ez80/ez80_lowuart.c
index 92131a9afae..6b38e03fac7 100644
--- a/arch/z80/src/ez80/ez80_lowuart.c
+++ b/arch/z80/src/ez80/ez80_lowuart.c
@@ -47,7 +47,7 @@
 #include <nuttx/sched.h>
 
 #include "chip.h"
-#include "common/up_internal.h"
+#include "up_internal.h"
 
 #ifdef USE_LOWSERIALINIT
 
diff --git a/arch/z80/src/ez80/ez80_vectors.asm b/arch/z80/src/ez80/ez80_vectors.asm
index 107b570c4be..e26bddf32cf 100644
--- a/arch/z80/src/ez80/ez80_vectors.asm
+++ b/arch/z80/src/ez80/ez80_vectors.asm
@@ -138,7 +138,7 @@ _nmi:
 					;----------------- --- ----- -----
 _ez80_handlers:
 	irqhandler	 0		; EZ80_EMACRX_IRQ   0    0   0x040
-	handlersize equ $-_ez80handlers
+	handlersize equ $-_ez80_handlers
 	irqhandler	 1		; EZ80_EMACTX_IRQ   1    1   0x044
 	irqhandler	 2		; EZ80_EMACSYS_IRQ  2    2   0x048
 	irqhandler	 3		; EZ80_PLL_IRQ      3    3   0x04c
diff --git a/arch/z80/src/ez80/switch.h b/arch/z80/src/ez80/switch.h
index fae313befd3..b390cdab6bd 100644
--- a/arch/z80/src/ez80/switch.h
+++ b/arch/z80/src/ez80/switch.h
@@ -44,7 +44,7 @@
 #  include <nuttx/sched.h>
 #  include <nuttx/arch.h>
 #endif
-#include "common/up_internal.h"
+#include "up_internal.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/z80/src/z8/switch.h b/arch/z80/src/z8/switch.h
index 7c54e34ca5e..a32308ada0c 100644
--- a/arch/z80/src/z8/switch.h
+++ b/arch/z80/src/z8/switch.h
@@ -46,7 +46,7 @@
 #  include <nuttx/sched.h>
 #  include <nuttx/arch.h>
 #endif
-#include "common/up_internal.h"
+#include "up_internal.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/z80/src/z8/z8_lowuart.c b/arch/z80/src/z8/z8_lowuart.c
index f8e99c740a4..4d16dd296e6 100644
--- a/arch/z80/src/z8/z8_lowuart.c
+++ b/arch/z80/src/z8/z8_lowuart.c
@@ -47,7 +47,7 @@
 #include <nuttx/sched.h>
 
 #include "chip.h"
-#include "common/up_internal.h"
+#include "up_internal.h"
 
 #ifdef USE_LOWSERIALINIT
 
diff --git a/configs/Board.mk b/configs/Board.mk
index 076de67c4ea..db423ccec99 100644
--- a/configs/Board.mk
+++ b/configs/Board.mk
@@ -58,9 +58,9 @@ ifneq ($(ZDSVERSION),)
 ifeq ($(WINTOOL),y)
   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'
 else
-  USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common"
+  USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR)$(DELIMI)chip;$(ARCHSRCDIR)$(DELIM)common"
 endif
 else
 ifeq ($(WINTOOL),y)
diff --git a/configs/ez80f910200kitg/README.txt b/configs/ez80f910200kitg/README.txt
index 0872dd52af4..9f957f4c2a2 100644
--- a/configs/ez80f910200kitg/README.txt
+++ b/configs/ez80f910200kitg/README.txt
@@ -60,12 +60,20 @@ Version 5.2.1
   however, I encountered compiler internal errors.  I did not pursue that
   build any further.
 
+Version 5.3.0
+
+  I started verification using 5.30 on June 2, 2019.  There are lots of
+  compile issues; most look like compiler problems (but only a single
+  internal error).  Other errors are the consequence of commits to the
+  OS that did not follow C89.  It will take some time to get a clean
+  compile again.
+
 Other Versions
-  If you use any version of ZDS-II other than 5.1.1 or 5.2.1 or if you install
-  ZDS-II at any location other than the default location, you will have to
-  modify one or two files:  (1) configs/ez80f910200kitg/*/Make.defs and
-  (2) arch/z80/src/ez80/Toolchain.defs.  You probably have to modify the
-  path to your toolchain in the PATH environment variable.
+  If you use any version of ZDS-II other than 5.1.1, 5.2.1, or 5.3.0 or
+  if you install ZDS-II at any location other than the default location,
+  you will have to modify one or three files:  (1) arch/arm/z80/src/ez80Kconfig,
+  (2) configs/ez80f910200kitg/scripts/Make.defs and, perhaps, (3)
+  arch/z80/src/ez80/Toolchain.defs.
 
 Configuration Subdirectories
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/configs/ez80f910200zco/README.txt b/configs/ez80f910200zco/README.txt
index 08d809cfa30..c2f26007dbb 100644
--- a/configs/ez80f910200zco/README.txt
+++ b/configs/ez80f910200zco/README.txt
@@ -60,12 +60,20 @@ Version 5.2.1
   however, I encountered compiler internal errors.  I did not pursue that
   build any further.
 
+Version 5.3.0
+
+  I started verification using 5.30 on June 2, 2019.  There are lots of
+  compile issues; most look like compiler problems (but only a single
+  internal error).  Other errors are the consequence of commits to the
+  OS that did not follow C89.  It will take some time to get a clean
+  compile again.
+
 Other Versions
-  If you use any version of ZDS-II other than 5.1.1 or 5.2.1 or if you install
-  ZDS-II at any location other than the default location, you will have to
-  modify one or two files:  (2) configs/ez80f910200zco/*/Make.defs and (2)
-  arch/z80/src/ez80/Toolchain.defs.  You may also have to modify you PATH
-  environment variable.
+  If you use any version of ZDS-II other than 5.1.1, 5.2.1, or 5.3.0 or
+  if you install ZDS-II at any location other than the default location,
+  you will have to modify one or three files:  (1) arch/arm/z80/src/ez80Kconfig,
+  (2) configs/ez80f910200zco/scripts/Make.defs and, perhaps, (3)
+  arch/z80/src/ez80/Toolchain.defs.
 
 Configurations
 ^^^^^^^^^^^^^^