misc/176603: [PATCH] Remove redundant and duplicate #include.
Christoph Mallon
christoph.mallon at gmx.de
Sat Mar 2 15:20:01 UTC 2013
>Number: 176603
>Category: misc
>Synopsis: [PATCH] Remove redundant and duplicate #include.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 02 15:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Christoph Mallon
>Release:
>Organization:
>Environment:
>Description:
This patch series removes several redundant and duplicate #include.
>How-To-Repeat:
>Fix:
Please apply these patches.
--- 0001-Eliminate-a-redundant-include-machine-pmap.h-is-alre.patch begins here ---
>From b5b910664c5899e73d751740dc7274cb00369812 Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon at gmx.de>
Date: Sat, 2 Mar 2013 09:56:55 +0100
Subject: [PATCH 1/5] Eliminate a redundant #include: machine/pmap.h is already
included through vm/pmap.h.
---
lib/libkvm/kvm_arm.c | 2 --
lib/libkvm/kvm_mips.c | 2 --
share/man/man9/bios.9 | 1 -
sys/amd64/vmm/intel/ept.c | 1 -
sys/amd64/vmm/intel/vmcs.c | 1 -
sys/amd64/vmm/intel/vmx.c | 1 -
sys/amd64/vmm/intel/vmx_genassym.c | 2 --
sys/amd64/vmm/intel/vtd.c | 1 -
sys/amd64/vmm/vmm_dev.c | 1 -
sys/amd64/vmm/vmm_instruction_emul.c | 1 -
sys/amd64/vmm/vmm_mem.c | 1 -
sys/arm/allwinner/a10_machdep.c | 1 -
sys/arm/arm/machdep.c | 1 -
sys/arm/arm/minidump_machdep.c | 1 -
sys/arm/arm/nexus.c | 1 -
sys/arm/broadcom/bcm2835/bcm2835_dma.c | 1 -
sys/arm/broadcom/bcm2835/bcm2835_machdep.c | 1 -
sys/arm/include/fdt.h | 1 -
sys/arm/lpc/lpc_machdep.c | 1 -
sys/arm/mv/mv_machdep.c | 1 -
sys/arm/mv/mvvar.h | 1 -
sys/arm/mv/orion/db88f5xxx.c | 1 -
sys/arm/sa11x0/sa11x0_io.c | 1 -
sys/arm/tegra/tegra2_machdep.c | 1 -
sys/arm/ti/omap4/pandaboard/pandaboard.c | 1 -
sys/arm/ti/ti_machdep.c | 1 -
sys/arm/versatile/versatile_machdep.c | 1 -
sys/arm/xscale/i80321/i80321_pci.c | 1 -
sys/arm/xscale/i8134x/i81342_pci.c | 1 -
sys/arm/xscale/ixp425/ixp425_pci.c | 1 -
sys/dev/ce/if_ce.c | 1 -
sys/dev/cp/if_cp.c | 1 -
sys/dev/drm/drmP.h | 1 -
sys/dev/drm2/drmP.h | 1 -
sys/dev/fb/machfb.c | 1 -
sys/dev/ieee488/tnt4882.c | 1 -
sys/dev/isci/isci_oem_parameters.c | 1 -
sys/dev/rt/if_rt.c | 1 -
sys/dev/siba/siba_pcib.c | 1 -
sys/i386/bios/mca_machdep.c | 1 -
sys/i386/pci/pci_cfgreg.c | 1 -
sys/i386/xen/clock.c | 1 -
sys/i386/xen/xen_clock_util.c | 1 -
sys/i386/xen/xen_rtc.c | 1 -
sys/ia64/ia64/nexus.c | 1 -
sys/mips/adm5120/admpci.c | 1 -
sys/mips/atheros/ar71xx_fixup.c | 1 -
sys/mips/atheros/ar71xx_pci.c | 1 -
sys/mips/atheros/ar71xx_spi.c | 1 -
sys/mips/atheros/ar724x_pci.c | 1 -
sys/mips/atheros/if_arge.c | 1 -
sys/mips/cavium/cvmx_config.h | 1 -
sys/mips/cavium/octopci.c | 1 -
sys/mips/idt/idtpci.c | 1 -
sys/mips/malta/gt_pci.c | 1 -
sys/mips/mips/minidump_machdep.c | 1 -
sys/mips/mips/nexus.c | 1 -
sys/mips/sibyte/sb_zbpci.c | 1 -
sys/ofed/include/linux/dma-mapping.h | 1 -
sys/ofed/include/linux/linux_compat.c | 1 -
sys/powerpc/aim/slb.c | 1 -
sys/powerpc/aim/trap.c | 1 -
sys/powerpc/booke/trap.c | 1 -
sys/powerpc/ofw/ofw_real.c | 1 -
sys/powerpc/ofw/rtas.c | 1 -
sys/powerpc/powermac/macgpio.c | 1 -
sys/powerpc/powermac/macio.c | 1 -
sys/powerpc/powermac/platform_powermac.c | 1 -
sys/powerpc/powerpc/genassym.c | 1 -
sys/powerpc/ps3/if_glc.c | 1 -
sys/powerpc/ps3/platform_ps3.c | 1 -
sys/powerpc/ps3/ps3_syscons.c | 1 -
sys/powerpc/ps3/ps3bus.c | 1 -
sys/powerpc/ps3/ps3cdrom.c | 1 -
sys/powerpc/ps3/ps3disk.c | 1 -
sys/powerpc/psim/iobus.c | 1 -
sys/powerpc/wii/platform_wii.c | 1 -
sys/powerpc/wii/wii_bus.c | 1 -
sys/powerpc/wii/wii_fb.c | 1 -
sys/sparc64/pci/fire.c | 1 -
sys/sparc64/sparc64/iommu.c | 1 -
sys/sparc64/sparc64/mem.c | 1 -
sys/sparc64/sparc64/tlb.c | 1 -
sys/x86/acpica/acpi_wakeup.c | 1 -
sys/x86/x86/nexus.c | 1 -
85 files changed, 88 deletions(-)
diff --git a/lib/libkvm/kvm_arm.c b/lib/libkvm/kvm_arm.c
index b1274e9..c1c1de7e 100644
--- a/lib/libkvm/kvm_arm.c
+++ b/lib/libkvm/kvm_arm.c
@@ -46,8 +46,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_param.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
-
#include <db.h>
#include <limits.h>
#include <kvm.h>
diff --git a/lib/libkvm/kvm_mips.c b/lib/libkvm/kvm_mips.c
index ad0834b..e10596c 100644
--- a/lib/libkvm/kvm_mips.c
+++ b/lib/libkvm/kvm_mips.c
@@ -43,8 +43,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_param.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
-
#include <db.h>
#include <limits.h>
#include <kvm.h>
diff --git a/share/man/man9/bios.9 b/share/man/man9/bios.9
index 48bbe16..d5e764b 100644
--- a/share/man/man9/bios.9
+++ b/share/man/man9/bios.9
@@ -38,7 +38,6 @@
.In vm/vm.h
.In vm/pmap.h
.In machine/param.h
-.In machine/pmap.h
.In machine/pc/bios.h
.Ft uint32_t
.Fn bios_sigsearch "uint32_t start" "u_char *sig" "int siglen" "int paralen" "int sigofs"
diff --git a/sys/amd64/vmm/intel/ept.c b/sys/amd64/vmm/intel/ept.c
index 4f91601..9bc9b0f 100644
--- a/sys/amd64/vmm/intel/ept.c
+++ b/sys/amd64/vmm/intel/ept.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <machine/param.h>
#include <machine/cpufunc.h>
-#include <machine/pmap.h>
#include <machine/vmparam.h>
#include <machine/vmm.h>
diff --git a/sys/amd64/vmm/intel/vmcs.c b/sys/amd64/vmm/intel/vmcs.c
index a5784dd..0787a40 100644
--- a/sys/amd64/vmm/intel/vmcs.c
+++ b/sys/amd64/vmm/intel/vmcs.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <machine/segments.h>
-#include <machine/pmap.h>
#include <machine/vmm.h>
#include "vmm_host.h"
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
index 287ac8c..b77125a 100644
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <machine/psl.h>
#include <machine/cpufunc.h>
#include <machine/md_var.h>
-#include <machine/pmap.h>
#include <machine/segments.h>
#include <machine/specialreg.h>
#include <machine/vmparam.h>
diff --git a/sys/amd64/vmm/intel/vmx_genassym.c b/sys/amd64/vmm/intel/vmx_genassym.c
index 823a05d..b801a2c 100644
--- a/sys/amd64/vmm/intel/vmx_genassym.c
+++ b/sys/amd64/vmm/intel/vmx_genassym.c
@@ -38,8 +38,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
-
#include <machine/vmm.h>
#include "vmx.h"
#include "vmx_cpufunc.h"
diff --git a/sys/amd64/vmm/intel/vtd.c b/sys/amd64/vmm/intel/vtd.c
index ef0e9bc..9f07ade 100644
--- a/sys/amd64/vmm/intel/vtd.c
+++ b/sys/amd64/vmm/intel/vtd.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include <dev/pci/pcireg.h>
-#include <machine/pmap.h>
#include <machine/vmparam.h>
#include <machine/pci_cfgreg.h>
diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c
index 95527ae..936b713 100644
--- a/sys/amd64/vmm/vmm_dev.c
+++ b/sys/amd64/vmm/vmm_dev.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/vmparam.h>
#include <machine/vmm.h>
diff --git a/sys/amd64/vmm/vmm_instruction_emul.c b/sys/amd64/vmm/vmm_instruction_emul.c
index 40748ea..b5390ac 100644
--- a/sys/amd64/vmm/vmm_instruction_emul.c
+++ b/sys/amd64/vmm/vmm_instruction_emul.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/vmparam.h>
#include <machine/vmm.h>
#else /* !_KERNEL */
diff --git a/sys/amd64/vmm/vmm_mem.c b/sys/amd64/vmm/vmm_mem.c
index 04f99b1..ef7fdda 100644
--- a/sys/amd64/vmm/vmm_mem.c
+++ b/sys/amd64/vmm/vmm_mem.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <machine/metadata.h>
#include <machine/pc/bios.h>
#include <machine/vmparam.h>
-#include <machine/pmap.h>
#include "vmm_util.h"
#include "vmm_mem.h"
diff --git a/sys/arm/allwinner/a10_machdep.c b/sys/arm/allwinner/a10_machdep.c
index 5282013..d837b09 100644
--- a/sys/arm/allwinner/a10_machdep.c
+++ b/sys/arm/allwinner/a10_machdep.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
#include <machine/machdep.h>
-#include <machine/pmap.h>
#include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index 5262e71..6b958c2 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -93,7 +93,6 @@ __FBSDID("$FreeBSD$");
#include <machine/md_var.h>
#include <machine/metadata.h>
#include <machine/pcb.h>
-#include <machine/pmap.h>
#include <machine/reg.h>
#include <machine/trap.h>
#include <machine/undefined.h>
diff --git a/sys/arm/arm/minidump_machdep.c b/sys/arm/arm/minidump_machdep.c
index a858709..69c82f8 100644
--- a/sys/arm/arm/minidump_machdep.c
+++ b/sys/arm/arm/minidump_machdep.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#endif
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/atomic.h>
#include <machine/elf.h>
#include <machine/md_var.h>
diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c
index 93643d5..9b5047e 100644
--- a/sys/arm/arm/nexus.c
+++ b/sys/arm/arm/nexus.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
#include <machine/pcb.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <machine/intr.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_dma.c b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
index 5e1c9dc..6246c9f 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_dma.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/cpufunc.h>
-#include <machine/pmap.h>
#include "bcm2835_dma.h"
#include "bcm2835_vcbus.h"
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
index 7eff61c..60be5aa 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
#include <machine/machdep.h>
-#include <machine/pmap.h>
#include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/include/fdt.h b/sys/arm/include/fdt.h
index 7285e97..bff86d8 100644
--- a/sys/arm/include/fdt.h
+++ b/sys/arm/include/fdt.h
@@ -38,7 +38,6 @@
#include <vm/pmap.h>
#include <machine/bus.h>
-#include <machine/pmap.h>
#include <machine/intr.h>
/* Max interrupt number */
diff --git a/sys/arm/lpc/lpc_machdep.c b/sys/arm/lpc/lpc_machdep.c
index 5fdc9d7..8f6f774 100644
--- a/sys/arm/lpc/lpc_machdep.c
+++ b/sys/arm/lpc/lpc_machdep.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
#include <machine/machdep.h>
-#include <machine/pmap.h>
#include <arm/lpc/lpcreg.h>
#include <arm/lpc/lpcvar.h>
diff --git a/sys/arm/mv/mv_machdep.c b/sys/arm/mv/mv_machdep.c
index fba222d..7aa8288 100644
--- a/sys/arm/mv/mv_machdep.c
+++ b/sys/arm/mv/mv_machdep.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
#include <machine/machdep.h>
-#include <machine/pmap.h>
#include <arm/mv/mvreg.h> /* XXX */
#include <arm/mv/mvvar.h> /* XXX eventually this should be eliminated */
diff --git a/sys/arm/mv/mvvar.h b/sys/arm/mv/mvvar.h
index 002640c..a3dfcb8 100644
--- a/sys/arm/mv/mvvar.h
+++ b/sys/arm/mv/mvvar.h
@@ -44,7 +44,6 @@
#include <machine/bus.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/vm.h>
#define MV_TYPE_PCI 0
diff --git a/sys/arm/mv/orion/db88f5xxx.c b/sys/arm/mv/orion/db88f5xxx.c
index 5bef2f2..0762df5 100644
--- a/sys/arm/mv/orion/db88f5xxx.c
+++ b/sys/arm/mv/orion/db88f5xxx.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/intr.h>
#include <machine/pte.h>
-#include <machine/pmap.h>
#include <machine/vmparam.h>
#include <arm/mv/mvreg.h>
diff --git a/sys/arm/sa11x0/sa11x0_io.c b/sys/arm/sa11x0/sa11x0_io.c
index ceeaffa..5731599 100644
--- a/sys/arm/sa11x0/sa11x0_io.c
+++ b/sys/arm/sa11x0/sa11x0_io.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_kern.h>
#include <machine/bus.h>
-#include <machine/pmap.h>
/* Proto types for all the bus_space structure functions */
diff --git a/sys/arm/tegra/tegra2_machdep.c b/sys/arm/tegra/tegra2_machdep.c
index a3b1d98..57d0e2a 100644
--- a/sys/arm/tegra/tegra2_machdep.c
+++ b/sys/arm/tegra/tegra2_machdep.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
#include <machine/machdep.h>
-#include <machine/pmap.h>
#include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/ti/omap4/pandaboard/pandaboard.c b/sys/arm/ti/omap4/pandaboard/pandaboard.c
index 043f2a0..e480132 100644
--- a/sys/arm/ti/omap4/pandaboard/pandaboard.c
+++ b/sys/arm/ti/omap4/pandaboard/pandaboard.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/pte.h>
-#include <machine/pmap.h>
#include <machine/vmparam.h>
#include <machine/fdt.h>
diff --git a/sys/arm/ti/ti_machdep.c b/sys/arm/ti/ti_machdep.c
index acf395c..f9b33d8 100644
--- a/sys/arm/ti/ti_machdep.c
+++ b/sys/arm/ti/ti_machdep.c
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
#include <machine/machdep.h>
-#include <machine/pmap.h>
#include <arm/ti/omap4/omap4_reg.h>
diff --git a/sys/arm/versatile/versatile_machdep.c b/sys/arm/versatile/versatile_machdep.c
index cd29a5a..2b11791 100644
--- a/sys/arm/versatile/versatile_machdep.c
+++ b/sys/arm/versatile/versatile_machdep.c
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
#include <machine/machdep.h>
-#include <machine/pmap.h>
#include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/xscale/i80321/i80321_pci.c b/sys/arm/xscale/i80321/i80321_pci.c
index dfb4c46..4e28148 100644
--- a/sys/arm/xscale/i80321/i80321_pci.c
+++ b/sys/arm/xscale/i80321/i80321_pci.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
-#include <machine/pmap.h>
#include <arm/xscale/i80321/i80321reg.h>
#include <arm/xscale/i80321/i80321var.h>
diff --git a/sys/arm/xscale/i8134x/i81342_pci.c b/sys/arm/xscale/i8134x/i81342_pci.c
index 8bbcdba..68d2fbf 100644
--- a/sys/arm/xscale/i8134x/i81342_pci.c
+++ b/sys/arm/xscale/i8134x/i81342_pci.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
-#include <machine/pmap.h>
#include <arm/xscale/i8134x/i81342reg.h>
#include <arm/xscale/i8134x/i81342var.h>
diff --git a/sys/arm/xscale/ixp425/ixp425_pci.c b/sys/arm/xscale/ixp425/ixp425_pci.c
index c17eb1e..9495ede 100644
--- a/sys/arm/xscale/ixp425/ixp425_pci.c
+++ b/sys/arm/xscale/ixp425/ixp425_pci.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
-#include <machine/pmap.h>
#include <arm/xscale/ixp425/ixp425reg.h>
#include <arm/xscale/ixp425/ixp425var.h>
diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c
index 3f1a550..b1cc8f8 100644
--- a/sys/dev/ce/if_ce.c
+++ b/sys/dev/ce/if_ce.c
@@ -75,7 +75,6 @@ __FBSDID("$FreeBSD$");
#include <dev/ce/ceddk.h>
#include <machine/cserial.h>
#include <machine/resource.h>
-#include <machine/pmap.h>
/* If we don't have Cronyx's sppp version, we don't have fr support via sppp */
#ifndef PP_FR
diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c
index 299a51c..9f699f8 100644
--- a/sys/dev/cp/if_cp.c
+++ b/sys/dev/cp/if_cp.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
#include <dev/cp/cpddk.h>
#include <machine/cserial.h>
#include <machine/resource.h>
-#include <machine/pmap.h>
/* If we don't have Cronyx's sppp version, we don't have fr support via sppp */
#ifndef PP_FR
diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h
index ffb69b4..356e37b 100644
--- a/sys/dev/drm/drmP.h
+++ b/sys/dev/drm/drmP.h
@@ -77,7 +77,6 @@ struct drm_file;
#include <vm/vm_param.h>
#include <vm/vm_phys.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/bus.h>
#include <machine/resource.h>
#if defined(__i386__) || defined(__amd64__)
diff --git a/sys/dev/drm2/drmP.h b/sys/dev/drm2/drmP.h
index 9b721a8..a335638 100644
--- a/sys/dev/drm2/drmP.h
+++ b/sys/dev/drm2/drmP.h
@@ -78,7 +78,6 @@ struct drm_file;
#include <vm/vm_param.h>
#include <vm/vm_phys.h>
#include <machine/param.h>
-#include <machine/pmap.h>
#include <machine/bus.h>
#include <machine/resource.h>
#if defined(__i386__) || defined(__amd64__)
diff --git a/sys/dev/fb/machfb.c b/sys/dev/fb/machfb.c
index 1c3023d..e84eacc 100644
--- a/sys/dev/fb/machfb.c
+++ b/sys/dev/fb/machfb.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/bus_private.h>
#include <machine/ofw_machdep.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <machine/sc_machdep.h>
diff --git a/sys/dev/ieee488/tnt4882.c b/sys/dev/ieee488/tnt4882.c
index 4b69d0d..b5ea921 100644
--- a/sys/dev/ieee488/tnt4882.c
+++ b/sys/dev/ieee488/tnt4882.c
@@ -43,7 +43,6 @@
/* vtophys */
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#define UPD7210_HW_DRIVER 1
#include <dev/ieee488/upd7210.h>
diff --git a/sys/dev/isci/isci_oem_parameters.c b/sys/dev/isci/isci_oem_parameters.c
index d17698f..83234a2 100644
--- a/sys/dev/isci/isci_oem_parameters.c
+++ b/sys/dev/isci/isci_oem_parameters.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
#include <dev/isci/isci.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/vmparam.h>
#include <machine/pc/bios.h>
#include <dev/isci/scil/scu_bios_definitions.h>
diff --git a/sys/dev/rt/if_rt.c b/sys/dev/rt/if_rt.c
index ebbbba5..ccc7a90 100644
--- a/sys/dev/rt/if_rt.c
+++ b/sys/dev/rt/if_rt.c
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_param.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <sys/bus.h>
#include <sys/rman.h>
diff --git a/sys/dev/siba/siba_pcib.c b/sys/dev/siba/siba_pcib.c
index 6236aed..90ebf05 100644
--- a/sys/dev/siba/siba_pcib.c
+++ b/sys/dev/siba/siba_pcib.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/pcb.h>
-#include <machine/pmap.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/i386/bios/mca_machdep.c b/sys/i386/bios/mca_machdep.c
index 4b78c13..e511f3f 100644
--- a/sys/i386/bios/mca_machdep.c
+++ b/sys/i386/bios/mca_machdep.c
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/md_var.h>
#include <machine/vm86.h>
#include <machine/pc/bios.h>
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index 14558d8..b40d5c7 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_kern.h>
#include <vm/vm_extern.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#ifdef XBOX
#include <machine/xbox.h>
diff --git a/sys/i386/xen/clock.c b/sys/i386/xen/clock.c
index a10b546..4c539a9 100644
--- a/sys/i386/xen/clock.c
+++ b/sys/i386/xen/clock.c
@@ -82,7 +82,6 @@ __FBSDID("$FreeBSD$");
#include <xen/xen_intr.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <xen/hypervisor.h>
#include <machine/xen/xen-os.h>
#include <machine/xen/xenfunc.h>
diff --git a/sys/i386/xen/xen_clock_util.c b/sys/i386/xen/xen_clock_util.c
index c14a627..55ea1ad 100644
--- a/sys/i386/xen/xen_clock_util.c
+++ b/sys/i386/xen/xen_clock_util.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
#include <xen/xen_intr.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <xen/hypervisor.h>
#include <machine/xen/xen-os.h>
#include <machine/xen/xenfunc.h>
diff --git a/sys/i386/xen/xen_rtc.c b/sys/i386/xen/xen_rtc.c
index 8e1e017..1f33064 100644
--- a/sys/i386/xen/xen_rtc.c
+++ b/sys/i386/xen/xen_rtc.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
#include <xen/xen_intr.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <xen/hypervisor.h>
#include <machine/xen/xen-os.h>
#include <machine/xen/xenfunc.h>
diff --git a/sys/ia64/ia64/nexus.c b/sys/ia64/ia64/nexus.c
index c232d39..c667bda 100644
--- a/sys/ia64/ia64/nexus.c
+++ b/sys/ia64/ia64/nexus.c
@@ -57,7 +57,6 @@
#include <machine/efi.h>
#include <machine/intr.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <machine/vmparam.h>
diff --git a/sys/mips/adm5120/admpci.c b/sys/mips/adm5120/admpci.c
index 616d3bd..4fb9453 100644
--- a/sys/mips/adm5120/admpci.c
+++ b/sys/mips/adm5120/admpci.c
@@ -79,7 +79,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <machine/pmap.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/mips/atheros/ar71xx_fixup.c b/sys/mips/atheros/ar71xx_fixup.c
index 8ab8855..27747bd 100644
--- a/sys/mips/atheros/ar71xx_fixup.c
+++ b/sys/mips/atheros/ar71xx_fixup.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/intr_machdep.h>
-#include <machine/pmap.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/mips/atheros/ar71xx_pci.c b/sys/mips/atheros/ar71xx_pci.c
index 9b88f60..93571ed 100644
--- a/sys/mips/atheros/ar71xx_pci.c
+++ b/sys/mips/atheros/ar71xx_pci.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/intr_machdep.h>
-#include <machine/pmap.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/mips/atheros/ar71xx_spi.c b/sys/mips/atheros/ar71xx_spi.c
index 92cc365..037411f 100644
--- a/sys/mips/atheros/ar71xx_spi.c
+++ b/sys/mips/atheros/ar71xx_spi.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <machine/pmap.h>
#include <dev/spibus/spi.h>
#include <dev/spibus/spibusvar.h>
diff --git a/sys/mips/atheros/ar724x_pci.c b/sys/mips/atheros/ar724x_pci.c
index e73e9fc..c67b02a 100644
--- a/sys/mips/atheros/ar724x_pci.c
+++ b/sys/mips/atheros/ar724x_pci.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/intr_machdep.h>
-#include <machine/pmap.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/mips/atheros/if_arge.c b/sys/mips/atheros/if_arge.c
index 247d331..08188b9 100644
--- a/sys/mips/atheros/if_arge.c
+++ b/sys/mips/atheros/if_arge.c
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_param.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <sys/bus.h>
#include <sys/rman.h>
diff --git a/sys/mips/cavium/cvmx_config.h b/sys/mips/cavium/cvmx_config.h
index 1aeabc2..84609f1 100644
--- a/sys/mips/cavium/cvmx_config.h
+++ b/sys/mips/cavium/cvmx_config.h
@@ -50,7 +50,6 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/stdarg.h>
#define asm __asm
diff --git a/sys/mips/cavium/octopci.c b/sys/mips/cavium/octopci.c
index ae92063..8182926 100644
--- a/sys/mips/cavium/octopci.c
+++ b/sys/mips/cavium/octopci.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <machine/pmap.h>
#include <contrib/octeon-sdk/cvmx.h>
#include <mips/cavium/octeon_irq.h>
diff --git a/sys/mips/idt/idtpci.c b/sys/mips/idt/idtpci.c
index 7e003fd..2bcd21c 100644
--- a/sys/mips/idt/idtpci.c
+++ b/sys/mips/idt/idtpci.c
@@ -80,7 +80,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <machine/pmap.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/mips/malta/gt_pci.c b/sys/mips/malta/gt_pci.c
index 0e2012e..679af66 100644
--- a/sys/mips/malta/gt_pci.c
+++ b/sys/mips/malta/gt_pci.c
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <machine/pmap.h>
#include <mips/malta/maltareg.h>
diff --git a/sys/mips/mips/minidump_machdep.c b/sys/mips/mips/minidump_machdep.c
index cded3ae..c6a0163 100644
--- a/sys/mips/mips/minidump_machdep.c
+++ b/sys/mips/mips/minidump_machdep.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include <sys/msgbuf.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/atomic.h>
#include <machine/elf.h>
#include <machine/md_var.h>
diff --git a/sys/mips/mips/nexus.c b/sys/mips/mips/nexus.c
index 47b8c19..1584bec 100644
--- a/sys/mips/mips/nexus.c
+++ b/sys/mips/mips/nexus.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/intr_machdep.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <machine/vmparam.h>
diff --git a/sys/mips/sibyte/sb_zbpci.c b/sys/mips/sibyte/sb_zbpci.c
index f4df353..3a17139 100644
--- a/sys/mips/sibyte/sb_zbpci.c
+++ b/sys/mips/sibyte/sb_zbpci.c
@@ -44,7 +44,6 @@
#include <dev/pci/pcivar.h>
#include <dev/pci/pcib_private.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <machine/bus.h>
diff --git a/sys/ofed/include/linux/dma-mapping.h b/sys/ofed/include/linux/dma-mapping.h
index c653524..e1e97a7 100644
--- a/sys/ofed/include/linux/dma-mapping.h
+++ b/sys/ofed/include/linux/dma-mapping.h
@@ -44,7 +44,6 @@
#include <vm/pmap.h>
#include <machine/bus.h>
-#include <machine/pmap.h>
enum dma_data_direction {
DMA_BIDIRECTIONAL = 0,
diff --git a/sys/ofed/include/linux/linux_compat.c b/sys/ofed/include/linux/linux_compat.c
index fb3783a..b5902c4 100644
--- a/sys/ofed/include/linux/linux_compat.c
+++ b/sys/ofed/include/linux/linux_compat.c
@@ -42,7 +42,6 @@
#include <vm/pmap.h>
#include <machine/stdarg.h>
-#include <machine/pmap.h>
#include <linux/kobject.h>
#include <linux/device.h>
diff --git a/sys/powerpc/aim/slb.c b/sys/powerpc/aim/slb.c
index 9d60b2b..5201668 100644
--- a/sys/powerpc/aim/slb.c
+++ b/sys/powerpc/aim/slb.c
@@ -44,7 +44,6 @@
#include <machine/md_var.h>
#include <machine/platform.h>
-#include <machine/pmap.h>
#include <machine/vmparam.h>
uintptr_t moea64_get_unique_vsid(void);
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c
index d30aded..7df3738 100644
--- a/sys/powerpc/aim/trap.c
+++ b/sys/powerpc/aim/trap.c
@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
#include <machine/fpu.h>
#include <machine/frame.h>
#include <machine/pcb.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/spr.h>
diff --git a/sys/powerpc/booke/trap.c b/sys/powerpc/booke/trap.c
index 959d8b1..be30ded 100644
--- a/sys/powerpc/booke/trap.c
+++ b/sys/powerpc/booke/trap.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
#include <machine/db_machdep.h>
#include <machine/frame.h>
#include <machine/pcb.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/trap.h>
#include <machine/spr.h>
diff --git a/sys/powerpc/ofw/ofw_real.c b/sys/powerpc/ofw/ofw_real.c
index f4066c2..fb4d166 100644
--- a/sys/powerpc/ofw/ofw_real.c
+++ b/sys/powerpc/ofw/ofw_real.c
@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/md_var.h>
#include <machine/ofw_machdep.h>
-#include <machine/pmap.h>
#include <machine/stdarg.h>
#include <dev/ofw/openfirm.h>
diff --git a/sys/powerpc/ofw/rtas.c b/sys/powerpc/ofw/rtas.c
index c6d8969..b06b888 100644
--- a/sys/powerpc/ofw/rtas.c
+++ b/sys/powerpc/ofw/rtas.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/md_var.h>
#include <machine/pcb.h>
-#include <machine/pmap.h>
#include <machine/rtas.h>
#include <machine/stdarg.h>
diff --git a/sys/powerpc/powermac/macgpio.c b/sys/powerpc/powermac/macgpio.c
index 709bcff..2ba535f 100644
--- a/sys/powerpc/powermac/macgpio.c
+++ b/sys/powerpc/powermac/macgpio.c
@@ -42,7 +42,6 @@
#include <machine/bus.h>
#include <machine/intr_machdep.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <machine/vmparam.h>
diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c
index eae6386..896b030 100644
--- a/sys/powerpc/powermac/macio.c
+++ b/sys/powerpc/powermac/macio.c
@@ -44,7 +44,6 @@
#include <machine/bus.h>
#include <machine/intr_machdep.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <machine/vmparam.h>
diff --git a/sys/powerpc/powermac/platform_powermac.c b/sys/powerpc/powermac/platform_powermac.c
index 52d5c4a..8893396 100644
--- a/sys/powerpc/powermac/platform_powermac.c
+++ b/sys/powerpc/powermac/platform_powermac.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <machine/hid.h>
#include <machine/platformvar.h>
-#include <machine/pmap.h>
#include <machine/smp.h>
#include <machine/spr.h>
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index 904d986..0a1b949 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -52,7 +52,6 @@
#include <vm/vm_map.h>
#include <machine/pcb.h>
-#include <machine/pmap.h>
#include <machine/psl.h>
#include <machine/sigframe.h>
diff --git a/sys/powerpc/ps3/if_glc.c b/sys/powerpc/ps3/if_glc.c
index 1788212..a829419 100644
--- a/sys/powerpc/ps3/if_glc.c
+++ b/sys/powerpc/ps3/if_glc.c
@@ -50,7 +50,6 @@
#include <machine/pio.h>
#include <machine/bus.h>
#include <machine/platform.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <sys/bus.h>
#include <sys/rman.h>
diff --git a/sys/powerpc/ps3/platform_ps3.c b/sys/powerpc/ps3/platform_ps3.c
index 207382d..d1415a2 100644
--- a/sys/powerpc/ps3/platform_ps3.c
+++ b/sys/powerpc/ps3/platform_ps3.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
#include <machine/hid.h>
#include <machine/platform.h>
#include <machine/platformvar.h>
-#include <machine/pmap.h>
#include <machine/smp.h>
#include <machine/spr.h>
#include <machine/vmparam.h>
diff --git a/sys/powerpc/ps3/ps3_syscons.c b/sys/powerpc/ps3/ps3_syscons.c
index 2b6e182..08848e2 100644
--- a/sys/powerpc/ps3/ps3_syscons.c
+++ b/sys/powerpc/ps3/ps3_syscons.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/sc_machdep.h>
#include <machine/platform.h>
-#include <machine/pmap.h>
#include <sys/rman.h>
diff --git a/sys/powerpc/ps3/ps3bus.c b/sys/powerpc/ps3/ps3bus.c
index 65e1153..19f35ef 100644
--- a/sys/powerpc/ps3/ps3bus.c
+++ b/sys/powerpc/ps3/ps3bus.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/platform.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include "ps3bus.h"
diff --git a/sys/powerpc/ps3/ps3cdrom.c b/sys/powerpc/ps3/ps3cdrom.c
index a654b4f..3403e1e 100644
--- a/sys/powerpc/ps3/ps3cdrom.c
+++ b/sys/powerpc/ps3/ps3cdrom.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <machine/pio.h>
#include <machine/bus.h>
#include <machine/platform.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <sys/bus.h>
#include <sys/rman.h>
diff --git a/sys/powerpc/ps3/ps3disk.c b/sys/powerpc/ps3/ps3disk.c
index d4ac7fa..d68caea 100644
--- a/sys/powerpc/ps3/ps3disk.c
+++ b/sys/powerpc/ps3/ps3disk.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <machine/pio.h>
#include <machine/bus.h>
#include <machine/platform.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <sys/bus.h>
#include <sys/rman.h>
diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c
index 6ed8cd3..3b1d7da 100644
--- a/sys/powerpc/psim/iobus.c
+++ b/sys/powerpc/psim/iobus.c
@@ -50,7 +50,6 @@
#include <machine/vmparam.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
diff --git a/sys/powerpc/wii/platform_wii.c b/sys/powerpc/wii/platform_wii.c
index bc35105..3fc4c0b 100644
--- a/sys/powerpc/wii/platform_wii.c
+++ b/sys/powerpc/wii/platform_wii.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
#include <machine/hid.h>
#include <machine/platform.h>
#include <machine/platformvar.h>
-#include <machine/pmap.h>
#include <machine/smp.h>
#include <machine/spr.h>
#include <machine/vmparam.h>
diff --git a/sys/powerpc/wii/wii_bus.c b/sys/powerpc/wii/wii_bus.c
index 1107f7b..4386bd7 100644
--- a/sys/powerpc/wii/wii_bus.c
+++ b/sys/powerpc/wii/wii_bus.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/platform.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <powerpc/wii/wii_picreg.h>
diff --git a/sys/powerpc/wii/wii_fb.c b/sys/powerpc/wii/wii_fb.c
index 7f5e3ae..3c29ecb 100644
--- a/sys/powerpc/wii/wii_fb.c
+++ b/sys/powerpc/wii/wii_fb.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/sc_machdep.h>
#include <machine/platform.h>
-#include <machine/pmap.h>
#include <sys/rman.h>
diff --git a/sys/sparc64/pci/fire.c b/sys/sparc64/pci/fire.c
index 080d57c..9a3c40b 100644
--- a/sys/sparc64/pci/fire.c
+++ b/sys/sparc64/pci/fire.c
@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
#include <machine/fsr.h>
#include <machine/iommureg.h>
#include <machine/iommuvar.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/sparc64/sparc64/iommu.c b/sys/sparc64/sparc64/iommu.c
index 42aa258..83e03d2 100644
--- a/sys/sparc64/sparc64/iommu.c
+++ b/sys/sparc64/sparc64/iommu.c
@@ -101,7 +101,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/bus_private.h>
#include <machine/iommureg.h>
-#include <machine/pmap.h>
#include <machine/resource.h>
#include <machine/ver.h>
diff --git a/sys/sparc64/sparc64/mem.c b/sys/sparc64/sparc64/mem.c
index 68c397e..3c6644a 100644
--- a/sys/sparc64/sparc64/mem.c
+++ b/sys/sparc64/sparc64/mem.c
@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cache.h>
#include <machine/md_var.h>
-#include <machine/pmap.h>
#include <machine/tlb.h>
#include <machine/memdev.h>
diff --git a/sys/sparc64/sparc64/tlb.c b/sys/sparc64/sparc64/tlb.c
index 70b2823..8adffc6 100644
--- a/sys/sparc64/sparc64/tlb.c
+++ b/sys/sparc64/sparc64/tlb.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/smp.h>
#include <machine/tlb.h>
#include <machine/vmparam.h>
diff --git a/sys/x86/acpica/acpi_wakeup.c b/sys/x86/acpica/acpi_wakeup.c
index 0c062bf..4642720 100644
--- a/sys/x86/acpica/acpi_wakeup.c
+++ b/sys/x86/acpica/acpi_wakeup.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
#include <machine/intr_machdep.h>
#include <x86/mca.h>
#include <machine/pcb.h>
-#include <machine/pmap.h>
#include <machine/specialreg.h>
#include <machine/md_var.h>
diff --git a/sys/x86/x86/nexus.c b/sys/x86/x86/nexus.c
index 9ead8c8..2829963 100644
--- a/sys/x86/x86/nexus.c
+++ b/sys/x86/x86/nexus.c
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
#include <machine/vmparam.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/pmap.h>
#include <machine/metadata.h>
#include <machine/nexusvar.h>
--
1.8.1.3
--- 0001-Eliminate-a-redundant-include-machine-pmap.h-is-alre.patch ends here ---
--- dummy1 begins here ---
dummy file, because GNATS damages every other file
--- dummy1 ends here ---
--- 0002-Eliminate-a-redundant-include-machine-vm.h-is-alread.patch begins here ---
>From d06ebea6e5eea87e8cc98ca895ccd9a90d1537ab Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon at gmx.de>
Date: Sat, 2 Mar 2013 09:59:02 +0100
Subject: [PATCH 2/5] Eliminate a redundant #include: machine/vm.h is already
included through vm/vm.h.
---
sys/amd64/vmm/vmm.c | 1 -
sys/arm/mv/mvvar.h | 1 -
sys/dev/altera/avgen/altera_avgen.c | 1 -
sys/dev/altera/avgen/altera_avgen_fdt.c | 1 -
sys/dev/altera/avgen/altera_avgen_nexus.c | 1 -
5 files changed, 5 deletions(-)
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index 85d277e..c67539e 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
-#include <machine/vm.h>
#include <machine/pcb.h>
#include <machine/smp.h>
#include <x86/apicreg.h>
diff --git a/sys/arm/mv/mvvar.h b/sys/arm/mv/mvvar.h
index a3dfcb8..e8eb632 100644
--- a/sys/arm/mv/mvvar.h
+++ b/sys/arm/mv/mvvar.h
@@ -44,7 +44,6 @@
#include <machine/bus.h>
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <machine/vm.h>
#define MV_TYPE_PCI 0
#define MV_TYPE_PCIE 1
diff --git a/sys/dev/altera/avgen/altera_avgen.c b/sys/dev/altera/avgen/altera_avgen.c
index 5429c9d..2eb1a33 100644
--- a/sys/dev/altera/avgen/altera_avgen.c
+++ b/sys/dev/altera/avgen/altera_avgen.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/vm.h>
#include <vm/vm.h>
diff --git a/sys/dev/altera/avgen/altera_avgen_fdt.c b/sys/dev/altera/avgen/altera_avgen_fdt.c
index 2762ff4..6d38a3c 100644
--- a/sys/dev/altera/avgen/altera_avgen_fdt.c
+++ b/sys/dev/altera/avgen/altera_avgen_fdt.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/vm.h>
#include <vm/vm.h>
diff --git a/sys/dev/altera/avgen/altera_avgen_nexus.c b/sys/dev/altera/avgen/altera_avgen_nexus.c
index d0e4f9b..7627175 100644
--- a/sys/dev/altera/avgen/altera_avgen_nexus.c
+++ b/sys/dev/altera/avgen/altera_avgen_nexus.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <machine/vm.h>
#include <vm/vm.h>
--
1.8.1.3
--- 0002-Eliminate-a-redundant-include-machine-vm.h-is-alread.patch ends here ---
--- dummy2 begins here ---
dummy file, because GNATS damages every other file
--- dummy2 ends here ---
--- 0003-Eliminate-a-redundant-include-machine-vmparam.h-is-a.patch begins here ---
>From 6d512d0f75174755732aca3f89e605aaf4ea63cc Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon at gmx.de>
Date: Sat, 2 Mar 2013 10:01:26 +0100
Subject: [PATCH 3/5] Eliminate a redundant #include: machine/vmparam.h is
already included through vm/vm_param.h.
---
lib/libkvm/kvm.c | 2 --
sys/arm/arm/genassym.c | 1 -
sys/cddl/dev/dtrace/mips/dtrace_isa.c | 1 -
sys/compat/linux/linux_util.h | 1 -
sys/compat/svr4/svr4_misc.c | 1 -
sys/compat/svr4/svr4_util.h | 1 -
6 files changed, 7 deletions(-)
diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 6c19a14..b42d90f 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -57,8 +57,6 @@ static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94";
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <machine/vmparam.h>
-
#include <ctype.h>
#include <fcntl.h>
#include <kvm.h>
diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c
index 4b8f4cc..0e6d634 100644
--- a/sys/arm/arm/genassym.c
+++ b/sys/arm/arm/genassym.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <vm/vm_map.h>
-#include <machine/vmparam.h>
#include <machine/armreg.h>
#include <machine/pcb.h>
#include <machine/cpu.h>
diff --git a/sys/cddl/dev/dtrace/mips/dtrace_isa.c b/sys/cddl/dev/dtrace/mips/dtrace_isa.c
index 4fa03d5..c09225c 100644
--- a/sys/cddl/dev/dtrace/mips/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/mips/dtrace_isa.c
@@ -44,7 +44,6 @@
#include <machine/db_machdep.h>
#include <machine/md_var.h>
#include <machine/mips_opcode.h>
-#include <machine/vmparam.h>
#include <ddb/db_sym.h>
#include <ddb/ddb.h>
#include <sys/kdb.h>
diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index 6be0392..a175212 100644
--- a/sys/compat/linux/linux_util.h
+++ b/sys/compat/linux/linux_util.h
@@ -37,7 +37,6 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/pmap.h>
-#include <machine/vmparam.h>
#include <sys/exec.h>
#include <sys/sysent.h>
#include <sys/syslog.h>
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 0cfaeae..9205d52 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -84,7 +84,6 @@ __FBSDID("$FreeBSD$");
#include <security/mac/mac_framework.h>
-#include <machine/vmparam.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/vm_map.h>
diff --git a/sys/compat/svr4/svr4_util.h b/sys/compat/svr4/svr4_util.h
index 4cbf230..3fc2451 100644
--- a/sys/compat/svr4/svr4_util.h
+++ b/sys/compat/svr4/svr4_util.h
@@ -35,7 +35,6 @@
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/pmap.h>
-#include <machine/vmparam.h>
#include <sys/exec.h>
#include <sys/sysent.h>
#include <sys/cdefs.h>
--
1.8.1.3
--- 0003-Eliminate-a-redundant-include-machine-vmparam.h-is-a.patch ends here ---
--- dummy3 begins here ---
dummy file, because GNATS damages every other file
--- dummy3 ends here ---
--- 0004-Eliminate-a-redundant-include-vm-pmap.h-is-already-i.patch begins here ---
>From b5713561aa60ac159f6ff85b5cb1391b50661cbf Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon at gmx.de>
Date: Sat, 2 Mar 2013 10:12:37 +0100
Subject: [PATCH 4/5] Eliminate a redundant #include: vm/pmap.h is already
included through vm/vm_page.h.
---
sys/amd64/amd64/minidump_machdep.c | 1 -
sys/amd64/amd64/trap.c | 1 -
sys/amd64/ia32/ia32_syscall.c | 1 -
sys/amd64/linux32/linux32_sysvec.c | 1 -
sys/amd64/vmm/vmm_mem.c | 1 -
sys/arm/arm/machdep.c | 1 -
sys/arm/arm/pmap-v6.c | 1 -
sys/arm/arm/pmap.c | 1 -
sys/arm/arm/vm_machdep.c | 1 -
sys/arm/at91/at91.c | 1 -
sys/arm/at91/at91_machdep.c | 1 -
sys/arm/econa/econa.c | 1 -
sys/arm/econa/econa_machdep.c | 1 -
sys/arm/s3c2xx0/s3c24x0_machdep.c | 1 -
sys/arm/s3c2xx0/s3c2xx0_space.c | 1 -
sys/arm/sa11x0/assabet_machdep.c | 1 -
sys/arm/xscale/i80321/ep80219_machdep.c | 1 -
sys/arm/xscale/i80321/i80321_space.c | 1 -
sys/arm/xscale/i80321/iq31244_machdep.c | 1 -
sys/arm/xscale/i8134x/crb_machdep.c | 1 -
sys/arm/xscale/i8134x/i81342_space.c | 1 -
sys/arm/xscale/ixp425/avila_machdep.c | 1 -
sys/arm/xscale/ixp425/ixp425_a4x_space.c | 1 -
sys/arm/xscale/ixp425/ixp425_pci_space.c | 1 -
sys/arm/xscale/ixp425/ixp425_space.c | 1 -
sys/arm/xscale/pxa/pxa_machdep.c | 1 -
sys/dev/agp/agp.c | 1 -
sys/dev/agp/agp_i810.c | 1 -
sys/dev/cxgb/sys/uipc_mvec.c | 1 -
sys/dev/cxgbe/tom/t4_ddp.c | 1 -
sys/dev/drm/drmP.h | 1 -
sys/dev/drm2/drmP.h | 1 -
sys/fs/fuse/fuse_io.c | 1 -
sys/fs/fuse/fuse_vnops.c | 1 -
sys/fs/procfs/procfs_map.c | 1 -
sys/i386/i386/trap.c | 1 -
sys/i386/i386/vm86.c | 1 -
sys/i386/linux/linux_sysvec.c | 1 -
sys/i386/xen/mp_machdep.c | 1 -
sys/i386/xen/xen_machdep.c | 1 -
sys/kern/kern_exec.c | 1 -
sys/kern/kern_exit.c | 1 -
sys/kern/kern_malloc.c | 1 -
sys/kern/kern_proc.c | 1 -
sys/kern/kern_sharedpage.c | 1 -
sys/kern/subr_bus_dma.c | 1 -
sys/kern/sys_pipe.c | 1 -
sys/kern/sys_process.c | 1 -
sys/kern/sysv_shm.c | 1 -
sys/kern/uipc_cow.c | 1 -
sys/kern/uipc_shm.c | 1 -
sys/kern/vfs_default.c | 1 -
sys/kern/vfs_subr.c | 1 -
sys/kern/vfs_vnops.c | 1 -
sys/mips/malta/gt.c | 1 -
sys/mips/mips/db_interface.c | 1 -
sys/mips/mips/machdep.c | 1 -
sys/mips/mips/mem.c | 1 -
sys/mips/mips/vm_machdep.c | 1 -
sys/net/bpf_zerocopy.c | 1 -
sys/ofed/include/linux/dma-mapping.h | 1 -
sys/powerpc/aim/slb.c | 1 -
sys/powerpc/aim/trap.c | 1 -
sys/powerpc/booke/machdep.c | 1 -
sys/powerpc/booke/trap.c | 1 -
sys/powerpc/ofw/ofw_real.c | 1 -
sys/powerpc/ofw/rtas.c | 1 -
sys/powerpc/powerpc/mem.c | 1 -
sys/sparc64/sparc64/mem.c | 1 -
sys/sparc64/sparc64/trap.c | 1 -
sys/sparc64/sparc64/vm_machdep.c | 1 -
sys/vm/swap_pager.c | 1 -
sys/vm/vm_fault.c | 1 -
sys/vm/vm_glue.c | 1 -
sys/vm/vm_kern.c | 1 -
sys/vm/vm_map.c | 1 -
sys/vm/vm_meter.c | 1 -
sys/vm/vm_mmap.c | 1 -
sys/vm/vm_object.c | 1 -
sys/vm/vm_page.c | 1 -
80 files changed, 80 deletions(-)
diff --git a/sys/amd64/amd64/minidump_machdep.c b/sys/amd64/amd64/minidump_machdep.c
index 79d8bde..b038e61 100644
--- a/sys/amd64/amd64/minidump_machdep.c
+++ b/sys/amd64/amd64/minidump_machdep.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_page.h>
#include <vm/vm_phys.h>
-#include <vm/pmap.h>
#include <machine/atomic.h>
#include <machine/elf.h>
#include <machine/md_var.h>
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 6fcca81..d7a2273 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -78,7 +78,6 @@ PMC_SOFT_DEFINE( , , page_fault, write);
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_kern.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c
index 0cdec6f..3fa14c9 100644
--- a/sys/amd64/ia32/ia32_syscall.c
+++ b/sys/amd64/ia32/ia32_syscall.c
@@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_kern.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index 42500da..ddace3d 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
#include <sys/eventhandler.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_map.h>
#include <vm/vm_object.h>
diff --git a/sys/amd64/vmm/vmm_mem.c b/sys/amd64/vmm/vmm_mem.c
index ef7fdda..d87d099 100644
--- a/sys/amd64/vmm/vmm_mem.c
+++ b/sys/amd64/vmm/vmm_mem.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include <sys/sysctl.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_page.h>
#include <vm/vm_pageout.h>
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index 6b958c2..f5cc877 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -80,7 +80,6 @@ __FBSDID("$FreeBSD$");
#include <sys/uio.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c
index a4f3db1..490bd96 100644
--- a/sys/arm/arm/pmap-v6.c
+++ b/sys/arm/arm/pmap-v6.c
@@ -162,7 +162,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/uma.h>
-#include <vm/pmap.h>
#include <vm/vm_kern.h>
#include <vm/vm_object.h>
#include <vm/vm_map.h>
diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c
index 313e6fa..e0249b1 100644
--- a/sys/arm/arm/pmap.c
+++ b/sys/arm/arm/pmap.c
@@ -159,7 +159,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/uma.h>
-#include <vm/pmap.h>
#include <vm/vm_kern.h>
#include <vm/vm_object.h>
#include <vm/vm_map.h>
diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c
index 97b8b76..614d6bf 100644
--- a/sys/arm/arm/vm_machdep.c
+++ b/sys/arm/arm/vm_machdep.c
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
#include <vm/vm_page.h>
diff --git a/sys/arm/at91/at91.c b/sys/arm/at91/at91.c
index deb3c38..e59558f 100644
--- a/sys/arm/at91/at91.c
+++ b/sys/arm/at91/at91.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#include <vm/pmap.h>
#include <vm/vm_page.h>
#include <vm/vm_extern.h>
diff --git a/sys/arm/at91/at91_machdep.c b/sys/arm/at91/at91_machdep.c
index 3837cbd..e382eb8 100644
--- a/sys/arm/at91/at91_machdep.c
+++ b/sys/arm/at91/at91_machdep.c
@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
#include <machine/board.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
diff --git a/sys/arm/econa/econa.c b/sys/arm/econa/econa.c
index 9f29a7f..5d1ddb1 100644
--- a/sys/arm/econa/econa.c
+++ b/sys/arm/econa/econa.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
#include <sys/rman.h>
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#include <vm/pmap.h>
#include <vm/vm_page.h>
#include <vm/vm_extern.h>
diff --git a/sys/arm/econa/econa_machdep.c b/sys/arm/econa/econa_machdep.c
index d64e826..a9e96d8 100644
--- a/sys/arm/econa/econa_machdep.c
+++ b/sys/arm/econa/econa_machdep.c
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
diff --git a/sys/arm/s3c2xx0/s3c24x0_machdep.c b/sys/arm/s3c2xx0/s3c24x0_machdep.c
index 1811b52..fffe9f5 100644
--- a/sys/arm/s3c2xx0/s3c24x0_machdep.c
+++ b/sys/arm/s3c2xx0/s3c24x0_machdep.c
@@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
diff --git a/sys/arm/s3c2xx0/s3c2xx0_space.c b/sys/arm/s3c2xx0/s3c2xx0_space.c
index 958e658..2d533a7 100644
--- a/sys/arm/s3c2xx0/s3c2xx0_space.c
+++ b/sys/arm/s3c2xx0/s3c2xx0_space.c
@@ -82,7 +82,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#include <vm/pmap.h>
#include <vm/vm_page.h>
#include <vm/vm_extern.h>
diff --git a/sys/arm/sa11x0/assabet_machdep.c b/sys/arm/sa11x0/assabet_machdep.c
index 0808798..dbd9c8c 100644
--- a/sys/arm/sa11x0/assabet_machdep.c
+++ b/sys/arm/sa11x0/assabet_machdep.c
@@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
diff --git a/sys/arm/xscale/i80321/ep80219_machdep.c b/sys/arm/xscale/i80321/ep80219_machdep.c
index ff2f1c3..0de1b5b 100644
--- a/sys/arm/xscale/i80321/ep80219_machdep.c
+++ b/sys/arm/xscale/i80321/ep80219_machdep.c
@@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
diff --git a/sys/arm/xscale/i80321/i80321_space.c b/sys/arm/xscale/i80321/i80321_space.c
index ebb0306..f512f40 100644
--- a/sys/arm/xscale/i80321/i80321_space.c
+++ b/sys/arm/xscale/i80321/i80321_space.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#include <vm/pmap.h>
#include <vm/vm_page.h>
#include <vm/vm_extern.h>
diff --git a/sys/arm/xscale/i80321/iq31244_machdep.c b/sys/arm/xscale/i80321/iq31244_machdep.c
index 1412635..050d515 100644
--- a/sys/arm/xscale/i80321/iq31244_machdep.c
+++ b/sys/arm/xscale/i80321/iq31244_machdep.c
@@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
diff --git a/sys/arm/xscale/i8134x/crb_machdep.c b/sys/arm/xscale/i8134x/crb_machdep.c
index 4ae836b..6f29472 100644
--- a/sys/arm/xscale/i8134x/crb_machdep.c
+++ b/sys/arm/xscale/i8134x/crb_machdep.c
@@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
diff --git a/sys/arm/xscale/i8134x/i81342_space.c b/sys/arm/xscale/i8134x/i81342_space.c
index 5b08ef6..73fa59f 100644
--- a/sys/arm/xscale/i8134x/i81342_space.c
+++ b/sys/arm/xscale/i8134x/i81342_space.c
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#include <vm/pmap.h>
#include <vm/vm_page.h>
#include <vm/vm_extern.h>
diff --git a/sys/arm/xscale/ixp425/avila_machdep.c b/sys/arm/xscale/ixp425/avila_machdep.c
index 82e1aab0..f5cfc16 100644
--- a/sys/arm/xscale/ixp425/avila_machdep.c
+++ b/sys/arm/xscale/ixp425/avila_machdep.c
@@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
diff --git a/sys/arm/xscale/ixp425/ixp425_a4x_space.c b/sys/arm/xscale/ixp425/ixp425_a4x_space.c
index 74239db..ade05d9 100644
--- a/sys/arm/xscale/ixp425/ixp425_a4x_space.c
+++ b/sys/arm/xscale/ixp425/ixp425_a4x_space.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#include <vm/pmap.h>
#include <vm/vm_page.h>
#include <vm/vm_extern.h>
diff --git a/sys/arm/xscale/ixp425/ixp425_pci_space.c b/sys/arm/xscale/ixp425/ixp425_pci_space.c
index 4b0ca81..90a4ca7 100644
--- a/sys/arm/xscale/ixp425/ixp425_pci_space.c
+++ b/sys/arm/xscale/ixp425/ixp425_pci_space.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#include <vm/pmap.h>
#include <vm/vm_page.h>
#include <vm/vm_extern.h>
diff --git a/sys/arm/xscale/ixp425/ixp425_space.c b/sys/arm/xscale/ixp425/ixp425_space.c
index 982ad4b..5bf3755 100644
--- a/sys/arm/xscale/ixp425/ixp425_space.c
+++ b/sys/arm/xscale/ixp425/ixp425_space.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#include <vm/pmap.h>
#include <vm/vm_page.h>
#include <vm/vm_extern.h>
diff --git a/sys/arm/xscale/pxa/pxa_machdep.c b/sys/arm/xscale/pxa/pxa_machdep.c
index 5640622..cbf8a43 100644
--- a/sys/arm/xscale/pxa/pxa_machdep.c
+++ b/sys/arm/xscale/pxa/pxa_machdep.c
@@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c
index 79b2d54..22318b5 100644
--- a/sys/dev/agp/agp.c
+++ b/sys/dev/agp/agp.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pageout.h>
-#include <vm/pmap.h>
#include <machine/bus.h>
#include <machine/resource.h>
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 9ec3992..158b389 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -69,7 +69,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pageout.h>
-#include <vm/pmap.h>
#include <machine/bus.h>
#include <machine/resource.h>
diff --git a/sys/dev/cxgb/sys/uipc_mvec.c b/sys/dev/cxgb/sys/uipc_mvec.c
index dea5500..da546e8 100644
--- a/sys/dev/cxgb/sys/uipc_mvec.c
+++ b/sys/dev/cxgb/sys/uipc_mvec.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_page.h>
-#include <vm/pmap.h>
#ifdef INVARIANTS
#define M_SANITY m_sanity
diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c
index 16eb707..9db15e9 100644
--- a/sys/dev/cxgbe/tom/t4_ddp.c
+++ b/sys/dev/cxgbe/tom/t4_ddp.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/vm_object.h>
diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h
index 356e37b..985193a 100644
--- a/sys/dev/drm/drmP.h
+++ b/sys/dev/drm/drmP.h
@@ -67,7 +67,6 @@ struct drm_file;
#include <sys/taskqueue.h>
#include <sys/tree.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
#include <vm/vm_map.h>
diff --git a/sys/dev/drm2/drmP.h b/sys/dev/drm2/drmP.h
index a335638..418914d 100644
--- a/sys/dev/drm2/drmP.h
+++ b/sys/dev/drm2/drmP.h
@@ -68,7 +68,6 @@ struct drm_file;
#include <sys/taskqueue.h>
#include <sys/tree.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
#include <vm/vm_map.h>
diff --git a/sys/fs/fuse/fuse_io.c b/sys/fs/fuse/fuse_io.c
index 5feec1e..6de31c3 100644
--- a/sys/fs/fuse/fuse_io.c
+++ b/sys/fs/fuse/fuse_io.c
@@ -83,7 +83,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_extern.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/vm_object.h>
diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c
index cc9733d..724e8d0 100644
--- a/sys/fs/fuse/fuse_vnops.c
+++ b/sys/fs/fuse/fuse_vnops.c
@@ -85,7 +85,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_extern.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/vm_param.h>
diff --git a/sys/fs/procfs/procfs_map.c b/sys/fs/procfs/procfs_map.c
index 3f57add..3625915 100644
--- a/sys/fs/procfs/procfs_map.c
+++ b/sys/fs/procfs/procfs_map.c
@@ -58,7 +58,6 @@
#include <vm/vm.h>
#include <vm/vm_extern.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/vm_object.h>
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index b7ce91d..47db7fd 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -81,7 +81,6 @@ PMC_SOFT_DEFINE( , , page_fault, write);
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_kern.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index 93ff855..0431581 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 71417e0..3ae6d27 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
#include <sys/eventhandler.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_map.h>
#include <vm/vm_object.h>
diff --git a/sys/i386/xen/mp_machdep.c b/sys/i386/xen/mp_machdep.c
index 253cc40..f2ce1ef 100644
--- a/sys/i386/xen/mp_machdep.c
+++ b/sys/i386/xen/mp_machdep.c
@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_kern.h>
#include <vm/vm_extern.h>
#include <vm/vm_page.h>
diff --git a/sys/i386/xen/xen_machdep.c b/sys/i386/xen/xen_machdep.c
index 3b3da6f..9f93331 100644
--- a/sys/i386/xen/xen_machdep.c
+++ b/sys/i386/xen/xen_machdep.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
#include <machine/xen/xen-os.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <machine/segments.h>
#include <machine/pcb.h>
#include <machine/stdarg.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 7c0d2d6..3e64874 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
#include <vm/vm_kern.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 5bd2daa..4811c6e 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -83,7 +83,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/uma.h>
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 05fd5e5..810aeef 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
#include <sys/time.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_param.h>
#include <vm/vm_kern.h>
#include <vm/vm_extern.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 2a74a59..feefe06 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -79,7 +79,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/vm_extern.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
diff --git a/sys/kern/kern_sharedpage.c b/sys/kern/kern_sharedpage.c
index 619304a..c33468d 100644
--- a/sys/kern/kern_sharedpage.c
+++ b/sys/kern/kern_sharedpage.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
#include <vm/vm_map.h>
diff --git a/sys/kern/subr_bus_dma.c b/sys/kern/subr_bus_dma.c
index 773d01a..e4fd2d9 100644
--- a/sys/kern/subr_bus_dma.c
+++ b/sys/kern/subr_bus_dma.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
-#include <vm/pmap.h>
#include <cam/cam.h>
#include <cam/cam_ccb.h>
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 5d0c434..ba4afca 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -124,7 +124,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_object.h>
#include <vm/vm_kern.h>
#include <vm/vm_extern.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/uma.h>
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index e70e60e..98baa84 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
#include <security/audit/audit.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_map.h>
#include <vm/vm_kern.h>
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 5c35514..cc75ed9 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -90,7 +90,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_object.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
diff --git a/sys/kern/uipc_cow.c b/sys/kern/uipc_cow.c
index 654b6d7..dcd2e0f 100644
--- a/sys/kern/uipc_cow.c
+++ b/sys/kern/uipc_cow.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/vm_object.h>
diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c
index 0cbb8b3..63d610c 100644
--- a/sys/kern/uipc_shm.c
+++ b/sys/kern/uipc_shm.c
@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_map.h>
#include <vm/vm_kern.h>
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 1dd0185..4369999 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_extern.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 1c26368..427f546 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -84,7 +84,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_extern.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/vm_kern.h>
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 96ce9e2..aff8e9b 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_extern.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
diff --git a/sys/mips/malta/gt.c b/sys/mips/malta/gt.c
index ce320c9..052205e 100644
--- a/sys/mips/malta/gt.c
+++ b/sys/mips/malta/gt.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#include <vm/pmap.h>
#include <vm/vm_page.h>
#include <vm/vm_extern.h>
diff --git a/sys/mips/mips/db_interface.c b/sys/mips/mips/db_interface.c
index 7ab1ec6..6fb8d3c 100644
--- a/sys/mips/mips/db_interface.c
+++ b/sys/mips/mips/db_interface.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <sys/user.h>
#include <sys/proc.h>
diff --git a/sys/mips/mips/machdep.c b/sys/mips/mips/machdep.c
index a5fd953..676a238 100644
--- a/sys/mips/mips/machdep.c
+++ b/sys/mips/mips/machdep.c
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_kern.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_pager.h>
#include <vm/vm_extern.h>
diff --git a/sys/mips/mips/mem.c b/sys/mips/mips/mem.c
index d40c424..82951b7 100644
--- a/sys/mips/mips/mem.c
+++ b/sys/mips/mips/mem.c
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
#include <machine/vmparam.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_page.h>
diff --git a/sys/mips/mips/vm_machdep.c b/sys/mips/mips/vm_machdep.c
index 76a520f..bd17848 100644
--- a/sys/mips/mips/vm_machdep.c
+++ b/sys/mips/mips/vm_machdep.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_extern.h>
-#include <vm/pmap.h>
#include <vm/vm_kern.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
diff --git a/sys/net/bpf_zerocopy.c b/sys/net/bpf_zerocopy.c
index a8ef8d5..d82d062 100644
--- a/sys/net/bpf_zerocopy.c
+++ b/sys/net/bpf_zerocopy.c
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
diff --git a/sys/ofed/include/linux/dma-mapping.h b/sys/ofed/include/linux/dma-mapping.h
index e1e97a7..ef78cb8 100644
--- a/sys/ofed/include/linux/dma-mapping.h
+++ b/sys/ofed/include/linux/dma-mapping.h
@@ -41,7 +41,6 @@
#include <vm/vm.h>
#include <vm/vm_page.h>
-#include <vm/pmap.h>
#include <machine/bus.h>
diff --git a/sys/powerpc/aim/slb.c b/sys/powerpc/aim/slb.c
index 5201668..b95f036 100644
--- a/sys/powerpc/aim/slb.c
+++ b/sys/powerpc/aim/slb.c
@@ -35,7 +35,6 @@
#include <sys/systm.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/uma.h>
#include <vm/vm.h>
#include <vm/vm_map.h>
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c
index 7df3738..4376ca8 100644
--- a/sys/powerpc/aim/trap.c
+++ b/sys/powerpc/aim/trap.c
@@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
#include <security/audit/audit.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_param.h>
#include <vm/vm_kern.h>
diff --git a/sys/powerpc/booke/machdep.c b/sys/powerpc/booke/machdep.c
index 1522f9f..abd04ba 100644
--- a/sys/powerpc/booke/machdep.c
+++ b/sys/powerpc/booke/machdep.c
@@ -113,7 +113,6 @@ __FBSDID("$FreeBSD$");
#include <sys/ptrace.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_page.h>
#include <vm/vm_object.h>
#include <vm/vm_pager.h>
diff --git a/sys/powerpc/booke/trap.c b/sys/powerpc/booke/trap.c
index be30ded..b08dfed 100644
--- a/sys/powerpc/booke/trap.c
+++ b/sys/powerpc/booke/trap.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
#include <security/audit/audit.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_param.h>
#include <vm/vm_kern.h>
diff --git a/sys/powerpc/ofw/ofw_real.c b/sys/powerpc/ofw/ofw_real.c
index fb4d166..2c580f7 100644
--- a/sys/powerpc/ofw/ofw_real.c
+++ b/sys/powerpc/ofw/ofw_real.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_page.h>
-#include <vm/pmap.h>
#include <machine/bus.h>
#include <machine/md_var.h>
diff --git a/sys/powerpc/ofw/rtas.c b/sys/powerpc/ofw/rtas.c
index b06b888..b0a1eed 100644
--- a/sys/powerpc/ofw/rtas.c
+++ b/sys/powerpc/ofw/rtas.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_page.h>
-#include <vm/pmap.h>
#include <machine/bus.h>
#include <machine/md_var.h>
diff --git a/sys/powerpc/powerpc/mem.c b/sys/powerpc/powerpc/mem.c
index 08e1cce..1615f1a 100644
--- a/sys/powerpc/powerpc/mem.c
+++ b/sys/powerpc/powerpc/mem.c
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
#include <machine/vmparam.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_page.h>
diff --git a/sys/sparc64/sparc64/mem.c b/sys/sparc64/sparc64/mem.c
index 3c6644a..2e521e4 100644
--- a/sys/sparc64/sparc64/mem.c
+++ b/sys/sparc64/sparc64/mem.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_param.h>
#include <vm/vm_page.h>
#include <vm/vm_kern.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <machine/cache.h>
diff --git a/sys/sparc64/sparc64/trap.c b/sys/sparc64/sparc64/trap.c
index b4f0e27..65b316b 100644
--- a/sys/sparc64/sparc64/trap.c
+++ b/sys/sparc64/sparc64/trap.c
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
#include <dev/ofw/openfirm.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_extern.h>
#include <vm/vm_param.h>
#include <vm/vm_kern.h>
diff --git a/sys/sparc64/sparc64/vm_machdep.c b/sys/sparc64/sparc64/vm_machdep.c
index 0196ec2..3d45e0e 100644
--- a/sys/sparc64/sparc64/vm_machdep.c
+++ b/sys/sparc64/sparc64/vm_machdep.c
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_extern.h>
-#include <vm/pmap.h>
#include <vm/vm_kern.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 712fd832..9bf4113 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -99,7 +99,6 @@ __FBSDID("$FreeBSD$");
#include <security/mac/mac_framework.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_kern.h>
#include <vm/vm_object.h>
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index b79b3f5..a78f59a 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -93,7 +93,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index f44f04c..cd9449d 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -85,7 +85,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/vm_pageout.h>
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index ad9aa0d..d42c4f9 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 35ac468..5a7e347 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -84,7 +84,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_page.h>
#include <vm/vm_object.h>
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index 05174e9..a5e19e9 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_page.h>
#include <vm/vm_extern.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_object.h>
#include <sys/sysctl.h>
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index cf94fe5..0d5ab55 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -74,7 +74,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 28d6d0c..d46a8b4 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -84,7 +84,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <vm/vm_map.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 44f7193..9dfefb1 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -101,7 +101,6 @@ __FBSDID("$FreeBSD$");
#include <sys/vnode.h>
#include <vm/vm.h>
-#include <vm/pmap.h>
#include <vm/vm_param.h>
#include <vm/vm_kern.h>
#include <vm/vm_object.h>
--
1.8.1.3
--- 0004-Eliminate-a-redundant-include-vm-pmap.h-is-already-i.patch ends here ---
--- dummy4 begins here ---
dummy file, because GNATS damages every other file
--- dummy4 ends here ---
--- 0005-Remove-duplicate-include.patch begins here ---
>From 63e7bbacbb6e121beb01cc5fef407fc1551da94f Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon at gmx.de>
Date: Sat, 2 Mar 2013 10:08:44 +0100
Subject: [PATCH 5/5] Remove duplicate #include.
---
crypto/heimdal/kadmin/kadmin_locl.h | 3 ---
crypto/heimdal/lib/roken/getifaddrs.c | 1 -
include/iconv.h | 3 ---
lib/libc/i386/sys/i386_get_ldt.c | 1 -
lib/libc/i386/sys/i386_set_ldt.c | 1 -
lib/libc/include/libc_private.h | 1 -
lib/libc/net/hesiod.c | 2 --
lib/libc/rpc/auth_des.c | 1 -
lib/libc/stdio/gets.c | 1 -
lib/libstand/netif.c | 1 -
lib/libstand/strcasecmp.c | 1 -
lib/libthread_db/thread_db.c | 1 -
sbin/newfs_nandfs/newfs_nandfs.c | 1 -
sys/amd64/amd64/bpf_jit_machdep.c | 3 +--
sys/amd64/amd64/fpu.c | 1 -
sys/amd64/amd64/genassym.c | 1 -
sys/amd64/ia32/ia32_syscall.c | 1 -
sys/amd64/vmm/vmm.c | 1 -
sys/cam/ctl/ctl_backend_block.c | 1 -
sys/cam/ctl/ctl_util.c | 3 +--
sys/cam/ctl/scsi_ctl.c | 1 -
sys/cam/scsi/scsi_target.c | 1 -
sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c | 1 -
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h | 3 ---
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 1 -
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c | 1 -
sys/cddl/contrib/opensolaris/uts/common/os/callb.c | 1 -
sys/compat/freebsd32/freebsd32_misc.c | 1 -
sys/contrib/ipfilter/netinet/fil.c | 1 -
sys/contrib/ipfilter/netinet/ip_frag.c | 1 -
sys/contrib/ipfilter/netinet/ip_state.c | 1 -
sys/contrib/ipfilter/netinet/ip_sync.c | 1 -
sys/contrib/ipfilter/netinet/mlfk_ipl.c | 1 -
sys/contrib/rdma/rdma_addr.c | 1 -
sys/contrib/rdma/rdma_cache.c | 1 -
sys/crypto/rijndael/rijndael-alg-fst.c | 1 -
sys/crypto/sha1.c | 1 -
sys/dev/ath/ah_osdep.c | 1 -
sys/dev/bktr/bktr_core.c | 1 -
sys/dev/bktr/bktr_i2c.c | 1 -
sys/dev/bktr/bktr_os.c | 1 -
sys/dev/ct/ct_isa.c | 1 -
sys/dev/cxgb/cxgb_sge.c | 1 -
sys/dev/cxgb/sys/uipc_mvec.c | 3 ---
sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c | 1 -
sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c | 1 -
sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c | 1 -
sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c | 1 -
sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c | 1 -
sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c | 1 -
sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c | 1 -
sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c | 1 -
sys/dev/drm/drmP.h | 3 ---
sys/dev/drm2/drmP.h | 3 ---
sys/dev/fatm/if_fatm.c | 1 -
sys/dev/hatm/if_hatm.c | 1 -
sys/dev/hatm/if_hatm_intr.c | 1 -
sys/dev/hatm/if_hatm_ioctl.c | 1 -
sys/dev/hatm/if_hatm_rx.c | 1 -
sys/dev/hatm/if_hatm_tx.c | 1 -
sys/dev/ips/ips_disk.h | 1 -
sys/dev/nand/nand.h | 1 -
sys/dev/netmap/netmap.c | 1 -
sys/dev/nsp/nsp_pccard.c | 2 --
sys/dev/nxge/xge-osdep.h | 4 ----
sys/dev/patm/if_patm.c | 1 -
sys/dev/patm/if_patm_attach.c | 1 -
sys/dev/patm/if_patm_intr.c | 1 -
sys/dev/patm/if_patm_ioctl.c | 1 -
sys/dev/patm/if_patm_rx.c | 1 -
sys/dev/patm/if_patm_tx.c | 1 -
sys/dev/sound/midi/midi.c | 3 ---
sys/dev/sound/midi/mpu401.c | 1 -
sys/dev/sound/pci/emu10kx-pcm.c | 1 -
sys/dev/usb/net/if_usie.c | 1 -
sys/dev/virtio/pci/virtio_pci.c | 1 -
sys/dev/wtap/if_wtap_module.c | 2 --
sys/dev/wtap/if_wtapvar.h | 1 -
sys/dev/wtap/plugins/visibility.c | 2 --
sys/dev/xe/if_xe.c | 1 -
sys/dev/xen/console/console.c | 2 --
sys/dev/xen/console/xencons_ring.c | 2 --
sys/dev/xen/control/control.c | 1 -
sys/fs/fuse/fuse_vnops.c | 1 -
sys/fs/nandfs/bmap.c | 5 -----
sys/fs/nandfs/nandfs.h | 1 -
sys/fs/nandfs/nandfs_bmap.c | 5 -----
sys/fs/ntfs/ntfs_vfsops.c | 1 -
sys/fs/procfs/procfs_status.c | 1 -
sys/fs/pseudofs/pseudofs_fileno.c | 1 -
sys/geom/geom_ctl.c | 1 -
sys/geom/geom_disk.c | 1 -
sys/geom/virstor/g_virstor.c | 1 -
sys/i386/i386/bpf_jit_machdep.c | 3 +--
sys/i386/i386/elan-mmcr.c | 1 -
sys/i386/i386/genassym.c | 1 -
sys/i386/ibcs2/ibcs2_other.c | 1 -
sys/i386/isa/npx.c | 1 -
sys/ia64/ia64/genassym.c | 1 -
sys/ia64/ia64/trap.c | 1 -
sys/kern/kern_conf.c | 2 --
sys/kern/kern_exec.c | 1 -
sys/kern/kern_gzio.c | 1 -
sys/kern/kern_thr.c | 1 -
sys/kern/subr_acl_nfs4.c | 7 +++----
sys/kern/subr_blist.c | 5 ++---
sys/kern/subr_trap.c | 4 ----
sys/kern/vfs_aio.c | 2 --
sys/mips/mips/freebsd32_machdep.c | 1 -
sys/mips/nlm/cms.c | 1 -
sys/mips/nlm/dev/sec/nlmrsa.c | 1 -
sys/mips/nlm/dev/sec/nlmsec.c | 1 -
sys/modules/ata/atadevel/ata-devel.c | 1 -
sys/net/bpf.c | 1 -
sys/net/bpf_jitter.c | 3 +--
sys/net/if.c | 1 -
sys/net/pfil.c | 1 -
sys/net/route.c | 1 -
sys/net/vnet.c | 1 -
sys/netgraph/ng_UI.c | 1 -
sys/netgraph/ng_eiface.c | 1 -
sys/netgraph/ng_fec.c | 1 -
sys/netgraph/ng_iface.c | 1 -
sys/netgraph/ng_rfc1490.c | 1 -
sys/netgraph/ng_split.c | 1 -
sys/netgraph/ng_sppp.c | 1 -
sys/netgraph/ng_vjc.c | 1 -
sys/netinet/in_mcast.c | 1 -
sys/netinet/ip_divert.c | 1 -
sys/netinet/libalias/alias_sctp.h | 1 -
sys/netinet/sctp_os_bsd.h | 1 -
sys/netinet/tcp_sack.c | 1 -
sys/netinet6/in6_mcast.c | 1 -
sys/nfs/nfs_lock.c | 1 -
sys/nfs/nfs_nfssvc.c | 1 -
sys/opencrypto/deflate.c | 1 -
sys/powerpc/aim/slb.c | 1 -
sys/powerpc/aim/uma_machdep.c | 1 -
sys/powerpc/booke/machdep.c | 1 -
sys/powerpc/mpc85xx/ds1553_bus_fdt.c | 1 -
sys/powerpc/powerpc/genassym.c | 1 -
sys/powerpc/ps3/ps3cdrom.c | 1 -
sys/powerpc/ps3/ps3disk.c | 1 -
sys/security/mac_biba/mac_biba.c | 1 -
sys/security/mac_lomac/mac_lomac.c | 1 -
sys/security/mac_mls/mac_mls.c | 1 -
sys/sys/shm.h | 2 --
sys/sys/socket.h | 2 --
sys/vm/vm_map.c | 2 --
sys/vm/vm_mmap.c | 1 -
sys/vm/vm_object.c | 2 --
sys/vm/vm_page.c | 2 --
sys/xen/evtchn/evtchn.c | 1 -
sys/xen/xenbus/xenbus.c | 1 -
sys/xen/xenstore/xenstore_dev.c | 1 -
tools/regression/p1003_1b/yield.c | 1 -
tools/tools/crypto/cryptotest.c | 1 -
tools/tools/kttcp/sys/kttcp.c | 1 -
tools/tools/vhba/vhba.h | 1 -
159 files changed, 9 insertions(+), 209 deletions(-)
diff --git a/crypto/heimdal/kadmin/kadmin_locl.h b/crypto/heimdal/kadmin/kadmin_locl.h
index bd92d9f..801d4cb 100644
--- a/crypto/heimdal/kadmin/kadmin_locl.h
+++ b/crypto/heimdal/kadmin/kadmin_locl.h
@@ -58,9 +58,6 @@
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
diff --git a/crypto/heimdal/lib/roken/getifaddrs.c b/crypto/heimdal/lib/roken/getifaddrs.c
index cc949b0..b7bd0a2 100644
--- a/crypto/heimdal/lib/roken/getifaddrs.c
+++ b/crypto/heimdal/lib/roken/getifaddrs.c
@@ -114,7 +114,6 @@ struct mbuf;
#include <errno.h>
#include <unistd.h>
-#include <sys/socket.h>
#include <asm/types.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
diff --git a/include/iconv.h b/include/iconv.h
index eecb2fd..a44dd61 100644
--- a/include/iconv.h
+++ b/include/iconv.h
@@ -38,9 +38,6 @@
#include <stdbool.h>
#include <wchar.h>
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
#define iconv_open libiconv_open
#define iconv_close libiconv_close
#define iconv(cd, in, insize, out, outsize) libiconv(cd, __DECONST(char **, in), insize, out, outsize)
diff --git a/lib/libc/i386/sys/i386_get_ldt.c b/lib/libc/i386/sys/i386_get_ldt.c
index 73d7667..7f91631 100644
--- a/lib/libc/i386/sys/i386_get_ldt.c
+++ b/lib/libc/i386/sys/i386_get_ldt.c
@@ -29,7 +29,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/cdefs.h>
#include <machine/segments.h>
#include <machine/sysarch.h>
diff --git a/lib/libc/i386/sys/i386_set_ldt.c b/lib/libc/i386/sys/i386_set_ldt.c
index 0bb109a..b6b0802 100644
--- a/lib/libc/i386/sys/i386_set_ldt.c
+++ b/lib/libc/i386/sys/i386_set_ldt.c
@@ -29,7 +29,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/cdefs.h>
#include <machine/segments.h>
#include <machine/sysarch.h>
diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h
index faae028..d7be9bf 100644
--- a/lib/libc/include/libc_private.h
+++ b/lib/libc/include/libc_private.h
@@ -226,7 +226,6 @@ extern void (*__cleanup)(void);
* for the wrapped "new" pad-less syscalls are here for now.
*/
extern int __getosreldate(void);
-#include <sys/_types.h>
/* Without pad */
extern __off_t __sys_lseek(int, __off_t, int);
extern int __sys_ftruncate(int, __off_t);
diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c
index 2413727..11ead59 100644
--- a/lib/libc/net/hesiod.c
+++ b/lib/libc/net/hesiod.c
@@ -43,8 +43,6 @@
* it uses res_send() and accesses _res.
*/
-#include <sys/cdefs.h>
-
#if 0
static char *orig_rcsid = "$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Exp $";
#endif
diff --git a/lib/libc/rpc/auth_des.c b/lib/libc/rpc/auth_des.c
index 1b45c3b..4400f80 100644
--- a/lib/libc/rpc/auth_des.c
+++ b/lib/libc/rpc/auth_des.c
@@ -57,7 +57,6 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)auth_des.c 2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI";
#endif
-#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#define USEC_PER_SEC 1000000
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
index 6a617ce..040cdf4 100644
--- a/lib/libc/stdio/gets.c
+++ b/lib/libc/stdio/gets.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include "namespace.h"
#include <unistd.h>
#include <stdio.h>
-#include <sys/cdefs.h>
#include "un-namespace.h"
#include "libc_private.h"
#include "local.h"
diff --git a/lib/libstand/netif.c b/lib/libstand/netif.c
index c260690..edb5ed7 100644
--- a/lib/libstand/netif.c
+++ b/lib/libstand/netif.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/types.h>
-#include <sys/cdefs.h>
#include <sys/mount.h>
#include <string.h>
diff --git a/lib/libstand/strcasecmp.c b/lib/libstand/strcasecmp.c
index 7ef3f59..86835be 100644
--- a/lib/libstand/strcasecmp.c
+++ b/lib/libstand/strcasecmp.c
@@ -30,7 +30,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/cdefs.h>
#include <string.h>
#include "stand.h"
diff --git a/lib/libthread_db/thread_db.c b/lib/libthread_db/thread_db.c
index 121855b..bbcea71 100644
--- a/lib/libthread_db/thread_db.c
+++ b/lib/libthread_db/thread_db.c
@@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
#include <stddef.h>
#include <thread_db.h>
#include <unistd.h>
-#include <sys/cdefs.h>
#include <sys/endian.h>
#include <sys/errno.h>
#include <sys/linker_set.h>
diff --git a/sbin/newfs_nandfs/newfs_nandfs.c b/sbin/newfs_nandfs/newfs_nandfs.c
index c996674..3ceb2df 100644
--- a/sbin/newfs_nandfs/newfs_nandfs.c
+++ b/sbin/newfs_nandfs/newfs_nandfs.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <sys/stddef.h>
#include <sys/uuid.h>
#include <sys/dirent.h>
-#include <sys/stat.h>
#include <ctype.h>
#include <err.h>
diff --git a/sys/amd64/amd64/bpf_jit_machdep.c b/sys/amd64/amd64/bpf_jit_machdep.c
index fe861d2..b878435 100644
--- a/sys/amd64/amd64/bpf_jit_machdep.c
+++ b/sys/amd64/amd64/bpf_jit_machdep.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
#ifdef _KERNEL
#include "opt_bpf.h"
-#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/socket.h>
@@ -44,9 +43,9 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
-#include <sys/param.h>
#endif
+#include <sys/param.h>
#include <sys/types.h>
#include <net/bpf.h>
diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 18130b5..ba0c5ad 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
-#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/sysctl.h>
#include <machine/bus.h>
diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index 174927a..511299d 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <vm/vm_map.h>
-#include <sys/proc.h>
#include <net/if.h>
#include <netinet/in.h>
#include <nfs/nfsproto.h>
diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c
index 3fa14c9..30d9232 100644
--- a/sys/amd64/ia32/ia32_syscall.c
+++ b/sys/amd64/ia32/ia32_syscall.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/pioctl.h>
#include <sys/kernel.h>
#include <sys/ktr.h>
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index c67539e..e2ef48c 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -30,7 +30,6 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/module.h>
#include <sys/sysctl.h>
diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c
index b699f9e..e9f9312 100644
--- a/sys/cam/ctl/ctl_backend_block.c
+++ b/sys/cam/ctl/ctl_backend_block.c
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
#include <sys/namei.h>
#include <sys/mount.h>
#include <sys/disk.h>
-#include <sys/fcntl.h>
#include <sys/filedesc.h>
#include <sys/proc.h>
#include <sys/pcpu.h>
diff --git a/sys/cam/ctl/ctl_util.c b/sys/cam/ctl/ctl_util.c
index 3ca0aa2..7dfb718 100644
--- a/sys/cam/ctl/ctl_util.c
+++ b/sys/cam/ctl/ctl_util.c
@@ -42,10 +42,8 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/types.h>
#include <sys/malloc.h>
#else /* __KERNEL__ */
-#include <sys/types.h>
#include <sys/time.h>
#include <stdint.h>
#include <stdio.h>
@@ -55,6 +53,7 @@ __FBSDID("$FreeBSD$");
#include <sys/sbuf.h>
#include <sys/queue.h>
#include <sys/callout.h>
+#include <sys/types.h>
#include <cam/scsi/scsi_all.h>
#include <cam/ctl/ctl_io.h>
#include <cam/ctl/ctl_scsi_all.h>
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index e9af881..2eecfb8 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/queue.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/mutex.h>
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 963b4e6..6ba17f5 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/malloc.h>
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c b/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c
index 9ff798a..0fbf3d4 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c
@@ -28,7 +28,6 @@
__FBSDID("$FreeBSD$");
#include <sys/types.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/systm.h>
#include <sys/kthread.h>
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
index cfec75d..601649b 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
@@ -39,7 +39,6 @@ extern "C" {
#include <sys/note.h>
#include <sys/kernel.h>
#include <sys/debug.h>
-#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/sysmacros.h>
#include <sys/bitmap.h>
@@ -47,7 +46,6 @@ extern "C" {
#include <sys/kmem.h>
#include <sys/taskq.h>
#include <sys/taskqueue.h>
-#include <sys/systm.h>
#include <sys/conf.h>
#include <sys/mutex.h>
#include <sys/rwlock.h>
@@ -58,7 +56,6 @@ extern "C" {
#include <sys/list.h>
#include <sys/zfs_debug.h>
#include <sys/sysevent.h>
-#include <sys/uio.h>
#include <sys/dirent.h>
#include <sys/time.h>
#include <sys/uio.h>
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
index fce4bb5..b6943c5 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
@@ -44,7 +44,6 @@
#include <sys/buf.h>
#include <sys/file.h>
#include <sys/kmem.h>
-#include <sys/conf.h>
#include <sys/cmn_err.h>
#include <sys/stat.h>
#include <sys/zfs_ioctl.h>
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
index 18e54d2..8e1139d 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
@@ -61,7 +61,6 @@
#include <sys/sa.h>
#include <sys/zfs_sa.h>
#include <sys/zfs_stat.h>
-#include <sys/refcount.h>
#include "zfs_prop.h"
#include "zfs_comutil.h"
diff --git a/sys/cddl/contrib/opensolaris/uts/common/os/callb.c b/sys/cddl/contrib/opensolaris/uts/common/os/callb.c
index da397a5..d79118d 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/os/callb.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/os/callb.c
@@ -27,7 +27,6 @@
#include <sys/types.h>
#include <sys/time.h>
#include <sys/sysmacros.h>
-#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index 934a32d..08d8ec1 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/file.h> /* Must come after sys/malloc.h */
-#include <sys/imgact.h>
#include <sys/mbuf.h>
#include <sys/mman.h>
#include <sys/module.h>
diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c
index e8e543a..24ca7b7 100644
--- a/sys/contrib/ipfilter/netinet/fil.c
+++ b/sys/contrib/ipfilter/netinet/fil.c
@@ -46,7 +46,6 @@
#endif
#if defined(_KERNEL)
# include <sys/systm.h>
-# include <sys/file.h>
#else
# include <stdio.h>
# include <string.h>
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c
index fb21bd1..28f9a1e 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.c
+++ b/sys/contrib/ipfilter/netinet/ip_frag.c
@@ -85,7 +85,6 @@ struct file;
# if defined(_KERNEL)
# ifndef IPFILTER_LKM
# include <sys/libkern.h>
-# include <sys/systm.h>
# endif
extern struct callout_handle fr_slowtimer_ch;
# endif
diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c
index 6c8b158..ba0674c 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.c
+++ b/sys/contrib/ipfilter/netinet/ip_state.c
@@ -105,7 +105,6 @@ struct file;
# include <sys/malloc.h>
# if defined(_KERNEL) && !defined(IPFILTER_LKM)
# include <sys/libkern.h>
-# include <sys/systm.h>
# endif
#endif
/* END OF INCLUDES */
diff --git a/sys/contrib/ipfilter/netinet/ip_sync.c b/sys/contrib/ipfilter/netinet/ip_sync.c
index a72f50f..fbd8f81 100644
--- a/sys/contrib/ipfilter/netinet/ip_sync.c
+++ b/sys/contrib/ipfilter/netinet/ip_sync.c
@@ -92,7 +92,6 @@ struct file;
# include <sys/malloc.h>
# if defined(_KERNEL) && !defined(IPFILTER_LKM)
# include <sys/libkern.h>
-# include <sys/systm.h>
# endif
#endif
/* END OF INCLUDES */
diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c
index 6dcb821..583d2a9 100644
--- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c
+++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c
@@ -101,7 +101,6 @@ SYSCTL_IPF(_net_inet_ipf, OID_AUTO, fr_minttl, CTLFLAG_RW, &fr_minttl, 0, "");
#define CDEV_MAJOR 79
#include <sys/poll.h>
#if __FreeBSD_version >= 500043
-# include <sys/select.h>
static int iplpoll(struct cdev *dev, int events, struct thread *td);
static struct cdevsw ipl_cdevsw = {
diff --git a/sys/contrib/rdma/rdma_addr.c b/sys/contrib/rdma/rdma_addr.c
index b1717c0..cdb4a0d 100644
--- a/sys/contrib/rdma/rdma_addr.c
+++ b/sys/contrib/rdma/rdma_addr.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/lock.h>
-#include <sys/condvar.h>
#include <sys/mutex.h>
#include <sys/rwlock.h>
#include <sys/queue.h>
diff --git a/sys/contrib/rdma/rdma_cache.c b/sys/contrib/rdma/rdma_cache.c
index 1e516a1..4c93c0e 100644
--- a/sys/contrib/rdma/rdma_cache.c
+++ b/sys/contrib/rdma/rdma_cache.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
#ifdef needed
#include <sys/condvar.h>
#include <sys/socket.h>
-#include <sys/condvar.h>
#endif
#include <contrib/rdma/ib_cache.h>
diff --git a/sys/crypto/rijndael/rijndael-alg-fst.c b/sys/crypto/rijndael/rijndael-alg-fst.c
index 5197e22..436396e 100644
--- a/sys/crypto/rijndael/rijndael-alg-fst.c
+++ b/sys/crypto/rijndael/rijndael-alg-fst.c
@@ -27,7 +27,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/cdefs.h>
#include <sys/types.h>
#ifdef _KERNEL
#include <sys/systm.h>
diff --git a/sys/crypto/sha1.c b/sys/crypto/sha1.c
index 208789a..d1a673c 100644
--- a/sys/crypto/sha1.c
+++ b/sys/crypto/sha1.c
@@ -38,7 +38,6 @@
__FBSDID("$FreeBSD$");
#include <sys/types.h>
-#include <sys/cdefs.h>
#include <sys/time.h>
#include <sys/systm.h>
diff --git a/sys/dev/ath/ah_osdep.c b/sys/dev/ath/ah_osdep.c
index 043ebed..2a15e74 100644
--- a/sys/dev/ath/ah_osdep.c
+++ b/sys/dev/ath/ah_osdep.c
@@ -168,7 +168,6 @@ DO_HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...)
* is emitted and the different devices are not identified.
*/
#include <sys/alq.h>
-#include <sys/pcpu.h>
#include <dev/ath/ath_hal/ah_decode.h>
static struct alq *ath_hal_alq;
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 60aa9e3..db92545 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -132,7 +132,6 @@ __FBSDID("$FreeBSD$");
#endif
#include <machine/bus.h>
-#include <sys/bus.h>
#include <dev/bktr/ioctl_meteor.h>
#include <dev/bktr/ioctl_bt848.h> /* extensions to ioctl_meteor.h */
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index 06a6547..6430405 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
#endif
#include <machine/bus.h>
-#include <sys/bus.h>
#include <dev/bktr/ioctl_meteor.h>
#include <dev/bktr/ioctl_bt848.h> /* extensions to ioctl_meteor.h */
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 4eb39ae..8856d9b 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -81,7 +81,6 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h> /* used by smbus and newbus */
#include <machine/bus.h> /* used by bus space and newbus */
-#include <sys/bus.h>
#include <sys/rman.h> /* used by newbus */
#include <machine/resource.h> /* used by newbus */
diff --git a/sys/dev/ct/ct_isa.c b/sys/dev/ct/ct_isa.c
index d17af23..30087c18 100644
--- a/sys/dev/ct/ct_isa.c
+++ b/sys/dev/ct/ct_isa.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <machine/md_var.h>
diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c
index 3a5d8f6..305df3a 100644
--- a/sys/dev/cxgb/cxgb_sge.c
+++ b/sys/dev/cxgb/cxgb_sge.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
#include "opt_inet.h"
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/module.h>
#include <sys/bus.h>
diff --git a/sys/dev/cxgb/sys/uipc_mvec.c b/sys/dev/cxgb/sys/uipc_mvec.c
index da546e8..3aba4c8 100644
--- a/sys/dev/cxgb/sys/uipc_mvec.c
+++ b/sys/dev/cxgb/sys/uipc_mvec.c
@@ -36,9 +36,6 @@ __FBSDID("$FreeBSD$");
#include <sys/ktr.h>
#include <sys/sf_buf.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
-
#include <machine/bus.h>
#include <cxgb_include.h>
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c
index 9ad6ed9..d47e762 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <sys/proc.h>
-#include <sys/queue.h>
#include <sys/libkern.h>
#include <netinet/in.h>
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c
index f5f59a3..d761d77 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <sys/proc.h>
-#include <sys/queue.h>
#include <sys/libkern.h>
#include <netinet/in.h>
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c
index 65b7a2d..613ed9f 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <sys/proc.h>
-#include <sys/queue.h>
#include <sys/libkern.h>
#include <netinet/in.h>
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c
index 2427263..9df0b19 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <sys/proc.h>
-#include <sys/queue.h>
#include <vm/vm.h>
#include <vm/pmap.h>
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c
index 0ccb70f..77dbed8 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <sys/proc.h>
-#include <sys/queue.h>
#include <sys/libkern.h>
#include <netinet/in.h>
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
index 9d6944a..e2260fc 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <sys/proc.h>
-#include <sys/queue.h>
#include <netinet/in.h>
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
index 7734fd0..78d1706 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <sys/proc.h>
-#include <sys/queue.h>
#include <net/route.h>
#include <netinet/in_systm.h>
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c
index a99bf66..cbbed1a 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
#include <sys/queue.h>
#include <sys/taskqueue.h>
#include <sys/proc.h>
-#include <sys/queue.h>
#include <sys/libkern.h>
#include <netinet/in.h>
diff --git a/sys/dev/drm/drmP.h b/sys/dev/drm/drmP.h
index 985193a..a2afaea 100644
--- a/sys/dev/drm/drmP.h
+++ b/sys/dev/drm/drmP.h
@@ -61,7 +61,6 @@ struct drm_file;
#include <sys/filio.h>
#include <sys/sysctl.h>
#include <sys/bus.h>
-#include <sys/queue.h>
#include <sys/signalvar.h>
#include <sys/poll.h>
#include <sys/taskqueue.h>
@@ -101,7 +100,6 @@ struct drm_file;
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <sys/selinfo.h>
-#include <sys/bus.h>
#include "dev/drm/drm.h"
#include "dev/drm/drm_atomic.h"
@@ -116,7 +114,6 @@ struct drm_file;
#if defined(DRM_LINUX) && DRM_LINUX && !defined(__amd64__)
#include <sys/file.h>
-#include <sys/proc.h>
#include <machine/../linux/linux.h>
#include <machine/../linux/linux_proto.h>
#else
diff --git a/sys/dev/drm2/drmP.h b/sys/dev/drm2/drmP.h
index 418914d..b799053 100644
--- a/sys/dev/drm2/drmP.h
+++ b/sys/dev/drm2/drmP.h
@@ -61,7 +61,6 @@ struct drm_file;
#include <sys/selinfo.h>
#include <sys/sysctl.h>
#include <sys/bus.h>
-#include <sys/queue.h>
#include <sys/signalvar.h>
#include <sys/poll.h>
#include <sys/sbuf.h>
@@ -92,8 +91,6 @@ struct drm_file;
#include <sys/mutex.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
-#include <sys/selinfo.h>
-#include <sys/bus.h>
#include <dev/drm2/drm.h>
#include <dev/drm2/drm_atomic.h>
diff --git a/sys/dev/fatm/if_fatm.c b/sys/dev/fatm/if_fatm.c
index 9020d22..a7c53e9 100644
--- a/sys/dev/fatm/if_fatm.c
+++ b/sys/dev/fatm/if_fatm.c
@@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/hatm/if_hatm.c b/sys/dev/hatm/if_hatm.c
index 0aa090e..b85d30c 100644
--- a/sys/dev/hatm/if_hatm.c
+++ b/sys/dev/hatm/if_hatm.c
@@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/hatm/if_hatm_intr.c b/sys/dev/hatm/if_hatm_intr.c
index b6a5368..0b855fa 100644
--- a/sys/dev/hatm/if_hatm_intr.c
+++ b/sys/dev/hatm/if_hatm_intr.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/hatm/if_hatm_ioctl.c b/sys/dev/hatm/if_hatm_ioctl.c
index 5e37b5d..5cb2f08 100644
--- a/sys/dev/hatm/if_hatm_ioctl.c
+++ b/sys/dev/hatm/if_hatm_ioctl.c
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/hatm/if_hatm_rx.c b/sys/dev/hatm/if_hatm_rx.c
index b79b2fc..2e4317e 100644
--- a/sys/dev/hatm/if_hatm_rx.c
+++ b/sys/dev/hatm/if_hatm_rx.c
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/hatm/if_hatm_tx.c b/sys/dev/hatm/if_hatm_tx.c
index 455dbb4..44e7871 100644
--- a/sys/dev/hatm/if_hatm_tx.c
+++ b/sys/dev/hatm/if_hatm_tx.c
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/ips/ips_disk.h b/sys/dev/ips/ips_disk.h
index b841eea..57cab04 100644
--- a/sys/dev/ips/ips_disk.h
+++ b/sys/dev/ips/ips_disk.h
@@ -36,7 +36,6 @@
#include <sys/conf.h>
#include <sys/types.h>
#include <sys/queue.h>
-#include <sys/disk.h>
#include <sys/bio.h>
#include <sys/disk.h>
#include <geom/geom_disk.h>
diff --git a/sys/dev/nand/nand.h b/sys/dev/nand/nand.h
index 05101ac..6b73768 100644
--- a/sys/dev/nand/nand.h
+++ b/sys/dev/nand/nand.h
@@ -36,7 +36,6 @@
#include <sys/taskqueue.h>
#include <sys/queue.h>
#include <sys/bio.h>
-#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/malloc.h>
diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c
index 35d5303..7301b65 100644
--- a/sys/dev/netmap/netmap.c
+++ b/sys/dev/netmap/netmap.c
@@ -517,7 +517,6 @@ netmap_dtor(void *data)
}
#ifdef __FreeBSD__
-#include <vm/vm.h>
#include <vm/vm_param.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
diff --git a/sys/dev/nsp/nsp_pccard.c b/sys/dev/nsp/nsp_pccard.c
index 08ed66f..a9f5f6c 100644
--- a/sys/dev/nsp/nsp_pccard.c
+++ b/sys/dev/nsp/nsp_pccard.c
@@ -49,8 +49,6 @@ __FBSDID("$FreeBSD$");
#include <machine/resource.h>
#include <sys/rman.h>
-#include <sys/bus.h>
-
#include <dev/pccard/pccardvar.h>
#include <cam/scsi/scsi_low.h>
diff --git a/sys/dev/nxge/xge-osdep.h b/sys/dev/nxge/xge-osdep.h
index e8f4aba..2386416 100644
--- a/sys/dev/nxge/xge-osdep.h
+++ b/sys/dev/nxge/xge-osdep.h
@@ -45,15 +45,11 @@
#include <sys/mutex.h>
#include <sys/rman.h>
#include <sys/stddef.h>
-#include <sys/types.h>
#include <sys/sockio.h>
#include <sys/proc.h>
-#include <sys/mutex.h>
#include <sys/types.h>
#include <sys/endian.h>
#include <sys/sysctl.h>
-#include <sys/endian.h>
-#include <sys/socket.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <machine/clock.h>
diff --git a/sys/dev/patm/if_patm.c b/sys/dev/patm/if_patm.c
index 279afde..fa2268a 100644
--- a/sys/dev/patm/if_patm.c
+++ b/sys/dev/patm/if_patm.c
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <sys/mbpool.h>
diff --git a/sys/dev/patm/if_patm_attach.c b/sys/dev/patm/if_patm_attach.c
index 97b6b95..38cb656 100644
--- a/sys/dev/patm/if_patm_attach.c
+++ b/sys/dev/patm/if_patm_attach.c
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <sys/mbpool.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/patm/if_patm_intr.c b/sys/dev/patm/if_patm_intr.c
index 12ef995..003cf0ce 100644
--- a/sys/dev/patm/if_patm_intr.c
+++ b/sys/dev/patm/if_patm_intr.c
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <sys/mbpool.h>
diff --git a/sys/dev/patm/if_patm_ioctl.c b/sys/dev/patm/if_patm_ioctl.c
index 2ed466d..7d4ce1c 100644
--- a/sys/dev/patm/if_patm_ioctl.c
+++ b/sys/dev/patm/if_patm_ioctl.c
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <sys/mbpool.h>
diff --git a/sys/dev/patm/if_patm_rx.c b/sys/dev/patm/if_patm_rx.c
index f739b9c..407f3c9 100644
--- a/sys/dev/patm/if_patm_rx.c
+++ b/sys/dev/patm/if_patm_rx.c
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <sys/mbpool.h>
diff --git a/sys/dev/patm/if_patm_tx.c b/sys/dev/patm/if_patm_tx.c
index 81a1efc..776a80c 100644
--- a/sys/dev/patm/if_patm_tx.c
+++ b/sys/dev/patm/if_patm_tx.c
@@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <sys/mbpool.h>
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index 964e1bd..d3ba5de 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -47,11 +47,8 @@ __FBSDID("$FreeBSD$");
#include <sys/conf.h>
#include <sys/selinfo.h>
#include <sys/sysctl.h>
-#include <sys/types.h>
#include <sys/malloc.h>
-#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/proc.h>
#include <sys/fcntl.h>
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c
index 3e061a7..f16af3f 100644
--- a/sys/dev/sound/midi/mpu401.c
+++ b/sys/dev/sound/midi/mpu401.c
@@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/queue.h>
#include <sys/kernel.h>
#include <sys/lock.h>
diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c
index 406a85f..3bb913a 100644
--- a/sys/dev/sound/pci/emu10kx-pcm.c
+++ b/sys/dev/sound/pci/emu10kx-pcm.c
@@ -32,7 +32,6 @@
#include <sys/bus.h>
#include <machine/bus.h>
#include <sys/rman.h>
-#include <sys/systm.h>
#include <sys/sbuf.h>
#include <sys/queue.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/net/if_usie.c b/sys/dev/usb/net/if_usie.c
index f3dbd9e..b7acb7a 100644
--- a/sys/dev/usb/net/if_usie.c
+++ b/sys/dev/usb/net/if_usie.c
@@ -29,7 +29,6 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/queue.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/virtio/pci/virtio_pci.c b/sys/dev/virtio/pci/virtio_pci.c
index 917ca84..a24735a 100644
--- a/sys/dev/virtio/pci/virtio_pci.c
+++ b/sys/dev/virtio/pci/virtio_pci.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <dev/pci/pcivar.h>
diff --git a/sys/dev/wtap/if_wtap_module.c b/sys/dev/wtap/if_wtap_module.c
index 7a87d57..003fbb5 100644
--- a/sys/dev/wtap/if_wtap_module.c
+++ b/sys/dev/wtap/if_wtap_module.c
@@ -51,7 +51,6 @@
#include <sys/kthread.h>
#include <sys/taskqueue.h>
#include <sys/priv.h>
-#include <sys/sysctl.h>
#include <machine/bus.h>
@@ -70,7 +69,6 @@
#include <net/bpf.h>
-#include <sys/errno.h>
#include <sys/conf.h> /* cdevsw struct */
#include <sys/uio.h> /* uio struct */
diff --git a/sys/dev/wtap/if_wtapvar.h b/sys/dev/wtap/if_wtapvar.h
index bb165b4..5c41ae7 100644
--- a/sys/dev/wtap/if_wtapvar.h
+++ b/sys/dev/wtap/if_wtapvar.h
@@ -54,7 +54,6 @@
#include <sys/kthread.h>
#include <sys/taskqueue.h>
#include <sys/priv.h>
-#include <sys/sysctl.h>
#include <machine/bus.h>
diff --git a/sys/dev/wtap/plugins/visibility.c b/sys/dev/wtap/plugins/visibility.c
index a73d520..c6635d1 100644
--- a/sys/dev/wtap/plugins/visibility.c
+++ b/sys/dev/wtap/plugins/visibility.c
@@ -51,7 +51,6 @@
#include <sys/kthread.h>
#include <sys/taskqueue.h>
#include <sys/priv.h>
-#include <sys/sysctl.h>
#include <machine/bus.h>
@@ -70,7 +69,6 @@
#include <net/bpf.h>
-#include <sys/errno.h>
#include <sys/conf.h> /* cdevsw struct */
#include <sys/uio.h> /* uio struct */
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 855c8c1..b48f832 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -93,7 +93,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
-#include <sys/cdefs.h>
#include <sys/errno.h>
#include <sys/kernel.h>
#include <sys/mbuf.h>
diff --git a/sys/dev/xen/console/console.c b/sys/dev/xen/console/console.c
index 6281bf2..c4d4f6d 100644
--- a/sys/dev/xen/console/console.c
+++ b/sys/dev/xen/console/console.c
@@ -3,7 +3,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/module.h>
-#include <sys/systm.h>
#include <sys/consio.h>
#include <sys/priv.h>
#include <sys/proc.h>
@@ -20,7 +19,6 @@ __FBSDID("$FreeBSD$");
#include <xen/xen_intr.h>
#include <sys/cons.h>
#include <sys/kdb.h>
-#include <sys/proc.h>
#include <dev/xen/console/xencons_ring.h>
#include <xen/interface/io/console.h>
diff --git a/sys/dev/xen/console/xencons_ring.c b/sys/dev/xen/console/xencons_ring.c
index 077d286..ec3d3dd 100644
--- a/sys/dev/xen/console/xencons_ring.c
+++ b/sys/dev/xen/console/xencons_ring.c
@@ -3,7 +3,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/module.h>
-#include <sys/systm.h>
#include <sys/consio.h>
#include <sys/proc.h>
#include <sys/uio.h>
@@ -19,7 +18,6 @@ __FBSDID("$FreeBSD$");
#include <machine/xen/xen-os.h>
#include <xen/hypervisor.h>
#include <xen/xen_intr.h>
-#include <sys/cons.h>
#include <xen/xen_intr.h>
#include <xen/evtchn.h>
diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c
index 18f42bb..1c3c3bf 100644
--- a/sys/dev/xen/control/control.c
+++ b/sys/dev/xen/control/control.c
@@ -121,7 +121,6 @@ __FBSDID("$FreeBSD$");
#include <sys/vnode.h>
#ifndef XENHVM
-#include <sys/sched.h>
#include <sys/smp.h>
#endif
diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c
index 724e8d0..423e572 100644
--- a/sys/fs/fuse/fuse_vnops.c
+++ b/sys/fs/fuse/fuse_vnops.c
@@ -91,7 +91,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_object.h>
#include <vm/vm_pager.h>
#include <vm/vnode_pager.h>
-#include <vm/vm_object.h>
#include "fuse.h"
#include "fuse_file.h"
diff --git a/sys/fs/nandfs/bmap.c b/sys/fs/nandfs/bmap.c
index 4cc4cb0..73b466d 100644
--- a/sys/fs/nandfs/bmap.c
+++ b/sys/fs/nandfs/bmap.c
@@ -43,11 +43,6 @@ __FBSDID("$FreeBSD$");
#include <sys/ktr.h>
#include <sys/kdb.h>
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-#include <vm/vm_object.h>
-#include <vm/vnode_pager.h>
-
#include <machine/_inttypes.h>
#include <vm/vm.h>
diff --git a/sys/fs/nandfs/nandfs.h b/sys/fs/nandfs/nandfs.h
index beb4e16..4d21ac4 100644
--- a/sys/fs/nandfs/nandfs.h
+++ b/sys/fs/nandfs/nandfs.h
@@ -39,7 +39,6 @@
#include <sys/queue.h>
#include <sys/uio.h>
-#include <sys/mutex.h>
#include <sys/disk.h>
#include <sys/kthread.h>
diff --git a/sys/fs/nandfs/nandfs_bmap.c b/sys/fs/nandfs/nandfs_bmap.c
index 9f800b8..1279be9 100644
--- a/sys/fs/nandfs/nandfs_bmap.c
+++ b/sys/fs/nandfs/nandfs_bmap.c
@@ -45,11 +45,6 @@ __FBSDID("$FreeBSD$");
#include <sys/lockf.h>
#include <sys/ktr.h>
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-#include <vm/vm_object.h>
-#include <vm/vnode_pager.h>
-
#include <machine/_inttypes.h>
#include <vm/vm.h>
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index c0408dd..5ef8f26 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -30,7 +30,6 @@
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/namei.h>
#include <sys/conf.h>
#include <sys/priv.h>
diff --git a/sys/fs/procfs/procfs_status.c b/sys/fs/procfs/procfs_status.c
index a97e0a9..6682265 100644
--- a/sys/fs/procfs/procfs_status.c
+++ b/sys/fs/procfs/procfs_status.c
@@ -42,7 +42,6 @@
#include <sys/systm.h>
#include <sys/exec.h>
#include <sys/lock.h>
-#include <sys/mutex.h>
#include <sys/jail.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
diff --git a/sys/fs/pseudofs/pseudofs_fileno.c b/sys/fs/pseudofs/pseudofs_fileno.c
index a8c034f..5947503 100644
--- a/sys/fs/pseudofs/pseudofs_fileno.c
+++ b/sys/fs/pseudofs/pseudofs_fileno.c
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/systm.h>
#include <sys/limits.h>
#include <sys/lock.h>
#include <sys/malloc.h>
diff --git a/sys/geom/geom_ctl.c b/sys/geom/geom_ctl.c
index d8ca92f..deb3df2 100644
--- a/sys/geom/geom_ctl.c
+++ b/sys/geom/geom_ctl.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/sysctl.h>
#include <sys/bio.h>
#include <sys/conf.h>
#include <sys/disk.h>
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 72e9162..93312b1 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <sys/sysctl.h>
#include <sys/bio.h>
#include <sys/ctype.h>
#include <sys/fcntl.h>
diff --git a/sys/geom/virstor/g_virstor.c b/sys/geom/virstor/g_virstor.c
index 40e25d1..6870310 100644
--- a/sys/geom/virstor/g_virstor.c
+++ b/sys/geom/virstor/g_virstor.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <sys/time.h>
#include <sys/proc.h>
#include <sys/kthread.h>
-#include <sys/mutex.h>
#include <vm/uma.h>
#include <geom/geom.h>
diff --git a/sys/i386/i386/bpf_jit_machdep.c b/sys/i386/i386/bpf_jit_machdep.c
index 4c2946f..3f36c24 100644
--- a/sys/i386/i386/bpf_jit_machdep.c
+++ b/sys/i386/i386/bpf_jit_machdep.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
#ifdef _KERNEL
#include "opt_bpf.h"
-#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/socket.h>
@@ -44,9 +43,9 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
-#include <sys/param.h>
#endif
+#include <sys/param.h>
#include <sys/types.h>
#include <net/bpf.h>
diff --git a/sys/i386/i386/elan-mmcr.c b/sys/i386/i386/elan-mmcr.c
index 6f63146..96b453a 100644
--- a/sys/i386/i386/elan-mmcr.c
+++ b/sys/i386/i386/elan-mmcr.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/conf.h>
-#include <sys/sysctl.h>
#include <sys/syslog.h>
#include <sys/timetc.h>
#include <sys/proc.h>
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index 2394c09..9a0a2ec 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <vm/vm_map.h>
-#include <sys/proc.h>
#include <net/if.h>
#include <netinet/in.h>
#include <nfs/nfsproto.h>
diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c
index f688661..1edd48e 100644
--- a/sys/i386/ibcs2/ibcs2_other.c
+++ b/sys/i386/ibcs2/ibcs2_other.c
@@ -81,7 +81,6 @@ ibcs2_lseek(struct thread *td, register struct ibcs2_lseek_args *uap)
#ifdef SPX_HACK
#include <sys/socket.h>
-#include <sys/un.h>
int
spx_open(struct thread *td)
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 3b86d84..34d48f0 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/module.h>
#include <sys/mutex.h>
-#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/smp.h>
#include <sys/sysctl.h>
diff --git a/sys/ia64/ia64/genassym.c b/sys/ia64/ia64/genassym.c
index 10ba5ab..3bc6192 100644
--- a/sys/ia64/ia64/genassym.c
+++ b/sys/ia64/ia64/genassym.c
@@ -38,7 +38,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/assym.h>
-#include <sys/proc.h>
#include <sys/bio.h>
#include <sys/buf.h>
#include <sys/errno.h>
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index c0cdaa9..8879b7e 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_map.h>
#include <vm/vm_extern.h>
#include <vm/vm_param.h>
-#include <sys/ptrace.h>
#include <machine/cpu.h>
#include <machine/md_var.h>
#include <machine/reg.h>
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index c04d1da..218763d 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -1395,8 +1395,6 @@ drain_dev_clone_events(void)
#include "opt_ddb.h"
#ifdef DDB
-#include <sys/kernel.h>
-
#include <ddb/ddb.h>
DB_SHOW_COMMAND(cdev, db_show_cdev)
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 3e64874..fbff73e 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/capability.h>
#include <sys/systm.h>
-#include <sys/capability.h>
#include <sys/eventhandler.h>
#include <sys/lock.h>
#include <sys/mutex.h>
diff --git a/sys/kern/kern_gzio.c b/sys/kern/kern_gzio.c
index 15dc301..6ae71aa 100644
--- a/sys/kern/kern_gzio.c
+++ b/sys/kern/kern_gzio.c
@@ -17,7 +17,6 @@
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/malloc.h>
-#include <sys/vnode.h>
#include <sys/syslog.h>
#include <sys/endian.h>
#include <net/zutil.h>
diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c
index 4270b41..e0d26db 100644
--- a/sys/kern/kern_thr.c
+++ b/sys/kern/kern_thr.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <sys/resourcevar.h>
#include <sys/rwlock.h>
#include <sys/sched.h>
-#include <sys/sysctl.h>
#include <sys/smp.h>
#include <sys/syscallsubr.h>
#include <sys/sysent.h>
diff --git a/sys/kern/subr_acl_nfs4.c b/sys/kern/subr_acl_nfs4.c
index ef378a0..3daf5fb 100644
--- a/sys/kern/subr_acl_nfs4.c
+++ b/sys/kern/subr_acl_nfs4.c
@@ -42,19 +42,18 @@ __FBSDID("$FreeBSD$");
#include <sys/priv.h>
#include <sys/vnode.h>
#include <sys/errno.h>
-#include <sys/stat.h>
#include <sys/sysctl.h>
-#include <sys/acl.h>
#else
#include <errno.h>
#include <assert.h>
-#include <sys/acl.h>
-#include <sys/stat.h>
#define KASSERT(a, b) assert(a)
#define CTASSERT(a)
#endif /* !_KERNEL */
+#include <sys/acl.h>
+#include <sys/stat.h>
+
#ifdef _KERNEL
static void acl_nfs4_trivial_from_mode(struct acl *aclp, mode_t mode);
diff --git a/sys/kern/subr_blist.c b/sys/kern/subr_blist.c
index 5c45b81..f2dbbc4 100644
--- a/sys/kern/subr_blist.c
+++ b/sys/kern/subr_blist.c
@@ -82,13 +82,14 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/blist.h>
+
#ifdef _KERNEL
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/lock.h>
#include <sys/kernel.h>
-#include <sys/blist.h>
#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/mutex.h>
@@ -112,8 +113,6 @@ __FBSDID("$FreeBSD$");
typedef unsigned int u_daddr_t;
-#include <sys/blist.h>
-
void panic(const char *ctl, ...);
#endif
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 1f24e88..516be35 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -86,10 +86,6 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#endif
-#ifdef HWPMC_HOOKS
-#include <sys/pmckern.h>
-#endif
-
#include <security/mac/mac_framework.h>
/*
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index cba1638..6de0598 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -437,8 +437,6 @@ static struct syscall_helper_data aio_syscalls[] = {
};
#ifdef COMPAT_FREEBSD32
-#include <sys/mount.h>
-#include <sys/socket.h>
#include <compat/freebsd32/freebsd32.h>
#include <compat/freebsd32/freebsd32_proto.h>
#include <compat/freebsd32/freebsd32_signal.h>
diff --git a/sys/mips/mips/freebsd32_machdep.c b/sys/mips/mips/freebsd32_machdep.c
index dfdf70f..aa24220 100644
--- a/sys/mips/mips/freebsd32_machdep.c
+++ b/sys/mips/mips/freebsd32_machdep.c
@@ -38,7 +38,6 @@
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <sys/sysent.h>
#include <sys/exec.h>
#include <sys/imgact.h>
#include <sys/malloc.h>
diff --git a/sys/mips/nlm/cms.c b/sys/mips/nlm/cms.c
index 75fc9d5..dd92a90 100644
--- a/sys/mips/nlm/cms.c
+++ b/sys/mips/nlm/cms.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/lock.h>
#include <sys/mutex.h>
-#include <sys/proc.h>
#include <sys/limits.h>
#include <sys/bus.h>
diff --git a/sys/mips/nlm/dev/sec/nlmrsa.c b/sys/mips/nlm/dev/sec/nlmrsa.c
index 2438fdf..7cae96f 100644
--- a/sys/mips/nlm/dev/sec/nlmrsa.c
+++ b/sys/mips/nlm/dev/sec/nlmrsa.c
@@ -29,7 +29,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/mips/nlm/dev/sec/nlmsec.c b/sys/mips/nlm/dev/sec/nlmsec.c
index 4c95661..a672c4b 100644
--- a/sys/mips/nlm/dev/sec/nlmsec.c
+++ b/sys/mips/nlm/dev/sec/nlmsec.c
@@ -29,7 +29,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
diff --git a/sys/modules/ata/atadevel/ata-devel.c b/sys/modules/ata/atadevel/ata-devel.c
index dbbbab2..fdb2d47 100644
--- a/sys/modules/ata/atadevel/ata-devel.c
+++ b/sys/modules/ata/atadevel/ata-devel.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
#include <sys/sema.h>
#include <sys/taskqueue.h>
#include <sys/errno.h>
-#include <sys/kernel.h>
#include <sys/conf.h>
#include <sys/uio.h>
#include <sys/malloc.h>
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index ba31c66..3baef18 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
#include <sys/event.h>
#include <sys/file.h>
#include <sys/poll.h>
-#include <sys/proc.h>
#include <sys/socket.h>
diff --git a/sys/net/bpf_jitter.c b/sys/net/bpf_jitter.c
index d024047..8864110 100644
--- a/sys/net/bpf_jitter.c
+++ b/sys/net/bpf_jitter.c
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
#ifdef _KERNEL
#include "opt_bpf.h"
-#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -43,10 +42,10 @@ __FBSDID("$FreeBSD$");
#else
#include <stdlib.h>
#include <sys/mman.h>
-#include <sys/param.h>
#include <sys/types.h>
#endif
+#include <sys/param.h>
#include <net/bpf.h>
#include <net/bpf_jitter.h>
diff --git a/sys/net/if.c b/sys/net/if.c
index 57bd4e1..030317d 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -58,7 +58,6 @@
#include <sys/taskqueue.h>
#include <sys/domain.h>
#include <sys/jail.h>
-#include <sys/priv.h>
#include <machine/stdarg.h>
#include <vm/uma.h>
diff --git a/sys/net/pfil.c b/sys/net/pfil.c
index 06da0be..3019604 100644
--- a/sys/net/pfil.c
+++ b/sys/net/pfil.c
@@ -39,7 +39,6 @@
#include <sys/socketvar.h>
#include <sys/systm.h>
#include <sys/condvar.h>
-#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/queue.h>
diff --git a/sys/net/route.c b/sys/net/route.c
index e69ce48..25da7f7 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -42,7 +42,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/syslog.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
diff --git a/sys/net/vnet.c b/sys/net/vnet.c
index e8864aa..5567d73 100644
--- a/sys/net/vnet.c
+++ b/sys/net/vnet.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
#include <sys/jail.h>
#include <sys/sdt.h>
#include <sys/systm.h>
-#include <sys/sysctl.h>
#include <sys/eventhandler.h>
#include <sys/lock.h>
#include <sys/malloc.h>
diff --git a/sys/netgraph/ng_UI.c b/sys/netgraph/ng_UI.c
index 8e8ab55..ae72bc4 100644
--- a/sys/netgraph/ng_UI.c
+++ b/sys/netgraph/ng_UI.c
@@ -47,7 +47,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/errno.h>
#include <netgraph/ng_message.h>
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index 0f471bb..a2de22e 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -34,7 +34,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/errno.h>
#include <sys/proc.h>
#include <sys/sockio.h>
#include <sys/socket.h>
diff --git a/sys/netgraph/ng_fec.c b/sys/netgraph/ng_fec.c
index 459931a..a6b3eb6 100644
--- a/sys/netgraph/ng_fec.c
+++ b/sys/netgraph/ng_fec.c
@@ -94,7 +94,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/errno.h>
#include <sys/sockio.h>
#include <sys/socket.h>
#include <sys/syslog.h>
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index 5e6f12f..3845d91 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -63,7 +63,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/errno.h>
#include <sys/proc.h>
#include <sys/random.h>
#include <sys/sockio.h>
diff --git a/sys/netgraph/ng_rfc1490.c b/sys/netgraph/ng_rfc1490.c
index 061faa2..3c64edf 100644
--- a/sys/netgraph/ng_rfc1490.c
+++ b/sys/netgraph/ng_rfc1490.c
@@ -53,7 +53,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/errno.h>
#include <sys/socket.h>
#include <net/if.h>
diff --git a/sys/netgraph/ng_split.c b/sys/netgraph/ng_split.c
index 87a2cbc..486308b 100644
--- a/sys/netgraph/ng_split.c
+++ b/sys/netgraph/ng_split.c
@@ -35,7 +35,6 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/errno.h>
#include <sys/sockio.h>
#include <sys/socket.h>
#include <sys/syslog.h>
diff --git a/sys/netgraph/ng_sppp.c b/sys/netgraph/ng_sppp.c
index 4ad89ec..bf7ada7 100644
--- a/sys/netgraph/ng_sppp.c
+++ b/sys/netgraph/ng_sppp.c
@@ -25,7 +25,6 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
-#include <sys/errno.h>
#include <sys/sockio.h>
#include <sys/socket.h>
#include <sys/syslog.h>
diff --git a/sys/netgraph/ng_vjc.c b/sys/netgraph/ng_vjc.c
index e1b76b5..93f9f9e 100644
--- a/sys/netgraph/ng_vjc.c
+++ b/sys/netgraph/ng_vjc.c
@@ -53,7 +53,6 @@
#include <sys/kernel.h>
#include <sys/mbuf.h>
#include <sys/malloc.h>
-#include <sys/errno.h>
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>
diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c
index b0d53b0..3cc91cf 100644
--- a/sys/netinet/in_mcast.c
+++ b/sys/netinet/in_mcast.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
-#include <sys/protosw.h>
#include <sys/sysctl.h>
#include <sys/ktr.h>
#include <sys/taskqueue.h>
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index e698035..39c348d 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/module.h>
-#include <sys/kernel.h>
#include <sys/priv.h>
#include <sys/proc.h>
#include <sys/protosw.h>
diff --git a/sys/netinet/libalias/alias_sctp.h b/sys/netinet/libalias/alias_sctp.h
index bb6db27..0dd135b 100644
--- a/sys/netinet/libalias/alias_sctp.h
+++ b/sys/netinet/libalias/alias_sctp.h
@@ -60,7 +60,6 @@
#include <sys/socketvar.h>
#include <sys/syslog.h>
#endif // #ifdef _KERNEL
-#include <sys/types.h>
#include <sys/queue.h>
#include <sys/types.h>
diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h
index 9cb77b6..df3b943 100644
--- a/sys/netinet/sctp_os_bsd.h
+++ b/sys/netinet/sctp_os_bsd.h
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/kernel.h>
-#include <sys/sysctl.h>
#include <sys/mbuf.h>
#include <sys/protosw.h>
#include <sys/socket.h>
diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
index 440bd64..e51bfc4 100644
--- a/sys/netinet/tcp_sack.c
+++ b/sys/netinet/tcp_sack.c
@@ -78,7 +78,6 @@ __FBSDID("$FreeBSD$");
#include "opt_tcpdebug.h"
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/malloc.h>
diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c
index ce23aa8..1f1f6e7 100644
--- a/sys/netinet6/in6_mcast.c
+++ b/sys/netinet6/in6_mcast.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
#include <sys/protosw.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
-#include <sys/protosw.h>
#include <sys/sysctl.h>
#include <sys/priv.h>
#include <sys/ktr.h>
diff --git a/sys/nfs/nfs_lock.c b/sys/nfs/nfs_lock.c
index 7d11672..38fc20f 100644
--- a/sys/nfs/nfs_lock.c
+++ b/sys/nfs/nfs_lock.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <sys/proc.h>
#include <sys/resourcevar.h>
#include <sys/socket.h>
-#include <sys/socket.h>
#include <sys/unistd.h>
#include <sys/vnode.h>
diff --git a/sys/nfs/nfs_nfssvc.c b/sys/nfs/nfs_nfssvc.c
index 3f925a1..1aa02d5 100644
--- a/sys/nfs/nfs_nfssvc.c
+++ b/sys/nfs/nfs_nfssvc.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/sysproto.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/priv.h>
diff --git a/sys/opencrypto/deflate.c b/sys/opencrypto/deflate.c
index deaf052..0c6d429 100644
--- a/sys/opencrypto/deflate.c
+++ b/sys/opencrypto/deflate.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#include "opt_kdtrace.h"
#include <sys/types.h>
-#include <sys/param.h>
#include <sys/malloc.h>
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/powerpc/aim/slb.c b/sys/powerpc/aim/slb.c
index b95f036..ba48ef8 100644
--- a/sys/powerpc/aim/slb.c
+++ b/sys/powerpc/aim/slb.c
@@ -34,7 +34,6 @@
#include <sys/proc.h>
#include <sys/systm.h>
-#include <vm/vm.h>
#include <vm/uma.h>
#include <vm/vm.h>
#include <vm/vm_map.h>
diff --git a/sys/powerpc/aim/uma_machdep.c b/sys/powerpc/aim/uma_machdep.c
index 255826e..fcf207d 100644
--- a/sys/powerpc/aim/uma_machdep.c
+++ b/sys/powerpc/aim/uma_machdep.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_pageout.h>
#include <vm/vm_extern.h>
#include <vm/uma.h>
-#include <vm/uma.h>
#include <vm/uma_int.h>
#include <machine/md_var.h>
#include <machine/vmparam.h>
diff --git a/sys/powerpc/booke/machdep.c b/sys/powerpc/booke/machdep.c
index abd04ba..ca5df78 100644
--- a/sys/powerpc/booke/machdep.c
+++ b/sys/powerpc/booke/machdep.c
@@ -86,7 +86,6 @@ __FBSDID("$FreeBSD$");
#include "opt_kstack_pages.h"
#include "opt_platform.h"
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/proc.h>
diff --git a/sys/powerpc/mpc85xx/ds1553_bus_fdt.c b/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
index ffbbee1..ca79785 100644
--- a/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
+++ b/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
@@ -29,7 +29,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index 0a1b949..eea6bc6 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -43,7 +43,6 @@
#include <sys/smp.h>
#include <sys/systm.h>
#include <sys/ucontext.h>
-#include <sys/ucontext.h>
#include <sys/vmmeter.h>
#include <vm/vm.h>
diff --git a/sys/powerpc/ps3/ps3cdrom.c b/sys/powerpc/ps3/ps3cdrom.c
index 3403e1e..db2d1f4 100644
--- a/sys/powerpc/ps3/ps3cdrom.c
+++ b/sys/powerpc/ps3/ps3cdrom.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/platform.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <cam/cam.h>
diff --git a/sys/powerpc/ps3/ps3disk.c b/sys/powerpc/ps3/ps3disk.c
index d68caea..b3d0421 100644
--- a/sys/powerpc/ps3/ps3disk.c
+++ b/sys/powerpc/ps3/ps3disk.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/platform.h>
#include <machine/resource.h>
-#include <sys/bus.h>
#include <sys/rman.h>
#include <geom/geom_disk.h>
diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c
index aa37fc7..40b9c66 100644
--- a/sys/security/mac_biba/mac_biba.c
+++ b/sys/security/mac_biba/mac_biba.c
@@ -58,7 +58,6 @@
#include <sys/priv.h>
#include <sys/proc.h>
#include <sys/sbuf.h>
-#include <sys/systm.h>
#include <sys/sysproto.h>
#include <sys/sysent.h>
#include <sys/systm.h>
diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c
index 40c9c2f..256b820 100644
--- a/sys/security/mac_lomac/mac_lomac.c
+++ b/sys/security/mac_lomac/mac_lomac.c
@@ -56,7 +56,6 @@
#include <sys/priv.h>
#include <sys/proc.h>
#include <sys/sbuf.h>
-#include <sys/systm.h>
#include <sys/sysproto.h>
#include <sys/sysent.h>
#include <sys/systm.h>
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c
index ff9084e..01da613 100644
--- a/sys/security/mac_mls/mac_mls.c
+++ b/sys/security/mac_mls/mac_mls.c
@@ -59,7 +59,6 @@
#include <sys/mount.h>
#include <sys/proc.h>
#include <sys/sbuf.h>
-#include <sys/systm.h>
#include <sys/sysproto.h>
#include <sys/sysent.h>
#include <sys/systm.h>
diff --git a/sys/sys/shm.h b/sys/sys/shm.h
index 799bbf5..4069cb4 100644
--- a/sys/sys/shm.h
+++ b/sys/sys/shm.h
@@ -146,8 +146,6 @@ void shmexit(struct vmspace *);
void shmfork(struct proc *, struct proc *);
#else /* !_KERNEL */
-#include <sys/cdefs.h>
-
#ifndef _SIZE_T_DECLARED
typedef __size_t size_t;
#define _SIZE_T_DECLARED
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index c29a689..40a98c3 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -615,8 +615,6 @@ struct sf_hdtr {
#ifndef _KERNEL
-#include <sys/cdefs.h>
-
__BEGIN_DECLS
int accept(int, struct sockaddr * __restrict, socklen_t * __restrict);
int bind(int, const struct sockaddr *, socklen_t);
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 5a7e347..fdc4739 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -3994,8 +3994,6 @@ vm_map_lookup_done(vm_map_t map, vm_map_entry_t entry)
#include "opt_ddb.h"
#ifdef DDB
-#include <sys/kernel.h>
-
#include <ddb/ddb.h>
static void
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index 0d5ab55..2b513fa 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -80,7 +80,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_pager.h>
#include <vm/vm_pageout.h>
#include <vm/vm_extern.h>
-#include <vm/vm_page.h>
#include <vm/vnode_pager.h>
#ifdef HWPMC_HOOKS
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index d46a8b4..aad4892 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -2155,8 +2155,6 @@ vm_object_set_writeable_dirty(vm_object_t object)
#include "opt_ddb.h"
#ifdef DDB
-#include <sys/kernel.h>
-
#include <sys/cons.h>
#include <ddb/ddb.h>
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 9dfefb1..94a1de5 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -3060,8 +3060,6 @@ vm_page_object_lock_assert(vm_page_t m)
#include "opt_ddb.h"
#ifdef DDB
-#include <sys/kernel.h>
-
#include <ddb/ddb.h>
DB_SHOW_COMMAND(page, vm_page_print_page_info)
diff --git a/sys/xen/evtchn/evtchn.c b/sys/xen/evtchn/evtchn.c
index eb18b57..d3d0f43 100644
--- a/sys/xen/evtchn/evtchn.c
+++ b/sys/xen/evtchn/evtchn.c
@@ -31,7 +31,6 @@ __FBSDID("$FreeBSD$");
#include <machine/xen/synch_bitops.h>
#include <xen/evtchn.h>
#include <xen/hypervisor.h>
-#include <sys/smp.h>
#include <xen/xen_intr.h>
#include <xen/evtchn.h>
diff --git a/sys/xen/xenbus/xenbus.c b/sys/xen/xenbus/xenbus.c
index 8887066..fd0b5a0 100644
--- a/sys/xen/xenbus/xenbus.c
+++ b/sys/xen/xenbus/xenbus.c
@@ -42,7 +42,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/types.h>
diff --git a/sys/xen/xenstore/xenstore_dev.c b/sys/xen/xenstore/xenstore_dev.c
index 1fa4197..4f10451 100644
--- a/sys/xen/xenstore/xenstore_dev.c
+++ b/sys/xen/xenstore/xenstore_dev.c
@@ -34,7 +34,6 @@
__FBSDID("$FreeBSD$");
#include <sys/types.h>
-#include <sys/cdefs.h>
#include <sys/errno.h>
#include <sys/uio.h>
#include <sys/param.h>
diff --git a/tools/regression/p1003_1b/yield.c b/tools/regression/p1003_1b/yield.c
index ac31a99..4ea1ff18 100644
--- a/tools/regression/p1003_1b/yield.c
+++ b/tools/regression/p1003_1b/yield.c
@@ -31,7 +31,6 @@
* $FreeBSD$
*
*/
-#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/tools/tools/crypto/cryptotest.c b/tools/tools/crypto/cryptotest.c
index 5f5e450..01294c7 100644
--- a/tools/tools/crypto/cryptotest.c
+++ b/tools/tools/crypto/cryptotest.c
@@ -96,7 +96,6 @@
#include <string.h>
#include <sys/sysctl.h>
-#include <sys/time.h>
#include <crypto/cryptodev.h>
#define CHUNK 64 /* how much to display */
diff --git a/tools/tools/kttcp/sys/kttcp.c b/tools/tools/kttcp/sys/kttcp.c
index 0973960..e268b02 100644
--- a/tools/tools/kttcp/sys/kttcp.c
+++ b/tools/tools/kttcp/sys/kttcp.c
@@ -79,7 +79,6 @@
#include <sys/protosw.h>
#include <sys/socketvar.h>
#include <sys/socket.h>
-#include <sys/mbuf.h>
#include <sys/resourcevar.h>
#include <sys/proc.h>
#include <sys/module.h>
diff --git a/tools/tools/vhba/vhba.h b/tools/tools/vhba/vhba.h
index c09bd00..90a543a 100644
--- a/tools/tools/vhba/vhba.h
+++ b/tools/tools/vhba/vhba.h
@@ -34,7 +34,6 @@
#include <sys/lock.h>
#include <sys/kernel.h>
#include <sys/queue.h>
-#include <sys/queue.h>
#include <sys/malloc.h>
#include <sys/taskqueue.h>
#include <sys/mutex.h>
--
1.8.1.3
--- 0005-Remove-duplicate-include.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-bugs
mailing list