Index: kernel/generic/include/lib/elf.h
===================================================================
--- kernel/generic/include/lib/elf.h	(revision 02667d9f8facbf1c4afd9bb4842fefd0a6c1aec9)
+++ kernel/generic/include/lib/elf.h	(revision 57d44dd9c17ddb49818d70775e58b45ccd3511fd)
@@ -39,8 +39,4 @@
 #include <arch/elf.h>
 
-/** Interpreter string used to recognize the program loader */
-#define ELF_INTERP_ZSTR  "kernel"
-#define ELF_INTERP_ZLEN  sizeof(ELF_INTERP_ZSTR)
-
 #endif
 
Index: kernel/generic/include/lib/elf_load.h
===================================================================
--- kernel/generic/include/lib/elf_load.h	(revision 02667d9f8facbf1c4afd9bb4842fefd0a6c1aec9)
+++ kernel/generic/include/lib/elf_load.h	(revision 57d44dd9c17ddb49818d70775e58b45ccd3511fd)
@@ -46,15 +46,7 @@
 #define EE_INCOMPATIBLE   3  /* ELF image is not compatible with current architecture */
 #define EE_UNSUPPORTED    4  /* Non-supported ELF (e.g. dynamic ELFs) */
-#define EE_LOADER         5  /* The image is actually a program loader. */
-#define EE_IRRECOVERABLE  6  /* Irrecoverable error. */
+#define EE_IRRECOVERABLE  5  /* Irrecoverable error. */
 
-/**
- * This flags is passed when running the loader, otherwise elf_load()
- * would return with a EE_LOADER error code.
- */
-#define ELD_F_NONE    0
-#define ELD_F_LOADER  1
-
-extern unsigned int elf_load(elf_header_t *, as_t *, unsigned int);
+extern unsigned int elf_load(elf_header_t *, as_t *);
 extern const char *elf_error(unsigned int rc);