diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index f7e9c724140..4a1695b2f75 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 
 #include <machine/apicreg.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <machine/mp_watchdog.h>
 #include <machine/pcb.h>
diff --git a/sys/cam/cam_debug.h b/sys/cam/cam_debug.h
index 8be45479b16..4b0fd245506 100644
--- a/sys/cam/cam_debug.h
+++ b/sys/cam/cam_debug.h
@@ -30,10 +30,6 @@
 #ifndef	_CAM_CAM_DEBUG_H
 #define _CAM_CAM_DEBUG_H 1
 
-#if defined(CAMDEBUG) && defined(_KERNEL)
-#include <machine/clock.h>
-#endif /* CAMDEBUG && _KERNEL */
-
 /*
  * Debugging flags.
  */
diff --git a/sys/coda/cnode.h b/sys/coda/cnode.h
index 8bbdeb55b0f..0504c74c220 100644
--- a/sys/coda/cnode.h
+++ b/sys/coda/cnode.h
@@ -49,7 +49,6 @@
 
 #include <sys/vnode.h>
 #include <sys/lock.h>
-#include <machine/clock.h>
 
 MALLOC_DECLARE(M_CODA);
 
diff --git a/sys/compat/ndis/subr_hal.c b/sys/compat/ndis/subr_hal.c
index e4282801b28..70ffb80c593 100644
--- a/sys/compat/ndis/subr_hal.c
+++ b/sys/compat/ndis/subr_hal.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 
 #include <sys/systm.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 
 #include <sys/bus.h>
diff --git a/sys/compat/ndis/subr_ntoskrnl.c b/sys/compat/ndis/subr_ntoskrnl.c
index 772bf7acb21..9a1ba07b983 100644
--- a/sys/compat/ndis/subr_ntoskrnl.c
+++ b/sys/compat/ndis/subr_ntoskrnl.c
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <machine/atomic.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/stdarg.h>
 #include <machine/resource.h>
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index a5a72a04f80..7fc9dc20d13 100644
--- a/sys/contrib/dev/oltr/if_oltr.c
+++ b/sys/contrib/dev/oltr/if_oltr.c
@@ -58,7 +58,6 @@
 #include <vm/pmap.h>            /* for vtophys */
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 
 #include <sys/bus.h>
diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c
index 5d77027973c..fca04af365c 100644
--- a/sys/dev/acpica/Osd/OsdSchedule.c
+++ b/sys/dev/acpica/Osd/OsdSchedule.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/taskqueue.h>
-#include <machine/clock.h>
 
 #include <contrib/dev/acpica/acpi.h>
 #include <dev/acpica/acpivar.h>
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index c6ef01b4cd9..f4e553e0e4e 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sbuf.h>
 #include <sys/smp.h>
 
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
diff --git a/sys/dev/aic7xxx/aic79xx_osm.h b/sys/dev/aic7xxx/aic79xx_osm.h
index 7e2291fb35c..c3b7d67ce87 100644
--- a/sys/dev/aic7xxx/aic79xx_osm.h
+++ b/sys/dev/aic7xxx/aic79xx_osm.h
@@ -55,7 +55,6 @@
 #define AIC_PCI_CONFIG 1
 #include <machine/bus.h>
 #include <machine/endian.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 
 #include <sys/rman.h>
diff --git a/sys/dev/aic7xxx/aic7xxx_osm.h b/sys/dev/aic7xxx/aic7xxx_osm.h
index f83ff5db677..9dcc88f8a11 100644
--- a/sys/dev/aic7xxx/aic7xxx_osm.h
+++ b/sys/dev/aic7xxx/aic7xxx_osm.h
@@ -62,7 +62,6 @@
 #endif
 #include <machine/bus.h>
 #include <machine/endian.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 
 #include <sys/rman.h>
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index cf1eb56a5e9..0dc49b4584c 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -99,7 +99,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 #endif
 #include <sys/sysctl.h>
-#include <machine/clock.h>	/* for DELAY */  
 
 #include <sys/module.h>
 #include <sys/sysctl.h>
diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c
index 27b09a5fa09..52cac478dc7 100644
--- a/sys/dev/arcmsr/arcmsr.c
+++ b/sys/dev/arcmsr/arcmsr.c
@@ -68,7 +68,6 @@
 #include <isa/rtc.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <machine/atomic.h>
 #include <sys/conf.h>
diff --git a/sys/dev/arl/if_arl.c b/sys/dev/arl/if_arl.c
index 8d038d63a6e..75ab4fd2932 100644
--- a/sys/dev/arl/if_arl.c
+++ b/sys/dev/arl/if_arl.c
@@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 
-#include <machine/clock.h>
 
 #include <dev/arl/if_arlreg.h>
 
diff --git a/sys/dev/arl/if_arl_isa.c b/sys/dev/arl/if_arl_isa.c
index fa84396b60e..5f985aaf100 100644
--- a/sys/dev/arl/if_arl_isa.c
+++ b/sys/dev/arl/if_arl_isa.c
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
 #include <isa/pnpvar.h>
 #include <isa/isa_common.h>
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/dev/bce/if_bcereg.h b/sys/dev/bce/if_bcereg.h
index 4b30f1401f3..16381792ff7 100644
--- a/sys/dev/bce/if_bcereg.h
+++ b/sys/dev/bce/if_bcereg.h
@@ -63,7 +63,6 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
index fb9087fcca6..2cda657720e 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 7d686488cc4..7c7adc5c0a1 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -95,7 +95,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index 2071e74ad7f..9d85234ac8b 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -93,7 +93,6 @@
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/endian.h>
 #include <machine/resource.h>
diff --git a/sys/dev/cnw/if_cnw.c b/sys/dev/cnw/if_cnw.c
index b2b99c112ca..2d97c36f69e 100644
--- a/sys/dev/cnw/if_cnw.c
+++ b/sys/dev/cnw/if_cnw.c
@@ -246,7 +246,6 @@ struct cfattach cnw_ca = {
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/cpufreq/ichss.c b/sys/dev/cpufreq/ichss.c
index f28d477a440..13d004d97a5 100644
--- a/sys/dev/cpufreq/ichss.c
+++ b/sys/dev/cpufreq/ichss.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcivar.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/ct/bshw_machdep.c b/sys/dev/ct/bshw_machdep.c
index 0e48f77ad28..128b6d067c8 100644
--- a/sys/dev/ct/bshw_machdep.c
+++ b/sys/dev/ct/bshw_machdep.c
@@ -75,7 +75,6 @@ __FBSDID("$FreeBSD$");
 
 #ifdef __FreeBSD__
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <compat/netbsd/dvcfg.h>
diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c
index fcc0a968533..4d22f4922ab 100644
--- a/sys/dev/ctau/if_ct.c
+++ b/sys/dev/ctau/if_ct.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <machine/cpufunc.h>
 #include <machine/cserial.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <dev/cx/machdep.h>
 #include <dev/ctau/ctddk.h>
diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c
index 9bf4e7b70f3..a48f76b09b6 100644
--- a/sys/dev/cx/if_cx.c
+++ b/sys/dev/cx/if_cx.c
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <machine/cpufunc.h>
 #include <machine/cserial.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <dev/cx/machdep.h>
 #include <dev/cx/cxddk.h>
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index 129c95b9482..826c05e0ae7 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <machine/clock.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c
index f0ac7448de1..cf78b555bfe 100644
--- a/sys/dev/ed/if_ed_cbus.c
+++ b/sys/dev/ed/if_ed_cbus.c
@@ -37,7 +37,6 @@
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
diff --git a/sys/dev/fb/boot_font.c b/sys/dev/fb/boot_font.c
index f1636577364..6f4ac051e7b 100644
--- a/sys/dev/fb/boot_font.c
+++ b/sys/dev/fb/boot_font.c
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/pc/vesa.h>
 #include <machine/resource.h>
diff --git a/sys/dev/fb/gfb.c b/sys/dev/fb/gfb.c
index c3c8ef9d22c..b4f191fe6a0 100644
--- a/sys/dev/fb/gfb.c
+++ b/sys/dev/fb/gfb.c
@@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/pc/vesa.h>
 #include <machine/resource.h>
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 41027a1a887..f49cb7ffd1c 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 
-#include <machine/clock.h>	/* for DELAY */
 
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
diff --git a/sys/dev/gfb/gfb_pci.c b/sys/dev/gfb/gfb_pci.c
index 9dc31aa4544..6d249ee67d2 100644
--- a/sys/dev/gfb/gfb_pci.c
+++ b/sys/dev/gfb/gfb_pci.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/md_var.h>
 #include <machine/pc/bios.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/pc/vesa.h>
 #include <machine/resource.h>
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index a0c4d48cf90..8680ab9ee86 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/hptmv/entry.c b/sys/dev/hptmv/entry.c
index 1c1d6d3add7..a7bc1f532bf 100644
--- a/sys/dev/hptmv/entry.c
+++ b/sys/dev/hptmv/entry.c
@@ -50,7 +50,6 @@
 #else 
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
-#include <machine/clock.h>
 #include <sys/wait.h>
 #include <sys/sysproto.h>
 #endif
diff --git a/sys/dev/idt/idt.c b/sys/dev/idt/idt.c
index 51b197be963..00a9e75c7d8 100644
--- a/sys/dev/idt/idt.c
+++ b/sys/dev/idt/idt.c
@@ -95,7 +95,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/mman.h>
-#include <machine/clock.h>
 #include <machine/cpu.h>	/* bootverbose */
 
 #include <sys/bus.h>
diff --git a/sys/dev/ie/if_ie_isa.c b/sys/dev/ie/if_ie_isa.c
index 120a0936be0..811ea068c7f 100644
--- a/sys/dev/ie/if_ie_isa.c
+++ b/sys/dev/ie/if_ie_isa.c
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <net/if.h>
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c
index f85ac8cc809..ebbaa1098d8 100644
--- a/sys/dev/iir/iir.c
+++ b/sys/dev/iir/iir.c
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/stdarg.h>
 
 #include <cam/cam.h>
diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c
index 0540193fed8..f2b918e858b 100644
--- a/sys/dev/iir/iir_pci.c
+++ b/sys/dev/iir/iir_pci.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h> 
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c
index 474be6eabc8..38e7a218a53 100644
--- a/sys/dev/ipmi/ipmi.c
+++ b/sys/dev/ipmi/ipmi.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 #include <sys/watchdog.h>
 #include <sys/sysctl.h>
diff --git a/sys/dev/ips/ips.c b/sys/dev/ips/ips.c
index 81e8339e24e..fead0aebd02 100644
--- a/sys/dev/ips/ips.c
+++ b/sys/dev/ips/ips.c
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/ips/ips.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <machine/clock.h>
 
 static d_open_t ips_open;
 static d_close_t ips_close;
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c
index eb1bd92994e..b3dcfad5930 100644
--- a/sys/dev/ipw/if_ipw.c
+++ b/sys/dev/ipw/if_ipw.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 3163b65abdf..acb4fd2378b 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -57,7 +57,6 @@
 #include <sys/bus.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/cpu.h>
 
 #include <cam/cam.h>
diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c
index 65078c51a1a..34713e4ffc0 100644
--- a/sys/dev/iwi/if_iwi.c
+++ b/sys/dev/iwi/if_iwi.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/ixgb/if_ixgb.h b/sys/dev/ixgb/if_ixgb.h
index f92989c0553..c2f0acffee8 100644
--- a/sys/dev/ixgb/if_ixgb.h
+++ b/sys/dev/ixgb/if_ixgb.h
@@ -67,7 +67,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #if __FreeBSD_version >= 502000
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
diff --git a/sys/dev/ixgb/if_ixgb_osdep.h b/sys/dev/ixgb/if_ixgb_osdep.h
index 4e9cd0fe8dd..e8ce885525b 100644
--- a/sys/dev/ixgb/if_ixgb_osdep.h
+++ b/sys/dev/ixgb/if_ixgb_osdep.h
@@ -48,7 +48,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #if __FreeBSD_version >= 502000
         #include <dev/pci/pcivar.h>
         #include <dev/pci/pcireg.h>
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 48220ecf1c0..2dcba85573e 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -89,7 +89,6 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index 96579204056..a7e73a6b2d6 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -110,7 +110,6 @@
 # include <net/netisr.h>
 # include <machine/bus.h>
 # include <machine/resource.h>
-# include <machine/clock.h>
 # include <sys/rman.h>
 # include <vm/vm.h>
 # include <vm/pmap.h>
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 69307ad861d..9a46746405b 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/ethernet.h>
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index d2f069fb479..f2ad07ee927 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>
diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c
index 7894e95f06b..b085ed299f7 100644
--- a/sys/dev/mii/e1000phy.c
+++ b/sys/dev/mii/e1000phy.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 625b2e628e8..51b290f29d4 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 001ce37931b..e8ccff4a74b 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index 149b0a4cf75..88bf006494b 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_media.h>
 
-#include <machine/clock.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/dev/mpt/mpt.h b/sys/dev/mpt/mpt.h
index 3694366cf03..fe6aa66ae27 100644
--- a/sys/dev/mpt/mpt.h
+++ b/sys/dev/mpt/mpt.h
@@ -117,7 +117,6 @@
 #include <sys/bus.h>
 #include <sys/module.h>
 
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/resource.h>
 
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 025faea0a57..28f67739395 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -82,7 +82,6 @@
 #include <sys/mouse.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/mse/mse_cbus.c b/sys/dev/mse/mse_cbus.c
index e5e06b5f184..75a72ddec2c 100644
--- a/sys/dev/mse/mse_cbus.c
+++ b/sys/dev/mse/mse_cbus.c
@@ -82,7 +82,6 @@
 #include <sys/mouse.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/mse/mse_isa.c b/sys/dev/mse/mse_isa.c
index 9e2996aaa54..517d678936c 100644
--- a/sys/dev/mse/mse_isa.c
+++ b/sys/dev/mse/mse_isa.c
@@ -82,7 +82,6 @@
 #include <sys/mouse.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c
index 96a063fc660..45799893b44 100644
--- a/sys/dev/mxge/if_mxge.c
+++ b/sys/dev/mxge/if_mxge.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 8d89e0827b1..035f11f251e 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/vm.h>		/* for vtophys */
 #include <vm/pmap.h>		/* for vtophys */
-#include <machine/clock.h>	/* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/myri10ge/if_myri10ge.c b/sys/dev/myri10ge/if_myri10ge.c
index 96a063fc660..45799893b44 100644
--- a/sys/dev/myri10ge/if_myri10ge.c
+++ b/sys/dev/myri10ge/if_myri10ge.c
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/ncv/ncr53c500.c b/sys/dev/ncv/ncr53c500.c
index 32bd9021fac..c56820bbf89 100644
--- a/sys/dev/ncv/ncr53c500.c
+++ b/sys/dev/ncv/ncr53c500.c
@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
 #endif /* __NetBSD__ */
 
 #ifdef __FreeBSD__
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index b176f31ca5c..bb41e5d472f 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -113,7 +113,6 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c
index cad74162fe5..3b394f70e6f 100644
--- a/sys/dev/nsp/nsp.c
+++ b/sys/dev/nsp/nsp.c
@@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$");
 #endif /* __NetBSD__ */
 
 #ifdef __FreeBSD__
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 
diff --git a/sys/dev/nve/if_nve.c b/sys/dev/nve/if_nve.c
index db31d1bbded..73b9aead81f 100644
--- a/sys/dev/nve/if_nve.c
+++ b/sys/dev/nve/if_nve.c
@@ -99,7 +99,6 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/vm.h>		/* for vtophys */
 #include <vm/pmap.h>		/* for vtophys */
-#include <machine/clock.h>	/* for DELAY */
 #include <sys/bus.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/pbio/pbio.c b/sys/dev/pbio/pbio.c
index 32f50a9cd8f..3ba3c1271cf 100644
--- a/sys/dev/pbio/pbio.c
+++ b/sys/dev/pbio/pbio.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>	/* DELAY() */
 #include <sys/rman.h>
 #include <dev/pbio/pbioio.h>		/* pbio IOCTL definitions */
 #include <sys/uio.h>
diff --git a/sys/dev/pccbb/pccbb.c b/sys/dev/pccbb/pccbb.c
index e1c897f8ffa..a9bf97a5444 100644
--- a/sys/dev/pccbb/pccbb.c
+++ b/sys/dev/pccbb/pccbb.c
@@ -96,7 +96,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#include <machine/clock.h>
 
 #include <dev/pccard/pccardreg.h>
 #include <dev/pccard/pccardvar.h>
diff --git a/sys/dev/pccbb/pccbb_pci.c b/sys/dev/pccbb/pccbb_pci.c
index 0ebf7c8e171..99e67dafafb 100644
--- a/sys/dev/pccbb/pccbb_pci.c
+++ b/sys/dev/pccbb/pccbb_pci.c
@@ -93,7 +93,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#include <machine/clock.h>
 
 #include <dev/pccard/pccardreg.h>
 #include <dev/pccard/pccardvar.h>
diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h
index e2ad2b49e7d..cdbf3893e90 100644
--- a/sys/dev/pdq/pdq_freebsd.h
+++ b/sys/dev/pdq/pdq_freebsd.h
@@ -62,7 +62,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 
 #endif	/* PDQ_HWSUPPORT */
 
diff --git a/sys/dev/pdq/pdqvar.h b/sys/dev/pdq/pdqvar.h
index 5e85ca98e83..d978809c232 100644
--- a/sys/dev/pdq/pdqvar.h
+++ b/sys/dev/pdq/pdqvar.h
@@ -88,7 +88,6 @@ enum _pdq_type_t {
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 #include <machine/cpufunc.h>
-#include <machine/clock.h>
 #define	ifnet_ret_t void
 typedef int ioctl_cmd_t;
 typedef enum { PDQ_BUS_EISA, PDQ_BUS_PCI } pdq_bus_t;
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index 128fdc7e56f..7ff515f6d78 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/malloc.h>
 
-#include <machine/clock.h>
 
 #endif
 
diff --git a/sys/dev/ral/if_ral_pci.c b/sys/dev/ral/if_ral_pci.c
index a6b480300bb..f1cc23caf09 100644
--- a/sys/dev/ral/if_ral_pci.c
+++ b/sys/dev/ral/if_ral_pci.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <net/bpf.h>
diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c
index b5f08dbef16..3840c5090e6 100644
--- a/sys/dev/ral/rt2560.c
+++ b/sys/dev/ral/rt2560.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <net/bpf.h>
diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c
index 811bdf484ca..7cfa6cde842 100644
--- a/sys/dev/ral/rt2661.c
+++ b/sys/dev/ral/rt2661.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <net/bpf.h>
diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c
index 6dde6ad4e08..734e6c5cae9 100644
--- a/sys/dev/safe/safe.c
+++ b/sys/dev/safe/safe.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/sbsh/if_sbsh.c b/sys/dev/sbsh/if_sbsh.c
index 32b15aaecb4..2970474087a 100644
--- a/sys/dev/sbsh/if_sbsh.c
+++ b/sys/dev/sbsh/if_sbsh.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/random.h>
-#include <machine/clock.h>
 #include <machine/stdarg.h>
 
 #include <net/if.h>
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index 7613b300c64..dd4af6374de 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -55,7 +55,6 @@
 #if __FreeBSD_version < 500000
 #include <sys/buf.h>
 #endif
-#include <machine/clock.h>	/* for DELAY */
 #include <machine/resource.h>
 #include <machine/bus.h>
 #include <sys/rman.h>
diff --git a/sys/dev/stg/tmc18c30.c b/sys/dev/stg/tmc18c30.c
index a0e7139b496..19b4905af06 100644
--- a/sys/dev/stg/tmc18c30.c
+++ b/sys/dev/stg/tmc18c30.c
@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
 #endif /* __NetBSD__ */
 
 #ifdef __FreeBSD__
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index 500c3076f6b..cc0cba703a9 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -83,7 +83,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcireg.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <cam/cam.h>
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 7fb0b49318d..3d3440d9608 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>	/* for DELAY */
 #include <sys/bus.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index ae22015b21d..9b8ba385330 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>	/* for DELAY */
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index eec7d4895e9..82281c5c58d 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index e14ee411cb1..0b79f64bf10 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/ehcivar.h>
 
 #if defined(__FreeBSD__)
-#include <machine/clock.h>
 
 #define delay(d)                DELAY(d)
 #endif
diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c
index f41bc88d531..e3a61112737 100644
--- a/sys/dev/usb/if_ural.c
+++ b/sys/dev/usb/if_ural.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <net/bpf.h>
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index b3ccfddbf4c..0b84a32b872 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -91,7 +91,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/ohcivar.h>
 
 #if defined(__FreeBSD__)
-#include <machine/clock.h>
 
 #define delay(d)                DELAY(d)
 #endif
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index e47d2b4b893..aed035c3143 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -96,7 +96,6 @@ __FBSDID("$FreeBSD$");
 /*#define UHCI_CTL_LOOP */
 
 #if defined(__FreeBSD__)
-#include <machine/clock.h>
 
 #define delay(d)		DELAY(d)
 #endif
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 9813fb7172d..e36694bb005 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -77,7 +77,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/usb_quirks.h>
 
 #if defined(__FreeBSD__)
-#include <machine/clock.h>
 #define delay(d)         DELAY(d)
 #endif
 
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 8246b939c9f..968b393b716 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
 
 #if defined(__FreeBSD__)
 #include "usb_if.h"
-#include <machine/clock.h>
 #define delay(d)	DELAY(d)
 #endif
 
diff --git a/sys/dev/wds/wd7000.c b/sys/dev/wds/wd7000.c
index 384dd08be1c..700b79f4c2c 100644
--- a/sys/dev/wds/wd7000.c
+++ b/sys/dev/wds/wd7000.c
@@ -144,7 +144,6 @@ __FBSDID("$FreeBSD$");
 #include <cam/scsi/scsi_all.h>
 #include <cam/scsi/scsi_message.h>
 
-#include <machine/clock.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 2903ec95957..e238f3a0139 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -87,7 +87,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <machine/atomic.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c
index cddc9298d50..fa67a6bf993 100644
--- a/sys/dev/wi/if_wi_pci.c
+++ b/sys/dev/wi/if_wi_pci.c
@@ -49,7 +49,6 @@
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/fs/coda/cnode.h b/sys/fs/coda/cnode.h
index 8bbdeb55b0f..0504c74c220 100644
--- a/sys/fs/coda/cnode.h
+++ b/sys/fs/coda/cnode.h
@@ -49,7 +49,6 @@
 
 #include <sys/vnode.h>
 #include <sys/lock.h>
-#include <machine/clock.h>
 
 MALLOC_DECLARE(M_CODA);
 
diff --git a/sys/fs/smbfs/smbfs_subr.c b/sys/fs/smbfs/smbfs_subr.c
index b368867b675..b3d06bcf6f9 100644
--- a/sys/fs/smbfs/smbfs_subr.c
+++ b/sys/fs/smbfs/smbfs_subr.c
@@ -35,7 +35,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <machine/clock.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
 #include <sys/sysctl.h>
diff --git a/sys/i386/cpufreq/powernow.c b/sys/i386/cpufreq/powernow.c
index b9d219fa253..07409fb796a 100644
--- a/sys/i386/cpufreq/powernow.c
+++ b/sys/i386/cpufreq/powernow.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #include <machine/cputypes.h>
-#include <machine/clock.h>
 #include <machine/vmparam.h>
 #include <sys/rman.h>
 
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 665296fadcf..77d2d18f930 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 
 #include <machine/apicreg.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <machine/mp_watchdog.h>
 #include <machine/pcb.h>
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 4121e3fcd06..bc396294c57 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <machine/specialreg.h>
 #include <machine/segments.h>
diff --git a/sys/i386/isa/spic.c b/sys/i386/isa/spic.c
index c3b5f1e1fe9..adf1a552d57 100644
--- a/sys/i386/isa/spic.c
+++ b/sys/i386/isa/spic.c
@@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$");
 #include <isa/isavar.h>
 #include <sys/poll.h>
 #include <machine/pci_cfgreg.h>
-#include <machine/clock.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
diff --git a/sys/i4b/capi/iavc/iavc_card.c b/sys/i4b/capi/iavc/iavc_card.c
index 763c8a06320..e95f1ffdee5 100644
--- a/sys/i4b/capi/iavc/iavc_card.c
+++ b/sys/i4b/capi/iavc/iavc_card.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/i4b/capi/iavc/iavc_isa.c b/sys/i4b/capi/iavc/iavc_isa.c
index 4ebbe766452..b837d068471 100644
--- a/sys/i4b/capi/iavc/iavc_isa.c
+++ b/sys/i4b/capi/iavc/iavc_isa.c
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/i4b/capi/iavc/iavc_lli.c b/sys/i4b/capi/iavc/iavc_lli.c
index fb19040ab66..1ec3aec8e64 100644
--- a/sys/i4b/capi/iavc/iavc_lli.c
+++ b/sys/i4b/capi/iavc/iavc_lli.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/bus.h>
 #include <sys/bus.h>
diff --git a/sys/i4b/capi/iavc/iavc_pci.c b/sys/i4b/capi/iavc/iavc_pci.c
index d8bcd97a856..bd05ce6fe36 100644
--- a/sys/i4b/capi/iavc/iavc_pci.c
+++ b/sys/i4b/capi/iavc/iavc_pci.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_isac.c b/sys/i4b/layer1/itjc/i4b_itjc_isac.c
index d86bd2bf640..13e79095998 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_isac.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_isac.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_l1.c b/sys/i4b/layer1/itjc/i4b_itjc_l1.c
index 3e9806b0950..ad7786b58af 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
index cc6a43d3eee..c48adad4f13 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
index efa3cf8d2f7..101ba9c160e 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c
index a989577101c..c25b6a117d1 100644
--- a/sys/ia64/ia64/mp_machdep.c
+++ b/sys/ia64/ia64/mp_machdep.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_kern.h>
 
 #include <machine/atomic.h>
-#include <machine/clock.h>
 #include <machine/fpu.h>
 #include <machine/mca.h>
 #include <machine/md_var.h>
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index 96c03deed32..7ca498d4d53 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 #include <vm/vm_param.h>
 #include <sys/ptrace.h>
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/md_var.h>
 #include <machine/reg.h>
diff --git a/sys/ia64/ia64/vm_machdep.c b/sys/ia64/ia64/vm_machdep.c
index c29e9d73fa3..0bda88f699e 100644
--- a/sys/ia64/ia64/vm_machdep.c
+++ b/sys/ia64/ia64/vm_machdep.c
@@ -81,7 +81,6 @@
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
 
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/fpu.h>
 #include <machine/md_var.h>
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index 22524aafc6f..0131a392fdc 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/atomic.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/cpu.h>
 
 #include <ddb/ddb.h>
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index b99a481b8a1..529486bf354 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -73,7 +73,6 @@
 #include <sys/systm.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/stdarg.h>
 
 #ifdef PC98
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index 085b6920637..f3e5b9ac08c 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -111,7 +111,6 @@
 #include <sys/syslog.h>
 #include <sys/malloc.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
diff --git a/sys/pc98/pc98/canbus.c b/sys/pc98/pc98/canbus.c
index b4564eb6cdb..522b4d0ba5c 100644
--- a/sys/pc98/pc98/canbus.c
+++ b/sys/pc98/pc98/canbus.c
@@ -35,7 +35,6 @@
 #include <sys/module.h>
 #include <sys/sysctl.h>
 
-#include <machine/clock.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/pci/amdpm.c b/sys/pci/amdpm.c
index cf7a91a55bb..841b0373d42 100644
--- a/sys/pci/amdpm.c
+++ b/sys/pci/amdpm.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
diff --git a/sys/pci/amdsmb.c b/sys/pci/amdsmb.c
index d75bcc56e90..60febd5af84 100644
--- a/sys/pci/amdsmb.c
+++ b/sys/pci/amdsmb.c
@@ -9,7 +9,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
diff --git a/sys/pci/nfsmb.c b/sys/pci/nfsmb.c
index b81e5a9a6e3..38305218f75 100644
--- a/sys/pci/nfsmb.c
+++ b/sys/pci/nfsmb.c
@@ -9,7 +9,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
diff --git a/sys/pci/viapm.c b/sys/pci/viapm.c
index c4809e8b646..0bddb22325f 100644
--- a/sys/pci/viapm.c
+++ b/sys/pci/viapm.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>		/* for DELAY */
 #include <machine/resource.h>
 #include <sys/rman.h>
 
diff --git a/sys/powerpc/aim/clock.c b/sys/powerpc/aim/clock.c
index cdf2290d906..e19d46e52bc 100644
--- a/sys/powerpc/aim/clock.c
+++ b/sys/powerpc/aim/clock.c
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/ofw/openfirm.h>
 
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
 #include <machine/md_var.h>
diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c
index 839e5b56ccc..5b3a4b2dd9c 100644
--- a/sys/powerpc/aim/machdep.c
+++ b/sys/powerpc/aim/machdep.c
@@ -104,7 +104,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_pager.h>
 
 #include <machine/bat.h>
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/elf.h>
 #include <machine/fpu.h>
diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c
index 4b896eaf7e4..cf6a4358d69 100644
--- a/sys/powerpc/aim/vm_machdep.c
+++ b/sys/powerpc/aim/vm_machdep.c
@@ -84,7 +84,6 @@
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
 
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/fpu.h>
 #include <machine/frame.h>
diff --git a/sys/powerpc/powerpc/clock.c b/sys/powerpc/powerpc/clock.c
index cdf2290d906..e19d46e52bc 100644
--- a/sys/powerpc/powerpc/clock.c
+++ b/sys/powerpc/powerpc/clock.c
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/ofw/openfirm.h>
 
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/intr.h>
 #include <machine/md_var.h>
diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c
index 839e5b56ccc..5b3a4b2dd9c 100644
--- a/sys/powerpc/powerpc/machdep.c
+++ b/sys/powerpc/powerpc/machdep.c
@@ -104,7 +104,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_pager.h>
 
 #include <machine/bat.h>
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/elf.h>
 #include <machine/fpu.h>
diff --git a/sys/powerpc/powerpc/mp_machdep.c b/sys/powerpc/powerpc/mp_machdep.c
index edc744669f4..f76eedf58e3 100644
--- a/sys/powerpc/powerpc/mp_machdep.c
+++ b/sys/powerpc/powerpc/mp_machdep.c
@@ -42,7 +42,6 @@
 
 #include <machine/atomic.h>
 #include <machine/pmap.h>
-#include <machine/clock.h>
 
 int			boot_cpu_id;
 
diff --git a/sys/powerpc/powerpc/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
index 4b896eaf7e4..cf6a4358d69 100644
--- a/sys/powerpc/powerpc/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -84,7 +84,6 @@
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
 
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/fpu.h>
 #include <machine/frame.h>
diff --git a/sys/sparc64/sparc64/prof_machdep.c b/sys/sparc64/sparc64/prof_machdep.c
index 065a1daa44c..c0fb7794dcf 100644
--- a/sys/sparc64/sparc64/prof_machdep.c
+++ b/sys/sparc64/sparc64/prof_machdep.c
@@ -37,7 +37,6 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 
-#include <machine/clock.h>
 #include <machine/profile.h>
 
 int	cputime_bias;
diff --git a/sys/sparc64/sparc64/trap.c b/sys/sparc64/sparc64/trap.c
index 4d623a4c05f..f45d273f532 100644
--- a/sys/sparc64/sparc64/trap.c
+++ b/sys/sparc64/sparc64/trap.c
@@ -78,7 +78,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
 
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>