From b5b910664c5899e73d751740dc7274cb00369812 Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@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