diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c
index cccd585860a..4c1277b71c8 100644
--- a/stand/common/load_elf.c
+++ b/stand/common/load_elf.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/elf.h>
 #include <stand.h>
 #define FREEBSD_ELF
-#include <link.h>
+#include <sys/link_elf.h>
 
 #include "bootstrap.h"
 
diff --git a/stand/common/load_elf_obj.c b/stand/common/load_elf_obj.c
index a32b9fde4b7..57df57a79c7 100644
--- a/stand/common/load_elf_obj.c
+++ b/stand/common/load_elf_obj.c
@@ -33,12 +33,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/exec.h>
 #include <sys/linker.h>
 #include <sys/module.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <string.h>
 #include <machine/elf.h>
 #include <stand.h>
 #define FREEBSD_ELF
-#include <link.h>
+#include <sys/link_elf.h>
 
 #include "bootstrap.h"
 
diff --git a/stand/common/reloc_elf.c b/stand/common/reloc_elf.c
index 6d4a00ff8f6..22bfe5bccfa 100644
--- a/stand/common/reloc_elf.c
+++ b/stand/common/reloc_elf.c
@@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <stand.h>
 
 #define FREEBSD_ELF
-#include <link.h>
+#include <sys/link_elf.h>
 
 #include "bootstrap.h"
 
diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
index 129fd72068b..f367f292d38 100644
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@@ -32,7 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/reboot.h>
 #include <sys/boot.h>
-#include <inttypes.h>
+#include <stdint.h>
 #include <stand.h>
 #include <string.h>
 #include <setjmp.h>