Index: uspace/lib/c/arch/arm32/include/libarch/config.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/config.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/config.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_arm32_CONFIG_H_
-#define LIBC_arm32_CONFIG_H_
+#ifndef _LIBC_arm32_CONFIG_H_
+#define _LIBC_arm32_CONFIG_H_
 
 #define PAGE_WIDTH	12
Index: uspace/lib/c/arch/arm32/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/ddi.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/ddi.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -31,6 +31,6 @@
  */
 
-#ifndef LIBC_arm32_DDI_H_
-#define LIBC_arm32_DDI_H_
+#ifndef _LIBC_arm32_DDI_H_
+#define _LIBC_arm32_DDI_H_
 
 #include <ddi.h>
Index: uspace/lib/c/arch/arm32/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/elf_linux.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/elf_linux.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_arm32_ELF_LINUX_H_
-#define LIBC_arm32_ELF_LINUX_H_
+#ifndef _LIBC_arm32_ELF_LINUX_H_
+#define _LIBC_arm32_ELF_LINUX_H_
 
 #include <libarch/istate.h>
Index: uspace/lib/c/arch/arm32/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/faddr.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/faddr.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_arm32_FADDR_H_
-#define LIBC_arm32_FADDR_H_
+#ifndef _LIBC_arm32_FADDR_H_
+#define _LIBC_arm32_FADDR_H_
 
 #include <types/common.h>
Index: uspace/lib/c/arch/arm32/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/fibril.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/fibril.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_arm32_FIBRIL_H_
-#define LIBC_arm32_FIBRIL_H_
+#ifndef _LIBC_arm32_FIBRIL_H_
+#define _LIBC_arm32_FIBRIL_H_
 
 #include <types/common.h>
Index: uspace/lib/c/arch/arm32/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/fibril_context.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/fibril_context.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -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_
 
 #include <stdint.h>
Index: uspace/lib/c/arch/arm32/include/libarch/rtld/dynamic.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/rtld/dynamic.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/rtld/dynamic.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_arm32_RTLD_DYNAMIC_H_
-#define LIBC_arm32_RTLD_DYNAMIC_H_
+#ifndef _LIBC_arm32_RTLD_DYNAMIC_H_
+#define _LIBC_arm32_RTLD_DYNAMIC_H_
 
 typedef struct {
Index: uspace/lib/c/arch/arm32/include/libarch/rtld/elf_dyn.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/rtld/elf_dyn.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/rtld/elf_dyn.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_arm32_RTLD_ELF_DYN_H_
-#define LIBC_arm32_RTLD_ELF_DYN_H_
+#ifndef _LIBC_arm32_RTLD_ELF_DYN_H_
+#define _LIBC_arm32_RTLD_ELF_DYN_H_
 
 /*
Index: uspace/lib/c/arch/arm32/include/libarch/rtld/module.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/rtld/module.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/rtld/module.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_arm32_RTLD_MODULE_H_
-#define LIBC_arm32_RTLD_MODULE_H_
+#ifndef _LIBC_arm32_RTLD_MODULE_H_
+#define _LIBC_arm32_RTLD_MODULE_H_
 
 #include <elf/elf_mod.h>
Index: uspace/lib/c/arch/arm32/include/libarch/stackarg.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/stackarg.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/stackarg.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_arm32_STACKARG_H_
-#define LIBC_arm32_STACKARG_H_
+#ifndef _LIBC_arm32_STACKARG_H_
+#define _LIBC_arm32_STACKARG_H_
 
 #endif
Index: uspace/lib/c/arch/arm32/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/syscall.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/syscall.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_arm32_SYSCALL_H_
-#define LIBC_arm32_SYSCALL_H_
+#ifndef _LIBC_arm32_SYSCALL_H_
+#define _LIBC_arm32_SYSCALL_H_
 
 #define LIBARCH_SYSCALL_GENERIC
Index: uspace/lib/c/arch/arm32/include/libarch/thread.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/thread.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/thread.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_arm32_THREAD_H_
-#define LIBC_arm32_THREAD_H_
+#ifndef _LIBC_arm32_THREAD_H_
+#define _LIBC_arm32_THREAD_H_
 
 #endif
Index: uspace/lib/c/arch/arm32/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/arm32/include/libarch/tls.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/include/libarch/tls.h	(revision fc448f5f560ea1a9a7e90a7dff181e501713aa1e)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_arm32_TLS_H_
-#define LIBC_arm32_TLS_H_
+#ifndef _LIBC_arm32_TLS_H_
+#define _LIBC_arm32_TLS_H_
 
 #include <stdint.h>