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 */
 /** @} */