Index: uspace/lib/c/include/elf/elf_mod.h
===================================================================
--- uspace/lib/c/include/elf/elf_mod.h	(revision 4f205248dfb2dd7692ef1b857648ba9d96fe496c)
+++ uspace/lib/c/include/elf/elf_mod.h	(revision 888a2c6b5494acd8c90d49e4cb3d98f1ed7cb0fc)
@@ -78,4 +78,9 @@
 	entry_point_t entry;
 
+	/** The base address where the file has been loaded.
+	 *  Points to the ELF file header.
+	 */
+	void *base;
+
 	/** ELF interpreter name or NULL if statically-linked */
 	const char *interp;
@@ -101,7 +106,4 @@
 	eld_flags_t flags;
 
-	/** A copy of the ELF file header */
-	elf_header_t *header;
-
 	/** Store extracted info here */
 	elf_finfo_t *info;
@@ -109,6 +111,6 @@
 
 extern const char *elf_error(unsigned int);
-extern int elf_load_file(int, size_t, eld_flags_t, elf_finfo_t *);
-extern int elf_load_file_name(const char *, size_t, eld_flags_t, elf_finfo_t *);
+extern int elf_load_file(int, eld_flags_t, elf_finfo_t *);
+extern int elf_load_file_name(const char *, eld_flags_t, elf_finfo_t *);
 
 #endif
Index: uspace/lib/c/include/types/rtld/rtld.h
===================================================================
--- uspace/lib/c/include/types/rtld/rtld.h	(revision 4f205248dfb2dd7692ef1b857648ba9d96fe496c)
+++ uspace/lib/c/include/types/rtld/rtld.h	(revision 888a2c6b5494acd8c90d49e4cb3d98f1ed7cb0fc)
@@ -61,7 +61,4 @@
 	/** List of initial modules */
 	list_t imodules;
-
-	/** Temporary hack to place each module at different address. */
-	uintptr_t next_bias;
 } rtld_t;