Index: kernel/generic/include/lib/elf.h
===================================================================
--- kernel/generic/include/lib/elf.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/lib/elf.h	(revision 279188c06352e8625cf73d1e32e3d8f3758aa8d1)
@@ -37,5 +37,4 @@
 
 #include <abi/elf.h>
-#include <arch/elf.h>
 
 #endif
Index: kernel/generic/include/lib/elf_load.h
===================================================================
--- kernel/generic/include/lib/elf_load.h	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/include/lib/elf_load.h	(revision 279188c06352e8625cf73d1e32e3d8f3758aa8d1)
@@ -36,5 +36,5 @@
 #define KERN_ELF_LOAD_H_
 
-#include <arch/elf.h>
+#include <abi/elf.h>
 
 /**