summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-01-10 18:00:42 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-01-10 18:00:42 +0000
commit2b23d7c017b38754363cea4467346e2f24286b2d (patch)
tree38b7e9b9521cffb2cbbde086ef265cc1fe5ad73f /src/mame/drivers
parentade4b98d4caeae71e5ca32c8640de0a76560e4da (diff)
Bulk driver.h -> emu.h switch.
Diffstat (limited to 'src/mame/drivers')
-rw-r--r--src/mame/drivers/1942.c2
-rw-r--r--src/mame/drivers/1943.c2
-rw-r--r--src/mame/drivers/1945kiii.c2
-rw-r--r--src/mame/drivers/20pacgal.c2
-rw-r--r--src/mame/drivers/2mindril.c2
-rw-r--r--src/mame/drivers/39in1.c3
-rw-r--r--src/mame/drivers/3super8.c2
-rw-r--r--src/mame/drivers/40love.c2
-rw-r--r--src/mame/drivers/4enraya.c2
-rw-r--r--src/mame/drivers/4roses.c2
-rw-r--r--src/mame/drivers/8080bw.c2
-rw-r--r--src/mame/drivers/86lions.c2
-rw-r--r--src/mame/drivers/88games.c2
-rw-r--r--src/mame/drivers/ace.c2
-rw-r--r--src/mame/drivers/acefruit.c2
-rw-r--r--src/mame/drivers/acommand.c2
-rw-r--r--src/mame/drivers/actfancr.c2
-rw-r--r--src/mame/drivers/adp.c2
-rw-r--r--src/mame/drivers/aeroboto.c2
-rw-r--r--src/mame/drivers/aerofgt.c2
-rw-r--r--src/mame/drivers/airbustr.c2
-rw-r--r--src/mame/drivers/ajax.c2
-rw-r--r--src/mame/drivers/aladbl.c2
-rw-r--r--src/mame/drivers/albazc.c2
-rw-r--r--src/mame/drivers/albazg.c2
-rw-r--r--src/mame/drivers/aleck64.c2
-rw-r--r--src/mame/drivers/alg.c2
-rw-r--r--src/mame/drivers/aliens.c2
-rw-r--r--src/mame/drivers/alpha68k.c2
-rw-r--r--src/mame/drivers/amaticmg.c2
-rw-r--r--src/mame/drivers/ambush.c2
-rw-r--r--src/mame/drivers/ampoker2.c2
-rw-r--r--src/mame/drivers/amspdwy.c2
-rw-r--r--src/mame/drivers/angelkds.c2
-rw-r--r--src/mame/drivers/appoooh.c2
-rw-r--r--src/mame/drivers/aquarium.c2
-rw-r--r--src/mame/drivers/arabian.c2
-rw-r--r--src/mame/drivers/arcadecl.c2
-rw-r--r--src/mame/drivers/arcadia.c2
-rw-r--r--src/mame/drivers/argus.c2
-rw-r--r--src/mame/drivers/aristmk4.c2
-rw-r--r--src/mame/drivers/aristmk5.c2
-rw-r--r--src/mame/drivers/arkanoid.c2
-rw-r--r--src/mame/drivers/armedf.c2
-rw-r--r--src/mame/drivers/artmagic.c2
-rw-r--r--src/mame/drivers/ashnojoe.c2
-rw-r--r--src/mame/drivers/asterix.c2
-rw-r--r--src/mame/drivers/asteroid.c2
-rw-r--r--src/mame/drivers/astinvad.c2
-rw-r--r--src/mame/drivers/astrocde.c2
-rw-r--r--src/mame/drivers/astrocorp.c2
-rw-r--r--src/mame/drivers/astrof.c2
-rw-r--r--src/mame/drivers/asuka.c2
-rw-r--r--src/mame/drivers/atarifb.c2
-rw-r--r--src/mame/drivers/atarig1.c2
-rw-r--r--src/mame/drivers/atarig42.c2
-rw-r--r--src/mame/drivers/atarigt.c2
-rw-r--r--src/mame/drivers/atarigx2.c2
-rw-r--r--src/mame/drivers/atarisy1.c2
-rw-r--r--src/mame/drivers/atarisy2.c2
-rw-r--r--src/mame/drivers/ataxx.c2
-rw-r--r--src/mame/drivers/atetris.c3
-rw-r--r--src/mame/drivers/attckufo.c2
-rw-r--r--src/mame/drivers/avalnche.c2
-rw-r--r--src/mame/drivers/aztarac.c2
-rw-r--r--src/mame/drivers/backfire.c2
-rw-r--r--src/mame/drivers/badlands.c2
-rw-r--r--src/mame/drivers/bagman.c2
-rw-r--r--src/mame/drivers/balsente.c2
-rw-r--r--src/mame/drivers/bankp.c2
-rw-r--r--src/mame/drivers/baraduke.c2
-rw-r--r--src/mame/drivers/batman.c2
-rw-r--r--src/mame/drivers/battlane.c2
-rw-r--r--src/mame/drivers/battlera.c2
-rw-r--r--src/mame/drivers/battlex.c2
-rw-r--r--src/mame/drivers/battlnts.c2
-rw-r--r--src/mame/drivers/bbusters.c2
-rw-r--r--src/mame/drivers/beaminv.c2
-rw-r--r--src/mame/drivers/beathead.c2
-rw-r--r--src/mame/drivers/beezer.c2
-rw-r--r--src/mame/drivers/berzerk.c2
-rw-r--r--src/mame/drivers/bestleag.c2
-rw-r--r--src/mame/drivers/bfcobra.c2
-rw-r--r--src/mame/drivers/bfm_sc1.c2
-rw-r--r--src/mame/drivers/bfm_sc2.c2
-rw-r--r--src/mame/drivers/bfmsys85.c2
-rw-r--r--src/mame/drivers/big10.c2
-rw-r--r--src/mame/drivers/bigevglf.c2
-rw-r--r--src/mame/drivers/bigfghtr.c2
-rw-r--r--src/mame/drivers/bigstrkb.c2
-rw-r--r--src/mame/drivers/bingoc.c2
-rw-r--r--src/mame/drivers/bingor.c2
-rw-r--r--src/mame/drivers/bionicc.c2
-rw-r--r--src/mame/drivers/bishi.c2
-rw-r--r--src/mame/drivers/bishjan.c2
-rw-r--r--src/mame/drivers/bking.c2
-rw-r--r--src/mame/drivers/blackt96.c2
-rw-r--r--src/mame/drivers/bladestl.c2
-rw-r--r--src/mame/drivers/blktiger.c2
-rw-r--r--src/mame/drivers/blmbycar.c2
-rw-r--r--src/mame/drivers/blockade.c2
-rw-r--r--src/mame/drivers/blockhl.c2
-rw-r--r--src/mame/drivers/blockout.c2
-rw-r--r--src/mame/drivers/bloodbro.c2
-rw-r--r--src/mame/drivers/blstroid.c2
-rw-r--r--src/mame/drivers/blueprnt.c2
-rw-r--r--src/mame/drivers/bmcbowl.c2
-rw-r--r--src/mame/drivers/bnstars.c2
-rw-r--r--src/mame/drivers/bogeyman.c2
-rw-r--r--src/mame/drivers/bombjack.c2
-rw-r--r--src/mame/drivers/boogwing.c2
-rw-r--r--src/mame/drivers/bottom9.c2
-rw-r--r--src/mame/drivers/boxer.c2
-rw-r--r--src/mame/drivers/brkthru.c2
-rw-r--r--src/mame/drivers/bsktball.c2
-rw-r--r--src/mame/drivers/btime.c2
-rw-r--r--src/mame/drivers/btoads.c2
-rw-r--r--src/mame/drivers/bublbobl.c2
-rw-r--r--src/mame/drivers/buggychl.c2
-rw-r--r--src/mame/drivers/buster.c2
-rw-r--r--src/mame/drivers/bwidow.c2
-rw-r--r--src/mame/drivers/bwing.c2
-rw-r--r--src/mame/drivers/bzone.c2
-rw-r--r--src/mame/drivers/cabal.c2
-rw-r--r--src/mame/drivers/cabaret.c2
-rw-r--r--src/mame/drivers/calchase.c2
-rw-r--r--src/mame/drivers/calomega.c2
-rw-r--r--src/mame/drivers/calorie.c2
-rw-r--r--src/mame/drivers/canyon.c2
-rw-r--r--src/mame/drivers/capbowl.c2
-rw-r--r--src/mame/drivers/cardline.c2
-rw-r--r--src/mame/drivers/carjmbre.c2
-rw-r--r--src/mame/drivers/carpolo.c2
-rw-r--r--src/mame/drivers/carrera.c2
-rw-r--r--src/mame/drivers/caswin.c2
-rw-r--r--src/mame/drivers/cave.c2
-rw-r--r--src/mame/drivers/cb2001.c2
-rw-r--r--src/mame/drivers/cball.c2
-rw-r--r--src/mame/drivers/cbasebal.c2
-rw-r--r--src/mame/drivers/cbuster.c2
-rw-r--r--src/mame/drivers/ccastles.c2
-rw-r--r--src/mame/drivers/cchance.c2
-rw-r--r--src/mame/drivers/cchasm.c2
-rw-r--r--src/mame/drivers/cclimber.c2
-rw-r--r--src/mame/drivers/centiped.c2
-rw-r--r--src/mame/drivers/chaknpop.c2
-rw-r--r--src/mame/drivers/cham24.c2
-rw-r--r--src/mame/drivers/champbas.c2
-rw-r--r--src/mame/drivers/champbwl.c2
-rw-r--r--src/mame/drivers/chanbara.c2
-rw-r--r--src/mame/drivers/changela.c2
-rw-r--r--src/mame/drivers/cheekyms.c2
-rw-r--r--src/mame/drivers/chihiro.c3
-rw-r--r--src/mame/drivers/chinagat.c2
-rw-r--r--src/mame/drivers/chinsan.c2
-rw-r--r--src/mame/drivers/chqflag.c2
-rw-r--r--src/mame/drivers/chsuper.c2
-rw-r--r--src/mame/drivers/cidelsa.c2
-rw-r--r--src/mame/drivers/cinemat.c2
-rw-r--r--src/mame/drivers/circus.c2
-rw-r--r--src/mame/drivers/circusc.c2
-rw-r--r--src/mame/drivers/cischeat.c2
-rw-r--r--src/mame/drivers/citycon.c2
-rw-r--r--src/mame/drivers/clayshoo.c2
-rw-r--r--src/mame/drivers/cliffhgr.c2
-rw-r--r--src/mame/drivers/cloak.c2
-rw-r--r--src/mame/drivers/cloud9.c2
-rw-r--r--src/mame/drivers/clshroad.c2
-rw-r--r--src/mame/drivers/cmmb.c2
-rw-r--r--src/mame/drivers/cninja.c2
-rw-r--r--src/mame/drivers/cntsteer.c3
-rw-r--r--src/mame/drivers/coinmstr.c2
-rw-r--r--src/mame/drivers/coinmvga.c2
-rw-r--r--src/mame/drivers/cojag.c2
-rw-r--r--src/mame/drivers/combatsc.c2
-rw-r--r--src/mame/drivers/comebaby.c2
-rw-r--r--src/mame/drivers/commando.c2
-rw-r--r--src/mame/drivers/compgolf.c2
-rw-r--r--src/mame/drivers/contra.c2
-rw-r--r--src/mame/drivers/coolpool.c2
-rw-r--r--src/mame/drivers/coolridr.c2
-rw-r--r--src/mame/drivers/cop01.c2
-rw-r--r--src/mame/drivers/copsnrob.c2
-rw-r--r--src/mame/drivers/cosmic.c2
-rw-r--r--src/mame/drivers/cowrace.c2
-rw-r--r--src/mame/drivers/cps1.c2
-rw-r--r--src/mame/drivers/cps2.c2
-rw-r--r--src/mame/drivers/cps3.c2
-rw-r--r--src/mame/drivers/crbaloon.c2
-rw-r--r--src/mame/drivers/crgolf.c2
-rw-r--r--src/mame/drivers/crimfght.c2
-rw-r--r--src/mame/drivers/crospang.c2
-rw-r--r--src/mame/drivers/crshrace.c2
-rw-r--r--src/mame/drivers/crystal.c2
-rw-r--r--src/mame/drivers/cshooter.c2
-rw-r--r--src/mame/drivers/cubeqst.c2
-rw-r--r--src/mame/drivers/cubocd32.c2
-rw-r--r--src/mame/drivers/cultures.c2
-rw-r--r--src/mame/drivers/cvs.c2
-rw-r--r--src/mame/drivers/cyberbal.c2
-rw-r--r--src/mame/drivers/cybertnk.c2
-rw-r--r--src/mame/drivers/cyclemb.c2
-rw-r--r--src/mame/drivers/d9final.c2
-rw-r--r--src/mame/drivers/dacholer.c2
-rw-r--r--src/mame/drivers/dambustr.c2
-rw-r--r--src/mame/drivers/darius.c2
-rw-r--r--src/mame/drivers/darkhors.c2
-rw-r--r--src/mame/drivers/darkmist.c2
-rw-r--r--src/mame/drivers/darkseal.c2
-rw-r--r--src/mame/drivers/dassault.c2
-rw-r--r--src/mame/drivers/dblewing.c2
-rw-r--r--src/mame/drivers/dbz.c2
-rw-r--r--src/mame/drivers/dcheese.c2
-rw-r--r--src/mame/drivers/dcon.c2
-rw-r--r--src/mame/drivers/dday.c2
-rw-r--r--src/mame/drivers/ddayjlc.c2
-rw-r--r--src/mame/drivers/ddealer.c2
-rw-r--r--src/mame/drivers/ddenlovr.c2
-rw-r--r--src/mame/drivers/ddragon.c2
-rw-r--r--src/mame/drivers/ddragon3.c2
-rw-r--r--src/mame/drivers/ddrible.c2
-rw-r--r--src/mame/drivers/ddz.c2
-rw-r--r--src/mame/drivers/deadang.c2
-rw-r--r--src/mame/drivers/dec0.c2
-rw-r--r--src/mame/drivers/dec8.c2
-rw-r--r--src/mame/drivers/deco156.c2
-rw-r--r--src/mame/drivers/deco32.c2
-rw-r--r--src/mame/drivers/deco_ld.c2
-rw-r--r--src/mame/drivers/deco_mlc.c2
-rw-r--r--src/mame/drivers/decocass.c2
-rw-r--r--src/mame/drivers/deniam.c2
-rw-r--r--src/mame/drivers/deshoros.c2
-rw-r--r--src/mame/drivers/destroyr.c2
-rw-r--r--src/mame/drivers/dgpix.c2
-rw-r--r--src/mame/drivers/dietgo.c2
-rw-r--r--src/mame/drivers/discoboy.c2
-rw-r--r--src/mame/drivers/diverboy.c2
-rw-r--r--src/mame/drivers/djboy.c2
-rw-r--r--src/mame/drivers/djmain.c2
-rw-r--r--src/mame/drivers/dkong.c2
-rw-r--r--src/mame/drivers/dlair.c2
-rw-r--r--src/mame/drivers/dmndrby.c2
-rw-r--r--src/mame/drivers/docastle.c2
-rw-r--r--src/mame/drivers/dogfgt.c2
-rw-r--r--src/mame/drivers/dominob.c2
-rw-r--r--src/mame/drivers/dooyong.c2
-rw-r--r--src/mame/drivers/dorachan.c2
-rw-r--r--src/mame/drivers/dotrikun.c2
-rw-r--r--src/mame/drivers/dragrace.c2
-rw-r--r--src/mame/drivers/dreamwld.c2
-rw-r--r--src/mame/drivers/drgnmst.c2
-rw-r--r--src/mame/drivers/dribling.c2
-rw-r--r--src/mame/drivers/drmicro.c2
-rw-r--r--src/mame/drivers/drtomy.c2
-rw-r--r--src/mame/drivers/drw80pkr.c2
-rw-r--r--src/mame/drivers/dunhuang.c2
-rw-r--r--src/mame/drivers/dwarfd.c2
-rw-r--r--src/mame/drivers/dynadice.c2
-rw-r--r--src/mame/drivers/dynax.c2
-rw-r--r--src/mame/drivers/dynduke.c2
-rw-r--r--src/mame/drivers/egghunt.c2
-rw-r--r--src/mame/drivers/embargo.c2
-rw-r--r--src/mame/drivers/enigma2.c2
-rw-r--r--src/mame/drivers/eolith.c2
-rw-r--r--src/mame/drivers/eolith16.c2
-rw-r--r--src/mame/drivers/eolithsp.c2
-rw-r--r--src/mame/drivers/epos.c2
-rw-r--r--src/mame/drivers/eprom.c2
-rw-r--r--src/mame/drivers/equites.c2
-rw-r--r--src/mame/drivers/ertictac.c2
-rw-r--r--src/mame/drivers/esd16.c2
-rw-r--r--src/mame/drivers/esh.c2
-rw-r--r--src/mame/drivers/espial.c2
-rw-r--r--src/mame/drivers/esripsys.c2
-rw-r--r--src/mame/drivers/ettrivia.c2
-rw-r--r--src/mame/drivers/exedexes.c2
-rw-r--r--src/mame/drivers/exerion.c2
-rw-r--r--src/mame/drivers/exidy.c2
-rw-r--r--src/mame/drivers/exidy440.c2
-rw-r--r--src/mame/drivers/expro02.c2
-rw-r--r--src/mame/drivers/exprraid.c2
-rw-r--r--src/mame/drivers/exterm.c2
-rw-r--r--src/mame/drivers/exzisus.c2
-rw-r--r--src/mame/drivers/f-32.c2
-rw-r--r--src/mame/drivers/f1gp.c2
-rw-r--r--src/mame/drivers/fantland.c2
-rw-r--r--src/mame/drivers/fastfred.c2
-rw-r--r--src/mame/drivers/fastlane.c2
-rw-r--r--src/mame/drivers/fcombat.c2
-rw-r--r--src/mame/drivers/fcrash.c2
-rw-r--r--src/mame/drivers/feversoc.c2
-rw-r--r--src/mame/drivers/fgoal.c2
-rw-r--r--src/mame/drivers/finalizr.c2
-rw-r--r--src/mame/drivers/firebeat.c2
-rw-r--r--src/mame/drivers/firefox.c2
-rw-r--r--src/mame/drivers/firetrap.c2
-rw-r--r--src/mame/drivers/firetrk.c2
-rw-r--r--src/mame/drivers/fitfight.c2
-rw-r--r--src/mame/drivers/flkatck.c2
-rw-r--r--src/mame/drivers/flower.c2
-rw-r--r--src/mame/drivers/flstory.c2
-rw-r--r--src/mame/drivers/flyball.c2
-rw-r--r--src/mame/drivers/foodf.c2
-rw-r--r--src/mame/drivers/forte2.c2
-rw-r--r--src/mame/drivers/fortecar.c2
-rw-r--r--src/mame/drivers/freekick.c2
-rw-r--r--src/mame/drivers/fromanc2.c2
-rw-r--r--src/mame/drivers/fromance.c2
-rw-r--r--src/mame/drivers/funkybee.c2
-rw-r--r--src/mame/drivers/funkyjet.c2
-rw-r--r--src/mame/drivers/funworld.c2
-rw-r--r--src/mame/drivers/funybubl.c2
-rw-r--r--src/mame/drivers/fuukifg2.c2
-rw-r--r--src/mame/drivers/fuukifg3.c2
-rw-r--r--src/mame/drivers/gaelco.c2
-rw-r--r--src/mame/drivers/gaelco2.c2
-rw-r--r--src/mame/drivers/gaelco3d.c2
-rw-r--r--src/mame/drivers/gaiden.c2
-rw-r--r--src/mame/drivers/gal3.c2
-rw-r--r--src/mame/drivers/galaga.c2
-rw-r--r--src/mame/drivers/galastrm.c2
-rw-r--r--src/mame/drivers/galaxi.c2
-rw-r--r--src/mame/drivers/galaxia.c2
-rw-r--r--src/mame/drivers/galaxian.c2
-rw-r--r--src/mame/drivers/galaxold.c2
-rw-r--r--src/mame/drivers/galivan.c2
-rw-r--r--src/mame/drivers/galpani2.c2
-rw-r--r--src/mame/drivers/galpani3.c2
-rw-r--r--src/mame/drivers/galpanic.c2
-rw-r--r--src/mame/drivers/galspnbl.c2
-rw-r--r--src/mame/drivers/gamecstl.c2
-rw-r--r--src/mame/drivers/gameplan.c2
-rw-r--r--src/mame/drivers/gaplus.c2
-rw-r--r--src/mame/drivers/gatron.c2
-rw-r--r--src/mame/drivers/gauntlet.c2
-rw-r--r--src/mame/drivers/gberet.c2
-rw-r--r--src/mame/drivers/gbusters.c2
-rw-r--r--src/mame/drivers/gcpinbal.c2
-rw-r--r--src/mame/drivers/gei.c2
-rw-r--r--src/mame/drivers/ggconnie.c2
-rw-r--r--src/mame/drivers/ghosteo.c2
-rw-r--r--src/mame/drivers/gijoe.c2
-rw-r--r--src/mame/drivers/ginganin.c2
-rw-r--r--src/mame/drivers/gladiatr.c2
-rw-r--r--src/mame/drivers/glass.c2
-rw-r--r--src/mame/drivers/gng.c2
-rw-r--r--src/mame/drivers/go2000.c2
-rw-r--r--src/mame/drivers/goal92.c2
-rw-r--r--src/mame/drivers/goindol.c2
-rw-r--r--src/mame/drivers/goldnpkr.c2
-rw-r--r--src/mame/drivers/goldstar.c2
-rw-r--r--src/mame/drivers/gomoku.c2
-rw-r--r--src/mame/drivers/good.c2
-rw-r--r--src/mame/drivers/goodejan.c2
-rw-r--r--src/mame/drivers/gotcha.c2
-rw-r--r--src/mame/drivers/gottlieb.c2
-rw-r--r--src/mame/drivers/gotya.c2
-rw-r--r--src/mame/drivers/gpworld.c2
-rw-r--r--src/mame/drivers/gradius3.c2
-rw-r--r--src/mame/drivers/grchamp.c2
-rw-r--r--src/mame/drivers/gridlee.c2
-rw-r--r--src/mame/drivers/groundfx.c2
-rw-r--r--src/mame/drivers/gstream.c2
-rw-r--r--src/mame/drivers/gstriker.c2
-rw-r--r--src/mame/drivers/gsword.c2
-rw-r--r--src/mame/drivers/gticlub.c2
-rw-r--r--src/mame/drivers/guab.c2
-rw-r--r--src/mame/drivers/gumbo.c2
-rw-r--r--src/mame/drivers/gunbustr.c2
-rw-r--r--src/mame/drivers/gundealr.c2
-rw-r--r--src/mame/drivers/gunpey.c2
-rw-r--r--src/mame/drivers/gunsmoke.c2
-rw-r--r--src/mame/drivers/gyruss.c2
-rw-r--r--src/mame/drivers/halleys.c2
-rw-r--r--src/mame/drivers/hanaawas.c2
-rw-r--r--src/mame/drivers/harddriv.c2
-rw-r--r--src/mame/drivers/hcastle.c2
-rw-r--r--src/mame/drivers/hexa.c2
-rw-r--r--src/mame/drivers/hexion.c2
-rw-r--r--src/mame/drivers/higemaru.c2
-rw-r--r--src/mame/drivers/highvdeo.c2
-rw-r--r--src/mame/drivers/hikaru.c2
-rw-r--r--src/mame/drivers/himesiki.c2
-rw-r--r--src/mame/drivers/hitme.c2
-rw-r--r--src/mame/drivers/hitpoker.c2
-rw-r--r--src/mame/drivers/hnayayoi.c2
-rw-r--r--src/mame/drivers/hng64.c2
-rw-r--r--src/mame/drivers/holeland.c2
-rw-r--r--src/mame/drivers/homedata.c2
-rw-r--r--src/mame/drivers/homerun.c2
-rw-r--r--src/mame/drivers/hornet.c2
-rw-r--r--src/mame/drivers/hotblock.c2
-rw-r--r--src/mame/drivers/hshavoc.c2
-rw-r--r--src/mame/drivers/hvyunit.c2
-rw-r--r--src/mame/drivers/hyhoo.c2
-rw-r--r--src/mame/drivers/hyperspt.c2
-rw-r--r--src/mame/drivers/hyprduel.c2
-rw-r--r--src/mame/drivers/igs009.c2
-rw-r--r--src/mame/drivers/igs011.c2
-rw-r--r--src/mame/drivers/igs017.c2
-rw-r--r--src/mame/drivers/igs_m027.c2
-rw-r--r--src/mame/drivers/igspoker.c2
-rw-r--r--src/mame/drivers/ikki.c2
-rw-r--r--src/mame/drivers/ilpag.c2
-rw-r--r--src/mame/drivers/imolagp.c2
-rw-r--r--src/mame/drivers/intrscti.c2
-rw-r--r--src/mame/drivers/inufuku.c2
-rw-r--r--src/mame/drivers/iqblock.c2
-rw-r--r--src/mame/drivers/irobot.c2
-rw-r--r--src/mame/drivers/ironhors.c2
-rw-r--r--src/mame/drivers/istellar.c2
-rw-r--r--src/mame/drivers/itech32.c2
-rw-r--r--src/mame/drivers/itech8.c2
-rw-r--r--src/mame/drivers/itgambl2.c2
-rw-r--r--src/mame/drivers/itgambl3.c2
-rw-r--r--src/mame/drivers/itgamble.c2
-rw-r--r--src/mame/drivers/jack.c2
-rw-r--r--src/mame/drivers/jackal.c2
-rw-r--r--src/mame/drivers/jackie.c2
-rw-r--r--src/mame/drivers/jackpool.c2
-rw-r--r--src/mame/drivers/jailbrek.c2
-rw-r--r--src/mame/drivers/jalmah.c2
-rw-r--r--src/mame/drivers/jangou.c2
-rw-r--r--src/mame/drivers/janshi.c2
-rw-r--r--src/mame/drivers/jantotsu.c2
-rw-r--r--src/mame/drivers/jchan.c2
-rw-r--r--src/mame/drivers/jedi.c2
-rw-r--r--src/mame/drivers/jokrwild.c2
-rw-r--r--src/mame/drivers/jollyjgr.c2
-rw-r--r--src/mame/drivers/jongkyo.c2
-rw-r--r--src/mame/drivers/jpmimpct.c2
-rw-r--r--src/mame/drivers/jpmsys5.c2
-rw-r--r--src/mame/drivers/jrpacman.c2
-rw-r--r--src/mame/drivers/junofrst.c2
-rw-r--r--src/mame/drivers/kaneko16.c2
-rw-r--r--src/mame/drivers/kangaroo.c2
-rw-r--r--src/mame/drivers/karnov.c2
-rw-r--r--src/mame/drivers/kchamp.c2
-rw-r--r--src/mame/drivers/kickgoal.c2
-rw-r--r--src/mame/drivers/kingdrby.c2
-rw-r--r--src/mame/drivers/kingobox.c2
-rw-r--r--src/mame/drivers/kingpin.c2
-rw-r--r--src/mame/drivers/kinst.c2
-rw-r--r--src/mame/drivers/klax.c2
-rw-r--r--src/mame/drivers/kncljoe.c2
-rw-r--r--src/mame/drivers/koftball.c2
-rw-r--r--src/mame/drivers/koikoi.c2
-rw-r--r--src/mame/drivers/konamigq.c2
-rw-r--r--src/mame/drivers/konamigv.c2
-rw-r--r--src/mame/drivers/konamigx.c2
-rw-r--r--src/mame/drivers/konamim2.c2
-rw-r--r--src/mame/drivers/kopunch.c2
-rw-r--r--src/mame/drivers/ksayakyu.c2
-rw-r--r--src/mame/drivers/ksys573.c2
-rw-r--r--src/mame/drivers/kungfur.c2
-rw-r--r--src/mame/drivers/kyugo.c2
-rw-r--r--src/mame/drivers/labyrunr.c2
-rw-r--r--src/mame/drivers/ladybug.c2
-rw-r--r--src/mame/drivers/ladyfrog.c2
-rw-r--r--src/mame/drivers/laserbas.c2
-rw-r--r--src/mame/drivers/laserbat.c2
-rw-r--r--src/mame/drivers/lasso.c2
-rw-r--r--src/mame/drivers/lastduel.c2
-rw-r--r--src/mame/drivers/lastfght.c2
-rw-r--r--src/mame/drivers/lazercmd.c2
-rw-r--r--src/mame/drivers/legionna.c2
-rw-r--r--src/mame/drivers/leland.c2
-rw-r--r--src/mame/drivers/lemmings.c2
-rw-r--r--src/mame/drivers/lethal.c2
-rw-r--r--src/mame/drivers/lethalj.c2
-rw-r--r--src/mame/drivers/lgp.c2
-rw-r--r--src/mame/drivers/liberate.c2
-rw-r--r--src/mame/drivers/liberatr.c2
-rw-r--r--src/mame/drivers/limenko.c2
-rw-r--r--src/mame/drivers/littlerb.c2
-rw-r--r--src/mame/drivers/lkage.c2
-rw-r--r--src/mame/drivers/lockon.c2
-rw-r--r--src/mame/drivers/looping.c2
-rw-r--r--src/mame/drivers/lordgun.c2
-rw-r--r--src/mame/drivers/lsasquad.c2
-rw-r--r--src/mame/drivers/ltcasino.c2
-rw-r--r--src/mame/drivers/luckgrln.c2
-rw-r--r--src/mame/drivers/lucky74.c2
-rw-r--r--src/mame/drivers/lvcards.c2
-rw-r--r--src/mame/drivers/lwings.c2
-rw-r--r--src/mame/drivers/m10.c2
-rw-r--r--src/mame/drivers/m107.c2
-rw-r--r--src/mame/drivers/m14.c2
-rw-r--r--src/mame/drivers/m52.c2
-rw-r--r--src/mame/drivers/m57.c2
-rw-r--r--src/mame/drivers/m58.c2
-rw-r--r--src/mame/drivers/m62.c2
-rw-r--r--src/mame/drivers/m63.c2
-rw-r--r--src/mame/drivers/m72.c2
-rw-r--r--src/mame/drivers/m79amb.c2
-rw-r--r--src/mame/drivers/m90.c2
-rw-r--r--src/mame/drivers/m92.c2
-rw-r--r--src/mame/drivers/macrossp.c2
-rw-r--r--src/mame/drivers/macs.c2
-rw-r--r--src/mame/drivers/madalien.c2
-rw-r--r--src/mame/drivers/madmotor.c2
-rw-r--r--src/mame/drivers/magic10.c2
-rw-r--r--src/mame/drivers/magicard.c2
-rw-r--r--src/mame/drivers/magicfly.c2
-rw-r--r--src/mame/drivers/magictg.c2
-rw-r--r--src/mame/drivers/magmax.c2
-rw-r--r--src/mame/drivers/mainevt.c2
-rw-r--r--src/mame/drivers/mainsnk.c2
-rw-r--r--src/mame/drivers/malzak.c2
-rw-r--r--src/mame/drivers/mappy.c2
-rw-r--r--src/mame/drivers/marineb.c2
-rw-r--r--src/mame/drivers/marinedt.c2
-rw-r--r--src/mame/drivers/mario.c2
-rw-r--r--src/mame/drivers/markham.c2
-rw-r--r--src/mame/drivers/mastboy.c2
-rw-r--r--src/mame/drivers/matmania.c2
-rw-r--r--src/mame/drivers/maxaflex.c2
-rw-r--r--src/mame/drivers/maygay1b.c3
-rw-r--r--src/mame/drivers/maygayv1.c2
-rw-r--r--src/mame/drivers/mayumi.c2
-rw-r--r--src/mame/drivers/mazerbla.c2
-rw-r--r--src/mame/drivers/mcatadv.c2
-rw-r--r--src/mame/drivers/mcr.c2
-rw-r--r--src/mame/drivers/mcr3.c2
-rw-r--r--src/mame/drivers/mcr68.c2
-rw-r--r--src/mame/drivers/meadows.c2
-rw-r--r--src/mame/drivers/mediagx.c2
-rw-r--r--src/mame/drivers/megadriv.c2
-rw-r--r--src/mame/drivers/megaplay.c2
-rw-r--r--src/mame/drivers/megasys1.c2
-rw-r--r--src/mame/drivers/megatech.c2
-rw-r--r--src/mame/drivers/megazone.c2
-rw-r--r--src/mame/drivers/meijinsn.c2
-rw-r--r--src/mame/drivers/merit.c2
-rw-r--r--src/mame/drivers/meritm.c2
-rw-r--r--src/mame/drivers/mermaid.c2
-rw-r--r--src/mame/drivers/metalmx.c2
-rw-r--r--src/mame/drivers/metlclsh.c2
-rw-r--r--src/mame/drivers/metro.c2
-rw-r--r--src/mame/drivers/mexico86.c2
-rw-r--r--src/mame/drivers/mgolf.c2
-rw-r--r--src/mame/drivers/mhavoc.c2
-rw-r--r--src/mame/drivers/micro3d.c2
-rw-r--r--src/mame/drivers/midas.c2
-rw-r--r--src/mame/drivers/midtunit.c2
-rw-r--r--src/mame/drivers/midvunit.c2
-rw-r--r--src/mame/drivers/midwunit.c2
-rw-r--r--src/mame/drivers/midxunit.c2
-rw-r--r--src/mame/drivers/midyunit.c2
-rw-r--r--src/mame/drivers/midzeus.c2
-rw-r--r--src/mame/drivers/mikie.c2
-rw-r--r--src/mame/drivers/mil4000.c2
-rw-r--r--src/mame/drivers/miniboy7.c2
-rw-r--r--src/mame/drivers/minivadr.c2
-rw-r--r--src/mame/drivers/mirage.c2
-rw-r--r--src/mame/drivers/mirax.c2
-rw-r--r--src/mame/drivers/mirderby.c2
-rw-r--r--src/mame/drivers/missb2.c2
-rw-r--r--src/mame/drivers/missile.c2
-rw-r--r--src/mame/drivers/mitchell.c2
-rw-r--r--src/mame/drivers/mjkjidai.c2
-rw-r--r--src/mame/drivers/mjsister.c2
-rw-r--r--src/mame/drivers/mlanding.c2
-rw-r--r--src/mame/drivers/model1.c2
-rw-r--r--src/mame/drivers/model2.c2
-rw-r--r--src/mame/drivers/model3.c2
-rw-r--r--src/mame/drivers/mogura.c2
-rw-r--r--src/mame/drivers/mole.c2
-rw-r--r--src/mame/drivers/momoko.c2
-rw-r--r--src/mame/drivers/monzagp.c2
-rw-r--r--src/mame/drivers/moo.c2
-rw-r--r--src/mame/drivers/mosaic.c2
-rw-r--r--src/mame/drivers/mouser.c2
-rw-r--r--src/mame/drivers/mpoker.c2
-rw-r--r--src/mame/drivers/mpu4.c3
-rw-r--r--src/mame/drivers/mpu5.c2
-rw-r--r--src/mame/drivers/mquake.c2
-rw-r--r--src/mame/drivers/mrdo.c2
-rw-r--r--src/mame/drivers/mrflea.c2
-rw-r--r--src/mame/drivers/mrjong.c2
-rw-r--r--src/mame/drivers/ms32.c2
-rw-r--r--src/mame/drivers/msisaac.c2
-rw-r--r--src/mame/drivers/mugsmash.c2
-rw-r--r--src/mame/drivers/multfish.c2
-rw-r--r--src/mame/drivers/multigam.c2
-rw-r--r--src/mame/drivers/munchmo.c2
-rw-r--r--src/mame/drivers/murogem.c2
-rw-r--r--src/mame/drivers/murogmbl.c2
-rw-r--r--src/mame/drivers/mustache.c2
-rw-r--r--src/mame/drivers/mw8080bw.c2
-rw-r--r--src/mame/drivers/mwarr.c2
-rw-r--r--src/mame/drivers/mystston.c2
-rw-r--r--src/mame/drivers/mystwarr.c2
-rw-r--r--src/mame/drivers/n8080.c2
-rw-r--r--src/mame/drivers/namcofl.c2
-rw-r--r--src/mame/drivers/namcoic.c2
-rw-r--r--src/mame/drivers/namcona1.c2
-rw-r--r--src/mame/drivers/namconb1.c2
-rw-r--r--src/mame/drivers/namcond1.c2
-rw-r--r--src/mame/drivers/namcops2.c3
-rw-r--r--src/mame/drivers/namcos1.c2
-rw-r--r--src/mame/drivers/namcos10.c2
-rw-r--r--src/mame/drivers/namcos11.c2
-rw-r--r--src/mame/drivers/namcos12.c2
-rw-r--r--src/mame/drivers/namcos2.c2
-rw-r--r--src/mame/drivers/namcos21.c2
-rw-r--r--src/mame/drivers/namcos22.c2
-rw-r--r--src/mame/drivers/namcos23.c2
-rw-r--r--src/mame/drivers/namcos86.c2
-rw-r--r--src/mame/drivers/naomi.c3
-rw-r--r--src/mame/drivers/naughtyb.c2
-rw-r--r--src/mame/drivers/nbmj8688.c2
-rw-r--r--src/mame/drivers/nbmj8891.c2
-rw-r--r--src/mame/drivers/nbmj8900.c2
-rw-r--r--src/mame/drivers/nbmj8991.c2
-rw-r--r--src/mame/drivers/nbmj9195.c2
-rw-r--r--src/mame/drivers/nemesis.c2
-rw-r--r--src/mame/drivers/neogeo.c2
-rw-r--r--src/mame/drivers/news.c2
-rw-r--r--src/mame/drivers/nightgal.c2
-rw-r--r--src/mame/drivers/ninjakd2.c2
-rw-r--r--src/mame/drivers/ninjaw.c2
-rw-r--r--src/mame/drivers/nitedrvr.c2
-rw-r--r--src/mame/drivers/niyanpai.c2
-rw-r--r--src/mame/drivers/nmg5.c2
-rw-r--r--src/mame/drivers/nmk16.c2
-rw-r--r--src/mame/drivers/norautp.c2
-rw-r--r--src/mame/drivers/nova2001.c2
-rw-r--r--src/mame/drivers/nss.c2
-rw-r--r--src/mame/drivers/nwk-tr.c2
-rw-r--r--src/mame/drivers/nycaptor.c2
-rw-r--r--src/mame/drivers/nyny.c2
-rw-r--r--src/mame/drivers/offtwall.c2
-rw-r--r--src/mame/drivers/ohmygod.c2
-rw-r--r--src/mame/drivers/ojankohs.c2
-rw-r--r--src/mame/drivers/olibochu.c2
-rw-r--r--src/mame/drivers/omegrace.c2
-rw-r--r--src/mame/drivers/oneshot.c2
-rw-r--r--src/mame/drivers/onetwo.c2
-rw-r--r--src/mame/drivers/opwolf.c2
-rw-r--r--src/mame/drivers/orbit.c2
-rw-r--r--src/mame/drivers/othello.c2
-rw-r--r--src/mame/drivers/othldrby.c2
-rw-r--r--src/mame/drivers/othunder.c2
-rw-r--r--src/mame/drivers/overdriv.c2
-rw-r--r--src/mame/drivers/pachifev.c2
-rw-r--r--src/mame/drivers/pacland.c2
-rw-r--r--src/mame/drivers/pacman.c2
-rw-r--r--src/mame/drivers/pandoras.c2
-rw-r--r--src/mame/drivers/pangofun.c2
-rw-r--r--src/mame/drivers/panicr.c2
-rw-r--r--src/mame/drivers/paradise.c2
-rw-r--r--src/mame/drivers/paranoia.c2
-rw-r--r--src/mame/drivers/parodius.c2
-rw-r--r--src/mame/drivers/pasha2.c2
-rw-r--r--src/mame/drivers/pass.c2
-rw-r--r--src/mame/drivers/pastelg.c2
-rw-r--r--src/mame/drivers/pbaction.c2
-rw-r--r--src/mame/drivers/pcat_dyn.c2
-rw-r--r--src/mame/drivers/pcat_nit.c2
-rw-r--r--src/mame/drivers/pcktgal.c2
-rw-r--r--src/mame/drivers/pcxt.c3
-rw-r--r--src/mame/drivers/pengo.c2
-rw-r--r--src/mame/drivers/peplus.c2
-rw-r--r--src/mame/drivers/pgm.c2
-rw-r--r--src/mame/drivers/phoenix.c2
-rw-r--r--src/mame/drivers/photon.c2
-rw-r--r--src/mame/drivers/photon2.c2
-rw-r--r--src/mame/drivers/photoply.c2
-rw-r--r--src/mame/drivers/pingpong.c2
-rw-r--r--src/mame/drivers/pipedrm.c2
-rw-r--r--src/mame/drivers/pipeline.c2
-rw-r--r--src/mame/drivers/pirates.c2
-rw-r--r--src/mame/drivers/pitnrun.c2
-rw-r--r--src/mame/drivers/pkscram.c2
-rw-r--r--src/mame/drivers/pktgaldx.c2
-rw-r--r--src/mame/drivers/playch10.c2
-rw-r--r--src/mame/drivers/playmark.c2
-rw-r--r--src/mame/drivers/plygonet.c2
-rw-r--r--src/mame/drivers/pntnpuzl.c2
-rw-r--r--src/mame/drivers/pokechmp.c2
-rw-r--r--src/mame/drivers/polepos.c2
-rw-r--r--src/mame/drivers/policetr.c2
-rw-r--r--src/mame/drivers/polyplay.c2
-rw-r--r--src/mame/drivers/poolshrk.c2
-rw-r--r--src/mame/drivers/pooyan.c2
-rw-r--r--src/mame/drivers/popeye.c2
-rw-r--r--src/mame/drivers/popper.c2
-rw-r--r--src/mame/drivers/portrait.c2
-rw-r--r--src/mame/drivers/powerbal.c2
-rw-r--r--src/mame/drivers/powerins.c2
-rw-r--r--src/mame/drivers/ppmast93.c2
-rw-r--r--src/mame/drivers/prehisle.c2
-rw-r--r--src/mame/drivers/progolf.c2
-rw-r--r--src/mame/drivers/psattack.c2
-rw-r--r--src/mame/drivers/psikyo.c2
-rw-r--r--src/mame/drivers/psikyo4.c2
-rw-r--r--src/mame/drivers/psikyosh.c2
-rw-r--r--src/mame/drivers/psychic5.c2
-rw-r--r--src/mame/drivers/pturn.c2
-rw-r--r--src/mame/drivers/puckpkmn.c2
-rw-r--r--src/mame/drivers/punchout.c2
-rw-r--r--src/mame/drivers/pushman.c2
-rw-r--r--src/mame/drivers/pzletime.c2
-rw-r--r--src/mame/drivers/qdrmfgp.c2
-rw-r--r--src/mame/drivers/qix.c2
-rw-r--r--src/mame/drivers/quakeat.c2
-rw-r--r--src/mame/drivers/quantum.c2
-rw-r--r--src/mame/drivers/quasar.c2
-rw-r--r--src/mame/drivers/queen.c2
-rw-r--r--src/mame/drivers/quizdna.c2
-rw-r--r--src/mame/drivers/quizo.c2
-rw-r--r--src/mame/drivers/quizpani.c2
-rw-r--r--src/mame/drivers/quizpun2.c2
-rw-r--r--src/mame/drivers/r2dtank.c2
-rw-r--r--src/mame/drivers/rabbit.c2
-rw-r--r--src/mame/drivers/raiden.c2
-rw-r--r--src/mame/drivers/raiden2.c2
-rw-r--r--src/mame/drivers/rainbow.c2
-rw-r--r--src/mame/drivers/rallyx.c2
-rw-r--r--src/mame/drivers/rampart.c2
-rw-r--r--src/mame/drivers/rastan.c2
-rw-r--r--src/mame/drivers/rbmk.c2
-rw-r--r--src/mame/drivers/rcorsair.c2
-rw-r--r--src/mame/drivers/re900.c2
-rw-r--r--src/mame/drivers/realbrk.c2
-rw-r--r--src/mame/drivers/redalert.c2
-rw-r--r--src/mame/drivers/redclash.c2
-rw-r--r--src/mame/drivers/relief.c2
-rw-r--r--src/mame/drivers/renegade.c2
-rw-r--r--src/mame/drivers/retofinv.c2
-rw-r--r--src/mame/drivers/rmhaihai.c2
-rw-r--r--src/mame/drivers/rockrage.c2
-rw-r--r--src/mame/drivers/rocnrope.c2
-rw-r--r--src/mame/drivers/rohga.c2
-rw-r--r--src/mame/drivers/rollerg.c2
-rw-r--r--src/mame/drivers/rollrace.c2
-rw-r--r--src/mame/drivers/rotaryf.c2
-rw-r--r--src/mame/drivers/roul.c2
-rw-r--r--src/mame/drivers/route16.c2
-rw-r--r--src/mame/drivers/royalmah.c2
-rw-r--r--src/mame/drivers/rpunch.c2
-rw-r--r--src/mame/drivers/runaway.c2
-rw-r--r--src/mame/drivers/rungun.c2
-rw-r--r--src/mame/drivers/safarir.c2
-rw-r--r--src/mame/drivers/sandscrp.c2
-rw-r--r--src/mame/drivers/sangho.c2
-rw-r--r--src/mame/drivers/sauro.c2
-rw-r--r--src/mame/drivers/sbasketb.c2
-rw-r--r--src/mame/drivers/sbowling.c2
-rw-r--r--src/mame/drivers/sbrkout.c2
-rw-r--r--src/mame/drivers/sbugger.c2
-rw-r--r--src/mame/drivers/scobra.c2
-rw-r--r--src/mame/drivers/scotrsht.c2
-rw-r--r--src/mame/drivers/scramble.c2
-rw-r--r--src/mame/drivers/scregg.c2
-rw-r--r--src/mame/drivers/sderby.c2
-rw-r--r--src/mame/drivers/seattle.c2
-rw-r--r--src/mame/drivers/segac2.c2
-rw-r--r--src/mame/drivers/segae.c2
-rw-r--r--src/mame/drivers/segag80r.c2
-rw-r--r--src/mame/drivers/segag80v.c2
-rw-r--r--src/mame/drivers/segahang.c2
-rw-r--r--src/mame/drivers/segald.c2
-rw-r--r--src/mame/drivers/segamsys.c2
-rw-r--r--src/mame/drivers/segaorun.c2
-rw-r--r--src/mame/drivers/segas16a.c2
-rw-r--r--src/mame/drivers/segas16b.c2
-rw-r--r--src/mame/drivers/segas18.c2
-rw-r--r--src/mame/drivers/segas24.c2
-rw-r--r--src/mame/drivers/segas32.c2
-rw-r--r--src/mame/drivers/segaxbd.c2
-rw-r--r--src/mame/drivers/segaybd.c2
-rw-r--r--src/mame/drivers/seibuspi.c2
-rw-r--r--src/mame/drivers/seicross.c2
-rw-r--r--src/mame/drivers/sengokmj.c2
-rw-r--r--src/mame/drivers/senjyo.c2
-rw-r--r--src/mame/drivers/seta.c2
-rw-r--r--src/mame/drivers/seta2.c2
-rw-r--r--src/mame/drivers/sf.c2
-rw-r--r--src/mame/drivers/sfbonus.c2
-rw-r--r--src/mame/drivers/sfkick.c2
-rw-r--r--src/mame/drivers/sg1000a.c2
-rw-r--r--src/mame/drivers/shadfrce.c2
-rw-r--r--src/mame/drivers/shangha3.c2
-rw-r--r--src/mame/drivers/shanghai.c2
-rw-r--r--src/mame/drivers/shangkid.c2
-rw-r--r--src/mame/drivers/shaolins.c2
-rw-r--r--src/mame/drivers/shisen.c2
-rw-r--r--src/mame/drivers/shootout.c2
-rw-r--r--src/mame/drivers/shougi.c2
-rw-r--r--src/mame/drivers/shuuz.c2
-rw-r--r--src/mame/drivers/sidearms.c2
-rw-r--r--src/mame/drivers/sidepckt.c2
-rw-r--r--src/mame/drivers/silkroad.c2
-rw-r--r--src/mame/drivers/simpl156.c2
-rw-r--r--src/mame/drivers/simpsons.c2
-rw-r--r--src/mame/drivers/skeetsht.c2
-rw-r--r--src/mame/drivers/skimaxx.c2
-rw-r--r--src/mame/drivers/skullxbo.c2
-rw-r--r--src/mame/drivers/skyarmy.c2
-rw-r--r--src/mame/drivers/skydiver.c2
-rw-r--r--src/mame/drivers/skyfox.c2
-rw-r--r--src/mame/drivers/skykid.c2
-rw-r--r--src/mame/drivers/skylncr.c2
-rw-r--r--src/mame/drivers/skyraid.c2
-rw-r--r--src/mame/drivers/slapfght.c2
-rw-r--r--src/mame/drivers/slapshot.c2
-rw-r--r--src/mame/drivers/sliver.c2
-rw-r--r--src/mame/drivers/slotcarn.c2
-rw-r--r--src/mame/drivers/sms.c2
-rw-r--r--src/mame/drivers/snesb.c2
-rw-r--r--src/mame/drivers/snk.c2
-rw-r--r--src/mame/drivers/snk6502.c2
-rw-r--r--src/mame/drivers/snk68.c2
-rw-r--r--src/mame/drivers/snookr10.c2
-rw-r--r--src/mame/drivers/snowbros.c2
-rw-r--r--src/mame/drivers/solomon.c2
-rw-r--r--src/mame/drivers/sonson.c2
-rw-r--r--src/mame/drivers/sothello.c2
-rw-r--r--src/mame/drivers/spacefb.c2
-rw-r--r--src/mame/drivers/spaceg.c2
-rw-r--r--src/mame/drivers/spbactn.c2
-rw-r--r--src/mame/drivers/spcforce.c2
-rw-r--r--src/mame/drivers/spdodgeb.c2
-rw-r--r--src/mame/drivers/speedatk.c2
-rw-r--r--src/mame/drivers/speedbal.c2
-rw-r--r--src/mame/drivers/speedspn.c2
-rw-r--r--src/mame/drivers/speglsht.c2
-rw-r--r--src/mame/drivers/spiders.c2
-rw-r--r--src/mame/drivers/splash.c2
-rw-r--r--src/mame/drivers/spoker.c2
-rw-r--r--src/mame/drivers/spool99.c2
-rw-r--r--src/mame/drivers/sprcros2.c2
-rw-r--r--src/mame/drivers/sprint2.c2
-rw-r--r--src/mame/drivers/sprint4.c2
-rw-r--r--src/mame/drivers/sprint8.c2
-rw-r--r--src/mame/drivers/spy.c2
-rw-r--r--src/mame/drivers/srmp2.c2
-rw-r--r--src/mame/drivers/srmp5.c2
-rw-r--r--src/mame/drivers/srmp6.c2
-rw-r--r--src/mame/drivers/srumbler.c2
-rw-r--r--src/mame/drivers/ssf2md.c2
-rw-r--r--src/mame/drivers/ssfindo.c2
-rw-r--r--src/mame/drivers/ssgbl.c2
-rw-r--r--src/mame/drivers/sshangha.c2
-rw-r--r--src/mame/drivers/ssingles.c2
-rw-r--r--src/mame/drivers/sslam.c2
-rw-r--r--src/mame/drivers/ssozumo.c2
-rw-r--r--src/mame/drivers/sspeedr.c2
-rw-r--r--src/mame/drivers/ssrj.c2
-rw-r--r--src/mame/drivers/sstrangr.c2
-rw-r--r--src/mame/drivers/ssv.c2
-rw-r--r--src/mame/drivers/st0016.c2
-rw-r--r--src/mame/drivers/stactics.c2
-rw-r--r--src/mame/drivers/stadhero.c2
-rw-r--r--src/mame/drivers/starcrus.c2
-rw-r--r--src/mame/drivers/starfire.c2
-rw-r--r--src/mame/drivers/starshp1.c2
-rw-r--r--src/mame/drivers/starwars.c2
-rw-r--r--src/mame/drivers/statriv2.c2
-rw-r--r--src/mame/drivers/stepstag.c2
-rw-r--r--src/mame/drivers/stfight.c2
-rw-r--r--src/mame/drivers/stlforce.c2
-rw-r--r--src/mame/drivers/strnskil.c2
-rw-r--r--src/mame/drivers/stv.c2
-rw-r--r--src/mame/drivers/stvinit.c2
-rw-r--r--src/mame/drivers/sub.c2
-rw-r--r--src/mame/drivers/subs.c2
-rw-r--r--src/mame/drivers/subsino.c2
-rw-r--r--src/mame/drivers/suna16.c2
-rw-r--r--src/mame/drivers/suna8.c2
-rw-r--r--src/mame/drivers/supbtime.c2
-rw-r--r--src/mame/drivers/supdrapo.c2
-rw-r--r--src/mame/drivers/superchs.c2
-rw-r--r--src/mame/drivers/superdq.c2
-rw-r--r--src/mame/drivers/superqix.c2
-rw-r--r--src/mame/drivers/supertnk.c2
-rw-r--r--src/mame/drivers/suprgolf.c2
-rw-r--r--src/mame/drivers/suprloco.c2
-rw-r--r--src/mame/drivers/suprnova.c2
-rw-r--r--src/mame/drivers/suprridr.c2
-rw-r--r--src/mame/drivers/suprslam.c2
-rw-r--r--src/mame/drivers/surpratk.c2
-rw-r--r--src/mame/drivers/system1.c2
-rw-r--r--src/mame/drivers/system16.c2
-rw-r--r--src/mame/drivers/tagteam.c2
-rw-r--r--src/mame/drivers/tail2nos.c2
-rw-r--r--src/mame/drivers/taito_b.c2
-rw-r--r--src/mame/drivers/taito_f2.c2
-rw-r--r--src/mame/drivers/taito_f3.c2
-rw-r--r--src/mame/drivers/taito_h.c2
-rw-r--r--src/mame/drivers/taito_l.c2
-rw-r--r--src/mame/drivers/taito_o.c2
-rw-r--r--src/mame/drivers/taito_x.c2
-rw-r--r--src/mame/drivers/taito_z.c2
-rw-r--r--src/mame/drivers/taitoair.c2
-rw-r--r--src/mame/drivers/taitogn.c2
-rw-r--r--src/mame/drivers/taitojc.c2
-rw-r--r--src/mame/drivers/taitopjc.c2
-rw-r--r--src/mame/drivers/taitosj.c2
-rw-r--r--src/mame/drivers/taitotz.c2
-rw-r--r--src/mame/drivers/taitowlf.c2
-rw-r--r--src/mame/drivers/tank8.c2
-rw-r--r--src/mame/drivers/tankbatt.c2
-rw-r--r--src/mame/drivers/tankbust.c2
-rw-r--r--src/mame/drivers/taotaido.c2
-rw-r--r--src/mame/drivers/targeth.c2
-rw-r--r--src/mame/drivers/tatsumi.c2
-rw-r--r--src/mame/drivers/tattack.c2
-rw-r--r--src/mame/drivers/taxidrvr.c2
-rw-r--r--src/mame/drivers/tbowl.c2
-rw-r--r--src/mame/drivers/tceptor.c2
-rw-r--r--src/mame/drivers/tcl.c2
-rw-r--r--src/mame/drivers/tecmo.c2
-rw-r--r--src/mame/drivers/tecmo16.c2
-rw-r--r--src/mame/drivers/tecmosys.c2
-rw-r--r--src/mame/drivers/tehkanwc.c2
-rw-r--r--src/mame/drivers/tempest.c2
-rw-r--r--src/mame/drivers/terracre.c2
-rw-r--r--src/mame/drivers/tetrisp2.c2
-rw-r--r--src/mame/drivers/tgtpanic.c2
-rw-r--r--src/mame/drivers/thayers.c2
-rw-r--r--src/mame/drivers/thedeep.c2
-rw-r--r--src/mame/drivers/thepit.c2
-rw-r--r--src/mame/drivers/thief.c2
-rw-r--r--src/mame/drivers/thoop2.c2
-rw-r--r--src/mame/drivers/thunderj.c2
-rw-r--r--src/mame/drivers/thunderx.c2
-rw-r--r--src/mame/drivers/tiamc1.c2
-rw-r--r--src/mame/drivers/tickee.c2
-rw-r--r--src/mame/drivers/tigeroad.c2
-rw-r--r--src/mame/drivers/timelimt.c2
-rw-r--r--src/mame/drivers/timeplt.c2
-rw-r--r--src/mame/drivers/timetrv.c2
-rw-r--r--src/mame/drivers/tmaster.c2
-rw-r--r--src/mame/drivers/tmmjprd.c2
-rw-r--r--src/mame/drivers/tmnt.c2
-rw-r--r--src/mame/drivers/tnzs.c2
-rw-r--r--src/mame/drivers/toaplan1.c2
-rw-r--r--src/mame/drivers/toaplan2.c2
-rw-r--r--src/mame/drivers/toki.c2
-rw-r--r--src/mame/drivers/tokyocop.c2
-rw-r--r--src/mame/drivers/tomcat.c2
-rw-r--r--src/mame/drivers/toobin.c2
-rw-r--r--src/mame/drivers/topshoot.c2
-rw-r--r--src/mame/drivers/topspeed.c2
-rw-r--r--src/mame/drivers/toratora.c2
-rw-r--r--src/mame/drivers/tourtabl.c2
-rw-r--r--src/mame/drivers/toypop.c2
-rw-r--r--src/mame/drivers/tp84.c2
-rw-r--r--src/mame/drivers/trackfld.c2
-rw-r--r--src/mame/drivers/travrusa.c2
-rw-r--r--src/mame/drivers/triforce.c3
-rw-r--r--src/mame/drivers/triplhnt.c2
-rw-r--r--src/mame/drivers/truco.c2
-rw-r--r--src/mame/drivers/trucocl.c2
-rw-r--r--src/mame/drivers/trvmadns.c2
-rw-r--r--src/mame/drivers/trvquest.c2
-rw-r--r--src/mame/drivers/tryout.c2
-rw-r--r--src/mame/drivers/tsamurai.c2
-rw-r--r--src/mame/drivers/ttchamp.c2
-rw-r--r--src/mame/drivers/tubep.c2
-rw-r--r--src/mame/drivers/tugboat.c2
-rw-r--r--src/mame/drivers/tumbleb.c2
-rw-r--r--src/mame/drivers/tumblep.c2
-rw-r--r--src/mame/drivers/tunhunt.c2
-rw-r--r--src/mame/drivers/turbo.c2
-rw-r--r--src/mame/drivers/turrett.c2
-rw-r--r--src/mame/drivers/tutankhm.c2
-rw-r--r--src/mame/drivers/twin16.c2
-rw-r--r--src/mame/drivers/twincobr.c2
-rw-r--r--src/mame/drivers/twinkle.c2
-rw-r--r--src/mame/drivers/twins.c2
-rw-r--r--src/mame/drivers/tx1.c2
-rw-r--r--src/mame/drivers/uapce.c2
-rw-r--r--src/mame/drivers/ultraman.c2
-rw-r--r--src/mame/drivers/ultratnk.c2
-rw-r--r--src/mame/drivers/ultrsprt.c2
-rw-r--r--src/mame/drivers/undrfire.c2
-rw-r--r--src/mame/drivers/unico.c2
-rw-r--r--src/mame/drivers/upscope.c2
-rw-r--r--src/mame/drivers/usgames.c2
-rw-r--r--src/mame/drivers/vamphalf.c2
-rw-r--r--src/mame/drivers/vaportra.c2
-rw-r--r--src/mame/drivers/vastar.c2
-rw-r--r--src/mame/drivers/vball.c2
-rw-r--r--src/mame/drivers/vcombat.c3
-rw-r--r--src/mame/drivers/vega.c2
-rw-r--r--src/mame/drivers/vegaeo.c2
-rw-r--r--src/mame/drivers/vegas.c2
-rw-r--r--src/mame/drivers/vendetta.c2
-rw-r--r--src/mame/drivers/vertigo.c2
-rw-r--r--src/mame/drivers/vicdual.c2
-rw-r--r--src/mame/drivers/victory.c2
-rw-r--r--src/mame/drivers/videopin.c2
-rw-r--r--src/mame/drivers/videopkr.c2
-rw-r--r--src/mame/drivers/vigilant.c2
-rw-r--r--src/mame/drivers/vindictr.c2
-rw-r--r--src/mame/drivers/viper.c2
-rw-r--r--src/mame/drivers/vmetal.c2
-rw-r--r--src/mame/drivers/volfied.c2
-rw-r--r--src/mame/drivers/vp101.c2
-rw-r--r--src/mame/drivers/vpoker.c2
-rw-r--r--src/mame/drivers/vroulet.c2
-rw-r--r--src/mame/drivers/vsnes.c2
-rw-r--r--src/mame/drivers/vulgus.c2
-rw-r--r--src/mame/drivers/wallc.c2
-rw-r--r--src/mame/drivers/wardner.c2
-rw-r--r--src/mame/drivers/warpwarp.c2
-rw-r--r--src/mame/drivers/warriorb.c2
-rw-r--r--src/mame/drivers/wc90.c2
-rw-r--r--src/mame/drivers/wc90b.c2
-rw-r--r--src/mame/drivers/wecleman.c2
-rw-r--r--src/mame/drivers/welltris.c2
-rw-r--r--src/mame/drivers/wgp.c2
-rw-r--r--src/mame/drivers/wheelfir.c2
-rw-r--r--src/mame/drivers/williams.c2
-rw-r--r--src/mame/drivers/wink.c2
-rw-r--r--src/mame/drivers/wiping.c2
-rw-r--r--src/mame/drivers/witch.c2
-rw-r--r--src/mame/drivers/wiz.c2
-rw-r--r--src/mame/drivers/wldarrow.c2
-rw-r--r--src/mame/drivers/wolfpack.c2
-rw-r--r--src/mame/drivers/wrally.c2
-rw-r--r--src/mame/drivers/wwfsstar.c2
-rw-r--r--src/mame/drivers/wwfwfest.c2
-rw-r--r--src/mame/drivers/xain.c2
-rw-r--r--src/mame/drivers/xexex.c2
-rw-r--r--src/mame/drivers/xmen.c2
-rw-r--r--src/mame/drivers/xorworld.c2
-rw-r--r--src/mame/drivers/xtheball.c2
-rw-r--r--src/mame/drivers/xxmissio.c2
-rw-r--r--src/mame/drivers/xybots.c2
-rw-r--r--src/mame/drivers/xyonix.c2
-rw-r--r--src/mame/drivers/yiear.c2
-rw-r--r--src/mame/drivers/yunsun16.c2
-rw-r--r--src/mame/drivers/yunsung8.c2
-rw-r--r--src/mame/drivers/zac2650.c2
-rw-r--r--src/mame/drivers/zaccaria.c2
-rw-r--r--src/mame/drivers/zaxxon.c2
-rw-r--r--src/mame/drivers/zerozone.c2
-rw-r--r--src/mame/drivers/zn.c2
-rw-r--r--src/mame/drivers/zodiack.c2
-rw-r--r--src/mame/drivers/zr107.c2
1045 files changed, 1045 insertions, 1056 deletions
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index e29b07a1a83..861043e866d 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -63,7 +63,7 @@ correctly.
#define SOUND_CPU_CLOCK (XTAL_12MHz/4) /* 12MHz is the only OSC on the PCB */
#define AUDIO_CLOCK (XTAL_12MHz/8) /* 12MHz is the only OSC on the PCB */
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c
index 78994ce34ef..3611cec9040 100644
--- a/src/mame/drivers/1943.c
+++ b/src/mame/drivers/1943.c
@@ -27,7 +27,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c
index 7a0ff0742f3..cac613d2314 100644
--- a/src/mame/drivers/1945kiii.c
+++ b/src/mame/drivers/1945kiii.c
@@ -53,7 +53,7 @@ There are no static local variables.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index 8c6621ae0bf..214a15096a7 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -35,7 +35,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z180/z180.h"
#include "machine/eeprom.h"
#include "sound/namco.h"
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index cfcc70342d0..9b249b63a8a 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -52,7 +52,7 @@ DAC -26.6860Mhz
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c
index e01fa208329..6a233b20717 100644
--- a/src/mame/drivers/39in1.c
+++ b/src/mame/drivers/39in1.c
@@ -20,8 +20,7 @@
*
**************************************************************************/
-#include "driver.h"
-#include "video/generic.h"
+#include "emu.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/3super8.c b/src/mame/drivers/3super8.c
index 03de9108bdb..6d22e2a2979 100644
--- a/src/mame/drivers/3super8.c
+++ b/src/mame/drivers/3super8.c
@@ -24,7 +24,7 @@ Note
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index 4c514ebca79..e32c41dbb08 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -216,7 +216,7 @@ Notes - Has jumper setting for 122HZ or 61HZ)
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c
index b8c31188a10..d1eee1d8695 100644
--- a/src/mame/drivers/4enraya.c
+++ b/src/mame/drivers/4enraya.c
@@ -48,7 +48,7 @@ Sound :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/4roses.c b/src/mame/drivers/4roses.c
index 32455217a52..c12b8538e2d 100644
--- a/src/mame/drivers/4roses.c
+++ b/src/mame/drivers/4roses.c
@@ -172,7 +172,7 @@
#define MASTER_CLOCK XTAL_16MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "video/mc6845.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index cc088233451..096b064bbd5 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -86,7 +86,7 @@
/* */
/****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "cpu/i8085/i8085.h"
#include "machine/mb14241.h"
diff --git a/src/mame/drivers/86lions.c b/src/mame/drivers/86lions.c
index ef3fb8363a4..97447b7f68d 100644
--- a/src/mame/drivers/86lions.c
+++ b/src/mame/drivers/86lions.c
@@ -27,7 +27,7 @@ Changes 02/06/2009 - Palindrome
#define MAIN_CLOCK XTAL_12MHz /* guess */
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "video/mc6845.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index b999c60040d..6b2e3227499 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/konami/konami.h"
#include "cpu/z80/z80.h"
#include "video/konicdev.h"
diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c
index e64c6e5c757..d28019048c3 100644
--- a/src/mame/drivers/ace.c
+++ b/src/mame/drivers/ace.c
@@ -37,7 +37,7 @@ A1 2101 2101
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#define MASTER_CLOCK XTAL_18MHz
diff --git a/src/mame/drivers/acefruit.c b/src/mame/drivers/acefruit.c
index b03c662c3fc..28a821d1b98 100644
--- a/src/mame/drivers/acefruit.c
+++ b/src/mame/drivers/acefruit.c
@@ -8,7 +8,7 @@ Inputs and Dip Switches by Stephh
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sidewndr.lh"
diff --git a/src/mame/drivers/acommand.c b/src/mame/drivers/acommand.c
index 612aec8ee96..01f9523217e 100644
--- a/src/mame/drivers/acommand.c
+++ b/src/mame/drivers/acommand.c
@@ -55,7 +55,7 @@ JALCF1 BIN 1,048,576 02-07-99 1:11a JALCF1.BIN
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index ca7b195cd37..617ca146931 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -22,7 +22,7 @@
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/h6280/h6280.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c
index 84d5ad15fbd..54644473d48 100644
--- a/src/mame/drivers/adp.c
+++ b/src/mame/drivers/adp.c
@@ -144,7 +144,7 @@ Video board has additional chips:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/ay8910.h"
#include "video/hd63484.h"
diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c
index 02076c5ca40..ed242684d33 100644
--- a/src/mame/drivers/aeroboto.c
+++ b/src/mame/drivers/aeroboto.c
@@ -22,7 +22,7 @@ Revisions:
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/ay8910.h"
#include "includes/aeroboto.h"
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 7afac1cc4be..2c84ca0856f 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -58,7 +58,7 @@ Verification still needed for the other PCBs.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/2610intf.h"
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index 118cbeaf2b6..007477b0c1e 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -217,7 +217,7 @@ Code at 505: waits for bit 1 to go low, writes command, waits for bit
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index f9dd7316c48..995d4aaa83a 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -10,7 +10,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "cpu/konami/konami.h"
diff --git a/src/mame/drivers/aladbl.c b/src/mame/drivers/aladbl.c
index 1d1f22a94cf..07a0db9622d 100644
--- a/src/mame/drivers/aladbl.c
+++ b/src/mame/drivers/aladbl.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "megadriv.h"
/*
diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c
index 0d82864e864..407245c6021 100644
--- a/src/mame/drivers/albazc.c
+++ b/src/mame/drivers/albazc.c
@@ -10,7 +10,7 @@ TODO:
switch bank, and probably some NVRAM because there's a battery.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c
index 9c02d161437..57d6c7ad655 100644
--- a/src/mame/drivers/albazg.c
+++ b/src/mame/drivers/albazg.c
@@ -53,7 +53,7 @@ Code disassembling
[0312]-> Eeprom init msg
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/eeprom.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/aleck64.c b/src/mame/drivers/aleck64.c
index 8a26cc934ca..2b5c0916e37 100644
--- a/src/mame/drivers/aleck64.c
+++ b/src/mame/drivers/aleck64.c
@@ -165,7 +165,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "cpu/rsp/rsp.h"
#include "cpu/mips/mips3.h"
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 515ca0ce6de..12c4bf8d39e 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -20,7 +20,7 @@
**************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "render.h"
#include "includes/amiga.h"
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index 94aaf3414a7..5d11170282d 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -7,7 +7,7 @@ Preliminary driver by:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
#include "sound/k007232.h"
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index 08ecfea1859..40ab4cd9b92 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -187,7 +187,7 @@ DIP locations verified from manuals for:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c
index baefee8d01e..367a883c72d 100644
--- a/src/mame/drivers/amaticmg.c
+++ b/src/mame/drivers/amaticmg.c
@@ -381,7 +381,7 @@
#define CRTC_CLOCK MASTER_CLOCK/8 /* guess */
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "video/mc6845.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index 4d96bcdee19..da66023bee3 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -33,7 +33,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "includes/ambush.h"
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index 2ea2dafe03a..1cb93140564 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -364,7 +364,7 @@
#define MASTER_CLOCK XTAL_6MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "ampoker2.lh"
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index ee5118fd572..2424a2a4c1f 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -13,7 +13,7 @@ Sound: YM2151
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2151intf.h"
#include "includes/amspdwy.h"
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index 05455492eca..83b703b53d2 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -126,7 +126,7 @@ Dumped by Chackn
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/segacrpt.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/appoooh.c b/src/mame/drivers/appoooh.c
index d634575705b..c2d7b145fcb 100644
--- a/src/mame/drivers/appoooh.c
+++ b/src/mame/drivers/appoooh.c
@@ -161,7 +161,7 @@ Language
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/appoooh.h"
#include "machine/segacrpt.h" // needed for robowres_decode
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index a845e68585b..64f0cd9ae36 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -49,7 +49,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index 5d8cff75b5a..52accd6dca2 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -66,7 +66,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/arabian.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/arcadecl.c b/src/mame/drivers/arcadecl.c
index 466ba051d2e..40b2e9be9cc 100644
--- a/src/mame/drivers/arcadecl.c
+++ b/src/mame/drivers/arcadecl.c
@@ -66,7 +66,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "includes/arcadecl.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index 6b7927fa12b..18603ae470b 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -47,7 +47,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "includes/amiga.h"
#include "machine/6526cia.h"
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index e0938f91698..5474bcd6994 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -119,7 +119,7 @@ Known issues :
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c
index 400f25f8cac..97248ecd9b3 100644
--- a/src/mame/drivers/aristmk4.c
+++ b/src/mame/drivers/aristmk4.c
@@ -30,7 +30,7 @@ Technical Notes:
#define MAIN_CLOCK XTAL_12MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "video/mc6845.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/aristmk5.c b/src/mame/drivers/aristmk5.c
index a820d9066e0..ff32d2d69db 100644
--- a/src/mame/drivers/aristmk5.c
+++ b/src/mame/drivers/aristmk5.c
@@ -7,7 +7,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/arm/arm.h"
#include "sound/dac.h"
#include "includes/archimds.h"
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 8e281bc247c..98bffe488f6 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -503,7 +503,7 @@ DIP locations verified for:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/arkanoid.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index 2f3b55ebbcc..a18f1e1082e 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -157,7 +157,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/artmagic.c b/src/mame/drivers/artmagic.c
index 06dedc08017..1083625359f 100644
--- a/src/mame/drivers/artmagic.c
+++ b/src/mame/drivers/artmagic.c
@@ -21,7 +21,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms34010/tms34010.h"
#include "video/tlc34076.h"
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index 572ba76d828..4bc2be2c1e2 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -72,7 +72,7 @@ Coin B is not used
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index caeb3286298..872f73ba82a 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -9,7 +9,7 @@ colour, including the word "Konami"
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index 68f47b9cf8e..67a7a8ec82b 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -183,7 +183,7 @@ There is not a rev 03 known or dumped. An Asteroids rev 03 is not mentioned in a
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "rendlay.h"
#include "video/vector.h"
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index eeffb54dc7d..49e8c0dc155 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -16,7 +16,7 @@ DIP locations verified for:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index cfca2d174e9..63411ce2eb6 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -110,7 +110,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "includes/astrocde.h"
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index e9785054d18..5b943a7ce89 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -11,7 +11,7 @@ OTHER: ASTRO 0001B, EEPROM
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index 34aed881e88..3fadf21b2b0 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -56,7 +56,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/astrof.h"
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index b64e92a1709..04b9b2b4676 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -212,7 +212,7 @@ DIP locations verified for:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "includes/taitoipt.h"
diff --git a/src/mame/drivers/atarifb.c b/src/mame/drivers/atarifb.c
index f9acb684ba7..ba3759de0cb 100644
--- a/src/mame/drivers/atarifb.c
+++ b/src/mame/drivers/atarifb.c
@@ -102,7 +102,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "deprecat.h"
#include "includes/atarifb.h"
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index 65e2026d988..63b8537b381 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -18,7 +18,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "audio/atarijsa.h"
#include "video/atarirle.h"
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index 280eb7d8ecd..82054e56c1f 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/asic65.h"
#include "audio/atarijsa.h"
diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c
index e433d68f155..7be29954eee 100644
--- a/src/mame/drivers/atarigt.c
+++ b/src/mame/drivers/atarigt.c
@@ -18,7 +18,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "video/atarirle.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index 45a38b8890c..a428c4e52fa 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -19,7 +19,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "audio/atarijsa.h"
#include "video/atarirle.h"
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index 6e1b63fdd22..1dbf38c4b65 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -168,7 +168,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
#include "machine/atarigen.h"
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index becae9f27f5..07e53198124 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -123,7 +123,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/t11/t11.h"
#include "includes/slapstic.h"
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index 7ba2f408044..4771684531e 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -25,7 +25,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i86/i86.h"
#include "machine/eeprom.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index bc77c6b8265..9840ba3970e 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -47,13 +47,12 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/slapstic.h"
#include "includes/atetris.h"
#include "sound/sn76496.h"
#include "sound/pokey.h"
-#include "state.h"
#define MASTER_CLOCK XTAL_14_31818MHz
diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c
index ae3c91b6904..7dc2a6c8736 100644
--- a/src/mame/drivers/attckufo.c
+++ b/src/mame/drivers/attckufo.c
@@ -41,7 +41,7 @@ LOIPOIO-B
****************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/attckufo.h"
diff --git a/src/mame/drivers/avalnche.c b/src/mame/drivers/avalnche.c
index 8ccc642cf34..d56e9a2778f 100644
--- a/src/mame/drivers/avalnche.c
+++ b/src/mame/drivers/avalnche.c
@@ -27,7 +27,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "deprecat.h"
#include "sound/discrete.h"
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 24998f0cebf..08704ac31ab 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -13,7 +13,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "video/vector.h"
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index 00466977ee5..e08ee22ee9d 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -11,7 +11,7 @@
*/
#define DE156CPU ARM
-#include "driver.h"
+#include "emu.h"
#include "includes/decocrpt.h"
#include "includes/deco32.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c
index dde96543d0d..8cc78bf728a 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -161,7 +161,7 @@ Measurements -
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index e1ad7389f3d..cd3366039a3 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -60,7 +60,7 @@ DIP locations verified for:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/tms5110.h"
diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c
index 9ec40049e67..3ef3bd64b7e 100644
--- a/src/mame/drivers/balsente.c
+++ b/src/mame/drivers/balsente.c
@@ -224,7 +224,7 @@ DIP locations verified for:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/bankp.c b/src/mame/drivers/bankp.c
index ee5db38e099..8adff1aaf12 100644
--- a/src/mame/drivers/bankp.c
+++ b/src/mame/drivers/bankp.c
@@ -91,7 +91,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "includes/bankp.h"
diff --git a/src/mame/drivers/baraduke.c b/src/mame/drivers/baraduke.c
index 9b2bff5f46a..9c821242b8f 100644
--- a/src/mame/drivers/baraduke.c
+++ b/src/mame/drivers/baraduke.c
@@ -104,7 +104,7 @@ DIP locations verified for:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
#include "sound/namco.h"
diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c
index 381997493ca..2db6718db52 100644
--- a/src/mame/drivers/batman.c
+++ b/src/mame/drivers/batman.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "audio/atarijsa.h"
#include "includes/batman.h"
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index b0d8f10a55c..89f5013a607 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/3526intf.h"
#include "includes/battlane.h"
diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c
index 9284b407962..43618a1c810 100644
--- a/src/mame/drivers/battlera.c
+++ b/src/mame/drivers/battlera.c
@@ -20,7 +20,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/h6280/h6280.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c
index f26dc81d861..ea08ccf87b1 100644
--- a/src/mame/drivers/battlex.c
+++ b/src/mame/drivers/battlex.c
@@ -43,7 +43,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index 32205618fdd..da07610a5e8 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -10,7 +10,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/hd6309/hd6309.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index fd8fe7c595e..48d0c054061 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -197,7 +197,7 @@ the entire size of the screen.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2608intf.h"
diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c
index 9957bf0c2da..23acac9056f 100644
--- a/src/mame/drivers/beaminv.c
+++ b/src/mame/drivers/beaminv.c
@@ -51,7 +51,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index 4447a1322b4..8e45bb992a3 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -97,7 +97,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/asap/asap.h"
#include "machine/atarigen.h"
#include "audio/atarijsa.h"
diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c
index 19eb3fb6a7f..0cca11c5b3f 100644
--- a/src/mame/drivers/beezer.c
+++ b/src/mame/drivers/beezer.c
@@ -6,7 +6,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "machine/6522via.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index 12c856a15bd..34e686a79bd 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/exidy.h"
#include "machine/74181.h"
diff --git a/src/mame/drivers/bestleag.c b/src/mame/drivers/bestleag.c
index 33526d0e8c8..01d175c4b19 100644
--- a/src/mame/drivers/bestleag.c
+++ b/src/mame/drivers/bestleag.c
@@ -19,7 +19,7 @@ Dip Locations added according to Service Mode
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index 90bac11867c..46ece9561a6 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -72,7 +72,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/6850acia.h"
#include "machine/meters.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/bfm_sc1.c b/src/mame/drivers/bfm_sc1.c
index 08b3c775dd0..6dd9978264e 100644
--- a/src/mame/drivers/bfm_sc1.c
+++ b/src/mame/drivers/bfm_sc1.c
@@ -81,7 +81,7 @@ Optional (on expansion card) (Viper)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/z80/z80.h"
#include "video/awpvid.h"
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index a3d905d6cac..0bb1a299220 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -136,7 +136,7 @@ Adder hardware:
* Fix RS232 protocol
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "video/bfm_adr2.h"
diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c
index b7620bf3386..c39858b278e 100644
--- a/src/mame/drivers/bfmsys85.c
+++ b/src/mame/drivers/bfmsys85.c
@@ -57,7 +57,7 @@ ___________________________________________________________________________
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "video/awpvid.h"
#include "machine/6850acia.h"
diff --git a/src/mame/drivers/big10.c b/src/mame/drivers/big10.c
index 65a6238348e..4983e6bd942 100644
--- a/src/mame/drivers/big10.c
+++ b/src/mame/drivers/big10.c
@@ -56,7 +56,7 @@
#define MASTER_CLOCK XTAL_21_4772MHz /* Dumper notes poorly refers to a 21.?727 Xtal. */
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "video/v9938.h"
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index 4cb960f77fa..94d18f71f0c 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -55,7 +55,7 @@ J1100072A
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index 00686a13744..182aa3a85ea 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -108,7 +108,7 @@ Notes:
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/bigstrkb.c b/src/mame/drivers/bigstrkb.c
index 1895a2564d3..65da2a7ae5a 100644
--- a/src/mame/drivers/bigstrkb.c
+++ b/src/mame/drivers/bigstrkb.c
@@ -12,7 +12,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/bingoc.c b/src/mame/drivers/bingoc.c
index 43230b1fc14..595d11ea625 100644
--- a/src/mame/drivers/bingoc.c
+++ b/src/mame/drivers/bingoc.c
@@ -27,7 +27,7 @@ SOUND : YM2151 uPD7759C
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/bingor.c b/src/mame/drivers/bingor.c
index b2f73064c46..c79a310c91f 100644
--- a/src/mame/drivers/bingor.c
+++ b/src/mame/drivers/bingor.c
@@ -437,7 +437,7 @@
************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i86/i86.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "sound/saa1099.h"
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index bd6cb06b05f..aef5d9d725a 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -54,7 +54,7 @@
******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index cb1d5c6bada..cbde51b77e0 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -83,7 +83,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "video/konicdev.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/bishjan.c b/src/mame/drivers/bishjan.c
index eb2722c9610..1d0ca46d259 100644
--- a/src/mame/drivers/bishjan.c
+++ b/src/mame/drivers/bishjan.c
@@ -30,7 +30,7 @@ To do:
************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "memconv.h"
#include "cpu/h83002/h8.h"
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index 99af0e8eea7..a72aaf50813 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -15,7 +15,7 @@ DIP Locations verified for:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c
index 7eb972e9dd3..92cbcc5f4cb 100644
--- a/src/mame/drivers/blackt96.c
+++ b/src/mame/drivers/blackt96.c
@@ -47,7 +47,7 @@ Is this based on some Seta / Taito HW design, the sprite-tilemaps look familiar
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index ba787fcde99..91acf5ff00a 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -25,7 +25,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m6809/m6809.h"
#include "cpu/hd6309/hd6309.h"
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index 06977771e56..66c9394e292 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -13,7 +13,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index b9d42d96641..ab7a770e807 100644
--- a/src/mame/drivers/blmbycar.c
+++ b/src/mame/drivers/blmbycar.c
@@ -23,7 +23,7 @@ Check game speed, it depends on a bit we toggle..
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "includes/blmbycar.h"
diff --git a/src/mame/drivers/blockade.c b/src/mame/drivers/blockade.c
index 13ef3a14f30..1f0420a523c 100644
--- a/src/mame/drivers/blockade.c
+++ b/src/mame/drivers/blockade.c
@@ -28,7 +28,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "includes/blockade.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index aa5817153f3..253c9855661 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -19,7 +19,7 @@
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
#include "video/konicdev.h"
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index 3aaef1599ac..c262c132a34 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -64,7 +64,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c
index e56ec21930a..e0b935b12f4 100644
--- a/src/mame/drivers/bloodbro.c
+++ b/src/mame/drivers/bloodbro.c
@@ -105,7 +105,7 @@ DIP locations verified for:
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "audio/seibu.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c
index c10caf97e85..80a59b3cd39 100644
--- a/src/mame/drivers/blstroid.c
+++ b/src/mame/drivers/blstroid.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/atarigen.h"
#include "audio/atarijsa.h"
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index e4cbabba444..434022697f1 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -52,7 +52,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index b5faee961ac..61a720baded 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -103,7 +103,7 @@ Main board:
KDA0476BCN-66 DIP4
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
#include "machine/6522via.h"
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index deca57c71e4..77dc27b2994 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -86,7 +86,7 @@ ROMs : MR96004-10.1 [125661cd] (IC5 - Samples)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/v60/v60.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c
index 77152cc8760..766cb25812c 100644
--- a/src/mame/drivers/bogeyman.c
+++ b/src/mame/drivers/bogeyman.c
@@ -11,7 +11,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c
index 0192503fbb5..168882602e8 100644
--- a/src/mame/drivers/bombjack.c
+++ b/src/mame/drivers/bombjack.c
@@ -95,7 +95,7 @@ Dip Locations and factory settings verified with manual
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "includes/bombjack.h"
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index 2c42dabe6f4..3ff3ccc4b11 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -78,7 +78,7 @@
Dip Locations added according to the manual of the JPN version
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "includes/decocrpt.h"
diff --git a/src/mame/drivers/bottom9.c b/src/mame/drivers/bottom9.c
index 9555cf91dc3..3691824301c 100644
--- a/src/mame/drivers/bottom9.c
+++ b/src/mame/drivers/bottom9.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index a8dd86fe977..6625e9bf6b9 100644
--- a/src/mame/drivers/boxer.c
+++ b/src/mame/drivers/boxer.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index a64577c9a5b..94bfe5dd25d 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -49,7 +49,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
#include "sound/3526intf.h"
diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c
index 10eefb8840d..3d84323579e 100644
--- a/src/mame/drivers/bsktball.c
+++ b/src/mame/drivers/bsktball.c
@@ -23,7 +23,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "deprecat.h"
#include "includes/bsktball.h"
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 9d31d92f865..555dcacb4d1 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -137,7 +137,7 @@ A few notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
#include "sound/discrete.h"
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index faad9c68565..e25d33f12f7 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -6,7 +6,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/tms34010/tms34010.h"
#include "video/tlc34076.h"
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index 91b2dc3d205..bc8e3143bb7 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -266,7 +266,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6800/m6800.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index 2d5eabc8f5b..16908d1adec 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -79,7 +79,7 @@ Dip locations and factory settings verified from dip listing
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/buster.c b/src/mame/drivers/buster.c
index 87c4557953a..c67bdd742fd 100644
--- a/src/mame/drivers/buster.c
+++ b/src/mame/drivers/buster.c
@@ -6,7 +6,7 @@ Video Fruit Machine
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/bwidow.c b/src/mame/drivers/bwidow.c
index dd6b0e7ad7d..b19bf839220 100644
--- a/src/mame/drivers/bwidow.c
+++ b/src/mame/drivers/bwidow.c
@@ -216,7 +216,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "video/vector.h"
#include "video/avgdvg.h"
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index 3b96c303f1c..37c4203f3e8 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -22,7 +22,7 @@ Known issues:
*****************************************************************************/
// Directives
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index 7b3b0c75160..90fb80d056c 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -200,7 +200,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "video/vector.h"
#include "video/avgdvg.h"
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 577c5062b9c..8d6aaff26cd 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -44,7 +44,7 @@ Dip locations verified with Fabtek manual for the trackball version
******************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/cabaret.c b/src/mame/drivers/cabaret.c
index f9950601971..b62312f8866 100644
--- a/src/mame/drivers/cabaret.c
+++ b/src/mame/drivers/cabaret.c
@@ -21,7 +21,7 @@ are the same of IGS. AMT may be previous IGS name.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z180/z180.h"
#include "sound/2413intf.h"
diff --git a/src/mame/drivers/calchase.c b/src/mame/drivers/calchase.c
index a18305e1923..80c80cf5c5a 100644
--- a/src/mame/drivers/calchase.c
+++ b/src/mame/drivers/calchase.c
@@ -83,7 +83,7 @@ all files across to new HDD, boots up fine.
************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
#include "memconv.h"
#include "devconv.h"
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index 2925f5829e0..57b0707d762 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -629,7 +629,7 @@
#define UART_CLOCK (MASTER_CLOCK/16)
#define SND_CLOCK (MASTER_CLOCK/8)
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "video/mc6845.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index 2d0e2cd8819..84932375423 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -77,7 +77,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/segacrpt.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/canyon.c b/src/mame/drivers/canyon.c
index 3696caf81fd..48812b0918a 100644
--- a/src/mame/drivers/canyon.c
+++ b/src/mame/drivers/canyon.c
@@ -36,7 +36,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/canyon.h"
#include "sound/discrete.h"
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index f83f14ca9b1..11428701af3 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -87,7 +87,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/ticket.h"
#include "cpu/m6809/m6809.h"
#include "includes/capbowl.h"
diff --git a/src/mame/drivers/cardline.c b/src/mame/drivers/cardline.c
index 2070478a017..4307899290f 100644
--- a/src/mame/drivers/cardline.c
+++ b/src/mame/drivers/cardline.c
@@ -16,7 +16,7 @@
***********************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mcs51/mcs51.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c
index abad1f5c6b7..c674966d753 100644
--- a/src/mame/drivers/carjmbre.c
+++ b/src/mame/drivers/carjmbre.c
@@ -42,7 +42,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "includes/carjmbre.h"
diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c
index aa65eef11ca..713cdb13414 100644
--- a/src/mame/drivers/carpolo.c
+++ b/src/mame/drivers/carpolo.c
@@ -16,7 +16,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/7474.h"
#include "machine/74148.h"
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 356c7191e61..c3aa1683ef3 100644
--- a/src/mame/drivers/carrera.c
+++ b/src/mame/drivers/carrera.c
@@ -46,7 +46,7 @@ TODO:
#define MASTER_CLOCK XTAL_22_1184MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/caswin.c b/src/mame/drivers/caswin.c
index 198f1b1ec68..12d080d9c16 100644
--- a/src/mame/drivers/caswin.c
+++ b/src/mame/drivers/caswin.c
@@ -41,7 +41,7 @@ TODO:
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index 341f90bb028..e18901dcf14 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -68,7 +68,7 @@ Versions known to exist but not dumped:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
#include "machine/nmk112.h"
diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c
index 22d473816e1..3bc27629705 100644
--- a/src/mame/drivers/cb2001.c
+++ b/src/mame/drivers/cb2001.c
@@ -38,7 +38,7 @@ In test mode (c) is 2000
*************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
#include "sound/ay8910.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c
index a12a79c4bbb..927429f2e86 100644
--- a/src/mame/drivers/cball.c
+++ b/src/mame/drivers/cball.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index 01bfb446540..862e57786bb 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/cps1.h" // needed for decoding functions only
#include "includes/cbasebal.h"
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index eaf04942e43..1270692bd20 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -16,7 +16,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/ccastles.c b/src/mame/drivers/ccastles.c
index 6edaea3f7cb..a8b80d59635 100644
--- a/src/mame/drivers/ccastles.c
+++ b/src/mame/drivers/ccastles.c
@@ -119,7 +119,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/pokey.h"
#include "includes/ccastles.h"
diff --git a/src/mame/drivers/cchance.c b/src/mame/drivers/cchance.c
index 4724fec60bd..ef1666bb976 100644
--- a/src/mame/drivers/cchance.c
+++ b/src/mame/drivers/cchance.c
@@ -32,7 +32,7 @@ cha3 $10d8
*****************************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/tnzs.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/cchasm.c b/src/mame/drivers/cchasm.c
index aadc9eba9be..2e311c4847d 100644
--- a/src/mame/drivers/cchasm.c
+++ b/src/mame/drivers/cchasm.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index f01bd04ec7d..27881278f8d 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -201,7 +201,7 @@ Dip location verified from manual for: cclimber, guzzler, swimmer
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/segacrpt.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index ea34e192578..439d8951716 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -418,7 +418,7 @@ The Two Bit Score "Dux" hack was circulated and common enough for inclusion
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/s2650/s2650.h"
#include "machine/atari_vg.h"
diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c
index 698abc156cb..a2f35308c04 100644
--- a/src/mame/drivers/chaknpop.c
+++ b/src/mame/drivers/chaknpop.c
@@ -5,7 +5,7 @@
* driver by BUT
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "includes/chaknpop.h"
diff --git a/src/mame/drivers/cham24.c b/src/mame/drivers/cham24.c
index 73954d2b887..63350bdae9d 100644
--- a/src/mame/drivers/cham24.c
+++ b/src/mame/drivers/cham24.c
@@ -54,7 +54,7 @@ Notes:
U3 is 27C512 EPROM
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/dac.h"
#include "sound/nes_apu.h"
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index 6696b5c9521..db8080a3185 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -81,7 +81,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/alph8201/alph8201.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c
index 0b194ec74b8..48547d0e0b4 100644
--- a/src/mame/drivers/champbwl.c
+++ b/src/mame/drivers/champbwl.c
@@ -150,7 +150,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/x1_010.h"
#include "includes/tnzs.h"
diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c
index 8172b0193da..311665737f3 100644
--- a/src/mame/drivers/chanbara.c
+++ b/src/mame/drivers/chanbara.c
@@ -46,7 +46,7 @@ ToDo:
****************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index 67242626b47..c3b9e843a27 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -8,7 +8,7 @@ Tomasz Slanina
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/cheekyms.c b/src/mame/drivers/cheekyms.c
index 9fa45474d4b..d62dba109c5 100644
--- a/src/mame/drivers/cheekyms.c
+++ b/src/mame/drivers/cheekyms.c
@@ -6,7 +6,7 @@
Not to be distributed as part of any commerical work.
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/dac.h"
#include "includes/cheekyms.h"
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index c361e2cd389..f696e93f335 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -34,9 +34,8 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
-#include "video/generic.h"
#include "includes/naomibd.h"
static ADDRESS_MAP_START( xbox_map, ADDRESS_SPACE_PROGRAM, 32 )
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index a958888edc3..c2cb8319006 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -69,7 +69,7 @@ Dip locations and factory settings verified with China Gate US manual.
-#include "driver.h"
+#include "emu.h"
#include "cpu/hd6309/hd6309.h"
#include "cpu/m6809/m6809.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index d299ada3d6d..86b653e8bc6 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -41,7 +41,7 @@ MM63.10N
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/mc8123.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index 9011204a51b..d13bbfe8f2c 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "cpu/konami/konami.h"
diff --git a/src/mame/drivers/chsuper.c b/src/mame/drivers/chsuper.c
index cd847741942..c4f5676e029 100644
--- a/src/mame/drivers/chsuper.c
+++ b/src/mame/drivers/chsuper.c
@@ -10,7 +10,7 @@ TODO:
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z180/z180.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c
index ce5188e55d8..2cbe314b19c 100644
--- a/src/mame/drivers/cidelsa.c
+++ b/src/mame/drivers/cidelsa.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "cpu/cdp1802/cdp1802.h"
#include "cpu/cop400/cop400.h"
#include "sound/cdp1869.h"
diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c
index 7bdcd4a70d7..a53697ee18a 100644
--- a/src/mame/drivers/cinemat.c
+++ b/src/mame/drivers/cinemat.c
@@ -29,7 +29,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/vector.h"
#include "cpu/ccpu/ccpu.h"
#include "includes/cinemat.h"
diff --git a/src/mame/drivers/circus.c b/src/mame/drivers/circus.c
index 66c04fc7945..b532526b572 100644
--- a/src/mame/drivers/circus.c
+++ b/src/mame/drivers/circus.c
@@ -33,7 +33,7 @@ D000 Paddle Position and Interrupt Reset
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "deprecat.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index f0a54b23d9c..13e7b190772 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -47,7 +47,7 @@ To enter service mode, keep 1&2 pressed on reset
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/konami1.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index b2f98f40885..db230cd02f7 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -167,7 +167,7 @@ Cisco Heat.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index 49c0f3d023e..3e16abe3034 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -7,7 +7,7 @@ Dip locations added from dip listing at crazykong.com
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/ay8910.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c
index 82bc17bf285..e6007f193e2 100644
--- a/src/mame/drivers/clayshoo.c
+++ b/src/mame/drivers/clayshoo.c
@@ -12,7 +12,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index 6d8258f64e7..d7729dd5499 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -73,7 +73,7 @@ Side 2 = 0x8F7DDD (or 0x880000 | ( 0x77 << 12 ) | 0x0DDD)
*********************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "render.h"
#include "machine/laserdsc.h"
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index 43b07a0528c..2df0e5c8a97 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -114,7 +114,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "deprecat.h"
#include "sound/pokey.h"
diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c
index fe14c5e7539..0658fca7e6b 100644
--- a/src/mame/drivers/cloud9.c
+++ b/src/mame/drivers/cloud9.c
@@ -90,7 +90,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/pokey.h"
#include "includes/cloud9.h"
diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c
index 651b0880a4b..004df3be716 100644
--- a/src/mame/drivers/clshroad.c
+++ b/src/mame/drivers/clshroad.c
@@ -17,7 +17,7 @@ XTAL : 18.432 MHz
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
/* Variables & functions defined in video: */
diff --git a/src/mame/drivers/cmmb.c b/src/mame/drivers/cmmb.c
index 712ee9a3cd0..9c7c8b9d40b 100644
--- a/src/mame/drivers/cmmb.c
+++ b/src/mame/drivers/cmmb.c
@@ -27,7 +27,7 @@ CYC1399
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
static VIDEO_START( cmmb )
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index 82fbc3bcf99..5fa8c5abbfc 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -40,7 +40,7 @@ Note about version levels using Mutant Fighter as the example:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "includes/cninja.h"
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index 2920ad5a1f8..42b46aa2ea8 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -22,12 +22,11 @@
***************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6809/m6809.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
-#include <math.h>
typedef struct _cntsteer_state cntsteer_state;
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index f6d1e6e8877..26d40251c27 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -22,7 +22,7 @@ x
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/6821pia.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/coinmvga.c b/src/mame/drivers/coinmvga.c
index f363aff47d9..2502af7df14 100644
--- a/src/mame/drivers/coinmvga.c
+++ b/src/mame/drivers/coinmvga.c
@@ -213,7 +213,7 @@
#define COM_CLOCK XTAL_20MHz
#define SND_CLOCK XTAL_16_9344MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/h83002/h8.h"
#include "sound/ymz280b.h"
diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c
index 8b45d37d63b..9ecdb1b773c 100644
--- a/src/mame/drivers/cojag.c
+++ b/src/mame/drivers/cojag.c
@@ -288,7 +288,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/mips/r3000.h"
#include "cpu/jaguar/jaguar.h"
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index d3f42430134..275dd506cff 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -121,7 +121,7 @@ Dip location and recommended settings verified with the US manual
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/hd6309/hd6309.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/comebaby.c b/src/mame/drivers/comebaby.c
index 59391a75d80..ae61f0f41b3 100644
--- a/src/mame/drivers/comebaby.c
+++ b/src/mame/drivers/comebaby.c
@@ -56,7 +56,7 @@
Easy enough to fix a broken game if you have the controls to plug into it.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
static VIDEO_START(comebaby)
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index ec3b63f40b9..8749181396f 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -42,7 +42,7 @@ Note : there is an ingame typo bug that doesn't display the bonus life values
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c
index 205d2f98ca2..e486c51f46d 100644
--- a/src/mame/drivers/compgolf.c
+++ b/src/mame/drivers/compgolf.c
@@ -10,7 +10,7 @@
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
#include "includes/compgolf.h"
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index 0f88fb0650c..5e91ef33278 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -16,7 +16,7 @@ Dip locations and factory settings verified with manual
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/2151intf.h"
#include "video/konicdev.h"
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index b3a078a01e5..74d7bb69f82 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -24,7 +24,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms32010/tms32010.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/tms32025/tms32025.h"
diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c
index ba50a551275..460a34c0cf9 100644
--- a/src/mame/drivers/coolridr.c
+++ b/src/mame/drivers/coolridr.c
@@ -233,7 +233,7 @@ Note: This hardware appears to have been designed as a test-bed for a new RLE ba
******************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "debugger.h"
#include "cpu/sh2/sh2.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index 67bcadb563d..1b53c6788f1 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -49,7 +49,7 @@ Mighty Guy board layout:
YM3526
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/3526intf.h"
diff --git a/src/mame/drivers/copsnrob.c b/src/mame/drivers/copsnrob.c
index 4128ab2f195..4430b799cbc 100644
--- a/src/mame/drivers/copsnrob.c
+++ b/src/mame/drivers/copsnrob.c
@@ -55,7 +55,7 @@ Added Dip locations according to manual.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/copsnrob.h"
#include "copsnrob.lh"
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index 55a817a485f..91e5a8868c3 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -36,7 +36,7 @@ forcing all sprites on a row to have an added blue component.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms9900/tms9900.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c
index 02dc012e31e..f18222be09a 100644
--- a/src/mame/drivers/cowrace.c
+++ b/src/mame/drivers/cowrace.c
@@ -6,7 +6,7 @@
*************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 2c0ed078bf6..aeff0d20b13 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -229,7 +229,7 @@ Stephh's log (2006.09.20) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 0baf61a5fc4..5194bb9f9b1 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -583,7 +583,7 @@ Stephh's inputs notes (based on some tests on the "parent" set) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index 11018b7ca7f..c4d6a3667c3 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -319,7 +319,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cdrom.h"
#include "cpu/sh2/sh2.h"
#include "machine/intelfsh.h"
diff --git a/src/mame/drivers/crbaloon.c b/src/mame/drivers/crbaloon.c
index 3a4ba37b270..22a61fdc2bf 100644
--- a/src/mame/drivers/crbaloon.c
+++ b/src/mame/drivers/crbaloon.c
@@ -14,7 +14,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/crbaloon.h"
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index cfd76d9e0f7..1311c148ca6 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -29,7 +29,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/crgolf.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index 64162b3632a..93f55ffc70a 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -11,7 +11,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
#include "video/konicdev.h"
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index b4fd253e7c7..e1865cf0291 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -28,7 +28,7 @@
Added Service dipswitch and dip locations based on Service Mode.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index 0bb186d617a..accae51bb5a 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -126,7 +126,7 @@ Dip locations verified with Service Mode.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index 7b3895321c7..3f993bc24a6 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -116,7 +116,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/se3208/se3208.h"
#include "video/vrender0.h"
#include "machine/ds1302.h"
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index e4bfa809a2d..4938a23e5e9 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -83,7 +83,7 @@ Stephh's notes (based on the game Z80 code and some tests) :
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "audio/seibu.h"
diff --git a/src/mame/drivers/cubeqst.c b/src/mame/drivers/cubeqst.c
index 153de29c84c..cc4a2021f77 100644
--- a/src/mame/drivers/cubeqst.c
+++ b/src/mame/drivers/cubeqst.c
@@ -17,7 +17,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/cubeqcpu/cubeqcpu.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index 97851f4fc17..38b60a215b4 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -324,7 +324,7 @@ routines :
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/cdda.h"
#include "includes/amiga.h"
diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c
index c8ada52fadc..c985017889d 100644
--- a/src/mame/drivers/cultures.c
+++ b/src/mame/drivers/cultures.c
@@ -8,7 +8,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index 158de03a9ef..7a2a4863aea 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -90,7 +90,7 @@ Todo & FIXME:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "sound/dac.h"
#include "sound/tms5110.h"
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index a289d25f065..94ccd2488b1 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -19,7 +19,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index 06079701d61..7cb2f86ba17 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -172,7 +172,7 @@ lev 7 : 0x7c : 0000 07e0 - input device clear?
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/cyclemb.c b/src/mame/drivers/cyclemb.c
index 8368a9ddeb5..f52eb6d5bd1 100644
--- a/src/mame/drivers/cyclemb.c
+++ b/src/mame/drivers/cyclemb.c
@@ -69,7 +69,7 @@ Dumped by Chack'n
****************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "machine/tait8741.h"
diff --git a/src/mame/drivers/d9final.c b/src/mame/drivers/d9final.c
index 1a0cacc6585..2d78db4c314 100644
--- a/src/mame/drivers/d9final.c
+++ b/src/mame/drivers/d9final.c
@@ -19,7 +19,7 @@
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2413intf.h"
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index 915c8ef0502..efcdb1c9703 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -17,7 +17,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/dac.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c
index 5e1b76f79f5..48893f7aae3 100644
--- a/src/mame/drivers/dambustr.c
+++ b/src/mame/drivers/dambustr.c
@@ -11,7 +11,7 @@ Dip locations verified with manual
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/galaxian.h"
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 3a38e1c559b..8ec1d46015b 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -126,7 +126,7 @@ sounds.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "video/taitoic.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index cfe08f3408e..e33536b9971 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -54,7 +54,7 @@ To do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/darkmist.c b/src/mame/drivers/darkmist.c
index e77afec5acf..ff9fe7ba270 100644
--- a/src/mame/drivers/darkmist.c
+++ b/src/mame/drivers/darkmist.c
@@ -23,7 +23,7 @@ TODO:
***********************************************************************************
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "audio/t5182.h"
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index 30069b06fe6..4ebcc1a546b 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -13,7 +13,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index dcd07759aa0..780de106fe6 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -121,7 +121,7 @@ Dip locations verified with US conversion kit manual.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "includes/deco16ic.h"
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index 30ec0b236a5..68f50af2bcb 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -17,7 +17,7 @@ Protection TODO:
-- Dip locations verified with Japanese manual
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "includes/decocrpt.h"
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 5f9c84b2585..1c3c4ea03af 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -50,7 +50,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "video/konicdev.h"
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index 2437c1b13f1..1afa84e3f74 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -28,7 +28,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/dcon.c b/src/mame/drivers/dcon.c
index 9b1d1c6c8ff..09f7bd0fc98 100644
--- a/src/mame/drivers/dcon.c
+++ b/src/mame/drivers/dcon.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "audio/seibu.h"
diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c
index 1f4b5a7b75f..68144bb8540 100644
--- a/src/mame/drivers/dday.c
+++ b/src/mame/drivers/dday.c
@@ -49,7 +49,7 @@ write:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "includes/dday.h"
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index 1dd1acc3ca6..48c0d07e1ca 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -51,7 +51,7 @@ $842f = lives
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c
index 0ecabc85d1f..830a31d32cd 100644
--- a/src/mame/drivers/ddealer.c
+++ b/src/mame/drivers/ddealer.c
@@ -109,7 +109,7 @@ Few words about protection:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 95e25d0493e..de66bcf4e7b 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -93,7 +93,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 52836bb8368..1a891881e87 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -68,7 +68,7 @@ Dip locations verified with manual for ddragon & ddragon2
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/hd6309/hd6309.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index 77bd48340f5..5670e162e2c 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -138,7 +138,7 @@ ROMs (All ROMs are 27C010 EPROM. - means not populated)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c
index 8ec59422d7b..62a195e7d8b 100644
--- a/src/mame/drivers/ddrible.c
+++ b/src/mame/drivers/ddrible.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
#include "sound/vlm5030.h"
diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c
index 21b755769ce..e0aa53485e1 100644
--- a/src/mame/drivers/ddz.c
+++ b/src/mame/drivers/ddz.c
@@ -8,7 +8,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/se3208/se3208.h"
#include "video/vrender0.h"
#include "machine/ds1302.h"
diff --git a/src/mame/drivers/deadang.c b/src/mame/drivers/deadang.c
index 0f01d7600da..aba6c510e15 100644
--- a/src/mame/drivers/deadang.c
+++ b/src/mame/drivers/deadang.c
@@ -36,7 +36,7 @@ Dip locations and factory settings verified with US manual
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
#include "deprecat.h"
#include "audio/seibu.h"
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 60bb339da7f..8c9fbf96323 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -42,7 +42,7 @@ ToDo:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
#include "cpu/h6280/h6280.h"
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index 9bcdc1bc385..e08947fe6ec 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -37,7 +37,7 @@ To do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/hd6309/hd6309.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 85fdff988f4..037911948b8 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -13,7 +13,7 @@
*/
#define DE156CPU ARM
-#include "driver.h"
+#include "emu.h"
#include "includes/decocrpt.h"
#include "includes/deco32.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index c945cfcbb82..3f77baa358b 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -223,7 +223,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "cpu/arm/arm.h"
diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c
index 7953367d766..5472bff29f7 100644
--- a/src/mame/drivers/deco_ld.c
+++ b/src/mame/drivers/deco_ld.c
@@ -101,7 +101,7 @@ Sound processor - 6502
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
#include "machine/laserdsc.h"
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index 837db6e1d02..5b26a4b2df1 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -95,7 +95,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/decocrpt.h"
#include "machine/eeprom.h"
#include "sound/ymz280b.h"
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index da31b82c9d3..d2ac9028eb6 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -4,7 +4,7 @@
***********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/decocass.h"
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index d575bc28244..24560f01300 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -42,7 +42,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c
index 7bacfb1fd78..cc023b06842 100644
--- a/src/mame/drivers/deshoros.c
+++ b/src/mame/drivers/deshoros.c
@@ -12,7 +12,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
static UINT8 *io_ram;
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index 4c003c76ab6..718f7117a2e 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -4,7 +4,7 @@ Atari Destroyer Driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/dgpix.c b/src/mame/drivers/dgpix.c
index 4958a51f1fb..00c12b3ee3f 100644
--- a/src/mame/drivers/dgpix.c
+++ b/src/mame/drivers/dgpix.c
@@ -49,7 +49,7 @@
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/e132xs/e132xs.h"
static UINT32 *vram;
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index 642446cd90e..90f11a0eef3 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -4,7 +4,7 @@
Driver by Bryan McPhail and David Haywood.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index 80ca24c0151..d5d80ed65a2 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -35,7 +35,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index 72a094dc130..c4ba7178206 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -46,7 +46,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index e378bb5c519..d50c57a49b3 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -153,7 +153,7 @@ Notes:
|--------------------------------------------|
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index 3fecf5ba6c3..773798320e3 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -63,7 +63,7 @@ hard drive 3.5 adapter long 3.5 IDE cable 3.5 adapter PCB
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
#include "machine/idectrl.h"
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index c0453ac77ca..8e986713f4d 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -298,7 +298,7 @@ Donkey Kong Junior Notes
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/s2650/s2650.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index b43fb2c1af9..232b561f6fb 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -32,7 +32,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "render.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/drivers/dmndrby.c b/src/mame/drivers/dmndrby.c
index f76f60394a7..02ae2f9ba7d 100644
--- a/src/mame/drivers/dmndrby.c
+++ b/src/mame/drivers/dmndrby.c
@@ -50,7 +50,7 @@ DD10 DD14 DD18 H5 DD21
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "video/resnet.h"
diff --git a/src/mame/drivers/docastle.c b/src/mame/drivers/docastle.c
index d3a0cf003e7..052fb4d399a 100644
--- a/src/mame/drivers/docastle.c
+++ b/src/mame/drivers/docastle.c
@@ -152,7 +152,7 @@ Dip locations verified with manual for docastle, dorunrun and dowild.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 4cabe031de2..d3b7f6b6fd5 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -7,7 +7,7 @@ driver by Nicola Salmoria
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "deprecat.h"
#include "includes/dogfgt.h"
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index 9b20a153f17..49ff1fae66d 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -60,7 +60,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index 0573a115d69..62d7b26990e 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -49,7 +49,7 @@ Flying Tiger
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c
index fc7174880a2..3fa3f380d03 100644
--- a/src/mame/drivers/dorachan.c
+++ b/src/mame/drivers/dorachan.c
@@ -8,7 +8,7 @@ Todo:
- dips (if any) - bits 5,6,7 of input port 0 ?
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c
index 7d65a38a382..48929cadef4 100644
--- a/src/mame/drivers/dotrikun.c
+++ b/src/mame/drivers/dotrikun.c
@@ -20,7 +20,7 @@ SOUND : (none)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/dragrace.c b/src/mame/drivers/dragrace.c
index bffdcf12669..e2b844f87f6 100644
--- a/src/mame/drivers/dragrace.c
+++ b/src/mame/drivers/dragrace.c
@@ -4,7 +4,7 @@ Atari Drag Race Driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "deprecat.h"
#include "includes/dragrace.h"
diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c
index b9dd14d49c4..11bf6e54ab3 100644
--- a/src/mame/drivers/dreamwld.c
+++ b/src/mame/drivers/dreamwld.c
@@ -84,7 +84,7 @@ Stephh's notes (based on the game M68EC020 code and some tests) :
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c
index 23faa37ea0d..25e165746a2 100644
--- a/src/mame/drivers/drgnmst.c
+++ b/src/mame/drivers/drgnmst.c
@@ -34,7 +34,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/dribling.c b/src/mame/drivers/dribling.c
index 889e8e139ae..59fa78bd8f8 100644
--- a/src/mame/drivers/dribling.c
+++ b/src/mame/drivers/dribling.c
@@ -25,7 +25,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
#include "includes/dribling.h"
diff --git a/src/mame/drivers/drmicro.c b/src/mame/drivers/drmicro.c
index bae96c88911..e363aca376c 100644
--- a/src/mame/drivers/drmicro.c
+++ b/src/mame/drivers/drmicro.c
@@ -8,7 +8,7 @@ Quite similar to Appoooh
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/msm5205.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c
index 92a1bd56341..7d2a44cea98 100644
--- a/src/mame/drivers/drtomy.c
+++ b/src/mame/drivers/drtomy.c
@@ -7,7 +7,7 @@ similar hardware.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c
index b5ebbddb75f..2c7ed32138b 100644
--- a/src/mame/drivers/drw80pkr.c
+++ b/src/mame/drivers/drw80pkr.c
@@ -25,7 +25,7 @@
company in 1981 and changed its name to IGT.
***********************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/ay8910.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index ee1c160e9bc..e774c26402f 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -49,7 +49,7 @@ Notes:
*********************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index 84a8a6dabf3..c9a055682c2 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -247,7 +247,7 @@ Stamp on disk:
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/i8085/i8085.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c
index c3e3f754028..07d19dabfe9 100644
--- a/src/mame/drivers/dynadice.c
+++ b/src/mame/drivers/dynadice.c
@@ -31,7 +31,7 @@ dy_5.bin
dy_6.bin (near Z80)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 6571a79c49c..b814be55aec 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -71,7 +71,7 @@ TODO:
*********************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "includes/dynax.h"
diff --git a/src/mame/drivers/dynduke.c b/src/mame/drivers/dynduke.c
index 47ca7b59589..cd36ac89620 100644
--- a/src/mame/drivers/dynduke.c
+++ b/src/mame/drivers/dynduke.c
@@ -62,7 +62,7 @@ Also, implemented conditional port for Coin Mode (SW1:1)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
#include "cpu/z80/z80.h"
#include "audio/seibu.h"
diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c
index f4e85758fd6..de46cccf1e9 100644
--- a/src/mame/drivers/egghunt.c
+++ b/src/mame/drivers/egghunt.c
@@ -41,7 +41,7 @@ I dumped it with this configuration. In case I'll redump it desoldering pin 16 f
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c
index fb084ad2561..7373689f06d 100644
--- a/src/mame/drivers/embargo.c
+++ b/src/mame/drivers/embargo.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/s2650/s2650.h"
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index 7c2b1bc7a55..2f43e8dca08 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -18,7 +18,7 @@ TODO:
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c
index 45c26436f6b..ad4e3d33abd 100644
--- a/src/mame/drivers/eolith.c
+++ b/src/mame/drivers/eolith.c
@@ -51,7 +51,7 @@
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/e132xs/e132xs.h"
#include "deprecat.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/eolith16.c b/src/mame/drivers/eolith16.c
index c4fff378abe..46204f7c0a2 100644
--- a/src/mame/drivers/eolith16.c
+++ b/src/mame/drivers/eolith16.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/e132xs/e132xs.h"
#include "deprecat.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/eolithsp.c b/src/mame/drivers/eolithsp.c
index 04dc5726822..d7341fdf992 100644
--- a/src/mame/drivers/eolithsp.c
+++ b/src/mame/drivers/eolithsp.c
@@ -8,7 +8,7 @@
this could probably be done a bit better using timers
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "includes/eolithsp.h"
diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c
index d254afe6ce3..f3adebe064e 100644
--- a/src/mame/drivers/epos.c
+++ b/src/mame/drivers/epos.c
@@ -28,7 +28,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index 265d086bdac..c93082369e5 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -23,7 +23,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "audio/atarijsa.h"
#include "includes/eprom.h"
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index 0508a59bc3b..909c3156975 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -363,7 +363,7 @@ D
*******************************************************************************/
// Directives
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/alph8201/alph8201.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/ertictac.c b/src/mame/drivers/ertictac.c
index 75a2b9dac0e..6f932bae988 100644
--- a/src/mame/drivers/ertictac.c
+++ b/src/mame/drivers/ertictac.c
@@ -26,7 +26,7 @@ TODO:
- Poizone controls are checked exactly once at bootup, breaking them.
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/arm/arm.h"
#define NUM_PENS (0x100)
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index b568e3dc5c1..d9d7d52cf9a 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -40,7 +40,7 @@ Head Panic
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/esh.c b/src/mame/drivers/esh.c
index 4c774669fee..cea6b9c4ff3 100644
--- a/src/mame/drivers/esh.c
+++ b/src/mame/drivers/esh.c
@@ -22,7 +22,7 @@ Todo:
- Hook up LED's to the MAME lamp system.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/laserdsc.h"
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index 61bcf19e9a7..805c3de45c6 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -7,7 +7,7 @@ Espial: The Orca logo is displayed, but looks to be "blacked out" via the
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "includes/espial.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/esripsys.c b/src/mame/drivers/esripsys.c
index cd750bc71ec..2111e634672 100644
--- a/src/mame/drivers/esripsys.c
+++ b/src/mame/drivers/esripsys.c
@@ -25,7 +25,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/esrip/esrip.h"
#include "machine/6840ptm.h"
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index b9cc6290e6d..954cc790ce8 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -24,7 +24,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c
index df86c52f80c..033f23fe61a 100644
--- a/src/mame/drivers/exedexes.c
+++ b/src/mame/drivers/exedexes.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index f5988e94606..4fa8c3cc8ea 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -13,7 +13,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/exerion.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c
index 9723043fdce..926c20e0854 100644
--- a/src/mame/drivers/exidy.c
+++ b/src/mame/drivers/exidy.c
@@ -125,7 +125,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "deprecat.h"
#include "includes/exidy.h"
diff --git a/src/mame/drivers/exidy440.c b/src/mame/drivers/exidy440.c
index c3355fa4f03..2490381c709 100644
--- a/src/mame/drivers/exidy440.c
+++ b/src/mame/drivers/exidy440.c
@@ -214,7 +214,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "includes/exidy440.h"
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index eedc3d046ac..da4f63d71c5 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -144,7 +144,7 @@ the layer is misplaced however, different scroll regs?
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "includes/kaneko16.h"
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index 9b410650185..5b6d1d1dae5 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -205,7 +205,7 @@ Stephh's notes (based on the games M6502 code and some tests) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index 8b9c1aed3ef..bc743b3df49 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -60,7 +60,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/m6502/m6502.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index e51fdc90ba1..a3f8af27635 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -32,7 +32,7 @@ TODO:
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/taitoipt.h"
#include "audio/taitosnd.h"
diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c
index 9a9722fa50e..d3630e41d07 100644
--- a/src/mame/drivers/f-32.c
+++ b/src/mame/drivers/f-32.c
@@ -11,7 +11,7 @@
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/e132xs/e132xs.h"
#include "machine/eeprom.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index 4b81cc7c0f7..791ed68b77f 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -19,7 +19,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "video/konicdev.h"
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index a22545310a1..b10d78ca1f0 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -43,7 +43,7 @@ Year + Game Main CPU Sound CPU Sound Video
***************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/nec/nec.h"
#include "cpu/i86/i86.h"
diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c
index e90f702a93c..d248632b7f6 100644
--- a/src/mame/drivers/fastfred.c
+++ b/src/mame/drivers/fastfred.c
@@ -5,7 +5,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "includes/fastfred.h"
diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c
index 5392ec1440b..281e8ba0091 100644
--- a/src/mame/drivers/fastlane.c
+++ b/src/mame/drivers/fastlane.c
@@ -10,7 +10,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/hd6309/hd6309.h"
#include "sound/k007232.h"
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index 435e3ca1fde..40d01b7fa3e 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -28,7 +28,7 @@ inputs + notes by stephh
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "includes/fcombat.h"
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index 03b762fd515..a50bd8fb371 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -32,7 +32,7 @@ from 2.bin to 9.bin program eproms
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "includes/cps1.h"
diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c
index 4be54cc7978..6c6dc1b361f 100644
--- a/src/mame/drivers/feversoc.c
+++ b/src/mame/drivers/feversoc.c
@@ -58,7 +58,7 @@ U0564 LH28F800SU OBJ4-1
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/sh2/sh2.h"
#include "includes/seibuspi.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/fgoal.c b/src/mame/drivers/fgoal.c
index 984e63ddf47..3f980fc35aa 100644
--- a/src/mame/drivers/fgoal.c
+++ b/src/mame/drivers/fgoal.c
@@ -16,7 +16,7 @@ Differences between these sets include
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "machine/mb14241.h"
#include "includes/fgoal.h"
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index 11b9528bf0d..29021744fa9 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -10,7 +10,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "machine/konami1.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index db0b8504a7d..903fe2f78b6 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -108,7 +108,7 @@
- The external Yamaha MIDI sound board is not emulated (no keyboard sounds).
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/powerpc/ppc.h"
#include "machine/intelfsh.h"
diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c
index af12d080c89..9e33e72c933 100644
--- a/src/mame/drivers/firefox.c
+++ b/src/mame/drivers/firefox.c
@@ -25,7 +25,7 @@ but requires a special level III player for proper control. Video: CAV. Audio: A
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6502/m6502.h"
#include "sound/pokey.h"
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index 0126df132a2..dcfcd1f2961 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -56,7 +56,7 @@ write:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c
index 9d52e650f8b..2dde3807f52 100644
--- a/src/mame/drivers/firetrk.c
+++ b/src/mame/drivers/firetrk.c
@@ -5,7 +5,7 @@ Atari Fire Truck + Super Bug + Monte Carlo driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "includes/firetrk.h"
#include "sound/discrete.h"
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index 34aa8511b06..d19ee91a694 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -81,7 +81,7 @@ Stephh's notes :
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/upd7810/upd7810.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 483c59c4bcc..d5ee3fde102 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -10,7 +10,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/hd6309/hd6309.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index 7d5a15edcde..c83a32b49f7 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -69,7 +69,7 @@ CHIP # POSITION TYPE
GND | 43 | 44 | GND
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "includes/flower.h"
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index a5038a5f17f..388062783ff 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c
index 704b5d15b6c..16d6891cd89 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -4,7 +4,7 @@ Atari Flyball Driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#define MASTER_CLOCK ( XTAL_12_096MHz )
diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c
index 43e8ca1ef43..f4d2617407d 100644
--- a/src/mame/drivers/foodf.c
+++ b/src/mame/drivers/foodf.c
@@ -73,7 +73,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/atarigen.h"
#include "sound/pokey.h"
diff --git a/src/mame/drivers/forte2.c b/src/mame/drivers/forte2.c
index 11b743dc760..bda67f5939f 100644
--- a/src/mame/drivers/forte2.c
+++ b/src/mame/drivers/forte2.c
@@ -20,7 +20,7 @@ insert a new coin after the game is over if you want another play.
According to Alexandre, there are more games for this board, but not
found/dumped yet. */
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "video/tms9928a.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c
index 61362ec7af2..0ef9734a591 100644
--- a/src/mame/drivers/fortecar.c
+++ b/src/mame/drivers/fortecar.c
@@ -24,7 +24,7 @@ dip 1X8
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/eeprom.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c
index fb53e25f14d..56785804987 100644
--- a/src/mame/drivers/freekick.c
+++ b/src/mame/drivers/freekick.c
@@ -28,7 +28,7 @@ TODO:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
#include "machine/mc8123.h"
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index a2bc1172eb5..e38c5e2b4a4 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -16,7 +16,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c
index 4bb1395a13b..701a097f9e9 100644
--- a/src/mame/drivers/fromance.c
+++ b/src/mame/drivers/fromance.c
@@ -39,7 +39,7 @@ Memo:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/2413intf.h"
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index 874af574abd..9480f434799 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -71,7 +71,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "includes/funkybee.h"
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index ac552fd2f67..dde1f5c40db 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -87,7 +87,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index d6ac330b4c3..24db4a2961b 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -1051,7 +1051,7 @@
#define MASTER_CLOCK XTAL_16MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "video/mc6845.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/funybubl.c b/src/mame/drivers/funybubl.c
index db69bc37d60..00daa59f798 100644
--- a/src/mame/drivers/funybubl.c
+++ b/src/mame/drivers/funybubl.c
@@ -48,7 +48,7 @@ Note: SW2, SW3 & SW4 not populated
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
#include "includes/funybubl.h"
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index f56c5c38e6b..646a61d89ab 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -34,7 +34,7 @@ To Do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index bdaedb2fafb..41bf84c1f51 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -148,7 +148,7 @@ FG-3J ROM-J 507KA0301P04 Rev:1.3
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/ymf278b.h"
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index cdf62623a79..6202b9d7b9f 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c
index a01765ecba8..6d1437ad753 100644
--- a/src/mame/drivers/gaelco2.c
+++ b/src/mame/drivers/gaelco2.c
@@ -19,7 +19,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/gaelco3d.c b/src/mame/drivers/gaelco3d.c
index 76223d06c54..f9b639d6c88 100644
--- a/src/mame/drivers/gaelco3d.c
+++ b/src/mame/drivers/gaelco3d.c
@@ -142,7 +142,7 @@ REF. 970429
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "includes/gaelco3d.h"
#include "cpu/tms32031/tms32031.h"
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 6a05021dd55..38737409ad1 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -123,7 +123,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/gal3.c b/src/mame/drivers/gal3.c
index ea9b2c07ceb..1198878f2d8 100644
--- a/src/mame/drivers/gal3.c
+++ b/src/mame/drivers/gal3.c
@@ -124,7 +124,7 @@ better notes (complete chip lists) for each board still needed
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "includes/namcos2.h"
#include "cpu/tms32025/tms32025.h"
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index 472e84d122e..f335575b406 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -694,7 +694,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/mb88xx/mb88xx.h"
#include "machine/atari_vg.h"
diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c
index e02137c6756..1757570475f 100644
--- a/src/mame/drivers/galastrm.c
+++ b/src/mame/drivers/galastrm.c
@@ -37,7 +37,7 @@ $305.b invincibility
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "video/taitoic.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c
index 5f4de06e46e..f83549cff54 100644
--- a/src/mame/drivers/galaxi.c
+++ b/src/mame/drivers/galaxi.c
@@ -39,7 +39,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "galaxi.lh"
diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c
index bb0ec5b0c24..6d1212fc460 100644
--- a/src/mame/drivers/galaxia.c
+++ b/src/mame/drivers/galaxia.c
@@ -23,7 +23,7 @@ TS 2008.08.12:
*/
-#include "driver.h"
+#include "emu.h"
#include "video/s2636.h"
#include "cpu/s2650/s2650.h"
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 8ec993487e3..8b9d67d9ddd 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -226,7 +226,7 @@ TO DO :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/s2650/s2650.h"
#include "includes/galaxian.h"
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index 555c039a461..af36b32b605 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -347,7 +347,7 @@ TO DO :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/s2650/s2650.h"
#include "includes/galaxold.h"
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index be546e72805..3b6cc1f2b76 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -27,7 +27,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/12/17 -
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/dac.h"
#include "sound/3526intf.h"
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index 667354579af..93a7ead376b 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -19,7 +19,7 @@ To Do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index b65ea0671db..07c4d78fb7a 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -63,7 +63,7 @@ Dumped by Uki
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "sound/ymz280b.h"
diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c
index cfc5877491a..ee928c9eb90 100644
--- a/src/mame/drivers/galpanic.c
+++ b/src/mame/drivers/galpanic.c
@@ -117,7 +117,7 @@ The current set of Super Model is an example of type C
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "includes/kaneko16.h"
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index bbefa1e4efb..babb6309dc5 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -18,7 +18,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c
index 4a7a7363637..396076da16d 100644
--- a/src/mame/drivers/gamecstl.c
+++ b/src/mame/drivers/gamecstl.c
@@ -59,7 +59,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
#include "memconv.h"
#include "devconv.h"
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index 797d8d8db29..115c2de1f09 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -74,7 +74,7 @@ TODO:
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/6532riot.h"
#include "machine/6522via.h"
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index fe16646c1df..2e0f0df9843 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -149,7 +149,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/namcoio.h"
#include "sound/namco.h"
diff --git a/src/mame/drivers/gatron.c b/src/mame/drivers/gatron.c
index 147ab813ea7..8b43e83230d 100644
--- a/src/mame/drivers/gatron.c
+++ b/src/mame/drivers/gatron.c
@@ -226,7 +226,7 @@
#define MASTER_CLOCK XTAL_16MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index 7bc64217152..b814bdf124b 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -118,7 +118,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
#include "sound/tms5220.h"
diff --git a/src/mame/drivers/gberet.c b/src/mame/drivers/gberet.c
index e8b82b83db4..6171aec99e4 100644
--- a/src/mame/drivers/gberet.c
+++ b/src/mame/drivers/gberet.c
@@ -71,7 +71,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index 4a45e06e60c..1989018eba0 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
#include "video/konicdev.h"
diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c
index a39d975f637..050b5f9c26b 100644
--- a/src/mame/drivers/gcpinbal.c
+++ b/src/mame/drivers/gcpinbal.c
@@ -30,7 +30,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c
index bf265fcfe5b..ada9d83173c 100644
--- a/src/mame/drivers/gei.c
+++ b/src/mame/drivers/gei.c
@@ -65,7 +65,7 @@ U.S.A. Trivia New Sports General Facts
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
#include "machine/ticket.h"
diff --git a/src/mame/drivers/ggconnie.c b/src/mame/drivers/ggconnie.c
index e33733168e2..64a29179c14 100644
--- a/src/mame/drivers/ggconnie.c
+++ b/src/mame/drivers/ggconnie.c
@@ -16,7 +16,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "machine/pcecommn.h"
#include "video/vdc.h"
diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c
index dc147975dbf..0679e8c2a9e 100644
--- a/src/mame/drivers/ghosteo.c
+++ b/src/mame/drivers/ghosteo.c
@@ -51,7 +51,7 @@ Hopper, Ticket Counter, Prize System (Option)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
diff --git a/src/mame/drivers/gijoe.c b/src/mame/drivers/gijoe.c
index 47df033d472..f17f0cf2c0d 100644
--- a/src/mame/drivers/gijoe.c
+++ b/src/mame/drivers/gijoe.c
@@ -33,7 +33,7 @@ Known Issues
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "video/konicdev.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index dee1df55d73..be03b420271 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -48,7 +48,7 @@ f5d6 print 7 digit BCD number: d0.l to (a1)+ color $3000
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index dcbd614d61b..4eec3536f4c 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -181,7 +181,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/tait8741.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/glass.c b/src/mame/drivers/glass.c
index 45a8ae4ecf8..cacbe88ef1c 100644
--- a/src/mame/drivers/glass.c
+++ b/src/mame/drivers/glass.c
@@ -8,7 +8,7 @@ The DS5002FP has up to 128KB undumped gameplay code making the game unplayable :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "includes/glass.h"
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index 79235a710a0..ec4c156fba4 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -20,7 +20,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c
index 5156f56bbda..7c488947a74 100644
--- a/src/mame/drivers/go2000.c
+++ b/src/mame/drivers/go2000.c
@@ -29,7 +29,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index 0ac27c2ee34..2003a5f09d1 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c
index cb3c1197d69..828c00016b9 100644
--- a/src/mame/drivers/goindol.c
+++ b/src/mame/drivers/goindol.c
@@ -17,7 +17,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c
index a1311aa10b8..85a1baf0cdf 100644
--- a/src/mame/drivers/goldnpkr.c
+++ b/src/mame/drivers/goldnpkr.c
@@ -616,7 +616,7 @@
#define MASTER_CLOCK XTAL_10MHz
#define CPU_CLOCK (MASTER_CLOCK/16)
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "video/mc6845.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 4c96c87660f..e54a2a0f818 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -101,7 +101,7 @@
#define AY_CLOCK MASTER_CLOCK / 8
#define OKI_CLOCK 1056000 /* unverified resonator */
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c
index 1e0dd3967a9..8e3abf871d1 100644
--- a/src/mame/drivers/gomoku.c
+++ b/src/mame/drivers/gomoku.c
@@ -19,7 +19,7 @@ todo:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/gomoku.h"
diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c
index 872456a20e3..33ec04dec83 100644
--- a/src/mame/drivers/good.c
+++ b/src/mame/drivers/good.c
@@ -30,7 +30,7 @@ Silk screened under the roms:
voice.rom - VOICE ROM
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/goodejan.c b/src/mame/drivers/goodejan.c
index 4706098fc6c..cc1ca94b697 100644
--- a/src/mame/drivers/goodejan.c
+++ b/src/mame/drivers/goodejan.c
@@ -50,7 +50,7 @@ Notes:
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
#include "audio/seibu.h"
#include "sound/3812intf.h"
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index b07927acbea..6fc568db377 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -57,7 +57,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index 902d7e3a254..51505253479 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -193,7 +193,7 @@ VBlank duration: 1/VSYNC * (16/256) = 1017.6 us
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i86/i86.h"
#include "machine/6532riot.h"
#include "machine/laserdsc.h"
diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c
index 814ab3329fe..1403f4fbdb1 100644
--- a/src/mame/drivers/gotya.c
+++ b/src/mame/drivers/gotya.c
@@ -33,7 +33,7 @@ TODO: Emulated sound
its more likely just a prototype / alternate version, its hard to tell
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/samples.h"
#include "includes/gotya.h"
diff --git a/src/mame/drivers/gpworld.c b/src/mame/drivers/gpworld.c
index 16596ac96e9..d19e8e14fa2 100644
--- a/src/mame/drivers/gpworld.c
+++ b/src/mame/drivers/gpworld.c
@@ -39,7 +39,7 @@ Dumping Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/laserdsc.h"
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index a6dbaecdba7..9be674c8d9f 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -18,7 +18,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "video/konicdev.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index 647225a2707..536991c5378 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -41,7 +41,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "includes/grchamp.h"
diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c
index 7c159286477..ea539fb26b0 100644
--- a/src/mame/drivers/gridlee.c
+++ b/src/mame/drivers/gridlee.c
@@ -77,7 +77,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "includes/gridlee.h"
#include "includes/balsente.h"
diff --git a/src/mame/drivers/groundfx.c b/src/mame/drivers/groundfx.c
index 6b7b8ac3538..399181380f4 100644
--- a/src/mame/drivers/groundfx.c
+++ b/src/mame/drivers/groundfx.c
@@ -62,7 +62,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "video/taitoic.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c
index 662b51ea895..f3e8c504c5f 100644
--- a/src/mame/drivers/gstream.c
+++ b/src/mame/drivers/gstream.c
@@ -122,7 +122,7 @@ RAM4 is HMC HM6264LP-70
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/e132xs/e132xs.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index 717bb1f3502..315b7deda2b 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -32,7 +32,7 @@ Merge with other Video System games ?
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "includes/gstriker.h"
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index 1985d8ec980..e57d7ab9aa1 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -141,7 +141,7 @@ reg: 0->1 (main->2nd) / : (1->0) 2nd->main :
******************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "machine/tait8741.h"
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index dd83f72983d..2de2794efbd 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -218,7 +218,7 @@ Hang Pilot (uses an unknown but similar video board) 12W
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
#include "cpu/powerpc/ppc.h"
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index ea218423f8b..80959bfef14 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -23,7 +23,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/6840ptm.h"
#include "video/tms34061.h"
diff --git a/src/mame/drivers/gumbo.c b/src/mame/drivers/gumbo.c
index 3fa37bc3556..12949e5755b 100644
--- a/src/mame/drivers/gumbo.c
+++ b/src/mame/drivers/gumbo.c
@@ -41,7 +41,7 @@ PCB Layout
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "includes/gumbo.h"
diff --git a/src/mame/drivers/gunbustr.c b/src/mame/drivers/gunbustr.c
index 0df7d4ad5dc..e534c9b8805 100644
--- a/src/mame/drivers/gunbustr.c
+++ b/src/mame/drivers/gunbustr.c
@@ -44,7 +44,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "video/taitoic.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c
index d235de3a492..8a8269162e6 100644
--- a/src/mame/drivers/gundealr.c
+++ b/src/mame/drivers/gundealr.c
@@ -46,7 +46,7 @@ Runs in interrupt mode 0, the interrupt vectors are 0xcf (RST 08h) and
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/gunpey.c b/src/mame/drivers/gunpey.c
index 91894eed7d6..c84dd2d7320 100644
--- a/src/mame/drivers/gunpey.c
+++ b/src/mame/drivers/gunpey.c
@@ -45,7 +45,7 @@ Notes:
GP_ROM5.622 SOP44 32M MASK, OKI samples
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
static UINT16 *unkram;
diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c
index 06ce7bcb068..77c8225cfc1 100644
--- a/src/mame/drivers/gunsmoke.c
+++ b/src/mame/drivers/gunsmoke.c
@@ -66,7 +66,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index 309a106e182..2694157bf2f 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -55,7 +55,7 @@ and 1 SFX channel controlled by an 8039:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "machine/konami1.h"
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index 74dda951469..6e168f55fea 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -157,7 +157,7 @@ Video sync 6 F Video sync Post 6 F Post
//**************************************************************************
// Compiler Directives
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/taitoipt.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index 41c82f3bde7..662fc3129d6 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -25,7 +25,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "includes/hanaawas.h"
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index a62bda3b24f..b5b02dcf40b 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -319,7 +319,7 @@ Notes:
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/tms32010/tms32010.h"
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index d2aca33b9db..f9ba4e8266c 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/konami/konami.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c
index 1eb1fd8e85a..06600085563 100644
--- a/src/mame/drivers/hexa.c
+++ b/src/mame/drivers/hexa.c
@@ -46,7 +46,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "includes/hexa.h"
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index 812157d172f..da82093c9d2 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -78,7 +78,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c
index 8694de303d3..db09d766f2e 100644
--- a/src/mame/drivers/higemaru.c
+++ b/src/mame/drivers/higemaru.c
@@ -10,7 +10,7 @@ Use Player 1 joystick and button, then press START1 to go to next screen.
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c
index 068acfbc799..b91e84c4c81 100644
--- a/src/mame/drivers/highvdeo.c
+++ b/src/mame/drivers/highvdeo.c
@@ -82,7 +82,7 @@ Game is V30 based, with rom banking (2Mb)
*************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
#include "cpu/i86/i86.h"
#include "sound/okim6376.h"
diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c
index 0fbc3d53201..5870174c01c 100644
--- a/src/mame/drivers/hikaru.c
+++ b/src/mame/drivers/hikaru.c
@@ -319,7 +319,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/sh4/sh4.h"
#define CPU_CLOCK (200000000)
diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c
index 68ee24046b4..fe66844319f 100644
--- a/src/mame/drivers/himesiki.c
+++ b/src/mame/drivers/himesiki.c
@@ -82,7 +82,7 @@ A 12.000MHz
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "includes/himesiki.h"
diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c
index 4844442d7e0..df3c9707969 100644
--- a/src/mame/drivers/hitme.c
+++ b/src/mame/drivers/hitme.c
@@ -14,7 +14,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "includes/hitme.h"
#include "sound/discrete.h"
diff --git a/src/mame/drivers/hitpoker.c b/src/mame/drivers/hitpoker.c
index a5344b818e6..6f49899d8d6 100644
--- a/src/mame/drivers/hitpoker.c
+++ b/src/mame/drivers/hitpoker.c
@@ -42,7 +42,7 @@ Some debug tricks (let's test this CPU as more as possible):
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mc68hc11/mc68hc11.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c
index 325f22f4a46..62ec0ae9ccc 100644
--- a/src/mame/drivers/hnayayoi.c
+++ b/src/mame/drivers/hnayayoi.c
@@ -32,7 +32,7 @@ TODO:
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index e1e5006a6f8..c5ad68ee02d 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -447,7 +447,7 @@ or Fatal Fury for example).
*/
#define MASTER_CLOCK 50000000
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/nec/nec.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c
index 6a576ed1f90..598be6972e0 100644
--- a/src/mame/drivers/holeland.c
+++ b/src/mame/drivers/holeland.c
@@ -11,7 +11,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "includes/holeland.h"
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index b847a21fdb2..4879a1917a3 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -215,7 +215,7 @@ Custom: GX61A01
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "cpu/upd7810/upd7810.h"
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index 7037d0e5a73..83e8a6f93da 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -15,7 +15,7 @@ Todo :
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c
index c3f6f36485f..ba7e8882d83 100644
--- a/src/mame/drivers/hornet.c
+++ b/src/mame/drivers/hornet.c
@@ -307,7 +307,7 @@
21C MC44200FT Motorola, 3 Channel video D/A converter
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/powerpc/ppc.h"
#include "cpu/sharc/sharc.h"
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index 03d05a244a6..589bd68fa55 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -41,7 +41,7 @@ so it could be by them instead
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i86/i86.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/hshavoc.c b/src/mame/drivers/hshavoc.c
index ae127f35fcc..ba3dc229093 100644
--- a/src/mame/drivers/hshavoc.c
+++ b/src/mame/drivers/hshavoc.c
@@ -34,7 +34,7 @@ Unfortunately it's read protected.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2612intf.h"
diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c
index fe77bb23718..46a557f403c 100644
--- a/src/mame/drivers/hvyunit.c
+++ b/src/mame/drivers/hvyunit.c
@@ -54,7 +54,7 @@ Notes:
***************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index eaf67f9a499..e0b82616f2e 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -21,7 +21,7 @@ Memo:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/nb1413m3.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c
index 3905b4b91a5..0dff38a7a3b 100644
--- a/src/mame/drivers/hyperspt.c
+++ b/src/mame/drivers/hyperspt.c
@@ -6,7 +6,7 @@ Based on drivers from Juno First emulator by Chris Hardy (chrish@kcbbs.gen.nz)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index 0556a3346a9..b2ff2fd9d82 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -34,7 +34,7 @@ fix comms so it boots, it's a bit of a hack for hyperduel at the moment ;-)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index be689f49bec..3b6cc79478e 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -15,7 +15,7 @@ NVRAM : Battery for main RAM
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z180/z180.h"
#include "machine/8255ppi.h"
#include "sound/2413intf.h"
diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c
index b7c89222c4d..d38cbfbb608 100644
--- a/src/mame/drivers/igs011.c
+++ b/src/mame/drivers/igs011.c
@@ -46,7 +46,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c
index d3ea7b06fa2..2b4a5962e6d 100644
--- a/src/mame/drivers/igs017.c
+++ b/src/mame/drivers/igs017.c
@@ -41,7 +41,7 @@ Notes:
************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z180/z180.h"
diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c
index 2ea3d2576cc..ed82ada9ed2 100644
--- a/src/mame/drivers/igs_m027.c
+++ b/src/mame/drivers/igs_m027.c
@@ -14,7 +14,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c
index bf0bdf028b8..0102d588e1f 100644
--- a/src/mame/drivers/igspoker.c
+++ b/src/mame/drivers/igspoker.c
@@ -64,7 +64,7 @@ FIX: PK Tetris have an input named AMUSE which I couldn't map. Maybe it is
#define VERBOSE 0
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/2413intf.h"
diff --git a/src/mame/drivers/ikki.c b/src/mame/drivers/ikki.c
index aedd186c725..63afd351c09 100644
--- a/src/mame/drivers/ikki.c
+++ b/src/mame/drivers/ikki.c
@@ -8,7 +8,7 @@ Ikki (c) 1985 Sun Electronics
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/ilpag.c b/src/mame/drivers/ilpag.c
index 4bf51c61bbe..2c435e8ede7 100644
--- a/src/mame/drivers/ilpag.c
+++ b/src/mame/drivers/ilpag.c
@@ -72,7 +72,7 @@ ROMs
*****************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c
index 309d0f24c7b..47ab849cc23 100644
--- a/src/mame/drivers/imolagp.c
+++ b/src/mame/drivers/imolagp.c
@@ -73,7 +73,7 @@ Known issues:
- the 8255 is not hooked up
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/intrscti.c b/src/mame/drivers/intrscti.c
index a0f4f08b4fc..3f4364b1c28 100644
--- a/src/mame/drivers/intrscti.c
+++ b/src/mame/drivers/intrscti.c
@@ -11,7 +11,7 @@ I've not had a chance to wire up the board yet, but it might be possible to writ
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
static READ8_HANDLER( unk_r )
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index fa155b67a2e..e402184a75a 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -67,7 +67,7 @@ TODO:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index 1dd1c983099..30a6f66a39b 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -49,7 +49,7 @@ Grndtour:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z180/z180.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/irobot.c b/src/mame/drivers/irobot.c
index ff7e0796187..668cf0c8d21 100644
--- a/src/mame/drivers/irobot.c
+++ b/src/mame/drivers/irobot.c
@@ -74,7 +74,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/pokey.h"
#include "includes/irobot.h"
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index 1f2ac208c18..1c9362558ba 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/istellar.c b/src/mame/drivers/istellar.c
index b8dca033132..57406242708 100644
--- a/src/mame/drivers/istellar.c
+++ b/src/mame/drivers/istellar.c
@@ -19,7 +19,7 @@ Todo:
Make it work - this one should be close right now :/.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "render.h"
#include "machine/laserdsc.h"
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 9f3e65f8fd4..8ec13df6e43 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -344,7 +344,7 @@ Notes:
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms32031/tms32031.h"
#include "cpu/m6800/m6800.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index f214b7c3d33..9d6cdebf452 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -494,7 +494,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/hd6309/hd6309.h"
diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c
index 7889247a1dc..74643aeadc2 100644
--- a/src/mame/drivers/itgambl2.c
+++ b/src/mame/drivers/itgambl2.c
@@ -52,7 +52,7 @@
#define MAIN_CLOCK XTAL_16MHz
#define SND_CLOCK XTAL_14_31818MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/h83002/h8.h"
#include "sound/upd7759.h"
diff --git a/src/mame/drivers/itgambl3.c b/src/mame/drivers/itgambl3.c
index 6a72cf80ec7..d19c418b60d 100644
--- a/src/mame/drivers/itgambl3.c
+++ b/src/mame/drivers/itgambl3.c
@@ -40,7 +40,7 @@
#define MAIN_CLOCK XTAL_16MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/h83002/h8.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c
index be2726022ed..a3e6670b97b 100644
--- a/src/mame/drivers/itgamble.c
+++ b/src/mame/drivers/itgamble.c
@@ -53,7 +53,7 @@
#define EJOLLYX5_MAIN_CLOCK XTAL_16MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/h83002/h8.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index c3521ced3a2..6f25af92056 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -41,7 +41,7 @@ The 2 ay-8910 read ports are responsible for reading the sound commands.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index a383dc21119..234a98bfb2d 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -70,7 +70,7 @@ Address Dir Data Description
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/2151intf.h"
#include "includes/jackal.h"
diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c
index 0ba0224fd90..02fb57e72ab 100644
--- a/src/mame/drivers/jackie.c
+++ b/src/mame/drivers/jackie.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/2413intf.h"
diff --git a/src/mame/drivers/jackpool.c b/src/mame/drivers/jackpool.c
index a97f04905cf..a0463e0c23e 100644
--- a/src/mame/drivers/jackpool.c
+++ b/src/mame/drivers/jackpool.c
@@ -15,7 +15,7 @@ TODO:
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c
index d333d852a7b..ebb67b8a0b3 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -83,7 +83,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/konami1.h"
#include "cpu/m6809/m6809.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/jalmah.c b/src/mame/drivers/jalmah.c
index 30e0c847648..0e77da81389 100644
--- a/src/mame/drivers/jalmah.c
+++ b/src/mame/drivers/jalmah.c
@@ -109,7 +109,7 @@ OSC: 12.000MHz
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c
index 1d45002130a..ccc9d1b2df0 100644
--- a/src/mame/drivers/jangou.c
+++ b/src/mame/drivers/jangou.c
@@ -23,7 +23,7 @@ $c088-$c095 player tiles
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6800/m6800.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/janshi.c b/src/mame/drivers/janshi.c
index 7b21016a66d..392a91c6285 100644
--- a/src/mame/drivers/janshi.c
+++ b/src/mame/drivers/janshi.c
@@ -27,7 +27,7 @@ Dumped by Chackn
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/news.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c
index f002c055b11..57c506bd093 100644
--- a/src/mame/drivers/jantotsu.c
+++ b/src/mame/drivers/jantotsu.c
@@ -94,7 +94,7 @@ dumped by sayu
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 6fa128b09a1..2393b2b3b5b 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -167,7 +167,7 @@ there are 9 PALS on the pcb (not dumped)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "sound/ymz280b.h"
diff --git a/src/mame/drivers/jedi.c b/src/mame/drivers/jedi.c
index 44c9d658d3e..df38bf48e1e 100644
--- a/src/mame/drivers/jedi.c
+++ b/src/mame/drivers/jedi.c
@@ -110,7 +110,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/jedi.h"
diff --git a/src/mame/drivers/jokrwild.c b/src/mame/drivers/jokrwild.c
index 513a3fd5444..7999ccc7c27 100644
--- a/src/mame/drivers/jokrwild.c
+++ b/src/mame/drivers/jokrwild.c
@@ -90,7 +90,7 @@
#define MASTER_CLOCK XTAL_8MHz /* guess */
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "video/mc6845.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index 19b70ed310b..66a6861f491 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -97,7 +97,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c
index 984eaba17e7..11cd19f230d 100644
--- a/src/mame/drivers/jongkyo.c
+++ b/src/mame/drivers/jongkyo.c
@@ -24,7 +24,7 @@
**********************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "machine/segacrpt.h"
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index 5d63b7dd8ba..376f42d3027 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -77,7 +77,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms34010/tms34010.h"
#include "sound/upd7759.h"
diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c
index 2ff9673d794..0e99594b2f2 100644
--- a/src/mame/drivers/jpmsys5.c
+++ b/src/mame/drivers/jpmsys5.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
diff --git a/src/mame/drivers/jrpacman.c b/src/mame/drivers/jrpacman.c
index 9e524c6edbe..5fa5e021b37 100644
--- a/src/mame/drivers/jrpacman.c
+++ b/src/mame/drivers/jrpacman.c
@@ -98,7 +98,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/pacman.h"
#include "sound/namco.h"
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index b92a8891e04..7b2e23261b1 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -77,7 +77,7 @@ Blitter source graphics
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/mcs48/mcs48.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 2dbc81e057a..11b16de6467 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -83,7 +83,7 @@ Dip locations verified from manual for:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c
index 8abe4b7f11b..abfa1524a5d 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -153,7 +153,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mb88xx/mb88xx.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index 19d233bb562..c15fa29631e 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -37,7 +37,7 @@
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index 8029cb51267..fb45b919f2d 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -62,7 +62,7 @@ IO ports and memory map changes. Dip switches differ too.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index 7b056b47ab1..78bf4bc8493 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -34,7 +34,7 @@ lev 7 : 0x7c : 0000 0000 - x
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c
index cceeb5c77f2..3c245634bdb 100644
--- a/src/mame/drivers/kingdrby.c
+++ b/src/mame/drivers/kingdrby.c
@@ -60,7 +60,7 @@ sg1_b.e1 4096 0x92ef3c13 D2732D
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "video/mc6845.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index 2f2919136f9..c3426e1acc2 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -15,7 +15,7 @@ Main CPU:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/kingpin.c b/src/mame/drivers/kingpin.c
index 6a06369ba57..b97cbfe780b 100644
--- a/src/mame/drivers/kingpin.c
+++ b/src/mame/drivers/kingpin.c
@@ -19,7 +19,7 @@ Todo:
-what really is I/O 0x02?
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "video/tms9928a.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c
index 1d192b64254..0618909e8f0 100644
--- a/src/mame/drivers/kinst.c
+++ b/src/mame/drivers/kinst.c
@@ -128,7 +128,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/mips3.h"
#include "cpu/adsp2100/adsp2100.h"
#include "machine/idectrl.h"
diff --git a/src/mame/drivers/klax.c b/src/mame/drivers/klax.c
index 422bab223a6..1db2578e2f8 100644
--- a/src/mame/drivers/klax.c
+++ b/src/mame/drivers/klax.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "includes/klax.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index a6bd24f5188..54223b115d1 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -25,7 +25,7 @@ Updates:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6800/m6800.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/koftball.c b/src/mame/drivers/koftball.c
index c84fbd023e3..5ba631677f9 100644
--- a/src/mame/drivers/koftball.c
+++ b/src/mame/drivers/koftball.c
@@ -28,7 +28,7 @@ ft5_v6_c4.u58 /
#define NVRAM_HACK 1
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c
index deeae8ec34c..91ba9246c53 100644
--- a/src/mame/drivers/koikoi.c
+++ b/src/mame/drivers/koikoi.c
@@ -37,7 +37,7 @@ to prevent disabling inputs.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/konamigq.c b/src/mame/drivers/konamigq.c
index dd9b8728559..aa4005db5e8 100644
--- a/src/mame/drivers/konamigq.c
+++ b/src/mame/drivers/konamigq.c
@@ -45,7 +45,7 @@
Vsync: 60Hz
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/mips/psx.h"
#include "includes/psx.h"
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index bf76cbb201b..85209066edd 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -112,7 +112,7 @@ Notes:
to that same game. It won't work with a blank EEPROM or a different games' EEPROM.
*/
-#include "driver.h"
+#include "emu.h"
#include "cdrom.h"
#include "cpu/mips/psx.h"
#include "includes/psx.h"
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 40deaa6584e..1e69c6da83d 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -94,7 +94,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "video/konamiic.h"
diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c
index e2cecd1b026..04c210efd5a 100644
--- a/src/mame/drivers/konamim2.c
+++ b/src/mame/drivers/konamim2.c
@@ -186,7 +186,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cdrom.h"
#include "cpu/powerpc/ppc.h"
diff --git a/src/mame/drivers/kopunch.c b/src/mame/drivers/kopunch.c
index 49564b4d1dd..68c5fc13133 100644
--- a/src/mame/drivers/kopunch.c
+++ b/src/mame/drivers/kopunch.c
@@ -4,7 +4,7 @@
********************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "includes/kopunch.h"
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index b41f7b5ccf4..bd091320ef2 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -63,7 +63,7 @@ SRAM:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c
index 5c7b31d9d04..8aa750215e4 100644
--- a/src/mame/drivers/ksys573.c
+++ b/src/mame/drivers/ksys573.c
@@ -334,7 +334,7 @@ G: gun mania only, drives air soft gun (this game uses real BB bullet)
*/
-#include "driver.h"
+#include "emu.h"
#include "cdrom.h"
#include "cpu/mips/psx.h"
#include "includes/psx.h"
diff --git a/src/mame/drivers/kungfur.c b/src/mame/drivers/kungfur.c
index e84abe86707..f16332b47dc 100644
--- a/src/mame/drivers/kungfur.c
+++ b/src/mame/drivers/kungfur.c
@@ -28,7 +28,7 @@ http://www.hoizinger.com/ed/EM.HTML
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/msm5205.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index 4c9a7b8977c..fa537ac3539 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -21,7 +21,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c
index f7d015020f8..8d2f9ba39ea 100644
--- a/src/mame/drivers/labyrunr.c
+++ b/src/mame/drivers/labyrunr.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/hd6309/hd6309.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/ladybug.c b/src/mame/drivers/ladybug.c
index 1971efa49a3..2837ac4b387 100644
--- a/src/mame/drivers/ladybug.c
+++ b/src/mame/drivers/ladybug.c
@@ -58,7 +58,7 @@ TODO:
* one unknown dip
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "includes/ladybug.h"
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index 99902d8a9cf..b8eaef4c4a8 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -46,7 +46,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c
index 91afeb05017..2867e61fce9 100644
--- a/src/mame/drivers/laserbas.c
+++ b/src/mame/drivers/laserbas.c
@@ -16,7 +16,7 @@
********************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index 1d2af4e61a6..d5c65b12685 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -16,7 +16,7 @@ TODO:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "cpu/s2650/s2650.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index 937f628d98e..c8ca184b55f 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -27,7 +27,7 @@ DIP locations verified for:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/z80/z80.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index dfb69f61025..a1b36f4ad9a 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -114,7 +114,7 @@ Notes:
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c
index a1f98682c6d..5f0483cf5f8 100644
--- a/src/mame/drivers/lastfght.c
+++ b/src/mame/drivers/lastfght.c
@@ -62,7 +62,7 @@ Notes:
*********************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/h83002/h8.h"
diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c
index 09dbe1f0e59..8a336e0269b 100644
--- a/src/mame/drivers/lazercmd.c
+++ b/src/mame/drivers/lazercmd.c
@@ -220,7 +220,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/s2650/s2650.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index 77c6b9b2847..76c9be79495 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -70,7 +70,7 @@ Preliminary COP MCU memory map
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "audio/seibu.h"
#include "sound/3812intf.h"
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index a86d234a17a..d439f655c07 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -41,7 +41,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i86/i86.h"
#include "machine/eeprom.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index cd622850885..e3f6c3d7528 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -15,7 +15,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index 70b9099e887..e9c6a7d2802 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -164,7 +164,7 @@ maybe some priority issues / sprite placement issues..
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "cpu/m6809/m6809.h"
#include "cpu/hd6309/hd6309.h"
diff --git a/src/mame/drivers/lethalj.c b/src/mame/drivers/lethalj.c
index 3c46d0d7207..7db241e7f9a 100644
--- a/src/mame/drivers/lethalj.c
+++ b/src/mame/drivers/lethalj.c
@@ -138,7 +138,7 @@ Pin #11(+) | | R |
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "includes/lethalj.h"
#include "machine/ticket.h"
diff --git a/src/mame/drivers/lgp.c b/src/mame/drivers/lgp.c
index a8422de8472..11e9c5a8200 100644
--- a/src/mame/drivers/lgp.c
+++ b/src/mame/drivers/lgp.c
@@ -63,7 +63,7 @@ Dumping Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "render.h"
#include "machine/laserdsc.h"
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index 0a67f678488..510da28cef1 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -14,7 +14,7 @@
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
#include "includes/liberate.h"
diff --git a/src/mame/drivers/liberatr.c b/src/mame/drivers/liberatr.c
index 1da6d4f9c8a..05e992af3ad 100644
--- a/src/mame/drivers/liberatr.c
+++ b/src/mame/drivers/liberatr.c
@@ -133,7 +133,7 @@
******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "deprecat.h"
#include "machine/atari_vg.h"
diff --git a/src/mame/drivers/limenko.c b/src/mame/drivers/limenko.c
index 9f1ad8ad07f..0e043bac1fa 100644
--- a/src/mame/drivers/limenko.c
+++ b/src/mame/drivers/limenko.c
@@ -23,7 +23,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/e132xs/e132xs.h"
#include "machine/eeprom.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index 4822c83705e..452b69a6bf4 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -58,7 +58,7 @@ Dip sw.2
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
static UINT16 littlerb_vdp_address_low;
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index aa50f3818f8..70de75348d5 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -78,7 +78,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index 4d5d8049987..98a60a83448 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/nec/nec.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 31c124adead..fcf6a6bc92a 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -52,7 +52,7 @@ L056-6 9A " " VLI-8-4 7A "
LOG.3 8A " tiles
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms9900/tms9900.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index 9a5b9c7a30c..702810fc153 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -26,7 +26,7 @@ To do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index 9372d67a3e7..a504267354a 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -146,7 +146,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c
index f4d0d417ce5..28db48822f2 100644
--- a/src/mame/drivers/ltcasino.c
+++ b/src/mame/drivers/ltcasino.c
@@ -13,7 +13,7 @@ etc.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c
index 8cbd215cd57..081dc7ea476 100644
--- a/src/mame/drivers/luckgrln.c
+++ b/src/mame/drivers/luckgrln.c
@@ -73,7 +73,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z180/z180.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index 9fd6f190bf9..24520ee6563 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -666,7 +666,7 @@
#define C_06B49P_CLKOUT_19 (MASTER_CLOCK/200000) /* 60 Hz. (V-Sync) */
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c
index 9670ff7595c..9ce6992496d 100644
--- a/src/mame/drivers/lvcards.c
+++ b/src/mame/drivers/lvcards.c
@@ -73,7 +73,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index 9bc8c3acbfd..4a43fd69505 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -45,7 +45,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c
index eabe4854c80..ba2cfbf6840 100644
--- a/src/mame/drivers/m10.c
+++ b/src/mame/drivers/m10.c
@@ -110,7 +110,7 @@ Notes (couriersud)
been a prototype or eventually the famous "capsule invader".
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/rescap.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index e57c1e52924..54c50ac74a1 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -23,7 +23,7 @@ confirmed for m107 games as well.
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
#include "includes/m107.h"
#include "includes/iremipt.h"
diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c
index d128ea9ecf6..7e285444174 100644
--- a/src/mame/drivers/m14.c
+++ b/src/mame/drivers/m14.c
@@ -50,7 +50,7 @@ Dumped by Chackn
**********************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
diff --git a/src/mame/drivers/m52.c b/src/mame/drivers/m52.c
index d12509ef5b7..51d1f796129 100644
--- a/src/mame/drivers/m52.c
+++ b/src/mame/drivers/m52.c
@@ -42,7 +42,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/iremipt.h"
#include "includes/iremz80.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/m57.c b/src/mame/drivers/m57.c
index 93168ac27b7..f01fd5e16a8 100644
--- a/src/mame/drivers/m57.c
+++ b/src/mame/drivers/m57.c
@@ -47,7 +47,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/iremipt.h"
#include "includes/iremz80.h"
diff --git a/src/mame/drivers/m58.c b/src/mame/drivers/m58.c
index 62086149eaa..15aa399b709 100644
--- a/src/mame/drivers/m58.c
+++ b/src/mame/drivers/m58.c
@@ -9,7 +9,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/iremipt.h"
#include "includes/iremz80.h"
diff --git a/src/mame/drivers/m62.c b/src/mame/drivers/m62.c
index 3568505ac13..450fe8d579a 100644
--- a/src/mame/drivers/m62.c
+++ b/src/mame/drivers/m62.c
@@ -67,7 +67,7 @@ other supported games as well.
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/iremz80.h"
#include "includes/iremipt.h"
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index 32966ead71b..f9d4fd51cc6 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -115,7 +115,7 @@ Dip locations verified for:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index da0c9bb0eb2..97a122bb0d5 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -80,7 +80,7 @@ other supported games as well.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/nec/nec.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c
index b2e780b1469..2d63134ae15 100644
--- a/src/mame/drivers/m79amb.c
+++ b/src/mame/drivers/m79amb.c
@@ -54,7 +54,7 @@ and two large (paddles pretending to be) guns.
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/m79amb.h"
#include "cpu/i8085/i8085.h"
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index 17efa0bfe5d..95fa3b9ce22 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -24,7 +24,7 @@ Notes:
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/nec/nec.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index 81cf2baea1d..4a419dbb6fd 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -193,7 +193,7 @@ psoldier dip locations still need veritication.
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
#include "includes/m92.h"
#include "includes/iremipt.h"
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index dc21fec9725..9c52a7adc78 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -36,7 +36,7 @@ TODO:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/es5506.h"
diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c
index 3f0abcb8e62..21dcd957601 100644
--- a/src/mame/drivers/macs.c
+++ b/src/mame/drivers/macs.c
@@ -55,7 +55,7 @@ KISEKAE -- info
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/st0016.h"
#include "includes/st0016.h"
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index 5207ba10d10..bfdef807c57 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index 52d49193ce4..4019382a511 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/magic10.c b/src/mame/drivers/magic10.c
index 375bc88423a..1c8ea27284a 100644
--- a/src/mame/drivers/magic10.c
+++ b/src/mame/drivers/magic10.c
@@ -75,7 +75,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "sgsafari.lh"
diff --git a/src/mame/drivers/magicard.c b/src/mame/drivers/magicard.c
index f69d28ebbdb..67c88cefad8 100644
--- a/src/mame/drivers/magicard.c
+++ b/src/mame/drivers/magicard.c
@@ -161,7 +161,7 @@
#define CLOCK_B XTAL_8MHz
#define CLOCK_C XTAL_19_6608MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/2413intf.h"
diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c
index 2b6b39fbb75..2f4dfc166ed 100644
--- a/src/mame/drivers/magicfly.c
+++ b/src/mame/drivers/magicfly.c
@@ -395,7 +395,7 @@
#define MASTER_CLOCK XTAL_10MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "video/mc6845.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/magictg.c b/src/mame/drivers/magictg.c
index 82ea9363cf2..c4a19ab9ecc 100644
--- a/src/mame/drivers/magictg.c
+++ b/src/mame/drivers/magictg.c
@@ -110,7 +110,7 @@ Medium size chip with heat sink on it
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/mips3.h"
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index b4830be5e88..7ffb75ec859 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -23,7 +23,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index abc9f5c25b9..0d2edd06b5a 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -20,7 +20,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/hd6309/hd6309.h"
#include "video/konicdev.h"
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index 9826daba5a5..59eea98d066 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -107,7 +107,7 @@ cc_p14.j2 8192 0xedc6a1eb M5L2764k
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/snk.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c
index 53b0bf0fff5..d24531b2526 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -62,7 +62,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "sound/sn76477.h"
#include "video/s2636.h"
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 71cccc34eb1..4008af0dba1 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -546,7 +546,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/dac.h"
#include "sound/namco.h"
diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c
index 596d19e4185..0761cb150ce 100644
--- a/src/mame/drivers/marineb.c
+++ b/src/mame/drivers/marineb.c
@@ -35,7 +35,7 @@ write
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "includes/espial.h"
diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c
index 08fa178ae72..470e1c5d342 100644
--- a/src/mame/drivers/marinedt.c
+++ b/src/mame/drivers/marinedt.c
@@ -94,7 +94,7 @@ p2 ink doesn't always light up in test mode
this is correct behavior if DSW set as Upright mode
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
static bitmap_t *tile, *obj1, *obj2;
diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c
index 1906ce0fc08..0f89ac36a33 100644
--- a/src/mame/drivers/mario.c
+++ b/src/mame/drivers/mario.c
@@ -89,7 +89,7 @@ write:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/z80dma.h"
diff --git a/src/mame/drivers/markham.c b/src/mame/drivers/markham.c
index 2c1e7980438..5df4d70cccf 100644
--- a/src/mame/drivers/markham.c
+++ b/src/mame/drivers/markham.c
@@ -8,7 +8,7 @@ Markham (c) 1983 Sun Electronics
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/mastboy.c b/src/mame/drivers/mastboy.c
index 50cffbb9569..0962652d67b 100644
--- a/src/mame/drivers/mastboy.c
+++ b/src/mame/drivers/mastboy.c
@@ -433,7 +433,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z180/z180.h"
#include "sound/saa1099.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index efae739504b..f5ad5ae119b 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -29,7 +29,7 @@ The driver has been updated accordingly.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c
index c4d137535d5..eff7da9decd 100644
--- a/src/mame/drivers/maxaflex.c
+++ b/src/mame/drivers/maxaflex.c
@@ -12,7 +12,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c
index 298c65dd662..56fe4026fb3 100644
--- a/src/mame/drivers/maygay1b.c
+++ b/src/mame/drivers/maygay1b.c
@@ -10,7 +10,7 @@
This only loads the basic stuff - there needs to be more done to make this run.
******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "video/awpvid.h" //Fruit Machines Only
#include "machine/6821pia.h"
@@ -21,7 +21,6 @@
#include "sound/ay8910.h"
#include "sound/2413intf.h"
#include "sound/okim6376.h"
-#include "timer.h"
#define VERBOSE 1
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c
index fc535a3c571..3e6c353ff48 100644
--- a/src/mame/drivers/maygayv1.c
+++ b/src/mame/drivers/maygayv1.c
@@ -124,7 +124,7 @@ Todo:
Find lamps/reels after UPD changes.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "video/awpvid.h"
#include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index 48f0ac72047..6aa531c0c69 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -6,7 +6,7 @@ Kikiippatsu Mayumi-chan (c) 1988 Victory L.L.C.
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index 920b507f504..33a4ccbc0e2 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -35,7 +35,7 @@ TO DO:
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "video/resnet.h"
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index afd3d9e00cc..370530f379b 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -135,7 +135,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index 308e166d68e..9b74b5e6591 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -282,7 +282,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c
index de7ee9ee92f..8d82002a6ee 100644
--- a/src/mame/drivers/mcr3.c
+++ b/src/mame/drivers/mcr3.c
@@ -101,7 +101,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c
index df22cae3e49..053d2d28474 100644
--- a/src/mame/drivers/mcr68.c
+++ b/src/mame/drivers/mcr68.c
@@ -53,7 +53,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "audio/mcr.h"
#include "audio/williams.h"
diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c
index d88691878e3..2bfc73ea9bd 100644
--- a/src/mame/drivers/meadows.c
+++ b/src/mame/drivers/meadows.c
@@ -116,7 +116,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "includes/meadows.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c
index 260ca8ee1c8..31ade74edae 100644
--- a/src/mame/drivers/mediagx.c
+++ b/src/mame/drivers/mediagx.c
@@ -63,7 +63,7 @@
ST ULN2064B (DIP16)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
#include "devconv.h"
#include "machine/8237dma.h"
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 84f1df14ca5..487f2586720 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -65,7 +65,7 @@ On SegaC2 the VDP never turns on the IRQ6 enable register
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index 740630b9686..02839084d64 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -49,7 +49,7 @@ Bugs:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index cbed064de79..0c1e3bbde22 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -119,7 +119,7 @@ RAM RW 0f0000-0f3fff 0e0000-0effff? <
#define SOUND_CPU_CLOCK XTAL_7MHz /* clock for sound 68000 */
#define OKI4_SOUND_CLOCK XTAL_4MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index c75ac1b8f27..3317a15d128 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -87,7 +87,7 @@ Turbo Outrun 171-5782 837-6963-61 610-0239-61 MPR
Sonic Hedgehog 2 171-6215A 837-6963-62 610-0239-62 MPR-15000A-F (838200) EPR-12368-62 (27256) n/a
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "rendlay.h"
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index 8389da4f032..1ddd3d21bb6 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -6,7 +6,7 @@ To enter service mode, keep 1&2 pressed on reset
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/konami1.h"
#include "cpu/m6809/m6809.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c
index 0690d217f73..1a8c682e32f 100644
--- a/src/mame/drivers/meijinsn.c
+++ b/src/mame/drivers/meijinsn.c
@@ -58,7 +58,7 @@ ALPHA DENSHI CO.,LTD JUNE / 24 / 1986 FOR
SOFT PSG & VOICE BY M.C & S.H
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index a8fc52cd4f5..f9420b232cf 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -38,7 +38,7 @@ Notes: it's important that "user1" is 0xa0000 bytes with empty space filled
---------------------------------------------------------------------------
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index c1c71523242..e6ae2a81ccd 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -98,7 +98,7 @@ Not all regional versions are available for each Megatouch series
- for pbst30 only roms were found, it appears that two roms with graphics data were missing, using pitbossm roms for now
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index 704b3c0cb49..4bf85080219 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -113,7 +113,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c
index d1ddc7b823e..3e336123263 100644
--- a/src/mame/drivers/metalmx.c
+++ b/src/mame/drivers/metalmx.c
@@ -253,7 +253,7 @@ Logic:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/adsp2100/adsp2100.h"
#include "cpu/tms34010/tms34010.h"
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index 0d9a96e765d..0c23f876182 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -31,7 +31,7 @@ metlclsh:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index aca7366e511..d6621f66d87 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -80,7 +80,7 @@ Compared to the real PCB, MAME is too fast, so 60fps needs to be changed to 58fp
driver modified by Eisuke Watanabe
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c
index bc171eb7a37..2ae605b0cf1 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -50,7 +50,7 @@ PS4 J8635 PS4 J8541 PS4 J8648
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c
index f43cd7195ad..f29dc4ac00d 100644
--- a/src/mame/drivers/mgolf.c
+++ b/src/mame/drivers/mgolf.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
static UINT8* mgolf_video_ram;
diff --git a/src/mame/drivers/mhavoc.c b/src/mame/drivers/mhavoc.c
index 8c33949513b..d9f9de24558 100644
--- a/src/mame/drivers/mhavoc.c
+++ b/src/mame/drivers/mhavoc.c
@@ -183,7 +183,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/atari_vg.h"
#include "video/avgdvg.h"
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index fcc5d3079f1..aea9ca27234 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -20,7 +20,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index f4b03a7cb57..185d077b5c0 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -45,7 +45,7 @@
*************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/ymz280b.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/midtunit.c b/src/mame/drivers/midtunit.c
index d35d5e1c826..e01bed0db6b 100644
--- a/src/mame/drivers/midtunit.c
+++ b/src/mame/drivers/midtunit.c
@@ -19,7 +19,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/adsp2100/adsp2100.h"
#include "audio/williams.h"
diff --git a/src/mame/drivers/midvunit.c b/src/mame/drivers/midvunit.c
index 130e096e895..81d5f873973 100644
--- a/src/mame/drivers/midvunit.c
+++ b/src/mame/drivers/midvunit.c
@@ -18,7 +18,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms32031/tms32031.h"
#include "cpu/adsp2100/adsp2100.h"
#include "audio/dcs.h"
diff --git a/src/mame/drivers/midwunit.c b/src/mame/drivers/midwunit.c
index 621cd038d7d..b731d980904 100644
--- a/src/mame/drivers/midwunit.c
+++ b/src/mame/drivers/midwunit.c
@@ -84,7 +84,7 @@ Notes:
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/adsp2100/adsp2100.h"
#include "audio/dcs.h"
diff --git a/src/mame/drivers/midxunit.c b/src/mame/drivers/midxunit.c
index 4b41c346cf0..ff5fc907bcd 100644
--- a/src/mame/drivers/midxunit.c
+++ b/src/mame/drivers/midxunit.c
@@ -79,7 +79,7 @@ There's a separate sound board also, but it wasn't available so is not documente
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/adsp2100/adsp2100.h"
#include "audio/dcs.h"
diff --git a/src/mame/drivers/midyunit.c b/src/mame/drivers/midyunit.c
index 852cdb6cfd0..892a548c7ff 100644
--- a/src/mame/drivers/midyunit.c
+++ b/src/mame/drivers/midyunit.c
@@ -111,7 +111,7 @@ Notes:
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/tms34010/tms34010.h"
#include "audio/williams.h"
diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c
index 5a4970cb487..c83b3cdf1a5 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -24,7 +24,7 @@ The Grid v1.2 10/18/2000
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms32031/tms32031.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/adsp2100/adsp2100.h"
diff --git a/src/mame/drivers/mikie.c b/src/mame/drivers/mikie.c
index f1c454d68c3..196c8d2117a 100644
--- a/src/mame/drivers/mikie.c
+++ b/src/mame/drivers/mikie.c
@@ -16,7 +16,7 @@ MAIN BOARD:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c
index 4b17dcc9a5d..d410eea81a2 100644
--- a/src/mame/drivers/mil4000.c
+++ b/src/mame/drivers/mil4000.c
@@ -84,7 +84,7 @@ Changes (2008-12-10, Roberto Fresca):
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "mil4000.lh"
diff --git a/src/mame/drivers/miniboy7.c b/src/mame/drivers/miniboy7.c
index 0d8620cdf1b..66b4749a564 100644
--- a/src/mame/drivers/miniboy7.c
+++ b/src/mame/drivers/miniboy7.c
@@ -123,7 +123,7 @@
#define MASTER_CLOCK 10000000 /* 10MHz */
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c
index a942df73643..0bef4069284 100644
--- a/src/mame/drivers/minivadr.c
+++ b/src/mame/drivers/minivadr.c
@@ -10,7 +10,7 @@ Japan). It has no sound.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c
index 80a94b32b38..2946ead90e6 100644
--- a/src/mame/drivers/mirage.c
+++ b/src/mame/drivers/mirage.c
@@ -32,7 +32,7 @@ MR_01-.3A [a0b758aa]
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "includes/decocrpt.h"
#include "includes/decoprot.h"
diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c
index f31ca587eb5..88aea63a923 100644
--- a/src/mame/drivers/mirax.c
+++ b/src/mame/drivers/mirax.c
@@ -68,7 +68,7 @@ The End
************************************************
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/mirderby.c b/src/mame/drivers/mirderby.c
index ab0f3bee7f1..63a2a2ef25c 100644
--- a/src/mame/drivers/mirderby.c
+++ b/src/mame/drivers/mirderby.c
@@ -42,7 +42,7 @@
/* clocks are 16mhz and 9mhz */
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index 041a1db730d..cdd7c40ac5e 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -13,7 +13,7 @@ OKI M6295 sound ROM dump is bad.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
#include "sound/3526intf.h"
diff --git a/src/mame/drivers/missile.c b/src/mame/drivers/missile.c
index 964a4d199f7..42b14c2c9f3 100644
--- a/src/mame/drivers/missile.c
+++ b/src/mame/drivers/missile.c
@@ -327,7 +327,7 @@ Notes:
*****************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/pokey.h"
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index b6a0b4bc5b0..685a2468e2c 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -71,7 +71,7 @@ mw-9.rom = ST M27C1001 / GFX
*************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index e3eec7723b1..a886f21aa5b 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -21,7 +21,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c
index d18b04fec28..5b9c812556b 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -6,7 +6,7 @@ Mahjong Sisters (c) 1986 Toa Plan
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index 13579052856..6b1b465973d 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -18,7 +18,7 @@ TODO:
************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms32025/tms32025.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 82b736a8afd..4dbb7a1eb7b 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -624,7 +624,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/v60/v60.h"
#include "deprecat.h"
#include "includes/system16.h"
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 93f64764720..4eccd37d2df 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -48,7 +48,7 @@
2C needs DSP still
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "machine/eeprom.h"
#include "video/segaic24.h"
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index 55c6e7e82cd..5eb74578585 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -597,7 +597,7 @@ ALL VROM ROMs are 16M MASK
0014b110 - service routine for IRQ 0x40 (SCSP)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "cpu/powerpc/ppc.h"
diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c
index e7d4ceeb2cf..6b8b45cd055 100644
--- a/src/mame/drivers/mogura.c
+++ b/src/mame/drivers/mogura.c
@@ -1,6 +1,6 @@
/* Mogura Desse */
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/dac.h"
#include "includes/konamipt.h"
diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c
index 03d09723170..ec9002d24a6 100644
--- a/src/mame/drivers/mole.c
+++ b/src/mame/drivers/mole.c
@@ -46,7 +46,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index 0c117115144..b0492507b0f 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -41,7 +41,7 @@ Stephh's notes (based on the game Z80 code and some tests) :
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/monzagp.c b/src/mame/drivers/monzagp.c
index eb5005bc9f7..afa6a6e9b47 100644
--- a/src/mame/drivers/monzagp.c
+++ b/src/mame/drivers/monzagp.c
@@ -31,7 +31,7 @@ Lower board (MGP_01):
1x trimmer (TIME?????)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index b7769275f9e..a0e38054870 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -38,7 +38,7 @@ Bucky:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c
index a72d8729dd8..d7639922e73 100644
--- a/src/mame/drivers/mosaic.c
+++ b/src/mame/drivers/mosaic.c
@@ -7,7 +7,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z180/z180.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index e353dc46623..64e4473acc8 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -12,7 +12,7 @@
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c
index d3f1aa81fc7..5d0cd74cfb9 100644
--- a/src/mame/drivers/mpoker.c
+++ b/src/mame/drivers/mpoker.c
@@ -167,7 +167,7 @@
#define MASTER_CLOCK XTAL_18MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
//#include "sound/dac.h"
#include "mpoker.lh"
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index 45b9e35655f..5193ef49c1b 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -243,12 +243,11 @@ IRQ line connected to CPU
TODO: - Fix lamp timing, MAME doesn't update fast enough to see everything
- Distinguish door switches using manual
***********************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
#include "deprecat.h"
-#include "timer.h"
#include "cpu/m6809/m6809.h"
#include "sound/ay8910.h"
#include "sound/okim6376.h"
diff --git a/src/mame/drivers/mpu5.c b/src/mame/drivers/mpu5.c
index ebbffa5fe67..a4766403de1 100644
--- a/src/mame/drivers/mpu5.c
+++ b/src/mame/drivers/mpu5.c
@@ -12,7 +12,7 @@
-- Much of the communication is done via a 68681 DUART.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index 145af313758..a7c73440d17 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -7,7 +7,7 @@
**************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "includes/amiga.h"
#include "sound/es5503.h"
diff --git a/src/mame/drivers/mrdo.c b/src/mame/drivers/mrdo.c
index 3cb75380eca..527bcc13815 100644
--- a/src/mame/drivers/mrdo.c
+++ b/src/mame/drivers/mrdo.c
@@ -12,7 +12,7 @@ VBlank duration: 1/VSYNC * (70/262) = 4368 us
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index 0b965861ef1..ea4dcac3d0c 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -39,7 +39,7 @@ Video Board
******************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/mrjong.c b/src/mame/drivers/mrjong.c
index 94ab928ffd5..e7b8074e1a9 100644
--- a/src/mame/drivers/mrjong.c
+++ b/src/mame/drivers/mrjong.c
@@ -42,7 +42,7 @@ ROMs 6A, 7A, 8A, 9A: 2764
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index 64b513e45f3..ddd172b695e 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -163,7 +163,7 @@ Super Strong Warriors
/********** BITS & PIECES **********/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/v60/v60.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index c01f5fb6458..ee9bbde4713 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -6,7 +6,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index 3926c913ac7..f2a7f7e8a30 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -39,7 +39,7 @@ behavior we use .
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c
index 91471284ecb..9f8250fbe33 100644
--- a/src/mame/drivers/multfish.c
+++ b/src/mame/drivers/multfish.c
@@ -126,7 +126,7 @@ below are simply made to the banking address to run on other boards.
#define ALL_REVISIONS 0
-#include "driver.h"
+#include "emu.h"
#include "sound/ay8910.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index 8fd76bdeb26..dd3a21fa8ef 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -39,7 +39,7 @@
RAM used by Super Mario Bros 3.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/dac.h"
#include "sound/nes_apu.h"
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index c0006bc46d9..d712963c35e 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -24,7 +24,7 @@ Stephh's notes (based on the game Z80 code and some tests) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/murogem.c b/src/mame/drivers/murogem.c
index bc61bb929b2..d97ee26f6d9 100644
--- a/src/mame/drivers/murogem.c
+++ b/src/mame/drivers/murogem.c
@@ -94,7 +94,7 @@ val (hex): 27 20 22 04 26 00 20 20 00 07 00 00 80 00 00 00 ns
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c
index ebf3586bb22..5cdeb83a414 100644
--- a/src/mame/drivers/murogmbl.c
+++ b/src/mame/drivers/murogmbl.c
@@ -33,7 +33,7 @@ Funzionamento: Non Funzionante
Dumped: 06/04/2009 f205v
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/mustache.c b/src/mame/drivers/mustache.c
index c8a699a0744..e69e6a8a51a 100644
--- a/src/mame/drivers/mustache.c
+++ b/src/mame/drivers/mustache.c
@@ -27,7 +27,7 @@ YM2151:
. Pin 24 - 3577600.55 OSC1/4
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "audio/seibu.h" // for seibu_sound_decrypt on the MAIN cpu (not sound)
#include "audio/t5182.h"
diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c
index 4930844c19f..e0535f40308 100644
--- a/src/mame/drivers/mw8080bw.c
+++ b/src/mame/drivers/mw8080bw.c
@@ -143,7 +143,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "rendlay.h"
#include "machine/rescap.h"
diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c
index 1e3ee33969e..c139e7837b8 100644
--- a/src/mame/drivers/mwarr.c
+++ b/src/mame/drivers/mwarr.c
@@ -38,7 +38,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c
index b7edcd84b1c..0c6511463f5 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -13,7 +13,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
#include "includes/mystston.h"
diff --git a/src/mame/drivers/mystwarr.c b/src/mame/drivers/mystwarr.c
index 162677a0b95..5e0a40ef261 100644
--- a/src/mame/drivers/mystwarr.c
+++ b/src/mame/drivers/mystwarr.c
@@ -21,7 +21,7 @@
* - Metamorphic Force's intro needs alpha blended sprites.
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "video/konamiic.h"
diff --git a/src/mame/drivers/n8080.c b/src/mame/drivers/n8080.c
index 57bc906b2ba..d37dfbe7f42 100644
--- a/src/mame/drivers/n8080.c
+++ b/src/mame/drivers/n8080.c
@@ -10,7 +10,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "includes/n8080.h"
diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c
index 46442e20d04..1bbbc07a698 100644
--- a/src/mame/drivers/namcofl.c
+++ b/src/mame/drivers/namcofl.c
@@ -155,7 +155,7 @@ OSC3: 48.384MHz
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "includes/namconb1.h"
#include "includes/namcos2.h"
diff --git a/src/mame/drivers/namcoic.c b/src/mame/drivers/namcoic.c
index 35a3091bf35..45096fe44cc 100644
--- a/src/mame/drivers/namcoic.c
+++ b/src/mame/drivers/namcoic.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/namcos2.h" /* for game-specific hacks */
#include "includes/namcoic.h"
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index bdd6f072dad..461987b92d7 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -158,7 +158,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "includes/namcona1.h"
diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c
index a16b91d9210..02da473ba97 100644
--- a/src/mame/drivers/namconb1.c
+++ b/src/mame/drivers/namconb1.c
@@ -268,7 +268,7 @@ GFX: Custom 145 ( 80 pin PQFP)
Custom 187 (120 pin PQFP)
Custom 169 (120 pin PQFP)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "includes/namconb1.h"
diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c
index 1793c34f3a1..2fe13b31340 100644
--- a/src/mame/drivers/namcond1.c
+++ b/src/mame/drivers/namcond1.c
@@ -65,7 +65,7 @@ Notes:
*************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "video/ygv608.h"
#include "cpu/h83002/h8.h"
diff --git a/src/mame/drivers/namcops2.c b/src/mame/drivers/namcops2.c
index 8de376bad82..7dd1a152bb6 100644
--- a/src/mame/drivers/namcops2.c
+++ b/src/mame/drivers/namcops2.c
@@ -20,10 +20,9 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/mips3.h"
#include "cpu/mips/r3000.h"
-#include "video/generic.h"
static VIDEO_START(system246)
{
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index 369e46df348..39fd2ca45ca 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -338,7 +338,7 @@ C - uses sub board with support for player 3 and 4 controls
***********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c
index 0f502ed2f64..67ddee95c65 100644
--- a/src/mame/drivers/namcos10.c
+++ b/src/mame/drivers/namcos10.c
@@ -263,7 +263,7 @@ Utyuu Daisakusen Chocovader Contactee CVC1 Ver.A KC022A
1. The ROM PCB has locations for 16x 128MBit FlashROMs (Total capacity = 2048MBits) but usually only a few are populated.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/psx.h"
#include "includes/psx.h"
diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c
index 0cfc1700be1..190cb5fff62 100644
--- a/src/mame/drivers/namcos11.c
+++ b/src/mame/drivers/namcos11.c
@@ -263,7 +263,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/mips/psx.h"
#include "includes/psx.h"
diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c
index e4ad75fcf8d..4c5f728dddb 100644
--- a/src/mame/drivers/namcos12.c
+++ b/src/mame/drivers/namcos12.c
@@ -920,7 +920,7 @@ Notes:
Point Blank 2 (GNB5/VER.A)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/psx.h"
#include "cpu/h83002/h8.h"
#include "includes/psx.h"
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index e50263a273c..0e16424f121 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -442,7 +442,7 @@ $a00000 checks have been seen on the Final Lap boards.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6805/m6805.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index 3c667b01735..7755cb1df69 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -288,7 +288,7 @@ CPU68 PCB:
JP2 /D-ST /VBL
JP3
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6805/m6805.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c
index f5127424c32..fa616cae5fc 100644
--- a/src/mame/drivers/namcos22.c
+++ b/src/mame/drivers/namcos22.c
@@ -1137,7 +1137,7 @@
* 2 Ground
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "includes/namcos22.h"
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index 7f7ff5819c9..40209193c8c 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -737,7 +737,7 @@ Notes:
J105 - 64 pin connector for connection of Main PCB
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/mips3.h"
#include "cpu/h83002/h8.h"
#include "sound/c352.h"
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index 393c851fe2a..6b53a7d2bbd 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -174,7 +174,7 @@ TODO:
*******************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 60fedf6efca..308ce35f159 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -1044,9 +1044,8 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/arm7/arm7.h"
-#include "video/generic.h"
#include "machine/eeprom.h"
#include "machine/intelfsh.h"
#include "includes/naomibd.h"
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index 52d35bd2827..af72cc6c576 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -102,7 +102,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/tms36xx.h"
#include "includes/phoenix.h"
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index fe70508ce61..8cbebd032d5 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -30,7 +30,7 @@ TODO:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/nb1413m3.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index e9ba10c99bb..652b071c1d0 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -41,7 +41,7 @@ TODO:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/nb1413m3.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/nbmj8900.c b/src/mame/drivers/nbmj8900.c
index 8e6b5975d27..bbbfc6c189a 100644
--- a/src/mame/drivers/nbmj8900.c
+++ b/src/mame/drivers/nbmj8900.c
@@ -23,7 +23,7 @@ TODO:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nb1413m3.h"
#include "cpu/z80/z80.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index cf127e31919..cc9bba2d375 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -28,7 +28,7 @@ Notes:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/nb1413m3.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 15873b00ead..0f632db1dc1 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -19,7 +19,7 @@ Notes:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/z80ctc.h"
#include "includes/nb1413m3.h" // needed for mahjong input controller
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index 28d60bf1d74..b7a90f8e3e6 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -38,7 +38,7 @@ So this is the correct behavior of real hardware, not an emulation bug.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 8babf71be6e..33f8c2d3a64 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -191,7 +191,7 @@ NOTE: On CTRG2-B, The "A" lines start at "A1". If you trace this on an
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "includes/neogeo.h"
#include "machine/pd4990a.h"
diff --git a/src/mame/drivers/news.c b/src/mame/drivers/news.c
index 396e78e50b8..546db2790fb 100644
--- a/src/mame/drivers/news.c
+++ b/src/mame/drivers/news.c
@@ -13,7 +13,7 @@ driver by David Haywood
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/news.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c
index 502a32f9c44..87e2d781d44 100644
--- a/src/mame/drivers/nightgal.c
+++ b/src/mame/drivers/nightgal.c
@@ -15,7 +15,7 @@ TODO:
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/ay8910.h"
#include "sound/2203intf.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index 010557aa1f3..f4216ff055a 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -128,7 +128,7 @@ TODO:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index 471b1510354..988db810e56 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -310,7 +310,7 @@ rumbling on a subwoofer in the cabinet.)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "video/taitoic.h"
diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c
index 11eb80da622..813d2073052 100644
--- a/src/mame/drivers/nitedrvr.c
+++ b/src/mame/drivers/nitedrvr.c
@@ -34,7 +34,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/rescap.h"
#include "sound/discrete.h"
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index 3f99cc37be0..978da2615f9 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -32,7 +32,7 @@ Memo:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "machine/m68kfmly.h"
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index 0fc56749e24..c1c6220f138 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -219,7 +219,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 69d029bf045..3a1bd9124af 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -138,7 +138,7 @@ Afega stands for "Art-Fiction Electronic Game"
********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/tlcs90/tlcs90.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c
index 96dd1bb1c09..bf7c54e9e1b 100644
--- a/src/mame/drivers/norautp.c
+++ b/src/mame/drivers/norautp.c
@@ -529,7 +529,7 @@
#define NORAUT_CPU_CLOCK NORAUT_MASTER_CLOCK / 8 /* 2.30275 MHz - Measured: 2.305 MHz */
#define DPHL_CPU_CLOCK DPHL_MASTER_CLOCK / 9 /* 2 MHz (from 8224) */
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
#include "machine/i8255a.h"
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index c753b14aaa8..84832dc6e60 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -117,7 +117,7 @@ e000 - e7ff R/W Work RAM
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c
index 8f6a506ca7f..5a67e9ffd84 100644
--- a/src/mame/drivers/nss.c
+++ b/src/mame/drivers/nss.c
@@ -292,7 +292,7 @@ Contra III CONTRA_III_1 TC574000 CONTRA_III_0 TC574000 GAME1_NSSU
-----------------------------------------------------------------------------------------------------------------------------------------------------
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/spc700/spc700.h"
#include "cpu/g65816/g65816.h"
#include "includes/snes.h"
diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c
index 346ad50e725..cde132c3ec9 100644
--- a/src/mame/drivers/nwk-tr.c
+++ b/src/mame/drivers/nwk-tr.c
@@ -212,7 +212,7 @@ Thrill Drive 713A13 - 713A14 -
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/powerpc/ppc.h"
#include "cpu/sharc/sharc.h"
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index d4f5a0fbe49..2d843224248 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -146,7 +146,7 @@ Stephh's additional notes (based on the game Z80 code and some tests) :
//#define USE_MCU
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index d2a1ce28327..cb72353d753 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -61,7 +61,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/rescap.h"
#include "machine/6821pia.h"
#include "machine/74123.h"
diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c
index b08d489b8d4..b7db515fb08 100644
--- a/src/mame/drivers/offtwall.c
+++ b/src/mame/drivers/offtwall.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "audio/atarijsa.h"
#include "includes/offtwall.h"
diff --git a/src/mame/drivers/ohmygod.c b/src/mame/drivers/ohmygod.c
index 9a3612c4cca..c2b00005395 100644
--- a/src/mame/drivers/ohmygod.c
+++ b/src/mame/drivers/ohmygod.c
@@ -11,7 +11,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index e4c8b70131d..dd78ca031b7 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -31,7 +31,7 @@ Memo:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index cca5b61cd1f..7dc8f195960 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -51,7 +51,7 @@ $7004 writes, related to $7000 reads
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index 94704a0f78a..fde21213ba4 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -216,7 +216,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "video/vector.h"
#include "video/avgdvg.h"
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index 4cfe4c95987..c9885d2eff9 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -29,7 +29,7 @@ TO DO :
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index f66856aa217..e586776be16 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -39,7 +39,7 @@ Note: this is quite clearly a 'Korean bootleg' of Shisensho - Joshiryo-Hen / Mat
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
#include "sound/3812intf.h"
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index 2a8cbbf8376..3af95e5583a 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -274,7 +274,7 @@ register. So what is controlling priority.
#define CPU_CLOCK (XTAL_16MHz / 2) /* clock for 68000 */
#define SOUND_CPU_CLOCK (XTAL_8MHz / 2) /* clock for Z80 sound CPU */
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "includes/taitoipt.h"
diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c
index 75953200ffa..2693fee2e89 100644
--- a/src/mame/drivers/orbit.c
+++ b/src/mame/drivers/orbit.c
@@ -17,7 +17,7 @@ Atari Orbit Driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "includes/orbit.h"
#include "sound/discrete.h"
diff --git a/src/mame/drivers/othello.c b/src/mame/drivers/othello.c
index 5cbd6505966..53a81b3b493 100644
--- a/src/mame/drivers/othello.c
+++ b/src/mame/drivers/othello.c
@@ -35,7 +35,7 @@ Limit for help/undo (matta):
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/othldrby.c b/src/mame/drivers/othldrby.c
index 294ee909ef3..a619da9dd5c 100644
--- a/src/mame/drivers/othldrby.c
+++ b/src/mame/drivers/othldrby.c
@@ -14,7 +14,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 3a057bee510..c9073e513ef 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -230,7 +230,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index febd64828d9..54196085aa7 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -18,7 +18,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "video/konicdev.h"
diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c
index 5ffca531c86..2160ebf8928 100644
--- a/src/mame/drivers/pachifev.c
+++ b/src/mame/drivers/pachifev.c
@@ -21,7 +21,7 @@ Many thanks to Olivier Galibert and Wilbert Pol for the identify effort ;-)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms9900/tms9900.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/pacland.c b/src/mame/drivers/pacland.c
index b02d0f077fa..71c4b131772 100644
--- a/src/mame/drivers/pacland.c
+++ b/src/mame/drivers/pacland.c
@@ -172,7 +172,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
#include "sound/namco.h"
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index 3d130d57b69..c3a5d14e7d8 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -336,7 +336,7 @@ Boards:
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "includes/pacman.h"
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index e6f08492798..21277068cf3 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -21,7 +21,7 @@ Boards:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/z80/z80.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/drivers/pangofun.c b/src/mame/drivers/pangofun.c
index 3277b473469..e3073161375 100644
--- a/src/mame/drivers/pangofun.c
+++ b/src/mame/drivers/pangofun.c
@@ -89,7 +89,7 @@ Arcade Version (Coin-Op) by InfoCube (Pisa, Italy)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
static VIDEO_START(pangofun)
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index fa12d0c3ccb..38af35d1846 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -59,7 +59,7 @@ D.9B [f99cac4b] /
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/nec/nec.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index d8a8df81cdf..6f452115283 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -29,7 +29,7 @@ paradise: I'm not sure it's working correctly:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "includes/paradise.h"
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index 09279a178b4..35d0dd0f7fb 100644
--- a/src/mame/drivers/paranoia.c
+++ b/src/mame/drivers/paranoia.c
@@ -33,7 +33,7 @@ HuC6280A (Hudson)
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index c3ad01b141a..90e79124dc2 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
#include "video/konicdev.h"
diff --git a/src/mame/drivers/pasha2.c b/src/mame/drivers/pasha2.c
index 60d8ce7fbcb..e6f20f9b223 100644
--- a/src/mame/drivers/pasha2.c
+++ b/src/mame/drivers/pasha2.c
@@ -71,7 +71,7 @@ Notes:
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/e132xs/e132xs.h"
#include "machine/eeprom.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index ed18a9f5aa0..3bc8c7499dc 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -99,7 +99,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index 483a2b2d6c2..7530d338d69 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -20,7 +20,7 @@ Memo:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/nb1413m3.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index 287db0ebdbd..0a8cb77136e 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -63,7 +63,7 @@ Stephh's notes (based on the game Z80 code and some tests) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/pcat_dyn.c b/src/mame/drivers/pcat_dyn.c
index 9041ba9fff4..499d3627f80 100644
--- a/src/mame/drivers/pcat_dyn.c
+++ b/src/mame/drivers/pcat_dyn.c
@@ -14,7 +14,7 @@ preliminary driver by Angelo Salese
********************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
#include "memconv.h"
#include "devconv.h"
diff --git a/src/mame/drivers/pcat_nit.c b/src/mame/drivers/pcat_nit.c
index 2f0a705269f..e643253fbe6 100644
--- a/src/mame/drivers/pcat_nit.c
+++ b/src/mame/drivers/pcat_nit.c
@@ -80,7 +80,7 @@ Smitdogg
********************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
#include "memconv.h"
#include "devconv.h"
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index 450737e5295..c094c958a16 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
#include "sound/3812intf.h"
diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c
index 3d87f01dbe9..526113dc07e 100644
--- a/src/mame/drivers/pcxt.c
+++ b/src/mame/drivers/pcxt.c
@@ -60,9 +60,8 @@ the main program is 9th October 1990.
******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i86/i86.h"
-#include "video/generic.h"
#include "machine/pit8253.h"
#include "machine/8255ppi.h"
#include "machine/8237dma.h"
diff --git a/src/mame/drivers/pengo.c b/src/mame/drivers/pengo.c
index 3b53f388c13..7a9b5191599 100644
--- a/src/mame/drivers/pengo.c
+++ b/src/mame/drivers/pengo.c
@@ -61,7 +61,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/segacrpt.h"
#include "includes/pacman.h"
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index 6fdfe93480d..966767489b4 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -160,7 +160,7 @@ Stephh's log (2007.11.28) :
***********************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/ay8910.h"
#include "cpu/mcs51/mcs51.h"
#include "machine/i2cmem.h"
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 1bb1f46e291..e3f2ec1ac52 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -282,7 +282,7 @@ Notes:
#define PGMLOGERROR 0
#define PGMARM7LOGERROR 1
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/arm7/arm7.h"
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index 2800fa7cce9..8731e5225b6 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -29,7 +29,7 @@ Pleiads:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/tms36xx.h"
#include "cpu/i8085/i8085.h"
diff --git a/src/mame/drivers/photon.c b/src/mame/drivers/photon.c
index 58fbf560465..e0d1ffc235c 100644
--- a/src/mame/drivers/photon.c
+++ b/src/mame/drivers/photon.c
@@ -13,7 +13,7 @@
- Treasure/Labyrinth
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "includes/pk8000.h"
#include "machine/i8255a.h"
diff --git a/src/mame/drivers/photon2.c b/src/mame/drivers/photon2.c
index 831d7f85684..a6d3daa563f 100644
--- a/src/mame/drivers/photon2.c
+++ b/src/mame/drivers/photon2.c
@@ -8,7 +8,7 @@
Each coin buys you 1-6 minutes of game time.
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/speaker.h"
diff --git a/src/mame/drivers/photoply.c b/src/mame/drivers/photoply.c
index e698c3edbee..865d377006f 100644
--- a/src/mame/drivers/photoply.c
+++ b/src/mame/drivers/photoply.c
@@ -12,7 +12,7 @@ TODO:
*******************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
#include "memconv.h"
#include "devconv.h"
diff --git a/src/mame/drivers/pingpong.c b/src/mame/drivers/pingpong.c
index e00a8c31d60..0eb262034ec 100644
--- a/src/mame/drivers/pingpong.c
+++ b/src/mame/drivers/pingpong.c
@@ -4,7 +4,7 @@ Ping Pong (c) 1985 Konami
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index 6b874cc0f1a..0426c7fb10f 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -160,7 +160,7 @@ Added Multiple Coin Feature:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2608intf.h"
#include "sound/2610intf.h"
diff --git a/src/mame/drivers/pipeline.c b/src/mame/drivers/pipeline.c
index 9308f66a5bc..c8dac4f3402 100644
--- a/src/mame/drivers/pipeline.c
+++ b/src/mame/drivers/pipeline.c
@@ -47,7 +47,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/z80ctc.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 4ef08bde203..f1ceea254d8 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -87,7 +87,7 @@ Notes:
---*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index 424fe0be536..259d22d108c 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -63,7 +63,7 @@ K1000233A
PR3
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index 65f2d5505d3..11e49df026b 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -11,7 +11,7 @@ driver by David Haywood and few bits by Pierpaolo Prazzoli
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c
index ca172350fba..6c9814ba3ab 100644
--- a/src/mame/drivers/pktgaldx.c
+++ b/src/mame/drivers/pktgaldx.c
@@ -52,7 +52,7 @@ bootleg todo:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "includes/decocrpt.h"
#include "includes/decoprot.h"
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index 8e0cd5b5601..821e2def9c0 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -289,7 +289,7 @@ Notes & Todo:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "video/ppu2c0x.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index 6abcf2ea167..7d786d685ac 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -39,7 +39,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
#include "cpu/pic16c5x/pic16c5x.h"
diff --git a/src/mame/drivers/plygonet.c b/src/mame/drivers/plygonet.c
index 0fe3e69e12d..64ca9a44640 100644
--- a/src/mame/drivers/plygonet.c
+++ b/src/mame/drivers/plygonet.c
@@ -79,7 +79,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c
index 445d0ca3b9f..d3839940946 100644
--- a/src/mame/drivers/pntnpuzl.c
+++ b/src/mame/drivers/pntnpuzl.c
@@ -120,7 +120,7 @@ c 1993 Ver D3.51 LH
CN1 standard DB15 VGA connector (15KHz)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c
index 31639d3b121..8bfea8cc716 100644
--- a/src/mame/drivers/pokechmp.c
+++ b/src/mame/drivers/pokechmp.c
@@ -44,7 +44,7 @@ ClawGrip, Jul 2006
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
#include "sound/3812intf.h"
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 33094fe5816..67aab99e12c 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -216,7 +216,7 @@ Todo:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z8000/z8000.h"
#include "cpu/mb88xx/mb88xx.h"
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index 48cd4f309e5..304454b5101 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -83,7 +83,7 @@ PC5380-9651 5380-JY3306A 5380-N1045503A
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/r3000.h"
#include "machine/eeprom.h"
#include "includes/policetr.h"
diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c
index 26c499c7a7d..512d33cb8aa 100644
--- a/src/mame/drivers/polyplay.c
+++ b/src/mame/drivers/polyplay.c
@@ -78,7 +78,7 @@ emulated now. ;)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/samples.h"
#include "includes/polyplay.h"
diff --git a/src/mame/drivers/poolshrk.c b/src/mame/drivers/poolshrk.c
index 9d90f8c3f4b..189960fbd2a 100644
--- a/src/mame/drivers/poolshrk.c
+++ b/src/mame/drivers/poolshrk.c
@@ -4,7 +4,7 @@ Atari Poolshark Driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "includes/poolshrk.h"
#include "sound/discrete.h"
diff --git a/src/mame/drivers/pooyan.c b/src/mame/drivers/pooyan.c
index 34031c6ec38..cec2dd36736 100644
--- a/src/mame/drivers/pooyan.c
+++ b/src/mame/drivers/pooyan.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/timeplt.h"
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index 9c3a8350468..47c8b65e286 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -16,7 +16,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index 96c2fc86782..e28661428dc 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -81,7 +81,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/portrait.c b/src/mame/drivers/portrait.c
index 231db10e253..58df7778e15 100644
--- a/src/mame/drivers/portrait.c
+++ b/src/mame/drivers/portrait.c
@@ -83,7 +83,7 @@ XD2210 or 8202
DM81LS95 = TriState buffer
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/tms5220.h"
diff --git a/src/mame/drivers/powerbal.c b/src/mame/drivers/powerbal.c
index 7f15e72ab86..65d7e5436da 100644
--- a/src/mame/drivers/powerbal.c
+++ b/src/mame/drivers/powerbal.c
@@ -13,7 +13,7 @@ Magic Sticks:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index 6471460e9c3..b6d0601192d 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -28,7 +28,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "machine/nmk112.h"
diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c
index f8d1f0718c2..212bdccf8c5 100644
--- a/src/mame/drivers/ppmast93.c
+++ b/src/mame/drivers/ppmast93.c
@@ -129,7 +129,7 @@ Dip locations added based on the notes above.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
#include "sound/2413intf.h"
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index d9e58cf96be..027248002ea 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/upd7759.h"
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index 66612f89ab0..15fa98d7455 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -50,7 +50,7 @@ Twenty four 8116 rams.
****************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/psattack.c b/src/mame/drivers/psattack.c
index 94efe0a992e..7c1626563b7 100644
--- a/src/mame/drivers/psattack.c
+++ b/src/mame/drivers/psattack.c
@@ -71,7 +71,7 @@ GUN_xP are 6 pin gun connectors (pins 1-4 match the UNICO sytle guns):
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/se3208/se3208.h"
#include "video/vrender0.h"
#include "machine/ds1302.h"
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 2278c361025..fe5d50a0cd9 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -60,7 +60,7 @@ This was pointed out by Bart Puype
*****/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index c26fb4e12d4..04c6e503487 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -126,7 +126,7 @@ ROMs -
----------------------------------------------------------------*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/sh2/sh2.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index d3a129d3b39..cef3b84c139 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -273,7 +273,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/sh2/sh2.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c
index 9eb0b65cdeb..253b9467ded 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -309,7 +309,7 @@ The first sprite data is located at f20b,then f21b and so on.
C= Color palette selector
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index 32bdb69225d..8562646b43d 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -74,7 +74,7 @@ ROMS: All ROM labels say only "PROM" and a number.
11, 12, 13 type 2732
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c
index 8d6639c7c46..1cd71054927 100644
--- a/src/mame/drivers/puckpkmn.c
+++ b/src/mame/drivers/puckpkmn.c
@@ -42,7 +42,7 @@ Notes:
TV16B 0010 ME251271 (QFP160)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index 6b7657203c7..c54764c8abb 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -109,7 +109,7 @@ DIP locations verified for:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6502/m6502.h"
#include "sound/vlm5030.h"
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index bde9d0369eb..3c48b59708a 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -23,7 +23,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/pzletime.c b/src/mame/drivers/pzletime.c
index cc7f53d47dd..02bc9d29d4d 100644
--- a/src/mame/drivers/pzletime.c
+++ b/src/mame/drivers/pzletime.c
@@ -14,7 +14,7 @@
*****************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c
index 1ac1d2b3322..6dbcf1d0474 100644
--- a/src/mame/drivers/qdrmfgp.c
+++ b/src/mame/drivers/qdrmfgp.c
@@ -19,7 +19,7 @@ GP1 HDD data contents:
0x52E-0x535 not used quiz (system music or invalid data)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
#include "machine/idectrl.h"
diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c
index 33f55a62fee..2dee0d61f03 100644
--- a/src/mame/drivers/qix.c
+++ b/src/mame/drivers/qix.c
@@ -221,7 +221,7 @@ Interrupts:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6805/m6805.h"
#include "rendlay.h"
#include "includes/qix.h"
diff --git a/src/mame/drivers/quakeat.c b/src/mame/drivers/quakeat.c
index 9ad82b8d541..ab33a22329a 100644
--- a/src/mame/drivers/quakeat.c
+++ b/src/mame/drivers/quakeat.c
@@ -57,7 +57,7 @@ TODO:
===============================================================================
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
#include "machine/pic8259.h"
/* Insert IBM PC includes here */
diff --git a/src/mame/drivers/quantum.c b/src/mame/drivers/quantum.c
index 60a022f7dcd..b4150c639fa 100644
--- a/src/mame/drivers/quantum.c
+++ b/src/mame/drivers/quantum.c
@@ -43,7 +43,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "video/vector.h"
#include "video/avgdvg.h"
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index c86de06731d..3619ac15231 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -57,7 +57,7 @@ Sound Board 1b11107
************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c
index e6d19976793..b13af2cf749 100644
--- a/src/mame/drivers/queen.c
+++ b/src/mame/drivers/queen.c
@@ -19,7 +19,7 @@ processor speed is 533MHz <- likely to be a Celeron or a Pentium III class CPU -
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
static VIDEO_START(queen)
diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c
index 9c4a3343834..c3d39c25ac9 100644
--- a/src/mame/drivers/quizdna.c
+++ b/src/mame/drivers/quizdna.c
@@ -8,7 +8,7 @@ Quiz Gekiretsu Scramble (Gakuen Paradise 2) (c) 1993 Face
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c
index c2658a9ffa4..af44fa385e3 100644
--- a/src/mame/drivers/quizo.c
+++ b/src/mame/drivers/quizo.c
@@ -23,7 +23,7 @@ Xtals 8MHz, 21.47727MHz
**********************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/quizpani.c b/src/mame/drivers/quizpani.c
index 43f7efa19a1..dff9963196b 100644
--- a/src/mame/drivers/quizpani.c
+++ b/src/mame/drivers/quizpani.c
@@ -32,7 +32,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/nmk112.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c
index 9d68fea52de..b024519fe82 100644
--- a/src/mame/drivers/quizpun2.c
+++ b/src/mame/drivers/quizpun2.c
@@ -38,7 +38,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index 59bef2be478..e6e08d9c96e 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -30,7 +30,7 @@ RAM = 4116 (x11)
----------------------------------------------------
********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/rescap.h"
#include "machine/6821pia.h"
#include "machine/74123.h"
diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c
index 684a41cdde9..c274173aefe 100644
--- a/src/mame/drivers/rabbit.c
+++ b/src/mame/drivers/rabbit.c
@@ -76,7 +76,7 @@ Custom: Imagetek 15000 (2ch video & 2ch sound)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c
index 0659365a7d3..f9ffc489e75 100644
--- a/src/mame/drivers/raiden.c
+++ b/src/mame/drivers/raiden.c
@@ -35,7 +35,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
#include "cpu/z80/z80.h"
#include "audio/seibu.h"
diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c
index 3157f991506..c92fb7b222f 100644
--- a/src/mame/drivers/raiden2.c
+++ b/src/mame/drivers/raiden2.c
@@ -135,7 +135,7 @@ Current Problem(s) - in order of priority
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
#include "cpu/z80/z80.h"
#include "audio/seibu.h"
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index 726785ccc81..6242ca0ae9c 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -317,7 +317,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "includes/taitoipt.h"
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index 8d5fdaf1d00..4a9daa65762 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -188,7 +188,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/namco.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index 80c399450d7..99d38252c82 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -22,7 +22,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "includes/rampart.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 9fd09729ded..a53344ef374 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -156,7 +156,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "includes/taitoipt.h"
diff --git a/src/mame/drivers/rbmk.c b/src/mame/drivers/rbmk.c
index c652edf0709..0c357e9ad34 100644
--- a/src/mame/drivers/rbmk.c
+++ b/src/mame/drivers/rbmk.c
@@ -49,7 +49,7 @@ Notes:
S1 - Macronix MX27C2000 (OKI samples)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c
index a6256844df9..7e273dfe135 100644
--- a/src/mame/drivers/rcorsair.c
+++ b/src/mame/drivers/rcorsair.c
@@ -51,7 +51,7 @@ so even the Main CPU is unknown, assuming the 8085 is the sound CPU
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
static ADDRESS_MAP_START( rcorsair_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/re900.c b/src/mame/drivers/re900.c
index 73a455714ce..cf9d7de4946 100644
--- a/src/mame/drivers/re900.c
+++ b/src/mame/drivers/re900.c
@@ -74,7 +74,7 @@
#define VDP_CLOCK XTAL_10_730MHz
#define TMS_CLOCK VDP_CLOCK / 24
-#include "driver.h"
+#include "emu.h"
#include "cpu/mcs51/mcs51.h"
#include "video/tms9928a.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index 8503d809732..4339a267378 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -41,7 +41,7 @@ To Do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "machine/tmp68301.h"
diff --git a/src/mame/drivers/redalert.c b/src/mame/drivers/redalert.c
index b7fb498929f..0e4eaee9ddc 100644
--- a/src/mame/drivers/redalert.c
+++ b/src/mame/drivers/redalert.c
@@ -91,7 +91,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/redalert.h"
diff --git a/src/mame/drivers/redclash.c b/src/mame/drivers/redclash.c
index e35e5f47c49..a3a2d90373a 100644
--- a/src/mame/drivers/redclash.c
+++ b/src/mame/drivers/redclash.c
@@ -20,7 +20,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/ladybug.h"
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index 806c7314f83..7df68d723ca 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/atarigen.h"
#include "includes/relief.h"
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index 04f3f173aff..b5f7275b801 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -99,7 +99,7 @@ $8000 - $ffff ROM
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "deprecat.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/drivers/retofinv.c b/src/mame/drivers/retofinv.c
index 1c358dbcb9e..f4ec0a60662 100644
--- a/src/mame/drivers/retofinv.c
+++ b/src/mame/drivers/retofinv.c
@@ -28,7 +28,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index 5763a9cd95b..0c8442c77df 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -28,7 +28,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index 8bff40bda1d..173d8259cd6 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -47,7 +47,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/hd6309/hd6309.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/rocnrope.c b/src/mame/drivers/rocnrope.c
index d5a01d0c65b..ba74f6366fd 100644
--- a/src/mame/drivers/rocnrope.c
+++ b/src/mame/drivers/rocnrope.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/konami1.h"
#include "includes/timeplt.h"
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index da8c232cdf6..5a1f3cd29ce 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -104,7 +104,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "includes/decocrpt.h"
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index 61fd9cc5854..1389a9f9310 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -10,7 +10,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "video/konicdev.h"
#include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c
index b06926108dd..ed3013e1e54 100644
--- a/src/mame/drivers/rollrace.c
+++ b/src/mame/drivers/rollrace.c
@@ -7,7 +7,7 @@ Issues:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/rotaryf.c b/src/mame/drivers/rotaryf.c
index f54c757c55b..cff304d9650 100644
--- a/src/mame/drivers/rotaryf.c
+++ b/src/mame/drivers/rotaryf.c
@@ -10,7 +10,7 @@ driver by Barry Rodewald
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/i8085/i8085.h"
diff --git a/src/mame/drivers/roul.c b/src/mame/drivers/roul.c
index 8945d1b88cb..e6c589fad71 100644
--- a/src/mame/drivers/roul.c
+++ b/src/mame/drivers/roul.c
@@ -46,7 +46,7 @@ with a write in reg[2] the command is executed
not handled commands with reg[3] & 0xc0 == 0x00
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "roul.lh"
diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c
index 472557603a5..0106ab55388 100644
--- a/src/mame/drivers/route16.c
+++ b/src/mame/drivers/route16.c
@@ -67,7 +67,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index 6a0a9cf6346..a94906f7a56 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -88,7 +88,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "cpu/tlcs90/tlcs90.h"
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index bedcd25756a..218fc17eeb8 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -104,7 +104,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c
index 309ef10a079..3d3306bf9ca 100644
--- a/src/mame/drivers/runaway.c
+++ b/src/mame/drivers/runaway.c
@@ -10,7 +10,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/atari_vg.h"
#include "sound/pokey.h"
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index b5cb1aaee7e..1edd46a5453 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -35,7 +35,7 @@
***********************