Index: kernel/genarch/include/mm/as_ht.h
===================================================================
--- kernel/genarch/include/mm/as_ht.h	(revision f47fd19f9885f194c0b816b7814357789c9565e2)
+++ kernel/genarch/include/mm/as_ht.h	(revision 3abe07f5c756a02236a5204f4769d9d19bd36b98)
@@ -33,6 +33,6 @@
  */
 
-#ifndef __AS_HT_H__
-#define __AS_HT_H__
+#ifndef KERN_AS_HT_H_
+#define KERN_AS_HT_H_
 
 #include <mm/as.h>
Index: kernel/genarch/include/mm/as_pt.h
===================================================================
--- kernel/genarch/include/mm/as_pt.h	(revision f47fd19f9885f194c0b816b7814357789c9565e2)
+++ kernel/genarch/include/mm/as_pt.h	(revision 3abe07f5c756a02236a5204f4769d9d19bd36b98)
@@ -33,6 +33,6 @@
  */
 
-#ifndef __AS_PT_H__
-#define __AS_PT_H__
+#ifndef KERN_AS_PT_H_
+#define KERN_AS_PT_H_
 
 #include <mm/as.h>
Index: kernel/genarch/include/mm/asid_fifo.h
===================================================================
--- kernel/genarch/include/mm/asid_fifo.h	(revision f47fd19f9885f194c0b816b7814357789c9565e2)
+++ kernel/genarch/include/mm/asid_fifo.h	(revision 3abe07f5c756a02236a5204f4769d9d19bd36b98)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup genarchmm
+/** @addtogroup genarchmm
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __ASID_FIFO_H__
-#define __ASID_FIFO_H__
+#ifndef KERN_ASID_FIFO_H_
+#define KERN_ASID_FIFO_H_
 
 extern void asid_fifo_init(void);
@@ -40,5 +40,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: kernel/genarch/include/mm/page_ht.h
===================================================================
--- kernel/genarch/include/mm/page_ht.h	(revision f47fd19f9885f194c0b816b7814357789c9565e2)
+++ kernel/genarch/include/mm/page_ht.h	(revision 3abe07f5c756a02236a5204f4769d9d19bd36b98)
@@ -37,6 +37,6 @@
 #ifdef CONFIG_PAGE_HT
 
-#ifndef __PAGE_HT_H__
-#define __PAGE_HT_H__
+#ifndef KERN_PAGE_HT_H_
+#define KERN_PAGE_HT_H_
 
 #include <mm/page.h>
Index: kernel/genarch/include/mm/page_pt.h
===================================================================
--- kernel/genarch/include/mm/page_pt.h	(revision f47fd19f9885f194c0b816b7814357789c9565e2)
+++ kernel/genarch/include/mm/page_pt.h	(revision 3abe07f5c756a02236a5204f4769d9d19bd36b98)
@@ -41,6 +41,6 @@
 #ifdef CONFIG_PAGE_PT
 
-#ifndef __PAGE_PT_H__
-#define __PAGE_PT_H__
+#ifndef KERN_PAGE_PT_H_
+#define KERN_PAGE_PT_H_
 
 #include <arch/types.h>