Fix a few more warnings such that this compiles again.

4 files changed, 12 insertions, 6 deletions

diff --git a/sys/arch/armv7/stand/efiboot/exec.c b/sys/arch/armv7/stand/efiboot/exec.c
index a8aef52a4a1..5e6b77abd9c 100644
--- a/sys/arch/armv7/stand/efiboot/exec.c
+++ b/sys/arch/armv7/stand/efiboot/exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.c,v 1.6 2016/05/17 22:41:20 kettenis Exp $	*/
+/*	$OpenBSD: exec.c,v 1.7 2016/05/17 23:16:10 kettenis Exp $	*/
 
 /*
  * Copyright (c) 2006, 2016 Mark Kettenis
@@ -21,6 +21,7 @@
 #include <machine/bootconfig.h>
 #include <dev/cons.h>
 
+#include <lib/libkern/libkern.h>
 #include <lib/libsa/loadfile.h>
 #include <sys/exec_elf.h>
 
@@ -28,6 +29,7 @@
 #include <stand/boot/cmd.h>
 
 #include "efiboot.h"
+#include "libsa.h"
 
 extern void *fdt;
 
diff --git a/sys/arch/armv7/stand/efiboot/fdt.c b/sys/arch/armv7/stand/efiboot/fdt.c
index da9552b7fc4..f49522965ea 100644
--- a/sys/arch/armv7/stand/efiboot/fdt.c
+++ b/sys/arch/armv7/stand/efiboot/fdt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdt.c,v 1.2 2016/05/17 22:41:20 kettenis Exp $	*/
+/*	$OpenBSD: fdt.c,v 1.3 2016/05/17 23:16:10 kettenis Exp $	*/
 
 /*
  * Copyright (c) 2009 Dariusz Swiderski <sfires@sfires.net>
@@ -20,6 +20,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 
+#include <lib/libkern/libkern.h>
+
 #include "fdt.h"
 
 unsigned int fdt_check_head(void *);
diff --git a/sys/arch/armv7/stand/efiboot/libsa.h b/sys/arch/armv7/stand/efiboot/libsa.h
index 8f1d8fc6cf9..14be675f708 100644
--- a/sys/arch/armv7/stand/efiboot/libsa.h
+++ b/sys/arch/armv7/stand/efiboot/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.1 2016/05/14 17:55:15 kettenis Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.2 2016/05/17 23:16:10 kettenis Exp $	*/
 
 /*
  * Copyright (c) 2008 Mark Kettenis
@@ -25,3 +25,6 @@
 #else
 #define DPRINTF(x)
 #endif
+
+void machdep(void);
+void devboot(dev_t, char *);
diff --git a/sys/arch/armv7/stand/efiboot/self_reloc.c b/sys/arch/armv7/stand/efiboot/self_reloc.c
index 44603fb353c..4e56237d38d 100644
--- a/sys/arch/armv7/stand/efiboot/self_reloc.c
+++ b/sys/arch/armv7/stand/efiboot/self_reloc.c
@@ -24,8 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-#include <sys/types.h>
+#include <sys/param.h>
 #include <sys/exec_elf.h>
 #include <machine/reloc.h>
 
@@ -69,7 +68,7 @@ self_reloc(Elf_Addr baseaddr, ElfW_Dyn *dynamic)
 {
 	Elf_Word relsz, relent;
 	Elf_Addr *newaddr;
-	ElfW_Rel *rel;
+	ElfW_Rel *rel = NULL;
 	ElfW_Dyn *dynp;
 
 	/*