summaryrefslogtreecommitdiffstats
path: root/src/mame
diff options
context:
space:
mode:
authorGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2017-10-01 22:45:43 -0400
committerGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2017-10-01 22:46:42 -0400
commitda7cd69f881d30af8a9cac40746ee2bbfc74a75b (patch) (github)
tree997817c32a8abf6bebd4e2b8358f382ac5eb40da /src/mame
parenta65015f5cb7b838b6ae29fadc3d5de186430d1ef (diff)
downloadmame-da7cd69f881d30af8a9cac40746ee2bbfc74a75b.tar.bz2
mame-da7cd69f881d30af8a9cac40746ee2bbfc74a75b.zip
Remove timer_device from emu.h and move it out of src/emu (nw)
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/audio/cage.h1
-rw-r--r--src/mame/audio/dcs.h1
-rw-r--r--src/mame/audio/rax.h1
-rw-r--r--src/mame/audio/segasnd.h1
-rw-r--r--src/mame/drivers/a6809.cpp1
-rw-r--r--src/mame/drivers/a7800.cpp1
-rw-r--r--src/mame/drivers/acommand.cpp1
-rw-r--r--src/mame/drivers/acrnsys1.cpp1
-rw-r--r--src/mame/drivers/airraid.cpp1
-rw-r--r--src/mame/drivers/allied.cpp1
-rw-r--r--src/mame/drivers/alphatro.cpp1
-rw-r--r--src/mame/drivers/ampro.cpp1
-rw-r--r--src/mame/drivers/apple2.cpp1
-rw-r--r--src/mame/drivers/apple2e.cpp1
-rw-r--r--src/mame/drivers/applix.cpp1
-rw-r--r--src/mame/drivers/aristmk4.cpp1
-rw-r--r--src/mame/drivers/astrcorp.cpp1
-rw-r--r--src/mame/drivers/atari400.cpp1
-rw-r--r--src/mame/drivers/atari_s1.cpp1
-rw-r--r--src/mame/drivers/atari_s2.cpp1
-rw-r--r--src/mame/drivers/babbage.cpp1
-rw-r--r--src/mame/drivers/bartop52.cpp1
-rw-r--r--src/mame/drivers/beezer.cpp1
-rw-r--r--src/mame/drivers/binbug.cpp1
-rw-r--r--src/mame/drivers/blitz68k.cpp1
-rw-r--r--src/mame/drivers/bmcpokr.cpp1
-rw-r--r--src/mame/drivers/bml3.cpp1
-rw-r--r--src/mame/drivers/by17.cpp1
-rw-r--r--src/mame/drivers/by35.cpp1
-rw-r--r--src/mame/drivers/by6803.cpp1
-rw-r--r--src/mame/drivers/byvid.cpp1
-rw-r--r--src/mame/drivers/chesstrv.cpp1
-rw-r--r--src/mame/drivers/chexx.cpp1
-rw-r--r--src/mame/drivers/chinagat.cpp1
-rw-r--r--src/mame/drivers/compis.cpp1
-rw-r--r--src/mame/drivers/coolridr.cpp1
-rw-r--r--src/mame/drivers/csplayh5.cpp1
-rw-r--r--src/mame/drivers/cxgz80.cpp1
-rw-r--r--src/mame/drivers/d6800.cpp1
-rw-r--r--src/mame/drivers/dblcrown.cpp1
-rw-r--r--src/mame/drivers/ddealer.cpp1
-rw-r--r--src/mame/drivers/ddenlovr.cpp1
-rw-r--r--src/mame/drivers/dfruit.cpp1
-rw-r--r--src/mame/drivers/didact.cpp1
-rw-r--r--src/mame/drivers/dolphunk.cpp1
-rw-r--r--src/mame/drivers/dooyong.cpp1
-rw-r--r--src/mame/drivers/dotrikun.cpp1
-rw-r--r--src/mame/drivers/dvk_kcgd.cpp1
-rw-r--r--src/mame/drivers/dvk_ksm.cpp1
-rw-r--r--src/mame/drivers/eacc.cpp1
-rw-r--r--src/mame/drivers/ecoinfr.cpp1
-rw-r--r--src/mame/drivers/exelv.cpp1
-rw-r--r--src/mame/drivers/expro02.cpp1
-rw-r--r--src/mame/drivers/fastinvaders.cpp1
-rw-r--r--src/mame/drivers/fc100.cpp1
-rw-r--r--src/mame/drivers/fidel6502.cpp1
-rw-r--r--src/mame/drivers/fidel68k.cpp1
-rw-r--r--src/mame/drivers/fidelz80.cpp1
-rw-r--r--src/mame/drivers/fireball.cpp1
-rw-r--r--src/mame/drivers/firebeat.cpp1
-rw-r--r--src/mame/drivers/firefox.cpp1
-rw-r--r--src/mame/drivers/fk1.cpp1
-rw-r--r--src/mame/drivers/fp1100.cpp1
-rw-r--r--src/mame/drivers/fresh.cpp1
-rw-r--r--src/mame/drivers/galgames.cpp1
-rw-r--r--src/mame/drivers/galpani3.cpp1
-rw-r--r--src/mame/drivers/gimix.cpp1
-rw-r--r--src/mame/drivers/glasgow.cpp1
-rw-r--r--src/mame/drivers/goupil.cpp1
-rw-r--r--src/mame/drivers/gp_1.cpp1
-rw-r--r--src/mame/drivers/gp_2.cpp1
-rw-r--r--src/mame/drivers/gunpey.cpp1
-rw-r--r--src/mame/drivers/h8.cpp1
-rw-r--r--src/mame/drivers/h89.cpp1
-rw-r--r--src/mame/drivers/halleys.cpp1
-rw-r--r--src/mame/drivers/hankin.cpp1
-rw-r--r--src/mame/drivers/harddriv.cpp1
-rw-r--r--src/mame/drivers/hh_amis2k.cpp1
-rw-r--r--src/mame/drivers/hh_cop400.cpp1
-rw-r--r--src/mame/drivers/hh_hmcs40.cpp1
-rw-r--r--src/mame/drivers/hh_melps4.cpp1
-rw-r--r--src/mame/drivers/hh_pic16.cpp1
-rw-r--r--src/mame/drivers/hh_tms1k.cpp1
-rw-r--r--src/mame/drivers/hp64k.cpp1
-rw-r--r--src/mame/drivers/hp80.cpp1
-rw-r--r--src/mame/drivers/hp9845.cpp1
-rw-r--r--src/mame/drivers/hvyunit.cpp1
-rw-r--r--src/mame/drivers/icecold.cpp1
-rw-r--r--src/mame/drivers/igs011.cpp1
-rw-r--r--src/mame/drivers/igs017.cpp1
-rw-r--r--src/mame/drivers/igspoker.cpp1
-rw-r--r--src/mame/drivers/imolagp.cpp1
-rw-r--r--src/mame/drivers/iq151.cpp1
-rw-r--r--src/mame/drivers/jackie.cpp1
-rw-r--r--src/mame/drivers/jalmah.cpp1
-rw-r--r--src/mame/drivers/jchan.cpp1
-rw-r--r--src/mame/drivers/jclub2.cpp1
-rw-r--r--src/mame/drivers/jeutel.cpp1
-rw-r--r--src/mame/drivers/jr100.cpp1
-rw-r--r--src/mame/drivers/junior.cpp1
-rw-r--r--src/mame/drivers/jupace.cpp1
-rw-r--r--src/mame/drivers/k28.cpp1
-rw-r--r--src/mame/drivers/kas89.cpp1
-rw-r--r--src/mame/drivers/kdt6.cpp1
-rw-r--r--src/mame/drivers/koftball.cpp1
-rw-r--r--src/mame/drivers/laserbas.cpp1
-rw-r--r--src/mame/drivers/lastbank.cpp1
-rw-r--r--src/mame/drivers/littlerb.cpp1
-rw-r--r--src/mame/drivers/ltd.cpp1
-rw-r--r--src/mame/drivers/mac128.cpp1
-rw-r--r--src/mame/drivers/maxaflex.cpp1
-rw-r--r--src/mame/drivers/mc10.cpp1
-rw-r--r--src/mame/drivers/mc1000.cpp1
-rw-r--r--src/mame/drivers/mediagx.cpp1
-rw-r--r--src/mame/drivers/meijinsn.cpp1
-rw-r--r--src/mame/drivers/mekd2.cpp1
-rw-r--r--src/mame/drivers/mephisto.cpp1
-rw-r--r--src/mame/drivers/mephisto_montec.cpp1
-rw-r--r--src/mame/drivers/meritm.cpp1
-rw-r--r--src/mame/drivers/metlfrzr.cpp1
-rw-r--r--src/mame/drivers/meyc8088.cpp1
-rw-r--r--src/mame/drivers/mgavegas.cpp1
-rw-r--r--src/mame/drivers/micro20.cpp1
-rw-r--r--src/mame/drivers/micropin.cpp1
-rw-r--r--src/mame/drivers/minitel_2_rpic.cpp1
-rw-r--r--src/mame/drivers/mk1.cpp1
-rw-r--r--src/mame/drivers/mk2.cpp1
-rw-r--r--src/mame/drivers/monzagp.cpp1
-rw-r--r--src/mame/drivers/mpu3.cpp1
-rw-r--r--src/mame/drivers/mrgame.cpp1
-rw-r--r--src/mame/drivers/mstation.cpp1
-rw-r--r--src/mame/drivers/multi8.cpp1
-rw-r--r--src/mame/drivers/mycom.cpp1
-rw-r--r--src/mame/drivers/nakajies.cpp1
-rw-r--r--src/mame/drivers/namcos11.cpp1
-rw-r--r--src/mame/drivers/nanos.cpp1
-rw-r--r--src/mame/drivers/novag6502.cpp1
-rw-r--r--src/mame/drivers/olibochu.cpp1
-rw-r--r--src/mame/drivers/oric.cpp1
-rw-r--r--src/mame/drivers/panicr.cpp1
-rw-r--r--src/mame/drivers/pasogo.cpp1
-rw-r--r--src/mame/drivers/patapata.cpp1
-rw-r--r--src/mame/drivers/pc100.cpp1
-rw-r--r--src/mame/drivers/pc6001.cpp1
-rw-r--r--src/mame/drivers/pc8801.cpp1
-rw-r--r--src/mame/drivers/pcd.cpp1
-rw-r--r--src/mame/drivers/pce220.cpp1
-rw-r--r--src/mame/drivers/pegasus.cpp1
-rw-r--r--src/mame/drivers/pet.cpp1
-rw-r--r--src/mame/drivers/photon2.cpp1
-rw-r--r--src/mame/drivers/piratesh.cpp1
-rw-r--r--src/mame/drivers/pkscram.cpp1
-rw-r--r--src/mame/drivers/pofo.cpp1
-rw-r--r--src/mame/drivers/polgar.cpp1
-rw-r--r--src/mame/drivers/popobear.cpp1
-rw-r--r--src/mame/drivers/prestige.cpp1
-rw-r--r--src/mame/drivers/pro80.cpp1
-rw-r--r--src/mame/drivers/proteus3.cpp1
-rw-r--r--src/mame/drivers/px4.cpp2
-rw-r--r--src/mame/drivers/quizshow.cpp1
-rw-r--r--src/mame/drivers/rainbow.cpp1
-rw-r--r--src/mame/drivers/rastersp.cpp1
-rw-r--r--src/mame/drivers/rd110.cpp1
-rw-r--r--src/mame/drivers/rex6000.cpp1
-rw-r--r--src/mame/drivers/rmt32.cpp1
-rw-r--r--src/mame/drivers/rotaryf.cpp1
-rw-r--r--src/mame/drivers/rowamet.cpp1
-rw-r--r--src/mame/drivers/rzone.cpp1
-rw-r--r--src/mame/drivers/s3.cpp1
-rw-r--r--src/mame/drivers/s4.cpp1
-rw-r--r--src/mame/drivers/sbowling.cpp1
-rw-r--r--src/mame/drivers/scorpion.cpp1
-rw-r--r--src/mame/drivers/scregg.cpp1
-rw-r--r--src/mame/drivers/segaufo.cpp1
-rw-r--r--src/mame/drivers/sigmab98.cpp1
-rw-r--r--src/mame/drivers/sliver.cpp1
-rw-r--r--src/mame/drivers/smc777.cpp1
-rw-r--r--src/mame/drivers/spc1500.cpp1
-rw-r--r--src/mame/drivers/spectra.cpp1
-rw-r--r--src/mame/drivers/spirit76.cpp1
-rw-r--r--src/mame/drivers/sprcros2.cpp1
-rw-r--r--src/mame/drivers/spyhuntertec.cpp1
-rw-r--r--src/mame/drivers/squale.cpp1
-rw-r--r--src/mame/drivers/st_mp100.cpp1
-rw-r--r--src/mame/drivers/st_mp200.cpp1
-rw-r--r--src/mame/drivers/stratos.cpp1
-rw-r--r--src/mame/drivers/sun3.cpp1
-rw-r--r--src/mame/drivers/sun3x.cpp1
-rw-r--r--src/mame/drivers/taito.cpp1
-rw-r--r--src/mame/drivers/tasman.cpp1
-rw-r--r--src/mame/drivers/tb303.cpp1
-rw-r--r--src/mame/drivers/thedealr.cpp1
-rw-r--r--src/mame/drivers/tispeak.cpp1
-rw-r--r--src/mame/drivers/tk2000.cpp1
-rw-r--r--src/mame/drivers/tm990189.cpp1
-rw-r--r--src/mame/drivers/tmaster.cpp1
-rw-r--r--src/mame/drivers/tmmjprd.cpp1
-rw-r--r--src/mame/drivers/toypop.cpp1
-rw-r--r--src/mame/drivers/tr606.cpp1
-rw-r--r--src/mame/drivers/ts803.cpp1
-rw-r--r--src/mame/drivers/vboy.cpp1
-rw-r--r--src/mame/drivers/vd.cpp1
-rw-r--r--src/mame/drivers/vg5k.cpp1
-rw-r--r--src/mame/drivers/videopkr.cpp1
-rw-r--r--src/mame/drivers/viper.cpp1
-rw-r--r--src/mame/drivers/votrpss.cpp1
-rw-r--r--src/mame/drivers/vt100.cpp1
-rw-r--r--src/mame/drivers/wacky_gator.cpp1
-rw-r--r--src/mame/drivers/wheelfir.cpp1
-rw-r--r--src/mame/drivers/wico.cpp1
-rw-r--r--src/mame/drivers/wpc_95.cpp1
-rw-r--r--src/mame/drivers/z9001.cpp1
-rw-r--r--src/mame/drivers/zac_1.cpp1
-rw-r--r--src/mame/drivers/zac_2.cpp1
-rw-r--r--src/mame/drivers/zaurus.cpp1
-rw-r--r--src/mame/drivers/zwackery.cpp1
-rw-r--r--src/mame/includes/1942.h1
-rw-r--r--src/mame/includes/3do.h1
-rw-r--r--src/mame/includes/8080bw.h1
-rw-r--r--src/mame/includes/airbustr.h1
-rw-r--r--src/mame/includes/apple2.h1
-rw-r--r--src/mame/includes/apple3.h1
-rw-r--r--src/mame/includes/argus.h2
-rw-r--r--src/mame/includes/astrof.h1
-rw-r--r--src/mame/includes/atarisy1.h1
-rw-r--r--src/mame/includes/atom.h1
-rw-r--r--src/mame/includes/avigo.h1
-rw-r--r--src/mame/includes/badlands.h1
-rw-r--r--src/mame/includes/balsente.h1
-rw-r--r--src/mame/includes/beathead.h1
-rw-r--r--src/mame/includes/bionicc.h1
-rw-r--r--src/mame/includes/bishi.h2
-rw-r--r--src/mame/includes/bladestl.h1
-rw-r--r--src/mame/includes/blockout.h1
-rw-r--r--src/mame/includes/bsktball.h1
-rw-r--r--src/mame/includes/btime.h1
-rw-r--r--src/mame/includes/bullet.h1
-rw-r--r--src/mame/includes/busicom.h1
-rw-r--r--src/mame/includes/bw12.h1
-rw-r--r--src/mame/includes/cave.h1
-rw-r--r--src/mame/includes/centiped.h1
-rw-r--r--src/mame/includes/cgc7900.h1
-rw-r--r--src/mame/includes/champbas.h1
-rw-r--r--src/mame/includes/changela.h1
-rw-r--r--src/mame/includes/circus.h2
-rw-r--r--src/mame/includes/cischeat.h1
-rw-r--r--src/mame/includes/coleco.h1
-rw-r--r--src/mame/includes/coolpool.h1
-rw-r--r--src/mame/includes/cosmic.h1
-rw-r--r--src/mame/includes/cosmicos.h1
-rw-r--r--src/mame/includes/cps1.h1
-rw-r--r--src/mame/includes/darkmist.h2
-rw-r--r--src/mame/includes/dbz.h1
-rw-r--r--src/mame/includes/dc.h1
-rw-r--r--src/mame/includes/ddragon.h1
-rw-r--r--src/mame/includes/ddragon3.h1
-rw-r--r--src/mame/includes/deadang.h2
-rw-r--r--src/mame/includes/deco_mlc.h2
-rw-r--r--src/mame/includes/decocass.h1
-rw-r--r--src/mame/includes/djboy.h1
-rw-r--r--src/mame/includes/dragrace.h1
-rw-r--r--src/mame/includes/einstein.h1
-rw-r--r--src/mame/includes/eolith.h1
-rw-r--r--src/mame/includes/equites.h1
-rw-r--r--src/mame/includes/espial.h1
-rw-r--r--src/mame/includes/exedexes.h1
-rw-r--r--src/mame/includes/exterm.h2
-rw-r--r--src/mame/includes/fastlane.h2
-rw-r--r--src/mame/includes/fidelbase.h1
-rw-r--r--src/mame/includes/finalizr.h2
-rw-r--r--src/mame/includes/firetrk.h1
-rw-r--r--src/mame/includes/foodf.h1
-rw-r--r--src/mame/includes/gaelco2.h1
-rw-r--r--src/mame/includes/gaelco3d.h1
-rw-r--r--src/mame/includes/galaxian.h1
-rw-r--r--src/mame/includes/galaxold.h1
-rw-r--r--src/mame/includes/galpani2.h1
-rw-r--r--src/mame/includes/galpanic.h1
-rw-r--r--src/mame/includes/gberet.h1
-rw-r--r--src/mame/includes/gradius3.h2
-rw-r--r--src/mame/includes/gundealr.h2
-rw-r--r--src/mame/includes/harddriv.h1
-rw-r--r--src/mame/includes/hexion.h2
-rw-r--r--src/mame/includes/hh_sm510.h1
-rw-r--r--src/mame/includes/hh_tms1k.h1
-rw-r--r--src/mame/includes/hh_ucom4.h1
-rw-r--r--src/mame/includes/higemaru.h2
-rw-r--r--src/mame/includes/hng64.h2
-rw-r--r--src/mame/includes/hp9845.h1
-rw-r--r--src/mame/includes/huebler.h1
-rw-r--r--src/mame/includes/hyprduel.h2
-rw-r--r--src/mame/includes/ikki.h2
-rw-r--r--src/mame/includes/iqblock.h3
-rw-r--r--src/mame/includes/irobot.h2
-rw-r--r--src/mame/includes/ironhors.h1
-rw-r--r--src/mame/includes/itech8.h1
-rw-r--r--src/mame/includes/jpmimpct.h1
-rw-r--r--src/mame/includes/kaneko16.h1
-rw-r--r--src/mame/includes/kc.h1
-rw-r--r--src/mame/includes/kim1.h1
-rw-r--r--src/mame/includes/konamigx.h1
-rw-r--r--src/mame/includes/kyocera.h1
-rw-r--r--src/mame/includes/lastduel.h1
-rw-r--r--src/mame/includes/lazercmd.h2
-rw-r--r--src/mame/includes/m107.h1
-rw-r--r--src/mame/includes/m92.h1
-rw-r--r--src/mame/includes/mac.h1
-rw-r--r--src/mame/includes/maygay1b.h1
-rw-r--r--src/mame/includes/mc80.h1
-rw-r--r--src/mame/includes/mcr.h1
-rw-r--r--src/mame/includes/mcr68.h1
-rw-r--r--src/mame/includes/megasys1.h1
-rw-r--r--src/mame/includes/mhavoc.h2
-rw-r--r--src/mame/includes/midvunit.h1
-rw-r--r--src/mame/includes/mitchell.h1
-rw-r--r--src/mame/includes/model1.h1
-rw-r--r--src/mame/includes/model2.h1
-rw-r--r--src/mame/includes/model3.h1
-rw-r--r--src/mame/includes/mpf1.h1
-rw-r--r--src/mame/includes/mpu4.h1
-rw-r--r--src/mame/includes/mrflea.h1
-rw-r--r--src/mame/includes/ms32.h1
-rw-r--r--src/mame/includes/mtx.h1
-rw-r--r--src/mame/includes/mustache.h2
-rw-r--r--src/mame/includes/mw8080bw.h1
-rw-r--r--src/mame/includes/mystwarr.h1
-rw-r--r--src/mame/includes/mz700.h1
-rw-r--r--src/mame/includes/mz80.h1
-rw-r--r--src/mame/includes/n8080.h2
-rw-r--r--src/mame/includes/namcofl.h2
-rw-r--r--src/mame/includes/namcona1.h1
-rw-r--r--src/mame/includes/namconb1.h1
-rw-r--r--src/mame/includes/namcos2.h1
-rw-r--r--src/mame/includes/namcos21.h1
-rw-r--r--src/mame/includes/namcos22.h1
-rw-r--r--src/mame/includes/nc.h1
-rw-r--r--src/mame/includes/nemesis.h2
-rw-r--r--src/mame/includes/nitedrvr.h1
-rw-r--r--src/mame/includes/nmk16.h1
-rw-r--r--src/mame/includes/novagbase.h1
-rw-r--r--src/mame/includes/orbit.h1
-rw-r--r--src/mame/includes/overdriv.h2
-rw-r--r--src/mame/includes/pc8401a.h1
-rw-r--r--src/mame/includes/pc9801.h1
-rw-r--r--src/mame/includes/pcw.h1
-rw-r--r--src/mame/includes/pcw16.h1
-rw-r--r--src/mame/includes/pgm.h1
-rw-r--r--src/mame/includes/pingpong.h3
-rw-r--r--src/mame/includes/polepos.h1
-rw-r--r--src/mame/includes/psion.h1
-rw-r--r--src/mame/includes/psychic5.h2
-rw-r--r--src/mame/includes/qdrmfgp.h2
-rw-r--r--src/mame/includes/renegade.h1
-rw-r--r--src/mame/includes/saturn.h1
-rw-r--r--src/mame/includes/segaorun.h1
-rw-r--r--src/mame/includes/segas24.h1
-rw-r--r--src/mame/includes/segas32.h1
-rw-r--r--src/mame/includes/seta.h1
-rw-r--r--src/mame/includes/seta2.h1
-rw-r--r--src/mame/includes/shadfrce.h1
-rw-r--r--src/mame/includes/shaolins.h3
-rw-r--r--src/mame/includes/simple_st0016.h1
-rw-r--r--src/mame/includes/skullxbo.h1
-rw-r--r--src/mame/includes/snk6502.h1
-rw-r--r--src/mame/includes/snowbros.h1
-rw-r--r--src/mame/includes/spdodgeb.h1
-rw-r--r--src/mame/includes/sprint8.h2
-rw-r--r--src/mame/includes/srumbler.h2
-rw-r--r--src/mame/includes/ssv.h2
-rw-r--r--src/mame/includes/strnskil.h3
-rw-r--r--src/mame/includes/suna16.h1
-rw-r--r--src/mame/includes/suna8.h1
-rw-r--r--src/mame/includes/super6.h1
-rw-r--r--src/mame/includes/super80.h1
-rw-r--r--src/mame/includes/suprnova.h1
-rw-r--r--src/mame/includes/svision.h1
-rw-r--r--src/mame/includes/system1.h1
-rw-r--r--src/mame/includes/taito_l.h1
-rw-r--r--src/mame/includes/taito_o.h1
-rw-r--r--src/mame/includes/tandy2k.h1
-rw-r--r--src/mame/includes/tek405x.h2
-rw-r--r--src/mame/includes/thedeep.h1
-rw-r--r--src/mame/includes/ti89.h1
-rw-r--r--src/mame/includes/tiki100.h1
-rw-r--r--src/mame/includes/tmc600.h1
-rw-r--r--src/mame/includes/trs80m2.h1
-rw-r--r--src/mame/includes/v1050.h1
-rw-r--r--src/mame/includes/vball.h1
-rw-r--r--src/mame/includes/vcs80.h1
-rw-r--r--src/mame/includes/vicdual.h1
-rw-r--r--src/mame/includes/vixen.h1
-rw-r--r--src/mame/includes/wecleman.h1
-rw-r--r--src/mame/includes/williams.h1
-rw-r--r--src/mame/includes/wwfsstar.h1
-rw-r--r--src/mame/includes/x07.h1
-rw-r--r--src/mame/includes/x1.h1
-rw-r--r--src/mame/includes/xain.h1
-rw-r--r--src/mame/includes/xerox820.h1
-rw-r--r--src/mame/includes/xevious.h2
-rw-r--r--src/mame/includes/xexex.h1
-rw-r--r--src/mame/includes/xmen.h1
-rw-r--r--src/mame/machine/mega32x.cpp1
-rw-r--r--src/mame/machine/megacdcd.h1
-rw-r--r--src/mame/video/decodmd1.h1
-rw-r--r--src/mame/video/decodmd2.h1
-rw-r--r--src/mame/video/decodmd3.h1
-rw-r--r--src/mame/video/pcd.h1
-rw-r--r--src/mame/video/wpc_dmd.h2
408 files changed, 446 insertions, 3 deletions
diff --git a/src/mame/audio/cage.h b/src/mame/audio/cage.h
index 11ace8d97fc..332b4e5bdb8 100644
--- a/src/mame/audio/cage.h
+++ b/src/mame/audio/cage.h
@@ -12,6 +12,7 @@
#pragma once
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/dmadac.h"
#define CAGE_IRQ_REASON_DATA_READY (1)
diff --git a/src/mame/audio/dcs.h b/src/mame/audio/dcs.h
index 7950f602617..ec2983faee6 100644
--- a/src/mame/audio/dcs.h
+++ b/src/mame/audio/dcs.h
@@ -14,6 +14,7 @@
#include "cpu/adsp2100/adsp2100.h"
#include "sound/dmadac.h"
#include "machine/bankdev.h"
+#include "machine/timer.h"
#define MCFG_DCS2_AUDIO_DRAM_IN_MB(_dram_in_mb) \
dcs_audio_device::static_set_dram_in_mb(*device, _dram_in_mb);
diff --git a/src/mame/audio/rax.h b/src/mame/audio/rax.h
index 34a7bc906fb..a5ef5079061 100644
--- a/src/mame/audio/rax.h
+++ b/src/mame/audio/rax.h
@@ -12,6 +12,7 @@
#include "cpu/adsp2100/adsp2100.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/dmadac.h"
diff --git a/src/mame/audio/segasnd.h b/src/mame/audio/segasnd.h
index cec2f9d725b..4fae14d301f 100644
--- a/src/mame/audio/segasnd.h
+++ b/src/mame/audio/segasnd.h
@@ -11,6 +11,7 @@
#pragma once
#include "cpu/mcs48/mcs48.h"
+#include "machine/timer.h"
class speech_sound_device : public device_t, public device_sound_interface
diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp
index 744d855fd69..84cbcef2303 100644
--- a/src/mame/drivers/a6809.cpp
+++ b/src/mame/drivers/a6809.cpp
@@ -53,6 +53,7 @@ enter show next address
#include "cpu/m6809/m6809.h"
#include "machine/6522via.h"
#include "machine/keyboard.h"
+#include "machine/timer.h"
#include "video/saa5050.h"
#include "video/mc6845.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp
index d4d5360b4a4..ac503e72cc2 100644
--- a/src/mame/drivers/a7800.cpp
+++ b/src/mame/drivers/a7800.cpp
@@ -98,6 +98,7 @@
#include "emu.h"
#include "cpu/m6502/m6502.h"
+#include "machine/timer.h"
#include "sound/tiaintf.h"
#include "sound/tiasound.h"
#include "machine/mos6530n.h"
diff --git a/src/mame/drivers/acommand.cpp b/src/mame/drivers/acommand.cpp
index 9491cb274da..f90de7a8cb3 100644
--- a/src/mame/drivers/acommand.cpp
+++ b/src/mame/drivers/acommand.cpp
@@ -59,6 +59,7 @@ JALCF1 BIN 1,048,576 02-07-99 1:11a JALCF1.BIN
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "video/ms1_tmap.h"
#include "screen.h"
diff --git a/src/mame/drivers/acrnsys1.cpp b/src/mame/drivers/acrnsys1.cpp
index 5ac7f7eb17c..cc370cb1775 100644
--- a/src/mame/drivers/acrnsys1.cpp
+++ b/src/mame/drivers/acrnsys1.cpp
@@ -50,6 +50,7 @@ Note that left-most digit is not wired up, and therefore will always be blank.
#include "cpu/m6502/m6502.h"
#include "machine/ins8154.h"
#include "machine/74145.h"
+#include "machine/timer.h"
#include "imagedev/cassette.h"
#include "sound/wave.h"
#include "speaker.h"
diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp
index b11a073d937..018e149dcc4 100644
--- a/src/mame/drivers/airraid.cpp
+++ b/src/mame/drivers/airraid.cpp
@@ -153,6 +153,7 @@ Stephh's notes (based on the game Z80 code and some tests) :
#include "video/airraid_dev.h"
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "sound/ym2151.h"
#include "speaker.h"
diff --git a/src/mame/drivers/allied.cpp b/src/mame/drivers/allied.cpp
index d076bd08ef9..2e6dc608f88 100644
--- a/src/mame/drivers/allied.cpp
+++ b/src/mame/drivers/allied.cpp
@@ -47,6 +47,7 @@ ToDo:
#include "cpu/m6502/m6504.h"
#include "machine/mos6530.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "allied.lh"
class allied_state : public genpin_class
diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp
index 817dabc2c88..a95673dba51 100644
--- a/src/mame/drivers/alphatro.cpp
+++ b/src/mame/drivers/alphatro.cpp
@@ -35,6 +35,7 @@
#include "machine/bankdev.h"
#include "machine/upd765.h"
#include "machine/i8257.h"
+#include "machine/timer.h"
#include "bus/generic/carts.h"
#include "bus/generic/slot.h"
#include "sound/beep.h"
diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp
index 2636413dd4b..4d3a9ac78f9 100644
--- a/src/mame/drivers/ampro.cpp
+++ b/src/mame/drivers/ampro.cpp
@@ -29,6 +29,7 @@ ToDo:
#include "machine/z80dart.h"
#include "machine/wd_fdc.h"
#include "machine/clock.h"
+#include "machine/timer.h"
#include "softlist.h"
class ampro_state : public driver_device
diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp
index 33e4bc731d3..9581987ca54 100644
--- a/src/mame/drivers/apple2.cpp
+++ b/src/mame/drivers/apple2.cpp
@@ -44,6 +44,7 @@ II Plus: RAM options reduced to 16/32/48 KB.
#include "machine/74259.h"
#include "machine/bankdev.h"
+#include "machine/timer.h"
#include "imagedev/flopdrv.h"
#include "bus/a2bus/a2alfam2.h"
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index 5d513cf45c6..65ad3d32e97 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -111,6 +111,7 @@ Address bus A0-A11 is Y0-Y11
#include "machine/mos6551.h"
#include "machine/ram.h"
#include "machine/sonydriv.h"
+#include "machine/timer.h"
#include "bus/a2bus/a2bus.h"
#include "bus/a2bus/a2diskii.h"
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index be6df17a063..9247a63fc29 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -42,6 +42,7 @@
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "machine/6522via.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp
index 5fa9be7232b..1e12e519955 100644
--- a/src/mame/drivers/aristmk4.cpp
+++ b/src/mame/drivers/aristmk4.cpp
@@ -327,6 +327,7 @@
#include "sound/samples.h"
#include "machine/mc146818.h" // DALLAS1287 is functionally compatible.
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp
index fbf83cf87ce..addf0b57921 100644
--- a/src/mame/drivers/astrcorp.cpp
+++ b/src/mame/drivers/astrcorp.cpp
@@ -41,6 +41,7 @@ To do:
#include "machine/eepromser.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp
index 825c5ef5aae..08cce420ebd 100644
--- a/src/mame/drivers/atari400.cpp
+++ b/src/mame/drivers/atari400.cpp
@@ -45,6 +45,7 @@
#include "cpu/m6502/m6502.h"
#include "machine/6821pia.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/atarifdc.h"
#include "sound/dac.h"
#include "sound/pokey.h"
diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp
index 5b5827d00c3..5889e6e987e 100644
--- a/src/mame/drivers/atari_s1.cpp
+++ b/src/mame/drivers/atari_s1.cpp
@@ -47,6 +47,7 @@ ToDo:
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp
index daaae16c926..7ca3b2b1628 100644
--- a/src/mame/drivers/atari_s2.cpp
+++ b/src/mame/drivers/atari_s2.cpp
@@ -25,6 +25,7 @@ ToDo:
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/drivers/babbage.cpp b/src/mame/drivers/babbage.cpp
index 8f1295d9b7d..d3a0470cdcf 100644
--- a/src/mame/drivers/babbage.cpp
+++ b/src/mame/drivers/babbage.cpp
@@ -24,6 +24,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/drivers/bartop52.cpp b/src/mame/drivers/bartop52.cpp
index 37fde21a7bd..9dc3a4eaef9 100644
--- a/src/mame/drivers/bartop52.cpp
+++ b/src/mame/drivers/bartop52.cpp
@@ -21,6 +21,7 @@
#include "includes/atari400.h"
#include "cpu/m6502/m6502.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "sound/pokey.h"
#include "video/gtia.h"
diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp
index 202b46bfcca..c5f58b7c924 100644
--- a/src/mame/drivers/beezer.cpp
+++ b/src/mame/drivers/beezer.cpp
@@ -26,6 +26,7 @@
#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/input_merger.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "machine/bankdev.h"
#include "machine/6522via.h"
diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp
index 833c6ddf004..8f5ef0baa6c 100644
--- a/src/mame/drivers/binbug.cpp
+++ b/src/mame/drivers/binbug.cpp
@@ -57,6 +57,7 @@
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
+#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "sound/wave.h"
diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp
index 601f8900c93..8254fd68ca0 100644
--- a/src/mame/drivers/blitz68k.cpp
+++ b/src/mame/drivers/blitz68k.cpp
@@ -47,6 +47,7 @@ To Do:
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/saa1099.h"
#include "video/mc6845.h"
#include "video/ramdac.h"
diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp
index ad69cf5634f..4a0a644c07c 100644
--- a/src/mame/drivers/bmcpokr.cpp
+++ b/src/mame/drivers/bmcpokr.cpp
@@ -22,6 +22,7 @@ Other: BMC B816140 (CPLD)
#include "sound/okim6295.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
+#include "machine/timer.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp
index 35df1363dd8..18ac954bf63 100644
--- a/src/mame/drivers/bml3.cpp
+++ b/src/mame/drivers/bml3.cpp
@@ -20,6 +20,7 @@
#include "machine/6821pia.h"
#include "machine/6850acia.h"
#include "machine/clock.h"
+#include "machine/timer.h"
#include "sound/2203intf.h"
#include "sound/spkrdev.h"
#include "sound/wave.h"
diff --git a/src/mame/drivers/by17.cpp b/src/mame/drivers/by17.cpp
index 37ce01ef41d..ca116231f25 100644
--- a/src/mame/drivers/by17.cpp
+++ b/src/mame/drivers/by17.cpp
@@ -22,6 +22,7 @@ ToDo:
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "by17.lh"
#include "by17_pwerplay.lh"
#include "by17_matahari.lh"
diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp
index b505ae44732..250899e59b8 100644
--- a/src/mame/drivers/by35.cpp
+++ b/src/mame/drivers/by35.cpp
@@ -71,6 +71,7 @@ ToDo:
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "sound/discrete.h"
#include "render.h"
#include "speaker.h"
diff --git a/src/mame/drivers/by6803.cpp b/src/mame/drivers/by6803.cpp
index d53a62188fc..adb4786b9ad 100644
--- a/src/mame/drivers/by6803.cpp
+++ b/src/mame/drivers/by6803.cpp
@@ -25,6 +25,7 @@ ToDo:
#include "cpu/m6800/m6801.h"
//#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
//#include "audio/midway.h"
//#include "by6803.lh"
diff --git a/src/mame/drivers/byvid.cpp b/src/mame/drivers/byvid.cpp
index 6b90e380640..6fda61bd054 100644
--- a/src/mame/drivers/byvid.cpp
+++ b/src/mame/drivers/byvid.cpp
@@ -42,6 +42,7 @@ ToDo (granny):
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/beep.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/drivers/chesstrv.cpp b/src/mame/drivers/chesstrv.cpp
index 8e594e000b3..0e0434ace56 100644
--- a/src/mame/drivers/chesstrv.cpp
+++ b/src/mame/drivers/chesstrv.cpp
@@ -12,6 +12,7 @@
#include "emu.h"
#include "cpu/f8/f8.h"
+#include "machine/timer.h"
#include "chesstrv.lh"
#include "borisdpl.lh"
diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp
index 6e4266bfd37..f5c9db7c603 100644
--- a/src/mame/drivers/chexx.cpp
+++ b/src/mame/drivers/chexx.cpp
@@ -18,6 +18,7 @@ Electro-mechanical bubble hockey games:
#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/6522via.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "sound/digitalk.h"
#include "speaker.h"
diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp
index 343d1841754..08ea5ffac11 100644
--- a/src/mame/drivers/chinagat.cpp
+++ b/src/mame/drivers/chinagat.cpp
@@ -76,6 +76,7 @@ Dip locations and factory settings verified with China Gate US manual.
#include "cpu/m6809/m6809.h"
#include "cpu/mcs48/mcs48.h"
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
#include "sound/ym2151.h"
diff --git a/src/mame/drivers/compis.cpp b/src/mame/drivers/compis.cpp
index 88b69111376..856c611a8ef 100644
--- a/src/mame/drivers/compis.cpp
+++ b/src/mame/drivers/compis.cpp
@@ -62,6 +62,7 @@
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/z80dart.h"
#define I80186_TAG "ic1"
diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp
index 37bbc985498..a8e4a628114 100644
--- a/src/mame/drivers/coolridr.cpp
+++ b/src/mame/drivers/coolridr.cpp
@@ -285,6 +285,7 @@ to the same bank as defined through A20.
#include "cpu/m68000/m68000.h"
#include "cpu/sh2/sh2.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/scsp.h"
#include "rendlay.h"
#include "screen.h"
diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp
index f25e0bf45d7..c36bf906b27 100644
--- a/src/mame/drivers/csplayh5.cpp
+++ b/src/mame/drivers/csplayh5.cpp
@@ -36,6 +36,7 @@
#include "machine/tmp68301.h"
#include "machine/idectrl.h"
#include "machine/idehd.h"
+#include "machine/timer.h"
#include "video/v9938.h"
#include "audio/nichisnd.h"
diff --git a/src/mame/drivers/cxgz80.cpp b/src/mame/drivers/cxgz80.cpp
index 0ade2d55644..a03e4b89686 100644
--- a/src/mame/drivers/cxgz80.cpp
+++ b/src/mame/drivers/cxgz80.cpp
@@ -25,6 +25,7 @@ Chess 2001:
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "speaker.h"
diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp
index 974fed413dd..8c628c314a4 100644
--- a/src/mame/drivers/d6800.cpp
+++ b/src/mame/drivers/d6800.cpp
@@ -43,6 +43,7 @@
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "sound/beep.h"
#include "sound/wave.h"
#include "screen.h"
diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp
index 90489181cbe..099b85253cd 100644
--- a/src/mame/drivers/dblcrown.cpp
+++ b/src/mame/drivers/dblcrown.cpp
@@ -49,6 +49,7 @@
#include "sound/ay8910.h"
#include "machine/i8255.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp
index 37e017774ec..df1e7fb2938 100644
--- a/src/mame/drivers/ddealer.cpp
+++ b/src/mame/drivers/ddealer.cpp
@@ -114,6 +114,7 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
#include "sound/2203intf.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index eef150a1cbd..5ebb9394feb 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -123,6 +123,7 @@ Notes:
#include "machine/gen_latch.h"
#include "machine/msm6242.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "speaker.h"
diff --git a/src/mame/drivers/dfruit.cpp b/src/mame/drivers/dfruit.cpp
index 47adce90c6b..5156b8c3877 100644
--- a/src/mame/drivers/dfruit.cpp
+++ b/src/mame/drivers/dfruit.cpp
@@ -21,6 +21,7 @@
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/tc009xlvc.h"
+#include "machine/timer.h"
#include "sound/2203intf.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/didact.cpp b/src/mame/drivers/didact.cpp
index 6de6733a1f9..4e83b8f2e6b 100644
--- a/src/mame/drivers/didact.cpp
+++ b/src/mame/drivers/didact.cpp
@@ -53,6 +53,7 @@
#include "machine/74145.h" // For the md6802 and e100
#include "machine/clock.h" // For candela
#include "machine/ram.h" // For candela
+#include "machine/timer.h"
#include "machine/wd_fdc.h" // For candela
#include "video/dm9368.h" // For the mp68a
#include "video/mc6845.h" // For candela
diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp
index 515291515c1..336fd823340 100644
--- a/src/mame/drivers/dolphunk.cpp
+++ b/src/mame/drivers/dolphunk.cpp
@@ -83,6 +83,7 @@
#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "imagedev/cassette.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "sound/wave.h"
#include "speaker.h"
diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp
index 6de798c6392..e2d627648aa 100644
--- a/src/mame/drivers/dooyong.cpp
+++ b/src/mame/drivers/dooyong.cpp
@@ -77,6 +77,7 @@ are almost identical, except for much darker BG layer colors).
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
#include "sound/ym2151.h"
diff --git a/src/mame/drivers/dotrikun.cpp b/src/mame/drivers/dotrikun.cpp
index 08636beed74..547e003e064 100644
--- a/src/mame/drivers/dotrikun.cpp
+++ b/src/mame/drivers/dotrikun.cpp
@@ -28,6 +28,7 @@ TODO:
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "screen.h"
#include "dotrikun.lh"
diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp
index d533826c287..ac44370142c 100644
--- a/src/mame/drivers/dvk_kcgd.cpp
+++ b/src/mame/drivers/dvk_kcgd.cpp
@@ -21,6 +21,7 @@
#include "cpu/t11/t11.h"
#include "machine/clock.h"
#include "machine/ms7004.h"
+#include "machine/timer.h"
#include "screen.h"
diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp
index 59c7a08dcea..803305b9491 100644
--- a/src/mame/drivers/dvk_ksm.cpp
+++ b/src/mame/drivers/dvk_ksm.cpp
@@ -59,6 +59,7 @@ ksm|DVK KSM,
#include "machine/i8255.h"
#include "machine/ms7004.h"
#include "machine/pic8259.h"
+#include "machine/timer.h"
#include "screen.h"
diff --git a/src/mame/drivers/eacc.cpp b/src/mame/drivers/eacc.cpp
index 0827f550ace..ee95ce8c8e1 100644
--- a/src/mame/drivers/eacc.cpp
+++ b/src/mame/drivers/eacc.cpp
@@ -52,6 +52,7 @@
#include "eacc.lh"
#include "machine/6821pia.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
class eacc_state : public driver_device
diff --git a/src/mame/drivers/ecoinfr.cpp b/src/mame/drivers/ecoinfr.cpp
index a7317a3160b..c92704d99dc 100644
--- a/src/mame/drivers/ecoinfr.cpp
+++ b/src/mame/drivers/ecoinfr.cpp
@@ -41,6 +41,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8251.h"
+#include "machine/timer.h"
#include "ecoinfr.lh"
#include "machine/steppers.h" // stepper motor
#include "video/awpvid.h" // drawing reels
diff --git a/src/mame/drivers/exelv.cpp b/src/mame/drivers/exelv.cpp
index 58a42b00c85..c93e804d625 100644
--- a/src/mame/drivers/exelv.cpp
+++ b/src/mame/drivers/exelv.cpp
@@ -57,6 +57,7 @@ TODO:
#include "cpu/tms7000/tms7000.h"
//#include "imagedev/cassette.h"
#include "machine/spchrom.h"
+#include "machine/timer.h"
#include "sound/tms5220.h"
#include "video/tms3556.h"
diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp
index c52b2673535..0ff353a8d9c 100644
--- a/src/mame/drivers/expro02.cpp
+++ b/src/mame/drivers/expro02.cpp
@@ -210,6 +210,7 @@ TODO:
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "machine/kaneko_hit.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "video/kaneko_tmap.h"
#include "video/kaneko_spr.h"
diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp
index 9b747d743b9..bfef16dc5d2 100644
--- a/src/mame/drivers/fastinvaders.cpp
+++ b/src/mame/drivers/fastinvaders.cpp
@@ -15,6 +15,7 @@ http://www.citylan.it/wiki/index.php/Fast_Invaders_%288275_version%29
#include "cpu/i8085/i8085.h"
#include "machine/i8257.h"
#include "machine/pic8259.h"
+#include "machine/timer.h"
#include "video/i8275.h"
#include "video/mc6845.h"
#include "screen.h"
diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp
index af65bca2946..ee988633979 100644
--- a/src/mame/drivers/fc100.cpp
+++ b/src/mame/drivers/fc100.cpp
@@ -41,6 +41,7 @@ TODO:
#include "machine/buffer.h"
#include "machine/clock.h"
#include "machine/i8251.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "sound/wave.h"
#include "video/mc6847.h"
diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp
index 2793d605e4f..1c1dd67351a 100644
--- a/src/mame/drivers/fidel6502.cpp
+++ b/src/mame/drivers/fidel6502.cpp
@@ -420,6 +420,7 @@ I/O is via TTL, very similar to Designer Display
#include "machine/6821pia.h"
#include "machine/i8255.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/volt_reg.h"
#include "speaker.h"
diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp
index e76a9c05197..a149a583b9e 100644
--- a/src/mame/drivers/fidel68k.cpp
+++ b/src/mame/drivers/fidel68k.cpp
@@ -163,6 +163,7 @@ B0000x-xxxxxx: see V7, -800000
#include "cpu/m68000/m68000.h"
#include "machine/ram.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/volt_reg.h"
#include "speaker.h"
diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp
index 23bc214c087..2ce5b29dcfd 100644
--- a/src/mame/drivers/fidelz80.cpp
+++ b/src/mame/drivers/fidelz80.cpp
@@ -495,6 +495,7 @@ expect that the software reads these once on startup only.
#include "cpu/mcs48/mcs48.h"
#include "machine/i8255.h"
#include "machine/i8243.h"
+#include "machine/timer.h"
#include "machine/z80pio.h"
#include "sound/beep.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/drivers/fireball.cpp b/src/mame/drivers/fireball.cpp
index f1333b21b5a..8361ce1c5b8 100644
--- a/src/mame/drivers/fireball.cpp
+++ b/src/mame/drivers/fireball.cpp
@@ -18,6 +18,7 @@
#include "cpu/mcs51/mcs51.h"
#include "machine/eepromser.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "speaker.h"
diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp
index d540e573892..209d7282554 100644
--- a/src/mame/drivers/firebeat.cpp
+++ b/src/mame/drivers/firebeat.cpp
@@ -146,6 +146,7 @@ Keyboard Mania 2nd Mix - dongle, program CD, audio CD
#include "machine/intelfsh.h"
#include "machine/midikbd.h"
#include "machine/rtc65271.h"
+#include "machine/timer.h"
#include "sound/cdda.h"
#include "sound/rf5c400.h"
#include "sound/ymz280b.h"
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index 35ac97cee5a..bbbd02e35ae 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -37,6 +37,7 @@ but requires a special level III player for proper control. Video: CAV. Audio: A
#include "machine/ldvp931.h"
#include "machine/6532riot.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "machine/x2212.h"
#include "speaker.h"
diff --git a/src/mame/drivers/fk1.cpp b/src/mame/drivers/fk1.cpp
index 7cbdc7d26ed..d62889c9878 100644
--- a/src/mame/drivers/fk1.cpp
+++ b/src/mame/drivers/fk1.cpp
@@ -14,6 +14,7 @@
#include "machine/pit8253.h"
#include "machine/i8251.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "screen.h"
diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp
index 00e324177c5..0c6a545eb8e 100644
--- a/src/mame/drivers/fp1100.cpp
+++ b/src/mame/drivers/fp1100.cpp
@@ -55,6 +55,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/upd7810/upd7810.h"
+#include "machine/timer.h"
#include "video/mc6845.h"
#include "sound/beep.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp
index a923cfc9e0c..63b79a4ab21 100644
--- a/src/mame/drivers/fresh.cpp
+++ b/src/mame/drivers/fresh.cpp
@@ -23,6 +23,7 @@ rom 5 and 6 are prg roms
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
#include "sound/ym2413.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp
index b3af5751f8b..0e4c4dd719c 100644
--- a/src/mame/drivers/galgames.cpp
+++ b/src/mame/drivers/galgames.cpp
@@ -37,6 +37,7 @@ Notes:
#include "cpu/m68000/m68000.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "machine/eepromser.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/okim6295.h"
#include "video/cesblit.h"
diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp
index 99e238bcfe1..fc60db1d9e3 100644
--- a/src/mame/drivers/galpani3.cpp
+++ b/src/mame/drivers/galpani3.cpp
@@ -67,6 +67,7 @@ Dumped by Uki
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "machine/kaneko_toybox.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/ymz280b.h"
#include "video/kaneko_grap2.h"
diff --git a/src/mame/drivers/gimix.cpp b/src/mame/drivers/gimix.cpp
index 7fc3fe9ab3e..abab8c71642 100644
--- a/src/mame/drivers/gimix.cpp
+++ b/src/mame/drivers/gimix.cpp
@@ -33,6 +33,7 @@
#include "machine/terminal.h"
#include "machine/bankdev.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "formats/flex_dsk.h"
#include "softlist.h"
diff --git a/src/mame/drivers/glasgow.cpp b/src/mame/drivers/glasgow.cpp
index 52a7de6d130..cb6afa0011f 100644
--- a/src/mame/drivers/glasgow.cpp
+++ b/src/mame/drivers/glasgow.cpp
@@ -44,6 +44,7 @@ ToDo:
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
#include "sound/beep.h"
#include "speaker.h"
diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp
index 310e33cf155..182f60f0458 100644
--- a/src/mame/drivers/goupil.cpp
+++ b/src/mame/drivers/goupil.cpp
@@ -28,6 +28,7 @@
#include "machine/6522via.h"
#include "machine/6850acia.h"
#include "machine/i8279.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "video/ef9364.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp
index 80eeffe1a79..c395adfa474 100644
--- a/src/mame/drivers/gp_1.cpp
+++ b/src/mame/drivers/gp_1.cpp
@@ -25,6 +25,7 @@ ToDo:
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "sound/sn76477.h"
#include "speaker.h"
diff --git a/src/mame/drivers/gp_2.cpp b/src/mame/drivers/gp_2.cpp
index 6f3012edc0f..d7413d7901b 100644
--- a/src/mame/drivers/gp_2.cpp
+++ b/src/mame/drivers/gp_2.cpp
@@ -38,6 +38,7 @@ ToDo:
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "gp_2.lh"
diff --git a/src/mame/drivers/gunpey.cpp b/src/mame/drivers/gunpey.cpp
index 46a0d91f5db..7e3999ca49d 100644
--- a/src/mame/drivers/gunpey.cpp
+++ b/src/mame/drivers/gunpey.cpp
@@ -190,6 +190,7 @@ Release: November 1999
#include "emu.h"
#include "cpu/nec/nec.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "sound/ymz280b.h"
#include "screen.h"
diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp
index 7d17716e3e1..0d645cdfaa1 100644
--- a/src/mame/drivers/h8.cpp
+++ b/src/mame/drivers/h8.cpp
@@ -51,6 +51,7 @@ TODO:
#include "cpu/i8085/i8085.h"
#include "machine/i8251.h"
#include "machine/clock.h"
+#include "machine/timer.h"
#include "imagedev/cassette.h"
#include "sound/beep.h"
#include "sound/wave.h"
diff --git a/src/mame/drivers/h89.cpp b/src/mame/drivers/h89.cpp
index 99f71df9a83..f1763160889 100644
--- a/src/mame/drivers/h89.cpp
+++ b/src/mame/drivers/h89.cpp
@@ -23,6 +23,7 @@
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
#include "machine/ins8250.h"
+#include "machine/timer.h"
#define RS232_TAG "rs232"
diff --git a/src/mame/drivers/halleys.cpp b/src/mame/drivers/halleys.cpp
index 9b3e8152c86..63223fa0cff 100644
--- a/src/mame/drivers/halleys.cpp
+++ b/src/mame/drivers/halleys.cpp
@@ -167,6 +167,7 @@ Video sync 6 F Video sync Post 6 F Post
#include "cpu/m6809/m6809.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/hankin.cpp b/src/mame/drivers/hankin.cpp
index 7a4d7466d87..cb46a01686a 100644
--- a/src/mame/drivers/hankin.cpp
+++ b/src/mame/drivers/hankin.cpp
@@ -20,6 +20,7 @@ ToDo:
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "speaker.h"
diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp
index c1c7d6611ab..5cc063e8384 100644
--- a/src/mame/drivers/harddriv.cpp
+++ b/src/mame/drivers/harddriv.cpp
@@ -328,6 +328,7 @@ Notes:
#include "includes/harddriv.h"
#include "includes/slapstic.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/volt_reg.h"
#include "speaker.h"
diff --git a/src/mame/drivers/hh_amis2k.cpp b/src/mame/drivers/hh_amis2k.cpp
index 5ee4e0e37ea..0639bf2cc55 100644
--- a/src/mame/drivers/hh_amis2k.cpp
+++ b/src/mame/drivers/hh_amis2k.cpp
@@ -25,6 +25,7 @@
#include "emu.h"
#include "cpu/amis2000/amis2000.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "speaker.h"
diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp
index 9b156b5593a..8f533e913f9 100644
--- a/src/mame/drivers/hh_cop400.cpp
+++ b/src/mame/drivers/hh_cop400.cpp
@@ -14,6 +14,7 @@
#include "emu.h"
#include "cpu/cop400/cop400.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp
index 4376441337c..3888a877904 100644
--- a/src/mame/drivers/hh_hmcs40.cpp
+++ b/src/mame/drivers/hh_hmcs40.cpp
@@ -93,6 +93,7 @@
#include "cpu/hmcs40/hmcs40.h"
#include "cpu/cop400/cop400.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "rendlay.h"
#include "screen.h"
diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp
index 389c95a92b9..f233dc064d7 100644
--- a/src/mame/drivers/hh_melps4.cpp
+++ b/src/mame/drivers/hh_melps4.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "cpu/melps4/m58846.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "rendlay.h"
diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp
index 5d1b3197638..ca8e2a946aa 100644
--- a/src/mame/drivers/hh_pic16.cpp
+++ b/src/mame/drivers/hh_pic16.cpp
@@ -47,6 +47,7 @@
#include "emu.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "machine/clock.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "speaker.h"
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index e64957267e8..2ee8e34c304 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -142,6 +142,7 @@
#include "includes/hh_tms1k.h"
#include "machine/tms1024.h"
+#include "machine/timer.h"
#include "sound/beep.h"
#include "sound/s14001a.h"
#include "sound/sn76477.h"
diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp
index d545cf1a13a..03ef087c415 100644
--- a/src/mame/drivers/hp64k.cpp
+++ b/src/mame/drivers/hp64k.cpp
@@ -156,6 +156,7 @@
#include "machine/com8116.h"
#include "machine/i8251.h"
#include "machine/rescap.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "sound/beep.h"
#include "video/i8275.h"
diff --git a/src/mame/drivers/hp80.cpp b/src/mame/drivers/hp80.cpp
index fd03e1688ca..4a0060726df 100644
--- a/src/mame/drivers/hp80.cpp
+++ b/src/mame/drivers/hp80.cpp
@@ -11,6 +11,7 @@
#include "screen.h"
#include "cpu/capricorn/capricorn.h"
#include "speaker.h"
+#include "machine/timer.h"
#include "sound/beep.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp
index 4b3f5717b63..f8a20913c4d 100644
--- a/src/mame/drivers/hp9845.cpp
+++ b/src/mame/drivers/hp9845.cpp
@@ -40,6 +40,7 @@
#include "bus/hp_optroms/hp_optrom.h"
#include "bus/hp9845_io/hp9845_io.h"
+#include "machine/timer.h"
#include "render.h"
#include "softlist.h"
diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp
index ab64e3d769f..5f79c40b086 100644
--- a/src/mame/drivers/hvyunit.cpp
+++ b/src/mame/drivers/hvyunit.cpp
@@ -63,6 +63,7 @@ To Do:
#include "cpu/z80/z80.h"
#include "cpu/mcs51/mcs51.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/2203intf.h"
#include "video/kan_pand.h"
#include "screen.h"
diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp
index de83b8e417e..523be013c23 100644
--- a/src/mame/drivers/icecold.cpp
+++ b/src/mame/drivers/icecold.cpp
@@ -10,6 +10,7 @@
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
#include "machine/i8279.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "speaker.h"
diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp
index 088e2a553c3..5e4ae3856fd 100644
--- a/src/mame/drivers/igs011.cpp
+++ b/src/mame/drivers/igs011.cpp
@@ -71,6 +71,7 @@ Notes:
#include "sound/3812intf.h"
#include "sound/ics2115.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp
index 5269791fd4d..976d5d4fb0a 100644
--- a/src/mame/drivers/igs017.cpp
+++ b/src/mame/drivers/igs017.cpp
@@ -54,6 +54,7 @@ Notes:
#include "machine/igs025.h"
#include "machine/igs022.h"
#include "machine/ticket.h"
+#include "machine/timer.h"
#include "video/igs017_igs031.h"
#include "screen.h"
diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp
index ee451bd50ce..5b805f32731 100644
--- a/src/mame/drivers/igspoker.cpp
+++ b/src/mame/drivers/igspoker.cpp
@@ -67,6 +67,7 @@ FIX: PK Tetris have an input named AMUSE which I couldn't map. Maybe it is
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "sound/ym2413.h"
#include "sound/okim6295.h"
#include "screen.h"
diff --git a/src/mame/drivers/imolagp.cpp b/src/mame/drivers/imolagp.cpp
index e6d07a7bcb2..f420c7d4500 100644
--- a/src/mame/drivers/imolagp.cpp
+++ b/src/mame/drivers/imolagp.cpp
@@ -82,6 +82,7 @@ www.andys-arcade.com
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/iq151.cpp b/src/mame/drivers/iq151.cpp
index fdb244bb66a..e42edea0a7c 100644
--- a/src/mame/drivers/iq151.cpp
+++ b/src/mame/drivers/iq151.cpp
@@ -49,6 +49,7 @@ ToDo:
#include "imagedev/cassette.h"
#include "machine/i8255.h"
#include "machine/pic8259.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
// cartridge slot
diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp
index 287301a6965..572e6b2cb6a 100644
--- a/src/mame/drivers/jackie.cpp
+++ b/src/mame/drivers/jackie.cpp
@@ -48,6 +48,7 @@ Note
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "sound/ym2413.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp
index 4778b53f678..9b398b13c4a 100644
--- a/src/mame/drivers/jalmah.cpp
+++ b/src/mame/drivers/jalmah.cpp
@@ -117,6 +117,7 @@ OSC: 12.000MHz
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/jchan.cpp b/src/mame/drivers/jchan.cpp
index 490624d5e18..513431fc66d 100644
--- a/src/mame/drivers/jchan.cpp
+++ b/src/mame/drivers/jchan.cpp
@@ -157,6 +157,7 @@ JC-301-00 W11 9510K7059 23C16000 U85
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/ymz280b.h"
#include "video/sknsspr.h"
diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp
index 169a391fdb2..7ee386c5b59 100644
--- a/src/mame/drivers/jclub2.cpp
+++ b/src/mame/drivers/jclub2.cpp
@@ -103,6 +103,7 @@
#include "machine/nvram.h"
#include "machine/st0016.h"
#include "machine/ticket.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/okim6295.h"
#include "speaker.h"
diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp
index ea5ce245d55..82817b4f7fa 100644
--- a/src/mame/drivers/jeutel.cpp
+++ b/src/mame/drivers/jeutel.cpp
@@ -20,6 +20,7 @@ ToDo:
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "sound/tms5110.h"
#include "speaker.h"
diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp
index 99c469c80a4..f02c726db43 100644
--- a/src/mame/drivers/jr100.cpp
+++ b/src/mame/drivers/jr100.cpp
@@ -18,6 +18,7 @@
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
#include "machine/6522via.h"
+#include "machine/timer.h"
#include "sound/beep.h"
#include "sound/spkrdev.h"
#include "sound/wave.h"
diff --git a/src/mame/drivers/junior.cpp b/src/mame/drivers/junior.cpp
index b6872389740..f0dc2bc4074 100644
--- a/src/mame/drivers/junior.cpp
+++ b/src/mame/drivers/junior.cpp
@@ -28,6 +28,7 @@ Test Paste:
#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/mos6530n.h"
+#include "machine/timer.h"
#include "junior.lh"
diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp
index ff488373a09..244c6d90d80 100644
--- a/src/mame/drivers/jupace.cpp
+++ b/src/mame/drivers/jupace.cpp
@@ -49,6 +49,7 @@ Ports:
#include "bus/centronics/ctronics.h"
#include "machine/i8255.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/z80pio.h"
#include "sound/ay8910.h"
#include "sound/sp0256.h"
diff --git a/src/mame/drivers/k28.cpp b/src/mame/drivers/k28.cpp
index 5e4cf519161..c78a73c7f81 100644
--- a/src/mame/drivers/k28.cpp
+++ b/src/mame/drivers/k28.cpp
@@ -21,6 +21,7 @@
#include "emu.h"
#include "cpu/mcs48/mcs48.h"
+#include "machine/timer.h"
#include "machine/tms6100.h"
#include "sound/votrax.h"
#include "speaker.h"
diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp
index 6f012930174..d2a067c118f 100644
--- a/src/mame/drivers/kas89.cpp
+++ b/src/mame/drivers/kas89.cpp
@@ -193,6 +193,7 @@
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "video/v9938.h"
#include "speaker.h"
diff --git a/src/mame/drivers/kdt6.cpp b/src/mame/drivers/kdt6.cpp
index 14d03f9764e..4a1cef39929 100644
--- a/src/mame/drivers/kdt6.cpp
+++ b/src/mame/drivers/kdt6.cpp
@@ -13,6 +13,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "machine/z80dma.h"
#include "machine/z80pio.h"
diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp
index 9bbd465f80d..4d82c8789e6 100644
--- a/src/mame/drivers/koftball.cpp
+++ b/src/mame/drivers/koftball.cpp
@@ -30,6 +30,7 @@ ft5_v6_c4.u58 /
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "sound/ym2413.h"
#include "video/ramdac.h"
diff --git a/src/mame/drivers/laserbas.cpp b/src/mame/drivers/laserbas.cpp
index 9baf4974385..d7ff870878b 100644
--- a/src/mame/drivers/laserbas.cpp
+++ b/src/mame/drivers/laserbas.cpp
@@ -62,6 +62,7 @@ expected: 43 FB CC 9A D4 23 6C 01 3E <- From ROM 4
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/pit8253.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/lastbank.cpp b/src/mame/drivers/lastbank.cpp
index ca83256c4fb..6e0fd7ef103 100644
--- a/src/mame/drivers/lastbank.cpp
+++ b/src/mame/drivers/lastbank.cpp
@@ -17,6 +17,7 @@
#include "sound/okim6295.h"
#include "machine/nvram.h"
#include "machine/tc009xlvc.h"
+#include "machine/timer.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/littlerb.cpp b/src/mame/drivers/littlerb.cpp
index 5cfb6ba9ab0..e980c345763 100644
--- a/src/mame/drivers/littlerb.cpp
+++ b/src/mame/drivers/littlerb.cpp
@@ -66,6 +66,7 @@ Dip sw.2
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/inder_vid.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "speaker.h"
diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp
index dcac94ea14c..83c848d8958 100644
--- a/src/mame/drivers/ltd.cpp
+++ b/src/mame/drivers/ltd.cpp
@@ -44,6 +44,7 @@ ToDo:
#include "machine/genpin.h"
#include "cpu/m6800/m6801.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "speaker.h"
diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp
index 0da4c911a62..66321691122 100644
--- a/src/mame/drivers/mac128.cpp
+++ b/src/mame/drivers/mac128.cpp
@@ -90,6 +90,7 @@ c0 8 data bits, Rx disabled
#include "machine/mackbd.h"
#include "machine/macrtc.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "formats/ap_dsk35.h"
diff --git a/src/mame/drivers/maxaflex.cpp b/src/mame/drivers/maxaflex.cpp
index 0f01a02f143..6daafa91faf 100644
--- a/src/mame/drivers/maxaflex.cpp
+++ b/src/mame/drivers/maxaflex.cpp
@@ -19,6 +19,7 @@
#include "cpu/m6805/m68705.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "sound/pokey.h"
diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp
index 6da3ea5f65c..f809b883967 100644
--- a/src/mame/drivers/mc10.cpp
+++ b/src/mame/drivers/mc10.cpp
@@ -13,6 +13,7 @@
#include "imagedev/cassette.h"
#include "imagedev/printer.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "video/ef9345.h"
diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp
index e5925c41d74..50214286023 100644
--- a/src/mame/drivers/mc1000.cpp
+++ b/src/mame/drivers/mc1000.cpp
@@ -29,6 +29,7 @@
#include "imagedev/cassette.h"
#include "machine/ram.h"
#include "machine/rescap.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
#include "video/mc6847.h"
diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp
index 8ca454abb69..e8a261f18cb 100644
--- a/src/mame/drivers/mediagx.cpp
+++ b/src/mame/drivers/mediagx.cpp
@@ -72,6 +72,7 @@
#include "machine/pcshare.h"
#include "machine/pckeybrd.h"
#include "machine/idectrl.h"
+#include "machine/timer.h"
#include "sound/dmadac.h"
#include "video/ramdac.h"
#include "screen.h"
diff --git a/src/mame/drivers/meijinsn.cpp b/src/mame/drivers/meijinsn.cpp
index 92e12ed11e7..fb80b531af7 100644
--- a/src/mame/drivers/meijinsn.cpp
+++ b/src/mame/drivers/meijinsn.cpp
@@ -64,6 +64,7 @@ SOFT PSG & VOICE BY M.C & S.H
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "video/resnet.h"
#include "sound/ay8910.h"
#include "screen.h"
diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp
index 87c50d1b848..0ac11d44017 100644
--- a/src/mame/drivers/mekd2.cpp
+++ b/src/mame/drivers/mekd2.cpp
@@ -79,6 +79,7 @@ TODO
#include "machine/6821pia.h"
#include "machine/6850acia.h"
#include "machine/clock.h"
+#include "machine/timer.h"
#include "sound/wave.h"
#include "speaker.h"
diff --git a/src/mame/drivers/mephisto.cpp b/src/mame/drivers/mephisto.cpp
index 721c8422d05..79621f44587 100644
--- a/src/mame/drivers/mephisto.cpp
+++ b/src/mame/drivers/mephisto.cpp
@@ -65,6 +65,7 @@ Mephisto 4 Turbo Kit 18mhz - (mm4tk)
#include "emu.h"
#include "cpu/m6502/m65c02.h"
#include "machine/mmboard.h"
+#include "machine/timer.h"
#include "sound/beep.h"
#include "speaker.h"
diff --git a/src/mame/drivers/mephisto_montec.cpp b/src/mame/drivers/mephisto_montec.cpp
index bc2d7faf390..da2e53e0263 100644
--- a/src/mame/drivers/mephisto_montec.cpp
+++ b/src/mame/drivers/mephisto_montec.cpp
@@ -17,6 +17,7 @@
#include "cpu/m6502/m65c02.h"
#include "machine/nvram.h"
#include "machine/mmboard.h"
+#include "machine/timer.h"
#include "screen.h"
#include "speaker.h"
#include "softlist.h"
diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp
index 78c998d2826..83ac0ab720f 100644
--- a/src/mame/drivers/meritm.cpp
+++ b/src/mame/drivers/meritm.cpp
@@ -181,6 +181,7 @@ Not all regional versions are available for each Megatouch series
#include "machine/ins8250.h"
#include "machine/microtch.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "machine/z80pio.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/metlfrzr.cpp b/src/mame/drivers/metlfrzr.cpp
index b943c3ffd8b..9a0acea3669 100644
--- a/src/mame/drivers/metlfrzr.cpp
+++ b/src/mame/drivers/metlfrzr.cpp
@@ -24,6 +24,7 @@
#include "audio/t5182.h"
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/meyc8088.cpp b/src/mame/drivers/meyc8088.cpp
index b9c04a86964..09bdd393e4b 100644
--- a/src/mame/drivers/meyc8088.cpp
+++ b/src/mame/drivers/meyc8088.cpp
@@ -29,6 +29,7 @@
#include "cpu/i86/i86.h"
#include "machine/i8155.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "video/resnet.h"
diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp
index 654620edce3..5f773e736b7 100644
--- a/src/mame/drivers/mgavegas.cpp
+++ b/src/mame/drivers/mgavegas.cpp
@@ -21,6 +21,7 @@ Ver. 2.2 should exist
#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "sound/flt_rc.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/micro20.cpp b/src/mame/drivers/micro20.cpp
index 91372e586ca..131ea4e5ec6 100644
--- a/src/mame/drivers/micro20.cpp
+++ b/src/mame/drivers/micro20.cpp
@@ -14,6 +14,7 @@
#include "cpu/m68000/m68000.h"
#include "machine/mc68681.h"
#include "machine/msm58321.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "machine/68230pit.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/drivers/micropin.cpp b/src/mame/drivers/micropin.cpp
index 2126c9d8784..4978c5bef9a 100644
--- a/src/mame/drivers/micropin.cpp
+++ b/src/mame/drivers/micropin.cpp
@@ -27,6 +27,7 @@ ToDo:
#include "cpu/i8085/i8085.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "sound/beep.h"
#include "speaker.h"
diff --git a/src/mame/drivers/minitel_2_rpic.cpp b/src/mame/drivers/minitel_2_rpic.cpp
index 280b51184cf..baefe838349 100644
--- a/src/mame/drivers/minitel_2_rpic.cpp
+++ b/src/mame/drivers/minitel_2_rpic.cpp
@@ -49,6 +49,7 @@
#include "emu.h"
#include "cpu/mcs51/mcs51.h"
+#include "machine/timer.h"
#include "video/ef9345.h"
#include "screen.h"
diff --git a/src/mame/drivers/mk1.cpp b/src/mame/drivers/mk1.cpp
index f1905c2817d..d2e41371c6f 100644
--- a/src/mame/drivers/mk1.cpp
+++ b/src/mame/drivers/mk1.cpp
@@ -44,6 +44,7 @@ TODO:
#include "emu.h"
#include "cpu/f8/f8.h"
#include "machine/f3853.h"
+#include "machine/timer.h"
#include "mk1.lh"
diff --git a/src/mame/drivers/mk2.cpp b/src/mame/drivers/mk2.cpp
index 90d9e57c026..ced3481a5d0 100644
--- a/src/mame/drivers/mk2.cpp
+++ b/src/mame/drivers/mk2.cpp
@@ -53,6 +53,7 @@ Usage:
#include "cpu/m6502/m6504.h"
#include "machine/mos6530.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "speaker.h"
diff --git a/src/mame/drivers/monzagp.cpp b/src/mame/drivers/monzagp.cpp
index a01a10379ae..f3ad86581e9 100644
--- a/src/mame/drivers/monzagp.cpp
+++ b/src/mame/drivers/monzagp.cpp
@@ -32,6 +32,7 @@ Lower board (MGP_01):
#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "video/resnet.h"
#include "screen.h"
diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp
index c9eb63f6c58..3fc3dd5b8c6 100644
--- a/src/mame/drivers/mpu3.cpp
+++ b/src/mame/drivers/mpu3.cpp
@@ -104,6 +104,7 @@ TODO: - Distinguish door switches using manual
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "cpu/m6800/m6800.h"
#include "machine/steppers.h"
diff --git a/src/mame/drivers/mrgame.cpp b/src/mame/drivers/mrgame.cpp
index 9d332891df2..5cc52fad082 100644
--- a/src/mame/drivers/mrgame.cpp
+++ b/src/mame/drivers/mrgame.cpp
@@ -36,6 +36,7 @@ ToDo:
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/tms5220.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp
index 842e3032f98..e0e4f67eb3f 100644
--- a/src/mame/drivers/mstation.cpp
+++ b/src/mame/drivers/mstation.cpp
@@ -32,6 +32,7 @@
#include "machine/intelfsh.h"
#include "machine/ram.h"
#include "machine/rp5c01.h"
+#include "machine/timer.h"
#include "rendlay.h"
#include "screen.h"
diff --git a/src/mame/drivers/multi8.cpp b/src/mame/drivers/multi8.cpp
index 8761b6dd51f..ca3410d7df2 100644
--- a/src/mame/drivers/multi8.cpp
+++ b/src/mame/drivers/multi8.cpp
@@ -17,6 +17,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "sound/2203intf.h"
#include "sound/beep.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp
index ad84f4eff24..257db4b633a 100644
--- a/src/mame/drivers/mycom.cpp
+++ b/src/mame/drivers/mycom.cpp
@@ -53,6 +53,7 @@
#include "imagedev/cassette.h"
#include "machine/i8255.h"
#include "machine/msm5832.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "sound/sn76496.h"
#include "sound/wave.h"
diff --git a/src/mame/drivers/nakajies.cpp b/src/mame/drivers/nakajies.cpp
index 73d189125de..5fe6874cfe6 100644
--- a/src/mame/drivers/nakajies.cpp
+++ b/src/mame/drivers/nakajies.cpp
@@ -274,6 +274,7 @@ disabled). Perhaps power on/off related??
#include "emu.h"
#include "cpu/nec/nec.h"
#include "machine/rp5c01.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "rendlay.h"
#include "screen.h"
diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp
index 6bcfd9fba52..0522834aa2f 100644
--- a/src/mame/drivers/namcos11.cpp
+++ b/src/mame/drivers/namcos11.cpp
@@ -301,6 +301,7 @@ Pin 22 Solder Side - Gun 2 Trigger
#include "machine/namcomcu.h"
#include "machine/ns11prot.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/c352.h"
#include "video/psx.h"
#include "speaker.h"
diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp
index a85e12365d8..605993d13c8 100644
--- a/src/mame/drivers/nanos.cpp
+++ b/src/mame/drivers/nanos.cpp
@@ -13,6 +13,7 @@
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/upd765.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp
index dd7becbb6b0..a1a82d1286a 100644
--- a/src/mame/drivers/novag6502.cpp
+++ b/src/mame/drivers/novag6502.cpp
@@ -63,6 +63,7 @@ instead of magnet sensors.
#include "cpu/m6502/r65c02.h"
#include "machine/mos6551.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "video/hlcd0538.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp
index f6518414a62..159a93a9ddc 100644
--- a/src/mame/drivers/olibochu.cpp
+++ b/src/mame/drivers/olibochu.cpp
@@ -56,6 +56,7 @@ $7004 writes, related to $7000 reads
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp
index 0f3b5f39c03..28f08f5a354 100644
--- a/src/mame/drivers/oric.cpp
+++ b/src/mame/drivers/oric.cpp
@@ -28,6 +28,7 @@
#include "imagedev/floppy.h"
#include "machine/6522via.h"
#include "machine/mos6551.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "sound/ay8910.h"
#include "sound/wave.h"
diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp
index 1bc7ee3b1e1..a3558fc91c3 100644
--- a/src/mame/drivers/panicr.cpp
+++ b/src/mame/drivers/panicr.cpp
@@ -65,6 +65,7 @@ D.9B [f99cac4b] /
#include "cpu/nec/nec.h"
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/pasogo.cpp b/src/mame/drivers/pasogo.cpp
index f2e5c469ec9..baa205f86be 100644
--- a/src/mame/drivers/pasogo.cpp
+++ b/src/mame/drivers/pasogo.cpp
@@ -108,6 +108,7 @@ TODO:
#include "bus/generic/carts.h"
#include "machine/bankdev.h"
#include "machine/genpc.h"
+#include "machine/timer.h"
#include "screen.h"
#include "softlist.h"
diff --git a/src/mame/drivers/patapata.cpp b/src/mame/drivers/patapata.cpp
index 91537c80af8..6971bf7416a 100644
--- a/src/mame/drivers/patapata.cpp
+++ b/src/mame/drivers/patapata.cpp
@@ -21,6 +21,7 @@ maybe close to jalmah.cpp?
#include "machine/nmk112.h"
#include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "screen.h"
diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp
index fd25bfc9499..e0ff6a99a7e 100644
--- a/src/mame/drivers/pc100.cpp
+++ b/src/mame/drivers/pc100.cpp
@@ -60,6 +60,7 @@
#include "machine/i8255.h"
#include "machine/msm58321.h"
#include "machine/pic8259.h"
+#include "machine/timer.h"
#include "machine/upd765.h"
#include "sound/beep.h"
diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp
index 0471b58f8e5..0589b09c203 100644
--- a/src/mame/drivers/pc6001.cpp
+++ b/src/mame/drivers/pc6001.cpp
@@ -130,6 +130,7 @@ irq vector 0x26:
#include "imagedev/cassette.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "sound/upd7752.h"
#include "sound/wave.h"
diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp
index a578864a17f..eb9f69697c4 100644
--- a/src/mame/drivers/pc8801.cpp
+++ b/src/mame/drivers/pc8801.cpp
@@ -261,6 +261,7 @@
#include "machine/i8214.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "machine/upd1990a.h"
#include "machine/upd765.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp
index 5a74bfffed8..fe002e1488f 100644
--- a/src/mame/drivers/pcd.cpp
+++ b/src/mame/drivers/pcd.cpp
@@ -20,6 +20,7 @@
#include "machine/nvram.h"
#include "machine/pic8259.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/drivers/pce220.cpp b/src/mame/drivers/pce220.cpp
index d1a39b8a8bf..903cb8af270 100644
--- a/src/mame/drivers/pce220.cpp
+++ b/src/mame/drivers/pce220.cpp
@@ -31,6 +31,7 @@
#include "machine/nvram.h"
#include "machine/pce220_ser.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/beep.h"
#include "rendlay.h"
#include "screen.h"
diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp
index fb213c8579a..4d767d9e4b9 100644
--- a/src/mame/drivers/pegasus.cpp
+++ b/src/mame/drivers/pegasus.cpp
@@ -43,6 +43,7 @@
#include "cpu/m6809/m6809.h"
#include "imagedev/cassette.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "sound/wave.h"
#include "screen.h"
#include "softlist.h"
diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp
index b9b1cf8522c..85824fd066f 100644
--- a/src/mame/drivers/pet.cpp
+++ b/src/mame/drivers/pet.cpp
@@ -168,6 +168,7 @@ ROM sockets: UA3 2K or 4K character
#include "machine/cbm_snqk.h"
#include "machine/pla.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/photon2.cpp b/src/mame/drivers/photon2.cpp
index 8cb476d4d62..51e98a2b47e 100644
--- a/src/mame/drivers/photon2.cpp
+++ b/src/mame/drivers/photon2.cpp
@@ -23,6 +23,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/piratesh.cpp b/src/mame/drivers/piratesh.cpp
index cb828399489..5c06f8e3418 100644
--- a/src/mame/drivers/piratesh.cpp
+++ b/src/mame/drivers/piratesh.cpp
@@ -31,6 +31,7 @@
#include "speaker.h"
#include "video/k053250_ps.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "cpu/m68000/m68000.h"
#include "sound/k054539.h"
#include "includes/konamigx.h" // TODO: WHY?
diff --git a/src/mame/drivers/pkscram.cpp b/src/mame/drivers/pkscram.cpp
index 596a5fc0d28..25ce47d0e4d 100644
--- a/src/mame/drivers/pkscram.cpp
+++ b/src/mame/drivers/pkscram.cpp
@@ -16,6 +16,7 @@ driver by David Haywood and few bits by Pierpaolo Prazzoli
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/2203intf.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp
index 13e26741d35..f24f6402bd7 100644
--- a/src/mame/drivers/pofo.cpp
+++ b/src/mame/drivers/pofo.cpp
@@ -39,6 +39,7 @@
#include "bus/pofo/exp.h"
#include "machine/nvram.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/pcd3311.h"
#include "video/hd61830.h"
diff --git a/src/mame/drivers/polgar.cpp b/src/mame/drivers/polgar.cpp
index 16b9e5e93a7..71cfef97731 100644
--- a/src/mame/drivers/polgar.cpp
+++ b/src/mame/drivers/polgar.cpp
@@ -12,6 +12,7 @@
#include "cpu/arm/arm.h"
#include "machine/nvram.h"
#include "machine/mmboard.h"
+#include "machine/timer.h"
#include "video/hd44780.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp
index d6ef1d1fa1b..ab897bf5ee7 100644
--- a/src/mame/drivers/popobear.cpp
+++ b/src/mame/drivers/popobear.cpp
@@ -79,6 +79,7 @@ Component Side A B Solder Side
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "sound/ym2413.h"
#include "screen.h"
diff --git a/src/mame/drivers/prestige.cpp b/src/mame/drivers/prestige.cpp
index 1ad35cea84f..6c166a56065 100644
--- a/src/mame/drivers/prestige.cpp
+++ b/src/mame/drivers/prestige.cpp
@@ -81,6 +81,7 @@ Notes:
#include "cpu/z80/z80.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
diff --git a/src/mame/drivers/pro80.cpp b/src/mame/drivers/pro80.cpp
index a735c12ac8d..e9b0cb2dafd 100644
--- a/src/mame/drivers/pro80.cpp
+++ b/src/mame/drivers/pro80.cpp
@@ -21,6 +21,7 @@ The cassette uses 2 bits for input, plus a D flipflop and a 74LS221 oneshot, wit
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "machine/z80pio.h"
#include "imagedev/cassette.h"
#include "sound/wave.h"
diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp
index 94ab7f7ca5d..346553ac360 100644
--- a/src/mame/drivers/proteus3.cpp
+++ b/src/mame/drivers/proteus3.cpp
@@ -53,6 +53,7 @@
#include "machine/mc14411.h"
#include "machine/clock.h"
#include "machine/keyboard.h"
+#include "machine/timer.h"
#include "sound/wave.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp
index 6476486f0fa..2fdc7cff951 100644
--- a/src/mame/drivers/px4.cpp
+++ b/src/mame/drivers/px4.cpp
@@ -20,7 +20,7 @@
#include "imagedev/cassette.h"
#include "machine/nvram.h"
#include "machine/ram.h"
-#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "screen.h"
diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp
index 772e5adb3b6..663cae3db26 100644
--- a/src/mame/drivers/quizshow.cpp
+++ b/src/mame/drivers/quizshow.cpp
@@ -16,6 +16,7 @@ TODO:
#include "emu.h"
#include "cpu/s2650/s2650.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "screen.h"
diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp
index dfc300452ec..b8f94aaafcf 100644
--- a/src/mame/drivers/rainbow.cpp
+++ b/src/mame/drivers/rainbow.cpp
@@ -363,6 +363,7 @@ W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND).
#include "machine/clock.h"
#include "machine/dec_lk201.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "machine/ds1315.h"
#include "softlist.h"
diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp
index 4c2cbd8ef9c..710bb3493de 100644
--- a/src/mame/drivers/rastersp.cpp
+++ b/src/mame/drivers/rastersp.cpp
@@ -22,6 +22,7 @@
#include "machine/mc146818.h"
#include "machine/nscsi_hd.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "screen.h"
diff --git a/src/mame/drivers/rd110.cpp b/src/mame/drivers/rd110.cpp
index 4056c8ce42e..cfb2a4c500d 100644
--- a/src/mame/drivers/rd110.cpp
+++ b/src/mame/drivers/rd110.cpp
@@ -21,6 +21,7 @@
#include "cpu/mcs96/i8x9x.h"
#include "machine/nvram.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "video/msm6222b.h"
#include "screen.h"
diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp
index 4d335652dc5..ecf130f3dc8 100644
--- a/src/mame/drivers/rex6000.cpp
+++ b/src/mame/drivers/rex6000.cpp
@@ -34,6 +34,7 @@
#include "machine/bankdev.h"
#include "machine/ram.h"
#include "machine/intelfsh.h"
+#include "machine/timer.h"
#include "imagedev/snapquik.h"
#include "sound/beep.h"
#include "rendlay.h"
diff --git a/src/mame/drivers/rmt32.cpp b/src/mame/drivers/rmt32.cpp
index a77fbc0ab16..de969a57732 100644
--- a/src/mame/drivers/rmt32.cpp
+++ b/src/mame/drivers/rmt32.cpp
@@ -163,6 +163,7 @@ Notes: (All IC's listed for completeness)
#include "emu.h"
#include "cpu/mcs96/i8x9x.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "video/sed1200.h"
#include "screen.h"
diff --git a/src/mame/drivers/rotaryf.cpp b/src/mame/drivers/rotaryf.cpp
index 8aba57fac63..704ad4b028e 100644
--- a/src/mame/drivers/rotaryf.cpp
+++ b/src/mame/drivers/rotaryf.cpp
@@ -18,6 +18,7 @@ driver by Barry Rodewald
#include "cpu/i8085/i8085.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "sound/samples.h"
#include "sound/sn76477.h"
diff --git a/src/mame/drivers/rowamet.cpp b/src/mame/drivers/rowamet.cpp
index 83365b09c6a..74f44a2ab5f 100644
--- a/src/mame/drivers/rowamet.cpp
+++ b/src/mame/drivers/rowamet.cpp
@@ -26,6 +26,7 @@ ToDO:
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "speaker.h"
diff --git a/src/mame/drivers/rzone.cpp b/src/mame/drivers/rzone.cpp
index 795db64d334..ea81616317a 100644
--- a/src/mame/drivers/rzone.cpp
+++ b/src/mame/drivers/rzone.cpp
@@ -30,6 +30,7 @@
#include "emu.h"
#include "includes/hh_sm510.h"
#include "cpu/sm510/sm510.h"
+#include "machine/timer.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp
index 621bcb0c86f..160af321308 100644
--- a/src/mame/drivers/s3.cpp
+++ b/src/mame/drivers/s3.cpp
@@ -42,6 +42,7 @@ ToDo:
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "speaker.h"
diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp
index 9aa71014619..95d34752989 100644
--- a/src/mame/drivers/s4.cpp
+++ b/src/mame/drivers/s4.cpp
@@ -36,6 +36,7 @@ ToDo:
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "speaker.h"
diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp
index 2ca1d2759b1..fe79f805a27 100644
--- a/src/mame/drivers/sbowling.cpp
+++ b/src/mame/drivers/sbowling.cpp
@@ -42,6 +42,7 @@ PROMs : NEC B406 (1kx4) x2
#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "cpu/mcs48/mcs48.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
#include "video/resnet.h"
diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp
index b62061b50b4..4b9506bc092 100644
--- a/src/mame/drivers/scorpion.cpp
+++ b/src/mame/drivers/scorpion.cpp
@@ -6,6 +6,7 @@
#include "includes/spec128.h"
#include "machine/beta.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "formats/tzx_cas.h"
diff --git a/src/mame/drivers/scregg.cpp b/src/mame/drivers/scregg.cpp
index 06d10f5f168..778c6cbf639 100644
--- a/src/mame/drivers/scregg.cpp
+++ b/src/mame/drivers/scregg.cpp
@@ -55,6 +55,7 @@ it as ASCII text.
#include "includes/btime.h"
#include "cpu/m6502/m6502.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "speaker.h"
diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp
index 1575fbd8878..f88c656f852 100644
--- a/src/mame/drivers/segaufo.cpp
+++ b/src/mame/drivers/segaufo.cpp
@@ -45,6 +45,7 @@
#include "cpu/z80/z80.h"
#include "machine/pit8253.h"
#include "machine/315_5296.h"
+#include "machine/timer.h"
#include "sound/2612intf.h"
#include "sound/upd7759.h"
#include "speaker.h"
diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp
index 66518468bb8..c26dcf49347 100644
--- a/src/mame/drivers/sigmab98.cpp
+++ b/src/mame/drivers/sigmab98.cpp
@@ -115,6 +115,7 @@ Notes:
#include "machine/eepromser.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/okim9810.h"
#include "sound/ymz280b.h"
diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp
index 73399954a25..dfc5269ea90 100644
--- a/src/mame/drivers/sliver.cpp
+++ b/src/mame/drivers/sliver.cpp
@@ -69,6 +69,7 @@ Notes:
#include "cpu/m68000/m68000.h"
#include "cpu/mcs51/mcs51.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "video/ramdac.h"
diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp
index b652ead85a8..7e45d9768ef 100644
--- a/src/mame/drivers/smc777.cpp
+++ b/src/mame/drivers/smc777.cpp
@@ -22,6 +22,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "imagedev/flopdrv.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "sound/beep.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp
index 5eca88df13a..a26d4353aee 100644
--- a/src/mame/drivers/spc1500.cpp
+++ b/src/mame/drivers/spc1500.cpp
@@ -228,6 +228,7 @@ TODO:
#include "imagedev/cassette.h"
#include "machine/i8255.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "sound/wave.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/spectra.cpp b/src/mame/drivers/spectra.cpp
index 7009475ed1a..97e64decb75 100644
--- a/src/mame/drivers/spectra.cpp
+++ b/src/mame/drivers/spectra.cpp
@@ -38,6 +38,7 @@
#include "cpu/m6502/m6502.h"
#include "machine/6532riot.h"
+#include "machine/timer.h"
#include "sound/sn76477.h"
#include "speaker.h"
diff --git a/src/mame/drivers/spirit76.cpp b/src/mame/drivers/spirit76.cpp
index df889db063e..85d1eda337d 100644
--- a/src/mame/drivers/spirit76.cpp
+++ b/src/mame/drivers/spirit76.cpp
@@ -24,6 +24,7 @@ Switch at G6 (sw1-4 = free game scores, sw5-8 = config), at G8 (coin chute setti
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
class spirit76_state : public genpin_class
{
diff --git a/src/mame/drivers/sprcros2.cpp b/src/mame/drivers/sprcros2.cpp
index ee4d98adc36..2ce28b64e2f 100644
--- a/src/mame/drivers/sprcros2.cpp
+++ b/src/mame/drivers/sprcros2.cpp
@@ -54,6 +54,7 @@ SC-61.5A
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "sound/sn76496.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp
index 8a417b408b5..b4d283b5316 100644
--- a/src/mame/drivers/spyhuntertec.cpp
+++ b/src/mame/drivers/spyhuntertec.cpp
@@ -20,6 +20,7 @@ sound system appears to be the same as 'spartanxtec.cpp'
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp
index 5e191bdf386..76b2028ba34 100644
--- a/src/mame/drivers/squale.cpp
+++ b/src/mame/drivers/squale.cpp
@@ -61,6 +61,7 @@
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
#include "machine/6850acia.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "sound/ay8910.h"
#include "video/ef9365.h"
diff --git a/src/mame/drivers/st_mp100.cpp b/src/mame/drivers/st_mp100.cpp
index 751ebe438f3..12272c2e772 100644
--- a/src/mame/drivers/st_mp100.cpp
+++ b/src/mame/drivers/st_mp100.cpp
@@ -19,6 +19,7 @@ ToDo:
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "st_mp100.lh"
diff --git a/src/mame/drivers/st_mp200.cpp b/src/mame/drivers/st_mp200.cpp
index ebf7982c975..d5681d5feb1 100644
--- a/src/mame/drivers/st_mp200.cpp
+++ b/src/mame/drivers/st_mp200.cpp
@@ -21,6 +21,7 @@ ToDo:
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "sound/s14001a.h"
#include "speaker.h"
diff --git a/src/mame/drivers/stratos.cpp b/src/mame/drivers/stratos.cpp
index 71b9176eff6..68cc41299d6 100644
--- a/src/mame/drivers/stratos.cpp
+++ b/src/mame/drivers/stratos.cpp
@@ -9,6 +9,7 @@
#include "emu.h"
#include "cpu/m6502/m65c02.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "screen.h"
class stratos_state : public driver_device
diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp
index ad3dd8a922a..f19e4bf33e4 100644
--- a/src/mame/drivers/sun3.cpp
+++ b/src/mame/drivers/sun3.cpp
@@ -185,6 +185,7 @@ fefc34a - start of mem_size, which queries ECC registers for each memory board
#include "machine/nvram.h"
#include "machine/ram.h"
#include "machine/timekpr.h"
+#include "machine/timer.h"
#include "machine/z80scc.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp
index 74a5ff4cb8e..8a62e022085 100644
--- a/src/mame/drivers/sun3x.cpp
+++ b/src/mame/drivers/sun3x.cpp
@@ -137,6 +137,7 @@
#include "formats/pc_dsk.h"
#include "machine/ncr539x.h"
#include "machine/timekpr.h"
+#include "machine/timer.h"
#include "machine/upd765.h"
#include "machine/z80scc.h"
diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp
index 3bc835d1402..b41184813d5 100644
--- a/src/mame/drivers/taito.cpp
+++ b/src/mame/drivers/taito.cpp
@@ -47,6 +47,7 @@ ToDO:
#include "cpu/i8085/i8085.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/votrax.h"
diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp
index 4f1dc486140..d8c9eac7839 100644
--- a/src/mame/drivers/tasman.cpp
+++ b/src/mame/drivers/tasman.cpp
@@ -24,6 +24,7 @@
#include "video/konami_helper.h"
#include "cpu/m68000/m68000.h"
#include "machine/k053252.h"
+#include "machine/timer.h"
#include "video/k053246_k053247_k055673.h"
#include "video/k054156_k054157_k056832.h"
#include "video/k055555.h"
diff --git a/src/mame/drivers/tb303.cpp b/src/mame/drivers/tb303.cpp
index 27826b6288d..7ad32852297 100644
--- a/src/mame/drivers/tb303.cpp
+++ b/src/mame/drivers/tb303.cpp
@@ -16,6 +16,7 @@
#include "emu.h"
#include "includes/hh_ucom4.h"
+#include "machine/timer.h"
#include "tb303.lh"
diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp
index 3010b8bf23b..fa3d5fcbdef 100644
--- a/src/mame/drivers/thedealr.cpp
+++ b/src/mame/drivers/thedealr.cpp
@@ -31,6 +31,7 @@
#include "emu.h"
#include "cpu/m6502/r65c02.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
#include "video/seta001.h"
diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp
index ed887144721..3fc841eabe3 100644
--- a/src/mame/drivers/tispeak.cpp
+++ b/src/mame/drivers/tispeak.cpp
@@ -403,6 +403,7 @@ K28 modules:
#include "bus/generic/carts.h"
#include "bus/generic/slot.h"
+#include "machine/timer.h"
#include "machine/tms6100.h"
#include "sound/tms5110.h"
diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp
index cdec166af41..4e8771a862a 100644
--- a/src/mame/drivers/tk2000.cpp
+++ b/src/mame/drivers/tk2000.cpp
@@ -22,6 +22,7 @@
#include "imagedev/flopdrv.h"
#include "machine/bankdev.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "screen.h"
diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp
index cc046bcb785..a70ccdf9750 100644
--- a/src/mame/drivers/tm990189.cpp
+++ b/src/mame/drivers/tm990189.cpp
@@ -63,6 +63,7 @@
#include "cpu/tms9900/tms9980a.h"
#include "imagedev/cassette.h"
+#include "machine/timer.h"
#include "machine/tms9901.h"
#include "machine/tms9902.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/drivers/tmaster.cpp b/src/mame/drivers/tmaster.cpp
index ec1fa4f6512..260e822c0dd 100644
--- a/src/mame/drivers/tmaster.cpp
+++ b/src/mame/drivers/tmaster.cpp
@@ -96,6 +96,7 @@ Chips:
#include "machine/mc68681.h"
#include "machine/microtch.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/okim6295.h"
#include "video/cesblit.h"
diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp
index 103a92a22ba..c45ddfdb6ce 100644
--- a/src/mame/drivers/tmmjprd.cpp
+++ b/src/mame/drivers/tmmjprd.cpp
@@ -32,6 +32,7 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
+#include "machine/timer.h"
#include "sound/i5000.h"
#include "rendlay.h"
#include "screen.h"
diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp
index 0f4d16d3ab7..285facb2257 100644
--- a/src/mame/drivers/toypop.cpp
+++ b/src/mame/drivers/toypop.cpp
@@ -31,6 +31,7 @@
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
+#include "machine/timer.h"
#include "sound/namco.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/tr606.cpp b/src/mame/drivers/tr606.cpp
index 95a18f94525..ae8d01ea584 100644
--- a/src/mame/drivers/tr606.cpp
+++ b/src/mame/drivers/tr606.cpp
@@ -16,6 +16,7 @@
#include "emu.h"
#include "includes/hh_ucom4.h"
+#include "machine/timer.h"
#include "tr606.lh"
diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp
index 91d5e77cb81..ec0ea6e3a03 100644
--- a/src/mame/drivers/ts803.cpp
+++ b/src/mame/drivers/ts803.cpp
@@ -52,6 +52,7 @@ PAGE SEL bit in PORT0 set to 1:
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/keyboard.h"
+#include "machine/timer.h"
#include "machine/z80dart.h"
#include "machine/wd_fdc.h"
#include "machine/z80sti.h"
diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp
index c5b57d34e27..de760174e13 100644
--- a/src/mame/drivers/vboy.cpp
+++ b/src/mame/drivers/vboy.cpp
@@ -32,6 +32,7 @@
#include "cpu/v810/v810.h"
#include "bus/vboy/slot.h"
#include "bus/vboy/rom.h"
+#include "machine/timer.h"
#include "screen.h"
#include "softlist.h"
#include "speaker.h"
diff --git a/src/mame/drivers/vd.cpp b/src/mame/drivers/vd.cpp
index bfb8022b92f..c788cdb41cc 100644
--- a/src/mame/drivers/vd.cpp
+++ b/src/mame/drivers/vd.cpp
@@ -17,6 +17,7 @@
#include "emu.h"
#include "machine/genpin.h"
+#include "machine/timer.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp
index c460768f086..cd57249f3ed 100644
--- a/src/mame/drivers/vg5k.cpp
+++ b/src/mame/drivers/vg5k.cpp
@@ -54,6 +54,7 @@
#include "imagedev/cassette.h"
#include "imagedev/printer.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "sound/wave.h"
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp
index 0c97984ebc9..1b9945bca0f 100644
--- a/src/mame/drivers/videopkr.cpp
+++ b/src/mame/drivers/videopkr.cpp
@@ -279,6 +279,7 @@
#include "cpu/mcs51/mcs51.h"
#include "machine/i8255.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp
index eae06470722..1b25fcc5577 100644
--- a/src/mame/drivers/viper.cpp
+++ b/src/mame/drivers/viper.cpp
@@ -355,6 +355,7 @@ some other components. It will be documented at a later date.
#include "machine/idehd.h"
#include "machine/lpci.h"
#include "machine/timekpr.h"
+#include "machine/timer.h"
#include "video/voodoo.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/votrpss.cpp b/src/mame/drivers/votrpss.cpp
index 825a2503cca..89da11870af 100644
--- a/src/mame/drivers/votrpss.cpp
+++ b/src/mame/drivers/votrpss.cpp
@@ -74,6 +74,7 @@ Notes:
#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/pit8253.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "sound/votrax.h"
#include "machine/terminal.h"
diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp
index bc12952d55b..4159561cb46 100644
--- a/src/mame/drivers/vt100.cpp
+++ b/src/mame/drivers/vt100.cpp
@@ -26,6 +26,7 @@
#include "cpu/z80/z80.h"
#include "machine/com8116.h"
#include "machine/i8251.h"
+#include "machine/timer.h"
#include "sound/beep.h"
#include "video/vtvideo.h"
#include "screen.h"
diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp
index ae6a9ca04cc..45fc413448f 100644
--- a/src/mame/drivers/wacky_gator.cpp
+++ b/src/mame/drivers/wacky_gator.cpp
@@ -21,6 +21,7 @@
#include "machine/i8255.h"
#include "machine/pit8253.h"
#include "machine/ticket.h"
+#include "machine/timer.h"
#include "sound/msm5205.h"
#include "sound/ym2413.h"
#include "speaker.h"
diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp
index b7a24880081..f236b7eb4cc 100644
--- a/src/mame/drivers/wheelfir.cpp
+++ b/src/mame/drivers/wheelfir.cpp
@@ -210,6 +210,7 @@ suspicious code:
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "screen.h"
diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp
index ad15cdbf6bf..149c4d56a3d 100644
--- a/src/mame/drivers/wico.cpp
+++ b/src/mame/drivers/wico.cpp
@@ -40,6 +40,7 @@ ToDo:
#include "machine/genpin.h"
#include "cpu/m6809/m6809.h"
+#include "machine/timer.h"
#include "sound/sn76496.h"
#include "speaker.h"
diff --git a/src/mame/drivers/wpc_95.cpp b/src/mame/drivers/wpc_95.cpp
index 8a64afddbbb..2278c6d99df 100644
--- a/src/mame/drivers/wpc_95.cpp
+++ b/src/mame/drivers/wpc_95.cpp
@@ -7,6 +7,7 @@
#include "cpu/m6809/m6809.h"
#include "audio/dcs.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "video/wpc_dmd.h"
#include "machine/wpc_pic.h"
#include "machine/wpc_shift.h"
diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp
index 725a5b6d748..797f7b3ad12 100644
--- a/src/mame/drivers/z9001.cpp
+++ b/src/mame/drivers/z9001.cpp
@@ -31,6 +31,7 @@ ToDo:
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "imagedev/cassette.h"
+#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "sound/beep.h"
diff --git a/src/mame/drivers/zac_1.cpp b/src/mame/drivers/zac_1.cpp
index 940fa24dbae..6eb2a5b506d 100644
--- a/src/mame/drivers/zac_1.cpp
+++ b/src/mame/drivers/zac_1.cpp
@@ -33,6 +33,7 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
#include "cpu/s2650/s2650.h"
+#include "machine/timer.h"
#include "zac_1.lh"
class zac_1_state : public genpin_class
diff --git a/src/mame/drivers/zac_2.cpp b/src/mame/drivers/zac_2.cpp
index 33b3333574e..03cd81eff85 100644
--- a/src/mame/drivers/zac_2.cpp
+++ b/src/mame/drivers/zac_2.cpp
@@ -11,6 +11,7 @@
#include "emu.h"
#include "machine/genpin.h"
#include "cpu/s2650/s2650.h"
+#include "machine/timer.h"
#include "zac_2.lh"
class zac_2_state : public driver_device
diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp
index 15920f5eddd..82a659fde36 100644
--- a/src/mame/drivers/zaurus.cpp
+++ b/src/mame/drivers/zaurus.cpp
@@ -1407,6 +1407,7 @@ Note:
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
#include "machine/pxa255.h"
+#include "machine/timer.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp
index 327b9d69277..afc720b5555 100644
--- a/src/mame/drivers/zwackery.cpp
+++ b/src/mame/drivers/zwackery.cpp
@@ -23,6 +23,7 @@
#include "cpu/m68000/m68000.h"
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "screen.h"
#include "speaker.h"
diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h
index 9aed92ff19b..a9f4192f495 100644
--- a/src/mame/includes/1942.h
+++ b/src/mame/includes/1942.h
@@ -7,6 +7,7 @@
***************************************************************************/
#include "machine/gen_latch.h"
+#include "machine/timer.h"
class _1942_state : public driver_device
{
diff --git a/src/mame/includes/3do.h b/src/mame/includes/3do.h
index 03401b01d2b..b8958100e8d 100644
--- a/src/mame/includes/3do.h
+++ b/src/mame/includes/3do.h
@@ -10,6 +10,7 @@
#define _3DO_H_
#include "machine/nvram.h"
+#include "machine/timer.h"
struct SLOW2 {
diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h
index 3f6e1a4f760..fefcf45b1e0 100644
--- a/src/mame/includes/8080bw.h
+++ b/src/mame/includes/8080bw.h
@@ -14,6 +14,7 @@
#include "includes/mw8080bw.h"
#include "machine/eepromser.h"
+#include "machine/timer.h"
#include "sound/sn76477.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h
index 94b97f5deaa..baeb879cdf1 100644
--- a/src/mame/includes/airbustr.h
+++ b/src/mame/includes/airbustr.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "video/kan_pand.h"
#include "screen.h"
diff --git a/src/mame/includes/apple2.h b/src/mame/includes/apple2.h
index 519845d20a1..85a6dbc2e9c 100644
--- a/src/mame/includes/apple2.h
+++ b/src/mame/includes/apple2.h
@@ -20,6 +20,7 @@
#include "machine/kb3600.h"
#include "machine/mos6551.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/includes/apple3.h b/src/mame/includes/apple3.h
index ebb34c4d6ff..bf0a446ee54 100644
--- a/src/mame/includes/apple3.h
+++ b/src/mame/includes/apple3.h
@@ -14,6 +14,7 @@
#include "cpu/m6502/m6502.h"
#include "includes/apple2.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "bus/a2bus/a2bus.h"
#include "machine/mos6551.h"
#include "machine/6522via.h"
diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h
index 9a81014f936..ffd1703a905 100644
--- a/src/mame/includes/argus.h
+++ b/src/mame/includes/argus.h
@@ -1,5 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Yochizo
+
+#include "machine/timer.h"
#include "video/jalblend.h"
#include "screen.h"
diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h
index a5c9a1c96a5..8845b26e4eb 100644
--- a/src/mame/includes/astrof.h
+++ b/src/mame/includes/astrof.h
@@ -6,6 +6,7 @@
****************************************************************************/
+#include "machine/timer.h"
#include "sound/samples.h"
#include "sound/sn76477.h"
#include "screen.h"
diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h
index e0edaf05735..648bc9881b7 100644
--- a/src/mame/includes/atarisy1.h
+++ b/src/mame/includes/atarisy1.h
@@ -8,6 +8,7 @@
#include "machine/74259.h"
#include "machine/atarigen.h"
+#include "machine/timer.h"
#include "sound/tms5220.h"
#include "sound/ym2151.h"
#include "video/atarimo.h"
diff --git a/src/mame/includes/atom.h b/src/mame/includes/atom.h
index 053b2447f3e..b0951ca8943 100644
--- a/src/mame/includes/atom.h
+++ b/src/mame/includes/atom.h
@@ -14,6 +14,7 @@
#include "machine/i8255.h"
#include "machine/i8271.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#include "video/mc6847.h"
diff --git a/src/mame/includes/avigo.h b/src/mame/includes/avigo.h
index d8692e09513..1463e94149e 100644
--- a/src/mame/includes/avigo.h
+++ b/src/mame/includes/avigo.h
@@ -20,6 +20,7 @@
#include "machine/nvram.h"
#include "machine/ram.h"
#include "machine/rp5c01.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
#define AVIGO_NUM_COLOURS 2
diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h
index 316b65907fa..f7ad1bf43d5 100644
--- a/src/mame/includes/badlands.h
+++ b/src/mame/includes/badlands.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "machine/atarigen.h"
+#include "machine/timer.h"
#include "video/atarimo.h"
class badlands_state : public atarigen_state
diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h
index 795f71e55e7..40bef15f176 100644
--- a/src/mame/includes/balsente.h
+++ b/src/mame/includes/balsente.h
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "machine/timer.h"
#include "sound/cem3394.h"
#include "screen.h"
diff --git a/src/mame/includes/beathead.h b/src/mame/includes/beathead.h
index 786cf7a9c6f..7fe2eae5bd6 100644
--- a/src/mame/includes/beathead.h
+++ b/src/mame/includes/beathead.h
@@ -7,6 +7,7 @@
***************************************************************************/
#include "machine/atarigen.h"
+#include "machine/timer.h"
#include "cpu/asap/asap.h"
#include "audio/atarijsa.h"
diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h
index 7fb7094ad49..69ed5f2c904 100644
--- a/src/mame/includes/bionicc.h
+++ b/src/mame/includes/bionicc.h
@@ -8,6 +8,7 @@
***************************************************************************/
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "video/bufsprite.h"
#include "video/tigeroad_spr.h"
diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h
index f944b17062e..b0339261384 100644
--- a/src/mame/includes/bishi.h
+++ b/src/mame/includes/bishi.h
@@ -6,7 +6,7 @@
*************************************************************************/
-
+#include "machine/timer.h"
#include "video/k054156_k054157_k056832.h"
#include "video/k055555.h"
#include "video/k054338.h"
diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h
index 1db91fabf1d..b50a142798b 100644
--- a/src/mame/includes/bladestl.h
+++ b/src/mame/includes/bladestl.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/flt_rc.h"
#include "sound/upd7759.h"
#include "video/k007342.h"
diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h
index 2f6e011a759..5062ef9b1e1 100644
--- a/src/mame/includes/blockout.h
+++ b/src/mame/includes/blockout.h
@@ -8,6 +8,7 @@
***************************************************************************/
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "screen.h"
class blockout_state : public driver_device
diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h
index 3e9a9ca0095..95b0ddf5a96 100644
--- a/src/mame/includes/bsktball.h
+++ b/src/mame/includes/bsktball.h
@@ -6,6 +6,7 @@
*************************************************************************/
+#include "machine/timer.h"
#include "sound/discrete.h"
/* Discrete Sound Input Nodes */
diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h
index ecba25b58e7..edc0b14f1d2 100644
--- a/src/mame/includes/btime.h
+++ b/src/mame/includes/btime.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "machine/input_merger.h"
+#include "machine/timer.h"
#include "screen.h"
class btime_state : public driver_device
diff --git a/src/mame/includes/bullet.h b/src/mame/includes/bullet.h
index 9902d4e2753..63ccb3ec42b 100644
--- a/src/mame/includes/bullet.h
+++ b/src/mame/includes/bullet.h
@@ -9,6 +9,7 @@
#include "bus/centronics/ctronics.h"
#include "machine/ram.h"
#include "bus/scsi/scsi.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
diff --git a/src/mame/includes/busicom.h b/src/mame/includes/busicom.h
index 0809af8f6af..61ffe789048 100644
--- a/src/mame/includes/busicom.h
+++ b/src/mame/includes/busicom.h
@@ -12,6 +12,7 @@
#pragma once
#include "cpu/mcs40/mcs40.h"
+#include "machine/timer.h"
class busicom_state : public driver_device
{
diff --git a/src/mame/includes/bw12.h b/src/mame/includes/bw12.h
index 115748f796e..4448077ed03 100644
--- a/src/mame/includes/bw12.h
+++ b/src/mame/includes/bw12.h
@@ -12,6 +12,7 @@
#include "machine/pit8253.h"
#include "machine/ram.h"
#include "machine/rescap.h"
+#include "machine/timer.h"
#include "machine/upd765.h"
#include "machine/z80dart.h"
#include "video/mc6845.h"
diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h
index 647ad66df59..d78be9c2fa6 100644
--- a/src/mame/includes/cave.h
+++ b/src/mame/includes/cave.h
@@ -10,6 +10,7 @@
#include "machine/eepromser.h"
#include "machine/gen_latch.h"
#include "machine/nmk112.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "screen.h"
diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h
index f152257a275..83e4dd745b7 100644
--- a/src/mame/includes/centiped.h
+++ b/src/mame/includes/centiped.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "machine/eepromser.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "screen.h"
diff --git a/src/mame/includes/cgc7900.h b/src/mame/includes/cgc7900.h
index 2ed507909e3..b70d38f5751 100644
--- a/src/mame/includes/cgc7900.h
+++ b/src/mame/includes/cgc7900.h
@@ -14,6 +14,7 @@
#include "machine/com8116.h"
#include "machine/mm58167.h"
#include "machine/keyboard.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "screen.h"
diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h
index c7af3b0f800..6bb32016d06 100644
--- a/src/mame/includes/champbas.h
+++ b/src/mame/includes/champbas.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "machine/alpha8201.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h
index 0fa5ebc7f4c..d7d904bb8d3 100644
--- a/src/mame/includes/changela.h
+++ b/src/mame/includes/changela.h
@@ -2,6 +2,7 @@
// copyright-holders:Jarek Burczynski, Phil Stroffolino, Tomasz Slanina
#include "cpu/m6805/m68705.h"
+#include "machine/timer.h"
#include "screen.h"
diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h
index a44eb5edaaf..f7021106d21 100644
--- a/src/mame/includes/circus.h
+++ b/src/mame/includes/circus.h
@@ -1,5 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Mike Coates
+
+#include "machine/timer.h"
#include "sound/discrete.h"
#include "sound/samples.h"
diff --git a/src/mame/includes/cischeat.h b/src/mame/includes/cischeat.h
index d000b648521..2f97c171b83 100644
--- a/src/mame/includes/cischeat.h
+++ b/src/mame/includes/cischeat.h
@@ -6,6 +6,7 @@
#include "sound/okim6295.h"
#include "machine/gen_latch.h"
#include "machine/ticket.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "video/ms1_tmap.h"
#include "screen.h"
diff --git a/src/mame/includes/coleco.h b/src/mame/includes/coleco.h
index 63b519240fd..43e9c540669 100644
--- a/src/mame/includes/coleco.h
+++ b/src/mame/includes/coleco.h
@@ -7,6 +7,7 @@
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "sound/sn76496.h"
#include "video/tms9928a.h"
#include "machine/coleco.h"
diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h
index 2516afaf1c1..4c2f0b95395 100644
--- a/src/mame/includes/coolpool.h
+++ b/src/mame/includes/coolpool.h
@@ -3,6 +3,7 @@
#define NVRAM_UNLOCK_SEQ_LEN 10
#include "cpu/tms34010/tms34010.h"
+#include "machine/timer.h"
#include "video/tlc34076.h"
class coolpool_state : public driver_device
diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h
index a8f91277fd2..4c9b66d8ed2 100644
--- a/src/mame/includes/cosmic.h
+++ b/src/mame/includes/cosmic.h
@@ -6,6 +6,7 @@
*************************************************************************/
+#include "machine/timer.h"
#include "sound/samples.h"
#include "sound/dac.h"
#include "screen.h"
diff --git a/src/mame/includes/cosmicos.h b/src/mame/includes/cosmicos.h
index c6042ae8356..ccab84cbc43 100644
--- a/src/mame/includes/cosmicos.h
+++ b/src/mame/includes/cosmicos.h
@@ -10,6 +10,7 @@
#include "imagedev/snapquik.h"
#include "machine/ram.h"
#include "machine/rescap.h"
+#include "machine/timer.h"
#include "sound/cdp1864.h"
#include "sound/spkrdev.h"
#include "video/dm9368.h"
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index 0ec1aebb876..280f46d309c 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -14,6 +14,7 @@
#include "sound/okim6295.h"
#include "machine/gen_latch.h"
#include "machine/timekpr.h"
+#include "machine/timer.h"
#include "cpu/m68000/m68000.h"
#include "screen.h"
diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h
index 2cfb54918e5..856898ca682 100644
--- a/src/mame/includes/darkmist.h
+++ b/src/mame/includes/darkmist.h
@@ -1,6 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood, Nicola Salmoria, Tomasz Slanina
+
#include "audio/t5182.h"
+#include "machine/timer.h"
#include "screen.h"
class darkmist_state : public driver_device
diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h
index cdb61cc0cad..a210bf0d8a0 100644
--- a/src/mame/includes/dbz.h
+++ b/src/mame/includes/dbz.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "machine/k053252.h"
+#include "machine/timer.h"
#include "video/k054156_k054157_k056832.h"
#include "video/k053246_k053247_k055673.h"
#include "video/k053936.h"
diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h
index b03738bebd7..1f755929218 100644
--- a/src/mame/includes/dc.h
+++ b/src/mame/includes/dc.h
@@ -13,6 +13,7 @@
#include "video/powervr2.h"
#include "machine/naomig1.h"
#include "machine/maple-dc.h"
+#include "machine/timer.h"
#include "sound/aica.h"
class dc_state : public driver_device
diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h
index a0b1195b606..645043a6ede 100644
--- a/src/mame/includes/ddragon.h
+++ b/src/mame/includes/ddragon.h
@@ -8,6 +8,7 @@
#include "cpu/m6805/m68705.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/msm5205.h"
#include "screen.h"
diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h
index b506b960e18..e7c20062777 100644
--- a/src/mame/includes/ddragon3.h
+++ b/src/mame/includes/ddragon3.h
@@ -8,6 +8,7 @@
*************************************************************************/
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "video/bufsprite.h"
#include "screen.h"
diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h
index 0b279e536b1..56102852da5 100644
--- a/src/mame/includes/deadang.h
+++ b/src/mame/includes/deadang.h
@@ -1,6 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail, David Haywood
+
#include "audio/seibu.h"
+#include "machine/timer.h"
class deadang_state : public driver_device
{
diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h
index 7e0496f37b3..cdf3c238b03 100644
--- a/src/mame/includes/deco_mlc.h
+++ b/src/mame/includes/deco_mlc.h
@@ -1,7 +1,9 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail
+
#include "machine/eepromser.h"
#include "machine/deco146.h"
+#include "machine/timer.h"
#include "sound/ymz280b.h"
#include "screen.h"
diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h
index 76eb97f060f..99fc4fd61fd 100644
--- a/src/mame/includes/decocass.h
+++ b/src/mame/includes/decocass.h
@@ -9,6 +9,7 @@
#include "machine/decocass_tape.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "cpu/mcs48/mcs48.h"
#include "screen.h"
diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h
index 0f26e4914d7..9768dc8306e 100644
--- a/src/mame/includes/djboy.h
+++ b/src/mame/includes/djboy.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "video/kan_pand.h"
#define PROT_OUTPUT_BUFFER_SIZE 8
diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h
index 7f8b6323efd..10b990e3f5c 100644
--- a/src/mame/includes/dragrace.h
+++ b/src/mame/includes/dragrace.h
@@ -6,6 +6,7 @@
*************************************************************************/
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/discrete.h"
#include "screen.h"
diff --git a/src/mame/includes/einstein.h b/src/mame/includes/einstein.h
index c1d47b339fb..a05ca13f6e9 100644
--- a/src/mame/includes/einstein.h
+++ b/src/mame/includes/einstein.h
@@ -13,6 +13,7 @@
#include "video/mc6845.h"
#include "cpu/z80/z80daisy.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "machine/z80ctc.h"
#include "video/tms9928a.h"
diff --git a/src/mame/includes/eolith.h b/src/mame/includes/eolith.h
index 052eb9f5698..1df41ff5d4f 100644
--- a/src/mame/includes/eolith.h
+++ b/src/mame/includes/eolith.h
@@ -2,6 +2,7 @@
// copyright-holders:Tomasz Slanina,Pierpaolo Prazzoli
#include "cpu/mcs51/mcs51.h"
+#include "machine/timer.h"
#include "sound/qs1000.h"
#include "screen.h"
diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h
index 4072801ebae..adf6878d140 100644
--- a/src/mame/includes/equites.h
+++ b/src/mame/includes/equites.h
@@ -8,6 +8,7 @@
#include "machine/alpha8201.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/samples.h"
#include "sound/msm5232.h"
#include "sound/dac.h"
diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h
index 9f33c630861..3b031f0920c 100644
--- a/src/mame/includes/espial.h
+++ b/src/mame/includes/espial.h
@@ -8,6 +8,7 @@
***************************************************************************/
#include "machine/gen_latch.h"
+#include "machine/timer.h"
class espial_state : public driver_device
{
diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h
index 86002c6a703..558ae79562d 100644
--- a/src/mame/includes/exedexes.h
+++ b/src/mame/includes/exedexes.h
@@ -6,6 +6,7 @@
*************************************************************************/
+#include "machine/timer.h"
#include "video/bufsprite.h"
class exedexes_state : public driver_device
diff --git a/src/mame/includes/exterm.h b/src/mame/includes/exterm.h
index f90cefc0238..9395b6e1c43 100644
--- a/src/mame/includes/exterm.h
+++ b/src/mame/includes/exterm.h
@@ -5,9 +5,11 @@
Gottlieb Exterminator hardware
*************************************************************************/
+
#include "cpu/tms32010/tms32010.h"
#include "cpu/tms34010/tms34010.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
class exterm_state : public driver_device
{
diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h
index 412e0480447..71116e2f1b4 100644
--- a/src/mame/includes/fastlane.h
+++ b/src/mame/includes/fastlane.h
@@ -5,6 +5,8 @@
Fast Lane
*************************************************************************/
+
+#include "machine/timer.h"
#include "sound/k007232.h"
#include "video/k007121.h"
#include "video/k051733.h"
diff --git a/src/mame/includes/fidelbase.h b/src/mame/includes/fidelbase.h
index e1a7452a6c2..4294ea37825 100644
--- a/src/mame/includes/fidelbase.h
+++ b/src/mame/includes/fidelbase.h
@@ -12,6 +12,7 @@
#ifndef DRIVERS_FIDELBASE_H
#define DRIVERS_FIDELBASE_H
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/s14001a.h"
#include "bus/generic/slot.h"
diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h
index 928c9005c52..cb62abcba77 100644
--- a/src/mame/includes/finalizr.h
+++ b/src/mame/includes/finalizr.h
@@ -6,6 +6,8 @@
***************************************************************************/
+#include "machine/timer.h"
+
class finalizr_state : public driver_device
{
public:
diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h
index f41e376d16c..6f6c88cb7a9 100644
--- a/src/mame/includes/firetrk.h
+++ b/src/mame/includes/firetrk.h
@@ -6,6 +6,7 @@ Atari Fire Truck + Super Bug + Monte Carlo driver
*************************************************************************/
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/discrete.h"
#include "screen.h"
diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h
index 4bf30770d7f..8507ce5d069 100644
--- a/src/mame/includes/foodf.h
+++ b/src/mame/includes/foodf.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "machine/atarigen.h"
+#include "machine/timer.h"
#include "machine/x2212.h"
class foodf_state : public atarigen_state
diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h
index 35614343f4f..579da5fdaa7 100644
--- a/src/mame/includes/gaelco2.h
+++ b/src/mame/includes/gaelco2.h
@@ -4,6 +4,7 @@
#include "video/bufsprite.h"
#include "machine/74259.h"
#include "machine/eepromser.h"
+#include "machine/timer.h"
class gaelco2_state : public driver_device
{
diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h
index a214f470444..472bff096f3 100644
--- a/src/mame/includes/gaelco3d.h
+++ b/src/mame/includes/gaelco3d.h
@@ -13,6 +13,7 @@
#include "machine/eepromser.h"
#include "machine/gaelco3d.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "cpu/adsp2100/adsp2100.h"
#include "screen.h"
diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h
index ade4a991688..4d40fc75a04 100644
--- a/src/mame/includes/galaxian.h
+++ b/src/mame/includes/galaxian.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/digitalk.h"
diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h
index c8e9263fb7b..7e9eee4ac5d 100644
--- a/src/mame/includes/galaxold.h
+++ b/src/mame/includes/galaxold.h
@@ -16,6 +16,7 @@
#define __GALAXOLD_H__
#include "machine/7474.h"
+#include "machine/timer.h"
#include "screen.h"
/* star circuit */
diff --git a/src/mame/includes/galpani2.h b/src/mame/includes/galpani2.h
index fb812c9647b..e63a40ed02e 100644
--- a/src/mame/includes/galpani2.h
+++ b/src/mame/includes/galpani2.h
@@ -3,6 +3,7 @@
#include "video/kaneko_spr.h"
#include "sound/okim6295.h"
#include "machine/eepromser.h"
+#include "machine/timer.h"
class galpani2_state : public driver_device
{
diff --git a/src/mame/includes/galpanic.h b/src/mame/includes/galpanic.h
index a07bd526f41..04e10692fe9 100644
--- a/src/mame/includes/galpanic.h
+++ b/src/mame/includes/galpanic.h
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
+#include "machine/timer.h"
#include "video/kan_pand.h"
#include "screen.h"
diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h
index 716fe007caf..f820ee5a0f3 100644
--- a/src/mame/includes/gberet.h
+++ b/src/mame/includes/gberet.h
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "machine/timer.h"
#include "sound/sn76496.h"
class gberet_state : public driver_device
diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h
index 26c1d632953..69bf1ef960e 100644
--- a/src/mame/includes/gradius3.h
+++ b/src/mame/includes/gradius3.h
@@ -5,6 +5,8 @@
Gradius 3
*************************************************************************/
+
+#include "machine/timer.h"
#include "sound/k007232.h"
#include "video/k052109.h"
#include "video/k051960.h"
diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h
index c0439ab4d57..ecde6a130d8 100644
--- a/src/mame/includes/gundealr.h
+++ b/src/mame/includes/gundealr.h
@@ -6,6 +6,8 @@
*************************************************************************/
+#include "machine/timer.h"
+
class gundealr_state : public driver_device
{
public:
diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h
index 7f4d2db4970..b7d436690d0 100644
--- a/src/mame/includes/harddriv.h
+++ b/src/mame/includes/harddriv.h
@@ -25,6 +25,7 @@
#include "machine/eeprompar.h"
#include "machine/mc68681.h"
#include "machine/timekpr.h"
+#include "machine/timer.h"
#include "sound/dac.h"
diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h
index d86ad099504..e537dd77e1e 100644
--- a/src/mame/includes/hexion.h
+++ b/src/mame/includes/hexion.h
@@ -1,6 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
+
#include "machine/k053252.h"
+#include "machine/timer.h"
class hexion_state : public driver_device
{
diff --git a/src/mame/includes/hh_sm510.h b/src/mame/includes/hh_sm510.h
index f8ae2f5eefd..e9fcee8fc6d 100644
--- a/src/mame/includes/hh_sm510.h
+++ b/src/mame/includes/hh_sm510.h
@@ -9,6 +9,7 @@
#ifndef MAME_INCLUDES_HH_SM510_H
#define MAME_INCLUDES_HH_SM510_H
+#include "machine/timer.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/includes/hh_tms1k.h b/src/mame/includes/hh_tms1k.h
index 1d3fcf1034c..7acd2cab738 100644
--- a/src/mame/includes/hh_tms1k.h
+++ b/src/mame/includes/hh_tms1k.h
@@ -18,6 +18,7 @@
#include "cpu/tms1000/tms0980.h"
#include "cpu/tms1000/tms0270.h"
#include "cpu/tms1000/tp0320.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/includes/hh_ucom4.h b/src/mame/includes/hh_ucom4.h
index ca38b68a447..afcd5eca008 100644
--- a/src/mame/includes/hh_ucom4.h
+++ b/src/mame/includes/hh_ucom4.h
@@ -10,6 +10,7 @@
#define MAME_INCLUDES_HH_UCOM4_H
#include "cpu/ucom4/ucom4.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h
index 7c7583ad35e..367cb693463 100644
--- a/src/mame/includes/higemaru.h
+++ b/src/mame/includes/higemaru.h
@@ -6,6 +6,8 @@
*************************************************************************/
+#include "machine/timer.h"
+
class higemaru_state : public driver_device
{
public:
diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h
index d9e873e4a24..9ddcce56a43 100644
--- a/src/mame/includes/hng64.h
+++ b/src/mame/includes/hng64.h
@@ -1,6 +1,8 @@
// license:LGPL-2.1+
// copyright-holders:David Haywood, Angelo Salese, ElSemi, Andrew Gardner
+
#include "machine/msm6242.h"
+#include "machine/timer.h"
#include "cpu/mips/mips3.h"
#include "cpu/nec/v53.h"
#include "sound/l7a1045_l6028_dsp_a.h"
diff --git a/src/mame/includes/hp9845.h b/src/mame/includes/hp9845.h
index 9bb25940ef5..52663f376f0 100644
--- a/src/mame/includes/hp9845.h
+++ b/src/mame/includes/hp9845.h
@@ -12,6 +12,7 @@
#include "bus/hp9845_io/hp9845_io.h"
#include "screen.h"
#include "machine/ram.h"
+#include "machine/timer.h"
class hp9845_base_state : public driver_device
{
diff --git a/src/mame/includes/huebler.h b/src/mame/includes/huebler.h
index 4a6a452f379..63aa6da9818 100644
--- a/src/mame/includes/huebler.h
+++ b/src/mame/includes/huebler.h
@@ -14,6 +14,7 @@
#include "cpu/z80/z80daisy.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/z80pio.h"
#include "machine/z80dart.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h
index fe55ab82db6..14e3397c785 100644
--- a/src/mame/includes/hyprduel.h
+++ b/src/mame/includes/hyprduel.h
@@ -1,5 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Luca Elia, Hau
+
+#include "machine/timer.h"
#include "screen.h"
#define RASTER_LINES 262
diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h
index 334191bd1fd..18194f3e669 100644
--- a/src/mame/includes/ikki.h
+++ b/src/mame/includes/ikki.h
@@ -5,6 +5,8 @@
Ikki
*************************************************************************/
+
+#include "machine/timer.h"
#include "screen.h"
class ikki_state : public driver_device
diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h
index 5c75ee98446..616ceaacefa 100644
--- a/src/mame/includes/iqblock.h
+++ b/src/mame/includes/iqblock.h
@@ -1,5 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria, Ernesto Corvi
+
+#include "machine/timer.h"
+
class iqblock_state : public driver_device
{
public:
diff --git a/src/mame/includes/irobot.h b/src/mame/includes/irobot.h
index 24c53f820cd..61e1bddae81 100644
--- a/src/mame/includes/irobot.h
+++ b/src/mame/includes/irobot.h
@@ -5,6 +5,8 @@
Atari I, Robot hardware
*************************************************************************/
+
+#include "machine/timer.h"
#include "screen.h"
#define IR_TIMING 1 /* try to emulate MB and VG running time */
diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h
index 13ff40a0128..72408c04d71 100644
--- a/src/mame/includes/ironhors.h
+++ b/src/mame/includes/ironhors.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "machine/gen_latch.h"
+#include "machine/timer.h"
class ironhors_state : public driver_device
{
diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h
index 565ee1ed265..124c4ac150b 100644
--- a/src/mame/includes/itech8.h
+++ b/src/mame/includes/itech8.h
@@ -8,6 +8,7 @@
**************************************************************************/
#include "machine/ticket.h"
+#include "machine/timer.h"
#include "video/tlc34076.h"
#include "video/tms34061.h"
#include "screen.h"
diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h
index b03c5037ce0..ede297aec83 100644
--- a/src/mame/includes/jpmimpct.h
+++ b/src/mame/includes/jpmimpct.h
@@ -8,6 +8,7 @@
#include "machine/meters.h"
#include "machine/roc10937.h"
#include "machine/steppers.h"
+#include "machine/timer.h"
#include "cpu/tms34010/tms34010.h"
#include "sound/upd7759.h"
diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h
index d5de260f15c..1c8a1cbd69a 100644
--- a/src/mame/includes/kaneko16.h
+++ b/src/mame/includes/kaneko16.h
@@ -16,6 +16,7 @@
#include "machine/eepromser.h"
#include "machine/kaneko_calc3.h"
#include "machine/kaneko_toybox.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "sound/okim6295.h"
diff --git a/src/mame/includes/kc.h b/src/mame/includes/kc.h
index 25101aebbc6..11de65a5068 100644
--- a/src/mame/includes/kc.h
+++ b/src/mame/includes/kc.h
@@ -12,6 +12,7 @@
/* Devices */
#include "imagedev/cassette.h"
#include "machine/ram.h"
+#include "machine/timer.h"
// Components
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/kim1.h b/src/mame/includes/kim1.h
index 1f951a92e31..8a95faac612 100644
--- a/src/mame/includes/kim1.h
+++ b/src/mame/includes/kim1.h
@@ -14,6 +14,7 @@
#include "softlist.h"
#include "cpu/m6502/m6502.h"
#include "machine/mos6530.h"
+#include "machine/timer.h"
#include "imagedev/cassette.h"
#include "formats/kim1_cas.h"
diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h
index 5ba3bf1a2ee..f5209b98cba 100644
--- a/src/mame/includes/konamigx.h
+++ b/src/mame/includes/konamigx.h
@@ -8,6 +8,7 @@
#include "cpu/tms57002/tms57002.h"
#include "machine/adc083x.h"
#include "machine/k053252.h"
+#include "machine/timer.h"
#include "video/k054156_k054157_k056832.h"
#include "video/k053246_k053247_k055673.h"
#include "video/k055555.h"
diff --git a/src/mame/includes/kyocera.h b/src/mame/includes/kyocera.h
index bfbecb7ebfa..d5a89dccff6 100644
--- a/src/mame/includes/kyocera.h
+++ b/src/mame/includes/kyocera.h
@@ -14,6 +14,7 @@
#include "machine/im6402.h"
#include "machine/ram.h"
#include "machine/rp5c01.h"
+#include "machine/timer.h"
#include "machine/upd1990a.h"
#include "sound/spkrdev.h"
#include "video/hd44102.h"
diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h
index f4a4a8732b7..ff900b05ca2 100644
--- a/src/mame/includes/lastduel.h
+++ b/src/mame/includes/lastduel.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "video/bufsprite.h"
class lastduel_state : public driver_device
diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h
index 64ca83f3f0e..c21c541089d 100644
--- a/src/mame/includes/lazercmd.h
+++ b/src/mame/includes/lazercmd.h
@@ -1,6 +1,8 @@
// license:GPL-2.0+
// copyright-holders:Juergen Buchmueller
+
#include "cpu/s2650/s2650.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#define HORZ_RES 32
diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h
index 12079e46379..f10ffbddfda 100644
--- a/src/mame/includes/m107.h
+++ b/src/mame/includes/m107.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "machine/pic8259.h"
+#include "machine/timer.h"
#include "screen.h"
struct pf_layer_info
diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h
index f2efae5d4d0..e5ef53a24b2 100644
--- a/src/mame/includes/m92.h
+++ b/src/mame/includes/m92.h
@@ -10,6 +10,7 @@
#include "sound/okim6295.h"
#include "machine/gen_latch.h"
#include "machine/pic8259.h"
+#include "machine/timer.h"
#include "screen.h"
struct M92_pf_layer_info
diff --git a/src/mame/includes/mac.h b/src/mame/includes/mac.h
index 20ad7bf9a29..67428390589 100644
--- a/src/mame/includes/mac.h
+++ b/src/mame/includes/mac.h
@@ -14,6 +14,7 @@
#include "machine/8530scc.h"
#include "machine/6522via.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/egret.h"
#include "machine/cuda.h"
#include "bus/nubus/nubus.h"
diff --git a/src/mame/includes/maygay1b.h b/src/mame/includes/maygay1b.h
index d7d40c913a7..bb6cacbd912 100644
--- a/src/mame/includes/maygay1b.h
+++ b/src/mame/includes/maygay1b.h
@@ -22,6 +22,7 @@
#include "sound/ym2413.h"
#include "sound/okim6376.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/upd7759.h"
#include "cpu/mcs51/mcs51.h"
#include "sound/okim6295.h"
diff --git a/src/mame/includes/mc80.h b/src/mame/includes/mc80.h
index a55db5e3aa9..0d091897fdf 100644
--- a/src/mame/includes/mc80.h
+++ b/src/mame/includes/mc80.h
@@ -10,6 +10,7 @@
#define MC80_H_
#include "cpu/z80/z80.h"
+#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "machine/z80dart.h"
diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h
index a7522690288..9e2c02206e2 100644
--- a/src/mame/includes/mcr.h
+++ b/src/mame/includes/mcr.h
@@ -8,6 +8,7 @@
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
+#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "machine/z80dart.h"
diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h
index 370708b2c5b..23968284654 100644
--- a/src/mame/includes/mcr68.h
+++ b/src/mame/includes/mcr68.h
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "audio/midway.h"
#include "audio/williams.h"
diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h
index 5d4042ec790..993ac96b0aa 100644
--- a/src/mame/includes/megasys1.h
+++ b/src/mame/includes/megasys1.h
@@ -9,6 +9,7 @@
***************************************************************************/
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "video/ms1_tmap.h"
#include "screen.h"
diff --git a/src/mame/includes/mhavoc.h b/src/mame/includes/mhavoc.h
index 711fbf746ff..b0bfadbafb5 100644
--- a/src/mame/includes/mhavoc.h
+++ b/src/mame/includes/mhavoc.h
@@ -6,6 +6,8 @@
*************************************************************************/
+#include "machine/timer.h"
+
#define MHAVOC_CLOCK 10000000
#define MHAVOC_CLOCK_5M (MHAVOC_CLOCK/2)
#define MHAVOC_CLOCK_2_5M (MHAVOC_CLOCK/4)
diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h
index 24416bcaf38..7401afc1b07 100644
--- a/src/mame/includes/midvunit.h
+++ b/src/mame/includes/midvunit.h
@@ -9,6 +9,7 @@
#include "video/poly.h"
#include "audio/dcs.h"
#include "machine/midwayic.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "screen.h"
diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h
index 46a8c1e534c..f244ab7df1e 100644
--- a/src/mame/includes/mitchell.h
+++ b/src/mame/includes/mitchell.h
@@ -10,6 +10,7 @@
#include "machine/nvram.h"
#include "machine/eepromser.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/msm5205.h"
#include "sound/okim6295.h"
diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h
index c4e4d10f86a..909437f0572 100644
--- a/src/mame/includes/model1.h
+++ b/src/mame/includes/model1.h
@@ -12,6 +12,7 @@
#include "cpu/v60/v60.h"
#include "machine/i8251.h"
#include "machine/m1comm.h"
+#include "machine/timer.h"
#include "video/segaic24.h"
#include "screen.h"
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index 72d0b0bb7d4..560af94e7b5 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -11,6 +11,7 @@
#include "machine/315-5881_crypt.h"
#include "machine/315-5838_317-0229_comp.h"
#include "machine/m2comm.h"
+#include "machine/timer.h"
#include "screen.h"
class model2_renderer;
diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h
index 053d7b86dea..37cc79d900b 100644
--- a/src/mame/includes/model3.h
+++ b/src/mame/includes/model3.h
@@ -10,6 +10,7 @@
#include "sound/scsp.h"
#include "machine/315-5881_crypt.h"
#include "machine/msm6242.h"
+#include "machine/timer.h"
#include "screen.h"
typedef float MATRIX[4][4];
diff --git a/src/mame/includes/mpf1.h b/src/mame/includes/mpf1.h
index 1cef6031529..ec2807365cb 100644
--- a/src/mame/includes/mpf1.h
+++ b/src/mame/includes/mpf1.h
@@ -11,6 +11,7 @@
#include "cpu/z80/z80daisy.h"
#include "imagedev/cassette.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h
index d0eaa5658a9..ac8e8747ad3 100644
--- a/src/mame/includes/mpu4.h
+++ b/src/mame/includes/mpu4.h
@@ -4,6 +4,7 @@
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "cpu/m6809/m6809.h"
#include "sound/ay8910.h"
diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h
index 80a9c07d6c9..f801b6a57e3 100644
--- a/src/mame/includes/mrflea.h
+++ b/src/mame/includes/mrflea.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "machine/pic8259.h"
+#include "machine/timer.h"
#include "screen.h"
class mrflea_state : public driver_device
diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h
index 922e62de742..cd6c54ec1a7 100644
--- a/src/mame/includes/ms32.h
+++ b/src/mame/includes/ms32.h
@@ -2,6 +2,7 @@
// copyright-holders:David Haywood,Paul Priest
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "screen.h"
class ms32_state : public driver_device
diff --git a/src/mame/includes/mtx.h b/src/mame/includes/mtx.h
index a9d5ca88fad..f52d468e3cd 100644
--- a/src/mame/includes/mtx.h
+++ b/src/mame/includes/mtx.h
@@ -16,6 +16,7 @@
#include "machine/z80ctc.h"
#include "sound/sn76496.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#define Z80_TAG "z80"
#define Z80CTC_TAG "z80ctc"
diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h
index 73e155633aa..752f3a4b48d 100644
--- a/src/mame/includes/mustache.h
+++ b/src/mame/includes/mustache.h
@@ -1,6 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Tomasz Slanina
+
#include "audio/seibu.h" // for seibu_sound_decrypt on the MAIN cpu (not sound)
+#include "machine/timer.h"
#include "screen.h"
class mustache_state : public driver_device
diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h
index ad87c7c7619..304262d0b0b 100644
--- a/src/mame/includes/mw8080bw.h
+++ b/src/mame/includes/mw8080bw.h
@@ -8,6 +8,7 @@
****************************************************************************/
#include "machine/mb14241.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/discrete.h"
#include "sound/sn76477.h"
diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h
index c764dd6e200..f49ceb2ec00 100644
--- a/src/mame/includes/mystwarr.h
+++ b/src/mame/includes/mystwarr.h
@@ -9,6 +9,7 @@
#include "video/k055555.h"
#include "video/k054000.h"
#include "machine/k054321.h"
+#include "machine/timer.h"
class mystwarr_state : public konamigx_state
{
diff --git a/src/mame/includes/mz700.h b/src/mame/includes/mz700.h
index e338524083c..2c080e18f9b 100644
--- a/src/mame/includes/mz700.h
+++ b/src/mame/includes/mz700.h
@@ -16,6 +16,7 @@
#include "machine/i8255.h"
#include "machine/pit8253.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/z80pio.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/includes/mz80.h b/src/mame/includes/mz80.h
index beca6caaecd..42011f4f7a2 100644
--- a/src/mame/includes/mz80.h
+++ b/src/mame/includes/mz80.h
@@ -12,6 +12,7 @@
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/pit8253.h"
+#include "machine/timer.h"
#include "imagedev/cassette.h"
#include "sound/spkrdev.h"
#include "sound/wave.h"
diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h
index fc4a161da00..ef85ee0dea4 100644
--- a/src/mame/includes/n8080.h
+++ b/src/mame/includes/n8080.h
@@ -1,6 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Pierpaolo Prazzoli
+
#include "cpu/mcs48/mcs48.h"
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/sn76477.h"
#include "screen.h"
diff --git a/src/mame/includes/namcofl.h b/src/mame/includes/namcofl.h
index ad11303c9b3..6553351440e 100644
--- a/src/mame/includes/namcofl.h
+++ b/src/mame/includes/namcofl.h
@@ -1,6 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont, ElSemi
+
#include "namcos2.h"
+#include "machine/timer.h"
#include "video/namco_c116.h"
#define NAMCOFL_HTOTAL (288) /* wrong */
diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h
index ea2881d36d3..d949d7e424d 100644
--- a/src/mame/includes/namcona1.h
+++ b/src/mame/includes/namcona1.h
@@ -7,6 +7,7 @@
***************************************************************************/
#include "machine/eeprompar.h"
+#include "machine/timer.h"
#include "sound/c140.h"
#include "screen.h"
diff --git a/src/mame/includes/namconb1.h b/src/mame/includes/namconb1.h
index 7834741df7f..9aac87fd502 100644
--- a/src/mame/includes/namconb1.h
+++ b/src/mame/includes/namconb1.h
@@ -8,6 +8,7 @@
#include "namcos2.h"
#include "machine/eeprompar.h"
+#include "machine/timer.h"
#include "video/namco_c116.h"
#define NAMCONB1_HTOTAL (288) /* wrong */
diff --git a/src/mame/includes/namcos2.h b/src/mame/includes/namcos2.h
index 05a67e643ec..7702a19e0fd 100644
--- a/src/mame/includes/namcos2.h
+++ b/src/mame/includes/namcos2.h
@@ -10,6 +10,7 @@
#include "machine/namco_c139.h"
#include "machine/namco_c148.h"
+#include "machine/timer.h"
#include "video/c45.h"
#include "cpu/m6502/m3745x.h"
diff --git a/src/mame/includes/namcos21.h b/src/mame/includes/namcos21.h
index 1816bf5f557..c01bf0f0533 100644
--- a/src/mame/includes/namcos21.h
+++ b/src/mame/includes/namcos21.h
@@ -6,6 +6,7 @@
#include "namcos2.h"
#include "machine/namcoio_gearbox.h"
+#include "machine/timer.h"
#define NAMCOS21_POLY_FRAME_WIDTH 496
#define NAMCOS21_POLY_FRAME_HEIGHT 480
diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h
index 26f694d8273..8e07c0199ac 100644
--- a/src/mame/includes/namcos22.h
+++ b/src/mame/includes/namcos22.h
@@ -7,6 +7,7 @@
***************************************************************************/
#include "machine/eeprompar.h"
+#include "machine/timer.h"
#include "video/rgbutil.h"
#include "video/poly.h"
#include "screen.h"
diff --git a/src/mame/includes/nc.h b/src/mame/includes/nc.h
index 1d362bcb1d2..e678383ebac 100644
--- a/src/mame/includes/nc.h
+++ b/src/mame/includes/nc.h
@@ -14,6 +14,7 @@
#include "machine/clock.h"
#include "machine/ram.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "sound/beep.h"
#include "bus/generic/slot.h"
diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h
index c29251de962..e8a7708c002 100644
--- a/src/mame/includes/nemesis.h
+++ b/src/mame/includes/nemesis.h
@@ -1,5 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Bryan McPhail
+
+#include "machine/timer.h"
#include "sound/flt_rc.h"
#include "sound/k007232.h"
#include "sound/k005289.h"
diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h
index d4b2e9aa5fd..b3d98e4c3df 100644
--- a/src/mame/includes/nitedrvr.h
+++ b/src/mame/includes/nitedrvr.h
@@ -6,6 +6,7 @@
*************************************************************************/
+#include "machine/timer.h"
#include "sound/discrete.h"
/* Discrete Sound Input Nodes */
diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h
index 982192ba741..857e64f4041 100644
--- a/src/mame/includes/nmk16.h
+++ b/src/mame/includes/nmk16.h
@@ -6,6 +6,7 @@
#include "sound/okim6295.h"
#include "machine/nmk004.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
class nmk16_state : public driver_device
{
diff --git a/src/mame/includes/novagbase.h b/src/mame/includes/novagbase.h
index bbeaf685bc0..475769113bb 100644
--- a/src/mame/includes/novagbase.h
+++ b/src/mame/includes/novagbase.h
@@ -12,6 +12,7 @@
#ifndef DRIVERS_NOVAGBASE_H
#define DRIVERS_NOVAGBASE_H
+#include "machine/timer.h"
#include "sound/dac.h"
#include "sound/beep.h"
#include "video/hd44780.h"
diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h
index e2f66a5cba3..63a3a90c1a6 100644
--- a/src/mame/includes/orbit.h
+++ b/src/mame/includes/orbit.h
@@ -11,6 +11,7 @@
#pragma once
#include "machine/74259.h"
+#include "machine/timer.h"
#include "sound/discrete.h"
#include "screen.h"
diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h
index bbfba5fe516..a573199e8d4 100644
--- a/src/mame/includes/overdriv.h
+++ b/src/mame/includes/overdriv.h
@@ -5,7 +5,9 @@
Over Drive
*************************************************************************/
+
#include "machine/k053252.h"
+#include "machine/timer.h"
#include "video/k051316.h"
#include "video/k053246_k053247_k055673.h"
#include "video/k053251.h"
diff --git a/src/mame/includes/pc8401a.h b/src/mame/includes/pc8401a.h
index d0053891473..07f3e6bb3e6 100644
--- a/src/mame/includes/pc8401a.h
+++ b/src/mame/includes/pc8401a.h
@@ -10,6 +10,7 @@
#include "machine/i8255.h"
#include "machine/i8251.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/upd1990a.h"
#include "video/mc6845.h"
#include "video/sed1330.h"
diff --git a/src/mame/includes/pc9801.h b/src/mame/includes/pc9801.h
index 1d666dd4674..3ffe85d7dc4 100644
--- a/src/mame/includes/pc9801.h
+++ b/src/mame/includes/pc9801.h
@@ -20,6 +20,7 @@
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/upd1990a.h"
#include "machine/upd765.h"
diff --git a/src/mame/includes/pcw.h b/src/mame/includes/pcw.h
index 5e44dee0c44..85073d2a0ce 100644
--- a/src/mame/includes/pcw.h
+++ b/src/mame/includes/pcw.h
@@ -11,6 +11,7 @@
#include "machine/upd765.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/beep.h"
#include "screen.h"
diff --git a/src/mame/includes/pcw16.h b/src/mame/includes/pcw16.h
index 343fd86bf89..ef901a00b0f 100644
--- a/src/mame/includes/pcw16.h
+++ b/src/mame/includes/pcw16.h
@@ -19,6 +19,7 @@
#include "machine/intelfsh.h"
#include "formats/pc_dsk.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#define PCW16_BORDER_HEIGHT 8
#define PCW16_BORDER_WIDTH 8
diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h
index 22afae585db..98e7e8b8562 100644
--- a/src/mame/includes/pgm.h
+++ b/src/mame/includes/pgm.h
@@ -14,6 +14,7 @@
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
+#include "machine/timer.h"
#include "machine/v3021.h"
#include "sound/ics2115.h"
diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h
index bac709a81fd..fb43d757c0a 100644
--- a/src/mame/includes/pingpong.h
+++ b/src/mame/includes/pingpong.h
@@ -1,5 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Jarek Parchanski
+
+#include "machine/timer.h"
+
class pingpong_state : public driver_device
{
public:
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index e0a6e6ac23e..f20a8988969 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -12,6 +12,7 @@
#include "machine/74259.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/namco.h"
#include "sound/discrete.h"
#include "screen.h"
diff --git a/src/mame/includes/psion.h b/src/mame/includes/psion.h
index f096f46ae1d..ac635097caf 100644
--- a/src/mame/includes/psion.h
+++ b/src/mame/includes/psion.h
@@ -14,6 +14,7 @@
#include "cpu/m6800/m6801.h"
#include "machine/nvram.h"
#include "machine/psion_pack.h"
+#include "machine/timer.h"
#include "video/hd44780.h"
#include "sound/beep.h"
diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h
index 768ce2088e3..c4aba904c71 100644
--- a/src/mame/includes/psychic5.h
+++ b/src/mame/includes/psychic5.h
@@ -1,6 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Jarek Parchanski
+
#include "machine/bankdev.h"
+#include "machine/timer.h"
#include "video/jalblend.h"
class psychic5_state : public driver_device
diff --git a/src/mame/includes/qdrmfgp.h b/src/mame/includes/qdrmfgp.h
index 4d2b29d0dbb..400b063f9bc 100644
--- a/src/mame/includes/qdrmfgp.h
+++ b/src/mame/includes/qdrmfgp.h
@@ -1,6 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Hau
+
#include "machine/ataintf.h"
+#include "machine/timer.h"
#include "sound/k054539.h"
#include "machine/k053252.h"
#include "video/konami_helper.h"
diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h
index dd5e477e715..24a993e5ffc 100644
--- a/src/mame/includes/renegade.h
+++ b/src/mame/includes/renegade.h
@@ -4,6 +4,7 @@
#include "machine/taito68705interface.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/msm5205.h"
class renegade_state : public driver_device
diff --git a/src/mame/includes/saturn.h b/src/mame/includes/saturn.h
index 83b2d52a2c2..e8ff0b7e85d 100644
--- a/src/mame/includes/saturn.h
+++ b/src/mame/includes/saturn.h
@@ -3,6 +3,7 @@
#include "cdrom.h"
#include "machine/eepromser.h"
+#include "machine/timer.h"
#include "cpu/m68000/m68000.h"
#include "cpu/adsp2100/adsp2100.h"
#include "cpu/scudsp/scudsp.h"
diff --git a/src/mame/includes/segaorun.h b/src/mame/includes/segaorun.h
index d06a1ff66bf..5cdd41ebdcc 100644
--- a/src/mame/includes/segaorun.h
+++ b/src/mame/includes/segaorun.h
@@ -12,6 +12,7 @@
#include "machine/gen_latch.h"
#include "machine/nvram.h"
#include "machine/segaic16.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "video/segaic16.h"
#include "video/segaic16_road.h"
diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h
index 27e159c4396..2d4410ccb73 100644
--- a/src/mame/includes/segas24.h
+++ b/src/mame/includes/segas24.h
@@ -5,6 +5,7 @@
*
*/
+#include "machine/timer.h"
#include "video/segaic24.h"
#include "sound/dac.h"
#include "screen.h"
diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h
index e4080dbd495..b100cb53a41 100644
--- a/src/mame/includes/segas32.h
+++ b/src/mame/includes/segas32.h
@@ -12,6 +12,7 @@
#include "sound/multipcm.h"
#include "machine/s32comm.h"
+#include "machine/timer.h"
#include "screen.h"
diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h
index 225a015b9aa..e1c48f8c04a 100644
--- a/src/mame/includes/seta.h
+++ b/src/mame/includes/seta.h
@@ -10,6 +10,7 @@
#include "machine/74157.h"
#include "machine/gen_latch.h"
#include "machine/ticket.h"
+#include "machine/timer.h"
#include "machine/upd4701.h"
#include "machine/upd4992.h"
#include "sound/x1_010.h"
diff --git a/src/mame/includes/seta2.h b/src/mame/includes/seta2.h
index 56f6bf7ef61..549073be754 100644
--- a/src/mame/includes/seta2.h
+++ b/src/mame/includes/seta2.h
@@ -9,6 +9,7 @@
#include "machine/tmp68301.h"
#include "machine/eepromser.h"
#include "machine/intelfsh.h"
+#include "machine/timer.h"
#include "machine/upd4992.h"
#include "sound/okim9810.h"
#include "sound/x1_010.h"
diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h
index 0148460b72b..26704c26f74 100644
--- a/src/mame/includes/shadfrce.h
+++ b/src/mame/includes/shadfrce.h
@@ -2,6 +2,7 @@
// copyright-holders:David Haywood
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "screen.h"
diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h
index 0efe76a3b71..3d126ecf822 100644
--- a/src/mame/includes/shaolins.h
+++ b/src/mame/includes/shaolins.h
@@ -1,5 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Allard van der Bas
+
+#include "machine/timer.h"
+
class shaolins_state : public driver_device
{
public:
diff --git a/src/mame/includes/simple_st0016.h b/src/mame/includes/simple_st0016.h
index 098a17d52b5..e417391212c 100644
--- a/src/mame/includes/simple_st0016.h
+++ b/src/mame/includes/simple_st0016.h
@@ -2,6 +2,7 @@
// copyright-holders:Tomasz Slanina
#include "machine/st0016.h"
+#include "machine/timer.h"
#include "screen.h"
class st0016_state : public driver_device
diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h
index 489207fe3b0..c158f772752 100644
--- a/src/mame/includes/skullxbo.h
+++ b/src/mame/includes/skullxbo.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "machine/atarigen.h"
+#include "machine/timer.h"
#include "audio/atarijsa.h"
#include "video/atarimo.h"
diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h
index 3538845b0d5..d429c80e065 100644
--- a/src/mame/includes/snk6502.h
+++ b/src/mame/includes/snk6502.h
@@ -10,6 +10,7 @@
#pragma once
+#include "machine/timer.h"
class snk6502_sound_device;
diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h
index d51287491fe..35ddc0aab63 100644
--- a/src/mame/includes/snowbros.h
+++ b/src/mame/includes/snowbros.h
@@ -2,6 +2,7 @@
// copyright-holders:David Haywood, Mike Coates
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/okim6295.h"
#include "video/kan_pand.h" // for the original pandora
diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h
index 1f97cf91465..e25104be042 100644
--- a/src/mame/includes/spdodgeb.h
+++ b/src/mame/includes/spdodgeb.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/msm5205.h"
#include "screen.h"
diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h
index 0d7404f56a6..64fae4a065e 100644
--- a/src/mame/includes/sprint8.h
+++ b/src/mame/includes/sprint8.h
@@ -1,6 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Stefan Jokisch
+
#include "machine/74259.h"
+#include "machine/timer.h"
#include "sound/discrete.h"
#include "screen.h"
diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h
index 43728d45292..7caa9852d58 100644
--- a/src/mame/includes/srumbler.h
+++ b/src/mame/includes/srumbler.h
@@ -1,5 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Paul Leaman
+
+#include "machine/timer.h"
#include "video/bufsprite.h"
class srumbler_state : public driver_device
diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h
index 7ae04442df6..6803750ad05 100644
--- a/src/mame/includes/ssv.h
+++ b/src/mame/includes/ssv.h
@@ -1,8 +1,10 @@
// license:BSD-3-Clause
// copyright-holders:Luca Elia
+
#include "cpu/upd7725/upd7725.h"
#include "video/st0020.h"
#include "machine/eepromser.h"
+#include "machine/timer.h"
#include "machine/upd4701.h"
#include "sound/es5506.h"
#include "screen.h"
diff --git a/src/mame/includes/strnskil.h b/src/mame/includes/strnskil.h
index 0b594da9120..73d7fd91877 100644
--- a/src/mame/includes/strnskil.h
+++ b/src/mame/includes/strnskil.h
@@ -1,5 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Uki
+
+#include "machine/timer.h"
+
class strnskil_state : public driver_device
{
public:
diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h
index ebab20075d6..c6f0d4232d3 100644
--- a/src/mame/includes/suna16.h
+++ b/src/mame/includes/suna16.h
@@ -2,6 +2,7 @@
// copyright-holders:Luca Elia
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "screen.h"
class suna16_state : public driver_device
diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h
index f618254f899..0e913e83e43 100644
--- a/src/mame/includes/suna8.h
+++ b/src/mame/includes/suna8.h
@@ -2,6 +2,7 @@
// copyright-holders:Luca Elia
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/samples.h"
#include "screen.h"
diff --git a/src/mame/includes/super6.h b/src/mame/includes/super6.h
index 5470b1567bc..66056566f30 100644
--- a/src/mame/includes/super6.h
+++ b/src/mame/includes/super6.h
@@ -9,6 +9,7 @@
#include "cpu/z80/z80daisy.h"
#include "machine/com8116.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h
index 66402fae33d..a94540f4f8e 100644
--- a/src/mame/includes/super80.h
+++ b/src/mame/includes/super80.h
@@ -11,6 +11,7 @@
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
#include "machine/buffer.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "machine/z80dma.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h
index 73733f83bd4..8878f44cc06 100644
--- a/src/mame/includes/suprnova.h
+++ b/src/mame/includes/suprnova.h
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood, Sylvain Glaize, Paul Priest, Olivier Galibert
+#include "machine/timer.h"
#include "video/sknsspr.h"
#include "cpu/sh2/sh2.h"
diff --git a/src/mame/includes/svision.h b/src/mame/includes/svision.h
index 4e98c277c37..0b699a53c59 100644
--- a/src/mame/includes/svision.h
+++ b/src/mame/includes/svision.h
@@ -10,6 +10,7 @@
#define SVISION_H_
#include "cpu/m6502/m65c02.h"
+#include "machine/timer.h"
#include "audio/svis_snd.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h
index f9975dbe464..c1a1a8af046 100644
--- a/src/mame/includes/system1.h
+++ b/src/mame/includes/system1.h
@@ -5,6 +5,7 @@
#include "machine/gen_latch.h"
#include "machine/i8255.h"
#include "machine/segacrp2_device.h"
+#include "machine/timer.h"
#include "screen.h"
class system1_state : public driver_device
diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h
index d73991e4bc4..d1ae6ae89e4 100644
--- a/src/mame/includes/taito_l.h
+++ b/src/mame/includes/taito_l.h
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
#include "machine/74157.h"
+#include "machine/timer.h"
#include "machine/upd4701.h"
#include "sound/msm5205.h"
#include "sound/2203intf.h"
diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h
index 04ee97ec5f3..ab8ec9b43f1 100644
--- a/src/mame/includes/taito_o.h
+++ b/src/mame/includes/taito_o.h
@@ -6,6 +6,7 @@
*************************************************************************/
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "video/tc0080vco.h"
diff --git a/src/mame/includes/tandy2k.h b/src/mame/includes/tandy2k.h
index 573aa33a75f..818da73a760 100644
--- a/src/mame/includes/tandy2k.h
+++ b/src/mame/includes/tandy2k.h
@@ -15,6 +15,7 @@
#include "machine/pic8259.h"
#include "machine/ram.h"
#include "machine/tandy2kb.h"
+#include "machine/timer.h"
#include "machine/upd765.h"
#include "sound/spkrdev.h"
#include "video/crt9007.h"
diff --git a/src/mame/includes/tek405x.h b/src/mame/includes/tek405x.h
index cf4c3341c08..ecae3626410 100644
--- a/src/mame/includes/tek405x.h
+++ b/src/mame/includes/tek405x.h
@@ -15,7 +15,7 @@
#include "machine/6850acia.h"
#include "machine/clock.h"
#include "machine/ram.h"
-#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/spkrdev.h"
diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h
index f1401f5d27c..7fdd23ef5cb 100644
--- a/src/mame/includes/thedeep.h
+++ b/src/mame/includes/thedeep.h
@@ -2,6 +2,7 @@
// copyright-holders:Luca Elia
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "video/decmxc06.h"
diff --git a/src/mame/includes/ti89.h b/src/mame/includes/ti89.h
index 7c6b8f56d48..64bb84917dd 100644
--- a/src/mame/includes/ti89.h
+++ b/src/mame/includes/ti89.h
@@ -10,6 +10,7 @@
#define TI89_H_
#include "machine/intelfsh.h"
+#include "machine/timer.h"
class ti68k_state : public driver_device
{
diff --git a/src/mame/includes/tiki100.h b/src/mame/includes/tiki100.h
index 299bd033d86..ac67c00dc2c 100644
--- a/src/mame/includes/tiki100.h
+++ b/src/mame/includes/tiki100.h
@@ -13,6 +13,7 @@
#include "formats/tiki100_dsk.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/tmc600.h b/src/mame/includes/tmc600.h
index 3519f210718..a5fdc19f956 100644
--- a/src/mame/includes/tmc600.h
+++ b/src/mame/includes/tmc600.h
@@ -11,6 +11,7 @@
#include "imagedev/snapquik.h"
#include "bus/centronics/ctronics.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/cdp1869.h"
#define SCREEN_TAG "screen"
diff --git a/src/mame/includes/trs80m2.h b/src/mame/includes/trs80m2.h
index 43ed53db42b..be42ec9c49c 100644
--- a/src/mame/includes/trs80m2.h
+++ b/src/mame/includes/trs80m2.h
@@ -14,6 +14,7 @@
#include "machine/keyboard.h"
#include "machine/pic8259.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "machine/trs80m2kb.h"
#include "machine/wd_fdc.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/includes/v1050.h b/src/mame/includes/v1050.h
index 16056093234..f56c6b22840 100644
--- a/src/mame/includes/v1050.h
+++ b/src/mame/includes/v1050.h
@@ -17,6 +17,7 @@
#include "machine/i8255.h"
#include "machine/msm58321.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "bus/scsi/scsi.h"
#include "bus/scsi/scsihd.h"
#include "machine/v1050kb.h"
diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h
index c500aba30d8..04ff4b18aed 100644
--- a/src/mame/includes/vball.h
+++ b/src/mame/includes/vball.h
@@ -2,6 +2,7 @@
// copyright-holders:Paul Hampson
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "screen.h"
class vball_state : public driver_device
diff --git a/src/mame/includes/vcs80.h b/src/mame/includes/vcs80.h
index c44d8014f2b..5bb587bdb7b 100644
--- a/src/mame/includes/vcs80.h
+++ b/src/mame/includes/vcs80.h
@@ -11,6 +11,7 @@
#include "machine/z80pio.h"
#include "machine/ram.h"
#include "machine/bankdev.h"
+#include "machine/timer.h"
#define SCREEN_TAG "screen"
#define Z80_TAG "z80"
diff --git a/src/mame/includes/vicdual.h b/src/mame/includes/vicdual.h
index bca3a20eae6..7d106ddb885 100644
--- a/src/mame/includes/vicdual.h
+++ b/src/mame/includes/vicdual.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "cpu/mcs48/mcs48.h"
+#include "machine/timer.h"
#include "sound/ay8910.h"
#include "sound/discrete.h"
#include "sound/samples.h"
diff --git a/src/mame/includes/vixen.h b/src/mame/includes/vixen.h
index 969dbd7b151..0873a9cbfa2 100644
--- a/src/mame/includes/vixen.h
+++ b/src/mame/includes/vixen.h
@@ -9,6 +9,7 @@
#include "cpu/z80/z80.h"
#include "machine/i8155.h"
#include "machine/i8251.h"
+#include "machine/timer.h"
#include "bus/ieee488/ieee488.h"
#include "machine/ram.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h
index 901bf63b791..2fa3508c51c 100644
--- a/src/mame/includes/wecleman.h
+++ b/src/mame/includes/wecleman.h
@@ -2,6 +2,7 @@
// copyright-holders:Luca Elia
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/k007232.h"
#include "video/k051316.h"
#include "screen.h"
diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h
index 567013ca6bc..7661ddb6264 100644
--- a/src/mame/includes/williams.h
+++ b/src/mame/includes/williams.h
@@ -11,6 +11,7 @@
#include "cpu/m6800/m6800.h"
#include "sound/hc55516.h"
#include "machine/ticket.h"
+#include "machine/timer.h"
#include "machine/watchdog.h"
#include "machine/6821pia.h"
#include "machine/bankdev.h"
diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h
index 064ac366849..e4bd246d11a 100644
--- a/src/mame/includes/wwfsstar.h
+++ b/src/mame/includes/wwfsstar.h
@@ -2,6 +2,7 @@
// copyright-holders:David Haywood
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "screen.h"
class wwfsstar_state : public driver_device
diff --git a/src/mame/includes/x07.h b/src/mame/includes/x07.h
index 89d20d835d7..7e50cc3c0af 100644
--- a/src/mame/includes/x07.h
+++ b/src/mame/includes/x07.h
@@ -10,6 +10,7 @@
#include "sound/beep.h"
#include "machine/nvram.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "sound/wave.h"
#include "imagedev/cassette.h"
#include "imagedev/printer.h"
diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h
index 0abab512956..fa3b9f2d4df 100644
--- a/src/mame/includes/x1.h
+++ b/src/mame/includes/x1.h
@@ -16,6 +16,7 @@
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
#include "machine/i8255.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "machine/z80dma.h"
#include "video/mc6845.h"
diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h
index aaa19f9eedc..ec571256165 100644
--- a/src/mame/includes/xain.h
+++ b/src/mame/includes/xain.h
@@ -4,6 +4,7 @@
#include "machine/taito68705interface.h"
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "screen.h"
class xain_state : public driver_device
diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h
index b3f3fbdd8bf..03f747b932b 100644
--- a/src/mame/includes/xerox820.h
+++ b/src/mame/includes/xerox820.h
@@ -14,6 +14,7 @@
#include "machine/ram.h"
#include "bus/scsi/scsi.h"
#include "bus/scsi/scsihd.h"
+#include "machine/timer.h"
#include "machine/wd_fdc.h"
#include "machine/x820kb.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/xevious.h b/src/mame/includes/xevious.h
index 77ae17f926a..bc110e9153f 100644
--- a/src/mame/includes/xevious.h
+++ b/src/mame/includes/xevious.h
@@ -1,6 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
+#include "machine/timer.h"
+
class xevious_state : public galaga_state
{
public:
diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h
index 5dc6d0568f5..ab0935a2e18 100644
--- a/src/mame/includes/xexex.h
+++ b/src/mame/includes/xexex.h
@@ -16,6 +16,7 @@
#include "video/k053251.h"
#include "video/konami_helper.h"
#include "machine/k054321.h"
+#include "machine/timer.h"
#include "screen.h"
class xexex_state : public driver_device
diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h
index 5422a7105b6..f0f306ea612 100644
--- a/src/mame/includes/xmen.h
+++ b/src/mame/includes/xmen.h
@@ -2,6 +2,7 @@
// copyright-holders:Nicola Salmoria
#include "machine/gen_latch.h"
+#include "machine/timer.h"
#include "sound/k054539.h"
#include "video/k053246_k053247_k055673.h"
#include "video/k053251.h"
diff --git a/src/mame/machine/mega32x.cpp b/src/mame/machine/mega32x.cpp
index b562b2c09c8..b815f1eec16 100644
--- a/src/mame/machine/mega32x.cpp
+++ b/src/mame/machine/mega32x.cpp
@@ -199,6 +199,7 @@ GFX check (these don't explicitly fails):
*/
#include "emu.h"
#include "machine/mega32x.h"
+#include "machine/timer.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/machine/megacdcd.h b/src/mame/machine/megacdcd.h
index d334e229dc7..a909b87fa02 100644
--- a/src/mame/machine/megacdcd.h
+++ b/src/mame/machine/megacdcd.h
@@ -4,6 +4,7 @@
#define MAME_MACHINE_SEGACDCD_H
#include "imagedev/chd_cd.h"
+#include "machine/timer.h"
#include "sound/cdda.h"
diff --git a/src/mame/video/decodmd1.h b/src/mame/video/decodmd1.h
index a66da7b264b..a9d193c8248 100644
--- a/src/mame/video/decodmd1.h
+++ b/src/mame/video/decodmd1.h
@@ -12,6 +12,7 @@
#include "cpu/z80/z80.h"
#include "machine/74259.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#define MCFG_DECODMD_TYPE1_ADD(_tag, _region) \
MCFG_DEVICE_ADD(_tag, DECODMD1, 0) \
diff --git a/src/mame/video/decodmd2.h b/src/mame/video/decodmd2.h
index 4083f259c82..bf5497c24db 100644
--- a/src/mame/video/decodmd2.h
+++ b/src/mame/video/decodmd2.h
@@ -11,6 +11,7 @@
#include "cpu/m6809/m6809.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "video/mc6845.h"
#define MCFG_DECODMD_TYPE2_ADD(_tag, _region) \
diff --git a/src/mame/video/decodmd3.h b/src/mame/video/decodmd3.h
index 99d8252e53c..700b4987749 100644
--- a/src/mame/video/decodmd3.h
+++ b/src/mame/video/decodmd3.h
@@ -11,6 +11,7 @@
#include "cpu/m68000/m68000.h"
#include "machine/ram.h"
+#include "machine/timer.h"
#include "video/mc6845.h"
#define MCFG_DECODMD_TYPE3_ADD(_tag, _region) \
diff --git a/src/mame/video/pcd.h b/src/mame/video/pcd.h
index 1eefba579eb..8e6f1ac243d 100644
--- a/src/mame/video/pcd.h
+++ b/src/mame/video/pcd.h
@@ -7,6 +7,7 @@
#pragma once
#include "machine/pic8259.h"
+#include "machine/timer.h"
#include "video/scn2674.h"
#define MCFG_PCX_VIDEO_TXD_HANDLER(_devcb) \
diff --git a/src/mame/video/wpc_dmd.h b/src/mame/video/wpc_dmd.h
index 1be4d530223..19bcc402f88 100644
--- a/src/mame/video/wpc_dmd.h
+++ b/src/mame/video/wpc_dmd.h
@@ -8,6 +8,8 @@
#ifndef MAME_VIDEO_WPC_DMD_H
#define MAME_VIDEO_WPC_DMD_H
+#include "machine/timer.h"
+
#define MCFG_WPC_DMD_ADD( _tag, _scanline_cb ) \
MCFG_DEVICE_ADD( _tag, WPC_DMD, 0 ) \
devcb = &wpc_dmd_device::set_scanline_cb(*device, DEVCB_##_scanline_cb);