Index: kernel/generic/include/proc/scheduler.h
===================================================================
--- kernel/generic/include/proc/scheduler.h	(revision 32fffef00aa36a7913892cc0d7ff6eff828b2e7e)
+++ kernel/generic/include/proc/scheduler.h	(revision 3abe07f5c756a02236a5204f4769d9d19bd36b98)
@@ -33,6 +33,6 @@
  */
 
-#ifndef __SCHEDULER_H__
-#define __SCHEDULER_H__
+#ifndef KERN_SCHEDULER_H_
+#define KERN_SCHEDULER_H_
 
 #include <synch/spinlock.h>
Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 32fffef00aa36a7913892cc0d7ff6eff828b2e7e)
+++ kernel/generic/include/proc/task.h	(revision 3abe07f5c756a02236a5204f4769d9d19bd36b98)
@@ -33,6 +33,6 @@
  */
 
-#ifndef __TASK_H__
-#define __TASK_H__
+#ifndef KERN_TASK_H_
+#define KERN_TASK_H_
 
 #include <typedefs.h>
@@ -108,5 +108,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision 32fffef00aa36a7913892cc0d7ff6eff828b2e7e)
+++ kernel/generic/include/proc/thread.h	(revision 3abe07f5c756a02236a5204f4769d9d19bd36b98)
@@ -33,6 +33,6 @@
  */
 
-#ifndef __THREAD_H__
-#define __THREAD_H__
+#ifndef KERN_THREAD_H_
+#define KERN_THREAD_H_
 
 #include <arch/proc/thread.h>
Index: kernel/generic/include/proc/uarg.h
===================================================================
--- kernel/generic/include/proc/uarg.h	(revision 32fffef00aa36a7913892cc0d7ff6eff828b2e7e)
+++ kernel/generic/include/proc/uarg.h	(revision 3abe07f5c756a02236a5204f4769d9d19bd36b98)
@@ -33,6 +33,6 @@
  */
 
-#ifndef __UARG_H__
-#define __UARG_H__
+#ifndef KERN_UARG_H_
+#define KERN_UARG_H_
 
 /** Structure passed to uinit kernel thread as argument. */