--- staging sources (pristine copies from /usr/src/sys) ---
staged. diffs vs pristine:
--- /usr/src/sys/crypto/chachapoly.c	2026-06-29 12:51:18.000000000 +0000
+++ stage/crypto/chachapoly.c	2026-09-15 00:12:20.311243000 +0000
@@ -15,10 +15,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
-#include <sys/systm.h>
--- /usr/src/sys/crypto/poly1305/poly1305.c	2026-06-29 12:51:18.000000000 +0000
+++ stage/crypto/poly1305/poly1305.c	2026-09-15 00:12:20.311243000 +0000
@@ -6,7 +6,7 @@
  */
 
 #include <sys/types.h>
-#include <sys/systm.h>
+#include "shim_systm.h" /* was sys/systm.h */
--- /usr/src/sys/crypto/chacha20/chacha.c	2026-06-29 12:51:18.000000000 +0000
+++ stage/crypto/chacha20/chacha.c	2026-09-15 00:12:20.311243000 +0000
@@ -6,7 +6,7 @@
 
 /* $OpenBSD: chacha.c,v 1.1 2013/11/21 00:45:44 djm Exp $ */
 
-#include <sys/param.h>
+#include <stddef.h> /* was sys/param.h */
--- serpent ---
--- twofish ---
--- rijndael-api ---
--- chachapoly ---
../../stage/crypto/chachapoly.c: In function '_chacha20poly1305_mbuf':
../../stage/crypto/chachapoly.c:320:16: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
   if (m->m_len >= off + sizeof(block)) {
                ^~
BUILD OK