diff --git a/core/include/flags.h b/core/include/flags.h
index 733c8872bea2b15c275e53c657777a02c20fb2f1..62a85a6b8cf2b03bd29935c32c10bb1927ac6b49 100644
--- a/core/include/flags.h
+++ b/core/include/flags.h
@@ -16,8 +16,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef _FLAGS_H
-#define _FLAGS_H
+#ifndef FLAGS_H
+#define FLAGS_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -38,5 +38,5 @@
 }
 #endif
 
-#endif /* _FLAGS_H */
+#endif /* FLAGS_H */
 /** @} */
diff --git a/core/include/log.h b/core/include/log.h
index b9e7c47f8aa45b17796b7ee35d1442060da7547c..fe10855ebec1125bb68cb7754f655ac3928c4568 100644
--- a/core/include/log.h
+++ b/core/include/log.h
@@ -29,8 +29,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef __LOG_H
-#define __LOG_H
+#ifndef LOG_H
+#define LOG_H
 
 #ifdef __cplusplus
  extern "C" {
@@ -100,5 +100,5 @@ enum {
 }
 #endif
 
-#endif /* __LOG_H */
+#endif /* LOG_H */
 /** @} */
diff --git a/core/include/native_sched.h b/core/include/native_sched.h
index 2c11161733cbed7e2f0c6639fb014823273590af..1b561181debba8e0bbd11fea862f79042aefa540 100644
--- a/core/include/native_sched.h
+++ b/core/include/native_sched.h
@@ -18,11 +18,10 @@
  * @brief       Add definitions required on the native board
  *
  * @author      Raphael Hiesgen <raphael.hiesgen@haw-hamburg.de>
- * @}
  */
 
-#ifndef _NATIVE_SCHEDULER_H
-#define _NATIVE_SCHEDULER_H
+#ifndef NATIVE_SCHEDULER_H
+#define NATIVE_SCHEDULER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -30,6 +29,7 @@ extern "C" {
 
 #ifdef BOARD_NATIVE
 #include <stdio.h>
+
 /*
  * Required to use some C++11 headers with g++ on the native board.
  */
@@ -48,10 +48,11 @@ inline int sched_yield(void)
     puts("[ERROR] sched_yield called (defined in sched.h)\n");
     return 0;
 }
-#endif // BOARD_NATIVE
+#endif /* BOARD_NATIVE */
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif // _NATIVE_SCHEDULER_H
+#endif /* NATIVE_SCHEDULER_H */
+/** @} */
diff --git a/core/include/sched.h b/core/include/sched.h
index 7f0436377afba5b45edb6a554532cedbcf94dca8..53b883c7fbb8ef33a1a96a82da9258b74237ef14 100644
--- a/core/include/sched.h
+++ b/core/include/sched.h
@@ -77,8 +77,8 @@
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
-#ifndef _SCHEDULER_H
-#define _SCHEDULER_H
+#ifndef SCHEDULER_H
+#define SCHEDULER_H
 
 #include <stddef.h>
 #include "bitarithm.h"
@@ -193,5 +193,5 @@ void sched_register_cb(void (*callback)(uint32_t, uint32_t));
 }
 #endif
 
-#endif // _SCHEDULER_H
+#endif /* SCHEDULER_H */
 /** @} */