Index: uspace/lib/c/arch/ia32/include/rtld/dynamic.h
===================================================================
--- uspace/lib/c/arch/ia32/include/rtld/dynamic.h	(revision 54146a0e4e89ae79bdb89d2cd48c51829a471c3d)
+++ uspace/lib/c/arch/ia32/include/rtld/dynamic.h	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ia32_DYNAMIC_H_
-#define ia32_DYNAMIC_H_
+#ifndef LIBC_ia32_RTLD_DYNAMIC_H_
+#define LIBC_ia32_RTLD_DYNAMIC_H_
 
 #include <sys/types.h>
Index: uspace/lib/c/arch/ia32/include/rtld/elf_dyn.h
===================================================================
--- uspace/lib/c/arch/ia32/include/rtld/elf_dyn.h	(revision 54146a0e4e89ae79bdb89d2cd48c51829a471c3d)
+++ uspace/lib/c/arch/ia32/include/rtld/elf_dyn.h	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
@@ -33,6 +33,6 @@
  */
 
-#ifndef ia32_ELF_DYN_H_
-#define ia32_ELF_DYN_H_
+#ifndef LIBC_ia32_RTLD_ELF_DYN_H_
+#define LIBC_ia32_RTLD_ELF_DYN_H_
 
 /* 
Index: uspace/lib/c/arch/ia32/src/rtld/dynamic.c
===================================================================
--- uspace/lib/c/arch/ia32/src/rtld/dynamic.c	(revision 54146a0e4e89ae79bdb89d2cd48c51829a471c3d)
+++ uspace/lib/c/arch/ia32/src/rtld/dynamic.c	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
@@ -27,8 +27,8 @@
  */
 
-/** @addtogroup rtld rtld
+/** @addtogroup libcia32
  * @brief
  * @{
- */ 
+ */
 /**
  * @file
@@ -38,6 +38,6 @@
 #include <stdlib.h>
 
-#include <elf_dyn.h>
-#include <dynamic.h>
+#include <rtld/elf_dyn.h>
+#include <rtld/dynamic.h>
 
 void dyn_parse_arch(elf_dyn_t *dp, size_t bias, dyn_info_t *info)
Index: uspace/lib/c/arch/ia32/src/rtld/reloc.c
===================================================================
--- uspace/lib/c/arch/ia32/src/rtld/reloc.c	(revision 54146a0e4e89ae79bdb89d2cd48c51829a471c3d)
+++ uspace/lib/c/arch/ia32/src/rtld/reloc.c	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
@@ -27,8 +27,8 @@
  */
 
-/** @addtogroup rtld rtld
+/** @addtogroup libcia32
  * @brief
  * @{
- */ 
+ */
 /**
  * @file
@@ -39,9 +39,8 @@
 
 #include <libarch/rtld/elf_dyn.h>
-#include <symbol.h>
-#include <rtld.h>
-#include <rtld_debug.h>
-
-#include <rtld_arch.h>
+#include <rtld/symbol.h>
+#include <rtld/rtld.h>
+#include <rtld/rtld_debug.h>
+#include <rtld/rtld_arch.h>
 
 void module_process_pre_arch(module_t *m)
Index: uspace/lib/c/arch/mips32/include/rtld/dynamic.h
===================================================================
--- uspace/lib/c/arch/mips32/include/rtld/dynamic.h	(revision 54146a0e4e89ae79bdb89d2cd48c51829a471c3d)
+++ uspace/lib/c/arch/mips32/include/rtld/dynamic.h	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup libcmips32
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef mips32_DYNAMIC_H_
-#define mips32_DYNAMIC_H_
+#ifndef LIBC_mips32_RTLD_DYNAMIC_H_
+#define LIBC_mips32_RTLD_DYNAMIC_H_
 
 #include <sys/types.h>
Index: uspace/lib/c/arch/mips32/include/rtld/elf_dyn.h
===================================================================
--- uspace/lib/c/arch/mips32/include/rtld/elf_dyn.h	(revision 54146a0e4e89ae79bdb89d2cd48c51829a471c3d)
+++ uspace/lib/c/arch/mips32/include/rtld/elf_dyn.h	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup libcmips32
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef mips32_ELF_DYN_H_
-#define mips32_ELF_DYN_H_
+#ifndef LIBC_mips32_RTLD_ELF_DYN_H_
+#define LIBC_mips32_RTLD_ELF_DYN_H_
 
 /*
Index: uspace/lib/c/arch/mips32/src/rtld/dynamic.c
===================================================================
--- uspace/lib/c/arch/mips32/src/rtld/dynamic.c	(revision 54146a0e4e89ae79bdb89d2cd48c51829a471c3d)
+++ uspace/lib/c/arch/mips32/src/rtld/dynamic.c	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
@@ -27,8 +27,8 @@
  */
 
-/** @addtogroup rtld rtld
+/** @addtogroup libcmips32
  * @brief
  * @{
- */ 
+ */
 /**
  * @file
Index: uspace/lib/c/arch/mips32/src/rtld/reloc.c
===================================================================
--- uspace/lib/c/arch/mips32/src/rtld/reloc.c	(revision 54146a0e4e89ae79bdb89d2cd48c51829a471c3d)
+++ uspace/lib/c/arch/mips32/src/rtld/reloc.c	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
@@ -27,8 +27,8 @@
  */
 
-/** @addtogroup rtld rtld
+/** @addtogroup libcmips32
  * @brief
  * @{
- */ 
+ */
 /**
  * @file
Index: uspace/lib/c/arch/ppc32/include/rtld/dynamic.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/rtld/dynamic.h	(revision 54146a0e4e89ae79bdb89d2cd48c51829a471c3d)
+++ uspace/lib/c/arch/ppc32/include/rtld/dynamic.h	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup libcppc32
  * @{
  */
@@ -33,6 +33,6 @@
  */
 
-#ifndef ppc32_DYNAMIC_H_
-#define ppc32_DYNAMIC_H_
+#ifndef LIBC_ppc32_RTLD_DYNAMIC_H_
+#define LIBC_ppc32_RTLD_DYNAMIC_H_
 
 #include <sys/types.h>
Index: uspace/lib/c/arch/ppc32/include/rtld/elf_dyn.h
===================================================================
--- uspace/lib/c/arch/ppc32/include/rtld/elf_dyn.h	(revision 54146a0e4e89ae79bdb89d2cd48c51829a471c3d)
+++ uspace/lib/c/arch/ppc32/include/rtld/elf_dyn.h	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup generic	
+/** @addtogroup libcppc32
  * @{
  */
@@ -33,8 +33,8 @@
  */
 
-#ifndef ppc32_ELF_DYN_H_
-#define ppc32_ELF_DYN_H_
+#ifndef LIBC_ppc32_RTLD_ELF_DYN_H_
+#define LIBC_ppc32_RTLD_ELF_DYN_H_
 
-/* 
+/*
  * ppc32 dynamic relocation types
  */
Index: uspace/lib/c/arch/ppc32/src/rtld/dynamic.c
===================================================================
--- uspace/lib/c/arch/ppc32/src/rtld/dynamic.c	(revision 54146a0e4e89ae79bdb89d2cd48c51829a471c3d)
+++ uspace/lib/c/arch/ppc32/src/rtld/dynamic.c	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
@@ -27,8 +27,8 @@
  */
 
-/** @addtogroup rtld rtld
+/** @addtogroup libcppc32
  * @brief
  * @{
- */ 
+ */
 /**
  * @file
Index: uspace/lib/c/arch/ppc32/src/rtld/reloc.c
===================================================================
--- uspace/lib/c/arch/ppc32/src/rtld/reloc.c	(revision 54146a0e4e89ae79bdb89d2cd48c51829a471c3d)
+++ uspace/lib/c/arch/ppc32/src/rtld/reloc.c	(revision 8a1fb098bbfa685e158cd315fe823dd431647b01)
@@ -27,8 +27,8 @@
  */
 
-/** @addtogroup rtld rtld
+/** @addtogroup libcppc32
  * @brief
  * @{
- */ 
+ */
 /**
  * @file