Index: uspace/lib/c/arch/ia64/include/libarch/config.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/config.h	(revision b4f117122b26d549e7cdbd586de66b7c21511361)
+++ uspace/lib/c/arch/ia64/include/libarch/config.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_ia64_CONFIG_H_
-#define LIBC_ia64_CONFIG_H_
+#ifndef _LIBC_ia64_CONFIG_H_
+#define _LIBC_ia64_CONFIG_H_
 
 #define PAGE_WIDTH	14
Index: uspace/lib/c/arch/ia64/include/libarch/ddi.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/ddi.h	(revision b4f117122b26d549e7cdbd586de66b7c21511361)
+++ uspace/lib/c/arch/ia64/include/libarch/ddi.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_ia64_DDI_H_
-#define LIBC_ia64_DDI_H_
+#ifndef _LIBC_ia64_DDI_H_
+#define _LIBC_ia64_DDI_H_
 
 #include <ddi.h>
Index: uspace/lib/c/arch/ia64/include/libarch/elf_linux.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/elf_linux.h	(revision b4f117122b26d549e7cdbd586de66b7c21511361)
+++ uspace/lib/c/arch/ia64/include/libarch/elf_linux.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_ia64_ELF_LINUX_H_
-#define LIBC_ia64_ELF_LINUX_H_
+#ifndef _LIBC_ia64_ELF_LINUX_H_
+#define _LIBC_ia64_ELF_LINUX_H_
 
 #include <libarch/istate.h>
Index: uspace/lib/c/arch/ia64/include/libarch/faddr.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/faddr.h	(revision b4f117122b26d549e7cdbd586de66b7c21511361)
+++ uspace/lib/c/arch/ia64/include/libarch/faddr.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_ia64_FADDR_H_
-#define LIBC_ia64_FADDR_H_
+#ifndef _LIBC_ia64_FADDR_H_
+#define _LIBC_ia64_FADDR_H_
 
 #include <types/common.h>
Index: uspace/lib/c/arch/ia64/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/fibril.h	(revision b4f117122b26d549e7cdbd586de66b7c21511361)
+++ uspace/lib/c/arch/ia64/include/libarch/fibril.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_ia64_FIBRIL_H_
-#define LIBC_ia64_FIBRIL_H_
+#ifndef _LIBC_ia64_FIBRIL_H_
+#define _LIBC_ia64_FIBRIL_H_
 
 #include <stdint.h>
Index: uspace/lib/c/arch/ia64/include/libarch/fibril_context.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/fibril_context.h	(revision b4f117122b26d549e7cdbd586de66b7c21511361)
+++ uspace/lib/c/arch/ia64/include/libarch/fibril_context.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -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_AR_PFS          0x000
Index: uspace/lib/c/arch/ia64/include/libarch/stack.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/stack.h	(revision b4f117122b26d549e7cdbd586de66b7c21511361)
+++ uspace/lib/c/arch/ia64/include/libarch/stack.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_ia64_STACK_H_
-#define LIBC_ia64_STACK_H_
+#ifndef _LIBC_ia64_STACK_H_
+#define _LIBC_ia64_STACK_H_
 
 #define STACK_ITEM_SIZE			8
Index: uspace/lib/c/arch/ia64/include/libarch/stackarg.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/stackarg.h	(revision b4f117122b26d549e7cdbd586de66b7c21511361)
+++ uspace/lib/c/arch/ia64/include/libarch/stackarg.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_STACKARG_H_
-#define LIBC_STACKARG_H_
+#ifndef _LIBC_STACKARG_H_
+#define _LIBC_STACKARG_H_
 
 #endif
Index: uspace/lib/c/arch/ia64/include/libarch/syscall.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/syscall.h	(revision b4f117122b26d549e7cdbd586de66b7c21511361)
+++ uspace/lib/c/arch/ia64/include/libarch/syscall.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -34,6 +34,6 @@
  */
 
-#ifndef LIBC_ia64_SYSCALL_H_
-#define LIBC_ia64_SYSCALL_H_
+#ifndef _LIBC_ia64_SYSCALL_H_
+#define _LIBC_ia64_SYSCALL_H_
 
 #define LIBARCH_SYSCALL_GENERIC
Index: uspace/lib/c/arch/ia64/include/libarch/thread.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/thread.h	(revision b4f117122b26d549e7cdbd586de66b7c21511361)
+++ uspace/lib/c/arch/ia64/include/libarch/thread.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_ia64_THREAD_H_
-#define LIBC_ia64_THREAD_H_
+#ifndef _LIBC_ia64_THREAD_H_
+#define _LIBC_ia64_THREAD_H_
 
 #endif
Index: uspace/lib/c/arch/ia64/include/libarch/tls.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/tls.h	(revision b4f117122b26d549e7cdbd586de66b7c21511361)
+++ uspace/lib/c/arch/ia64/include/libarch/tls.h	(revision 62101beefba91c0ff7d989250af8474affc836b5)
@@ -33,6 +33,6 @@
  */
 
-#ifndef LIBC_ia64_TLS_H_
-#define LIBC_ia64_TLS_H_
+#ifndef _LIBC_ia64_TLS_H_
+#define _LIBC_ia64_TLS_H_
 
 #define CONFIG_TLS_VARIANT_1