diff --git a/core/include/flags.h b/core/include/flags.h
index 733c8872be..62a85a6b8c 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 b9e7c47f8a..fe10855ebe 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 2c11161733..10508d2390 100644
--- a/core/include/native_sched.h
+++ b/core/include/native_sched.h
@@ -21,8 +21,8 @@
  * @}
  */
 
-#ifndef _NATIVE_SCHEDULER_H
-#define _NATIVE_SCHEDULER_H
+#ifndef NATIVE_SCHEDULER_H
+#define NATIVE_SCHEDULER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,4 +54,4 @@ inline int sched_yield(void)
 }
 #endif
 
-#endif // _NATIVE_SCHEDULER_H
+#endif /* NATIVE_SCHEDULER_H */
diff --git a/core/include/sched.h b/core/include/sched.h
index 7f0436377a..53b883c7fb 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 */
 /** @} */