remove duplicate includes

ok deraadt@ miod@ krw@

diff --git a/sys/arch/arm64/arm64/ast.c b/sys/arch/arm64/arm64/ast.c
index 2479eb5..f0f980f 100644 (file)
--- a/sys/arch/arm64/arm64/ast.c
+++ b/sys/arch/arm64/arm64/ast.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ast.c,v 1.7 2018/06/22 16:08:12 drahn Exp $ */
+/* $OpenBSD: ast.c,v 1.8 2023/04/13 02:19:04 jsg Exp $ */
 /*
  * Copyright (c) 2015 Dale Rahn <drahn@dalerahn.com>
  *
@@ -19,7 +19,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
-#include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/signal.h>
 #include <sys/syscall.h>

diff --git a/sys/arch/arm64/arm64/cpu.c b/sys/arch/arm64/arm64/cpu.c
index 755d76e..a7e7d52 100644 (file)
--- a/sys/arch/arm64/arm64/cpu.c
+++ b/sys/arch/arm64/arm64/cpu.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cpu.c,v 1.87 2023/03/27 17:49:13 kettenis Exp $       */
+/*     $OpenBSD: cpu.c,v 1.88 2023/04/13 02:19:04 jsg Exp $    */
 
 /*
  * Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com>
@@ -37,7 +37,6 @@
 #include <dev/ofw/fdt.h>
 
 #include <machine/cpufunc.h>
-#include <machine/fdt.h>
 
 #include "psci.h"
 #if NPSCI > 0

diff --git a/sys/arch/arm64/arm64/syscall.c b/sys/arch/arm64/arm64/syscall.c
index fab269d..0f3b52f 100644 (file)
--- a/sys/arch/arm64/arm64/syscall.c
+++ b/sys/arch/arm64/arm64/syscall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: syscall.c,v 1.13 2023/02/11 23:07:26 deraadt Exp $ */
+/* $OpenBSD: syscall.c,v 1.14 2023/04/13 02:19:04 jsg Exp $ */
 /*
  * Copyright (c) 2015 Dale Rahn <drahn@dalerahn.com>
  *
@@ -23,8 +23,6 @@
 #include <sys/signal.h>
 #include <sys/syscall.h>
 #include <sys/syscall_mi.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
 
 #include <uvm/uvm_extern.h>
 

diff --git a/sys/arch/landisk/stand/boot/getsecs.c b/sys/arch/landisk/stand/boot/getsecs.c
index f7ad4b6..1cfe2d8 100644 (file)
--- a/sys/arch/landisk/stand/boot/getsecs.c
+++ b/sys/arch/landisk/stand/boot/getsecs.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: getsecs.c,v 1.7 2022/09/02 10:15:35 miod Exp $        */
+/*     $OpenBSD: getsecs.c,v 1.8 2023/04/13 02:19:04 jsg Exp $ */
 /*     $NetBSD: getsecs.c,v 1.4 2022/08/24 14:22:35 nonaka Exp $       */
 
 /*-
@@ -28,7 +28,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/param.h>
 
 #include <libsa.h>
 

diff --git a/sys/arch/loongson/loongson/conf.c b/sys/arch/loongson/loongson/conf.c
index a400511..f8f7fcc 100644 (file)
--- a/sys/arch/loongson/loongson/conf.c
+++ b/sys/arch/loongson/loongson/conf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: conf.c,v 1.33 2022/10/15 10:12:13 jsg Exp $ */
+/*     $OpenBSD: conf.c,v 1.34 2023/04/13 02:19:05 jsg Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -53,7 +53,6 @@
 #include "vnd.h"
 #include "sd.h"
 #include "cd.h"
-#include "st.h"
 #include "wd.h"
 bdev_decl(wd);
 #include "rd.h"

diff --git a/sys/arch/loongson/loongson/gdium_machdep.c b/sys/arch/loongson/loongson/gdium_machdep.c
index f0386b8..d7a17e2 100644 (file)
--- a/sys/arch/loongson/loongson/gdium_machdep.c
+++ b/sys/arch/loongson/loongson/gdium_machdep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: gdium_machdep.c,v 1.8 2014/03/27 22:16:03 miod Exp $  */
+/*     $OpenBSD: gdium_machdep.c,v 1.9 2023/04/13 02:19:05 jsg Exp $   */
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -201,7 +201,6 @@ extern struct cfdriver umass_cd;
 extern struct cfdriver scsibus_cd;
 extern struct cfdriver sd_cd;
 
-#include <dev/pci/pcivar.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 

diff --git a/sys/arch/octeon/octeon/conf.c b/sys/arch/octeon/octeon/conf.c
index e90e598..c538dff 100644 (file)
--- a/sys/arch/octeon/octeon/conf.c
+++ b/sys/arch/octeon/octeon/conf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: conf.c,v 1.29 2022/10/15 10:12:13 jsg Exp $ */
+/*     $OpenBSD: conf.c,v 1.30 2023/04/13 02:19:05 jsg Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -53,7 +53,6 @@
 #include "vnd.h"
 #include "sd.h"
 #include "cd.h"
-#include "st.h"
 #include "wd.h"
 bdev_decl(wd);
 #include "rd.h"

diff --git a/sys/arch/powerpc64/powerpc64/trap.c b/sys/arch/powerpc64/powerpc64/trap.c
index a4a386c..c9a2e3c 100644 (file)
--- a/sys/arch/powerpc64/powerpc64/trap.c
+++ b/sys/arch/powerpc64/powerpc64/trap.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: trap.c,v 1.53 2023/04/11 00:45:08 jsg Exp $   */
+/*     $OpenBSD: trap.c,v 1.54 2023/04/13 02:19:05 jsg Exp $   */
 
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
@@ -23,7 +23,6 @@
 #include <sys/user.h>
 #include <sys/syscall.h>
 #include <sys/syscall_mi.h>
-#include <sys/systm.h>
 
 #include <uvm/uvm_extern.h>
 

diff --git a/sys/arch/riscv64/riscv64/ast.c b/sys/arch/riscv64/riscv64/ast.c
index 1d9cee4..3e4b1ee 100644 (file)
--- a/sys/arch/riscv64/riscv64/ast.c
+++ b/sys/arch/riscv64/riscv64/ast.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ast.c,v 1.3 2021/05/14 06:48:52 jsg Exp $     */
+/*     $OpenBSD: ast.c,v 1.4 2023/04/13 02:19:05 jsg Exp $     */
 
 /*
  * Copyright (c) 2015 Dale Rahn <drahn@dalerahn.com>
@@ -19,7 +19,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/syscall.h>
 #include <sys/syscall_mi.h>

diff --git a/sys/arch/riscv64/riscv64/syscall.c b/sys/arch/riscv64/riscv64/syscall.c
index a918bb0..65f6f8f 100644 (file)
--- a/sys/arch/riscv64/riscv64/syscall.c
+++ b/sys/arch/riscv64/riscv64/syscall.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: syscall.c,v 1.15 2023/02/11 23:07:27 deraadt Exp $    */
+/*     $OpenBSD: syscall.c,v 1.16 2023/04/13 02:19:05 jsg Exp $        */
 
 /*
  * Copyright (c) 2020 Brian Bamsch <bbamsch@google.com>
@@ -22,8 +22,6 @@
 #include <sys/user.h>
 #include <sys/syscall.h>
 #include <sys/syscall_mi.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
 
 #include <uvm/uvm_extern.h>
 

diff --git a/sys/arch/sparc64/stand/ofwboot/boot.c b/sys/arch/sparc64/stand/ofwboot/boot.c
index 0580f3e..8e2524e 100644 (file)
--- a/sys/arch/sparc64/stand/ofwboot/boot.c
+++ b/sys/arch/sparc64/stand/ofwboot/boot.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: boot.c,v 1.40 2022/09/02 08:13:03 kn Exp $    */
+/*     $OpenBSD: boot.c,v 1.41 2023/04/13 02:19:05 jsg Exp $   */
 /*     $NetBSD: boot.c,v 1.3 2001/05/31 08:55:19 mrg Exp $     */
 /*
  * Copyright (c) 1997, 1999 Eduardo E. Horvath.  All rights reserved.
@@ -58,7 +58,6 @@
 #include <lib/libsa/arc4.h>
 
 #ifdef SOFTRAID
-#include <sys/param.h>
 #include <sys/queue.h>
 #include <dev/biovar.h>
 #include <dev/softraidvar.h>

diff --git a/sys/arch/sparc64/stand/ofwboot/elf64_exec.c b/sys/arch/sparc64/stand/ofwboot/elf64_exec.c
index 00417ce..8c13615 100644 (file)
--- a/sys/arch/sparc64/stand/ofwboot/elf64_exec.c
+++ b/sys/arch/sparc64/stand/ofwboot/elf64_exec.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: elf64_exec.c,v 1.12 2020/06/13 12:25:09 kn Exp $      */
+/*     $OpenBSD: elf64_exec.c,v 1.13 2023/04/13 02:19:05 jsg Exp $     */
 /*     $NetBSD: elfXX_exec.c,v 1.2 2001/08/15 20:08:15 eeh Exp $       */
 
 /*
@@ -57,7 +57,6 @@
 #include <machine/boot_flag.h>
 
 #ifdef SOFTRAID
-#include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/disklabel.h>
 #include <dev/biovar.h>

diff --git a/sys/dev/acpi/acpidmar.c b/sys/dev/acpi/acpidmar.c
index b075645..1a78927 100644 (file)
--- a/sys/dev/acpi/acpidmar.c
+++ b/sys/dev/acpi/acpidmar.c
@@ -37,8 +37,6 @@
 #include <dev/acpi/amltypes.h>
 #include <dev/acpi/dsdt.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/i8259.h>
 #include <machine/i82093reg.h>
 #include <machine/i82093var.h>

diff --git a/sys/dev/diskmap.c b/sys/dev/diskmap.c
index d7293e2..1662209 100644 (file)
--- a/sys/dev/diskmap.c
+++ b/sys/dev/diskmap.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: diskmap.c,v 1.26 2019/08/06 07:16:48 anton Exp $      */
+/*     $OpenBSD: diskmap.c,v 1.27 2023/04/13 02:19:05 jsg Exp $        */
 
 /*
  * Copyright (c) 2009, 2010 Joel Sing <jsing@openbsd.org>
@@ -37,7 +37,6 @@
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/pledge.h>
-#include <sys/namei.h>
 
 int
 diskmapopen(dev_t dev, int flag, int fmt, struct proc *p)

diff --git a/sys/dev/dt/dt_prov_syscall.c b/sys/dev/dt/dt_prov_syscall.c
index 530033d..f272ac7 100644 (file)
--- a/sys/dev/dt/dt_prov_syscall.c
+++ b/sys/dev/dt/dt_prov_syscall.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: dt_prov_syscall.c,v 1.7 2021/12/09 00:26:11 guenther Exp $ */
+/*     $OpenBSD: dt_prov_syscall.c,v 1.8 2023/04/13 02:19:05 jsg Exp $ */
 
 /*
  * Copyright (c) 2019 Martin Pieuchot <mpi@openbsd.org>
@@ -21,7 +21,6 @@
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/atomic.h>
-#include <sys/systm.h>
 #include <sys/syscall.h>
 
 #include <dev/dt/dtvar.h>

diff --git a/sys/dev/fdt/if_mvneta.c b/sys/dev/fdt/if_mvneta.c
index 2152b36..dbf9261 100644 (file)
--- a/sys/dev/fdt/if_mvneta.c
+++ b/sys/dev/fdt/if_mvneta.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_mvneta.c,v 1.29 2023/04/03 01:46:18 dlg Exp $      */
+/*     $OpenBSD: if_mvneta.c,v 1.30 2023/04/13 02:19:05 jsg Exp $      */
 /*     $NetBSD: if_mvneta.c,v 1.41 2015/04/15 10:15:40 hsuenaga Exp $  */
 /*
  * Copyright (c) 2007, 2008, 2013 KIYOHARA Takashi
@@ -62,8 +62,6 @@
 #include <net/if_media.h>
 #include <net/if_types.h>
 
-#include <net/bpf.h>
-
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 

diff --git a/sys/dev/pci/virtio_pci.c b/sys/dev/pci/virtio_pci.c
index 6f04c41..236120c 100644 (file)
--- a/sys/dev/pci/virtio_pci.c
+++ b/sys/dev/pci/virtio_pci.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: virtio_pci.c,v 1.31 2022/03/11 18:00:52 mpi Exp $     */
+/*     $OpenBSD: virtio_pci.c,v 1.32 2023/04/13 02:19:05 jsg Exp $     */
 /*     $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */
 
 /*
@@ -39,7 +39,6 @@
 
 #include <dev/pv/virtioreg.h>
 #include <dev/pv/virtiovar.h>
-#include <dev/pci/virtio_pcireg.h>
 
 #define DNPRINTF(n,x...)                               \
     do { if (VIRTIO_DEBUG >= n) printf(x); } while(0)

diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c
index a3589c8..afd2f36 100644 (file)
--- a/sys/dev/rasops/rasops.c
+++ b/sys/dev/rasops/rasops.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rasops.c,v 1.70 2023/02/03 18:34:24 miod Exp $        */
+/*     $OpenBSD: rasops.c,v 1.71 2023/04/13 02:19:05 jsg Exp $ */
 /*     $NetBSD: rasops.c,v 1.35 2001/02/02 06:01:01 marcus Exp $       */
 
 /*-
@@ -1160,8 +1160,6 @@ rasops_erasecols(void *cookie, int row, int col, int num, uint32_t attr)
  * built-in Zaurus C3x00 display in 16bpp).
  */
 
-#include <sys/malloc.h>
-
 void
 rasops_rotate_font(int *cookie, int ccw)
 {

diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c
index 01ac5ca..c0fc506 100644 (file)
--- a/sys/isofs/udf/udf_vfsops.c
+++ b/sys/isofs/udf/udf_vfsops.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: udf_vfsops.c,v 1.70 2022/01/11 03:13:59 jsg Exp $     */
+/*     $OpenBSD: udf_vfsops.c,v 1.71 2023/04/13 02:19:05 jsg Exp $     */
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -62,7 +62,6 @@
 #include <sys/lock.h>
 #include <sys/queue.h>
 #include <sys/vnode.h>
-#include <sys/lock.h>
 #include <sys/endian.h>
 #include <sys/specdev.h>
 

diff --git a/sys/isofs/udf/udf_vnops.c b/sys/isofs/udf/udf_vnops.c
index 33b1c1d..e557701 100644 (file)
--- a/sys/isofs/udf/udf_vnops.c
+++ b/sys/isofs/udf/udf_vnops.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: udf_vnops.c,v 1.69 2021/12/12 09:14:59 visa Exp $     */
+/*     $OpenBSD: udf_vnops.c,v 1.70 2023/04/13 02:19:05 jsg Exp $      */
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -43,7 +43,6 @@
 #include <sys/lock.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
-#include <sys/lock.h>
 #include <sys/dirent.h>
 #include <sys/queue.h>
 #include <sys/endian.h>

diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 4044148..6aebed6 100644 (file)
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_gre.c,v 1.172 2022/06/26 15:50:21 mvs Exp $ */
+/*     $OpenBSD: if_gre.c,v 1.173 2023/04/13 02:19:05 jsg Exp $ */
 /*     $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
@@ -97,7 +97,6 @@
 #include <sys/sysctl.h>
 
 /* for nvgre bridge shizz */
-#include <sys/socket.h>
 #include <net/if_bridge.h>
 #include <net/if_etherbridge.h>
 

diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c
index ba90b30..f7950d0 100644 (file)
--- a/sys/net/if_pflow.c
+++ b/sys/net/if_pflow.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_pflow.c,v 1.98 2022/11/23 15:12:27 mvs Exp $       */
+/*     $OpenBSD: if_pflow.c,v 1.99 2023/04/13 02:19:05 jsg Exp $       */
 
 /*
  * Copyright (c) 2011 Florian Obser <florian@narrans.de>
@@ -27,7 +27,6 @@
 #include <sys/timeout.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
-#include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 

diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c
index 51503c1..937f36b 100644 (file)
--- a/sys/net/if_vxlan.c
+++ b/sys/net/if_vxlan.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_vxlan.c,v 1.91 2022/06/06 14:45:41 claudio Exp $ */
+/*     $OpenBSD: if_vxlan.c,v 1.92 2023/04/13 02:19:05 jsg Exp $ */
 
 /*
  * Copyright (c) 2021 David Gwynne <dlg@openbsd.org>
@@ -31,7 +31,6 @@
 #include <sys/refcnt.h>
 #include <sys/smr.h>
 
-#include <sys/socket.h>
 #include <sys/socketvar.h>
 
 #include <net/if.h>