diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 831ab3b168a6..60c15a6d56de 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -61,7 +61,6 @@
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
 
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/md_var.h>
 #include <machine/mutex.h>
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 33d02aa41320..b498d6138c66 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -45,7 +45,6 @@
 #include <pc98/pc98/pc98_machdep.h>	/* geometry translation */
 #endif
 
-#include <machine/clock.h>
 #include <sys/ipl.h>
 
 #include <cam/cam.h>
diff --git a/sys/cam/scsi/scsi_ses.c b/sys/cam/scsi/scsi_ses.c
index 28b38b4c4796..6d7c4d1773cd 100644
--- a/sys/cam/scsi/scsi_ses.c
+++ b/sys/cam/scsi/scsi_ses.c
@@ -36,7 +36,6 @@
 #include <sys/errno.h>
 #include <sys/devicestat.h>
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c
index bb16a11918a1..5130bbb7b6ed 100644
--- a/sys/contrib/dev/fla/fla.c
+++ b/sys/contrib/dev/fla/fla.c
@@ -20,7 +20,6 @@
 #include <sys/disk.h>
 #include <sys/devicestat.h>
 #include <sys/module.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 
 #include <vm/vm.h>
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c
index 38da767b0f48..dd4f1125efde 100644
--- a/sys/contrib/dev/oltr/if_oltr.c
+++ b/sys/contrib/dev/oltr/if_oltr.c
@@ -60,7 +60,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index ffad4689621d..b89678bc15d4 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -47,7 +47,6 @@
 
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 
 #include <dev/aac/aacreg.h>
diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c
index b2028ece6d8e..3b6581d918a8 100644
--- a/sys/dev/aac/aac_disk.c
+++ b/sys/dev/aac/aac_disk.c
@@ -38,7 +38,6 @@
 #include <sys/disk.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/aac/aacreg.h>
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 63d4a1fb658d..473f273e04b5 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -38,7 +38,6 @@
 #include <sys/reboot.h>
 #include <sys/sysctl.h>
 
-#include <machine/clock.h>
 #include <sys/kthread.h>
 
 #include <machine/bus.h>
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 066a21cf413f..6391efcc139b 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -54,7 +54,6 @@
 
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/bus.h> 
 #include <sys/rman.h> 
diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c
index dd0f4ccd92b2..7d3ec52f56d6 100644
--- a/sys/dev/advansys/advlib.c
+++ b/sys/dev/advansys/advlib.c
@@ -49,7 +49,6 @@
 
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/bus.h> 
 #include <sys/rman.h> 
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index a3427fc7ffbc..95777a649710 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -55,7 +55,6 @@
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 
 #include <sys/rman.h>
diff --git a/sys/dev/advansys/adwlib.c b/sys/dev/advansys/adwlib.c
index 9abf933f98b3..bbe483734192 100644
--- a/sys/dev/advansys/adwlib.c
+++ b/sys/dev/advansys/adwlib.c
@@ -51,7 +51,6 @@
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
diff --git a/sys/dev/agp/agp_amd.c b/sys/dev/agp/agp_amd.c
index 198b926241fb..0a498f72ae99 100644
--- a/sys/dev/agp/agp_amd.c
+++ b/sys/dev/agp/agp_amd.c
@@ -44,7 +44,6 @@
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/pmap.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index afb7188a4955..be063d0f4ffc 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -65,7 +65,6 @@
  
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index d9474bc76da6..0388b3ed9cca 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -39,7 +39,6 @@
 
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index 4ea9a0858e5b..21237662a94d 100644
--- a/sys/dev/aic/aic.c
+++ b/sys/dev/aic/aic.c
@@ -33,7 +33,6 @@
 
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c
index 808afa70d99f..8bd550b19c8e 100644
--- a/sys/dev/amd/amd.c
+++ b/sys/dev/amd/amd.c
@@ -61,7 +61,6 @@
 
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index cdf87f174cf3..d870df8511ae 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -47,7 +47,6 @@
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <pci/pcireg.h>
diff --git a/sys/dev/amr/amr_disk.c b/sys/dev/amr/amr_disk.c
index 65fc4457013e..c2038fe0ae22 100644
--- a/sys/dev/amr/amr_disk.c
+++ b/sys/dev/amr/amr_disk.c
@@ -43,7 +43,6 @@
 #include <sys/disk.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/amr/amrio.h>
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index e4e2534ca83d..68a22a2e2e6b 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -125,7 +125,6 @@
 
 #include <net/bpf.h>
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <dev/an/if_aironet_ieee.h>
diff --git a/sys/dev/ar/if_ar.c b/sys/dev/ar/if_ar.c
index c9f3bbe94fc3..f43aef13a07d 100644
--- a/sys/dev/ar/if_ar.c
+++ b/sys/dev/ar/if_ar.c
@@ -68,7 +68,6 @@
 #include <net/bpf.h>
 #endif /* NETGRAPH */
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <i386/isa/if_arregs.h>
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index c9f3bbe94fc3..f43aef13a07d 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -68,7 +68,6 @@
 #include <net/bpf.h>
 #endif /* NETGRAPH */
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <i386/isa/if_arregs.h>
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index d64d006e8397..30dcfca51969 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -202,7 +202,6 @@ static dpt_sig_S ASR_sig = {
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <machine/cputypes.h>
-#include <machine/clock.h>
 #include <i386/include/vmparam.h>
 
 #include <pci/pcivar.h>
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 2e1f2bed8808..150a47d98d34 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -58,7 +58,6 @@
 #endif
 #include <isa/isavar.h>
 #include <isa/isareg.h>
-#include <machine/clock.h>
 #ifdef __alpha__
 #include <machine/md_var.h>
 #endif
diff --git a/sys/dev/ata/ata-disk.c b/sys/dev/ata/ata-disk.c
index f53eca06e292..dba5fbef891b 100644
--- a/sys/dev/ata/ata-disk.c
+++ b/sys/dev/ata/ata-disk.c
@@ -43,7 +43,6 @@
 #include <sys/cons.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <machine/bus.h>
 #include <dev/ata/ata-all.h>
diff --git a/sys/dev/ata/atapi-all.c b/sys/dev/ata/atapi-all.c
index 386a90e61117..04c42c0ee00d 100644
--- a/sys/dev/ata/atapi-all.c
+++ b/sys/dev/ata/atapi-all.c
@@ -38,7 +38,6 @@
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/malloc.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <dev/ata/ata-all.h>
 #include <dev/ata/atapi-all.h>
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index 9b62dd813773..de5d17fdedbd 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -168,7 +168,6 @@ atkbd_timeout(void *arg)
 
 #include <machine/limits.h>
 #include <sys/kbio.h>
-#include <machine/clock.h>
 
 #define ATKBD_DEFAULT	0
 
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c
index ee643d017b82..7db3d8dce9dc 100644
--- a/sys/dev/atkbdc/atkbdc.c
+++ b/sys/dev/atkbdc/atkbdc.c
@@ -44,7 +44,6 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <machine/clock.h>
 
 #include <dev/kbd/atkbdcreg.h>
 
diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
index e4f531dd6e80..fe1866e9d797 100644
--- a/sys/dev/atkbdc/psm.c
+++ b/sys/dev/atkbdc/psm.c
@@ -76,7 +76,6 @@
 #include <sys/select.h>
 #include <sys/uio.h>
 
-#include <machine/clock.h>
 #include <machine/limits.h>
 #include <sys/mouse.h>
 #include <machine/resource.h>
diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c
index 5e4ab1f042e7..ef105ba70143 100644
--- a/sys/dev/awi/awi.c
+++ b/sys/dev/awi/awi.c
@@ -145,7 +145,6 @@
 #include <machine/intr.h>
 #endif
 #ifdef __FreeBSD__
-#include <machine/clock.h>
 #endif
 
 #ifdef __NetBSD__
diff --git a/sys/dev/awi/awi_wep.c b/sys/dev/awi/awi_wep.c
index 607eceb34f25..308cfcb8a932 100644
--- a/sys/dev/awi/awi_wep.c
+++ b/sys/dev/awi/awi_wep.c
@@ -79,7 +79,6 @@
 #include <machine/cpu.h>
 #include <machine/bus.h>
 #ifdef __FreeBSD__
-#include <machine/clock.h>
 #endif
 
 #ifdef __NetBSD__
diff --git a/sys/dev/awi/awi_wicfg.c b/sys/dev/awi/awi_wicfg.c
index bc2e4d7606a1..76ff3efb44a6 100644
--- a/sys/dev/awi/awi_wicfg.c
+++ b/sys/dev/awi/awi_wicfg.c
@@ -70,7 +70,6 @@
 #include <machine/cpu.h>
 #include <machine/bus.h>
 #ifdef __FreeBSD__
-#include <machine/clock.h>
 #endif
 
 #ifdef __NetBSD__
diff --git a/sys/dev/awi/if_awi_pccard.c b/sys/dev/awi/if_awi_pccard.c
index 82190d58b680..be55de57cccf 100644
--- a/sys/dev/awi/if_awi_pccard.c
+++ b/sys/dev/awi/if_awi_pccard.c
@@ -43,7 +43,6 @@
 #include <net/ethernet.h>
 #include <net/if_ieee80211.h>
 
-#include <machine/clock.h>
 
 #include <dev/awi/am79c930reg.h>
 #include <dev/awi/am79c930var.h>
diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c
index 4ff89504a6c4..092c8adf27a9 100644
--- a/sys/dev/bktr/bktr_audio.c
+++ b/sys/dev/bktr/bktr_audio.c
@@ -52,7 +52,6 @@
 #include <sys/vnode.h>
 
 #ifdef __FreeBSD__
-#include <machine/clock.h>		/* for DELAY */
 #include <pci/pcivar.h>
 
 #if (__FreeBSD_version >=300000)
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c
index 8702f57a8984..b374e80f4092 100644
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@@ -54,7 +54,6 @@
 #include <sys/vnode.h>
 
 #ifdef __FreeBSD__
-#include <machine/clock.h>      /* for DELAY */
 #include <pci/pcivar.h>
 
 #if (__FreeBSD_version >=300000)
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index e6e0da74fd4c..9a29ec431e3d 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -128,7 +128,6 @@
 #include <sys/bus.h>		/* used by smbus and newbus */
 #endif
 
-#include <machine/clock.h>      /* for DELAY */
 #include <pci/pcivar.h>
 
 #if (__FreeBSD_version >=300000)
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index e21ccf319852..12eb60d3086a 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -43,7 +43,6 @@
 #include <sys/uio.h>
 #include <sys/select.h>
 
-#include <machine/clock.h>
 
 #if (__FreeBSD_version >=300000)
 #include <machine/bus_memio.h>          /* for bus space */
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 61ea98a51c50..cebfb2b04e2b 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -95,7 +95,6 @@
 #endif
 
 
-#include <machine/clock.h>      /* for DELAY */
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
 
diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c
index 0f16547745fb..c036584edf2e 100644
--- a/sys/dev/bktr/bktr_tuner.c
+++ b/sys/dev/bktr/bktr_tuner.c
@@ -54,7 +54,6 @@
 #endif
 
 #ifdef __FreeBSD__
-#include <machine/clock.h>      /* for DELAY */
 #include <pci/pcivar.h>
 
 #if (__FreeBSD_version >=300000)
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index bd94ef3760f6..5eed00057c52 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -60,7 +60,6 @@
 #endif
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <cam/cam.h>
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index b5816554a3e7..dfed34329458 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -62,7 +62,6 @@
 
 #include <isa/isavar.h>
 
-#include <machine/clock.h>
 
 #include <dev/cs/if_csreg.h>
 
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 5e0ea5636ae0..8b49cfa7c6b7 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -80,7 +80,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <machine/lock.h>
 #include <machine/psl.h>
 
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 5e0ea5636ae0..8b49cfa7c6b7 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -80,7 +80,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <machine/lock.h>
 #include <machine/psl.h>
 
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index 2e0e77ef2798..285c2d3694c9 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -57,7 +57,6 @@
 #include <dev/mii/miivar.h>
 #include <dev/mii/miidevs.h>
 
-#include <machine/clock.h>
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 893da207161f..6a437a455f7d 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -104,7 +104,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index 12737dec8b88..e87e0be25e95 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -55,7 +55,6 @@
 #include <dev/mii/miivar.h>
 #include <dev/mii/miidevs.h>
 
-#include <machine/clock.h>
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 7037f6dbfa73..4b867931f7a8 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -48,7 +48,6 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/eventhandler.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index 5b778ad306cb..3fa1aafc0bbb 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -54,7 +54,6 @@
 #include <sys/sysctl.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/dev/dgb/dgm.c b/sys/dev/dgb/dgm.c
index a31ff9c9124f..b74b8043776a 100644
--- a/sys/dev/dgb/dgm.c
+++ b/sys/dev/dgb/dgm.c
@@ -57,7 +57,6 @@
 #include <sys/sysctl.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index fb076040f066..7b5fd94dc572 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -62,7 +62,6 @@
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
 
-#include <machine/clock.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 0c67a94002b5..72fb2ef173ac 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -63,7 +63,6 @@
 #include <net/bridge.h>
 #endif
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <dev/ed/if_edreg.h>
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index e97dd3b103e9..8f3a5dec0c3c 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@@ -34,7 +34,6 @@
 #include <sys/conf.h>
 #include <sys/uio.h>
 #include <sys/select.h>
-#include <machine/clock.h>
 
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index 3a2f37a3fd95..382c7b63f428 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -56,7 +56,6 @@
 #include <sys/malloc.h>
 #include <sys/socket.h>
 
-#include <machine/clock.h>		/* for DELAY */
 
 #include <net/if.h>
 
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index f397065ab72c..cb3d7c4cee82 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -157,7 +157,6 @@
 #define	vtophys(va)	alpha_XXX_dmamap((vm_offset_t)(va))
 #endif
 #elif defined(__FreeBSD__)
-#include <machine/clock.h>              /* for DELAY */
 #include <dev/en/midwayreg.h>
 #include <dev/en/midwayvar.h>
 #include <vm/pmap.h>			/* for vtophys proto */
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 7578a03bd3f5..3397de2675d9 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -79,7 +79,6 @@
 #include <net/ethernet.h>
 #include <net/bpf.h>
 
-#include <machine/clock.h>
 
 #include <dev/ep/if_epreg.h>
 #include <dev/ep/if_epvar.h>
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index b8bc31d3f497..63be85c39fae 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -38,7 +38,6 @@
 #include <net/if_arp.h>
 #include <net/if_media.h> 
 
-#include <machine/clock.h>
 
 #include <dev/eisa/eisaconf.h>
 
diff --git a/sys/dev/ep/if_ep_isa.c b/sys/dev/ep/if_ep_isa.c
index c7496fb87412..ae7dd26d1704 100644
--- a/sys/dev/ep/if_ep_isa.c
+++ b/sys/dev/ep/if_ep_isa.c
@@ -46,7 +46,6 @@
 #include <net/if_arp.h>
 #include <net/if_media.h> 
 
-#include <machine/clock.h>
 
 #include <isa/isavar.h>
 
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c
index 6ddd6790a632..7f86b9424e7e 100644
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@@ -52,7 +52,6 @@
 #include <net/if_arp.h>
 #include <net/if_media.h>
 
-#include <machine/clock.h>
 
 #include <dev/ep/if_epreg.h>
 #include <dev/ep/if_epvar.h>
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index 8e1152fc8f82..3f2e0ea13d60 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -61,7 +61,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#include <machine/clock.h>
 
 #include <isa/isavar.h>
 #include <isa/pnpvar.h>
diff --git a/sys/dev/ex/if_ex_isa.c b/sys/dev/ex/if_ex_isa.c
index a7036220fda4..993e4eafc29d 100644
--- a/sys/dev/ex/if_ex_isa.c
+++ b/sys/dev/ex/if_ex_isa.c
@@ -42,7 +42,6 @@
 #include <net/if_arp.h>
 #include <net/if_media.h> 
 
-#include <machine/clock.h>
 
 #include <isa/isavar.h>
 #include <isa/pnpvar.h>
diff --git a/sys/dev/ex/if_ex_pccard.c b/sys/dev/ex/if_ex_pccard.c
index adb3d9635325..5b7f6ff318e5 100644
--- a/sys/dev/ex/if_ex_pccard.c
+++ b/sys/dev/ex/if_ex_pccard.c
@@ -42,7 +42,6 @@
 #include <net/if_arp.h>
 #include <net/if_media.h> 
 
-#include <machine/clock.h>
 
 #include <dev/ex/if_exreg.h>
 #include <dev/ex/if_exvar.h>
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 7af3d1ac7146..3e789b4cc3de 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -77,7 +77,6 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <machine/clock.h>
 
 #include <sys/bus.h>
 #include <machine/bus.h>
diff --git a/sys/dev/fe/if_fe_cbus.c b/sys/dev/fe/if_fe_cbus.c
index a11cc28d9b06..85119f22416a 100644
--- a/sys/dev/fe/if_fe_cbus.c
+++ b/sys/dev/fe/if_fe_cbus.c
@@ -31,7 +31,6 @@
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/module.h>
-#include <machine/clock.h>
 
 #include <sys/bus.h>
 #include <machine/bus.h>
diff --git a/sys/dev/fe/if_fe_isa.c b/sys/dev/fe/if_fe_isa.c
index 480bb5f051ba..56bef05da7ba 100644
--- a/sys/dev/fe/if_fe_isa.c
+++ b/sys/dev/fe/if_fe_isa.c
@@ -31,7 +31,6 @@
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/module.h>
-#include <machine/clock.h>
 
 #include <sys/bus.h>
 #include <machine/bus.h>
diff --git a/sys/dev/fe/if_fe_pccard.c b/sys/dev/fe/if_fe_pccard.c
index 5d4853c340c0..728a62e49e16 100644
--- a/sys/dev/fe/if_fe_pccard.c
+++ b/sys/dev/fe/if_fe_pccard.c
@@ -31,7 +31,6 @@
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/module.h>
-#include <machine/clock.h>
 
 #include <sys/bus.h>
 #include <machine/bus.h>
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 9a5def58ce3c..3b4afedacdc0 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -63,7 +63,6 @@
 
 #include <vm/vm.h>		/* for vtophys */
 #include <vm/pmap.h>		/* for vtophys */
-#include <machine/clock.h>	/* for DELAY */
 
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>		/* for PCIM_CMD_xxx */
diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index 6c2b62714169..ad5a18fda83c 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -44,7 +44,6 @@
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
 #include <sys/eventhandler.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c
index 125359583b0a..cd5d1596eacb 100644
--- a/sys/dev/hea/eni_if.c
+++ b/sys/dev/hea/eni_if.c
@@ -42,7 +42,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/dev/hea/eni_vcm.c b/sys/dev/hea/eni_vcm.c
index 377d3a0dbf45..d452097e0623 100644
--- a/sys/dev/hea/eni_vcm.c
+++ b/sys/dev/hea/eni_vcm.c
@@ -42,7 +42,6 @@
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index 240332699094..4b64128e819c 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -45,7 +45,6 @@
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
 #include <sys/eventhandler.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index 1e7dd448fb33..b18e0dc4fcef 100644
--- a/sys/dev/hfa/fore_output.c
+++ b/sys/dev/hfa/fore_output.c
@@ -41,7 +41,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <net/if.h>
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index 7fa4a2843f48..0c509b57d872 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_receive.c
@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <net/if.h>
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c
index 061e70457bcb..8b8d2a4e3a94 100644
--- a/sys/dev/ida/ida.c
+++ b/sys/dev/ida/ida.c
@@ -54,7 +54,6 @@
 #endif
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/ida/idareg.h>
diff --git a/sys/dev/ida/ida_disk.c b/sys/dev/ida/ida_disk.c
index 6172085b8de8..8863adc17c6e 100644
--- a/sys/dev/ida/ida_disk.c
+++ b/sys/dev/ida/ida_disk.c
@@ -45,7 +45,6 @@
 #endif
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/ida/idareg.h>
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 636c634a203b..d59fca5c534f 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -130,7 +130,6 @@ iomem and and with 0xffff.
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <i386/isa/isa_device.h>
diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c
index 0a6831b3c14f..e8e5f96cc632 100644
--- a/sys/dev/iicbus/iic.c
+++ b/sys/dev/iicbus/iic.c
@@ -35,7 +35,6 @@
 #include <sys/uio.h>
 #include <sys/fcntl.h>
 
-#include <machine/clock.h>
 
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c
index 63f0249db893..56bc390220e5 100644
--- a/sys/dev/iicbus/iicbb.c
+++ b/sys/dev/iicbus/iicbb.c
@@ -51,7 +51,6 @@
 #include <sys/bus.h>
 #include <sys/uio.h>
 
-#include <machine/clock.h>
 
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c
index 45a32d4d1a3b..4d4a6718e6eb 100644
--- a/sys/dev/iicbus/iicbus.c
+++ b/sys/dev/iicbus/iicbus.c
@@ -37,7 +37,6 @@
 #include <sys/module.h>
 #include <sys/bus.h> 
 
-#include <machine/clock.h>
 
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c
index 02bec7fa24d6..680c8b63c53b 100644
--- a/sys/dev/iicbus/iicsmb.c
+++ b/sys/dev/iicbus/iicsmb.c
@@ -52,7 +52,6 @@
 #include <sys/bus.h>
 #include <sys/uio.h>
 
-#include <machine/clock.h>
 
 #include <dev/iicbus/iiconf.h>
 #include <dev/iicbus/iicbus.h>
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index fe087c2fe4de..714581c933ae 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -40,7 +40,6 @@
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 #include <sys/malloc.h>
 
diff --git a/sys/dev/kbd/atkbd.c b/sys/dev/kbd/atkbd.c
index 9b62dd813773..de5d17fdedbd 100644
--- a/sys/dev/kbd/atkbd.c
+++ b/sys/dev/kbd/atkbd.c
@@ -168,7 +168,6 @@ atkbd_timeout(void *arg)
 
 #include <machine/limits.h>
 #include <sys/kbio.h>
-#include <machine/clock.h>
 
 #define ATKBD_DEFAULT	0
 
diff --git a/sys/dev/kbd/atkbdc.c b/sys/dev/kbd/atkbdc.c
index ee643d017b82..7db3d8dce9dc 100644
--- a/sys/dev/kbd/atkbdc.c
+++ b/sys/dev/kbd/atkbdc.c
@@ -44,7 +44,6 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 
-#include <machine/clock.h>
 
 #include <dev/kbd/atkbdcreg.h>
 
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index 0a4407e8f348..57302ffd453e 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -38,7 +38,6 @@ char lmc_version[] = "BSD 1.1";
 #include <sys/errno.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <sys/syslog.h>
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 23446f7b34ce..837b4ce1b623 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -55,7 +55,6 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 #include <sys/disklabel.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/mcdreg.h>
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 06a61d5f0ccd..a0118d5cb842 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -44,7 +44,6 @@
 #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/dcphy.c b/sys/dev/mii/dcphy.c
index 2e0e77ef2798..285c2d3694c9 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -57,7 +57,6 @@
 #include <dev/mii/miivar.h>
 #include <dev/mii/miidevs.h>
 
-#include <machine/clock.h>
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index ff4719050930..7e1c8b5ec139 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -49,7 +49,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index 13ce5ff5fdfa..d83afd377c38 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -54,7 +54,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index 67cf59dde303..9a661b30f600 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -54,7 +54,6 @@
 #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/mii/pnphy.c b/sys/dev/mii/pnphy.c
index 12737dec8b88..e87e0be25e95 100644
--- a/sys/dev/mii/pnphy.c
+++ b/sys/dev/mii/pnphy.c
@@ -55,7 +55,6 @@
 #include <dev/mii/miivar.h>
 #include <dev/mii/miidevs.h>
 
-#include <machine/clock.h>
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index f4e3ba8b736c..59aae3da1d1e 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -79,7 +79,6 @@
 #include <sys/bus.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index a17651b2b00a..df004207725e 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -81,7 +81,6 @@
 #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/mii/xmphy.c b/sys/dev/mii/xmphy.c
index bf6aa3e033d8..8e46061824b3 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -45,7 +45,6 @@
 #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/mlx/mlx_disk.c b/sys/dev/mlx/mlx_disk.c
index 558474921fe4..3f19514e798b 100644
--- a/sys/dev/mlx/mlx_disk.c
+++ b/sys/dev/mlx/mlx_disk.c
@@ -42,7 +42,6 @@
 #include <sys/disk.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/mlx/mlxio.h>
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index 02c68af66607..6434534861ae 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -37,7 +37,6 @@
 
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c
index 2429b3f6eaf2..b30b2c6cc099 100644
--- a/sys/dev/pcf/pcf.c
+++ b/sys/dev/pcf/pcf.c
@@ -32,7 +32,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 2c7940fc02a0..2410afe4e9c9 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -90,7 +90,6 @@
 #include <sys/kernel.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/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index 7a9b503db601..dd8a0c97d363 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.c
@@ -40,7 +40,6 @@
 #include <sys/bus.h>
 #include <sys/malloc.h>
 
-#include <machine/clock.h>
 
 #endif	/* _KERNEL */
 
diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c
index 9132b478997b..5fd99df6c0ed 100644
--- a/sys/dev/ppbus/lpbb.c
+++ b/sys/dev/ppbus/lpbb.c
@@ -40,7 +40,6 @@
 #include <sys/bus.h>
 #include <sys/uio.h>
 
-#include <machine/clock.h>
 
 #include <dev/ppbus/ppbconf.h>
 #include "ppbus_if.h"
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index 04e161dba274..e6c0f6bb6d66 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -73,7 +73,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/dev/ppbus/pcfclock.c b/sys/dev/ppbus/pcfclock.c
index c82e5dc53f05..91a516d1a006 100644
--- a/sys/dev/ppbus/pcfclock.c
+++ b/sys/dev/ppbus/pcfclock.c
@@ -39,7 +39,6 @@
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>      /* for DELAY */
 
 #include <dev/ppbus/ppbconf.h>
 #include <dev/ppbus/ppb_msq.h>
diff --git a/sys/dev/ppbus/ppb_1284.c b/sys/dev/ppbus/ppb_1284.c
index 47ee046c2435..091582848428 100644
--- a/sys/dev/ppbus/ppb_1284.c
+++ b/sys/dev/ppbus/ppb_1284.c
@@ -37,7 +37,6 @@
 #include <sys/systm.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <dev/ppbus/ppbconf.h>
 #include <dev/ppbus/ppb_1284.h>
diff --git a/sys/dev/ppbus/ppb_base.c b/sys/dev/ppbus/ppb_base.c
index 060cb439c528..d74216cc29c3 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.c
@@ -32,7 +32,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <dev/ppbus/ppbconf.h>
   
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index 56f0b1143b2b..9c7eca66643d 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -37,7 +37,6 @@
 #include <sys/uio.h>
 #include <sys/fcntl.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index 1d6d4a242d32..fafc3f133ea0 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -33,7 +33,6 @@
 #include <sys/malloc.h>
 #include <sys/devicestat.h>	/* for struct devstat */
 
-#include <machine/clock.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index 0feb9bb4ac47..661097782b99 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -34,7 +34,6 @@
 #include <sys/bus.h>
 #include <sys/malloc.h>
 
-#include <machine/clock.h>
 
 #endif
 
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index 5b18becb9c09..22c82c2ad477 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -49,7 +49,6 @@
 #include <sys/interrupt.h>
 #include <sys/ipl.h>
 
-#include <machine/clock.h>
 
 #include <i386/isa/isa_device.h>
 
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index a0214bd8397b..fd3a54d10b02 100644
--- a/sys/dev/scd/scd.c
+++ b/sys/dev/scd/scd.c
@@ -57,7 +57,6 @@
 #include <sys/disklabel.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 #include <machine/stdarg.h>
 
 #include <i386/isa/isa_device.h>
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index eac7980e9a8f..f2ca1e8bd922 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -97,7 +97,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index 603dcf698d08..0fef75e31527 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -60,7 +60,6 @@ static const char si_copyright1[] =  "@(#) Copyright (C) Specialix International
 #include <sys/rman.h>
 #include <machine/resource.h>
 
-#include <machine/clock.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index b1f0bfd43ab3..0b76c4eff017 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -85,7 +85,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/dev/smbus/smb.c b/sys/dev/smbus/smb.c
index 67341ae4f891..3b40de1a5360 100644
--- a/sys/dev/smbus/smb.c
+++ b/sys/dev/smbus/smb.c
@@ -35,7 +35,6 @@
 #include <sys/uio.h>
 #include <sys/fcntl.h>
 
-#include <machine/clock.h>
 
 #include <dev/smbus/smbconf.h>
 #include <dev/smbus/smbus.h>
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index f1d284042b3b..ad3a3b86f38c 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -117,7 +117,6 @@
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 
-#include <machine/clock.h>
 
 #include <dev/sn/if_snreg.h>
 #include <dev/sn/if_snvar.h>
diff --git a/sys/dev/sn/if_sn_isa.c b/sys/dev/sn/if_sn_isa.c
index 157be8f1143f..c48d4bc99d59 100644
--- a/sys/dev/sn/if_sn_isa.c
+++ b/sys/dev/sn/if_sn_isa.c
@@ -43,7 +43,6 @@
 #include <net/if.h>
 #include <net/if_arp.h>
 
-#include <machine/clock.h>
 
 #include <isa/isavar.h>
 
diff --git a/sys/dev/sn/if_sn_pccard.c b/sys/dev/sn/if_sn_pccard.c
index 61a300016cab..08933d433d99 100644
--- a/sys/dev/sn/if_sn_pccard.c
+++ b/sys/dev/sn/if_sn_pccard.c
@@ -47,7 +47,6 @@
 #include <net/if.h> 
 #include <net/if_arp.h>
 
-#include <machine/clock.h>
 
 #include <dev/sn/if_snvar.h>
 #include <dev/pccard/pccardvar.h>
diff --git a/sys/dev/snc/dp83932subr.c b/sys/dev/snc/dp83932subr.c
index 65b9de9abca9..0076f96db365 100644
--- a/sys/dev/snc/dp83932subr.c
+++ b/sys/dev/snc/dp83932subr.c
@@ -70,7 +70,6 @@
 #include <net/bpf.h>
 
 #include <sys/bus.h>
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c
index 10a1f0a64ed4..bd98a8f0fc8a 100644
--- a/sys/dev/sound/isa/gusc.c
+++ b/sys/dev/sound/isa/gusc.c
@@ -35,7 +35,6 @@
 #include <sys/module.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 #include <sys/soundcard.h>
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index 7d513115ce76..8cfc17918502 100644
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -38,7 +38,6 @@
 #include <sys/module.h>
 #include <machine/resource.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 #include <sys/soundcard.h>
 #include <dev/sound/pcm/sound.h>
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index 534b8900cf70..fa6fcc2c203d 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -116,7 +116,6 @@
 #include <machine/resource.h>
 #include <sys/rman.h>
 #endif
-#include <machine/clock.h>
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 1afd6ed6d699..3f885048249c 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -108,7 +108,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c
index 3a7571476b4a..067e6f9edec5 100644
--- a/sys/dev/twe/twe.c
+++ b/sys/dev/twe/twe.c
@@ -49,7 +49,6 @@
 
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
 
diff --git a/sys/dev/twe/twe_disk.c b/sys/dev/twe/twe_disk.c
index cc49ad103842..bb8fba1956b4 100644
--- a/sys/dev/twe/twe_disk.c
+++ b/sys/dev/twe/twe_disk.c
@@ -42,7 +42,6 @@
 #include <sys/disk.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 
 #include <dev/twe/twereg.h>
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 7cbe32de48b8..8c5a8dfccfee 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -63,7 +63,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index fc3241a1f918..e88962b1660c 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -77,7 +77,6 @@
 
 #include <net/bpf.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <sys/bus.h>
 
 #include <dev/usb/usb.h>
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 3de43640b4e3..a55b01a9d5c9 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -65,7 +65,6 @@
 
 #include <net/bpf.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <sys/bus.h>
 
 #include <dev/usb/usb.h>
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 780c42bbcbf1..0b5f9fb2b339 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -80,7 +80,6 @@
 
 #include <net/bpf.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <sys/bus.h>
 
 #include <dev/usb/usb.h>
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 9d584d96082e..dee9216a4ea3 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -77,7 +77,6 @@
 #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 d9aeabf644d3..c243035c164f 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -79,7 +79,6 @@
 #include <dev/usb/uhcivar.h>
 
 #if defined(__FreeBSD__)
-#include <machine/clock.h>
 
 #define delay(d)		DELAY(d)
 #endif
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index 5debe8f2652c..1cfa940b6e1d 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -50,7 +50,6 @@
 #include <sys/ioccom.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <machine/clock.h>
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
@@ -217,7 +216,6 @@ DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0);
 
 #include <machine/limits.h>
 #include <sys/kbio.h>
-#include <machine/clock.h>
 
 #define UKBD_DEFAULT	0
 
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 01bce13fc1a7..927135e16ce0 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -100,7 +100,6 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <machine/clock.h>
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index 8b467f3f9036..241c0fa9af78 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -62,7 +62,6 @@
 #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 f4ac846e9714..1266ec331148 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -63,7 +63,6 @@
 
 #if defined(__FreeBSD__)
 #include "usb_if.h"
-#include <machine/clock.h>
 #define delay(d)	DELAY(d)
 #endif
 
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 7430a8c20aa5..38677fd95e04 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -77,7 +77,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index da8dcb0c81b2..03d3e64b21d6 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -76,7 +76,6 @@
 
 #include <net/bpf.h>
 
-#include <machine/clock.h>
 
 #include <dev/vx/if_vxreg.h>
 
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index 973d2bba24c8..63b456c3a78c 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -83,7 +83,6 @@
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <machine/bus_pio.h>
 #include <sys/rman.h>
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index fe4558bc07ad..66e8422f909f 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -217,7 +217,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <net/bpf.h>
 
-#include <machine/clock.h>
 
 #include <i386/isa/isa_device.h>
 
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index b0301953205e..0aaed442187b 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -140,7 +140,6 @@
 #include <dev/xe/if_xereg.h>
 #include <dev/xe/if_xevar.h>
 
-#include <machine/clock.h>
 
 /*
  * MII command structure
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index 5b778ad306cb..3fa1aafc0bbb 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -54,7 +54,6 @@
 #include <sys/sysctl.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c
index a31ff9c9124f..b74b8043776a 100644
--- a/sys/gnu/i386/isa/dgm.c
+++ b/sys/gnu/i386/isa/dgm.c
@@ -57,7 +57,6 @@
 #include <sys/sysctl.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
diff --git a/sys/i386/i386/synch_machdep.c b/sys/i386/i386/synch_machdep.c
index ca0e9ada8162..3dac9766ffd1 100644
--- a/sys/i386/i386/synch_machdep.c
+++ b/sys/i386/i386/synch_machdep.c
@@ -40,7 +40,6 @@
 #include <vm/vm_extern.h>
 #include <ddb/ddb.h>
 #include <machine/atomic.h>
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/mutex.h>
 
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 831ab3b168a6..60c15a6d56de 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -61,7 +61,6 @@
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
 
-#include <machine/clock.h>
 #include <machine/cpu.h>
 #include <machine/md_var.h>
 #include <machine/mutex.h>
diff --git a/sys/i386/isa/bs/bshw.c b/sys/i386/isa/bs/bshw.c
index 7c97b3291d94..fd7926004793 100644
--- a/sys/i386/isa/bs/bshw.c
+++ b/sys/i386/isa/bs/bshw.c
@@ -1,5 +1,4 @@
 /*	$NecBSD: bshw.c,v 1.1 1997/07/18 09:19:03 kmatsuda Exp $	*/
-/*	$NetBSD$	*/
 /*
  * [NetBSD for NEC PC98 series]
  *  Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff.
@@ -30,6 +29,8 @@
  */
 /*
  * Copyright (c) 1994, 1995, 1996 Naofumi HONDA.  All rights reserved.
+ *
+ * $FreeBSD$
  */
 
 #ifdef	__NetBSD__
@@ -42,7 +43,6 @@
 #include <i386/isa/ic/i8237.h>
 #include <i386/isa/bs/bsif.h>
 #include <i386/isa/bs/bshw.lst>
-#include <machine/clock.h>
 #include <sys/cons.h>
 #endif
 
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 5e0ea5636ae0..8b49cfa7c6b7 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -80,7 +80,6 @@
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <machine/lock.h>
 #include <machine/psl.h>
 
diff --git a/sys/i386/isa/if_ar.c b/sys/i386/isa/if_ar.c
index c9f3bbe94fc3..f43aef13a07d 100644
--- a/sys/i386/isa/if_ar.c
+++ b/sys/i386/isa/if_ar.c
@@ -68,7 +68,6 @@
 #include <net/bpf.h>
 #endif /* NETGRAPH */
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <i386/isa/if_arregs.h>
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index c0a54a27ec23..29ca01d4933d 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -40,7 +40,6 @@
 
 #include <net/bpf.h>
 
-#include <machine/clock.h>
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/if_elreg.h>
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 4ed96bbabf08..838a5f0698f0 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -57,7 +57,6 @@
 #include <netinet/if_ether.h>
 
 
-#include <machine/clock.h>
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/icu.h>
diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c
index f959a5228fd7..39620439343b 100644
--- a/sys/i386/isa/if_rdp.c
+++ b/sys/i386/isa/if_rdp.c
@@ -90,7 +90,6 @@
 
 #include <net/bpf.h>
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <i386/isa/isa_device.h>
diff --git a/sys/i386/isa/if_wi.c b/sys/i386/isa/if_wi.c
index 973d2bba24c8..63b456c3a78c 100644
--- a/sys/i386/isa/if_wi.c
+++ b/sys/i386/isa/if_wi.c
@@ -83,7 +83,6 @@
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <machine/bus_pio.h>
 #include <sys/rman.h>
diff --git a/sys/i386/isa/if_wl.c b/sys/i386/isa/if_wl.c
index fe4558bc07ad..66e8422f909f 100644
--- a/sys/i386/isa/if_wl.c
+++ b/sys/i386/isa/if_wl.c
@@ -217,7 +217,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include <net/bpf.h>
 
-#include <machine/clock.h>
 
 #include <i386/isa/isa_device.h>
 
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index eb00e3db783a..d8e9d6812787 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -52,7 +52,6 @@
 #include <sys/fcntl.h>
 #include <sys/uio.h>
 #include <sys/bus.h>
-#include <machine/clock.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <i386/isa/isa_device.h>
diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c
index 135a085eda7e..ab6f4b8eddb7 100644
--- a/sys/i386/isa/labpc.c
+++ b/sys/i386/isa/labpc.c
@@ -57,7 +57,6 @@
 #include <sys/bus.h>
 
 #ifdef LOUTB
-#include <machine/clock.h>
 #endif
 
 #include <i386/isa/isa_device.h>
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 23446f7b34ce..837b4ce1b623 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -55,7 +55,6 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 #include <sys/disklabel.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/mcdreg.h>
diff --git a/sys/i386/isa/pcf.c b/sys/i386/isa/pcf.c
index 2429b3f6eaf2..b30b2c6cc099 100644
--- a/sys/i386/isa/pcf.c
+++ b/sys/i386/isa/pcf.c
@@ -32,7 +32,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index 5b18becb9c09..22c82c2ad477 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -49,7 +49,6 @@
 #include <sys/interrupt.h>
 #include <sys/ipl.h>
 
-#include <machine/clock.h>
 
 #include <i386/isa/isa_device.h>
 
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index a0214bd8397b..fd3a54d10b02 100644
--- a/sys/i386/isa/scd.c
+++ b/sys/i386/isa/scd.c
@@ -57,7 +57,6 @@
 #include <sys/disklabel.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 #include <machine/stdarg.h>
 
 #include <i386/isa/isa_device.h>
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index 35fd31cd7f2f..2f177cbffcea 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -69,7 +69,6 @@
 #include <sys/conf.h>
 #include <sys/bus.h>
 
-#include <machine/clock.h>
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/wtreg.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
index 95f61e876471..e89a4aee8df0 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
@@ -48,7 +48,6 @@
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
index 249632e90629..5ec686bd8661 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
@@ -46,7 +46,6 @@
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
index e2d04eaadef4..514157ec2348 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
@@ -46,7 +46,6 @@
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
index b1502c7bd750..15884a04f394 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -52,7 +52,6 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_pio.h> /* this device uses port accesses only */
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
index b1d3c0ed9a3a..fac02b17dba4 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
@@ -52,7 +52,6 @@
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 
-#include <machine/clock.h>  
 #include <machine/bus_pio.h> 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
index 7df6a2300565..8ae893ae7c04 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
@@ -48,7 +48,6 @@
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
index ffa0d6dea271..2e1e4777d9aa 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
@@ -46,7 +46,6 @@
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
index 90c9bd140fc0..88c124f04ae1 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
@@ -46,7 +46,6 @@
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
index 215a639d760b..c0f436ab94c5 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
@@ -48,7 +48,6 @@
 #include <net/if.h>
 
 #include <sys/mbuf.h>
-#include <machine/clock.h>
 
 #include <i4b/include/i4b_mbuf.h>
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
index f5ee661c441f..69343fa60c13 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
@@ -51,7 +51,6 @@
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
index 56828e259452..b324f4172840 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
@@ -49,7 +49,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <i4b/include/i4b_global.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
index 726081dfbb92..4c09c6550fc4 100644
--- a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
+++ b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
@@ -57,7 +57,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_avm_a1.c b/sys/i4b/layer1/isic/i4b_avm_a1.c
index 0f5b63a11f04..d102783e1e6d 100644
--- a/sys/i4b/layer1/isic/i4b_avm_a1.c
+++ b/sys/i4b/layer1/isic/i4b_avm_a1.c
@@ -54,7 +54,6 @@
 
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
diff --git a/sys/i4b/layer1/isic/i4b_bchan.c b/sys/i4b/layer1/isic/i4b_bchan.c
index d63909c81ff4..d1b92054dbf7 100644
--- a/sys/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/i4b/layer1/isic/i4b_bchan.c
@@ -44,7 +44,6 @@
 #include <sys/mbuf.h>
 #include <machine/stdarg.h>
 
-#include <machine/clock.h>
 
 #include <sys/socket.h>
 #include <net/if.h>
diff --git a/sys/i4b/layer1/isic/i4b_ctx_s0P.c b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
index 0dd42ecf0444..0d43a330aef3 100644
--- a/sys/i4b/layer1/isic/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
@@ -51,7 +51,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_drn_ngo.c b/sys/i4b/layer1/isic/i4b_drn_ngo.c
index 24b68d93a7f4..85ff646be5c5 100644
--- a/sys/i4b/layer1/isic/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/isic/i4b_drn_ngo.c
@@ -44,7 +44,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_dynalink.c b/sys/i4b/layer1/isic/i4b_dynalink.c
index a9efd088ca1b..8228152368b5 100644
--- a/sys/i4b/layer1/isic/i4b_dynalink.c
+++ b/sys/i4b/layer1/isic/i4b_dynalink.c
@@ -78,7 +78,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
index 0ce2143334bc..4903de97a114 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
@@ -47,7 +47,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
index b4e642a786bc..fcae2bf32be7 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
@@ -45,7 +45,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
index 6f57b01aee02..05b11edc3d27 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
@@ -49,7 +49,6 @@
 #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/isic/i4b_hscx.c b/sys/i4b/layer1/isic/i4b_hscx.c
index 40ef206802a4..125454e07605 100644
--- a/sys/i4b/layer1/isic/i4b_hscx.c
+++ b/sys/i4b/layer1/isic/i4b_hscx.c
@@ -45,7 +45,6 @@
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_isac.c b/sys/i4b/layer1/isic/i4b_isac.c
index 64096533c30b..ad6bb91b80c8 100644
--- a/sys/i4b/layer1/isic/i4b_isac.c
+++ b/sys/i4b/layer1/isic/i4b_isac.c
@@ -47,7 +47,6 @@
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_isic.c b/sys/i4b/layer1/isic/i4b_isic.c
index cc8719d380d5..cd75612e0b43 100644
--- a/sys/i4b/layer1/isic/i4b_isic.c
+++ b/sys/i4b/layer1/isic/i4b_isic.c
@@ -45,7 +45,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
diff --git a/sys/i4b/layer1/isic/i4b_isic_isa.c b/sys/i4b/layer1/isic/i4b_isic_isa.c
index f11e61ffd667..71101dad853b 100644
--- a/sys/i4b/layer1/isic/i4b_isic_isa.c
+++ b/sys/i4b/layer1/isic/i4b_isic_isa.c
@@ -46,7 +46,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
diff --git a/sys/i4b/layer1/isic/i4b_isic_pnp.c b/sys/i4b/layer1/isic/i4b_isic_pnp.c
index 7ab4ba76e9b4..a26ec9188f01 100644
--- a/sys/i4b/layer1/isic/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/isic/i4b_isic_pnp.c
@@ -56,7 +56,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/i4b_ioctl.h>
 #include <i4b/layer1/isic/i4b_isic.h>
diff --git a/sys/i4b/layer1/isic/i4b_itk_ix1.c b/sys/i4b/layer1/isic/i4b_itk_ix1.c
index 101c98319bb6..9d043c1a286b 100644
--- a/sys/i4b/layer1/isic/i4b_itk_ix1.c
+++ b/sys/i4b/layer1/isic/i4b_itk_ix1.c
@@ -71,7 +71,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_l1.c b/sys/i4b/layer1/isic/i4b_l1.c
index 6a25764c733d..86e111b8d3bc 100644
--- a/sys/i4b/layer1/isic/i4b_l1.c
+++ b/sys/i4b/layer1/isic/i4b_l1.c
@@ -45,7 +45,6 @@
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_l1fsm.c b/sys/i4b/layer1/isic/i4b_l1fsm.c
index 7563b4b497d0..a125bd5cb436 100644
--- a/sys/i4b/layer1/isic/i4b_l1fsm.c
+++ b/sys/i4b/layer1/isic/i4b_l1fsm.c
@@ -45,7 +45,6 @@
 #include <sys/socket.h>
 
 #include <machine/stdarg.h>
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_siemens_isurf.c b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
index 3d73f8e9f3c7..21a9757a5b10 100644
--- a/sys/i4b/layer1/isic/i4b_siemens_isurf.c
+++ b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
@@ -54,7 +54,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_sws.c b/sys/i4b/layer1/isic/i4b_sws.c
index d31b27c3784f..95d944f74516 100644
--- a/sys/i4b/layer1/isic/i4b_sws.c
+++ b/sys/i4b/layer1/isic/i4b_sws.c
@@ -71,7 +71,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_tel_s016.c b/sys/i4b/layer1/isic/i4b_tel_s016.c
index 47630ea3cee3..4a658cea285a 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s016.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s016.c
@@ -54,7 +54,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <net/if.h>
diff --git a/sys/i4b/layer1/isic/i4b_tel_s0163.c b/sys/i4b/layer1/isic/i4b_tel_s0163.c
index 28b96b288bf8..0b1f4d0845e8 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s0163.c
@@ -54,7 +54,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/clock.h>
 
 #include <net/if.h>
 
diff --git a/sys/i4b/layer1/isic/i4b_tel_s08.c b/sys/i4b/layer1/isic/i4b_tel_s08.c
index 85a6eb2fe9f7..bed99c28fcf0 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s08.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s08.c
@@ -54,7 +54,6 @@
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <net/if.h>
diff --git a/sys/i4b/layer1/isic/i4b_usr_sti.c b/sys/i4b/layer1/isic/i4b_usr_sti.c
index 684240c45d18..1885f45c74f6 100644
--- a/sys/i4b/layer1/isic/i4b_usr_sti.c
+++ b/sys/i4b/layer1/isic/i4b_usr_sti.c
@@ -48,7 +48,6 @@
 #include <sys/systm.h>
 
 #ifdef __FreeBSD__
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
index 7918844b5d6f..8a18c9962369 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
@@ -50,7 +50,6 @@
 
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
index 5db03bf69b94..e582d6f6dcb2 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
@@ -48,7 +48,6 @@
 
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
index 7c0dd6f86151..5bbf75122895 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
@@ -46,7 +46,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/i4b_debug.h>
 #include <machine/i4b_ioctl.h>
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
index e38365de2176..f5004f8a78b7 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
@@ -46,7 +46,6 @@
 #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/iwic/i4b_iwic_pci.c b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
index 4975b0ce73ac..d675891ab23f 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_pci.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
@@ -47,7 +47,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 
-#include <machine/clock.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/isa/pnp.c b/sys/isa/pnp.c
index 473e4d7aeea9..6a58ddf6dd99 100644
--- a/sys/isa/pnp.c
+++ b/sys/isa/pnp.c
@@ -36,7 +36,6 @@
 #include <isa/isavar.h>
 #include <isa/pnpreg.h>
 #include <isa/pnpvar.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 
 typedef struct _pnp_id {
diff --git a/sys/isa/psm.c b/sys/isa/psm.c
index e4f531dd6e80..fe1866e9d797 100644
--- a/sys/isa/psm.c
+++ b/sys/isa/psm.c
@@ -76,7 +76,6 @@
 #include <sys/select.h>
 #include <sys/uio.h>
 
-#include <machine/clock.h>
 #include <machine/limits.h>
 #include <sys/mouse.h>
 #include <machine/resource.h>
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 15f2d5ea45a4..ed2ce218434f 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -62,7 +62,6 @@
 #include <sys/cons.h>
 
 #include <machine/pcb.h>
-#include <machine/clock.h>
 #include <machine/lock.h>
 #include <machine/md_var.h>
 #include <machine/mutex.h>
diff --git a/sys/net/if.c b/sys/net/if.c
index cb1831927b7e..1e5a4efef3da 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -63,7 +63,6 @@
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #ifdef INET6
-#include <machine/clock.h> /* XXX: temporal workaround for fxp issue */
 #include <netinet6/in6_var.h>
 #include <netinet6/in6_ifattach.h>
 #endif
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index cd2c2d98b3fc..4141ffdffcc1 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -68,7 +68,6 @@
 
 #include <net/bpf.h>
 
-#include <machine/clock.h>
 #include <machine/md_var.h>
 
 #include <i386/isa/isa_device.h>
diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c
index 2a48c19b8576..5ceb3519895b 100644
--- a/sys/netatm/atm_aal5.c
+++ b/sys/netatm/atm_aal5.c
@@ -43,7 +43,6 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c
index 46c1006884cf..22bea2ac6f04 100644
--- a/sys/netatm/atm_cm.c
+++ b/sys/netatm/atm_cm.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c
index b65c36fd3bfe..33efb935027f 100644
--- a/sys/netatm/atm_device.c
+++ b/sys/netatm/atm_device.c
@@ -44,7 +44,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/atm_if.c b/sys/netatm/atm_if.c
index c8078f41c770..9131b80f57b2 100644
--- a/sys/netatm/atm_if.c
+++ b/sys/netatm/atm_if.c
@@ -44,7 +44,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
diff --git a/sys/netatm/atm_proto.c b/sys/netatm/atm_proto.c
index 9789f62d4a88..a1ded20db523 100644
--- a/sys/netatm/atm_proto.c
+++ b/sys/netatm/atm_proto.c
@@ -44,7 +44,6 @@
 #include <sys/domain.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/atm_signal.c b/sys/netatm/atm_signal.c
index 9ba114fb675d..e4bde9973074 100644
--- a/sys/netatm/atm_signal.c
+++ b/sys/netatm/atm_signal.c
@@ -42,7 +42,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/atm_socket.c b/sys/netatm/atm_socket.c
index 560970644d4c..d3bef8bf862c 100644
--- a/sys/netatm/atm_socket.c
+++ b/sys/netatm/atm_socket.c
@@ -44,7 +44,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c
index 8dc9d54b67f3..33f0ad98c4fa 100644
--- a/sys/netatm/atm_subr.c
+++ b/sys/netatm/atm_subr.c
@@ -44,7 +44,6 @@
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <net/netisr.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/atm_usrreq.c b/sys/netatm/atm_usrreq.c
index 37aae9e4a021..b2e6f5ca5238 100644
--- a/sys/netatm/atm_usrreq.c
+++ b/sys/netatm/atm_usrreq.c
@@ -44,7 +44,6 @@
 #include <sys/time.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c
index 2058ca1f0c28..33ba4a9e8ebb 100644
--- a/sys/netatm/ipatm/ipatm_event.c
+++ b/sys/netatm/ipatm/ipatm_event.c
@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/ipatm/ipatm_if.c b/sys/netatm/ipatm/ipatm_if.c
index b924cf5f530a..97fe415aec81 100644
--- a/sys/netatm/ipatm/ipatm_if.c
+++ b/sys/netatm/ipatm/ipatm_if.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/ipatm/ipatm_input.c b/sys/netatm/ipatm/ipatm_input.c
index fa06a7dc82d3..d04c60a52e1e 100644
--- a/sys/netatm/ipatm/ipatm_input.c
+++ b/sys/netatm/ipatm/ipatm_input.c
@@ -41,7 +41,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <net/netisr.h>
 #include <netinet/in.h>
diff --git a/sys/netatm/ipatm/ipatm_load.c b/sys/netatm/ipatm/ipatm_load.c
index 736f7d6eda5a..c854075a812c 100644
--- a/sys/netatm/ipatm/ipatm_load.c
+++ b/sys/netatm/ipatm/ipatm_load.c
@@ -48,7 +48,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/sys/netatm/ipatm/ipatm_output.c b/sys/netatm/ipatm/ipatm_output.c
index 3e6d1d2550ea..55d68646bc8c 100644
--- a/sys/netatm/ipatm/ipatm_output.c
+++ b/sys/netatm/ipatm/ipatm_output.c
@@ -42,7 +42,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/sys/netatm/ipatm/ipatm_usrreq.c b/sys/netatm/ipatm/ipatm_usrreq.c
index e563e4dbc4cd..4b083000d2a6 100644
--- a/sys/netatm/ipatm/ipatm_usrreq.c
+++ b/sys/netatm/ipatm/ipatm_usrreq.c
@@ -42,7 +42,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c
index bdb956c24e64..91ac2dd8516f 100644
--- a/sys/netatm/ipatm/ipatm_vcm.c
+++ b/sys/netatm/ipatm/ipatm_vcm.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/sys/netatm/sigpvc/sigpvc_if.c b/sys/netatm/sigpvc/sigpvc_if.c
index 0ed91188c99a..7a0275079809 100644
--- a/sys/netatm/sigpvc/sigpvc_if.c
+++ b/sys/netatm/sigpvc/sigpvc_if.c
@@ -50,7 +50,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/sigpvc/sigpvc_subr.c b/sys/netatm/sigpvc/sigpvc_subr.c
index 787ad3ebd310..28d55ded3c0f 100644
--- a/sys/netatm/sigpvc/sigpvc_subr.c
+++ b/sys/netatm/sigpvc/sigpvc_subr.c
@@ -42,7 +42,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index bf8a9a9a157c..af2e05036654 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index 2d4d3a19f011..e19d5d20a5f3 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index 70b0ed071536..7766eb848cea 100644
--- a/sys/netatm/spans/spans_if.c
+++ b/sys/netatm/spans/spans_if.c
@@ -50,7 +50,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c
index 5ed0bc122d3b..8425fb5c732f 100644
--- a/sys/netatm/spans/spans_kxdr.c
+++ b/sys/netatm/spans/spans_kxdr.c
@@ -39,7 +39,6 @@
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <machine/clock.h>
 #include <netatm/port.h>
 
 #ifndef lint
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index 9e0171dc25f7..686eb537b761 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c
index b0ce63d95b54..857a3ed6e287 100644
--- a/sys/netatm/spans/spans_print.c
+++ b/sys/netatm/spans/spans_print.c
@@ -40,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index bd735d4a12ef..16b89cce930e 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index 53930eaa2bbe..ad83912eed02 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/spans/spans_util.c b/sys/netatm/spans/spans_util.c
index 310cd3fc7a21..2367e305fa8e 100644
--- a/sys/netatm/spans/spans_util.c
+++ b/sys/netatm/spans/spans_util.c
@@ -40,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/uni/q2110_sigaa.c b/sys/netatm/uni/q2110_sigaa.c
index f53be1088e4a..61ba1b9d57ac 100644
--- a/sys/netatm/uni/q2110_sigaa.c
+++ b/sys/netatm/uni/q2110_sigaa.c
@@ -40,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/q2110_sigcpcs.c b/sys/netatm/uni/q2110_sigcpcs.c
index 75eca40a0580..3e18c1625cb0 100644
--- a/sys/netatm/uni/q2110_sigcpcs.c
+++ b/sys/netatm/uni/q2110_sigcpcs.c
@@ -41,7 +41,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/q2110_subr.c b/sys/netatm/uni/q2110_subr.c
index b570453ef259..f870cb078c69 100644
--- a/sys/netatm/uni/q2110_subr.c
+++ b/sys/netatm/uni/q2110_subr.c
@@ -40,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/qsaal1_sigaa.c b/sys/netatm/uni/qsaal1_sigaa.c
index 6c572325f968..5f2a90037362 100644
--- a/sys/netatm/uni/qsaal1_sigaa.c
+++ b/sys/netatm/uni/qsaal1_sigaa.c
@@ -40,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/qsaal1_sigcpcs.c b/sys/netatm/uni/qsaal1_sigcpcs.c
index 30fe1eb0d727..da0abde1676e 100644
--- a/sys/netatm/uni/qsaal1_sigcpcs.c
+++ b/sys/netatm/uni/qsaal1_sigcpcs.c
@@ -41,7 +41,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/qsaal1_subr.c b/sys/netatm/uni/qsaal1_subr.c
index 1f65368ee193..c10823cdbe5f 100644
--- a/sys/netatm/uni/qsaal1_subr.c
+++ b/sys/netatm/uni/qsaal1_subr.c
@@ -40,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c
index d6553d45c730..f5f93f7df0a0 100644
--- a/sys/netatm/uni/sscf_uni.c
+++ b/sys/netatm/uni/sscf_uni.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c
index 15210587e61e..d4175ed842d6 100644
--- a/sys/netatm/uni/sscf_uni_lower.c
+++ b/sys/netatm/uni/sscf_uni_lower.c
@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c
index 22822dbe9eed..8f1d49ccb970 100644
--- a/sys/netatm/uni/sscf_uni_upper.c
+++ b/sys/netatm/uni/sscf_uni_upper.c
@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c
index 2eefe443a79e..d578c7ebd405 100644
--- a/sys/netatm/uni/sscop.c
+++ b/sys/netatm/uni/sscop.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c
index 7e7b17f00fcc..4ce20575075f 100644
--- a/sys/netatm/uni/sscop_lower.c
+++ b/sys/netatm/uni/sscop_lower.c
@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/sscop_pdu.c b/sys/netatm/uni/sscop_pdu.c
index 56a1e2e3d3b6..7b9734303de9 100644
--- a/sys/netatm/uni/sscop_pdu.c
+++ b/sys/netatm/uni/sscop_pdu.c
@@ -41,7 +41,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/sscop_sigaa.c b/sys/netatm/uni/sscop_sigaa.c
index 4e46b4316873..9c366f7da400 100644
--- a/sys/netatm/uni/sscop_sigaa.c
+++ b/sys/netatm/uni/sscop_sigaa.c
@@ -40,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/sscop_sigcpcs.c b/sys/netatm/uni/sscop_sigcpcs.c
index 0a345d3f6ab4..c0d0d596fc64 100644
--- a/sys/netatm/uni/sscop_sigcpcs.c
+++ b/sys/netatm/uni/sscop_sigcpcs.c
@@ -41,7 +41,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c
index 9adcccaa2742..9cbb063229d5 100644
--- a/sys/netatm/uni/sscop_subr.c
+++ b/sys/netatm/uni/sscop_subr.c
@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c
index e5fb97e68067..1c0c03e68c79 100644
--- a/sys/netatm/uni/sscop_timer.c
+++ b/sys/netatm/uni/sscop_timer.c
@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c
index 4c5ed4dc4289..6920c94e6690 100644
--- a/sys/netatm/uni/sscop_upper.c
+++ b/sys/netatm/uni/sscop_upper.c
@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/uni_load.c b/sys/netatm/uni/uni_load.c
index 00b5960b3749..6fad4eacba55 100644
--- a/sys/netatm/uni/uni_load.c
+++ b/sys/netatm/uni/uni_load.c
@@ -48,7 +48,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c
index bdbe71f7da52..7e5c5563f0fe 100644
--- a/sys/netatm/uni/uniarp.c
+++ b/sys/netatm/uni/uniarp.c
@@ -44,7 +44,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/sys/netatm/uni/uniarp_cache.c b/sys/netatm/uni/uniarp_cache.c
index 40f64a06c305..8400eeb8e2ec 100644
--- a/sys/netatm/uni/uniarp_cache.c
+++ b/sys/netatm/uni/uniarp_cache.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/uni/uniarp_input.c b/sys/netatm/uni/uniarp_input.c
index bfcbf1d7b522..5932aff47cb7 100644
--- a/sys/netatm/uni/uniarp_input.c
+++ b/sys/netatm/uni/uniarp_input.c
@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/sys/netatm/uni/uniarp_output.c b/sys/netatm/uni/uniarp_output.c
index 1b097eb98768..2a5395eef296 100644
--- a/sys/netatm/uni/uniarp_output.c
+++ b/sys/netatm/uni/uniarp_output.c
@@ -41,7 +41,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/sys/netatm/uni/uniarp_timer.c b/sys/netatm/uni/uniarp_timer.c
index 575d32a34bcf..c91f11d9b9e8 100644
--- a/sys/netatm/uni/uniarp_timer.c
+++ b/sys/netatm/uni/uniarp_timer.c
@@ -41,7 +41,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c
index 3ae7f06f1f63..563d704ec51a 100644
--- a/sys/netatm/uni/uniarp_vcm.c
+++ b/sys/netatm/uni/uniarp_vcm.c
@@ -41,7 +41,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
diff --git a/sys/netatm/uni/uniip.c b/sys/netatm/uni/uniip.c
index 3519cc15c6b6..e831573ec814 100644
--- a/sys/netatm/uni/uniip.c
+++ b/sys/netatm/uni/uniip.c
@@ -43,7 +43,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c
index e3bae48d442a..1d0bb5b8d580 100644
--- a/sys/netatm/uni/unisig_decode.c
+++ b/sys/netatm/uni/unisig_decode.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c
index a201c26427b4..fb36be5cb0ab 100644
--- a/sys/netatm/uni/unisig_encode.c
+++ b/sys/netatm/uni/unisig_encode.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c
index da49a548156b..9da98c6739cb 100644
--- a/sys/netatm/uni/unisig_if.c
+++ b/sys/netatm/uni/unisig_if.c
@@ -44,7 +44,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netatm/port.h>
diff --git a/sys/netatm/uni/unisig_mbuf.c b/sys/netatm/uni/unisig_mbuf.c
index 96088618a718..102caaf6aefa 100644
--- a/sys/netatm/uni/unisig_mbuf.c
+++ b/sys/netatm/uni/unisig_mbuf.c
@@ -42,7 +42,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c
index 9ea82162af70..beb6cf73d0f4 100644
--- a/sys/netatm/uni/unisig_msg.c
+++ b/sys/netatm/uni/unisig_msg.c
@@ -42,7 +42,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/unisig_print.c b/sys/netatm/uni/unisig_print.c
index 8744a6bd49da..c9ea122e1c7c 100644
--- a/sys/netatm/uni/unisig_print.c
+++ b/sys/netatm/uni/unisig_print.c
@@ -40,7 +40,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c
index 063899b8f9bf..15081134b024 100644
--- a/sys/netatm/uni/unisig_proto.c
+++ b/sys/netatm/uni/unisig_proto.c
@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c
index e10f2850ed4c..49d93b96a188 100644
--- a/sys/netatm/uni/unisig_sigmgr_state.c
+++ b/sys/netatm/uni/unisig_sigmgr_state.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c
index 952e417fdcb7..a57bee1d01e3 100644
--- a/sys/netatm/uni/unisig_subr.c
+++ b/sys/netatm/uni/unisig_subr.c
@@ -42,7 +42,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/unisig_util.c b/sys/netatm/uni/unisig_util.c
index 09d35aa3683f..f25ddd3fa532 100644
--- a/sys/netatm/uni/unisig_util.c
+++ b/sys/netatm/uni/unisig_util.c
@@ -42,7 +42,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c
index 0ba75e21bb0e..809756455610 100644
--- a/sys/netatm/uni/unisig_vc_state.c
+++ b/sys/netatm/uni/unisig_vc_state.c
@@ -43,7 +43,6 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 #include <net/if.h>
 #include <netatm/port.h>
 #include <netatm/queue.h>
diff --git a/sys/netgraph/ng_frame_relay.c b/sys/netgraph/ng_frame_relay.c
index 6004a7e2a2c8..8111b3ce457b 100644
--- a/sys/netgraph/ng_frame_relay.c
+++ b/sys/netgraph/ng_frame_relay.c
@@ -57,7 +57,6 @@
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/ctype.h>
-#include <machine/clock.h>
 
 #include <netgraph/ng_message.h>
 #include <netgraph/netgraph.h>
diff --git a/sys/pc98/cbus/gdc.c b/sys/pc98/cbus/gdc.c
index 3dad2bc4e65c..284e2b09f496 100644
--- a/sys/pc98/cbus/gdc.c
+++ b/sys/pc98/cbus/gdc.c
@@ -251,7 +251,6 @@ DRIVER_MODULE(gdc, isa, gdcdriver, gdc_devclass, 0, 0);
 
 /* LOW-LEVEL */
 
-#include <machine/clock.h>
 
 #include <pc98/pc98/30line.h>
 
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index 99fa95b8b443..cd645128e6d9 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -117,7 +117,6 @@
 #include <sys/kernel.h>
 #include <sys/uio.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/lptreg.h>
diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c
index d46edbf2bc67..4bd235c64dba 100644
--- a/sys/pc98/cbus/pckbd.c
+++ b/sys/pc98/cbus/pckbd.c
@@ -222,7 +222,6 @@ pckbd_timeout(void *arg)
 
 #include <machine/limits.h>
 #include <machine/console.h>
-#include <machine/clock.h>
 
 #define PC98KBD_DEFAULT	0
 
diff --git a/sys/pc98/cbus/ppc.c b/sys/pc98/cbus/ppc.c
index 0afbad0a1884..e20e5b55a4bf 100644
--- a/sys/pc98/cbus/ppc.c
+++ b/sys/pc98/cbus/ppc.c
@@ -36,7 +36,6 @@
   
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <machine/vmparam.h>
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 947d1d11f823..89056545e20c 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -175,7 +175,6 @@
 #endif
 #include <machine/lock.h>
 
-#include <machine/clock.h>
 #ifndef SMP
 #include <machine/lock.h>
 #endif
diff --git a/sys/pc98/pc98/atapi.c b/sys/pc98/pc98/atapi.c
index 68418e430e57..84f3ee23e8e8 100644
--- a/sys/pc98/pc98/atapi.c
+++ b/sys/pc98/pc98/atapi.c
@@ -114,7 +114,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 
-#include <machine/clock.h>
 
 #include <pc98/pc98/atapi.h>
 
diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index c89b58c60d1d..3b8ee54ce115 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -54,7 +54,6 @@
 #include <sys/uio.h>
 
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <sys/mouse.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
diff --git a/sys/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c
index 99fa95b8b443..cd645128e6d9 100644
--- a/sys/pc98/pc98/olpt.c
+++ b/sys/pc98/pc98/olpt.c
@@ -117,7 +117,6 @@
 #include <sys/kernel.h>
 #include <sys/uio.h>
 #include <sys/syslog.h>
-#include <machine/clock.h>
 
 #include <i386/isa/isa_device.h>
 #include <i386/isa/lptreg.h>
diff --git a/sys/pc98/pc98/pc98gdc.c b/sys/pc98/pc98/pc98gdc.c
index 3dad2bc4e65c..284e2b09f496 100644
--- a/sys/pc98/pc98/pc98gdc.c
+++ b/sys/pc98/pc98/pc98gdc.c
@@ -251,7 +251,6 @@ DRIVER_MODULE(gdc, isa, gdcdriver, gdc_devclass, 0, 0);
 
 /* LOW-LEVEL */
 
-#include <machine/clock.h>
 
 #include <pc98/pc98/30line.h>
 
diff --git a/sys/pc98/pc98/pc98kbd.c b/sys/pc98/pc98/pc98kbd.c
index d46edbf2bc67..4bd235c64dba 100644
--- a/sys/pc98/pc98/pc98kbd.c
+++ b/sys/pc98/pc98/pc98kbd.c
@@ -222,7 +222,6 @@ pckbd_timeout(void *arg)
 
 #include <machine/limits.h>
 #include <machine/console.h>
-#include <machine/clock.h>
 
 #define PC98KBD_DEFAULT	0
 
diff --git a/sys/pc98/pc98/ppc.c b/sys/pc98/pc98/ppc.c
index 0afbad0a1884..e20e5b55a4bf 100644
--- a/sys/pc98/pc98/ppc.c
+++ b/sys/pc98/pc98/ppc.c
@@ -36,7 +36,6 @@
   
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <machine/vmparam.h>
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 947d1d11f823..89056545e20c 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -175,7 +175,6 @@
 #endif
 #include <machine/lock.h>
 
-#include <machine/clock.h>
 #ifndef SMP
 #include <machine/lock.h>
 #endif
diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c
index cf8842cf57a7..513e3eb212e4 100644
--- a/sys/pc98/pc98/wd.c
+++ b/sys/pc98/pc98/wd.c
@@ -73,7 +73,6 @@
 #include <sys/devicestat.h>
 #include <sys/malloc.h>
 #include <machine/bootinfo.h>
-#include <machine/clock.h>
 #include <sys/cons.h>
 #include <machine/md_var.h>
 #ifdef PC98
diff --git a/sys/pccard/pcic.c b/sys/pccard/pcic.c
index ab75c8494125..007493d2fae5 100644
--- a/sys/pccard/pcic.c
+++ b/sys/pccard/pcic.c
@@ -37,7 +37,6 @@
 #include <sys/module.h>
 #include <sys/select.h>
 
-#include <machine/clock.h>
 
 #include <pccard/i82365.h>
 #include <pccard/cardinfo.h>
diff --git a/sys/pci/agp_amd.c b/sys/pci/agp_amd.c
index 198b926241fb..0a498f72ae99 100644
--- a/sys/pci/agp_amd.c
+++ b/sys/pci/agp_amd.c
@@ -44,7 +44,6 @@
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/pmap.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/rman.h>
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index fb87c74bc56a..315bdec270b8 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -37,7 +37,6 @@
 #include <sys/bus.h>
 #include <sys/uio.h>
 
-#include <machine/clock.h>
 
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
diff --git a/sys/pci/amd.c b/sys/pci/amd.c
index 808afa70d99f..8bd550b19c8e 100644
--- a/sys/pci/amd.c
+++ b/sys/pci/amd.c
@@ -61,7 +61,6 @@
 
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
-#include <machine/clock.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index 893da207161f..6a437a455f7d 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -104,7 +104,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 7037f6dbfa73..4b867931f7a8 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -48,7 +48,6 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/eventhandler.h>
-#include <machine/clock.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
 #include <sys/bus.h>
diff --git a/sys/pci/if_en_pci.c b/sys/pci/if_en_pci.c
index 3a2f37a3fd95..382c7b63f428 100644
--- a/sys/pci/if_en_pci.c
+++ b/sys/pci/if_en_pci.c
@@ -56,7 +56,6 @@
 #include <sys/malloc.h>
 #include <sys/socket.h>
 
-#include <machine/clock.h>		/* for DELAY */
 
 #include <net/if.h>
 
diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index 9a5def58ce3c..3b4afedacdc0 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -63,7 +63,6 @@
 
 #include <vm/vm.h>		/* for vtophys */
 #include <vm/pmap.h>		/* for vtophys */
-#include <machine/clock.h>	/* for DELAY */
 
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>		/* for PCIM_CMD_xxx */
diff --git a/sys/pci/if_mn.c b/sys/pci/if_mn.c
index 7e273db432ec..703c6e56028d 100644
--- a/sys/pci/if_mn.c
+++ b/sys/pci/if_mn.c
@@ -47,7 +47,6 @@
 
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 
 #include <sys/rman.h>
 
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index c9952f3ddabd..05e0ab70faac 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -73,7 +73,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index fd9a75f68cf7..0feb7f8c9d72 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -101,7 +101,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index eac7980e9a8f..f2ca1e8bd922 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -97,7 +97,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 4602e582b479..5de1eb491b1c 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -75,7 +75,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index b1f0bfd43ab3..0b76c4eff017 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -85,7 +85,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 77895f80513e..4120762bd9ba 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -50,7 +50,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 1afd6ed6d699..3f885048249c 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -108,7 +108,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index 06504c3498ab..b8735973d7b7 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -196,7 +196,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index 7cbe32de48b8..8c5a8dfccfee 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -63,7 +63,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 7430a8c20aa5..38677fd95e04 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -77,7 +77,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_pio.h>
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 8fe210c54404..1dcb5472bf4a 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -104,7 +104,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 94ba480093f2..278759909e9b 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -112,7 +112,6 @@
 
 #include <vm/vm.h>              /* for vtophys */
 #include <vm/pmap.h>            /* for vtophys */
-#include <machine/clock.h>      /* for DELAY */
 #include <machine/bus_memio.h>
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index e085933cc296..ae0e2b4ffa2a 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -33,7 +33,6 @@
 #include <machine/bus_memio.h>
 #include <machine/bus.h>
 
-#include <machine/clock.h>
 #include <sys/uio.h>
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index fe087c2fe4de..714581c933ae 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/isp_pci.c
@@ -40,7 +40,6 @@
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
-#include <machine/clock.h>
 #include <sys/rman.h>
 #include <sys/malloc.h>
 
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 40a865b6b41b..77d694068f05 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -181,7 +181,6 @@
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/bus.h>
-#include <machine/clock.h>
 #include <machine/md_var.h>
 #include <machine/bus.h>
 #include <machine/resource.h>