Index: kernel/arch/mips32/include/drivers/arc.h
===================================================================
--- kernel/arch/mips32/include/drivers/arc.h	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/arch/mips32/include/drivers/arc.h	(revision 6ff1f1e849d8a798e3ed34a6dcdd58b2f25b0055)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup mips32	
+/** @addtogroup mips32	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __mips32_ARC_H__
-#define __mips32_ARC_H__
+#ifndef KERN_mips32_ARC_H_
+#define KERN_mips32_ARC_H_
 
 #include <arch/types.h>
@@ -54,5 +54,5 @@
 	CmResourceTypeProductName,
 	CmResourceTypeSerialNumber
-}cm_resource_type;
+} cm_resource_type;
 
 typedef struct {
@@ -75,5 +75,5 @@
 		}memory;
 	}u;
-}__attribute__ ((packed)) cm_resource_descriptor;
+} __attribute__ ((packed)) cm_resource_descriptor;
 
 typedef struct {
@@ -82,5 +82,5 @@
 	unsigned long count;
 	cm_resource_descriptor descr[1];
-}__attribute__ ((packed)) cm_resource_list;
+} __attribute__ ((packed)) cm_resource_list;
 
 typedef enum {
@@ -138,5 +138,5 @@
 	TPUAdapter,
 	Anonymous
-}arc_component_type;
+} arc_component_type;
 
 typedef enum {
@@ -148,5 +148,5 @@
 	Input = 32,
 	Output = 64
-}arc_component_flags;
+} arc_component_flags;
 
 typedef struct  {
@@ -183,5 +183,5 @@
 	FirmwareTemporary,
 	FirmwarePermanent
-}arc_memorytype_t;
+} arc_memorytype_t;
 
 typedef struct  {
@@ -189,10 +189,10 @@
 	uint32_t basepage;  /* *4096 = baseaddr */
 	uint32_t basecount;
-}arc_memdescriptor_t;
+} arc_memdescriptor_t;
 
 typedef struct {
 	char vendorid[8];
 	char prodid[8];
-}arc_sysid_t;
+} arc_sysid_t;
 
 typedef struct {
@@ -255,5 +255,5 @@
 	void *privvector;
 	uint32_t adaptercount;
-}__attribute__ ((packed)) arc_sbp;
+} __attribute__ ((packed)) arc_sbp;
 
 extern int arc_init(void);
@@ -266,3 +266,2 @@
  /** @}
  */
-
Index: kernel/arch/mips32/include/drivers/msim.h
===================================================================
--- kernel/arch/mips32/include/drivers/msim.h	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/arch/mips32/include/drivers/msim.h	(revision 6ff1f1e849d8a798e3ed34a6dcdd58b2f25b0055)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup mips32	
+/** @addtogroup mips32	
  * @{
  */
@@ -33,10 +33,10 @@
  */
 
-#ifndef _MSIM_H_
-#define _MSIM_H_
+#ifndef KERN_mips32_MSIM_H_
+#define KERN_mips32_MSIM_H_
 
 #include <console/chardev.h>
 
-#define MSIM_VIDEORAM            0xB0000000
+#define MSIM_VIDEORAM            	0xB0000000
 /** Address of 'keyboard' device. */
 #define MSIM_KBD_ADDRESS		0xB0000000
@@ -49,5 +49,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: kernel/arch/mips32/include/drivers/serial.h
===================================================================
--- kernel/arch/mips32/include/drivers/serial.h	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/arch/mips32/include/drivers/serial.h	(revision 6ff1f1e849d8a798e3ed34a6dcdd58b2f25b0055)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup mips32	
+/** @addtogroup mips32	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __DRV_SERIAL_H__
-#define __DRV_SERIAL_H__
+#ifndef KERN_mips32_SERIAL_H_
+#define KERN_mips32_SERIAL_H_
 
 #include <console/chardev.h>
@@ -68,5 +68,4 @@
 #endif
 
- /** @}
+/** @}
  */
-