Index: boot/arch/mips32/loader/asm.h
===================================================================
--- boot/arch/mips32/loader/asm.h	(revision 67f5fbd92424ee3d6c31b93b0b515498a9a24b3e)
+++ boot/arch/mips32/loader/asm.h	(revision de7663fb0ae74743dc4eb0f110341bf66804710f)
@@ -27,11 +27,11 @@
  */
 
-#ifndef __ASM_H__
-#define __ASM_H__
+#ifndef BOOT_mips32_ASM_H_
+#define BOOT_mips32_ASM_H_
 
 #define PAGE_SIZE 16384
 #define PAGE_WIDTH 14
 
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+#define memcpy(dst, src, cnt)	__builtin_memcpy((dst), (src), (cnt))
 
 void jump_to_kernel(void *entry, void *bootinfo, unsigned int bootinfo_size) __attribute__((noreturn));
Index: boot/arch/mips32/loader/main.h
===================================================================
--- boot/arch/mips32/loader/main.h	(revision 67f5fbd92424ee3d6c31b93b0b515498a9a24b3e)
+++ boot/arch/mips32/loader/main.h	(revision de7663fb0ae74743dc4eb0f110341bf66804710f)
@@ -27,6 +27,6 @@
  */
 
-#ifndef __MAIN_H__
-#define __MAIN_H__
+#ifndef BOOT_mips32_MAIN_H_
+#define BOOT_mips32_MAIN_H_
 
 /** Align to the nearest higher address.
Index: boot/arch/mips32/loader/msim.h
===================================================================
--- boot/arch/mips32/loader/msim.h	(revision 67f5fbd92424ee3d6c31b93b0b515498a9a24b3e)
+++ boot/arch/mips32/loader/msim.h	(revision de7663fb0ae74743dc4eb0f110341bf66804710f)
@@ -27,6 +27,6 @@
  */
 
-#ifndef __MSIM_H__
-#define __MSIM_H__
+#ifndef BOOT_mips32_MSIM_H_
+#define BOOT_mips32_MSIM_H_
 
 extern void init(void);
Index: boot/arch/mips32/loader/regname.h
===================================================================
--- boot/arch/mips32/loader/regname.h	(revision 67f5fbd92424ee3d6c31b93b0b515498a9a24b3e)
+++ boot/arch/mips32/loader/regname.h	(revision de7663fb0ae74743dc4eb0f110341bf66804710f)
@@ -27,6 +27,6 @@
  */
 
-#ifndef __mips32_REGNAME_H_
-#define __mips32_REGNAME_H_
+#ifndef BOOT_mips32_REGNAME_H_
+#define BOOT_mips32_REGNAME_H_
 
 #define zero    0
@@ -86,4 +86,3 @@
 #define eepc		30
 
-
 #endif /* _REGNAME_H_ */
Index: boot/arch/mips32/loader/types.h
===================================================================
--- boot/arch/mips32/loader/types.h	(revision 67f5fbd92424ee3d6c31b93b0b515498a9a24b3e)
+++ boot/arch/mips32/loader/types.h	(revision de7663fb0ae74743dc4eb0f110341bf66804710f)
@@ -27,6 +27,6 @@
  */
 
-#ifndef TYPES_H__
-#define TYPES_H__
+#ifndef BOOT_mips32_TYPES_H_
+#define BOOT_mips32_TYPES_H_
 
 #include <gentypes.h>