Index: sys/boot/geli/geliboot_crypto.c
===================================================================
--- sys/boot/geli/geliboot_crypto.c
+++ sys/boot/geli/geliboot_crypto.c
@@ -82,17 +82,17 @@
 		rijndael_set_key(&ctxp->key1, key, xts_len / 2);
 		rijndael_set_key(&ctxp->key2, key + (xts_len / 16), xts_len / 2);
 
-		enc_xform_aes_xts.reinit(ctxp, iv);
+		enc_xform_aes_xts.reinit((caddr_t)ctxp, iv);
 
 		switch (enc) {
 		case 0: /* decrypt */
 			for (i = 0; i < datasize; i += AES_XTS_BLOCKSIZE) {
-				enc_xform_aes_xts.decrypt(ctxp, data + i);
+				enc_xform_aes_xts.decrypt((caddr_t)ctxp, data + i);
 			}
 			break;
 		case 1: /* encrypt */
 			for (i = 0; i < datasize; i += AES_XTS_BLOCKSIZE) {
-				enc_xform_aes_xts.encrypt(ctxp, data + i);
+				enc_xform_aes_xts.encrypt((caddr_t)ctxp, data + i);
 			}
 			break;
 		}
Index: sys/boot/geli/geliboot_internal.h
===================================================================
--- sys/boot/geli/geliboot_internal.h
+++ sys/boot/geli/geliboot_internal.h
@@ -51,7 +51,6 @@
 #include <crypto/rijndael/rijndael-api-fst.h>
 
 /* AES-XTS implementation */
-#define _STAND
 #define STAND_H /* We don't want stand.h in {gpt,zfs,gptzfs}boot */
 #include <opencrypto/xform_enc.h>