Index: uspace/libc/arch/mips32/include/atomic.h
===================================================================
--- uspace/libc/arch/mips32/include/atomic.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/mips32/include/atomic.h	(revision e2bf6397425bb03f552f342e22cf4d105a242516)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcmips32	
+/** @addtogroup libcmips32	
  * @{
  */
@@ -34,6 +34,6 @@
  */
 
-#ifndef __mips32_ATOMIC_H__
-#define __mips32_ATOMIC_H__
+#ifndef LIBC_mips32_ATOMIC_H_
+#define LIBC_mips32_ATOMIC_H_
 
 #define atomic_inc(x)	((void) atomic_add(x, 1))
@@ -74,5 +74,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/mips32/include/context_offset.h
===================================================================
--- uspace/libc/arch/mips32/include/context_offset.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/mips32/include/context_offset.h	(revision e2bf6397425bb03f552f342e22cf4d105a242516)
@@ -27,5 +27,2 @@
 #define OFFSET_F30     0x5c
 
- /** @}
- */
-
Index: uspace/libc/arch/mips32/include/endian.h
===================================================================
--- uspace/libc/arch/mips32/include/endian.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/mips32/include/endian.h	(revision e2bf6397425bb03f552f342e22cf4d105a242516)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcmips32 mips32
+/** @addtogroup libcmips32 mips32
   * @brief mips32 architecture dependent parts of libc
   * @ingroup lc
@@ -35,8 +35,8 @@
  */
 
-#ifndef __mips32_ENDIAN_H__
-#define __mips32_ENDIAN_H__
+#ifndef LIBC_mips32_ENDIAN_H_
+#define LIBC_mips32_ENDIAN_H_
 
-#ifndef __LIBC__ENDIAN_H__
+#ifndef LIBC_ENDIAN_H_
 # error "Never use <libarch/endian.h> directly - use <endian.h> instead."
 #endif
@@ -46,6 +46,4 @@
 #endif
 
-
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/mips32/include/limits.h
===================================================================
--- uspace/libc/arch/mips32/include/limits.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/mips32/include/limits.h	(revision e2bf6397425bb03f552f342e22cf4d105a242516)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcmips32	
+/** @addtogroup libcmips32	
  * @{
  */
@@ -34,6 +34,6 @@
  */
 
-#ifndef __mips32__LIMITS_H__
-#define __mips32__LIMITS_H__
+#ifndef LIBC_mips32__LIMITS_H_
+#define LIBC_mips32__LIMITS_H_
 
 # define LONG_MIN MIN_INT32
@@ -44,7 +44,4 @@
 #endif
 
-
-
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/mips32/include/psthread.h
===================================================================
--- uspace/libc/arch/mips32/include/psthread.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/mips32/include/psthread.h	(revision e2bf6397425bb03f552f342e22cf4d105a242516)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcmips32	
+/** @addtogroup libcmips32	
  * @{
  */
@@ -34,6 +34,6 @@
  */
 
-#ifndef __LIBC__mips32PSTHREAD_H__
-#define __LIBC__mips32PSTHREAD_H__
+#ifndef LIBC_mips32_PSTHREAD_H_
+#define LIBC_mips32_PSTHREAD_H_
 
 #include <types.h>
@@ -87,5 +87,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/mips32/include/stackarg.h
===================================================================
--- uspace/libc/arch/mips32/include/stackarg.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/mips32/include/stackarg.h	(revision e2bf6397425bb03f552f342e22cf4d105a242516)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcmips32	
+/** @addtogroup libcmips32	
  * @{
  */
@@ -34,6 +34,6 @@
  */
 
-#ifndef __LIBC_mips32_STACKARG_H__
-#define __LIBC_mips32_STACKARG_H__
+#ifndef LIBC_mips32_STACKARG_H_
+#define LIBC_mips32_STACKARG_H_
 
 /* dont allow to define it second time in stdarg.h */
@@ -59,5 +59,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: uspace/libc/arch/mips32/include/thread.h
===================================================================
--- uspace/libc/arch/mips32/include/thread.h	(revision 002e6136848b41de207a590bc212ce31cce81d12)
+++ uspace/libc/arch/mips32/include/thread.h	(revision e2bf6397425bb03f552f342e22cf4d105a242516)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup libcmips32	
+/** @addtogroup libcmips32	
  * @{
  */
@@ -36,6 +36,6 @@
 /* TLS for MIPS is described in http://www.linux-mips.org/wiki/NPTL */
 
-#ifndef __LIBC__mips32THREAD_H__
-#define __LIBC__mips32THREAD_H__
+#ifndef LIBC_mips32THREAD_H_
+#define LIBC_mips32THREAD_H_
 
 /* I did not find any specification (neither MIPS nor PowerPC), but
@@ -76,5 +76,4 @@
 #endif
 
- /** @}
+/** @}
  */
-