Index: kernel/generic/include/lib/elf.h
===================================================================
--- kernel/generic/include/lib/elf.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/lib/elf.h	(revision 4c6025555328facc2067352b94cc19e4d1bc6a74)
@@ -38,5 +38,4 @@
 #include <arch/elf.h>
 #include <arch/types.h>
-#include <typedefs.h>
 
 /**
@@ -336,5 +335,4 @@
 #endif
 
-extern int elf_load(elf_header_t *header, as_t * as);
 extern char *elf_error(int rc);
 
Index: kernel/generic/include/lib/rd.h
===================================================================
--- kernel/generic/include/lib/rd.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/generic/include/lib/rd.h	(revision 4c6025555328facc2067352b94cc19e4d1bc6a74)
@@ -37,5 +37,4 @@
 
 #include <arch/types.h>
-#include <typedefs.h>
 
 /**