Index: head/share/man/man9/fpu_kern.9
===================================================================
--- head/share/man/man9/fpu_kern.9
+++ head/share/man/man9/fpu_kern.9
@@ -23,13 +23,14 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 7, 2018
+.Dd October 13, 2020
 .Dt FPU_KERN 9
 .Os
 .Sh NAME
 .Nm fpu_kern
 .Nd "facility to use the FPU in the kernel"
 .Sh SYNOPSIS
+.In machine/fpu.h
 .Ft struct fpu_kern_ctx *
 .Fn fpu_kern_alloc_ctx "u_int flags"
 .Ft void
Index: head/sys/crypto/aesni/aesni.h
===================================================================
--- head/sys/crypto/aesni/aesni.h
+++ head/sys/crypto/aesni/aesni.h
@@ -40,10 +40,6 @@
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
-#endif
-#if defined(__i386__)
-#include <machine/npx.h>
-#elif defined(__amd64__)
 #include <machine/fpu.h>
 #endif
 
Index: head/sys/crypto/aesni/aesni.c
===================================================================
--- head/sys/crypto/aesni/aesni.c
+++ head/sys/crypto/aesni/aesni.c
@@ -60,11 +60,7 @@
 
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
-#if defined(__i386__)
-#include <machine/npx.h>
-#elif defined(__amd64__)
 #include <machine/fpu.h>
-#endif
 
 static struct mtx_padalign *ctx_mtx;
 static struct fpu_kern_ctx **ctx_fpu;
Index: head/sys/crypto/blake2/blake2_cryptodev.c
===================================================================
--- head/sys/crypto/blake2/blake2_cryptodev.c
+++ head/sys/crypto/blake2/blake2_cryptodev.c
@@ -43,11 +43,7 @@
 #include <opencrypto/cryptodev.h>
 #include <cryptodev_if.h>
 
-#if defined(__amd64__)
 #include <machine/fpu.h>
-#elif defined(__i386__)
-#include <machine/npx.h>
-#endif
 
 struct blake2_session {
 	size_t mlen;
Index: head/sys/crypto/via/padlock.h
===================================================================
--- head/sys/crypto/via/padlock.h
+++ head/sys/crypto/via/padlock.h
@@ -32,11 +32,7 @@
 #include <opencrypto/cryptodev.h>
 #include <crypto/rijndael/rijndael.h>
 
-#if defined(__i386__)
-#include <machine/npx.h>
-#elif defined(__amd64__)
 #include <machine/fpu.h>
-#endif
 
 union padlock_cw {
 	uint64_t raw;
Index: head/sys/i386/include/fpu.h
===================================================================
--- head/sys/i386/include/fpu.h
+++ head/sys/i386/include/fpu.h
@@ -0,0 +1,6 @@
+/*-
+ * This file is in the public domain.
+ *
+ * $FreeBSD$
+ */
+#include <machine/npx.h>