Index: uspace/lib/c/include/rtld/rtld.h
===================================================================
--- uspace/lib/c/include/rtld/rtld.h	(revision bfdb5af17f3dbd50c306aece1ff89fee3c15dd0f)
+++ uspace/lib/c/include/rtld/rtld.h	(revision 054476d01aca9bd28135fce64c7c46d84fe7398c)
@@ -36,26 +36,15 @@
 #define LIBC_RTLD_H_
 
+#include <adt/list.h>
+#include <elf/elf_mod.h>
 #include <sys/types.h>
-#include <adt/list.h>
 
 #include <rtld/dynamic.h>
-#include <rtld/module.h>
+#include <types/rtld/rtld.h>
 
-typedef struct {
-	elf_dyn_t *rtld_dynamic;
-	module_t rtld;
-
-	module_t *program;
-
-	/** List of all loaded modules including rtld and the program */
-	list_t modules;
-
-	/** Temporary hack to place each module at different address. */
-	uintptr_t next_bias;
-} runtime_env_t;
-
-extern runtime_env_t *runtime_env;
+extern rtld_t *runtime_env;
 
 extern void rtld_init_static(void);
+extern int rtld_prog_process(elf_finfo_t *, rtld_t **);
 
 #endif