diff -up aboot-1.0_pre20040408/disk.c.elf_h aboot-1.0_pre20040408/disk.c
--- aboot-1.0_pre20040408/disk.c.elf_h	2009-02-11 10:00:58.000000000 +0100
+++ aboot-1.0_pre20040408/disk.c	2009-02-11 10:00:58.000000000 +0100
@@ -36,7 +36,6 @@
 #include <linux/elf.h>
 #include <asm/console.h>
 #include "system.h"
-#include <asm/elf.h>
 
 extern struct bootfs ext2fs;
 extern struct bootfs iso;
diff -up aboot-1.0_pre20040408/Makefile.elf_h aboot-1.0_pre20040408/Makefile
--- aboot-1.0_pre20040408/Makefile.elf_h	2009-02-11 10:02:30.000000000 +0100
+++ aboot-1.0_pre20040408/Makefile	2009-02-11 10:02:42.000000000 +0100
@@ -18,7 +18,7 @@ VMLINUXGZ	= $(KSRC)/arch/alpha/boot/vmli
 
 # for boot testing
 #CFGDEFS       	= -DDEBUG_ISO -DDEBUG_ROCK -DDEBUG_EXT2 -DDEBUG
-CFGDEFS = $(OPTFLAGS)
+CFGDEFS = $(OPTFLAGS) -I$(KSRC)
 
 # root, aka prefix
 root		=
diff -up aboot-1.0_pre20040408/tools/elfencap.c.elf_h aboot-1.0_pre20040408/tools/elfencap.c
--- aboot-1.0_pre20040408/tools/elfencap.c.elf_h	2001-10-09 01:03:53.000000000 +0200
+++ aboot-1.0_pre20040408/tools/elfencap.c	2009-02-11 10:00:58.000000000 +0100
@@ -6,6 +6,7 @@
 #include <sys/stat.h>
 
 #include <linux/elf.h>
+#include <include/asm-alpha/elf.h>
 
 
 int
diff -up aboot-1.0_pre20040408/tools/objstrip.c.elf_h aboot-1.0_pre20040408/tools/objstrip.c
--- aboot-1.0_pre20040408/tools/objstrip.c.elf_h	2003-01-14 21:24:29.000000000 +0100
+++ aboot-1.0_pre20040408/tools/objstrip.c	2009-02-11 10:00:58.000000000 +0100
@@ -27,9 +27,9 @@
 #include <string.h>
 
 #ifdef __ELF__
-# include <asm/elf.h>
 # include <linux/elf.h>
 # include <linux/version.h>
+# include <include/asm-alpha/elf.h>
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 #  define aboot_elf_check_arch(e)        elf_check_arch(e)
 # else