Index: head/sys/conf/files.arm64
===================================================================
--- head/sys/conf/files.arm64
+++ head/sys/conf/files.arm64
@@ -177,7 +177,7 @@
 crypto/armv8/armv8_crypto.c	optional	armv8crypto
 armv8_crypto_wrap.o		optional	armv8crypto		\
 	dependency	"$S/crypto/armv8/armv8_crypto_wrap.c"		\
-	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \
+	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \
 	no-implicit-rule						\
 	clean		"armv8_crypto_wrap.o"
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec | ipsec_support
Index: head/sys/crypto/armv8/stdint.h
===================================================================
--- head/sys/crypto/armv8/stdint.h
+++ head/sys/crypto/armv8/stdint.h
@@ -0,0 +1,5 @@
+/*
+ * This is here as arm_neon.h includes <stdint.h>. It can be empty as
+ * we already include the needed headers.
+ */
+/* $FreeBSD$ */
Index: head/sys/modules/armv8crypto/Makefile
===================================================================
--- head/sys/modules/armv8crypto/Makefile
+++ head/sys/modules/armv8crypto/Makefile
@@ -11,6 +11,7 @@
 # Remove -nostdinc so we can get the intrinsics.
 armv8_crypto_wrap.o: armv8_crypto_wrap.c
 	${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} \
+	    -I${SRCTOP}/sys/crypto/armv8 \
 	    ${WERROR} ${PROF} \
 	     -march=armv8-a+crypto ${.IMPSRC}
 	${CTFCONVERT_CMD}