From db7e3af11198d19592e7e6ef827f4817e823d450 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sun, 15 Oct 2000 14:19:01 +0000
Subject: Remove unneeded #include <machine/clock.h>

---
 sys/dev/aac/aac.c           | 1 -
 sys/dev/aac/aac_disk.c      | 1 -
 sys/dev/acpi/acpi.c         | 1 -
 sys/dev/advansys/advansys.c | 1 -
 sys/dev/advansys/advlib.c   | 1 -
 sys/dev/advansys/adwcam.c   | 1 -
 sys/dev/advansys/adwlib.c   | 1 -
 sys/dev/agp/agp_amd.c       | 1 -
 sys/dev/aha/aha.c           | 1 -
 sys/dev/ahb/ahb.c           | 1 -
 sys/dev/aic/aic.c           | 1 -
 sys/dev/amd/amd.c           | 1 -
 sys/dev/amr/amr.c           | 1 -
 sys/dev/amr/amr_disk.c      | 1 -
 sys/dev/an/if_an.c          | 1 -
 sys/dev/ar/if_ar.c          | 1 -
 sys/dev/ar/if_ar_isa.c      | 1 -
 sys/dev/asr/asr.c           | 1 -
 sys/dev/ata/ata-all.c       | 1 -
 sys/dev/ata/ata-disk.c      | 1 -
 sys/dev/ata/atapi-all.c     | 1 -
 sys/dev/atkbdc/atkbd.c      | 1 -
 sys/dev/atkbdc/atkbdc.c     | 1 -
 sys/dev/atkbdc/psm.c        | 1 -
 sys/dev/awi/awi.c           | 1 -
 sys/dev/awi/awi_wep.c       | 1 -
 sys/dev/awi/awi_wicfg.c     | 1 -
 sys/dev/awi/if_awi_pccard.c | 1 -
 sys/dev/bktr/bktr_audio.c   | 1 -
 sys/dev/bktr/bktr_card.c    | 1 -
 sys/dev/bktr/bktr_core.c    | 1 -
 sys/dev/bktr/bktr_i2c.c     | 1 -
 sys/dev/bktr/bktr_os.c      | 1 -
 sys/dev/bktr/bktr_tuner.c   | 1 -
 sys/dev/buslogic/bt.c       | 1 -
 sys/dev/cs/if_cs.c          | 1 -
 sys/dev/cy/cy.c             | 1 -
 sys/dev/cy/cy_isa.c         | 1 -
 sys/dev/dc/dcphy.c          | 1 -
 sys/dev/dc/if_dc.c          | 1 -
 sys/dev/dc/pnphy.c          | 1 -
 sys/dev/de/if_de.c          | 1 -
 sys/dev/dgb/dgb.c           | 1 -
 sys/dev/dgb/dgm.c           | 1 -
 sys/dev/dpt/dpt_scsi.c      | 1 -
 sys/dev/ed/if_ed.c          | 1 -
 sys/dev/ed/if_ed_pccard.c   | 1 -
 sys/dev/en/if_en_pci.c      | 1 -
 sys/dev/en/midway.c         | 1 -
 sys/dev/ep/if_ep.c          | 1 -
 sys/dev/ep/if_ep_eisa.c     | 1 -
 sys/dev/ep/if_ep_isa.c      | 1 -
 sys/dev/ep/if_ep_pccard.c   | 1 -
 sys/dev/ex/if_ex.c          | 1 -
 sys/dev/ex/if_ex_isa.c      | 1 -
 sys/dev/ex/if_ex_pccard.c   | 1 -
 sys/dev/fe/if_fe.c          | 1 -
 sys/dev/fe/if_fe_cbus.c     | 1 -
 sys/dev/fe/if_fe_isa.c      | 1 -
 sys/dev/fe/if_fe_pccard.c   | 1 -
 sys/dev/fxp/if_fxp.c        | 1 -
 sys/dev/hea/eni.c           | 1 -
 sys/dev/hea/eni_if.c        | 1 -
 sys/dev/hea/eni_vcm.c       | 1 -
 sys/dev/hfa/fore_load.c     | 1 -
 sys/dev/hfa/fore_output.c   | 1 -
 sys/dev/hfa/fore_receive.c  | 1 -
 sys/dev/ida/ida.c           | 1 -
 sys/dev/ida/ida_disk.c      | 1 -
 sys/dev/ie/if_ie.c          | 1 -
 sys/dev/iicbus/iic.c        | 1 -
 sys/dev/iicbus/iicbb.c      | 1 -
 sys/dev/iicbus/iicbus.c     | 1 -
 sys/dev/iicbus/iicsmb.c     | 1 -
 sys/dev/isp/isp_pci.c       | 1 -
 sys/dev/kbd/atkbd.c         | 1 -
 sys/dev/kbd/atkbdc.c        | 1 -
 sys/dev/lmc/if_lmc.c        | 1 -
 sys/dev/mcd/mcd.c           | 1 -
 sys/dev/mii/brgphy.c        | 1 -
 sys/dev/mii/dcphy.c         | 1 -
 sys/dev/mii/mii_physubr.c   | 1 -
 sys/dev/mii/mlphy.c         | 1 -
 sys/dev/mii/pnaphy.c        | 1 -
 sys/dev/mii/pnphy.c         | 1 -
 sys/dev/mii/tlphy.c         | 1 -
 sys/dev/mii/ukphy.c         | 1 -
 sys/dev/mii/xmphy.c         | 1 -
 sys/dev/mlx/mlx_disk.c      | 1 -
 sys/dev/mly/mly.c           | 1 -
 sys/dev/pcf/pcf.c           | 1 -
 sys/dev/ppbus/if_plip.c     | 1 -
 sys/dev/ppbus/immio.c       | 1 -
 sys/dev/ppbus/lpbb.c        | 1 -
 sys/dev/ppbus/lpt.c         | 1 -
 sys/dev/ppbus/pcfclock.c    | 1 -
 sys/dev/ppbus/ppb_1284.c    | 1 -
 sys/dev/ppbus/ppb_base.c    | 1 -
 sys/dev/ppbus/ppi.c         | 1 -
 sys/dev/ppbus/vpo.c         | 1 -
 sys/dev/ppbus/vpoio.c       | 1 -
 sys/dev/rc/rc.c             | 1 -
 sys/dev/scd/scd.c           | 1 -
 sys/dev/sf/if_sf.c          | 1 -
 sys/dev/si/si.c             | 1 -
 sys/dev/sk/if_sk.c          | 1 -
 sys/dev/smbus/smb.c         | 1 -
 sys/dev/sn/if_sn.c          | 1 -
 sys/dev/sn/if_sn_isa.c      | 1 -
 sys/dev/sn/if_sn_pccard.c   | 1 -
 sys/dev/snc/dp83932subr.c   | 1 -
 sys/dev/sound/isa/gusc.c    | 1 -
 sys/dev/sound/pci/csa.c     | 1 -
 sys/dev/sym/sym_hipd.c      | 1 -
 sys/dev/ti/if_ti.c          | 1 -
 sys/dev/twe/twe.c           | 1 -
 sys/dev/twe/twe_disk.c      | 1 -
 sys/dev/tx/if_tx.c          | 1 -
 sys/dev/usb/if_aue.c        | 1 -
 sys/dev/usb/if_cue.c        | 1 -
 sys/dev/usb/if_kue.c        | 1 -
 sys/dev/usb/ohci.c          | 1 -
 sys/dev/usb/uhci.c          | 1 -
 sys/dev/usb/ukbd.c          | 2 --
 sys/dev/usb/umass.c         | 1 -
 sys/dev/usb/usb_subr.c      | 1 -
 sys/dev/usb/usbdi.c         | 1 -
 sys/dev/vr/if_vr.c          | 1 -
 sys/dev/vx/if_vx.c          | 1 -
 sys/dev/wi/if_wi.c          | 1 -
 sys/dev/wl/if_wl.c          | 1 -
 sys/dev/xe/if_xe.c          | 1 -
 132 files changed, 133 deletions(-)

(limited to 'sys/dev')

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
-- 
cgit v1.3