From: deraadt <deraadt@openbsd.org>
Date: Mon, 13 Dec 2021 16:56:48 +0000 (+0000)
Subject: remove a couple hundred sys/param.h includes in userland code, and
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=49a6e16f2c2c8e509184b1f777366d1a6f337e1c;p=openbsd

remove a couple hundred sys/param.h includes in userland code, and
also whack some sys/cdefs.h early includes which is such a brutally
bad pattern
ok bluhm mbuhl
---

diff --git a/regress/lib/libc/basename/basename_test.c b/regress/lib/libc/basename/basename_test.c
index 34e138c726e..7272c46b1dc 100644
--- a/regress/lib/libc/basename/basename_test.c
+++ b/regress/lib/libc/basename/basename_test.c
@@ -4,8 +4,6 @@
  * Public domain.
  */
 
-#include <sys/param.h>
-
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
@@ -15,7 +13,7 @@
 int
 main(void)
 {
-	char path[2 * MAXPATHLEN];
+	char path[2 * PATH_MAX];
 	const char *dir = "junk/";
 	const char *fname = "file.name.ext";
 	char *str;
@@ -35,7 +33,7 @@ main(void)
 	 * 1) path is NULL
 	 * 2) path is the empty string
 	 * 3) path is composed entirely of slashes
-	 * 4) the resulting name is larger than MAXPATHLEN
+	 * 4) the resulting name is larger than PATH_MAX
 	 *
 	 * The first two cases require that a pointer
 	 * to the string "." be returned.
@@ -58,7 +56,7 @@ main(void)
 		goto fail;
 
 	/* Case 3 */
-	for (i = 0; i < MAXPATHLEN - 1; i++)
+	for (i = 0; i < PATH_MAX - 1; i++)
 		strlcat(path, "/", sizeof(path));	/* path cleared above */
 	str = basename(path);
 	if (strcmp(str, "/") != 0)
@@ -67,7 +65,7 @@ main(void)
 	/* Case 4 */
 	strlcpy(path, "/", sizeof(path));
 	strlcat(path, dir, sizeof(path));
-	for (i = 0; i <= MAXPATHLEN; i += sizeof(fname))
+	for (i = 0; i <= PATH_MAX; i += sizeof(fname))
 		strlcat(path, fname, sizeof(path));
 	str = basename(path);
 	if (str != NULL || errno != ENAMETOOLONG)
diff --git a/regress/lib/libc/db/dbtest.c b/regress/lib/libc/db/dbtest.c
index b520d8db72d..a3375511b06 100644
--- a/regress/lib/libc/db/dbtest.c
+++ b/regress/lib/libc/db/dbtest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dbtest.c,v 1.18 2021/10/24 21:24:20 deraadt Exp $	*/
+/*	$OpenBSD: dbtest.c,v 1.19 2021/12/13 16:56:48 deraadt Exp $	*/
 /*	$NetBSD: dbtest.c,v 1.8 1996/05/03 21:57:48 cgd Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
 #include <sys/stat.h>
 
 #include <ctype.h>
@@ -45,6 +44,8 @@
 
 #include <db.h>
 
+#define MINIMUM(a, b)    (((a) < (b)) ? (a) : (b))
+
 enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA };
 
 void	 compare(DBT *, DBT *);
@@ -340,7 +341,7 @@ compare(db1, db2)
 		printf("compare failed: key->data len %lu != data len %lu\n",
 		    db1->size, db2->size);
 
-	len = MIN(db1->size, db2->size);
+	len = MINIMUM(db1->size, db2->size);
 	for (p1 = db1->data, p2 = db2->data; len--;)
 		if (*p1++ != *p2++) {
 			printf("compare failed at offset %ld\n",
@@ -371,7 +372,7 @@ get(dbp, kp)
 			(void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
 		else
 			(void)fprintf(stderr, "%lu: %.*s: %s", lineno,
-			    MIN((int)kp->size, 20), kp->data, NOSUCHKEY);
+			    MINIMUM((int)kp->size, 20), kp->data, NOSUCHKEY);
 #undef	NOSUCHKEY
 		break;
 	}
@@ -428,7 +429,7 @@ rem(dbp, kp)
 			(void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
 		else if (flags != R_CURSOR)
 			(void)fprintf(stderr, "%lu: %.*s: %s", lineno,
-			    MIN((int)kp->size, 20), kp->data, NOSUCHKEY);
+			    MINIMUM((int)kp->size, 20), kp->data, NOSUCHKEY);
 		else
 			(void)fprintf(stderr,
 			    "%lu: rem of cursor failed\n", lineno);
@@ -472,7 +473,7 @@ seq(dbp, kp)
 			(void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
 		else if (flags == R_CURSOR)
 			(void)fprintf(stderr, "%lu: %.*s: %s", lineno,
-			    MIN((int)kp->size, 20), kp->data, NOSUCHKEY);
+			    MINIMUM((int)kp->size, 20), kp->data, NOSUCHKEY);
 		else
 			(void)fprintf(stderr,
 			    "%lu: seq (%s) failed\n", lineno, sflags(flags));
diff --git a/regress/lib/libc/dirname/dirname_test.c b/regress/lib/libc/dirname/dirname_test.c
index 27d32b6edaf..250b4def667 100644
--- a/regress/lib/libc/dirname/dirname_test.c
+++ b/regress/lib/libc/dirname/dirname_test.c
@@ -4,8 +4,6 @@
  * Public domain.
  */
 
-#include <sys/param.h>
-
 #include <libgen.h>
 #include <stdio.h>
 #include <string.h>
@@ -16,7 +14,7 @@
 int
 main(void)
 {
-	char path[2 * MAXPATHLEN];
+	char path[2 * PATH_MAX];
 	char dname[128];
 	const char *dir = "junk";
 	const char *fname = "/file.name.ext";
@@ -39,7 +37,7 @@ main(void)
 	 * 1) path is NULL
 	 * 2) path is the empty string
 	 * 3) path is composed entirely of slashes
-	 * 4) the resulting name is larger than MAXPATHLEN
+	 * 4) the resulting name is larger than PATH_MAX
 	 *
 	 * The first two cases require that a pointer
 	 * to the string "." be returned.
@@ -62,7 +60,7 @@ main(void)
 		errx(1, "2: dirname(%s) = %s != .", path, str);
 
 	/* Case 3 */
-	for (i = 0; i < MAXPATHLEN - 1; i++)
+	for (i = 0; i < PATH_MAX - 1; i++)
 		strlcat(path, "/", sizeof(path));	/* path cleared above */
 	str = dirname(path);
 	if (strcmp(str, "/") != 0)
@@ -70,7 +68,7 @@ main(void)
 
 	/* Case 4 */
 	strlcpy(path, "/", sizeof(path));		/* reset path */
-	for (i = 0; i <= MAXPATHLEN; i += strlen(dir))
+	for (i = 0; i <= PATH_MAX; i += strlen(dir))
 		strlcat(path, dir, sizeof(path));
 	strlcat(path, fname, sizeof(path));
 	str = dirname(path);
diff --git a/regress/lib/libc/mkstemp/mkstemp_test.c b/regress/lib/libc/mkstemp/mkstemp_test.c
index c1c05eae39d..b92619cd360 100644
--- a/regress/lib/libc/mkstemp/mkstemp_test.c
+++ b/regress/lib/libc/mkstemp/mkstemp_test.c
@@ -8,7 +8,7 @@
  * contain any X's
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include <unistd.h>
 
 #define MAX_TEMPLATE_LEN	10
@@ -110,7 +111,7 @@ int
 main(void)
 {
 	struct stat sb, fsb;
-	char cwd[MAXPATHLEN + 1];
+	char cwd[PATH_MAX + 1];
 	char *p;
 	size_t clen;
 	int i;
diff --git a/regress/lib/libc/popen/popen.c b/regress/lib/libc/popen/popen.c
index 916cb71b037..2e081de5842 100644
--- a/regress/lib/libc/popen/popen.c
+++ b/regress/lib/libc/popen/popen.c
@@ -29,13 +29,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>
 
 #include <err.h>
 #include <errno.h>
 #include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <limits.h>
 #include <time.h>
 #include <unistd.h>
 
@@ -47,7 +47,7 @@
 int
 main(int argc, char **argv)
 {
-	char *buffer, command[MAXPATHLEN];
+	char *buffer, command[PATH_MAX];
 	int index, in;
 	FILE *pipe;
 
diff --git a/regress/lib/libc/sys/macros.h b/regress/lib/libc/sys/macros.h
index ee7d77c31de..cb0789eb71c 100644
--- a/regress/lib/libc/sys/macros.h
+++ b/regress/lib/libc/sys/macros.h
@@ -1,7 +1,6 @@
-/*	$OpenBSD: macros.h,v 1.4 2021/09/02 15:28:41 mbuhl Exp $	*/
+/*	$OpenBSD: macros.h,v 1.5 2021/12/13 16:56:48 deraadt Exp $	*/
 /* Public domain - Moritz Buhl */
 
-#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stdint.h>
 #include <sys/sysctl.h>
@@ -11,8 +10,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#define __RCSID(str)
-#define __COPYRIGHT(str)
+#define nitems(_a)     (sizeof((_a)) / sizeof((_a)[0]))
 
 #define __arraycount(_a)	nitems(_a)
 #define __unreachable()		atf_tc_fail("unreachable")
diff --git a/regress/lib/libc/sys/t_access.c b/regress/lib/libc/sys/t_access.c
index ed6410423b3..531b17c46e6 100644
--- a/regress/lib/libc/sys/t_access.c
+++ b/regress/lib/libc/sys/t_access.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_access.c,v 1.2 2019/11/22 15:59:53 bluhm Exp $	*/
+/*	$OpenBSD: t_access.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_access.c,v 1.3 2019/07/16 17:29:18 martin Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_access.c,v 1.3 2019/07/16 17:29:18 martin Exp $");
-
 #include "atf-c.h"
 
 #include <sys/stat.h>
diff --git a/regress/lib/libc/sys/t_chroot.c b/regress/lib/libc/sys/t_chroot.c
index b2bc16e49e2..fb65bacebd9 100644
--- a/regress/lib/libc/sys/t_chroot.c
+++ b/regress/lib/libc/sys/t_chroot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_chroot.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_chroot.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_chroot.c,v 1.2 2017/01/10 22:36:29 christos Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_chroot.c,v 1.2 2017/01/10 22:36:29 christos Exp $");
-
 #include <sys/wait.h>
 #include <sys/stat.h>
 
diff --git a/regress/lib/libc/sys/t_clock_gettime.c b/regress/lib/libc/sys/t_clock_gettime.c
index b75be63e4cd..11105d22403 100644
--- a/regress/lib/libc/sys/t_clock_gettime.c
+++ b/regress/lib/libc/sys/t_clock_gettime.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_clock_gettime.c,v 1.2 2021/09/02 12:40:44 mbuhl Exp $	*/
+/*	$OpenBSD: t_clock_gettime.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_clock_gettime.c,v 1.3 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
@@ -58,12 +58,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__COPYRIGHT("@(#) Copyright (c) 2008\
- The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_clock_gettime.c,v 1.3 2017/01/13 21:30:41 christos Exp $");
-
-#include <sys/param.h>
 #include <sys/sysctl.h>
 
 
diff --git a/regress/lib/libc/sys/t_dup.c b/regress/lib/libc/sys/t_dup.c
index c998c228b4c..b461a5f7c84 100644
--- a/regress/lib/libc/sys/t_dup.c
+++ b/regress/lib/libc/sys/t_dup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_dup.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_dup.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_dup.c,v 1.9 2017/01/13 20:31:53 christos Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_dup.c,v 1.9 2017/01/13 20:31:53 christos Exp $");
-
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
diff --git a/regress/lib/libc/sys/t_fork.c b/regress/lib/libc/sys/t_fork.c
index 8fbc502d1f8..b55b557824e 100644
--- a/regress/lib/libc/sys/t_fork.c
+++ b/regress/lib/libc/sys/t_fork.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_fork.c,v 1.4 2021/09/28 05:39:24 anton Exp $	*/
+/*	$OpenBSD: t_fork.c,v 1.5 2021/12/13 16:56:48 deraadt Exp $	*/
 /*	$NetBSD: t_fork.c,v 1.4 2019/04/06 15:41:54 kamil Exp $	*/
 
 /*-
@@ -28,16 +28,11 @@
  */
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__COPYRIGHT("@(#) Copyright (c) 2018, 2019\
- The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_fork.c,v 1.4 2019/04/06 15:41:54 kamil Exp $");
-
-#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/signal.h>
 #ifdef __OpenBSD__
 #include <sys/proc.h>
 #endif
-#include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
 #include <sched.h>
diff --git a/regress/lib/libc/sys/t_fsync.c b/regress/lib/libc/sys/t_fsync.c
index bc3cd7939b9..66653df633d 100644
--- a/regress/lib/libc/sys/t_fsync.c
+++ b/regress/lib/libc/sys/t_fsync.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_fsync.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_fsync.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_fsync.c,v 1.2 2012/03/18 07:00:52 jruoho Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_fsync.c,v 1.2 2012/03/18 07:00:52 jruoho Exp $");
-
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/regress/lib/libc/sys/t_getgroups.c b/regress/lib/libc/sys/t_getgroups.c
index 5cecd3031fc..a17c9c67780 100644
--- a/regress/lib/libc/sys/t_getgroups.c
+++ b/regress/lib/libc/sys/t_getgroups.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_getgroups.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_getgroups.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_getgroups.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_getgroups.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
-
 #include <sys/wait.h>
 
 #include "atf-c.h"
diff --git a/regress/lib/libc/sys/t_getitimer.c b/regress/lib/libc/sys/t_getitimer.c
index 9e5bd792ed7..b18bc75cd08 100644
--- a/regress/lib/libc/sys/t_getitimer.c
+++ b/regress/lib/libc/sys/t_getitimer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_getitimer.c,v 1.3 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_getitimer.c,v 1.4 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_getitimer.c,v 1.3 2019/07/13 12:44:02 gson Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_getitimer.c,v 1.3 2019/07/13 12:44:02 gson Exp $");
-
 #include <sys/time.h>
 
 #include "atf-c.h"
diff --git a/regress/lib/libc/sys/t_getlogin.c b/regress/lib/libc/sys/t_getlogin.c
index 3c98cd7de89..b4f06fdee63 100644
--- a/regress/lib/libc/sys/t_getlogin.c
+++ b/regress/lib/libc/sys/t_getlogin.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_getlogin.c,v 1.1.1.1 2019/11/19 19:57:03 bluhm Exp $	*/
+/*	$OpenBSD: t_getlogin.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_getlogin.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
 
 /*-
@@ -32,16 +32,13 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_getlogin.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
-
-#include <sys/param.h>
 #include <sys/wait.h>
 
 #include "atf-c.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include <unistd.h>
 
 ATF_TC(getlogin_r_err);
@@ -65,7 +62,7 @@ ATF_TC_HEAD(getlogin_same, tc)
 
 ATF_TC_BODY(getlogin_same, tc)
 {
-	char buf[MAXLOGNAME];
+	char buf[LOGIN_NAME_MAX];
 	char *str;
 
 	str = getlogin();
@@ -128,7 +125,7 @@ ATF_TC_HEAD(setlogin_err, tc)
 
 ATF_TC_BODY(setlogin_err, tc)
 {
-	char buf[MAXLOGNAME + 1];
+	char buf[LOGIN_NAME_MAX + 1];
 	char *name;
 	pid_t pid;
 	int sta;
diff --git a/regress/lib/libc/sys/t_getpid.c b/regress/lib/libc/sys/t_getpid.c
index 0dbf7f43fee..db9f8c87460 100644
--- a/regress/lib/libc/sys/t_getpid.c
+++ b/regress/lib/libc/sys/t_getpid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_getpid.c,v 1.1.1.1 2019/11/19 19:57:03 bluhm Exp $	*/
+/*	$OpenBSD: t_getpid.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_getpid.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_getpid.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
-
 #include <sys/wait.h>
 
 #include <stdlib.h>
diff --git a/regress/lib/libc/sys/t_getrusage.c b/regress/lib/libc/sys/t_getrusage.c
index 316377f8ce8..1a9e3d139cd 100644
--- a/regress/lib/libc/sys/t_getrusage.c
+++ b/regress/lib/libc/sys/t_getrusage.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_getrusage.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_getrusage.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_getrusage.c,v 1.8 2018/05/09 08:45:03 mrg Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_getrusage.c,v 1.8 2018/05/09 08:45:03 mrg Exp $");
-
 #include <sys/resource.h>
 #include <sys/time.h>
 
diff --git a/regress/lib/libc/sys/t_getsid.c b/regress/lib/libc/sys/t_getsid.c
index 5ccc2ca1a17..9bd82cd2baf 100644
--- a/regress/lib/libc/sys/t_getsid.c
+++ b/regress/lib/libc/sys/t_getsid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_getsid.c,v 1.1.1.1 2019/11/19 19:57:03 bluhm Exp $	*/
+/*	$OpenBSD: t_getsid.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_getsid.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_getsid.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
-
 #include <sys/wait.h>
 
 #include <errno.h>
diff --git a/regress/lib/libc/sys/t_gettimeofday.c b/regress/lib/libc/sys/t_gettimeofday.c
index 015204b1fc9..7a7d319be1c 100644
--- a/regress/lib/libc/sys/t_gettimeofday.c
+++ b/regress/lib/libc/sys/t_gettimeofday.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_gettimeofday.c,v 1.4 2021/09/27 14:07:44 mbuhl Exp $	*/
+/*	$OpenBSD: t_gettimeofday.c,v 1.5 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_gettimeofday.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
 
 /*-
@@ -32,13 +32,11 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_gettimeofday.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
-
 #include <sys/time.h>
 
 #include "atf-c.h"
 #include <errno.h>
+#include <signal.h>
 #include <string.h>
 
 #ifdef __OpenBSD__
diff --git a/regress/lib/libc/sys/t_kevent.c b/regress/lib/libc/sys/t_kevent.c
index 171e1f3dc99..917ab7f1dd6 100644
--- a/regress/lib/libc/sys/t_kevent.c
+++ b/regress/lib/libc/sys/t_kevent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_kevent.c,v 1.1 2021/09/02 12:40:44 mbuhl Exp $	*/
+/*	$OpenBSD: t_kevent.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /*	$NetBSD: t_kevent.c,v 1.9 2020/10/31 01:08:32 christos Exp $ */
 
 /*-
@@ -31,9 +31,6 @@
  */
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_kevent.c,v 1.9 2020/10/31 01:08:32 christos Exp $");
-
 #include <sys/types.h>
 #include <sys/event.h>
 
diff --git a/regress/lib/libc/sys/t_kill.c b/regress/lib/libc/sys/t_kill.c
index bce0f2f111f..0c55dfa41b2 100644
--- a/regress/lib/libc/sys/t_kill.c
+++ b/regress/lib/libc/sys/t_kill.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_kill.c,v 1.3 2021/09/28 05:39:24 anton Exp $	*/
+/*	$OpenBSD: t_kill.c,v 1.4 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_kill.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_kill.c,v 1.1 2011/07/07 06:57:53 jruoho Exp $");
-
 #include <sys/wait.h>
 
 #include <errno.h>
diff --git a/regress/lib/libc/sys/t_link.c b/regress/lib/libc/sys/t_link.c
index 291fd9cda40..12dbd8b595b 100644
--- a/regress/lib/libc/sys/t_link.c
+++ b/regress/lib/libc/sys/t_link.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_link.c,v 1.1.1.1 2019/11/19 19:57:03 bluhm Exp $	*/
+/*	$OpenBSD: t_link.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_link.c,v 1.3 2017/01/13 20:42:36 christos Exp $ */
 
 /*-
@@ -32,10 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_link.c,v 1.3 2017/01/13 20:42:36 christos Exp $");
-
-#include <sys/param.h>
 #include <sys/stat.h>
 
 #include "atf-c.h"
@@ -112,7 +108,7 @@ ATF_TC_HEAD(link_err, tc)
 
 ATF_TC_BODY(link_err, tc)
 {
-	char buf[MAXPATHLEN + 1];
+	char buf[PATH_MAX + 1];
 	int fd;
 
 	(void)memset(buf, 'x', sizeof(buf));
diff --git a/regress/lib/libc/sys/t_minherit.c b/regress/lib/libc/sys/t_minherit.c
index dd9ddf1d1ed..578092352c6 100644
--- a/regress/lib/libc/sys/t_minherit.c
+++ b/regress/lib/libc/sys/t_minherit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_minherit.c,v 1.1 2021/09/02 12:40:44 mbuhl Exp $	*/
+/*	$OpenBSD: t_minherit.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_minherit.c,v 1.1 2014/07/18 12:34:52 christos Exp $ */
 
 /*-
@@ -31,10 +31,6 @@
  */
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_minherit.c,v 1.1 2014/07/18 12:34:52 christos Exp $");
-
-#include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
@@ -43,6 +39,7 @@ __RCSID("$NetBSD: t_minherit.c,v 1.1 2014/07/18 12:34:52 christos Exp $");
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
 #include <unistd.h>
 
 #include "atf-c.h"
diff --git a/regress/lib/libc/sys/t_mkdir.c b/regress/lib/libc/sys/t_mkdir.c
index 41df34ace93..5052bd39883 100644
--- a/regress/lib/libc/sys/t_mkdir.c
+++ b/regress/lib/libc/sys/t_mkdir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_mkdir.c,v 1.1.1.1 2019/11/19 19:57:03 bluhm Exp $	*/
+/*	$OpenBSD: t_mkdir.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_mkdir.c,v 1.2 2011/10/15 07:38:31 jruoho Exp $ */
 
 /*-
@@ -32,11 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__COPYRIGHT("@(#) Copyright (c) 2008\
- The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_mkdir.c,v 1.2 2011/10/15 07:38:31 jruoho Exp $");
-
 #include <sys/stat.h>
 #include <sys/wait.h>
 
diff --git a/regress/lib/libc/sys/t_mkfifo.c b/regress/lib/libc/sys/t_mkfifo.c
index 1c2fe60e3a1..13cd2d19227 100644
--- a/regress/lib/libc/sys/t_mkfifo.c
+++ b/regress/lib/libc/sys/t_mkfifo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_mkfifo.c,v 1.1.1.1 2019/11/19 19:57:03 bluhm Exp $	*/
+/*	$OpenBSD: t_mkfifo.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_mkfifo.c,v 1.3 2019/06/20 03:31:54 kamil Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mkfifo.c,v 1.3 2019/06/20 03:31:54 kamil Exp $");
-
 #include <sys/stat.h>
 #include <sys/wait.h>
 
diff --git a/regress/lib/libc/sys/t_mknod.c b/regress/lib/libc/sys/t_mknod.c
index b1e412cb688..0c8b54f85fd 100644
--- a/regress/lib/libc/sys/t_mknod.c
+++ b/regress/lib/libc/sys/t_mknod.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_mknod.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_mknod.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_mknod.c,v 1.2 2012/03/18 07:00:52 jruoho Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mknod.c,v 1.2 2012/03/18 07:00:52 jruoho Exp $");
-
 #include <sys/stat.h>
 
 #include "atf-c.h"
diff --git a/regress/lib/libc/sys/t_mlock.c b/regress/lib/libc/sys/t_mlock.c
index e41f52443cb..865bd9e36ba 100644
--- a/regress/lib/libc/sys/t_mlock.c
+++ b/regress/lib/libc/sys/t_mlock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_mlock.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_mlock.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_mlock.c,v 1.8 2020/01/24 08:45:16 skrll Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mlock.c,v 1.8 2020/01/24 08:45:16 skrll Exp $");
-
 #include <sys/mman.h>
 #include <sys/resource.h>
 #include <sys/sysctl.h>
diff --git a/regress/lib/libc/sys/t_mmap.c b/regress/lib/libc/sys/t_mmap.c
index 8d167cd5ec6..59c74296e39 100644
--- a/regress/lib/libc/sys/t_mmap.c
+++ b/regress/lib/libc/sys/t_mmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_mmap.c,v 1.3 2020/12/06 18:46:07 bluhm Exp $	*/
+/*	$OpenBSD: t_mmap.c,v 1.4 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_mmap.c,v 1.14 2020/06/26 07:50:11 jruoho Exp $ */
 
 /*-
@@ -58,10 +58,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mmap.c,v 1.14 2020/06/26 07:50:11 jruoho Exp $");
-
-#include <sys/param.h>
 #include <sys/disklabel.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -75,6 +71,7 @@ __RCSID("$NetBSD: t_mmap.c,v 1.14 2020/06/26 07:50:11 jruoho Exp $");
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <limits.h>
 #include <string.h>
 #include <unistd.h>
 #include <paths.h>
diff --git a/regress/lib/libc/sys/t_msgctl.c b/regress/lib/libc/sys/t_msgctl.c
index 980f11ee0b8..91c0eaaeafe 100644
--- a/regress/lib/libc/sys/t_msgctl.c
+++ b/regress/lib/libc/sys/t_msgctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_msgctl.c,v 1.1.1.1 2019/11/19 19:57:04 bluhm Exp $	*/
+/*	$OpenBSD: t_msgctl.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_msgctl.c,v 1.7 2017/10/07 17:15:44 kre Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_msgctl.c,v 1.7 2017/10/07 17:15:44 kre Exp $");
-
 #include <sys/msg.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
diff --git a/regress/lib/libc/sys/t_msgget.c b/regress/lib/libc/sys/t_msgget.c
index c5b7d97e156..f4d3013b6fb 100644
--- a/regress/lib/libc/sys/t_msgget.c
+++ b/regress/lib/libc/sys/t_msgget.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_msgget.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_msgget.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_msgget.c,v 1.3 2017/10/08 08:31:05 kre Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_msgget.c,v 1.3 2017/10/08 08:31:05 kre Exp $");
-
 #include <sys/msg.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
@@ -45,6 +42,7 @@ __RCSID("$NetBSD: t_msgget.c,v 1.3 2017/10/08 08:31:05 kre Exp $");
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <signal.h>
 #include <string.h>
 #include <sysexits.h>
 #include <time.h>
diff --git a/regress/lib/libc/sys/t_msgrcv.c b/regress/lib/libc/sys/t_msgrcv.c
index 1fbcd416951..2e73b3d5baf 100644
--- a/regress/lib/libc/sys/t_msgrcv.c
+++ b/regress/lib/libc/sys/t_msgrcv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_msgrcv.c,v 1.1.1.1 2019/11/19 19:57:04 bluhm Exp $	*/
+/*	$OpenBSD: t_msgrcv.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_msgrcv.c,v 1.5 2017/10/08 08:31:05 kre Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_msgrcv.c,v 1.5 2017/10/08 08:31:05 kre Exp $");
-
 #include <sys/msg.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
diff --git a/regress/lib/libc/sys/t_msgsnd.c b/regress/lib/libc/sys/t_msgsnd.c
index ab0cc87e6f8..4ea2aa485e5 100644
--- a/regress/lib/libc/sys/t_msgsnd.c
+++ b/regress/lib/libc/sys/t_msgsnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_msgsnd.c,v 1.1.1.1 2019/11/19 19:57:04 bluhm Exp $	*/
+/*	$OpenBSD: t_msgsnd.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_msgsnd.c,v 1.4 2017/10/08 08:31:05 kre Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_msgsnd.c,v 1.4 2017/10/08 08:31:05 kre Exp $");
-
 #include <sys/msg.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
diff --git a/regress/lib/libc/sys/t_msync.c b/regress/lib/libc/sys/t_msync.c
index 8e06d79d9a3..acce0f664eb 100644
--- a/regress/lib/libc/sys/t_msync.c
+++ b/regress/lib/libc/sys/t_msync.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_msync.c,v 1.1.1.1 2019/11/19 19:57:04 bluhm Exp $	*/
+/*	$OpenBSD: t_msync.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_msync.c,v 1.3 2017/01/14 20:52:42 christos Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_msync.c,v 1.3 2017/01/14 20:52:42 christos Exp $");
-
 #include <sys/mman.h>
 
 #include "atf-c.h"
diff --git a/regress/lib/libc/sys/t_pipe.c b/regress/lib/libc/sys/t_pipe.c
index 2fcb6d4b131..7640cc2944e 100644
--- a/regress/lib/libc/sys/t_pipe.c
+++ b/regress/lib/libc/sys/t_pipe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_pipe.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_pipe.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_pipe.c,v 1.7 2020/06/26 07:50:11 jruoho Exp $ */
 
 /*-
@@ -29,12 +29,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-#include <sys/cdefs.h>
-__COPYRIGHT("@(#) Copyright (c) 2008\
- The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_pipe.c,v 1.7 2020/06/26 07:50:11 jruoho Exp $");
-
 #include <sys/types.h>
 #include <sys/wait.h>
 
diff --git a/regress/lib/libc/sys/t_pipe2.c b/regress/lib/libc/sys/t_pipe2.c
index 07991de4558..173d467c38e 100644
--- a/regress/lib/libc/sys/t_pipe2.c
+++ b/regress/lib/libc/sys/t_pipe2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_pipe2.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_pipe2.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_pipe2.c,v 1.9 2017/01/13 21:19:45 christos Exp $ */
 
 /*-
@@ -39,9 +39,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_pipe2.c,v 1.9 2017/01/13 21:19:45 christos Exp $");
-
 #include "atf-c.h"
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/regress/lib/libc/sys/t_ptrace.c b/regress/lib/libc/sys/t_ptrace.c
index a48616efb23..4b87acfdd28 100644
--- a/regress/lib/libc/sys/t_ptrace.c
+++ b/regress/lib/libc/sys/t_ptrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_ptrace.c,v 1.4 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_ptrace.c,v 1.5 2021/12/13 16:56:48 deraadt Exp $	*/
 /*	$NetBSD: t_ptrace.c,v 1.4 2018/05/14 12:44:40 kamil Exp $	*/
 
 /*-
@@ -29,16 +29,13 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace.c,v 1.4 2018/05/14 12:44:40 kamil Exp $");
-
-#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <err.h>
 #include <errno.h>
+#include <limits.h>
 #include <unistd.h>
 
 #include "atf-c.h"
diff --git a/regress/lib/libc/sys/t_revoke.c b/regress/lib/libc/sys/t_revoke.c
index 7640c2d8713..d330b8832af 100644
--- a/regress/lib/libc/sys/t_revoke.c
+++ b/regress/lib/libc/sys/t_revoke.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_revoke.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_revoke.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_revoke.c,v 1.2 2017/01/13 21:15:57 christos Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_revoke.c,v 1.2 2017/01/13 21:15:57 christos Exp $");
-
 #include <sys/resource.h>
 #include <sys/wait.h>
 
diff --git a/regress/lib/libc/sys/t_sendrecv.c b/regress/lib/libc/sys/t_sendrecv.c
index 4b62505c284..ae6425f40dd 100644
--- a/regress/lib/libc/sys/t_sendrecv.c
+++ b/regress/lib/libc/sys/t_sendrecv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_sendrecv.c,v 1.2 2021/05/31 16:56:27 bluhm Exp $	*/
+/*	$OpenBSD: t_sendrecv.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /*	$NetBSD: t_sendrecv.c,v 1.8 2021/03/28 17:30:01 christos Exp $	*/
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_sendrecv.c,v 1.8 2021/03/28 17:30:01 christos Exp $");
-
 #include "atf-c.h"
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/regress/lib/libc/sys/t_setrlimit.c b/regress/lib/libc/sys/t_setrlimit.c
index d72ec5216d7..c9c64d42f01 100644
--- a/regress/lib/libc/sys/t_setrlimit.c
+++ b/regress/lib/libc/sys/t_setrlimit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_setrlimit.c,v 1.1 2021/09/02 12:40:44 mbuhl Exp $	*/
+/*	$OpenBSD: t_setrlimit.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_setrlimit.c,v 1.7 2020/10/13 06:58:57 rin Exp $ */
 
 /*-
@@ -31,9 +31,6 @@
  */
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_setrlimit.c,v 1.7 2020/10/13 06:58:57 rin Exp $");
-
 #include <sys/resource.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
diff --git a/regress/lib/libc/sys/t_setuid.c b/regress/lib/libc/sys/t_setuid.c
index 7d3bd1986b0..69240413907 100644
--- a/regress/lib/libc/sys/t_setuid.c
+++ b/regress/lib/libc/sys/t_setuid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_setuid.c,v 1.1.1.1 2019/11/19 19:57:04 bluhm Exp $	*/
+/*	$OpenBSD: t_setuid.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_setuid.c,v 1.1 2011/07/07 06:57:54 jruoho Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_setuid.c,v 1.1 2011/07/07 06:57:54 jruoho Exp $");
-
 #include <sys/wait.h>
 
 #include "atf-c.h"
diff --git a/regress/lib/libc/sys/t_sigaction.c b/regress/lib/libc/sys/t_sigaction.c
index 21c793d74ac..4254e1fece2 100644
--- a/regress/lib/libc/sys/t_sigaction.c
+++ b/regress/lib/libc/sys/t_sigaction.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_sigaction.c,v 1.1.1.1 2019/11/19 19:57:04 bluhm Exp $	*/
+/*	$OpenBSD: t_sigaction.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_sigaction.c,v 1.5 2017/01/13 21:30:41 christos Exp $ */
 
 /*-
@@ -29,11 +29,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__COPYRIGHT("@(#) Copyright (c) 2010\
- The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sigaction.c,v 1.5 2017/01/13 21:30:41 christos Exp $");
-
 #include <sys/wait.h>
 
 #include <signal.h>
diff --git a/regress/lib/libc/sys/t_sigaltstack.c b/regress/lib/libc/sys/t_sigaltstack.c
index ac02650296a..b02063bf2d9 100644
--- a/regress/lib/libc/sys/t_sigaltstack.c
+++ b/regress/lib/libc/sys/t_sigaltstack.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_sigaltstack.c,v 1.1 2021/09/02 12:40:44 mbuhl Exp $	*/
+/*	$OpenBSD: t_sigaltstack.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_sigaltstack.c,v 1.2 2020/05/01 21:35:30 christos Exp $ */
 
 /*-
@@ -28,9 +28,6 @@
  */
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_sigaltstack.c,v 1.2 2020/05/01 21:35:30 christos Exp $");
-
 #include <signal.h>
 #include <stdbool.h>
 
diff --git a/regress/lib/libc/sys/t_socketpair.c b/regress/lib/libc/sys/t_socketpair.c
index 076d2fa057a..e24a166161b 100644
--- a/regress/lib/libc/sys/t_socketpair.c
+++ b/regress/lib/libc/sys/t_socketpair.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_socketpair.c,v 1.1.1.1 2019/11/19 19:57:04 bluhm Exp $	*/
+/*	$OpenBSD: t_socketpair.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_socketpair.c,v 1.2 2017/01/13 20:04:52 christos Exp $ */
 
 /*-
@@ -39,9 +39,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_socketpair.c,v 1.2 2017/01/13 20:04:52 christos Exp $");
-
 #include "atf-c.h"
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/regress/lib/libc/sys/t_stat.c b/regress/lib/libc/sys/t_stat.c
index 5aadf39b997..eca93f83bd8 100644
--- a/regress/lib/libc/sys/t_stat.c
+++ b/regress/lib/libc/sys/t_stat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_stat.c,v 1.3 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_stat.c,v 1.4 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_stat.c,v 1.6 2019/07/16 17:29:18 martin Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_stat.c,v 1.6 2019/07/16 17:29:18 martin Exp $");
-
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/types.h>
diff --git a/regress/lib/libc/sys/t_syscall.c b/regress/lib/libc/sys/t_syscall.c
index 454905837fa..a8e3cd12881 100644
--- a/regress/lib/libc/sys/t_syscall.c
+++ b/regress/lib/libc/sys/t_syscall.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_syscall.c,v 1.3 2021/09/02 12:40:44 mbuhl Exp $	*/
+/*	$OpenBSD: t_syscall.c,v 1.4 2021/12/13 16:56:48 deraadt Exp $	*/
 /*	$NetBSD: t_syscall.c,v 1.4 2021/01/18 05:44:20 simonb Exp $	*/
 
 /*-
@@ -32,10 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_syscall.c,v 1.4 2021/01/18 05:44:20 simonb Exp $");
-
-
 #include "atf-c.h"
 #include <stdio.h>
 #include <unistd.h>
diff --git a/regress/lib/libc/sys/t_truncate.c b/regress/lib/libc/sys/t_truncate.c
index 7d3dedb7b88..f952efc35e8 100644
--- a/regress/lib/libc/sys/t_truncate.c
+++ b/regress/lib/libc/sys/t_truncate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_truncate.c,v 1.2 2021/10/24 21:24:20 deraadt Exp $	*/
+/*	$OpenBSD: t_truncate.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_truncate.c,v 1.3 2017/01/13 20:03:51 christos Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_truncate.c,v 1.3 2017/01/13 20:03:51 christos Exp $");
-
 #include <sys/stat.h>
 
 #include "atf-c.h"
diff --git a/regress/lib/libc/sys/t_umask.c b/regress/lib/libc/sys/t_umask.c
index b312e8183b8..53837b654e7 100644
--- a/regress/lib/libc/sys/t_umask.c
+++ b/regress/lib/libc/sys/t_umask.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_umask.c,v 1.1.1.1 2019/11/19 19:57:04 bluhm Exp $	*/
+/*	$OpenBSD: t_umask.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_umask.c,v 1.2 2017/01/13 19:34:19 christos Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_umask.c,v 1.2 2017/01/13 19:34:19 christos Exp $");
-
 #include <sys/stat.h>
 #include <sys/wait.h>
 
diff --git a/regress/lib/libc/sys/t_unlink.c b/regress/lib/libc/sys/t_unlink.c
index 9736d775931..2b1170ead7d 100644
--- a/regress/lib/libc/sys/t_unlink.c
+++ b/regress/lib/libc/sys/t_unlink.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_unlink.c,v 1.1.1.1 2019/11/19 19:57:04 bluhm Exp $	*/
+/*	$OpenBSD: t_unlink.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_unlink.c,v 1.4 2017/01/14 20:55:26 christos Exp $ */
 
 /*-
@@ -32,9 +32,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_unlink.c,v 1.4 2017/01/14 20:55:26 christos Exp $");
-
 #include <sys/stat.h>
 
 #include "atf-c.h"
diff --git a/regress/lib/libc/sys/t_wait_noproc.c b/regress/lib/libc/sys/t_wait_noproc.c
index 73fc7ae0352..ee3454eb709 100644
--- a/regress/lib/libc/sys/t_wait_noproc.c
+++ b/regress/lib/libc/sys/t_wait_noproc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_wait_noproc.c,v 1.1 2021/09/02 12:40:44 mbuhl Exp $	*/
+/*	$OpenBSD: t_wait_noproc.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_wait_noproc.c,v 1.5 2016/11/09 17:50:19 kamil Exp $ */
 
 /*-
@@ -29,9 +29,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_wait_noproc.c,v 1.5 2016/11/09 17:50:19 kamil Exp $");
-
 #include <sys/wait.h>
 #include <sys/resource.h>
 
diff --git a/regress/lib/libc/sys/t_write.c b/regress/lib/libc/sys/t_write.c
index 326032db712..8d01ebfba88 100644
--- a/regress/lib/libc/sys/t_write.c
+++ b/regress/lib/libc/sys/t_write.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: t_write.c,v 1.3 2020/11/09 23:18:51 bluhm Exp $	*/
+/*	$OpenBSD: t_write.c,v 1.4 2021/12/13 16:56:48 deraadt Exp $	*/
 /* $NetBSD: t_write.c,v 1.7 2019/07/16 17:29:18 martin Exp $ */
 
 /*-
@@ -29,11 +29,6 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__COPYRIGHT("@(#) Copyright (c) 2008\
- The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_write.c,v 1.7 2019/07/16 17:29:18 martin Exp $");
-
 #include <sys/uio.h>
 #include <sys/mman.h>
 
diff --git a/regress/lib/libm/msun/cexp_test.c b/regress/lib/libm/msun/cexp_test.c
index f94362952a3..58f5e266db0 100644
--- a/regress/lib/libm/msun/cexp_test.c
+++ b/regress/lib/libm/msun/cexp_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cexp_test.c,v 1.1 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: cexp_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008-2011 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <sys/types.h>
 
 #include <complex.h>
 #include <fenv.h>
diff --git a/regress/lib/libm/msun/csqrt_test.c b/regress/lib/libm/msun/csqrt_test.c
index adbd427d04d..a7b66da5ab8 100644
--- a/regress/lib/libm/msun/csqrt_test.c
+++ b/regress/lib/libm/msun/csqrt_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: csqrt_test.c,v 1.1 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: csqrt_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /*-
  * Copyright (c) 2007 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -30,7 +30,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <sys/types.h>
 
 #include <complex.h>
 #include <float.h>
diff --git a/regress/lib/libm/msun/ctrig_test.c b/regress/lib/libm/msun/ctrig_test.c
index d571d647eb7..31e38c287ee 100644
--- a/regress/lib/libm/msun/ctrig_test.c
+++ b/regress/lib/libm/msun/ctrig_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ctrig_test.c,v 1.1 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: ctrig_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008-2011 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <complex.h>
 #include <fenv.h>
 #include <float.h>
diff --git a/regress/lib/libm/msun/fma_test.c b/regress/lib/libm/msun/fma_test.c
index ce1dfee6072..cd45a7a3ca6 100644
--- a/regress/lib/libm/msun/fma_test.c
+++ b/regress/lib/libm/msun/fma_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fma_test.c,v 1.1 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: fma_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/regress/lib/libm/msun/invctrig_test.c b/regress/lib/libm/msun/invctrig_test.c
index 9502ddfa408..368ebd11a21 100644
--- a/regress/lib/libm/msun/invctrig_test.c
+++ b/regress/lib/libm/msun/invctrig_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: invctrig_test.c,v 1.1 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: invctrig_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008-2013 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <complex.h>
 #include <fenv.h>
 #include <float.h>
diff --git a/regress/lib/libm/msun/logarithm_test.c b/regress/lib/libm/msun/logarithm_test.c
index 2263c81cfc0..3cf65274033 100644
--- a/regress/lib/libm/msun/logarithm_test.c
+++ b/regress/lib/libm/msun/logarithm_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: logarithm_test.c,v 1.1 2021/10/22 18:00:22 mbuhl Exp $	*/
+/*	$OpenBSD: logarithm_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008-2010 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/regress/lib/libm/msun/macros.h b/regress/lib/libm/msun/macros.h
index ed682c29e37..00ea394dbc1 100644
--- a/regress/lib/libm/msun/macros.h
+++ b/regress/lib/libm/msun/macros.h
@@ -1,7 +1,9 @@
-/*      $OpenBSD: macros.h,v 1.1 2021/10/22 18:00:22 mbuhl Exp $       */
+/*      $OpenBSD: macros.h,v 1.2 2021/12/13 16:56:48 deraadt Exp $       */
 /* Public domain - Moritz Buhl */
 
 #define __FBSDID(a)
 #define rounddown(x, y)	(((x)/(y))*(y))
 #define fpequal(a, b)	fpequal_cs(a, b, 1)
 #define hexdump(...)
+
+#define nitems(_a)      (sizeof((_a)) / sizeof((_a)[0]))
diff --git a/regress/lib/libm/msun/nan_test.c b/regress/lib/libm/msun/nan_test.c
index 833290d8872..99883fb94c3 100644
--- a/regress/lib/libm/msun/nan_test.c
+++ b/regress/lib/libm/msun/nan_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nan_test.c,v 1.1 2021/10/22 18:00:23 mbuhl Exp $	*/
+/*	$OpenBSD: nan_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /*-
  * Copyright (C) 2007 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -35,7 +35,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <fenv.h>
 #include <float.h>
 #include <locale.h>
diff --git a/regress/lib/libm/msun/nearbyint_test.c b/regress/lib/libm/msun/nearbyint_test.c
index 35ec3724faa..68053aa98a1 100644
--- a/regress/lib/libm/msun/nearbyint_test.c
+++ b/regress/lib/libm/msun/nearbyint_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nearbyint_test.c,v 1.1 2021/10/22 18:00:23 mbuhl Exp $	*/
+/*	$OpenBSD: nearbyint_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /*-
  * Copyright (c) 2010 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -38,7 +38,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <fenv.h>
 #include <math.h>
 #include <stdio.h>
diff --git a/regress/lib/libm/msun/trig_test.c b/regress/lib/libm/msun/trig_test.c
index 040690f5266..c6b2afa9710 100644
--- a/regress/lib/libm/msun/trig_test.c
+++ b/regress/lib/libm/msun/trig_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trig_test.c,v 1.1 2021/10/22 18:00:23 mbuhl Exp $	*/
+/*	$OpenBSD: trig_test.c,v 1.2 2021/12/13 16:56:48 deraadt Exp $	*/
 /*-
  * Copyright (c) 2008 David Schultz <das@FreeBSD.org>
  * All rights reserved.
@@ -39,7 +39,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>
+#include <sys/types.h>
 
 #include <fenv.h>
 #include <float.h>
diff --git a/regress/lib/libpthread/cwd/cwd.c b/regress/lib/libpthread/cwd/cwd.c
index 925e337a728..f274088b3d7 100644
--- a/regress/lib/libpthread/cwd/cwd.c
+++ b/regress/lib/libpthread/cwd/cwd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cwd.c,v 1.2 2001/09/20 16:43:15 todd Exp $	*/
+/*	$OpenBSD: cwd.c,v 1.3 2021/12/13 16:56:48 deraadt Exp $	*/
 /*
  * Copyright (c) 1993, 1994, 1995, 1996 by Chris Provenzano and contributors, 
  * proven@mit.edu All rights reserved.
@@ -37,15 +37,15 @@
  */
 
 #include <stdio.h>
-#include <sys/param.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <limits.h>
 #include "test.h"
 
 int
 main(int argc, char **argv)
 {
-    char wd[MAXPATHLEN];
+    char wd[PATH_MAX];
     char *path;
 
     ASSERT(path = getcwd(wd, sizeof wd));
diff --git a/regress/sbin/iked/parser/test_parser_fuzz.c b/regress/sbin/iked/parser/test_parser_fuzz.c
index 3154167bd04..2f14dda55c8 100644
--- a/regress/sbin/iked/parser/test_parser_fuzz.c
+++ b/regress/sbin/iked/parser/test_parser_fuzz.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: test_parser_fuzz.c,v 1.4 2020/09/21 20:10:14 tobhe Exp $ */
+/*	$OpenBSD: test_parser_fuzz.c,v 1.5 2021/12/13 16:56:49 deraadt Exp $ */
 /*
  * Fuzz tests for payload parsing
  *
@@ -6,7 +6,6 @@
  */
 
 #include <sys/socket.h>
-#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/uio.h>
 
diff --git a/regress/sbin/isakmpd/crypto/cryptotest.c b/regress/sbin/isakmpd/crypto/cryptotest.c
index 86f9b1ee70d..b571077d4c9 100644
--- a/regress/sbin/isakmpd/crypto/cryptotest.c
+++ b/regress/sbin/isakmpd/crypto/cryptotest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cryptotest.c,v 1.2 2016/09/02 16:54:28 mikeb Exp $	*/
+/*	$OpenBSD: cryptotest.c,v 1.3 2021/12/13 16:56:49 deraadt Exp $	*/
 /*	$EOM: cryptotest.c,v 1.5 1998/10/07 16:40:49 niklas Exp $	*/
 
 /*
@@ -30,7 +30,6 @@
  * This code was written under funding by Ericsson Radio Systems.
  */
 
-#include <sys/param.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/regress/sbin/isakmpd/hmac/hmactest.c b/regress/sbin/isakmpd/hmac/hmactest.c
index 1213039e91d..e714d8cf106 100644
--- a/regress/sbin/isakmpd/hmac/hmactest.c
+++ b/regress/sbin/isakmpd/hmac/hmactest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hmactest.c,v 1.1 2005/04/08 17:12:49 cloder Exp $	*/
+/*	$OpenBSD: hmactest.c,v 1.2 2021/12/13 16:56:49 deraadt Exp $	*/
 /*	$EOM: hmactest.c,v 1.3 1998/08/09 19:16:24 niklas Exp $	*/
 
 /*
@@ -29,7 +29,7 @@
  * This code was written under funding by Ericsson Radio Systems.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/regress/sbin/isakmpd/prf/prftest.c b/regress/sbin/isakmpd/prf/prftest.c
index a1b0c44be3a..a8be544ffb1 100644
--- a/regress/sbin/isakmpd/prf/prftest.c
+++ b/regress/sbin/isakmpd/prf/prftest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prftest.c,v 1.2 2016/09/04 17:47:37 mikeb Exp $	*/
+/*	$OpenBSD: prftest.c,v 1.3 2021/12/13 16:56:49 deraadt Exp $	*/
 /*	$EOM: prftest.c,v 1.2 1998/10/07 16:40:50 niklas Exp $	*/
 
 /*
@@ -29,7 +29,7 @@
  * This code was written under funding by Ericsson Radio Systems.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/regress/sbin/isakmpd/x509/x509test.c b/regress/sbin/isakmpd/x509/x509test.c
index 9f6b8b5a91e..15ecce6faf3 100644
--- a/regress/sbin/isakmpd/x509/x509test.c
+++ b/regress/sbin/isakmpd/x509/x509test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: x509test.c,v 1.2 2014/11/18 20:51:00 krw Exp $	*/
+/*	$OpenBSD: x509test.c,v 1.3 2021/12/13 16:56:49 deraadt Exp $	*/
 /*	$EOM: x509test.c,v 1.9 2000/12/21 15:24:25 ho Exp $	*/
 
 /*
@@ -39,7 +39,6 @@
  * isakmpd.
  */
 
-#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/regress/sys/arch/amd64/dump_tables/dump_tables.c b/regress/sys/arch/amd64/dump_tables/dump_tables.c
index b7296ea4823..634e72c9efa 100644
--- a/regress/sys/arch/amd64/dump_tables/dump_tables.c
+++ b/regress/sys/arch/amd64/dump_tables/dump_tables.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dump_tables.c,v 1.6 2019/04/23 04:46:03 guenther Exp $	*/
+/*	$OpenBSD: dump_tables.c,v 1.7 2021/12/13 16:56:49 deraadt Exp $	*/
 /*
  * Copyright (c) 2019 Philip Guenther <guenther@openbsd.org>
  *
@@ -20,7 +20,7 @@
  * Requires "kern.allowkmem=1" sysctl
  */
 
-#include <sys/param.h>
+#include <sys/param.h>	/* PAGE_SIZE and other things */
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <uvm/uvm_extern.h>
diff --git a/regress/sys/arch/amd64/fpu/fdfl.c b/regress/sys/arch/amd64/fpu/fdfl.c
index 7e9bf4ec357..a4c7f7d0a66 100644
--- a/regress/sys/arch/amd64/fpu/fdfl.c
+++ b/regress/sys/arch/amd64/fpu/fdfl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdfl.c,v 1.1.1.1 2018/08/21 18:35:18 bluhm Exp $	*/
+/*	$OpenBSD: fdfl.c,v 1.2 2021/12/13 16:56:49 deraadt Exp $	*/
 /*
  * Copyright (c) 2018 Alexander Bluhm <bluhm@openbsd.org>
  *
@@ -15,11 +15,13 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 
 #include <fenv.h>
 #include <stdio.h>
 
+#define nitems(_a)     (sizeof((_a)) / sizeof((_a)[0]))
+
 int
 main(int argc, char *argv[])
 {
diff --git a/regress/sys/arch/amd64/fpu/fdump.c b/regress/sys/arch/amd64/fpu/fdump.c
index c18fc1afb18..5e23034b197 100644
--- a/regress/sys/arch/amd64/fpu/fdump.c
+++ b/regress/sys/arch/amd64/fpu/fdump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdump.c,v 1.1.1.1 2018/08/21 18:35:18 bluhm Exp $	*/
+/*	$OpenBSD: fdump.c,v 1.2 2021/12/13 16:56:49 deraadt Exp $	*/
 /*
  * Copyright (c) 2018 Alexander Bluhm <bluhm@openbsd.org>
  *
@@ -15,13 +15,15 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 
 #include <err.h>
 #include <fenv.h>
 #include <stdio.h>
 #include <unistd.h>
 
+#define nitems(_a)     (sizeof((_a)) / sizeof((_a)[0]))
+
 int
 main(int argc, char *argv[])
 {
diff --git a/regress/sys/arch/amd64/fpu/feget.c b/regress/sys/arch/amd64/fpu/feget.c
index f28b15ff714..4cdb62fc69d 100644
--- a/regress/sys/arch/amd64/fpu/feget.c
+++ b/regress/sys/arch/amd64/fpu/feget.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: feget.c,v 1.1.1.1 2018/08/21 18:35:18 bluhm Exp $	*/
+/*	$OpenBSD: feget.c,v 1.2 2021/12/13 16:56:49 deraadt Exp $	*/
 /*
  * Copyright (c) 2018 Alexander Bluhm <bluhm@openbsd.org>
  *
@@ -15,12 +15,14 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 
 #include <err.h>
 #include <fenv.h>
 #include <stdio.h>
 
+#define nitems(_a)     (sizeof((_a)) / sizeof((_a)[0]))
+
 int
 main(int argc, char *argv[])
 {
diff --git a/regress/sys/arch/amd64/fpu/fxproc0.c b/regress/sys/arch/amd64/fpu/fxproc0.c
index 55bddb6c687..d401e1a74a9 100644
--- a/regress/sys/arch/amd64/fpu/fxproc0.c
+++ b/regress/sys/arch/amd64/fpu/fxproc0.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fxproc0.c,v 1.1.1.1 2018/08/21 18:35:18 bluhm Exp $	*/
+/*	$OpenBSD: fxproc0.c,v 1.2 2021/12/13 16:56:49 deraadt Exp $	*/
 /*
  * Copyright (c) 2018 Alexander Bluhm <bluhm@openbsd.org>
  *
@@ -15,7 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/signal.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <machine/fpu.h>
@@ -29,6 +30,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#define nitems(_a)     (sizeof((_a)) / sizeof((_a)[0]))
+
 void __dead usage(void);
 void fenv_proc(kvm_t *, unsigned long);
 
diff --git a/regress/sys/arch/hppa/probe/probe.c b/regress/sys/arch/hppa/probe/probe.c
index 6462ddee58e..723a4c9e3cd 100644
--- a/regress/sys/arch/hppa/probe/probe.c
+++ b/regress/sys/arch/hppa/probe/probe.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: probe.c,v 1.3 2017/01/13 15:28:02 kettenis Exp $	*/
+/*	$OpenBSD: probe.c,v 1.4 2021/12/13 16:56:49 deraadt Exp $	*/
 
 /*
  * Written by Michael Shalayeff, 2004. Public Domain.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <signal.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/regress/sys/arch/hppa/sfuid/sfuid.c b/regress/sys/arch/hppa/sfuid/sfuid.c
index 10f8d634bbd..a61bda5d826 100644
--- a/regress/sys/arch/hppa/sfuid/sfuid.c
+++ b/regress/sys/arch/hppa/sfuid/sfuid.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: sfuid.c,v 1.3 2017/01/13 15:28:02 kettenis Exp $	*/
+/*	$OpenBSD: sfuid.c,v 1.4 2021/12/13 16:56:49 deraadt Exp $	*/
 
 /*
  * Written by Michael Shalayeff, 2004. Public Domain.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <signal.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/regress/sys/copy/copy.c b/regress/sys/copy/copy.c
index 2ed0fe65a21..2f04b11e9c3 100644
--- a/regress/sys/copy/copy.c
+++ b/regress/sys/copy/copy.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: copy.c,v 1.5 2016/08/19 01:37:50 deraadt Exp $	*/
+/*	$OpenBSD: copy.c,v 1.6 2021/12/13 16:56:49 deraadt Exp $	*/
 
 /* Written by Ted Unangst 2004 Public Domain */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/syslimits.h>
diff --git a/regress/sys/crypto/aes/aestest.c b/regress/sys/crypto/aes/aestest.c
index 56966c67da3..f8a91b4d61c 100644
--- a/regress/sys/crypto/aes/aestest.c
+++ b/regress/sys/crypto/aes/aestest.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: aestest.c,v 1.4 2017/04/30 21:34:45 mikeb Exp $  */
+/*      $OpenBSD: aestest.c,v 1.5 2021/12/13 16:56:49 deraadt Exp $  */
 
 /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.
@@ -30,7 +30,7 @@
  * Dr Brian Gladman:  http://fp.gladman.plus.com/AES/
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <crypto/aes.h>
 #include <err.h>
 #include <stdio.h>
diff --git a/regress/sys/crypto/aesctr/aesctr.c b/regress/sys/crypto/aesctr/aesctr.c
index 0c2e605193c..443a508d164 100644
--- a/regress/sys/crypto/aesctr/aesctr.c
+++ b/regress/sys/crypto/aesctr/aesctr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: aesctr.c,v 1.3 2017/05/02 11:46:00 mikeb Exp $  */
+/*      $OpenBSD: aesctr.c,v 1.4 2021/12/13 16:56:49 deraadt Exp $  */
 
 /*
  * Copyright (c) 2005 Markus Friedl <markus@openbsd.org>
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <crypto/aes.h>
 #include <err.h>
 #include <stdio.h>
diff --git a/regress/sys/crypto/chachapoly/chachapoly_test.c b/regress/sys/crypto/chachapoly/chachapoly_test.c
index c8500055216..004e58d48d6 100644
--- a/regress/sys/crypto/chachapoly/chachapoly_test.c
+++ b/regress/sys/crypto/chachapoly/chachapoly_test.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: chachapoly_test.c,v 1.1 2015/11/03 01:46:08 mikeb Exp $  */
+/*      $OpenBSD: chachapoly_test.c,v 1.2 2021/12/13 16:56:49 deraadt Exp $  */
 
 /*
  * Copyright (c) 2010,2015 Mike Belopuhov <mikeb@openbsd.org>
@@ -17,7 +17,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <crypto/chachapoly.h>
 #include <err.h>
 #include <errno.h>
diff --git a/regress/sys/crypto/cmac/cmac_test.c b/regress/sys/crypto/cmac/cmac_test.c
index 0f5c8911c87..f3c1f51f239 100644
--- a/regress/sys/crypto/cmac/cmac_test.c
+++ b/regress/sys/crypto/cmac/cmac_test.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <crypto/aes.h>
 #include <crypto/cmac.h>
 #include <stdio.h>
diff --git a/regress/sys/crypto/enc/des3.c b/regress/sys/crypto/enc/des3.c
index 65c67e8568e..a5bf9bd419e 100644
--- a/regress/sys/crypto/enc/des3.c
+++ b/regress/sys/crypto/enc/des3.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: des3.c,v 1.9 2014/08/15 15:13:38 mikeb Exp $  */
+/*      $OpenBSD: des3.c,v 1.10 2021/12/13 16:56:49 deraadt Exp $  */
 
 /*
  * Copyright (c) 2002 Markus Friedl.  All rights reserved.
@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>
 #include <openssl/des.h>
 #include <err.h>
 #include <fcntl.h>
diff --git a/regress/sys/crypto/gmac/gmac_test.c b/regress/sys/crypto/gmac/gmac_test.c
index 1286b8b63ad..bb72a6d2fef 100644
--- a/regress/sys/crypto/gmac/gmac_test.c
+++ b/regress/sys/crypto/gmac/gmac_test.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: gmac_test.c,v 1.5 2017/05/02 11:46:00 mikeb Exp $  */
+/*      $OpenBSD: gmac_test.c,v 1.6 2021/12/13 16:56:49 deraadt Exp $  */
 
 /*
  * Copyright (c) 2010 Mike Belopuhov <mikeb@openbsd.org>
@@ -17,7 +17,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <crypto/aes.h>
 #include <crypto/gmac.h>
 #include <err.h>
diff --git a/regress/sys/ffs/fstest.c b/regress/sys/ffs/fstest.c
index 000bf7c3cc1..e4935c1394a 100644
--- a/regress/sys/ffs/fstest.c
+++ b/regress/sys/ffs/fstest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fstest.c,v 1.6 2017/01/12 01:12:56 bluhm Exp $	*/
+/*	$OpenBSD: fstest.c,v 1.7 2021/12/13 16:56:49 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006-2007 Pawel Jakub Dawidek <pjd@FreeBSD.org>
@@ -28,7 +28,7 @@
  * $FreeBSD: src/tools/regression/fstest/fstest.c,v 1.1 2007/01/17 01:42:07 pjd Exp $
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 
diff --git a/regress/sys/fifofs/fifotest.c b/regress/sys/fifofs/fifotest.c
index fc08106d073..6d2542b555b 100644
--- a/regress/sys/fifofs/fifotest.c
+++ b/regress/sys/fifofs/fifotest.c
@@ -14,7 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <errno.h>
diff --git a/regress/sys/kern/accept/accept.c b/regress/sys/kern/accept/accept.c
index 2601fbb7e70..b3727a24c05 100644
--- a/regress/sys/kern/accept/accept.c
+++ b/regress/sys/kern/accept/accept.c
@@ -1,8 +1,7 @@
-/*	$OpenBSD: accept.c,v 1.5 2015/01/19 00:22:30 guenther Exp $	*/
+/*	$OpenBSD: accept.c,v 1.6 2021/12/13 16:56:49 deraadt Exp $	*/
 /*
  *	Written by Artur Grabowski <art@openbsd.org>, 2002 Public Domain.
  */
-#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/clock_gettime/monotonicrelapse.c b/regress/sys/kern/clock_gettime/monotonicrelapse.c
index 8a04d4a764f..e8ba7ac6820 100644
--- a/regress/sys/kern/clock_gettime/monotonicrelapse.c
+++ b/regress/sys/kern/clock_gettime/monotonicrelapse.c
@@ -1,9 +1,9 @@
-/* $OpenBSD: monotonicrelapse.c,v 1.2 2019/06/17 08:19:30 anton Exp $ */
+/* $OpenBSD: monotonicrelapse.c,v 1.3 2021/12/13 16:56:49 deraadt Exp $ */
 /*
  * Scott Cheloha <scottcheloha@gmail.com>, 2019.  Public Domain.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 
diff --git a/regress/sys/kern/kqueue/kqueue-random.c b/regress/sys/kern/kqueue/kqueue-random.c
index 64b44c12fbe..fb5fd00f808 100644
--- a/regress/sys/kern/kqueue/kqueue-random.c
+++ b/regress/sys/kern/kqueue/kqueue-random.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: kqueue-random.c,v 1.11 2018/04/26 15:55:14 guenther Exp $	*/
+/*	$OpenBSD: kqueue-random.c,v 1.12 2021/12/13 16:56:49 deraadt Exp $	*/
 /*	Written by Michael Shalayeff, 2002, Public Domain	*/
 
-#include <sys/param.h>		/* MIN() */
+#include <sys/types.h>
 #include <sys/event.h>
 
 #include <err.h>
@@ -13,6 +13,8 @@
 
 #include "main.h"
 
+#define MINIMUM(a, b)    (((a) < (b)) ? (a) : (b))
+
 int
 do_random(void)
 {
@@ -41,7 +43,7 @@ do_random(void)
 	n = kevent(kq, NULL, 0, &ev, 1, &ts);
 	ASSX(n >= 0);
 
-	n = MIN((ev.data + 7) / 8, sizeof(buf));
+	n = MINIMUM((ev.data + 7) / 8, sizeof(buf));
 	ASSX(read(fd, buf, n) > 0);
 
 	close(kq);
diff --git a/regress/sys/kern/mbuf/mbuftest.c b/regress/sys/kern/mbuf/mbuftest.c
index d38f63d9e0a..f71ff9d0acc 100644
--- a/regress/sys/kern/mbuf/mbuftest.c
+++ b/regress/sys/kern/mbuf/mbuftest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbuftest.c,v 1.2 2007/05/29 17:58:02 david Exp $	*/
+/*	$OpenBSD: mbuftest.c,v 1.3 2021/12/13 16:56:49 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003 Jason L. Wright (jason@thought.net)
@@ -34,7 +34,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/mbuf.h>
 #include <stdio.h>
 #include <err.h>
diff --git a/regress/sys/kern/noexec/noexec.c b/regress/sys/kern/noexec/noexec.c
index 2f22fb3b40e..b98bc91fc7e 100644
--- a/regress/sys/kern/noexec/noexec.c
+++ b/regress/sys/kern/noexec/noexec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: noexec.c,v 1.20 2019/05/10 15:57:39 visa Exp $	*/
+/*	$OpenBSD: noexec.c,v 1.21 2021/12/13 16:56:50 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2002,2003 Michael Shalayeff
@@ -28,7 +28,6 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>
 #include <sys/mman.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/regress/sys/kern/pledge/ioctl/unfdpass.c b/regress/sys/kern/pledge/ioctl/unfdpass.c
index 289bc311c6b..143b5dff743 100644
--- a/regress/sys/kern/pledge/ioctl/unfdpass.c
+++ b/regress/sys/kern/pledge/ioctl/unfdpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unfdpass.c,v 1.1 2017/01/26 04:58:08 benno Exp $	*/
+/*	$OpenBSD: unfdpass.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*	$NetBSD: unfdpass.c,v 1.3 1998/06/24 23:51:30 thorpej Exp $	*/
 
 /*-
@@ -37,7 +37,7 @@
  * is then used for ioctl()
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
diff --git a/regress/sys/kern/ptrace2/macros.h b/regress/sys/kern/ptrace2/macros.h
index 2446a7272e0..efb983be9c0 100644
--- a/regress/sys/kern/ptrace2/macros.h
+++ b/regress/sys/kern/ptrace2/macros.h
@@ -1,7 +1,6 @@
-/*	$OpenBSD: macros.h,v 1.1 2020/02/28 12:48:30 mpi Exp $	*/
+/*	$OpenBSD: macros.h,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /* Public domain - Moritz Buhl */
 
-#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stdint.h>
 #include <sys/sysctl.h>
@@ -11,10 +10,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#define __FBSDID(str)
-#define __RCSID(str)
-#define __COPYRIGHT(str)
-
 #define __arraycount(_a)	nitems(_a)
 #define __unreachable()		atf_tc_fail("unreachable")
 #define __UNCONST(a)		(a)
diff --git a/regress/sys/kern/ptrace2/ptrace_test.c b/regress/sys/kern/ptrace2/ptrace_test.c
index ea0a6404b9b..05d60d78358 100644
--- a/regress/sys/kern/ptrace2/ptrace_test.c
+++ b/regress/sys/kern/ptrace2/ptrace_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ptrace_test.c,v 1.3 2020/04/03 13:17:12 jca Exp $ */
+/*	$OpenBSD: ptrace_test.c,v 1.4 2021/12/13 16:56:50 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2015 John Baldwin <jhb@FreeBSD.org>
@@ -27,13 +27,11 @@
 
 #include "macros.h"
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/file.h>
 #include <sys/time.h>
+#include <sys/signal.h>
 #include <sys/proc.h>
 #include <sys/ptrace.h>
 #include <sys/queue.h>
@@ -51,6 +49,8 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include "atf-c.h"
 
+#define nitems(_a)     (sizeof((_a)) / sizeof((_a)[0]))
+
 /*
  * A variant of ATF_REQUIRE that is suitable for use in child
  * processes.  This only works if the parent process is tripped up by
diff --git a/regress/sys/kern/rcvtimeo/rcvtimeo.c b/regress/sys/kern/rcvtimeo/rcvtimeo.c
index 72d22835852..3f43f03e36d 100644
--- a/regress/sys/kern/rcvtimeo/rcvtimeo.c
+++ b/regress/sys/kern/rcvtimeo/rcvtimeo.c
@@ -1,8 +1,7 @@
-/*	$OpenBSD: rcvtimeo.c,v 1.5 2014/07/19 18:11:12 miod Exp $	*/
+/*	$OpenBSD: rcvtimeo.c,v 1.6 2021/12/13 16:56:50 deraadt Exp $	*/
 
 /*	Written by Michael Shalayeff, 2002, Public Domain */
 
-#include <sys/param.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>
diff --git a/regress/sys/kern/setuid/setegid.c b/regress/sys/kern/setuid/setegid.c
index e62d0eb7860..411aae639e9 100644
--- a/regress/sys/kern/setuid/setegid.c
+++ b/regress/sys/kern/setuid/setegid.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setegid.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setegid.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/seteuid.c b/regress/sys/kern/setuid/seteuid.c
index 7da65acb307..6fec0157918 100644
--- a/regress/sys/kern/setuid/seteuid.c
+++ b/regress/sys/kern/setuid/seteuid.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: seteuid.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: seteuid.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setgid.c b/regress/sys/kern/setuid/setgid.c
index ee2b04a5cf1..3923fef48a2 100644
--- a/regress/sys/kern/setuid/setgid.c
+++ b/regress/sys/kern/setuid/setgid.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setgid.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setgid.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setgid_child.c b/regress/sys/kern/setuid/setgid_child.c
index 982e2057d2c..c87ab2522b3 100644
--- a/regress/sys/kern/setuid/setgid_child.c
+++ b/regress/sys/kern/setuid/setgid_child.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setgid_child.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setgid_child.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setgid_exec_inherit.c b/regress/sys/kern/setuid/setgid_exec_inherit.c
index 6074c488ca7..85f3a7b0897 100644
--- a/regress/sys/kern/setuid/setgid_exec_inherit.c
+++ b/regress/sys/kern/setuid/setgid_exec_inherit.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setgid_exec_inherit.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setgid_exec_inherit.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setgid_none.c b/regress/sys/kern/setuid/setgid_none.c
index 6f3d9a7cfd0..200eba19c74 100644
--- a/regress/sys/kern/setuid/setgid_none.c
+++ b/regress/sys/kern/setuid/setgid_none.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setgid_none.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setgid_none.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setresgid.c b/regress/sys/kern/setuid/setresgid.c
index a295d3609f5..ab7e875c37e 100644
--- a/regress/sys/kern/setuid/setresgid.c
+++ b/regress/sys/kern/setuid/setresgid.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setresgid.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setresgid.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setresgid_effective_exec.c b/regress/sys/kern/setuid/setresgid_effective_exec.c
index 33767fa8bd3..6cbfb1199da 100644
--- a/regress/sys/kern/setuid/setresgid_effective_exec.c
+++ b/regress/sys/kern/setuid/setresgid_effective_exec.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setresgid_effective_exec.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setresgid_effective_exec.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setresgid_real_exec.c b/regress/sys/kern/setuid/setresgid_real_exec.c
index fd9b9d32c20..0fd8f7f03aa 100644
--- a/regress/sys/kern/setuid/setresgid_real_exec.c
+++ b/regress/sys/kern/setuid/setresgid_real_exec.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setresgid_real_exec.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setresgid_real_exec.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setresgid_saved_exec.c b/regress/sys/kern/setuid/setresgid_saved_exec.c
index f1f6bf0cfd3..eb783118e68 100644
--- a/regress/sys/kern/setuid/setresgid_saved_exec.c
+++ b/regress/sys/kern/setuid/setresgid_saved_exec.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setresgid_saved_exec.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setresgid_saved_exec.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setresuid.c b/regress/sys/kern/setuid/setresuid.c
index 0721d254482..e96c820b504 100644
--- a/regress/sys/kern/setuid/setresuid.c
+++ b/regress/sys/kern/setuid/setresuid.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setresuid.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setresuid.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setresuid_effective_exec.c b/regress/sys/kern/setuid/setresuid_effective_exec.c
index 860a47ef519..a6b9da1d892 100644
--- a/regress/sys/kern/setuid/setresuid_effective_exec.c
+++ b/regress/sys/kern/setuid/setresuid_effective_exec.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setresuid_effective_exec.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setresuid_effective_exec.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setresuid_real_exec.c b/regress/sys/kern/setuid/setresuid_real_exec.c
index 18fff09291e..121a28f36f3 100644
--- a/regress/sys/kern/setuid/setresuid_real_exec.c
+++ b/regress/sys/kern/setuid/setresuid_real_exec.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setresuid_real_exec.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setresuid_real_exec.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setresuid_saved_exec.c b/regress/sys/kern/setuid/setresuid_saved_exec.c
index 9d76fccbb07..991cf6bb0a6 100644
--- a/regress/sys/kern/setuid/setresuid_saved_exec.c
+++ b/regress/sys/kern/setuid/setresuid_saved_exec.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setresuid_saved_exec.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setresuid_saved_exec.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setuid.c b/regress/sys/kern/setuid/setuid.c
index 79ecc57f136..4edbd520c66 100644
--- a/regress/sys/kern/setuid/setuid.c
+++ b/regress/sys/kern/setuid/setuid.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setuid.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setuid.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setuid_child.c b/regress/sys/kern/setuid/setuid_child.c
index eed09ba09c2..f4068fdecbc 100644
--- a/regress/sys/kern/setuid/setuid_child.c
+++ b/regress/sys/kern/setuid/setuid_child.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setuid_child.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setuid_child.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setuid_exec_inherit.c b/regress/sys/kern/setuid/setuid_exec_inherit.c
index b2bd33a2f12..b401b74d891 100644
--- a/regress/sys/kern/setuid/setuid_exec_inherit.c
+++ b/regress/sys/kern/setuid/setuid_exec_inherit.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setuid_exec_inherit.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setuid_exec_inherit.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setuid_none.c b/regress/sys/kern/setuid/setuid_none.c
index 4c13366d0b6..fd98050e5a0 100644
--- a/regress/sys/kern/setuid/setuid_none.c
+++ b/regress/sys/kern/setuid/setuid_none.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setuid_none.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setuid_none.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/setuid_real_exec.c b/regress/sys/kern/setuid/setuid_real_exec.c
index 2b0d73ed0fb..7b922a22da8 100644
--- a/regress/sys/kern/setuid/setuid_real_exec.c
+++ b/regress/sys/kern/setuid/setuid_real_exec.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: setuid_real_exec.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: setuid_real_exec.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/sgidexec.c b/regress/sys/kern/setuid/sgidexec.c
index 094e312b148..0812b1935c4 100644
--- a/regress/sys/kern/setuid/sgidexec.c
+++ b/regress/sys/kern/setuid/sgidexec.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: sgidexec.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: sgidexec.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/sgidexec_inherit.c b/regress/sys/kern/setuid/sgidexec_inherit.c
index 0d4bec3edbb..ab85b64a761 100644
--- a/regress/sys/kern/setuid/sgidexec_inherit.c
+++ b/regress/sys/kern/setuid/sgidexec_inherit.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: sgidexec_inherit.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: sgidexec_inherit.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/sgidexec_none.c b/regress/sys/kern/setuid/sgidexec_none.c
index f189ac24ac9..15edd353f24 100644
--- a/regress/sys/kern/setuid/sgidexec_none.c
+++ b/regress/sys/kern/setuid/sgidexec_none.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: sgidexec_none.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: sgidexec_none.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/suidexec.c b/regress/sys/kern/setuid/suidexec.c
index 0503aecc8bd..b0d6b2131cb 100644
--- a/regress/sys/kern/setuid/suidexec.c
+++ b/regress/sys/kern/setuid/suidexec.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: suidexec.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: suidexec.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/suidexec_inherit.c b/regress/sys/kern/setuid/suidexec_inherit.c
index e6db0ece21b..062696fd9db 100644
--- a/regress/sys/kern/setuid/suidexec_inherit.c
+++ b/regress/sys/kern/setuid/suidexec_inherit.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: suidexec_inherit.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: suidexec_inherit.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/setuid/suidexec_none.c b/regress/sys/kern/setuid/suidexec_none.c
index 95fad6c05c4..d535aeea6f1 100644
--- a/regress/sys/kern/setuid/suidexec_none.c
+++ b/regress/sys/kern/setuid/suidexec_none.c
@@ -1,11 +1,10 @@
-/*	$OpenBSD: suidexec_none.c,v 1.1 2014/08/27 07:36:14 blambert Exp $	*/
+/*	$OpenBSD: suidexec_none.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  *	Written by Bret Stephen Lambert <blambert@openbsd.org> 2014
  *	Public Domain.
  */
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/signal/cansig/cansig.c b/regress/sys/kern/signal/cansig/cansig.c
index 00e5f073ff3..a69676827f4 100644
--- a/regress/sys/kern/signal/cansig/cansig.c
+++ b/regress/sys/kern/signal/cansig/cansig.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: cansig.c,v 1.1 2008/06/10 18:04:31 hshoexer Exp $	*/
+/*	$OpenBSD: cansig.c,v 1.2 2021/12/13 16:56:50 deraadt Exp $	*/
 /*	Written by Michael Shalayeff, 2008. Public Domain	*/
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <signal.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/regress/sys/kern/sysvmsg/msgtest.c b/regress/sys/kern/sysvmsg/msgtest.c
index f95bd4cea3a..24d022d225b 100644
--- a/regress/sys/kern/sysvmsg/msgtest.c
+++ b/regress/sys/kern/sysvmsg/msgtest.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msgtest.c,v 1.6 2008/06/26 05:42:06 ray Exp $	*/
+/*	$OpenBSD: msgtest.c,v 1.7 2021/12/13 16:56:50 deraadt Exp $	*/
 /*	$NetBSD: msgtest.c,v 1.6 2001/02/19 22:44:41 cgd Exp $	*/
 
 /*-
@@ -35,7 +35,6 @@
  * Test the SVID-compatible Message Queue facility.
  */
 
-#include <sys/param.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/sysvsem/semtest.c b/regress/sys/kern/sysvsem/semtest.c
index 807569c0105..bef47bdc733 100644
--- a/regress/sys/kern/sysvsem/semtest.c
+++ b/regress/sys/kern/sysvsem/semtest.c
@@ -34,7 +34,6 @@
  * Test the SVID-compatible Semaphore facility.
  */
 
-#include <sys/param.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/sysvshm/shmtest.c b/regress/sys/kern/sysvshm/shmtest.c
index 39d163360a2..665808ac24c 100644
--- a/regress/sys/kern/sysvshm/shmtest.c
+++ b/regress/sys/kern/sysvshm/shmtest.c
@@ -34,7 +34,6 @@
  * Test the SVID-compatible Shared Memory facility.
  */
 
-#include <sys/param.h>
 #include <sys/ipc.h>
 #include <sys/mman.h>
 #include <sys/shm.h>
diff --git a/regress/sys/kern/unfdpass/unfdpass.c b/regress/sys/kern/unfdpass/unfdpass.c
index 264c73ec1e5..9a73641d72b 100644
--- a/regress/sys/kern/unfdpass/unfdpass.c
+++ b/regress/sys/kern/unfdpass/unfdpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: unfdpass.c,v 1.21 2021/10/24 21:24:20 deraadt Exp $	*/
+/*	$OpenBSD: unfdpass.c,v 1.22 2021/12/13 16:56:50 deraadt Exp $	*/
 /*	$NetBSD: unfdpass.c,v 1.3 1998/06/24 23:51:30 thorpej Exp $	*/
 
 /*-
@@ -35,7 +35,6 @@
  * Test passing of file descriptors over Unix domain sockets and socketpairs.
  */
 
-#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/wait.h>
diff --git a/regress/sys/kern/unveil/syscalls.c b/regress/sys/kern/unveil/syscalls.c
index 0c7c8ac68e3..4503da86ac8 100644
--- a/regress/sys/kern/unveil/syscalls.c
+++ b/regress/sys/kern/unveil/syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscalls.c,v 1.30 2021/08/30 09:09:21 claudio Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.31 2021/12/13 16:56:50 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2017-2019 Bob Beck <beck@openbsd.org>
@@ -26,7 +26,6 @@
 #include <sys/errno.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
-#include <sys/param.h>
 #include <sys/mount.h>
 
 pid_t child;
diff --git a/regress/sys/nfs/mmap-sysctl-copyin.c b/regress/sys/nfs/mmap-sysctl-copyin.c
index 9d333920d12..c08baa2653a 100644
--- a/regress/sys/nfs/mmap-sysctl-copyin.c
+++ b/regress/sys/nfs/mmap-sysctl-copyin.c
@@ -1,6 +1,6 @@
-/*	$OpenBSD: mmap-sysctl-copyin.c,v 1.2 2017/01/13 01:33:14 bluhm Exp $	*/
+/*	$OpenBSD: mmap-sysctl-copyin.c,v 1.3 2021/12/13 16:56:50 deraadt Exp $	*/
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
@@ -15,6 +15,7 @@
 #include <err.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/regress/sys/nfs/mmap-sysctl-copyout.c b/regress/sys/nfs/mmap-sysctl-copyout.c
index 10c804df389..1d189c4f074 100644
--- a/regress/sys/nfs/mmap-sysctl-copyout.c
+++ b/regress/sys/nfs/mmap-sysctl-copyout.c
@@ -1,6 +1,6 @@
-/*	$OpenBSD: mmap-sysctl-copyout.c,v 1.2 2017/01/13 01:33:14 bluhm Exp $	*/
+/*	$OpenBSD: mmap-sysctl-copyout.c,v 1.3 2021/12/13 16:56:50 deraadt Exp $	*/
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
@@ -15,6 +15,7 @@
 #include <err.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/regress/sys/uvm/mmap_hint/mmap_hint.c b/regress/sys/uvm/mmap_hint/mmap_hint.c
index 8fc816a4a9f..95ba5e60144 100644
--- a/regress/sys/uvm/mmap_hint/mmap_hint.c
+++ b/regress/sys/uvm/mmap_hint/mmap_hint.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mmap_hint.c,v 1.5 2017/07/13 11:24:58 bluhm Exp $	*/
+/*	$OpenBSD: mmap_hint.c,v 1.6 2021/12/13 16:56:50 deraadt Exp $	*/
 /*
  * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl>
  *
@@ -15,7 +15,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>
+#include <sys/param.h>	/* PAGE_SIZE PAGE_MASK */
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/tree.h>
diff --git a/regress/sys/uvm/wx_syscall/wx_syscall.c b/regress/sys/uvm/wx_syscall/wx_syscall.c
index a0fa7bbdc44..c067ac849ab 100644
--- a/regress/sys/uvm/wx_syscall/wx_syscall.c
+++ b/regress/sys/uvm/wx_syscall/wx_syscall.c
@@ -1,4 +1,4 @@
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/mman.h>
 #include <fcntl.h>
 #include <stdio.h>