diff --git a/sys/crypto/rijndael/rijndael.h b/sys/crypto/rijndael/rijndael.h
index 41ecf48cddf1..a443592dcfb2 100644
--- a/sys/crypto/rijndael/rijndael.h
+++ b/sys/crypto/rijndael/rijndael.h
@@ -31,7 +31,6 @@
 #define	__RIJNDAEL_H
 
 #include <crypto/rijndael/rijndael-alg-fst.h>
-#include <crypto/rijndael/rijndael-api-fst.h>
 
 /* XXX: avoid conflicts with opencrypto */
 #define	rijndael_set_key	_rijndael_set_key
diff --git a/sys/dev/random/hash.c b/sys/dev/random/hash.c
index 95fc8e943689..611f866c4242 100644
--- a/sys/dev/random/hash.c
+++ b/sys/dev/random/hash.c
@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <crypto/rijndael/rijndael.h>
+#include <crypto/rijndael/rijndael-api-fst.h>
 #include <crypto/sha2/sha2.h>
 
 #include <dev/random/hash.h>
diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c
index ae22046925b0..3c5f8310b79e 100644
--- a/sys/dev/random/yarrow.c
+++ b/sys/dev/random/yarrow.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 
-#include <crypto/rijndael/rijndael.h>
+#include <crypto/rijndael/rijndael-api-fst.h>
 #include <crypto/sha2/sha2.h>
 
 #include <dev/random/hash.h>
diff --git a/sys/geom/bde/g_bde.c b/sys/geom/bde/g_bde.c
index bb9cbf07f7df..90aaf7a44b83 100644
--- a/sys/geom/bde/g_bde.c
+++ b/sys/geom/bde/g_bde.c
@@ -42,7 +42,7 @@
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 
-#include <crypto/rijndael/rijndael.h>
+#include <crypto/rijndael/rijndael-api-fst.h>
 #include <crypto/sha2/sha2.h>
 #include <geom/geom.h>
 #include <geom/bde/g_bde.h>
diff --git a/sys/geom/bde/g_bde_crypt.c b/sys/geom/bde/g_bde_crypt.c
index e95352e5136e..89b48ba71fbd 100644
--- a/sys/geom/bde/g_bde_crypt.c
+++ b/sys/geom/bde/g_bde_crypt.c
@@ -46,7 +46,7 @@
 #include <sys/endian.h>
 #include <sys/md5.h>
 
-#include <crypto/rijndael/rijndael.h>
+#include <crypto/rijndael/rijndael-api-fst.h>
 #include <crypto/sha2/sha2.h>
 
 #include <geom/geom.h>
diff --git a/sys/geom/bde/g_bde_lock.c b/sys/geom/bde/g_bde_lock.c
index a33144ca8cae..d699cc32fcab 100644
--- a/sys/geom/bde/g_bde_lock.c
+++ b/sys/geom/bde/g_bde_lock.c
@@ -57,7 +57,7 @@
 #define g_free(foo)	free(foo)
 #endif
 
-#include <crypto/rijndael/rijndael.h>
+#include <crypto/rijndael/rijndael-api-fst.h>
 #include <crypto/sha2/sha2.h>
 
 #include <geom/geom.h>
diff --git a/sys/geom/bde/g_bde_work.c b/sys/geom/bde/g_bde_work.c
index 8e1b542d586f..e0e58ca591f3 100644
--- a/sys/geom/bde/g_bde_work.c
+++ b/sys/geom/bde/g_bde_work.c
@@ -70,7 +70,7 @@
 #include <sys/proc.h>
 #include <sys/kthread.h>
 
-#include <crypto/rijndael/rijndael.h>
+#include <crypto/rijndael/rijndael-api-fst.h>
 #include <crypto/sha2/sha2.h>
 #include <geom/geom.h>
 #include <geom/bde/g_bde.h>
diff --git a/sys/geom/geom_aes.c b/sys/geom/geom_aes.c
index 9d17fa93e239..de7e1c63e5c9 100644
--- a/sys/geom/geom_aes.c
+++ b/sys/geom/geom_aes.c
@@ -57,9 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/errno.h>
 #include <geom/geom.h>
 
-#include <crypto/rijndael/rijndael.h>
-
-#include <crypto/rijndael/rijndael.h>
+#include <crypto/rijndael/rijndael-api-fst.h>
 
 #define AES_CLASS_NAME "AES"