summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/amd64/vm_machdep.c1
-rw-r--r--sys/cam/cam_xpt.c1
-rw-r--r--sys/cam/scsi/scsi_ses.c1
-rw-r--r--sys/contrib/dev/fla/fla.c1
-rw-r--r--sys/contrib/dev/oltr/if_oltr.c1
-rw-r--r--sys/dev/aac/aac.c1
-rw-r--r--sys/dev/aac/aac_disk.c1
-rw-r--r--sys/dev/acpi/acpi.c1
-rw-r--r--sys/dev/advansys/advansys.c1
-rw-r--r--sys/dev/advansys/advlib.c1
-rw-r--r--sys/dev/advansys/adwcam.c1
-rw-r--r--sys/dev/advansys/adwlib.c1
-rw-r--r--sys/dev/agp/agp_amd.c1
-rw-r--r--sys/dev/aha/aha.c1
-rw-r--r--sys/dev/ahb/ahb.c1
-rw-r--r--sys/dev/aic/aic.c1
-rw-r--r--sys/dev/amd/amd.c1
-rw-r--r--sys/dev/amr/amr.c1
-rw-r--r--sys/dev/amr/amr_disk.c1
-rw-r--r--sys/dev/an/if_an.c1
-rw-r--r--sys/dev/ar/if_ar.c1
-rw-r--r--sys/dev/ar/if_ar_isa.c1
-rw-r--r--sys/dev/asr/asr.c1
-rw-r--r--sys/dev/ata/ata-all.c1
-rw-r--r--sys/dev/ata/ata-disk.c1
-rw-r--r--sys/dev/ata/atapi-all.c1
-rw-r--r--sys/dev/atkbdc/atkbd.c1
-rw-r--r--sys/dev/atkbdc/atkbdc.c1
-rw-r--r--sys/dev/atkbdc/psm.c1
-rw-r--r--sys/dev/awi/awi.c1
-rw-r--r--sys/dev/awi/awi_wep.c1
-rw-r--r--sys/dev/awi/awi_wicfg.c1
-rw-r--r--sys/dev/awi/if_awi_pccard.c1
-rw-r--r--sys/dev/bktr/bktr_audio.c1
-rw-r--r--sys/dev/bktr/bktr_card.c1
-rw-r--r--sys/dev/bktr/bktr_core.c1
-rw-r--r--sys/dev/bktr/bktr_i2c.c1
-rw-r--r--sys/dev/bktr/bktr_os.c1
-rw-r--r--sys/dev/bktr/bktr_tuner.c1
-rw-r--r--sys/dev/buslogic/bt.c1
-rw-r--r--sys/dev/cs/if_cs.c1
-rw-r--r--sys/dev/cy/cy.c1
-rw-r--r--sys/dev/cy/cy_isa.c1
-rw-r--r--sys/dev/dc/dcphy.c1
-rw-r--r--sys/dev/dc/if_dc.c1
-rw-r--r--sys/dev/dc/pnphy.c1
-rw-r--r--sys/dev/de/if_de.c1
-rw-r--r--sys/dev/dgb/dgb.c1
-rw-r--r--sys/dev/dgb/dgm.c1
-rw-r--r--sys/dev/dpt/dpt_scsi.c1
-rw-r--r--sys/dev/ed/if_ed.c1
-rw-r--r--sys/dev/ed/if_ed_pccard.c1
-rw-r--r--sys/dev/en/if_en_pci.c1
-rw-r--r--sys/dev/en/midway.c1
-rw-r--r--sys/dev/ep/if_ep.c1
-rw-r--r--sys/dev/ep/if_ep_eisa.c1
-rw-r--r--sys/dev/ep/if_ep_isa.c1
-rw-r--r--sys/dev/ep/if_ep_pccard.c1
-rw-r--r--sys/dev/ex/if_ex.c1
-rw-r--r--sys/dev/ex/if_ex_isa.c1
-rw-r--r--sys/dev/ex/if_ex_pccard.c1
-rw-r--r--sys/dev/fe/if_fe.c1
-rw-r--r--sys/dev/fe/if_fe_cbus.c1
-rw-r--r--sys/dev/fe/if_fe_isa.c1
-rw-r--r--sys/dev/fe/if_fe_pccard.c1
-rw-r--r--sys/dev/fxp/if_fxp.c1
-rw-r--r--sys/dev/hea/eni.c1
-rw-r--r--sys/dev/hea/eni_if.c1
-rw-r--r--sys/dev/hea/eni_vcm.c1
-rw-r--r--sys/dev/hfa/fore_load.c1
-rw-r--r--sys/dev/hfa/fore_output.c1
-rw-r--r--sys/dev/hfa/fore_receive.c1
-rw-r--r--sys/dev/ida/ida.c1
-rw-r--r--sys/dev/ida/ida_disk.c1
-rw-r--r--sys/dev/ie/if_ie.c1
-rw-r--r--sys/dev/iicbus/iic.c1
-rw-r--r--sys/dev/iicbus/iicbb.c1
-rw-r--r--sys/dev/iicbus/iicbus.c1
-rw-r--r--sys/dev/iicbus/iicsmb.c1
-rw-r--r--sys/dev/isp/isp_pci.c1
-rw-r--r--sys/dev/kbd/atkbd.c1
-rw-r--r--sys/dev/kbd/atkbdc.c1
-rw-r--r--sys/dev/lmc/if_lmc.c1
-rw-r--r--sys/dev/mcd/mcd.c1
-rw-r--r--sys/dev/mii/brgphy.c1
-rw-r--r--sys/dev/mii/dcphy.c1
-rw-r--r--sys/dev/mii/mii_physubr.c1
-rw-r--r--sys/dev/mii/mlphy.c1
-rw-r--r--sys/dev/mii/pnaphy.c1
-rw-r--r--sys/dev/mii/pnphy.c1
-rw-r--r--sys/dev/mii/tlphy.c1
-rw-r--r--sys/dev/mii/ukphy.c1
-rw-r--r--sys/dev/mii/xmphy.c1
-rw-r--r--sys/dev/mlx/mlx_disk.c1
-rw-r--r--sys/dev/mly/mly.c1
-rw-r--r--sys/dev/pcf/pcf.c1
-rw-r--r--sys/dev/ppbus/if_plip.c1
-rw-r--r--sys/dev/ppbus/immio.c1
-rw-r--r--sys/dev/ppbus/lpbb.c1
-rw-r--r--sys/dev/ppbus/lpt.c1
-rw-r--r--sys/dev/ppbus/pcfclock.c1
-rw-r--r--sys/dev/ppbus/ppb_1284.c1
-rw-r--r--sys/dev/ppbus/ppb_base.c1
-rw-r--r--sys/dev/ppbus/ppi.c1
-rw-r--r--sys/dev/ppbus/vpo.c1
-rw-r--r--sys/dev/ppbus/vpoio.c1
-rw-r--r--sys/dev/rc/rc.c1
-rw-r--r--sys/dev/scd/scd.c1
-rw-r--r--sys/dev/sf/if_sf.c1
-rw-r--r--sys/dev/si/si.c1
-rw-r--r--sys/dev/sk/if_sk.c1
-rw-r--r--sys/dev/smbus/smb.c1
-rw-r--r--sys/dev/sn/if_sn.c1
-rw-r--r--sys/dev/sn/if_sn_isa.c1
-rw-r--r--sys/dev/sn/if_sn_pccard.c1
-rw-r--r--sys/dev/snc/dp83932subr.c1
-rw-r--r--sys/dev/sound/isa/gusc.c1
-rw-r--r--sys/dev/sound/pci/csa.c1
-rw-r--r--sys/dev/sym/sym_hipd.c1
-rw-r--r--sys/dev/ti/if_ti.c1
-rw-r--r--sys/dev/twe/twe.c1
-rw-r--r--sys/dev/twe/twe_disk.c1
-rw-r--r--sys/dev/tx/if_tx.c1
-rw-r--r--sys/dev/usb/if_aue.c1
-rw-r--r--sys/dev/usb/if_cue.c1
-rw-r--r--sys/dev/usb/if_kue.c1
-rw-r--r--sys/dev/usb/ohci.c1
-rw-r--r--sys/dev/usb/uhci.c1
-rw-r--r--sys/dev/usb/ukbd.c2
-rw-r--r--sys/dev/usb/umass.c1
-rw-r--r--sys/dev/usb/usb_subr.c1
-rw-r--r--sys/dev/usb/usbdi.c1
-rw-r--r--sys/dev/vr/if_vr.c1
-rw-r--r--sys/dev/vx/if_vx.c1
-rw-r--r--sys/dev/wi/if_wi.c1
-rw-r--r--sys/dev/wl/if_wl.c1
-rw-r--r--sys/dev/xe/if_xe.c1
-rw-r--r--sys/gnu/i386/isa/dgb.c1
-rw-r--r--sys/gnu/i386/isa/dgm.c1
-rw-r--r--sys/i386/i386/synch_machdep.c1
-rw-r--r--sys/i386/i386/vm_machdep.c1
-rw-r--r--sys/i386/isa/bs/bshw.c4
-rw-r--r--sys/i386/isa/cy.c1
-rw-r--r--sys/i386/isa/if_ar.c1
-rw-r--r--sys/i386/isa/if_el.c1
-rw-r--r--sys/i386/isa/if_le.c1
-rw-r--r--sys/i386/isa/if_rdp.c1
-rw-r--r--sys/i386/isa/if_wi.c1
-rw-r--r--sys/i386/isa/if_wl.c1
-rw-r--r--sys/i386/isa/istallion.c1
-rw-r--r--sys/i386/isa/labpc.c1
-rw-r--r--sys/i386/isa/mcd.c1
-rw-r--r--sys/i386/isa/pcf.c1
-rw-r--r--sys/i386/isa/rc.c1
-rw-r--r--sys/i386/isa/scd.c1
-rw-r--r--sys/i386/isa/wt.c1
-rw-r--r--sys/i4b/layer1/ifpi/i4b_ifpi_isac.c1
-rw-r--r--sys/i4b/layer1/ifpi/i4b_ifpi_l1.c1
-rw-r--r--sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c1
-rw-r--r--sys/i4b/layer1/ifpi/i4b_ifpi_pci.c1
-rw-r--r--sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c1
-rw-r--r--sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c1
-rw-r--r--sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c1
-rw-r--r--sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c1
-rw-r--r--sys/i4b/layer1/ihfc/i4b_ihfc_drv.c1
-rw-r--r--sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c1
-rw-r--r--sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_asuscom_ipac.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_avm_a1.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_bchan.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_ctx_s0P.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_drn_ngo.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_dynalink.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_elsa_pcc16.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_elsa_qs1i.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_elsa_qs1p.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_hscx.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_isac.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_isic.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_isic_isa.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_isic_pnp.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_itk_ix1.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_l1.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_l1fsm.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_siemens_isurf.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_sws.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_tel_s016.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_tel_s0163.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_tel_s08.c1
-rw-r--r--sys/i4b/layer1/isic/i4b_usr_sti.c1
-rw-r--r--sys/i4b/layer1/iwic/i4b_iwic_bchan.c1
-rw-r--r--sys/i4b/layer1/iwic/i4b_iwic_dchan.c1
-rw-r--r--sys/i4b/layer1/iwic/i4b_iwic_fsm.c1
-rw-r--r--sys/i4b/layer1/iwic/i4b_iwic_l1if.c1
-rw-r--r--sys/i4b/layer1/iwic/i4b_iwic_pci.c1
-rw-r--r--sys/isa/pnp.c1
-rw-r--r--sys/isa/psm.c1
-rw-r--r--sys/kern/kern_shutdown.c1
-rw-r--r--sys/net/if.c1
-rw-r--r--sys/net/if_iso88025subr.c1
-rw-r--r--sys/netatm/atm_aal5.c1
-rw-r--r--sys/netatm/atm_cm.c1
-rw-r--r--sys/netatm/atm_device.c1
-rw-r--r--sys/netatm/atm_if.c1
-rw-r--r--sys/netatm/atm_proto.c1
-rw-r--r--sys/netatm/atm_signal.c1
-rw-r--r--sys/netatm/atm_socket.c1
-rw-r--r--sys/netatm/atm_subr.c1
-rw-r--r--sys/netatm/atm_usrreq.c1
-rw-r--r--sys/netatm/ipatm/ipatm_event.c1
-rw-r--r--sys/netatm/ipatm/ipatm_if.c1
-rw-r--r--sys/netatm/ipatm/ipatm_input.c1
-rw-r--r--sys/netatm/ipatm/ipatm_load.c1
-rw-r--r--sys/netatm/ipatm/ipatm_output.c1
-rw-r--r--sys/netatm/ipatm/ipatm_usrreq.c1
-rw-r--r--sys/netatm/ipatm/ipatm_vcm.c1
-rw-r--r--sys/netatm/sigpvc/sigpvc_if.c1
-rw-r--r--sys/netatm/sigpvc/sigpvc_subr.c1
-rw-r--r--sys/netatm/spans/spans_arp.c1
-rw-r--r--sys/netatm/spans/spans_cls.c1
-rw-r--r--sys/netatm/spans/spans_if.c1
-rw-r--r--sys/netatm/spans/spans_kxdr.c1
-rw-r--r--sys/netatm/spans/spans_msg.c1
-rw-r--r--sys/netatm/spans/spans_print.c1
-rw-r--r--sys/netatm/spans/spans_proto.c1
-rw-r--r--sys/netatm/spans/spans_subr.c1
-rw-r--r--sys/netatm/spans/spans_util.c1
-rw-r--r--sys/netatm/uni/q2110_sigaa.c1
-rw-r--r--sys/netatm/uni/q2110_sigcpcs.c1
-rw-r--r--sys/netatm/uni/q2110_subr.c1
-rw-r--r--sys/netatm/uni/qsaal1_sigaa.c1
-rw-r--r--sys/netatm/uni/qsaal1_sigcpcs.c1
-rw-r--r--sys/netatm/uni/qsaal1_subr.c1
-rw-r--r--sys/netatm/uni/sscf_uni.c1
-rw-r--r--sys/netatm/uni/sscf_uni_lower.c1
-rw-r--r--sys/netatm/uni/sscf_uni_upper.c1
-rw-r--r--sys/netatm/uni/sscop.c1
-rw-r--r--sys/netatm/uni/sscop_lower.c1
-rw-r--r--sys/netatm/uni/sscop_pdu.c1
-rw-r--r--sys/netatm/uni/sscop_sigaa.c1
-rw-r--r--sys/netatm/uni/sscop_sigcpcs.c1
-rw-r--r--sys/netatm/uni/sscop_subr.c1
-rw-r--r--sys/netatm/uni/sscop_timer.c1
-rw-r--r--sys/netatm/uni/sscop_upper.c1
-rw-r--r--sys/netatm/uni/uni_load.c1
-rw-r--r--sys/netatm/uni/uniarp.c1
-rw-r--r--sys/netatm/uni/uniarp_cache.c1
-rw-r--r--sys/netatm/uni/uniarp_input.c1
-rw-r--r--sys/netatm/uni/uniarp_output.c1
-rw-r--r--sys/netatm/uni/uniarp_timer.c1
-rw-r--r--sys/netatm/uni/uniarp_vcm.c1
-rw-r--r--sys/netatm/uni/uniip.c1
-rw-r--r--sys/netatm/uni/unisig_decode.c1
-rw-r--r--sys/netatm/uni/unisig_encode.c1
-rw-r--r--sys/netatm/uni/unisig_if.c1
-rw-r--r--sys/netatm/uni/unisig_mbuf.c1
-rw-r--r--sys/netatm/uni/unisig_msg.c1
-rw-r--r--sys/netatm/uni/unisig_print.c1
-rw-r--r--sys/netatm/uni/unisig_proto.c1
-rw-r--r--sys/netatm/uni/unisig_sigmgr_state.c1
-rw-r--r--sys/netatm/uni/unisig_subr.c1
-rw-r--r--sys/netatm/uni/unisig_util.c1
-rw-r--r--sys/netatm/uni/unisig_vc_state.c1
-rw-r--r--sys/netgraph/ng_frame_relay.c1
-rw-r--r--sys/pc98/cbus/gdc.c1
-rw-r--r--sys/pc98/cbus/olpt.c1
-rw-r--r--sys/pc98/cbus/pckbd.c1
-rw-r--r--sys/pc98/cbus/ppc.c1
-rw-r--r--sys/pc98/cbus/sio.c1
-rw-r--r--sys/pc98/pc98/atapi.c1
-rw-r--r--sys/pc98/pc98/mse.c1
-rw-r--r--sys/pc98/pc98/olpt.c1
-rw-r--r--sys/pc98/pc98/pc98gdc.c1
-rw-r--r--sys/pc98/pc98/pc98kbd.c1
-rw-r--r--sys/pc98/pc98/ppc.c1
-rw-r--r--sys/pc98/pc98/sio.c1
-rw-r--r--sys/pc98/pc98/wd.c1
-rw-r--r--sys/pccard/pcic.c1
-rw-r--r--sys/pci/agp_amd.c1
-rw-r--r--sys/pci/alpm.c1
-rw-r--r--sys/pci/amd.c1
-rw-r--r--sys/pci/if_dc.c1
-rw-r--r--sys/pci/if_de.c1
-rw-r--r--sys/pci/if_en_pci.c1
-rw-r--r--sys/pci/if_fxp.c1
-rw-r--r--sys/pci/if_mn.c1
-rw-r--r--sys/pci/if_pcn.c1
-rw-r--r--sys/pci/if_rl.c1
-rw-r--r--sys/pci/if_sf.c1
-rw-r--r--sys/pci/if_sis.c1
-rw-r--r--sys/pci/if_sk.c1
-rw-r--r--sys/pci/if_ste.c1
-rw-r--r--sys/pci/if_ti.c1
-rw-r--r--sys/pci/if_tl.c1
-rw-r--r--sys/pci/if_tx.c1
-rw-r--r--sys/pci/if_vr.c1
-rw-r--r--sys/pci/if_wb.c1
-rw-r--r--sys/pci/if_xl.c1
-rw-r--r--sys/pci/intpm.c1
-rw-r--r--sys/pci/isp_pci.c1
-rw-r--r--sys/pci/ncr.c1
301 files changed, 2 insertions, 303 deletions
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 831ab3b..60c15a6 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 33d02aa..b498d61 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 28b38b4..6d7c4d1 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 bb16a11..5130bbb 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 38da767..dd4f112 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 ffad468..b89678b 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 b2028ec..3b6581d 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 63d4a1f..473f273 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 066a21c..6391efc 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 dd0f4ccd..7d3ec52 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 a3427fc..95777a6 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 9abf933..bbe4837 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 198b926..0a498f7 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 afb7188..be063d0 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 d9474bc..0388b3e 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 4ea9a08..2123766 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 808afa7..8bd550b 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 cdf87f1..d870df8 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 65fc445..c2038fe 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 e4e2534..68a22a2 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 c9f3bbe..f43aef1 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 c9f3bbe..f43aef1 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 d64d006..30dcfca 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 2e1f2be..150a47d 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 f53eca0..dba5fbe 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 386a90e..04c42c0 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 9b62dd8..de5d17f 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 ee643d0..7db3d8d 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 e4f531d..fe1866e 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 5e4ab1f..ef105ba 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 607eceb..308cfcb 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 bc2e4d7..76ff3ef 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 82190d5..be55de57 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 4ff8950..092c8ad 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 8702f57..b374e80 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 e6e0da74..9a29ec4 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 e21ccf3..12eb60d 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 61ea98a..cebfb2b 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 0f16547..c036584 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 bd94ef3..5eed000 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 b581655..dfed343 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 5e0ea56..8b49cfa 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 5e0ea56..8b49cfa 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 2e0e77e..285c2d3 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 893da20..6a437a4 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 12737de..e87e0be 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 7037f6d..4b86793 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 5b778ad..3fa1aaf 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 a31ff9c..b74b804 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 fb07604..7b5fd94 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 0c67a94..72fb2ef 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 e97dd3b..8f3a5de 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 3a2f37a..382c7b6 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 f397065..cb3d7c4 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 7578a03..3397de2 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 b8bc31d..63be85c 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 c7496fb..ae7dd26 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 6ddd679..7f86b94 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 8e1152f..3f2e0ea1 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 a703622..993e4ea 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 adb3d96..5b7f6ff 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 7af3d1a..3e789b4 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 a11cc28..85119f2 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 480bb5f..56bef05 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 5d4853c..728a62e 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 9a5def5..3b4afed 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 6c2b627..ad5a18f 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 1253595..cd5d159 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 377d3a0..d452097 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 2403326..4b64128 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 1e7dd44..b18e0dc 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 7fa4a28..0c509b5 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 061e704..8b8d2a4 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 6172085..8863adc 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 636c634..d59fca5 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 0a6831b..e8e5f96 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 63f0249..56bc390 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 45a32d4d..4d4a671 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 02bec7f..680c8b6 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 fe087c2..714581c 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 9b62dd8..de5d17f 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 ee643d0..7db3d8d 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 0a4407e..57302ff 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 23446f7..837b4ce 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 06a61d5..a0118d5 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 2e0e77e..285c2d3 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 ff47190..7e1c8b5 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 13ce5ff..d83afd3 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 67cf59d..9a661b3 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 12737de..e87e0be 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 f4e3ba8..59aae3d 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 a17651b..df00420 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 bf6aa3e..8e46061 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 5584749..3f19514 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 02c68af..6434534 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 2429b3f..b30b2c6 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 2c7940f..2410afe 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 7a9b503..dd8a0c9 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 9132b47..5fd99df 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 04e161d..e6c0f6b 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 c82e5dc..91a516d 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 47ee046..0915828 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 060cb43..d74216c 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 56f0b11..9c7eca6 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 1d6d4a2..fafc3f1 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 0feb9bb..6610977 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 5b18bec..22c82c2 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 a0214bd..fd3a54d 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 eac7980..f2ca1e8 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 603dcf6..0fef75e 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 b1f0bfd..0b76c4e 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 67341ae..3b40de1 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 f1d2840..ad3a3b8 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 157be8f1..c48d4bc 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 61a3000..08933d4 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 65b9de9..0076f96 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 10a1f0a..bd98a8f 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 7d51311..8cfc179 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 534b890..fa6fcc2 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 1afd6ed..3f88504 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 3a75714..067e6f9 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 cc49ad1..bb8fba1 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 7cbe32d..8c5a8df 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 fc3241a..e88962b 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 3de4364..a55b01a 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 780c42b..0b5f9fb 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 9d584d9..dee9216 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 d9aeabf..c243035 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 5debe8f..1cfa940 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 01bce13..927135e 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 8b467f3..241c0fa 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 f4ac846..1266ec3 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 7430a8c..38677fd 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 da8dcb0..03d3e64 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 973d2bb..63b456c 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 fe4558b..66e8422 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 b030195..0aaed44 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 5b778ad..3fa1aaf 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 a31ff9c..b74b804 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 ca0e9ad..3dac976 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 831ab3b..60c15a6 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 7c97b32..fd79260 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 5e0ea56..8b49cfa 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 c9f3bbe..f43aef1 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 c0a54a2..29ca01d 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 4ed96bb..838a5f0 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 f959a52..3962043 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 973d2bb..63b456c 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 fe4558b..66e8422 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 eb00e3d..d8e9d68 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 135a085..ab6f4b8 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 23446f7..837b4ce 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 2429b3f..b30b2c6 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 5b18bec..22c82c2 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 a0214bd..fd3a54d 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 35fd31c..2f177cb 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 95f61e8..e89a4ae 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 249632e..5ec686b 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 e2d04ea..514157e 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 b1502c7..15884a0 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 b1d3c0e..fac02b1 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 7df6a23..8ae893a 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 ffa0d6d..2e1e477 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 90c9bd1..88c124f 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 215a639..c0f436a 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 f5ee661..69343fa 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 56828e2..b324f41 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 726081d..4c09c65 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 0f5b63a..d102783 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 d63909c..d1b9205 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 0dd42ec..0d43a33 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 24b68d9..85ff646 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 a9efd08..8228152 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 0ce2143..4903de9 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 b4e642a..fcae2bf 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 6f57b01..05b11ed 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 40ef206..125454e 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 6409653..ad6bb91 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 cc8719d..cd75612 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 f11e61f..71101da 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 7ab4ba7..a26ec91 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 101c983..9d043c1 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 6a25764..86e111b 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 7563b4b..a125bd5 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 3d73f8e..21a9757 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 d31b27c..95d944f 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 47630ea..4a658ce 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 28b96b2..0b1f4d0 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 85a6eb2..bed99c2 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 684240c..1885f45 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 7918844..8a18c99 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 5db03bf..e582d6f 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 7c0dd6f..5bbf751 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 e38365d..f5004f8 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 4975b0c..d675891 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 473e4d7..6a58ddf 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 e4f531d..fe1866e 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 15f2d5e..ed2ce21 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 cb18319..1e5a4ef 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 cd2c2d9..4141ffd 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 2a48c19..5ceb351 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 46c1006..22bea2a 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 b65c36f..33efb93 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 c8078f4..9131b80 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 9789f62..a1ded20 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 9ba114f..e4bde99 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 56097064..d3bef8b 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 8dc9d54..33f0ad9 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 37aae9e..b2e6f5c 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 2058ca1..33ba4a9 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 b924cf5..97fe415 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 fa06a7d..d04c60a 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 736f7d6..c854075 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 3e6d1d2..55d6864 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 e563e4d..4b08300 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 bdb956c..91ac2dd 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 0ed9118..7a02750 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 787ad3e..28d55de 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 bf8a9a9..af2e050 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 2d4d3a1..e19d5d2 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 70b0ed0..7766eb8 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 5ed0bc1..8425fb5 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 9e0171d..686eb53 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 b0ce63d..857a3ed 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 bd735d4..16b89cc 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 53930ea..ad83912 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 310cd3f..2367e30 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 f53be10..61ba1b9 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 75eca40..3e18c16 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 b570453..f870cb0 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 6c57232..5f2a900 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 30fe1eb..da0abde 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 1f65368..c10823c 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 d6553d4..f5f93f7 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 1521058..d4175ed 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 22822db..8f1d49c 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 2eefe44..d578c7eb 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 7e7b17f..4ce2057 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 56a1e2e..7b97343 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 4e46b43..9c366f7 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 0a345d3..c0d0d59 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 9adccca..9cbb063 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 e5fb97e..1c0c03e 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 4c5ed4d..6920c94 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 00b5960..6fad4ea 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 bdbe71f..7e5c556 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 40f64a0..8400eeb 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 bfcbf1d..5932aff 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 1b097eb..2a5395e 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 575d32a..c91f11d 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 3ae7f06..563d704 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 3519cc1..e831573 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 e3bae48..1d0bb5b 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 a201c26..fb36be5 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 da49a54..9da98c6 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 9608861..102caaf 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 9ea8216..beb6cf7 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 8744a6b..c9ea122 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 063899b..1508113 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 e10f285..49d93b9 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 952e417..a57bee1 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 09d35aa..f25ddd3 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 0ba75e2..8097564 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 6004a7e..8111b3c 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 3dad2bc..284e2b0 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 99fa95b..cd64512 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 d46edbf..4bd235c 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 0afbad0..e20e5b5 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 947d1d1..8905654 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 68418e4..84f3ee2 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 c89b58c..3b8ee54 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 99fa95b..cd64512 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 3dad2bc..284e2b0 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 d46edbf..4bd235c 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 0afbad0..e20e5b5 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 947d1d1..8905654 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 cf8842c..513e3eb 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 ab75c84..007493d 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 198b926..0a498f7 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 fb87c74..315bdec 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 808afa7..8bd550b 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 893da20..6a437a4 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 7037f6d..4b86793 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 3a2f37a..382c7b6 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 9a5def5..3b4afed 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 7e273db..703c6e5 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 c9952f3..05e0ab7 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 fd9a75f..0feb7f8 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 eac7980..f2ca1e8 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 4602e58..5de1eb4 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 b1f0bfd..0b76c4e 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 77895f8..4120762 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 1afd6ed..3f88504 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 06504c3..b873597 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 7cbe32d..8c5a8df 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 7430a8c..38677fd 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 8fe210c..1dcb547 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 94ba480..2787599 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 e085933..ae0e2b4 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 fe087c2..714581c 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 40a865b..77d6940 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>
OpenPOWER on IntegriCloud