diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile
index 3cfe75a97ba..c4b5f67a500 100644
--- a/arch/z16/src/Makefile
+++ b/arch/z16/src/Makefile
@@ -40,14 +40,14 @@ COMPILER = ${shell basename "$(CC)"}
 ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 
 ifeq ($(CONFIG_WINDOWS_NATIVE),y)
-  USRINCLUDES = -usrinc:'.;$(TOPDIR)/sched;$(ARCHSRCDIR);$(ARCHSRCDIR)/common'
+  USRINCLUDES = -usrinc:'.;$(TOPDIR)/sched;$(ARCHSRCDIR)$(DELIM)chip;$(ARCHSRCDIR)$(DELIM)common'
 else
 ifeq ($(COMPILER),zneocc.exe)
   WARCHSRCDIR := ${shell cygpath -w $(ARCHSRCDIR)}
-  USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
+  USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR)$(DELIM)chip;$(WARCHSRCDIR)$(DELIM)common'
 else
   WARCHSRCDIR = $(ARCHSRCDIR)
-  USRINCLUDES = -I$(TOPDIR)/sched -I$(ARCHSRCDIR) -I$(ARCHSRCDIR)/common
+  USRINCLUDES = -I$(TOPDIR)/sched -I$(ARCHSRCDIR)$(DELIM)chip -I$(ARCHSRCDIR)$(DELIM)common
 endif
 endif
 
diff --git a/arch/z16/src/common/up_allocateheap.c b/arch/z16/src/common/up_allocateheap.c
index 948f770210a..73a9f1cd032 100644
--- a/arch/z16/src/common/up_allocateheap.c
+++ b/arch/z16/src/common/up_allocateheap.c
@@ -47,7 +47,7 @@
 #include <nuttx/kmalloc.h>
 #include <arch/board/board.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/z16/src/common/up_arch.h b/arch/z16/src/common/up_arch.h
index 1b98ccc2aea..159344a4246 100644
--- a/arch/z16/src/common/up_arch.h
+++ b/arch/z16/src/common/up_arch.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include <arch/board/board.h>
-#include "chip/chip.h"
+#include "chip.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c
index f22e9822860..ee2aaa26a1b 100644
--- a/arch/z16/src/common/up_assert.c
+++ b/arch/z16/src/common/up_assert.c
@@ -53,7 +53,7 @@
 
 #include <arch/board/board.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/z16/src/common/up_createstack.c b/arch/z16/src/common/up_createstack.c
index 0bab2d3ab36..0ec33206fc2 100644
--- a/arch/z16/src/common/up_createstack.c
+++ b/arch/z16/src/common/up_createstack.c
@@ -49,7 +49,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/z16/src/common/up_doirq.c b/arch/z16/src/common/up_doirq.c
index fb4954fc618..52112166ef6 100644
--- a/arch/z16/src/common/up_doirq.c
+++ b/arch/z16/src/common/up_doirq.c
@@ -46,7 +46,7 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/z16/src/common/up_exit.c b/arch/z16/src/common/up_exit.c
index 27eed07ff09..3fe1e4f392a 100644
--- a/arch/z16/src/common/up_exit.c
+++ b/arch/z16/src/common/up_exit.c
@@ -49,7 +49,7 @@
 #  include <nuttx/fs/fs.h>
 #endif
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "task/task.h"
 #include "sched/sched.h"
 #include "up_internal.h"
diff --git a/arch/z16/src/common/up_initialstate.c b/arch/z16/src/common/up_initialstate.c
index 4509e1eba0e..afae71b2138 100644
--- a/arch/z16/src/common/up_initialstate.c
+++ b/arch/z16/src/common/up_initialstate.c
@@ -43,7 +43,7 @@
 #include <string.h>
 #include <nuttx/arch.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/z16/src/common/up_internal.h b/arch/z16/src/common/up_internal.h
index 98ccae82ada..92984031fc4 100644
--- a/arch/z16/src/common/up_internal.h
+++ b/arch/z16/src/common/up_internal.h
@@ -42,7 +42,7 @@
  ****************************************************************************/
 
 #include <arch/irq.h>
-#include "chip/chip.h"
+#include "chip.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/z16/src/common/up_releasepending.c b/arch/z16/src/common/up_releasepending.c
index 41ee99c7ed1..4df9fdc75c9 100644
--- a/arch/z16/src/common/up_releasepending.c
+++ b/arch/z16/src/common/up_releasepending.c
@@ -45,7 +45,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/z16/src/common/up_reprioritizertr.c b/arch/z16/src/common/up_reprioritizertr.c
index 76fe4a1f5da..33215d42c62 100644
--- a/arch/z16/src/common/up_reprioritizertr.c
+++ b/arch/z16/src/common/up_reprioritizertr.c
@@ -47,7 +47,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/z16/src/common/up_stackdump.c b/arch/z16/src/common/up_stackdump.c
index 0802612a05b..40abf3777e8 100644
--- a/arch/z16/src/common/up_stackdump.c
+++ b/arch/z16/src/common/up_stackdump.c
@@ -41,7 +41,7 @@
 
 #include <debug.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "sched/sched.h"
 #include "up_internal.h"
 
diff --git a/arch/z16/src/common/up_unblocktask.c b/arch/z16/src/common/up_unblocktask.c
index db1a43aaeb5..ecaae236087 100644
--- a/arch/z16/src/common/up_unblocktask.c
+++ b/arch/z16/src/common/up_unblocktask.c
@@ -45,7 +45,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/sched.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "sched/sched.h"
 #include "clock/clock.h"
 #include "up_internal.h"
diff --git a/arch/z16/src/z16f/z16f_clkinit.c b/arch/z16/src/z16f/z16f_clkinit.c
index 41690dd8298..9a5c6f8ecd1 100644
--- a/arch/z16/src/z16f/z16f_clkinit.c
+++ b/arch/z16/src/z16f/z16f_clkinit.c
@@ -39,7 +39,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "chip/chip.h"
+#include "chip.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/z16/src/z16f/z16f_irq.c b/arch/z16/src/z16f/z16f_irq.c
index bc2c6ba118c..69a244725bb 100644
--- a/arch/z16/src/z16f/z16f_irq.c
+++ b/arch/z16/src/z16f/z16f_irq.c
@@ -44,7 +44,7 @@
 #include <nuttx/irq.h>
 #include <arch/irq.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/z16/src/z16f/z16f_lowuart.S b/arch/z16/src/z16f/z16f_lowuart.S
index f9209626522..327c0085fcf 100644
--- a/arch/z16/src/z16f/z16f_lowuart.S
+++ b/arch/z16/src/z16f/z16f_lowuart.S
@@ -39,7 +39,7 @@
  *************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/chip.h"
+#include "chip.h"
 #include "common/up_internal.h"
 
 #ifdef USE_LOWUARTINIT
diff --git a/arch/z16/src/z16f/z16f_restoreusercontext.S b/arch/z16/src/z16f/z16f_restoreusercontext.S
index 673fe0a98f8..8e5aca02adf 100644
--- a/arch/z16/src/z16f/z16f_restoreusercontext.S
+++ b/arch/z16/src/z16f/z16f_restoreusercontext.S
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
-#include "chip/chip.h"
+#include "chip.h"
 
 /*************************************************************************
  * External References / External Definitions
diff --git a/arch/z16/src/z16f/z16f_saveusercontext.S b/arch/z16/src/z16f/z16f_saveusercontext.S
index 43fc8a0bcb2..c3b43ef52bd 100644
--- a/arch/z16/src/z16f/z16f_saveusercontext.S
+++ b/arch/z16/src/z16f/z16f_saveusercontext.S
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 #include <arch/irq.h>
-#include "chip/chip.h"
+#include "chip.h"
 
 /*************************************************************************
  * External References / External Definitions
diff --git a/arch/z16/src/z16f/z16f_serial.c b/arch/z16/src/z16f/z16f_serial.c
index f3e7d41f595..c05ac306a18 100644
--- a/arch/z16/src/z16f/z16f_serial.c
+++ b/arch/z16/src/z16f/z16f_serial.c
@@ -52,7 +52,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/serial/serial.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER
diff --git a/arch/z16/src/z16f/z16f_sysexec.c b/arch/z16/src/z16f/z16f_sysexec.c
index 86ed1e4eb0b..c21d9e377ab 100644
--- a/arch/z16/src/z16f/z16f_sysexec.c
+++ b/arch/z16/src/z16f/z16f_sysexec.c
@@ -44,7 +44,7 @@
 
 #include <nuttx/arch.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "up_internal.h"
 
 /****************************************************************************
diff --git a/arch/z16/src/z16f/z16f_timerisr.c b/arch/z16/src/z16f/z16f_timerisr.c
index 36d7c3c9dce..aaaa04f7edd 100644
--- a/arch/z16/src/z16f/z16f_timerisr.c
+++ b/arch/z16/src/z16f/z16f_timerisr.c
@@ -45,7 +45,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 #include "clock/clock.h"
 #include "up_internal.h"
 
diff --git a/configs/z16f2800100zcog/src/z16f_lowinit.c b/configs/z16f2800100zcog/src/z16f_lowinit.c
index 081d2d50909..6c82bb0c54f 100644
--- a/configs/z16f2800100zcog/src/z16f_lowinit.c
+++ b/configs/z16f2800100zcog/src/z16f_lowinit.c
@@ -41,7 +41,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/chip.h"
+#include "chip.h"
 
 /****************************************************************************
  * Pre-processor Definitions