diff --git a/arch/arm/include/calypso/clock.h b/arch/arm/include/calypso/clock.h
index abcfde1d44..a10a607a5d 100644
--- a/arch/arm/include/calypso/clock.h
+++ b/arch/arm/include/calypso/clock.h
@@ -1,5 +1,5 @@
-#ifndef _CALYPSO_CLK_H
-#define _CALYPSO_CLK_H
+#ifndef __ARCH_ARM_INCLUDE_CALYPSO_CLOCK_H
+#define __ARCH_ARM_INCLUDE_CALYPSO_CLOCK_H
 
 #include <stdint.h>
 
@@ -64,4 +64,4 @@ void calypso_debugunit(int enable);
 void calypso_rhea_cfg(uint8_t fac0, uint8_t fac1, uint8_t timeout,
 		      uint8_t ws_h, uint8_t ws_l, uint8_t w_en0, uint8_t w_en1);
 
-#endif /* _CALYPSO_CLK_H */
+#endif /* __ARCH_ARM_INCLUDE_CALYPSO_CLOCK_H */
diff --git a/arch/arm/include/calypso/debug.h b/arch/arm/include/calypso/debug.h
index 8c7b9aabfb..9596946775 100644
--- a/arch/arm/include/calypso/debug.h
+++ b/arch/arm/include/calypso/debug.h
@@ -1,5 +1,5 @@
-#ifndef _DEBUG_H
-#define _DEBUG_H
+#ifndef __ARCH_ARM_INCLUDE_CALYPSO_DEBUG_H
+#define __ARCH_ARM_INCLUDE_CALYPSO_DEBUG_H
 
 #ifndef ARRAY_SIZE
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
@@ -28,4 +28,4 @@
 #define printd(x, args ...)
 #endif
 
-#endif /* _DEBUG_H */
+#endif /* __ARCH_ARM_INCLUDE_CALYPSO_DEBUG_H */
diff --git a/arch/arm/include/calypso/defines.h b/arch/arm/include/calypso/defines.h
index 3c8732f92f..4f29560c83 100644
--- a/arch/arm/include/calypso/defines.h
+++ b/arch/arm/include/calypso/defines.h
@@ -1,6 +1,5 @@
-
-#ifndef _DEFINES_H
-#define _DEFINES_H
+#ifndef __ARCH_ARM_INCLUDE_CALYPSO_DEFINES_H
+#define __ARCH_ARM_INCLUDE_CALYPSO_DEFINES_H
 
 #define __attribute_const__	__attribute__((__const__))
 
@@ -15,4 +14,4 @@
 /* force placement in zero-waitstate memory */
 #define __ramtext __section(".ramtext")
 
-#endif /* !_DEFINES_H */
+#endif /* !__ARCH_ARM_INCLUDE_CALYPSO_DEFINES_H */
diff --git a/arch/arm/include/calypso/irq.h b/arch/arm/include/calypso/irq.h
index baea3de5a3..0dda3f312f 100644
--- a/arch/arm/include/calypso/irq.h
+++ b/arch/arm/include/calypso/irq.h
@@ -41,8 +41,8 @@
 #error "This file should never be included directly! Use <nuttx/irq.h>"
 #endif
 
-#ifndef _CALYPSO_IRQ_H
-#define _CALYPSO_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_CALYPSO_IRQ_H
+#define __ARCH_ARM_INCLUDE_CALYPSO_IRQ_H
 
 #ifndef __ASSEMBLY__
 
@@ -78,4 +78,4 @@ enum irq_nr {
 
 #define IRQ_SYSTIMER		IRQ_TIMER2
 
-#endif /* _CALYPSO_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_CALYPSO_IRQ_H */
diff --git a/arch/arm/include/calypso/memory.h b/arch/arm/include/calypso/memory.h
index b0a0490cec..a4ce1e890e 100644
--- a/arch/arm/include/calypso/memory.h
+++ b/arch/arm/include/calypso/memory.h
@@ -1,5 +1,5 @@
-#ifndef _MEMORY_H
-#define _MEMORY_H
+#ifndef __ARCH_ARM_INCLUDE_CALYPSO_MEMORY_H
+#define __ARCH_ARM_INCLUDE_CALYPSO_MEMORY_H
 
 #define __arch_getb(a)			(*(volatile unsigned char *)(a))
 #define __arch_getw(a)			(*(volatile unsigned short *)(a))
@@ -25,4 +25,4 @@
 #define readw(a)			__arch_getw(a)
 #define readl(a)			__arch_getl(a)
 
-#endif /* _MEMORY_H */
+#endif /* __ARCH_ARM_INCLUDE_CALYPSO_MEMORY_H */
diff --git a/arch/arm/include/calypso/timer.h b/arch/arm/include/calypso/timer.h
index 694e4ebc92..93a1bd1492 100644
--- a/arch/arm/include/calypso/timer.h
+++ b/arch/arm/include/calypso/timer.h
@@ -1,5 +1,5 @@
-#ifndef _CAL_TIMER_H
-#define _CAL_TIMER_H
+#ifndef __ARCH_ARM_INCLUDE_CALYPSO_TIMER_H
+#define __ARCH_ARM_INCLUDE_CALYPSO_TIMER_H
 
 /* Enable or Disable a timer */
 void hwtimer_enable(int num, int on);
@@ -22,4 +22,4 @@ void wdog_reset(void);
 /* power up the timers */
 void hwtimer_init(void);
 
-#endif /* _CAL_TIMER_H */
+#endif /* __ARCH_ARM_INCLUDE_CALYPSO_TIMER_H */
diff --git a/arch/arm/include/calypso/uwire.h b/arch/arm/include/calypso/uwire.h
index 19a277bccb..0ca6c376ca 100644
--- a/arch/arm/include/calypso/uwire.h
+++ b/arch/arm/include/calypso/uwire.h
@@ -1,5 +1,5 @@
-#ifndef _CALYPSO_UWIRE_H
-#define _CALYPSO_UWIRE_H
+#ifndef __ARCH_ARM_INCLUDE_CALYPSO_UWIRE_H
+#define __ARCH_ARM_INCLUDE_CALYPSO_UWIRE_H
 void uwire_init(void);
 int uwire_xfer(int cs, int bitlen, const void *dout, void *din);
 #endif
diff --git a/arch/arm/include/lpc214x/irq.h b/arch/arm/include/lpc214x/irq.h
index a4737c38d4..852dd0c649 100644
--- a/arch/arm/include/lpc214x/irq.h
+++ b/arch/arm/include/lpc214x/irq.h
@@ -37,8 +37,8 @@
  * only indirectly through nuttx/irq.h
  */
 
-#ifndef __ARCH_LPC214X_IRQ_H
-#define __ARCH_LPC214X_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_LPC214X_IRQ_H
+#define __ARCH_ARM_INCLUDE_LPC214X_IRQ_H
 
 /****************************************************************************
  * Included Files
@@ -127,5 +127,5 @@ void up_detach_vector(int vector);
 #endif
 #endif
 
-#endif /* __ARCH_LPC214X_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_LPC214X_IRQ_H */
 
diff --git a/arch/arm/include/lpc2378/irq.h b/arch/arm/include/lpc2378/irq.h
index 18ef58604b..8fa2067fc9 100644
--- a/arch/arm/include/lpc2378/irq.h
+++ b/arch/arm/include/lpc2378/irq.h
@@ -43,8 +43,8 @@
  * only indirectly through nuttx/irq.h
  */
 
-#ifndef __ARCH_LPC2378_IRQ_H
-#define __ARCH_LPC2378_IRQ_H
+#ifndef __ARCH_ARM_INCLUDE_LPC2378_IRQ_H
+#define __ARCH_ARM_INCLUDE_LPC2378_IRQ_H
 
 /****************************************************************************
  * Included Files
@@ -149,4 +149,4 @@ void up_detach_vector(int vector);
 #endif
 #endif
 
-#endif /* __ARCH_LPC2378_IRQ_H */
+#endif /* __ARCH_ARM_INCLUDE_LPC2378_IRQ_H */
diff --git a/arch/arm/src/c5471/chip.h b/arch/arm/src/c5471/chip.h
index 580ae075dc..e1f40e58d3 100644
--- a/arch/arm/src/c5471/chip.h
+++ b/arch/arm/src/c5471/chip.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * c5471/chip.h
+ * arch/arm/src/c5471/chip.h
  *
  *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __C5471_CHIP_H
-#define __C5471_CHIP_H
+#ifndef __ARCH_ARM_SRC_C5471_CHIP_H
+#define __ARCH_ARM_SRC_C5471_CHIP_H
 
 /****************************************************************************
  * Included Files
@@ -368,4 +368,4 @@
  * Public Function Prototypes
  ****************************************************************************/
 
-#endif  /* __C5471_CHIP_H */
+#endif  /* __ARCH_ARM_SRC_C5471_CHIP_H */
diff --git a/arch/arm/src/calypso/chip.h b/arch/arm/src/calypso/chip.h
index 824fdce893..bea381cc38 100644
--- a/arch/arm/src/calypso/chip.h
+++ b/arch/arm/src/calypso/chip.h
@@ -37,8 +37,8 @@
  *
  ****************************************************************************/
 
-#ifndef __CALYPSO_CHIP_H
-#define __CALYPSO_CHIP_H
+#ifndef __ARCH_ARM_SRC_CALYPSO_CHIP_H
+#define __ARCH_ARM_SRC_CALYPSO_CHIP_H
 
 /****************************************************************************
  * Included Files
@@ -208,4 +208,4 @@
  * Public Function Prototypes
  ****************************************************************************/
 
-#endif  /* __CALYPSO_CHIP_H */
+#endif  /* __ARCH_ARM_SRC_CALYPSO_CHIP_H */
diff --git a/arch/arm/src/dm320/chip.h b/arch/arm/src/dm320/chip.h
index 73e53b6831..20c722ab6a 100644
--- a/arch/arm/src/dm320/chip.h
+++ b/arch/arm/src/dm320/chip.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __DM320_CHIP_H
-#define __DM320_CHIP_H
+#ifndef __ARCH_ARM_SRC_DM320_CHIP_H
+#define __ARCH_ARM_SRC_DM320_CHIP_H
 
 /************************************************************************************
  * Included Files
@@ -58,4 +58,4 @@
  * Inline Functions
  ************************************************************************************/
 
-#endif  /* __DM320_CHIP_H */
+#endif  /* __ARCH_ARM_SRC_DM320_CHIP_H */
diff --git a/arch/arm/src/dm320/dm320_emif.h b/arch/arm/src/dm320/dm320_emif.h
index 653e20fe0d..72d4e8947d 100644
--- a/arch/arm/src/dm320/dm320_emif.h
+++ b/arch/arm/src/dm320/dm320_emif.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __DM320_DM320_EMIF_H
-#define __DM320_DM320_EMIF_H
+#ifndef __ARCH_ARM_SRC_DM320_DM320_EMIF_H
+#define __ARCH_ARM_SRC_DM320_DM320_EMIF_H
 
 /************************************************************************************
  * Included Files
@@ -105,4 +105,4 @@
 
 #endif
 
-#endif  /* __DM320_DM320_EMIF_H */
+#endif  /* __ARCH_ARM_SRC_DM320_DM320_EMIF_H */
diff --git a/arch/arm/src/dm320/dm320_gio.h b/arch/arm/src/dm320/dm320_gio.h
index 136e96118c..5c0fdc73c3 100644
--- a/arch/arm/src/dm320/dm320_gio.h
+++ b/arch/arm/src/dm320/dm320_gio.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __DM320_DM320GIO_H
-#define __DM320_DM320GIO_H
+#ifndef __ARCH_ARM_SRC_DM320_DM320_GIO_H
+#define __ARCH_ARM_SRC_DM320_DM320_GIO_H
 
 /************************************************************************************
  * Included Files
diff --git a/arch/arm/src/dm320/dm320_intc.h b/arch/arm/src/dm320/dm320_intc.h
index f05febb2f9..57bc5c1f34 100644
--- a/arch/arm/src/dm320/dm320_intc.h
+++ b/arch/arm/src/dm320/dm320_intc.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __DM320_DM320_INTC_H
-#define __DM320_DM320_INTC_H
+#ifndef __ARCH_ARM_SRC_DM320_DM320_INTC_H
+#define __ARCH_ARM_SRC_DM320_DM320_INTC_H
 
 /************************************************************************************
  * Included Files
@@ -98,4 +98,4 @@
 
 #endif
 
-#endif  /* __DM320_DM320_INTC_H */
+#endif  /* __ARCH_ARM_SRC_DM320_DM320_INTC_H */
diff --git a/arch/arm/src/dm320/dm320_memorymap.h b/arch/arm/src/dm320/dm320_memorymap.h
index 67923b1507..a5db596361 100644
--- a/arch/arm/src/dm320/dm320_memorymap.h
+++ b/arch/arm/src/dm320/dm320_memorymap.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __DM320_MEMORYMAP_H
-#define __DM320_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_DM320_DM320_MEMORYMAP_H
+#define __ARCH_ARM_SRC_DM320_DM320_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -261,4 +261,4 @@
 
 #endif
 
-#endif  /* __DM320_MEMORYMAP_H */
+#endif  /* __ARCH_ARM_SRC_DM320_DM320_MEMORYMAP_H */
diff --git a/arch/arm/src/dm320/dm320_timer.h b/arch/arm/src/dm320/dm320_timer.h
index 2ef4079067..5b1830b98c 100644
--- a/arch/arm/src/dm320/dm320_timer.h
+++ b/arch/arm/src/dm320/dm320_timer.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __DM320_TIMER_H
-#define __DM320_TIMER_H
+#ifndef __ARCH_ARM_SRC_DM320_DM320_TIMER_H
+#define __ARCH_ARM_SRC_DM320_DM320_TIMER_H
 
 /************************************************************************************
  * Included Files
@@ -105,4 +105,4 @@
 
 #endif
 
-#endif  /* __DM320_TIMER_H */
+#endif  /* __ARCH_ARM_SRC_DM320_DM320_TIMER_H */
diff --git a/arch/arm/src/dm320/dm320_uart.h b/arch/arm/src/dm320/dm320_uart.h
index d668489412..af9c1df91f 100644
--- a/arch/arm/src/dm320/dm320_uart.h
+++ b/arch/arm/src/dm320/dm320_uart.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __DM320_UART_H
-#define __DM320_UART_H
+#ifndef __ARCH_ARM_SRC_DM320_DM320_UART_H
+#define __ARCH_ARM_SRC_DM320_DM320_UART_H
 
 /************************************************************************************
  * Included Files
@@ -173,4 +173,4 @@
  * Inline Functions
  ************************************************************************************/
 
-#endif  /* __DM320_UART_H */
+#endif  /* __ARCH_ARM_SRC_DM320_DM320_UART_H */
diff --git a/arch/arm/src/lpc214x/chip.h b/arch/arm/src/lpc214x/chip.h
index c0af01c447..1e7c8b219b 100644
--- a/arch/arm/src/lpc214x/chip.h
+++ b/arch/arm/src/lpc214x/chip.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __LPC214X_CHIP_H
-#define __LPC214X_CHIP_H
+#ifndef __ARCH_ARM_SRC_LPC214X_CHIP_H
+#define __ARCH_ARM_SRC_LPC214X_CHIP_H
 
 /****************************************************************************************************
  * Included Files
@@ -346,4 +346,4 @@
  * Public Function Prototypes
  ****************************************************************************************************/
 
-#endif  /* __LPC214X_CHIP_H */
+#endif  /* __ARCH_ARM_SRC_LPC214X_CHIP_H */
diff --git a/arch/arm/src/lpc214x/lpc214x_apb.h b/arch/arm/src/lpc214x/lpc214x_apb.h
index e76fa5754a..93f9ebdf7a 100644
--- a/arch/arm/src/lpc214x/lpc214x_apb.h
+++ b/arch/arm/src/lpc214x/lpc214x_apb.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef _ARCH_ARM_SRC_LPC214X_APB_H
-#define _ARCH_ARM_SRC_LPC214X_APB_H
+#ifndef __ARCH_ARM_SRC_LPC214X_LPC214X_APB_H
+#define __ARCH_ARM_SRC_LPC214X_LPC214X_APB_H
 
 /************************************************************************************
  * Included Files
@@ -69,4 +69,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
-#endif  /* _ARCH_ARM_SRC_LPC214X_APB_H */
+#endif  /* __ARCH_ARM_SRC_LPC214X_LPC214X_APB_H */
diff --git a/arch/arm/src/lpc214x/lpc214x_i2c.h b/arch/arm/src/lpc214x/lpc214x_i2c.h
index 35fcc00f7e..d12f1ff4ee 100644
--- a/arch/arm/src/lpc214x/lpc214x_i2c.h
+++ b/arch/arm/src/lpc214x/lpc214x_i2c.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef _ARCH_ARM_SRC_LPC214X_I2C_H
-#define _ARCH_ARM_SRC_LPC214X_I2C_H
+#ifndef __ARCH_ARM_SRC_LPC214X_LPC214X_I2C_H
+#define __ARCH_ARM_SRC_LPC214X_LPC214X_I2C_H
 
 /************************************************************************************
  * Included Files
@@ -138,4 +138,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
-#endif  /* _ARCH_ARM_SRC_LPC214X_I2C_H */
+#endif  /* __ARCH_ARM_SRC_LPC214X_LPC214X_I2C_H */
diff --git a/arch/arm/src/lpc214x/lpc214x_pinsel.h b/arch/arm/src/lpc214x/lpc214x_pinsel.h
index 21c6c2f9db..0cb2c58f9b 100644
--- a/arch/arm/src/lpc214x/lpc214x_pinsel.h
+++ b/arch/arm/src/lpc214x/lpc214x_pinsel.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef _ARCH_ARM_SRC_LPC214X_PINSEL_H
-#define _ARCH_ARM_SRC_LPC214X_PINSEL_H
+#ifndef __ARCH_ARM_SRC_LPC214X_LPC214X_PINSEL_H
+#define __ARCH_ARM_SRC_LPC214X_LPC214X_PINSEL_H
 
 /************************************************************************************
  * Included Files
@@ -256,4 +256,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
-#endif  /* _ARCH_ARM_SRC_LPC214X_PINSEL_H */
+#endif  /* __ARCH_ARM_SRC_LPC214X_LPC214X_PINSEL_H */
diff --git a/arch/arm/src/lpc214x/lpc214x_pll.h b/arch/arm/src/lpc214x/lpc214x_pll.h
index 4e19bcdc11..f8f9a25ad8 100644
--- a/arch/arm/src/lpc214x/lpc214x_pll.h
+++ b/arch/arm/src/lpc214x/lpc214x_pll.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef _ARCH_ARM_SRC_LPC214X_PLL_H
-#define _ARCH_ARM_SRC_LPC214X_PLL_H
+#ifndef __ARCH_ARM_SRC_LPC214X_LPC214X_PLL_H
+#define __ARCH_ARM_SRC_LPC214X_LPC214X_PLL_H
 
 /****************************************************************************************************
  * Included Files
@@ -102,4 +102,4 @@
  * Public Function Prototypes
  ****************************************************************************************************/
 
-#endif  /* _ARCH_ARM_SRC_LPC214X_PLL_H */
+#endif  /* __ARCH_ARM_SRC_LPC214X_LPC214X_PLL_H */
diff --git a/arch/arm/src/lpc214x/lpc214x_power.h b/arch/arm/src/lpc214x/lpc214x_power.h
index 699af8d590..09d89c92ce 100644
--- a/arch/arm/src/lpc214x/lpc214x_power.h
+++ b/arch/arm/src/lpc214x/lpc214x_power.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef _ARCH_ARM_SRC_LPC214X_POWER_H
-#define _ARCH_ARM_SRC_LPC214X_POWER_H
+#ifndef __ARCH_ARM_SRC_LPC214X_LPC214X_POWER_H
+#define __ARCH_ARM_SRC_LPC214X_LPC214X_POWER_H
 
 /************************************************************************************
  * Included Files
@@ -87,4 +87,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
-#endif  /* _ARCH_ARM_SRC_LPC214X_POWER_H */
+#endif  /* __ARCH_ARM_SRC_LPC214X_LPC214X_POWER_H */
diff --git a/arch/arm/src/lpc214x/lpc214x_spi.h b/arch/arm/src/lpc214x/lpc214x_spi.h
index 97e2fc7a58..69c94d89c0 100644
--- a/arch/arm/src/lpc214x/lpc214x_spi.h
+++ b/arch/arm/src/lpc214x/lpc214x_spi.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef _ARCH_ARM_SRC_LPC214X_SPI_H
-#define _ARCH_ARM_SRC_LPC214X_SPI_H
+#ifndef __ARCH_ARM_SRC_LPC214X_LPC214X_SPI_H
+#define __ARCH_ARM_SRC_LPC214X_LPC214X_SPI_H
 
 /************************************************************************************
  * Included Files
@@ -181,4 +181,4 @@ struct spi_dev_s; /* Forward reference */
 
 FAR struct spi_dev_s *lpc214x_spibus_initialize(int port);
 
-#endif  /* _ARCH_ARM_SRC_LPC214X_SPI_H */
+#endif  /* __ARCH_ARM_SRC_LPC214X_LPC214X_SPI_H */
diff --git a/arch/arm/src/lpc214x/lpc214x_timer.h b/arch/arm/src/lpc214x/lpc214x_timer.h
index 224e608f3e..df0287d449 100644
--- a/arch/arm/src/lpc214x/lpc214x_timer.h
+++ b/arch/arm/src/lpc214x/lpc214x_timer.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __LPC214X_TIMER_H
-#define __LPC214X_TIMER_H
+#ifndef __ARCH_ARM_SRC_LPC214X_LPC214X_TIMER_H
+#define __ARCH_ARM_SRC_LPC214X_LPC214X_TIMER_H
 
 /************************************************************************************
  * Included Files
@@ -149,4 +149,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
-#endif  /* __LPC214X_TIMER_H */
+#endif  /* __ARCH_ARM_SRC_LPC214X_LPC214X_TIMER_H */
diff --git a/arch/arm/src/lpc214x/lpc214x_uart.h b/arch/arm/src/lpc214x/lpc214x_uart.h
index c4c90c1669..3c85c3a065 100644
--- a/arch/arm/src/lpc214x/lpc214x_uart.h
+++ b/arch/arm/src/lpc214x/lpc214x_uart.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __LPC214X_UART_H
-#define __LPC214X_UART_H
+#ifndef __ARCH_ARM_SRC_LPC214X_LPC214X_UART_H
+#define __ARCH_ARM_SRC_LPC214X_LPC214X_UART_H
 
 /************************************************************************************
  * Included Files
@@ -139,4 +139,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
-#endif  /* __LPC214X_UART_H */
+#endif  /* __ARCH_ARM_SRC_LPC214X_LPC214X_UART_H */
diff --git a/arch/arm/src/lpc214x/lpc214x_vic.h b/arch/arm/src/lpc214x/lpc214x_vic.h
index 89a5f7b13f..4f3b821a84 100644
--- a/arch/arm/src/lpc214x/lpc214x_vic.h
+++ b/arch/arm/src/lpc214x/lpc214x_vic.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __LPC214X_VIC_H
-#define __LPC214X_VIC_H
+#ifndef __ARCH_ARM_SRC_LPC214X_LPC214X_VIC_H
+#define __ARCH_ARM_SRC_LPC214X_LPC214X_VIC_H
 
 /************************************************************************************
  * Included Files
@@ -67,4 +67,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
-#endif  /* __LPC214X_VIC_H */
+#endif  /* __ARCH_ARM_SRC_LPC214X_LPC214X_VIC_H */
diff --git a/arch/arm/src/lpc2378/chip.h b/arch/arm/src/lpc2378/chip.h
index b8b8b70c85..1f213eaeab 100644
--- a/arch/arm/src/lpc2378/chip.h
+++ b/arch/arm/src/lpc2378/chip.h
@@ -38,8 +38,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef _ARCH_ARM_SRC_LPC2378_CHIP_H
-#define _ARCH_ARM_SRC_LPC2378_CHIP_H
+#ifndef __ARCH_ARM_SRC_LPC2378_CHIP_H
+#define __ARCH_ARM_SRC_LPC2378_CHIP_H
 
 /****************************************************************************************************
  * Included Files
@@ -1003,4 +1003,4 @@ are for LPC24xx only. */
  * Public Function Prototypes
  ****************************************************************************************************/
 
-#endif  /* _ARCH_ARM_SRC_LPC2378_CHIP_H */
+#endif  /* __ARCH_ARM_SRC_LPC2378_CHIP_H */
diff --git a/arch/arm/src/lpc2378/lpc2378.h b/arch/arm/src/lpc2378/lpc2378.h
index 0c7fccede9..1e40b228d0 100644
--- a/arch/arm/src/lpc2378/lpc2378.h
+++ b/arch/arm/src/lpc2378/lpc2378.h
@@ -38,8 +38,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef _ARCH_ARM_SRC_LPC2378_INTERNAL_H
-#define _ARCH_ARM_SRC_LPC2378_INTERNAL_H
+#ifndef __ARCH_ARM_SRC_LPC2378_LPC23XX_H
+#define __ARCH_ARM_SRC_LPC2378_LPC23XX_H
 
 /****************************************************************************************************
  * Included Files
@@ -67,4 +67,4 @@ void lpc2378_statledon(void);
 
 #endif
 
-#endif /* _ARCH_ARM_SRC_LPC2378_INTERNAL_H */
+#endif /* __ARCH_ARM_SRC_LPC2378_LPC23XX_H */
diff --git a/arch/arm/src/lpc2378/lpc23xx_gpio.h b/arch/arm/src/lpc2378/lpc23xx_gpio.h
index fc920be4e9..b8be696609 100644
--- a/arch/arm/src/lpc2378/lpc23xx_gpio.h
+++ b/arch/arm/src/lpc2378/lpc23xx_gpio.h
@@ -38,8 +38,8 @@
  *
  ************************************************************************************/
 
-#ifndef _ARCH_ARM_SRC_LPC2378_LPC23XX_GPIO_H
-#define _ARCH_ARM_SRC_LPC2378_LPC23XX_GPIO_H
+#ifndef __ARCH_ARM_SRC_LPC2378_LPC23XX_GPIO_H
+#define __ARCH_ARM_SRC_LPC2378_LPC23XX_GPIO_H
 
 /************************************************************************************
  * Included Files
@@ -68,4 +68,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
-#endif  /* _ARCH_ARM_SRC_LPC2378_LPC23XX_GPIO_H */
+#endif  /* __ARCH_ARM_SRC_LPC2378_LPC23XX_GPIO_H */
diff --git a/arch/arm/src/lpc2378/lpc23xx_pinsel.h b/arch/arm/src/lpc2378/lpc23xx_pinsel.h
index 69ad1b7490..be34810fdc 100644
--- a/arch/arm/src/lpc2378/lpc23xx_pinsel.h
+++ b/arch/arm/src/lpc2378/lpc23xx_pinsel.h
@@ -38,8 +38,8 @@
  *
  ************************************************************************************/
 
-#ifndef _ARCH_ARM_SRC_LPC23XX_PINSEL_H
-#define _ARCH_ARM_SRC_LPC23XX_PINSEL_H
+#ifndef __ARCH_ARM_SRC_LPC2378_LPC23XX_PINSEL_H
+#define __ARCH_ARM_SRC_LPC2378_LPC23XX_PINSEL_H
 
 /************************************************************************************
  * Included Files
@@ -789,4 +789,4 @@
  * Public Function Prototypes
  ************************************************************************************/
 
-#endif  /* _ARCH_ARM_SRC_LPC23XX_PINSEL_H */
+#endif  /* __ARCH_ARM_SRC_LPC2378_LPC23XX_PINSEL_H */
diff --git a/arch/sim/include/arch.h b/arch/sim/include/arch.h
index 29cf6495fc..83fdc737c4 100644
--- a/arch/sim/include/arch.h
+++ b/arch/sim/include/arch.h
@@ -37,8 +37,8 @@
  * only indirectly through nuttx/arch.h
  */
 
-#ifndef __ARCH_ARCH_H
-#define __ARCH_ARCH_H
+#ifndef __ARCH_SIM_INCLUDE_ARCH_H
+#define __ARCH_SIM_INCLUDE_ARCH_H
 
 /****************************************************************************
  * Included Files
@@ -77,5 +77,5 @@ extern "C"
 }
 #endif
 
-#endif /* __ARCH_ARCH_H */
+#endif /* __ARCH_SIM_INCLUDE_ARCH_H */
 
diff --git a/arch/sim/include/irq.h b/arch/sim/include/irq.h
index 49581e9aba..ae95625ace 100644
--- a/arch/sim/include/irq.h
+++ b/arch/sim/include/irq.h
@@ -37,8 +37,8 @@
  * only indirectly through nuttx/irq.h
  */
 
-#ifndef __ARCH_IRQ_H
-#define __ARCH_IRQ_H
+#ifndef __ARCH_SIM_INCLUDE_IRQ_H
+#define __ARCH_SIM_INCLUDE_IRQ_H
 
 /****************************************************************************
  * Included Files
@@ -132,5 +132,5 @@ extern "C"
 }
 #endif
 
-#endif /* __ARCH_IRQ_H */
+#endif /* __ARCH_SIM_INCLUDE_IRQ_H */
 
diff --git a/arch/z16/include/arch.h b/arch/z16/include/arch.h
index 7e93f55540..350a94b419 100644
--- a/arch/z16/include/arch.h
+++ b/arch/z16/include/arch.h
@@ -37,8 +37,8 @@
  * only indirectly through nuttx/arch.h
  */
 
-#ifndef __ARCH_ARCH_H
-#define __ARCH_ARCH_H
+#ifndef __ARCH_Z16_INCLUDE_ARCH_H
+#define __ARCH_Z16_INCLUDE_ARCH_H
 
 /****************************************************************************
  * Included Files
@@ -77,5 +77,5 @@ extern "C"
 }
 #endif
 
-#endif /* __ARCH_ARCH_H */
+#endif /* __ARCH_Z16_INCLUDE_ARCH_H */
 
diff --git a/arch/z16/include/irq.h b/arch/z16/include/irq.h
index 6c46141630..5fcd165487 100644
--- a/arch/z16/include/irq.h
+++ b/arch/z16/include/irq.h
@@ -37,8 +37,8 @@
  * only indirectly through nuttx/irq.h
  */
 
-#ifndef __ARCH_IRQ_H
-#define __ARCH_IRQ_H
+#ifndef __ARCH_Z16_INCLUDE_IRQ_H
+#define __ARCH_Z16_INCLUDE_IRQ_H
 
 /****************************************************************************
  * Included Files
@@ -78,5 +78,5 @@ extern "C"
 #endif
 #endif
 
-#endif /* __ARCH_IRQ_H */
+#endif /* __ARCH_Z16_INCLUDE_IRQ_H */
 
diff --git a/arch/z16/include/serial.h b/arch/z16/include/serial.h
index ca49f514b9..ced8e9e596 100644
--- a/arch/z16/include/serial.h
+++ b/arch/z16/include/serial.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_SERIAL_H
-#define __ARCH_SERIAL_H
+#ifndef __ARCH_Z16_INCLUDE_SERIAL_H
+#define __ARCH_Z16_INCLUDE_SERIAL_H
 
 /****************************************************************************
  * Included Files
@@ -52,4 +52,4 @@
  * Public Functions
  ****************************************************************************/
 
-#endif /* __ARCH_SERIAL_H */
+#endif /* __ARCH_Z16_INCLUDE_SERIAL_H */
diff --git a/arch/z16/src/common/up_internal.h b/arch/z16/src/common/up_internal.h
index 921878a2da..d0fc6d4404 100644
--- a/arch/z16/src/common/up_internal.h
+++ b/arch/z16/src/common/up_internal.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __UP_INTERNAL_H
-#define __UP_INTERNAL_H
+#ifndef __ARCH_Z16_SRC_COMMON_UP_INTERNAL_H
+#define __ARCH_Z16_SRC_COMMON_UP_INTERNAL_H
 
 /****************************************************************************
  * Included Files
@@ -203,4 +203,4 @@ void up_registerdump(void);
 
 #endif /* __ASSEMBLY__ */
 
-#endif  /* __UP_INTERNAL_H */
+#endif  /* __ARCH_Z16_SRC_COMMON_UP_INTERNAL_H */
diff --git a/arch/z80/include/ez80/arch.h b/arch/z80/include/ez80/arch.h
index 04fc387446..b8e3eecc8a 100644
--- a/arch/z80/include/ez80/arch.h
+++ b/arch/z80/include/ez80/arch.h
@@ -37,8 +37,8 @@
  * only indirectly through nuttx/arch.h (via arch/arch.h)
  */
 
-#ifndef __ARCH_EZ80_ARCH_H
-#define __ARCH_EZ80_ARCH_H
+#ifndef __ARCH_Z80_INCLUDE_EZ80_ARCH_H
+#define __ARCH_Z80_INCLUDE_EZ80_ARCH_H
 
 /****************************************************************************
  * Included Files
@@ -73,5 +73,5 @@ extern "C"
 }
 #endif
 
-#endif /* __ARCH_EZ80_ARCH_H */
+#endif /* __ARCH_Z80_INCLUDE_EZ80_ARCH_H */
 
diff --git a/arch/z80/include/ez80/io.h b/arch/z80/include/ez80/io.h
index 9dc0d88b1c..e843db3567 100644
--- a/arch/z80/include/ez80/io.h
+++ b/arch/z80/include/ez80/io.h
@@ -37,8 +37,8 @@
  * through arch/io.h
  */
 
-#ifndef __ARCH_EZ80_IO_H
-#define __ARCH_EZ80_IO_H
+#ifndef __ARCH_Z80_INCLUDE_EZ80_IO_H
+#define __ARCH_Z80_INCLUDE_EZ80_IO_H
 
 /****************************************************************************
  * Included Files
@@ -84,4 +84,4 @@ uint8_t inp(uint16_t p);
 #endif
 #endif
 
-#endif /* __ARCH_EZ80_IO_H */
+#endif /* __ARCH_Z80_INCLUDE_EZ80_IO_H */
diff --git a/arch/z80/include/z180/types.h b/arch/z80/include/z180/types.h
index 63d40de8a3..16460dca5c 100644
--- a/arch/z80/include/z180/types.h
+++ b/arch/z80/include/z180/types.h
@@ -37,8 +37,8 @@
  * through sys/types.h
  */
 
-#ifndef __ARC_Z80_INCLUDE_Z180_TYPES_H
-#define __ARC_Z80_INCLUDE_Z180_TYPES_H
+#ifndef __ARCH_Z80_INCLUDE_Z180_TYPES_H
+#define __ARCH_Z80_INCLUDE_Z180_TYPES_H
 
 /****************************************************************************
  * Included Files
@@ -95,4 +95,4 @@ typedef _uint16_t          irqstate_t;
  * Public Function Prototypes
  ****************************************************************************/
 
-#endif /* __ARC_Z80_INCLUDE_Z180_TYPES_H */
+#endif /* __ARCH_Z80_INCLUDE_Z180_TYPES_H */
diff --git a/arch/z80/include/z8/arch.h b/arch/z80/include/z8/arch.h
index c1ee58506c..3d03dea67b 100644
--- a/arch/z80/include/z8/arch.h
+++ b/arch/z80/include/z8/arch.h
@@ -37,8 +37,8 @@
  * only indirectly through nuttx/arch.h (via arch/arch.h)
  */
 
-#ifndef __ARCH_Z8_ARCH_H
-#define __ARCH_Z8_ARCH_H
+#ifndef __ARCH_Z80_INCLUDE_Z8_ARCH_H
+#define __ARCH_Z80_INCLUDE_Z8_ARCH_H
 
 /****************************************************************************
  * Included Files
@@ -73,5 +73,5 @@ extern "C"
 }
 #endif
 
-#endif /* __ARCH_Z8_ARCH_H */
+#endif /* __ARCH_Z80_INCLUDE_Z8_ARCH_H */
 
diff --git a/arch/z80/include/z8/irq.h b/arch/z80/include/z8/irq.h
index 209c46df47..10693fd517 100644
--- a/arch/z80/include/z8/irq.h
+++ b/arch/z80/include/z8/irq.h
@@ -37,8 +37,8 @@
  * only indirectly through nuttx/irq.h (via arch/irq.h)
  */
 
-#ifndef __ARCH_Z8_IRQ_H
-#define __ARCH_Z8_IRQ_H
+#ifndef __ARCH_Z80_INCLUDE_Z8_IRQ_H
+#define __ARCH_Z80_INCLUDE_Z8_IRQ_H
 
 /****************************************************************************
  * Included Files
@@ -373,5 +373,5 @@ void up_irq_restore(irqstate_t flags);
 #endif
 #endif
 
-#endif /* __ARCH_Z8_IRQ_H */
+#endif /* __ARCH_Z80_INCLUDE_Z8_IRQ_H */
 
diff --git a/arch/z80/include/z80/types.h b/arch/z80/include/z80/types.h
index 5384deb871..ecf2cc4132 100644
--- a/arch/z80/include/z80/types.h
+++ b/arch/z80/include/z80/types.h
@@ -37,8 +37,8 @@
  * through sys/types.h
  */
 
-#ifndef __ARC_Z80_INCLUDE_Z80_TYPES_H
-#define __ARC_Z80_INCLUDE_Z80_TYPES_H
+#ifndef __ARCH_Z80_INCLUDE_Z80_TYPES_H
+#define __ARCH_Z80_INCLUDE_Z80_TYPES_H
 
 /****************************************************************************
  * Included Files
@@ -95,4 +95,4 @@ typedef _uint16_t          irqstate_t;
  * Public Function Prototypes
  ****************************************************************************/
 
-#endif /* __ARC_Z80_INCLUDE_Z80_TYPES_H */
+#endif /* __ARCH_Z80_INCLUDE_Z80_TYPES_H */
diff --git a/arch/z80/src/ez80/switch.h b/arch/z80/src/ez80/switch.h
index a6e46204d9..fae313befd 100644
--- a/arch/z80/src/ez80/switch.h
+++ b/arch/z80/src/ez80/switch.h
@@ -1,6 +1,5 @@
 /************************************************************************************
  * arch/z80/src/ez80/switch.h
- * arch/z80/src/chip/switch.h
  *
  *   Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __EZ80_SWITCH_H
-#define __EZ80_SWITCH_H
+#ifndef __ARCH_Z80_SRC_EZ80_SWITCH_H
+#define __ARCH_Z80_SRC_EZ80_SWITCH_H
 
 /************************************************************************************
  * Included Files
@@ -168,4 +167,4 @@ void ez80_registerdump(void);
 #endif
 #endif
 
-#endif  /* __EZ80_SWITCH_H */
+#endif  /* __ARCH_Z80_SRC_EZ80_SWITCH_H */
diff --git a/arch/z80/src/ez80/up_mem.h b/arch/z80/src/ez80/up_mem.h
index 9f65b5d084..a64bddb73b 100644
--- a/arch/z80/src/ez80/up_mem.h
+++ b/arch/z80/src/ez80/up_mem.h
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __EZ80_UP_MEM_H
-#define __EZ80_UP_MEM_H
+#ifndef __ARCH_Z80_SRC_EZ80_UP_MEM_H
+#define __ARCH_Z80_SRC_EZ80_UP_MEM_H
 
 /************************************************************************************
  * Included Files
@@ -86,4 +86,4 @@ extern "C"
 #endif
 #endif
 
-#endif  /* __EZ80_UP_MEM_H */
+#endif  /* __ARCH_Z80_SRC_EZ80_UP_MEM_H */
diff --git a/arch/z80/src/z180/up_mem.h b/arch/z80/src/z180/up_mem.h
index a8df44848a..8a1389ee22 100644
--- a/arch/z80/src/z180/up_mem.h
+++ b/arch/z80/src/z180/up_mem.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_Z180_SRC_COMMON_UP_MEM_H
-#define __ARCH_Z180_SRC_COMMON_UP_MEM_H
+#ifndef __ARCH_Z80_SRC_Z180_UP_MEM_H
+#define __ARCH_Z80_SRC_Z180_UP_MEM_H
 
 /************************************************************************************
  * Included Files
@@ -72,4 +72,4 @@
 
 extern const uint16_t g_heapbase;
 
-#endif  /* __ARCH_Z180_SRC_COMMON_UP_MEM_H */
+#endif  /* __ARCH_Z80_SRC_Z180_UP_MEM_H */
diff --git a/arch/z80/src/z8/chip.h b/arch/z80/src/z8/chip.h
index b85b478f13..1e9035a3bf 100644
--- a/arch/z80/src/z8/chip.h
+++ b/arch/z80/src/z8/chip.h
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __Z8_CHIP_H
-#define __Z8_CHIP_H
+#ifndef __ARCH_Z80_SRC_Z8_CHIP_H
+#define __ARCH_Z80_SRC_Z8_CHIP_H
 
 /************************************************************************************
  * Included Files
@@ -236,4 +236,4 @@ extern "C"
 #endif
 #endif
 
-#endif  /* __Z8_CHIP_H */
+#endif  /* __ARCH_Z80_SRC_Z8_CHIP_H */
diff --git a/arch/z80/src/z8/switch.h b/arch/z80/src/z8/switch.h
index b8e23f597b..7c54e34ca5 100644
--- a/arch/z80/src/z8/switch.h
+++ b/arch/z80/src/z8/switch.h
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __Z80_SWITCH_H
-#define __Z80_SWITCH_H
+#ifndef __ARCH_Z80_SRC_Z8_SWITCH_H
+#define __ARCH_Z80_SRC_Z8_SWITCH_H
 
 /************************************************************************************
  * Included Files
@@ -255,4 +255,4 @@ void z8_registerdump(void);
 #endif
 #endif
 
-#endif  /* __Z80_SWITCH_H */
+#endif  /* __ARCH_Z80_SRC_Z8_SWITCH_H */
diff --git a/arch/z80/src/z8/up_mem.h b/arch/z80/src/z8/up_mem.h
index fe6854b476..ffe3b2210e 100644
--- a/arch/z80/src/z8/up_mem.h
+++ b/arch/z80/src/z8/up_mem.h
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __Z8_UP_MEM_H
-#define __Z8_UP_MEM_H
+#ifndef __ARCH_Z80_SRC_Z8_UP_MEM_H
+#define __ARCH_Z80_SRC_Z8_UP_MEM_H
 
 /************************************************************************************
  * Included Files
@@ -86,4 +86,4 @@ extern "C"
 #endif
 #endif
 
-#endif  /* __Z8_UP_MEM_H */
+#endif  /* __ARCH_Z80_SRC_Z8_UP_MEM_H */
diff --git a/arch/z80/src/z80/switch.h b/arch/z80/src/z80/switch.h
index f277893a33..c3403e1ea7 100644
--- a/arch/z80/src/z80/switch.h
+++ b/arch/z80/src/z80/switch.h
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __Z80_SWITCH_H
-#define __Z80_SWITCH_H
+#ifndef __ARCH_Z80_SRC_Z80_SWITCH_H
+#define __ARCH_Z80_SRC_Z80_SWITCH_H
 
 /************************************************************************************
  * Included Files
@@ -167,4 +167,4 @@ void z80_registerdump(void);
 #endif
 #endif
 
-#endif  /* __Z80_SWITCH_H */
+#endif  /* __ARCH_Z80_SRC_Z80_SWITCH_H */