Index: uspace/lib/c/arch/mips32/include/libarch/config.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/config.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/mips32/include/libarch/config.h	(revision 401415aa8fcb6902c643bf1c028f08be8f7c2d8e)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_mips32_CONFIG_H_
-#define LIBC_mips32_CONFIG_H_
+#ifndef _LIBC_mips32_CONFIG_H_
+#define _LIBC_mips32_CONFIG_H_
 
 #define PAGE_WIDTH  14
Index: uspace/lib/c/arch/mips32/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/ddi.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/mips32/include/libarch/ddi.h	(revision 401415aa8fcb6902c643bf1c028f08be8f7c2d8e)
@@ -31,6 +31,6 @@
  */
 
-#ifndef LIBC_mips32_DDI_H_
-#define LIBC_mips32_DDI_H_
+#ifndef _LIBC_mips32_DDI_H_
+#define _LIBC_mips32_DDI_H_
 
 #include <ddi.h>
Index: uspace/lib/c/arch/mips32/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/elf_linux.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/mips32/include/libarch/elf_linux.h	(revision 401415aa8fcb6902c643bf1c028f08be8f7c2d8e)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_mips32_ELF_LINUX_H_
-#define LIBC_mips32_ELF_LINUX_H_
+#ifndef _LIBC_mips32_ELF_LINUX_H_
+#define _LIBC_mips32_ELF_LINUX_H_
 
 #include <libarch/istate.h>
Index: uspace/lib/c/arch/mips32/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/faddr.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/mips32/include/libarch/faddr.h	(revision 401415aa8fcb6902c643bf1c028f08be8f7c2d8e)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_mips32_FADDR_H_
-#define LIBC_mips32_FADDR_H_
+#ifndef _LIBC_mips32_FADDR_H_
+#define _LIBC_mips32_FADDR_H_
 
 #include <types/common.h>
Index: uspace/lib/c/arch/mips32/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/fibril.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/mips32/include/libarch/fibril.h	(revision 401415aa8fcb6902c643bf1c028f08be8f7c2d8e)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_mips32_FIBRIL_H_
-#define LIBC_mips32_FIBRIL_H_
+#ifndef _LIBC_mips32_FIBRIL_H_
+#define _LIBC_mips32_FIBRIL_H_
 
 #include <stdint.h>
Index: uspace/lib/c/arch/mips32/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/fibril_context.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/mips32/include/libarch/fibril_context.h	(revision 401415aa8fcb6902c643bf1c028f08be8f7c2d8e)
@@ -27,6 +27,6 @@
  */
 
-#ifndef LIBC_ARCH_FIBRIL_CONTEXT_H_
-#define LIBC_ARCH_FIBRIL_CONTEXT_H_
+#ifndef _LIBC_ARCH_FIBRIL_CONTEXT_H_
+#define _LIBC_ARCH_FIBRIL_CONTEXT_H_
 
 #define __CONTEXT_OFFSET_SP   0x00
Index: uspace/lib/c/arch/mips32/include/libarch/stack.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/stack.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/mips32/include/libarch/stack.h	(revision 401415aa8fcb6902c643bf1c028f08be8f7c2d8e)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_mips32_STACK_H_
-#define LIBC_mips32_STACK_H_
+#ifndef _LIBC_mips32_STACK_H_
+#define _LIBC_mips32_STACK_H_
 
 #define STACK_ITEM_SIZE  4
Index: uspace/lib/c/arch/mips32/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/syscall.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/mips32/include/libarch/syscall.h	(revision 401415aa8fcb6902c643bf1c028f08be8f7c2d8e)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_mips32_SYSCALL_H_
-#define LIBC_mips32_SYSCALL_H_
+#ifndef _LIBC_mips32_SYSCALL_H_
+#define _LIBC_mips32_SYSCALL_H_
 
 #define LIBARCH_SYSCALL_GENERIC
Index: uspace/lib/c/arch/mips32/include/libarch/thread.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/thread.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/mips32/include/libarch/thread.h	(revision 401415aa8fcb6902c643bf1c028f08be8f7c2d8e)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_mips32_THREAD_H_
-#define LIBC_mips32_THREAD_H_
+#ifndef _LIBC_mips32_THREAD_H_
+#define _LIBC_mips32_THREAD_H_
 
 #endif
Index: uspace/lib/c/arch/mips32/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/mips32/include/libarch/tls.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/mips32/include/libarch/tls.h	(revision 401415aa8fcb6902c643bf1c028f08be8f7c2d8e)
@@ -36,6 +36,6 @@
 /* TLS for MIPS is described in http://www.linux-mips.org/wiki/NPTL */
 
-#ifndef LIBC_mips32_TLS_H_
-#define LIBC_mips32_TLS_H_
+#ifndef _LIBC_mips32_TLS_H_
+#define _LIBC_mips32_TLS_H_
 
 /*