Index: uspace/libc/arch/ppc32/include/atomic.h
===================================================================
--- uspace/libc/arch/ppc32/include/atomic.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ppc32/include/atomic.h	(revision 9dae51d7af10e4e1cc8b9dc8f11dd75a35e17135)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcppc32	
+/** @addtogroup libcppc32	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __ppc32_ATOMIC_H__
-#define __ppc32_ATOMIC_H__
+#ifndef LIBC_ppc32_ATOMIC_H_
+#define LIBC_ppc32_ATOMIC_H_
 
 static inline void atomic_inc(atomic_t *val)
@@ -92,5 +92,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/ppc32/include/context_offset.h
===================================================================
--- uspace/libc/arch/ppc32/include/context_offset.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ppc32/include/context_offset.h	(revision 9dae51d7af10e4e1cc8b9dc8f11dd75a35e17135)
@@ -24,6 +24,2 @@
 #define OFFSET_CR    0x58
 #define OFFSET_CR    0x58
-
- /** @}
- */
-
Index: uspace/libc/arch/ppc32/include/endian.h
===================================================================
--- uspace/libc/arch/ppc32/include/endian.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ppc32/include/endian.h	(revision 9dae51d7af10e4e1cc8b9dc8f11dd75a35e17135)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcppc32	
+/** @addtogroup libcppc32	
  * @{
  */
@@ -33,8 +33,8 @@
  */
 
-#ifndef __ppc32_ENDIAN_H__
-#define __ppc32_ENDIAN_H__
+#ifndef LIBC_ppc32_ENDIAN_H_
+#define LIBC_ppc32_ENDIAN_H_
 
-#ifndef __LIBC__ENDIAN_H__
+#ifndef LIBC_ENDIAN_H_
 # error "Never use <libarch/endian.h> directly - use <endian.h> instead."
 #endif
@@ -44,5 +44,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/ppc32/include/limits.h
===================================================================
--- uspace/libc/arch/ppc32/include/limits.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ppc32/include/limits.h	(revision 9dae51d7af10e4e1cc8b9dc8f11dd75a35e17135)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcppc32	
+/** @addtogroup libcppc32	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __ppc32__LIMITS_H__
-#define __ppc32__LIMITS_H__
+#ifndef LIBC_ppc32_LIMITS_H_
+#define LIBC_ppc32_LIMITS_H_
 
 #define LONG_MIN MIN_INT32
@@ -43,5 +43,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/ppc32/include/psthread.h
===================================================================
--- uspace/libc/arch/ppc32/include/psthread.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ppc32/include/psthread.h	(revision 9dae51d7af10e4e1cc8b9dc8f11dd75a35e17135)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcppc32	
+/** @addtogroup libcppc32	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __LIBC__ppc32__PSTHREAD_H__
-#define __LIBC__ppc32__PSTHREAD_H__
+#ifndef LIBC_ppc32_PSTHREAD_H_
+#define LIBC_ppc32_PSTHREAD_H_
 
 #include <types.h>
@@ -80,5 +80,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/ppc32/include/regname.h
===================================================================
--- uspace/libc/arch/ppc32/include/regname.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ppc32/include/regname.h	(revision 9dae51d7af10e4e1cc8b9dc8f11dd75a35e17135)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcppc32	
+/** @addtogroup libcppc32	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __ppc32_REGNAME_H__
-#define __ppc32_REGNAME_H__
+#ifndef LIBC_ppc32_REGNAME_H_
+#define LIBC_ppc32_REGNAME_H_
 
 /* Condition Register Bit Fields */
@@ -185,5 +185,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/ppc32/include/stackarg.h
===================================================================
--- uspace/libc/arch/ppc32/include/stackarg.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ppc32/include/stackarg.h	(revision 9dae51d7af10e4e1cc8b9dc8f11dd75a35e17135)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcppc32	
+/** @addtogroup libcppc32	
  * @{
  */
@@ -33,11 +33,9 @@
  */
 
-#ifndef __LIBC__STACKARG_H__
-#define __LIBC__STACKARG_H__
+#ifndef LIBC_STACKARG_H_
+#define LIBC_STACKARG_H_
 
 #endif
 
-
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/ppc32/include/thread.h
===================================================================
--- uspace/libc/arch/ppc32/include/thread.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/ppc32/include/thread.h	(revision 9dae51d7af10e4e1cc8b9dc8f11dd75a35e17135)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcppc32	
+/** @addtogroup libcppc32	
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef __LIBC__ppc32__THREAD_H__
-#define __LIBC__ppc32__THREAD_H__
+#ifndef LIBC_ppc32_THREAD_H_
+#define LIBC_ppc32_THREAD_H_
 
 #define PPC_TP_OFFSET 0x7000
@@ -68,5 +68,4 @@
 #endif
 
- /** @}
+/** @}
  */
-