diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
index 500fcba20938..213089961704 100644
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@@ -45,7 +45,7 @@
 #include <disk.h>
 #include <dev_net.h>
 #include <net.h>
-#include <inttypes.h>
+#include <machine/_inttypes.h>
 
 #include <efi.h>
 #include <efilib.h>
diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile
index 603fee71e84a..42ef3e69c18a 100644
--- a/stand/libsa/Makefile
+++ b/stand/libsa/Makefile
@@ -200,7 +200,7 @@ MAN=libsa.3
 # Create a subset of includes that are safe, as well as adjusting those that aren't
 # The lists may drive people nuts, but they are explicitly opt-in
 FAKE_DIRS=xlocale arpa ssp
-SAFE_INCS=a.out.h assert.h elf.h inttypes.h limits.h nlist.h setjmp.h stddef.h stdbool.h string.h strings.h time.h uuid.h
+SAFE_INCS=a.out.h assert.h elf.h limits.h nlist.h setjmp.h stddef.h stdbool.h string.h strings.h time.h uuid.h
 STAND_H_INC=ctype.h fcntl.h signal.h stdio.h stdlib.h unistd.h
 OTHER_INC=stdarg.h errno.h stdint.h