Index: uspace/libc/arch/ia64/include/atomic.h
===================================================================
--- uspace/libc/arch/ia64/include/atomic.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ia64/include/atomic.h	(revision d7e3f1ade9ff58d20053f91aafb424534a868c2e)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcia64	
+/** @addtogroup libcia64	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __ia64_ATOMIC_H__
-#define __ia64_ATOMIC_H__
+#ifndef LIBC_ia64_ATOMIC_H_
+#define LIBC_ia64_ATOMIC_H_
 
 /** Atomic addition.
@@ -63,5 +63,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/ia64/include/endian.h
===================================================================
--- uspace/libc/arch/ia64/include/endian.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ia64/include/endian.h	(revision d7e3f1ade9ff58d20053f91aafb424534a868c2e)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcia64	
+/** @addtogroup libcia64	
  * @{
  */
@@ -33,8 +33,8 @@
  */
 
-#ifndef __ia64_ENDIAN_H__
-#define __ia64_ENDIAN_H__
+#ifndef LIBC_ia64_ENDIAN_H_
+#define LIBC_ia64_ENDIAN_H_
 
-#ifndef __LIBC__ENDIAN_H__
+#ifndef LIBC_ENDIAN_H_
 # error "Never use <libarch/endian.h> directly - use <endian.h> instead."
 #endif
@@ -44,7 +44,4 @@
 #endif
 
-
-
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/ia64/include/limits.h
===================================================================
--- uspace/libc/arch/ia64/include/limits.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ia64/include/limits.h	(revision d7e3f1ade9ff58d20053f91aafb424534a868c2e)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcia64	
+/** @addtogroup libcia64	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __ia64__LIMITS_H__
-#define __ia64__LIMITS_H__
+#ifndef LIBC_ia64_LIMITS_H_
+#define LIBC_ia64_LIMITS_H_
 
 # define LONG_MIN MIN_INT64
@@ -43,8 +43,4 @@
 #endif
 
-
-
-
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/ia64/include/psthread.h
===================================================================
--- uspace/libc/arch/ia64/include/psthread.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ia64/include/psthread.h	(revision d7e3f1ade9ff58d20053f91aafb424534a868c2e)
@@ -136,5 +136,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/ia64/include/stack.h
===================================================================
--- uspace/libc/arch/ia64/include/stack.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ia64/include/stack.h	(revision d7e3f1ade9ff58d20053f91aafb424534a868c2e)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcia64	
+/** @addtogroup libcia64	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __ia64_STACK_H__
-#define __ia64_STACK_H__
+#ifndef LIBC_ia64_STACK_H_
+#define LIBC_ia64_STACK_H_
 
 #define STACK_ITEM_SIZE			8
@@ -43,5 +43,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/ia64/include/stackarg.h
===================================================================
--- uspace/libc/arch/ia64/include/stackarg.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ia64/include/stackarg.h	(revision d7e3f1ade9ff58d20053f91aafb424534a868c2e)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcia64	
+/** @addtogroup libcia64	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __LIBC__STACKARG_H__
-#define __LIBC__STACKARG_H__
+#ifndef LIBC_STACKARG_H_
+#define LIBC_STACKARG_H_
 
 #endif
Index: uspace/libc/arch/ia64/include/thread.h
===================================================================
--- uspace/libc/arch/ia64/include/thread.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ia64/include/thread.h	(revision d7e3f1ade9ff58d20053f91aafb424534a868c2e)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcia64	
+/** @addtogroup libcia64	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __LIBC__ia64THREAD_H__
-#define __LIBC__ia64THREAD_H__
+#ifndef LIBC_ia64THREAD_H_
+#define LIBC_ia64THREAD_H_
 
 #define THREAD_INITIAL_STACK_PAGES_NO 2
@@ -60,5 +60,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/ia64/src/thread.c
===================================================================
--- uspace/libc/arch/ia64/src/thread.c	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ia64/src/thread.c	(revision d7e3f1ade9ff58d20053f91aafb424534a868c2e)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcia64 ia64
+/** @addtogroup libcia64 ia64
   * @brief ia64 architecture dependent parts of libc
   * @ingroup lc
@@ -62,5 +62,4 @@
 }
 
- /** @}
+/** @}
  */
-