diff --git a/bin/ed/cbc.c b/bin/ed/cbc.c
index 7d20c6cc6123..ae9e98887567 100644
--- a/bin/ed/cbc.c
+++ b/bin/ed/cbc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cbc.c,v 1.25 2018/02/08 09:05:16 dholland Exp $	*/
+/*	$NetBSD: cbc.c,v 1.26 2023/08/01 07:04:14 mrg Exp $	*/
 
 /* cbc.c: This file contains the encryption routines for the ed line editor */
 /*-
@@ -72,7 +72,7 @@
 #if 0
 static char *rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
 #else
-__RCSID("$NetBSD: cbc.c,v 1.25 2018/02/08 09:05:16 dholland Exp $");
+__RCSID("$NetBSD: cbc.c,v 1.26 2023/08/01 07:04:14 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -145,7 +145,7 @@ static int des_n = 0;		/* index for put_des_char/get_des_char */
 static void des_error(const char *);
 static int hex_to_binary(int, int);
 static void expand_des_key(char *, char *);
-static void set_des_key(char *);
+static void set_des_key(Desbuf);
 static int cbc_decode(char *, FILE *);
 static int cbc_encode(char *, int, FILE *);
 #endif
diff --git a/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c b/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c
index ced43eb3d7de..ca7268003490 100644
--- a/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/sha2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sha2.c,v 1.4 2018/08/13 09:54:19 christos Exp $ */
+/* $NetBSD: sha2.c,v 1.5 2023/08/01 07:04:14 mrg Exp $ */
 /*	$KAME: sha2.c,v 1.9 2003/07/20 00:28:38 itojun Exp $	*/
 
 /*
@@ -588,7 +588,7 @@ netpgpv_SHA224_256_Final(uint8_t digest[], NETPGPV_SHA256_CTX *context, size_t l
 }
 
 int
-netpgpv_SHA256_Final(uint8_t digest[], NETPGPV_SHA256_CTX *context)
+netpgpv_SHA256_Final(uint8_t digest[32], NETPGPV_SHA256_CTX *context)
 {
 	return netpgpv_SHA224_256_Final(digest, context, SHA256_DIGEST_LENGTH);
 }
@@ -622,7 +622,7 @@ netpgpv_SHA224_Transform(NETPGPV_SHA224_CTX *context, const uint32_t *data)
 }
 
 int
-netpgpv_SHA224_Final(uint8_t digest[], NETPGPV_SHA224_CTX *context)
+netpgpv_SHA224_Final(uint8_t digest[28], NETPGPV_SHA224_CTX *context)
 {
 	return netpgpv_SHA224_256_Final(digest, (NETPGPV_SHA256_CTX *)context,
 	    SHA224_DIGEST_LENGTH);
@@ -915,7 +915,7 @@ netpgpv_SHA512_Last(NETPGPV_SHA512_CTX *context)
 }
 
 int
-netpgpv_SHA512_Final(uint8_t digest[], NETPGPV_SHA512_CTX *context)
+netpgpv_SHA512_Final(uint8_t digest[64], NETPGPV_SHA512_CTX *context)
 {
 	size_t i;
 
@@ -962,7 +962,7 @@ netpgpv_SHA384_Transform(NETPGPV_SHA512_CTX *context, const uint64_t *data)
 }
 
 int
-netpgpv_SHA384_Final(uint8_t digest[], NETPGPV_SHA384_CTX *context)
+netpgpv_SHA384_Final(uint8_t digest[48], NETPGPV_SHA384_CTX *context)
 {
 	size_t i;
 
diff --git a/dist/pf/sbin/pfctl/pfctl_radix.c b/dist/pf/sbin/pfctl/pfctl_radix.c
index cb3a6853d2ae..4507e002e674 100644
--- a/dist/pf/sbin/pfctl/pfctl_radix.c
+++ b/dist/pf/sbin/pfctl/pfctl_radix.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pfctl_radix.c,v 1.5 2008/06/18 09:06:26 yamt Exp $	*/
+/*	$NetBSD: pfctl_radix.c,v 1.6 2023/08/01 07:04:14 mrg Exp $	*/
 /*	$OpenBSD: pfctl_radix.c,v 1.27 2005/05/21 21:03:58 henning Exp $ */
 
 /*
@@ -52,7 +52,7 @@
 
 extern int dev;
 
-static int	 pfr_next_token(char buf[], FILE *);
+static int	 pfr_next_token(char buf[BUF_SIZE], FILE *);
 
 
 int
diff --git a/external/bsd/libarchive/dist/libarchive/archive_read_support_format_warc.c b/external/bsd/libarchive/dist/libarchive/archive_read_support_format_warc.c
index c1c54450c396..9035bbfd8347 100644
--- a/external/bsd/libarchive/dist/libarchive/archive_read_support_format_warc.c
+++ b/external/bsd/libarchive/dist/libarchive/archive_read_support_format_warc.c
@@ -127,7 +127,7 @@ static int _warc_skip(struct archive_read *a);
 static int _warc_rdhdr(struct archive_read *a, struct archive_entry *e);
 
 /* private routines */
-static unsigned int _warc_rdver(const char buf[10], size_t bsz);
+static unsigned int _warc_rdver(const char *buf, size_t bsz);
 static unsigned int _warc_rdtyp(const char *buf, size_t bsz);
 static warc_string_t _warc_rduri(const char *buf, size_t bsz);
 static ssize_t _warc_rdlen(const char *buf, size_t bsz);
diff --git a/external/bsd/libevent/dist/util-internal.h b/external/bsd/libevent/dist/util-internal.h
index 2d5c21c2c55b..6c7c5b0a47e9 100644
--- a/external/bsd/libevent/dist/util-internal.h
+++ b/external/bsd/libevent/dist/util-internal.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: util-internal.h,v 1.7 2021/04/10 19:18:45 rillig Exp $	*/
+/*	$NetBSD: util-internal.h,v 1.8 2023/08/01 07:04:14 mrg Exp $	*/
 
 /*
  * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
@@ -305,7 +305,7 @@ int evutil_socket_connect_(evutil_socket_t *fd_ptr, const struct sockaddr *sa, i
 int evutil_socket_finished_connecting_(evutil_socket_t fd);
 
 EVENT2_EXPORT_SYMBOL
-int evutil_ersatz_socketpair_(int, int , int, evutil_socket_t[]);
+int evutil_ersatz_socketpair_(int, int , int, evutil_socket_t[2]);
 
 int evutil_resolve_(int family, const char *hostname, struct sockaddr *sa,
     ev_socklen_t *socklen, int port);
diff --git a/external/bsd/ntp/dist/sntp/libevent/util-internal.h b/external/bsd/ntp/dist/sntp/libevent/util-internal.h
index 38f80a2a7b3b..ffde28eb085a 100644
--- a/external/bsd/ntp/dist/sntp/libevent/util-internal.h
+++ b/external/bsd/ntp/dist/sntp/libevent/util-internal.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: util-internal.h,v 1.6 2020/05/25 20:47:33 christos Exp $	*/
+/*	$NetBSD: util-internal.h,v 1.7 2023/08/01 07:04:14 mrg Exp $	*/
 
 /*
  * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
@@ -267,7 +267,7 @@ int evutil_socket_connect_(evutil_socket_t *fd_ptr, struct sockaddr *sa, int soc
 
 int evutil_socket_finished_connecting_(evutil_socket_t fd);
 
-int evutil_ersatz_socketpair_(int, int , int, evutil_socket_t[]);
+int evutil_ersatz_socketpair_(int, int , int, evutil_socket_t[2]);
 
 int evutil_resolve_(int family, const char *hostname, struct sockaddr *sa,
     ev_socklen_t *socklen, int port);
diff --git a/external/bsd/nvi/dist/ex/ex_subst.c b/external/bsd/nvi/dist/ex/ex_subst.c
index 6e4de0403ce0..1c029ca7db75 100644
--- a/external/bsd/nvi/dist/ex/ex_subst.c
+++ b/external/bsd/nvi/dist/ex/ex_subst.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ex_subst.c,v 1.4 2014/01/26 21:43:45 christos Exp $ */
+/*	$NetBSD: ex_subst.c,v 1.5 2023/08/01 07:04:14 mrg Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -16,7 +16,7 @@
 static const char sccsid[] = "Id: ex_subst.c,v 10.50 2002/02/09 21:18:23 skimo Exp  (Berkeley) Date: 2002/02/09 21:18:23 ";
 #endif /* not lint */
 #else
-__RCSID("$NetBSD: ex_subst.c,v 1.4 2014/01/26 21:43:45 christos Exp $");
+__RCSID("$NetBSD: ex_subst.c,v 1.5 2023/08/01 07:04:14 mrg Exp $");
 #endif
 
 #include <sys/types.h>
@@ -1320,7 +1320,7 @@ re_error(SCR *sp, int errcode, regex_t *preg)
  * 	Do the substitution for a regular expression.
  */
 static int
-re_sub(SCR *sp, CHAR_T *ip, CHAR_T **lbp, size_t *lbclenp, size_t *lblenp, regmatch_t *match)
+re_sub(SCR *sp, CHAR_T *ip, CHAR_T **lbp, size_t *lbclenp, size_t *lblenp, regmatch_t match[10])
 	        
 	           			/* Input line. */
 	             
diff --git a/external/bsd/ppp/dist/pppd/chap_ms.c b/external/bsd/ppp/dist/pppd/chap_ms.c
index 19eafb6d474e..663913f0ffd0 100644
--- a/external/bsd/ppp/dist/pppd/chap_ms.c
+++ b/external/bsd/ppp/dist/pppd/chap_ms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: chap_ms.c,v 1.5 2021/01/09 16:39:28 christos Exp $	*/
+/*	$NetBSD: chap_ms.c,v 1.6 2023/08/01 07:04:15 mrg Exp $	*/
 
 /*
  * chap_ms.c - Microsoft MS-CHAP compatible implementation.
@@ -81,7 +81,7 @@
 #define RCSID	"Id: chap_ms.c,v 1.38 2007/12/01 20:10:51 carlsonj Exp "
 static const char rcsid[] = RCSID;
 #else
-__RCSID("$NetBSD: chap_ms.c,v 1.5 2021/01/09 16:39:28 christos Exp $");
+__RCSID("$NetBSD: chap_ms.c,v 1.6 2023/08/01 07:04:15 mrg Exp $");
 #endif
 
 #ifdef CHAPMS
@@ -108,7 +108,8 @@ __RCSID("$NetBSD: chap_ms.c,v 1.5 2021/01/09 16:39:28 christos Exp $");
 
 static void	ascii2unicode (char[], int, u_char[]);
 static void	NTPasswordHash (u_char *, int, u_char[MD4_SIGNATURE_SIZE]);
-static void	ChallengeResponse (u_char *, u_char *, u_char[24]);
+static void	ChallengeResponse (u_char *, u_char[MD4_SIGNATURE_SIZE],
+				u_char[24]);
 static void	ChapMS_NT (u_char *, char *, int, u_char[24]);
 static void	ChapMS2_NT (u_char *, u_char[16], char *, char *, int,
 				u_char[24]);
@@ -923,7 +924,7 @@ ChapMS(u_char *rchallenge, char *secret, int secret_len,
 void
 ChapMS2(u_char *rchallenge, u_char *PeerChallenge,
 	char *user, char *secret, int secret_len, unsigned char *response,
-	u_char authResponse[], int authenticator)
+	u_char authResponse[MS_AUTH_RESPONSE_LENGTH+1], int authenticator)
 {
     /* ARGSUSED */
     u_char *p = &response[MS_CHAP2_PEER_CHALLENGE];
diff --git a/games/sail/dr_5.c b/games/sail/dr_5.c
index 5846ccbb8905..172074e4f0cd 100644
--- a/games/sail/dr_5.c
+++ b/games/sail/dr_5.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dr_5.c,v 1.14 2009/03/14 22:52:52 dholland Exp $	*/
+/*	$NetBSD: dr_5.c,v 1.15 2023/08/01 07:04:15 mrg Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)dr_5.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: dr_5.c,v 1.14 2009/03/14 22:52:52 dholland Exp $");
+__RCSID("$NetBSD: dr_5.c,v 1.15 2023/08/01 07:04:15 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -42,7 +42,7 @@ __RCSID("$NetBSD: dr_5.c,v 1.14 2009/03/14 22:52:52 dholland Exp $");
 #include "extern.h"
 
 void
-subtract(struct ship *from, struct ship *fromcap, int totalfrom, int *crewfrom,
+subtract(struct ship *from, struct ship *fromcap, int totalfrom, int crewfrom[3],
 	 int pcfrom)
 {
 	int n;
@@ -66,7 +66,7 @@ subtract(struct ship *from, struct ship *fromcap, int totalfrom, int *crewfrom,
 }
 
 int
-mensent(struct ship *from, struct ship *to, int *crew, struct ship **captured,
+mensent(struct ship *from, struct ship *to, int crew[3], struct ship **captured,
 	int *pc, int isdefense)
 {					/* returns # of crew squares sent */
 	int men = 0;
diff --git a/include/md2.h b/include/md2.h
index 10a39506b734..caf4056a01b9 100644
--- a/include/md2.h
+++ b/include/md2.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: md2.h,v 1.7 2016/07/01 16:42:46 christos Exp $	*/
+/*	$NetBSD: md2.h,v 1.8 2023/08/01 07:04:15 mrg Exp $	*/
 
 #ifndef _MD2_H_
 #define _MD2_H_
@@ -21,10 +21,10 @@ __BEGIN_DECLS
 void	MD2Init(MD2_CTX *);
 void	MD2Update(MD2_CTX *, const unsigned char *, unsigned int);
 void	MD2Final(unsigned char[16], MD2_CTX *);
-char	*MD2End(MD2_CTX *, char *);
+char	*MD2End(MD2_CTX *, char[MD2_DIGEST_STRING_LENGTH]);
 char	*MD2File(const char *, char *);
 char	*MD2FileChunk(const char *, char *, off_t, off_t);
-char	*MD2Data(const unsigned char *, size_t, char *);
+char	*MD2Data(const unsigned char *, size_t, char[MD2_DIGEST_STRING_LENGTH]);
 __END_DECLS
 
 #endif /* _MD2_H_ */
diff --git a/lib/libc/compat/sys/compat_utimes.c b/lib/libc/compat/sys/compat_utimes.c
index a5664341ed48..3427bd8f6a8c 100644
--- a/lib/libc/compat/sys/compat_utimes.c
+++ b/lib/libc/compat/sys/compat_utimes.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_utimes.c,v 1.2 2009/01/11 02:46:27 christos Exp $	*/
+/*	$NetBSD: compat_utimes.c,v 1.3 2023/08/01 07:04:15 mrg Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: compat_utimes.c,v 1.2 2009/01/11 02:46:27 christos Exp $");
+__RCSID("$NetBSD: compat_utimes.c,v 1.3 2023/08/01 07:04:15 mrg Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #define __LIBC12_SOURCE__
@@ -52,7 +52,7 @@ __warn_references(futimes,
  * libc12 compatible f,l,utimes routine.
  */
 int
-utimes(const char *path, const struct timeval50 *tv50)
+utimes(const char *path, const struct timeval50 tv50[2])
 {
 	struct timeval tv[2];
 
@@ -64,7 +64,7 @@ utimes(const char *path, const struct timeval50 *tv50)
 }
 
 int
-lutimes(const char *path, const struct timeval50 *tv50)
+lutimes(const char *path, const struct timeval50 tv50[2])
 {
 	struct timeval tv[2];
 
@@ -76,7 +76,7 @@ lutimes(const char *path, const struct timeval50 *tv50)
 }
 
 int
-futimes(int fd, const struct timeval50 *tv50)
+futimes(int fd, const struct timeval50 tv50[2])
 {
 	struct timeval tv[2];
 
diff --git a/lib/libc/gen/utimens.c b/lib/libc/gen/utimens.c
index f4261b49827f..4401af1a5342 100644
--- a/lib/libc/gen/utimens.c
+++ b/lib/libc/gen/utimens.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: utimens.c,v 1.2 2019/09/16 01:25:16 kamil Exp $	*/
+/*	$NetBSD: utimens.c,v 1.3 2023/08/01 07:04:15 mrg Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: utimens.c,v 1.2 2019/09/16 01:25:16 kamil Exp $");
+__RCSID("$NetBSD: utimens.c,v 1.3 2023/08/01 07:04:15 mrg Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -40,13 +40,13 @@ __RCSID("$NetBSD: utimens.c,v 1.2 2019/09/16 01:25:16 kamil Exp $");
 #include <sys/stat.h>
 
 int
-utimens(const char *path, const struct timespec *times)
+utimens(const char *path, const struct timespec times[2])
 {
 	return utimensat(AT_FDCWD, path, times, 0);
 }
 
 int
-lutimens(const char *path, const struct timespec *times)
+lutimens(const char *path, const struct timespec times[2])
 {
 	return utimensat(AT_FDCWD, path, times, AT_SYMLINK_NOFOLLOW);
 }
diff --git a/lib/librumphijack/hijack.c b/lib/librumphijack/hijack.c
index 645595afe120..65b053be0f57 100644
--- a/lib/librumphijack/hijack.c
+++ b/lib/librumphijack/hijack.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: hijack.c,v 1.138 2023/07/31 04:37:04 rin Exp $	*/
+/*      $NetBSD: hijack.c,v 1.139 2023/08/01 07:04:15 mrg Exp $	*/
 
 /*-
  * Copyright (c) 2011 Antti Kantee.  All Rights Reserved.
@@ -34,7 +34,7 @@
 #include <rump/rumpuser_port.h>
 
 #if !defined(lint)
-__RCSID("$NetBSD: hijack.c,v 1.138 2023/07/31 04:37:04 rin Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.139 2023/08/01 07:04:15 mrg Exp $");
 #endif
 
 #include <sys/param.h>
@@ -2628,13 +2628,13 @@ FDCALL(int, fsync_range, DUALCALL_FSYNC_RANGE,				\
 #endif
 
 FDCALL(int, futimes, DUALCALL_FUTIMES,					\
-	(int fd, const struct timeval *tv),				\
-	(int, const struct timeval *),					\
+	(int fd, const struct timeval tv[2]),				\
+	(int, const struct timeval[2]),					\
 	(fd, tv))
 
 FDCALL(int, futimens, DUALCALL_FUTIMENS,				\
-	(int fd, const struct timespec *ts),				\
-	(int, const struct timespec *),					\
+	(int fd, const struct timespec ts[2]),				\
+	(int, const struct timespec[2]),				\
 	(fd, ts))
 
 #ifdef HAVE_CHFLAGS
@@ -2734,13 +2734,13 @@ PATHCALL(int, rmdir, DUALCALL_RMDIR,					\
 	(path))
 
 PATHCALL(int, utimes, DUALCALL_UTIMES,					\
-	(const char *path, const struct timeval *tv),			\
-	(const char *, const struct timeval *),				\
+	(const char *path, const struct timeval tv[2]),			\
+	(const char *, const struct timeval[2]),			\
 	(path, tv))
 
 PATHCALL(int, lutimes, DUALCALL_LUTIMES,				\
-	(const char *path, const struct timeval *tv),			\
-	(const char *, const struct timeval *),				\
+	(const char *path, const struct timeval tv[2]),			\
+	(const char *, const struct timeval[2]),			\
 	(path, tv))
 
 #ifdef HAVE_CHFLAGS
diff --git a/sys/dev/ic/arn5008.h b/sys/dev/ic/arn5008.h
index 2cb91e2da1ab..78ccbdf50130 100644
--- a/sys/dev/ic/arn5008.h
+++ b/sys/dev/ic/arn5008.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: arn5008.h,v 1.1 2013/03/30 02:53:00 christos Exp $	*/
+/*	$NetBSD: arn5008.h,v 1.2 2023/08/01 07:04:15 mrg Exp $	*/
 /*
  * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -31,15 +31,15 @@
 #include <dev/ic/arn5008reg.h>
 
 int	ar5008_attach(struct athn_softc *);
-void	ar5008_write_txpower(struct athn_softc *, int16_t power[]);
+void	ar5008_write_txpower(struct athn_softc *, int16_t power[ATHN_POWER_COUNT]);
 void	ar5008_set_viterbi_mask(struct athn_softc *, int);
 void	ar5008_get_pdadcs(struct athn_softc *, uint8_t, struct athn_pier *,
 		    struct athn_pier *, int, int, uint8_t, uint8_t *, uint8_t *);
 
 void	ar5008_get_ht_tpow(struct athn_softc *, struct ieee80211_channel *,
-		    uint8_t, const struct ar_cal_target_power_ht *, int, uint8_t[]);
+		    uint8_t, const struct ar_cal_target_power_ht *, int, uint8_t[8]);
 void	ar5008_get_lg_tpow(struct athn_softc *, struct ieee80211_channel *,
-		    uint8_t, const struct ar_cal_target_power_leg *, int, uint8_t[]);
+		    uint8_t, const struct ar_cal_target_power_leg *, int, uint8_t[4]);
 
 
 #endif /* _IF_ARN5008_H_ */
diff --git a/sys/dev/ic/arn9003.c b/sys/dev/ic/arn9003.c
index 00a7c8cf80a4..81e7595f6769 100644
--- a/sys/dev/ic/arn9003.c
+++ b/sys/dev/ic/arn9003.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: arn9003.c,v 1.15 2020/01/29 14:09:58 thorpej Exp $	*/
+/*	$NetBSD: arn9003.c,v 1.16 2023/08/01 07:04:15 mrg Exp $	*/
 /*	$OpenBSD: ar9003.c,v 1.25 2012/10/20 09:53:32 stsp Exp $	*/
 
 /*-
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.15 2020/01/29 14:09:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arn9003.c,v 1.16 2023/08/01 07:04:15 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -82,7 +82,7 @@ Static void	ar9003_enable_predistorter(struct athn_softc *, int);
 Static int	ar9003_find_rom(struct athn_softc *);
 Static void	ar9003_force_txgain(struct athn_softc *, uint32_t);
 Static int	ar9003_get_desired_txgain(struct athn_softc *, int, int);
-Static int	ar9003_get_iq_corr(struct athn_softc *, int32_t[], int32_t[]);
+Static int	ar9003_get_iq_corr(struct athn_softc *, int32_t[6], int32_t[2]);
 Static void	ar9003_gpio_config_input(struct athn_softc *, int);
 Static void	ar9003_gpio_config_output(struct athn_softc *, int, int);
 Static int	ar9003_gpio_read(struct athn_softc *, int);
diff --git a/sys/dev/ic/arn9003.h b/sys/dev/ic/arn9003.h
index f9e15bda1e65..76f7c9124ef5 100644
--- a/sys/dev/ic/arn9003.h
+++ b/sys/dev/ic/arn9003.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: arn9003.h,v 1.1 2013/03/30 02:53:01 christos Exp $	*/
+/*	$NetBSD: arn9003.h,v 1.2 2023/08/01 07:04:15 mrg Exp $	*/
 /*
  * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -33,10 +33,10 @@ int	ar9003_init_calib(struct athn_softc *);
 void	ar9003_reset_txsring(struct athn_softc *);
 void	ar9003_get_lg_tpow(struct athn_softc *, struct ieee80211_channel *,
 	    uint8_t, const uint8_t *, const struct ar_cal_target_power_leg *,
-	    int, uint8_t[]);
+	    int, uint8_t[4]);
 void	ar9003_get_ht_tpow(struct athn_softc *, struct ieee80211_channel *,
 	    uint8_t, const uint8_t *, const struct ar_cal_target_power_ht *,
-	    int, uint8_t[]);
-void	ar9003_write_txpower(struct athn_softc *, int16_t power[]);
+	    int, uint8_t[14]);
+void	ar9003_write_txpower(struct athn_softc *, int16_t power[ATHN_POWER_COUNT]);
 
 #endif /* _IF_ARN9003_H_ */
diff --git a/sys/dev/ic/bwfm.c b/sys/dev/ic/bwfm.c
index e496e54f2ce8..b0bef190b75b 100644
--- a/sys/dev/ic/bwfm.c
+++ b/sys/dev/ic/bwfm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bwfm.c,v 1.34 2022/12/04 09:25:04 mlelstv Exp $ */
+/* $NetBSD: bwfm.c,v 1.35 2023/08/01 07:04:15 mrg Exp $ */
 /* $OpenBSD: bwfm.c,v 1.5 2017/10/16 22:27:16 patrick Exp $ */
 /*
  * Copyright (c) 2010-2016 Broadcom Corporation
@@ -69,7 +69,7 @@ int	 bwfm_send_mgmt(struct ieee80211com *, struct ieee80211_node *,
 void	 bwfm_recv_mgmt(struct ieee80211com *, struct mbuf *,
 	     struct ieee80211_node *, int, int, uint32_t);
 int	 bwfm_key_set(struct ieee80211com *, const struct ieee80211_key *,
-	     const uint8_t *);
+	     const uint8_t[IEEE80211_ADDR_LEN]);
 int	 bwfm_key_delete(struct ieee80211com *, const struct ieee80211_key *);
 int	 bwfm_newstate(struct ieee80211com *, enum ieee80211_state, int);
 void	 bwfm_newstate_cb(struct bwfm_softc *, struct bwfm_cmd_newstate *);
diff --git a/sys/dev/ic/dwc_gmac.c b/sys/dev/ic/dwc_gmac.c
index a8b07b71f077..0e95f4efe852 100644
--- a/sys/dev/ic/dwc_gmac.c
+++ b/sys/dev/ic/dwc_gmac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.78 2022/09/18 18:26:53 thorpej Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.79 2023/08/01 07:04:15 mrg Exp $ */
 
 /*-
  * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.78 2022/09/18 18:26:53 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.79 2023/08/01 07:04:15 mrg Exp $");
 
 /* #define	DWC_GMAC_DEBUG	1 */
 
@@ -77,7 +77,7 @@ static int dwc_gmac_miibus_write_reg(device_t, int, int, uint16_t);
 static void dwc_gmac_miibus_statchg(struct ifnet *);
 
 static int dwc_gmac_reset(struct dwc_gmac_softc *);
-static void dwc_gmac_write_hwaddr(struct dwc_gmac_softc *, uint8_t *);
+static void dwc_gmac_write_hwaddr(struct dwc_gmac_softc *, uint8_t[ETHER_ADDR_LEN]);
 static int dwc_gmac_alloc_dma_rings(struct dwc_gmac_softc *);
 static void dwc_gmac_free_dma_rings(struct dwc_gmac_softc *);
 static int dwc_gmac_alloc_rx_ring(struct dwc_gmac_softc *, struct dwc_gmac_rx_ring *);
diff --git a/sys/dev/ic/wi.c b/sys/dev/ic/wi.c
index 4b91cbc61a6e..2aac7931b180 100644
--- a/sys/dev/ic/wi.c
+++ b/sys/dev/ic/wi.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wi.c,v 1.257 2021/09/21 14:50:12 christos Exp $	*/
+/*	$NetBSD: wi.c,v 1.258 2023/08/01 07:04:15 mrg Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.257 2021/09/21 14:50:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.258 2023/08/01 07:04:15 mrg Exp $");
 
 #define WI_HERMES_AUTOINC_WAR	/* Work around data write autoinc bug. */
 #define WI_HERMES_STATS_WAR	/* Work around stats counter bug. */
@@ -165,10 +165,12 @@ STATIC int wi_choose_rate(struct ieee80211com *, struct ieee80211_node *,
     struct ieee80211_frame *, u_int);
 STATIC void wi_rssadapt_updatestats_cb(void *, struct ieee80211_node *);
 STATIC void wi_rssadapt_updatestats(void *);
-STATIC void wi_rssdescs_init(struct wi_rssdesc (*)[], wi_rssdescq_t *);
-STATIC void wi_rssdescs_reset(struct ieee80211com *, struct wi_rssdesc (*)[],
-    wi_rssdescq_t *, uint8_t (*)[]);
-STATIC void wi_sync_bssid(struct wi_softc *, uint8_t new_bssid[]);
+STATIC void wi_rssdescs_init(struct wi_rssdesc (*)[WI_NTXRSS], wi_rssdescq_t *);
+STATIC void wi_rssdescs_reset(struct ieee80211com *,
+    struct wi_rssdesc (*)[WI_NTXRSS], wi_rssdescq_t *,
+    uint8_t (*)[IEEE80211_RATE_MAXSIZE]);
+STATIC void wi_sync_bssid(struct wi_softc *,
+    uint8_t new_bssid[IEEE80211_ADDR_LEN]);
 
 STATIC void wi_rx_intr(struct wi_softc *);
 STATIC void wi_txalloc_intr(struct wi_softc *);
diff --git a/sys/dev/pci/if_rtwn.c b/sys/dev/pci/if_rtwn.c
index 14c8412dee0d..52245bc53d21 100644
--- a/sys/dev/pci/if_rtwn.c
+++ b/sys/dev/pci/if_rtwn.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_rtwn.c,v 1.20 2021/06/16 00:21:18 riastradh Exp $	*/
+/*	$NetBSD: if_rtwn.c,v 1.21 2023/08/01 07:04:15 mrg Exp $	*/
 /*	$OpenBSD: if_rtwn.c,v 1.5 2015/06/14 08:02:47 stsp Exp $	*/
 #define	IEEE80211_NO_HT
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.20 2021/06/16 00:21:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.21 2023/08/01 07:04:15 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/sockio.h>
@@ -161,10 +161,11 @@ static void	rtwn_cam_init(struct rtwn_softc *);
 static void	rtwn_pa_bias_init(struct rtwn_softc *);
 static void	rtwn_rxfilter_init(struct rtwn_softc *);
 static void	rtwn_edca_init(struct rtwn_softc *);
-static void	rtwn_write_txpower(struct rtwn_softc *, int, uint16_t[]);
+static void	rtwn_write_txpower(struct rtwn_softc *, int,
+		    uint16_t[RTWN_RIDX_COUNT]);
 static void	rtwn_get_txpower(struct rtwn_softc *, int,
 		    struct ieee80211_channel *, struct ieee80211_channel *,
-		    uint16_t[]);
+		    uint16_t[RTWN_RIDX_COUNT]);
 static void	rtwn_set_txpower(struct rtwn_softc *,
 		    struct ieee80211_channel *, struct ieee80211_channel *);
 static void	rtwn_set_chan(struct rtwn_softc *,
diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c
index f591b646ad75..28c8b37450aa 100644
--- a/sys/dev/usb/if_urtwn.c
+++ b/sys/dev/usb/if_urtwn.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_urtwn.c,v 1.106 2023/07/20 20:00:34 mrg Exp $	*/
+/*	$NetBSD: if_urtwn.c,v 1.107 2023/08/01 07:04:16 mrg Exp $	*/
 /*	$OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $	*/
 
 /*-
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.106 2023/07/20 20:00:34 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.107 2023/08/01 07:04:16 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -325,11 +325,12 @@ static void	urtwn_cam_init(struct urtwn_softc *);
 static void	urtwn_pa_bias_init(struct urtwn_softc *);
 static void	urtwn_rxfilter_init(struct urtwn_softc *);
 static void	urtwn_edca_init(struct urtwn_softc *);
-static void	urtwn_write_txpower(struct urtwn_softc *, int, uint16_t[]);
+static void	urtwn_write_txpower(struct urtwn_softc *, int,
+		    uint16_t[URTWN_RIDX_COUNT]);
 static void	urtwn_get_txpower(struct urtwn_softc *, size_t, u_int, u_int,
-		    uint16_t[]);
+		    uint16_t[URTWN_RIDX_COUNT]);
 static void	urtwn_r88e_get_txpower(struct urtwn_softc *, size_t, u_int,
-		    u_int, uint16_t[]);
+		    u_int, uint16_t[URTWN_RIDX_COUNT]);
 static void	urtwn_set_txpower(struct urtwn_softc *, u_int, u_int);
 static void	urtwn_set_chan(struct urtwn_softc *, struct ieee80211_channel *,
 		    u_int);
diff --git a/sys/external/bsd/drm2/dist/drm/i915/display/intel_dp.h b/sys/external/bsd/drm2/dist/drm/i915/display/intel_dp.h
index 9433abbbbea7..ce01279174a9 100644
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_dp.h
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_dp.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intel_dp.h,v 1.3 2021/12/19 11:38:03 riastradh Exp $	*/
+/*	$NetBSD: intel_dp.h,v 1.4 2023/08/01 07:04:16 mrg Exp $	*/
 
 /* SPDX-License-Identifier: MIT */
 /*
@@ -11,6 +11,7 @@
 #include <linux/types.h>
 
 #include <drm/i915_drm.h>
+#include <drm/drm_dp_helper.h>
 
 #include "i915_reg.h"
 
@@ -107,7 +108,8 @@ void intel_dp_compute_rate(struct intel_dp *intel_dp, int port_clock,
 bool intel_dp_source_supports_hbr2(struct intel_dp *intel_dp);
 bool intel_dp_source_supports_hbr3(struct intel_dp *intel_dp);
 bool
-intel_dp_get_link_status(struct intel_dp *intel_dp, u8 *link_status);
+intel_dp_get_link_status(struct intel_dp *intel_dp, u8
+			 link_status[DP_LINK_STATUS_SIZE]);
 
 bool intel_dp_read_dpcd(struct intel_dp *intel_dp);
 bool intel_dp_get_colorimetry_status(struct intel_dp *intel_dp);
diff --git a/sys/external/isc/atheros_hal/dist/ar5212/ar5212.h b/sys/external/isc/atheros_hal/dist/ar5212/ar5212.h
index 7f28c7bd57a9..2a332fa80e45 100644
--- a/sys/external/isc/atheros_hal/dist/ar5212/ar5212.h
+++ b/sys/external/isc/atheros_hal/dist/ar5212/ar5212.h
@@ -14,7 +14,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: ar5212.h,v 1.4 2011/03/07 11:25:43 cegger Exp $
+ * $Id: ar5212.h,v 1.5 2023/08/01 07:04:16 mrg Exp $
  */
 #ifndef _ATH_AR5212_H_
 #define _ATH_AR5212_H_
@@ -541,7 +541,7 @@ extern	HAL_BOOL ar5212PerCalibrationN(struct ath_hal *ah, HAL_CHANNEL *chan,
 extern	HAL_BOOL ar5212ResetCalValid(struct ath_hal *ah, HAL_CHANNEL *chan);
 extern	int16_t ar5212GetNoiseFloor(struct ath_hal *ah);
 extern	void ar5212InitNfCalHistBuffer(struct ath_hal *);
-extern	int16_t ar5212GetNfHistMid(const int16_t calData[]);
+extern	int16_t ar5212GetNfHistMid(const int16_t calData[AR512_NF_CAL_HIST_MAX]);
 extern	void ar5212SetSpurMitigation(struct ath_hal *, HAL_CHANNEL_INTERNAL *);
 extern	HAL_BOOL ar5212SetAntennaSwitchInternal(struct ath_hal *ah,
 		HAL_ANT_SETTING settings, const HAL_CHANNEL_INTERNAL *ichan);
diff --git a/sys/net/if_ether.h b/sys/net/if_ether.h
index 2e9572cd13a7..dd9dda04bfb3 100644
--- a/sys/net/if_ether.h
+++ b/sys/net/if_ether.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ether.h,v 1.89 2022/06/20 08:14:48 yamaguchi Exp $	*/
+/*	$NetBSD: if_ether.h,v 1.90 2023/08/01 07:04:16 mrg Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -255,7 +255,8 @@ void	ether_set_vlan_cb(struct ethercom *, ether_vlancb_t);
 int	ether_ioctl(struct ifnet *, u_long, void *);
 int	ether_addmulti(const struct sockaddr *, struct ethercom *);
 int	ether_delmulti(const struct sockaddr *, struct ethercom *);
-int	ether_multiaddr(const struct sockaddr *, uint8_t[], uint8_t[]);
+int	ether_multiaddr(const struct sockaddr *, uint8_t[ETHER_ADDR_LEN],
+			uint8_t[ETHER_ADDR_LEN]);
 void    ether_input(struct ifnet *, struct mbuf *);
 
 /*
diff --git a/sys/net/if_wg.c b/sys/net/if_wg.c
index a287bb979e87..538d690ad432 100644
--- a/sys/net/if_wg.c
+++ b/sys/net/if_wg.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wg.c,v 1.76 2023/04/11 14:03:46 jakllsch Exp $	*/
+/*	$NetBSD: if_wg.c,v 1.77 2023/08/01 07:04:16 mrg Exp $	*/
 
 /*
  * Copyright (C) Ryota Ozaki <ozaki.ryota@gmail.com>
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.76 2023/04/11 14:03:46 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wg.c,v 1.77 2023/08/01 07:04:16 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_altq_enabled.h"
@@ -668,7 +668,8 @@ static struct mbuf *
 static int	wg_send_data_msg(struct wg_peer *, struct wg_session *,
 		    struct mbuf *);
 static int	wg_send_cookie_msg(struct wg_softc *, struct wg_peer *,
-		    const uint32_t, const uint8_t [], const struct sockaddr *);
+		    const uint32_t, const uint8_t [WG_MAC_LEN],
+		    const struct sockaddr *);
 static int	wg_send_handshake_msg_resp(struct wg_softc *, struct wg_peer *,
 		    struct wg_session *, const struct wg_msg_init *);
 static void	wg_send_keepalive_msg(struct wg_peer *, struct wg_session *);
@@ -678,7 +679,7 @@ static struct wg_peer *
 		    struct psref *);
 static struct wg_peer *
 		wg_lookup_peer_by_pubkey(struct wg_softc *,
-		    const uint8_t [], struct psref *);
+		    const uint8_t [WG_STATIC_KEY_LEN], struct psref *);
 
 static struct wg_session *
 		wg_lookup_session_by_index(struct wg_softc *,
diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h
index 39c234303a32..6f34355d2703 100644
--- a/sys/net80211/ieee80211_node.h
+++ b/sys/net80211/ieee80211_node.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee80211_node.h,v 1.31 2022/02/16 22:00:56 andvar Exp $	*/
+/*	$NetBSD: ieee80211_node.h,v 1.32 2023/08/01 07:04:16 mrg Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -283,7 +283,8 @@ void	ieee80211_dump_node(struct ieee80211_node_table *,
 void	ieee80211_dump_nodes(struct ieee80211_node_table *);
 
 struct ieee80211_node *ieee80211_fakeup_adhoc_node(
-		struct ieee80211_node_table *, const u_int8_t macaddr[]);
+		struct ieee80211_node_table *,
+		const u_int8_t macaddr[IEEE80211_ADDR_LEN]);
 void	ieee80211_node_join(struct ieee80211com *, struct ieee80211_node *,int);
 void	ieee80211_node_leave(struct ieee80211com *, struct ieee80211_node *);
 u_int8_t ieee80211_getrssi(struct ieee80211com *ic);
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index 33f006d061c4..624d2d17b73c 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_carp.c,v 1.119 2023/04/07 06:44:08 mlelstv Exp $	*/
+/*	$NetBSD: ip_carp.c,v 1.120 2023/08/01 07:04:16 mrg Exp $	*/
 /*	$OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.119 2023/04/07 06:44:08 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.120 2023/08/01 07:04:16 mrg Exp $");
 
 /*
  * TODO:
@@ -186,10 +186,10 @@ struct carp_if {
 	}
 
 static void	carp_hmac_prepare(struct carp_softc *);
-static void	carp_hmac_generate(struct carp_softc *, u_int32_t *,
-		    unsigned char *);
-static int	carp_hmac_verify(struct carp_softc *, u_int32_t *,
-		    unsigned char *);
+static void	carp_hmac_generate(struct carp_softc *, u_int32_t[2],
+		    unsigned char[20]);
+static int	carp_hmac_verify(struct carp_softc *, u_int32_t[2],
+		    unsigned char[20]);
 static void	carp_setroute(struct carp_softc *, int);
 static void	carp_proto_input_c(struct mbuf *, struct carp_header *,
 		    sa_family_t);
diff --git a/sys/stand/efiboot/efiboot_machdep.h b/sys/stand/efiboot/efiboot_machdep.h
index d2c914b47ebf..f78ca73e0412 100644
--- a/sys/stand/efiboot/efiboot_machdep.h
+++ b/sys/stand/efiboot/efiboot_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: efiboot_machdep.h,v 1.3 2020/11/28 14:02:09 jmcneill Exp $ */
+/* $NetBSD: efiboot_machdep.h,v 1.4 2023/08/01 07:04:16 mrg Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill <jmcneill@invisible.ca>
@@ -31,5 +31,5 @@
 #endif
 
 void efi_dcache_flush(u_long, u_long);
-void efi_boot_kernel(u_long[]);
+void efi_boot_kernel(u_long[MARK_MAX]);
 void efi_md_show(void);
diff --git a/sys/sys/rmd160.h b/sys/sys/rmd160.h
index f79163a7f276..41f4116a4e68 100644
--- a/sys/sys/rmd160.h
+++ b/sys/sys/rmd160.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rmd160.h,v 1.3 2016/07/01 16:43:16 christos Exp $	*/
+/*	$NetBSD: rmd160.h,v 1.4 2023/08/01 07:04:16 mrg Exp $	*/
 /*	$KAME: rmd160.h,v 1.2 2003/07/25 09:37:55 itojun Exp $	*/
 /*	$OpenBSD: rmd160.h,v 1.3 2002/03/14 01:26:51 millert Exp $	*/
 /*
@@ -47,10 +47,10 @@ void	 RMD160Transform(uint32_t [5], const u_char [64]);
 void	 RMD160Update(RMD160_CTX *, const u_char *, uint32_t);
 void	 RMD160Final(u_char [RMD160_DIGEST_LENGTH], RMD160_CTX *);
 #ifndef _KERNEL
-char	*RMD160End(RMD160_CTX *, char *);
+char	*RMD160End(RMD160_CTX *, char[RMD160_DIGEST_STRING_LENGTH]);
 char	*RMD160FileChunk(const char *, char *, off_t, off_t);
 char	*RMD160File(const char *, char *);
-char	*RMD160Data(const u_char *, size_t, char *);
+char	*RMD160Data(const u_char *, size_t, char[RMD160_DIGEST_STRING_LENGTH]);
 #endif /* _KERNEL */
 __END_DECLS
 
diff --git a/sys/sys/sha1.h b/sys/sys/sha1.h
index 6e75cab29e4a..4b8f870742c6 100644
--- a/sys/sys/sha1.h
+++ b/sys/sys/sha1.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sha1.h,v 1.15 2016/07/01 16:43:16 christos Exp $	*/
+/*	$NetBSD: sha1.h,v 1.16 2023/08/01 07:04:16 mrg Exp $	*/
 
 /*
  * SHA-1 in C
@@ -28,10 +28,10 @@ void	SHA1Init(SHA1_CTX *);
 void	SHA1Update(SHA1_CTX *, const uint8_t *, unsigned int);
 void	SHA1Final(uint8_t[SHA1_DIGEST_LENGTH], SHA1_CTX *);
 #ifndef _KERNEL
-char	*SHA1End(SHA1_CTX *, char *);
+char	*SHA1End(SHA1_CTX *, char[SHA1_DIGEST_STRING_LENGTH]);
 char	*SHA1FileChunk(const char *, char *, off_t, off_t);
 char	*SHA1File(const char *, char *);
-char	*SHA1Data(const uint8_t *, size_t, char *);
+char	*SHA1Data(const uint8_t *, size_t, char[SHA1_DIGEST_STRING_LENGTH]);
 #endif /* _KERNEL */
 __END_DECLS
 
diff --git a/sys/sys/stat.h b/sys/sys/stat.h
index 3ef5d53869d3..eb6a6c0e018c 100644
--- a/sys/sys/stat.h
+++ b/sys/sys/stat.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: stat.h,v 1.69 2019/09/15 23:55:22 christos Exp $	*/
+/*	$NetBSD: stat.h,v 1.70 2023/08/01 07:04:16 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -279,17 +279,17 @@ int     fstatat(int, const char *, struct stat *, int);
 int     mkdirat(int, const char *, mode_t);
 int     mkfifoat(int, const char *, mode_t);
 int     mknodat(int, const char *, mode_t, dev_t);
-int     utimensat(int, const char *, const struct timespec *, int);
+int     utimensat(int, const char *, const struct timespec [2], int);
 #endif
 
 #ifdef _NETBSD_SOURCE
-int utimens(const char *, const struct timespec *);
-int lutimens(const char *, const struct timespec *);
+int utimens(const char *, const struct timespec [2]);
+int lutimens(const char *, const struct timespec [2]);
 #endif
 
 #if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0) >= 700 || \
     defined(_NETBSD_SOURCE)
-int futimens(int, const struct timespec *);
+int futimens(int, const struct timespec [2]);
 #endif
 #endif
 
diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h
index 50f1d47f7e78..c6fd977ef20e 100644
--- a/usr.bin/mail/extern.h
+++ b/usr.bin/mail/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.34 2016/09/05 00:40:29 sevan Exp $	*/
+/*	$NetBSD: extern.h,v 1.35 2023/08/01 07:04:17 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/20/95
- *	$NetBSD: extern.h,v 1.34 2016/09/05 00:40:29 sevan Exp $
+ *	$NetBSD: extern.h,v 1.35 2023/08/01 07:04:17 mrg Exp $
  */
 
 #ifndef __EXTERN_H__
@@ -289,7 +289,7 @@ int	blankline(char []);
 char *	copy(char *, char *);
 char *	hfield(const char [], const struct message *);
 int	isdir(const char []);
-int	isign(const char *, struct ignoretab []);
+int	isign(const char *, struct ignoretab [2]);
 void	istrcpy(char *, const char *);
 int	member(char *, struct ignoretab *);
 char *	nameof(struct message *, int);
diff --git a/usr.sbin/rpc.pcnfsd/extern.h b/usr.sbin/rpc.pcnfsd/extern.h
index db1ba34ed147..77ecf2fc8ec6 100644
--- a/usr.sbin/rpc.pcnfsd/extern.h
+++ b/usr.sbin/rpc.pcnfsd/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.4 2018/01/23 21:06:25 sevan Exp $	*/
+/*	$NetBSD: extern.h,v 1.5 2023/08/01 07:04:17 mrg Exp $	*/
 
 extern	int		interrupted;
 extern	pr_list		printers;
@@ -11,7 +11,7 @@ int		build_pr_list(void);
 pirstat		build_pr_queue(printername, username, int, int *, int *);
 int		check_cache(char *, char *, int *, int *);
 void		free_mapreq_results(mapreq_res);
-void            fillin_extra_groups(char *, u_int, int *, u_int[]);
+void            fillin_extra_groups(char *, u_int, int *, gid_t[EXTRAGIDLEN]);
 #ifdef USE_YP
 char	       *find_entry(const char *, const char *);
 #endif