summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/alpha/db_trace.c3
-rw-r--r--sys/arch/alpha/alpha/promcons.c3
-rw-r--r--sys/arch/alpha/isa/isa_machdep.c3
-rw-r--r--sys/arch/alpha/pci/pci_1000.c3
-rw-r--r--sys/arch/alpha/pci/pci_1000a.c3
-rw-r--r--sys/arch/alpha/pci/pci_2100_a50.c3
-rw-r--r--sys/arch/alpha/pci/pci_550.c3
-rw-r--r--sys/arch/alpha/pci/pci_alphabook1.c3
-rw-r--r--sys/arch/alpha/pci/pci_axppci_33.c3
-rw-r--r--sys/arch/alpha/pci/pci_eb164.c3
-rw-r--r--sys/arch/alpha/pci/pci_eb64plus.c3
-rw-r--r--sys/arch/alpha/pci/pci_kn20aa.c3
-rw-r--r--sys/arch/alpha/pci/pci_kn300.c3
-rw-r--r--sys/arch/alpha/pci/pci_machdep.c3
-rw-r--r--sys/arch/alpha/pci/pci_up1000.c3
-rw-r--r--sys/arch/alpha/stand/netboot/if_prom.c3
-rw-r--r--sys/arch/amd64/amd64/aesni.c3
-rw-r--r--sys/arch/amd64/amd64/amd64errata.c4
-rw-r--r--sys/arch/amd64/amd64/k1x-pstate.c3
-rw-r--r--sys/arch/amd64/amd64/pctr.c3
-rw-r--r--sys/arch/amd64/amd64/powernow-k8.c3
-rw-r--r--sys/arch/amd64/amd64/vmm.c3
-rw-r--r--sys/arch/amd64/pci/pci_machdep.c3
-rw-r--r--sys/arch/amd64/stand/boot/conf.c3
-rw-r--r--sys/arch/amd64/stand/cdboot/conf.c3
-rw-r--r--sys/arch/amd64/stand/efiboot/conf.c3
-rw-r--r--sys/arch/amd64/stand/libsa/gateA20.c3
-rw-r--r--sys/arch/amd64/stand/pxeboot/conf.c3
-rw-r--r--sys/arch/arm/arm/cpufunc.c3
-rw-r--r--sys/arch/arm/arm/fault.c4
-rw-r--r--sys/arch/arm/arm/pmap7.c3
-rw-r--r--sys/arch/arm64/arm64/ast.c4
-rw-r--r--sys/arch/arm64/arm64/intr.c5
-rw-r--r--sys/arch/arm64/arm64/machdep.c3
-rw-r--r--sys/arch/arm64/stand/efiboot/conf.c3
-rw-r--r--sys/arch/armv7/armv7/armv7.c3
-rw-r--r--sys/arch/armv7/armv7/intr.c5
-rw-r--r--sys/arch/armv7/armv7/platform.c3
-rw-r--r--sys/arch/armv7/omap/am335x.c3
-rw-r--r--sys/arch/armv7/omap/dmtimer.c3
-rw-r--r--sys/arch/armv7/omap/edma.c3
-rw-r--r--sys/arch/armv7/omap/gptimer.c3
-rw-r--r--sys/arch/armv7/omap/omap3.c3
-rw-r--r--sys/arch/armv7/omap/omap_machdep.c3
-rw-r--r--sys/arch/armv7/omap/ompinmux.c3
-rw-r--r--sys/arch/armv7/omap/prcm.c3
-rw-r--r--sys/arch/armv7/omap/sitara_cm.c3
-rw-r--r--sys/arch/armv7/stand/efiboot/conf.c3
-rw-r--r--sys/arch/armv7/sunxi/sxitimer.c3
-rw-r--r--sys/arch/hppa/hppa/ipi.c3
-rw-r--r--sys/arch/hppa/hppa/mem.c3
-rw-r--r--sys/arch/hppa/stand/boot/conf.c3
-rw-r--r--sys/arch/i386/eisa/eisa_machdep.c3
-rw-r--r--sys/arch/i386/i386/amd64errata.c3
-rw-r--r--sys/arch/i386/i386/k1x-pstate.c3
-rw-r--r--sys/arch/i386/i386/pctr.c3
-rw-r--r--sys/arch/i386/i386/powernow-k7.c3
-rw-r--r--sys/arch/i386/i386/powernow-k8.c3
-rw-r--r--sys/arch/i386/i386/vmm.c3
-rw-r--r--sys/arch/i386/isa/clock.c3
-rw-r--r--sys/arch/i386/pci/glxsb.c3
-rw-r--r--sys/arch/i386/pci/pci_machdep.c3
-rw-r--r--sys/arch/i386/stand/boot/conf.c3
-rw-r--r--sys/arch/i386/stand/cdboot/conf.c3
-rw-r--r--sys/arch/i386/stand/libsa/gateA20.c3
-rw-r--r--sys/arch/i386/stand/pxeboot/conf.c3
-rw-r--r--sys/arch/landisk/dev/power.c3
-rw-r--r--sys/arch/landisk/landisk/shpcic_machdep.c3
-rw-r--r--sys/arch/landisk/stand/boot/conf.c3
-rw-r--r--sys/arch/luna88k/cbus/i82365_cbus.c3
-rw-r--r--sys/arch/luna88k/dev/xp.c3
-rw-r--r--sys/arch/m88k/m88k/fpu.c3
-rw-r--r--sys/arch/m88k/m88k/m88100_fp.c3
-rw-r--r--sys/arch/m88k/m88k/m88110_fp.c3
-rw-r--r--sys/arch/m88k/m88k/trap.c3
-rw-r--r--sys/arch/macppc/dev/esp.c3
-rw-r--r--sys/arch/macppc/dev/macgpio.c3
-rw-r--r--sys/arch/macppc/dev/pgs.c3
-rw-r--r--sys/arch/macppc/dev/sysbutton.c3
-rw-r--r--sys/arch/macppc/dev/xlights.c3
-rw-r--r--sys/arch/macppc/macppc/mem.c3
-rw-r--r--sys/arch/macppc/pci/macobio.c3
-rw-r--r--sys/arch/macppc/pci/pchb.c3
-rw-r--r--sys/arch/octeon/dev/cn30xxfpa.c3
-rw-r--r--sys/arch/octeon/dev/cn30xxgmx.c3
-rw-r--r--sys/arch/octeon/dev/cn30xxpow.c3
-rw-r--r--sys/arch/sgi/dev/impact.c3
-rw-r--r--sys/arch/sgi/gio/impact_gio.c3
-rw-r--r--sys/arch/sgi/stand/sgivol/sgivol.c3
-rw-r--r--sys/arch/sgi/xbow/impact_xbow.c3
-rw-r--r--sys/arch/sgi/xbow/odyssey.c3
-rw-r--r--sys/arch/socppc/socppc/mem.c3
-rw-r--r--sys/arch/socppc/stand/boot/fdt.c3
-rw-r--r--sys/arch/socppc/stand/boot/wd.c3
-rw-r--r--sys/arch/sparc64/dev/beep.c3
-rw-r--r--sys/arch/sparc64/dev/beeper.c3
-rw-r--r--sys/arch/sparc64/dev/central.c3
-rw-r--r--sys/arch/sparc64/dev/com_ebus.c3
-rw-r--r--sys/arch/sparc64/dev/creator.c3
-rw-r--r--sys/arch/sparc64/dev/fhc.c3
-rw-r--r--sys/arch/sparc64/dev/fhc_central.c3
-rw-r--r--sys/arch/sparc64/dev/fhc_mainbus.c3
-rw-r--r--sys/arch/sparc64/dev/lpt_ebus.c3
-rw-r--r--sys/arch/sparc64/dev/pci_machdep.c3
-rw-r--r--sys/arch/sparc64/dev/pckbc_ebus.c3
-rw-r--r--sys/arch/sparc64/dev/power.c3
-rw-r--r--sys/arch/sparc64/dev/ppm.c3
-rw-r--r--sys/arch/sparc64/dev/sab.c3
-rw-r--r--sys/arch/sparc64/dev/upa.c3
-rw-r--r--sys/arch/sparc64/dev/uperf.c3
-rw-r--r--sys/arch/sparc64/dev/uperf_ebus.c3
-rw-r--r--sys/ddb/db_ctf.c5
-rw-r--r--sys/ddb/db_dwarf.c3
-rw-r--r--sys/ddb/db_elf.c5
-rw-r--r--sys/ddb/db_usrreq.c3
-rw-r--r--sys/dev/diskmap.c3
-rw-r--r--sys/dev/eisa/cac_eisa.c3
-rw-r--r--sys/dev/eisa/dpt_eisa.c3
-rw-r--r--sys/dev/eisa/uha_eisa.c3
-rw-r--r--sys/dev/fdt/if_mvneta.c3
-rw-r--r--sys/dev/fdt/sxiccmu.c3
-rw-r--r--sys/dev/ic/adv.c3
-rw-r--r--sys/dev/ic/advlib.c3
-rw-r--r--sys/dev/ic/adw.c3
-rw-r--r--sys/dev/ic/adwlib.c3
-rw-r--r--sys/dev/ic/aic6250.c3
-rw-r--r--sys/dev/ic/aic6360.c3
-rw-r--r--sys/dev/ic/bwi.c3
-rw-r--r--sys/dev/ic/cy.c3
-rw-r--r--sys/dev/ic/i82365.c3
-rw-r--r--sys/dev/ic/lsi64854.c3
-rw-r--r--sys/dev/ic/malo.c3
-rw-r--r--sys/dev/ic/mfi.c3
-rw-r--r--sys/dev/ic/ncr5380sbc.c3
-rw-r--r--sys/dev/ic/ncr53c9x.c3
-rw-r--r--sys/dev/ic/rtw.c3
-rw-r--r--sys/dev/ic/tcic2.c3
-rw-r--r--sys/dev/ic/uha.c3
-rw-r--r--sys/dev/ipmi.c3
-rw-r--r--sys/dev/isa/aic_isa.c3
-rw-r--r--sys/dev/isa/i82365_isa.c3
-rw-r--r--sys/dev/isa/i82365_isapnp.c3
-rw-r--r--sys/dev/isa/i82365_isasubr.c3
-rw-r--r--sys/dev/isa/if_eg.c3
-rw-r--r--sys/dev/isa/sch311x.c3
-rw-r--r--sys/dev/isa/tcic2_isa.c3
-rw-r--r--sys/dev/isa/uha_isa.c3
-rw-r--r--sys/dev/isa/wdc_isa.c3
-rw-r--r--sys/dev/isa/wdc_isapnp.c3
-rw-r--r--sys/dev/isa/wds.c3
-rw-r--r--sys/dev/microcode/adw/adwmcode.c3
-rw-r--r--sys/dev/microcode/tusb3410/build.c5
-rw-r--r--sys/dev/pci/adv_pci.c3
-rw-r--r--sys/dev/pci/adw_pci.c3
-rw-r--r--sys/dev/pci/auixp.c5
-rw-r--r--sys/dev/pci/azalia.c3
-rw-r--r--sys/dev/pci/berkwdt.c3
-rw-r--r--sys/dev/pci/emuxki.c5
-rw-r--r--sys/dev/pci/esa.c3
-rw-r--r--sys/dev/pci/i82365_pci.c3
-rw-r--r--sys/dev/pci/if_age.c3
-rw-r--r--sys/dev/pci/if_alc.c3
-rw-r--r--sys/dev/pci/if_ale.c3
-rw-r--r--sys/dev/pci/if_et.c3
-rw-r--r--sys/dev/pci/if_jme.c3
-rw-r--r--sys/dev/pci/if_nfe.c3
-rw-r--r--sys/dev/pci/if_vte.c3
-rw-r--r--sys/dev/pci/mbg.c3
-rw-r--r--sys/dev/pci/mfii.c3
-rw-r--r--sys/dev/pci/pccbb.c3
-rw-r--r--sys/dev/pci/pwdog.c3
-rw-r--r--sys/dev/pci/wdt.c3
-rw-r--r--sys/dev/pcmcia/com_pcmcia.c3
-rw-r--r--sys/dev/pcmcia/pcmcia.c3
-rw-r--r--sys/dev/pcmcia/pcmcia_cis.c3
-rw-r--r--sys/dev/pcmcia/pcmcia_cis_quirks.c3
-rw-r--r--sys/dev/puc/lpt_puc.c3
-rw-r--r--sys/dev/pv/vioscsi.c3
-rw-r--r--sys/dev/pv/virtiovar.h5
-rw-r--r--sys/dev/sbus/apio.c3
-rw-r--r--sys/dev/sbus/asio.c3
-rw-r--r--sys/dev/sbus/dma_sbus.c3
-rw-r--r--sys/dev/sbus/esp_sbus.c3
-rw-r--r--sys/dev/sbus/qec.c3
-rw-r--r--sys/dev/sbus/uperf_sbus.c3
-rw-r--r--sys/dev/usb/dwc2/dwc2_core.c3
-rw-r--r--sys/dev/usb/dwc2/dwc2_hcd.c3
-rw-r--r--sys/dev/usb/dwc2/dwc2_hcdddma.c3
-rw-r--r--sys/dev/usb/dwc2/dwc2_hcdintr.c3
-rw-r--r--sys/dev/usb/dwc2/dwc2_hcdqueue.c3
-rw-r--r--sys/dev/usb/ulpt.c3
-rw-r--r--sys/dev/videomode/vesagtf.c6
-rw-r--r--sys/dev/wscons/wskbdutil.c3
-rw-r--r--sys/dev/wsfont/wsfont.c3
-rw-r--r--sys/isofs/cd9660/cd9660_rrip.c3
-rw-r--r--sys/isofs/udf/udf_vfsops.c3
-rw-r--r--sys/kern/kern_pledge.c3
-rw-r--r--sys/kern/kern_srp.c3
-rw-r--r--sys/kern/subr_percpu.c3
-rw-r--r--sys/kern/subr_poison.c3
-rw-r--r--sys/lib/libkern/random.c3
-rw-r--r--sys/lib/libsa/netif.c3
-rw-r--r--sys/net/bfd.c5
-rw-r--r--sys/net/bpf_filter.c3
-rw-r--r--sys/net/bsd-comp.c3
-rw-r--r--sys/net/if_pflow.c5
-rw-r--r--sys/net/if_pppoe.c3
-rw-r--r--sys/net/pfkeyv2.c3
-rw-r--r--sys/net/pfkeyv2_convert.c3
-rw-r--r--sys/net/ppp-deflate.c3
-rw-r--r--sys/netinet6/ip6_id.c3
-rw-r--r--sys/scsi/cd.c3
-rw-r--r--sys/scsi/scsi_base.c3
-rw-r--r--sys/scsi/scsi_ioctl.c5
-rw-r--r--sys/scsi/scsiconf.c3
-rw-r--r--sys/scsi/sd.c3
-rw-r--r--sys/scsi/st.c3
-rw-r--r--sys/scsi/uk.c3
-rw-r--r--sys/tmpfs/tmpfs_vfsops.c3
-rw-r--r--sys/ufs/ext2fs/ext2fs_extents.c1
220 files changed, 231 insertions, 455 deletions
diff --git a/sys/arch/alpha/alpha/db_trace.c b/sys/arch/alpha/alpha/db_trace.c
index b7f8ca76227..f653b64ae9a 100644
--- a/sys/arch/alpha/alpha/db_trace.c
+++ b/sys/arch/alpha/alpha/db_trace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_trace.c,v 1.19 2016/09/19 21:18:35 jasper Exp $ */
+/* $OpenBSD: db_trace.c,v 1.20 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 1997 Niklas Hallqvist. All rights reserved.
@@ -25,7 +25,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/alpha/promcons.c b/sys/arch/alpha/alpha/promcons.c
index 0dda2c26fbe..ee74f89f8ed 100644
--- a/sys/arch/alpha/alpha/promcons.c
+++ b/sys/arch/alpha/alpha/promcons.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: promcons.c,v 1.16 2010/07/02 17:27:01 nicm Exp $ */
+/* $OpenBSD: promcons.c,v 1.17 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: promcons.c,v 1.5 1996/11/13 22:20:55 cgd Exp $ */
/*
@@ -39,7 +39,6 @@
#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/syslog.h>
-#include <sys/types.h>
#include <sys/device.h>
#include <sys/timeout.h>
diff --git a/sys/arch/alpha/isa/isa_machdep.c b/sys/arch/alpha/isa/isa_machdep.c
index 646daa0b514..02299fc14e0 100644
--- a/sys/arch/alpha/isa/isa_machdep.c
+++ b/sys/arch/alpha/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.c,v 1.13 2006/02/12 21:09:08 miod Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.14 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: isa_machdep.c,v 1.12 1998/08/07 10:26:39 drochner Exp $ */
/*
@@ -32,7 +32,6 @@
* Machine-specific functions for ISA autoconfiguration.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/pci/pci_1000.c b/sys/arch/alpha/pci/pci_1000.c
index deac6a60c6c..fcfa1ebffcf 100644
--- a/sys/arch/alpha/pci/pci_1000.c
+++ b/sys/arch/alpha/pci/pci_1000.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_1000.c,v 1.11 2015/07/26 05:09:44 miod Exp $ */
+/* $OpenBSD: pci_1000.c,v 1.12 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_1000.c,v 1.12 2001/07/27 00:25:20 thorpej Exp $ */
/*
@@ -59,7 +59,6 @@
* rights to redistribute these changes.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/pci/pci_1000a.c b/sys/arch/alpha/pci/pci_1000a.c
index 02dd1e4d86d..7324f414634 100644
--- a/sys/arch/alpha/pci/pci_1000a.c
+++ b/sys/arch/alpha/pci/pci_1000a.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_1000a.c,v 1.13 2015/07/26 05:09:44 miod Exp $ */
+/* $OpenBSD: pci_1000a.c,v 1.14 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_1000a.c,v 1.14 2001/07/27 00:25:20 thorpej Exp $ */
/*
@@ -59,7 +59,6 @@
* rights to redistribute these changes.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index efd74cddaa6..9b03d6aa0bd 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_2100_a50.c,v 1.23 2015/07/26 05:09:44 miod Exp $ */
+/* $OpenBSD: pci_2100_a50.c,v 1.24 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_2100_a50.c,v 1.12 1996/11/13 21:13:29 cgd Exp $ */
/*
@@ -28,7 +28,6 @@
* rights to redistribute these changes.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c
index da725d53771..cfa3eedfa8d 100644
--- a/sys/arch/alpha/pci/pci_550.c
+++ b/sys/arch/alpha/pci/pci_550.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_550.c,v 1.23 2015/07/26 05:09:44 miod Exp $ */
+/* $OpenBSD: pci_550.c,v 1.24 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */
/*-
@@ -58,7 +58,6 @@
* rights to redistribute these changes.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/pci/pci_alphabook1.c b/sys/arch/alpha/pci/pci_alphabook1.c
index ed61d44e91d..c305530d28f 100644
--- a/sys/arch/alpha/pci/pci_alphabook1.c
+++ b/sys/arch/alpha/pci/pci_alphabook1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_alphabook1.c,v 1.4 2015/08/15 19:18:27 miod Exp $ */
+/* $OpenBSD: pci_alphabook1.c,v 1.5 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_alphabook1.c,v 1.16 2012/02/06 02:14:15 matt Exp $ */
/*-
@@ -58,7 +58,6 @@
* rights to redistribute these changes.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index ec0f6f6a8ce..86788a56325 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_axppci_33.c,v 1.21 2015/07/26 05:09:44 miod Exp $ */
+/* $OpenBSD: pci_axppci_33.c,v 1.22 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_axppci_33.c,v 1.10 1996/11/13 21:13:29 cgd Exp $ */
/*
@@ -28,7 +28,6 @@
* rights to redistribute these changes.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index d3cc5480a02..d2b2f83a6d1 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb164.c,v 1.27 2015/07/26 05:09:44 miod Exp $ */
+/* $OpenBSD: pci_eb164.c,v 1.28 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */
/*-
@@ -58,7 +58,6 @@
* rights to redistribute these changes.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c
index b9398d79aa0..17acab1d65c 100644
--- a/sys/arch/alpha/pci/pci_eb64plus.c
+++ b/sys/arch/alpha/pci/pci_eb64plus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb64plus.c,v 1.15 2015/07/26 05:09:44 miod Exp $ */
+/* $OpenBSD: pci_eb64plus.c,v 1.16 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_eb64plus.c,v 1.10 2001/07/27 00:25:20 thorpej Exp $ */
/*-
@@ -58,7 +58,6 @@
* rights to redistribute these changes.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index 6916147ba9f..1b3a483bcab 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_kn20aa.c,v 1.28 2015/07/26 05:09:44 miod Exp $ */
+/* $OpenBSD: pci_kn20aa.c,v 1.29 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_kn20aa.c,v 1.21 1996/11/17 02:05:27 cgd Exp $ */
/*
@@ -28,7 +28,6 @@
* rights to redistribute these changes.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/pci/pci_kn300.c b/sys/arch/alpha/pci/pci_kn300.c
index 2bd1bc0d7d6..7dcfcd6b9f8 100644
--- a/sys/arch/alpha/pci/pci_kn300.c
+++ b/sys/arch/alpha/pci/pci_kn300.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_kn300.c,v 1.7 2015/07/26 05:09:44 miod Exp $ */
+/* $OpenBSD: pci_kn300.c,v 1.8 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_kn300.c,v 1.28 2005/12/11 12:16:17 christos Exp $ */
/*
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/pci/pci_machdep.c b/sys/arch/alpha/pci/pci_machdep.c
index 0bcdba22249..d667230aa33 100644
--- a/sys/arch/alpha/pci/pci_machdep.c
+++ b/sys/arch/alpha/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.20 2015/07/26 05:09:44 miod Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.21 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_machdep.c,v 1.7 1996/11/19 04:57:32 cgd Exp $ */
/*
@@ -32,7 +32,6 @@
* Machine-specific functions for PCI autoconfiguration.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/pci/pci_up1000.c b/sys/arch/alpha/pci/pci_up1000.c
index 5fb66344dc3..c9fc523bb10 100644
--- a/sys/arch/alpha/pci/pci_up1000.c
+++ b/sys/arch/alpha/pci/pci_up1000.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_up1000.c,v 1.17 2015/08/15 19:18:27 miod Exp $ */
+/* $OpenBSD: pci_up1000.c,v 1.18 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_up1000.c,v 1.6 2000/12/28 22:59:07 sommerfeld Exp $ */
/*-
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/alpha/stand/netboot/if_prom.c b/sys/arch/alpha/stand/netboot/if_prom.c
index 0cd674ff08e..d4f11dc437d 100644
--- a/sys/arch/alpha/stand/netboot/if_prom.c
+++ b/sys/arch/alpha/stand/netboot/if_prom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_prom.c,v 1.7 2015/07/17 16:13:26 miod Exp $ */
+/* $OpenBSD: if_prom.c,v 1.8 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: if_prom.c,v 1.9 1997/04/06 08:41:26 cgd Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <netinet/in.h>
diff --git a/sys/arch/amd64/amd64/aesni.c b/sys/arch/amd64/amd64/aesni.c
index b744aaf343d..60f05f660ca 100644
--- a/sys/arch/amd64/amd64/aesni.c
+++ b/sys/arch/amd64/amd64/aesni.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aesni.c,v 1.41 2017/05/02 11:47:49 mikeb Exp $ */
+/* $OpenBSD: aesni.c,v 1.42 2017/09/08 05:36:51 deraadt Exp $ */
/*-
* Copyright (c) 2003 Jason Wright
* Copyright (c) 2003, 2004 Theo de Raadt
@@ -22,7 +22,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/queue.h>
-#include <sys/types.h>
#include <sys/malloc.h>
#include <sys/pool.h>
#include <sys/mbuf.h>
diff --git a/sys/arch/amd64/amd64/amd64errata.c b/sys/arch/amd64/amd64/amd64errata.c
index 7e3a55583a6..508a3802d25 100644
--- a/sys/arch/amd64/amd64/amd64errata.c
+++ b/sys/arch/amd64/amd64/amd64errata.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amd64errata.c,v 1.8 2017/07/24 15:31:14 robert Exp $ */
+/* $OpenBSD: amd64errata.c,v 1.9 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: errata.c,v 1.6 2007/02/05 21:05:45 ad Exp $ */
/*-
@@ -43,8 +43,6 @@
*/
#include <sys/param.h>
-
-#include <sys/types.h>
#include <sys/systm.h>
#include <machine/cpu.h>
diff --git a/sys/arch/amd64/amd64/k1x-pstate.c b/sys/arch/amd64/amd64/k1x-pstate.c
index 3dddaf6e3db..dfa6fb175b8 100644
--- a/sys/arch/amd64/amd64/k1x-pstate.c
+++ b/sys/arch/amd64/amd64/k1x-pstate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: k1x-pstate.c,v 1.8 2015/03/14 03:38:46 jsg Exp $ */
+/* $OpenBSD: k1x-pstate.c,v 1.9 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2011 Bryan Steele <brynet@gmail.com>
*
@@ -24,7 +24,6 @@
*/
/* AMD K10/K11 pstate driver */
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/arch/amd64/amd64/pctr.c b/sys/arch/amd64/amd64/pctr.c
index 2b2381de6a6..7484b1ffd04 100644
--- a/sys/arch/amd64/amd64/pctr.c
+++ b/sys/arch/amd64/amd64/pctr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pctr.c,v 1.7 2016/04/14 07:00:24 mlarkin Exp $ */
+/* $OpenBSD: pctr.c,v 1.8 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2007 Mike Belopuhov
@@ -26,7 +26,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/errno.h>
#include <sys/fcntl.h>
#include <sys/ioccom.h>
diff --git a/sys/arch/amd64/amd64/powernow-k8.c b/sys/arch/amd64/amd64/powernow-k8.c
index 74ea706b692..e41e1558337 100644
--- a/sys/arch/amd64/amd64/powernow-k8.c
+++ b/sys/arch/amd64/amd64/powernow-k8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: powernow-k8.c,v 1.25 2015/03/14 03:38:46 jsg Exp $ */
+/* $OpenBSD: powernow-k8.c,v 1.26 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2004 Martin Végiard.
* Copyright (c) 2004-2005 Bruno Ducrot
@@ -26,7 +26,6 @@
*/
/* AMD POWERNOW K8 driver */
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c
index 95007cfa416..f5c9e3c204e 100644
--- a/sys/arch/amd64/amd64/vmm.c
+++ b/sys/arch/amd64/amd64/vmm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmm.c,v 1.169 2017/08/25 06:34:51 mlarkin Exp $ */
+/* $OpenBSD: vmm.c,v 1.170 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
*
@@ -17,7 +17,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/signalvar.h>
#include <sys/malloc.h>
#include <sys/device.h>
diff --git a/sys/arch/amd64/pci/pci_machdep.c b/sys/arch/amd64/pci/pci_machdep.c
index 19983b0a22e..4acd9cb79a7 100644
--- a/sys/arch/amd64/pci/pci_machdep.c
+++ b/sys/arch/amd64/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.65 2016/06/02 21:01:51 kettenis Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.66 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */
/*-
@@ -65,7 +65,6 @@
* Machine-specific functions for PCI autoconfiguration.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c
index f2033efda25..6bb7271de00 100644
--- a/sys/arch/amd64/stand/boot/conf.c
+++ b/sys/arch/amd64/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.37 2016/09/18 16:36:09 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.38 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -27,7 +27,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <netinet/in.h>
#include <libsa.h>
#include <lib/libsa/ufs.h>
diff --git a/sys/arch/amd64/stand/cdboot/conf.c b/sys/arch/amd64/stand/cdboot/conf.c
index 448dbe80c58..29088565aa8 100644
--- a/sys/arch/amd64/stand/cdboot/conf.c
+++ b/sys/arch/amd64/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.32 2016/09/18 16:36:09 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.33 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -28,7 +28,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <netinet/in.h>
#include <libsa.h>
#include <lib/libsa/ufs.h>
diff --git a/sys/arch/amd64/stand/efiboot/conf.c b/sys/arch/amd64/stand/efiboot/conf.c
index 1c82abe5f48..9d825543ec0 100644
--- a/sys/arch/amd64/stand/efiboot/conf.c
+++ b/sys/arch/amd64/stand/efiboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.10 2017/07/31 14:04:52 kettenis Exp $ */
+/* $OpenBSD: conf.c,v 1.11 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -27,7 +27,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/disklabel.h>
#include <libsa.h>
#include <lib/libsa/ufs.h>
diff --git a/sys/arch/amd64/stand/libsa/gateA20.c b/sys/arch/amd64/stand/libsa/gateA20.c
index 66a11a08cdd..318f2deb11f 100644
--- a/sys/arch/amd64/stand/libsa/gateA20.c
+++ b/sys/arch/amd64/stand/libsa/gateA20.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gateA20.c,v 1.2 2004/03/21 21:37:41 tom Exp $ */
+/* $OpenBSD: gateA20.c,v 1.3 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
@@ -29,7 +29,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <machine/pio.h>
#include <dev/ic/i8042reg.h>
#include <dev/isa/isareg.h>
diff --git a/sys/arch/amd64/stand/pxeboot/conf.c b/sys/arch/amd64/stand/pxeboot/conf.c
index 573655e5daf..4e2484374c3 100644
--- a/sys/arch/amd64/stand/pxeboot/conf.c
+++ b/sys/arch/amd64/stand/pxeboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.36 2016/09/18 16:36:09 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.37 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -28,7 +28,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <netinet/in.h>
#include <libsa.h>
#include <lib/libsa/ufs.h>
diff --git a/sys/arch/arm/arm/cpufunc.c b/sys/arch/arm/arm/cpufunc.c
index c91108e7066..f528e20662b 100644
--- a/sys/arch/arm/arm/cpufunc.c
+++ b/sys/arch/arm/arm/cpufunc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpufunc.c,v 1.51 2017/04/24 18:15:16 kettenis Exp $ */
+/* $OpenBSD: cpufunc.c,v 1.52 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: cpufunc.c,v 1.65 2003/11/05 12:53:15 scw Exp $ */
/*
@@ -46,7 +46,6 @@
* Created : 30/01/97
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/arch/arm/arm/fault.c b/sys/arch/arm/arm/fault.c
index bd600f9e2ea..47f308121d1 100644
--- a/sys/arch/arm/arm/fault.c
+++ b/sys/arch/arm/arm/fault.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fault.c,v 1.29 2017/07/21 09:19:05 kettenis Exp $ */
+/* $OpenBSD: fault.c,v 1.30 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: fault.c,v 1.46 2004/01/21 15:39:21 skrll Exp $ */
/*
@@ -78,8 +78,6 @@
* Created : 28/11/94
*/
-#include <sys/types.h>
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/arch/arm/arm/pmap7.c b/sys/arch/arm/arm/pmap7.c
index f99ee582e00..5cba9b599e4 100644
--- a/sys/arch/arm/arm/pmap7.c
+++ b/sys/arch/arm/arm/pmap7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap7.c,v 1.55 2016/10/22 17:48:41 patrick Exp $ */
+/* $OpenBSD: pmap7.c,v 1.56 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $ */
/*
@@ -175,7 +175,6 @@
* in a significant slow-down if both processes are in tight loops.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
diff --git a/sys/arch/arm64/arm64/ast.c b/sys/arch/arm64/arm64/ast.c
index d00087021b0..240d6cc5355 100644
--- a/sys/arch/arm64/arm64/ast.c
+++ b/sys/arch/arm64/arm64/ast.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ast.c,v 1.3 2017/04/29 17:07:09 kettenis Exp $ */
+/* $OpenBSD: ast.c,v 1.4 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2015 Dale Rahn <drahn@dalerahn.com>
*
@@ -15,8 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/arch/arm64/arm64/intr.c b/sys/arch/arm64/arm64/intr.c
index 61b19dad0bd..e34e4e120fd 100644
--- a/sys/arch/arm64/arm64/intr.c
+++ b/sys/arch/arm64/arm64/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.7 2017/03/09 14:23:59 kettenis Exp $ */
+/* $OpenBSD: intr.c,v 1.8 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2011 Dale Rahn <drahn@openbsd.org>
*
@@ -15,9 +15,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/systm.h>
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/timetc.h>
#include <sys/malloc.h>
diff --git a/sys/arch/arm64/arm64/machdep.c b/sys/arch/arm64/arm64/machdep.c
index 18ba1eaf47a..db259e9c265 100644
--- a/sys/arch/arm64/arm64/machdep.c
+++ b/sys/arch/arm64/arm64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.21 2017/08/27 12:42:22 kettenis Exp $ */
+/* $OpenBSD: machdep.c,v 1.22 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
*
@@ -15,7 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/timetc.h>
#include <sys/sched.h>
diff --git a/sys/arch/arm64/stand/efiboot/conf.c b/sys/arch/arm64/stand/efiboot/conf.c
index e3e3d974907..0fa040972e6 100644
--- a/sys/arch/arm64/stand/efiboot/conf.c
+++ b/sys/arch/arm64/stand/efiboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.8 2017/08/23 18:03:54 kettenis Exp $ */
+/* $OpenBSD: conf.c,v 1.9 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -27,7 +27,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <lib/libsa/stand.h>
#include <lib/libsa/ufs.h>
#include <dev/cons.h>
diff --git a/sys/arch/armv7/armv7/armv7.c b/sys/arch/armv7/armv7/armv7.c
index c57fb56738a..6a70df184b7 100644
--- a/sys/arch/armv7/armv7/armv7.c
+++ b/sys/arch/armv7/armv7/armv7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: armv7.c,v 1.14 2016/06/04 18:09:16 jsg Exp $ */
+/* $OpenBSD: armv7.c,v 1.15 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2005,2008 Dale Rahn <drahn@openbsd.com>
* Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
@@ -18,7 +18,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/malloc.h>
#define _ARM32_BUS_DMA_PRIVATE
diff --git a/sys/arch/armv7/armv7/intr.c b/sys/arch/armv7/armv7/intr.c
index 5f3b79a19c0..a9488227872 100644
--- a/sys/arch/armv7/armv7/intr.c
+++ b/sys/arch/armv7/armv7/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.11 2017/03/09 15:36:52 kettenis Exp $ */
+/* $OpenBSD: intr.c,v 1.12 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2011 Dale Rahn <drahn@openbsd.org>
*
@@ -15,9 +15,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/systm.h>
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/timetc.h>
#include <sys/malloc.h>
diff --git a/sys/arch/armv7/armv7/platform.c b/sys/arch/armv7/armv7/platform.c
index 49736e1d5f7..8653f074da9 100644
--- a/sys/arch/armv7/armv7/platform.c
+++ b/sys/arch/armv7/armv7/platform.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: platform.c,v 1.22 2017/03/07 15:38:11 kettenis Exp $ */
+/* $OpenBSD: platform.c,v 1.23 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2014 Patrick Wildt <patrick@blueri.se>
*
@@ -16,7 +16,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <machine/bus.h>
diff --git a/sys/arch/armv7/omap/am335x.c b/sys/arch/armv7/omap/am335x.c
index 3bbb047cf18..98d411b29e5 100644
--- a/sys/arch/armv7/omap/am335x.c
+++ b/sys/arch/armv7/omap/am335x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: am335x.c,v 1.10 2017/03/01 05:10:05 jsg Exp $ */
+/* $OpenBSD: am335x.c,v 1.11 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org>
@@ -17,7 +17,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <machine/bus.h>
diff --git a/sys/arch/armv7/omap/dmtimer.c b/sys/arch/armv7/omap/dmtimer.c
index 252b2fd5597..db1eb32ad23 100644
--- a/sys/arch/armv7/omap/dmtimer.c
+++ b/sys/arch/armv7/omap/dmtimer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dmtimer.c,v 1.6 2015/01/22 14:33:01 krw Exp $ */
+/* $OpenBSD: dmtimer.c,v 1.7 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2013 Raphael Graf <r@undefined.ch>
@@ -22,7 +22,6 @@
* low power mode.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/armv7/omap/edma.c b/sys/arch/armv7/omap/edma.c
index 01e62a026d2..f8dcd0dabe4 100644
--- a/sys/arch/armv7/omap/edma.c
+++ b/sys/arch/armv7/omap/edma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: edma.c,v 1.6 2017/03/01 04:34:09 jsg Exp $ */
+/* $OpenBSD: edma.c,v 1.7 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
*
@@ -16,7 +16,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <machine/fdt.h>
diff --git a/sys/arch/armv7/omap/gptimer.c b/sys/arch/armv7/omap/gptimer.c
index e5fd9965ded..e87db41106e 100644
--- a/sys/arch/armv7/omap/gptimer.c
+++ b/sys/arch/armv7/omap/gptimer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gptimer.c,v 1.4 2014/06/20 14:08:11 rapha Exp $ */
+/* $OpenBSD: gptimer.c,v 1.5 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
*
@@ -21,7 +21,6 @@
* low power mode.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/armv7/omap/omap3.c b/sys/arch/armv7/omap/omap3.c
index 52855d35e73..45e507f7653 100644
--- a/sys/arch/armv7/omap/omap3.c
+++ b/sys/arch/armv7/omap/omap3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omap3.c,v 1.4 2017/03/01 05:10:05 jsg Exp $ */
+/* $OpenBSD: omap3.c,v 1.5 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2011 Uwe Stuehler <uwe@openbsd.org>
@@ -16,7 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <machine/bus.h>
diff --git a/sys/arch/armv7/omap/omap_machdep.c b/sys/arch/armv7/omap/omap_machdep.c
index 12302c08e96..f62178f04a4 100644
--- a/sys/arch/armv7/omap/omap_machdep.c
+++ b/sys/arch/armv7/omap/omap_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omap_machdep.c,v 1.11 2016/10/25 00:04:59 jsg Exp $ */
+/* $OpenBSD: omap_machdep.c,v 1.12 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
*
@@ -16,7 +16,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/termios.h>
diff --git a/sys/arch/armv7/omap/ompinmux.c b/sys/arch/armv7/omap/ompinmux.c
index 10a5b06ddfd..55db93c5f2f 100644
--- a/sys/arch/armv7/omap/ompinmux.c
+++ b/sys/arch/armv7/omap/ompinmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ompinmux.c,v 1.1 2016/10/03 01:59:20 jsg Exp $ */
+/* $OpenBSD: ompinmux.c,v 1.2 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2016 Jonathan Gray <jsg@openbsd.org>
*
@@ -15,7 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/arch/armv7/omap/prcm.c b/sys/arch/armv7/omap/prcm.c
index 1f2ab7fe5b6..57ea148a6b3 100644
--- a/sys/arch/armv7/omap/prcm.c
+++ b/sys/arch/armv7/omap/prcm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prcm.c,v 1.12 2017/08/14 21:46:02 ians Exp $ */
+/* $OpenBSD: prcm.c,v 1.13 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
*
@@ -48,7 +48,6 @@
* Driver for the Power, Reset and Clock Management Module (PRCM).
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/armv7/omap/sitara_cm.c b/sys/arch/armv7/omap/sitara_cm.c
index 112053a6a8d..88980ddf422 100644
--- a/sys/arch/armv7/omap/sitara_cm.c
+++ b/sys/arch/armv7/omap/sitara_cm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sitara_cm.c,v 1.4 2016/08/12 03:22:41 jsg Exp $ */
+/* $OpenBSD: sitara_cm.c,v 1.5 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: sitara_cm.c,v 1.1 2013/04/17 14:31:02 bouyer Exp $ */
/*
* Copyright (c) 2010
@@ -47,7 +47,6 @@
* call ti_padconf_devmap to be located somewhere in the kernel.
*
*/
-#include <sys/types.h>
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/arch/armv7/stand/efiboot/conf.c b/sys/arch/armv7/stand/efiboot/conf.c
index da04d738e19..e9a0bd971e0 100644
--- a/sys/arch/armv7/stand/efiboot/conf.c
+++ b/sys/arch/armv7/stand/efiboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.11 2017/08/21 20:05:32 kettenis Exp $ */
+/* $OpenBSD: conf.c,v 1.12 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -27,7 +27,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <lib/libsa/stand.h>
#include <lib/libsa/ufs.h>
#include <dev/cons.h>
diff --git a/sys/arch/armv7/sunxi/sxitimer.c b/sys/arch/armv7/sunxi/sxitimer.c
index b86644042ae..65d455adaeb 100644
--- a/sys/arch/armv7/sunxi/sxitimer.c
+++ b/sys/arch/armv7/sunxi/sxitimer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sxitimer.c,v 1.10 2017/01/21 08:26:49 patrick Exp $ */
+/* $OpenBSD: sxitimer.c,v 1.11 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2013 Raphael Graf <r@undefined.ch>
@@ -17,7 +17,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/hppa/hppa/ipi.c b/sys/arch/hppa/hppa/ipi.c
index 98f83751c61..8d31d2f60ca 100644
--- a/sys/arch/hppa/hppa/ipi.c
+++ b/sys/arch/hppa/hppa/ipi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipi.c,v 1.4 2011/01/14 13:20:06 jsing Exp $ */
+/* $OpenBSD: ipi.c,v 1.5 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2010 Joel Sing <jsing@openbsd.org>
@@ -17,7 +17,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <sys/mutex.h>
diff --git a/sys/arch/hppa/hppa/mem.c b/sys/arch/hppa/hppa/mem.c
index 94984bdc47a..f903e9ac065 100644
--- a/sys/arch/hppa/hppa/mem.c
+++ b/sys/arch/hppa/hppa/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.2 2016/09/25 15:23:37 deraadt Exp $ */
+/* $OpenBSD: mem.c,v 1.3 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
@@ -77,7 +77,6 @@
#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/uio.h>
-#include <sys/types.h>
#include <sys/device.h>
#include <sys/errno.h>
#include <sys/ioctl.h>
diff --git a/sys/arch/hppa/stand/boot/conf.c b/sys/arch/hppa/stand/boot/conf.c
index 48ebed0b697..95261c482b8 100644
--- a/sys/arch/hppa/stand/boot/conf.c
+++ b/sys/arch/hppa/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.28 2016/09/13 18:27:49 jasper Exp $ */
+/* $OpenBSD: conf.c,v 1.29 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
@@ -27,7 +27,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <libsa.h>
#include <lib/libsa/ufs.h>
#include <lib/libsa/cd9660.h>
diff --git a/sys/arch/i386/eisa/eisa_machdep.c b/sys/arch/i386/eisa/eisa_machdep.c
index 5fc86049dbd..c008ca2d40e 100644
--- a/sys/arch/i386/eisa/eisa_machdep.c
+++ b/sys/arch/i386/eisa/eisa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eisa_machdep.c,v 1.16 2016/07/16 06:08:52 mlarkin Exp $ */
+/* $OpenBSD: eisa_machdep.c,v 1.17 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: eisa_machdep.c,v 1.10.22.2 2000/06/25 19:36:58 sommerfeld Exp $ */
/*-
@@ -65,7 +65,6 @@
* Machine-specific functions for EISA autoconfiguration.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/i386/i386/amd64errata.c b/sys/arch/i386/i386/amd64errata.c
index 6d0faee783c..83b1bb2f555 100644
--- a/sys/arch/i386/i386/amd64errata.c
+++ b/sys/arch/i386/i386/amd64errata.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amd64errata.c,v 1.7 2017/07/24 15:17:31 naddy Exp $ */
+/* $OpenBSD: amd64errata.c,v 1.8 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: errata.c,v 1.6 2007/02/05 21:05:45 ad Exp $ */
/*-
@@ -44,7 +44,6 @@
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <machine/cpu.h>
diff --git a/sys/arch/i386/i386/k1x-pstate.c b/sys/arch/i386/i386/k1x-pstate.c
index 213adbf9873..bb57aaab703 100644
--- a/sys/arch/i386/i386/k1x-pstate.c
+++ b/sys/arch/i386/i386/k1x-pstate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: k1x-pstate.c,v 1.8 2015/09/08 07:12:56 deraadt Exp $ */
+/* $OpenBSD: k1x-pstate.c,v 1.9 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2011 Bryan Steele <brynet@gmail.com>
*
@@ -24,7 +24,6 @@
*/
/* AMD K10/K11 pstate driver */
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/arch/i386/i386/pctr.c b/sys/arch/i386/i386/pctr.c
index c7335129b19..88c5b5e0b61 100644
--- a/sys/arch/i386/i386/pctr.c
+++ b/sys/arch/i386/i386/pctr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pctr.c,v 1.29 2016/09/26 03:33:03 guenther Exp $ */
+/* $OpenBSD: pctr.c,v 1.30 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Pentium performance counter driver for OpenBSD.
@@ -10,7 +10,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/errno.h>
#include <sys/fcntl.h>
#include <sys/ioccom.h>
diff --git a/sys/arch/i386/i386/powernow-k7.c b/sys/arch/i386/i386/powernow-k7.c
index ff230f4d811..44a63860d03 100644
--- a/sys/arch/i386/i386/powernow-k7.c
+++ b/sys/arch/i386/i386/powernow-k7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: powernow-k7.c,v 1.37 2015/09/08 07:12:56 deraadt Exp $ */
+/* $OpenBSD: powernow-k7.c,v 1.38 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2004 Martin Végiard.
@@ -28,7 +28,6 @@
/* AMD POWERNOW K7 driver */
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/arch/i386/i386/powernow-k8.c b/sys/arch/i386/i386/powernow-k8.c
index 7354507973c..aa947710e60 100644
--- a/sys/arch/i386/i386/powernow-k8.c
+++ b/sys/arch/i386/i386/powernow-k8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: powernow-k8.c,v 1.29 2015/09/08 07:12:56 deraadt Exp $ */
+/* $OpenBSD: powernow-k8.c,v 1.30 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2004 Martin Végiard.
@@ -27,7 +27,6 @@
*/
/* AMD POWERNOW K8 driver */
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/arch/i386/i386/vmm.c b/sys/arch/i386/i386/vmm.c
index 40309dc3b78..f2dca7a31a9 100644
--- a/sys/arch/i386/i386/vmm.c
+++ b/sys/arch/i386/i386/vmm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmm.c,v 1.31 2017/08/21 00:38:24 pd Exp $ */
+/* $OpenBSD: vmm.c,v 1.32 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2014 Mike Larkin <mlarkin@openbsd.org>
*
@@ -17,7 +17,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/signalvar.h>
#include <sys/malloc.h>
#include <sys/device.h>
diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index 289247f5717..e4da81f5c94 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.51 2017/01/25 08:23:50 tom Exp $ */
+/* $OpenBSD: clock.c,v 1.52 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: clock.c,v 1.39 1996/05/12 23:11:54 mycroft Exp $ */
/*-
@@ -85,7 +85,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
/*
* Primitive clock interrupt routines.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/time.h>
diff --git a/sys/arch/i386/pci/glxsb.c b/sys/arch/i386/pci/glxsb.c
index 6792e9c99d0..8316b42a1b2 100644
--- a/sys/arch/i386/pci/glxsb.c
+++ b/sys/arch/i386/pci/glxsb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: glxsb.c,v 1.32 2017/05/02 11:47:49 mikeb Exp $ */
+/* $OpenBSD: glxsb.c,v 1.33 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 2006 Tom Cosgrove <tom@openbsd.org>
@@ -28,7 +28,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/types.h>
#include <sys/timeout.h>
#include <machine/bus.h>
diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c
index cf08b23ab55..231e6a984b9 100644
--- a/sys/arch/i386/pci/pci_machdep.c
+++ b/sys/arch/i386/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.81 2015/09/01 06:01:24 deraadt Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.82 2017/09/08 05:36:51 deraadt Exp $ */
/* $NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $ */
/*-
@@ -73,7 +73,6 @@
* as defined section 3.6.4.1, `Generating Configuration Cycles'.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c
index 30e044f10db..46338319244 100644
--- a/sys/arch/i386/stand/boot/conf.c
+++ b/sys/arch/i386/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.61 2016/09/18 16:36:09 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.62 2017/09/08 05:36:51 deraadt Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -27,7 +27,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <netinet/in.h>
#include <libsa.h>
#include <lib/libsa/ufs.h>
diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c
index 66a7d18b686..1daefd490e6 100644
--- a/sys/arch/i386/stand/cdboot/conf.c
+++ b/sys/arch/i386/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.30 2016/09/18 16:36:09 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.31 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -28,7 +28,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <netinet/in.h>
#include <libsa.h>
#include <lib/libsa/ufs.h>
diff --git a/sys/arch/i386/stand/libsa/gateA20.c b/sys/arch/i386/stand/libsa/gateA20.c
index 00bfad10613..b897bf4c13d 100644
--- a/sys/arch/i386/stand/libsa/gateA20.c
+++ b/sys/arch/i386/stand/libsa/gateA20.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gateA20.c,v 1.10 2004/03/19 13:48:18 tom Exp $ */
+/* $OpenBSD: gateA20.c,v 1.11 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Ported to boot 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
@@ -29,7 +29,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <machine/pio.h>
#include <dev/ic/i8042reg.h>
#include <dev/isa/isareg.h>
diff --git a/sys/arch/i386/stand/pxeboot/conf.c b/sys/arch/i386/stand/pxeboot/conf.c
index f0d02101c10..705a054e8d3 100644
--- a/sys/arch/i386/stand/pxeboot/conf.c
+++ b/sys/arch/i386/stand/pxeboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.35 2016/09/18 16:36:09 jsing Exp $ */
+/* $OpenBSD: conf.c,v 1.36 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -28,7 +28,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <netinet/in.h>
#include <libsa.h>
#include <lib/libsa/ufs.h>
diff --git a/sys/arch/landisk/dev/power.c b/sys/arch/landisk/dev/power.c
index bb66681bc36..2ec1c653bf0 100644
--- a/sys/arch/landisk/dev/power.c
+++ b/sys/arch/landisk/dev/power.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: power.c,v 1.7 2017/04/30 16:45:45 mpi Exp $ */
+/* $OpenBSD: power.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2007 Martin Reindl.
@@ -16,7 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/landisk/landisk/shpcic_machdep.c b/sys/arch/landisk/landisk/shpcic_machdep.c
index cbb082e1afb..ec82fc48e2e 100644
--- a/sys/arch/landisk/landisk/shpcic_machdep.c
+++ b/sys/arch/landisk/landisk/shpcic_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: shpcic_machdep.c,v 1.5 2010/04/04 12:49:30 miod Exp $ */
+/* $OpenBSD: shpcic_machdep.c,v 1.6 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: shpcic_machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
/*
@@ -35,7 +35,6 @@
* Machine-specific functions for PCI autoconfiguration.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/landisk/stand/boot/conf.c b/sys/arch/landisk/stand/boot/conf.c
index 8309fa77c5e..b241f7e40ca 100644
--- a/sys/arch/landisk/stand/boot/conf.c
+++ b/sys/arch/landisk/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.9 2016/09/13 18:27:49 jasper Exp $ */
+/* $OpenBSD: conf.c,v 1.10 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2006 Michael Shalayeff
@@ -18,7 +18,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <libsa.h>
#include <lib/libsa/ufs.h>
#ifdef notdef
diff --git a/sys/arch/luna88k/cbus/i82365_cbus.c b/sys/arch/luna88k/cbus/i82365_cbus.c
index 9955a5a22ee..6bf0b878d40 100644
--- a/sys/arch/luna88k/cbus/i82365_cbus.c
+++ b/sys/arch/luna88k/cbus/i82365_cbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365_cbus.c,v 1.4 2017/03/16 18:13:43 miod Exp $ */
+/* $OpenBSD: i82365_cbus.c,v 1.5 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $ */
/*
@@ -35,7 +35,6 @@
* based on OpenBSD:src/sys/dev/isa/i82365_isa{,subr}.c
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/luna88k/dev/xp.c b/sys/arch/luna88k/dev/xp.c
index bf801267ce4..01b480c0515 100644
--- a/sys/arch/luna88k/dev/xp.c
+++ b/sys/arch/luna88k/dev/xp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xp.c,v 1.2 2017/01/09 08:46:13 aoyama Exp $ */
+/* $OpenBSD: xp.c,v 1.3 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: xp.c,v 1.1 2016/12/03 17:38:02 tsutsui Exp $ */
/*-
@@ -36,7 +36,6 @@
#include <sys/ioctl.h>
#include <sys/malloc.h>
#include <sys/errno.h>
-#include <sys/types.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/arch/m88k/m88k/fpu.c b/sys/arch/m88k/m88k/fpu.c
index 327d6ef0dd9..5c8785ae58b 100644
--- a/sys/arch/m88k/m88k/fpu.c
+++ b/sys/arch/m88k/m88k/fpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu.c,v 1.2 2014/07/02 18:44:09 miod Exp $ */
+/* $OpenBSD: fpu.c,v 1.3 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2007, 2014, Miodrag Vallat.
@@ -22,7 +22,6 @@
* code.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/proc.h>
diff --git a/sys/arch/m88k/m88k/m88100_fp.c b/sys/arch/m88k/m88k/m88100_fp.c
index 582f0a11c62..5c7adf2bcbb 100644
--- a/sys/arch/m88k/m88k/m88100_fp.c
+++ b/sys/arch/m88k/m88k/m88100_fp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m88100_fp.c,v 1.3 2014/07/02 20:28:08 miod Exp $ */
+/* $OpenBSD: m88100_fp.c,v 1.4 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2007, 2014, Miodrag Vallat.
@@ -17,7 +17,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
diff --git a/sys/arch/m88k/m88k/m88110_fp.c b/sys/arch/m88k/m88k/m88110_fp.c
index 7b60277d657..0ddd911656b 100644
--- a/sys/arch/m88k/m88k/m88110_fp.c
+++ b/sys/arch/m88k/m88k/m88110_fp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m88110_fp.c,v 1.10 2014/06/09 16:26:32 miod Exp $ */
+/* $OpenBSD: m88110_fp.c,v 1.11 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2007, Miodrag Vallat.
@@ -17,7 +17,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
diff --git a/sys/arch/m88k/m88k/trap.c b/sys/arch/m88k/m88k/trap.c
index de8a5f2fdd0..032cab05327 100644
--- a/sys/arch/m88k/m88k/trap.c
+++ b/sys/arch/m88k/m88k/trap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: trap.c,v 1.106 2017/02/15 21:18:52 miod Exp $ */
+/* $OpenBSD: trap.c,v 1.107 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
* Copyright (c) 1998 Steve Murphree, Jr.
@@ -45,7 +45,6 @@
*
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/signalvar.h>
diff --git a/sys/arch/macppc/dev/esp.c b/sys/arch/macppc/dev/esp.c
index 2d585534133..b52b9bb333b 100644
--- a/sys/arch/macppc/dev/esp.c
+++ b/sys/arch/macppc/dev/esp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp.c,v 1.11 2014/01/21 03:42:21 dlg Exp $ */
+/* $OpenBSD: esp.c,v 1.12 2017/09/08 05:36:52 deraadt Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -69,7 +69,6 @@
* Charles Hannum (mycroft@duality.gnu.ai.mit.edu). Thanks a million!
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/macppc/dev/macgpio.c b/sys/arch/macppc/dev/macgpio.c
index 75d31b3e610..a1b192bd78a 100644
--- a/sys/arch/macppc/dev/macgpio.c
+++ b/sys/arch/macppc/dev/macgpio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: macgpio.c,v 1.8 2015/06/24 11:58:06 mpi Exp $ */
+/* $OpenBSD: macgpio.c,v 1.9 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: gpio.c,v 1.2 2001/02/27 05:16:33 matt Exp $ */
/*-
@@ -32,7 +32,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/macppc/dev/pgs.c b/sys/arch/macppc/dev/pgs.c
index 62aba5a1cb4..82950d70242 100644
--- a/sys/arch/macppc/dev/pgs.c
+++ b/sys/arch/macppc/dev/pgs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pgs.c,v 1.4 2017/04/30 16:45:45 mpi Exp $ */
+/* $OpenBSD: pgs.c,v 1.5 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2010 Jasper Lievisse Adriaanse <jasper@openbsd.org>
*
@@ -20,7 +20,6 @@
* which can be found on many "Old World" and some early "New World" MacPPC.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/arch/macppc/dev/sysbutton.c b/sys/arch/macppc/dev/sysbutton.c
index e982d15d58e..f946738424d 100644
--- a/sys/arch/macppc/dev/sysbutton.c
+++ b/sys/arch/macppc/dev/sysbutton.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysbutton.c,v 1.5 2017/04/30 16:45:45 mpi Exp $ */
+/* $OpenBSD: sysbutton.c,v 1.6 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2007 Gordon Willem Klok <gwk@openbsd.org>
*
@@ -15,7 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/arch/macppc/dev/xlights.c b/sys/arch/macppc/dev/xlights.c
index ca2a28ee38d..8ab39f37b7c 100644
--- a/sys/arch/macppc/dev/xlights.c
+++ b/sys/arch/macppc/dev/xlights.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xlights.c,v 1.7 2015/06/24 11:58:06 mpi Exp $ */
+/* $OpenBSD: xlights.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2007 Gordon Willem Klok <gwk@openbsd,org>
*
@@ -14,7 +14,6 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/arch/macppc/macppc/mem.c b/sys/arch/macppc/macppc/mem.c
index 0404d92dad9..e84f574b743 100644
--- a/sys/arch/macppc/macppc/mem.c
+++ b/sys/arch/macppc/macppc/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.24 2016/09/25 15:23:37 deraadt Exp $ */
+/* $OpenBSD: mem.c,v 1.25 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: mem.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */
/*
@@ -47,7 +47,6 @@
#include <sys/ioccom.h>
#include <sys/uio.h>
#include <sys/malloc.h>
-#include <sys/types.h>
#include <machine/cpu.h>
diff --git a/sys/arch/macppc/pci/macobio.c b/sys/arch/macppc/pci/macobio.c
index 40f9cf3b6dc..b03e7ed5e55 100644
--- a/sys/arch/macppc/pci/macobio.c
+++ b/sys/arch/macppc/pci/macobio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: macobio.c,v 1.21 2015/04/02 11:12:24 mpi Exp $ */
+/* $OpenBSD: macobio.c,v 1.22 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: obio.c,v 1.6 1999/05/01 10:36:08 tsubai Exp $ */
/*-
@@ -32,7 +32,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/macppc/pci/pchb.c b/sys/arch/macppc/pci/pchb.c
index 5a8e9632656..000b5a860c5 100644
--- a/sys/arch/macppc/pci/pchb.c
+++ b/sys/arch/macppc/pci/pchb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pchb.c,v 1.14 2014/03/26 14:41:41 mpi Exp $ */
+/* $OpenBSD: pchb.c,v 1.15 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: pchb.c,v 1.4 2000/01/25 07:19:11 tsubai Exp $ */
/*-
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/arch/octeon/dev/cn30xxfpa.c b/sys/arch/octeon/dev/cn30xxfpa.c
index 9761815b44f..182bc844d7e 100644
--- a/sys/arch/octeon/dev/cn30xxfpa.c
+++ b/sys/arch/octeon/dev/cn30xxfpa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cn30xxfpa.c,v 1.6 2015/11/19 14:08:09 visa Exp $ */
+/* $OpenBSD: cn30xxfpa.c,v 1.7 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -30,7 +30,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/malloc.h>
#include <machine/bus.h>
diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c
index 4dd98a8ff9a..e826907a05d 100644
--- a/sys/arch/octeon/dev/cn30xxgmx.c
+++ b/sys/arch/octeon/dev/cn30xxgmx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cn30xxgmx.c,v 1.35 2017/06/29 10:56:18 visa Exp $ */
+/* $OpenBSD: cn30xxgmx.c,v 1.36 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -28,7 +28,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/syslog.h>
diff --git a/sys/arch/octeon/dev/cn30xxpow.c b/sys/arch/octeon/dev/cn30xxpow.c
index 11fd9c3c17b..62146ab7223 100644
--- a/sys/arch/octeon/dev/cn30xxpow.c
+++ b/sys/arch/octeon/dev/cn30xxpow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cn30xxpow.c,v 1.9 2017/04/30 04:32:58 visa Exp $ */
+/* $OpenBSD: cn30xxpow.c,v 1.10 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -28,7 +28,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/kernel.h> /* hz */
#include <sys/malloc.h>
diff --git a/sys/arch/sgi/dev/impact.c b/sys/arch/sgi/dev/impact.c
index dd589faa3bc..7c181e267e6 100644
--- a/sys/arch/sgi/dev/impact.c
+++ b/sys/arch/sgi/dev/impact.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: impact.c,v 1.8 2015/09/08 10:21:50 deraadt Exp $ */
+/* $OpenBSD: impact.c,v 1.9 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2010, 2012 Miodrag Vallat.
@@ -49,7 +49,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/types.h>
#include <sys/malloc.h>
#include <machine/bus.h>
diff --git a/sys/arch/sgi/gio/impact_gio.c b/sys/arch/sgi/gio/impact_gio.c
index dc050c08ab2..e964cef2ad7 100644
--- a/sys/arch/sgi/gio/impact_gio.c
+++ b/sys/arch/sgi/gio/impact_gio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: impact_gio.c,v 1.6 2012/10/03 22:46:09 miod Exp $ */
+/* $OpenBSD: impact_gio.c,v 1.7 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2012 Miodrag Vallat.
@@ -24,7 +24,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/types.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/sgi/stand/sgivol/sgivol.c b/sys/arch/sgi/stand/sgivol/sgivol.c
index b4b2993cc07..1066bf00eab 100644
--- a/sys/arch/sgi/stand/sgivol/sgivol.c
+++ b/sys/arch/sgi/stand/sgivol/sgivol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sgivol.c,v 1.23 2014/07/12 19:01:49 tedu Exp $ */
+/* $OpenBSD: sgivol.c,v 1.24 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: sgivol.c,v 1.8 2003/11/08 04:59:00 sekiya Exp $ */
/*-
@@ -44,7 +44,6 @@
#include <sys/ioctl.h>
#include <sys/param.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <sys/dkio.h>
/*
diff --git a/sys/arch/sgi/xbow/impact_xbow.c b/sys/arch/sgi/xbow/impact_xbow.c
index 53e637b1282..bfe2bb350a3 100644
--- a/sys/arch/sgi/xbow/impact_xbow.c
+++ b/sys/arch/sgi/xbow/impact_xbow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: impact_xbow.c,v 1.1 2012/04/18 17:28:24 miod Exp $ */
+/* $OpenBSD: impact_xbow.c,v 1.2 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2010, 2012 Miodrag Vallat.
@@ -25,7 +25,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/types.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/sgi/xbow/odyssey.c b/sys/arch/sgi/xbow/odyssey.c
index 0f1bfebfe9c..64c46aee053 100644
--- a/sys/arch/sgi/xbow/odyssey.c
+++ b/sys/arch/sgi/xbow/odyssey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: odyssey.c,v 1.11 2014/03/09 10:01:25 miod Exp $ */
+/* $OpenBSD: odyssey.c,v 1.12 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2009, 2010 Joel Sing <jsing@openbsd.org>
*
@@ -29,7 +29,6 @@
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/types.h>
#include <sys/malloc.h>
#include <machine/autoconf.h>
diff --git a/sys/arch/socppc/socppc/mem.c b/sys/arch/socppc/socppc/mem.c
index 54aaa6688ba..c9450994ed8 100644
--- a/sys/arch/socppc/socppc/mem.c
+++ b/sys/arch/socppc/socppc/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.6 2016/09/25 15:23:37 deraadt Exp $ */
+/* $OpenBSD: mem.c,v 1.7 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: mem.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */
/*
@@ -47,7 +47,6 @@
#include <sys/ioccom.h>
#include <sys/uio.h>
#include <sys/malloc.h>
-#include <sys/types.h>
#include <machine/cpu.h>
diff --git a/sys/arch/socppc/stand/boot/fdt.c b/sys/arch/socppc/stand/boot/fdt.c
index 788257c7b10..f788e3d5094 100644
--- a/sys/arch/socppc/stand/boot/fdt.c
+++ b/sys/arch/socppc/stand/boot/fdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fdt.c,v 1.6 2016/11/14 09:21:41 mpi Exp $ */
+/* $OpenBSD: fdt.c,v 1.7 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2009 Dariusz Swiderski <sfires@sfires.net>
@@ -17,7 +17,6 @@
*/
-#include <sys/types.h>
#include <sys/param.h>
#include "fdt.h"
diff --git a/sys/arch/socppc/stand/boot/wd.c b/sys/arch/socppc/stand/boot/wd.c
index c55e550eddc..1a5369aafda 100644
--- a/sys/arch/socppc/stand/boot/wd.c
+++ b/sys/arch/socppc/stand/boot/wd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wd.c,v 1.9 2015/10/01 20:28:12 krw Exp $ */
+/* $OpenBSD: wd.c,v 1.10 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: wd.c,v 1.5 2005/12/11 12:17:06 christos Exp $ */
/*-
@@ -31,7 +31,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/stdint.h>
#include "libsa.h"
diff --git a/sys/arch/sparc64/dev/beep.c b/sys/arch/sparc64/dev/beep.c
index bcb7067e260..c109e0a4e92 100644
--- a/sys/arch/sparc64/dev/beep.c
+++ b/sys/arch/sparc64/dev/beep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: beep.c,v 1.7 2016/03/19 11:34:22 mpi Exp $ */
+/* $OpenBSD: beep.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2006 Jason L. Wright (jason@thought.net)
@@ -30,7 +30,6 @@
* Driver for beeper device on BBC machines (Blade 1k, 2k, etc)
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/sparc64/dev/beeper.c b/sys/arch/sparc64/dev/beeper.c
index 73fd981a336..895979efedf 100644
--- a/sys/arch/sparc64/dev/beeper.c
+++ b/sys/arch/sparc64/dev/beeper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: beeper.c,v 1.11 2016/03/19 11:34:22 mpi Exp $ */
+/* $OpenBSD: beeper.c,v 1.12 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -35,7 +35,6 @@
* Driver for beeper device on SUNW,Ultra-1-Engine.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/sparc64/dev/central.c b/sys/arch/sparc64/dev/central.c
index 01515baa85b..2a42a3d3ef9 100644
--- a/sys/arch/sparc64/dev/central.c
+++ b/sys/arch/sparc64/dev/central.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: central.c,v 1.9 2015/12/29 04:46:28 mmcc Exp $ */
+/* $OpenBSD: central.c,v 1.10 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2004 Jason L. Wright (jason@thought.net)
@@ -26,7 +26,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/sparc64/dev/com_ebus.c b/sys/arch/sparc64/dev/com_ebus.c
index 7d2541abf88..9c9d88bffcc 100644
--- a/sys/arch/sparc64/dev/com_ebus.c
+++ b/sys/arch/sparc64/dev/com_ebus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_ebus.c,v 1.21 2011/09/28 11:02:37 dlg Exp $ */
+/* $OpenBSD: com_ebus.c,v 1.22 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: com_ebus.c,v 1.6 2001/07/24 19:27:10 eeh Exp $ */
/*
@@ -33,7 +33,6 @@
* NS Super I/O PC87332VLJ "com" to ebus attachment
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/arch/sparc64/dev/creator.c b/sys/arch/sparc64/dev/creator.c
index 633a9f0c3a6..8edeb55c36c 100644
--- a/sys/arch/sparc64/dev/creator.c
+++ b/sys/arch/sparc64/dev/creator.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: creator.c,v 1.50 2015/12/11 16:07:01 mpi Exp $ */
+/* $OpenBSD: creator.c,v 1.51 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -26,7 +26,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/sparc64/dev/fhc.c b/sys/arch/sparc64/dev/fhc.c
index 3912292a33e..23b77c0e277 100644
--- a/sys/arch/sparc64/dev/fhc.c
+++ b/sys/arch/sparc64/dev/fhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fhc.c,v 1.20 2015/09/19 21:07:04 semarie Exp $ */
+/* $OpenBSD: fhc.c,v 1.21 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2004 Jason L. Wright (jason@thought.net)
@@ -26,7 +26,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/sparc64/dev/fhc_central.c b/sys/arch/sparc64/dev/fhc_central.c
index 95d5f78fe50..73e49ee7d1f 100644
--- a/sys/arch/sparc64/dev/fhc_central.c
+++ b/sys/arch/sparc64/dev/fhc_central.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fhc_central.c,v 1.5 2004/09/27 18:32:35 jason Exp $ */
+/* $OpenBSD: fhc_central.c,v 1.6 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2004 Jason L. Wright (jason@thought.net).
@@ -26,7 +26,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/sparc64/dev/fhc_mainbus.c b/sys/arch/sparc64/dev/fhc_mainbus.c
index 1d5b55ea0ea..99fc1579a56 100644
--- a/sys/arch/sparc64/dev/fhc_mainbus.c
+++ b/sys/arch/sparc64/dev/fhc_mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fhc_mainbus.c,v 1.4 2004/09/27 18:32:35 jason Exp $ */
+/* $OpenBSD: fhc_mainbus.c,v 1.5 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2004 Jason L. Wright (jason@thought.net).
@@ -26,7 +26,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/sparc64/dev/lpt_ebus.c b/sys/arch/sparc64/dev/lpt_ebus.c
index 739b81ce769..b1f9c4ba9d0 100644
--- a/sys/arch/sparc64/dev/lpt_ebus.c
+++ b/sys/arch/sparc64/dev/lpt_ebus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpt_ebus.c,v 1.8 2003/12/16 15:04:56 jason Exp $ */
+/* $OpenBSD: lpt_ebus.c,v 1.9 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: lpt_ebus.c,v 1.8 2002/03/01 11:51:00 martin Exp $ */
/*
@@ -33,7 +33,6 @@
* NS Super I/O PC87332VLJ "lpt" to ebus attachment
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/arch/sparc64/dev/pci_machdep.c b/sys/arch/sparc64/dev/pci_machdep.c
index 967db32027d..b1f4422a785 100644
--- a/sys/arch/sparc64/dev/pci_machdep.c
+++ b/sys/arch/sparc64/dev/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_machdep.c,v 1.44 2014/05/10 12:15:19 kettenis Exp $ */
+/* $OpenBSD: pci_machdep.c,v 1.45 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: pci_machdep.c,v 1.22 2001/07/20 00:07:13 eeh Exp $ */
/*
@@ -44,7 +44,6 @@ int sparc_pci_debug = 0x0;
#define DPRINTF(l, s) do { } while (0)
#endif
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/arch/sparc64/dev/pckbc_ebus.c b/sys/arch/sparc64/dev/pckbc_ebus.c
index 4814ca75d5a..ac41b53d8f9 100644
--- a/sys/arch/sparc64/dev/pckbc_ebus.c
+++ b/sys/arch/sparc64/dev/pckbc_ebus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbc_ebus.c,v 1.13 2015/05/24 10:57:47 miod Exp $ */
+/* $OpenBSD: pckbc_ebus.c,v 1.14 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -36,7 +36,6 @@
*
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/arch/sparc64/dev/power.c b/sys/arch/sparc64/dev/power.c
index bde18c16559..3ff4dcc425d 100644
--- a/sys/arch/sparc64/dev/power.c
+++ b/sys/arch/sparc64/dev/power.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: power.c,v 1.7 2014/07/11 08:18:31 guenther Exp $ */
+/* $OpenBSD: power.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2006 Jason L. Wright (jason@thought.net)
@@ -30,7 +30,6 @@
* Driver for power-button device on U5, U10, etc.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/sparc64/dev/ppm.c b/sys/arch/sparc64/dev/ppm.c
index 5096daab6a4..f351dec36cc 100644
--- a/sys/arch/sparc64/dev/ppm.c
+++ b/sys/arch/sparc64/dev/ppm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppm.c,v 1.1 2006/06/02 04:46:01 jason Exp $ */
+/* $OpenBSD: ppm.c,v 1.2 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2006 Jason L. Wright (jason@thought.net)
@@ -26,7 +26,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/arch/sparc64/dev/sab.c b/sys/arch/sparc64/dev/sab.c
index feb9de16f45..f237fd09948 100644
--- a/sys/arch/sparc64/dev/sab.c
+++ b/sys/arch/sparc64/dev/sab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sab.c,v 1.32 2017/04/30 16:45:45 mpi Exp $ */
+/* $OpenBSD: sab.c,v 1.33 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2001 Jason L. Wright (jason@thought.net)
@@ -35,7 +35,6 @@
* SAB82532 Dual UART driver
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/arch/sparc64/dev/upa.c b/sys/arch/sparc64/dev/upa.c
index a6156a459cb..aea9e43ad42 100644
--- a/sys/arch/sparc64/dev/upa.c
+++ b/sys/arch/sparc64/dev/upa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: upa.c,v 1.9 2010/11/11 17:58:23 miod Exp $ */
+/* $OpenBSD: upa.c,v 1.10 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -31,7 +31,6 @@
*
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/sparc64/dev/uperf.c b/sys/arch/sparc64/dev/uperf.c
index d8188c96018..cb39277e96d 100644
--- a/sys/arch/sparc64/dev/uperf.c
+++ b/sys/arch/sparc64/dev/uperf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uperf.c,v 1.7 2016/12/20 13:47:38 jsg Exp $ */
+/* $OpenBSD: uperf.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -31,7 +31,6 @@
*
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/arch/sparc64/dev/uperf_ebus.c b/sys/arch/sparc64/dev/uperf_ebus.c
index 9a3349a46b1..406918d9984 100644
--- a/sys/arch/sparc64/dev/uperf_ebus.c
+++ b/sys/arch/sparc64/dev/uperf_ebus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uperf_ebus.c,v 1.5 2008/12/15 22:33:06 kettenis Exp $ */
+/* $OpenBSD: uperf_ebus.c,v 1.6 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -31,7 +31,6 @@
*
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/ddb/db_ctf.c b/sys/ddb/db_ctf.c
index e38226e3a9b..6b67b962e84 100644
--- a/sys/ddb/db_ctf.c
+++ b/sys/ddb/db_ctf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_ctf.c,v 1.19 2017/09/06 09:49:35 dlg Exp $ */
+/* $OpenBSD: db_ctf.c,v 1.20 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2016-2017 Martin Pieuchot
@@ -17,9 +17,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/stdint.h>
#include <sys/param.h>
+#include <sys/stdint.h>
#include <sys/systm.h>
#include <sys/exec.h>
diff --git a/sys/ddb/db_dwarf.c b/sys/ddb/db_dwarf.c
index 5956d602664..5000479fac2 100644
--- a/sys/ddb/db_dwarf.c
+++ b/sys/ddb/db_dwarf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_dwarf.c,v 1.5 2016/04/20 08:02:59 mpi Exp $ */
+/* $OpenBSD: db_dwarf.c,v 1.6 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2014 Matthew Dempsky <matthew@dempsky.org>
*
@@ -18,7 +18,6 @@
#ifdef _KERNEL
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <machine/db_machdep.h>
#include <ddb/db_sym.h>
#ifdef DIAGNOSTIC
diff --git a/sys/ddb/db_elf.c b/sys/ddb/db_elf.c
index dbf41c127af..3d463d7c3d4 100644
--- a/sys/ddb/db_elf.c
+++ b/sys/ddb/db_elf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_elf.c,v 1.27 2017/08/10 19:39:38 mpi Exp $ */
+/* $OpenBSD: db_elf.c,v 1.28 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: db_elf.c,v 1.13 2000/07/07 21:55:18 jhawk Exp $ */
/*-
@@ -31,9 +31,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
-#include <sys/stdint.h>
#include <sys/param.h>
+#include <sys/stdint.h>
#include <sys/systm.h>
#include <sys/exec.h>
diff --git a/sys/ddb/db_usrreq.c b/sys/ddb/db_usrreq.c
index 678680cafe0..546822459ca 100644
--- a/sys/ddb/db_usrreq.c
+++ b/sys/ddb/db_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_usrreq.c,v 1.19 2017/04/30 16:45:45 mpi Exp $ */
+/* $OpenBSD: db_usrreq.c,v 1.20 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff. All rights reserved.
@@ -25,7 +25,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/tty.h>
diff --git a/sys/dev/diskmap.c b/sys/dev/diskmap.c
index ef3e90c517d..4550cffc264 100644
--- a/sys/dev/diskmap.c
+++ b/sys/dev/diskmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diskmap.c,v 1.15 2016/04/29 14:40:36 beck Exp $ */
+/* $OpenBSD: diskmap.c,v 1.16 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2009, 2010 Joel Sing <jsing@openbsd.org>
@@ -21,7 +21,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/errno.h>
diff --git a/sys/dev/eisa/cac_eisa.c b/sys/dev/eisa/cac_eisa.c
index 1e9ce07c86f..ff6f85d47ac 100644
--- a/sys/dev/eisa/cac_eisa.c
+++ b/sys/dev/eisa/cac_eisa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cac_eisa.c,v 1.4 2009/06/02 11:38:21 deraadt Exp $ */
+/* $OpenBSD: cac_eisa.c,v 1.5 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: cac_eisa.c,v 1.1 2000/09/01 12:15:20 ad Exp $ */
/*-
@@ -61,7 +61,6 @@
* EISA front-end for cac(4) driver.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/eisa/dpt_eisa.c b/sys/dev/eisa/dpt_eisa.c
index e8f6700b343..48036b16ecc 100644
--- a/sys/dev/eisa/dpt_eisa.c
+++ b/sys/dev/eisa/dpt_eisa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dpt_eisa.c,v 1.4 2008/05/13 02:24:08 brad Exp $ */
+/* $OpenBSD: dpt_eisa.c,v 1.5 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: dpt_eisa.c,v 1.2 1999/10/18 21:59:19 ad Exp $ */
/*
@@ -32,7 +32,6 @@
* EISA front-end for DPT EATA SCSI driver.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c
index 4a9b851d7eb..9d2fe688bf1 100644
--- a/sys/dev/eisa/uha_eisa.c
+++ b/sys/dev/eisa/uha_eisa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha_eisa.c,v 1.13 2014/09/14 14:17:24 jsg Exp $ */
+/* $OpenBSD: uha_eisa.c,v 1.14 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: uha_eisa.c,v 1.5 1996/10/21 22:31:07 thorpej Exp $ */
/*
@@ -30,7 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/fdt/if_mvneta.c b/sys/dev/fdt/if_mvneta.c
index bff95633672..525702554ad 100644
--- a/sys/dev/fdt/if_mvneta.c
+++ b/sys/dev/fdt/if_mvneta.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mvneta.c,v 1.1 2017/08/25 20:09:34 patrick Exp $ */
+/* $OpenBSD: if_mvneta.c,v 1.2 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: if_mvneta.c,v 1.41 2015/04/15 10:15:40 hsuenaga Exp $ */
/*
* Copyright (c) 2007, 2008, 2013 KIYOHARA Takashi
@@ -37,7 +37,6 @@
#include <sys/mutex.h>
#include <sys/socket.h>
#include <sys/sockio.h>
-#include <sys/types.h>
#include <uvm/uvm_extern.h>
#include <sys/mbuf.h>
diff --git a/sys/dev/fdt/sxiccmu.c b/sys/dev/fdt/sxiccmu.c
index 0cfa7aaf464..0f82e39f52a 100644
--- a/sys/dev/fdt/sxiccmu.c
+++ b/sys/dev/fdt/sxiccmu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sxiccmu.c,v 1.6 2017/09/02 21:44:52 patrick Exp $ */
+/* $OpenBSD: sxiccmu.c,v 1.7 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2013 Artturi Alm
@@ -17,7 +17,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index 0040b999a02..4456418104b 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adv.c,v 1.36 2014/09/14 14:17:24 jsg Exp $ */
+/* $OpenBSD: adv.c,v 1.37 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: adv.c,v 1.6 1998/10/28 20:39:45 dante Exp $ */
/*
@@ -31,7 +31,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/ic/advlib.c b/sys/dev/ic/advlib.c
index 2984cbdfc5b..8386ec2807b 100644
--- a/sys/dev/ic/advlib.c
+++ b/sys/dev/ic/advlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: advlib.c,v 1.14 2013/11/15 16:46:27 brad Exp $ */
+/* $OpenBSD: advlib.c,v 1.15 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: advlib.c,v 1.7 1998/10/28 20:39:46 dante Exp $ */
/*
@@ -46,7 +46,6 @@
*
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index c1efc7f0c13..8ffd2b3d0d4 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adw.c,v 1.54 2017/04/11 14:43:49 dhill Exp $ */
+/* $OpenBSD: adw.c,v 1.55 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */
/*
@@ -31,7 +31,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c
index 2852a1531e1..fc17cdf5e3c 100644
--- a/sys/dev/ic/adwlib.c
+++ b/sys/dev/ic/adwlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adwlib.c,v 1.24 2012/01/11 16:22:32 dhill Exp $ */
+/* $OpenBSD: adwlib.c,v 1.25 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: adwlib.c,v 1.20 2000/07/04 04:17:03 itojun Exp $ */
/*
@@ -45,7 +45,6 @@
* modification.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/dev/ic/aic6250.c b/sys/dev/ic/aic6250.c
index d438d82ee3a..23297285bc9 100644
--- a/sys/dev/ic/aic6250.c
+++ b/sys/dev/ic/aic6250.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic6250.c,v 1.3 2017/04/30 16:45:45 mpi Exp $ */
+/* $OpenBSD: aic6250.c,v 1.4 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2010, 2013 Miodrag Vallat.
@@ -105,7 +105,6 @@
/* End of customizable parameters */
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index 3520ea837e0..46da32e9007 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic6360.c,v 1.28 2017/04/30 16:45:46 mpi Exp $ */
+/* $OpenBSD: aic6360.c,v 1.29 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */
#ifdef DDB
@@ -122,7 +122,6 @@
#error "I said not yet! Start paying attention... grumble"
#endif
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index db0de53b04c..ee04f178247 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwi.c,v 1.125 2017/07/03 09:21:09 kevlo Exp $ */
+/* $OpenBSD: bwi.c,v 1.126 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -39,7 +39,6 @@
#include "bpfilter.h"
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/device.h>
#include <sys/kernel.h>
diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c
index e86e205dd4f..dacd33b96e5 100644
--- a/sys/dev/ic/cy.c
+++ b/sys/dev/ic/cy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cy.c,v 1.36 2017/02/01 16:46:57 bluhm Exp $ */
+/* $OpenBSD: cy.c,v 1.37 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 1996 Timo Rossi.
* All rights reserved.
@@ -50,7 +50,6 @@
*
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/syslog.h>
diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c
index 7d34c3c1a42..f8cf68ccdc5 100644
--- a/sys/dev/ic/i82365.c
+++ b/sys/dev/ic/i82365.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365.c,v 1.35 2017/04/08 02:57:25 deraadt Exp $ */
+/* $OpenBSD: i82365.c,v 1.36 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: i82365.c,v 1.10 1998/06/09 07:36:55 thorpej Exp $ */
/*
@@ -30,7 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/lsi64854.c b/sys/dev/ic/lsi64854.c
index 8ff1d1cdff6..4ac686fe2e7 100644
--- a/sys/dev/ic/lsi64854.c
+++ b/sys/dev/ic/lsi64854.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lsi64854.c,v 1.10 2014/07/08 17:19:25 deraadt Exp $ */
+/* $OpenBSD: lsi64854.c,v 1.11 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: lsi64854.c,v 1.18 2001/06/04 20:56:51 mrg Exp $ */
/*-
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index b1044bb9bd3..2cb532c47b6 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: malo.c,v 1.114 2017/04/04 04:38:31 deraadt Exp $ */
+/* $OpenBSD: malo.c,v 1.115 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -20,7 +20,6 @@
#include "bpfilter.h"
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/device.h>
#include <sys/kernel.h>
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index 6950d46b7ed..57fe533211b 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.167 2017/02/02 03:47:41 dlg Exp $ */
+/* $OpenBSD: mfi.c,v 1.168 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
*
@@ -17,7 +17,6 @@
#include "bio.h"
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c
index ce030d61692..38d0ae6f885 100644
--- a/sys/dev/ic/ncr5380sbc.c
+++ b/sys/dev/ic/ncr5380sbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr5380sbc.c,v 1.33 2017/04/30 16:45:46 mpi Exp $ */
+/* $OpenBSD: ncr5380sbc.c,v 1.34 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: ncr5380sbc.c,v 1.13 1996/10/13 01:37:25 christos Exp $ */
/*
@@ -67,7 +67,6 @@
* There are others too. Thanks, everyone.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index fa00dbf7453..e4a25139049 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr53c9x.c,v 1.63 2016/09/15 02:00:17 dlg Exp $ */
+/* $OpenBSD: ncr53c9x.c,v 1.64 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $ */
/*
@@ -65,7 +65,6 @@
* Charles Hannum (mycroft@duality.gnu.ai.mit.edu). Thanks a million!
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index b5d84ed78f2..51aaaedb706 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtw.c,v 1.98 2017/04/08 02:57:25 deraadt Exp $ */
+/* $OpenBSD: rtw.c,v 1.99 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */
/*-
@@ -45,7 +45,6 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/time.h>
-#include <sys/types.h>
#include <sys/endian.h>
#include <machine/bus.h>
diff --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c
index 52277af36d2..fa491ac096e 100644
--- a/sys/dev/ic/tcic2.c
+++ b/sys/dev/ic/tcic2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcic2.c,v 1.11 2014/07/12 18:48:17 tedu Exp $ */
+/* $OpenBSD: tcic2.c,v 1.12 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: tcic2.c,v 1.3 2000/01/13 09:38:17 joda Exp $ */
#undef TCICDEBUG
@@ -33,7 +33,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 58b35570398..b0f3b08f5ab 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha.c,v 1.25 2017/07/26 03:36:19 deraadt Exp $ */
+/* $OpenBSD: uha.c,v 1.26 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $ */
#undef UHADEBUG
@@ -54,7 +54,6 @@
* slight mod to make work with 34F as well: Wed Jun 2 18:05:48 WST 1993
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/ipmi.c b/sys/dev/ipmi.c
index 07bc1c87863..788838a1d60 100644
--- a/sys/dev/ipmi.c
+++ b/sys/dev/ipmi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipmi.c,v 1.98 2017/06/29 03:48:44 tedu Exp $ */
+/* $OpenBSD: ipmi.c,v 1.99 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2015 Masao Uebayashi
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c
index 8e23b412809..576f6072915 100644
--- a/sys/dev/isa/aic_isa.c
+++ b/sys/dev/isa/aic_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic_isa.c,v 1.7 2014/09/14 14:17:25 jsg Exp $ */
+/* $OpenBSD: aic_isa.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */
/*
@@ -51,7 +51,6 @@
* Charles Hannum (mycroft@duality.gnu.ai.mit.edu). Thanks a million!
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c
index a7bdac21cf2..791c0f85244 100644
--- a/sys/dev/isa/i82365_isa.c
+++ b/sys/dev/isa/i82365_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365_isa.c,v 1.22 2010/09/07 16:21:43 deraadt Exp $ */
+/* $OpenBSD: i82365_isa.c,v 1.23 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $ */
/*
@@ -30,7 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/isa/i82365_isapnp.c b/sys/dev/isa/i82365_isapnp.c
index 85e636c5148..1acbf393471 100644
--- a/sys/dev/isa/i82365_isapnp.c
+++ b/sys/dev/isa/i82365_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365_isapnp.c,v 1.8 2010/09/07 16:21:43 deraadt Exp $ */
+/* $OpenBSD: i82365_isapnp.c,v 1.9 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: i82365_isapnp.c,v 1.8 2000/02/23 17:22:11 soren Exp $ */
/*
@@ -32,7 +32,6 @@
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/isa/i82365_isasubr.c b/sys/dev/isa/i82365_isasubr.c
index 00def7ac105..a1cb52ecd5a 100644
--- a/sys/dev/isa/i82365_isasubr.c
+++ b/sys/dev/isa/i82365_isasubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365_isasubr.c,v 1.24 2013/07/14 15:18:36 kettenis Exp $ */
+/* $OpenBSD: i82365_isasubr.c,v 1.25 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: i82365_isasubr.c,v 1.1 1998/06/07 18:28:31 sommerfe Exp $ */
/*
@@ -32,7 +32,6 @@
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index 7a17a3ef5a3..d2e979c3095 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_eg.c,v 1.48 2017/06/04 19:23:20 naddy Exp $ */
+/* $OpenBSD: if_eg.c,v 1.49 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $ */
/*
@@ -40,7 +40,6 @@
*/
#include "bpfilter.h"
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
diff --git a/sys/dev/isa/sch311x.c b/sys/dev/isa/sch311x.c
index b7b3dc4e86c..6a5ad56f509 100644
--- a/sys/dev/isa/sch311x.c
+++ b/sys/dev/isa/sch311x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sch311x.c,v 1.16 2016/08/30 12:24:07 jsg Exp $ */
+/* $OpenBSD: sch311x.c,v 1.17 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org>
* Copyright (c) 2009 Michael Knudsen <mk@openbsd.org>
@@ -24,7 +24,6 @@
#include <sys/device.h>
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/sensors.h>
#include <machine/bus.h>
diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c
index 168365ec281..f87b8fb6e8d 100644
--- a/sys/dev/isa/tcic2_isa.c
+++ b/sys/dev/isa/tcic2_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcic2_isa.c,v 1.7 2005/01/27 17:03:23 millert Exp $ */
+/* $OpenBSD: tcic2_isa.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: tcic2_isa.c,v 1.2 1999/04/08 16:14:29 bad Exp $ */
#undef TCICISADEBUG
@@ -35,7 +35,6 @@
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/isa/uha_isa.c b/sys/dev/isa/uha_isa.c
index 63e31145f5f..69bdf9b2990 100644
--- a/sys/dev/isa/uha_isa.c
+++ b/sys/dev/isa/uha_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uha_isa.c,v 1.12 2014/09/14 14:17:25 jsg Exp $ */
+/* $OpenBSD: uha_isa.c,v 1.13 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: uha_isa.c,v 1.5 1996/10/21 22:41:21 thorpej Exp $ */
/*
@@ -30,7 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/isa/wdc_isa.c b/sys/dev/isa/wdc_isa.c
index 1cf488a954a..6804ab54388 100644
--- a/sys/dev/isa/wdc_isa.c
+++ b/sys/dev/isa/wdc_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc_isa.c,v 1.15 2011/06/20 01:09:25 matthew Exp $ */
+/* $OpenBSD: wdc_isa.c,v 1.16 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: wdc_isa.c,v 1.15 1999/05/19 14:41:25 bouyer Exp $ */
/*-
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/isa/wdc_isapnp.c b/sys/dev/isa/wdc_isapnp.c
index c304ac4e919..dbe07bcb82c 100644
--- a/sys/dev/isa/wdc_isapnp.c
+++ b/sys/dev/isa/wdc_isapnp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdc_isapnp.c,v 1.10 2011/06/29 12:17:40 tedu Exp $ */
+/* $OpenBSD: wdc_isapnp.c,v 1.11 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: wdc_isapnp.c,v 1.13 1999/03/22 10:00:12 mycroft Exp $ */
/*-
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 96668c2e100..b0dfc258f41 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wds.c,v 1.42 2014/09/14 14:17:25 jsg Exp $ */
+/* $OpenBSD: wds.c,v 1.43 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */
#undef WDSDIAG
@@ -57,7 +57,6 @@
* so they decided to delete the copyright that file had on it.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/microcode/adw/adwmcode.c b/sys/dev/microcode/adw/adwmcode.c
index 9ec8fe000a2..cc564f1da64 100644
--- a/sys/dev/microcode/adw/adwmcode.c
+++ b/sys/dev/microcode/adw/adwmcode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adwmcode.c,v 1.7 2015/03/14 03:38:47 jsg Exp $ */
+/* $OpenBSD: adwmcode.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: adwmcode.c,v 1.5 2000/05/27 18:24:50 dante Exp $ */
/*
@@ -48,7 +48,6 @@
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/microcode/tusb3410/build.c b/sys/dev/microcode/tusb3410/build.c
index 41d9d4c582f..d0b0416a97d 100644
--- a/sys/dev/microcode/tusb3410/build.c
+++ b/sys/dev/microcode/tusb3410/build.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: build.c,v 1.5 2016/12/18 18:28:39 krw Exp $ */
+/* $OpenBSD: build.c,v 1.6 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2004 Theo de Raadt <deraadt@openbsd.org>
@@ -15,10 +15,9 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
+#include <sys/param.h>
#include <sys/uio.h>
#include <fcntl.h>
-#include <sys/param.h>
#include <err.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/sys/dev/pci/adv_pci.c b/sys/dev/pci/adv_pci.c
index 73a84daf9f9..bb3d26da8b0 100644
--- a/sys/dev/pci/adv_pci.c
+++ b/sys/dev/pci/adv_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adv_pci.c,v 1.11 2011/04/03 15:36:02 jasper Exp $ */
+/* $OpenBSD: adv_pci.c,v 1.12 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: adv_pci.c,v 1.5 1998/09/26 15:52:55 dante Exp $ */
/*
@@ -55,7 +55,6 @@
* 2. This board has been sold by Iomega as a Jaz Jet PCI adapter.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/dev/pci/adw_pci.c b/sys/dev/pci/adw_pci.c
index dcd9851bdd3..a895e4aac9e 100644
--- a/sys/dev/pci/adw_pci.c
+++ b/sys/dev/pci/adw_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adw_pci.c,v 1.17 2015/03/14 03:38:48 jsg Exp $ */
+/* $OpenBSD: adw_pci.c,v 1.18 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: adw_pci.c,v 1.7 2000/05/26 15:13:46 dante Exp $ */
/*
@@ -41,7 +41,6 @@
* ASB-3940U3W-00 - Bus-Master PCI Ultra3-Wide (253 CDB)
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index a45aa7f8144..b0bf480baeb 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auixp.c,v 1.38 2016/09/19 06:46:44 ratchov Exp $ */
+/* $OpenBSD: auixp.c,v 1.39 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
/*
@@ -50,9 +50,8 @@
/*#define DEBUG_AUIXP*/
-#include <sys/types.h>
-#include <sys/errno.h>
#include <sys/param.h>
+#include <sys/errno.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/device.h>
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index 79b29986add..0ef837158fe 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: azalia.c,v 1.236 2017/08/10 15:25:52 tb Exp $ */
+/* $OpenBSD: azalia.c,v 1.237 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */
/*-
@@ -46,7 +46,6 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/timeout.h>
#include <dev/audio_if.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/pci/berkwdt.c b/sys/dev/pci/berkwdt.c
index 250f3973575..0e6c3c582b5 100644
--- a/sys/dev/pci/berkwdt.c
+++ b/sys/dev/pci/berkwdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: berkwdt.c,v 1.8 2014/12/10 12:27:57 mikeb Exp $ */
+/* $OpenBSD: berkwdt.c,v 1.9 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2009 Wim Van Sebroeck <wim@iguana.be>
@@ -21,7 +21,6 @@
* http://www.pcwatchdog.com/
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c
index 72582ef38ba..c49dddd9336 100644
--- a/sys/dev/pci/emuxki.c
+++ b/sys/dev/pci/emuxki.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: emuxki.c,v 1.51 2016/09/19 06:46:44 ratchov Exp $ */
+/* $OpenBSD: emuxki.c,v 1.52 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */
/*-
@@ -49,13 +49,12 @@
* - DSP FX patches (to make fx like chipmunk)
*/
-#include <sys/types.h>
+#include <sys/param.h>
#include <sys/device.h>
#include <sys/errno.h>
#include <sys/fcntl.h>
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <sys/param.h>
#include <sys/audioio.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c
index ff66e5a560d..9ee7837269e 100644
--- a/sys/dev/pci/esa.c
+++ b/sys/dev/pci/esa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esa.c,v 1.32 2016/12/12 06:47:22 ratchov Exp $ */
+/* $OpenBSD: esa.c,v 1.33 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: esa.c,v 1.12 2002/03/24 14:17:35 jmcneill Exp $ */
/*
@@ -43,7 +43,6 @@
* driver.
*/
-#include <sys/types.h>
#include <sys/errno.h>
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/i82365_pci.c b/sys/dev/pci/i82365_pci.c
index e1e4aab8a08..b8aaf967931 100644
--- a/sys/dev/pci/i82365_pci.c
+++ b/sys/dev/pci/i82365_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i82365_pci.c,v 1.11 2010/09/07 16:21:44 deraadt Exp $ */
+/* $OpenBSD: i82365_pci.c,v 1.12 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: i82365_pci.c,v 1.11 2000/02/24 03:42:44 itohy Exp $ */
/*
@@ -34,7 +34,6 @@
* XXX this driver frontend is *very* i386 dependent and should be relocated
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index 3ba504fa5fd..bedcb8ce282 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_age.c,v 1.34 2017/01/22 10:17:38 dlg Exp $ */
+/* $OpenBSD: if_age.c,v 1.35 2017/09/08 05:36:52 deraadt Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -35,7 +35,6 @@
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/queue.h>
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index f3651cd5d29..7b5e628efe1 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_alc.c,v 1.41 2017/01/22 10:17:38 dlg Exp $ */
+/* $OpenBSD: if_alc.c,v 1.42 2017/09/08 05:36:52 deraadt Exp $ */
/*-
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -34,7 +34,6 @@
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/queue.h>
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index 5f4743cb53b..8b920166646 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ale.c,v 1.45 2017/01/22 10:17:38 dlg Exp $ */
+/* $OpenBSD: if_ale.c,v 1.46 2017/09/08 05:36:52 deraadt Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -36,7 +36,6 @@
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/queue.h>
diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c
index 9abe09ad806..ee388194231 100644
--- a/sys/dev/pci/if_et.c
+++ b/sys/dev/pci/if_et.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_et.c,v 1.36 2017/07/19 12:25:34 claudio Exp $ */
+/* $OpenBSD: if_et.c,v 1.37 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
*
@@ -40,7 +40,6 @@
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/queue.h>
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index f4db392702a..0802298e04d 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_jme.c,v 1.49 2017/01/22 10:17:38 dlg Exp $ */
+/* $OpenBSD: if_jme.c,v 1.50 2017/09/08 05:36:52 deraadt Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -35,7 +35,6 @@
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/queue.h>
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 1a7978f9e88..4256075559b 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_nfe.c,v 1.119 2017/01/22 10:17:38 dlg Exp $ */
+/* $OpenBSD: if_nfe.c,v 1.120 2017/09/08 05:36:52 deraadt Exp $ */
/*-
* Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -25,7 +25,6 @@
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/queue.h>
diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c
index 1e50364ef22..a02e59b9ccb 100644
--- a/sys/dev/pci/if_vte.c
+++ b/sys/dev/pci/if_vte.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vte.c,v 1.20 2017/07/19 07:02:52 claudio Exp $ */
+/* $OpenBSD: if_vte.c,v 1.21 2017/09/08 05:36:52 deraadt Exp $ */
/*-
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -33,7 +33,6 @@
#include <sys/param.h>
#include <sys/endian.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/sockio.h>
#include <sys/mbuf.h>
#include <sys/queue.h>
diff --git a/sys/dev/pci/mbg.c b/sys/dev/pci/mbg.c
index de7dfdd88f9..4d9c8dace48 100644
--- a/sys/dev/pci/mbg.c
+++ b/sys/dev/pci/mbg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbg.c,v 1.29 2010/04/08 00:23:53 tedu Exp $ */
+/* $OpenBSD: mbg.c,v 1.30 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2006, 2007 Marc Balmer <mbalmer@openbsd.org>
@@ -16,7 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/mfii.c b/sys/dev/pci/mfii.c
index 95e9e69bf39..4911f374c4d 100644
--- a/sys/dev/pci/mfii.c
+++ b/sys/dev/pci/mfii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfii.c,v 1.43 2017/04/08 02:57:25 deraadt Exp $ */
+/* $OpenBSD: mfii.c,v 1.44 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2012 David Gwynne <dlg@openbsd.org>
@@ -22,7 +22,6 @@
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <sys/types.h>
#include <sys/pool.h>
#include <sys/task.h>
#include <sys/atomic.h>
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index 0fad698304b..e81db231385 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pccbb.c,v 1.96 2015/09/11 09:15:44 deraadt Exp $ */
+/* $OpenBSD: pccbb.c,v 1.97 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $ */
/*
@@ -38,7 +38,6 @@
#define LEVEL2
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/pwdog.c b/sys/dev/pci/pwdog.c
index b3f48e06e30..444810e122d 100644
--- a/sys/dev/pci/pwdog.c
+++ b/sys/dev/pci/pwdog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pwdog.c,v 1.9 2014/12/10 12:27:57 mikeb Exp $ */
+/* $OpenBSD: pwdog.c,v 1.10 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2006 Marc Balmer <mbalmer@openbsd.org>
@@ -16,7 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/wdt.c b/sys/dev/pci/wdt.c
index 874864bc18b..df89f4d24c4 100644
--- a/sys/dev/pci/wdt.c
+++ b/sys/dev/pci/wdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wdt.c,v 1.22 2014/12/10 12:27:57 mikeb Exp $ */
+/* $OpenBSD: wdt.c,v 1.23 2017/09/08 05:36:52 deraadt Exp $ */
/*-
* Copyright (c) 1998,1999 Alex Nash
@@ -27,7 +27,6 @@
*
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/device.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index 86d93195c69..e56a5251ed5 100644
--- a/sys/dev/pcmcia/com_pcmcia.c
+++ b/sys/dev/pcmcia/com_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_pcmcia.c,v 1.55 2015/03/14 03:38:49 jsg Exp $ */
+/* $OpenBSD: com_pcmcia.c,v 1.56 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */
/*
@@ -98,7 +98,6 @@
#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/syslog.h>
-#include <sys/types.h>
#include <sys/device.h>
#include <machine/intr.h>
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index 85b7401b6b9..c0f6fe1c8ca 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcmcia.c,v 1.47 2016/06/06 07:09:44 mpi Exp $ */
+/* $OpenBSD: pcmcia.c,v 1.48 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: pcmcia.c,v 1.9 1998/08/13 02:10:55 eeh Exp $ */
/*
@@ -30,7 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/pcmcia/pcmcia_cis.c b/sys/dev/pcmcia/pcmcia_cis.c
index 86677f8119b..7baf0ff7dc1 100644
--- a/sys/dev/pcmcia/pcmcia_cis.c
+++ b/sys/dev/pcmcia/pcmcia_cis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcmcia_cis.c,v 1.20 2014/07/12 18:48:52 tedu Exp $ */
+/* $OpenBSD: pcmcia_cis.c,v 1.21 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: pcmcia_cis.c,v 1.9 1998/08/22 23:41:48 msaitoh Exp $ */
/*
@@ -30,7 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/pcmcia/pcmcia_cis_quirks.c b/sys/dev/pcmcia/pcmcia_cis_quirks.c
index 62f8535a39d..1d8961e9a7d 100644
--- a/sys/dev/pcmcia/pcmcia_cis_quirks.c
+++ b/sys/dev/pcmcia/pcmcia_cis_quirks.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcmcia_cis_quirks.c,v 1.13 2017/08/24 04:06:05 jsg Exp $ */
+/* $OpenBSD: pcmcia_cis_quirks.c,v 1.14 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: pcmcia_cis_quirks.c,v 1.3 1998/12/29 09:00:28 marc Exp $ */
/*
@@ -30,7 +30,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/dev/puc/lpt_puc.c b/sys/dev/puc/lpt_puc.c
index 6301c1825c8..c53315a92ca 100644
--- a/sys/dev/puc/lpt_puc.c
+++ b/sys/dev/puc/lpt_puc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lpt_puc.c,v 1.8 2015/03/14 03:38:49 jsg Exp $ */
+/* $OpenBSD: lpt_puc.c,v 1.9 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: lpt_puc.c,v 1.1 1998/06/26 18:52:41 cgd Exp $ */
/*
@@ -38,7 +38,6 @@
* Author: Christopher G. Demetriou, May 17, 1998.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/pv/vioscsi.c b/sys/dev/pv/vioscsi.c
index cdd2a5ea3b2..a7ccd8913b3 100644
--- a/sys/dev/pv/vioscsi.c
+++ b/sys/dev/pv/vioscsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vioscsi.c,v 1.11 2017/05/30 19:28:09 sf Exp $ */
+/* $OpenBSD: vioscsi.c,v 1.12 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2013 Google Inc.
*
@@ -16,7 +16,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/mutex.h>
diff --git a/sys/dev/pv/virtiovar.h b/sys/dev/pv/virtiovar.h
index 4b1f71c7e37..0c7f2e482ca 100644
--- a/sys/dev/pv/virtiovar.h
+++ b/sys/dev/pv/virtiovar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: virtiovar.h,v 1.6 2017/06/03 08:50:38 sf Exp $ */
+/* $OpenBSD: virtiovar.h,v 1.7 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: virtiovar.h,v 1.1 2011/10/30 12:12:21 hannken Exp $ */
/*
@@ -67,9 +67,8 @@
#ifndef _DEV_PCI_VIRTIOVAR_H_
#define _DEV_PCI_VIRTIOVAR_H_
-#include <sys/types.h>
-#include <sys/queue.h>
#include <sys/param.h>
+#include <sys/queue.h>
#include <sys/device.h>
#include <sys/mutex.h>
#include <machine/bus.h>
diff --git a/sys/dev/sbus/apio.c b/sys/dev/sbus/apio.c
index ac7934169ca..2d7f38f8eab 100644
--- a/sys/dev/sbus/apio.c
+++ b/sys/dev/sbus/apio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apio.c,v 1.7 2003/06/27 01:50:52 jason Exp $ */
+/* $OpenBSD: apio.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -35,7 +35,6 @@
* Driver for Aurora 210SJ parallel ports.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/sbus/asio.c b/sys/dev/sbus/asio.c
index 7d62ddb55a1..1a71346dbb2 100644
--- a/sys/dev/sbus/asio.c
+++ b/sys/dev/sbus/asio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asio.c,v 1.10 2003/06/27 01:50:52 jason Exp $ */
+/* $OpenBSD: asio.c,v 1.11 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -35,7 +35,6 @@
* Driver for Aurora 210SJ serial ports.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/sbus/dma_sbus.c b/sys/dev/sbus/dma_sbus.c
index 62ec7f4e16e..03fa7e2d1a3 100644
--- a/sys/dev/sbus/dma_sbus.c
+++ b/sys/dev/sbus/dma_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dma_sbus.c,v 1.16 2008/06/26 05:42:18 ray Exp $ */
+/* $OpenBSD: dma_sbus.c,v 1.17 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: dma_sbus.c,v 1.5 2000/07/09 20:57:42 pk Exp $ */
/*-
@@ -54,7 +54,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c
index eacbdb15303..ba597b8a061 100644
--- a/sys/dev/sbus/esp_sbus.c
+++ b/sys/dev/sbus/esp_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: esp_sbus.c,v 1.24 2014/01/18 22:33:59 dlg Exp $ */
+/* $OpenBSD: esp_sbus.c,v 1.25 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: esp_sbus.c,v 1.14 2001/04/25 17:53:37 bouyer Exp $ */
/*-
@@ -31,7 +31,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/sbus/qec.c b/sys/dev/sbus/qec.c
index a777a961e2e..e235ee04a88 100644
--- a/sys/dev/sbus/qec.c
+++ b/sys/dev/sbus/qec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: qec.c,v 1.13 2008/06/26 05:42:18 ray Exp $ */
+/* $OpenBSD: qec.c,v 1.14 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: qec.c,v 1.12 2000/12/04 20:12:55 fvdl Exp $ */
/*-
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/sbus/uperf_sbus.c b/sys/dev/sbus/uperf_sbus.c
index ad219a3b30c..125902d19b0 100644
--- a/sys/dev/sbus/uperf_sbus.c
+++ b/sys/dev/sbus/uperf_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uperf_sbus.c,v 1.8 2008/12/15 22:35:06 kettenis Exp $ */
+/* $OpenBSD: uperf_sbus.c,v 1.9 2017/09/08 05:36:52 deraadt Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -31,7 +31,6 @@
*
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/usb/dwc2/dwc2_core.c b/sys/dev/usb/dwc2/dwc2_core.c
index 87ffe9207d6..04cbc87b61a 100644
--- a/sys/dev/usb/dwc2/dwc2_core.c
+++ b/sys/dev/usb/dwc2/dwc2_core.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwc2_core.c,v 1.8 2017/06/29 17:36:16 deraadt Exp $ */
+/* $OpenBSD: dwc2_core.c,v 1.9 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: dwc2_core.c,v 1.6 2014/04/03 06:34:58 skrll Exp $ */
/*
@@ -45,7 +45,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/signal.h>
#include <sys/proc.h>
#include <sys/timeout.h>
diff --git a/sys/dev/usb/dwc2/dwc2_hcd.c b/sys/dev/usb/dwc2/dwc2_hcd.c
index 1264bfe8d6c..7e5c91481d5 100644
--- a/sys/dev/usb/dwc2/dwc2_hcd.c
+++ b/sys/dev/usb/dwc2/dwc2_hcd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwc2_hcd.c,v 1.19 2017/06/29 17:36:16 deraadt Exp $ */
+/* $OpenBSD: dwc2_hcd.c,v 1.20 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: dwc2_hcd.c,v 1.15 2014/11/24 10:14:14 skrll Exp $ */
/*
@@ -44,7 +44,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/malloc.h>
#include <sys/signal.h>
#include <sys/proc.h>
diff --git a/sys/dev/usb/dwc2/dwc2_hcdddma.c b/sys/dev/usb/dwc2/dwc2_hcdddma.c
index 09d8de19aa7..d8584eed50d 100644
--- a/sys/dev/usb/dwc2/dwc2_hcdddma.c
+++ b/sys/dev/usb/dwc2/dwc2_hcdddma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwc2_hcdddma.c,v 1.13 2017/06/29 17:36:16 deraadt Exp $ */
+/* $OpenBSD: dwc2_hcdddma.c,v 1.14 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: dwc2_hcdddma.c,v 1.6 2014/04/03 06:34:58 skrll Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#if 0
diff --git a/sys/dev/usb/dwc2/dwc2_hcdintr.c b/sys/dev/usb/dwc2/dwc2_hcdintr.c
index 98855cdb019..49e020a6cc2 100644
--- a/sys/dev/usb/dwc2/dwc2_hcdintr.c
+++ b/sys/dev/usb/dwc2/dwc2_hcdintr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwc2_hcdintr.c,v 1.9 2017/06/29 17:36:16 deraadt Exp $ */
+/* $OpenBSD: dwc2_hcdintr.c,v 1.10 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: dwc2_hcdintr.c,v 1.11 2014/11/24 10:14:14 skrll Exp $ */
/*
@@ -43,7 +43,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/pool.h>
#include <machine/bus.h>
diff --git a/sys/dev/usb/dwc2/dwc2_hcdqueue.c b/sys/dev/usb/dwc2/dwc2_hcdqueue.c
index bbecd3d50f2..94452e88e06 100644
--- a/sys/dev/usb/dwc2/dwc2_hcdqueue.c
+++ b/sys/dev/usb/dwc2/dwc2_hcdqueue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwc2_hcdqueue.c,v 1.8 2017/06/29 17:36:16 deraadt Exp $ */
+/* $OpenBSD: dwc2_hcdqueue.c,v 1.9 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: dwc2_hcdqueue.c,v 1.11 2014/09/03 10:00:08 skrll Exp $ */
/*
@@ -44,7 +44,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/malloc.h>
#include <sys/pool.h>
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index f23450b7126..9a6befb293d 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ulpt.c,v 1.54 2017/03/26 15:31:15 deraadt Exp $ */
+/* $OpenBSD: ulpt.c,v 1.55 2017/09/08 05:36:52 deraadt Exp $ */
/* $NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $ */
/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
@@ -44,7 +44,6 @@
#include <sys/conf.h>
#include <sys/vnode.h>
#include <sys/syslog.h>
-#include <sys/types.h>
#include <sys/malloc.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/videomode/vesagtf.c b/sys/dev/videomode/vesagtf.c
index d60de2c0e58..bb4838e3c7b 100644
--- a/sys/dev/videomode/vesagtf.c
+++ b/sys/dev/videomode/vesagtf.c
@@ -151,18 +151,16 @@
#ifdef _KERNEL
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <dev/videomode/videomode.h>
#include <dev/videomode/vesagtf.h>
#else
-#include <stdio.h>
-#include <stdlib.h>
#include <sys/types.h>
#include "videomode.h"
#include "vesagtf.h"
-
+#include <stdio.h>
+#include <stdlib.h>
void print_xf86_mode(struct videomode *m);
#endif
diff --git a/sys/dev/wscons/wskbdutil.c b/sys/dev/wscons/wskbdutil.c
index c4412a78f2f..f1d108fca1d 100644
--- a/sys/dev/wscons/wskbdutil.c
+++ b/sys/dev/wscons/wskbdutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbdutil.c,v 1.15 2016/08/31 11:05:48 jca Exp $ */
+/* $OpenBSD: wskbdutil.c,v 1.16 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: wskbdutil.c,v 1.7 1999/12/21 11:59:13 drochner Exp $ */
/*-
@@ -31,7 +31,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/errno.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c
index 052440619a1..c4435690231 100644
--- a/sys/dev/wsfont/wsfont.c
+++ b/sys/dev/wsfont/wsfont.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsfont.c,v 1.51 2017/08/18 21:30:01 deraadt Exp $ */
+/* $OpenBSD: wsfont.c,v 1.52 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $ */
/*-
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/time.h>
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index 8f3bcb2fcd4..f9af8b8dbae 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd9660_rrip.c,v 1.13 2015/03/14 03:38:50 jsg Exp $ */
+/* $OpenBSD: cd9660_rrip.c,v 1.14 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: cd9660_rrip.c,v 1.17 1997/01/24 00:27:32 cgd Exp $ */
/*-
@@ -46,7 +46,6 @@
#include <sys/mount.h>
#include <sys/kernel.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <sys/time.h>
#include <isofs/cd9660/iso.h>
diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c
index 08a592629f2..562ee1eec13 100644
--- a/sys/isofs/udf/udf_vfsops.c
+++ b/sys/isofs/udf/udf_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udf_vfsops.c,v 1.59 2017/04/20 14:13:00 visa Exp $ */
+/* $OpenBSD: udf_vfsops.c,v 1.60 2017/09/08 05:36:53 deraadt Exp $ */
/*
* Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -46,7 +46,6 @@
* media is closed.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/uio.h>
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c
index 5c67bde01f6..98ec3aa9f7b 100644
--- a/sys/kern/kern_pledge.c
+++ b/sys/kern/kern_pledge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_pledge.c,v 1.219 2017/08/29 02:51:27 deraadt Exp $ */
+/* $OpenBSD: kern_pledge.c,v 1.220 2017/09/08 05:36:53 deraadt Exp $ */
/*
* Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -18,7 +18,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/mount.h>
#include <sys/proc.h>
diff --git a/sys/kern/kern_srp.c b/sys/kern/kern_srp.c
index 6900fd30557..52fb4490047 100644
--- a/sys/kern/kern_srp.c
+++ b/sys/kern/kern_srp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_srp.c,v 1.11 2016/09/15 02:00:16 dlg Exp $ */
+/* $OpenBSD: kern_srp.c,v 1.12 2017/09/08 05:36:53 deraadt Exp $ */
/*
* Copyright (c) 2014 Jonathan Matthew <jmatthew@openbsd.org>
@@ -17,7 +17,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <sys/timeout.h>
#include <sys/srp.h>
diff --git a/sys/kern/subr_percpu.c b/sys/kern/subr_percpu.c
index bcd4dd9bcd7..96e3e148bd3 100644
--- a/sys/kern/subr_percpu.c
+++ b/sys/kern/subr_percpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_percpu.c,v 1.7 2017/02/05 16:23:38 jca Exp $ */
+/* $OpenBSD: subr_percpu.c,v 1.8 2017/09/08 05:36:53 deraadt Exp $ */
/*
* Copyright (c) 2016 David Gwynne <dlg@openbsd.org>
@@ -20,7 +20,6 @@
#include <sys/systm.h>
#include <sys/pool.h>
#include <sys/malloc.h>
-#include <sys/types.h>
#include <sys/percpu.h>
diff --git a/sys/kern/subr_poison.c b/sys/kern/subr_poison.c
index 5de436e13f8..d3577e20484 100644
--- a/sys/kern/subr_poison.c
+++ b/sys/kern/subr_poison.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_poison.c,v 1.13 2015/03/14 03:38:50 jsg Exp $ */
+/* $OpenBSD: subr_poison.c,v 1.14 2017/09/08 05:36:53 deraadt Exp $ */
/*
* Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
*
@@ -15,7 +15,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/lib/libkern/random.c b/sys/lib/libkern/random.c
index 26a9173702d..c3361fb86c6 100644
--- a/sys/lib/libkern/random.c
+++ b/sys/lib/libkern/random.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: random.c,v 1.9 2014/01/19 12:45:36 deraadt Exp $ */
+/* $OpenBSD: random.c,v 1.10 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: random.c,v 1.2 1994/10/26 06:42:42 cgd Exp $ */
/*-
@@ -33,7 +33,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <lib/libkern/libkern.h>
diff --git a/sys/lib/libsa/netif.c b/sys/lib/libsa/netif.c
index afa18cebbd7..d1a5e180291 100644
--- a/sys/lib/libsa/netif.c
+++ b/sys/lib/libsa/netif.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netif.c,v 1.11 2016/03/14 23:08:06 krw Exp $ */
+/* $OpenBSD: netif.c,v 1.12 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: netif.c,v 1.7 1996/10/13 02:29:03 christos Exp $ */
/*
@@ -33,7 +33,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/mount.h>
#include <netinet/in.h>
diff --git a/sys/net/bfd.c b/sys/net/bfd.c
index d4ed5357dc7..9a7771a93d0 100644
--- a/sys/net/bfd.c
+++ b/sys/net/bfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bfd.c,v 1.64 2017/09/01 15:05:31 mpi Exp $ */
+/* $OpenBSD: bfd.c,v 1.65 2017/09/08 05:36:53 deraadt Exp $ */
/*
* Copyright (c) 2016 Peter Hessler <phessler@openbsd.org>
@@ -20,12 +20,11 @@
* Support for Bi-directional Forwarding Detection (RFC 5880 / 5881)
*/
-#include <sys/errno.h>
#include <sys/param.h>
+#include <sys/errno.h>
#include <sys/task.h>
#include <sys/pool.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
#include <sys/stdint.h>
diff --git a/sys/net/bpf_filter.c b/sys/net/bpf_filter.c
index 45ca6a527f2..e46bf0799ba 100644
--- a/sys/net/bpf_filter.c
+++ b/sys/net/bpf_filter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bpf_filter.c,v 1.32 2016/09/13 12:09:53 krw Exp $ */
+/* $OpenBSD: bpf_filter.c,v 1.33 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: bpf_filter.c,v 1.12 1996/02/13 22:00:00 christos Exp $ */
/*
@@ -38,7 +38,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/time.h>
#ifndef _KERNEL
#include <stdlib.h>
diff --git a/sys/net/bsd-comp.c b/sys/net/bsd-comp.c
index d087a63417d..fa4dfe2773c 100644
--- a/sys/net/bsd-comp.c
+++ b/sys/net/bsd-comp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bsd-comp.c,v 1.14 2017/06/19 17:58:49 bluhm Exp $ */
+/* $OpenBSD: bsd-comp.c,v 1.15 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: bsd-comp.c,v 1.6 1996/10/13 02:10:58 christos Exp $ */
/* Because this code is derived from the 4.3BSD compress source:
@@ -41,7 +41,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c
index 58899d81240..38efb02be7e 100644
--- a/sys/net/if_pflow.c
+++ b/sys/net/if_pflow.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pflow.c,v 1.83 2017/08/12 20:27:28 mpi Exp $ */
+/* $OpenBSD: if_pflow.c,v 1.84 2017/09/08 05:36:53 deraadt Exp $ */
/*
* Copyright (c) 2011 Florian Obser <florian@narrans.de>
@@ -19,9 +19,8 @@
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/malloc.h>
#include <sys/param.h>
+#include <sys/malloc.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c
index 39454f012e0..10947b36274 100644
--- a/sys/net/if_pppoe.c
+++ b/sys/net/if_pppoe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pppoe.c,v 1.64 2017/08/11 21:24:19 mpi Exp $ */
+/* $OpenBSD: if_pppoe.c,v 1.65 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */
/*
@@ -36,7 +36,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/types.h>
#include <sys/timeout.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
diff --git a/sys/net/pfkeyv2.c b/sys/net/pfkeyv2.c
index 988903448c1..947accd6c44 100644
--- a/sys/net/pfkeyv2.c
+++ b/sys/net/pfkeyv2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2.c,v 1.165 2017/08/11 21:24:19 mpi Exp $ */
+/* $OpenBSD: pfkeyv2.c,v 1.166 2017/09/08 05:36:53 deraadt Exp $ */
/*
* @(#)COPYRIGHT 1.1 (NRL) 17 January 1995
@@ -70,7 +70,6 @@
#include "pf.h"
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
diff --git a/sys/net/pfkeyv2_convert.c b/sys/net/pfkeyv2_convert.c
index a620dbc739f..8b129e461b1 100644
--- a/sys/net/pfkeyv2_convert.c
+++ b/sys/net/pfkeyv2_convert.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2_convert.c,v 1.61 2017/06/06 11:39:55 mpi Exp $ */
+/* $OpenBSD: pfkeyv2_convert.c,v 1.62 2017/09/08 05:36:53 deraadt Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@keromytis.org)
*
@@ -93,7 +93,6 @@
#include "pf.h"
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
diff --git a/sys/net/ppp-deflate.c b/sys/net/ppp-deflate.c
index cd75e9c8b26..384e30a0f8e 100644
--- a/sys/net/ppp-deflate.c
+++ b/sys/net/ppp-deflate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ppp-deflate.c,v 1.13 2017/06/19 17:58:49 bluhm Exp $ */
+/* $OpenBSD: ppp-deflate.c,v 1.14 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: ppp-deflate.c,v 1.1 1996/03/15 02:28:09 paulus Exp $ */
/*
@@ -39,7 +39,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <net/ppp_defs.h>
diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c
index 1b85241625c..6225e73c1e6 100644
--- a/sys/netinet6/ip6_id.c
+++ b/sys/netinet6/ip6_id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_id.c,v 1.12 2016/10/03 12:33:21 mpi Exp $ */
+/* $OpenBSD: ip6_id.c,v 1.13 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: ip6_id.c,v 1.7 2003/09/13 21:32:59 itojun Exp $ */
/* $KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $ */
@@ -81,7 +81,6 @@
* This avoids reuse issues caused by reseeding.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/socket.h>
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index ec2bd4479f5..a83b0662a33 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd.c,v 1.220 2017/05/29 07:47:13 krw Exp $ */
+/* $OpenBSD: cd.c,v 1.221 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */
/*
@@ -47,7 +47,6 @@
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/timeout.h>
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index da7b85165c9..98b3d9640c9 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_base.c,v 1.226 2017/05/29 07:47:13 krw Exp $ */
+/* $OpenBSD: scsi_base.c,v 1.227 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */
/*
@@ -35,7 +35,6 @@
* Detailed SCSI error printing Copyright 1997 by Matthew Jacob.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c
index be1107e577f..36dd804a5f1 100644
--- a/sys/scsi/scsi_ioctl.c
+++ b/sys/scsi/scsi_ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_ioctl.c,v 1.52 2016/03/12 15:16:04 krw Exp $ */
+/* $OpenBSD: scsi_ioctl.c,v 1.53 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: scsi_ioctl.c,v 1.23 1996/10/12 23:23:17 christos Exp $ */
/*
@@ -37,9 +37,8 @@
* Berkeley style copyright.
*/
-#include <sys/types.h>
-#include <sys/errno.h>
#include <sys/param.h>
+#include <sys/errno.h>
#include <sys/systm.h>
#include <sys/file.h>
#include <sys/pool.h>
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 89f10076010..eca0926cbf0 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.c,v 1.195 2016/03/12 15:16:04 krw Exp $ */
+/* $OpenBSD: scsiconf.c,v 1.196 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */
/*
@@ -50,7 +50,6 @@
#include "bio.h"
#include "mpath.h"
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 5869d6fdb17..06db326216f 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.273 2017/05/29 14:08:49 sf Exp $ */
+/* $OpenBSD: sd.c,v 1.274 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */
/*-
@@ -48,7 +48,6 @@
*/
#include <sys/stdint.h>
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/timeout.h>
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index f311aa48762..3f88efd1c58 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: st.c,v 1.133 2017/05/29 07:47:13 krw Exp $ */
+/* $OpenBSD: st.c,v 1.134 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */
/*
@@ -54,7 +54,6 @@
* to be depending on whether we expect to retension or not.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/timeout.h>
diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c
index 4c27c06c6fd..e8a78b135bd 100644
--- a/sys/scsi/uk.c
+++ b/sys/scsi/uk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uk.c,v 1.18 2016/03/12 15:16:04 krw Exp $ */
+/* $OpenBSD: uk.c,v 1.19 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: uk.c,v 1.15 1996/03/17 00:59:57 thorpej Exp $ */
/*
@@ -35,7 +35,6 @@
* Originally by Julian Elischer (julian@tfs.com)
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/errno.h>
diff --git a/sys/tmpfs/tmpfs_vfsops.c b/sys/tmpfs/tmpfs_vfsops.c
index 7c2ddd5b530..9a17e74ae63 100644
--- a/sys/tmpfs/tmpfs_vfsops.c
+++ b/sys/tmpfs/tmpfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmpfs_vfsops.c,v 1.12 2016/09/15 02:00:18 dlg Exp $ */
+/* $OpenBSD: tmpfs_vfsops.c,v 1.13 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: tmpfs_vfsops.c,v 1.52 2011/09/27 01:10:43 christos Exp $ */
/*
@@ -43,7 +43,6 @@
*/
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/systm.h>
diff --git a/sys/ufs/ext2fs/ext2fs_extents.c b/sys/ufs/ext2fs/ext2fs_extents.c
index f9c86cb742e..c467144d095 100644
--- a/sys/ufs/ext2fs/ext2fs_extents.c
+++ b/sys/ufs/ext2fs/ext2fs_extents.c
@@ -28,7 +28,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/types.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/vnode.h>