diff --git a/include/nuttx/analog/ads1242.h b/include/nuttx/analog/ads1242.h
index b74b2a28b26..ea98a63b240 100644
--- a/include/nuttx/analog/ads1242.h
+++ b/include/nuttx/analog/ads1242.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef NUTTX_INCLUDE_NUTTX_ANALOG_ADS1242_H_
-#define NUTTX_INCLUDE_NUTTX_ANALOG_ADS1242_H_
+#ifndef __INCLUDE_NUTTX_ANALOG_ADS1242_H
+#define __INCLUDE_NUTTX_ANALOG_ADS1242_H
 
 /****************************************************************************
  * Included Files
@@ -199,4 +199,4 @@ int ads1242_register(FAR const char *devpath, FAR struct spi_dev_s *spi,
 #endif
 
 #endif /* CONFIG_SPI && CONFIG_ADC_ADS1242 */
-#endif /* NUTTX_INCLUDE_NUTTX_ANALOG_ADS1242_H_ */
+#endif /* __INCLUDE_NUTTX_ANALOG_ADS1242_H */
diff --git a/include/nuttx/clock.h b/include/nuttx/clock.h
index a844396b30c..b21c0384815 100644
--- a/include/nuttx/clock.h
+++ b/include/nuttx/clock.h
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_CLOCK_H
-#define _INCLUDE_NUTTX_CLOCK_H
+#ifndef __INCLUDE_NUTTX_CLOCK_H
+#define __INCLUDE_NUTTX_CLOCK_H
 
 /****************************************************************************
  * Included Files
@@ -334,4 +334,4 @@ int clock_cpuload(int pid, FAR struct cpuload_s *cpuload);
 }
 #endif
 
-#endif /* _INCLUDE_NUTTX_CLOCK_H */
+#endif /* __INCLUDE_NUTTX_CLOCK_H */
diff --git a/include/nuttx/drivers/can.h b/include/nuttx/drivers/can.h
index ed570097fc4..725a9180f6d 100644
--- a/include/nuttx/drivers/can.h
+++ b/include/nuttx/drivers/can.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_DRVERS_CAN_H
-#define _INCLUDE_NUTTX_DRVERS_CAN_H
+#ifndef __INCLUDE_NUTTX_DRVERS_CAN_H
+#define __INCLUDE_NUTTX_DRVERS_CAN_H
 
 /************************************************************************************
  * Included Files
@@ -796,4 +796,4 @@ int can_txready(FAR struct can_dev_s *dev);
 #endif
 
 #endif /* CONFIG_CAN */
-#endif /* _INCLUDE_NUTTX_DRVERS_CAN_H */
+#endif /* __INCLUDE_NUTTX_DRVERS_CAN_H */
diff --git a/include/nuttx/fs/nfs.h b/include/nuttx/fs/nfs.h
index f2980d24076..f5bb1e730fd 100644
--- a/include/nuttx/fs/nfs.h
+++ b/include/nuttx/fs/nfs.h
@@ -106,4 +106,4 @@ extern "C"
 }
 #endif
 
-#endif /* _NFS_NFS_H */
+#endif /* __INCLUDE_NUTTX_FS_NFS_H */
diff --git a/include/nuttx/ioexpander/pcf8574.h b/include/nuttx/ioexpander/pcf8574.h
index 1caa0fa5895..f8d9bf50658 100644
--- a/include/nuttx/ioexpander/pcf8574.h
+++ b/include/nuttx/ioexpander/pcf8574.h
@@ -111,4 +111,4 @@ struct i2c_master_s;
 FAR struct ioexpander_dev_s *pcf8574_initialize(FAR struct i2c_master_s *i2c,
                                                 FAR struct pcf8574_config_s *config);
 
-#endif
+#endif /* __INCLUDE_NUTTX_IOEXPANDER_PCF8574_H */
diff --git a/include/nuttx/ioexpander/tca64xx.h b/include/nuttx/ioexpander/tca64xx.h
index 9a1ec8ca0a1..077d12d6994 100644
--- a/include/nuttx/ioexpander/tca64xx.h
+++ b/include/nuttx/ioexpander/tca64xx.h
@@ -127,4 +127,4 @@ struct i2c_master_s;
 FAR struct ioexpander_dev_s *tca64_initialize(FAR struct i2c_master_s *i2c,
                                               FAR struct tca64_config_s *config);
 
-#endif
+#endif /* __INCLUDE_NUTTX_IOEXPANDER_TCA64XX_H */
diff --git a/include/nuttx/poff.h b/include/nuttx/poff.h
index cda48805e4d..8b689df7fd2 100644
--- a/include/nuttx/poff.h
+++ b/include/nuttx/poff.h
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUXX_POFF_H
-#define __INCLUDE_NUXX_POFF_H
+#ifndef __INCLUDE_NUTTX_POFF_H
+#define __INCLUDE_NUTTX_POFF_H
 
 /****************************************************************************
  * Included Files
@@ -432,4 +432,4 @@ struct poff_debugarginfo_s
 
 typedef struct poff_debugarginfo_s poff_debugarginfo_t;
 
-#endif /* __INCLUDE_NUXX_POFF_H */
+#endif /* __INCLUDE_NUTTX_POFF_H */
diff --git a/include/nuttx/power/relay.h b/include/nuttx/power/relay.h
index b1c32028b6c..8b450ea0124 100644
--- a/include/nuttx/power/relay.h
+++ b/include/nuttx/power/relay.h
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef __CONFIGS_NUTTX_INCLUDE_RELAY_H
-#define __CONFIGS_NUTTX_INCLUDE_RELAY_H
+#ifndef __INCLUDE_NUTTX_POWER_RELAY_H
+#define __INCLUDE_NUTTX_POWER_RELAY_H
 
 /****************************************************************************
  * Included Files
@@ -62,4 +62,4 @@
  * Public Types
  ****************************************************************************/
 
-#endif  /* __CONFIGS_NUTTX_INCLUDE_RELAY_H */
+#endif  /* __INCLUDE_NUTTX_POWER_RELAY_H */
diff --git a/include/nuttx/sensors/bmp180.h b/include/nuttx/sensors/bmp180.h
index 9a2d21d839d..5bdb86fe212 100644
--- a/include/nuttx/sensors/bmp180.h
+++ b/include/nuttx/sensors/bmp180.h
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __DRIVERS_SENSORS_BMP180_H
-#define __DRIVERS_SENSORS_BMP180_H
+#ifndef __INCLUDE_NUTTX_SENSORS_BMP180_H
+#define __INCLUDE_NUTTX_SENSORS_BMP180_H
 
 #include <nuttx/config.h>
 
@@ -97,4 +97,4 @@ int bmp180_register(FAR const char *devpath, FAR struct i2c_master_s *i2c);
 #endif
 
 #endif /* CONFIG_I2C && CONFIG_BMP180 */
-#endif /* __DRIVERS_BMP180_H */
+#endif /* __INCLUDE_NUTTX_SENSORS_BMP180_H */
diff --git a/include/nuttx/sensors/mcp9844.h b/include/nuttx/sensors/mcp9844.h
index 97a8f2bda32..36bc5822a64 100644
--- a/include/nuttx/sensors/mcp9844.h
+++ b/include/nuttx/sensors/mcp9844.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NUTTX_INCLUDE_NUTTX_SENSORS_MCP9844_H
-#define __NUTTX_INCLUDE_NUTTX_SENSORS_MCP9844_H
+#ifndef __INCLUDE_NUTTX_SENSORS_MCP9844_H
+#define __INCLUDE_NUTTX_SENSORS_MCP9844_H
 
 /****************************************************************************
  * Included Files
@@ -125,4 +125,4 @@ int mcp9844_register(FAR const char *devpath, FAR struct i2c_master_s *i2c,
 #endif
 
 #endif /* CONFIG_I2C && CONFIG_MCP9844 */
-#endif /* __NUTTX_INCLUDE_NUTTX_SENSORS_MCP9844_H */
+#endif /* __INCLUDE_NUTTX_SENSORS_MCP9844_H */
diff --git a/include/nuttx/sensors/mpl115a.h b/include/nuttx/sensors/mpl115a.h
index 736922d968e..4df7de55d13 100644
--- a/include/nuttx/sensors/mpl115a.h
+++ b/include/nuttx/sensors/mpl115a.h
@@ -33,8 +33,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __DRIVERS_SENSORS_MPL115A_H
-#define __DRIVERS_SENSORS_MPL115A_H
+#ifndef __INCLUDE_NUTTX_SENSORS_MPL115A_H
+#define __INCLUDE_NUTTX_SENSORS_MPL115A_H
 
 #include <nuttx/config.h>
 
@@ -127,4 +127,4 @@ int mpl115a_register(FAR const char *devpath, FAR struct spi_dev_s *spi);
 #endif
 
 #endif /* CONFIG_SPI && CONFIG_MPL115A */
-#endif /* __DRIVERS_SENSORS_MPL115A_H */
+#endif /* __INCLUDE_NUTTX_SENSORS_MPL115A_H */
diff --git a/include/nuttx/sensors/qencoder.h b/include/nuttx/sensors/qencoder.h
index f765ee1956f..8a240ad1314 100644
--- a/include/nuttx/sensors/qencoder.h
+++ b/include/nuttx/sensors/qencoder.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NUTTX_SENSORS_QENCODER_H
-#define __NUTTX_SENSORS_QENCODER_H
+#ifndef __INCLUDE_NUTTX_SENSORS_QENCODER_H
+#define __INCLUDE_NUTTX_SENSORS_QENCODER_H
 
 /****************************************************************************
  * Included Files
@@ -177,4 +177,4 @@ int qe_register(FAR const char *devpath, FAR struct qe_lowerhalf_s *lower);
 #endif
 
 #endif /* CONFIG_QENCODER */
-#endif /* __NUTTX_SENSORS_QENCODER_H */
+#endif /* __INCLUDE_NUTTX_SENSORS_QENCODER_H */
diff --git a/include/nuttx/sensors/zerocross.h b/include/nuttx/sensors/zerocross.h
index 9b93c7c2152..6d7ce40b87e 100644
--- a/include/nuttx/sensors/zerocross.h
+++ b/include/nuttx/sensors/zerocross.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NUTTX_SENSORS_ZEROCROSS_H
-#define __NUTTX_SENSORS_ZEROCROSS_H
+#ifndef __INCLUDE_NUTTX_SENSORS_ZEROCROSS_H
+#define __INCLUDE_NUTTX_SENSORS_ZEROCROSS_H
 
 /****************************************************************************
  * Included Files
@@ -148,4 +148,4 @@ int zc_register(FAR const char *devpath, FAR struct zc_lowerhalf_s *lower);
 #endif
 
 #endif /* CONFIG_ZEROCROSS */
-#endif /* __NUTTX_SENSORS_ZEROCROSS_H */
+#endif /* __INCLUDE_NUTTX_SENSORS_ZEROCROSS_H */
diff --git a/include/nuttx/sercomm/sercomm.h b/include/nuttx/sercomm/sercomm.h
index 54256b5a7dc..260f1be57b8 100644
--- a/include/nuttx/sercomm/sercomm.h
+++ b/include/nuttx/sercomm/sercomm.h
@@ -1,5 +1,5 @@
-#ifndef _SERCOMM_H
-#define _SERCOMM_H
+#ifndef __INCLUDE_NUTTX_SERCOMM_SERCOMM_H
+#define __INCLUDE_NUTTX_SERCOMM_SERCOMM_H
 
 /* SERCOMM layer on UART1 (modem UART) */
 
@@ -54,4 +54,4 @@ static inline struct msgb *sercomm_alloc_msgb(unsigned int len)
 	return msgb_alloc_headroom(len+4, 4, "sercomm_tx");
 }
 
-#endif /* _SERCOMM_H */
+#endif /* __INCLUDE_NUTTX_SERCOMM_SERCOMM_H */
diff --git a/include/nuttx/sercomm/sercomm_cons.h b/include/nuttx/sercomm/sercomm_cons.h
index 11f66545c21..eb8e7fa12bd 100644
--- a/include/nuttx/sercomm/sercomm_cons.h
+++ b/include/nuttx/sercomm/sercomm_cons.h
@@ -1,5 +1,5 @@
-#ifndef _SERCOMM_CONS_H
-#define _SERCOMM_CONS_H
+#ifndef __INCLUDE_NUTTX_SERCOMM_SERCOMM_CONS_H
+#define __INCLUDE_NUTTX_SERCOMM_SERCOMM_CONS_H
 
 /* how large buffers do we allocate? */
 #define SERCOMM_CONS_ALLOC	256
@@ -7,4 +7,4 @@
 int sercomm_puts(const char *s);
 int sercomm_putchar(int c);
 
-#endif /* _SERCOMM_CONS_H */
+#endif /* __INCLUDE_NUTTX_SERCOMM_SERCOMM_CONS_H */
diff --git a/include/nuttx/streams.h b/include/nuttx/streams.h
index 6ae6b8c9430..ffbcffc9ec5 100644
--- a/include/nuttx/streams.h
+++ b/include/nuttx/streams.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_STREAMS_H
-#define _INCLUDE_NUTTX_STREAMS_H
+#ifndef __INCLUDE_NUTTX_STREAMS_H
+#define __INCLUDE_NUTTX_STREAMS_H
 
 /****************************************************************************
  * Included Files
@@ -440,4 +440,4 @@ int lib_vsprintf(FAR struct lib_outstream_s *obj,
 }
 #endif
 
-#endif /* _INCLUDE_NUTTX_STREAMS_H */
+#endif /* __INCLUDE_NUTTX_STREAMS_H */
diff --git a/include/nuttx/usb/pl2303.h b/include/nuttx/usb/pl2303.h
index 925010db027..2f4ef137163 100644
--- a/include/nuttx/usb/pl2303.h
+++ b/include/nuttx/usb/pl2303.h
@@ -39,8 +39,8 @@
  *
  ************************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_USB_PL2303_H
-#define _INCLUDE_NUTTX_USB_PL2303_H
+#ifndef __INCLUDE_NUTTX_USB_PL2303_H
+#define __INCLUDE_NUTTX_USB_PL2303_H
 
 /************************************************************************************
  * Included Files
@@ -88,4 +88,4 @@ int usbdev_serialinitialize(int minor);
 }
 #endif
 
-#endif /* _INCLUDE_NUTTX_USB_PL2303_H */
+#endif /* __INCLUDE_NUTTX_USB_PL2303_H */
diff --git a/include/nuttx/usb/usbdev.h b/include/nuttx/usb/usbdev.h
index 1e36963f75f..ed7fe433ee5 100644
--- a/include/nuttx/usb/usbdev.h
+++ b/include/nuttx/usb/usbdev.h
@@ -39,8 +39,8 @@
  *
  ************************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_USB_USBDEV_H
-#define _INCLUDE_NUTTX_USB_USBDEV_H
+#ifndef __INCLUDE_NUTTX_USB_USBDEV_H
+#define __INCLUDE_NUTTX_USB_USBDEV_H
 
 /************************************************************************************
  * Included Files
@@ -386,4 +386,4 @@ void usbdev_dma_free(FAR void *memory);
 }
 #endif
 
-#endif /* _INCLUDE_NUTTX_USB_USBDEV_H */
+#endif /* __INCLUDE_NUTTX_USB_USBDEV_H */
diff --git a/include/nuttx/usb/usbhost_devaddr.h b/include/nuttx/usb/usbhost_devaddr.h
index df4514f3954..378196b7d3a 100644
--- a/include/nuttx/usb/usbhost_devaddr.h
+++ b/include/nuttx/usb/usbhost_devaddr.h
@@ -40,8 +40,8 @@
  *
  ****************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_USB_USBHOST_DEVADDR_H
-#define _INCLUDE_NUTTX_USB_USBHOST_DEVADDR_H
+#ifndef __INCLUDE_NUTTX_USB_USBHOST_DEVADDR_H
+#define __INCLUDE_NUTTX_USB_USBHOST_DEVADDR_H
 
 /****************************************************************************
  * Included Files
@@ -151,4 +151,4 @@ void usbhost_devaddr_destroy(FAR struct usbhost_hubport_s *hport,
 }
 #endif
 
-#endif /* _INCLUDE_NUTTX_USB_USBHOST_DEVADDR_H */
+#endif /* __INCLUDE_NUTTX_USB_USBHOST_DEVADDR_H */
diff --git a/include/nuttx/usb/usbmsc.h b/include/nuttx/usb/usbmsc.h
index 140d2907ff8..270fac0da3e 100644
--- a/include/nuttx/usb/usbmsc.h
+++ b/include/nuttx/usb/usbmsc.h
@@ -39,8 +39,8 @@
  *
  ************************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_USB_USBMSC_H
-#define _INCLUDE_NUTTX_USB_USBMSC_H
+#ifndef __INCLUDE_NUTTX_USB_USBMSC_H
+#define __INCLUDE_NUTTX_USB_USBMSC_H
 
 /************************************************************************************
  * Included Files
@@ -255,4 +255,4 @@ void usbmsc_uninitialize(FAR void *handle);
 }
 #endif
 
-#endif /* _INCLUDE_NUTTX_USB_USBMSC_H */
+#endif /* __INCLUDE_NUTTX_USB_USBMSC_H */
diff --git a/include/nuttx/video/fb.h b/include/nuttx/video/fb.h
index 1264515adee..fec81822ca9 100644
--- a/include/nuttx/video/fb.h
+++ b/include/nuttx/video/fb.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_VIDEO_FB_H
-#define _INCLUDE_NUTTX_VIDEO_FB_H
+#ifndef __INCLUDE_NUTTX_VIDIO_FB_H
+#define __INCLUDE_NUTTX_VIDIO_FB_H
 
 /****************************************************************************
  * Included Files
@@ -426,4 +426,4 @@ void up_fbuninitialize(int display);
 }
 #endif
 
-#endif /* _INCLUDE_NUTTX_VIDEO_FB_H */
+#endif /* __INCLUDE_NUTTX_VIDIO_FB_H */
diff --git a/include/nuttx/wireless/cc3000/cc3000_common.h b/include/nuttx/wireless/cc3000/cc3000_common.h
index 4a11f74591b..857c6560b33 100644
--- a/include/nuttx/wireless/cc3000/cc3000_common.h
+++ b/include/nuttx/wireless/cc3000/cc3000_common.h
@@ -32,8 +32,8 @@
  *
  ****************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_WIRELESS_CC3000_CC3000_COMMON_H
-#define _INCLUDE_NUTTX_WIRELESS_CC3000_CC3000_COMMON_H
+#ifndef __INCLUDE_NUTTX_WIRELESS_CC3000_CC3300_COMMON_H
+#define __INCLUDE_NUTTX_WIRELESS_CC3000_CC3300_COMMON_H
 
 /****************************************************************************
  * Included files
@@ -391,4 +391,4 @@ unsigned long STREAM_TO_UINT32_f(char* p, uint16_t offset);
 }
 #endif // __cplusplus
 
-#endif // _INCLUDE_NUTTX_WIRELESS_CC3000_CC3000_COMMON_H
+#endif // __INCLUDE_NUTTX_WIRELESS_CC3000_CC3300_COMMON_H
diff --git a/include/nuttx/wireless/cc3000/hci.h b/include/nuttx/wireless/cc3000/hci.h
index 409fd9d1e94..8b4c3e67ab5 100644
--- a/include/nuttx/wireless/cc3000/hci.h
+++ b/include/nuttx/wireless/cc3000/hci.h
@@ -32,8 +32,8 @@
  *
  ****************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_WIRELESS_CC3000_HCI_H
-#define _INCLUDE_NUTTX_WIRELESS_CC3000_HCI_H
+#ifndef __INCLUDE_NUTTX_WIRELESS_CC3000_HCI_H
+#define __INCLUDE_NUTTX_WIRELESS_CC3000_HCI_H
 
 /****************************************************************************
  * Included Files
@@ -296,4 +296,4 @@ void hci_patch_send(uint8_t ucOpcode, uint8_t *pucBuff, char *patch,
 }
 #endif // __cplusplus
 
-#endif // _INCLUDE_NUTTX_WIRELESS_CC3000_HCI_H
+#endif // __INCLUDE_NUTTX_WIRELESS_CC3000_HCI_H
diff --git a/include/nuttx/wireless/cc3000/netapp.h b/include/nuttx/wireless/cc3000/netapp.h
index e42b5876a40..8a0bcf4acb5 100644
--- a/include/nuttx/wireless/cc3000/netapp.h
+++ b/include/nuttx/wireless/cc3000/netapp.h
@@ -32,8 +32,8 @@
  *
  ****************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_WIRELESS_CC3000_NETAPP_H
-#define  _INCLUDE_NUTTX_WIRELESS_CC3000_NETAPP_H
+#ifndef __INCLUDE_NUTTX_WIRELESS_CC3000_NETAPP_H
+#define __INCLUDE_NUTTX_WIRELESS_CC3000_NETAPP_H
 
 /****************************************************************************
  * Included Files
@@ -354,4 +354,4 @@ long netapp_set_debug_level(unsigned long ulLevel);
 }
 #endif // __cplusplus
 
-#endif  // _INCLUDE_NUTTX_WIRELESS_CC3000_NETAPP_H
+#endif  // __INCLUDE_NUTTX_WIRELESS_CC3000_NETAPP_H
diff --git a/include/nuttx/wireless/cc3000/nvmem.h b/include/nuttx/wireless/cc3000/nvmem.h
index f9b3b48695c..afc6aec8905 100644
--- a/include/nuttx/wireless/cc3000/nvmem.h
+++ b/include/nuttx/wireless/cc3000/nvmem.h
@@ -32,8 +32,8 @@
  *
  ****************************************************************************/
 
-#ifndef _INCLUDE_NUTTX_WIRELESS_CC3000_NVMEM_H
-#define _INCLUDE_NUTTX_WIRELESS_CC3000_NVMEM_H
+#ifndef __INCLUDE_NUTTX_WIRELESS_CC3000_NVMEM_H
+#define __INCLUDE_NUTTX_WIRELESS_CC3000_NVMEM_H
 
 /****************************************************************************
  * Included Files
@@ -241,4 +241,4 @@ signed long nvmem_create_entry(unsigned long ulFileId, unsigned long ulNewLen);
 }
 #endif // __cplusplus
 
-#endif // _INCLUDE_NUTTX_WIRELESS_CC3000_NVMEM_H
+#endif // __INCLUDE_NUTTX_WIRELESS_CC3000_NVMEM_H
diff --git a/include/nuttx/wireless/mfrc522.h b/include/nuttx/wireless/mfrc522.h
index d5e406738ce..252ec403027 100644
--- a/include/nuttx/wireless/mfrc522.h
+++ b/include/nuttx/wireless/mfrc522.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NUTTX_WIRELESS_MFRC522_H
-#define __NUTTX_WIRELESS_MFRC522_H
+#ifndef __INCLUDE_NUTTX_WIRELESS_MFRC522_H
+#define __INCLUDE_NUTTX_WIRELESS_MFRC522_H
 
 /****************************************************************************
  * Included Files
@@ -113,4 +113,4 @@ int mfrc522_register(FAR const char *devpath, FAR struct spi_dev_s *spi);
 }
 #endif
 
-#endif /* __NUTTX_WIRELESS_MFRC522_H */
+#endif /* __INCLUDE_NUTTX_WIRELESS_MFRC522_H */
diff --git a/include/nuttx/wireless/pn532.h b/include/nuttx/wireless/pn532.h
index f260afa7c24..73d41f00174 100644
--- a/include/nuttx/wireless/pn532.h
+++ b/include/nuttx/wireless/pn532.h
@@ -35,8 +35,8 @@
  *
  ****************************************************************************/
 
-#ifndef __NUTTX_WIRELESS_PN532_H
-#define __NUTTX_WIRELESS_PN532_H
+#ifndef __INCLUDE_NUTTX_WIRELESS_PN532_H
+#define __INCLUDE_NUTTX_WIRELESS_PN532_H
 
 /****************************************************************************
  * Included Files
@@ -162,4 +162,4 @@ int pn532_register(FAR const char *devpath, FAR struct spi_dev_s *spi,
 }
 #endif
 
-#endif /* __NUTTX_WIRELESS_PN532_H */
+#endif /* __INCLUDE_NUTTX_WIRELESS_PN532_H */
diff --git a/include/sys/epoll.h b/include/sys/epoll.h
index 01aecdd69ef..672dc1901a2 100644
--- a/include/sys/epoll.h
+++ b/include/sys/epoll.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_SYS_EPOLL_H
-#define __INCLUDE_NUTTX_SYS_EPOLL_H
+#ifndef __INCLUDE_SYS_EPOLL_H
+#define __INCLUDE_SYS_EPOLL_H
 
 /****************************************************************************
  * Included Files
@@ -107,4 +107,4 @@ int epoll_wait(int epfd, struct epoll_event *evs, int maxevents, int timeout);
 
 void epoll_close(int epfd);
 
-#endif /* __INCLUDE_NUTTX_SYS_EPOLL_H */
+#endif /* __INCLUDE_SYS_EPOLL_H */