diff --git a/boards/frdm-k64f/include/board.h b/boards/frdm-k64f/include/board.h
index 28ae56ae0bc00808618bb1636faad941d9e95388..9e557926b721ebbb0e4b8e69c45eb0e35d54a9ed 100644
--- a/boards/frdm-k64f/include/board.h
+++ b/boards/frdm-k64f/include/board.h
@@ -19,8 +19,8 @@
  * @author      Johann Fischer <j.fischer@phytec.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 #include "periph_conf.h"
@@ -94,5 +94,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H */
 /** @} */
diff --git a/boards/frdm-k64f/include/periph_conf.h b/boards/frdm-k64f/include/periph_conf.h
index 6343feb6613446379db7103e2e69cb8cb9f4b1fc..ea4ee444c29ba4e4827bb879e2190d4fed1b56bc 100644
--- a/boards/frdm-k64f/include/periph_conf.h
+++ b/boards/frdm-k64f/include/periph_conf.h
@@ -17,8 +17,8 @@
  * @author      Johann Fischer <j.fischer@phytec.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #include "cpu_conf.h"
 
@@ -284,12 +284,11 @@ extern "C"
 #define KINETIS_RNGA                 RNG
 #define RANDOM_CLKEN()               (SIM->SCGC6 |= (1 << 9))
 #define RANDOM_CLKDIS()              (SIM->SCGC6 &= ~(1 << 9))
-
 /** @} */
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H */
 /** @} */
diff --git a/boards/nrf51dongle/include/periph_conf.h b/boards/nrf51dongle/include/periph_conf.h
index 97a9e093f8a901466fe4293c7c6b58981d32f825..8ea27056a001831355e081444ccd10dd443a8adf 100644
--- a/boards/nrf51dongle/include/periph_conf.h
+++ b/boards/nrf51dongle/include/periph_conf.h
@@ -16,8 +16,8 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -120,4 +120,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H */
+/** @} */
diff --git a/boards/nrf6310/include/board.h b/boards/nrf6310/include/board.h
index 081419e961e3388bd5a8ce218e9d400ac1e12c36..3615968c051c8cab4e3abc419917b98aa5abf269 100644
--- a/boards/nrf6310/include/board.h
+++ b/boards/nrf6310/include/board.h
@@ -20,8 +20,8 @@
  * @author      Frank Holtz <frank-riot2015@holtznet.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 
@@ -77,5 +77,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H */
 /** @} */
diff --git a/boards/nrf6310/include/periph_conf.h b/boards/nrf6310/include/periph_conf.h
index a1b91736e80193c43ffb1be8dfd5161b63e3c1ca..4027e15744e82e9019b3f712fc3a6e88fcfbfb04 100644
--- a/boards/nrf6310/include/periph_conf.h
+++ b/boards/nrf6310/include/periph_conf.h
@@ -19,8 +19,8 @@
  * @author      Frank Holtz <frank-riot2015@holtznet.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -148,4 +148,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H */
+/** @} */
diff --git a/boards/saml21-xpro/include/board.h b/boards/saml21-xpro/include/board.h
index a061a815a506fa27ca287d3c9a9d3aa820650009..2bc2fc21121bfaa074b723af93c7f2b837452223 100644
--- a/boards/saml21-xpro/include/board.h
+++ b/boards/saml21-xpro/include/board.h
@@ -18,8 +18,8 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  */
 
-#ifndef __BOARD_H
-#define __BOARD_H
+#ifndef BOARD_H
+#define BOARD_H
 
 #include "cpu.h"
 
@@ -79,5 +79,5 @@ void board_init(void);
 }
 #endif
 
-#endif /** __BOARD_H */
+#endif /** BOARD_H */
 /** @} */
diff --git a/boards/saml21-xpro/include/periph_conf.h b/boards/saml21-xpro/include/periph_conf.h
index c624f73e781a97931dfd47f556433bc5762bf951..0f94f000914085248471f8e9ee5e496f11913c22 100644
--- a/boards/saml21-xpro/include/periph_conf.h
+++ b/boards/saml21-xpro/include/periph_conf.h
@@ -19,8 +19,8 @@
  * @autor       Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef __PERIPH_CONF_H
-#define __PERIPH_CONF_H
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -109,5 +109,5 @@ extern "C" {
 }
 #endif
 
-#endif /* __PERIPH_CONF_H */
+#endif /* PERIPH_CONF_H */
 /** @} */