Index: sys/cam/ata/ata_da.c
===================================================================
--- sys/cam/ata/ata_da.c
+++ sys/cam/ata/ata_da.c
@@ -825,7 +825,7 @@
 			       union ccb *done_ccb);
 static  int		adaerror(union ccb *ccb, u_int32_t cam_flags,
 				u_int32_t sense_flags);
-static timeout_t	adasendorderedtag;
+static void		adasendorderedtag(void *arg);
 static void		adashutdown(void *arg, int howto);
 static void		adasuspend(void *arg);
 static void		adaresume(void *arg);
Index: sys/cam/cam_xpt.c
===================================================================
--- sys/cam/cam_xpt.c
+++ sys/cam/cam_xpt.c
@@ -255,7 +255,7 @@
 static void	 xpt_run_allocq(struct cam_periph *periph, int sleep);
 static void	 xpt_run_allocq_task(void *context, int pending);
 static void	 xpt_run_devq(struct cam_devq *devq);
-static timeout_t xpt_release_devq_timeout;
+static void	 xpt_release_devq_timeout(void *arg);
 static void	 xpt_release_simq_timeout(void *arg) __unused;
 static void	 xpt_acquire_bus(struct cam_eb *bus);
 static void	 xpt_release_bus(struct cam_eb *bus);
Index: sys/cam/scsi/scsi_cd.c
===================================================================
--- sys/cam/scsi/scsi_cd.c
+++ sys/cam/scsi/scsi_cd.c
@@ -302,7 +302,7 @@
 				  struct dvd_authinfo *authinfo);
 static	int		cdreaddvdstructure(struct cam_periph *periph,
 					   struct dvd_struct *dvdstruct);
-static timeout_t	cdmediapoll;
+static  void		cdmediapoll(void *arg);
 
 static struct periph_driver cddriver =
 {
Index: sys/cam/scsi/scsi_da.c
===================================================================
--- sys/cam/scsi/scsi_da.c
+++ sys/cam/scsi/scsi_da.c
@@ -1492,9 +1492,9 @@
 				  uint64_t maxsector,
 				  struct scsi_read_capacity_data_long *rcaplong,
 				  size_t rcap_size);
-static timeout_t	dasendorderedtag;
+static void		dasendorderedtag(void *arg);
 static void		dashutdown(void *arg, int howto);
-static timeout_t	damediapoll;
+static void		damediapoll(void *arg);
 
 #ifndef	DA_DEFAULT_POLL_PERIOD
 #define	DA_DEFAULT_POLL_PERIOD	3
Index: sys/dev/ahci/ahci.c
===================================================================
--- sys/dev/ahci/ahci.c
+++ sys/dev/ahci/ahci.c
@@ -67,7 +67,7 @@
 static void ahci_begin_transaction(struct ahci_channel *ch, union ccb *ccb);
 static void ahci_dmasetprd(void *arg, bus_dma_segment_t *segs, int nsegs, int error);
 static void ahci_execute_transaction(struct ahci_slot *slot);
-static void ahci_timeout(struct ahci_slot *slot);
+static void ahci_timeout(void *arg);
 static void ahci_end_transaction(struct ahci_slot *slot, enum ahci_err_type et);
 static int ahci_setup_fis(struct ahci_channel *ch, struct ahci_cmd_tab *ctp, union ccb *ccb, int tag);
 static void ahci_dmainit(device_t dev);
@@ -1793,7 +1793,7 @@
 	}
 	/* Start command execution timeout */
 	callout_reset_sbt(&slot->timeout, SBT_1MS * ccb->ccb_h.timeout / 2,
-	    0, (timeout_t*)ahci_timeout, slot, 0);
+	    0, ahci_timeout, slot, 0);
 	return;
 }
 
@@ -1830,14 +1830,15 @@
 			continue;
 		callout_reset_sbt(&slot->timeout,
     	    	    SBT_1MS * slot->ccb->ccb_h.timeout / 2, 0,
-		    (timeout_t*)ahci_timeout, slot, 0);
+		    ahci_timeout, slot, 0);
 	}
 }
 
 /* Locked by callout mechanism. */
 static void
-ahci_timeout(struct ahci_slot *slot)
+ahci_timeout(void *arg)
 {
+	struct ahci_slot *slot = arg;
 	struct ahci_channel *ch = slot->ch;
 	device_t dev = ch->dev;
 	uint32_t sstatus;
@@ -1864,7 +1865,7 @@
 
 		callout_reset_sbt(&slot->timeout,
 	    	    SBT_1MS * slot->ccb->ccb_h.timeout / 2, 0,
-		    (timeout_t*)ahci_timeout, slot, 0);
+		    ahci_timeout, slot, 0);
 		return;
 	}
 
Index: sys/dev/aic7xxx/aic_osm_lib.h
===================================================================
--- sys/dev/aic7xxx/aic_osm_lib.h
+++ sys/dev/aic7xxx/aic_osm_lib.h
@@ -112,7 +112,7 @@
 
 /****************************** Error Recovery ********************************/
 void		aic_set_recoveryscb(struct aic_softc *aic, struct scb *scb);
-timeout_t	aic_platform_timeout;
+void		aic_platform_timeout(void *arg);
 int		aic_spawn_recovery_thread(struct aic_softc *aic);
 void		aic_terminate_recovery_thread(struct aic_softc *aic);
 
Index: sys/dev/ata/ata-all.h
===================================================================
--- sys/dev/ata/ata-all.h
+++ sys/dev/ata/ata-all.h
@@ -477,7 +477,7 @@
 void ata_setmode(device_t dev);
 void ata_print_cable(device_t dev, u_int8_t *who);
 int ata_atapi(device_t dev, int target);
-void ata_timeout(struct ata_request *);
+void ata_timeout(void *);
 
 /* ata-lowlevel.c: */
 void ata_generic_hw(device_t dev);
Index: sys/dev/ata/ata-all.c
===================================================================
--- sys/dev/ata/ata-all.c
+++ sys/dev/ata/ata-all.c
@@ -702,10 +702,12 @@
 }
 
 void
-ata_timeout(struct ata_request *request)
+ata_timeout(void *arg)
 {
+	struct ata_request *request;
 	struct ata_channel *ch;
 
+	request = arg;
 	ch = device_get_softc(request->parent);
 	//request->flags |= ATA_R_DEBUG;
 	ATA_DEBUG_RQ(request, "timeout");
Index: sys/dev/ata/ata-lowlevel.c
===================================================================
--- sys/dev/ata/ata-lowlevel.c
+++ sys/dev/ata/ata-lowlevel.c
@@ -237,7 +237,7 @@
 
 begin_continue:
     callout_reset(&request->callout, request->timeout * hz,
-		  (timeout_t*)ata_timeout, request);
+		  ata_timeout, request);
     return ATA_OP_CONTINUES;
 }
 
Index: sys/dev/isp/isp_freebsd.c
===================================================================
--- sys/dev/isp/isp_freebsd.c
+++ sys/dev/isp/isp_freebsd.c
@@ -57,8 +57,8 @@
 static d_ioctl_t ispioctl;
 static void isp_cam_async(void *, uint32_t, struct cam_path *, void *);
 static void isp_poll(struct cam_sim *);
-static timeout_t isp_watchdog;
-static timeout_t isp_gdt;
+static void isp_watchdog(void *);
+static void isp_gdt(void *);
 static task_fn_t isp_gdt_task;
 static void isp_kthread(void *);
 static void isp_action(struct cam_sim *, union ccb *);
@@ -764,8 +764,8 @@
 static void destroy_lun_state(ispsoftc_t *, int, tstate_t *);
 static void isp_enable_lun(ispsoftc_t *, union ccb *);
 static void isp_disable_lun(ispsoftc_t *, union ccb *);
-static timeout_t isp_refire_putback_atio;
-static timeout_t isp_refire_notify_ack;
+static void isp_refire_putback_atio(void *);
+static void isp_refire_notify_ack(void *);
 static void isp_complete_ctio(union ccb *);
 static void isp_target_putback_atio(union ccb *);
 enum Start_Ctio_How { FROM_CAM, FROM_TIMER, FROM_SRR, FROM_CTIO_DONE };
Index: sys/dev/kbdmux/kbdmux.c
===================================================================
--- sys/dev/kbdmux/kbdmux.c
+++ sys/dev/kbdmux/kbdmux.c
@@ -185,7 +185,7 @@
  *****************************************************************************/
 
 static task_fn_t		kbdmux_kbd_intr;
-static timeout_t		kbdmux_kbd_intr_timo;
+static void			kbdmux_kbd_intr_timo(void *arg);
 static kbd_callback_func_t	kbdmux_kbd_event;
 
 static void
Index: sys/dev/mpt/mpt_cam.c
===================================================================
--- sys/dev/mpt/mpt_cam.c
+++ sys/dev/mpt/mpt_cam.c
@@ -113,7 +113,7 @@
 #include <sys/sysctl.h>
 
 static void mpt_poll(struct cam_sim *);
-static timeout_t mpt_timeout;
+static void mpt_timeout(void *);
 static void mpt_action(struct cam_sim *, union ccb *);
 static int
 mpt_get_spi_settings(struct mpt_softc *, struct ccb_trans_settings *);
Index: sys/dev/mpt/mpt_raid.c
===================================================================
--- sys/dev/mpt/mpt_raid.c
+++ sys/dev/mpt/mpt_raid.c
@@ -107,7 +107,7 @@
 static int mpt_spawn_raid_thread(struct mpt_softc *mpt);
 static void mpt_terminate_raid_thread(struct mpt_softc *mpt);
 static void mpt_raid_thread(void *arg);
-static timeout_t mpt_raid_timer;
+static void mpt_raid_timer(void *arg);
 #if 0
 static void mpt_enable_vol(struct mpt_softc *mpt,
 			   struct mpt_raid_volume *mpt_vol, int enable);
@@ -733,7 +733,6 @@
 	/* COWWWW */
 }
 
-static timeout_t mpt_raid_quiesce_timeout;
 cam_status
 mpt_raid_quiesce_disk(struct mpt_softc *mpt, struct mpt_raid_disk *mpt_disk,
 		      request_t *req)
Index: sys/dev/mvs/mvs.c
===================================================================
--- sys/dev/mvs/mvs.c
+++ sys/dev/mvs/mvs.c
@@ -82,7 +82,7 @@
 static void mvs_crbq_intr(device_t dev);
 static void mvs_begin_transaction(device_t dev, union ccb *ccb);
 static void mvs_legacy_execute_transaction(struct mvs_slot *slot);
-static void mvs_timeout(struct mvs_slot *slot);
+static void mvs_timeout(void *arg);
 static void mvs_dmasetprd(void *arg,
 	bus_dma_segment_t *segs, int nsegs, int error);
 static void mvs_requeue_frozen(device_t dev);
@@ -1418,7 +1418,7 @@
 	}
 	/* Start command execution timeout */
 	callout_reset_sbt(&slot->timeout, SBT_1MS * ccb->ccb_h.timeout, 0,
-	    (timeout_t*)mvs_timeout, slot, 0);
+	    mvs_timeout, slot, 0);
 }
 
 /* Must be called with channel locked. */
@@ -1532,7 +1532,7 @@
 	    ch->dma.workrq_bus + MVS_CRQB_OFFSET + (MVS_CRQB_SIZE * ch->out_idx));
 	/* Start command execution timeout */
 	callout_reset_sbt(&slot->timeout, SBT_1MS * ccb->ccb_h.timeout, 0,
-	    (timeout_t*)mvs_timeout, slot, 0);
+	    mvs_timeout, slot, 0);
 	return;
 }
 
@@ -1571,14 +1571,15 @@
 			continue;
 		callout_reset_sbt(&slot->timeout,
 		    SBT_1MS * slot->ccb->ccb_h.timeout / 2, 0,
-		    (timeout_t*)mvs_timeout, slot, 0);
+		    mvs_timeout, slot, 0);
 	}
 }
 
 /* Locked by callout mechanism. */
 static void
-mvs_timeout(struct mvs_slot *slot)
+mvs_timeout(void *arg)
 {
+	struct mvs_slot *slot = arg;
 	device_t dev = slot->dev;
 	struct mvs_channel *ch = device_get_softc(dev);
 
Index: sys/dev/ocs_fc/ocs_os.c
===================================================================
--- sys/dev/ocs_fc/ocs_os.c
+++ sys/dev/ocs_fc/ocs_os.c
@@ -45,7 +45,7 @@
 
 #include <machine/bus.h>
 
-timeout_t	__ocs_callout;
+void	__ocs_callout(void *);
 
 uint32_t
 ocs_config_read32(ocs_os_handle_t os, uint32_t reg)
Index: sys/dev/ppbus/lpt.c
===================================================================
--- sys/dev/ppbus/lpt.c
+++ sys/dev/ppbus/lpt.c
@@ -140,7 +140,7 @@
 
 #define	LPT_NAME	"lpt"		/* our official name */
 
-static timeout_t lptout;
+static void	lptout(void *arg);
 static int	lpt_port_test(device_t dev, u_char data, u_char mask);
 static int	lpt_detect(device_t dev);
 
Index: sys/dev/sbni/if_sbni.c
===================================================================
--- sys/dev/sbni/if_sbni.c
+++ sys/dev/sbni/if_sbni.c
@@ -116,7 +116,7 @@
 static void	set_initial_values(struct sbni_softc *, struct sbni_flags);
 
 static u_int32_t	calc_crc32(u_int32_t, caddr_t, u_int);
-static timeout_t	sbni_timeout;
+static void	sbni_timeout(void *);
 
 static __inline u_char	sbni_inb(struct sbni_softc *, enum sbni_reg);
 static __inline void	sbni_outb(struct sbni_softc *, enum sbni_reg, u_char);
Index: sys/dev/siis/siis.c
===================================================================
--- sys/dev/siis/siis.c
+++ sys/dev/siis/siis.c
@@ -72,7 +72,7 @@
 static void siis_begin_transaction(device_t dev, union ccb *ccb);
 static void siis_dmasetprd(void *arg, bus_dma_segment_t *segs, int nsegs, int error);
 static void siis_execute_transaction(struct siis_slot *slot);
-static void siis_timeout(struct siis_slot *slot);
+static void siis_timeout(void *arg);
 static void siis_end_transaction(struct siis_slot *slot, enum siis_err_type et);
 static int siis_setup_fis(device_t dev, struct siis_cmd *ctp, union ccb *ccb, int tag);
 static void siis_dmainit(device_t dev);
@@ -1123,7 +1123,7 @@
 	ATA_OUTL(ch->r_mem, SIIS_P_CACTH(slot->slot), prb_bus >> 32);
 	/* Start command execution timeout */
 	callout_reset_sbt(&slot->timeout, SBT_1MS * ccb->ccb_h.timeout, 0,
-	    (timeout_t*)siis_timeout, slot, 0);
+	    siis_timeout, slot, 0);
 	return;
 }
 
@@ -1166,14 +1166,15 @@
 			continue;
 		callout_reset_sbt(&slot->timeout,
 		    SBT_1MS * slot->ccb->ccb_h.timeout, 0,
-		    (timeout_t*)siis_timeout, slot, 0);
+		    siis_timeout, slot, 0);
 	}
 }
 
 /* Locked by callout mechanism. */
 static void
-siis_timeout(struct siis_slot *slot)
+siis_timeout(void *arg)
 {
+	struct siis_slot *slot = arg;
 	device_t dev = slot->dev;
 	struct siis_channel *ch = device_get_softc(dev);
 	union ccb *ccb = slot->ccb;
Index: sys/dev/smc/if_smc.c
===================================================================
--- sys/dev/smc/if_smc.c
+++ sys/dev/smc/if_smc.c
@@ -122,7 +122,7 @@
 static void	smc_task_tx(void *, int);
 
 static driver_filter_t	smc_intr;
-static timeout_t	smc_watchdog;
+static void		smc_watchdog(void *);
 #ifdef DEVICE_POLLING
 static poll_handler_t	smc_poll;
 #endif
Index: sys/dev/syscons/syscons.c
===================================================================
--- sys/dev/syscons/syscons.c
+++ sys/dev/syscons/syscons.c
@@ -196,7 +196,7 @@
 static void sccnupdate(scr_stat *scp);
 static scr_stat *alloc_scp(sc_softc_t *sc, int vty);
 static void init_scp(sc_softc_t *sc, int vty, scr_stat *scp);
-static timeout_t scrn_timer;
+static void scrn_timer(void *arg);
 static int and_region(int *s1, int *e1, int s2, int e2);
 static void scrn_update(scr_stat *scp, int show_cursor);
 
@@ -228,7 +228,7 @@
 static int update_kbd_state(scr_stat *scp, int state, int mask);
 static int update_kbd_leds(scr_stat *scp, int which);
 static int sc_kattr(void);
-static timeout_t blink_screen;
+static void blink_screen(void *arg);
 static struct tty *sc_alloc_tty(int, int);
 
 static cn_probe_t	sc_cnprobe;
Index: sys/dev/uart/uart_core.c
===================================================================
--- sys/dev/uart/uart_core.c
+++ sys/dev/uart/uart_core.c
@@ -447,7 +447,7 @@
 
 	if (sc->sc_polled) {
 		callout_reset(&sc->sc_timer, hz / uart_poll_freq,
-		    (timeout_t *)uart_intr, sc);
+		    (void (*)(void *))uart_intr, sc);
 	}
 
 	return ((cnt == 0) ? FILTER_STRAY :
@@ -712,7 +712,7 @@
 		sc->sc_polled = 1;
 		callout_init(&sc->sc_timer, 1);
 		callout_reset(&sc->sc_timer, hz / uart_poll_freq,
-		    (timeout_t *)uart_intr, sc);
+		    (void (*)(void *))uart_intr, sc);
 	}
 
 	if (bootverbose && (sc->sc_fastintr || sc->sc_polled)) {
Index: sys/net/altq/altq_rmclass.c
===================================================================
--- sys/net/altq/altq_rmclass.c
+++ sys/net/altq/altq_rmclass.c
@@ -87,7 +87,7 @@
 static int	rmc_under_limit(struct rm_class *, struct timeval *);
 static void	rmc_tl_satisfied(struct rm_ifdat *, struct timeval *);
 static void	rmc_drop_action(struct rm_class *);
-static void	rmc_restart(struct rm_class *);
+static void	rmc_restart(void *);
 static void	rmc_root_overlimit(struct rm_class *, struct rm_class *);
 
 #define	BORROW_OFFTIME
@@ -1530,8 +1530,7 @@
 			t = hzto(&cl->undertime_);
 		} else
 			t = 2;
-		CALLOUT_RESET(&cl->callout_, t,
-			      (timeout_t *)rmc_restart, (caddr_t)cl);
+		CALLOUT_RESET(&cl->callout_, t, rmc_restart, cl);
 	}
 }
 
@@ -1553,8 +1552,9 @@
  */
 
 static void
-rmc_restart(struct rm_class *cl)
+rmc_restart(void *arg)
 {
+	struct rm_class *cl = arg;
 	struct rm_ifdat	*ifd = cl->ifdat_;
 	int		 s;
 
Index: sys/netgraph/netflow/ng_netflow.h
===================================================================
--- sys/netgraph/netflow/ng_netflow.h
+++ sys/netgraph/netflow/ng_netflow.h
@@ -522,7 +522,7 @@
 int	ng_netflow_fib_init(priv_p priv, int fib);
 void	ng_netflow_copyinfo(priv_p, struct ng_netflow_info *);
 void	ng_netflow_copyv9info(priv_p, struct ng_netflow_v9info *);
-timeout_t ng_netflow_expire;
+void	ng_netflow_expire(void *);
 int 	ng_netflow_flow_add(priv_p, fib_export_p, struct ip *, caddr_t,
 	uint8_t, uint8_t, unsigned int);
 int	ng_netflow_flow6_add(priv_p, fib_export_p, struct ip6_hdr *, caddr_t,
Index: sys/netinet/tcp_timer.c
===================================================================
--- sys/netinet/tcp_timer.c
+++ sys/netinet/tcp_timer.c
@@ -839,7 +839,7 @@
 tcp_timer_activate(struct tcpcb *tp, uint32_t timer_type, u_int delta)
 {
 	struct callout *t_callout;
-	timeout_t *f_callout;
+	void (*f_callout)(void *);
 	struct inpcb *inp = tp->t_inpcb;
 	int cpu = inp_to_cpuid(inp);
 
Index: sys/powerpc/mpc85xx/fsl_sata.c
===================================================================
--- sys/powerpc/mpc85xx/fsl_sata.c
+++ sys/powerpc/mpc85xx/fsl_sata.c
@@ -70,7 +70,7 @@
 static void fsl_sata_begin_transaction(struct fsl_sata_channel *ch, union ccb *ccb);
 static void fsl_sata_dmasetprd(void *arg, bus_dma_segment_t *segs, int nsegs, int error);
 static void fsl_sata_execute_transaction(struct fsl_sata_slot *slot);
-static void fsl_sata_timeout(struct fsl_sata_slot *slot);
+static void fsl_sata_timeout(void *arg);
 static void fsl_sata_end_transaction(struct fsl_sata_slot *slot, enum fsl_sata_err_type et);
 static int fsl_sata_setup_fis(struct fsl_sata_channel *ch, struct fsl_sata_cmd_tab *ctp, union ccb *ccb, int tag);
 static void fsl_sata_dmainit(device_t dev);
@@ -1107,7 +1107,7 @@
 	}
 	/* Start command execution timeout */
 	callout_reset_sbt(&slot->timeout, SBT_1MS * ccb->ccb_h.timeout / 2,
-	    0, (timeout_t*)fsl_sata_timeout, slot, 0);
+	    0, fsl_sata_timeout, slot, 0);
 	return;
 }
 
@@ -1144,14 +1144,15 @@
 			continue;
 		callout_reset_sbt(&slot->timeout,
  	    	    SBT_1MS * slot->ccb->ccb_h.timeout / 2, 0,
-		    (timeout_t*)fsl_sata_timeout, slot, 0);
+		    fsl_sata_timeout, slot, 0);
 	}
 }
 
 /* Locked by callout mechanism. */
 static void
-fsl_sata_timeout(struct fsl_sata_slot *slot)
+fsl_sata_timeout(void *arg)
 {
+	struct fsl_sata_slot *slot = arg;
 	struct fsl_sata_channel *ch = slot->ch;
 	device_t dev = ch->dev;
 	uint32_t sstatus;
@@ -1169,7 +1170,7 @@
 
 		callout_reset_sbt(&slot->timeout,
 	    	    SBT_1MS * slot->ccb->ccb_h.timeout / 2, 0,
-		    (timeout_t*)fsl_sata_timeout, slot, 0);
+		    fsl_sata_timeout, slot, 0);
 		return;
 	}