summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/macppc/dev/if_mc.c3
-rw-r--r--sys/dev/ic/dc.c3
-rw-r--r--sys/dev/ic/lemac.c3
-rw-r--r--sys/dev/ic/xl.c3
-rw-r--r--sys/dev/isa/if_ie.c3
-rw-r--r--sys/dev/pci/if_dc_pci.c3
-rw-r--r--sys/dev/pci/if_de.c3
-rw-r--r--sys/dev/pci/if_sis.c3
-rw-r--r--sys/dev/pci/if_ste.c3
-rw-r--r--sys/dev/pci/if_xl_pci.c3
-rw-r--r--sys/kern/init_main.c3
-rw-r--r--sys/kern/kern_event.c3
-rw-r--r--sys/kern/uipc_mbuf.c4
-rw-r--r--sys/net/if_ethersubr.c3
-rw-r--r--sys/net/if_pppx.c3
-rw-r--r--sys/net/if_tun.c3
-rw-r--r--sys/net/if_wg.c3
-rw-r--r--sys/net/route.c3
-rw-r--r--sys/netinet/ip_spd.c4
-rw-r--r--sys/netinet/tcp_debug.c3
-rw-r--r--sys/netinet6/dest6.c4
-rw-r--r--sys/netinet6/frag6.c4
-rw-r--r--sys/netinet6/icmp6.c3
-rw-r--r--sys/netinet6/in6_src.c3
-rw-r--r--sys/netinet6/ip6_forward.c4
-rw-r--r--sys/netinet6/nd6.c3
-rw-r--r--sys/netinet6/udp6_output.c3
-rw-r--r--sys/netmpls/mpls_proto.c3
-rw-r--r--sys/netmpls/mpls_raw.c3
-rw-r--r--sys/nfs/nfs_socket.c3
-rw-r--r--sys/uvm/uvm_swap.c3
31 files changed, 31 insertions, 67 deletions
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index 8b38651091f..0f384ba3f08 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mc.c,v 1.31 2021/03/11 11:16:58 jsg Exp $ */
+/* $OpenBSD: if_mc.c,v 1.32 2022/02/22 01:15:01 guenther Exp $ */
/* $NetBSD: if_mc.c,v 1.9.16.1 2006/06/21 14:53:13 yamt Exp $ */
/*-
@@ -38,7 +38,6 @@
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/buf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/syslog.h>
#include <sys/ioctl.h>
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index 7162fd885c9..67dfc69d354 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dc.c,v 1.154 2020/07/10 13:26:37 patrick Exp $ */
+/* $OpenBSD: dc.c,v 1.155 2022/02/22 01:15:01 guenther Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -94,7 +94,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
diff --git a/sys/dev/ic/lemac.c b/sys/dev/ic/lemac.c
index 6d6644070cc..0bd9a4ef775 100644
--- a/sys/dev/ic/lemac.c
+++ b/sys/dev/ic/lemac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lemac.c,v 1.30 2017/01/22 10:17:38 dlg Exp $ */
+/* $OpenBSD: lemac.c,v 1.31 2022/02/22 01:15:01 guenther Exp $ */
/* $NetBSD: lemac.c,v 1.20 2001/06/13 10:46:02 wiz Exp $ */
/*-
@@ -37,7 +37,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/sockio.h>
#include <sys/errno.h>
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index 95da52f6c29..087c6521a2d 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xl.c,v 1.137 2022/01/09 05:42:42 jsg Exp $ */
+/* $OpenBSD: xl.c,v 1.138 2022/02/22 01:15:01 guenther Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -105,7 +105,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 3f4264cb9b0..21eeb91610d 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ie.c,v 1.57 2021/03/07 06:17:03 jsg Exp $ */
+/* $OpenBSD: if_ie.c,v 1.58 2022/02/22 01:15:01 guenther Exp $ */
/* $NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $ */
/*-
@@ -112,7 +112,6 @@ iomem, and to make 16-pointers, we subtract sc_maddr and and with 0xffff.
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/buf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c
index 95a820313ce..3c279f32485 100644
--- a/sys/dev/pci/if_dc_pci.c
+++ b/sys/dev/pci/if_dc_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_dc_pci.c,v 1.76 2017/04/11 14:43:49 dhill Exp $ */
+/* $OpenBSD: if_dc_pci.c,v 1.77 2022/02/22 01:15:01 guenther Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -39,7 +39,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 1f110456f07..9b16a1fae65 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_de.c,v 1.138 2022/01/09 05:42:50 jsg Exp $ */
+/* $OpenBSD: if_de.c,v 1.139 2022/02/22 01:15:01 guenther Exp $ */
/* $NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $ */
/*-
@@ -41,7 +41,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c
index 4ca2e331832..9b35993a8a2 100644
--- a/sys/dev/pci/if_sis.c
+++ b/sys/dev/pci/if_sis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sis.c,v 1.140 2022/01/09 05:42:54 jsg Exp $ */
+/* $OpenBSD: if_sis.c,v 1.141 2022/02/22 01:15:01 guenther Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -63,7 +63,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index 48ff4820043..dfb39598b04 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ste.c,v 1.67 2020/07/10 13:26:38 patrick Exp $ */
+/* $OpenBSD: if_ste.c,v 1.68 2022/02/22 01:15:01 guenther Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -38,7 +38,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
diff --git a/sys/dev/pci/if_xl_pci.c b/sys/dev/pci/if_xl_pci.c
index 8bf2c48a110..9e8e610e47c 100644
--- a/sys/dev/pci/if_xl_pci.c
+++ b/sys/dev/pci/if_xl_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_xl_pci.c,v 1.46 2015/11/24 17:11:40 mpi Exp $ */
+/* $OpenBSD: if_xl_pci.c,v 1.47 2022/02/22 01:15:01 guenther Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -39,7 +39,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 3ca2a9226b5..bfc324c3ae5 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.314 2022/01/01 07:00:57 jsg Exp $ */
+/* $OpenBSD: init_main.c,v 1.315 2022/02/22 01:15:01 guenther Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -58,7 +58,6 @@
#include <sys/device.h>
#include <sys/socketvar.h>
#include <sys/lockf.h>
-#include <sys/protosw.h>
#include <sys/reboot.h>
#include <sys/user.h>
#ifdef SYSVSHM
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 8e5911fc734..eece57cfaca 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_event.c,v 1.182 2022/02/13 13:05:51 visa Exp $ */
+/* $OpenBSD: kern_event.c,v 1.183 2022/02/22 01:15:01 guenther Exp $ */
/*-
* Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
@@ -45,7 +45,6 @@
#include <sys/eventvar.h>
#include <sys/ktrace.h>
#include <sys/pool.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/stat.h>
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 2f11e8c43d5..ce0d6f2c25e 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_mbuf.c,v 1.282 2022/02/14 04:33:18 dlg Exp $ */
+/* $OpenBSD: uipc_mbuf.c,v 1.283 2022/02/22 01:15:01 guenther Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */
/*
@@ -81,8 +81,6 @@
#include <sys/mbuf.h>
#include <sys/kernel.h>
#include <sys/syslog.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
#include <sys/pool.h>
#include <sys/percpu.h>
#include <sys/sysctl.h>
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 421a2d239c7..c154241e91f 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ethersubr.c,v 1.277 2022/01/18 10:48:33 dlg Exp $ */
+/* $OpenBSD: if_ethersubr.c,v 1.278 2022/02/22 01:15:02 guenther Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */
/*
@@ -80,7 +80,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/errno.h>
diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c
index 00e6bd937fd..d64f6b5fc61 100644
--- a/sys/net/if_pppx.c
+++ b/sys/net/if_pppx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pppx.c,v 1.113 2021/12/30 14:25:39 anton Exp $ */
+/* $OpenBSD: if_pppx.c,v 1.114 2022/02/22 01:15:02 guenther Exp $ */
/*
* Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org>
@@ -53,7 +53,6 @@
#include <sys/pool.h>
#include <sys/mbuf.h>
#include <sys/errno.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/vnode.h>
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index c54f51b0d54..6b974dbe9f4 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tun.c,v 1.234 2022/02/16 02:22:39 dlg Exp $ */
+/* $OpenBSD: if_tun.c,v 1.235 2022/02/22 01:15:02 guenther Exp $ */
/* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */
/*
@@ -42,7 +42,6 @@
#include <sys/proc.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/sigio.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
diff --git a/sys/net/if_wg.c b/sys/net/if_wg.c
index 47de3fb1c24..4dae3e3c976 100644
--- a/sys/net/if_wg.c
+++ b/sys/net/if_wg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wg.c,v 1.21 2022/02/20 19:59:29 tb Exp $ */
+/* $OpenBSD: if_wg.c,v 1.22 2022/02/22 01:15:02 guenther Exp $ */
/*
* Copyright (C) 2015-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
@@ -30,7 +30,6 @@
#include <sys/percpu.h>
#include <sys/ioctl.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <net/if.h>
#include <net/if_var.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index 44a0e758058..21a5367d2aa 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.401 2022/02/07 11:03:34 claudio Exp $ */
+/* $OpenBSD: route.c,v 1.402 2022/02/22 01:15:02 guenther Exp $ */
/* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */
/*
@@ -108,7 +108,6 @@
#include <sys/socketvar.h>
#include <sys/timeout.h>
#include <sys/domain.h>
-#include <sys/protosw.h>
#include <sys/ioctl.h>
#include <sys/kernel.h>
#include <sys/queue.h>
diff --git a/sys/netinet/ip_spd.c b/sys/netinet/ip_spd.c
index e7fe8d66007..cef1e9d0f1c 100644
--- a/sys/netinet/ip_spd.c
+++ b/sys/netinet/ip_spd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_spd.c,v 1.111 2022/01/04 06:32:39 yasuoka Exp $ */
+/* $OpenBSD: ip_spd.c,v 1.112 2022/02/22 01:15:02 guenther Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
*
@@ -26,8 +26,6 @@
#include <sys/socket.h>
#include <sys/kernel.h>
#include <sys/socketvar.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
#include <sys/pool.h>
#include <sys/timeout.h>
diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c
index 0b844e3a92f..0fa8614000c 100644
--- a/sys/netinet/tcp_debug.c
+++ b/sys/netinet/tcp_debug.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_debug.c,v 1.29 2019/04/05 14:42:06 bluhm Exp $ */
+/* $OpenBSD: tcp_debug.c,v 1.30 2022/02/22 01:15:02 guenther Exp $ */
/* $NetBSD: tcp_debug.c,v 1.10 1996/02/13 23:43:36 christos Exp $ */
/*
@@ -80,7 +80,6 @@
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
-#include <sys/protosw.h>
#include <net/route.h>
diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c
index 392f1e1b106..e6e88644d6b 100644
--- a/sys/netinet6/dest6.c
+++ b/sys/netinet6/dest6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dest6.c,v 1.17 2017/04/14 20:46:31 bluhm Exp $ */
+/* $OpenBSD: dest6.c,v 1.18 2022/02/22 01:15:02 guenther Exp $ */
/* $KAME: dest6.c,v 1.25 2001/02/22 01:39:16 itojun Exp $ */
/*
@@ -33,8 +33,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/errno.h>
#include <sys/time.h>
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index 346411f5897..5ecb11f1cb0 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: frag6.c,v 1.86 2019/08/26 18:47:53 bluhm Exp $ */
+/* $OpenBSD: frag6.c,v 1.87 2022/02/22 01:15:02 guenther Exp $ */
/* $KAME: frag6.c,v 1.40 2002/05/27 21:40:31 itojun Exp $ */
/*
@@ -33,8 +33,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/errno.h>
#include <sys/time.h>
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 24e9effe645..e3b79a13b08 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: icmp6.c,v 1.237 2022/01/02 22:36:04 jsg Exp $ */
+/* $OpenBSD: icmp6.c,v 1.238 2022/02/22 01:15:02 guenther Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -75,7 +75,6 @@
#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/syslog.h>
-#include <sys/domain.h>
#include <net/if.h>
#include <net/if_var.h>
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index 07c90102b8f..3825e5e45bc 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_src.c,v 1.85 2021/03/10 10:21:49 jsg Exp $ */
+/* $OpenBSD: in6_src.c,v 1.86 2022/02/22 01:15:02 guenther Exp $ */
/* $KAME: in6_src.c,v 1.36 2001/02/06 04:08:17 itojun Exp $ */
/*
@@ -64,7 +64,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/ioctl.h>
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 9bf2a28c965..099f77aee24 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_forward.c,v 1.105 2022/01/02 22:36:04 jsg Exp $ */
+/* $OpenBSD: ip6_forward.c,v 1.106 2022/02/22 01:15:02 guenther Exp $ */
/* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */
/*
@@ -35,8 +35,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
-#include <sys/domain.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/errno.h>
#include <sys/time.h>
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 3cfa93dd685..65cbb1159c2 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nd6.c,v 1.237 2022/02/07 15:23:43 bluhm Exp $ */
+/* $OpenBSD: nd6.c,v 1.238 2022/02/22 01:15:02 guenther Exp $ */
/* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */
/*
@@ -40,7 +40,6 @@
#include <sys/time.h>
#include <sys/kernel.h>
#include <sys/pool.h>
-#include <sys/protosw.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
#include <sys/syslog.h>
diff --git a/sys/netinet6/udp6_output.c b/sys/netinet6/udp6_output.c
index cbba92885cd..30755812ba7 100644
--- a/sys/netinet6/udp6_output.c
+++ b/sys/netinet6/udp6_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp6_output.c,v 1.57 2021/03/10 10:21:49 jsg Exp $ */
+/* $OpenBSD: udp6_output.c,v 1.58 2022/02/22 01:15:02 guenther Exp $ */
/* $KAME: udp6_output.c,v 1.21 2001/02/07 11:51:54 itojun Exp $ */
/*
@@ -63,7 +63,6 @@
#include <sys/param.h>
#include <sys/mbuf.h>
-#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/errno.h>
diff --git a/sys/netmpls/mpls_proto.c b/sys/netmpls/mpls_proto.c
index 0124488be24..09c8ffcff5b 100644
--- a/sys/netmpls/mpls_proto.c
+++ b/sys/netmpls/mpls_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpls_proto.c,v 1.19 2021/05/25 22:45:10 bluhm Exp $ */
+/* $OpenBSD: mpls_proto.c,v 1.20 2022/02/22 01:15:02 guenther Exp $ */
/*
* Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project.
@@ -32,7 +32,6 @@
#include <sys/param.h>
#include <sys/socket.h>
-#include <sys/protosw.h>
#include <sys/domain.h>
#include <sys/mbuf.h>
diff --git a/sys/netmpls/mpls_raw.c b/sys/netmpls/mpls_raw.c
index d663eceff61..8aaaf757cde 100644
--- a/sys/netmpls/mpls_raw.c
+++ b/sys/netmpls/mpls_raw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpls_raw.c,v 1.18 2020/08/19 19:22:53 gnezdo Exp $ */
+/* $OpenBSD: mpls_raw.c,v 1.19 2022/02/22 01:15:02 guenther Exp $ */
/*
* Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project.
@@ -33,7 +33,6 @@
#include <sys/param.h>
#include <sys/mbuf.h>
#include <sys/errno.h>
-#include <sys/protosw.h>
#include <sys/sockio.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 864c56e998f..53f813bcc1b 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_socket.c,v 1.138 2022/01/11 03:13:59 jsg Exp $ */
+/* $OpenBSD: nfs_socket.c,v 1.139 2022/02/22 01:15:02 guenther Exp $ */
/* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */
/*
@@ -46,7 +46,6 @@
#include <sys/kernel.h>
#include <sys/mbuf.h>
#include <sys/vnode.h>
-#include <sys/domain.h>
#include <sys/protosw.h>
#include <sys/signalvar.h>
#include <sys/socket.h>
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index 4c991e74ba2..13e1e02f6dd 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_swap.c,v 1.152 2021/12/12 09:14:59 visa Exp $ */
+/* $OpenBSD: uvm_swap.c,v 1.153 2022/02/22 01:15:02 guenther Exp $ */
/* $NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $ */
/*
@@ -52,7 +52,6 @@
#include <sys/pledge.h>
#if defined(NFSCLIENT)
#include <sys/socket.h>
-#include <sys/domain.h>
#include <netinet/in.h>
#include <nfs/nfsproto.h>
#include <nfs/nfsdiskless.h>