summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/audio/generic.c3
-rw-r--r--src/emu/cpu/i860/i860dis.c1
-rw-r--r--src/emu/cpu/m68000/m68kdasm.c4
-rw-r--r--src/emu/cpu/pdp1/pdp1dasm.c2
-rw-r--r--src/emu/cpu/pdp1/tx0dasm.c2
-rw-r--r--src/emu/debug/debugcon.c2
-rw-r--r--src/emu/debug/debugcpu.c2
-rw-r--r--src/emu/debug/debughlp.c2
-rw-r--r--src/emu/debug/debugvw.c2
-rw-r--r--src/emu/drawgfx.c1
-rw-r--r--src/emu/driver.h13
-rw-r--r--src/emu/drivers/empty.c2
-rw-r--r--src/emu/emucore.h26
-rw-r--r--src/emu/fileio.c1
-rw-r--r--src/emu/inptport.c1
-rw-r--r--src/emu/machine/53c810.c2
-rw-r--r--src/emu/machine/6522via.c2
-rw-r--r--src/emu/machine/6526cia.c2
-rw-r--r--src/emu/machine/6532riot.c2
-rw-r--r--src/emu/machine/6840ptm.c2
-rw-r--r--src/emu/machine/6850acia.c3
-rw-r--r--src/emu/machine/68681.c2
-rw-r--r--src/emu/machine/74123.c2
-rw-r--r--src/emu/machine/74148.c2
-rw-r--r--src/emu/machine/74153.c2
-rw-r--r--src/emu/machine/74181.c2
-rw-r--r--src/emu/machine/7474.c2
-rw-r--r--src/emu/machine/8042kbdc.c2
-rw-r--r--src/emu/machine/8237dma.c2
-rw-r--r--src/emu/machine/8255ppi.c2
-rw-r--r--src/emu/machine/8257dma.c2
-rw-r--r--src/emu/machine/adc083x.c2
-rw-r--r--src/emu/machine/adc1038.c2
-rw-r--r--src/emu/machine/adc1213x.c2
-rw-r--r--src/emu/machine/am53cf96.c2
-rw-r--r--src/emu/machine/at28c16.c2
-rw-r--r--src/emu/machine/cdp1852.c2
-rw-r--r--src/emu/machine/cr589.c2
-rw-r--r--src/emu/machine/ds1302.c2
-rw-r--r--src/emu/machine/ds2401.c4
-rw-r--r--src/emu/machine/ds2404.c2
-rw-r--r--src/emu/machine/eeprom.c2
-rw-r--r--src/emu/machine/f3853.c2
-rw-r--r--src/emu/machine/generic.c1
-rw-r--r--src/emu/machine/i2cmem.c2
-rw-r--r--src/emu/machine/i2cmemdev.c2
-rw-r--r--src/emu/machine/i8255a.c2
-rw-r--r--src/emu/machine/idectrl.c2
-rw-r--r--src/emu/machine/intelfsh.c2
-rw-r--r--src/emu/machine/k033906.c2
-rw-r--r--src/emu/machine/k056230.c2
-rw-r--r--src/emu/machine/latch8.c2
-rw-r--r--src/emu/machine/mb14241.c2
-rw-r--r--src/emu/machine/mb3773.c2
-rw-r--r--src/emu/machine/mb87078.c2
-rw-r--r--src/emu/machine/mc146818.c4
-rw-r--r--src/emu/machine/microtch.c2
-rw-r--r--src/emu/machine/msm6242.c2
-rw-r--r--src/emu/machine/pc16552d.c2
-rw-r--r--src/emu/machine/pci.c2
-rw-r--r--src/emu/machine/pd4990a.c2
-rw-r--r--src/emu/machine/pic8259.c2
-rw-r--r--src/emu/machine/pit8253.c2
-rw-r--r--src/emu/machine/roc10937.c2
-rw-r--r--src/emu/machine/rp5h01.c2
-rw-r--r--src/emu/machine/rtc65271.c2
-rw-r--r--src/emu/machine/smc91c9x.c2
-rw-r--r--src/emu/machine/timekpr.c2
-rw-r--r--src/emu/machine/tmp68301.c2
-rw-r--r--src/emu/machine/upd4701.c2
-rw-r--r--src/emu/machine/wd33c93.c3
-rw-r--r--src/emu/machine/x2212.c2
-rw-r--r--src/emu/machine/x76f041.c2
-rw-r--r--src/emu/machine/x76f100.c2
-rw-r--r--src/emu/machine/z80ctc.c2
-rw-r--r--src/emu/machine/z80dma.c2
-rw-r--r--src/emu/machine/z80pio.c2
-rw-r--r--src/emu/machine/z80sio.c2
-rw-r--r--src/emu/rendersw.c1
-rw-r--r--src/emu/romload.c1
-rw-r--r--src/emu/sound/2203intf.c1
-rw-r--r--src/emu/sound/aicadsp.c1
-rw-r--r--src/emu/sound/bsmt2000.c2
-rw-r--r--src/emu/sound/c140.c1
-rw-r--r--src/emu/sound/sn76477.c1
-rw-r--r--src/emu/video/generic.c3
-rw-r--r--src/emu/video/mc6845.c2
-rw-r--r--src/emu/video/poly.c5
-rw-r--r--src/emu/video/resnet.c2
-rw-r--r--src/emu/video/rgbutil.c3
-rw-r--r--src/emu/video/s2636.c2
-rw-r--r--src/emu/video/saa5050.c2
-rw-r--r--src/emu/video/tlc34076.c2
-rw-r--r--src/emu/video/tms34061.c2
-rw-r--r--src/emu/video/tms9927.c2
-rw-r--r--src/emu/video/tms9928a.c2
-rw-r--r--src/emu/video/v9938.c2
-rw-r--r--src/emu/video/voodoo.c3
-rw-r--r--src/ldplayer/ldpdriv.c2
-rw-r--r--src/ldplayer/ldplayer.c2
-rw-r--r--src/mame/audio/8080bw.c2
-rw-r--r--src/mame/audio/amiga.c2
-rw-r--r--src/mame/audio/asteroid.c3
-rw-r--r--src/mame/audio/astrof.c2
-rw-r--r--src/mame/audio/atarifb.c2
-rw-r--r--src/mame/audio/atarijsa.c2
-rw-r--r--src/mame/audio/attckufo.c4
-rw-r--r--src/mame/audio/avalnche.c2
-rw-r--r--src/mame/audio/aztarac.c2
-rw-r--r--src/mame/audio/blockade.c2
-rw-r--r--src/mame/audio/bsktball.c2
-rw-r--r--src/mame/audio/bzone.c3
-rw-r--r--src/mame/audio/cage.c2
-rw-r--r--src/mame/audio/canyon.c2
-rw-r--r--src/mame/audio/carnival.c2
-rw-r--r--src/mame/audio/cchasm.c2
-rw-r--r--src/mame/audio/cclimber.c2
-rw-r--r--src/mame/audio/cinemat.c2
-rw-r--r--src/mame/audio/circus.c2
-rw-r--r--src/mame/audio/cliffhgr.c2
-rw-r--r--src/mame/audio/cps3.c2
-rw-r--r--src/mame/audio/crbaloon.c2
-rw-r--r--src/mame/audio/cyberbal.c2
-rw-r--r--src/mame/audio/dcs.c2
-rw-r--r--src/mame/audio/depthch.c2
-rw-r--r--src/mame/audio/dkong.c2
-rw-r--r--src/mame/audio/dragrace.c2
-rw-r--r--src/mame/audio/exidy.c2
-rw-r--r--src/mame/audio/exidy440.c2
-rw-r--r--src/mame/audio/firetrk.c2
-rw-r--r--src/mame/audio/flower.c2
-rw-r--r--src/mame/audio/galaga.c2
-rw-r--r--src/mame/audio/galaxian.c2
-rw-r--r--src/mame/audio/geebee.c3
-rw-r--r--src/mame/audio/gomoku.c2
-rw-r--r--src/mame/audio/gorf.c2
-rw-r--r--src/mame/audio/gottlieb.c2
-rw-r--r--src/mame/audio/gotya.c2
-rw-r--r--src/mame/audio/grchamp.c2
-rw-r--r--src/mame/audio/gridlee.c2
-rw-r--r--src/mame/audio/harddriv.c2
-rw-r--r--src/mame/audio/hitme.c2
-rw-r--r--src/mame/audio/invinco.c2
-rw-r--r--src/mame/audio/irem.c2
-rw-r--r--src/mame/audio/jaguar.c2
-rw-r--r--src/mame/audio/jedi.c2
-rw-r--r--src/mame/audio/laserbat.c2
-rw-r--r--src/mame/audio/leland.c2
-rw-r--r--src/mame/audio/llander.c2
-rw-r--r--src/mame/audio/m72.c2
-rw-r--r--src/mame/audio/m79amb.c2
-rw-r--r--src/mame/audio/madalien.c2
-rw-r--r--src/mame/audio/mario.c2
-rw-r--r--src/mame/audio/mcr.c2
-rw-r--r--src/mame/audio/meadows.c2
-rw-r--r--src/mame/audio/mw8080bw.c2
-rw-r--r--src/mame/audio/n8080.c2
-rw-r--r--src/mame/audio/namco52.c2
-rw-r--r--src/mame/audio/namco54.c2
-rw-r--r--src/mame/audio/namcoc7x.c2
-rw-r--r--src/mame/audio/nitedrvr.c2
-rw-r--r--src/mame/audio/norautp.c2
-rw-r--r--src/mame/audio/orbit.c2
-rw-r--r--src/mame/audio/phoenix.c2
-rw-r--r--src/mame/audio/pleiads.c2
-rw-r--r--src/mame/audio/polepos.c2
-rw-r--r--src/mame/audio/polyplay.c3
-rw-r--r--src/mame/audio/poolshrk.c2
-rw-r--r--src/mame/audio/pulsar.c2
-rw-r--r--src/mame/audio/qix.c2
-rw-r--r--src/mame/audio/redalert.c2
-rw-r--r--src/mame/audio/redbaron.c3
-rw-r--r--src/mame/audio/scramble.c2
-rw-r--r--src/mame/audio/segag80r.c2
-rw-r--r--src/mame/audio/segag80v.c2
-rw-r--r--src/mame/audio/segasnd.c2
-rw-r--r--src/mame/audio/seibu.c2
-rw-r--r--src/mame/audio/senjyo.c2
-rw-r--r--src/mame/audio/skydiver.c2
-rw-r--r--src/mame/audio/skyraid.c2
-rw-r--r--src/mame/audio/snes.c3
-rw-r--r--src/mame/audio/snk6502.c2
-rw-r--r--src/mame/audio/spacefb.c2
-rw-r--r--src/mame/audio/spiders.c2
-rw-r--r--src/mame/audio/sprint2.c2
-rw-r--r--src/mame/audio/sprint4.c2
-rw-r--r--src/mame/audio/sprint8.c2
-rw-r--r--src/mame/audio/starshp1.c2
-rw-r--r--src/mame/audio/starwars.c2
-rw-r--r--src/mame/audio/subs.c2
-rw-r--r--src/mame/audio/suna8.c2
-rw-r--r--src/mame/audio/t5182.c2
-rw-r--r--src/mame/audio/taito_en.c2
-rw-r--r--src/mame/audio/taitosnd.c2
-rw-r--r--src/mame/audio/tank8.c2
-rw-r--r--src/mame/audio/targ.c2
-rw-r--r--src/mame/audio/tiamc1.c2
-rw-r--r--src/mame/audio/timeplt.c2
-rw-r--r--src/mame/audio/toaplan2.c2
-rw-r--r--src/mame/audio/trackfld.c2
-rw-r--r--src/mame/audio/triplhnt.c2
-rw-r--r--src/mame/audio/turbo.c2
-rw-r--r--src/mame/audio/tx1.c2
-rw-r--r--src/mame/audio/vicdual.c2
-rw-r--r--src/mame/audio/videopin.c2
-rw-r--r--src/mame/audio/warpwarp.c3
-rw-r--r--src/mame/audio/williams.c2
-rw-r--r--src/mame/audio/wiping.c2
-rw-r--r--src/mame/audio/wow.c2
-rw-r--r--src/mame/audio/zaxxon.c2
-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
-rw-r--r--src/mame/etc/jrcrypt.c7
-rw-r--r--src/mame/machine/acitya.c2
-rw-r--r--src/mame/machine/ajax.c2
-rw-r--r--src/mame/machine/amiga.c2
-rw-r--r--src/mame/machine/archimds.c2
-rw-r--r--src/mame/machine/arkanoid.c2
-rw-r--r--src/mame/machine/asic65.c2
-rw-r--r--src/mame/machine/asteroid.c2
-rw-r--r--src/mame/machine/atari.c2
-rw-r--r--src/mame/machine/atari_vg.c2
-rw-r--r--src/mame/machine/atarifb.c2
-rw-r--r--src/mame/machine/atarigen.c2
-rw-r--r--src/mame/machine/bagman.c2
-rw-r--r--src/mame/machine/balsente.c2
-rw-r--r--src/mame/machine/beezer.c2
-rw-r--r--src/mame/machine/bfm_bd1.c2
-rw-r--r--src/mame/machine/bigevglf.c2
-rw-r--r--src/mame/machine/bonzeadv.c2
-rw-r--r--src/mame/machine/bsktball.c2
-rw-r--r--src/mame/machine/btime.c2
-rw-r--r--src/mame/machine/bublbobl.c2
-rw-r--r--src/mame/machine/buggychl.c2
-rw-r--r--src/mame/machine/carpolo.c2
-rw-r--r--src/mame/machine/cchasm.c2
-rw-r--r--src/mame/machine/cchip.c2
-rw-r--r--src/mame/machine/cclimber.c2
-rw-r--r--src/mame/machine/chaknpop.c2
-rw-r--r--src/mame/machine/copsnrob.c2
-rw-r--r--src/mame/machine/cps2crpt.c2
-rw-r--r--src/mame/machine/cubocd32.c2
-rw-r--r--src/mame/machine/daikaiju.c2
-rw-r--r--src/mame/machine/dc.c2
-rw-r--r--src/mame/machine/dec0.c2
-rw-r--r--src/mame/machine/deco102.c2
-rw-r--r--src/mame/machine/deco156.c2
-rw-r--r--src/mame/machine/decocass.c2
-rw-r--r--src/mame/machine/decocrpt.c2
-rw-r--r--src/mame/machine/decoprot.c2
-rw-r--r--src/mame/machine/docastle.c2
-rw-r--r--src/mame/machine/fd1089.c2
-rw-r--r--src/mame/machine/fd1094.c2
-rw-r--r--src/mame/machine/fddebug.c2
-rw-r--r--src/mame/machine/flstory.c2
-rw-r--r--src/mame/machine/gaelco2.c2
-rw-r--r--src/mame/machine/gaelcrpt.c2
-rw-r--r--src/mame/machine/galaxold.c2
-rw-r--r--src/mame/machine/gaplus.c2
-rw-r--r--src/mame/machine/gdcrypt.c2
-rw-r--r--src/mame/machine/harddriv.c2
-rw-r--r--src/mame/machine/irem_cpu.c2
-rw-r--r--src/mame/machine/irobot.c2
-rw-r--r--src/mame/machine/jumpshot.c2
-rw-r--r--src/mame/machine/kabuki.c2
-rw-r--r--src/mame/machine/kaneko16.c2
-rw-r--r--src/mame/machine/konami1.c2
-rw-r--r--src/mame/machine/konamigx.c2
-rw-r--r--src/mame/machine/konppc.c2
-rw-r--r--src/mame/machine/leland.c2
-rw-r--r--src/mame/machine/lkage.c2
-rw-r--r--src/mame/machine/lsasquad.c2
-rw-r--r--src/mame/machine/m68kfmly.c2
-rw-r--r--src/mame/machine/maniach.c2
-rw-r--r--src/mame/machine/mathbox.c2
-rw-r--r--src/mame/machine/mc8123.c2
-rw-r--r--src/mame/machine/mcr.c2
-rw-r--r--src/mame/machine/meters.c2
-rw-r--r--src/mame/machine/mexico86.c2
-rw-r--r--src/mame/machine/mhavoc.c2
-rw-r--r--src/mame/machine/midtunit.c2
-rw-r--r--src/mame/machine/midwayic.c2
-rw-r--r--src/mame/machine/midwunit.c2
-rw-r--r--src/mame/machine/midyunit.c2
-rw-r--r--src/mame/machine/model1.c2
-rw-r--r--src/mame/machine/model3.c2
-rw-r--r--src/mame/machine/mw8080bw.c2
-rw-r--r--src/mame/machine/n64.c2
-rw-r--r--src/mame/machine/namco06.c2
-rw-r--r--src/mame/machine/namco50.c2
-rw-r--r--src/mame/machine/namco51.c2
-rw-r--r--src/mame/machine/namco53.c2
-rw-r--r--src/mame/machine/namcoio.c2
-rw-r--r--src/mame/machine/namcond1.c2
-rw-r--r--src/mame/machine/namcos1.c2
-rw-r--r--src/mame/machine/namcos2.c2
-rw-r--r--src/mame/machine/naomi.c2
-rw-r--r--src/mame/machine/naomibd.c3
-rw-r--r--src/mame/machine/nb1413m3.c2
-rw-r--r--src/mame/machine/neoboot.c2
-rw-r--r--src/mame/machine/neocrypt.c2
-rw-r--r--src/mame/machine/neoprot.c2
-rw-r--r--src/mame/machine/nitedrvr.c2
-rw-r--r--src/mame/machine/nmk004.c2
-rw-r--r--src/mame/machine/nmk112.c2
-rw-r--r--src/mame/machine/nycaptor.c2
-rw-r--r--src/mame/machine/opwolf.c2
-rw-r--r--src/mame/machine/pacplus.c2
-rw-r--r--src/mame/machine/pcecommn.c2
-rw-r--r--src/mame/machine/pckeybrd.c2
-rw-r--r--src/mame/machine/pcshare.c2
-rw-r--r--src/mame/machine/pgmcrypt.c2
-rw-r--r--src/mame/machine/pgmprot.c2
-rw-r--r--src/mame/machine/pitnrun.c2
-rw-r--r--src/mame/machine/playch10.c2
-rw-r--r--src/mame/machine/psx.c2
-rw-r--r--src/mame/machine/qix.c2
-rw-r--r--src/mame/machine/r2crypt.c2
-rw-r--r--src/mame/machine/rainbow.c2
-rw-r--r--src/mame/machine/retofinv.c2
-rw-r--r--src/mame/machine/s16fd.c2
-rw-r--r--src/mame/machine/s24fd.c2
-rw-r--r--src/mame/machine/scramble.c2
-rw-r--r--src/mame/machine/scudsp.c2
-rw-r--r--src/mame/machine/segacrpt.c2
-rw-r--r--src/mame/machine/segag80.c2
-rw-r--r--src/mame/machine/segaic16.c2
-rw-r--r--src/mame/machine/segas24.c2
-rw-r--r--src/mame/machine/segas32.c2
-rw-r--r--src/mame/machine/seibuspi.c2
-rw-r--r--src/mame/machine/seicop.c2
-rw-r--r--src/mame/machine/simpsons.c2
-rw-r--r--src/mame/machine/slapfght.c2
-rw-r--r--src/mame/machine/slapstic.c2
-rw-r--r--src/mame/machine/slikshot.c2
-rw-r--r--src/mame/machine/snes.c2
-rw-r--r--src/mame/machine/snescx4.c2
-rw-r--r--src/mame/machine/spisprit.c2
-rw-r--r--src/mame/machine/starwars.c2
-rw-r--r--src/mame/machine/steppers.c2
-rw-r--r--src/mame/machine/stfight.c2
-rw-r--r--src/mame/machine/stvcd.c3
-rw-r--r--src/mame/machine/stvprot.c2
-rw-r--r--src/mame/machine/subs.c2
-rw-r--r--src/mame/machine/system16.c2
-rw-r--r--src/mame/machine/tait8741.c2
-rw-r--r--src/mame/machine/taitoio.c2
-rw-r--r--src/mame/machine/taitosj.c2
-rw-r--r--src/mame/machine/tatsumi.c2
-rw-r--r--src/mame/machine/tecmosys.c2
-rw-r--r--src/mame/machine/theglobp.c2
-rw-r--r--src/mame/machine/ticket.c2
-rw-r--r--src/mame/machine/tnzs.c2
-rw-r--r--src/mame/machine/toaplan1.c2
-rw-r--r--src/mame/machine/twincobr.c2
-rw-r--r--src/mame/machine/tx1.c2
-rw-r--r--src/mame/machine/vertigo.c2
-rw-r--r--src/mame/machine/volfied.c2
-rw-r--r--src/mame/machine/vsnes.c2
-rw-r--r--src/mame/machine/williams.c2
-rw-r--r--src/mame/machine/wrally.c2
-rw-r--r--src/mame/machine/xevious.c2
-rw-r--r--src/mame/machine/znsec.c2
-rw-r--r--src/mame/machine/zs01.c2
-rw-r--r--src/mame/tiny.c2
-rw-r--r--src/mame/video/1942.c2
-rw-r--r--src/mame/video/1943.c2
-rw-r--r--src/mame/video/20pacgal.c2
-rw-r--r--src/mame/video/40love.c2
-rw-r--r--src/mame/video/4enraya.c2
-rw-r--r--src/mame/video/8080bw.c2
-rw-r--r--src/mame/video/88games.c2
-rw-r--r--src/mame/video/actfancr.c2
-rw-r--r--src/mame/video/aeroboto.c2
-rw-r--r--src/mame/video/aerofgt.c2
-rw-r--r--src/mame/video/airbustr.c2
-rw-r--r--src/mame/video/ajax.c2
-rw-r--r--src/mame/video/aliens.c2
-rw-r--r--src/mame/video/alpha68k.c2
-rw-r--r--src/mame/video/ambush.c2
-rw-r--r--src/mame/video/amiga.c2
-rw-r--r--src/mame/video/amigaaga.c2
-rw-r--r--src/mame/video/ampoker2.c2
-rw-r--r--src/mame/video/amspdwy.c2
-rw-r--r--src/mame/video/angelkds.c2
-rw-r--r--src/mame/video/antic.c2
-rw-r--r--src/mame/video/appoooh.c2
-rw-r--r--src/mame/video/aquarium.c2
-rw-r--r--src/mame/video/arabian.c2
-rw-r--r--src/mame/video/arcadecl.c2
-rw-r--r--src/mame/video/argus.c2
-rw-r--r--src/mame/video/arkanoid.c2
-rw-r--r--src/mame/video/armedf.c2
-rw-r--r--src/mame/video/artmagic.c2
-rw-r--r--src/mame/video/ashnojoe.c2
-rw-r--r--src/mame/video/asterix.c2
-rw-r--r--src/mame/video/astrocde.c2
-rw-r--r--src/mame/video/asuka.c2
-rw-r--r--src/mame/video/atari.c2
-rw-r--r--src/mame/video/atarifb.c2
-rw-r--r--src/mame/video/atarig1.c2
-rw-r--r--src/mame/video/atarig42.c2
-rw-r--r--src/mame/video/atarigt.c2
-rw-r--r--src/mame/video/atarigx2.c2
-rw-r--r--src/mame/video/atarimo.c2
-rw-r--r--src/mame/video/atarirle.c2
-rw-r--r--src/mame/video/atarisy1.c2
-rw-r--r--src/mame/video/atarisy2.c2
-rw-r--r--src/mame/video/atetris.c2
-rw-r--r--src/mame/video/attckufo.c2
-rw-r--r--src/mame/video/avgdvg.c2
-rw-r--r--src/mame/video/awpvid.c2
-rw-r--r--src/mame/video/aztarac.c2
-rw-r--r--src/mame/video/badlands.c2
-rw-r--r--src/mame/video/bagman.c2
-rw-r--r--src/mame/video/balsente.c2
-rw-r--r--src/mame/video/bankp.c2
-rw-r--r--src/mame/video/baraduke.c2
-rw-r--r--src/mame/video/batman.c2
-rw-r--r--src/mame/video/battlane.c2
-rw-r--r--src/mame/video/battlera.c2
-rw-r--r--src/mame/video/battlex.c2
-rw-r--r--src/mame/video/battlnts.c2
-rw-r--r--src/mame/video/bbusters.c2
-rw-r--r--src/mame/video/beathead.c2
-rw-r--r--src/mame/video/beezer.c2
-rw-r--r--src/mame/video/bfm_adr2.c2
-rw-r--r--src/mame/video/bfm_dm01.c2
-rw-r--r--src/mame/video/bigevglf.c2
-rw-r--r--src/mame/video/bigstrkb.c2
-rw-r--r--src/mame/video/bionicc.c2
-rw-r--r--src/mame/video/bishi.c2
-rw-r--r--src/mame/video/bking.c2
-rw-r--r--src/mame/video/bladestl.c2
-rw-r--r--src/mame/video/blktiger.c2
-rw-r--r--src/mame/video/blmbycar.c2
-rw-r--r--src/mame/video/blockade.c2
-rw-r--r--src/mame/video/blockhl.c2
-rw-r--r--src/mame/video/blockout.c2
-rw-r--r--src/mame/video/bloodbro.c2
-rw-r--r--src/mame/video/blstroid.c2
-rw-r--r--src/mame/video/blueprnt.c2
-rw-r--r--src/mame/video/bogeyman.c2
-rw-r--r--src/mame/video/bombjack.c2
-rw-r--r--src/mame/video/boogwing.c2
-rw-r--r--src/mame/video/bosco.c2
-rw-r--r--src/mame/video/bottom9.c2
-rw-r--r--src/mame/video/brkthru.c2
-rw-r--r--src/mame/video/bsktball.c2
-rw-r--r--src/mame/video/btime.c2
-rw-r--r--src/mame/video/btoads.c2
-rw-r--r--src/mame/video/bublbobl.c2
-rw-r--r--src/mame/video/buggychl.c2
-rw-r--r--src/mame/video/bwing.c2
-rw-r--r--src/mame/video/cabal.c2
-rw-r--r--src/mame/video/calomega.c2
-rw-r--r--src/mame/video/canyon.c2
-rw-r--r--src/mame/video/capbowl.c2
-rw-r--r--src/mame/video/carjmbre.c2
-rw-r--r--src/mame/video/carpolo.c2
-rw-r--r--src/mame/video/cave.c2
-rw-r--r--src/mame/video/cbasebal.c2
-rw-r--r--src/mame/video/cbuster.c2
-rw-r--r--src/mame/video/ccastles.c2
-rw-r--r--src/mame/video/cchasm.c2
-rw-r--r--src/mame/video/cclimber.c2
-rw-r--r--src/mame/video/centiped.c2
-rw-r--r--src/mame/video/chaknpop.c2
-rw-r--r--src/mame/video/champbas.c2
-rw-r--r--src/mame/video/changela.c2
-rw-r--r--src/mame/video/cheekyms.c2
-rw-r--r--src/mame/video/chqflag.c2
-rw-r--r--src/mame/video/cidelsa.c2
-rw-r--r--src/mame/video/cinemat.c2
-rw-r--r--src/mame/video/circus.c2
-rw-r--r--src/mame/video/circusc.c2
-rw-r--r--src/mame/video/cischeat.c2
-rw-r--r--src/mame/video/citycon.c2
-rw-r--r--src/mame/video/cloak.c2
-rw-r--r--src/mame/video/cloud9.c2
-rw-r--r--src/mame/video/clshroad.c2
-rw-r--r--src/mame/video/cninja.c2
-rw-r--r--src/mame/video/combatsc.c2
-rw-r--r--src/mame/video/commando.c2
-rw-r--r--src/mame/video/compgolf.c2
-rw-r--r--src/mame/video/contra.c2
-rw-r--r--src/mame/video/cop01.c2
-rw-r--r--src/mame/video/copsnrob.c2
-rw-r--r--src/mame/video/cosmic.c2
-rw-r--r--src/mame/video/cps1.c2
-rw-r--r--src/mame/video/crbaloon.c2
-rw-r--r--src/mame/video/crgolf.c2
-rw-r--r--src/mame/video/crimfght.c2
-rw-r--r--src/mame/video/crospang.c2
-rw-r--r--src/mame/video/crshrace.c2
-rw-r--r--src/mame/video/cvs.c2
-rw-r--r--src/mame/video/cyberbal.c2
-rw-r--r--src/mame/video/darius.c2
-rw-r--r--src/mame/video/darkmist.c2
-rw-r--r--src/mame/video/darkseal.c2
-rw-r--r--src/mame/video/dassault.c2
-rw-r--r--src/mame/video/dbz.c2
-rw-r--r--src/mame/video/dc.c4
-rw-r--r--src/mame/video/dcheese.c2
-rw-r--r--src/mame/video/dcon.c2
-rw-r--r--src/mame/video/dday.c2
-rw-r--r--src/mame/video/ddragon.c2
-rw-r--r--src/mame/video/ddragon3.c2
-rw-r--r--src/mame/video/ddrible.c2
-rw-r--r--src/mame/video/deadang.c2
-rw-r--r--src/mame/video/dec0.c2
-rw-r--r--src/mame/video/dec8.c2
-rw-r--r--src/mame/video/deco16ic.c2
-rw-r--r--src/mame/video/deco32.c2
-rw-r--r--src/mame/video/deco_mlc.c2
-rw-r--r--src/mame/video/decocass.c2
-rw-r--r--src/mame/video/deniam.c2
-rw-r--r--src/mame/video/dietgo.c2
-rw-r--r--src/mame/video/digdug.c2
-rw-r--r--src/mame/video/djboy.c2
-rw-r--r--src/mame/video/djmain.c2
-rw-r--r--src/mame/video/dkong.c2
-rw-r--r--src/mame/video/docastle.c2
-rw-r--r--src/mame/video/dogfgt.c2
-rw-r--r--src/mame/video/dooyong.c2
-rw-r--r--src/mame/video/dragrace.c2
-rw-r--r--src/mame/video/drgnmst.c2
-rw-r--r--src/mame/video/dribling.c2
-rw-r--r--src/mame/video/drmicro.c2
-rw-r--r--src/mame/video/dynax.c2
-rw-r--r--src/mame/video/dynduke.c2
-rw-r--r--src/mame/video/eolith.c2
-rw-r--r--src/mame/video/epos.c2
-rw-r--r--src/mame/video/eprom.c2
-rw-r--r--src/mame/video/equites.c2
-rw-r--r--src/mame/video/esd16.c2
-rw-r--r--src/mame/video/espial.c2
-rw-r--r--src/mame/video/esripsys.c2
-rw-r--r--src/mame/video/exedexes.c2
-rw-r--r--src/mame/video/exerion.c2
-rw-r--r--src/mame/video/exidy.c2
-rw-r--r--src/mame/video/exidy440.c2
-rw-r--r--src/mame/video/exprraid.c2
-rw-r--r--src/mame/video/exterm.c2
-rw-r--r--src/mame/video/exzisus.c2
-rw-r--r--src/mame/video/f1gp.c2
-rw-r--r--src/mame/video/fantland.c2
-rw-r--r--src/mame/video/fastfred.c2
-rw-r--r--src/mame/video/fastlane.c2
-rw-r--r--src/mame/video/fcombat.c2
-rw-r--r--src/mame/video/fgoal.c2
-rw-r--r--src/mame/video/finalizr.c2
-rw-r--r--src/mame/video/firetrap.c2
-rw-r--r--src/mame/video/firetrk.c2
-rw-r--r--src/mame/video/fitfight.c2
-rw-r--r--src/mame/video/flkatck.c2
-rw-r--r--src/mame/video/flower.c2
-rw-r--r--src/mame/video/flstory.c2
-rw-r--r--src/mame/video/foodf.c2
-rw-r--r--src/mame/video/freekick.c2
-rw-r--r--src/mame/video/fromanc2.c2
-rw-r--r--src/mame/video/fromance.c2
-rw-r--r--src/mame/video/funkybee.c2
-rw-r--r--src/mame/video/funkyjet.c2
-rw-r--r--src/mame/video/funworld.c2
-rw-r--r--src/mame/video/funybubl.c2
-rw-r--r--src/mame/video/fuukifg2.c2
-rw-r--r--src/mame/video/fuukifg3.c2
-rw-r--r--src/mame/video/gaelco.c2
-rw-r--r--src/mame/video/gaelco2.c2
-rw-r--r--src/mame/video/gaelco3d.c3
-rw-r--r--src/mame/video/gaiden.c2
-rw-r--r--src/mame/video/galaga.c2
-rw-r--r--src/mame/video/galastrm.c2
-rw-r--r--src/mame/video/galaxian.c2
-rw-r--r--src/mame/video/galaxold.c2
-rw-r--r--src/mame/video/galivan.c2
-rw-r--r--src/mame/video/galpani2.c2
-rw-r--r--src/mame/video/galpanic.c2
-rw-r--r--src/mame/video/galspnbl.c2
-rw-r--r--src/mame/video/gameplan.c2
-rw-r--r--src/mame/video/gaplus.c2
-rw-r--r--src/mame/video/gatron.c2
-rw-r--r--src/mame/video/gauntlet.c2
-rw-r--r--src/mame/video/gberet.c2
-rw-r--r--src/mame/video/gbusters.c2
-rw-r--r--src/mame/video/gcpinbal.c2
-rw-r--r--src/mame/video/genesis.c2
-rw-r--r--src/mame/video/gijoe.c2
-rw-r--r--src/mame/video/ginganin.c2
-rw-r--r--src/mame/video/gladiatr.c2
-rw-r--r--src/mame/video/glass.c2
-rw-r--r--src/mame/video/gng.c2
-rw-r--r--src/mame/video/goal92.c2
-rw-r--r--src/mame/video/goindol.c2
-rw-r--r--src/mame/video/goldstar.c2
-rw-r--r--src/mame/video/gomoku.c2
-rw-r--r--src/mame/video/gotcha.c2
-rw-r--r--src/mame/video/gottlieb.c2
-rw-r--r--src/mame/video/gotya.c2
-rw-r--r--src/mame/video/gradius3.c2
-rw-r--r--src/mame/video/grchamp.c2
-rw-r--r--src/mame/video/gridlee.c2
-rw-r--r--src/mame/video/groundfx.c2
-rw-r--r--src/mame/video/gstriker.c2
-rw-r--r--src/mame/video/gsword.c2
-rw-r--r--src/mame/video/gtia.c2
-rw-r--r--src/mame/video/gticlub.c2
-rw-r--r--src/mame/video/gumbo.c2
-rw-r--r--src/mame/video/gunbustr.c2
-rw-r--r--src/mame/video/gundealr.c2
-rw-r--r--src/mame/video/gunsmoke.c2
-rw-r--r--src/mame/video/gyruss.c2
-rw-r--r--src/mame/video/hanaawas.c2
-rw-r--r--src/mame/video/harddriv.c2
-rw-r--r--src/mame/video/hcastle.c2
-rw-r--r--src/mame/video/hd63484.c3
-rw-r--r--src/mame/video/hexa.c2
-rw-r--r--src/mame/video/hexion.c2
-rw-r--r--src/mame/video/higemaru.c2
-rw-r--r--src/mame/video/himesiki.c2
-rw-r--r--src/mame/video/hnayayoi.c2
-rw-r--r--src/mame/video/hng64.c4
-rw-r--r--src/mame/video/holeland.c2
-rw-r--r--src/mame/video/homedata.c2
-rw-r--r--src/mame/video/homerun.c2
-rw-r--r--src/mame/video/hyhoo.c2
-rw-r--r--src/mame/video/hyperspt.c2
-rw-r--r--src/mame/video/hyprduel.c2
-rw-r--r--src/mame/video/ikki.c2
-rw-r--r--src/mame/video/inufuku.c2
-rw-r--r--src/mame/video/iqblock.c2
-rw-r--r--src/mame/video/irobot.c2
-rw-r--r--src/mame/video/ironhors.c2
-rw-r--r--src/mame/video/itech32.c2
-rw-r--r--src/mame/video/itech8.c2
-rw-r--r--src/mame/video/jack.c2
-rw-r--r--src/mame/video/jackal.c2
-rw-r--r--src/mame/video/jaguar.c2
-rw-r--r--src/mame/video/jailbrek.c2
-rw-r--r--src/mame/video/jalblend.c2
-rw-r--r--src/mame/video/jedi.c2
-rw-r--r--src/mame/video/jpmimpct.c2
-rw-r--r--src/mame/video/kan_panb.c2
-rw-r--r--src/mame/video/kan_pand.c2
-rw-r--r--src/mame/video/kaneko16.c2
-rw-r--r--src/mame/video/kangaroo.c2
-rw-r--r--src/mame/video/karnov.c2
-rw-r--r--src/mame/video/kchamp.c2
-rw-r--r--src/mame/video/kickgoal.c2
-rw-r--r--src/mame/video/kingobox.c2
-rw-r--r--src/mame/video/klax.c2
-rw-r--r--src/mame/video/kncljoe.c2
-rw-r--r--src/mame/video/konamigx.c2
-rw-r--r--src/mame/video/konamiic.c2
-rw-r--r--src/mame/video/konicdev.c2
-rw-r--r--src/mame/video/kopunch.c2
-rw-r--r--src/mame/video/ksayakyu.c2
-rw-r--r--src/mame/video/kyugo.c2
-rw-r--r--src/mame/video/labyrunr.c2
-rw-r--r--src/mame/video/ladybug.c2
-rw-r--r--src/mame/video/ladyfrog.c2
-rw-r--r--src/mame/video/lasso.c2
-rw-r--r--src/mame/video/lastduel.c2
-rw-r--r--src/mame/video/lazercmd.c2
-rw-r--r--src/mame/video/legionna.c2
-rw-r--r--src/mame/video/leland.c2
-rw-r--r--src/mame/video/lemmings.c2
-rw-r--r--src/mame/video/lethal.c2
-rw-r--r--src/mame/video/lethalj.c2
-rw-r--r--src/mame/video/liberate.c2
-rw-r--r--src/mame/video/liberatr.c2
-rw-r--r--src/mame/video/lkage.c2
-rw-r--r--src/mame/video/lockon.c2
-rw-r--r--src/mame/video/lordgun.c2
-rw-r--r--src/mame/video/lsasquad.c2
-rw-r--r--src/mame/video/lucky74.c2
-rw-r--r--src/mame/video/lvcards.c2
-rw-r--r--src/mame/video/lwings.c2
-rw-r--r--src/mame/video/m10.c2
-rw-r--r--src/mame/video/m107.c2
-rw-r--r--src/mame/video/m52.c2
-rw-r--r--src/mame/video/m57.c2
-rw-r--r--src/mame/video/m58.c2
-rw-r--r--src/mame/video/m62.c2
-rw-r--r--src/mame/video/m72.c2
-rw-r--r--src/mame/video/m90.c2
-rw-r--r--src/mame/video/m92.c2
-rw-r--r--src/mame/video/macrossp.c2
-rw-r--r--src/mame/video/madalien.c2
-rw-r--r--src/mame/video/madmotor.c2
-rw-r--r--src/mame/video/magmax.c2
-rw-r--r--src/mame/video/mainevt.c2
-rw-r--r--src/mame/video/mainsnk.c2
-rw-r--r--src/mame/video/malzak.c2
-rw-r--r--src/mame/video/mappy.c2
-rw-r--r--src/mame/video/marineb.c2
-rw-r--r--src/mame/video/mario.c2
-rw-r--r--src/mame/video/markham.c2
-rw-r--r--src/mame/video/matmania.c2
-rw-r--r--src/mame/video/mayumi.c2
-rw-r--r--src/mame/video/mcatadv.c2
-rw-r--r--src/mame/video/mcr.c2
-rw-r--r--src/mame/video/mcr3.c2
-rw-r--r--src/mame/video/mcr68.c2
-rw-r--r--src/mame/video/meadows.c2
-rw-r--r--src/mame/video/megasys1.c2
-rw-r--r--src/mame/video/megazone.c2
-rw-r--r--src/mame/video/mermaid.c2
-rw-r--r--src/mame/video/metlclsh.c2
-rw-r--r--src/mame/video/metro.c2
-rw-r--r--src/mame/video/mexico86.c2
-rw-r--r--src/mame/video/midtunit.c2
-rw-r--r--src/mame/video/midvunit.c2
-rw-r--r--src/mame/video/midyunit.c2
-rw-r--r--src/mame/video/midzeus.c3
-rw-r--r--src/mame/video/midzeus2.c3
-rw-r--r--src/mame/video/mikie.c2
-rw-r--r--src/mame/video/mitchell.c2
-rw-r--r--src/mame/video/mjkjidai.c2
-rw-r--r--src/mame/video/mjsister.c2
-rw-r--r--src/mame/video/model1.c2
-rw-r--r--src/mame/video/model2.c3
-rw-r--r--src/mame/video/model3.c4
-rw-r--r--src/mame/video/mole.c2
-rw-r--r--src/mame/video/momoko.c2
-rw-r--r--src/mame/video/moo.c2
-rw-r--r--src/mame/video/mosaic.c2
-rw-r--r--src/mame/video/mouser.c2
-rw-r--r--src/mame/video/mrdo.c2
-rw-r--r--src/mame/video/mrflea.c2
-rw-r--r--src/mame/video/mrjong.c2
-rw-r--r--src/mame/video/ms32.c2
-rw-r--r--src/mame/video/msisaac.c2
-rw-r--r--src/mame/video/mugsmash.c2
-rw-r--r--src/mame/video/munchmo.c2
-rw-r--r--src/mame/video/mustache.c2
-rw-r--r--src/mame/video/mw8080bw.c2
-rw-r--r--src/mame/video/mystston.c2
-rw-r--r--src/mame/video/mystwarr.c2
-rw-r--r--src/mame/video/n64.c3
-rw-r--r--src/mame/video/n8080.c2
-rw-r--r--src/mame/video/namcofl.c2
-rw-r--r--src/mame/video/namcona1.c2
-rw-r--r--src/mame/video/namconb1.c2
-rw-r--r--src/mame/video/namcos1.c2
-rw-r--r--src/mame/video/namcos2.c2
-rw-r--r--src/mame/video/namcos21.c2
-rw-r--r--src/mame/video/namcos22.c3
-rw-r--r--src/mame/video/namcos86.c2
-rw-r--r--src/mame/video/naughtyb.c2
-rw-r--r--src/mame/video/nbmj8688.c2
-rw-r--r--src/mame/video/nbmj8891.c2
-rw-r--r--src/mame/video/nbmj8900.c2
-rw-r--r--src/mame/video/nbmj8991.c2
-rw-r--r--src/mame/video/nbmj9195.c2
-rw-r--r--src/mame/video/nemesis.c2
-rw-r--r--src/mame/video/neogeo.c2
-rw-r--r--src/mame/video/news.c2
-rw-r--r--src/mame/video/ninjakd2.c2
-rw-r--r--src/mame/video/ninjaw.c2
-rw-r--r--src/mame/video/nitedrvr.c2
-rw-r--r--src/mame/video/niyanpai.c2
-rw-r--r--src/mame/video/nmk16.c2
-rw-r--r--src/mame/video/nova2001.c2
-rw-r--r--src/mame/video/nycaptor.c2
-rw-r--r--src/mame/video/offtwall.c2
-rw-r--r--src/mame/video/ohmygod.c2
-rw-r--r--src/mame/video/ojankohs.c2
-rw-r--r--src/mame/video/oneshot.c2
-rw-r--r--src/mame/video/orbit.c2
-rw-r--r--src/mame/video/othldrby.c2
-rw-r--r--src/mame/video/othunder.c2
-rw-r--r--src/mame/video/overdriv.c2
-rw-r--r--src/mame/video/pacland.c2
-rw-r--r--src/mame/video/pacman.c2
-rw-r--r--src/mame/video/pandoras.c2
-rw-r--r--src/mame/video/paradise.c2
-rw-r--r--src/mame/video/parodius.c2
-rw-r--r--src/mame/video/pass.c2
-rw-r--r--src/mame/video/pastelg.c2
-rw-r--r--src/mame/video/pbaction.c2
-rw-r--r--src/mame/video/pcktgal.c2
-rw-r--r--src/mame/video/pgm.c2
-rw-r--r--src/mame/video/phoenix.c2
-rw-r--r--src/mame/video/pingpong.c2
-rw-r--r--src/mame/video/pirates.c2
-rw-r--r--src/mame/video/pitnrun.c2
-rw-r--r--src/mame/video/pk8000.c2
-rw-r--r--src/mame/video/pktgaldx.c2
-rw-r--r--src/mame/video/playch10.c2
-rw-r--r--src/mame/video/playmark.c2
-rw-r--r--src/mame/video/plygonet.c2
-rw-r--r--src/mame/video/pokechmp.c2
-rw-r--r--src/mame/video/polepos.c2
-rw-r--r--src/mame/video/policetr.c2
-rw-r--r--src/mame/video/polyplay.c2
-rw-r--r--src/mame/video/poolshrk.c2
-rw-r--r--src/mame/video/pooyan.c2
-rw-r--r--src/mame/video/popeye.c2
-rw-r--r--src/mame/video/popper.c2
-rw-r--r--src/mame/video/portrait.c2
-rw-r--r--src/mame/video/powerins.c2
-rw-r--r--src/mame/video/ppu2c0x.c2
-rw-r--r--src/mame/video/prehisle.c2
-rw-r--r--src/mame/video/psikyo.c2
-rw-r--r--src/mame/video/psikyo4.c2
-rw-r--r--src/mame/video/psikyosh.c2
-rw-r--r--src/mame/video/psx.c2
-rw-r--r--src/mame/video/psychic5.c2
-rw-r--r--src/mame/video/punchout.c2
-rw-r--r--src/mame/video/pushman.c2
-rw-r--r--src/mame/video/qdrmfgp.c2
-rw-r--r--src/mame/video/qix.c2
-rw-r--r--src/mame/video/quasar.c2
-rw-r--r--src/mame/video/quizdna.c2
-rw-r--r--src/mame/video/quizpani.c2
-rw-r--r--src/mame/video/raiden.c2
-rw-r--r--src/mame/video/rallyx.c2
-rw-r--r--src/mame/video/rampart.c2
-rw-r--r--src/mame/video/rastan.c2
-rw-r--r--src/mame/video/realbrk.c2
-rw-r--r--src/mame/video/redalert.c2
-rw-r--r--src/mame/video/redclash.c2
-rw-r--r--src/mame/video/relief.c2
-rw-r--r--src/mame/video/renegade.c2
-rw-r--r--src/mame/video/retofinv.c2
-rw-r--r--src/mame/video/rockrage.c2
-rw-r--r--src/mame/video/rocnrope.c2
-rw-r--r--src/mame/video/rohga.c2
-rw-r--r--src/mame/video/rollerg.c2
-rw-r--r--src/mame/video/rollrace.c2
-rw-r--r--src/mame/video/route16.c2
-rw-r--r--src/mame/video/rpunch.c2
-rw-r--r--src/mame/video/runaway.c2
-rw-r--r--src/mame/video/rungun.c2
-rw-r--r--src/mame/video/sauro.c2
-rw-r--r--src/mame/video/sbasketb.c2
-rw-r--r--src/mame/video/sbugger.c2
-rw-r--r--src/mame/video/scotrsht.c2
-rw-r--r--src/mame/video/sderby.c2
-rw-r--r--src/mame/video/segag80r.c2
-rw-r--r--src/mame/video/segag80v.c3
-rw-r--r--src/mame/video/segahang.c2
-rw-r--r--src/mame/video/segaic16.c2
-rw-r--r--src/mame/video/segaic24.c2
-rw-r--r--src/mame/video/segaorun.c2
-rw-r--r--src/mame/video/segas16a.c2
-rw-r--r--src/mame/video/segas16b.c2
-rw-r--r--src/mame/video/segas18.c2
-rw-r--r--src/mame/video/segas24.c2
-rw-r--r--src/mame/video/segas32.c2
-rw-r--r--src/mame/video/segaxbd.c2
-rw-r--r--src/mame/video/segaybd.c2
-rw-r--r--src/mame/video/sei_crtc.c2
-rw-r--r--src/mame/video/seibuspi.c2
-rw-r--r--src/mame/video/seicross.c2
-rw-r--r--src/mame/video/senjyo.c2
-rw-r--r--src/mame/video/seta.c2
-rw-r--r--src/mame/video/seta2.c2
-rw-r--r--src/mame/video/sf.c2
-rw-r--r--src/mame/video/shadfrce.c2
-rw-r--r--src/mame/video/shangha3.c2
-rw-r--r--src/mame/video/shangkid.c2
-rw-r--r--src/mame/video/shaolins.c2
-rw-r--r--src/mame/video/shisen.c2
-rw-r--r--src/mame/video/shootout.c2
-rw-r--r--src/mame/video/shuuz.c2
-rw-r--r--src/mame/video/sidearms.c2
-rw-r--r--src/mame/video/sidepckt.c2
-rw-r--r--src/mame/video/silkroad.c2
-rw-r--r--src/mame/video/simpl156.c2
-rw-r--r--src/mame/video/simpsons.c2
-rw-r--r--src/mame/video/skullxbo.c2
-rw-r--r--src/mame/video/skydiver.c2
-rw-r--r--src/mame/video/skyfox.c2
-rw-r--r--src/mame/video/skykid.c2
-rw-r--r--src/mame/video/skyraid.c2
-rw-r--r--src/mame/video/slapfght.c2
-rw-r--r--src/mame/video/slapshot.c2
-rw-r--r--src/mame/video/snes.c2
-rw-r--r--src/mame/video/snk.c2
-rw-r--r--src/mame/video/snk6502.c2
-rw-r--r--src/mame/video/snk68.c2
-rw-r--r--src/mame/video/snookr10.c2
-rw-r--r--src/mame/video/solomon.c2
-rw-r--r--src/mame/video/sonson.c2
-rw-r--r--src/mame/video/spacefb.c2
-rw-r--r--src/mame/video/spbactn.c2
-rw-r--r--src/mame/video/spcforce.c2
-rw-r--r--src/mame/video/spdodgeb.c2
-rw-r--r--src/mame/video/speedatk.c2
-rw-r--r--src/mame/video/speedbal.c2
-rw-r--r--src/mame/video/speedspn.c2
-rw-r--r--src/mame/video/splash.c2
-rw-r--r--src/mame/video/sprcros2.c2
-rw-r--r--src/mame/video/sprint2.c2
-rw-r--r--src/mame/video/sprint4.c2
-rw-r--r--src/mame/video/sprint8.c2
-rw-r--r--src/mame/video/spy.c2
-rw-r--r--src/mame/video/srmp2.c2
-rw-r--r--src/mame/video/srumbler.c2
-rw-r--r--src/mame/video/sshangha.c2
-rw-r--r--src/mame/video/sslam.c2
-rw-r--r--src/mame/video/ssozumo.c2
-rw-r--r--src/mame/video/sspeedr.c2
-rw-r--r--src/mame/video/ssrj.c2
-rw-r--r--src/mame/video/ssv.c2
-rw-r--r--src/mame/video/st0016.c2
-rw-r--r--src/mame/video/stactics.c2
-rw-r--r--src/mame/video/stadhero.c2
-rw-r--r--src/mame/video/starcrus.c2
-rw-r--r--src/mame/video/starfire.c2
-rw-r--r--src/mame/video/starshp1.c2
-rw-r--r--src/mame/video/stfight.c2
-rw-r--r--src/mame/video/stlforce.c2
-rw-r--r--src/mame/video/strnskil.c2
-rw-r--r--src/mame/video/stvvdp1.c2
-rw-r--r--src/mame/video/stvvdp2.c3
-rw-r--r--src/mame/video/subs.c2
-rw-r--r--src/mame/video/suna16.c2
-rw-r--r--src/mame/video/suna8.c2
-rw-r--r--src/mame/video/supbtime.c2
-rw-r--r--src/mame/video/superchs.c2
-rw-r--r--src/mame/video/superqix.c2
-rw-r--r--src/mame/video/suprloco.c2
-rw-r--r--src/mame/video/suprnova.c2
-rw-r--r--src/mame/video/suprridr.c2
-rw-r--r--src/mame/video/suprslam.c2
-rw-r--r--src/mame/video/surpratk.c2
-rw-r--r--src/mame/video/system1.c2
-rw-r--r--src/mame/video/system16.c2
-rw-r--r--src/mame/video/tagteam.c2
-rw-r--r--src/mame/video/tail2nos.c2
-rw-r--r--src/mame/video/taito_b.c2
-rw-r--r--src/mame/video/taito_f2.c2
-rw-r--r--src/mame/video/taito_f3.c2
-rw-r--r--src/mame/video/taito_h.c2
-rw-r--r--src/mame/video/taito_l.c2
-rw-r--r--src/mame/video/taito_o.c2
-rw-r--r--src/mame/video/taito_z.c2
-rw-r--r--src/mame/video/taitoair.c2
-rw-r--r--src/mame/video/taitoic.c2
-rw-r--r--src/mame/video/taitojc.c2
-rw-r--r--src/mame/video/taitosj.c2
-rw-r--r--src/mame/video/tank8.c2
-rw-r--r--src/mame/video/tankbatt.c2
-rw-r--r--src/mame/video/tankbust.c2
-rw-r--r--src/mame/video/taotaido.c2
-rw-r--r--src/mame/video/targeth.c2
-rw-r--r--src/mame/video/tatsumi.c2
-rw-r--r--src/mame/video/taxidrvr.c2
-rw-r--r--src/mame/video/tbowl.c2
-rw-r--r--src/mame/video/tceptor.c2
-rw-r--r--src/mame/video/tecmo.c2
-rw-r--r--src/mame/video/tecmo16.c2
-rw-r--r--src/mame/video/tehkanwc.c2
-rw-r--r--src/mame/video/terracre.c2
-rw-r--r--src/mame/video/tetrisp2.c2
-rw-r--r--src/mame/video/thedeep.c2
-rw-r--r--src/mame/video/thepit.c2
-rw-r--r--src/mame/video/thief.c2
-rw-r--r--src/mame/video/thoop2.c2
-rw-r--r--src/mame/video/thunderj.c2
-rw-r--r--src/mame/video/thunderx.c2
-rw-r--r--src/mame/video/tia.c2
-rw-r--r--src/mame/video/tiamc1.c2
-rw-r--r--src/mame/video/tigeroad.c2
-rw-r--r--src/mame/video/timelimt.c2
-rw-r--r--src/mame/video/timeplt.c2
-rw-r--r--src/mame/video/tmnt.c2
-rw-r--r--src/mame/video/tnzs.c2
-rw-r--r--src/mame/video/toaplan1.c2
-rw-r--r--src/mame/video/toaplan2.c2
-rw-r--r--src/mame/video/toki.c2
-rw-r--r--src/mame/video/toobin.c2
-rw-r--r--src/mame/video/topspeed.c2
-rw-r--r--src/mame/video/toypop.c2
-rw-r--r--src/mame/video/tp84.c2
-rw-r--r--src/mame/video/trackfld.c2
-rw-r--r--src/mame/video/travrusa.c2
-rw-r--r--src/mame/video/triplhnt.c2
-rw-r--r--src/mame/video/truco.c2
-rw-r--r--src/mame/video/trucocl.c2
-rw-r--r--src/mame/video/tryout.c2
-rw-r--r--src/mame/video/tsamurai.c2
-rw-r--r--src/mame/video/tubep.c2
-rw-r--r--src/mame/video/tumbleb.c2
-rw-r--r--src/mame/video/tumblep.c2
-rw-r--r--src/mame/video/tunhunt.c2
-rw-r--r--src/mame/video/turbo.c2
-rw-r--r--src/mame/video/tutankhm.c2
-rw-r--r--src/mame/video/twin16.c2
-rw-r--r--src/mame/video/twincobr.c2
-rw-r--r--src/mame/video/tx1.c2
-rw-r--r--src/mame/video/ultraman.c2
-rw-r--r--src/mame/video/ultratnk.c2
-rw-r--r--src/mame/video/undrfire.c2
-rw-r--r--src/mame/video/unico.c2
-rw-r--r--src/mame/video/usgames.c2
-rw-r--r--src/mame/video/vaportra.c2
-rw-r--r--src/mame/video/vastar.c2
-rw-r--r--src/mame/video/vball.c2
-rw-r--r--src/mame/video/vdc.c2
-rw-r--r--src/mame/video/vendetta.c2
-rw-r--r--src/mame/video/vertigo.c2
-rw-r--r--src/mame/video/vicdual.c2
-rw-r--r--src/mame/video/victory.c2
-rw-r--r--src/mame/video/videopin.c2
-rw-r--r--src/mame/video/vigilant.c2
-rw-r--r--src/mame/video/vindictr.c2
-rw-r--r--src/mame/video/volfied.c2
-rw-r--r--src/mame/video/vrender0.c2
-rw-r--r--src/mame/video/vsnes.c2
-rw-r--r--src/mame/video/vulgus.c2
-rw-r--r--src/mame/video/warpwarp.c2
-rw-r--r--src/mame/video/warriorb.c2
-rw-r--r--src/mame/video/wc90.c2
-rw-r--r--src/mame/video/wc90b.c2
-rw-r--r--src/mame/video/wecleman.c2
-rw-r--r--src/mame/video/welltris.c2
-rw-r--r--src/mame/video/wgp.c2
-rw-r--r--src/mame/video/williams.c2
-rw-r--r--src/mame/video/wiping.c2
-rw-r--r--src/mame/video/wiz.c2
-rw-r--r--src/mame/video/wolfpack.c2
-rw-r--r--src/mame/video/wrally.c2
-rw-r--r--src/mame/video/wwfsstar.c2
-rw-r--r--src/mame/video/wwfwfest.c2
-rw-r--r--src/mame/video/xain.c2
-rw-r--r--src/mame/video/xevious.c2
-rw-r--r--src/mame/video/xexex.c2
-rw-r--r--src/mame/video/xmen.c2
-rw-r--r--src/mame/video/xorworld.c2
-rw-r--r--src/mame/video/xxmissio.c2
-rw-r--r--src/mame/video/xybots.c2
-rw-r--r--src/mame/video/xyonix.c2
-rw-r--r--src/mame/video/ygv608.c2
-rw-r--r--src/mame/video/yiear.c2
-rw-r--r--src/mame/video/yunsun16.c2
-rw-r--r--src/mame/video/yunsung8.c2
-rw-r--r--src/mame/video/zac2650.c2
-rw-r--r--src/mame/video/zaccaria.c2
-rw-r--r--src/mame/video/zaxxon.c2
-rw-r--r--src/mame/video/zerozone.c2
-rw-r--r--src/mame/video/zodiack.c2
-rw-r--r--src/osd/osdmini/minimain.c2
-rw-r--r--src/osd/windows/d3d8intf.c2
-rw-r--r--src/osd/windows/d3d9intf.c2
-rw-r--r--src/osd/windows/debugwin.c2
-rw-r--r--src/osd/windows/drawd3d.c3
-rw-r--r--src/osd/windows/drawdd.c3
-rw-r--r--src/osd/windows/input.c2
-rw-r--r--src/osd/windows/output.c2
-rw-r--r--src/osd/windows/sound.c2
-rw-r--r--src/osd/windows/video.c5
-rw-r--r--src/osd/windows/window.c3
-rw-r--r--src/osd/windows/winmain.c2
2101 files changed, 2102 insertions, 2187 deletions
diff --git a/src/emu/audio/generic.c b/src/emu/audio/generic.c
index 5af690c797f..5c419fcd99f 100644
--- a/src/emu/audio/generic.c
+++ b/src/emu/audio/generic.c
@@ -9,8 +9,7 @@
***************************************************************************/
-#include "driver.h"
-#include "generic.h"
+#include "emu.h"
diff --git a/src/emu/cpu/i860/i860dis.c b/src/emu/cpu/i860/i860dis.c
index d5f2497b797..b454ee58ffc 100644
--- a/src/emu/cpu/i860/i860dis.c
+++ b/src/emu/cpu/i860/i860dis.c
@@ -15,7 +15,6 @@
#include "emu.h"
#include "i860.h"
-#include <string.h>
/* Macros for accessing register fields in instruction word. */
#define get_isrc1(bits) (((bits) >> 11) & 0x1f)
diff --git a/src/emu/cpu/m68000/m68kdasm.c b/src/emu/cpu/m68000/m68kdasm.c
index a190250a471..fbb61dbfe37 100644
--- a/src/emu/cpu/m68000/m68kdasm.c
+++ b/src/emu/cpu/m68000/m68kdasm.c
@@ -25,10 +25,6 @@
/* ================================ INCLUDES ============================== */
/* ======================================================================== */
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
#define m68ki_cpu_core void
#include "emu.h"
#include "m68000.h"
diff --git a/src/emu/cpu/pdp1/pdp1dasm.c b/src/emu/cpu/pdp1/pdp1dasm.c
index bd86e130db4..05e5e8eaac5 100644
--- a/src/emu/cpu/pdp1/pdp1dasm.c
+++ b/src/emu/cpu/pdp1/pdp1dasm.c
@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <string.h>
#include "emu.h"
#include "cpu/pdp1/pdp1.h"
diff --git a/src/emu/cpu/pdp1/tx0dasm.c b/src/emu/cpu/pdp1/tx0dasm.c
index 6d50c24a4ed..e05c35d6ec8 100644
--- a/src/emu/cpu/pdp1/tx0dasm.c
+++ b/src/emu/cpu/pdp1/tx0dasm.c
@@ -1,5 +1,3 @@
-#include <stdio.h>
-#include <string.h>
#include "emu.h"
#include "cpu/pdp1/tx0.h"
diff --git a/src/emu/debug/debugcon.c b/src/emu/debug/debugcon.c
index 00d95708d8e..203cb17bfe5 100644
--- a/src/emu/debug/debugcon.c
+++ b/src/emu/debug/debugcon.c
@@ -9,7 +9,7 @@
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "debugcon.h"
#include "debugcpu.h"
#include "debughlp.h"
diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index 519b00401f7..0f529e10ad1 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -15,8 +15,8 @@
*********************************************************************/
+#include "emu.h"
#include "osdepend.h"
-#include "driver.h"
#include "debugcpu.h"
#include "debugcmd.h"
#include "debugcmt.h"
diff --git a/src/emu/debug/debughlp.c b/src/emu/debug/debughlp.c
index e84bec5d575..1f7e1efd2f0 100644
--- a/src/emu/debug/debughlp.c
+++ b/src/emu/debug/debughlp.c
@@ -9,7 +9,7 @@
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "debughlp.h"
#include <ctype.h>
diff --git a/src/emu/debug/debugvw.c b/src/emu/debug/debugvw.c
index 2dd822c00ef..5b8ea3471fe 100644
--- a/src/emu/debug/debugvw.c
+++ b/src/emu/debug/debugvw.c
@@ -9,7 +9,7 @@
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "debugvw.h"
#include "debugcmd.h"
#include "debugcmt.h"
diff --git a/src/emu/drawgfx.c b/src/emu/drawgfx.c
index 3f4bde06098..ab771666494 100644
--- a/src/emu/drawgfx.c
+++ b/src/emu/drawgfx.c
@@ -11,7 +11,6 @@
#include "emu.h"
#include "drawgfxm.h"
-#include "drawgfx.h"
/***************************************************************************
diff --git a/src/emu/driver.h b/src/emu/driver.h
index 86bcbf9af7e..d755d995762 100644
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@@ -2,20 +2,19 @@
driver.h
- Include this with all MAME files. Includes all the core system pieces.
+ Definitions relating to game drivers.
Copyright Nicola Salmoria and the MAME Team.
Visit http://mamedev.org for licensing and usage restrictions.
***************************************************************************/
-// temporary: redirect #include "driver.h" to #include "emu.h"
-#ifndef __EMU_H__
-#include "emu.h"
-#else
-
#pragma once
+#ifndef __EMU_H__
+#error Dont include this file directly; include emu.h instead.
+#endif
+
#ifndef __DRIVER_H__
#define __DRIVER_H__
@@ -143,6 +142,4 @@ void driver_list_get_approx_matches(const game_driver * const driverlist[], cons
int driver_list_get_count(const game_driver * const driverlist[]);
-#endif /* __DRIVER_H__ */
-
#endif
diff --git a/src/emu/drivers/empty.c b/src/emu/drivers/empty.c
index 149262f223b..78b295378b3 100644
--- a/src/emu/drivers/empty.c
+++ b/src/emu/drivers/empty.c
@@ -9,7 +9,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "uimenu.h"
diff --git a/src/emu/emucore.h b/src/emu/emucore.h
index f802ed5a7b9..755df2bcb3f 100644
--- a/src/emu/emucore.h
+++ b/src/emu/emucore.h
@@ -268,35 +268,35 @@ class emu_fatalerror : public emu_exception
{
public:
emu_fatalerror(const char *format, ...)
- : m_exitcode(0)
+ : code(0)
{
va_list ap;
va_start(ap, format);
- sprintf(m_text, format, ap);
+ sprintf(text, format, ap);
va_end(ap);
- osd_break_into_debugger(m_text);
+ osd_break_into_debugger(text);
}
emu_fatalerror(const char *format, va_list ap)
- : m_exitcode(0)
+ : code(0)
{
- vsprintf(m_text, format, ap);
- osd_break_into_debugger(m_text);
+ vsprintf(text, format, ap);
+ osd_break_into_debugger(text);
}
emu_fatalerror(int _exitcode, const char *format, va_list ap)
- : m_exitcode(_exitcode)
+ : code(_exitcode)
{
- vsprintf(m_text, format, ap);
- osd_break_into_debugger(m_text);
+ vsprintf(text, format, ap);
+ osd_break_into_debugger(text);
}
- const char *string() const { return m_text; }
- int exitcode() const { return m_exitcode; }
+ const char *string() const { return text; }
+ int exitcode() const { return code; }
private:
- char m_text[1024];
- int m_exitcode;
+ char text[1024];
+ int code;
};
diff --git a/src/emu/fileio.c b/src/emu/fileio.c
index 53cc21cac08..07debd89215 100644
--- a/src/emu/fileio.c
+++ b/src/emu/fileio.c
@@ -10,7 +10,6 @@
***************************************************************************/
#include "emu.h"
-#include "osdepend.h"
#include "hash.h"
#include "unzip.h"
#include "options.h"
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index 6ab46545f22..63c0e0f1cc4 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -101,7 +101,6 @@
#include <ctype.h>
#include <time.h>
-#include <stdarg.h>
#ifdef MESS
#include "uimess.h"
diff --git a/src/emu/machine/53c810.c b/src/emu/machine/53c810.c
index 214e2818bed..2dcc0f938eb 100644
--- a/src/emu/machine/53c810.c
+++ b/src/emu/machine/53c810.c
@@ -1,6 +1,6 @@
/* LSI Logic LSI53C810A PCI to SCSI I/O Processor */
-#include "driver.h"
+#include "emu.h"
#include "53c810.h"
#define DMA_MAX_ICOUNT 512 /* Maximum number of DMA Scripts opcodes to run */
diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c
index d4e86647193..abc6db99bd4 100644
--- a/src/emu/machine/6522via.c
+++ b/src/emu/machine/6522via.c
@@ -22,7 +22,7 @@
timer init, reset, read changed
*/
-#include "driver.h"
+#include "emu.h"
#include "6522via.h"
diff --git a/src/emu/machine/6526cia.c b/src/emu/machine/6526cia.c
index d145b282ae7..61deda9d7a7 100644
--- a/src/emu/machine/6526cia.c
+++ b/src/emu/machine/6526cia.c
@@ -7,7 +7,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "6526cia.h"
diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c
index 4e6d14f6813..ad1c99146e3 100644
--- a/src/emu/machine/6532riot.c
+++ b/src/emu/machine/6532riot.c
@@ -11,7 +11,7 @@ The timer seems to follow these rules:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "6532riot.h"
diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c
index a7933ab8c2e..55d05b3611a 100644
--- a/src/emu/machine/6840ptm.c
+++ b/src/emu/machine/6840ptm.c
@@ -33,7 +33,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "6840ptm.h"
diff --git a/src/emu/machine/6850acia.c b/src/emu/machine/6850acia.c
index d68dac4c986..64f63c4e83b 100644
--- a/src/emu/machine/6850acia.c
+++ b/src/emu/machine/6850acia.c
@@ -6,8 +6,7 @@
*********************************************************************/
-#include "driver.h"
-#include "timer.h"
+#include "emu.h"
#include "6850acia.h"
diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c
index be9cf651242..1ff3124a61f 100644
--- a/src/emu/machine/68681.c
+++ b/src/emu/machine/68681.c
@@ -5,7 +5,7 @@
Updated by Jonathan Gevaryahu AKA Lord Nightmare
*/
-#include "driver.h"
+#include "emu.h"
#include "68681.h"
#define VERBOSE 1
diff --git a/src/emu/machine/74123.c b/src/emu/machine/74123.c
index 0c4f21fbe55..96c10d98101 100644
--- a/src/emu/machine/74123.c
+++ b/src/emu/machine/74123.c
@@ -6,7 +6,7 @@
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/74123.h"
#include "machine/rescap.h"
diff --git a/src/emu/machine/74148.c b/src/emu/machine/74148.c
index 4ed151e44d8..c600c6a9384 100644
--- a/src/emu/machine/74148.c
+++ b/src/emu/machine/74148.c
@@ -38,7 +38,7 @@
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/74148.h"
diff --git a/src/emu/machine/74153.c b/src/emu/machine/74153.c
index 982684d8db6..cc3af530962 100644
--- a/src/emu/machine/74153.c
+++ b/src/emu/machine/74153.c
@@ -33,7 +33,7 @@
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/74153.h"
diff --git a/src/emu/machine/74181.c b/src/emu/machine/74181.c
index 3d15e4241f1..18f41703922 100644
--- a/src/emu/machine/74181.c
+++ b/src/emu/machine/74181.c
@@ -5,7 +5,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "74181.h"
diff --git a/src/emu/machine/7474.c b/src/emu/machine/7474.c
index 195a27ea1cc..259230cea17 100644
--- a/src/emu/machine/7474.c
+++ b/src/emu/machine/7474.c
@@ -37,7 +37,7 @@
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "7474.h"
diff --git a/src/emu/machine/8042kbdc.c b/src/emu/machine/8042kbdc.c
index 60164f90f65..d7bfbd1723c 100644
--- a/src/emu/machine/8042kbdc.c
+++ b/src/emu/machine/8042kbdc.c
@@ -173,7 +173,7 @@
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "memconv.h"
#include "machine/pckeybrd.h"
diff --git a/src/emu/machine/8237dma.c b/src/emu/machine/8237dma.c
index 418e4221cfe..1f984878474 100644
--- a/src/emu/machine/8237dma.c
+++ b/src/emu/machine/8237dma.c
@@ -18,7 +18,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "memconv.h"
#include "8237dma.h"
diff --git a/src/emu/machine/8255ppi.c b/src/emu/machine/8255ppi.c
index d1b81c20994..53366a65eaa 100644
--- a/src/emu/machine/8255ppi.c
+++ b/src/emu/machine/8255ppi.c
@@ -90,7 +90,7 @@
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "8255ppi.h"
typedef struct _ppi8255 ppi8255_t;
diff --git a/src/emu/machine/8257dma.c b/src/emu/machine/8257dma.c
index afe857934fb..2a92d126fab 100644
--- a/src/emu/machine/8257dma.c
+++ b/src/emu/machine/8257dma.c
@@ -29,7 +29,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "memconv.h"
#include "8257dma.h"
diff --git a/src/emu/machine/adc083x.c b/src/emu/machine/adc083x.c
index 858b753aaea..2f29a0e1e76 100644
--- a/src/emu/machine/adc083x.c
+++ b/src/emu/machine/adc083x.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "adc083x.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/emu/machine/adc1038.c b/src/emu/machine/adc1038.c
index 1a12f6baa64..bb5ef3c90fa 100644
--- a/src/emu/machine/adc1038.c
+++ b/src/emu/machine/adc1038.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "adc1038.h"
/***************************************************************************
diff --git a/src/emu/machine/adc1213x.c b/src/emu/machine/adc1213x.c
index 65e6d163a69..fed2f8a6ac2 100644
--- a/src/emu/machine/adc1213x.c
+++ b/src/emu/machine/adc1213x.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "adc1213x.h"
diff --git a/src/emu/machine/am53cf96.c b/src/emu/machine/am53cf96.c
index d8423561b8a..3fe4aff5c83 100644
--- a/src/emu/machine/am53cf96.c
+++ b/src/emu/machine/am53cf96.c
@@ -9,7 +9,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "am53cf96.h"
static UINT8 scsi_regs[32], fifo[16], fptr = 0, xfer_state, last_id;
diff --git a/src/emu/machine/at28c16.c b/src/emu/machine/at28c16.c
index c2fa87dd5c6..52054f1426e 100644
--- a/src/emu/machine/at28c16.c
+++ b/src/emu/machine/at28c16.c
@@ -5,7 +5,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "machine/at28c16.h"
#define SIZE_DATA ( 0x800 )
diff --git a/src/emu/machine/cdp1852.c b/src/emu/machine/cdp1852.c
index 45ebb4ffdf6..275b3bdae22 100644
--- a/src/emu/machine/cdp1852.c
+++ b/src/emu/machine/cdp1852.c
@@ -7,7 +7,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cdp1852.h"
/***************************************************************************
diff --git a/src/emu/machine/cr589.c b/src/emu/machine/cr589.c
index 538bde46ea3..ed4a9ad00f1 100644
--- a/src/emu/machine/cr589.c
+++ b/src/emu/machine/cr589.c
@@ -3,7 +3,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "cr589.h"
typedef struct
diff --git a/src/emu/machine/ds1302.c b/src/emu/machine/ds1302.c
index 585c0b23b58..50c2b030453 100644
--- a/src/emu/machine/ds1302.c
+++ b/src/emu/machine/ds1302.c
@@ -20,7 +20,7 @@
************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "ds1302.h"
diff --git a/src/emu/machine/ds2401.c b/src/emu/machine/ds2401.c
index 502ab414f70..f20d5b2c63d 100644
--- a/src/emu/machine/ds2401.c
+++ b/src/emu/machine/ds2401.c
@@ -6,9 +6,7 @@
*
*/
-#include <stdarg.h>
-#include "driver.h"
-#include "state.h"
+#include "emu.h"
#include "machine/ds2401.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/emu/machine/ds2404.c b/src/emu/machine/ds2404.c
index 9c312e502ce..ad5b742d790 100644
--- a/src/emu/machine/ds2404.c
+++ b/src/emu/machine/ds2404.c
@@ -1,6 +1,6 @@
/* Dallas DS2404 RTC/NVRAM */
-#include "driver.h"
+#include "emu.h"
#include "ds2404.h"
#include <time.h>
diff --git a/src/emu/machine/eeprom.c b/src/emu/machine/eeprom.c
index 61182741b29..3b2c8d12324 100644
--- a/src/emu/machine/eeprom.c
+++ b/src/emu/machine/eeprom.c
@@ -3,7 +3,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "machine/eeprom.h"
#define VERBOSE 0
diff --git a/src/emu/machine/f3853.c b/src/emu/machine/f3853.c
index 825583d39de..238f29742af 100644
--- a/src/emu/machine/f3853.c
+++ b/src/emu/machine/f3853.c
@@ -5,7 +5,7 @@
databook found at www.freetradezone.com
*/
-#include "driver.h"
+#include "emu.h"
#include "f3853.h"
/*
diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c
index c5b58efd598..62cc0206f04 100644
--- a/src/emu/machine/generic.c
+++ b/src/emu/machine/generic.c
@@ -12,7 +12,6 @@
#include "emu.h"
#include "emuopts.h"
#include "config.h"
-#include "generic.h"
diff --git a/src/emu/machine/i2cmem.c b/src/emu/machine/i2cmem.c
index cc72ee8b268..decaf4bee73 100644
--- a/src/emu/machine/i2cmem.c
+++ b/src/emu/machine/i2cmem.c
@@ -20,7 +20,7 @@ Up to 4096 bytes can be addressed.
*/
-#include "driver.h"
+#include "emu.h"
#include "machine/i2cmem.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/emu/machine/i2cmemdev.c b/src/emu/machine/i2cmemdev.c
index bf6b78de061..e081c20b750 100644
--- a/src/emu/machine/i2cmemdev.c
+++ b/src/emu/machine/i2cmemdev.c
@@ -19,7 +19,7 @@ Up to 4096 bytes can be addressed.
*/
-#include "driver.h"
+#include "emu.h"
#include "machine/i2cmemdev.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/emu/machine/i8255a.c b/src/emu/machine/i8255a.c
index 0869b211bae..67f5aebbaaf 100644
--- a/src/emu/machine/i8255a.c
+++ b/src/emu/machine/i8255a.c
@@ -7,7 +7,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "i8255a.h"
/***************************************************************************
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 3bee7f7108c..90866e6dfee 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "idectrl.h"
#include "debugger.h"
diff --git a/src/emu/machine/intelfsh.c b/src/emu/machine/intelfsh.c
index 0c985c52f3c..66a96627573 100644
--- a/src/emu/machine/intelfsh.c
+++ b/src/emu/machine/intelfsh.c
@@ -11,7 +11,7 @@
as long as the game doesn't query the maker ID.
*/
-#include "driver.h"
+#include "emu.h"
#include "intelfsh.h"
enum
diff --git a/src/emu/machine/k033906.c b/src/emu/machine/k033906.c
index 3ea9739e3b4..44665bd26a7 100644
--- a/src/emu/machine/k033906.c
+++ b/src/emu/machine/k033906.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "k033906.h"
#include "video/voodoo.h"
diff --git a/src/emu/machine/k056230.c b/src/emu/machine/k056230.c
index fe55c4bbeab..96f48ddfa78 100644
--- a/src/emu/machine/k056230.c
+++ b/src/emu/machine/k056230.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "k056230.h"
/***************************************************************************
diff --git a/src/emu/machine/latch8.c b/src/emu/machine/latch8.c
index 0469583a34c..ed7ebb6041d 100644
--- a/src/emu/machine/latch8.c
+++ b/src/emu/machine/latch8.c
@@ -6,7 +6,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "memconv.h"
#include "sound/discrete.h"
#include "latch8.h"
diff --git a/src/emu/machine/mb14241.c b/src/emu/machine/mb14241.c
index d4e6dfd07e3..17019fcc184 100644
--- a/src/emu/machine/mb14241.c
+++ b/src/emu/machine/mb14241.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/mb14241.h"
typedef struct _mb14241_state mb14241_state;
diff --git a/src/emu/machine/mb3773.c b/src/emu/machine/mb3773.c
index 8539345ac88..826c2fa5214 100644
--- a/src/emu/machine/mb3773.c
+++ b/src/emu/machine/mb3773.c
@@ -13,7 +13,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "mb3773.h"
/***************************************************************************
diff --git a/src/emu/machine/mb87078.c b/src/emu/machine/mb87078.c
index 71c801959a8..b18b286adb9 100644
--- a/src/emu/machine/mb87078.c
+++ b/src/emu/machine/mb87078.c
@@ -68,7 +68,7 @@
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/mb87078.h"
typedef struct _mb87078_state mb87078_state;
diff --git a/src/emu/machine/mc146818.c b/src/emu/machine/mc146818.c
index d9aab406d12..7aba725f4d3 100644
--- a/src/emu/machine/mc146818.c
+++ b/src/emu/machine/mc146818.c
@@ -71,10 +71,10 @@
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "memconv.h"
-#include "machine/mc146818.h"
#include "coreutil.h"
+#include "machine/mc146818.h"
#define LOG_MC146818 0
diff --git a/src/emu/machine/microtch.c b/src/emu/machine/microtch.c
index 598321d67be..6e502054dc8 100644
--- a/src/emu/machine/microtch.c
+++ b/src/emu/machine/microtch.c
@@ -9,7 +9,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "microtch.h"
static struct
diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c
index 8327d6c4a1e..105e6d52efe 100644
--- a/src/emu/machine/msm6242.c
+++ b/src/emu/machine/msm6242.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/msm6242.h"
diff --git a/src/emu/machine/pc16552d.c b/src/emu/machine/pc16552d.c
index d37162840d9..b892b59ebce 100644
--- a/src/emu/machine/pc16552d.c
+++ b/src/emu/machine/pc16552d.c
@@ -5,7 +5,7 @@
Written by Ville Linde
*/
-#include "driver.h"
+#include "emu.h"
#include "pc16552d.h"
#define REG_RECV_BUFFER 0x0 // Read
diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c
index 4100fee8a02..13d7776e4a1 100644
--- a/src/emu/machine/pci.c
+++ b/src/emu/machine/pci.c
@@ -69,7 +69,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "devconv.h"
#include "machine/pci.h"
diff --git a/src/emu/machine/pd4990a.c b/src/emu/machine/pd4990a.c
index bee8f1d5542..08ca627db58 100644
--- a/src/emu/machine/pd4990a.c
+++ b/src/emu/machine/pd4990a.c
@@ -32,7 +32,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/pd4990a.h"
diff --git a/src/emu/machine/pic8259.c b/src/emu/machine/pic8259.c
index 935011ffff9..5e550b7c6be 100644
--- a/src/emu/machine/pic8259.c
+++ b/src/emu/machine/pic8259.c
@@ -11,7 +11,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/pic8259.h"
#define IRQ_COUNT 8
diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c
index 8d2f8f72a5d..8214146986e 100644
--- a/src/emu/machine/pit8253.c
+++ b/src/emu/machine/pit8253.c
@@ -18,7 +18,7 @@
*
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/pit8253.h"
diff --git a/src/emu/machine/roc10937.c b/src/emu/machine/roc10937.c
index 29bba9edf50..79e6c6e6660 100644
--- a/src/emu/machine/roc10937.c
+++ b/src/emu/machine/roc10937.c
@@ -5,7 +5,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "roc10937.h"
static struct
diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c
index 3b96704c916..9ff5785a827 100644
--- a/src/emu/machine/rp5h01.c
+++ b/src/emu/machine/rp5h01.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/rp5h01.h"
diff --git a/src/emu/machine/rtc65271.c b/src/emu/machine/rtc65271.c
index e30c94bdc9a..ab554994636 100644
--- a/src/emu/machine/rtc65271.c
+++ b/src/emu/machine/rtc65271.c
@@ -15,7 +15,7 @@
Raphael Nabet, 2003-2004
*/
-#include "driver.h"
+#include "emu.h"
#include "rtc65271.h"
static void field_interrupts(const device_config *device);
diff --git a/src/emu/machine/smc91c9x.c b/src/emu/machine/smc91c9x.c
index 8dab60f6271..4b7ad3bd260 100644
--- a/src/emu/machine/smc91c9x.c
+++ b/src/emu/machine/smc91c9x.c
@@ -11,7 +11,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "smc91c9x.h"
diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c
index 67f4b8a0bf5..94f716931d7 100644
--- a/src/emu/machine/timekpr.c
+++ b/src/emu/machine/timekpr.c
@@ -9,7 +9,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "machine/timekpr.h"
typedef struct
diff --git a/src/emu/machine/tmp68301.c b/src/emu/machine/tmp68301.c
index 6d216ac8354..25a0ea02148 100644
--- a/src/emu/machine/tmp68301.c
+++ b/src/emu/machine/tmp68301.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/tmp68301.h"
UINT16 *tmp68301_regs;
diff --git a/src/emu/machine/upd4701.c b/src/emu/machine/upd4701.c
index ad7c16525eb..b431e2627c0 100644
--- a/src/emu/machine/upd4701.c
+++ b/src/emu/machine/upd4701.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "upd4701.h"
/***************************************************************************
diff --git a/src/emu/machine/wd33c93.c b/src/emu/machine/wd33c93.c
index fbf845db0d9..194b4ed11e1 100644
--- a/src/emu/machine/wd33c93.c
+++ b/src/emu/machine/wd33c93.c
@@ -11,8 +11,7 @@
*
*/
-#include "driver.h"
-#include "state.h"
+#include "emu.h"
#include "wd33c93.h"
#define VERBOSE 0
diff --git a/src/emu/machine/x2212.c b/src/emu/machine/x2212.c
index 50a1dffeb57..06d29a40c7f 100644
--- a/src/emu/machine/x2212.c
+++ b/src/emu/machine/x2212.c
@@ -5,7 +5,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "machine/x2212.h"
#define SIZE_DATA ( 0x100 )
diff --git a/src/emu/machine/x76f041.c b/src/emu/machine/x76f041.c
index c54617a3db6..612a7dfe5cb 100644
--- a/src/emu/machine/x76f041.c
+++ b/src/emu/machine/x76f041.c
@@ -11,7 +11,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "machine/x76f041.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/emu/machine/x76f100.c b/src/emu/machine/x76f100.c
index 80c77d54b27..ccaab8063dc 100644
--- a/src/emu/machine/x76f100.c
+++ b/src/emu/machine/x76f100.c
@@ -9,7 +9,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "machine/x76f100.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c
index d85ed91589e..c16ad4773d1 100644
--- a/src/emu/machine/z80ctc.c
+++ b/src/emu/machine/z80ctc.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "z80ctc.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c
index a69a23d5433..ce11aee7f9e 100644
--- a/src/emu/machine/z80dma.c
+++ b/src/emu/machine/z80dma.c
@@ -21,7 +21,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "memconv.h"
#include "z80dma.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/emu/machine/z80pio.c b/src/emu/machine/z80pio.c
index 6643251b43a..129e7b2e74c 100644
--- a/src/emu/machine/z80pio.c
+++ b/src/emu/machine/z80pio.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "z80pio.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/emu/machine/z80sio.c b/src/emu/machine/z80sio.c
index 5f690d09d78..0df63d098d0 100644
--- a/src/emu/machine/z80sio.c
+++ b/src/emu/machine/z80sio.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "z80sio.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/emu/rendersw.c b/src/emu/rendersw.c
index 0cc49c1f585..670b68db9cd 100644
--- a/src/emu/rendersw.c
+++ b/src/emu/rendersw.c
@@ -59,7 +59,6 @@
#include "eminline.h"
#include "video/rgbutil.h"
#include "render.h"
-#include <math.h>
diff --git a/src/emu/romload.c b/src/emu/romload.c
index 7cd98447a69..ff48fe85347 100644
--- a/src/emu/romload.c
+++ b/src/emu/romload.c
@@ -11,7 +11,6 @@
#include "emu.h"
#include "emuopts.h"
-#include "osdepend.h"
#include "hash.h"
#include "png.h"
#include "harddisk.h"
diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c
index 88b76fcc4e3..398cfe723a7 100644
--- a/src/emu/sound/2203intf.c
+++ b/src/emu/sound/2203intf.c
@@ -1,4 +1,3 @@
-#include <math.h>
#include "emu.h"
#include "streams.h"
#include "2203intf.h"
diff --git a/src/emu/sound/aicadsp.c b/src/emu/sound/aicadsp.c
index e7332d8124b..8c5f6635995 100644
--- a/src/emu/sound/aicadsp.c
+++ b/src/emu/sound/aicadsp.c
@@ -1,4 +1,3 @@
-#include <math.h>
#include "emu.h"
#include "aica.h"
#include "aicadsp.h"
diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c
index 0e3db3535f4..5c60171e68e 100644
--- a/src/emu/sound/bsmt2000.c
+++ b/src/emu/sound/bsmt2000.c
@@ -11,8 +11,6 @@
***************************************************************************/
-#include <math.h>
-
#include "emu.h"
#include "streams.h"
#include "bsmt2000.h"
diff --git a/src/emu/sound/c140.c b/src/emu/sound/c140.c
index 7c37ab4b63e..8b34e9bdda8 100644
--- a/src/emu/sound/c140.c
+++ b/src/emu/sound/c140.c
@@ -43,7 +43,6 @@ Unmapped registers:
*/
-#include <math.h>
#include "emu.h"
#include "streams.h"
#include "c140.h"
diff --git a/src/emu/sound/sn76477.c b/src/emu/sound/sn76477.c
index 8c52b34576a..c50b9be6a7a 100644
--- a/src/emu/sound/sn76477.c
+++ b/src/emu/sound/sn76477.c
@@ -94,7 +94,6 @@
#if TEST_MODE
-#include "input.h"
static const sn76477_interface empty_interface =
{
diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c
index 1c4dc959cad..be425acc09d 100644
--- a/src/emu/video/generic.c
+++ b/src/emu/video/generic.c
@@ -9,8 +9,7 @@
*********************************************************************/
-#include "driver.h"
-#include "generic.h"
+#include "emu.h"
diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c
index 1ba45871490..ce0c9adc8be 100644
--- a/src/emu/video/mc6845.c
+++ b/src/emu/video/mc6845.c
@@ -22,7 +22,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "mc6845.h"
diff --git a/src/emu/video/poly.c b/src/emu/video/poly.c
index f6ff70959d3..2c63f1457bf 100644
--- a/src/emu/video/poly.c
+++ b/src/emu/video/poly.c
@@ -6,11 +6,8 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "poly.h"
-#include "eminline.h"
-#include "state.h"
-#include <math.h>
/***************************************************************************
diff --git a/src/emu/video/resnet.c b/src/emu/video/resnet.c
index 02e1befc779..51c1968e305 100644
--- a/src/emu/video/resnet.c
+++ b/src/emu/video/resnet.c
@@ -47,7 +47,7 @@
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "resnet.h"
#define VERBOSE 0
diff --git a/src/emu/video/rgbutil.c b/src/emu/video/rgbutil.c
index f0599cd16f6..62bb0283265 100644
--- a/src/emu/video/rgbutil.c
+++ b/src/emu/video/rgbutil.c
@@ -10,8 +10,7 @@
***************************************************************************/
-#include "driver.h"
-#include "eminline.h"
+#include "emu.h"
#include "rgbutil.h"
diff --git a/src/emu/video/s2636.c b/src/emu/video/s2636.c
index 801e7b337af..106fae6cb96 100644
--- a/src/emu/video/s2636.c
+++ b/src/emu/video/s2636.c
@@ -75,7 +75,7 @@
*************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/s2636.h"
/*************************************
diff --git a/src/emu/video/saa5050.c b/src/emu/video/saa5050.c
index 052c80bc7e2..2214ae92413 100644
--- a/src/emu/video/saa5050.c
+++ b/src/emu/video/saa5050.c
@@ -16,7 +16,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/saa5050.h"
#define SAA5050_DBLHI 0x0001
diff --git a/src/emu/video/tlc34076.c b/src/emu/video/tlc34076.c
index ccc49810e12..31aaa51bfe6 100644
--- a/src/emu/video/tlc34076.c
+++ b/src/emu/video/tlc34076.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "tlc34076.h"
static UINT8 local_paletteram[0x300];
diff --git a/src/emu/video/tms34061.c b/src/emu/video/tms34061.c
index 68d3291419d..29fc784b3e9 100644
--- a/src/emu/video/tms34061.c
+++ b/src/emu/video/tms34061.c
@@ -10,7 +10,7 @@
* *
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "tms34061.h"
diff --git a/src/emu/video/tms9927.c b/src/emu/video/tms9927.c
index 8b665aa8b9c..892652ea2b1 100644
--- a/src/emu/video/tms9927.c
+++ b/src/emu/video/tms9927.c
@@ -7,7 +7,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "tms9927.h"
diff --git a/src/emu/video/tms9928a.c b/src/emu/video/tms9928a.c
index ff8f165cb23..d0eb541e8cc 100644
--- a/src/emu/video/tms9928a.c
+++ b/src/emu/video/tms9928a.c
@@ -45,7 +45,7 @@
** - Colours are incorrect. [fixed by R Nabet ?]
*/
-#include "driver.h"
+#include "emu.h"
#include "tms9928a.h"
diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c
index e7a171827fd..3e885050eab 100644
--- a/src/emu/video/v9938.c
+++ b/src/emu/video/v9938.c
@@ -14,7 +14,7 @@
- make vdp engine work in exp. ram
*/
-#include "driver.h"
+#include "emu.h"
#include "v9938.h"
#define VERBOSE 0
diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c
index 0d746043c0a..b7fae6d24e6 100644
--- a/src/emu/video/voodoo.c
+++ b/src/emu/video/voodoo.c
@@ -134,8 +134,7 @@ bits(7:4) and bit(24)), X, and Y:
#ifndef EXPAND_RASTERIZERS
#define EXPAND_RASTERIZERS
-#include "driver.h"
-#include "eminline.h"
+#include "emu.h"
#include "profiler.h"
#include "video/poly.h"
#include "video/rgbutil.h"
diff --git a/src/ldplayer/ldpdriv.c b/src/ldplayer/ldpdriv.c
index 1ded58502e6..8142ffc7bb9 100644
--- a/src/ldplayer/ldpdriv.c
+++ b/src/ldplayer/ldpdriv.c
@@ -17,7 +17,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#ifndef DRIVER_RECURSIVE
diff --git a/src/ldplayer/ldplayer.c b/src/ldplayer/ldplayer.c
index 258addf33f1..2706b10adeb 100644
--- a/src/ldplayer/ldplayer.c
+++ b/src/ldplayer/ldplayer.c
@@ -9,7 +9,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "uimenu.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/laserdsc.h"
diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c
index 0e92ba8292d..a8a97555392 100644
--- a/src/mame/audio/8080bw.c
+++ b/src/mame/audio/8080bw.c
@@ -1,6 +1,6 @@
/* 8080bw.c *******************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "sound/sn76477.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/amiga.c b/src/mame/audio/amiga.c
index b4038a0a10f..aec48a4f90d 100644
--- a/src/mame/audio/amiga.c
+++ b/src/mame/audio/amiga.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/amiga.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/audio/asteroid.c b/src/mame/audio/asteroid.c
index 623c39780a8..5927d192052 100644
--- a/src/mame/audio/asteroid.c
+++ b/src/mame/audio/asteroid.c
@@ -4,8 +4,7 @@
*
*****************************************************************************/
-#include <math.h>
-#include "driver.h"
+#include "emu.h"
#include "sound/discrete.h"
#include "includes/asteroid.h"
diff --git a/src/mame/audio/astrof.c b/src/mame/audio/astrof.c
index 81f1ab16a6f..94b774bf963 100644
--- a/src/mame/audio/astrof.c
+++ b/src/mame/audio/astrof.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "sound/sn76477.h"
#include "includes/astrof.h"
diff --git a/src/mame/audio/atarifb.c b/src/mame/audio/atarifb.c
index 5aa2ab6c0ba..05c508a8509 100644
--- a/src/mame/audio/atarifb.c
+++ b/src/mame/audio/atarifb.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/atarifb.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index 7793d3a2cdc..637d5744c0e 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -30,7 +30,7 @@ Static Program ROM (48K bytes) 4000-FFFF R D0-D7
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/tms5220.h"
#include "sound/2151intf.h"
diff --git a/src/mame/audio/attckufo.c b/src/mame/audio/attckufo.c
index 9330ee29728..e338cf557fa 100644
--- a/src/mame/audio/attckufo.c
+++ b/src/mame/audio/attckufo.c
@@ -5,8 +5,8 @@
PeT mess@utanet.at
***************************************************************************/
-#include <math.h>
-#include "driver.h"
+
+#include "emu.h"
#include "streams.h"
#include "includes/attckufo.h"
diff --git a/src/mame/audio/avalnche.c b/src/mame/audio/avalnche.c
index 4756a7871a8..5145e9c5fd5 100644
--- a/src/mame/audio/avalnche.c
+++ b/src/mame/audio/avalnche.c
@@ -3,7 +3,7 @@
audio\avalnche.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/avalnche.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/aztarac.c b/src/mame/audio/aztarac.c
index c8930199097..87628ad5a90 100644
--- a/src/mame/audio/aztarac.c
+++ b/src/mame/audio/aztarac.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/aztarac.h"
diff --git a/src/mame/audio/blockade.c b/src/mame/audio/blockade.c
index a28c42c53ce..2f73816519e 100644
--- a/src/mame/audio/blockade.c
+++ b/src/mame/audio/blockade.c
@@ -1,5 +1,5 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/blockade.h"
#include "sound/discrete.h"
#include "sound/samples.h"
diff --git a/src/mame/audio/bsktball.c b/src/mame/audio/bsktball.c
index 5d8556bed92..382f35ebeef 100644
--- a/src/mame/audio/bsktball.c
+++ b/src/mame/audio/bsktball.c
@@ -3,7 +3,7 @@
audio\bsktball.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/bsktball.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/bzone.c b/src/mame/audio/bzone.c
index 53e066cb070..20e17ea91be 100644
--- a/src/mame/audio/bzone.c
+++ b/src/mame/audio/bzone.c
@@ -17,8 +17,7 @@ D0 explosion enable gates a noise generator
*/
-#include <math.h>
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/bzone.h"
diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c
index e1a9ec0c54e..8c514e251d9 100644
--- a/src/mame/audio/cage.c
+++ b/src/mame/audio/cage.c
@@ -9,7 +9,7 @@
#define LOG_32031_IOPORTS (0)
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms32031/tms32031.h"
#include "sound/dmadac.h"
#include "cage.h"
diff --git a/src/mame/audio/canyon.c b/src/mame/audio/canyon.c
index 932c472bb47..5e19f6b56dd 100644
--- a/src/mame/audio/canyon.c
+++ b/src/mame/audio/canyon.c
@@ -3,7 +3,7 @@
audio\canyon.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/canyon.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index de52230aba3..1d5fd793b43 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -36,7 +36,7 @@
/* */
/*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/ay8910.h"
#include "sound/samples.h"
diff --git a/src/mame/audio/cchasm.c b/src/mame/audio/cchasm.c
index a321c44d1b4..5d1ea24f94f 100644
--- a/src/mame/audio/cchasm.c
+++ b/src/mame/audio/cchasm.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "cpu/z80/z80.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/audio/cclimber.c b/src/mame/audio/cclimber.c
index 0a0b1fe0f0a..b212ac6c379 100644
--- a/src/mame/audio/cclimber.c
+++ b/src/mame/audio/cclimber.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "sound/ay8910.h"
#include "sound/samples.h"
#include "includes/cclimber.h"
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index 9627a38b134..953d3dcc010 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -16,7 +16,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/ccpu/ccpu.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/audio/circus.c b/src/mame/audio/circus.c
index 672185019f6..02bc9966b78 100644
--- a/src/mame/audio/circus.c
+++ b/src/mame/audio/circus.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "includes/circus.h"
diff --git a/src/mame/audio/cliffhgr.c b/src/mame/audio/cliffhgr.c
index 9df92f0457e..6be5869eda8 100644
--- a/src/mame/audio/cliffhgr.c
+++ b/src/mame/audio/cliffhgr.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "sound/discrete.h"
#define CLIFF_ENABLE_SND_1 NODE_01
diff --git a/src/mame/audio/cps3.c b/src/mame/audio/cps3.c
index e98a137ce91..e684e2eb0de 100644
--- a/src/mame/audio/cps3.c
+++ b/src/mame/audio/cps3.c
@@ -3,7 +3,7 @@
Capcom CPS-3 Sound Hardware
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/cps3.h"
diff --git a/src/mame/audio/crbaloon.c b/src/mame/audio/crbaloon.c
index 5a6a1809b37..6910caf740e 100644
--- a/src/mame/audio/crbaloon.c
+++ b/src/mame/audio/crbaloon.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/crbaloon.h"
#include "sound/sn76477.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c
index cbb0f03ec27..ad8d4fcc756 100644
--- a/src/mame/audio/cyberbal.c
+++ b/src/mame/audio/cyberbal.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/dac.h"
#include "sound/2151intf.h"
#include "machine/atarigen.h"
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index b447ba5dd07..44869f6e6dd 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -149,7 +149,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/adsp2100/adsp2100.h"
#include "dcs.h"
#include "sound/dmadac.h"
diff --git a/src/mame/audio/depthch.c b/src/mame/audio/depthch.c
index 4458dd61001..041dc31c942 100644
--- a/src/mame/audio/depthch.c
+++ b/src/mame/audio/depthch.c
@@ -2,7 +2,7 @@
* Depth Charge audio routines
*/
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "includes/vicdual.h"
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index 1b020a78821..661a4d5e177 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "cpu/m6502/m6502.h"
#include "sound/nes_apu.h"
diff --git a/src/mame/audio/dragrace.c b/src/mame/audio/dragrace.c
index 0c6246103d3..4494cdca723 100644
--- a/src/mame/audio/dragrace.c
+++ b/src/mame/audio/dragrace.c
@@ -3,7 +3,7 @@
audio\dragrace.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/dragrace.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index 840c1d49337..a264c4c914d 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/rescap.h"
#include "streams.h"
diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c
index 4c32d7e669e..88de303e3b3 100644
--- a/src/mame/audio/exidy440.c
+++ b/src/mame/audio/exidy440.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "streams.h"
#include "includes/exidy440.h"
diff --git a/src/mame/audio/firetrk.c b/src/mame/audio/firetrk.c
index 43f25ae7957..b68f5411c55 100644
--- a/src/mame/audio/firetrk.c
+++ b/src/mame/audio/firetrk.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/firetrk.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/flower.c b/src/mame/audio/flower.c
index 6ade6689322..d818b1a86f1 100644
--- a/src/mame/audio/flower.c
+++ b/src/mame/audio/flower.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/flower.h"
diff --git a/src/mame/audio/galaga.c b/src/mame/audio/galaga.c
index 803a9439663..0293e2f56f5 100644
--- a/src/mame/audio/galaga.c
+++ b/src/mame/audio/galaga.c
@@ -3,7 +3,7 @@
Sound handler
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "namco52.h"
#include "namco54.h"
#include "includes/galaga.h"
diff --git a/src/mame/audio/galaxian.c b/src/mame/audio/galaxian.c
index ef914fe5808..eed536b7e75 100644
--- a/src/mame/audio/galaxian.c
+++ b/src/mame/audio/galaxian.c
@@ -20,7 +20,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/galaxian.h"
diff --git a/src/mame/audio/geebee.c b/src/mame/audio/geebee.c
index b19085161ad..6640986008d 100644
--- a/src/mame/audio/geebee.c
+++ b/src/mame/audio/geebee.c
@@ -7,8 +7,7 @@
*
****************************************************************************/
-#include <math.h>
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/warpwarp.h"
diff --git a/src/mame/audio/gomoku.c b/src/mame/audio/gomoku.c
index 9bdda0d7bc5..74165d06418 100644
--- a/src/mame/audio/gomoku.c
+++ b/src/mame/audio/gomoku.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/gomoku.h"
diff --git a/src/mame/audio/gorf.c b/src/mame/audio/gorf.c
index 2671f0bf0ae..4c7acba9b90 100644
--- a/src/mame/audio/gorf.c
+++ b/src/mame/audio/gorf.c
@@ -17,7 +17,7 @@ gorf_sh_ update- Null
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/samples.h"
#include "includes/astrocde.h"
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index 9161c600dec..64addf15578 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -5,7 +5,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "debugger.h"
#include "cpu/m6502/m6502.h"
#include "machine/6532riot.h"
diff --git a/src/mame/audio/gotya.c b/src/mame/audio/gotya.c
index 141466340cc..77afd0681ad 100644
--- a/src/mame/audio/gotya.c
+++ b/src/mame/audio/gotya.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "includes/gotya.h"
diff --git a/src/mame/audio/grchamp.c b/src/mame/audio/grchamp.c
index 94388f3e99c..afe875788c0 100644
--- a/src/mame/audio/grchamp.c
+++ b/src/mame/audio/grchamp.c
@@ -3,7 +3,7 @@
audio\grchamp.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/grchamp.h"
diff --git a/src/mame/audio/gridlee.c b/src/mame/audio/gridlee.c
index dd20f8b695f..7603341afc3 100644
--- a/src/mame/audio/gridlee.c
+++ b/src/mame/audio/gridlee.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/gridlee.h"
#include "sound/samples.h"
diff --git a/src/mame/audio/harddriv.c b/src/mame/audio/harddriv.c
index 3c08ddadaf3..71d3d9dbe17 100644
--- a/src/mame/audio/harddriv.c
+++ b/src/mame/audio/harddriv.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms32010/tms32010.h"
#include "sound/dac.h"
#include "machine/atarigen.h"
diff --git a/src/mame/audio/hitme.c b/src/mame/audio/hitme.c
index 15b632cd06f..a4e6bc5e97e 100644
--- a/src/mame/audio/hitme.c
+++ b/src/mame/audio/hitme.c
@@ -3,7 +3,7 @@
audio\hitme.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/hitme.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/invinco.c b/src/mame/audio/invinco.c
index e5c1cb2adbf..3c1d27bbe81 100644
--- a/src/mame/audio/invinco.c
+++ b/src/mame/audio/invinco.c
@@ -2,7 +2,7 @@
* Invinco sound routines
*/
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "includes/vicdual.h"
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index de737d7d93c..236361314af 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "sound/ay8910.h"
#include "sound/msm5205.h"
diff --git a/src/mame/audio/jaguar.c b/src/mame/audio/jaguar.c
index 7f6e630d763..aee2d9a023b 100644
--- a/src/mame/audio/jaguar.c
+++ b/src/mame/audio/jaguar.c
@@ -142,7 +142,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "memconv.h"
#include "includes/jaguar.h"
#include "cpu/jaguar/jaguar.h"
diff --git a/src/mame/audio/jedi.c b/src/mame/audio/jedi.c
index 665b516b696..f0bfddacfbf 100644
--- a/src/mame/audio/jedi.c
+++ b/src/mame/audio/jedi.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/tms5220.h"
#include "sound/pokey.h"
diff --git a/src/mame/audio/laserbat.c b/src/mame/audio/laserbat.c
index 59a4dcb3e67..84880f3cca8 100644
--- a/src/mame/audio/laserbat.c
+++ b/src/mame/audio/laserbat.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "sound/sn76477.h"
#include "sound/tms3615.h"
#include "includes/laserbat.h"
diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c
index eddbb27c1da..3341f3f376f 100644
--- a/src/mame/audio/leland.c
+++ b/src/mame/audio/leland.c
@@ -77,7 +77,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "cpu/i86/i86.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/audio/llander.c b/src/mame/audio/llander.c
index e34f9ba5806..0c5f67b80be 100644
--- a/src/mame/audio/llander.c
+++ b/src/mame/audio/llander.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/asteroid.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/m72.c b/src/mame/audio/m72.c
index 1b0895a5781..608ed6e3f50 100644
--- a/src/mame/audio/m72.c
+++ b/src/mame/audio/m72.c
@@ -41,7 +41,7 @@ Shisensho II 1993 Rev 3.34 M81 Yes
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/dac.h"
#include "m72.h"
diff --git a/src/mame/audio/m79amb.c b/src/mame/audio/m79amb.c
index 2d987212b27..d40726d79a9 100644
--- a/src/mame/audio/m79amb.c
+++ b/src/mame/audio/m79amb.c
@@ -3,7 +3,7 @@
* Nov 2008, Derrick Renaud
************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/m79amb.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/madalien.c b/src/mame/audio/madalien.c
index 476777ed257..45997f39bff 100644
--- a/src/mame/audio/madalien.c
+++ b/src/mame/audio/madalien.c
@@ -3,7 +3,7 @@
* Aug 2008, Derrick Renaud
************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/madalien.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 278346bb97d..c9225373454 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -1,4 +1,4 @@
-#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/audio/mcr.c b/src/mame/audio/mcr.c
index dee24223c7d..f9e0f3c9eb7 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6800/m6800.h"
diff --git a/src/mame/audio/meadows.c b/src/mame/audio/meadows.c
index 8b004949b02..66d95311a71 100644
--- a/src/mame/audio/meadows.c
+++ b/src/mame/audio/meadows.c
@@ -6,7 +6,7 @@
J. Buchmueller, June '98
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "includes/meadows.h"
#include "sound/samples.h"
diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c
index 3b31ec7c48d..9471bfd460f 100644
--- a/src/mame/audio/mw8080bw.c
+++ b/src/mame/audio/mw8080bw.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "sound/sn76477.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index a12f9892c1f..6674255be37 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/sn76477.h"
#include "sound/dac.h"
diff --git a/src/mame/audio/namco52.c b/src/mame/audio/namco52.c
index a100c438f78..062836dbc49 100644
--- a/src/mame/audio/namco52.c
+++ b/src/mame/audio/namco52.c
@@ -45,7 +45,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "namco52.h"
#include "cpu/mb88xx/mb88xx.h"
diff --git a/src/mame/audio/namco54.c b/src/mame/audio/namco54.c
index 368e874a840..162c53c0929 100644
--- a/src/mame/audio/namco54.c
+++ b/src/mame/audio/namco54.c
@@ -47,7 +47,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "namco54.h"
#include "cpu/mb88xx/mb88xx.h"
diff --git a/src/mame/audio/namcoc7x.c b/src/mame/audio/namcoc7x.c
index a78b751b673..7be79ae6d3c 100644
--- a/src/mame/audio/namcoc7x.c
+++ b/src/mame/audio/namcoc7x.c
@@ -26,7 +26,7 @@
Thanks to Cync and Cap for invaluable assistance.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m37710/m37710.h"
#include "deprecat.h"
#include "audio/namcoc7x.h"
diff --git a/src/mame/audio/nitedrvr.c b/src/mame/audio/nitedrvr.c
index b67ed64d8e4..7537b2cb9bd 100644
--- a/src/mame/audio/nitedrvr.c
+++ b/src/mame/audio/nitedrvr.c
@@ -3,7 +3,7 @@
audio\nitedrvr.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nitedrvr.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/norautp.c b/src/mame/audio/norautp.c
index 41872edca0c..9e6f7a20308 100644
--- a/src/mame/audio/norautp.c
+++ b/src/mame/audio/norautp.c
@@ -3,7 +3,7 @@
* Sept 2009, Derrick Renaud & Roberto Fresca.
************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/norautp.h"
diff --git a/src/mame/audio/orbit.c b/src/mame/audio/orbit.c
index 333e32abd08..dab18b308db 100644
--- a/src/mame/audio/orbit.c
+++ b/src/mame/audio/orbit.c
@@ -3,7 +3,7 @@
audio\orbit.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/orbit.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/phoenix.c b/src/mame/audio/phoenix.c
index f6cfb2fc555..6366313fdc9 100644
--- a/src/mame/audio/phoenix.c
+++ b/src/mame/audio/phoenix.c
@@ -8,7 +8,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "sound/tms36xx.h"
#include "includes/phoenix.h"
diff --git a/src/mame/audio/pleiads.c b/src/mame/audio/pleiads.c
index b7844a4c51e..e4e4c3f4f7f 100644
--- a/src/mame/audio/pleiads.c
+++ b/src/mame/audio/pleiads.c
@@ -6,7 +6,7 @@
* Juergen Buchmueller <pullmoll@t-online.de>
*
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "sound/tms36xx.h"
#include "includes/phoenix.h"
diff --git a/src/mame/audio/polepos.c b/src/mame/audio/polepos.c
index 2a64ecdd1f0..a878d609b1d 100644
--- a/src/mame/audio/polepos.c
+++ b/src/mame/audio/polepos.c
@@ -2,7 +2,7 @@
polepos.c
Sound handler
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "sound/filter.h"
#include "machine/rescap.h"
diff --git a/src/mame/audio/polyplay.c b/src/mame/audio/polyplay.c
index 6ec04b3868f..7d1b0b6bed2 100644
--- a/src/mame/audio/polyplay.c
+++ b/src/mame/audio/polyplay.c
@@ -9,8 +9,7 @@
***************************************************************************/
-#include <math.h>
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "includes/polyplay.h"
diff --git a/src/mame/audio/poolshrk.c b/src/mame/audio/poolshrk.c
index e0c93cda72b..4450bf83d58 100644
--- a/src/mame/audio/poolshrk.c
+++ b/src/mame/audio/poolshrk.c
@@ -3,7 +3,7 @@
audio\poolshrk.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/poolshrk.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/pulsar.c b/src/mame/audio/pulsar.c
index e74fa900e6e..0f7bc0b2b4c 100644
--- a/src/mame/audio/pulsar.c
+++ b/src/mame/audio/pulsar.c
@@ -5,7 +5,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "includes/vicdual.h"
diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c
index d80d1ea5547..0068664241a 100644
--- a/src/mame/audio/qix.c
+++ b/src/mame/audio/qix.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
#include "includes/qix.h"
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index 3c86606f178..2ddc0753683 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -7,7 +7,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6502/m6502.h"
#include "machine/rescap.h"
diff --git a/src/mame/audio/redbaron.c b/src/mame/audio/redbaron.c
index 3f28a44f58f..115a15ba938 100644
--- a/src/mame/audio/redbaron.c
+++ b/src/mame/audio/redbaron.c
@@ -14,8 +14,7 @@
0 POTSEL (rb_input_select)
*/
-#include <math.h>
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/bzone.h"
#include "sound/pokey.h"
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index 86a0f7b6f4d..93aeeb7f3f2 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -11,7 +11,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/7474.h"
#include "sound/flt_rc.h"
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index 0a15988c7db..d30db660d48 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "cpu/mcs48/mcs48.h"
#include "includes/segag80r.h"
diff --git a/src/mame/audio/segag80v.c b/src/mame/audio/segag80v.c
index 05a2c4e86fe..c08a8efa178 100644
--- a/src/mame/audio/segag80v.c
+++ b/src/mame/audio/segag80v.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/segag80v.h"
#include "sound/samples.h"
diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c
index 44aa908aa91..7f796448676 100644
--- a/src/mame/audio/segasnd.c
+++ b/src/mame/audio/segasnd.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/segag80v.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index f345785d1ae..9807edb48a1 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -32,7 +32,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "audio/seibu.h"
#include "sound/3812intf.h"
diff --git a/src/mame/audio/senjyo.c b/src/mame/audio/senjyo.c
index 06a2b97fd97..3ba5a0caa68 100644
--- a/src/mame/audio/senjyo.c
+++ b/src/mame/audio/senjyo.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "includes/senjyo.h"
diff --git a/src/mame/audio/skydiver.c b/src/mame/audio/skydiver.c
index 95785ae7d15..14b46b8cb72 100644
--- a/src/mame/audio/skydiver.c
+++ b/src/mame/audio/skydiver.c
@@ -3,7 +3,7 @@
audio\skydiver.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/skydiver.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/skyraid.c b/src/mame/audio/skyraid.c
index 95dc7cac596..7f35c3fee61 100644
--- a/src/mame/audio/skyraid.c
+++ b/src/mame/audio/skyraid.c
@@ -3,7 +3,7 @@
* Sept 2009, Derrick Renaud
************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/skyraid.h"
diff --git a/src/mame/audio/snes.c b/src/mame/audio/snes.c
index a9adb56ab75..1a7dc038c8e 100644
--- a/src/mame/audio/snes.c
+++ b/src/mame/audio/snes.c
@@ -25,8 +25,7 @@
***************************************************************************/
-#include <math.h>
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/snes.h"
diff --git a/src/mame/audio/snk6502.c b/src/mame/audio/snk6502.c
index 08ee9dd2a35..fbc0dc061a1 100644
--- a/src/mame/audio/snk6502.c
+++ b/src/mame/audio/snk6502.c
@@ -10,7 +10,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "sound/sn76477.h"
#include "sound/samples.h"
diff --git a/src/mame/audio/spacefb.c b/src/mame/audio/spacefb.c
index a2c6f6b66f5..c0a35f94954 100644
--- a/src/mame/audio/spacefb.c
+++ b/src/mame/audio/spacefb.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/dac.h"
#include "sound/samples.h"
diff --git a/src/mame/audio/spiders.c b/src/mame/audio/spiders.c
index 0073c89674d..2b9321c52fe 100644
--- a/src/mame/audio/spiders.c
+++ b/src/mame/audio/spiders.c
@@ -6,7 +6,7 @@ To Do: add filters
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/discrete.h"
#include "machine/6821pia.h"
#include "includes/spiders.h"
diff --git a/src/mame/audio/sprint2.c b/src/mame/audio/sprint2.c
index 7e414426270..84e520b5bb9 100644
--- a/src/mame/audio/sprint2.c
+++ b/src/mame/audio/sprint2.c
@@ -3,7 +3,7 @@
audio\sprint2.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/sprint2.h"
diff --git a/src/mame/audio/sprint4.c b/src/mame/audio/sprint4.c
index 45822d9141b..4c2797bab62 100644
--- a/src/mame/audio/sprint4.c
+++ b/src/mame/audio/sprint4.c
@@ -3,7 +3,7 @@
audio\sprint4.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sprint4.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/sprint8.c b/src/mame/audio/sprint8.c
index a57b343aa3a..648cd34e661 100644
--- a/src/mame/audio/sprint8.c
+++ b/src/mame/audio/sprint8.c
@@ -3,7 +3,7 @@
* Sept 2009, Derrick Renaud
************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/sprint8.h"
diff --git a/src/mame/audio/starshp1.c b/src/mame/audio/starshp1.c
index 919ee7f4fbf..55538402757 100644
--- a/src/mame/audio/starshp1.c
+++ b/src/mame/audio/starshp1.c
@@ -3,7 +3,7 @@
* Aug 2008, Derrick Renaud
************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/starshp1.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/starwars.c b/src/mame/audio/starwars.c
index 1ffde55cfb2..471e3a22e8e 100644
--- a/src/mame/audio/starwars.c
+++ b/src/mame/audio/starwars.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/tms5220.h"
#include "includes/starwars.h"
diff --git a/src/mame/audio/subs.c b/src/mame/audio/subs.c
index 50ffe770a22..a21f02c54e6 100644
--- a/src/mame/audio/subs.c
+++ b/src/mame/audio/subs.c
@@ -3,7 +3,7 @@
audio\subs.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/subs.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/suna8.c b/src/mame/audio/suna8.c
index c4b8b35c075..0b377ad254e 100644
--- a/src/mame/audio/suna8.c
+++ b/src/mame/audio/suna8.c
@@ -6,7 +6,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "includes/suna8.h"
diff --git a/src/mame/audio/t5182.c b/src/mame/audio/t5182.c
index 03e6f224316..8fe6ff6f623 100644
--- a/src/mame/audio/t5182.c
+++ b/src/mame/audio/t5182.c
@@ -144,7 +144,7 @@ rom.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "t5182.h"
#include "sound/2151intf.h"
diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c
index 64155f94b0e..eb371ab852b 100644
--- a/src/mame/audio/taito_en.c
+++ b/src/mame/audio/taito_en.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "sound/es5506.h"
#include "includes/taito_f3.h"
#include "taito_en.h"
diff --git a/src/mame/audio/taitosnd.c b/src/mame/audio/taitosnd.c
index 3167f69bf59..6def548c9d3 100644
--- a/src/mame/audio/taitosnd.c
+++ b/src/mame/audio/taitosnd.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "taitosnd.h"
diff --git a/src/mame/audio/tank8.c b/src/mame/audio/tank8.c
index 7a62a294de2..a64b1dd0b4b 100644
--- a/src/mame/audio/tank8.c
+++ b/src/mame/audio/tank8.c
@@ -3,7 +3,7 @@
audio\tank8.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/tank8.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/targ.c b/src/mame/audio/targ.c
index a709e7677e5..11d1313d8cc 100644
--- a/src/mame/audio/targ.c
+++ b/src/mame/audio/targ.c
@@ -11,7 +11,7 @@
3 = Tone generator
*/
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "sound/dac.h"
#include "includes/targ.h"
diff --git a/src/mame/audio/tiamc1.c b/src/mame/audio/tiamc1.c
index 27157650971..32dde518267 100644
--- a/src/mame/audio/tiamc1.c
+++ b/src/mame/audio/tiamc1.c
@@ -31,7 +31,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/tiamc1.h"
diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c
index 1a0e1e098af..0af8e117201 100644
--- a/src/mame/audio/timeplt.c
+++ b/src/mame/audio/timeplt.c
@@ -10,7 +10,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/flt_rc.h"
diff --git a/src/mame/audio/toaplan2.c b/src/mame/audio/toaplan2.c
index 0c1a9962a97..73442bf5751 100644
--- a/src/mame/audio/toaplan2.c
+++ b/src/mame/audio/toaplan2.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "sound/okim6295.h"
#include "includes/toaplan2.h"
diff --git a/src/mame/audio/trackfld.c b/src/mame/audio/trackfld.c
index 1b005246bde..06ba91bd3c3 100644
--- a/src/mame/audio/trackfld.c
+++ b/src/mame/audio/trackfld.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "sound/vlm5030.h"
#include "sound/sn76496.h"
#include "includes/trackfld.h"
diff --git a/src/mame/audio/triplhnt.c b/src/mame/audio/triplhnt.c
index e3adcd1ea37..340d698f536 100644
--- a/src/mame/audio/triplhnt.c
+++ b/src/mame/audio/triplhnt.c
@@ -3,7 +3,7 @@
audio\triplhnt.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/triplhnt.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/turbo.c b/src/mame/audio/turbo.c
index e435892db75..f928297cdb2 100644
--- a/src/mame/audio/turbo.c
+++ b/src/mame/audio/turbo.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/turbo.h"
#include "sound/samples.h"
diff --git a/src/mame/audio/tx1.c b/src/mame/audio/tx1.c
index 01c37f50e56..8a5a22dd6df 100644
--- a/src/mame/audio/tx1.c
+++ b/src/mame/audio/tx1.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "sound/ay8910.h"
#include "video/resnet.h"
diff --git a/src/mame/audio/vicdual.c b/src/mame/audio/vicdual.c
index ccb655bbd50..8cdcfb0712c 100644
--- a/src/mame/audio/vicdual.c
+++ b/src/mame/audio/vicdual.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/vicdual.h"
#include "sound/discrete.h"
#include "sound/samples.h"
diff --git a/src/mame/audio/videopin.c b/src/mame/audio/videopin.c
index 8ec3b62324f..91380cd0e40 100644
--- a/src/mame/audio/videopin.c
+++ b/src/mame/audio/videopin.c
@@ -3,7 +3,7 @@
audio\videopin.c
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/videopin.h"
#include "sound/discrete.h"
diff --git a/src/mame/audio/warpwarp.c b/src/mame/audio/warpwarp.c
index 80bcd5d5c84..83cd642bd97 100644
--- a/src/mame/audio/warpwarp.c
+++ b/src/mame/audio/warpwarp.c
@@ -7,8 +7,7 @@
*
****************************************************************************/
-#include <math.h>
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/warpwarp.h"
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index d3d4510442b..ec5bd328f9b 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -22,7 +22,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/6821pia.h"
#include "cpu/m6809/m6809.h"
#include "williams.h"
diff --git a/src/mame/audio/wiping.c b/src/mame/audio/wiping.c
index 60c80e2683b..8b6b854b9c3 100644
--- a/src/mame/audio/wiping.c
+++ b/src/mame/audio/wiping.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "streams.h"
#include "includes/wiping.h"
diff --git a/src/mame/audio/wow.c b/src/mame/audio/wow.c
index 9c1313a5367..c53e4d82e54 100644
--- a/src/mame/audio/wow.c
+++ b/src/mame/audio/wow.c
@@ -18,7 +18,7 @@ wow_sh_ update- Null
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/samples.h"
#include "includes/astrocde.h"
diff --git a/src/mame/audio/zaxxon.c b/src/mame/audio/zaxxon.c
index 2abc56d03fb..498f3709091 100644
--- a/src/mame/audio/zaxxon.c
+++ b/src/mame/audio/zaxxon.c
@@ -59,7 +59,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "includes/zaxxon.h"
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 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c
index 3fd97aa8ca2..afbe61f86d0 100644
--- a/src/mame/drivers/safarir.c
+++ b/src/mame/drivers/safarir.c
@@ -46,7 +46,7 @@ modified by Hau
08/09/2009
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index d62bea5e4b7..7fddc2ad6a1 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -70,7 +70,7 @@ Is there another alt program rom set labeled 9 & 10?
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "includes/kaneko16.h"
diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c
index 95e910b3457..5f87cc5874a 100644
--- a/src/mame/drivers/sangho.c
+++ b/src/mame/drivers/sangho.c
@@ -46,7 +46,7 @@ is a YM2413 compatible chip.
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "video/v9938.h"
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index 7dea4fbacdb..2ac239405fc 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -73,7 +73,7 @@ Addition by Reip
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
#include "sound/sp0256.h"
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index 4582df17e0b..95435f11f87 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -38,7 +38,7 @@ CPU/Video Board Parts:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index 14a4781241f..ac3e0b3128a 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -37,7 +37,7 @@ PROMs : NEC B406 (1kx4) x2
***********************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "deprecat.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index f279e876569..e6be2da16de 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -30,7 +30,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/sbugger.c b/src/mame/drivers/sbugger.c
index 36de0340119..e22bcacbd9e 100644
--- a/src/mame/drivers/sbugger.c
+++ b/src/mame/drivers/sbugger.c
@@ -97,7 +97,7 @@ Sound PCB
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "deprecat.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index 5a124dfa57a..08dcb4482f2 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -32,7 +32,7 @@ Notes/Tidbits:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
#include "machine/7474.h"
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index eceb8b4eb34..995fc30a063 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -32,7 +32,7 @@ Stephh's notes (based on the game M6502 code and some tests) :
***************************************************************************/
-#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/scramble.c b/src/mame/drivers/scramble.c
index 5e9e977bbd1..2637427dda8 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -25,7 +25,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/s2650/s2650.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c
index dfbcb4121b5..4364aff7a11 100644
--- a/src/mame/drivers/scregg.c
+++ b/src/mame/drivers/scregg.c
@@ -49,7 +49,7 @@ it as ASCII text.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
#include "includes/btime.h"
diff --git a/src/mame/drivers/sderby.c b/src/mame/drivers/sderby.c
index 80ce36ab183..ca4750ec50d 100644
--- a/src/mame/drivers/sderby.c
+++ b/src/mame/drivers/sderby.c
@@ -58,7 +58,7 @@
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "sderby.lh"
diff --git a/src/mame/drivers/seattle.c b/src/mame/drivers/seattle.c
index 7d7cba665b5..07ca88062b2 100644
--- a/src/mame/drivers/seattle.c
+++ b/src/mame/drivers/seattle.c
@@ -182,7 +182,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/adsp2100/adsp2100.h"
#include "cpu/mips/mips3.h"
#include "audio/dcs.h"
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index 63f39bea723..c8da4013a2c 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -66,7 +66,7 @@
***********************************************************************************************/
-#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/segae.c b/src/mame/drivers/segae.c
index e49232a3c9b..a080d79c9b2 100644
--- a/src/mame/drivers/segae.c
+++ b/src/mame/drivers/segae.c
@@ -293,7 +293,7 @@ covert megatech / megaplay drivers to use new code etc. etc.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "machine/mc8123.h"
diff --git a/src/mame/drivers/segag80r.c b/src/mame/drivers/segag80r.c
index 84e03479cee..080dd0c0738 100644
--- a/src/mame/drivers/segag80r.c
+++ b/src/mame/drivers/segag80r.c
@@ -104,7 +104,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index 1ca274a8edb..edb6ea5c2a9 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -132,7 +132,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index d4a7f5c10d5..b3b5c7da8d1 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -13,7 +13,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/mcs51/mcs51.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/segald.c b/src/mame/drivers/segald.c
index 665ef57df77..759bc14473c 100644
--- a/src/mame/drivers/segald.c
+++ b/src/mame/drivers/segald.c
@@ -17,7 +17,7 @@ Todo:
-Character decoding may combine the lower 0x0800 with the upper 0x0800.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "render.h"
#include "machine/laserdsc.h"
diff --git a/src/mame/drivers/segamsys.c b/src/mame/drivers/segamsys.c
index caac7daee2f..1bcd4f8ba8d 100644
--- a/src/mame/drivers/segamsys.c
+++ b/src/mame/drivers/segamsys.c
@@ -9,7 +9,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "machine/mc8123.h"
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index 4a26f57dbd3..4d738ceac87 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -268,7 +268,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/system16.h"
#include "machine/fd1089.h"
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index f9caac079f4..6c11605c2b0 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -143,7 +143,7 @@ Shinobi EPR11268 - - - EPR11290 EPR11294 EPR11
Tetris - - - - EPR12169 EPR12170 - - - - - -
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index 2a0bbd681bf..8ff16653c98 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -867,7 +867,7 @@ CPU - 317-0092 |--------------------------------------------------------------
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index 1bfd800be51..f61be2e319e 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -27,7 +27,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index d9db98c50c7..4cbba9bf670 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -331,7 +331,7 @@ Notes:
just made a copy & renamed them for now to avoid any conflicts
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
#include "sound/ym2151.h"
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 4a082c9e12a..cd08a577c6a 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -314,7 +314,7 @@ MIB.42
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/v60/v60.h"
#include "cpu/nec/nec.h"
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index fadcb44cdb9..a47c9c5b40a 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -231,7 +231,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/system16.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index 7cbec70edc9..dc399e8e552 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -22,7 +22,7 @@ Known games currently not dumped:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/system16.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 0ec9bfebaaf..500ecff1de2 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -733,7 +733,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/i386/i386.h"
#include "machine/ds2404.h"
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index c06345b2fb7..0a6123c823c 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -42,7 +42,7 @@ This info came from http://www.ne.jp/asahi/cc-sakura/akkun/old/fryski.html
***************************************************************************/
-#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/sengokmj.c b/src/mame/drivers/sengokmj.c
index 15bf9428c2a..9d9bc604243 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -51,7 +51,7 @@ RSSENGO2.72 chr.
*******************************************************************************************/
-#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/senjyo.c b/src/mame/drivers/senjyo.c
index b68cb6ebf80..0e469f8074c 100644
--- a/src/mame/drivers/senjyo.c
+++ b/src/mame/drivers/senjyo.c
@@ -68,7 +68,7 @@ I/O read/write
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 3e6616c62e9..51accb77565 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -1297,7 +1297,7 @@ Note: on screen copyright is (c)1998 Coinmaster.
***************************************************************************/
-#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/seta2.c b/src/mame/drivers/seta2.c
index 7255638f05e..407a4ad82f0 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -527,7 +527,7 @@ The same H8/3007 code "FC21 IOPR-0" at U49 is used for FUNCUBE 2,3,4 & 5
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "memconv.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index 272b4e776b4..95c725ebcab 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#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/sfbonus.c b/src/mame/drivers/sfbonus.c
index 6b014ee9114..131888090bd 100644
--- a/src/mame/drivers/sfbonus.c
+++ b/src/mame/drivers/sfbonus.c
@@ -48,7 +48,7 @@ In a couple of cases, due to too many older revisions, I used: parent + version
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c
index 5a3390698ca..8f0c4d0d8b3 100644
--- a/src/mame/drivers/sfkick.c
+++ b/src/mame/drivers/sfkick.c
@@ -51,7 +51,7 @@ YM2203C
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "video/v9938.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/sg1000a.c b/src/mame/drivers/sg1000a.c
index 0356bde6ed9..d15f5633460 100644
--- a/src/mame/drivers/sg1000a.c
+++ b/src/mame/drivers/sg1000a.c
@@ -111,7 +111,7 @@ CN4 CN5
******************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "video/tms9928a.h"
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index 84f5da73a08..aeedb16d9d7 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -137,7 +137,7 @@ lev 6 : 0x78 : 0000 11d0 - just rte
lev 7 : 0x7c : 0000 11d0 - just rte
*/
-#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/shangha3.c b/src/mame/drivers/shangha3.c
index 034a806c6ae..e11cf363969 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -19,7 +19,7 @@ blocken:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index a1baa9cd400..9ad27f1d981 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -22,7 +22,7 @@ displayed.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
#include "audio/seibu.h"
#include "video/hd63484.h"
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index 0b2dfc4534e..d195a620494 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -48,7 +48,7 @@ Games by Nihon Game/Culture Brain:
1986 Super Chinese (Nintendo Vs. System)
*/
-#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/shaolins.c b/src/mame/drivers/shaolins.c
index 0ab7571f663..7d05602e82e 100644
--- a/src/mame/drivers/shaolins.c
+++ b/src/mame/drivers/shaolins.c
@@ -6,7 +6,7 @@ driver by Allard Van Der Bas
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "deprecat.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index 7d5020dc00d..3bd7e8193a3 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -5,7 +5,7 @@ Shisen
driver by Nicola Salmoria
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "audio/m72.h"
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index e910980eea9..4b942c13aae 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -34,7 +34,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index d8b71c42339..fd63b1fe4ed 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -81,7 +81,7 @@ PROM : Type MB7051
-#include "driver.h"
+#include "emu.h"
#include "cpu/alph8201/alph8201.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/shuuz.c b/src/mame/drivers/shuuz.c
index aaf50fb343d..6178fb989dc 100644
--- a/src/mame/drivers/shuuz.c
+++ b/src/mame/drivers/shuuz.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "includes/shuuz.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index faed51ae581..b518291eec8 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -35,7 +35,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index cbb766b363c..d7bf57be387 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -13,7 +13,7 @@ i8751 protection simluation and other fixes by Bryan McPhail, 15/10/00.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index 547bd977bc7..b51d210bc48 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -4,7 +4,7 @@
/* Inputs, DIPs by Stephh & R. Belmont */
/* and preliminary sound hookup by R. Belmont + fixes by Pierpaolo Prazzoli */
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/2151intf.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c
index 9dd2a506046..44b747b3333 100644
--- a/src/mame/drivers/simpl156.c
+++ b/src/mame/drivers/simpl156.c
@@ -88,7 +88,7 @@ Are the OKI M6295 clocks from Heavy Smash are correct at least for the Mitchell
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/decocrpt.h"
#include "includes/deco32.h"
#include "cpu/arm/arm.h"
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index fe194588a91..13469fc5de0 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -66,7 +66,7 @@ Custom ICs - 053260 - sound chip (QFP80)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
#include "cpu/z80/z80.h"
#include "video/konicdev.h"
diff --git a/src/mame/drivers/skeetsht.c b/src/mame/drivers/skeetsht.c
index e6e636eda84..32fcaa49bfc 100644
--- a/src/mame/drivers/skeetsht.c
+++ b/src/mame/drivers/skeetsht.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mc68hc11/mc68hc11.h"
#include "cpu/tms34010/tms34010.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c
index ec43f929f99..e0f423ddc94 100644
--- a/src/mame/drivers/skimaxx.c
+++ b/src/mame/drivers/skimaxx.c
@@ -34,7 +34,7 @@
*****************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms34010/tms34010.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c
index 0c13bb0b8c8..477a2ac63a5 100644
--- a/src/mame/drivers/skullxbo.c
+++ b/src/mame/drivers/skullxbo.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "audio/atarijsa.h"
#include "includes/skullxbo.h"
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index 26652e47093..2a26dde3b6d 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -20,7 +20,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/skydiver.c b/src/mame/drivers/skydiver.c
index 2cdf1b272b5..a7f4b8f3b3e 100644
--- a/src/mame/drivers/skydiver.c
+++ b/src/mame/drivers/skydiver.c
@@ -86,7 +86,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "deprecat.h"
#include "includes/skydiver.h"
diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c
index 45a7a956cdc..200644a13c0 100644
--- a/src/mame/drivers/skyfox.c
+++ b/src/mame/drivers/skyfox.c
@@ -16,7 +16,7 @@ To Do: The background rendering is entirely guesswork
Verified Dip locations and recommended settings with manual
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/skykid.c b/src/mame/drivers/skykid.c
index 45d5ce05fe7..77f8f1f3867 100644
--- a/src/mame/drivers/skykid.c
+++ b/src/mame/drivers/skykid.c
@@ -13,7 +13,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/skylncr.c b/src/mame/drivers/skylncr.c
index 34857011db9..9ec950822f6 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -32,7 +32,7 @@
#define MASTER_CLOCK XTAL_12MHz /* confirmed */
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c
index a34c3a5b29b..e34f5c65180 100644
--- a/src/mame/drivers/skyraid.c
+++ b/src/mame/drivers/skyraid.c
@@ -4,7 +4,7 @@ Atari Sky Raider driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/skyraid.h"
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index 15dd0ba3290..db2d2589424 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -398,7 +398,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/m6805/m6805.h"
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index 4b404328f8f..4a6faef3ba4 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -131,7 +131,7 @@ Region byte at offset 0x031:
US versions or different then both.
***************************************************************************/
-#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/sliver.c b/src/mame/drivers/sliver.c
index e3c8e74b8cb..9ea3a5ea8c0 100644
--- a/src/mame/drivers/sliver.c
+++ b/src/mame/drivers/sliver.c
@@ -64,7 +64,7 @@ Notes:
VSync - 60Hz
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/slotcarn.c b/src/mame/drivers/slotcarn.c
index f879b8d027b..39f93b1c3dd 100644
--- a/src/mame/drivers/slotcarn.c
+++ b/src/mame/drivers/slotcarn.c
@@ -14,7 +14,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/sms.c b/src/mame/drivers/sms.c
index 762c329d665..01b03437f94 100644
--- a/src/mame/drivers/sms.c
+++ b/src/mame/drivers/sms.c
@@ -212,7 +212,7 @@ U145 1Brown PAL14H4CN
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i86/i86.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/snesb.c b/src/mame/drivers/snesb.c
index 881ca1cb733..95eb54cf383 100644
--- a/src/mame/drivers/snesb.c
+++ b/src/mame/drivers/snesb.c
@@ -136,7 +136,7 @@ Iron PCB (same as Final Fight 2?)
-#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/snk.c b/src/mame/drivers/snk.c
index fb8d3fe850e..01e63b523a0 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -258,7 +258,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/snk.h"
#include "sound/snkwave.h"
diff --git a/src/mame/drivers/snk6502.c b/src/mame/drivers/snk6502.c
index 76070e9d640..1bd37b9afc5 100644
--- a/src/mame/drivers/snk6502.c
+++ b/src/mame/drivers/snk6502.c
@@ -262,7 +262,7 @@ Stephh's notes (based on the games M6502 code and some tests) :
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m6502/m6502.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index a628c7bcd72..36173d533b1 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -40,7 +40,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
diff --git a/src/mame/drivers/snookr10.c b/src/mame/drivers/snookr10.c
index 92206609acf..f72298c5bd3 100644
--- a/src/mame/drivers/snookr10.c
+++ b/src/mame/drivers/snookr10.c
@@ -361,7 +361,7 @@
#define MASTER_CLOCK XTAL_16MHz
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/okim6295.h"
#include "snookr10.lh"
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index 00e76c85c50..a5101a40465 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -62,7 +62,7 @@ out of the sprite list at that point.. (verify on real hw)
***************************************************************************/
-#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/solomon.c b/src/mame/drivers/solomon.c
index 957c379ba3f..e7b45188739 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -5,7 +5,7 @@ Solomon's Key
driver by Mirko Buffoni
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index 494a2c3c96a..94ca5947846 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -48,7 +48,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m6809/m6809.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c
index 75d4eb8f0db..cb530d4b999 100644
--- a/src/mame/drivers/sothello.c
+++ b/src/mame/drivers/sothello.c
@@ -34,7 +34,7 @@ OSC : 8.0000MHz(X1) 21.477 MHz(X2) 384kHz(X3)
*/
-#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/spacefb.c b/src/mame/drivers/spacefb.c
index f2fc22156e6..eb2bc3a309e 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -104,7 +104,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/spacefb.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c
index 6458c0ac23c..61b5361a38b 100644
--- a/src/mame/drivers/spaceg.c
+++ b/src/mame/drivers/spaceg.c
@@ -161,7 +161,7 @@ Notes:
**************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/dac.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index 8336049be20..5c4f20359f2 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -125,7 +125,7 @@ cpu #0 (PC=00001A1A): unmapped memory word write to 00090030 = 00F7 & 00FF
*******************************************************************************/
-#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/spcforce.c b/src/mame/drivers/spcforce.c
index ed5cc145d19..dbe29b5f4b2 100644
--- a/src/mame/drivers/spcforce.c
+++ b/src/mame/drivers/spcforce.c
@@ -31,7 +31,7 @@ a000-a3ff R/W X/Y scroll position of each character (can be scrolled up
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index d20c917bf97..a11f199b5b5 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -21,7 +21,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "deprecat.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c
index 626c2032a2b..1892be177cc 100644
--- a/src/mame/drivers/speedatk.c
+++ b/src/mame/drivers/speedatk.c
@@ -74,7 +74,7 @@ SW 8 : TEST MODE H:TEST
PS / PD : key matrix
*****************************************************************************************/
-#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/speedbal.c b/src/mame/drivers/speedbal.c
index 706f84f5897..cdd41055adb 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -50,7 +50,7 @@ c1 ??
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/3812intf.h"
diff --git a/src/mame/drivers/speedspn.c b/src/mame/drivers/speedspn.c
index 9a8efe7034e..c60a1c9370b 100644
--- a/src/mame/drivers/speedspn.c
+++ b/src/mame/drivers/speedspn.c
@@ -20,7 +20,7 @@ TODO:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/speglsht.c b/src/mame/drivers/speglsht.c
index d57dbafca57..04ff328e8e3 100644
--- a/src/mame/drivers/speglsht.c
+++ b/src/mame/drivers/speglsht.c
@@ -103,7 +103,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/mips/r3000.h"
#include "sound/st0016.h"
diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c
index a06023e5843..fd4187085d8 100644
--- a/src/mame/drivers/spiders.c
+++ b/src/mame/drivers/spiders.c
@@ -187,7 +187,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/rescap.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index 760aa758bdf..dc0ce6e21d8 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -41,7 +41,7 @@ TS 2006.12.22:
***************************************************************************/
-#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/spoker.c b/src/mame/drivers/spoker.c
index 78fe8f66893..3f5bf4159b0 100644
--- a/src/mame/drivers/spoker.c
+++ b/src/mame/drivers/spoker.c
@@ -8,7 +8,7 @@ TODO:
- Map Leds and Coin counters
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z180/z180.h"
#include "sound/2413intf.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c
index 7b6cf9960fd..d7c29e7b284 100644
--- a/src/mame/drivers/spool99.c
+++ b/src/mame/drivers/spool99.c
@@ -87,7 +87,7 @@ Note
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/sprcros2.c b/src/mame/drivers/sprcros2.c
index a46aa108ae9..b3e9fee8680 100644
--- a/src/mame/drivers/sprcros2.c
+++ b/src/mame/drivers/sprcros2.c
@@ -54,7 +54,7 @@ Notes:
vertical position only, assume this is original behaviour
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c
index 88d33b5473f..e2aa50f9261 100644
--- a/src/mame/drivers/sprint2.c
+++ b/src/mame/drivers/sprint2.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/sprint2.h"
#include "sound/discrete.h"
diff --git a/src/mame/drivers/sprint4.c b/src/mame/drivers/sprint4.c
index 37665fafe7e..861d164b344 100644
--- a/src/mame/drivers/sprint4.c
+++ b/src/mame/drivers/sprint4.c
@@ -4,7 +4,7 @@ Atari Sprint 4 driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "audio/sprint4.h"
diff --git a/src/mame/drivers/sprint8.c b/src/mame/drivers/sprint8.c
index c77a06672cf..02ef923aad2 100644
--- a/src/mame/drivers/sprint8.c
+++ b/src/mame/drivers/sprint8.c
@@ -4,7 +4,7 @@ Atari Sprint 8 driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "includes/sprint8.h"
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index dff5f19e261..d2f84000fb0 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "video/konicdev.h"
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index 348bd55aa09..b84e986aace 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -51,7 +51,7 @@ Note:
****************************************************************************/
-#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/srmp5.c b/src/mame/drivers/srmp5.c
index 06763110912..962cc5bd582 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -34,7 +34,7 @@ This is not a bug (real machine behaves the same).
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "cpu/mips/r3000.h"
diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c
index 0678e8c95d7..b825244e4c6 100644
--- a/src/mame/drivers/srmp6.c
+++ b/src/mame/drivers/srmp6.c
@@ -66,7 +66,7 @@ Dumped 06/15/2000
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "sound/nile.h"
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 6d192edc0fe..edaff06e441 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -10,7 +10,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/ssf2md.c b/src/mame/drivers/ssf2md.c
index abe24962ac1..83248205a2d 100644
--- a/src/mame/drivers/ssf2md.c
+++ b/src/mame/drivers/ssf2md.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "megadriv.h"
ROM_START( ssf2ghw )
diff --git a/src/mame/drivers/ssfindo.c b/src/mame/drivers/ssfindo.c
index 7ebd69c7132..53d240f8b1e 100644
--- a/src/mame/drivers/ssfindo.c
+++ b/src/mame/drivers/ssfindo.c
@@ -120,7 +120,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
diff --git a/src/mame/drivers/ssgbl.c b/src/mame/drivers/ssgbl.c
index 389ace1a5b2..fe019033e5d 100644
--- a/src/mame/drivers/ssgbl.c
+++ b/src/mame/drivers/ssgbl.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "megadriv.h"
/* Sunset Riders bootleg - based on Genesis / Megadrive version
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index 3665875c5bf..73801e9a6ef 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -51,7 +51,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/2203intf.h"
diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c
index 85c663eeffb..555319a363f 100644
--- a/src/mame/drivers/ssingles.c
+++ b/src/mame/drivers/ssingles.c
@@ -142,7 +142,7 @@ Dumped by Chack'n
*/
-#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/sslam.c b/src/mame/drivers/sslam.c
index 07aae5a39bb..2a9b45a0050 100644
--- a/src/mame/drivers/sslam.c
+++ b/src/mame/drivers/sslam.c
@@ -80,7 +80,7 @@ Notes:
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/mcs51/mcs51.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c
index ee994c85459..89845ccdee8 100644
--- a/src/mame/drivers/ssozumo.c
+++ b/src/mame/drivers/ssozumo.c
@@ -7,7 +7,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/10/04
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6809/m6809.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c
index 35cb02554df..2b85dfeae17 100644
--- a/src/mame/drivers/sspeedr.c
+++ b/src/mame/drivers/sspeedr.c
@@ -4,7 +4,7 @@ Taito Super Speed Race driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sspeedr.lh"
#include "includes/sspeedr.h"
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index e74325fbaea..2c74e29b888 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -29,7 +29,7 @@ HW info :
************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c
index 83e9ac7ca1b..88d9dff4599 100644
--- a/src/mame/drivers/sstrangr.c
+++ b/src/mame/drivers/sstrangr.c
@@ -5,7 +5,7 @@
/*******************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index d344414618b..2d0aea8c9ea 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -179,7 +179,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/v810/v810.h"
#include "cpu/v60/v60.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/st0016.c b/src/mame/drivers/st0016.c
index 613cf919d69..aabee33c29b 100644
--- a/src/mame/drivers/st0016.c
+++ b/src/mame/drivers/st0016.c
@@ -9,7 +9,7 @@ Todo:
Dips verified for Neratte Chu (nratechu) from manual
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/v810/v810.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/stactics.c b/src/mame/drivers/stactics.c
index 8a9eeffff74..128b2bf6974 100644
--- a/src/mame/drivers/stactics.c
+++ b/src/mame/drivers/stactics.c
@@ -40,7 +40,7 @@ Verify Color PROM resistor values (Last 8 colors)
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "includes/stactics.h"
#include "stactics.lh"
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index 997f9428d04..3dab93bf2bf 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -6,7 +6,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/starcrus.c b/src/mame/drivers/starcrus.c
index c915d376b81..aa6fd30e502 100644
--- a/src/mame/drivers/starcrus.c
+++ b/src/mame/drivers/starcrus.c
@@ -9,7 +9,7 @@ palazzol@home.com
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/starfire.c b/src/mame/drivers/starfire.c
index cbc34a73501..9f97ecfe1ab 100644
--- a/src/mame/drivers/starfire.c
+++ b/src/mame/drivers/starfire.c
@@ -44,7 +44,7 @@ starfira has one less rom in total than starfire but everything passes as
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/starfire.h"
diff --git a/src/mame/drivers/starshp1.c b/src/mame/drivers/starshp1.c
index ba71c85050c..5743645a977 100644
--- a/src/mame/drivers/starshp1.c
+++ b/src/mame/drivers/starshp1.c
@@ -7,7 +7,7 @@ Atari Starship 1 driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/starshp1.h"
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index b83bfdce72e..b11a43038df 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -22,7 +22,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "video/vector.h"
#include "video/avgdvg.h"
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index 2c8d7e50fc8..3d3d953f8fe 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -64,7 +64,7 @@ quaquiz2 - no inputs, needs NVRAM
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "sound/ay8910.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c
index 15cb8e169d9..01a823a214d 100644
--- a/src/mame/drivers/stepstag.c
+++ b/src/mame/drivers/stepstag.c
@@ -15,7 +15,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "rendlay.h"
#include "stepstag.lh"
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index 31fe524332f..5ba6c63919d 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -228,7 +228,7 @@ DONE? (check on real board)
*****************************************************************************/
-#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/stlforce.c b/src/mame/drivers/stlforce.c
index a94187391b2..bd732fcd3ad 100644
--- a/src/mame/drivers/stlforce.c
+++ b/src/mame/drivers/stlforce.c
@@ -67,7 +67,7 @@ TO DO :
*/
-#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/strnskil.c b/src/mame/drivers/strnskil.c
index deea23f771d..1d5bcab168f 100644
--- a/src/mame/drivers/strnskil.c
+++ b/src/mame/drivers/strnskil.c
@@ -14,7 +14,7 @@ Notes:
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 6e81cbd6535..230c96847cf 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -152,7 +152,7 @@ ToDo / Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
#include "cpu/sh2/sh2.h"
diff --git a/src/mame/drivers/stvinit.c b/src/mame/drivers/stvinit.c
index 8dd66497947..95a9788e34c 100644
--- a/src/mame/drivers/stvinit.c
+++ b/src/mame/drivers/stvinit.c
@@ -5,7 +5,7 @@
to be honest i think some of these cause more problems than they're worth ...
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/sh2/sh2.h"
#include "machine/stvprot.h"
#include "includes/stv.h"
diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c
index 9882a18bbac..dc36dab26eb 100644
--- a/src/mame/drivers/sub.c
+++ b/src/mame/drivers/sub.c
@@ -106,7 +106,7 @@ PCB2 (Top board, CPU board)
*************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/subs.c b/src/mame/drivers/subs.c
index 46ab9a03b01..6ea4d429299 100644
--- a/src/mame/drivers/subs.c
+++ b/src/mame/drivers/subs.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "deprecat.h"
#include "includes/subs.h"
diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c
index f6200673a60..1f70118efd3 100644
--- a/src/mame/drivers/subsino.c
+++ b/src/mame/drivers/subsino.c
@@ -15,7 +15,7 @@ To enter test mode in smoto, keep F2 pressed during boot.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z180/z180.h"
#include "machine/8255ppi.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index befff84e8b7..09f771e2398 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -21,7 +21,7 @@ Year + Game By Board Hardware
***************************************************************************/
-#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/suna8.c b/src/mame/drivers/suna8.c
index 7d20b089c2c..91efbc9514f 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -35,7 +35,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index 09bd9938c6b..b458ebe7b76 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -20,7 +20,7 @@ down hardware (it doesn't write any good sound data btw, mostly zeros).
***************************************************************************/
-#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/supdrapo.c b/src/mame/drivers/supdrapo.c
index 486bfc13ea3..71d9b3b8613 100644
--- a/src/mame/drivers/supdrapo.c
+++ b/src/mame/drivers/supdrapo.c
@@ -28,7 +28,7 @@ A3-1J
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/superchs.c b/src/mame/drivers/superchs.c
index 203c59aa56f..e5f1e4fd8b5 100644
--- a/src/mame/drivers/superchs.c
+++ b/src/mame/drivers/superchs.c
@@ -33,7 +33,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/superdq.c b/src/mame/drivers/superdq.c
index ac657cb0333..7507a5ad5c0 100644
--- a/src/mame/drivers/superdq.c
+++ b/src/mame/drivers/superdq.c
@@ -20,7 +20,7 @@
#define MASTER_CLOCK 20000000
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "render.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index 35ec74cdcec..72cd2ad2291 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -104,7 +104,7 @@ DSW2 stored @ $f237
***************************************************************************/
-#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/supertnk.c b/src/mame/drivers/supertnk.c
index 64896efa7fb..999d85a18fc 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -95,7 +95,7 @@ CRU lines:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms9900/tms9900.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index 8e898c462cd..4a4690e9865 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -19,7 +19,7 @@
************************************************************************************/
-#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/suprloco.c b/src/mame/drivers/suprloco.c
index 2449585bb54..5fc5c58c556 100644
--- a/src/mame/drivers/suprloco.c
+++ b/src/mame/drivers/suprloco.c
@@ -11,7 +11,7 @@ TODO:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "video/system1.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index 44dedfb747f..dd8422872e7 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -186,7 +186,7 @@ NEP-16
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "sound/ymz280b.h"
#include "cpu/sh2/sh2.h"
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index 3c586abbc16..806e4e5c6e8 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -79,7 +79,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/suprridr.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index 187ff1d833c..1a1c3e90993 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -80,7 +80,7 @@ EB26IC73.BIN 27C240 / Main Program
******************************************************************************/
-#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/surpratk.c b/src/mame/drivers/surpratk.c
index 18f819c14fc..8377ddc2020 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/konami/konami.h" /* for the callback and the firq irq definition */
#include "video/konicdev.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index 5c098a14a5c..ad333456772 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -187,7 +187,7 @@ Notes:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/system1.h"
#include "cpu/z80/z80.h"
#include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index fd8e175005f..3eb4334844d 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -86,7 +86,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/system16.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c
index d0777198967..e614c392993 100644
--- a/src/mame/drivers/tagteam.c
+++ b/src/mame/drivers/tagteam.c
@@ -24,7 +24,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index 27efe78d1a3..8d2310993a1 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#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/taito_b.c b/src/mame/drivers/taito_b.c
index dd575f8298d..8caf1c53e09 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -167,7 +167,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/taitoipt.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 93caaee04fb..cdd66125382 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -292,7 +292,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/taitoipt.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/taito_f3.c b/src/mame/drivers/taito_f3.c
index a252074a7f7..03bc1172234 100644
--- a/src/mame/drivers/taito_f3.c
+++ b/src/mame/drivers/taito_f3.c
@@ -35,7 +35,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
#include "includes/taito_f3.h"
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index c58f20008d2..593a0608c07 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -139,7 +139,7 @@ some kind of zoom table?
****************************************************************************/
-#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/taito_l.c b/src/mame/drivers/taito_l.c
index 2840be423f0..c96d91d31b9 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -50,7 +50,7 @@ puzznici note
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "includes/taitoipt.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/taito_o.c b/src/mame/drivers/taito_o.c
index 8458a3c0e9a..e187b650e1a 100644
--- a/src/mame/drivers/taito_o.c
+++ b/src/mame/drivers/taito_o.c
@@ -28,7 +28,7 @@ TODO:
*****************************************************************/
-#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/taito_x.c b/src/mame/drivers/taito_x.c
index a0086766632..20c13f20845 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -310,7 +310,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/taito_z.c b/src/mame/drivers/taito_z.c
index 0c51b4b5825..8a2decac923 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -875,7 +875,7 @@ J1100256A VIDEO PCB
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/taitoipt.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index 6c828318241..59c7f7b0743 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -215,7 +215,7 @@ cpu #2 (PC=0000060E): unmapped memory word read from 0000683A & FFFF
****************************************************************************/
-#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/taitogn.c b/src/mame/drivers/taitogn.c
index 52a161619ed..db6b798fc6f 100644
--- a/src/mame/drivers/taitogn.c
+++ b/src/mame/drivers/taitogn.c
@@ -317,7 +317,7 @@ Type 3 (PCMCIA Compact Flash Adaptor + Compact Flash card, sealed together with
Zooo
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/psx.h"
#include "includes/psx.h"
#include "machine/at28c16.h"
diff --git a/src/mame/drivers/taitojc.c b/src/mame/drivers/taitojc.c
index 36808d8961f..99cde82559b 100644
--- a/src/mame/drivers/taitojc.c
+++ b/src/mame/drivers/taitojc.c
@@ -349,7 +349,7 @@ Notes:
- dangcurv needs correct controls hooking up.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms32051/tms32051.h"
#include "cpu/m68000/m68000.h"
#include "includes/taito_f3.h"
diff --git a/src/mame/drivers/taitopjc.c b/src/mame/drivers/taitopjc.c
index b3ef36aa1d8..78cc46940c9 100644
--- a/src/mame/drivers/taitopjc.c
+++ b/src/mame/drivers/taitopjc.c
@@ -54,7 +54,7 @@
1.84320MHz osc
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/powerpc/ppc.h"
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index ce00fe89ab8..50cb1030022 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -163,7 +163,7 @@ TODO:
***************************************************************************/
-#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/taitotz.c b/src/mame/drivers/taitotz.c
index 87d1fa20e69..b69dadda8e9 100644
--- a/src/mame/drivers/taitotz.c
+++ b/src/mame/drivers/taitotz.c
@@ -68,7 +68,7 @@ IC7 Panasonic MN1020819DA E68-01
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/powerpc/ppc.h"
diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c
index 909c4aa0822..238880a2f7c 100644
--- a/src/mame/drivers/taitowlf.c
+++ b/src/mame/drivers/taitowlf.c
@@ -3,7 +3,7 @@
Driver by Ville Linde
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
#include "memconv.h"
#include "devconv.h"
diff --git a/src/mame/drivers/tank8.c b/src/mame/drivers/tank8.c
index e5a93fd3c19..5b86230bf47 100644
--- a/src/mame/drivers/tank8.c
+++ b/src/mame/drivers/tank8.c
@@ -4,7 +4,7 @@ Atari Tank 8 driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "includes/tank8.h"
#include "sound/discrete.h"
diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c
index 978518313dc..5080219500f 100644
--- a/src/mame/drivers/tankbatt.c
+++ b/src/mame/drivers/tankbatt.c
@@ -56,7 +56,7 @@ Known issues:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index ae1d34bc59b..60fc95bab39 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -16,7 +16,7 @@ To do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index abdcb8d2340..e5b200b5073 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -63,7 +63,7 @@ zooming might be wrong
-#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/targeth.c b/src/mame/drivers/targeth.c
index a0cc986acd1..4db26b102a7 100644
--- a/src/mame/drivers/targeth.c
+++ b/src/mame/drivers/targeth.c
@@ -8,7 +8,7 @@ The DS5002FP has 32KB undumped gameplay code making the game unplayable :_(
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index dbf86a3afa9..af2898d3799 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -137,7 +137,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/nec/nec.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/tattack.c b/src/mame/drivers/tattack.c
index 7db80ede82d..f274465fcb3 100644
--- a/src/mame/drivers/tattack.c
+++ b/src/mame/drivers/tattack.c
@@ -18,7 +18,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c
index 5fecaa1d0a8..b19dd867ca1 100644
--- a/src/mame/drivers/taxidrvr.c
+++ b/src/mame/drivers/taxidrvr.c
@@ -4,7 +4,7 @@ Taxi Driver (c) 1984 Graphic Techno
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
#include "includes/taxidrvr.h"
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 9506d93e3ff..f92cd2ac97e 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -12,7 +12,7 @@ Might be some priority glitches
***/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index 7ae145919b1..800133bb87c 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -6,7 +6,7 @@
* Driver by BUT
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
diff --git a/src/mame/drivers/tcl.c b/src/mame/drivers/tcl.c
index 1013f962c9e..ac08519f676 100644
--- a/src/mame/drivers/tcl.c
+++ b/src/mame/drivers/tcl.c
@@ -40,7 +40,7 @@ Notes:
*/
-#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/tecmo.c b/src/mame/drivers/tecmo.c
index a145cef29d1..0122a2f61cf 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -45,7 +45,7 @@ f809 ????
f80b ????
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index f23147b54cb..f96106e224c 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -23,7 +23,7 @@ Notes:
******************************************************************************/
-#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/tecmosys.c b/src/mame/drivers/tecmosys.c
index 271ec8cd742..3ab839ad37e 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -181,7 +181,7 @@ ae500w07.ad1 - M6295 Samples (23c4001)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/eeprom.h"
#include "includes/tecmosys.h"
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index b3305a2a3c0..010599d54a4 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -88,7 +88,7 @@ TO DO :
***************************************************************************/
-#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/tempest.c b/src/mame/drivers/tempest.c
index 2baaa3f3c2f..f0ed8473cc7 100644
--- a/src/mame/drivers/tempest.c
+++ b/src/mame/drivers/tempest.c
@@ -277,7 +277,7 @@ Version 1 for Tempest Analog Vector-Generator PCB Assembly A037383-01 or A037383
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/mathbox.h"
#include "video/avgdvg.h"
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index 7a7ce8b5efc..65371f54505 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -80,7 +80,7 @@ AT-2
22MHz
*/
-#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/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 4775e523f32..1e8bd652f37 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -33,7 +33,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "sound/ymz280b.h"
diff --git a/src/mame/drivers/tgtpanic.c b/src/mame/drivers/tgtpanic.c
index 18953471fc8..931621aded0 100644
--- a/src/mame/drivers/tgtpanic.c
+++ b/src/mame/drivers/tgtpanic.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
static UINT8 *ram;
diff --git a/src/mame/drivers/thayers.c b/src/mame/drivers/thayers.c
index 05660d60b83..10caa35f54a 100644
--- a/src/mame/drivers/thayers.c
+++ b/src/mame/drivers/thayers.c
@@ -10,7 +10,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "render.h"
#include "machine/laserdsc.h"
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index 600b956f792..257067e0fe4 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -24,7 +24,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6502/m6502.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index 12d080ee618..612e5ab60db 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -114,7 +114,7 @@ HT-01B
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c
index cd81b6d82a4..0578d71abda 100644
--- a/src/mame/drivers/thief.c
+++ b/src/mame/drivers/thief.c
@@ -22,7 +22,7 @@ Credits:
******************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/thoop2.c b/src/mame/drivers/thoop2.c
index 4f5fd2ac84f..8b5eb1f705f 100644
--- a/src/mame/drivers/thoop2.c
+++ b/src/mame/drivers/thoop2.c
@@ -13,7 +13,7 @@ pf: but some gameplay bugs - sprite positioning is incorrect, no enemies, jump a
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c
index 519441f1804..c37c3c82ab2 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.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/thunderx.c b/src/mame/drivers/thunderx.c
index 7dca06329b4..f1349897589 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -8,7 +8,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/tiamc1.c b/src/mame/drivers/tiamc1.c
index cecb0ac9d79..ddf2aeabdbd 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -114,7 +114,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "includes/tiamc1.h"
diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c
index 69d19033fdd..cbf14a51217 100644
--- a/src/mame/drivers/tickee.c
+++ b/src/mame/drivers/tickee.c
@@ -16,7 +16,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "machine/ticket.h"
#include "video/tlc34076.h"
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index ffc8cc407b4..f83899427e4 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -19,7 +19,7 @@ Memory Overview:
***************************************************************************/
-#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/timelimt.c b/src/mame/drivers/timelimt.c
index 37a99cb84ff..df47f6633e8 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -10,7 +10,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c
index 77516a86535..04ec92441a2 100644
--- a/src/mame/drivers/timeplt.c
+++ b/src/mame/drivers/timeplt.c
@@ -44,7 +44,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/timeplt.h"
#include "includes/konamipt.h"
diff --git a/src/mame/drivers/timetrv.c b/src/mame/drivers/timetrv.c
index 28ebc51ce8d..16ea21a0811 100644
--- a/src/mame/drivers/timetrv.c
+++ b/src/mame/drivers/timetrv.c
@@ -23,7 +23,7 @@ CPU is an Intel 80188
*************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i86/i86.h"
static UINT8 *led_vram_lo,*led_vram_hi;
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index 9aec277c1a8..7caf9978305 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -101,7 +101,7 @@ To Do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/tmmjprd.c b/src/mame/drivers/tmmjprd.c
index daef3eb416d..36185e7c07b 100644
--- a/src/mame/drivers/tmmjprd.c
+++ b/src/mame/drivers/tmmjprd.c
@@ -29,7 +29,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index b28de62bb39..832dc4b81c3 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -64,7 +64,7 @@ Updates:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "video/konicdev.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index 630d0cabee2..f6f58f5ac83 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -619,7 +619,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/11/06
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/taitoipt.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index f787f98d77a..223c0105897 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -61,7 +61,7 @@ To Do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms32010/tms32010.h"
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 7a4c1409c56..e489f01596a 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -250,7 +250,7 @@ To Do / Unknowns:
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z180/z180.h"
#include "cpu/nec/nec.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index 54b6c5fc291..498ee6cab10 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -34,7 +34,7 @@ for now. Even at 12 this slowdown still happens a little.
***************************************************************************/
-#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/tokyocop.c b/src/mame/drivers/tokyocop.c
index 99a922b6bb6..38b6111bc56 100644
--- a/src/mame/drivers/tokyocop.c
+++ b/src/mame/drivers/tokyocop.c
@@ -16,7 +16,7 @@ I/O Board with Altera Flex EPF15K50EQC240-3
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i386/i386.h"
static VIDEO_START(tokyocop)
diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c
index f1f171bbe00..9d7872e84e2 100644
--- a/src/mame/drivers/tomcat.c
+++ b/src/mame/drivers/tomcat.c
@@ -22,7 +22,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms32010/tms32010.h"
diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c
index c20d71bf7e1..b06bae8094e 100644
--- a/src/mame/drivers/toobin.c
+++ b/src/mame/drivers/toobin.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/topshoot.c b/src/mame/drivers/topshoot.c
index 236d260559c..273523128f2 100644
--- a/src/mame/drivers/topshoot.c
+++ b/src/mame/drivers/topshoot.c
@@ -117,7 +117,7 @@ connector, but of course, I can be wrong.
*/
-#include "driver.h"
+#include "emu.h"
#include "megadriv.h"
static INPUT_PORTS_START( topshoot ) /* Top Shooter Input Ports */
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index aa363de4a65..7e1b71943f1 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -229,7 +229,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 "includes/taitoipt.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index e46930fdd40..bb53bcd7d17 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -17,7 +17,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
#include "sound/sn76477.h"
diff --git a/src/mame/drivers/tourtabl.c b/src/mame/drivers/tourtabl.c
index 83c279ac278..dddd2c477c6 100644
--- a/src/mame/drivers/tourtabl.c
+++ b/src/mame/drivers/tourtabl.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/6532riot.h"
#include "cpu/m6502/m6502.h"
#include "sound/tiaintf.h"
diff --git a/src/mame/drivers/toypop.c b/src/mame/drivers/toypop.c
index b06b6a4e956..1e6c30e008f 100644
--- a/src/mame/drivers/toypop.c
+++ b/src/mame/drivers/toypop.c
@@ -29,7 +29,7 @@ TODO:
****************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
#include "machine/namcoio.h"
diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c
index fc73cd8e8a6..07206d618e9 100644
--- a/src/mame/drivers/tp84.c
+++ b/src/mame/drivers/tp84.c
@@ -64,7 +64,7 @@ C004 76489 #4 trigger
***************************************************************************/
-#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/trackfld.c b/src/mame/drivers/trackfld.c
index fe2d67bd595..6aaa9996fb2 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -17,7 +17,7 @@ MAIN BOARD:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6800/m6800.h"
#include "machine/konami1.h"
diff --git a/src/mame/drivers/travrusa.c b/src/mame/drivers/travrusa.c
index 79db698cc3c..2d00a81cab3 100644
--- a/src/mame/drivers/travrusa.c
+++ b/src/mame/drivers/travrusa.c
@@ -47,7 +47,7 @@ and 2764 eprom (swapped D3/D4 and D5/D6 data lines)
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/iremz80.h"
diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c
index dea4dcb0022..4cdccf3b1fc 100644
--- a/src/mame/drivers/triforce.c
+++ b/src/mame/drivers/triforce.c
@@ -396,9 +396,8 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/powerpc/ppc.h"
-#include "video/generic.h"
#include "includes/naomibd.h"
static ADDRESS_MAP_START( gc_map, ADDRESS_SPACE_PROGRAM, 32 )
diff --git a/src/mame/drivers/triplhnt.c b/src/mame/drivers/triplhnt.c
index 29d9ecaca9c..5cc6c3cda2a 100644
--- a/src/mame/drivers/triplhnt.c
+++ b/src/mame/drivers/triplhnt.c
@@ -10,7 +10,7 @@ To Do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "includes/triplhnt.h"
diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c
index dc642b892c3..541f3da9bcc 100644
--- a/src/mame/drivers/truco.c
+++ b/src/mame/drivers/truco.c
@@ -15,7 +15,7 @@
game options are truncated. Title is also truncated.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c
index 558314ea3c7..899393e4771 100644
--- a/src/mame/drivers/trucocl.c
+++ b/src/mame/drivers/trucocl.c
@@ -32,7 +32,7 @@ Daughterboard: Custom made, plugged in the 2 roms and Z80 mainboard sockets.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c
index 7e04224f5c1..7e4ef488841 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -60,7 +60,7 @@ Technology = NMOS
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index 4176e263ed0..23dcf84fa80 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -34,7 +34,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/6522via.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index 2e22181e4d0..5c5642f08c8 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -20,7 +20,7 @@ $208 strikes count
****************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index 8b5dc7e2c33..c85450607f7 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -41,7 +41,7 @@ TODO:
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index e73eb0d99bb..960b13459d5 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -41,7 +41,7 @@ The PCB is Spanish and manufacured by Gamart.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
static UINT16 *peno_vram;
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index 58e1600874c..f9af5264f88 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -98,7 +98,7 @@ TP-S.1 TP-S.2 TP-S.3 TP-B.1 8212 TP-B.2 TP-B.3 TP-B.4
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index ec693fdfa2a..5b09d5246a8 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -21,7 +21,7 @@ always false - counter was reloaded and incremented before interrupt occurs
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/6821pia.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index a791cd6b53d..e05ea7165aa 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -308,7 +308,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 "cpu/h6280/h6280.h"
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index 5bde8a25019..8204c3a15fa 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -39,7 +39,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
***************************************************************************/
-#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/tunhunt.c b/src/mame/drivers/tunhunt.c
index 8b97333356a..2245f40db6b 100644
--- a/src/mame/drivers/tunhunt.c
+++ b/src/mame/drivers/tunhunt.c
@@ -48,7 +48,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/turbo.c b/src/mame/drivers/turbo.c
index c84eadbe844..51ddc01f020 100644
--- a/src/mame/drivers/turbo.c
+++ b/src/mame/drivers/turbo.c
@@ -144,7 +144,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
#include "includes/turbo.h"
diff --git a/src/mame/drivers/turrett.c b/src/mame/drivers/turrett.c
index 205247152a1..50ed3dbb8ef 100644
--- a/src/mame/drivers/turrett.c
+++ b/src/mame/drivers/turrett.c
@@ -57,7 +57,7 @@ Windows showed a 5.94 gig partion empty and a 12.74 unallocated partition
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/r3000.h"
diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c
index 65a43bd934a..91f0804dc56 100644
--- a/src/mame/drivers/tutankhm.c
+++ b/src/mame/drivers/tutankhm.c
@@ -20,7 +20,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "includes/timeplt.h"
#include "includes/konamipt.h"
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index 9c42e3a5961..ea0188d85a4 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -43,7 +43,7 @@ Known Issues:
*/
-#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/twincobr.c b/src/mame/drivers/twincobr.c
index 2cab5646818..6c479678bec 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -187,7 +187,7 @@ Shark Zame
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms32010/tms32010.h"
diff --git a/src/mame/drivers/twinkle.c b/src/mame/drivers/twinkle.c
index 1febd967901..4f8958a113e 100644
--- a/src/mame/drivers/twinkle.c
+++ b/src/mame/drivers/twinkle.c
@@ -224,7 +224,7 @@ Notes:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/psx.h"
#include "cpu/m68000/m68000.h"
#include "includes/psx.h"
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 4ee6796d752..d3a452c13a8 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -48,7 +48,7 @@ Electronic Devices was printed on rom labels
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/nec/nec.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index f27de22f898..e45df92112f 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -38,7 +38,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/i86/i86.h"
#include "machine/8255ppi.h"
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index 19cbb47c685..858db579bfe 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -23,7 +23,7 @@
- tone played by jamma if board is not emulated
*/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "cpu/h6280/h6280.h"
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index bac8cb50be8..442e1635460 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -9,7 +9,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/ultratnk.c b/src/mame/drivers/ultratnk.c
index 511267d0542..c82eb976f2c 100644
--- a/src/mame/drivers/ultratnk.c
+++ b/src/mame/drivers/ultratnk.c
@@ -4,7 +4,7 @@ Atari Ultra Tank driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/ultratnk.h"
#include "audio/sprint4.h"
diff --git a/src/mame/drivers/ultrsprt.c b/src/mame/drivers/ultrsprt.c
index df3f15fad2a..aef76edbf9d 100644
--- a/src/mame/drivers/ultrsprt.c
+++ b/src/mame/drivers/ultrsprt.c
@@ -8,7 +8,7 @@ TODO:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/powerpc/ppc.h"
#include "sound/k054539.h"
diff --git a/src/mame/drivers/undrfire.c b/src/mame/drivers/undrfire.c
index d64df88ad1b..807e3e95e0a 100644
--- a/src/mame/drivers/undrfire.c
+++ b/src/mame/drivers/undrfire.c
@@ -186,7 +186,7 @@ Board contains only 29 ROMs and not much else.
***************************************************************************/
-#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/unico.c b/src/mame/drivers/unico.c
index 1b1d0e9d543..d9d476e0757 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -22,7 +22,7 @@ Year + Game PCB Notes
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eeprom.h"
#include "includes/unico.h"
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index b13100dc900..eec9873833a 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -23,7 +23,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/usgames.c b/src/mame/drivers/usgames.c
index 59332efee95..9f13b414abe 100644
--- a/src/mame/drivers/usgames.c
+++ b/src/mame/drivers/usgames.c
@@ -23,7 +23,7 @@ Sound: AY-3-8912
*/
-#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/vamphalf.c b/src/mame/drivers/vamphalf.c
index 35df736cb85..353fd9cd0ba 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -26,7 +26,7 @@
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mcs51/mcs51.h"
#include "cpu/e132xs/e132xs.h"
#include "machine/eeprom.h"
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index 20c122ed0cf..f58fa13a819 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -8,7 +8,7 @@
added pal & prom-maps - Highwayman.
***************************************************************************/
-#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/vastar.c b/src/mame/drivers/vastar.c
index 01b122c521b..d8313e89e32 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -61,7 +61,7 @@ write:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index 4306971e92c..573000152bf 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -87,7 +87,7 @@ VBlank = 58Hz
*********************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/z80/z80.h"
#include "sound/2151intf.h"
diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c
index fdc96ba5d3a..3930e2a9a3e 100644
--- a/src/mame/drivers/vcombat.c
+++ b/src/mame/drivers/vcombat.c
@@ -80,11 +80,10 @@ TODO : This is a partially working driver. Most of the memory maps for
----------------------------------------------
*/
-#include "driver.h"
+#include "emu.h"
#include "rendlay.h"
#include "cpu/m68000/m68000.h"
#include "cpu/i860/i860.h"
-#include "video/generic.h"
#include "video/tlc34076.h"
#include "video/mc6845.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/vega.c b/src/mame/drivers/vega.c
index 57febcf4cfd..6fc9386d640 100644
--- a/src/mame/drivers/vega.c
+++ b/src/mame/drivers/vega.c
@@ -11,7 +11,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/drivers/vegaeo.c b/src/mame/drivers/vegaeo.c
index 6083225fca7..654224d3aac 100644
--- a/src/mame/drivers/vegaeo.c
+++ b/src/mame/drivers/vegaeo.c
@@ -12,7 +12,7 @@
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/e132xs/e132xs.h"
#include "deprecat.h"
#include "machine/at28c16.h"
diff --git a/src/mame/drivers/vegas.c b/src/mame/drivers/vegas.c
index 01638f64e61..ead5f53bd79 100644
--- a/src/mame/drivers/vegas.c
+++ b/src/mame/drivers/vegas.c
@@ -272,7 +272,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/adsp2100/adsp2100.h"
#include "cpu/mips/mips3.h"
#include "audio/dcs.h"
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index fd4f8cb5918..cde8317d35d 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -86,7 +86,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/vertigo.c b/src/mame/drivers/vertigo.c
index 7b7246444f4..f159c69359a 100644
--- a/src/mame/drivers/vertigo.c
+++ b/src/mame/drivers/vertigo.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6805/m6805.h"
#include "cpu/m68000/m68000.h"
#include "video/vector.h"
diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c
index 4a7b8895e42..5a75c364e2e 100644
--- a/src/mame/drivers/vicdual.c
+++ b/src/mame/drivers/vicdual.c
@@ -51,7 +51,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
#include "includes/vicdual.h"
diff --git a/src/mame/drivers/victory.c b/src/mame/drivers/victory.c
index 1808000417a..93b23175da1 100644
--- a/src/mame/drivers/victory.c
+++ b/src/mame/drivers/victory.c
@@ -94,7 +94,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/exidy.h"
#include "includes/victory.h"
diff --git a/src/mame/drivers/videopin.c b/src/mame/drivers/videopin.c
index cc129fde91b..7c199295fea 100644
--- a/src/mame/drivers/videopin.c
+++ b/src/mame/drivers/videopin.c
@@ -10,7 +10,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/videopin.h"
#include "videopin.lh"
diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c
index 7faceee30a9..f411ee443ea 100644
--- a/src/mame/drivers/videopkr.c
+++ b/src/mame/drivers/videopkr.c
@@ -256,7 +256,7 @@
#define VIDEO_CLOCK (XTAL_7.8643MHz)
-#include "driver.h"
+#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "cpu/mcs51/mcs51.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index cc3402cc46d..41742cd01d1 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -14,7 +14,7 @@ Buccaneers has a 5.6888 Mhz and a 18.432 Mhz OSC
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "audio/m72.h"
diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c
index 96615379286..d708a6ea957 100644
--- a/src/mame/drivers/vindictr.c
+++ b/src/mame/drivers/vindictr.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "audio/atarijsa.h"
#include "includes/vindictr.h"
diff --git a/src/mame/drivers/viper.c b/src/mame/drivers/viper.c
index 7c01a7edd2d..6d99981a6ec 100644
--- a/src/mame/drivers/viper.c
+++ b/src/mame/drivers/viper.c
@@ -37,7 +37,7 @@ DASM code snippets:
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/powerpc/ppc.h"
#include "machine/pci.h"
#include "memconv.h"
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index 68093df0874..4aa0f8521e5 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -75,7 +75,7 @@ cleanup
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "sound/es8712.h"
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index 48b6bda08d6..aada0414b14 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -47,7 +47,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
#define CPU_CLOCK (XTAL_32MHz / 4) /* 8 MHz clock for 68000 */
#define SOUND_CPU_CLOCK (XTAL_32MHz / 8) /* 4 MHz 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/vp101.c b/src/mame/drivers/vp101.c
index a59724ee089..e2045b44083 100644
--- a/src/mame/drivers/vp101.c
+++ b/src/mame/drivers/vp101.c
@@ -12,7 +12,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/mips3.h"
#include "machine/idectrl.h"
diff --git a/src/mame/drivers/vpoker.c b/src/mame/drivers/vpoker.c
index 1a29020d9c3..f0a9f21c66a 100644
--- a/src/mame/drivers/vpoker.c
+++ b/src/mame/drivers/vpoker.c
@@ -78,7 +78,7 @@ mm74c920J/mmc6551j-9 x2
**************************************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/6840ptm.h"
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index edeb4820ad3..dd9bf49b0a6 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -34,7 +34,7 @@ Tomasz Slanina 20050225
*/
-#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/vsnes.c b/src/mame/drivers/vsnes.c
index c37984637f2..b0ce2fb1b70 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -127,7 +127,7 @@ Changes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "rendlay.h"
#include "video/ppu2c0x.h"
diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c
index 4f374007d71..cce3585b53c 100644
--- a/src/mame/drivers/vulgus.c
+++ b/src/mame/drivers/vulgus.c
@@ -39,7 +39,7 @@ c001 YM2203 #2 write
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c
index 0e642c4b3fa..c7ce9c47c51 100644
--- a/src/mame/drivers/wallc.c
+++ b/src/mame/drivers/wallc.c
@@ -47,7 +47,7 @@ Thanks to HIGHWAYMAN for providing info on how to get to these epoxies
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "video/resnet.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 35713853179..cb580b75fad 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -123,7 +123,7 @@ out:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/tms32010/tms32010.h"
#include "includes/twincobr.h"
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index 56dd4a69f8d..57b20a90c6f 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -126,7 +126,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "includes/warpwarp.h"
#include "geebee.lh"
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index 79089fb337f..663b932758f 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -143,7 +143,7 @@ Colscroll effects?
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "rendlay.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index 5d302dc775b..4724ea5de12 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -74,7 +74,7 @@ voice.ic82 CRC32 abc61f3d SHA1 c6f123d16a26c4d77c635617dd97bb4b906c463a
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/2608intf.h"
#include "includes/wc90.h"
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index fa5f0b48762..e4e37a79709 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -82,7 +82,7 @@ Noted added by ClawGrip 28-Mar-2008:
*/
-#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/wecleman.c b/src/mame/drivers/wecleman.c
index 0ee54a4239b..c4c70a1876c 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -269,7 +269,7 @@ TODO:
***************************************************************************/
-#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/welltris.c b/src/mame/drivers/welltris.c
index 4bb5489a02e..a9d6870abaa 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -312,7 +312,7 @@ TODO:
#define WELLTRIS_4P_HACK 0
-#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/wgp.c b/src/mame/drivers/wgp.c
index 042dfdfd100..9d50d0f004d 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -393,7 +393,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 "includes/taitoipt.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/wheelfir.c b/src/mame/drivers/wheelfir.c
index 5f00b7f2b52..ad315bd3c09 100644
--- a/src/mame/drivers/wheelfir.c
+++ b/src/mame/drivers/wheelfir.c
@@ -49,7 +49,7 @@ something is missing, currently needs a hack to boot
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
diff --git a/src/mame/drivers/williams.c b/src/mame/drivers/williams.c
index 16f53abdd3a..bd3a1e0faeb 100644
--- a/src/mame/drivers/williams.c
+++ b/src/mame/drivers/williams.c
@@ -491,7 +491,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index 78ec5b9cc97..d0e82b192a1 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -11,7 +11,7 @@
- I need a better comparison screenshot to be sure about the colors.
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c
index 35c6e886692..2fca11bb10b 100644
--- a/src/mame/drivers/wiping.c
+++ b/src/mame/drivers/wiping.c
@@ -33,7 +33,7 @@ dip: 6.7 7.7
1 1 5 lives
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/wiping.h"
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index 475c48593e4..aea2d8858de 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -189,7 +189,7 @@ TODO :
- Figure out the ports for the "PayOut" stuff (a006/a00c?)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/es8712.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index bc104d9aea2..bd8e45a4d74 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -157,7 +157,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/ay8910.h"
diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c
index 86c5abbd174..aa06c324678 100644
--- a/src/mame/drivers/wldarrow.c
+++ b/src/mame/drivers/wldarrow.c
@@ -15,7 +15,7 @@ XTal: 20.0
**********************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/wolfpack.c b/src/mame/drivers/wolfpack.c
index ad1ca45b87b..fd3c824fc95 100644
--- a/src/mame/drivers/wolfpack.c
+++ b/src/mame/drivers/wolfpack.c
@@ -4,7 +4,7 @@ Atari Wolf Pack (prototype) driver
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/s14001a.h"
diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c
index dd21029d877..3cd02e6f190 100644
--- a/src/mame/drivers/wrally.c
+++ b/src/mame/drivers/wrally.c
@@ -94,7 +94,7 @@ produces a high clock frequency, slow movements a low freq.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/mcs51/mcs51.h"
#include "sound/okim6295.h"
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index 71500a16e5d..e92fafc420c 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -137,7 +137,7 @@ Notes:
*******************************************************************************/
-#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/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index 72adf3e1f1f..e2861b82b21 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -37,7 +37,7 @@
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "includes/wwfwfest.h"
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index 6afec582816..8e07494f5d4 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -141,7 +141,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6805/m6805.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 7ad5330a5a5..edd2e8012f5 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -57,7 +57,7 @@ Unresolved Issues:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "video/konicdev.h"
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index 269c9d01948..31842d5c85d 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -13,7 +13,7 @@ on the 2/4p board is 053253. This chip is also on Run n Gun which should
likewise be a 2 screen game
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "video/konicdev.h"
diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c
index 6fb06b2bf3d..5e0c431833d 100644
--- a/src/mame/drivers/xorworld.c
+++ b/src/mame/drivers/xorworld.c
@@ -30,7 +30,7 @@ EEPROM chip: 93C46
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "machine/eeprom.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index f33e4cae354..8c837204a2f 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -6,7 +6,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "video/tlc34076.h"
#include "machine/ticket.h"
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index a91c12a816a..4845b0be5a1 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -8,7 +8,7 @@ XX Mission (c) 1986 UPL
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/2203intf.h"
diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c
index c79628dbe49..aab8ecc7cf6 100644
--- a/src/mame/drivers/xybots.c
+++ b/src/mame/drivers/xybots.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/xyonix.c b/src/mame/drivers/xyonix.c
index 96099ff9195..fd07c4835ad 100644
--- a/src/mame/drivers/xyonix.c
+++ b/src/mame/drivers/xyonix.c
@@ -19,7 +19,7 @@ TODO:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c
index b74b241047d..b117b2d09bb 100644
--- a/src/mame/drivers/yiear.c
+++ b/src/mame/drivers/yiear.c
@@ -47,7 +47,7 @@ The 6809 NMI is used for sound timing.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/sn76496.h"
#include "sound/vlm5030.h"
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index e9dfa4bd7a5..ceae0914d11 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -85,7 +85,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/yunsun16.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c
index 8368605fdf8..6e6bde93662 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -29,7 +29,7 @@ To Do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
#include "sound/msm5205.h"
diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c
index 5a2de0d08a1..83b97aa53eb 100644
--- a/src/mame/drivers/zac2650.c
+++ b/src/mame/drivers/zac2650.c
@@ -8,7 +8,7 @@
* mike@the-coates.com
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "tinv2650.lh"
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index 4a13e2293c8..c275aadc0b4 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -32,7 +32,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/zaxxon.c b/src/mame/drivers/zaxxon.c
index b9f18ec2985..c27573914a8 100644
--- a/src/mame/drivers/zaxxon.c
+++ b/src/mame/drivers/zaxxon.c
@@ -251,7 +251,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "sound/samples.h"
diff --git a/src/mame/drivers/zerozone.c b/src/mame/drivers/zerozone.c
index 0846fad00e8..5c49583b17b 100644
--- a/src/mame/drivers/zerozone.c
+++ b/src/mame/drivers/zerozone.c
@@ -27,7 +27,7 @@
*********************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/zerozone.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index e14553f64e9..7408a3b476c 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "deprecat.h"
#include "cpu/mips/psx.h"
diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c
index 64c70d28178..30fe1480efc 100644
--- a/src/mame/drivers/zodiack.c
+++ b/src/mame/drivers/zodiack.c
@@ -78,7 +78,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "deprecat.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c
index 583876d1c30..511b4d12e8c 100644
--- a/src/mame/drivers/zr107.c
+++ b/src/mame/drivers/zr107.c
@@ -163,7 +163,7 @@ Check gticlub.c for details on the bottom board.
*/
-#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/etc/jrcrypt.c b/src/mame/etc/jrcrypt.c
index b2027c961fc..a75252e4706 100644
--- a/src/mame/etc/jrcrypt.c
+++ b/src/mame/etc/jrcrypt.c
@@ -13,13 +13,8 @@
***************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "emu.h"
#include <ctype.h>
-#include "mame.h"
-#include "driver.h"
-#include "osdepend.h"
static int interrupt_enable;
diff --git a/src/mame/machine/acitya.c b/src/mame/machine/acitya.c
index c15c1f14aeb..3a178ee5770 100644
--- a/src/mame/machine/acitya.c
+++ b/src/mame/machine/acitya.c
@@ -12,7 +12,7 @@ David Widel d_widel@hotmail.com
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/pacman.h"
static INT8 counter=0;
diff --git a/src/mame/machine/ajax.c b/src/mame/machine/ajax.c
index f3a42385950..b1f3d2e4b73 100644
--- a/src/mame/machine/ajax.c
+++ b/src/mame/machine/ajax.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/z80/z80.h"
#include "cpu/konami/konami.h"
diff --git a/src/mame/machine/amiga.c b/src/mame/machine/amiga.c
index a61988c582c..e9322319c02 100644
--- a/src/mame/machine/amiga.c
+++ b/src/mame/machine/amiga.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/amiga.h"
#include "cpu/m68000/m68000.h"
#include "machine/6526cia.h"
diff --git a/src/mame/machine/archimds.c b/src/mame/machine/archimds.c
index 5b80c784848..fbd10bbb5eb 100644
--- a/src/mame/machine/archimds.c
+++ b/src/mame/machine/archimds.c
@@ -26,7 +26,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/machine/arkanoid.c b/src/mame/machine/arkanoid.c
index ac2cbfed4b9..bcacb7e7d9b 100644
--- a/src/mame/machine/arkanoid.c
+++ b/src/mame/machine/arkanoid.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/arkanoid.h"
diff --git a/src/mame/machine/asic65.c b/src/mame/machine/asic65.c
index 808079be793..92283801a13 100644
--- a/src/mame/machine/asic65.c
+++ b/src/mame/machine/asic65.c
@@ -4,7 +4,7 @@
*
*************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/atarig42.h"
#include "cpu/tms32010/tms32010.h"
#include "asic65.h"
diff --git a/src/mame/machine/asteroid.c b/src/mame/machine/asteroid.c
index c98a0771880..85352629728 100644
--- a/src/mame/machine/asteroid.c
+++ b/src/mame/machine/asteroid.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atari_vg.h"
#include "video/avgdvg.h"
#include "includes/asteroid.h"
diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c
index fab82816e39..a0c93ab759f 100644
--- a/src/mame/machine/atari.c
+++ b/src/mame/machine/atari.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/atari.h"
#include "sound/pokey.h"
diff --git a/src/mame/machine/atari_vg.c b/src/mame/machine/atari_vg.c
index f5840984305..d1f080b48f0 100644
--- a/src/mame/machine/atari_vg.c
+++ b/src/mame/machine/atari_vg.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "atari_vg.h"
#define EAROM_SIZE 0x40
diff --git a/src/mame/machine/atarifb.c b/src/mame/machine/atarifb.c
index e2da2900241..522483b4f2f 100644
--- a/src/mame/machine/atarifb.c
+++ b/src/mame/machine/atarifb.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "includes/atarifb.h"
#include "sound/discrete.h"
diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c
index 041d12e9372..c0d22d5fcc7 100644
--- a/src/mame/machine/atarigen.c
+++ b/src/mame/machine/atarigen.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/2151intf.h"
#include "sound/2413intf.h"
diff --git a/src/mame/machine/bagman.c b/src/mame/machine/bagman.c
index 0b8c9230912..5307144ce06 100644
--- a/src/mame/machine/bagman.c
+++ b/src/mame/machine/bagman.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/bagman.h"
diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c
index 8b8f530d9ab..882ded1a5af 100644
--- a/src/mame/machine/balsente.c
+++ b/src/mame/machine/balsente.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "includes/balsente.h"
#include "sound/cem3394.h"
diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c
index e9e91660293..aab01e8699b 100644
--- a/src/mame/machine/beezer.c
+++ b/src/mame/machine/beezer.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/6522via.h"
#include "includes/beezer.h"
diff --git a/src/mame/machine/bfm_bd1.c b/src/mame/machine/bfm_bd1.c
index e9c361d915d..47765bf560f 100644
--- a/src/mame/machine/bfm_bd1.c
+++ b/src/mame/machine/bfm_bd1.c
@@ -4,7 +4,7 @@
**********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "bfm_bd1.h"
static struct
diff --git a/src/mame/machine/bigevglf.c b/src/mame/machine/bigevglf.c
index b4841b14c53..3c525cc7a2c 100644
--- a/src/mame/machine/bigevglf.c
+++ b/src/mame/machine/bigevglf.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/bigevglf.h"
diff --git a/src/mame/machine/bonzeadv.c b/src/mame/machine/bonzeadv.c
index 759f5d47cf1..deb1cfca346 100644
--- a/src/mame/machine/bonzeadv.c
+++ b/src/mame/machine/bonzeadv.c
@@ -21,7 +21,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/asuka.h"
struct cchip_mapping
diff --git a/src/mame/machine/bsktball.c b/src/mame/machine/bsktball.c
index c95914a2b36..1bfa1c5d7ff 100644
--- a/src/mame/machine/bsktball.c
+++ b/src/mame/machine/bsktball.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/bsktball.h"
/***************************************************************************
diff --git a/src/mame/machine/btime.c b/src/mame/machine/btime.c
index 5f2b47d4fc0..7516d9d755a 100644
--- a/src/mame/machine/btime.c
+++ b/src/mame/machine/btime.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/btime.h"
diff --git a/src/mame/machine/bublbobl.c b/src/mame/machine/bublbobl.c
index 0c5862ec3a4..5669c4ee335 100644
--- a/src/mame/machine/bublbobl.c
+++ b/src/mame/machine/bublbobl.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/z80/z80.h"
#include "includes/bublbobl.h"
diff --git a/src/mame/machine/buggychl.c b/src/mame/machine/buggychl.c
index 047df7eb485..b90d1ae81e6 100644
--- a/src/mame/machine/buggychl.c
+++ b/src/mame/machine/buggychl.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/buggychl.h"
diff --git a/src/mame/machine/carpolo.c b/src/mame/machine/carpolo.c
index 12a4ca86d8d..17af8e76be9 100644
--- a/src/mame/machine/carpolo.c
+++ b/src/mame/machine/carpolo.c
@@ -6,7 +6,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/6821pia.h"
#include "machine/7474.h"
diff --git a/src/mame/machine/cchasm.c b/src/mame/machine/cchasm.c
index 09e0cc9fb41..7b4de3a0380 100644
--- a/src/mame/machine/cchasm.c
+++ b/src/mame/machine/cchasm.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/vector.h"
#include "includes/cchasm.h"
diff --git a/src/mame/machine/cchip.c b/src/mame/machine/cchip.c
index d723458a20d..40e46d53d10 100644
--- a/src/mame/machine/cchip.c
+++ b/src/mame/machine/cchip.c
@@ -29,7 +29,7 @@ This code requires that the player & coin inputs be in input ports 2-4.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/cchip.h"
static UINT16 current_bank = 0;
diff --git a/src/mame/machine/cclimber.c b/src/mame/machine/cclimber.c
index ab41dae69fb..67fd2358080 100644
--- a/src/mame/machine/cclimber.c
+++ b/src/mame/machine/cclimber.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/cclimber.h"
/* set to 1 to fix protection check after bonus round (see notes in pacman.c driver) */
diff --git a/src/mame/machine/chaknpop.c b/src/mame/machine/chaknpop.c
index b65ae82262a..8bd92e6b304 100644
--- a/src/mame/machine/chaknpop.c
+++ b/src/mame/machine/chaknpop.c
@@ -3,7 +3,7 @@
* simulate 68705 MCU
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/chaknpop.h"
diff --git a/src/mame/machine/copsnrob.c b/src/mame/machine/copsnrob.c
index f8314b0afcb..1fbd42ae869 100644
--- a/src/mame/machine/copsnrob.c
+++ b/src/mame/machine/copsnrob.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/copsnrob.h"
static const int gun_mask[] = {0x7e, 0x7d, 0x7b, 0x77, 0x6f, 0x5f, 0x3f};
diff --git a/src/mame/machine/cps2crpt.c b/src/mame/machine/cps2crpt.c
index b3c412c4bfc..fc76f098e15 100644
--- a/src/mame/machine/cps2crpt.c
+++ b/src/mame/machine/cps2crpt.c
@@ -110,7 +110,7 @@ the decryption keys.
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "ui.h"
#include "includes/cps1.h"
diff --git a/src/mame/machine/cubocd32.c b/src/mame/machine/cubocd32.c
index c4a4776f8a1..6027f165ef0 100644
--- a/src/mame/machine/cubocd32.c
+++ b/src/mame/machine/cubocd32.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/amiga.h"
#include "cdrom.h"
#include "coreutil.h"
diff --git a/src/mame/machine/daikaiju.c b/src/mame/machine/daikaiju.c
index 766765a2e02..cb324391992 100644
--- a/src/mame/machine/daikaiju.c
+++ b/src/mame/machine/daikaiju.c
@@ -97,7 +97,7 @@ displayed (game) or not (attract mode). Due to above bug message is always displ
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/lsasquad.h"
diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c
index b966a1da16f..7cd4c014b8d 100644
--- a/src/mame/machine/dc.c
+++ b/src/mame/machine/dc.c
@@ -4,7 +4,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "debugger.h"
#include "includes/dc.h"
#include "cpu/sh4/sh4.h"
diff --git a/src/mame/machine/dec0.c b/src/mame/machine/dec0.c
index b03211f9e53..e62d7f3ffe5 100644
--- a/src/mame/machine/dec0.c
+++ b/src/mame/machine/dec0.c
@@ -6,7 +6,7 @@ Data East machine functions - Bryan McPhail, mish@tendril.co.uk
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/dec0.h"
#include "cpu/h6280/h6280.h"
diff --git a/src/mame/machine/deco102.c b/src/mame/machine/deco102.c
index bc747b7e706..c944957f97d 100644
--- a/src/mame/machine/deco102.c
+++ b/src/mame/machine/deco102.c
@@ -7,7 +7,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "includes/decocrpt.h"
diff --git a/src/mame/machine/deco156.c b/src/mame/machine/deco156.c
index 3c47b2629ec..c292223e6c9 100644
--- a/src/mame/machine/deco156.c
+++ b/src/mame/machine/deco156.c
@@ -30,7 +30,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/decocrpt.h"
diff --git a/src/mame/machine/decocass.c b/src/mame/machine/decocass.c
index d93f069c823..f7f92dcaf63 100644
--- a/src/mame/machine/decocass.c
+++ b/src/mame/machine/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/machine/decocrpt.c b/src/mame/machine/decocrpt.c
index b551f12a4fd..7b246319079 100644
--- a/src/mame/machine/decocrpt.c
+++ b/src/mame/machine/decocrpt.c
@@ -41,7 +41,7 @@ Sotsugyo Shousho 1995
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/decocrpt.h"
static const UINT16 xor_masks[16] =
diff --git a/src/mame/machine/decoprot.c b/src/mame/machine/decoprot.c
index fee5e1bde18..0f11ea9f1a3 100644
--- a/src/mame/machine/decoprot.c
+++ b/src/mame/machine/decoprot.c
@@ -70,7 +70,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/eeprom.h"
#include "includes/decoprot.h"
diff --git a/src/mame/machine/docastle.c b/src/mame/machine/docastle.c
index e0eea5a4dfe..bfcdf973658 100644
--- a/src/mame/machine/docastle.c
+++ b/src/mame/machine/docastle.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/docastle.h"
diff --git a/src/mame/machine/fd1089.c b/src/mame/machine/fd1089.c
index df913779c4b..32936f5ece0 100644
--- a/src/mame/machine/fd1089.c
+++ b/src/mame/machine/fd1089.c
@@ -119,7 +119,7 @@ CPU # Type Status Game Seed Unencrypted data range
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "fd1089.h"
diff --git a/src/mame/machine/fd1094.c b/src/mame/machine/fd1094.c
index 58bb7c07c6f..f696124fb34 100644
--- a/src/mame/machine/fd1094.c
+++ b/src/mame/machine/fd1094.c
@@ -419,7 +419,7 @@ eswat:
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "fd1094.h"
diff --git a/src/mame/machine/fddebug.c b/src/mame/machine/fddebug.c
index d6bf4af3dfa..18775ebc484 100644
--- a/src/mame/machine/fddebug.c
+++ b/src/mame/machine/fddebug.c
@@ -105,7 +105,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/fd1094.h"
#include "cpu/m68000/m68kcpu.h"
diff --git a/src/mame/machine/flstory.c b/src/mame/machine/flstory.c
index a80e0aaa490..beb7fd8803a 100644
--- a/src/mame/machine/flstory.c
+++ b/src/mame/machine/flstory.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/flstory.h"
/***************************************************************************
diff --git a/src/mame/machine/gaelco2.c b/src/mame/machine/gaelco2.c
index f4b33e223d2..75a3f7dd9f9 100644
--- a/src/mame/machine/gaelco2.c
+++ b/src/mame/machine/gaelco2.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "machine/eeprom.h"
#include "includes/gaelco2.h"
diff --git a/src/mame/machine/gaelcrpt.c b/src/mame/machine/gaelcrpt.c
index 082f01a4441..d6115916d5e 100644
--- a/src/mame/machine/gaelcrpt.c
+++ b/src/mame/machine/gaelcrpt.c
@@ -6,7 +6,7 @@ Thanks to GAELCO SA for information on the algorithm.
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/gaelcrpt.h"
static int decrypt(int const param1, int const param2, int const enc_prev_word, int const dec_prev_word, int const enc_word)
diff --git a/src/mame/machine/galaxold.c b/src/mame/machine/galaxold.c
index fa61d1ed11a..131c3a71696 100644
--- a/src/mame/machine/galaxold.c
+++ b/src/mame/machine/galaxold.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/7474.h"
#include "includes/galaxold.h"
diff --git a/src/mame/machine/gaplus.c b/src/mame/machine/gaplus.c
index b640de3b8d3..d7a4daa4394 100644
--- a/src/mame/machine/gaplus.c
+++ b/src/mame/machine/gaplus.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "includes/gaplus.h"
diff --git a/src/mame/machine/gdcrypt.c b/src/mame/machine/gdcrypt.c
index 8b60da7bb9b..21aacff68df 100644
--- a/src/mame/machine/gdcrypt.c
+++ b/src/mame/machine/gdcrypt.c
@@ -1,7 +1,7 @@
/* DES decryption, used by GD-ROM based titles (Naomi etc.) */
-#include "driver.h"
+#include "emu.h"
#include "includes/naomi.h"
static UINT32 des_subkeys[32];
diff --git a/src/mame/machine/harddriv.c b/src/mame/machine/harddriv.c
index 35d3a83e83f..9871faffd22 100644
--- a/src/mame/machine/harddriv.c
+++ b/src/mame/machine/harddriv.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/adsp2100/adsp2100.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/machine/irem_cpu.c b/src/mame/machine/irem_cpu.c
index 1e3a684736c..bfea2724200 100644
--- a/src/mame/machine/irem_cpu.c
+++ b/src/mame/machine/irem_cpu.c
@@ -39,7 +39,7 @@
-#include "driver.h"
+#include "emu.h"
#include "irem_cpu.h"
diff --git a/src/mame/machine/irobot.c b/src/mame/machine/irobot.c
index fcc154fa40c..d0bb6ecaa9a 100644
--- a/src/mame/machine/irobot.c
+++ b/src/mame/machine/irobot.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "cpu/m6809/m6809.h"
#include "includes/irobot.h"
diff --git a/src/mame/machine/jumpshot.c b/src/mame/machine/jumpshot.c
index e07c619576f..89ab0e78abc 100644
--- a/src/mame/machine/jumpshot.c
+++ b/src/mame/machine/jumpshot.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/pacman.h"
diff --git a/src/mame/machine/kabuki.c b/src/mame/machine/kabuki.c
index bbc4a6ecc9a..705cd853bb6 100644
--- a/src/mame/machine/kabuki.c
+++ b/src/mame/machine/kabuki.c
@@ -93,7 +93,7 @@ Slam Masters 54321076 65432107 3131 19
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/cps1.h"
diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c
index 756e0865e47..0da791e536c 100644
--- a/src/mame/machine/kaneko16.c
+++ b/src/mame/machine/kaneko16.c
@@ -12,7 +12,7 @@ Currently none of the MCUs' internal roms are dumped so simulation is used
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/kaneko16.h"
#include "kanekotb.h" // TOYBOX MCU trojaning results
diff --git a/src/mame/machine/konami1.c b/src/mame/machine/konami1.c
index cb735e6c3d1..a96702e577f 100644
--- a/src/mame/machine/konami1.c
+++ b/src/mame/machine/konami1.c
@@ -5,7 +5,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "konami1.h"
diff --git a/src/mame/machine/konamigx.c b/src/mame/machine/konamigx.c
index 6559d8ad6a3..ae9d6b2715f 100644
--- a/src/mame/machine/konamigx.c
+++ b/src/mame/machine/konamigx.c
@@ -4,7 +4,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "video/konamiic.h"
#include "includes/konamigx.h"
diff --git a/src/mame/machine/konppc.c b/src/mame/machine/konppc.c
index 06c98f11e0d..8c1d837347c 100644
--- a/src/mame/machine/konppc.c
+++ b/src/mame/machine/konppc.c
@@ -1,6 +1,6 @@
/* Konami PowerPC-based 3D games common functions */
-#include "driver.h"
+#include "emu.h"
#include "cpu/sharc/sharc.h"
#include "machine/k033906.h"
#include "video/voodoo.h"
diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c
index 072518c8acc..c5a7de3d3c8 100644
--- a/src/mame/machine/leland.c
+++ b/src/mame/machine/leland.c
@@ -6,7 +6,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/machine/lkage.c b/src/mame/machine/lkage.c
index d73dddc4716..022e2076d34 100644
--- a/src/mame/machine/lkage.c
+++ b/src/mame/machine/lkage.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/lkage.h"
diff --git a/src/mame/machine/lsasquad.c b/src/mame/machine/lsasquad.c
index db875485844..4dcf2b6a66b 100644
--- a/src/mame/machine/lsasquad.c
+++ b/src/mame/machine/lsasquad.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/lsasquad.h"
diff --git a/src/mame/machine/m68kfmly.c b/src/mame/machine/m68kfmly.c
index 1c029b8ae38..098d30b51f8 100644
--- a/src/mame/machine/m68kfmly.c
+++ b/src/mame/machine/m68kfmly.c
@@ -10,7 +10,7 @@ Memo:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "m68kfmly.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/machine/maniach.c b/src/mame/machine/maniach.c
index faa4bf8cc12..390c710caf1 100644
--- a/src/mame/machine/maniach.c
+++ b/src/mame/machine/maniach.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/matmania.h"
diff --git a/src/mame/machine/mathbox.c b/src/mame/machine/mathbox.c
index 41cc7121425..d39edf2f93e 100644
--- a/src/mame/machine/mathbox.c
+++ b/src/mame/machine/mathbox.c
@@ -5,7 +5,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "mathbox.h"
#define REG0 mb->reg [0x00]
diff --git a/src/mame/machine/mc8123.c b/src/mame/machine/mc8123.c
index 64260862a3f..b276d2b4272 100644
--- a/src/mame/machine/mc8123.c
+++ b/src/mame/machine/mc8123.c
@@ -71,7 +71,7 @@ CPU # Game Notes Seed Upper Limit
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "mc8123.h"
diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c
index 0014e0f16bc..617f71a89c6 100644
--- a/src/mame/machine/mcr.c
+++ b/src/mame/machine/mcr.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
diff --git a/src/mame/machine/meters.c b/src/mame/machine/meters.c
index 8b4cafaf141..c86d8dc990b 100644
--- a/src/mame/machine/meters.c
+++ b/src/mame/machine/meters.c
@@ -11,7 +11,7 @@
// //
///////////////////////////////////////////////////////////////////////////
-#include "driver.h"
+#include "emu.h"
#include "meters.h"
// local vars /////////////////////////////////////////////////////////////
diff --git a/src/mame/machine/mexico86.c b/src/mame/machine/mexico86.c
index 66000fbdd16..5a9244e3089 100644
--- a/src/mame/machine/mexico86.c
+++ b/src/mame/machine/mexico86.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "includes/mexico86.h"
diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c
index f952ef11bf4..60e01b91664 100644
--- a/src/mame/machine/mhavoc.c
+++ b/src/mame/machine/mhavoc.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/avgdvg.h"
#include "sound/tms5220.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/machine/midtunit.c b/src/mame/machine/midtunit.c
index c5af044dfc1..8c334a9412a 100644
--- a/src/mame/machine/midtunit.c
+++ b/src/mame/machine/midtunit.c
@@ -4,7 +4,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/m6809/m6809.h"
#include "audio/williams.h"
diff --git a/src/mame/machine/midwayic.c b/src/mame/machine/midwayic.c
index 33b07afeb59..96eda6157f3 100644
--- a/src/mame/machine/midwayic.c
+++ b/src/mame/machine/midwayic.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "debugger.h"
#include "midwayic.h"
#include "machine/idectrl.h"
diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c
index e8e00ff5894..47f6a1998e9 100644
--- a/src/mame/machine/midwunit.c
+++ b/src/mame/machine/midwunit.c
@@ -4,7 +4,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/m6809/m6809.h"
#include "audio/dcs.h"
diff --git a/src/mame/machine/midyunit.c b/src/mame/machine/midyunit.c
index b872850845e..fe03cdee706 100644
--- a/src/mame/machine/midyunit.c
+++ b/src/mame/machine/midyunit.c
@@ -4,7 +4,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "cpu/m6809/m6809.h"
#include "audio/williams.h"
diff --git a/src/mame/machine/model1.c b/src/mame/machine/model1.c
index df8bd9febed..9854f56c571 100644
--- a/src/mame/machine/model1.c
+++ b/src/mame/machine/model1.c
@@ -2,7 +2,7 @@
** Model 1 coprocessor TGP simulation
*/
-#include "driver.h"
+#include "emu.h"
#include "debugger.h"
#include "cpu/mb86233/mb86233.h"
#include "cpu/v60/v60.h"
diff --git a/src/mame/machine/model3.c b/src/mame/machine/model3.c
index d6a6b8758b8..af3bb365e14 100644
--- a/src/mame/machine/model3.c
+++ b/src/mame/machine/model3.c
@@ -4,7 +4,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/model3.h"
static int m3_step;
diff --git a/src/mame/machine/mw8080bw.c b/src/mame/machine/mw8080bw.c
index 7539a101b33..d551ba51d17 100644
--- a/src/mame/machine/mw8080bw.c
+++ b/src/mame/machine/mw8080bw.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/mw8080bw.h"
/*************************************
diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c
index 5caf5671db7..1db986d0409 100644
--- a/src/mame/machine/n64.c
+++ b/src/mame/machine/n64.c
@@ -1,6 +1,6 @@
/* machine/n64.c - contains N64 hardware emulation shared between MAME and MESS */
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/mips3.h"
#include "cpu/mips/mips3com.h"
#include "streams.h"
diff --git a/src/mame/machine/namco06.c b/src/mame/machine/namco06.c
index 34501683224..456dd964b98 100644
--- a/src/mame/machine/namco06.c
+++ b/src/mame/machine/namco06.c
@@ -79,7 +79,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/namco06.h"
#include "machine/namco50.h"
#include "machine/namco51.h"
diff --git a/src/mame/machine/namco50.c b/src/mame/machine/namco50.c
index 448a13914d3..92baea8b03c 100644
--- a/src/mame/machine/namco50.c
+++ b/src/mame/machine/namco50.c
@@ -130,7 +130,7 @@ Flags: 80=high score, 40=first bonus, 20=interval bonus, 10=?
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "namco50.h"
#include "cpu/mb88xx/mb88xx.h"
diff --git a/src/mame/machine/namco51.c b/src/mame/machine/namco51.c
index f1deaa9eaa0..bf8786a7fca 100644
--- a/src/mame/machine/namco51.c
+++ b/src/mame/machine/namco51.c
@@ -54,7 +54,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "namco51.h"
#include "cpu/mb88xx/mb88xx.h"
diff --git a/src/mame/machine/namco53.c b/src/mame/machine/namco53.c
index b1a10b414e4..e6a8ec8deb1 100644
--- a/src/mame/machine/namco53.c
+++ b/src/mame/machine/namco53.c
@@ -52,7 +52,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "namco53.h"
#include "cpu/mb88xx/mb88xx.h"
diff --git a/src/mame/machine/namcoio.c b/src/mame/machine/namcoio.c
index fd18d977bf9..e56fa8f8748 100644
--- a/src/mame/machine/namcoio.c
+++ b/src/mame/machine/namcoio.c
@@ -108,7 +108,7 @@ TODO:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/namcoio.h"
diff --git a/src/mame/machine/namcond1.c b/src/mame/machine/namcond1.c
index fa867e2a857..50393eb3286 100644
--- a/src/mame/machine/namcond1.c
+++ b/src/mame/machine/namcond1.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "includes/namcond1.h"
diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c
index d83eff53d98..846adaee72b 100644
--- a/src/mame/machine/namcos1.c
+++ b/src/mame/machine/namcos1.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "sound/ym2151.h"
#include "sound/namco.h"
#include "includes/namcos1.h"
diff --git a/src/mame/machine/namcos2.c b/src/mame/machine/namcos2.c
index 2cbbcc7ef90..347da68dfec 100644
--- a/src/mame/machine/namcos2.c
+++ b/src/mame/machine/namcos2.c
@@ -9,7 +9,7 @@ Namco System II
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6805/m6805.h"
#include "includes/namcos21.h"
diff --git a/src/mame/machine/naomi.c b/src/mame/machine/naomi.c
index dbbca01e8ec..43cbe2351de 100644
--- a/src/mame/machine/naomi.c
+++ b/src/mame/machine/naomi.c
@@ -4,7 +4,7 @@ Per-game specific JVS settings / idle loop skips for the MAME Naomi driver.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/naomi.h"
UINT64 *naomi_ram64;
diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c
index 0072f1aa51d..01193d5a46d 100644
--- a/src/mame/machine/naomibd.c
+++ b/src/mame/machine/naomibd.c
@@ -170,8 +170,7 @@ Atomiswave ROM board specs from Cah4e3 @ http://cah4e3.wordpress.com/2009/07/26/
// NOTE: all accesses are 16 or 32 bits wide but only 16 bits are valid
-#include "driver.h"
-#include "eminline.h"
+#include "emu.h"
#include "profiler.h"
#include "machine/x76f100.h"
#include "cdrom.h"
diff --git a/src/mame/machine/nb1413m3.c b/src/mame/machine/nb1413m3.c
index c3ea169b4d0..a2612554de8 100644
--- a/src/mame/machine/nb1413m3.c
+++ b/src/mame/machine/nb1413m3.c
@@ -10,7 +10,7 @@ Memo:
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/nb1413m3.h"
diff --git a/src/mame/machine/neoboot.c b/src/mame/machine/neoboot.c
index 0ae38e83983..010d362cabf 100644
--- a/src/mame/machine/neoboot.c
+++ b/src/mame/machine/neoboot.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/neogeo.h"
diff --git a/src/mame/machine/neocrypt.c b/src/mame/machine/neocrypt.c
index f435557a9a4..42300b47441 100644
--- a/src/mame/machine/neocrypt.c
+++ b/src/mame/machine/neocrypt.c
@@ -46,7 +46,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/neogeo.h"
diff --git a/src/mame/machine/neoprot.c b/src/mame/machine/neoprot.c
index 795a600c492..efa94d6441d 100644
--- a/src/mame/machine/neoprot.c
+++ b/src/mame/machine/neoprot.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/neogeo.h"
/************************ Fatal Fury 2 *************************/
diff --git a/src/mame/machine/nitedrvr.c b/src/mame/machine/nitedrvr.c
index 4e62a9f1b18..aa8a20719f2 100644
--- a/src/mame/machine/nitedrvr.c
+++ b/src/mame/machine/nitedrvr.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nitedrvr.h"
#include "sound/discrete.h"
diff --git a/src/mame/machine/nmk004.c b/src/mame/machine/nmk004.c
index a2b5b4a5b44..f9be2c1fc7d 100644
--- a/src/mame/machine/nmk004.c
+++ b/src/mame/machine/nmk004.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "nmk004.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
diff --git a/src/mame/machine/nmk112.c b/src/mame/machine/nmk112.c
index 8c06274093d..0bd0ae42e38 100644
--- a/src/mame/machine/nmk112.c
+++ b/src/mame/machine/nmk112.c
@@ -7,7 +7,7 @@
with the sample data. This allows each of the four voices on the chip
to play a sample from a different bank at the same time. */
-#include "driver.h"
+#include "emu.h"
#include "nmk112.h"
#define TABLESIZE 0x100
diff --git a/src/mame/machine/nycaptor.c b/src/mame/machine/nycaptor.c
index a789ed73106..751c4db68c2 100644
--- a/src/mame/machine/nycaptor.c
+++ b/src/mame/machine/nycaptor.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nycaptor.h"
static UINT8 from_main,from_mcu;
diff --git a/src/mame/machine/opwolf.c b/src/mame/machine/opwolf.c
index 4ac451030c9..d37d36b873d 100644
--- a/src/mame/machine/opwolf.c
+++ b/src/mame/machine/opwolf.c
@@ -35,7 +35,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/opwolf.h"
/* Select how coinage data is initialised in opwolf_cchip_data_w : 0 = user-defined in function - 1 = automatic */
diff --git a/src/mame/machine/pacplus.c b/src/mame/machine/pacplus.c
index 015182eda95..beed2a87365 100644
--- a/src/mame/machine/pacplus.c
+++ b/src/mame/machine/pacplus.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/pacman.h"
diff --git a/src/mame/machine/pcecommn.c b/src/mame/machine/pcecommn.c
index ce5ed006420..c88e0f4888e 100644
--- a/src/mame/machine/pcecommn.c
+++ b/src/mame/machine/pcecommn.c
@@ -1,5 +1,5 @@
-#include "driver.h"
+#include "emu.h"
#include "machine/pcecommn.h"
#include "video/vdc.h"
#include "cpu/h6280/h6280.h"
diff --git a/src/mame/machine/pckeybrd.c b/src/mame/machine/pckeybrd.c
index ecdb65cb2db..74f5ae8112b 100644
--- a/src/mame/machine/pckeybrd.c
+++ b/src/mame/machine/pckeybrd.c
@@ -16,7 +16,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "machine/pckeybrd.h"
#ifdef MESS
diff --git a/src/mame/machine/pcshare.c b/src/mame/machine/pcshare.c
index 7665d2c1659..c2bab6bb7ac 100644
--- a/src/mame/machine/pcshare.c
+++ b/src/mame/machine/pcshare.c
@@ -20,7 +20,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/pcshare.h"
#include "machine/pckeybrd.h"
diff --git a/src/mame/machine/pgmcrypt.c b/src/mame/machine/pgmcrypt.c
index a0ac25a29c0..bc7d576ce1a 100644
--- a/src/mame/machine/pgmcrypt.c
+++ b/src/mame/machine/pgmcrypt.c
@@ -1,6 +1,6 @@
/* IGS PGM System Encryptions */
-#include "driver.h"
+#include "emu.h"
#include "includes/pgm.h"
diff --git a/src/mame/machine/pgmprot.c b/src/mame/machine/pgmprot.c
index 333918991a7..1f246503f41 100644
--- a/src/mame/machine/pgmprot.c
+++ b/src/mame/machine/pgmprot.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/pgm.h"
diff --git a/src/mame/machine/pitnrun.c b/src/mame/machine/pitnrun.c
index ecf8d2958c7..4978a15e3ad 100644
--- a/src/mame/machine/pitnrun.c
+++ b/src/mame/machine/pitnrun.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6805/m6805.h"
#include "includes/pitnrun.h"
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index 12fdf2397fa..3bd30494380 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/ppu2c0x.h"
#include "machine/rp5h01.h"
#include "includes/playch10.h"
diff --git a/src/mame/machine/psx.c b/src/mame/machine/psx.c
index 62b76dd9c8f..dba345a18f8 100644
--- a/src/mame/machine/psx.c
+++ b/src/mame/machine/psx.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/psx.h"
#include "includes/psx.h"
diff --git a/src/mame/machine/qix.c b/src/mame/machine/qix.c
index 2df09439441..195451fc0bb 100644
--- a/src/mame/machine/qix.c
+++ b/src/mame/machine/qix.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6805/m6805.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/machine/r2crypt.c b/src/mame/machine/r2crypt.c
index 9f1633ea8c9..6e6b070dcbf 100644
--- a/src/mame/machine/r2crypt.c
+++ b/src/mame/machine/r2crypt.c
@@ -1,6 +1,6 @@
/* Raiden 2 Sprite Decryption */
-#include "driver.h"
+#include "emu.h"
#include "includes/raiden2.h"
/* INIT */
diff --git a/src/mame/machine/rainbow.c b/src/mame/machine/rainbow.c
index f79c596302f..1a706e316aa 100644
--- a/src/mame/machine/rainbow.c
+++ b/src/mame/machine/rainbow.c
@@ -47,7 +47,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/rainbow.h"
diff --git a/src/mame/machine/retofinv.c b/src/mame/machine/retofinv.c
index 7338864a51c..c743fced427 100644
--- a/src/mame/machine/retofinv.c
+++ b/src/mame/machine/retofinv.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/retofinv.h"
diff --git a/src/mame/machine/s16fd.c b/src/mame/machine/s16fd.c
index 9d67d014daa..3cedbbddaae 100644
--- a/src/mame/machine/s16fd.c
+++ b/src/mame/machine/s16fd.c
@@ -8,7 +8,7 @@ make more configurable (select caches per game?)
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/fd1094.h"
#include "machine/fddebug.h"
diff --git a/src/mame/machine/s24fd.c b/src/mame/machine/s24fd.c
index a92dd791484..72456b8be9e 100644
--- a/src/mame/machine/s24fd.c
+++ b/src/mame/machine/s24fd.c
@@ -5,7 +5,7 @@ this could get messy if games change their own code after initial loading as we'
*/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/fd1094.h"
#include "includes/segas24.h"
diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c
index a57e63b16e3..484fe87c584 100644
--- a/src/mame/machine/scramble.c
+++ b/src/mame/machine/scramble.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/8255ppi.h"
#include "includes/galaxold.h"
diff --git a/src/mame/machine/scudsp.c b/src/mame/machine/scudsp.c
index 9cd20beedec..c8993863472 100644
--- a/src/mame/machine/scudsp.c
+++ b/src/mame/machine/scudsp.c
@@ -49,7 +49,7 @@ Changelog:
- Add control flags
******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/scudsp.h"
#include "sound/scsp.h"
diff --git a/src/mame/machine/segacrpt.c b/src/mame/machine/segacrpt.c
index ec6c066e5ea..00a0722ed44 100644
--- a/src/mame/machine/segacrpt.c
+++ b/src/mame/machine/segacrpt.c
@@ -171,7 +171,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "segacrpt.h"
diff --git a/src/mame/machine/segag80.c b/src/mame/machine/segag80.c
index 74d97d137f6..4a4cfd0de43 100644
--- a/src/mame/machine/segag80.c
+++ b/src/mame/machine/segag80.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/segag80r.h"
UINT8 (*sega_decrypt)(offs_t,UINT8);
diff --git a/src/mame/machine/segaic16.c b/src/mame/machine/segaic16.c
index a0a1fb67c42..e342568b8ab 100644
--- a/src/mame/machine/segaic16.c
+++ b/src/mame/machine/segaic16.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "segaic16.h"
#include "video/resnet.h"
#include "machine/fd1089.h"
diff --git a/src/mame/machine/segas24.c b/src/mame/machine/segas24.c
index 72c74899a80..6b27556582f 100644
--- a/src/mame/machine/segas24.c
+++ b/src/mame/machine/segas24.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/system16.h"
#include "includes/segas24.h"
diff --git a/src/mame/machine/segas32.c b/src/mame/machine/segas32.c
index 03f24e9e42d..2d3b5570353 100644
--- a/src/mame/machine/segas32.c
+++ b/src/mame/machine/segas32.c
@@ -1,6 +1,6 @@
/* Sega System 32 Protection related functions */
-#include "driver.h"
+#include "emu.h"
#include "includes/segas32.h"
diff --git a/src/mame/machine/seibuspi.c b/src/mame/machine/seibuspi.c
index 88d8933aa0d..d7f97154cb2 100644
--- a/src/mame/machine/seibuspi.c
+++ b/src/mame/machine/seibuspi.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/seibuspi.h"
diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c
index 8e8ffa21d9b..3dc76428d66 100644
--- a/src/mame/machine/seicop.c
+++ b/src/mame/machine/seicop.c
@@ -1357,7 +1357,7 @@ Raiden 2 / Zero Team banking doesn't make much sense, a bank address has been fo
hardware, but the game never writes directly to it.
*/
-#include "driver.h"
+#include "emu.h"
#include "audio/seibu.h"
#include "includes/legionna.h"
#include "includes/raiden2.h"
diff --git a/src/mame/machine/simpsons.c b/src/mame/machine/simpsons.c
index cbaa5057653..46dcf638fda 100644
--- a/src/mame/machine/simpsons.c
+++ b/src/mame/machine/simpsons.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "cpu/konami/konami.h"
#include "machine/eeprom.h"
diff --git a/src/mame/machine/slapfght.c b/src/mame/machine/slapfght.c
index 6da190443fc..ffb2fe54888 100644
--- a/src/mame/machine/slapfght.c
+++ b/src/mame/machine/slapfght.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/slapfght.h"
diff --git a/src/mame/machine/slapstic.c b/src/mame/machine/slapstic.c
index 7e0c368f2af..e3ccc26a767 100644
--- a/src/mame/machine/slapstic.c
+++ b/src/mame/machine/slapstic.c
@@ -178,7 +178,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "includes/slapstic.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/machine/slikshot.c b/src/mame/machine/slikshot.c
index 7f7e7c389cf..7ea5808bd81 100644
--- a/src/mame/machine/slikshot.c
+++ b/src/mame/machine/slikshot.c
@@ -67,7 +67,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/itech8.h"
diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c
index 0147a7ba17c..8c844e9823a 100644
--- a/src/mame/machine/snes.c
+++ b/src/mame/machine/snes.c
@@ -14,7 +14,7 @@
***************************************************************************/
#define __MACHINE_SNES_C
-#include "driver.h"
+#include "emu.h"
#include "includes/snes.h"
#include "cpu/superfx/superfx.h"
#include "cpu/g65816/g65816.h"
diff --git a/src/mame/machine/snescx4.c b/src/mame/machine/snescx4.c
index 7219f836c35..c8c83d53f79 100644
--- a/src/mame/machine/snescx4.c
+++ b/src/mame/machine/snescx4.c
@@ -10,7 +10,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "snescx4.h"
static CX4 cx4;
diff --git a/src/mame/machine/spisprit.c b/src/mame/machine/spisprit.c
index 2f67b7316ca..1c0c4d89cca 100644
--- a/src/mame/machine/spisprit.c
+++ b/src/mame/machine/spisprit.c
@@ -11,7 +11,7 @@ cpu #0 (PC=0033C315): unmapped program memory dword write to 00000524 = 9CAC0000
#endif
-#include "driver.h"
+#include "emu.h"
#include "includes/seibuspi.h"
// add two numbers generating carry from one bit to the next only if
diff --git a/src/mame/machine/starwars.c b/src/mame/machine/starwars.c
index 3c7e799eccd..ea3d017409f 100644
--- a/src/mame/machine/starwars.c
+++ b/src/mame/machine/starwars.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/starwars.h"
#include "video/avgdvg.h"
diff --git a/src/mame/machine/steppers.c b/src/mame/machine/steppers.c
index 3be744848f5..1e07844b678 100644
--- a/src/mame/machine/steppers.c
+++ b/src/mame/machine/steppers.c
@@ -14,7 +14,7 @@
// //
///////////////////////////////////////////////////////////////////////////
-#include "driver.h"
+#include "emu.h"
#include "steppers.h"
/* local prototypes */
diff --git a/src/mame/machine/stfight.c b/src/mame/machine/stfight.c
index 9d85639126b..97aa2366d45 100644
--- a/src/mame/machine/stfight.c
+++ b/src/mame/machine/stfight.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/msm5205.h"
#include "includes/stfight.h"
diff --git a/src/mame/machine/stvcd.c b/src/mame/machine/stvcd.c
index d7d7cc3026b..42d6247b67b 100644
--- a/src/mame/machine/stvcd.c
+++ b/src/mame/machine/stvcd.c
@@ -21,13 +21,12 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#ifdef MESS
#include "devices/chd_cd.h"
#endif
#include "cdrom.h"
#include "stvcd.h"
-#include <stdio.h>
// super-verbose
#if 0
diff --git a/src/mame/machine/stvprot.c b/src/mame/machine/stvprot.c
index 34444f4fa5b..47609bddcd6 100644
--- a/src/mame/machine/stvprot.c
+++ b/src/mame/machine/stvprot.c
@@ -98,7 +98,7 @@ encryption on the data used...
For now I'm writing this function with a command basis so I can work better with it.
****************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "stvprot.h"
static UINT32 a_bus[4];
diff --git a/src/mame/machine/subs.c b/src/mame/machine/subs.c
index df19039a61c..88bcc767c7a 100644
--- a/src/mame/machine/subs.c
+++ b/src/mame/machine/subs.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/subs.h"
static int subs_steering_buf1;
diff --git a/src/mame/machine/system16.c b/src/mame/machine/system16.c
index 9a1385387ca..cc3234ccee6 100644
--- a/src/mame/machine/system16.c
+++ b/src/mame/machine/system16.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/system16.h"
#include "sound/upd7759.h"
diff --git a/src/mame/machine/tait8741.c b/src/mame/machine/tait8741.c
index 3203eace616..cb6cd79738d 100644
--- a/src/mame/machine/tait8741.c
+++ b/src/mame/machine/tait8741.c
@@ -7,7 +7,7 @@ Taito 8741 emulation
*/
-#include "driver.h"
+#include "emu.h"
#include "tait8741.h"
#define VERBOSE 0
diff --git a/src/mame/machine/taitoio.c b/src/mame/machine/taitoio.c
index 877c36da429..4a53fa38ccd 100644
--- a/src/mame/machine/taitoio.c
+++ b/src/mame/machine/taitoio.c
@@ -42,7 +42,7 @@ Newer version of the I/O chip ?
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/taitoio.h"
diff --git a/src/mame/machine/taitosj.c b/src/mame/machine/taitosj.c
index f28dffeaa98..355259c50c0 100644
--- a/src/mame/machine/taitosj.c
+++ b/src/mame/machine/taitosj.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6805/m6805.h"
#include "includes/taitosj.h"
diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c
index 4b8ad765831..757221b7310 100644
--- a/src/mame/machine/tatsumi.c
+++ b/src/mame/machine/tatsumi.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/tatsumi.h"
#include "sound/2151intf.h"
#include "sound/okim6295.h"
diff --git a/src/mame/machine/tecmosys.c b/src/mame/machine/tecmosys.c
index 1612cc7654f..c11b5ebdecf 100644
--- a/src/mame/machine/tecmosys.c
+++ b/src/mame/machine/tecmosys.c
@@ -28,7 +28,7 @@
You can get me at nuapete@hotmail.com
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/tecmosys.h"
enum DEV_STATUS
diff --git a/src/mame/machine/theglobp.c b/src/mame/machine/theglobp.c
index 624bca22c53..9b9a1024e10 100644
--- a/src/mame/machine/theglobp.c
+++ b/src/mame/machine/theglobp.c
@@ -61,7 +61,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/pacman.h"
static INT8 counter=0;
diff --git a/src/mame/machine/ticket.c b/src/mame/machine/ticket.c
index 18ded9e6fde..5c7ee1ce8ab 100644
--- a/src/mame/machine/ticket.c
+++ b/src/mame/machine/ticket.c
@@ -10,7 +10,7 @@
of arguments to ticket_dispenser_init.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/ticket.h"
#define DEBUG_TICKET 0
diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c
index 4bf981eb2d3..d7f55e8c40f 100644
--- a/src/mame/machine/tnzs.c
+++ b/src/mame/machine/tnzs.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "includes/tnzs.h"
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index f16a20ba12c..58d24ad08b9 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -3,7 +3,7 @@
------------------------------------
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms32010/tms32010.h"
diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c
index e9f6c89d95c..6b6385b6a27 100644
--- a/src/mame/machine/twincobr.c
+++ b/src/mame/machine/twincobr.c
@@ -3,7 +3,7 @@
* Communications and memory functions between shared CPU memory spaces *
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms32010/tms32010.h"
#include "includes/twincobr.h"
diff --git a/src/mame/machine/tx1.c b/src/mame/machine/tx1.c
index ebd82d48a60..378eb61e716 100644
--- a/src/mame/machine/tx1.c
+++ b/src/mame/machine/tx1.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "debugger.h"
#include "includes/tx1.h"
diff --git a/src/mame/machine/vertigo.c b/src/mame/machine/vertigo.c
index 5339573446f..0113598b440 100644
--- a/src/mame/machine/vertigo.c
+++ b/src/mame/machine/vertigo.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/vertigo.h"
#include "includes/exidy440.h"
#include "machine/74148.h"
diff --git a/src/mame/machine/volfied.c b/src/mame/machine/volfied.c
index af750a6edd6..ee05b176dac 100644
--- a/src/mame/machine/volfied.c
+++ b/src/mame/machine/volfied.c
@@ -14,7 +14,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/volfied.h"
static const UINT16 palette_data_01[0x50] =
diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c
index fb3dd05fa2c..cac77cdbedd 100644
--- a/src/mame/machine/vsnes.c
+++ b/src/mame/machine/vsnes.c
@@ -7,7 +7,7 @@ Nintendo VS UniSystem and DualSystem - (c) 1984 Nintendo of America
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/ppu2c0x.h"
#include "includes/vsnes.h"
diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c
index e087db951af..fe99ce73f64 100644
--- a/src/mame/machine/williams.c
+++ b/src/mame/machine/williams.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "audio/williams.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/machine/wrally.c b/src/mame/machine/wrally.c
index fec61047d5a..87bd6635bf7 100644
--- a/src/mame/machine/wrally.c
+++ b/src/mame/machine/wrally.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mcs51/mcs51.h"
#include "includes/gaelcrpt.h"
#include "includes/wrally.h"
diff --git a/src/mame/machine/xevious.c b/src/mame/machine/xevious.c
index db65ad3c955..72644de2b48 100644
--- a/src/mame/machine/xevious.c
+++ b/src/mame/machine/xevious.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "includes/galaga.h"
diff --git a/src/mame/machine/znsec.c b/src/mame/machine/znsec.c
index 77172aa9a2a..4d03ef35e57 100644
--- a/src/mame/machine/znsec.c
+++ b/src/mame/machine/znsec.c
@@ -82,7 +82,7 @@
= Shift(c[n-1, 6])^Shift(c[n-1, 7])
*/
-#include "driver.h"
+#include "emu.h"
#include "znsec.h"
typedef struct {
diff --git a/src/mame/machine/zs01.c b/src/mame/machine/zs01.c
index b5f2cd20bbc..2d87487b413 100644
--- a/src/mame/machine/zs01.c
+++ b/src/mame/machine/zs01.c
@@ -7,7 +7,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "machine/zs01.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/mame/tiny.c b/src/mame/tiny.c
index 7d70d24856c..32c4d94ebc0 100644
--- a/src/mame/tiny.c
+++ b/src/mame/tiny.c
@@ -17,7 +17,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#ifndef DRIVER_RECURSIVE
diff --git a/src/mame/video/1942.c b/src/mame/video/1942.c
index fc54121d2b1..22931b2f60a 100644
--- a/src/mame/video/1942.c
+++ b/src/mame/video/1942.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/1942.h"
/***************************************************************************
diff --git a/src/mame/video/1943.c b/src/mame/video/1943.c
index f9de12334b6..5a1a894afe3 100644
--- a/src/mame/video/1943.c
+++ b/src/mame/video/1943.c
@@ -27,7 +27,7 @@ other 2 bits (output & 0x0c) unknown
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/1943.h"
/***************************************************************************
diff --git a/src/mame/video/20pacgal.c b/src/mame/video/20pacgal.c
index 5f1e446da78..ef4c945e1aa 100644
--- a/src/mame/video/20pacgal.c
+++ b/src/mame/video/20pacgal.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/20pacgal.h"
diff --git a/src/mame/video/40love.c b/src/mame/video/40love.c
index 463c38c2a1f..a25edae4db4 100644
--- a/src/mame/video/40love.c
+++ b/src/mame/video/40love.c
@@ -2,7 +2,7 @@
* Video Driver for Forty-Love
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/buggychl.h"
diff --git a/src/mame/video/4enraya.c b/src/mame/video/4enraya.c
index 7598b05d9a6..7bd9d7013fe 100644
--- a/src/mame/video/4enraya.c
+++ b/src/mame/video/4enraya.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/4enraya.h"
WRITE8_HANDLER( fenraya_videoram_w )
diff --git a/src/mame/video/8080bw.c b/src/mame/video/8080bw.c
index 353ce47a60b..ebbf268e51b 100644
--- a/src/mame/video/8080bw.c
+++ b/src/mame/video/8080bw.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/mw8080bw.h"
diff --git a/src/mame/video/88games.c b/src/mame/video/88games.c
index 934ef17bf9a..2ae19962925 100644
--- a/src/mame/video/88games.c
+++ b/src/mame/video/88games.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/88games.h"
diff --git a/src/mame/video/actfancr.c b/src/mame/video/actfancr.c
index a871d1ae01b..ae62186d2b4 100644
--- a/src/mame/video/actfancr.c
+++ b/src/mame/video/actfancr.c
@@ -4,7 +4,7 @@
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/actfancr.h"
diff --git a/src/mame/video/aeroboto.c b/src/mame/video/aeroboto.c
index 06a832e5929..6c39ee7aed9 100644
--- a/src/mame/video/aeroboto.c
+++ b/src/mame/video/aeroboto.c
@@ -5,7 +5,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/aeroboto.h"
diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c
index 2f8eb364c36..c6dcc7a31d3 100644
--- a/src/mame/video/aerofgt.c
+++ b/src/mame/video/aerofgt.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/aerofgt.h"
/***************************************************************************
diff --git a/src/mame/video/airbustr.c b/src/mame/video/airbustr.c
index 7641d9f3ce7..fc40428d06f 100644
--- a/src/mame/video/airbustr.c
+++ b/src/mame/video/airbustr.c
@@ -30,7 +30,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/kan_pand.h"
#include "includes/airbustr.h"
diff --git a/src/mame/video/ajax.c b/src/mame/video/ajax.c
index cd60dd3b095..e724ae0fd00 100644
--- a/src/mame/video/ajax.c
+++ b/src/mame/video/ajax.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/ajax.h"
diff --git a/src/mame/video/aliens.c b/src/mame/video/aliens.c
index be362a82a7a..46b781c269d 100644
--- a/src/mame/video/aliens.c
+++ b/src/mame/video/aliens.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/aliens.h"
diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c
index a3640535bff..930a310ae79 100644
--- a/src/mame/video/alpha68k.c
+++ b/src/mame/video/alpha68k.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/alpha68k.h"
diff --git a/src/mame/video/ambush.c b/src/mame/video/ambush.c
index cbb31adddbc..2df8e9356aa 100644
--- a/src/mame/video/ambush.c
+++ b/src/mame/video/ambush.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/ambush.h"
diff --git a/src/mame/video/amiga.c b/src/mame/video/amiga.c
index 498e9929e7d..2e4538d9b4b 100644
--- a/src/mame/video/amiga.c
+++ b/src/mame/video/amiga.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/amiga.h"
diff --git a/src/mame/video/amigaaga.c b/src/mame/video/amigaaga.c
index be0896e6ce3..26ae1368196 100644
--- a/src/mame/video/amigaaga.c
+++ b/src/mame/video/amigaaga.c
@@ -17,7 +17,7 @@ To do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/amiga.h"
diff --git a/src/mame/video/ampoker2.c b/src/mame/video/ampoker2.c
index 389bcd07481..5149c96485f 100644
--- a/src/mame/video/ampoker2.c
+++ b/src/mame/video/ampoker2.c
@@ -66,7 +66,7 @@
********************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
static tilemap_t *bg_tilemap;
diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c
index 4f684728863..c50269eb11b 100644
--- a/src/mame/video/amspdwy.c
+++ b/src/mame/video/amspdwy.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/amspdwy.h"
diff --git a/src/mame/video/angelkds.c b/src/mame/video/angelkds.c
index 3e27c490844..489c317d0a7 100644
--- a/src/mame/video/angelkds.c
+++ b/src/mame/video/angelkds.c
@@ -6,7 +6,7 @@ enable / disable tilemap bits might be wrong
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/angelkds.h"
diff --git a/src/mame/video/antic.c b/src/mame/video/antic.c
index ae1af334065..5c5ffb3194b 100644
--- a/src/mame/video/antic.c
+++ b/src/mame/video/antic.c
@@ -6,7 +6,7 @@
Juergen Buchmueller, June 1998
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/atari.h"
diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c
index ee985361179..640a10f2c9d 100644
--- a/src/mame/video/appoooh.c
+++ b/src/mame/video/appoooh.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/appoooh.h"
/***************************************************************************
diff --git a/src/mame/video/aquarium.c b/src/mame/video/aquarium.c
index 0288ffbec79..4096055267a 100644
--- a/src/mame/video/aquarium.c
+++ b/src/mame/video/aquarium.c
@@ -1,6 +1,6 @@
/* Aquarium */
-#include "driver.h"
+#include "emu.h"
#include "includes/aquarium.h"
/* gcpinbal.c modified */
diff --git a/src/mame/video/arabian.c b/src/mame/video/arabian.c
index 06798644bb2..6d5f73fc7a2 100644
--- a/src/mame/video/arabian.c
+++ b/src/mame/video/arabian.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/arabian.h"
/* Constants */
diff --git a/src/mame/video/arcadecl.c b/src/mame/video/arcadecl.c
index 1a3e12a7f0c..5fda34f23c9 100644
--- a/src/mame/video/arcadecl.c
+++ b/src/mame/video/arcadecl.c
@@ -8,7 +8,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/arcadecl.h"
diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c
index 5757cc18470..774586131f8 100644
--- a/src/mame/video/argus.c
+++ b/src/mame/video/argus.c
@@ -113,7 +113,7 @@ BG0 palette intensity ( $C47F, $C4FF )
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "jalblend.h"
#include "includes/argus.h"
diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c
index 98f1f3d2766..eadd6324357 100644
--- a/src/mame/video/arkanoid.c
+++ b/src/mame/video/arkanoid.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/arkanoid.h"
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index b8651bbcb94..683253f1b58 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/armedf.h"
diff --git a/src/mame/video/artmagic.c b/src/mame/video/artmagic.c
index b35cfba5c7c..e31145c3c9f 100644
--- a/src/mame/video/artmagic.c
+++ b/src/mame/video/artmagic.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "cpu/tms34010/tms34010.h"
#include "video/tlc34076.h"
diff --git a/src/mame/video/ashnojoe.c b/src/mame/video/ashnojoe.c
index 8a072736929..671e9148b0d 100644
--- a/src/mame/video/ashnojoe.c
+++ b/src/mame/video/ashnojoe.c
@@ -5,7 +5,7 @@
*********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/ashnojoe.h"
diff --git a/src/mame/video/asterix.c b/src/mame/video/asterix.c
index b30ea2cee7b..7b3d37bfd28 100644
--- a/src/mame/video/asterix.c
+++ b/src/mame/video/asterix.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/asterix.h"
diff --git a/src/mame/video/astrocde.c b/src/mame/video/astrocde.c
index 0bc88666904..85141ae6f1a 100644
--- a/src/mame/video/astrocde.c
+++ b/src/mame/video/astrocde.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "includes/astrocde.h"
#include "sound/astrocde.h"
diff --git a/src/mame/video/asuka.c b/src/mame/video/asuka.c
index 680eb4eaa5c..509b6a0c56a 100644
--- a/src/mame/video/asuka.c
+++ b/src/mame/video/asuka.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/asuka.h"
diff --git a/src/mame/video/atari.c b/src/mame/video/atari.c
index 958ed67798a..3d4331fd59e 100644
--- a/src/mame/video/atari.c
+++ b/src/mame/video/atari.c
@@ -6,7 +6,7 @@
Juergen Buchmueller, June 1998
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/atari.h"
#include "video/gtia.h"
diff --git a/src/mame/video/atarifb.c b/src/mame/video/atarifb.c
index 3fcf3b00cc7..665a5553856 100644
--- a/src/mame/video/atarifb.c
+++ b/src/mame/video/atarifb.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/atarifb.h"
diff --git a/src/mame/video/atarig1.c b/src/mame/video/atarig1.c
index c773edb9631..3e6461296bc 100644
--- a/src/mame/video/atarig1.c
+++ b/src/mame/video/atarig1.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "includes/atarig1.h"
diff --git a/src/mame/video/atarig42.c b/src/mame/video/atarig42.c
index a14140fb2a0..b046743810b 100644
--- a/src/mame/video/atarig42.c
+++ b/src/mame/video/atarig42.c
@@ -19,7 +19,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "includes/atarig42.h"
diff --git a/src/mame/video/atarigt.c b/src/mame/video/atarigt.c
index 006574a1773..d477f35e78f 100644
--- a/src/mame/video/atarigt.c
+++ b/src/mame/video/atarigt.c
@@ -19,7 +19,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "includes/atarigt.h"
diff --git a/src/mame/video/atarigx2.c b/src/mame/video/atarigx2.c
index ff0e209933c..65d3eaf36dc 100644
--- a/src/mame/video/atarigx2.c
+++ b/src/mame/video/atarigx2.c
@@ -19,7 +19,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "includes/atarigx2.h"
diff --git a/src/mame/video/atarimo.c b/src/mame/video/atarimo.c
index be9230eb158..c9917ef35df 100644
--- a/src/mame/video/atarimo.c
+++ b/src/mame/video/atarimo.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "atarimo.h"
diff --git a/src/mame/video/atarirle.c b/src/mame/video/atarirle.c
index c0709c68f25..4c0267317ff 100644
--- a/src/mame/video/atarirle.c
+++ b/src/mame/video/atarirle.c
@@ -18,7 +18,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "atarirle.h"
diff --git a/src/mame/video/atarisy1.c b/src/mame/video/atarisy1.c
index 20cfbd4e10e..ed4c7e3b280 100644
--- a/src/mame/video/atarisy1.c
+++ b/src/mame/video/atarisy1.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/atarisy1.h"
diff --git a/src/mame/video/atarisy2.c b/src/mame/video/atarisy2.c
index d72679cb05e..035e83ffbd0 100644
--- a/src/mame/video/atarisy2.c
+++ b/src/mame/video/atarisy2.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/slapstic.h"
#include "includes/atarisy2.h"
diff --git a/src/mame/video/atetris.c b/src/mame/video/atetris.c
index 78d27f706f2..0712b90b182 100644
--- a/src/mame/video/atetris.c
+++ b/src/mame/video/atetris.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/atetris.h"
diff --git a/src/mame/video/attckufo.c b/src/mame/video/attckufo.c
index f906ba6d43f..b2882c21c43 100644
--- a/src/mame/video/attckufo.c
+++ b/src/mame/video/attckufo.c
@@ -11,7 +11,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/attckufo.h"
#define MAX_LINES 261
diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c
index 2166f6cd38c..b29ab551ad4 100644
--- a/src/mame/video/avgdvg.c
+++ b/src/mame/video/avgdvg.c
@@ -11,7 +11,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "avgdvg.h"
#include "video/vector.h"
diff --git a/src/mame/video/awpvid.c b/src/mame/video/awpvid.c
index 795e36ee05e..933f6cb4f3a 100644
--- a/src/mame/video/awpvid.c
+++ b/src/mame/video/awpvid.c
@@ -29,7 +29,7 @@
**************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "awpvid.h"
#include "rendlay.h"
#include "machine/steppers.h"
diff --git a/src/mame/video/aztarac.c b/src/mame/video/aztarac.c
index f8bb4e98e63..718ae16fdbb 100644
--- a/src/mame/video/aztarac.c
+++ b/src/mame/video/aztarac.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/vector.h"
#include "includes/aztarac.h"
diff --git a/src/mame/video/badlands.c b/src/mame/video/badlands.c
index a0d5856f320..6924a108c75 100644
--- a/src/mame/video/badlands.c
+++ b/src/mame/video/badlands.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/badlands.h"
diff --git a/src/mame/video/bagman.c b/src/mame/video/bagman.c
index 84bc2dbbd6a..da14bf9599a 100644
--- a/src/mame/video/bagman.c
+++ b/src/mame/video/bagman.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/bagman.h"
diff --git a/src/mame/video/balsente.c b/src/mame/video/balsente.c
index bd532a6903d..b2e11ea6ada 100644
--- a/src/mame/video/balsente.c
+++ b/src/mame/video/balsente.c
@@ -6,7 +6,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/balsente.h"
diff --git a/src/mame/video/bankp.c b/src/mame/video/bankp.c
index dfda82fa3f8..7fd44cc8d40 100644
--- a/src/mame/video/bankp.c
+++ b/src/mame/video/bankp.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/bankp.h"
diff --git a/src/mame/video/baraduke.c b/src/mame/video/baraduke.c
index 52a0aea3f56..f25df32b840 100644
--- a/src/mame/video/baraduke.c
+++ b/src/mame/video/baraduke.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
UINT8 *baraduke_textram, *baraduke_videoram, *baraduke_spriteram;
diff --git a/src/mame/video/batman.c b/src/mame/video/batman.c
index 5ae697c5953..00c616b353d 100644
--- a/src/mame/video/batman.c
+++ b/src/mame/video/batman.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/batman.h"
#include "includes/thunderj.h"
diff --git a/src/mame/video/battlane.c b/src/mame/video/battlane.c
index d65580df256..7983a931cf7 100644
--- a/src/mame/video/battlane.c
+++ b/src/mame/video/battlane.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/battlane.h"
/*
diff --git a/src/mame/video/battlera.c b/src/mame/video/battlera.c
index a8c2865ed08..098f16167e3 100644
--- a/src/mame/video/battlera.c
+++ b/src/mame/video/battlera.c
@@ -7,7 +7,7 @@
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/h6280/h6280.h"
diff --git a/src/mame/video/battlex.c b/src/mame/video/battlex.c
index 1eb385ae49b..6d8f53cc8be 100644
--- a/src/mame/video/battlex.c
+++ b/src/mame/video/battlex.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/battlex.h"
PALETTE_INIT( battlex )
diff --git a/src/mame/video/battlnts.c b/src/mame/video/battlnts.c
index 517a051186c..f23510c5bd2 100644
--- a/src/mame/video/battlnts.c
+++ b/src/mame/video/battlnts.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/battlnts.h"
diff --git a/src/mame/video/bbusters.c b/src/mame/video/bbusters.c
index a280cea77e5..d5f656f6f02 100644
--- a/src/mame/video/bbusters.c
+++ b/src/mame/video/bbusters.c
@@ -21,7 +21,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
static tilemap_t *fix_tilemap,*pf1_tilemap,*pf2_tilemap;
static const UINT8 *scale_table_ptr;
diff --git a/src/mame/video/beathead.c b/src/mame/video/beathead.c
index 6fb7607f89a..0b81ce59d31 100644
--- a/src/mame/video/beathead.c
+++ b/src/mame/video/beathead.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/beathead.h"
diff --git a/src/mame/video/beezer.c b/src/mame/video/beezer.c
index 48e5420d8ad..70b00ade8dc 100644
--- a/src/mame/video/beezer.c
+++ b/src/mame/video/beezer.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/6522via.h"
#include "includes/beezer.h"
diff --git a/src/mame/video/bfm_adr2.c b/src/mame/video/bfm_adr2.c
index 6e35918b7a1..dd99a583e12 100644
--- a/src/mame/video/bfm_adr2.c
+++ b/src/mame/video/bfm_adr2.c
@@ -90,7 +90,7 @@ E000-FFFF | R | D D D D D D D D | 8K ROM
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/bfm_bd1.h" // vfd
#include "video/bfm_adr2.h"
diff --git a/src/mame/video/bfm_dm01.c b/src/mame/video/bfm_dm01.c
index 05ed07e89c0..7793327284d 100644
--- a/src/mame/video/bfm_dm01.c
+++ b/src/mame/video/bfm_dm01.c
@@ -36,7 +36,7 @@ Standard dm01 memorymap
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "video/awpvid.h"
#include "bfm_dm01.h"
diff --git a/src/mame/video/bigevglf.c b/src/mame/video/bigevglf.c
index b27673ce300..b3917e6d4bc 100644
--- a/src/mame/video/bigevglf.c
+++ b/src/mame/video/bigevglf.c
@@ -5,7 +5,7 @@
Functions to emulate the video hardware of the machine.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/bigevglf.h"
diff --git a/src/mame/video/bigstrkb.c b/src/mame/video/bigstrkb.c
index d60ace51d2f..fe7d253c14c 100644
--- a/src/mame/video/bigstrkb.c
+++ b/src/mame/video/bigstrkb.c
@@ -1,6 +1,6 @@
/* Big Striker (bootleg) Video Hardware */
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bsb_tilemap, *bsb_tilemap2, *bsb_tilemap3;
diff --git a/src/mame/video/bionicc.c b/src/mame/video/bionicc.c
index 3de4decea0e..5bfbe1b96a7 100644
--- a/src/mame/video/bionicc.c
+++ b/src/mame/video/bionicc.c
@@ -23,7 +23,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/bionicc.h"
diff --git a/src/mame/video/bishi.c b/src/mame/video/bishi.c
index 53cad62d714..51e6a8a7cda 100644
--- a/src/mame/video/bishi.c
+++ b/src/mame/video/bishi.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
//#include "includes/konamigx.h"
#include "includes/bishi.h"
diff --git a/src/mame/video/bking.c b/src/mame/video/bking.c
index 2b72aa862f7..abd6fdc51f4 100644
--- a/src/mame/video/bking.c
+++ b/src/mame/video/bking.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/buggychl.h"
diff --git a/src/mame/video/bladestl.c b/src/mame/video/bladestl.c
index 648e88fae16..41d1e646b59 100644
--- a/src/mame/video/bladestl.c
+++ b/src/mame/video/bladestl.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/bladestl.h"
diff --git a/src/mame/video/blktiger.c b/src/mame/video/blktiger.c
index 424fc4969b7..feb31cfbe9d 100644
--- a/src/mame/video/blktiger.c
+++ b/src/mame/video/blktiger.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/blktiger.h"
diff --git a/src/mame/video/blmbycar.c b/src/mame/video/blmbycar.c
index 91fb4b15a31..6a9459c9ce7 100644
--- a/src/mame/video/blmbycar.c
+++ b/src/mame/video/blmbycar.c
@@ -28,7 +28,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/blmbycar.h"
diff --git a/src/mame/video/blockade.c b/src/mame/video/blockade.c
index 7da73e2edb2..29988f23a59 100644
--- a/src/mame/video/blockade.c
+++ b/src/mame/video/blockade.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/blockade.h"
WRITE8_HANDLER( blockade_videoram_w )
diff --git a/src/mame/video/blockhl.c b/src/mame/video/blockhl.c
index 19e3e8933d9..122bde2cb31 100644
--- a/src/mame/video/blockhl.c
+++ b/src/mame/video/blockhl.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/blockhl.h"
diff --git a/src/mame/video/blockout.c b/src/mame/video/blockout.c
index f6e59fbdde0..1fb2c1970e0 100644
--- a/src/mame/video/blockout.c
+++ b/src/mame/video/blockout.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/blockout.h"
diff --git a/src/mame/video/bloodbro.c b/src/mame/video/bloodbro.c
index 67eb394a00c..b21171534a7 100644
--- a/src/mame/video/bloodbro.c
+++ b/src/mame/video/bloodbro.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *bloodbro_txvideoram;
UINT16 *bloodbro_bgvideoram,*bloodbro_fgvideoram;
diff --git a/src/mame/video/blstroid.c b/src/mame/video/blstroid.c
index 0b95540ecc3..be717fe6e5d 100644
--- a/src/mame/video/blstroid.c
+++ b/src/mame/video/blstroid.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "includes/blstroid.h"
diff --git a/src/mame/video/blueprnt.c b/src/mame/video/blueprnt.c
index 4aa1e8efb8b..1644c7908ec 100644
--- a/src/mame/video/blueprnt.c
+++ b/src/mame/video/blueprnt.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/blueprnt.h"
diff --git a/src/mame/video/bogeyman.c b/src/mame/video/bogeyman.c
index c46a1711b3e..704bad88379 100644
--- a/src/mame/video/bogeyman.c
+++ b/src/mame/video/bogeyman.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/bogeyman.h"
diff --git a/src/mame/video/bombjack.c b/src/mame/video/bombjack.c
index 975b1c83d57..acc37119ee2 100644
--- a/src/mame/video/bombjack.c
+++ b/src/mame/video/bombjack.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/bombjack.h"
WRITE8_HANDLER( bombjack_videoram_w )
diff --git a/src/mame/video/boogwing.c b/src/mame/video/boogwing.c
index da2940c0fcd..f44fbb76bb7 100644
--- a/src/mame/video/boogwing.c
+++ b/src/mame/video/boogwing.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect, UINT16* spriteram_base, int gfx_region)
diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c
index 771d881a25c..c6aeb644157 100644
--- a/src/mame/video/bosco.c
+++ b/src/mame/video/bosco.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/galaga.h"
diff --git a/src/mame/video/bottom9.c b/src/mame/video/bottom9.c
index b4ff073273a..f4115b07d48 100644
--- a/src/mame/video/bottom9.c
+++ b/src/mame/video/bottom9.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/bottom9.h"
diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c
index a94139cbf1d..24ba12870d2 100644
--- a/src/mame/video/brkthru.c
+++ b/src/mame/video/brkthru.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/brkthru.h"
diff --git a/src/mame/video/bsktball.c b/src/mame/video/bsktball.c
index 2438e253639..d6ccf9798aa 100644
--- a/src/mame/video/bsktball.c
+++ b/src/mame/video/bsktball.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/bsktball.h"
diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c
index 18717f3039a..1efb124ee84 100644
--- a/src/mame/video/btime.c
+++ b/src/mame/video/btime.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/btime.h"
/***************************************************************************
diff --git a/src/mame/video/btoads.c b/src/mame/video/btoads.c
index 2ae2cad8856..bc7e830dedc 100644
--- a/src/mame/video/btoads.c
+++ b/src/mame/video/btoads.c
@@ -6,7 +6,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "video/tlc34076.h"
#include "includes/btoads.h"
diff --git a/src/mame/video/bublbobl.c b/src/mame/video/bublbobl.c
index 77afe40c5e7..da704b4aac5 100644
--- a/src/mame/video/bublbobl.c
+++ b/src/mame/video/bublbobl.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/bublbobl.h"
diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c
index badc9465f19..ce1c8d662e1 100644
--- a/src/mame/video/buggychl.c
+++ b/src/mame/video/buggychl.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "includes/buggychl.h"
diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c
index 6c3c22397fa..83c3025df79 100644
--- a/src/mame/video/bwing.c
+++ b/src/mame/video/bwing.c
@@ -8,7 +8,7 @@ drivers by Acho A. Tang
*****************************************************************************/
// Directives
-#include "driver.h"
+#include "emu.h"
#include "includes/bwing.h"
diff --git a/src/mame/video/cabal.c b/src/mame/video/cabal.c
index e22f2b66a57..1d22e6660ca 100644
--- a/src/mame/video/cabal.c
+++ b/src/mame/video/cabal.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/cabal.h"
static TILE_GET_INFO( get_back_tile_info )
diff --git a/src/mame/video/calomega.c b/src/mame/video/calomega.c
index 0dfe4381dbf..5828f08cd20 100644
--- a/src/mame/video/calomega.c
+++ b/src/mame/video/calomega.c
@@ -13,7 +13,7 @@
************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *calomega_videoram;
UINT8 *calomega_colorram;
diff --git a/src/mame/video/canyon.c b/src/mame/video/canyon.c
index f640b64c828..321f5dce2ac 100644
--- a/src/mame/video/canyon.c
+++ b/src/mame/video/canyon.c
@@ -4,7 +4,7 @@ Atari Canyon Bomber video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/canyon.h"
diff --git a/src/mame/video/capbowl.c b/src/mame/video/capbowl.c
index 3427c9aa929..58fb23ea251 100644
--- a/src/mame/video/capbowl.c
+++ b/src/mame/video/capbowl.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/tms34061.h"
#include "cpu/m6809/m6809.h"
#include "includes/capbowl.h"
diff --git a/src/mame/video/carjmbre.c b/src/mame/video/carjmbre.c
index 8f41264b859..faab5728ada 100644
--- a/src/mame/video/carjmbre.c
+++ b/src/mame/video/carjmbre.c
@@ -5,7 +5,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/carjmbre.h"
PALETTE_INIT( carjmbre )
diff --git a/src/mame/video/carpolo.c b/src/mame/video/carpolo.c
index b7310e6e927..dc679f24d41 100644
--- a/src/mame/video/carpolo.c
+++ b/src/mame/video/carpolo.c
@@ -6,7 +6,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/carpolo.h"
diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c
index 559737d961a..ebc0859b689 100644
--- a/src/mame/video/cave.c
+++ b/src/mame/video/cave.c
@@ -44,7 +44,7 @@ Note: if MAME_DEBUG is defined, pressing:
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/cave.h"
diff --git a/src/mame/video/cbasebal.c b/src/mame/video/cbasebal.c
index 9e80bf9e6f0..da23ed27045 100644
--- a/src/mame/video/cbasebal.c
+++ b/src/mame/video/cbasebal.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/cbasebal.h"
diff --git a/src/mame/video/cbuster.c b/src/mame/video/cbuster.c
index eb0ce31f276..a7e9e4d527a 100644
--- a/src/mame/video/cbuster.c
+++ b/src/mame/video/cbuster.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
static int twocrude_pri;
diff --git a/src/mame/video/ccastles.c b/src/mame/video/ccastles.c
index c7b518736a7..e7b9df3517b 100644
--- a/src/mame/video/ccastles.c
+++ b/src/mame/video/ccastles.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/ccastles.h"
#include "video/resnet.h"
diff --git a/src/mame/video/cchasm.c b/src/mame/video/cchasm.c
index 1e7b095ed42..476628eb4cb 100644
--- a/src/mame/video/cchasm.c
+++ b/src/mame/video/cchasm.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/vector.h"
#include "includes/cchasm.h"
diff --git a/src/mame/video/cclimber.c b/src/mame/video/cclimber.c
index 169ae7f0cdf..71a0e84afd4 100644
--- a/src/mame/video/cclimber.c
+++ b/src/mame/video/cclimber.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/cclimber.h"
diff --git a/src/mame/video/centiped.c b/src/mame/video/centiped.c
index 09a6fa1e8b8..0f65e806250 100644
--- a/src/mame/video/centiped.c
+++ b/src/mame/video/centiped.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/centiped.h"
diff --git a/src/mame/video/chaknpop.c b/src/mame/video/chaknpop.c
index cb70bf6f7bf..74cf4840ea7 100644
--- a/src/mame/video/chaknpop.c
+++ b/src/mame/video/chaknpop.c
@@ -3,7 +3,7 @@
* emulate video hardware
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/chaknpop.h"
#define GFX_FLIP_X 0x01
diff --git a/src/mame/video/champbas.c b/src/mame/video/champbas.c
index bd00653333b..55102cdb874 100644
--- a/src/mame/video/champbas.c
+++ b/src/mame/video/champbas.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/champbas.h"
diff --git a/src/mame/video/changela.c b/src/mame/video/changela.c
index 1a0aef75b6e..7ca3289796e 100644
--- a/src/mame/video/changela.c
+++ b/src/mame/video/changela.c
@@ -11,7 +11,7 @@ Todo: Priority between tree0 and tree1.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/changela.h"
diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c
index 8ecdebc2c8b..a0d794ce5ea 100644
--- a/src/mame/video/cheekyms.c
+++ b/src/mame/video/cheekyms.c
@@ -8,7 +8,7 @@
Functions to emulate the video hardware of the machine.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/dac.h"
#include "includes/cheekyms.h"
diff --git a/src/mame/video/chqflag.c b/src/mame/video/chqflag.c
index 0ed148121f9..0a052dbdb93 100644
--- a/src/mame/video/chqflag.c
+++ b/src/mame/video/chqflag.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/chqflag.h"
diff --git a/src/mame/video/cidelsa.c b/src/mame/video/cidelsa.c
index 3868140b122..b4e62b59c0d 100644
--- a/src/mame/video/cidelsa.c
+++ b/src/mame/video/cidelsa.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "sound/cdp1869.h"
#include "sound/ay8910.h"
#include "includes/cidelsa.h"
diff --git a/src/mame/video/cinemat.c b/src/mame/video/cinemat.c
index f67de1b3e10..08374e00053 100644
--- a/src/mame/video/cinemat.c
+++ b/src/mame/video/cinemat.c
@@ -4,7 +4,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/video/circus.c b/src/mame/video/circus.c
index f838d42cdd2..4ebfc49bc79 100644
--- a/src/mame/video/circus.c
+++ b/src/mame/video/circus.c
@@ -10,7 +10,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
#include "includes/circus.h"
diff --git a/src/mame/video/circusc.c b/src/mame/video/circusc.c
index 2ad3dd84037..5f015690014 100644
--- a/src/mame/video/circusc.c
+++ b/src/mame/video/circusc.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/circusc.h"
diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c
index 518104775ac..79e4dc6f69a 100644
--- a/src/mame/video/cischeat.c
+++ b/src/mame/video/cischeat.c
@@ -53,7 +53,7 @@ Note: if MAME_DEBUG is defined, pressing Z or X with:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/megasys1.h"
#include "includes/cischeat.h"
diff --git a/src/mame/video/citycon.c b/src/mame/video/citycon.c
index 7910885451d..ce4094e2a00 100644
--- a/src/mame/video/citycon.c
+++ b/src/mame/video/citycon.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/citycon.h"
diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c
index 1ae6bd9772c..e667e9d8933 100644
--- a/src/mame/video/cloak.c
+++ b/src/mame/video/cloak.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/cloak.h"
diff --git a/src/mame/video/cloud9.c b/src/mame/video/cloud9.c
index 346a7660a65..329d278e633 100644
--- a/src/mame/video/cloud9.c
+++ b/src/mame/video/cloud9.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/cloud9.h"
#include "video/resnet.h"
diff --git a/src/mame/video/clshroad.c b/src/mame/video/clshroad.c
index 5e6f1706a7e..4d328cedeb4 100644
--- a/src/mame/video/clshroad.c
+++ b/src/mame/video/clshroad.c
@@ -30,7 +30,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
/* Variables only used here: */
diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c
index c6177a09ed4..36efe26d99f 100644
--- a/src/mame/video/cninja.c
+++ b/src/mame/video/cninja.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
#include "includes/cninja.h"
diff --git a/src/mame/video/combatsc.c b/src/mame/video/combatsc.c
index aa4f8a0d0fc..8fbf4ab16be 100644
--- a/src/mame/video/combatsc.c
+++ b/src/mame/video/combatsc.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/combatsc.h"
diff --git a/src/mame/video/commando.c b/src/mame/video/commando.c
index c8ea095a99b..fe04cafd5d4 100644
--- a/src/mame/video/commando.c
+++ b/src/mame/video/commando.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/commando.h"
diff --git a/src/mame/video/compgolf.c b/src/mame/video/compgolf.c
index b7ef1b91946..5ac69d831dc 100644
--- a/src/mame/video/compgolf.c
+++ b/src/mame/video/compgolf.c
@@ -5,7 +5,7 @@
****************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/compgolf.h"
diff --git a/src/mame/video/contra.c b/src/mame/video/contra.c
index f6a32578c0a..4b7808f8657 100644
--- a/src/mame/video/contra.c
+++ b/src/mame/video/contra.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/contra.h"
diff --git a/src/mame/video/cop01.c b/src/mame/video/cop01.c
index 11a495840b5..726c27a7267 100644
--- a/src/mame/video/cop01.c
+++ b/src/mame/video/cop01.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/cop01.h"
diff --git a/src/mame/video/copsnrob.c b/src/mame/video/copsnrob.c
index 50efd0fe2c1..6c84597e001 100644
--- a/src/mame/video/copsnrob.c
+++ b/src/mame/video/copsnrob.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/copsnrob.h"
diff --git a/src/mame/video/cosmic.c b/src/mame/video/cosmic.c
index 8dc17a3cb4a..ec7c5178d2f 100644
--- a/src/mame/video/cosmic.c
+++ b/src/mame/video/cosmic.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/cosmic.h"
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index 67f6f4ddea6..dd29746bcfe 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -317,7 +317,7 @@ The games seem to use them to mark platforms, kill zones and no-go areas.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/cps1.h"
#define VERBOSE 0
diff --git a/src/mame/video/crbaloon.c b/src/mame/video/crbaloon.c
index fc79715eff5..4a6550511e8 100644
--- a/src/mame/video/crbaloon.c
+++ b/src/mame/video/crbaloon.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/crbaloon.h"
diff --git a/src/mame/video/crgolf.c b/src/mame/video/crgolf.c
index f979b3f4219..9cf63f9b91b 100644
--- a/src/mame/video/crgolf.c
+++ b/src/mame/video/crgolf.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/crgolf.h"
diff --git a/src/mame/video/crimfght.c b/src/mame/video/crimfght.c
index 221c6202724..8ed2816be43 100644
--- a/src/mame/video/crimfght.c
+++ b/src/mame/video/crimfght.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/crimfght.h"
diff --git a/src/mame/video/crospang.c b/src/mame/video/crospang.c
index 838ac339ff0..908316bd242 100644
--- a/src/mame/video/crospang.c
+++ b/src/mame/video/crospang.c
@@ -9,7 +9,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/crospang.h"
WRITE16_HANDLER( bestri_tilebank_w)
diff --git a/src/mame/video/crshrace.c b/src/mame/video/crshrace.c
index ab9769440bb..79b645f2d11 100644
--- a/src/mame/video/crshrace.c
+++ b/src/mame/video/crshrace.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/crshrace.h"
diff --git a/src/mame/video/cvs.c b/src/mame/video/cvs.c
index 80d8c13eac8..788894821e1 100644
--- a/src/mame/video/cvs.c
+++ b/src/mame/video/cvs.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "includes/cvs.h"
#include "video/s2636.h"
diff --git a/src/mame/video/cyberbal.c b/src/mame/video/cyberbal.c
index 75b4ea442d7..121b9146528 100644
--- a/src/mame/video/cyberbal.c
+++ b/src/mame/video/cyberbal.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "includes/cyberbal.h"
diff --git a/src/mame/video/darius.c b/src/mame/video/darius.c
index aef3ca2f0e0..3f50c02159c 100644
--- a/src/mame/video/darius.c
+++ b/src/mame/video/darius.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/darius.h"
diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c
index d65d7445c2e..b2c36f96f11 100644
--- a/src/mame/video/darkmist.c
+++ b/src/mame/video/darkmist.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
/*defined in drivers/darkmist.c */
extern int darkmist_hw;
diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c
index 6ca79b414c4..331c5e52168 100644
--- a/src/mame/video/darkseal.c
+++ b/src/mame/video/darkseal.c
@@ -85,7 +85,7 @@ Sprites - Data East custom chip 52
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *darkseal_pf12_row,*darkseal_pf34_row;
UINT16 *darkseal_pf1_data,*darkseal_pf2_data,*darkseal_pf3_data;
diff --git a/src/mame/video/dassault.c b/src/mame/video/dassault.c
index 0bf64a1a648..17eded6f821 100644
--- a/src/mame/video/dassault.c
+++ b/src/mame/video/dassault.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
/******************************************************************************/
diff --git a/src/mame/video/dbz.c b/src/mame/video/dbz.c
index 459d6f9e1d6..845566a8054 100644
--- a/src/mame/video/dbz.c
+++ b/src/mame/video/dbz.c
@@ -8,7 +8,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/dbz.h"
diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c
index dc89ac25c1d..3301093b6b4 100644
--- a/src/mame/video/dc.c
+++ b/src/mame/video/dc.c
@@ -3,7 +3,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/dc.h"
#include "cpu/sh4/sh4.h"
#include "render.h"
@@ -11,8 +11,6 @@
#include "profiler.h"
#include "video/rgbutil.h"
-#include <math.h>
-
static int vblc=0;
#define DEBUG_FIFO_POLY (0)
#define DEBUG_PVRCTRL (0)
diff --git a/src/mame/video/dcheese.c b/src/mame/video/dcheese.c
index 3431f3d971d..b5ad36aabf2 100644
--- a/src/mame/video/dcheese.c
+++ b/src/mame/video/dcheese.c
@@ -5,7 +5,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/dcheese.h"
diff --git a/src/mame/video/dcon.c b/src/mame/video/dcon.c
index 8cd6d1852ea..9a1416484f2 100644
--- a/src/mame/video/dcon.c
+++ b/src/mame/video/dcon.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *dcon_back_data,*dcon_fore_data,*dcon_mid_data,*dcon_scroll_ram,*dcon_textram;
diff --git a/src/mame/video/dday.c b/src/mame/video/dday.c
index 5d4ac05a93d..9cae80e4385 100644
--- a/src/mame/video/dday.c
+++ b/src/mame/video/dday.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/ay8910.h"
#include "includes/dday.h"
diff --git a/src/mame/video/ddragon.c b/src/mame/video/ddragon.c
index d3ad815057a..a4bce21664d 100644
--- a/src/mame/video/ddragon.c
+++ b/src/mame/video/ddragon.c
@@ -40,7 +40,7 @@ Sprite layout.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/ddragon.h"
diff --git a/src/mame/video/ddragon3.c b/src/mame/video/ddragon3.c
index 324483da374..827bd5dba9c 100644
--- a/src/mame/video/ddragon3.c
+++ b/src/mame/video/ddragon3.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/ddragon3.h"
WRITE16_HANDLER( ddragon3_scroll_w )
diff --git a/src/mame/video/ddrible.c b/src/mame/video/ddrible.c
index 6ca44d20e10..ec0a4877d8c 100644
--- a/src/mame/video/ddrible.c
+++ b/src/mame/video/ddrible.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/ddrible.h"
diff --git a/src/mame/video/deadang.c b/src/mame/video/deadang.c
index fddc1a1c38d..16d2c928302 100644
--- a/src/mame/video/deadang.c
+++ b/src/mame/video/deadang.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
static tilemap_t *pf3_layer,*pf2_layer,*pf1_layer,*text_layer;
static int deadangle_tilebank, deadangle_oldtilebank;
diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c
index 2b267b0dfb7..41a6e58a025 100644
--- a/src/mame/video/dec0.c
+++ b/src/mame/video/dec0.c
@@ -94,7 +94,7 @@ Todo:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/dec0.h"
static tilemap_t *pf1_tilemap_0,*pf1_tilemap_1,*pf1_tilemap_2;
diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c
index 5b52cf39cba..2e010cc4457 100644
--- a/src/mame/video/dec8.c
+++ b/src/mame/video/dec8.c
@@ -40,7 +40,7 @@ sprites.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/dec8.h"
/***************************************************************************
diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c
index 650492fed6e..9fae1232d37 100644
--- a/src/mame/video/deco16ic.c
+++ b/src/mame/video/deco16ic.c
@@ -139,7 +139,7 @@ Rowscroll style:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
#include "ui.h"
diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c
index b6cb3f6b0f0..c44cbb0fbe3 100644
--- a/src/mame/video/deco32.c
+++ b/src/mame/video/deco32.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
#include "includes/deco32.h"
diff --git a/src/mame/video/deco_mlc.c b/src/mame/video/deco_mlc.c
index 639bd7929ef..9949971c92c 100644
--- a/src/mame/video/deco_mlc.c
+++ b/src/mame/video/deco_mlc.c
@@ -8,7 +8,7 @@
combined into 8bpp with a flag.
*/
-#include "driver.h"
+#include "emu.h"
//extern int mlc_raster_table[9][256];
//extern UINT32 mlc_clipper[32];
diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c
index 3f155a04968..5ebc6907f63 100644
--- a/src/mame/video/decocass.c
+++ b/src/mame/video/decocass.c
@@ -4,7 +4,7 @@
***********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/decocass.h"
diff --git a/src/mame/video/deniam.c b/src/mame/video/deniam.c
index d9192103948..6581da6f2f9 100644
--- a/src/mame/video/deniam.c
+++ b/src/mame/video/deniam.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/deniam.h"
diff --git a/src/mame/video/dietgo.c b/src/mame/video/dietgo.c
index 45eeded381f..9d355ad6790 100644
--- a/src/mame/video/dietgo.c
+++ b/src/mame/video/dietgo.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
static void draw_sprites(running_machine* machine, bitmap_t *bitmap,const rectangle *cliprect)
diff --git a/src/mame/video/digdug.c b/src/mame/video/digdug.c
index 4acf3228928..db91ef8b95a 100644
--- a/src/mame/video/digdug.c
+++ b/src/mame/video/digdug.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/galaga.h"
diff --git a/src/mame/video/djboy.c b/src/mame/video/djboy.c
index 66bd77fea64..70aff74f07e 100644
--- a/src/mame/video/djboy.c
+++ b/src/mame/video/djboy.c
@@ -3,7 +3,7 @@
*
* video hardware for DJ Boy
*/
-#include "driver.h"
+#include "emu.h"
#include "video/kan_pand.h"
#include "includes/djboy.h"
diff --git a/src/mame/video/djmain.c b/src/mame/video/djmain.c
index bce885ed78d..2603fff431c 100644
--- a/src/mame/video/djmain.c
+++ b/src/mame/video/djmain.c
@@ -3,7 +3,7 @@
* emulate video hardware
*/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#define NUM_SPRITES (0x800 / 16)
diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c
index 9144521ba08..ca499c78966 100644
--- a/src/mame/video/dkong.c
+++ b/src/mame/video/dkong.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/dkong.h"
#include "machine/latch8.h"
diff --git a/src/mame/video/docastle.c b/src/mame/video/docastle.c
index 5753bd875bf..d1c3d05b73a 100644
--- a/src/mame/video/docastle.c
+++ b/src/mame/video/docastle.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/docastle.h"
/***************************************************************************
diff --git a/src/mame/video/dogfgt.c b/src/mame/video/dogfgt.c
index efc8b21cb4b..1e723042f31 100644
--- a/src/mame/video/dogfgt.c
+++ b/src/mame/video/dogfgt.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/dogfgt.h"
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index 6240e96423a..e6cc38e8297 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/dooyong.h"
diff --git a/src/mame/video/dragrace.c b/src/mame/video/dragrace.c
index 962827236bc..308f3992e5f 100644
--- a/src/mame/video/dragrace.c
+++ b/src/mame/video/dragrace.c
@@ -4,7 +4,7 @@ Atari Drag Race video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/dragrace.h"
diff --git a/src/mame/video/drgnmst.c b/src/mame/video/drgnmst.c
index 07930c87640..c18d0fe229a 100644
--- a/src/mame/video/drgnmst.c
+++ b/src/mame/video/drgnmst.c
@@ -2,7 +2,7 @@
// layer priority register not fully understood
-#include "driver.h"
+#include "emu.h"
#include "includes/drgnmst.h"
diff --git a/src/mame/video/dribling.c b/src/mame/video/dribling.c
index 148cae2cc0f..e8ad0c6d506 100644
--- a/src/mame/video/dribling.c
+++ b/src/mame/video/dribling.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/dribling.h"
diff --git a/src/mame/video/drmicro.c b/src/mame/video/drmicro.c
index 8d4f43748bb..4c6c2e330f1 100644
--- a/src/mame/video/drmicro.c
+++ b/src/mame/video/drmicro.c
@@ -7,7 +7,7 @@ Video hardware
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/drmicro.h"
diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c
index 4b43e88abaf..b4c5985c37e 100644
--- a/src/mame/video/dynax.c
+++ b/src/mame/video/dynax.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/dynax.h"
// Log Blitter
diff --git a/src/mame/video/dynduke.c b/src/mame/video/dynduke.c
index f365478a8c2..7c5e1ce29f4 100644
--- a/src/mame/video/dynduke.c
+++ b/src/mame/video/dynduke.c
@@ -1,5 +1,5 @@
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bg_layer,*fg_layer,*tx_layer;
UINT16 *dynduke_back_data,*dynduke_fore_data,*dynduke_scroll_ram;
diff --git a/src/mame/video/eolith.c b/src/mame/video/eolith.c
index ec9a6b70eed..19c300c5252 100644
--- a/src/mame/video/eolith.c
+++ b/src/mame/video/eolith.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
int eolith_buffer = 0;
static UINT32 *vram;
diff --git a/src/mame/video/epos.c b/src/mame/video/epos.c
index 3ead546ebbf..3c28c7fe4ce 100644
--- a/src/mame/video/epos.c
+++ b/src/mame/video/epos.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/epos.h"
/***************************************************************************
diff --git a/src/mame/video/eprom.c b/src/mame/video/eprom.c
index 815ae5557d0..90c4b02bc20 100644
--- a/src/mame/video/eprom.c
+++ b/src/mame/video/eprom.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/eprom.h"
#include "includes/thunderj.h"
diff --git a/src/mame/video/equites.c b/src/mame/video/equites.c
index 807d3aeec81..19f960cde6a 100644
--- a/src/mame/video/equites.c
+++ b/src/mame/video/equites.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/equites.h"
diff --git a/src/mame/video/esd16.c b/src/mame/video/esd16.c
index dbcce668159..e28f2895a3c 100644
--- a/src/mame/video/esd16.c
+++ b/src/mame/video/esd16.c
@@ -33,7 +33,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/esd16.h"
diff --git a/src/mame/video/espial.c b/src/mame/video/espial.c
index 70b6b26645b..8bb217b5054 100644
--- a/src/mame/video/espial.c
+++ b/src/mame/video/espial.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/espial.h"
/***************************************************************************
diff --git a/src/mame/video/esripsys.c b/src/mame/video/esripsys.c
index 965f62805ff..6dbcb27074d 100644
--- a/src/mame/video/esripsys.c
+++ b/src/mame/video/esripsys.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "includes/esripsys.h"
diff --git a/src/mame/video/exedexes.c b/src/mame/video/exedexes.c
index 108ce6a82de..75545348b9e 100644
--- a/src/mame/video/exedexes.c
+++ b/src/mame/video/exedexes.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/exedexes.h"
diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c
index 6d005934714..e52082a6eba 100644
--- a/src/mame/video/exerion.c
+++ b/src/mame/video/exerion.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/exerion.h"
diff --git a/src/mame/video/exidy.c b/src/mame/video/exidy.c
index 5423deb9d35..307aecb8e80 100644
--- a/src/mame/video/exidy.c
+++ b/src/mame/video/exidy.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "includes/exidy.h"
diff --git a/src/mame/video/exidy440.c b/src/mame/video/exidy440.c
index 0276615dd6f..09a0392d1d0 100644
--- a/src/mame/video/exidy440.c
+++ b/src/mame/video/exidy440.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/exidy440.h"
diff --git a/src/mame/video/exprraid.c b/src/mame/video/exprraid.c
index d88b83746be..f4c7a8f3571 100644
--- a/src/mame/video/exprraid.c
+++ b/src/mame/video/exprraid.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/exprraid.h"
diff --git a/src/mame/video/exterm.c b/src/mame/video/exterm.c
index 9f7bdf3754d..7f5ce0dbe04 100644
--- a/src/mame/video/exterm.c
+++ b/src/mame/video/exterm.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "includes/exterm.h"
diff --git a/src/mame/video/exzisus.c b/src/mame/video/exzisus.c
index cf3bf197387..6ffb3865dbb 100644
--- a/src/mame/video/exzisus.c
+++ b/src/mame/video/exzisus.c
@@ -8,7 +8,7 @@ Functions to emulate the video hardware of the machine.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *exzisus_videoram0;
diff --git a/src/mame/video/f1gp.c b/src/mame/video/f1gp.c
index 258dc98f763..29458014a6b 100644
--- a/src/mame/video/f1gp.c
+++ b/src/mame/video/f1gp.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/f1gp.h"
diff --git a/src/mame/video/fantland.c b/src/mame/video/fantland.c
index 824a8ec92c9..1170abdf8fa 100644
--- a/src/mame/video/fantland.c
+++ b/src/mame/video/fantland.c
@@ -58,7 +58,7 @@
***************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/fantland.h"
static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect)
diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c
index 9f88726e359..0d902886e69 100644
--- a/src/mame/video/fastfred.c
+++ b/src/mame/video/fastfred.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/fastfred.h"
#include "includes/galaxold.h"
diff --git a/src/mame/video/fastlane.c b/src/mame/video/fastlane.c
index 291119bc6e9..f6f8283cb1b 100644
--- a/src/mame/video/fastlane.c
+++ b/src/mame/video/fastlane.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/fastlane.h"
diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c
index c1fdfebfd52..7c8ab15fdc6 100644
--- a/src/mame/video/fcombat.c
+++ b/src/mame/video/fcombat.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/fcombat.h"
diff --git a/src/mame/video/fgoal.c b/src/mame/video/fgoal.c
index d3061eae611..180f32cf6ce 100644
--- a/src/mame/video/fgoal.c
+++ b/src/mame/video/fgoal.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/fgoal.h"
diff --git a/src/mame/video/finalizr.c b/src/mame/video/finalizr.c
index df3750711e0..b4706fc8493 100644
--- a/src/mame/video/finalizr.c
+++ b/src/mame/video/finalizr.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/finalizr.h"
diff --git a/src/mame/video/firetrap.c b/src/mame/video/firetrap.c
index be3f75b208d..c0d0589cc65 100644
--- a/src/mame/video/firetrap.c
+++ b/src/mame/video/firetrap.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/firetrap.h"
diff --git a/src/mame/video/firetrk.c b/src/mame/video/firetrk.c
index 5cf4b461615..181c312c619 100644
--- a/src/mame/video/firetrk.c
+++ b/src/mame/video/firetrk.c
@@ -4,7 +4,7 @@ Atari Fire Truck + Super Bug + Monte Carlo video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/firetrk.h"
diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c
index 712bdebb38a..3f3729686c5 100644
--- a/src/mame/video/fitfight.c
+++ b/src/mame/video/fitfight.c
@@ -1,6 +1,6 @@
/* Fit of Fighting Video Hardware */
-#include "driver.h"
+#include "emu.h"
#include "includes/fitfight.h"
diff --git a/src/mame/video/flkatck.c b/src/mame/video/flkatck.c
index eac8a9dd937..09ad1e69c0b 100644
--- a/src/mame/video/flkatck.c
+++ b/src/mame/video/flkatck.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/flkatck.h"
diff --git a/src/mame/video/flower.c b/src/mame/video/flower.c
index f7d2e06b0e9..0b11d617c4e 100644
--- a/src/mame/video/flower.c
+++ b/src/mame/video/flower.c
@@ -1,6 +1,6 @@
/* Flower Video Hardware */
-#include "driver.h"
+#include "emu.h"
#include "includes/flower.h"
static tilemap_t *flower_bg0_tilemap, *flower_bg1_tilemap, *flower_text_tilemap, *flower_text_right_tilemap;
diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c
index 6c1f6bb3ba2..93baec4decb 100644
--- a/src/mame/video/flstory.c
+++ b/src/mame/video/flstory.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/flstory.h"
static TILE_GET_INFO( get_tile_info )
diff --git a/src/mame/video/foodf.c b/src/mame/video/foodf.c
index 2d7a59625de..6fc95a0ba02 100644
--- a/src/mame/video/foodf.c
+++ b/src/mame/video/foodf.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/foodf.h"
#include "video/resnet.h"
diff --git a/src/mame/video/freekick.c b/src/mame/video/freekick.c
index 3c78b8ade32..336234ee633 100644
--- a/src/mame/video/freekick.c
+++ b/src/mame/video/freekick.c
@@ -1,6 +1,6 @@
/* Free Kick Video Hardware */
-#include "driver.h"
+#include "emu.h"
#include "includes/freekick.h"
diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c
index acbed1b66a5..cf07f9b6c34 100644
--- a/src/mame/video/fromanc2.c
+++ b/src/mame/video/fromanc2.c
@@ -6,7 +6,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/fromanc2.h"
/******************************************************************************
diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c
index 83553723d27..2e812e78a58 100644
--- a/src/mame/video/fromance.c
+++ b/src/mame/video/fromance.c
@@ -7,7 +7,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/fromance.h"
diff --git a/src/mame/video/funkybee.c b/src/mame/video/funkybee.c
index 8c47e563584..9f81d689bbc 100644
--- a/src/mame/video/funkybee.c
+++ b/src/mame/video/funkybee.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/funkybee.h"
PALETTE_INIT( funkybee )
diff --git a/src/mame/video/funkyjet.c b/src/mame/video/funkyjet.c
index 595c9683101..88587e8f965 100644
--- a/src/mame/video/funkyjet.c
+++ b/src/mame/video/funkyjet.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
/******************************************************************************/
diff --git a/src/mame/video/funworld.c b/src/mame/video/funworld.c
index 733fa038996..52f3265fa5f 100644
--- a/src/mame/video/funworld.c
+++ b/src/mame/video/funworld.c
@@ -57,7 +57,7 @@
***********************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
static tilemap_t *bg_tilemap;
diff --git a/src/mame/video/funybubl.c b/src/mame/video/funybubl.c
index 5a3f0be395c..dbc1c5f9988 100644
--- a/src/mame/video/funybubl.c
+++ b/src/mame/video/funybubl.c
@@ -5,7 +5,7 @@ todo - convert to tilemap
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/funybubl.h"
diff --git a/src/mame/video/fuukifg2.c b/src/mame/video/fuukifg2.c
index 01644412479..920602fe4d0 100644
--- a/src/mame/video/fuukifg2.c
+++ b/src/mame/video/fuukifg2.c
@@ -24,7 +24,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/fuukifg2.h"
/***************************************************************************
diff --git a/src/mame/video/fuukifg3.c b/src/mame/video/fuukifg3.c
index b5bd7f45e10..fd214564e8a 100644
--- a/src/mame/video/fuukifg3.c
+++ b/src/mame/video/fuukifg3.c
@@ -27,7 +27,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/fuukifg3.h"
diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c
index 53b1a4bc4f8..ddcad476eab 100644
--- a/src/mame/video/gaelco.c
+++ b/src/mame/video/gaelco.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/gaelco.h"
/***************************************************************************
diff --git a/src/mame/video/gaelco2.c b/src/mame/video/gaelco2.c
index 5851c0f8319..41f1e47d3ef 100644
--- a/src/mame/video/gaelco2.c
+++ b/src/mame/video/gaelco2.c
@@ -76,7 +76,7 @@ Multi monitor notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/gaelco2.h"
UINT16 *gaelco2_vregs;
diff --git a/src/mame/video/gaelco3d.c b/src/mame/video/gaelco3d.c
index 6afe2f1a7e6..0a998442e55 100644
--- a/src/mame/video/gaelco3d.c
+++ b/src/mame/video/gaelco3d.c
@@ -6,8 +6,7 @@
**************************************************************************/
-#include "driver.h"
-#include "eminline.h"
+#include "emu.h"
#include "includes/gaelco3d.h"
#include "cpu/tms32031/tms32031.h"
#include "video/rgbutil.h"
diff --git a/src/mame/video/gaiden.c b/src/mame/video/gaiden.c
index 8ca2a84d044..acc31094721 100644
--- a/src/mame/video/gaiden.c
+++ b/src/mame/video/gaiden.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/gaiden.h"
/***************************************************************************
diff --git a/src/mame/video/galaga.c b/src/mame/video/galaga.c
index e53dd5c1fdb..33bd4fd9bb9 100644
--- a/src/mame/video/galaga.c
+++ b/src/mame/video/galaga.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/galaga.h"
diff --git a/src/mame/video/galastrm.c b/src/mame/video/galastrm.c
index ed65e8a068d..3bd438d2844 100644
--- a/src/mame/video/galastrm.c
+++ b/src/mame/video/galastrm.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "video/poly.h"
diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c
index 6f2e8ed72a7..936ca4e9730 100644
--- a/src/mame/video/galaxian.c
+++ b/src/mame/video/galaxian.c
@@ -210,7 +210,7 @@ H=B0: 0C,0C,0D,0D,0E,0E,0F,0F 0C,0C,2D,2D,0E,0E,2F,2F
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/galaxian.h"
diff --git a/src/mame/video/galaxold.c b/src/mame/video/galaxold.c
index 23fdfdf847e..758ed9eae57 100644
--- a/src/mame/video/galaxold.c
+++ b/src/mame/video/galaxold.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/galaxold.h"
static const rectangle _spritevisiblearea =
diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c
index 6d52b2fc6f0..83f665b82da 100644
--- a/src/mame/video/galivan.c
+++ b/src/mame/video/galivan.c
@@ -29,7 +29,7 @@ background: 0x4000 bytes of ROM: 76543210 tile code low bits
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/galivan.h"
/* Layers has only bits 5-6 active.
diff --git a/src/mame/video/galpani2.c b/src/mame/video/galpani2.c
index f5f62f862a1..6edb07bdf87 100644
--- a/src/mame/video/galpani2.c
+++ b/src/mame/video/galpani2.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/kaneko16.h"
/*
diff --git a/src/mame/video/galpanic.c b/src/mame/video/galpanic.c
index da2dae7b923..9769cd6d448 100644
--- a/src/mame/video/galpanic.c
+++ b/src/mame/video/galpanic.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "kan_pand.h"
UINT16 *galpanic_bgvideoram,*galpanic_fgvideoram;
diff --git a/src/mame/video/galspnbl.c b/src/mame/video/galspnbl.c
index e710cd1b8e8..79cc042d058 100644
--- a/src/mame/video/galspnbl.c
+++ b/src/mame/video/galspnbl.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/galspnbl.h"
diff --git a/src/mame/video/gameplan.c b/src/mame/video/gameplan.c
index e6374d12990..8bf7ec0f233 100644
--- a/src/mame/video/gameplan.c
+++ b/src/mame/video/gameplan.c
@@ -6,7 +6,7 @@ driver by Chris Moore
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/6522via.h"
#include "includes/gameplan.h"
diff --git a/src/mame/video/gaplus.c b/src/mame/video/gaplus.c
index 5c7c7105170..8e9245b77f3 100644
--- a/src/mame/video/gaplus.c
+++ b/src/mame/video/gaplus.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/gaplus.h"
diff --git a/src/mame/video/gatron.c b/src/mame/video/gatron.c
index ddf9f42723a..d9c179cef1c 100644
--- a/src/mame/video/gatron.c
+++ b/src/mame/video/gatron.c
@@ -17,7 +17,7 @@
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bg_tilemap;
diff --git a/src/mame/video/gauntlet.c b/src/mame/video/gauntlet.c
index 8a1544a9307..61af29c7254 100644
--- a/src/mame/video/gauntlet.c
+++ b/src/mame/video/gauntlet.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "includes/gauntlet.h"
diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c
index 0098eb4e146..eb8213d8138 100644
--- a/src/mame/video/gberet.c
+++ b/src/mame/video/gberet.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/gberet.h"
diff --git a/src/mame/video/gbusters.c b/src/mame/video/gbusters.c
index ce0ef553bbe..aae15fc5e0c 100644
--- a/src/mame/video/gbusters.c
+++ b/src/mame/video/gbusters.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/gbusters.h"
diff --git a/src/mame/video/gcpinbal.c b/src/mame/video/gcpinbal.c
index 1d79d2a9b31..9c99a4772b6 100644
--- a/src/mame/video/gcpinbal.c
+++ b/src/mame/video/gcpinbal.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/gcpinbal.h"
diff --git a/src/mame/video/genesis.c b/src/mame/video/genesis.c
index 7cec3396d68..558c952879d 100644
--- a/src/mame/video/genesis.c
+++ b/src/mame/video/genesis.c
@@ -7,7 +7,7 @@
***********************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/sn76496.h"
#include "includes/genesis.h"
diff --git a/src/mame/video/gijoe.c b/src/mame/video/gijoe.c
index 0c6e59c26d7..aa8060b4eb2 100644
--- a/src/mame/video/gijoe.c
+++ b/src/mame/video/gijoe.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/gijoe.h"
diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c
index fbcd502354a..ca59d159055 100644
--- a/src/mame/video/ginganin.c
+++ b/src/mame/video/ginganin.c
@@ -57,7 +57,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/ginganin.h"
diff --git a/src/mame/video/gladiatr.c b/src/mame/video/gladiatr.c
index d88f63253cb..83ff65ac3bb 100644
--- a/src/mame/video/gladiatr.c
+++ b/src/mame/video/gladiatr.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *gladiatr_videoram, *gladiatr_colorram, *gladiatr_textram;
diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c
index cad163ea2bb..955d670a610 100644
--- a/src/mame/video/glass.c
+++ b/src/mame/video/glass.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/glass.h"
/***************************************************************************
diff --git a/src/mame/video/gng.c b/src/mame/video/gng.c
index 22e47b7e303..5db5b10acde 100644
--- a/src/mame/video/gng.c
+++ b/src/mame/video/gng.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/gng.h"
diff --git a/src/mame/video/goal92.c b/src/mame/video/goal92.c
index 9313f2e96fd..2d6d5e38aa3 100644
--- a/src/mame/video/goal92.c
+++ b/src/mame/video/goal92.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/goal92.h"
READ16_HANDLER( goal92_fg_bank_r )
diff --git a/src/mame/video/goindol.c b/src/mame/video/goindol.c
index e0a85559794..59adb02d497 100644
--- a/src/mame/video/goindol.c
+++ b/src/mame/video/goindol.c
@@ -5,7 +5,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/goindol.h"
diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c
index 137e731f459..deed93fe2ab 100644
--- a/src/mame/video/goldstar.c
+++ b/src/mame/video/goldstar.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/goldstar.h"
diff --git a/src/mame/video/gomoku.c b/src/mame/video/gomoku.c
index 7dcd085a120..40156ca5c36 100644
--- a/src/mame/video/gomoku.c
+++ b/src/mame/video/gomoku.c
@@ -8,7 +8,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/gomoku.h"
diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c
index 887c939dd15..3548875c9cf 100644
--- a/src/mame/video/gotcha.c
+++ b/src/mame/video/gotcha.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/gotcha.h"
/***************************************************************************
diff --git a/src/mame/video/gottlieb.c b/src/mame/video/gottlieb.c
index 6e7c61169ea..39997a434a0 100644
--- a/src/mame/video/gottlieb.c
+++ b/src/mame/video/gottlieb.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/gottlieb.h"
#include "machine/laserdsc.h"
#include "video/resnet.h"
diff --git a/src/mame/video/gotya.c b/src/mame/video/gotya.c
index 0037476355d..e64db2de364 100644
--- a/src/mame/video/gotya.c
+++ b/src/mame/video/gotya.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/gotya.h"
diff --git a/src/mame/video/gradius3.c b/src/mame/video/gradius3.c
index 5a1554b48a5..0208b3bf6d4 100644
--- a/src/mame/video/gradius3.c
+++ b/src/mame/video/gradius3.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/gradius3.h"
diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c
index e606eb63add..9a0aea8b338 100644
--- a/src/mame/video/grchamp.c
+++ b/src/mame/video/grchamp.c
@@ -1,7 +1,7 @@
/* Video hardware for Taito Grand Champion */
/* updated by Hans Andersson, dec 2005 */
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/grchamp.h"
diff --git a/src/mame/video/gridlee.c b/src/mame/video/gridlee.c
index 4a3248158ce..0ecd34ed678 100644
--- a/src/mame/video/gridlee.c
+++ b/src/mame/video/gridlee.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/gridlee.h"
#include "includes/balsente.h"
diff --git a/src/mame/video/groundfx.c b/src/mame/video/groundfx.c
index f53948a466c..ab795ad1aab 100644
--- a/src/mame/video/groundfx.c
+++ b/src/mame/video/groundfx.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
UINT16 groundfx_rotate_ctrl[8];
diff --git a/src/mame/video/gstriker.c b/src/mame/video/gstriker.c
index fbfcd0cf6d6..0ce5d912757 100644
--- a/src/mame/video/gstriker.c
+++ b/src/mame/video/gstriker.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/gstriker.h"
//UINT16 *gs_videoram3;
diff --git a/src/mame/video/gsword.c b/src/mame/video/gsword.c
index 3bac31169e0..6ea4a30e745 100644
--- a/src/mame/video/gsword.c
+++ b/src/mame/video/gsword.c
@@ -5,7 +5,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
size_t gsword_spritexy_size;
diff --git a/src/mame/video/gtia.c b/src/mame/video/gtia.c
index 544558f2a84..349deaaacf9 100644
--- a/src/mame/video/gtia.c
+++ b/src/mame/video/gtia.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/atari.h"
#include "video/gtia.h"
diff --git a/src/mame/video/gticlub.c b/src/mame/video/gticlub.c
index 0cfe2ff7813..999adb9955a 100644
--- a/src/mame/video/gticlub.c
+++ b/src/mame/video/gticlub.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "cpu/sharc/sharc.h"
#include "machine/konppc.h"
#include "video/poly.h"
diff --git a/src/mame/video/gumbo.c b/src/mame/video/gumbo.c
index f3970099d02..5501fed9573 100644
--- a/src/mame/video/gumbo.c
+++ b/src/mame/video/gumbo.c
@@ -1,6 +1,6 @@
/* Gumbo video */
-#include "driver.h"
+#include "emu.h"
#include "includes/gumbo.h"
diff --git a/src/mame/video/gunbustr.c b/src/mame/video/gunbustr.c
index b5af17bcd20..01fd51e67ec 100644
--- a/src/mame/video/gunbustr.c
+++ b/src/mame/video/gunbustr.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
struct tempsprite
diff --git a/src/mame/video/gundealr.c b/src/mame/video/gundealr.c
index 0cbff7cf8ab..125b808b5ea 100644
--- a/src/mame/video/gundealr.c
+++ b/src/mame/video/gundealr.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/gundealr.h"
diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c
index 5e423e436ce..d30b5975295 100644
--- a/src/mame/video/gunsmoke.c
+++ b/src/mame/video/gunsmoke.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/gunsmoke.h"
/***************************************************************************
diff --git a/src/mame/video/gyruss.c b/src/mame/video/gyruss.c
index 2a49ec89428..eeca2630b21 100644
--- a/src/mame/video/gyruss.c
+++ b/src/mame/video/gyruss.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/gyruss.h"
diff --git a/src/mame/video/hanaawas.c b/src/mame/video/hanaawas.c
index 6c82a08a53c..3feb3a2400b 100644
--- a/src/mame/video/hanaawas.c
+++ b/src/mame/video/hanaawas.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/hanaawas.h"
/***************************************************************************
diff --git a/src/mame/video/harddriv.c b/src/mame/video/harddriv.c
index ca6d80e9acc..c264bbefeb6 100644
--- a/src/mame/video/harddriv.c
+++ b/src/mame/video/harddriv.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "includes/harddriv.h"
diff --git a/src/mame/video/hcastle.c b/src/mame/video/hcastle.c
index 9d963f885f3..3ae564da7d3 100644
--- a/src/mame/video/hcastle.c
+++ b/src/mame/video/hcastle.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/hcastle.h"
diff --git a/src/mame/video/hd63484.c b/src/mame/video/hd63484.c
index 901c7e69562..9318d5268d2 100644
--- a/src/mame/video/hd63484.c
+++ b/src/mame/video/hd63484.c
@@ -8,8 +8,7 @@ this chip is used in:
***************************************************************************/
-#include "driver.h"
-#include <math.h>
+#include "emu.h"
#include "video/hd63484.h"
#define LOG_COMMANDS 0
diff --git a/src/mame/video/hexa.c b/src/mame/video/hexa.c
index 47aa2f268c2..e8cfbc0cde7 100644
--- a/src/mame/video/hexa.c
+++ b/src/mame/video/hexa.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/hexa.h"
WRITE8_HANDLER( hexa_videoram_w )
diff --git a/src/mame/video/hexion.c b/src/mame/video/hexion.c
index 25cd310e798..7c089b97295 100644
--- a/src/mame/video/hexion.c
+++ b/src/mame/video/hexion.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
static UINT8 *vram[2],*unkram;
diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c
index 9d20a5b3358..edb6ce42c46 100644
--- a/src/mame/video/higemaru.c
+++ b/src/mame/video/higemaru.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/higemaru.h"
WRITE8_HANDLER( higemaru_videoram_w )
diff --git a/src/mame/video/himesiki.c b/src/mame/video/himesiki.c
index cbf9c03f73b..da3e9566e33 100644
--- a/src/mame/video/himesiki.c
+++ b/src/mame/video/himesiki.c
@@ -7,7 +7,7 @@ Video hardware
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/himesiki.h"
static TILE_GET_INFO( get_bg_tile_info )
diff --git a/src/mame/video/hnayayoi.c b/src/mame/video/hnayayoi.c
index 64407973dd4..59171be3b6e 100644
--- a/src/mame/video/hnayayoi.c
+++ b/src/mame/video/hnayayoi.c
@@ -9,7 +9,7 @@ The blitter reads compressed data from ROM and copies it to the bitmap RAM.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/hnayayoi.h"
static void common_vh_start( running_machine *machine, int num_pixmaps )
diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c
index 2f779b13d99..d9c958e8794 100644
--- a/src/mame/video/hng64.c
+++ b/src/mame/video/hng64.c
@@ -1,9 +1,7 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/hng64.h"
-#include <math.h>
#include "drawgfxm.h"
-#include "tilemap.h"
#define MAKE_MAME_REEEEAAALLLL_SLOW 0
diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c
index 525a6b370e7..b828386a3ca 100644
--- a/src/mame/video/holeland.c
+++ b/src/mame/video/holeland.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/holeland.h"
diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c
index 1a673490ee7..e7a6972b10d 100644
--- a/src/mame/video/homedata.c
+++ b/src/mame/video/homedata.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "includes/homedata.h"
diff --git a/src/mame/video/homerun.c b/src/mame/video/homerun.c
index ee75feeba47..0640b565dde 100644
--- a/src/mame/video/homerun.c
+++ b/src/mame/video/homerun.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/homerun.h"
diff --git a/src/mame/video/hyhoo.c b/src/mame/video/hyhoo.c
index 4619b36ba60..ecf84e3f17c 100644
--- a/src/mame/video/hyhoo.c
+++ b/src/mame/video/hyhoo.c
@@ -6,7 +6,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nb1413m3.h"
diff --git a/src/mame/video/hyperspt.c b/src/mame/video/hyperspt.c
index 03b1ad50e04..09ce1d0e7d7 100644
--- a/src/mame/video/hyperspt.c
+++ b/src/mame/video/hyperspt.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/trackfld.h"
diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c
index e78e5401a13..fc26cf0efad 100644
--- a/src/mame/video/hyprduel.c
+++ b/src/mame/video/hyprduel.c
@@ -54,7 +54,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/hyprduel.h"
/***************************************************************************
diff --git a/src/mame/video/ikki.c b/src/mame/video/ikki.c
index 22c384e5d8d..4102ecb0f53 100644
--- a/src/mame/video/ikki.c
+++ b/src/mame/video/ikki.c
@@ -8,7 +8,7 @@ Video hardware driver by Uki
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/ikki.h"
PALETTE_INIT( ikki )
diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c
index f02d754a748..f187bf3f35e 100644
--- a/src/mame/video/inufuku.c
+++ b/src/mame/video/inufuku.c
@@ -11,7 +11,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/inufuku.h"
diff --git a/src/mame/video/iqblock.c b/src/mame/video/iqblock.c
index 93ce9e293ac..a53e251f675 100644
--- a/src/mame/video/iqblock.c
+++ b/src/mame/video/iqblock.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/iqblock.h"
diff --git a/src/mame/video/irobot.c b/src/mame/video/irobot.c
index fb6411a2b98..1563b97d0d8 100644
--- a/src/mame/video/irobot.c
+++ b/src/mame/video/irobot.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/irobot.h"
#define BITMAP_WIDTH 256
diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c
index 4b899672616..7eaf0f44cd9 100644
--- a/src/mame/video/ironhors.c
+++ b/src/mame/video/ironhors.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/ironhors.h"
diff --git a/src/mame/video/itech32.c b/src/mame/video/itech32.c
index e8ec332265d..2484763dcbc 100644
--- a/src/mame/video/itech32.c
+++ b/src/mame/video/itech32.c
@@ -5,7 +5,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "cpu/m68000/m68000.h"
#include "includes/itech32.h"
diff --git a/src/mame/video/itech8.c b/src/mame/video/itech8.c
index 099d568207d..44685c7431b 100644
--- a/src/mame/video/itech8.c
+++ b/src/mame/video/itech8.c
@@ -87,7 +87,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/tms34061.h"
#include "video/tlc34076.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/video/jack.c b/src/mame/video/jack.c
index b700a229f11..79c1881ea21 100644
--- a/src/mame/video/jack.c
+++ b/src/mame/video/jack.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/jack.h"
diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c
index df62c7e2af9..e513240c5f7 100644
--- a/src/mame/video/jackal.c
+++ b/src/mame/video/jackal.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/jackal.h"
diff --git a/src/mame/video/jaguar.c b/src/mame/video/jaguar.c
index 6dfbb7b9f03..69a6cf58a95 100644
--- a/src/mame/video/jaguar.c
+++ b/src/mame/video/jaguar.c
@@ -134,7 +134,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "memconv.h"
#include "profiler.h"
#include "machine/atarigen.h"
diff --git a/src/mame/video/jailbrek.c b/src/mame/video/jailbrek.c
index 93b5e592917..4ed8cfc22f5 100644
--- a/src/mame/video/jailbrek.c
+++ b/src/mame/video/jailbrek.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/jailbrek.h"
PALETTE_INIT( jailbrek )
diff --git a/src/mame/video/jalblend.c b/src/mame/video/jalblend.c
index 33a9255dedd..b6a6ff73489 100644
--- a/src/mame/video/jalblend.c
+++ b/src/mame/video/jalblend.c
@@ -11,7 +11,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "jalblend.h"
diff --git a/src/mame/video/jedi.c b/src/mame/video/jedi.c
index 912479eb212..9f8fa022dd9 100644
--- a/src/mame/video/jedi.c
+++ b/src/mame/video/jedi.c
@@ -14,7 +14,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/jedi.h"
diff --git a/src/mame/video/jpmimpct.c b/src/mame/video/jpmimpct.c
index 64c2be8fa8f..d1fb9e82537 100644
--- a/src/mame/video/jpmimpct.c
+++ b/src/mame/video/jpmimpct.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "includes/jpmimpct.h"
diff --git a/src/mame/video/kan_panb.c b/src/mame/video/kan_panb.c
index 33fc3f4dba5..7ac51d0e7ea 100644
--- a/src/mame/video/kan_panb.c
+++ b/src/mame/video/kan_panb.c
@@ -1,6 +1,6 @@
/* bootlegs of Kaneko Pandora chip, with modifications */
-#include "driver.h"
+#include "emu.h"
#include "kan_panb.h"
VIDEO_UPDATE( honeydol )
diff --git a/src/mame/video/kan_pand.c b/src/mame/video/kan_pand.c
index cdebe82ca5a..eab40eb6ba8 100644
--- a/src/mame/video/kan_pand.c
+++ b/src/mame/video/kan_pand.c
@@ -47,7 +47,7 @@
***********************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/kan_pand.h"
typedef struct _kaneko_pandora_state kaneko_pandora_state;
diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c
index 97533c297a3..50b07aff929 100644
--- a/src/mame/video/kaneko16.c
+++ b/src/mame/video/kaneko16.c
@@ -31,7 +31,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/kaneko16.h"
#include "kan_pand.h"
diff --git a/src/mame/video/kangaroo.c b/src/mame/video/kangaroo.c
index 7dd7b55140e..38064d5d6d1 100644
--- a/src/mame/video/kangaroo.c
+++ b/src/mame/video/kangaroo.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/kangaroo.h"
static void blitter_execute(running_machine *machine);
diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c
index 5fe47c9f7b0..f8603891861 100644
--- a/src/mame/video/karnov.c
+++ b/src/mame/video/karnov.c
@@ -4,7 +4,7 @@
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/karnov.h"
/***************************************************************************
diff --git a/src/mame/video/kchamp.c b/src/mame/video/kchamp.c
index 64ee2917aa0..c2778121918 100644
--- a/src/mame/video/kchamp.c
+++ b/src/mame/video/kchamp.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/kchamp.h"
diff --git a/src/mame/video/kickgoal.c b/src/mame/video/kickgoal.c
index 18ba1c00204..e8ba42259b1 100644
--- a/src/mame/video/kickgoal.c
+++ b/src/mame/video/kickgoal.c
@@ -1,6 +1,6 @@
/* Kick Goal - video */
-#include "driver.h"
+#include "emu.h"
#include "includes/kickgoal.h"
diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c
index 4329a35a725..da505666bc0 100644
--- a/src/mame/video/kingobox.c
+++ b/src/mame/video/kingobox.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/kingobox.h"
diff --git a/src/mame/video/klax.c b/src/mame/video/klax.c
index da18eb0da0f..e12177eda7a 100644
--- a/src/mame/video/klax.c
+++ b/src/mame/video/klax.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/klax.h"
diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c
index 3194aed7ad5..d9c3ca70d3b 100644
--- a/src/mame/video/kncljoe.c
+++ b/src/mame/video/kncljoe.c
@@ -4,7 +4,7 @@ Knuckle Joe - (c) 1985 Taito Corporation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/kncljoe.h"
diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c
index c54591f4cf6..1346f5bf19d 100644
--- a/src/mame/video/konamigx.c
+++ b/src/mame/video/konamigx.c
@@ -3,7 +3,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "video/konamiic.h"
#include "includes/konamigx.h"
diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c
index bc4033bbea8..4787e17420c 100644
--- a/src/mame/video/konamiic.c
+++ b/src/mame/video/konamiic.c
@@ -1149,7 +1149,7 @@ Registers (word-wise):
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konamiic.h"
#define VERBOSE 0
diff --git a/src/mame/video/konicdev.c b/src/mame/video/konicdev.c
index 8cbe96429a3..fda1351401b 100644
--- a/src/mame/video/konicdev.c
+++ b/src/mame/video/konicdev.c
@@ -1149,7 +1149,7 @@ Registers (word-wise):
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#define VERBOSE 0
diff --git a/src/mame/video/kopunch.c b/src/mame/video/kopunch.c
index f945c4ec898..8d0283ca0c1 100644
--- a/src/mame/video/kopunch.c
+++ b/src/mame/video/kopunch.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/kopunch.h"
diff --git a/src/mame/video/ksayakyu.c b/src/mame/video/ksayakyu.c
index 7ee4b2be10e..21af7c67459 100644
--- a/src/mame/video/ksayakyu.c
+++ b/src/mame/video/ksayakyu.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/ksayakyu.h"
diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c
index d7a58f19d95..c08950ac149 100644
--- a/src/mame/video/kyugo.c
+++ b/src/mame/video/kyugo.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/kyugo.h"
diff --git a/src/mame/video/labyrunr.c b/src/mame/video/labyrunr.c
index 39e3ccaa47d..891a8a84e07 100644
--- a/src/mame/video/labyrunr.c
+++ b/src/mame/video/labyrunr.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/labyrunr.h"
diff --git a/src/mame/video/ladybug.c b/src/mame/video/ladybug.c
index 94d80b03f5a..79a6a8765f9 100644
--- a/src/mame/video/ladybug.c
+++ b/src/mame/video/ladybug.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/ladybug.h"
diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c
index 75a524e7760..7a5ddfbdc6a 100644
--- a/src/mame/video/ladyfrog.c
+++ b/src/mame/video/ladyfrog.c
@@ -5,7 +5,7 @@
Functions to emulate the video hardware of the machine.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/ladyfrog.h"
diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c
index a38d6376fe7..cebe152b2ba 100644
--- a/src/mame/video/lasso.c
+++ b/src/mame/video/lasso.c
@@ -27,7 +27,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/lasso.h"
/***************************************************************************
diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c
index 38da3ce37c6..5c02345bd7f 100644
--- a/src/mame/video/lastduel.c
+++ b/src/mame/video/lastduel.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/lastduel.h"
diff --git a/src/mame/video/lazercmd.c b/src/mame/video/lazercmd.c
index 9ba88a69023..229e4275d2c 100644
--- a/src/mame/video/lazercmd.c
+++ b/src/mame/video/lazercmd.c
@@ -4,7 +4,7 @@
/* */
/*************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/lazercmd.h"
/* scale a markers vertical position */
diff --git a/src/mame/video/legionna.c b/src/mame/video/legionna.c
index 1fe4fc892b7..9744a7d724b 100644
--- a/src/mame/video/legionna.c
+++ b/src/mame/video/legionna.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/legionna.h"
UINT16 *legionna_back_data,*legionna_fore_data,*legionna_mid_data,*legionna_scrollram16,*legionna_textram;
diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c
index b18924680af..a65d859c92b 100644
--- a/src/mame/video/leland.c
+++ b/src/mame/video/leland.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/leland.h"
diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c
index 526ebff1507..948f1b2d5c1 100644
--- a/src/mame/video/lemmings.c
+++ b/src/mame/video/lemmings.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/lemmings.h"
static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, UINT16 *spritedata, int gfxbank, UINT16 pri )
diff --git a/src/mame/video/lethal.c b/src/mame/video/lethal.c
index c93e8ffb1d8..9a52c2efaaa 100644
--- a/src/mame/video/lethal.c
+++ b/src/mame/video/lethal.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/lethal.h"
diff --git a/src/mame/video/lethalj.c b/src/mame/video/lethalj.c
index ee9dff38b73..bf23e359413 100644
--- a/src/mame/video/lethalj.c
+++ b/src/mame/video/lethalj.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "includes/lethalj.h"
diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c
index 08f2874196f..961aece9d19 100644
--- a/src/mame/video/liberate.c
+++ b/src/mame/video/liberate.c
@@ -9,7 +9,7 @@
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/liberate.h"
diff --git a/src/mame/video/liberatr.c b/src/mame/video/liberatr.c
index c29baba95d3..c60cb795b08 100644
--- a/src/mame/video/liberatr.c
+++ b/src/mame/video/liberatr.c
@@ -13,7 +13,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/liberatr.h"
diff --git a/src/mame/video/lkage.c b/src/mame/video/lkage.c
index d9a14abdd39..bd8157f9ea2 100644
--- a/src/mame/video/lkage.c
+++ b/src/mame/video/lkage.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/lkage.h"
static tilemap_t *bg_tilemap, *fg_tilemap, *tx_tilemap;
diff --git a/src/mame/video/lockon.c b/src/mame/video/lockon.c
index 8f9f265c84d..ff2829d3580 100644
--- a/src/mame/video/lockon.c
+++ b/src/mame/video/lockon.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/lockon.h"
#include "cpu/nec/nec.h"
#include "video/resnet.h"
diff --git a/src/mame/video/lordgun.c b/src/mame/video/lordgun.c
index 8b5a6fbf0b0..4bddfccbcdc 100644
--- a/src/mame/video/lordgun.c
+++ b/src/mame/video/lordgun.c
@@ -35,7 +35,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/lordgun.h"
// Variables needed by driver:
diff --git a/src/mame/video/lsasquad.c b/src/mame/video/lsasquad.c
index 31f4a328bd3..d9436215722 100644
--- a/src/mame/video/lsasquad.c
+++ b/src/mame/video/lsasquad.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/lsasquad.h"
UINT8 *lsasquad_scrollram;
diff --git a/src/mame/video/lucky74.c b/src/mame/video/lucky74.c
index 7cb4a042497..3d2e2de4397 100644
--- a/src/mame/video/lucky74.c
+++ b/src/mame/video/lucky74.c
@@ -93,7 +93,7 @@
****************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
diff --git a/src/mame/video/lvcards.c b/src/mame/video/lvcards.c
index e3bb46bb90d..3d7a8f6a0be 100644
--- a/src/mame/video/lvcards.c
+++ b/src/mame/video/lvcards.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *lvcards_videoram;
UINT8 *lvcards_colorram;
diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c
index c1118d8c1c1..e8073f086d5 100644
--- a/src/mame/video/lwings.c
+++ b/src/mame/video/lwings.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/lwings.h"
/***************************************************************************
diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c
index 765550e8a8f..5d20e4be1da 100644
--- a/src/mame/video/m10.c
+++ b/src/mame/video/m10.c
@@ -10,7 +10,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/m10.h"
static UINT32 extyoffs[32 * 8]; // FIXME: this should be moved to m10_state, but backlayout would have problems
diff --git a/src/mame/video/m107.c b/src/mame/video/m107.c
index 2942af6578d..05927c669c7 100644
--- a/src/mame/video/m107.c
+++ b/src/mame/video/m107.c
@@ -34,7 +34,7 @@
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/m107.h"
typedef struct _pf_layer_info pf_layer_info;
diff --git a/src/mame/video/m52.c b/src/mame/video/m52.c
index d4d899daac4..f849029cb00 100644
--- a/src/mame/video/m52.c
+++ b/src/mame/video/m52.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/iremz80.h"
#include "video/resnet.h"
diff --git a/src/mame/video/m57.c b/src/mame/video/m57.c
index b883577eb47..e4480c8fa60 100644
--- a/src/mame/video/m57.c
+++ b/src/mame/video/m57.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/iremz80.h"
diff --git a/src/mame/video/m58.c b/src/mame/video/m58.c
index 50d0d7a4d8d..af2657c4d8b 100644
--- a/src/mame/video/m58.c
+++ b/src/mame/video/m58.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/iremz80.h"
#include "video/resnet.h"
diff --git a/src/mame/video/m62.c b/src/mame/video/m62.c
index db8cb560046..f7c94dfa9e0 100644
--- a/src/mame/video/m62.c
+++ b/src/mame/video/m62.c
@@ -13,7 +13,7 @@ Tile/sprite priority system (for the Kung Fu Master M62 board):
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/iremz80.h"
#include "video/resnet.h"
diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c
index 189b67f1df7..e77a74a9a05 100644
--- a/src/mame/video/m72.c
+++ b/src/mame/video/m72.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "audio/m72.h"
#include "includes/m72.h"
diff --git a/src/mame/video/m90.c b/src/mame/video/m90.c
index 32ea857c826..4a4b91d00ce 100644
--- a/src/mame/video/m90.c
+++ b/src/mame/video/m90.c
@@ -26,7 +26,7 @@
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
static UINT16 *m90_spriteram;
UINT16 *m90_video_data;
diff --git a/src/mame/video/m92.c b/src/mame/video/m92.c
index a10d0f865cb..7d3bd7b87d6 100644
--- a/src/mame/video/m92.c
+++ b/src/mame/video/m92.c
@@ -39,7 +39,7 @@
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/m92.h"
typedef struct _pf_layer_info pf_layer_info;
diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c
index dc45890fc36..c8a9d6eafad 100644
--- a/src/mame/video/macrossp.c
+++ b/src/mame/video/macrossp.c
@@ -1,7 +1,7 @@
/* Macross Plus - video
see DRIVER file for notes */
-#include "driver.h"
+#include "emu.h"
UINT32 *macrossp_scra_videoram, *macrossp_scra_videoregs;
diff --git a/src/mame/video/madalien.c b/src/mame/video/madalien.c
index 154323c44c5..44e9e41a289 100644
--- a/src/mame/video/madalien.c
+++ b/src/mame/video/madalien.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/mc6845.h"
#include "includes/madalien.h"
diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c
index 66fd1a8fd82..44a49fb9568 100644
--- a/src/mame/video/madmotor.c
+++ b/src/mame/video/madmotor.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *madmotor_pf1_rowscroll;
UINT16 *madmotor_pf1_data,*madmotor_pf2_data,*madmotor_pf3_data;
diff --git a/src/mame/video/magmax.c b/src/mame/video/magmax.c
index f2041a06408..6df4d794aa1 100644
--- a/src/mame/video/magmax.c
+++ b/src/mame/video/magmax.c
@@ -7,7 +7,7 @@ Additional tweaking by Jarek Burczynski
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *magmax_scroll_x;
UINT16 *magmax_scroll_y;
diff --git a/src/mame/video/mainevt.c b/src/mame/video/mainevt.c
index e9585490ae8..30d24239dab 100644
--- a/src/mame/video/mainevt.c
+++ b/src/mame/video/mainevt.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/mainevt.h"
diff --git a/src/mame/video/mainsnk.c b/src/mame/video/mainsnk.c
index 2f44b5c9781..47ac6391850 100644
--- a/src/mame/video/mainsnk.c
+++ b/src/mame/video/mainsnk.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
static tilemap_t *tx_tilemap;
static tilemap_t *bg_tilemap;
diff --git a/src/mame/video/malzak.c b/src/mame/video/malzak.c
index bfa115392d5..b2d8dda02a8 100644
--- a/src/mame/video/malzak.c
+++ b/src/mame/video/malzak.c
@@ -12,7 +12,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "video/s2636.h"
#include "video/saa5050.h"
#include "includes/malzak.h"
diff --git a/src/mame/video/mappy.c b/src/mame/video/mappy.c
index 9abba1cec42..2f2d3427acf 100644
--- a/src/mame/video/mappy.c
+++ b/src/mame/video/mappy.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/mappy.h"
diff --git a/src/mame/video/marineb.c b/src/mame/video/marineb.c
index f0c58ebb9d5..ab785f1df87 100644
--- a/src/mame/video/marineb.c
+++ b/src/mame/video/marineb.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/espial.h"
diff --git a/src/mame/video/mario.c b/src/mame/video/mario.c
index 04f06abc8a4..3f91979ad90 100644
--- a/src/mame/video/mario.c
+++ b/src/mame/video/mario.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/mario.h"
diff --git a/src/mame/video/markham.c b/src/mame/video/markham.c
index 62df7f59292..0feabfb7aa5 100644
--- a/src/mame/video/markham.c
+++ b/src/mame/video/markham.c
@@ -8,7 +8,7 @@ Video hardware driver by Uki
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *markham_xscroll;
diff --git a/src/mame/video/matmania.c b/src/mame/video/matmania.c
index d97096a1f5e..03d69a04bf6 100644
--- a/src/mame/video/matmania.c
+++ b/src/mame/video/matmania.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/matmania.h"
diff --git a/src/mame/video/mayumi.c b/src/mame/video/mayumi.c
index 062ff0b9183..8d0c0f61f7a 100644
--- a/src/mame/video/mayumi.c
+++ b/src/mame/video/mayumi.c
@@ -7,7 +7,7 @@ Video hardware
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *mayumi_videoram;
static tilemap_t *mayumi_tilemap;
diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c
index b1b31762ba7..6eaa2acc6fa 100644
--- a/src/mame/video/mcatadv.c
+++ b/src/mame/video/mcatadv.c
@@ -10,7 +10,7 @@ Nost final boss, the priority of the arms is under the tilemaps, everything else
ToDo: Fix Sprites & Rowscroll/Select for Cocktail
*/
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "includes/mcatadv.h"
diff --git a/src/mame/video/mcr.c b/src/mame/video/mcr.c
index 1924efd7d4e..db8ea6eb471 100644
--- a/src/mame/video/mcr.c
+++ b/src/mame/video/mcr.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/mcr.h"
diff --git a/src/mame/video/mcr3.c b/src/mame/video/mcr3.c
index f7a207c0c35..8142e179cd0 100644
--- a/src/mame/video/mcr3.c
+++ b/src/mame/video/mcr3.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/mcr.h"
diff --git a/src/mame/video/mcr68.c b/src/mame/video/mcr68.c
index fd6c9f113d9..de88f5c59c0 100644
--- a/src/mame/video/mcr68.c
+++ b/src/mame/video/mcr68.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/mcr.h"
diff --git a/src/mame/video/meadows.c b/src/mame/video/meadows.c
index 4e0e460f2ce..02fbe95303d 100644
--- a/src/mame/video/meadows.c
+++ b/src/mame/video/meadows.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/meadows.h"
/* some constants to make life easier */
diff --git a/src/mame/video/megasys1.c b/src/mame/video/megasys1.c
index 3e76494d4b9..deb7e0df986 100644
--- a/src/mame/video/megasys1.c
+++ b/src/mame/video/megasys1.c
@@ -191,7 +191,7 @@ actual code sent to the hardware.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/megasys1.h"
/* Variables defined here, that have to be shared: */
diff --git a/src/mame/video/megazone.c b/src/mame/video/megazone.c
index e2645d00f92..d8cb2222993 100644
--- a/src/mame/video/megazone.c
+++ b/src/mame/video/megazone.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
UINT8 *megazone_scrollx;
diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c
index 5c747a9189d..271010131dc 100644
--- a/src/mame/video/mermaid.c
+++ b/src/mame/video/mermaid.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bg_tilemap, *fg_tilemap;
diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c
index 8eb5c56b492..344d1fff3f4 100644
--- a/src/mame/video/metlclsh.c
+++ b/src/mame/video/metlclsh.c
@@ -18,7 +18,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
/* Local variables: */
diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c
index 1ad3e621c3d..b58a63810ac 100644
--- a/src/mame/video/metro.c
+++ b/src/mame/video/metro.c
@@ -51,7 +51,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
/* Variables that driver has access to: */
diff --git a/src/mame/video/mexico86.c b/src/mame/video/mexico86.c
index 2ed03c74568..e4f8c21bf84 100644
--- a/src/mame/video/mexico86.c
+++ b/src/mame/video/mexico86.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/mexico86.h"
UINT8 *mexico86_videoram,*mexico86_objectram;
diff --git a/src/mame/video/midtunit.c b/src/mame/video/midtunit.c
index dd5aac8600c..37510d0b482 100644
--- a/src/mame/video/midtunit.c
+++ b/src/mame/video/midtunit.c
@@ -4,7 +4,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "cpu/tms34010/tms34010.h"
#include "includes/midtunit.h"
diff --git a/src/mame/video/midvunit.c b/src/mame/video/midvunit.c
index 6263a2993af..7c32da5789b 100644
--- a/src/mame/video/midvunit.c
+++ b/src/mame/video/midvunit.c
@@ -4,7 +4,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/video/midyunit.c b/src/mame/video/midyunit.c
index 864a43e0f30..19c11c23857 100644
--- a/src/mame/video/midyunit.c
+++ b/src/mame/video/midyunit.c
@@ -4,7 +4,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "cpu/tms34010/tms34010.h"
#include "includes/midyunit.h"
diff --git a/src/mame/video/midzeus.c b/src/mame/video/midzeus.c
index becc0c90e65..e11eab13451 100644
--- a/src/mame/video/midzeus.c
+++ b/src/mame/video/midzeus.c
@@ -4,8 +4,7 @@
**************************************************************************/
-#include "driver.h"
-#include "eminline.h"
+#include "emu.h"
#include "includes/midzeus.h"
#include "video/poly.h"
#include "video/rgbutil.h"
diff --git a/src/mame/video/midzeus2.c b/src/mame/video/midzeus2.c
index 295536c10e9..2b7c0412a59 100644
--- a/src/mame/video/midzeus2.c
+++ b/src/mame/video/midzeus2.c
@@ -4,8 +4,7 @@
**************************************************************************/
-#include "driver.h"
-#include "eminline.h"
+#include "emu.h"
#include "cpu/tms32031/tms32031.h"
#include "includes/midzeus.h"
#include "video/poly.h"
diff --git a/src/mame/video/mikie.c b/src/mame/video/mikie.c
index 713a5db6cfb..492bcf30778 100644
--- a/src/mame/video/mikie.c
+++ b/src/mame/video/mikie.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
static int palettebank;
diff --git a/src/mame/video/mitchell.c b/src/mame/video/mitchell.c
index c2a4dae3e2b..ea9e6597275 100644
--- a/src/mame/video/mitchell.c
+++ b/src/mame/video/mitchell.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/okim6295.h"
#include "includes/mitchell.h"
diff --git a/src/mame/video/mjkjidai.c b/src/mame/video/mjkjidai.c
index c09cf1d4d66..cde6259c7da 100644
--- a/src/mame/video/mjkjidai.c
+++ b/src/mame/video/mjkjidai.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/mjkjidai.h"
static int display_enable;
diff --git a/src/mame/video/mjsister.c b/src/mame/video/mjsister.c
index 177b9b34b3a..9af9206c2c0 100644
--- a/src/mame/video/mjsister.c
+++ b/src/mame/video/mjsister.c
@@ -7,7 +7,7 @@ Video hardware
*****************************************************************************/
-#include "driver.h"
+#include "emu.h"
int mjsister_screen_redraw;
int mjsister_flip_screen;
diff --git a/src/mame/video/model1.c b/src/mame/video/model1.c
index 11bc5c02ff5..fa565102e50 100644
--- a/src/mame/video/model1.c
+++ b/src/mame/video/model1.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/segaic24.h"
#include "cpu/mb86233/mb86233.h"
#include "includes/model1.h"
diff --git a/src/mame/video/model2.c b/src/mame/video/model2.c
index 4924951d72a..2feb4c0fa08 100644
--- a/src/mame/video/model2.c
+++ b/src/mame/video/model2.c
@@ -85,8 +85,7 @@
to display more detail when a texture is real close to the viewer. This is currently unemulated.
*********************************************************************************************************************************/
-#include "driver.h"
-#include "eminline.h"
+#include "emu.h"
#include "video/segaic24.h"
#include "video/poly.h"
#include "includes/model2.h"
diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c
index 0fa8fae5b82..ee6a7abbe43 100644
--- a/src/mame/video/model3.c
+++ b/src/mame/video/model3.c
@@ -1,8 +1,6 @@
-#include "driver.h"
+#include "emu.h"
#include "video/poly.h"
#include "video/rgbutil.h"
-#include "eminline.h"
-#include <math.h>
#include "includes/model3.h"
diff --git a/src/mame/video/mole.c b/src/mame/video/mole.c
index a48e049ee15..5da7d7e497e 100644
--- a/src/mame/video/mole.c
+++ b/src/mame/video/mole.c
@@ -6,7 +6,7 @@
and uses a control location (0x8400) to select the character sets
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
static int tile_bank;
static UINT16 *tileram;
diff --git a/src/mame/video/momoko.c b/src/mame/video/momoko.c
index 6365d55d551..04dbd0be4fc 100644
--- a/src/mame/video/momoko.c
+++ b/src/mame/video/momoko.c
@@ -8,7 +8,7 @@ Video hardware driver by Uki
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *momoko_bg_scrollx;
UINT8 *momoko_bg_scrolly;
diff --git a/src/mame/video/moo.c b/src/mame/video/moo.c
index 0a260c2bd10..65bd92ffce9 100644
--- a/src/mame/video/moo.c
+++ b/src/mame/video/moo.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/moo.h"
diff --git a/src/mame/video/mosaic.c b/src/mame/video/mosaic.c
index de16369ec0c..8639cd9664c 100644
--- a/src/mame/video/mosaic.c
+++ b/src/mame/video/mosaic.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *mosaic_fgvideoram;
diff --git a/src/mame/video/mouser.c b/src/mame/video/mouser.c
index e568571f8fb..5b86896295f 100644
--- a/src/mame/video/mouser.c
+++ b/src/mame/video/mouser.c
@@ -13,7 +13,7 @@
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *mouser_videoram;
UINT8 *mouser_colorram;
diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c
index bfb022d508d..8f8effa7b60 100644
--- a/src/mame/video/mrdo.c
+++ b/src/mame/video/mrdo.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *mrdo_bgvideoram,*mrdo_fgvideoram;
diff --git a/src/mame/video/mrflea.c b/src/mame/video/mrflea.c
index 888063bf284..5bbe991e053 100644
--- a/src/mame/video/mrflea.c
+++ b/src/mame/video/mrflea.c
@@ -5,7 +5,7 @@ Mr. F. Lea
******************************************************************/
-#include "driver.h"
+#include "emu.h"
static int mrflea_gfx_bank;
diff --git a/src/mame/video/mrjong.c b/src/mame/video/mrjong.c
index e68c99c8201..eb93b1fb0cc 100644
--- a/src/mame/video/mrjong.c
+++ b/src/mame/video/mrjong.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *mrjong_videoram;
UINT8 *mrjong_colorram;
diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c
index 5a25c304575..6e9c30b6072 100644
--- a/src/mame/video/ms32.c
+++ b/src/mame/video/ms32.c
@@ -12,7 +12,7 @@ priority should be given to
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/tetrisp2.h"
#include "includes/ms32.h"
diff --git a/src/mame/video/msisaac.c b/src/mame/video/msisaac.c
index 0b6212e731e..d8138469546 100644
--- a/src/mame/video/msisaac.c
+++ b/src/mame/video/msisaac.c
@@ -2,7 +2,7 @@
* Video Driver for Metal Soldier Isaac II (1985)
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/buggychl.h"
diff --git a/src/mame/video/mugsmash.c b/src/mame/video/mugsmash.c
index defb9f5e87d..24f7a733083 100644
--- a/src/mame/video/mugsmash.c
+++ b/src/mame/video/mugsmash.c
@@ -1,6 +1,6 @@
/* video/mugsmash.c - see drivers/mugsmash.c for more info */
-#include "driver.h"
+#include "emu.h"
static tilemap_t *mugsmash_tilemap1, *mugsmash_tilemap2;
diff --git a/src/mame/video/munchmo.c b/src/mame/video/munchmo.c
index b25b1c93c94..8866d91f778 100644
--- a/src/mame/video/munchmo.c
+++ b/src/mame/video/munchmo.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
UINT8 *mnchmobl_vreg;
diff --git a/src/mame/video/mustache.c b/src/mame/video/mustache.c
index 8705d5660a8..fc6dd809e30 100644
--- a/src/mame/video/mustache.c
+++ b/src/mame/video/mustache.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bg_tilemap;
static int control_byte;
diff --git a/src/mame/video/mw8080bw.c b/src/mame/video/mw8080bw.c
index 0f4b59fb21e..032484464f8 100644
--- a/src/mame/video/mw8080bw.c
+++ b/src/mame/video/mw8080bw.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/mw8080bw.h"
diff --git a/src/mame/video/mystston.c b/src/mame/video/mystston.c
index 01405b6e3bb..a5fa29bb160 100644
--- a/src/mame/video/mystston.c
+++ b/src/mame/video/mystston.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/mystston.h"
diff --git a/src/mame/video/mystwarr.c b/src/mame/video/mystwarr.c
index f224bd5c07a..6e8d3a9c74f 100644
--- a/src/mame/video/mystwarr.c
+++ b/src/mame/video/mystwarr.c
@@ -5,7 +5,7 @@
*
*/
-#include "driver.h"
+#include "emu.h"
#include "video/konamiic.h"
#include "includes/konamigx.h"
diff --git a/src/mame/video/n64.c b/src/mame/video/n64.c
index ac5c54aba79..13c73c491e4 100644
--- a/src/mame/video/n64.c
+++ b/src/mame/video/n64.c
@@ -6,8 +6,7 @@
Many improvements by angrylion, Ziggy, Gonetz, Orkin
*/
-#include <math.h>
-#include "driver.h"
+#include "emu.h"
#include "includes/n64.h"
#define LOG_RDP_EXECUTION 0
diff --git a/src/mame/video/n8080.c b/src/mame/video/n8080.c
index b7d7cc5f9d3..9e9abe8c385 100644
--- a/src/mame/video/n8080.c
+++ b/src/mame/video/n8080.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/n8080.h"
diff --git a/src/mame/video/namcofl.c b/src/mame/video/namcofl.c
index 0853324e098..714593cb069 100644
--- a/src/mame/video/namcofl.c
+++ b/src/mame/video/namcofl.c
@@ -1,6 +1,6 @@
/* video/namcofl.c */
-#include "driver.h"
+#include "emu.h"
#include "includes/namconb1.h"
#include "includes/namcoic.h"
#include "includes/namcos2.h"
diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c
index 5abffe1f3da..165d2a3f165 100644
--- a/src/mame/video/namcona1.c
+++ b/src/mame/video/namcona1.c
@@ -6,7 +6,7 @@ TODO:
- non-shadow pixels for sprites flagged to enable shadows have bad colors
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/namcona1.h"
#define NAMCONA1_NUM_TILEMAPS 4
diff --git a/src/mame/video/namconb1.c b/src/mame/video/namconb1.c
index 60d639a13b1..d8f30348ab6 100644
--- a/src/mame/video/namconb1.c
+++ b/src/mame/video/namconb1.c
@@ -1,6 +1,6 @@
/* video/namconb1.c */
-#include "driver.h"
+#include "emu.h"
#include "includes/namconb1.h"
#include "includes/namcoic.h"
#include "includes/namcos2.h"
diff --git a/src/mame/video/namcos1.c b/src/mame/video/namcos1.c
index 47e741e7d2b..24258446b3a 100644
--- a/src/mame/video/namcos1.c
+++ b/src/mame/video/namcos1.c
@@ -4,7 +4,7 @@ Namco System 1 Video Hardware
*******************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/namcos1.h"
diff --git a/src/mame/video/namcos2.c b/src/mame/video/namcos2.c
index 17967317fa4..e68c56ad75f 100644
--- a/src/mame/video/namcos2.c
+++ b/src/mame/video/namcos2.c
@@ -1,6 +1,6 @@
/* video hardware for Namco System II */
-#include "driver.h"
+#include "emu.h"
#include "includes/namcos2.h"
#include "includes/namcoic.h"
diff --git a/src/mame/video/namcos21.c b/src/mame/video/namcos21.c
index b2c73d63cdc..a72a10e25a5 100644
--- a/src/mame/video/namcos21.c
+++ b/src/mame/video/namcos21.c
@@ -6,7 +6,7 @@ Namco System 21 Video Hardware
- 3d graphics are managed by DSP processors
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/namcos2.h"
#include "includes/namcoic.h"
#include "includes/namcos21.h"
diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c
index 34f6d971657..49901910e59 100644
--- a/src/mame/video/namcos22.c
+++ b/src/mame/video/namcos22.c
@@ -33,8 +33,7 @@ SPOT TABLE test
03F2B2: 06B9 0000 0001 00E0 AB08 addi.l #$1, $e0ab08.l
*/
-#include "driver.h"
-#include "eminline.h"
+#include "emu.h"
#include "video/rgbutil.h"
#include "includes/namcos22.h"
#include "video/poly.h"
diff --git a/src/mame/video/namcos86.c b/src/mame/video/namcos86.c
index 061b9961ecf..0738c98d18e 100644
--- a/src/mame/video/namcos86.c
+++ b/src/mame/video/namcos86.c
@@ -4,7 +4,7 @@ Namco System 86 Video Hardware
*******************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *rthunder_videoram1, *rthunder_videoram2, *rthunder_spriteram;
diff --git a/src/mame/video/naughtyb.c b/src/mame/video/naughtyb.c
index 68fb3871d95..fd08b8e401f 100644
--- a/src/mame/video/naughtyb.c
+++ b/src/mame/video/naughtyb.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/phoenix.h"
diff --git a/src/mame/video/nbmj8688.c b/src/mame/video/nbmj8688.c
index c75b2849f09..0e1e3fd2b6d 100644
--- a/src/mame/video/nbmj8688.c
+++ b/src/mame/video/nbmj8688.c
@@ -6,7 +6,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nb1413m3.h"
#include "includes/nbmj8688.h"
diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c
index 1a9d9b2a2ca..3907ef062ff 100644
--- a/src/mame/video/nbmj8891.c
+++ b/src/mame/video/nbmj8891.c
@@ -6,7 +6,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nb1413m3.h"
#include "includes/nbmj8891.h"
diff --git a/src/mame/video/nbmj8900.c b/src/mame/video/nbmj8900.c
index 34848a2dd07..16ba573cf69 100644
--- a/src/mame/video/nbmj8900.c
+++ b/src/mame/video/nbmj8900.c
@@ -6,7 +6,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nb1413m3.h"
diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c
index 41347002f42..26a55528bf2 100644
--- a/src/mame/video/nbmj8991.c
+++ b/src/mame/video/nbmj8991.c
@@ -6,7 +6,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nb1413m3.h"
#include "includes/nbmj8991.h"
diff --git a/src/mame/video/nbmj9195.c b/src/mame/video/nbmj9195.c
index 45be30600df..ad855198c25 100644
--- a/src/mame/video/nbmj9195.c
+++ b/src/mame/video/nbmj9195.c
@@ -7,7 +7,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nbmj9195.h"
diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c
index 85851c28686..d99aa5864f3 100644
--- a/src/mame/video/nemesis.c
+++ b/src/mame/video/nemesis.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nemesis.h"
diff --git a/src/mame/video/neogeo.c b/src/mame/video/neogeo.c
index e754c7b1711..29037a0ff83 100644
--- a/src/mame/video/neogeo.c
+++ b/src/mame/video/neogeo.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/neogeo.h"
#include "video/resnet.h"
diff --git a/src/mame/video/news.c b/src/mame/video/news.c
index 2da64ecec11..f5f7dc6a589 100644
--- a/src/mame/video/news.c
+++ b/src/mame/video/news.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/news.h"
diff --git a/src/mame/video/ninjakd2.c b/src/mame/video/ninjakd2.c
index f6851e2255c..9be50e22a93 100644
--- a/src/mame/video/ninjakd2.c
+++ b/src/mame/video/ninjakd2.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/ninjakd2.h"
UINT8* ninjakd2_bg_videoram;
diff --git a/src/mame/video/ninjaw.c b/src/mame/video/ninjaw.c
index 5739b7cc41a..9870156ba0e 100644
--- a/src/mame/video/ninjaw.c
+++ b/src/mame/video/ninjaw.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/ninjaw.h"
diff --git a/src/mame/video/nitedrvr.c b/src/mame/video/nitedrvr.c
index 1f421539440..e820d3011db 100644
--- a/src/mame/video/nitedrvr.c
+++ b/src/mame/video/nitedrvr.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nitedrvr.h"
UINT8 *nitedrvr_hvc;
diff --git a/src/mame/video/niyanpai.c b/src/mame/video/niyanpai.c
index cd41a7da903..341fd84f979 100644
--- a/src/mame/video/niyanpai.c
+++ b/src/mame/video/niyanpai.c
@@ -6,7 +6,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/niyanpai.h"
diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c
index 4c809556be3..009b9009e7a 100644
--- a/src/mame/video/nmk16.c
+++ b/src/mame/video/nmk16.c
@@ -7,7 +7,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/nmk16.h"
// the larger tilemaps on macross2, rapid hero and thunder dragon 2 appear to act like 4 'banks'
diff --git a/src/mame/video/nova2001.c b/src/mame/video/nova2001.c
index 3438cd1dcac..5099b6f00cd 100644
--- a/src/mame/video/nova2001.c
+++ b/src/mame/video/nova2001.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/nova2001.h"
UINT8 *nova2001_fg_videoram, *nova2001_bg_videoram;
diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c
index b21f8bbca3c..9236031f3df 100644
--- a/src/mame/video/nycaptor.c
+++ b/src/mame/video/nycaptor.c
@@ -5,7 +5,7 @@
Functions to emulate the video hardware of the machine.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nycaptor.h"
#define NYCAPTOR_DEBUG 0
diff --git a/src/mame/video/offtwall.c b/src/mame/video/offtwall.c
index ee2da644979..713f461a26c 100644
--- a/src/mame/video/offtwall.c
+++ b/src/mame/video/offtwall.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/offtwall.h"
diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c
index 9547d9e4b5e..c154a0ad56e 100644
--- a/src/mame/video/ohmygod.c
+++ b/src/mame/video/ohmygod.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
UINT16 *ohmygod_videoram;
diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c
index 628a2a0259f..e3d05e6126c 100644
--- a/src/mame/video/ojankohs.c
+++ b/src/mame/video/ojankohs.c
@@ -7,7 +7,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c
index 649bf0801bf..536653e0577 100644
--- a/src/mame/video/oneshot.c
+++ b/src/mame/video/oneshot.c
@@ -1,6 +1,6 @@
/* One Shot One Kill Video Hardware */
-#include "driver.h"
+#include "emu.h"
#include "includes/oneshot.h"
static tilemap_t *oneshot_bg_tilemap;
diff --git a/src/mame/video/orbit.c b/src/mame/video/orbit.c
index ff9d6d54d33..ff3cda5e65b 100644
--- a/src/mame/video/orbit.c
+++ b/src/mame/video/orbit.c
@@ -4,7 +4,7 @@ Atari Orbit video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/orbit.h"
UINT8* orbit_playfield_ram;
diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c
index f598578f989..15e1f81fb7b 100644
--- a/src/mame/video/othldrby.c
+++ b/src/mame/video/othldrby.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
diff --git a/src/mame/video/othunder.c b/src/mame/video/othunder.c
index c093c1e0c50..c9624502556 100644
--- a/src/mame/video/othunder.c
+++ b/src/mame/video/othunder.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/othunder.h"
diff --git a/src/mame/video/overdriv.c b/src/mame/video/overdriv.c
index af22033acbd..95c3325f4aa 100644
--- a/src/mame/video/overdriv.c
+++ b/src/mame/video/overdriv.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/overdriv.h"
diff --git a/src/mame/video/pacland.c b/src/mame/video/pacland.c
index 05c9dbd24d2..abb4a46eb9a 100644
--- a/src/mame/video/pacland.c
+++ b/src/mame/video/pacland.c
@@ -24,7 +24,7 @@ sprite color 0x7f will erase the tilemap and force it to be transparent.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *pacland_videoram,*pacland_videoram2,*pacland_spriteram;
diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c
index 8a9046cf75f..3d3a710b32a 100644
--- a/src/mame/video/pacman.c
+++ b/src/mame/video/pacman.c
@@ -16,7 +16,7 @@
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/pacman.h"
#include "video/resnet.h"
diff --git a/src/mame/video/pandoras.c b/src/mame/video/pandoras.c
index 59d3817e9b7..ea884d47182 100644
--- a/src/mame/video/pandoras.c
+++ b/src/mame/video/pandoras.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/pandoras.h"
#include "video/resnet.h"
diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c
index a0598321259..9b520e4ee13 100644
--- a/src/mame/video/paradise.c
+++ b/src/mame/video/paradise.c
@@ -25,7 +25,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/paradise.h"
/* Variables that driver has access to: */
diff --git a/src/mame/video/parodius.c b/src/mame/video/parodius.c
index 08bfa4ef7da..0eff7e6e7c6 100644
--- a/src/mame/video/parodius.c
+++ b/src/mame/video/parodius.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/parodius.h"
diff --git a/src/mame/video/pass.c b/src/mame/video/pass.c
index 77b376dba34..c749d2c494d 100644
--- a/src/mame/video/pass.c
+++ b/src/mame/video/pass.c
@@ -1,6 +1,6 @@
/* video/pass.c - see drivers/pass.c for more info */
-#include "driver.h"
+#include "emu.h"
static tilemap_t *pass_bg_tilemap;
static tilemap_t *pass_fg_tilemap;
diff --git a/src/mame/video/pastelg.c b/src/mame/video/pastelg.c
index 0fb05cee122..4e2faed31d3 100644
--- a/src/mame/video/pastelg.c
+++ b/src/mame/video/pastelg.c
@@ -6,7 +6,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/nb1413m3.h"
diff --git a/src/mame/video/pbaction.c b/src/mame/video/pbaction.c
index f41985100c9..3a4a91261e9 100644
--- a/src/mame/video/pbaction.c
+++ b/src/mame/video/pbaction.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *pbaction_videoram, *pbaction_colorram;
UINT8 *pbaction_videoram2, *pbaction_colorram2;
diff --git a/src/mame/video/pcktgal.c b/src/mame/video/pcktgal.c
index 9e497ae7f26..5b7c06949fa 100644
--- a/src/mame/video/pcktgal.c
+++ b/src/mame/video/pcktgal.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bg_tilemap;
diff --git a/src/mame/video/pgm.c b/src/mame/video/pgm.c
index 70fe2420fce..e64aaca2867 100644
--- a/src/mame/video/pgm.c
+++ b/src/mame/video/pgm.c
@@ -1,7 +1,7 @@
/*** Video *******************************************************************/
/* see drivers/pgm.c for notes on where improvements can be made */
-#include "driver.h"
+#include "emu.h"
#include "includes/pgm.h"
/* Sprites - These are a pain! */
diff --git a/src/mame/video/phoenix.c b/src/mame/video/phoenix.c
index 81e3cc22e9c..e784a0dd3e5 100644
--- a/src/mame/video/phoenix.c
+++ b/src/mame/video/phoenix.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/phoenix.h"
diff --git a/src/mame/video/pingpong.c b/src/mame/video/pingpong.c
index 1102f12ae71..3d55d0f6652 100644
--- a/src/mame/video/pingpong.c
+++ b/src/mame/video/pingpong.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bg_tilemap;
UINT8 *pingpong_videoram;
diff --git a/src/mame/video/pirates.c b/src/mame/video/pirates.c
index fee2a8d7b59..5ecaea7418a 100644
--- a/src/mame/video/pirates.c
+++ b/src/mame/video/pirates.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
UINT16 *pirates_tx_tileram, *pirates_spriteram;
diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c
index b663913c80c..72f7a7535ff 100644
--- a/src/mame/video/pitnrun.c
+++ b/src/mame/video/pitnrun.c
@@ -16,7 +16,7 @@
In debug build press 'w' for spotlight and 'e' for lightning
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/pitnrun.h"
static int pitnrun_h_heed;
diff --git a/src/mame/video/pk8000.c b/src/mame/video/pk8000.c
index 3652eac8366..0a09e031392 100644
--- a/src/mame/video/pk8000.c
+++ b/src/mame/video/pk8000.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/pk8000.h"
static UINT8 pk8000_text_start;
diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c
index ee5c13e8f6a..0e52cc0b4da 100644
--- a/src/mame/video/pktgaldx.c
+++ b/src/mame/video/pktgaldx.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
UINT16* pcktgaldb_fgram;
diff --git a/src/mame/video/playch10.c b/src/mame/video/playch10.c
index 9ca727bae8f..6b95f3c8852 100644
--- a/src/mame/video/playch10.c
+++ b/src/mame/video/playch10.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/ppu2c0x.h"
#include "includes/playch10.h"
diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c
index a3ebad86317..b165c3d8abb 100644
--- a/src/mame/video/playmark.c
+++ b/src/mame/video/playmark.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/playmark.h"
diff --git a/src/mame/video/plygonet.c b/src/mame/video/plygonet.c
index 34c13298ddf..6e08643c541 100644
--- a/src/mame/video/plygonet.c
+++ b/src/mame/video/plygonet.c
@@ -7,7 +7,7 @@
Needs: PSAC2 roz plane, polygons
*/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
/* TTL text plane stuff */
diff --git a/src/mame/video/pokechmp.c b/src/mame/video/pokechmp.c
index 446f05677c7..ee568e7eee7 100644
--- a/src/mame/video/pokechmp.c
+++ b/src/mame/video/pokechmp.c
@@ -1,6 +1,6 @@
/* Poke Champ */
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bg_tilemap;
diff --git a/src/mame/video/polepos.c b/src/mame/video/polepos.c
index 1173d6f856e..e0cd2e7bba3 100644
--- a/src/mame/video/polepos.c
+++ b/src/mame/video/polepos.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/polepos.h"
UINT16 *polepos_view16_memory;
diff --git a/src/mame/video/policetr.c b/src/mame/video/policetr.c
index 81a9a5581af..26ada8de1b8 100644
--- a/src/mame/video/policetr.c
+++ b/src/mame/video/policetr.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/mips/r3000.h"
#include "includes/policetr.h"
diff --git a/src/mame/video/polyplay.c b/src/mame/video/polyplay.c
index 5d046c1e2da..93b8d7ac058 100644
--- a/src/mame/video/polyplay.c
+++ b/src/mame/video/polyplay.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/polyplay.h"
diff --git a/src/mame/video/poolshrk.c b/src/mame/video/poolshrk.c
index 247609b8601..2d738a66b5b 100644
--- a/src/mame/video/poolshrk.c
+++ b/src/mame/video/poolshrk.c
@@ -4,7 +4,7 @@ Atari Poolshark video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/poolshrk.h"
UINT8* poolshrk_playfield_ram;
diff --git a/src/mame/video/pooyan.c b/src/mame/video/pooyan.c
index 489a95a5e4b..08a7d25d250 100644
--- a/src/mame/video/pooyan.c
+++ b/src/mame/video/pooyan.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/timeplt.h"
diff --git a/src/mame/video/popeye.c b/src/mame/video/popeye.c
index 8150613a8a1..3aed000bd20 100644
--- a/src/mame/video/popeye.c
+++ b/src/mame/video/popeye.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *popeye_videoram;
UINT8 *popeye_colorram;
diff --git a/src/mame/video/popper.c b/src/mame/video/popper.c
index d95740aa597..0e5186ef0c0 100644
--- a/src/mame/video/popper.c
+++ b/src/mame/video/popper.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/popper.h"
diff --git a/src/mame/video/portrait.c b/src/mame/video/portrait.c
index f5ac7de7a7e..de252a10ebc 100644
--- a/src/mame/video/portrait.c
+++ b/src/mame/video/portrait.c
@@ -5,7 +5,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
int portrait_scroll;
UINT8 *portrait_bgvideoram, *portrait_fgvideoram;
diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c
index 0b7e28ddb6e..503290751e5 100644
--- a/src/mame/video/powerins.c
+++ b/src/mame/video/powerins.c
@@ -37,7 +37,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
/* Variables that driver has access to: */
UINT16 *powerins_vram_0, *powerins_vctrl_0;
diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c
index 3c82cc8f8d9..2940fcb470e 100644
--- a/src/mame/video/ppu2c0x.c
+++ b/src/mame/video/ppu2c0x.c
@@ -23,7 +23,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "video/ppu2c0x.h"
diff --git a/src/mame/video/prehisle.c b/src/mame/video/prehisle.c
index 6c59a039cb9..a124491ce25 100644
--- a/src/mame/video/prehisle.c
+++ b/src/mame/video/prehisle.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *prehisle_bg_videoram16;
diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c
index e3bd7ce25da..ebe368a1635 100644
--- a/src/mame/video/psikyo.c
+++ b/src/mame/video/psikyo.c
@@ -54,7 +54,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
**************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/psikyo.h"
diff --git a/src/mame/video/psikyo4.c b/src/mame/video/psikyo4.c
index 3916cde837b..776431c8045 100644
--- a/src/mame/video/psikyo4.c
+++ b/src/mame/video/psikyo4.c
@@ -26,7 +26,7 @@ HotGmck: 86010000 1f201918 a0000000 Large Screen
HgKairak: 86010000 1f201918 a0000000 Large Screen
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/psikyo4.h"
diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c
index 592c93fc346..af2be7944d8 100644
--- a/src/mame/video/psikyosh.c
+++ b/src/mame/video/psikyosh.c
@@ -90,7 +90,7 @@ sol divide doesn't seem to make much use of tilemaps at all, it uses them to fad
*/
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "drawgfxm.h"
#include "includes/psikyosh.h"
diff --git a/src/mame/video/psx.c b/src/mame/video/psx.c
index 4500160d542..5564b523fc0 100644
--- a/src/mame/video/psx.c
+++ b/src/mame/video/psx.c
@@ -17,7 +17,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/psx.h"
#define STOP_ON_ERROR ( 0 )
diff --git a/src/mame/video/psychic5.c b/src/mame/video/psychic5.c
index c9a9cee193c..92d39d6eef7 100644
--- a/src/mame/video/psychic5.c
+++ b/src/mame/video/psychic5.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "jalblend.h"
#define BG_SCROLLX_LSB 0x308
diff --git a/src/mame/video/punchout.c b/src/mame/video/punchout.c
index b5a1b7c6b7f..ffa6e3c92e5 100644
--- a/src/mame/video/punchout.c
+++ b/src/mame/video/punchout.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bg_top_tilemap;
diff --git a/src/mame/video/pushman.c b/src/mame/video/pushman.c
index 5f9486968d7..d218afaea5e 100644
--- a/src/mame/video/pushman.c
+++ b/src/mame/video/pushman.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bg_tilemap,*tx_tilemap;
static UINT16 control[2];
diff --git a/src/mame/video/qdrmfgp.c b/src/mame/video/qdrmfgp.c
index aa4806a65ef..0092344fcc4 100644
--- a/src/mame/video/qdrmfgp.c
+++ b/src/mame/video/qdrmfgp.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
int qdrmfgp_get_palette(void);
diff --git a/src/mame/video/qix.c b/src/mame/video/qix.c
index ad8f20e3564..1cb9a2c7ef8 100644
--- a/src/mame/video/qix.c
+++ b/src/mame/video/qix.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/mc6845.h"
#include "includes/qix.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/video/quasar.c b/src/mame/video/quasar.c
index b2ab68a4684..585dcfd2058 100644
--- a/src/mame/video/quasar.c
+++ b/src/mame/video/quasar.c
@@ -14,7 +14,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/s2636.h"
#include "cpu/s2650/s2650.h"
#include "includes/cvs.h"
diff --git a/src/mame/video/quizdna.c b/src/mame/video/quizdna.c
index 297dc54d38a..67959082c3b 100644
--- a/src/mame/video/quizdna.c
+++ b/src/mame/video/quizdna.c
@@ -9,7 +9,7 @@ Video hardware
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
static UINT8 *quizdna_bg_ram;
static UINT8 *quizdna_fg_ram;
diff --git a/src/mame/video/quizpani.c b/src/mame/video/quizpani.c
index 398cd5670c2..f2299649d45 100644
--- a/src/mame/video/quizpani.c
+++ b/src/mame/video/quizpani.c
@@ -4,7 +4,7 @@
************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *quizpani_bg_videoram, *quizpani_txt_videoram;
UINT16 *quizpani_scrollreg;
diff --git a/src/mame/video/raiden.c b/src/mame/video/raiden.c
index c9e9200283d..26431a39432 100644
--- a/src/mame/video/raiden.c
+++ b/src/mame/video/raiden.c
@@ -1,5 +1,5 @@
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bg_layer,*fg_layer,*tx_layer;
UINT16 *raiden_back_data,*raiden_fore_data,*raiden_scroll_ram;
diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c
index fc6ccb391b8..48f6227f10e 100644
--- a/src/mame/video/rallyx.c
+++ b/src/mame/video/rallyx.c
@@ -27,7 +27,7 @@ needs more color combination to render its graphics.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/timeplt.h"
diff --git a/src/mame/video/rampart.c b/src/mame/video/rampart.c
index af081cd5427..c601a444381 100644
--- a/src/mame/video/rampart.c
+++ b/src/mame/video/rampart.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "includes/rampart.h"
diff --git a/src/mame/video/rastan.c b/src/mame/video/rastan.c
index 408638a64e4..3da86161860 100644
--- a/src/mame/video/rastan.c
+++ b/src/mame/video/rastan.c
@@ -8,7 +8,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/opwolf.h"
diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c
index 3200671ddd7..93b17da5ebf 100644
--- a/src/mame/video/realbrk.c
+++ b/src/mame/video/realbrk.c
@@ -19,7 +19,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/realbrk.h"
UINT16 *realbrk_vram_0, *realbrk_vram_1, *realbrk_vram_2, *realbrk_vregs, *realbrk_vram_0ras, *realbrk_vram_1ras;
diff --git a/src/mame/video/redalert.c b/src/mame/video/redalert.c
index 806e2976226..a3fee2eb586 100644
--- a/src/mame/video/redalert.c
+++ b/src/mame/video/redalert.c
@@ -7,7 +7,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/redalert.h"
diff --git a/src/mame/video/redclash.c b/src/mame/video/redclash.c
index 920d6966b0b..75fecd76104 100644
--- a/src/mame/video/redclash.c
+++ b/src/mame/video/redclash.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/ladybug.h"
/***************************************************************************
diff --git a/src/mame/video/relief.c b/src/mame/video/relief.c
index a8c1eae924a..2c82a6a3169 100644
--- a/src/mame/video/relief.c
+++ b/src/mame/video/relief.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "includes/relief.h"
diff --git a/src/mame/video/renegade.c b/src/mame/video/renegade.c
index 0d6b7ea74e8..83db00806e4 100644
--- a/src/mame/video/renegade.c
+++ b/src/mame/video/renegade.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *renegade_videoram2;
static INT32 renegade_scrollx;
diff --git a/src/mame/video/retofinv.c b/src/mame/video/retofinv.c
index fa2514956a8..01e0e055b77 100644
--- a/src/mame/video/retofinv.c
+++ b/src/mame/video/retofinv.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/retofinv.h"
UINT8 *retofinv_bg_videoram;
diff --git a/src/mame/video/rockrage.c b/src/mame/video/rockrage.c
index 7f95d4f0df0..c8db9c3c1f8 100644
--- a/src/mame/video/rockrage.c
+++ b/src/mame/video/rockrage.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/rockrage.h"
diff --git a/src/mame/video/rocnrope.c b/src/mame/video/rocnrope.c
index c506ff34d51..872b50c554d 100644
--- a/src/mame/video/rocnrope.c
+++ b/src/mame/video/rocnrope.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/timeplt.h"
diff --git a/src/mame/video/rohga.c b/src/mame/video/rohga.c
index 9f5bd866736..9e93b3230ac 100644
--- a/src/mame/video/rohga.c
+++ b/src/mame/video/rohga.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
static UINT16 * rohga_spriteram;
diff --git a/src/mame/video/rollerg.c b/src/mame/video/rollerg.c
index fb33c40f5be..8d625a35cd8 100644
--- a/src/mame/video/rollerg.c
+++ b/src/mame/video/rollerg.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/rollerg.h"
diff --git a/src/mame/video/rollrace.c b/src/mame/video/rollrace.c
index 899d5573711..a3841e9b857 100644
--- a/src/mame/video/rollrace.c
+++ b/src/mame/video/rollrace.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
UINT8 *rollrace_videoram;
UINT8 *rollrace_colorram;
diff --git a/src/mame/video/route16.c b/src/mame/video/route16.c
index a24733dbca9..fbdcff9ef6b 100644
--- a/src/mame/video/route16.c
+++ b/src/mame/video/route16.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/sn76477.h"
diff --git a/src/mame/video/rpunch.c b/src/mame/video/rpunch.c
index b3cef47250c..225979f2009 100644
--- a/src/mame/video/rpunch.c
+++ b/src/mame/video/rpunch.c
@@ -6,7 +6,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#define BITMAP_WIDTH 304
diff --git a/src/mame/video/runaway.c b/src/mame/video/runaway.c
index 62b97a027df..0cfe8737fef 100644
--- a/src/mame/video/runaway.c
+++ b/src/mame/video/runaway.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bg_tilemap;
diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c
index 7cd465701ad..6e496cfed59 100644
--- a/src/mame/video/rungun.c
+++ b/src/mame/video/rungun.c
@@ -9,7 +9,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/rungun.h"
diff --git a/src/mame/video/sauro.c b/src/mame/video/sauro.c
index 11b520d5905..e3a914bbe63 100644
--- a/src/mame/video/sauro.c
+++ b/src/mame/video/sauro.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *tecfri_videoram;
UINT8 *tecfri_colorram;
diff --git a/src/mame/video/sbasketb.c b/src/mame/video/sbasketb.c
index b3cd18a5b1d..94106436014 100644
--- a/src/mame/video/sbasketb.c
+++ b/src/mame/video/sbasketb.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/trackfld.h"
diff --git a/src/mame/video/sbugger.c b/src/mame/video/sbugger.c
index 8264104706e..6da6db2eb31 100644
--- a/src/mame/video/sbugger.c
+++ b/src/mame/video/sbugger.c
@@ -1,6 +1,6 @@
/* Space Bugger - Video Hardware */
-#include "driver.h"
+#include "emu.h"
extern UINT8* sbugger_videoram, *sbugger_videoram_attr;
diff --git a/src/mame/video/scotrsht.c b/src/mame/video/scotrsht.c
index efc17264247..1daf9c45184 100644
--- a/src/mame/video/scotrsht.c
+++ b/src/mame/video/scotrsht.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
UINT8 *scotrsht_scroll;
diff --git a/src/mame/video/sderby.c b/src/mame/video/sderby.c
index 46983febe56..d5c202520eb 100644
--- a/src/mame/video/sderby.c
+++ b/src/mame/video/sderby.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
static tilemap_t *sderby_tilemap;
extern UINT16 *sderby_videoram;
diff --git a/src/mame/video/segag80r.c b/src/mame/video/segag80r.c
index 8ade553ce6a..f4e9fa760e9 100644
--- a/src/mame/video/segag80r.c
+++ b/src/mame/video/segag80r.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/segag80r.h"
#include "machine/rescap.h"
#include "video/resnet.h"
diff --git a/src/mame/video/segag80v.c b/src/mame/video/segag80v.c
index c9556aa664c..7ec82adc6b6 100644
--- a/src/mame/video/segag80v.c
+++ b/src/mame/video/segag80v.c
@@ -4,11 +4,10 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "avgdvg.h"
#include "video/vector.h"
#include "includes/segag80v.h"
-#include <math.h>
#define VECTOR_CLOCK 15468480 /* master clock */
#define U34_CLOCK (VECTOR_CLOCK/3) /* clock for interrupt chain */
diff --git a/src/mame/video/segahang.c b/src/mame/video/segahang.c
index ab8eb69c959..375bf97a430 100644
--- a/src/mame/video/segahang.c
+++ b/src/mame/video/segahang.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "segaic16.h"
#include "includes/system16.h"
diff --git a/src/mame/video/segaic16.c b/src/mame/video/segaic16.c
index 98697f57896..a9a30f3f308 100644
--- a/src/mame/video/segaic16.c
+++ b/src/mame/video/segaic16.c
@@ -350,7 +350,7 @@ Quick review of the system16 hardware:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "segaic16.h"
#include "video/resnet.h"
diff --git a/src/mame/video/segaic24.c b/src/mame/video/segaic24.c
index 324b57e027f..0b34d962122 100644
--- a/src/mame/video/segaic24.c
+++ b/src/mame/video/segaic24.c
@@ -22,7 +22,7 @@ System 24 68000x2 315-5292 315-5293 315-5294 315-5242 ym2151 da
just made a copy & renamed them for now to avoid any conflicts
*/
-#include "driver.h"
+#include "emu.h"
#include "segaic24.h"
diff --git a/src/mame/video/segaorun.c b/src/mame/video/segaorun.c
index 926493ba52e..05b51acef56 100644
--- a/src/mame/video/segaorun.c
+++ b/src/mame/video/segaorun.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "segaic16.h"
#include "includes/system16.h"
diff --git a/src/mame/video/segas16a.c b/src/mame/video/segas16a.c
index 78e3f4bc7b9..9c60c8fa5fc 100644
--- a/src/mame/video/segas16a.c
+++ b/src/mame/video/segas16a.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "segaic16.h"
#include "includes/system16.h"
diff --git a/src/mame/video/segas16b.c b/src/mame/video/segas16b.c
index 4c42de4c095..25e68606c14 100644
--- a/src/mame/video/segas16b.c
+++ b/src/mame/video/segas16b.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "segaic16.h"
#include "includes/system16.h"
diff --git a/src/mame/video/segas18.c b/src/mame/video/segas18.c
index 7e2445f0d36..b4650d8bad3 100644
--- a/src/mame/video/segas18.c
+++ b/src/mame/video/segas18.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "segaic16.h"
#include "includes/genesis.h"
#include "includes/system16.h"
diff --git a/src/mame/video/segas24.c b/src/mame/video/segas24.c
index c037277df08..40a9eec5954 100644
--- a/src/mame/video/segas24.c
+++ b/src/mame/video/segas24.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/segaic24.h"
#include "includes/segas24.h"
diff --git a/src/mame/video/segas32.c b/src/mame/video/segas32.c
index 6a006356dba..99c33e4e436 100644
--- a/src/mame/video/segas32.c
+++ b/src/mame/video/segas32.c
@@ -141,7 +141,7 @@
---- ---- ---- ---t : 1= Text layer disable
*/
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "includes/segas32.h"
diff --git a/src/mame/video/segaxbd.c b/src/mame/video/segaxbd.c
index 840aefd5413..d92a82c2805 100644
--- a/src/mame/video/segaxbd.c
+++ b/src/mame/video/segaxbd.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "segaic16.h"
#include "includes/system16.h"
diff --git a/src/mame/video/segaybd.c b/src/mame/video/segaybd.c
index 2443990107f..04ead1bd5db 100644
--- a/src/mame/video/segaybd.c
+++ b/src/mame/video/segaybd.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "segaic16.h"
#include "includes/system16.h"
diff --git a/src/mame/video/sei_crtc.c b/src/mame/video/sei_crtc.c
index a0330070359..359fd20c32b 100644
--- a/src/mame/video/sei_crtc.c
+++ b/src/mame/video/sei_crtc.c
@@ -56,7 +56,7 @@ List of default vregs (title screen):
*******************************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/sei_crtc.h"
static tilemap_t *sc0_tilemap,*sc2_tilemap,*sc1_tilemap,*sc3_tilemap_0,*sc3_tilemap_1;
diff --git a/src/mame/video/seibuspi.c b/src/mame/video/seibuspi.c
index c61ab7b60da..001b7d59d67 100644
--- a/src/mame/video/seibuspi.c
+++ b/src/mame/video/seibuspi.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/seibuspi.h"
static tilemap_t *text_layer;
diff --git a/src/mame/video/seicross.c b/src/mame/video/seicross.c
index 6ab4696d104..1746440ed1f 100644
--- a/src/mame/video/seicross.c
+++ b/src/mame/video/seicross.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *seicross_row_scroll;
diff --git a/src/mame/video/senjyo.c b/src/mame/video/senjyo.c
index ab474f71934..db26e0e8537 100644
--- a/src/mame/video/senjyo.c
+++ b/src/mame/video/senjyo.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/segacrpt.h"
#include "includes/senjyo.h"
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index 2c7288d13b0..d56886e43c1 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -135,7 +135,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "sound/x1_010.h"
#include "includes/seta.h"
diff --git a/src/mame/video/seta2.c b/src/mame/video/seta2.c
index ab7c994ee55..51a169a83d8 100644
--- a/src/mame/video/seta2.c
+++ b/src/mame/video/seta2.c
@@ -70,7 +70,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/seta.h"
UINT16 *seta2_vregs;
diff --git a/src/mame/video/sf.c b/src/mame/video/sf.c
index 9093dd0e41f..a7767e7d9f0 100644
--- a/src/mame/video/sf.c
+++ b/src/mame/video/sf.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/sf.h"
/***************************************************************************
diff --git a/src/mame/video/shadfrce.c b/src/mame/video/shadfrce.c
index 4b08b4545b2..5ce5c0f9aea 100644
--- a/src/mame/video/shadfrce.c
+++ b/src/mame/video/shadfrce.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
static tilemap_t *shadfrce_fgtilemap, *shadfrce_bg0tilemap, *shadfrce_bg1tilemap;
extern UINT16 *shadfrce_fgvideoram, *shadfrce_bg0videoram, *shadfrce_bg1videoram, *shadfrce_spvideoram;
diff --git a/src/mame/video/shangha3.c b/src/mame/video/shangha3.c
index 8586c771324..631c4f605f9 100644
--- a/src/mame/video/shangha3.c
+++ b/src/mame/video/shangha3.c
@@ -58,7 +58,7 @@ Word | Bit(s) | Use
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
diff --git a/src/mame/video/shangkid.c b/src/mame/video/shangkid.c
index c7e3d545fc3..2106c7f70b0 100644
--- a/src/mame/video/shangkid.c
+++ b/src/mame/video/shangkid.c
@@ -1,6 +1,6 @@
/* video/shangkid */
-#include "driver.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
static tilemap_t *background;
diff --git a/src/mame/video/shaolins.c b/src/mame/video/shaolins.c
index a6862ab4a8f..9f448b871d1 100644
--- a/src/mame/video/shaolins.c
+++ b/src/mame/video/shaolins.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
extern UINT8 shaolins_nmi_enable;
diff --git a/src/mame/video/shisen.c b/src/mame/video/shisen.c
index c4a8988b568..51ceb1d0619 100644
--- a/src/mame/video/shisen.c
+++ b/src/mame/video/shisen.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
static int gfxbank;
diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c
index bca57cc77ba..5441393825e 100644
--- a/src/mame/video/shootout.c
+++ b/src/mame/video/shootout.c
@@ -3,7 +3,7 @@
prom GB09.K6 may be related to background tile-sprite priority
*/
-#include "driver.h"
+#include "emu.h"
static tilemap_t *background, *foreground;
extern UINT8 *shootout_textram;
diff --git a/src/mame/video/shuuz.c b/src/mame/video/shuuz.c
index 925ff749f88..13f8575cbff 100644
--- a/src/mame/video/shuuz.c
+++ b/src/mame/video/shuuz.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/shuuz.h"
diff --git a/src/mame/video/sidearms.c b/src/mame/video/sidearms.c
index cc56e45ef1e..04126c33e86 100644
--- a/src/mame/video/sidearms.c
+++ b/src/mame/video/sidearms.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/sidearms.h"
WRITE8_HANDLER( sidearms_videoram_w )
diff --git a/src/mame/video/sidepckt.c b/src/mame/video/sidepckt.c
index 5b545105352..3aa24a8b7f4 100644
--- a/src/mame/video/sidepckt.c
+++ b/src/mame/video/sidepckt.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/sidepckt.h"
diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c
index b818f44fb99..a5e3648fc8d 100644
--- a/src/mame/video/silkroad.c
+++ b/src/mame/video/silkroad.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
/* Sprites probably need to be delayed */
/* Some scroll layers may need to be offset slightly? */
diff --git a/src/mame/video/simpl156.c b/src/mame/video/simpl156.c
index 4c8cc4ddd94..3f03104e30c 100644
--- a/src/mame/video/simpl156.c
+++ b/src/mame/video/simpl156.c
@@ -2,7 +2,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
/*
diff --git a/src/mame/video/simpsons.c b/src/mame/video/simpsons.c
index c2d6583b5e1..21dca4818c2 100644
--- a/src/mame/video/simpsons.c
+++ b/src/mame/video/simpsons.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/simpsons.h"
diff --git a/src/mame/video/skullxbo.c b/src/mame/video/skullxbo.c
index 383b756a964..f964960d900 100644
--- a/src/mame/video/skullxbo.c
+++ b/src/mame/video/skullxbo.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/skullxbo.h"
diff --git a/src/mame/video/skydiver.c b/src/mame/video/skydiver.c
index fb2eb383951..a5f75f0f68d 100644
--- a/src/mame/video/skydiver.c
+++ b/src/mame/video/skydiver.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/skydiver.h"
#include "sound/discrete.h"
diff --git a/src/mame/video/skyfox.c b/src/mame/video/skyfox.c
index 9455fbc964f..096b4607629 100644
--- a/src/mame/video/skyfox.c
+++ b/src/mame/video/skyfox.c
@@ -34,7 +34,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
/* Variables only used here: */
diff --git a/src/mame/video/skykid.c b/src/mame/video/skykid.c
index efd0f1f42d0..277f2b8e597 100644
--- a/src/mame/video/skykid.c
+++ b/src/mame/video/skykid.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
UINT8 *skykid_textram, *skykid_videoram, *skykid_spriteram;
diff --git a/src/mame/video/skyraid.c b/src/mame/video/skyraid.c
index 4197d07a3b7..07c8ec76b44 100644
--- a/src/mame/video/skyraid.c
+++ b/src/mame/video/skyraid.c
@@ -4,7 +4,7 @@ Atari Sky Raider video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
int skyraid_scroll;
diff --git a/src/mame/video/slapfght.c b/src/mame/video/slapfght.c
index ec07347fb3c..32ecf8e20db 100644
--- a/src/mame/video/slapfght.c
+++ b/src/mame/video/slapfght.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/slapfght.h"
UINT8 *slapfight_videoram;
diff --git a/src/mame/video/slapshot.c b/src/mame/video/slapshot.c
index 6f1cd07620e..8687a565a3d 100644
--- a/src/mame/video/slapshot.c
+++ b/src/mame/video/slapshot.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/slapshot.h"
diff --git a/src/mame/video/snes.c b/src/mame/video/snes.c
index 9b4ea2a7129..63f7fac6b1a 100644
--- a/src/mame/video/snes.c
+++ b/src/mame/video/snes.c
@@ -70,7 +70,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "includes/snes.h"
diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c
index 0376405654c..5440fdbeb14 100644
--- a/src/mame/video/snk.c
+++ b/src/mame/video/snk.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/snk.h"
/*******************************************************************************
diff --git a/src/mame/video/snk6502.c b/src/mame/video/snk6502.c
index cefdc7ebf2d..67d3204c296 100644
--- a/src/mame/video/snk6502.c
+++ b/src/mame/video/snk6502.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/snk6502.h"
diff --git a/src/mame/video/snk68.c b/src/mame/video/snk68.c
index ff50d75120c..de2514c6cb1 100644
--- a/src/mame/video/snk68.c
+++ b/src/mame/video/snk68.c
@@ -12,7 +12,7 @@ Notes:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16* pow_fg_videoram;
diff --git a/src/mame/video/snookr10.c b/src/mame/video/snookr10.c
index a901d08e758..1dc48c87686 100644
--- a/src/mame/video/snookr10.c
+++ b/src/mame/video/snookr10.c
@@ -37,7 +37,7 @@
**********************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
UINT8 *snookr10_videoram;
diff --git a/src/mame/video/solomon.c b/src/mame/video/solomon.c
index a0bb8678425..a09e09ba3ae 100644
--- a/src/mame/video/solomon.c
+++ b/src/mame/video/solomon.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
UINT8 *solomon_videoram;
UINT8 *solomon_colorram;
diff --git a/src/mame/video/sonson.c b/src/mame/video/sonson.c
index f3e374b1e57..daef1e8866e 100644
--- a/src/mame/video/sonson.c
+++ b/src/mame/video/sonson.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/sonson.h"
/***************************************************************************
diff --git a/src/mame/video/spacefb.c b/src/mame/video/spacefb.c
index 0b78c114294..bff646b322d 100644
--- a/src/mame/video/spacefb.c
+++ b/src/mame/video/spacefb.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/spacefb.h"
#include "video/resnet.h"
diff --git a/src/mame/video/spbactn.c b/src/mame/video/spbactn.c
index abc4ef50907..64db58e11e4 100644
--- a/src/mame/video/spbactn.c
+++ b/src/mame/video/spbactn.c
@@ -1,7 +1,7 @@
/* video/spbactn.c - see drivers/spbactn.c for more info */
/* rather similar to galspnbl.c */
-#include "driver.h"
+#include "emu.h"
extern UINT16 *spbactn_bgvideoram, *spbactn_fgvideoram, *spbactn_spvideoram;
static bitmap_t *tile_bitmap_bg, *tile_bitmap_fg;
diff --git a/src/mame/video/spcforce.c b/src/mame/video/spcforce.c
index 5feaa3b99a0..13fdb65534e 100644
--- a/src/mame/video/spcforce.c
+++ b/src/mame/video/spcforce.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *spcforce_scrollram;
diff --git a/src/mame/video/spdodgeb.c b/src/mame/video/spdodgeb.c
index 5da1325ac33..a40ef08b5b2 100644
--- a/src/mame/video/spdodgeb.c
+++ b/src/mame/video/spdodgeb.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "deprecat.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/video/speedatk.c b/src/mame/video/speedatk.c
index ee2ed3c749f..279994e507b 100644
--- a/src/mame/video/speedatk.c
+++ b/src/mame/video/speedatk.c
@@ -3,7 +3,7 @@
Speed Attack video hardware emulation
*****************************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *speedatk_videoram;
UINT8 *speedatk_colorram;
diff --git a/src/mame/video/speedbal.c b/src/mame/video/speedbal.c
index 711b659457d..49ddbd3c162 100644
--- a/src/mame/video/speedbal.c
+++ b/src/mame/video/speedbal.c
@@ -6,7 +6,7 @@
* *
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *speedbal_background_videoram;
UINT8 *speedbal_foreground_videoram;
diff --git a/src/mame/video/speedspn.c b/src/mame/video/speedspn.c
index d7619163fd9..e073ec1534b 100644
--- a/src/mame/video/speedspn.c
+++ b/src/mame/video/speedspn.c
@@ -1,6 +1,6 @@
/* Speed Spin video, see driver file for notes */
-#include "driver.h"
+#include "emu.h"
UINT8 *speedspn_attram;
diff --git a/src/mame/video/splash.c b/src/mame/video/splash.c
index 80ce84f696b..b7608b4ef01 100644
--- a/src/mame/video/splash.c
+++ b/src/mame/video/splash.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *splash_vregs;
UINT16 *splash_videoram;
diff --git a/src/mame/video/sprcros2.c b/src/mame/video/sprcros2.c
index 267eb9a850d..370ad545af8 100644
--- a/src/mame/video/sprcros2.c
+++ b/src/mame/video/sprcros2.c
@@ -3,7 +3,7 @@ Super Cross II (JPN Ver.)
(c)1986 GM Shoji
*/
-#include "driver.h"
+#include "emu.h"
static tilemap_t *sprcros2_bgtilemap, *sprcros2_fgtilemap;
UINT8 *sprcros2_fgvideoram, *sprcros2_spriteram, *sprcros2_bgvideoram;
diff --git a/src/mame/video/sprint2.c b/src/mame/video/sprint2.c
index 4287ca28834..58d26c468b9 100644
--- a/src/mame/video/sprint2.c
+++ b/src/mame/video/sprint2.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/sprint2.h"
UINT8* sprint2_video_ram;
diff --git a/src/mame/video/sprint4.c b/src/mame/video/sprint4.c
index 17883f57245..2a012c7182e 100644
--- a/src/mame/video/sprint4.c
+++ b/src/mame/video/sprint4.c
@@ -4,7 +4,7 @@ Atari Sprint 4 video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "audio/sprint4.h"
static tilemap_t* playfield;
diff --git a/src/mame/video/sprint8.c b/src/mame/video/sprint8.c
index e79e3b97567..baf14897160 100644
--- a/src/mame/video/sprint8.c
+++ b/src/mame/video/sprint8.c
@@ -4,7 +4,7 @@ Atari Sprint 8 video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/sprint8.h"
UINT8* sprint8_video_ram;
diff --git a/src/mame/video/spy.c b/src/mame/video/spy.c
index 9d806e07289..8d55d91d1b1 100644
--- a/src/mame/video/spy.c
+++ b/src/mame/video/spy.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/spy.h"
diff --git a/src/mame/video/srmp2.c b/src/mame/video/srmp2.c
index 1bc84e1164e..4f62a544600 100644
--- a/src/mame/video/srmp2.c
+++ b/src/mame/video/srmp2.c
@@ -7,7 +7,7 @@ Functions to emulate the video hardware of the machine.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/srmp2.h"
PALETTE_INIT( srmp2 )
diff --git a/src/mame/video/srumbler.c b/src/mame/video/srumbler.c
index 3bb7f3a2650..c96107251d6 100644
--- a/src/mame/video/srumbler.c
+++ b/src/mame/video/srumbler.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *srumbler_backgroundram,*srumbler_foregroundram;
diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c
index 080aed9f038..688d9b797b0 100644
--- a/src/mame/video/sshangha.c
+++ b/src/mame/video/sshangha.c
@@ -5,7 +5,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *sshangha_pf2_data,*sshangha_pf1_data;
UINT16 *sshangha_pf1_rowscroll,*sshangha_pf2_rowscroll;
diff --git a/src/mame/video/sslam.c b/src/mame/video/sslam.c
index 5d24698a11c..940d87a7687 100644
--- a/src/mame/video/sslam.c
+++ b/src/mame/video/sslam.c
@@ -1,6 +1,6 @@
/* Super Slam - Video Hardware */
-#include "driver.h"
+#include "emu.h"
static tilemap_t *sslam_bg_tilemap, *sslam_tx_tilemap, *sslam_md_tilemap;
diff --git a/src/mame/video/ssozumo.c b/src/mame/video/ssozumo.c
index 5ef5a3e9414..3c668b375f7 100644
--- a/src/mame/video/ssozumo.c
+++ b/src/mame/video/ssozumo.c
@@ -7,7 +7,7 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/10/04
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *ssozumo_videoram;
UINT8 *ssozumo_colorram;
diff --git a/src/mame/video/sspeedr.c b/src/mame/video/sspeedr.c
index dfde6b44dd0..ea9f50e2b28 100644
--- a/src/mame/video/sspeedr.c
+++ b/src/mame/video/sspeedr.c
@@ -4,7 +4,7 @@ Taito Super Speed Race video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/sspeedr.h"
diff --git a/src/mame/video/ssrj.c b/src/mame/video/ssrj.c
index 945313a9dca..f9974d74102 100644
--- a/src/mame/video/ssrj.c
+++ b/src/mame/video/ssrj.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
static tilemap_t *tilemap1,*tilemap2,*tilemap4;
UINT8 *ssrj_vram1,*ssrj_vram2,*ssrj_vram3,*ssrj_vram4,*ssrj_scrollram;
diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c
index 205aec53553..dbfb12835df 100644
--- a/src/mame/video/ssv.c
+++ b/src/mame/video/ssv.c
@@ -135,7 +135,7 @@ Note: press Z to show some info on each sprite (debug builds only)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/seta.h"
#ifdef MAME_DEBUG
#include "ui.h"
diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c
index 65122144b29..595d89a24ed 100644
--- a/src/mame/video/st0016.c
+++ b/src/mame/video/st0016.c
@@ -3,7 +3,7 @@
driver by Tomasz Slanina
************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/st0016.h"
UINT8 *st0016_charram;
diff --git a/src/mame/video/stactics.c b/src/mame/video/stactics.c
index ac88a2112de..7db470dc724 100644
--- a/src/mame/video/stactics.c
+++ b/src/mame/video/stactics.c
@@ -46,7 +46,7 @@ tilt the mirror up and down, and the monitor left and right.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/stactics.h"
diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c
index bb64465ef77..ad33d58bedb 100644
--- a/src/mame/video/stadhero.c
+++ b/src/mame/video/stadhero.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *stadhero_pf1_data;
static UINT16 *stadhero_pf2_data;
diff --git a/src/mame/video/starcrus.c b/src/mame/video/starcrus.c
index 3b497e29c3d..0c91751ec4e 100644
--- a/src/mame/video/starcrus.c
+++ b/src/mame/video/starcrus.c
@@ -1,7 +1,7 @@
/* Ramtek - Star Cruiser */
-#include "driver.h"
+#include "emu.h"
#include "sound/samples.h"
static bitmap_t *ship1_vid;
diff --git a/src/mame/video/starfire.c b/src/mame/video/starfire.c
index e736a3b8ec3..825983d9c35 100644
--- a/src/mame/video/starfire.c
+++ b/src/mame/video/starfire.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/starfire.h"
diff --git a/src/mame/video/starshp1.c b/src/mame/video/starshp1.c
index 30153662e66..ed8af86c740 100644
--- a/src/mame/video/starshp1.c
+++ b/src/mame/video/starshp1.c
@@ -4,7 +4,7 @@ Atari Starship 1 video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/starshp1.h"
UINT8 *starshp1_playfield_ram;
diff --git a/src/mame/video/stfight.c b/src/mame/video/stfight.c
index ce696cf0538..c96ecebae9c 100644
--- a/src/mame/video/stfight.c
+++ b/src/mame/video/stfight.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/stfight.h"
// Real stuff
diff --git a/src/mame/video/stlforce.c b/src/mame/video/stlforce.c
index dbecf84a6cb..040d5e8513e 100644
--- a/src/mame/video/stlforce.c
+++ b/src/mame/video/stlforce.c
@@ -1,6 +1,6 @@
/* video/stlforce.c - see main driver for other notes */
-#include "driver.h"
+#include "emu.h"
static tilemap_t *stlforce_bg_tilemap, *stlforce_mlow_tilemap, *stlforce_mhigh_tilemap, *stlforce_tx_tilemap;
diff --git a/src/mame/video/strnskil.c b/src/mame/video/strnskil.c
index 3f9b9f003e4..9bb47d1e28c 100644
--- a/src/mame/video/strnskil.c
+++ b/src/mame/video/strnskil.c
@@ -8,7 +8,7 @@ Video hardware driver by Uki
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *strnskil_xscroll;
diff --git a/src/mame/video/stvvdp1.c b/src/mame/video/stvvdp1.c
index 85a31ab9b15..1defade0ae1 100644
--- a/src/mame/video/stvvdp1.c
+++ b/src/mame/video/stvvdp1.c
@@ -16,7 +16,7 @@ Framebuffer todo:
*/
-#include "driver.h"
+#include "emu.h"
#include "sound/scsp.h"
#include "includes/stv.h"
diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c
index b18b0c5ac92..e4682c138ce 100644
--- a/src/mame/video/stvvdp2.c
+++ b/src/mame/video/stvvdp2.c
@@ -101,8 +101,7 @@ In other words,the first three types uses the offset and not the color allocated
\-N Stores VDP1 ram contents into a file.
*/
-#include "driver.h"
-#include "eminline.h"
+#include "emu.h"
#include "profiler.h"
#include "includes/stv.h"
diff --git a/src/mame/video/subs.c b/src/mame/video/subs.c
index 44cff843464..84c822d30ef 100644
--- a/src/mame/video/subs.c
+++ b/src/mame/video/subs.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/subs.h"
#include "sound/discrete.h"
diff --git a/src/mame/video/suna16.c b/src/mame/video/suna16.c
index 1287139c498..b49e59a3ffa 100644
--- a/src/mame/video/suna16.c
+++ b/src/mame/video/suna16.c
@@ -57,7 +57,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
static int color_bank;
diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c
index fce643cb3c4..7594756b055 100644
--- a/src/mame/video/suna8.c
+++ b/src/mame/video/suna8.c
@@ -69,7 +69,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/suna8.h"
#define TILEMAPS 0
diff --git a/src/mame/video/supbtime.c b/src/mame/video/supbtime.c
index a8337958b08..637743aa8a5 100644
--- a/src/mame/video/supbtime.c
+++ b/src/mame/video/supbtime.c
@@ -12,7 +12,7 @@ End sequence uses rowscroll '98 c0' on pf1 (jmp to 1d61a on supbtimj)
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
/******************************************************************************/
diff --git a/src/mame/video/superchs.c b/src/mame/video/superchs.c
index 0dfec4c9398..e53c5b76015 100644
--- a/src/mame/video/superchs.c
+++ b/src/mame/video/superchs.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
struct tempsprite
diff --git a/src/mame/video/superqix.c b/src/mame/video/superqix.c
index 54c5342b638..9cd29954dbe 100644
--- a/src/mame/video/superqix.c
+++ b/src/mame/video/superqix.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *superqix_videoram;
UINT8 *superqix_bitmapram,*superqix_bitmapram2;
diff --git a/src/mame/video/suprloco.c b/src/mame/video/suprloco.c
index 50a9fbc7d85..18742ac87a3 100644
--- a/src/mame/video/suprloco.c
+++ b/src/mame/video/suprloco.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *suprloco_videoram;
UINT8 *suprloco_scrollram;
diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c
index 7d875fec5b2..533f4f1a3f2 100644
--- a/src/mame/video/suprnova.c
+++ b/src/mame/video/suprnova.c
@@ -14,7 +14,7 @@ Add global sprite flip
Tilemap flip flags were reversed
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/suprnova.h"
static bitmap_t *sprite_bitmap;
diff --git a/src/mame/video/suprridr.c b/src/mame/video/suprridr.c
index c8d8f7d8388..5a7261e7165 100644
--- a/src/mame/video/suprridr.c
+++ b/src/mame/video/suprridr.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/suprridr.h"
diff --git a/src/mame/video/suprslam.c b/src/mame/video/suprslam.c
index b1624b5c45d..35c8a288ad1 100644
--- a/src/mame/video/suprslam.c
+++ b/src/mame/video/suprslam.c
@@ -1,6 +1,6 @@
/* Super Slams - video, see notes in driver file */
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/suprslam.h"
diff --git a/src/mame/video/surpratk.c b/src/mame/video/surpratk.c
index 44a04431a68..10929c87499 100644
--- a/src/mame/video/surpratk.c
+++ b/src/mame/video/surpratk.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/surpratk.h"
diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c
index 4bc5c95a626..1f7a91aa75c 100644
--- a/src/mame/video/system1.c
+++ b/src/mame/video/system1.c
@@ -78,7 +78,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "system1.h"
static UINT8 *mix_collide;
diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c
index f35c28a3377..3dd501e7230 100644
--- a/src/mame/video/system16.c
+++ b/src/mame/video/system16.c
@@ -24,7 +24,7 @@
a coin.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/system16.h"
#include "video/resnet.h"
#include "video/segaic16.h"
diff --git a/src/mame/video/tagteam.c b/src/mame/video/tagteam.c
index 493eb006697..13cd6d937de 100644
--- a/src/mame/video/tagteam.c
+++ b/src/mame/video/tagteam.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
static int palettebank;
diff --git a/src/mame/video/tail2nos.c b/src/mame/video/tail2nos.c
index e4e0d70c293..8c60bb0c11d 100644
--- a/src/mame/video/tail2nos.c
+++ b/src/mame/video/tail2nos.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/tail2nos.h"
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index 83f077ecc8b..ead1f3ccea4 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "video/taitoic.h"
#include "includes/taito_b.h"
diff --git a/src/mame/video/taito_f2.c b/src/mame/video/taito_f2.c
index 8d2972a4008..c2a1496015d 100644
--- a/src/mame/video/taito_f2.c
+++ b/src/mame/video/taito_f2.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/taito_f2.h"
diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c
index c97045f1548..ab10c9fcb74 100644
--- a/src/mame/video/taito_f3.c
+++ b/src/mame/video/taito_f3.c
@@ -204,7 +204,7 @@ Playfield tile info:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/taito_f3.h"
#include "ui.h"
diff --git a/src/mame/video/taito_h.c b/src/mame/video/taito_h.c
index b21f22c0e64..4e36f2bd424 100644
--- a/src/mame/video/taito_h.c
+++ b/src/mame/video/taito_h.c
@@ -45,7 +45,7 @@ sprite RAM
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/taito_h.h"
diff --git a/src/mame/video/taito_l.c b/src/mame/video/taito_l.c
index 04a9ba02def..b5ec8de94d2 100644
--- a/src/mame/video/taito_l.c
+++ b/src/mame/video/taito_l.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/taito_l.h"
/***************************************************************************
diff --git a/src/mame/video/taito_o.c b/src/mame/video/taito_o.c
index 3213ad7e067..9c79d4af0d1 100644
--- a/src/mame/video/taito_o.c
+++ b/src/mame/video/taito_o.c
@@ -4,7 +4,7 @@ Based on taito_h.c
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/taito_o.h"
diff --git a/src/mame/video/taito_z.c b/src/mame/video/taito_z.c
index 9819fd9b1ce..2965db169ae 100644
--- a/src/mame/video/taito_z.c
+++ b/src/mame/video/taito_z.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/taito_z.h"
diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c
index f3320fb5c77..2c791174dbb 100644
--- a/src/mame/video/taitoair.c
+++ b/src/mame/video/taitoair.c
@@ -45,7 +45,7 @@ sprite RAM
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/taitoair.h"
diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c
index 91d720d54b1..555e16b9aef 100644
--- a/src/mame/video/taitoic.c
+++ b/src/mame/video/taitoic.c
@@ -492,7 +492,7 @@ The data bus is 16 bits wide.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "drawgfxm.h"
#include "taitoic.h"
diff --git a/src/mame/video/taitojc.c b/src/mame/video/taitojc.c
index ef7c14b240e..dd939e85182 100644
--- a/src/mame/video/taitojc.c
+++ b/src/mame/video/taitojc.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/poly.h"
UINT8 *taitojc_texture;
diff --git a/src/mame/video/taitosj.c b/src/mame/video/taitosj.c
index b2107b25f3c..ac28341f3cd 100644
--- a/src/mame/video/taitosj.c
+++ b/src/mame/video/taitosj.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/taitosj.h"
diff --git a/src/mame/video/tank8.c b/src/mame/video/tank8.c
index d44a6ac57f2..a0a3ad8524b 100644
--- a/src/mame/video/tank8.c
+++ b/src/mame/video/tank8.c
@@ -4,7 +4,7 @@ Atari Tank 8 video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/tank8.h"
diff --git a/src/mame/video/tankbatt.c b/src/mame/video/tankbatt.c
index 7a54fb0f426..ca385c43439 100644
--- a/src/mame/video/tankbatt.c
+++ b/src/mame/video/tankbatt.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *tankbatt_bulletsram;
size_t tankbatt_bulletsram_size;
diff --git a/src/mame/video/tankbust.c b/src/mame/video/tankbust.c
index 43e9c7014a7..12e145e36d0 100644
--- a/src/mame/video/tankbust.c
+++ b/src/mame/video/tankbust.c
@@ -2,7 +2,7 @@
* Video Driver for Tank Busters
*/
-#include "driver.h"
+#include "emu.h"
/*
* variables
diff --git a/src/mame/video/taotaido.c b/src/mame/video/taotaido.c
index 5ebaf68f4a9..b206b097c94 100644
--- a/src/mame/video/taotaido.c
+++ b/src/mame/video/taotaido.c
@@ -8,7 +8,7 @@ zooming might be wrong (only used on title logo?)
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/taotaido.h"
UINT16 *taotaido_spriteram;
diff --git a/src/mame/video/targeth.c b/src/mame/video/targeth.c
index c24f941fb18..8307bf801de 100644
--- a/src/mame/video/targeth.c
+++ b/src/mame/video/targeth.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *targeth_spriteram;
UINT16 *targeth_vregs;
diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c
index 4da60a80472..4caf152a3bf 100644
--- a/src/mame/video/tatsumi.c
+++ b/src/mame/video/tatsumi.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/tatsumi.h"
static tilemap_t *tx_layer;
diff --git a/src/mame/video/taxidrvr.c b/src/mame/video/taxidrvr.c
index 811579c00f3..25e4d9fb925 100644
--- a/src/mame/video/taxidrvr.c
+++ b/src/mame/video/taxidrvr.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/taxidrvr.h"
diff --git a/src/mame/video/tbowl.c b/src/mame/video/tbowl.c
index f2d9decae38..1ef0504b0a6 100644
--- a/src/mame/video/tbowl.c
+++ b/src/mame/video/tbowl.c
@@ -2,7 +2,7 @@
/* see drivers/tbowl.c for more info */
-#include "driver.h"
+#include "emu.h"
static tilemap_t *tx_tilemap, *bg_tilemap, *bg2_tilemap;
UINT8 *tbowl_txvideoram, *tbowl_bgvideoram, *tbowl_bg2videoram;
diff --git a/src/mame/video/tceptor.c b/src/mame/video/tceptor.c
index c036a5015eb..33cc9284c5b 100644
--- a/src/mame/video/tceptor.c
+++ b/src/mame/video/tceptor.c
@@ -3,7 +3,7 @@
* emulate video hardware
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/namcoic.h"
#define TX_TILE_OFFSET_CENTER (32 * 2)
diff --git a/src/mame/video/tecmo.c b/src/mame/video/tecmo.c
index da5594bdae6..f57e41afbaf 100644
--- a/src/mame/video/tecmo.c
+++ b/src/mame/video/tecmo.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *tecmo_txvideoram,*tecmo_fgvideoram,*tecmo_bgvideoram;
diff --git a/src/mame/video/tecmo16.c b/src/mame/video/tecmo16.c
index 30083c14636..be6a2d55e22 100644
--- a/src/mame/video/tecmo16.c
+++ b/src/mame/video/tecmo16.c
@@ -8,7 +8,7 @@
******************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *tecmo16_videoram;
UINT16 *tecmo16_colorram;
diff --git a/src/mame/video/tehkanwc.c b/src/mame/video/tehkanwc.c
index a1f63698ada..d29830ff316 100644
--- a/src/mame/video/tehkanwc.c
+++ b/src/mame/video/tehkanwc.c
@@ -11,7 +11,7 @@ robbiex@rocketmail.com
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *tehkanwc_videoram;
UINT8 *tehkanwc_colorram;
diff --git a/src/mame/video/terracre.c b/src/mame/video/terracre.c
index 8c15e8f45f3..b209025380a 100644
--- a/src/mame/video/terracre.c
+++ b/src/mame/video/terracre.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
static UINT16 xscroll;
static UINT16 yscroll;
diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c
index 87f5f8d77e0..1f9ed7bec90 100644
--- a/src/mame/video/tetrisp2.c
+++ b/src/mame/video/tetrisp2.c
@@ -30,7 +30,7 @@ To Do:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/tetrisp2.h"
diff --git a/src/mame/video/thedeep.c b/src/mame/video/thedeep.c
index d15c3ca62ef..b62e306c97e 100644
--- a/src/mame/video/thedeep.c
+++ b/src/mame/video/thedeep.c
@@ -28,7 +28,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/thedeep.h"
/* Variables only used here: */
diff --git a/src/mame/video/thepit.c b/src/mame/video/thepit.c
index 1e462f7e4ef..6a1a150ea1f 100644
--- a/src/mame/video/thepit.c
+++ b/src/mame/video/thepit.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *thepit_videoram;
diff --git a/src/mame/video/thief.c b/src/mame/video/thief.c
index 662b8831d98..8ea48b2a6c4 100644
--- a/src/mame/video/thief.c
+++ b/src/mame/video/thief.c
@@ -2,7 +2,7 @@
** Thief/Nato Defense
*/
-#include "driver.h"
+#include "emu.h"
#include "video/tms9927.h"
static UINT8 thief_read_mask, thief_write_mask;
diff --git a/src/mame/video/thoop2.c b/src/mame/video/thoop2.c
index 930c4bb7c1c..10b96cbe02d 100644
--- a/src/mame/video/thoop2.c
+++ b/src/mame/video/thoop2.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *thoop2_vregs;
UINT16 *thoop2_videoram;
diff --git a/src/mame/video/thunderj.c b/src/mame/video/thunderj.c
index f9fee44ab37..8e32c61b3ff 100644
--- a/src/mame/video/thunderj.c
+++ b/src/mame/video/thunderj.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "includes/thunderj.h"
diff --git a/src/mame/video/thunderx.c b/src/mame/video/thunderx.c
index 962107ca6b7..302d82ba394 100644
--- a/src/mame/video/thunderx.c
+++ b/src/mame/video/thunderx.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/thunderx.h"
diff --git a/src/mame/video/tia.c b/src/mame/video/tia.c
index d1e0e22b016..89ae5b112b4 100644
--- a/src/mame/video/tia.c
+++ b/src/mame/video/tia.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "tia.h"
#include "sound/tiaintf.h"
diff --git a/src/mame/video/tiamc1.c b/src/mame/video/tiamc1.c
index 9625b542e29..55ced9bcb08 100644
--- a/src/mame/video/tiamc1.c
+++ b/src/mame/video/tiamc1.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/tiamc1.h"
diff --git a/src/mame/video/tigeroad.c b/src/mame/video/tigeroad.c
index 90a2b6e8fdc..91874f8e82b 100644
--- a/src/mame/video/tigeroad.c
+++ b/src/mame/video/tigeroad.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
static int bgcharbank;
static tilemap_t *bg_tilemap, *fg_tilemap;
diff --git a/src/mame/video/timelimt.c b/src/mame/video/timelimt.c
index 1d48c9433c7..3d1f09fe40b 100644
--- a/src/mame/video/timelimt.c
+++ b/src/mame/video/timelimt.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
/* globals */
UINT8 *timelimt_bg_videoram;
diff --git a/src/mame/video/timeplt.c b/src/mame/video/timeplt.c
index 3758755a398..8c81cae910f 100644
--- a/src/mame/video/timeplt.c
+++ b/src/mame/video/timeplt.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/timeplt.h"
/***************************************************************************
diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c
index edad9e4b9d7..d5bf22f640b 100644
--- a/src/mame/video/tmnt.c
+++ b/src/mame/video/tmnt.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/tmnt.h"
diff --git a/src/mame/video/tnzs.c b/src/mame/video/tnzs.c
index 8bf6bbbab3e..3ff063ecb37 100644
--- a/src/mame/video/tnzs.c
+++ b/src/mame/video/tnzs.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/tnzs.h"
diff --git a/src/mame/video/toaplan1.c b/src/mame/video/toaplan1.c
index 6af3d097751..b93f4ff34b5 100644
--- a/src/mame/video/toaplan1.c
+++ b/src/mame/video/toaplan1.c
@@ -118,7 +118,7 @@ Abnormalities:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/toaplan1.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c
index 1abea4c11dd..583cb7332f0 100644
--- a/src/mame/video/toaplan2.c
+++ b/src/mame/video/toaplan2.c
@@ -144,7 +144,7 @@ Pipi & Bibis | Fix Eight | V-Five | Snow Bros. 2 |
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/3812intf.h"
#include "includes/toaplan2.h"
diff --git a/src/mame/video/toki.c b/src/mame/video/toki.c
index af4754d7a9d..52f5e67cb84 100644
--- a/src/mame/video/toki.c
+++ b/src/mame/video/toki.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
static tilemap_t *background_layer,*foreground_layer,*text_layer;
diff --git a/src/mame/video/toobin.c b/src/mame/video/toobin.c
index 72bb91fc465..2d7bda210f9 100644
--- a/src/mame/video/toobin.c
+++ b/src/mame/video/toobin.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "includes/toobin.h"
diff --git a/src/mame/video/topspeed.c b/src/mame/video/topspeed.c
index f86373363fc..1b5f373a124 100644
--- a/src/mame/video/topspeed.c
+++ b/src/mame/video/topspeed.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/topspeed.h"
diff --git a/src/mame/video/toypop.c b/src/mame/video/toypop.c
index 9c3b978336e..6dfbaea8da0 100644
--- a/src/mame/video/toypop.c
+++ b/src/mame/video/toypop.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/mappy.h"
#include "includes/toypop.h"
diff --git a/src/mame/video/tp84.c b/src/mame/video/tp84.c
index f48aca82a13..77585f1fd32 100644
--- a/src/mame/video/tp84.c
+++ b/src/mame/video/tp84.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
diff --git a/src/mame/video/trackfld.c b/src/mame/video/trackfld.c
index 574b2caa42e..c1f1882cf53 100644
--- a/src/mame/video/trackfld.c
+++ b/src/mame/video/trackfld.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/trackfld.h"
diff --git a/src/mame/video/travrusa.c b/src/mame/video/travrusa.c
index cc998d47508..2d253c75f67 100644
--- a/src/mame/video/travrusa.c
+++ b/src/mame/video/travrusa.c
@@ -11,7 +11,7 @@ J Clegg
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/iremz80.h"
/***************************************************************************
diff --git a/src/mame/video/triplhnt.c b/src/mame/video/triplhnt.c
index c0538925d6e..9212faefd0f 100644
--- a/src/mame/video/triplhnt.c
+++ b/src/mame/video/triplhnt.c
@@ -4,7 +4,7 @@ Atari Triple Hunt video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/triplhnt.h"
diff --git a/src/mame/video/truco.c b/src/mame/video/truco.c
index e432b4b5e42..101a66f15b0 100644
--- a/src/mame/video/truco.c
+++ b/src/mame/video/truco.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
PALETTE_INIT( truco )
{
diff --git a/src/mame/video/trucocl.c b/src/mame/video/trucocl.c
index 2dd39904850..a830300902f 100644
--- a/src/mame/video/trucocl.c
+++ b/src/mame/video/trucocl.c
@@ -32,7 +32,7 @@ Daughterboard: Custom made, plugged in the 2 roms and Z80 mainboard sockets.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *trucocl_videoram;
UINT8 *trucocl_colorram;
diff --git a/src/mame/video/tryout.c b/src/mame/video/tryout.c
index 7445cf21c64..284a583d3c7 100644
--- a/src/mame/video/tryout.c
+++ b/src/mame/video/tryout.c
@@ -5,7 +5,7 @@
****************************************************************/
-#include "driver.h"
+#include "emu.h"
static tilemap_t *fg_tilemap, *bg_tilemap;
static UINT8 vram_bank;
diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c
index 6587c78d408..1f9cc008d7f 100644
--- a/src/mame/video/tsamurai.c
+++ b/src/mame/video/tsamurai.c
@@ -2,7 +2,7 @@
** Video Driver for Taito Samurai (1985)
*/
-#include "driver.h"
+#include "emu.h"
/*
diff --git a/src/mame/video/tubep.c b/src/mame/video/tubep.c
index 8382524aee7..f229d50950a 100644
--- a/src/mame/video/tubep.c
+++ b/src/mame/video/tubep.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/tubep.h"
#include "video/resnet.h"
diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c
index 9a69dcc18aa..88f829d32b6 100644
--- a/src/mame/video/tumbleb.c
+++ b/src/mame/video/tumbleb.c
@@ -14,7 +14,7 @@ to switch between 8*8 tiles and 16*16 tiles.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/tumbleb.h"
diff --git a/src/mame/video/tumblep.c b/src/mame/video/tumblep.c
index 8f7aac7b4c9..36f2e31549f 100644
--- a/src/mame/video/tumblep.c
+++ b/src/mame/video/tumblep.c
@@ -13,7 +13,7 @@ to switch between 8*8 tiles and 16*16 tiles.
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect)
diff --git a/src/mame/video/tunhunt.c b/src/mame/video/tunhunt.c
index 12687bec79d..9df137138b6 100644
--- a/src/mame/video/tunhunt.c
+++ b/src/mame/video/tunhunt.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
extern UINT8 tunhunt_control;
extern UINT8 *tunhunt_ram;
diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c
index 08648aca3fe..afef0df6175 100644
--- a/src/mame/video/turbo.c
+++ b/src/mame/video/turbo.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/turbo.h"
#include "video/resnet.h"
diff --git a/src/mame/video/tutankhm.c b/src/mame/video/tutankhm.c
index 0409aef3259..d98123b21d2 100644
--- a/src/mame/video/tutankhm.c
+++ b/src/mame/video/tutankhm.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/timeplt.h"
diff --git a/src/mame/video/twin16.c b/src/mame/video/twin16.c
index ece484fb09f..d36757565fc 100644
--- a/src/mame/video/twin16.c
+++ b/src/mame/video/twin16.c
@@ -12,7 +12,7 @@
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/twin16.h"
static UINT16 twin16_sprite_buffer[0x800];
diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c
index 153d629fc5a..3d8b9aa51a5 100644
--- a/src/mame/video/twincobr.c
+++ b/src/mame/video/twincobr.c
@@ -12,7 +12,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/mc6845.h"
#include "includes/twincobr.h"
diff --git a/src/mame/video/tx1.c b/src/mame/video/tx1.c
index d5b874bd01c..dfc1147fd61 100644
--- a/src/mame/video/tx1.c
+++ b/src/mame/video/tx1.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "render.h"
#include "video/resnet.h"
#include "cpu/i86/i86.h"
diff --git a/src/mame/video/ultraman.c b/src/mame/video/ultraman.c
index b3accbbd3f6..3f4fc12d9bc 100644
--- a/src/mame/video/ultraman.c
+++ b/src/mame/video/ultraman.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/ultraman.h"
diff --git a/src/mame/video/ultratnk.c b/src/mame/video/ultratnk.c
index af84641d507..2336d5c0816 100644
--- a/src/mame/video/ultratnk.c
+++ b/src/mame/video/ultratnk.c
@@ -4,7 +4,7 @@ Atari Ultra Tank video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/ultratnk.h"
#include "audio/sprint4.h"
diff --git a/src/mame/video/undrfire.c b/src/mame/video/undrfire.c
index 06fb8aec3db..ac3483d9683 100644
--- a/src/mame/video/undrfire.c
+++ b/src/mame/video/undrfire.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
UINT16 undrfire_rotate_ctrl[8];
diff --git a/src/mame/video/unico.c b/src/mame/video/unico.c
index 9400aa9ac4a..44e746983ba 100644
--- a/src/mame/video/unico.c
+++ b/src/mame/video/unico.c
@@ -36,7 +36,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/unico.h"
/* Variables needed by drivers: */
diff --git a/src/mame/video/usgames.c b/src/mame/video/usgames.c
index 0c5a482fdc1..eba95363670 100644
--- a/src/mame/video/usgames.c
+++ b/src/mame/video/usgames.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
UINT8 *usgames_videoram,*usgames_charram;
diff --git a/src/mame/video/vaportra.c b/src/mame/video/vaportra.c
index bcdef046452..d1692922114 100644
--- a/src/mame/video/vaportra.c
+++ b/src/mame/video/vaportra.c
@@ -9,7 +9,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/deco16ic.h"
static UINT16 vaportra_priority[2];
diff --git a/src/mame/video/vastar.c b/src/mame/video/vastar.c
index e2ab49c4494..439666541de 100644
--- a/src/mame/video/vastar.c
+++ b/src/mame/video/vastar.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/vastar.h"
diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c
index 2396c4b262d..b3097d2c469 100644
--- a/src/mame/video/vball.c
+++ b/src/mame/video/vball.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "includes/vball.h"
diff --git a/src/mame/video/vdc.c b/src/mame/video/vdc.c
index 07e2f185d68..80bbbdfe28c 100644
--- a/src/mame/video/vdc.c
+++ b/src/mame/video/vdc.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/vdc.h"
/* VDC segments */
diff --git a/src/mame/video/vendetta.c b/src/mame/video/vendetta.c
index 7bba000663a..afdbececff1 100644
--- a/src/mame/video/vendetta.c
+++ b/src/mame/video/vendetta.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/vendetta.h"
diff --git a/src/mame/video/vertigo.c b/src/mame/video/vertigo.c
index a7ac3514d74..3da03b362d3 100644
--- a/src/mame/video/vertigo.c
+++ b/src/mame/video/vertigo.c
@@ -43,7 +43,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "profiler.h"
#include "video/vector.h"
#include "includes/vertigo.h"
diff --git a/src/mame/video/vicdual.c b/src/mame/video/vicdual.c
index 8e18bce5d50..68c281fcdcd 100644
--- a/src/mame/video/vicdual.c
+++ b/src/mame/video/vicdual.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/vicdual.h"
diff --git a/src/mame/video/victory.c b/src/mame/video/victory.c
index 4955f939c8e..e354061da59 100644
--- a/src/mame/video/victory.c
+++ b/src/mame/video/victory.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/victory.h"
diff --git a/src/mame/video/videopin.c b/src/mame/video/videopin.c
index 10400d3534b..ce704ebba85 100644
--- a/src/mame/video/videopin.c
+++ b/src/mame/video/videopin.c
@@ -4,7 +4,7 @@
*************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/videopin.h"
UINT8* videopin_video_ram;
diff --git a/src/mame/video/vigilant.c b/src/mame/video/vigilant.c
index e98b06b8f28..6d4320579f4 100644
--- a/src/mame/video/vigilant.c
+++ b/src/mame/video/vigilant.c
@@ -14,7 +14,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
static const rectangle bottomvisiblearea =
diff --git a/src/mame/video/vindictr.c b/src/mame/video/vindictr.c
index 56f721f8103..ecd954b0b7f 100644
--- a/src/mame/video/vindictr.c
+++ b/src/mame/video/vindictr.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/vindictr.h"
#include "includes/thunderj.h"
diff --git a/src/mame/video/volfied.c b/src/mame/video/volfied.c
index 0d1ba87a74a..f850c5cd325 100644
--- a/src/mame/video/volfied.c
+++ b/src/mame/video/volfied.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/volfied.h"
diff --git a/src/mame/video/vrender0.c b/src/mame/video/vrender0.c
index fbc56416b21..158c1842e80 100644
--- a/src/mame/video/vrender0.c
+++ b/src/mame/video/vrender0.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "vrender0.h"
/***********************************
diff --git a/src/mame/video/vsnes.c b/src/mame/video/vsnes.c
index 49cea5b29da..3eb3b43d35d 100644
--- a/src/mame/video/vsnes.c
+++ b/src/mame/video/vsnes.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/ppu2c0x.h"
#include "includes/vsnes.h"
diff --git a/src/mame/video/vulgus.c b/src/mame/video/vulgus.c
index 02dfc1a0f92..2f012f86e61 100644
--- a/src/mame/video/vulgus.c
+++ b/src/mame/video/vulgus.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *vulgus_fgvideoram,*vulgus_bgvideoram;
UINT8 *vulgus_scroll_low,*vulgus_scroll_high;
diff --git a/src/mame/video/warpwarp.c b/src/mame/video/warpwarp.c
index 9230728d0ee..4c683f2e264 100644
--- a/src/mame/video/warpwarp.c
+++ b/src/mame/video/warpwarp.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/warpwarp.h"
diff --git a/src/mame/video/warriorb.c b/src/mame/video/warriorb.c
index 2567c13decf..ca259d56b4d 100644
--- a/src/mame/video/warriorb.c
+++ b/src/mame/video/warriorb.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/warriorb.h"
diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c
index 78116bf064f..cf50d6f0d93 100644
--- a/src/mame/video/wc90.c
+++ b/src/mame/video/wc90.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "includes/wc90.h"
diff --git a/src/mame/video/wc90b.c b/src/mame/video/wc90b.c
index 08debad5fe6..a20bbe5ab09 100644
--- a/src/mame/video/wc90b.c
+++ b/src/mame/video/wc90b.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
UINT8 *wc90b_fgvideoram,*wc90b_bgvideoram,*wc90b_txvideoram;
diff --git a/src/mame/video/wecleman.c b/src/mame/video/wecleman.c
index 9f315019717..3ad6b3172b0 100644
--- a/src/mame/video/wecleman.c
+++ b/src/mame/video/wecleman.c
@@ -7,7 +7,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#define BMP_PAD 8
diff --git a/src/mame/video/welltris.c b/src/mame/video/welltris.c
index 30824567bb5..dc152b568f7 100644
--- a/src/mame/video/welltris.c
+++ b/src/mame/video/welltris.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
diff --git a/src/mame/video/wgp.c b/src/mame/video/wgp.c
index f8369fd9650..f911b8f26ac 100644
--- a/src/mame/video/wgp.c
+++ b/src/mame/video/wgp.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/taitoic.h"
#include "includes/wgp.h"
diff --git a/src/mame/video/williams.c b/src/mame/video/williams.c
index d1b1d079309..7c75606b507 100644
--- a/src/mame/video/williams.c
+++ b/src/mame/video/williams.c
@@ -91,7 +91,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/williams.h"
diff --git a/src/mame/video/wiping.c b/src/mame/video/wiping.c
index 6158e22fb65..d318207e93a 100644
--- a/src/mame/video/wiping.c
+++ b/src/mame/video/wiping.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/wiping.h"
diff --git a/src/mame/video/wiz.c b/src/mame/video/wiz.c
index f23822fb925..0008968a718 100644
--- a/src/mame/video/wiz.c
+++ b/src/mame/video/wiz.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
static const rectangle spritevisiblearea =
diff --git a/src/mame/video/wolfpack.c b/src/mame/video/wolfpack.c
index ee3598d61fb..12ae20ebf59 100644
--- a/src/mame/video/wolfpack.c
+++ b/src/mame/video/wolfpack.c
@@ -4,7 +4,7 @@ Atari Wolf Pack (prototype) video emulation
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
int wolfpack_collision;
diff --git a/src/mame/video/wrally.c b/src/mame/video/wrally.c
index a8cbb1998fe..2fc8a3fe9dc 100644
--- a/src/mame/video/wrally.c
+++ b/src/mame/video/wrally.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/wrally.h"
UINT16 *wrally_spriteram;
diff --git a/src/mame/video/wwfsstar.c b/src/mame/video/wwfsstar.c
index ab1ebbe1d4a..723d1f46c39 100644
--- a/src/mame/video/wwfsstar.c
+++ b/src/mame/video/wwfsstar.c
@@ -6,7 +6,7 @@
see (drivers/wwfsstar.c) for more notes
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT16 *wwfsstar_fg0_videoram, *wwfsstar_bg0_videoram;
extern int wwfsstar_scrollx, wwfsstar_scrolly;
diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c
index 214ad17abce..cba5d0aea16 100644
--- a/src/mame/video/wwfwfest.c
+++ b/src/mame/video/wwfwfest.c
@@ -6,7 +6,7 @@
see (drivers/wwfwfest.c) for more notes
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/wwfwfest.h"
static tilemap_t *fg0_tilemap, *bg0_tilemap, *bg1_tilemap;
diff --git a/src/mame/video/xain.c b/src/mame/video/xain.c
index a41bbb2fc3c..89e4a0d34fc 100644
--- a/src/mame/video/xain.c
+++ b/src/mame/video/xain.c
@@ -30,7 +30,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *xain_charram, *xain_bgram0, *xain_bgram1, xain_pri;
diff --git a/src/mame/video/xevious.c b/src/mame/video/xevious.c
index 65b7b95a404..a4f36a2075e 100644
--- a/src/mame/video/xevious.c
+++ b/src/mame/video/xevious.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/galaga.h"
diff --git a/src/mame/video/xexex.c b/src/mame/video/xexex.c
index 030f9024748..8bfb2189c35 100644
--- a/src/mame/video/xexex.c
+++ b/src/mame/video/xexex.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/xexex.h"
diff --git a/src/mame/video/xmen.c b/src/mame/video/xmen.c
index d4bb6efbf0d..3515c8df8c7 100644
--- a/src/mame/video/xmen.c
+++ b/src/mame/video/xmen.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
#include "video/konicdev.h"
#include "includes/xmen.h"
diff --git a/src/mame/video/xorworld.c b/src/mame/video/xorworld.c
index b3ba05b03a4..97a920225b1 100644
--- a/src/mame/video/xorworld.c
+++ b/src/mame/video/xorworld.c
@@ -1,4 +1,4 @@
-#include "driver.h"
+#include "emu.h"
static tilemap_t *bg_tilemap;
diff --git a/src/mame/video/xxmissio.c b/src/mame/video/xxmissio.c
index 1009dea9183..288cf5b1611 100644
--- a/src/mame/video/xxmissio.c
+++ b/src/mame/video/xxmissio.c
@@ -8,7 +8,7 @@ Video hardware driver by Uki
*******************************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *xxmissio_bgram;
UINT8 *xxmissio_fgram;
diff --git a/src/mame/video/xybots.c b/src/mame/video/xybots.c
index 28d916beede..54480752eaf 100644
--- a/src/mame/video/xybots.c
+++ b/src/mame/video/xybots.c
@@ -4,7 +4,7 @@
****************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "machine/atarigen.h"
#include "includes/xybots.h"
diff --git a/src/mame/video/xyonix.c b/src/mame/video/xyonix.c
index a74b3443374..28cf3d7191c 100644
--- a/src/mame/video/xyonix.c
+++ b/src/mame/video/xyonix.c
@@ -1,5 +1,5 @@
-#include "driver.h"
+#include "emu.h"
extern UINT8 *xyonix_vidram;
diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c
index dac410409ac..4950ec87efc 100644
--- a/src/mame/video/ygv608.c
+++ b/src/mame/video/ygv608.c
@@ -29,7 +29,7 @@
* Everything else! :)
*/
-#include "driver.h"
+#include "emu.h"
#include "includes/namcond1.h" // only while debugging
#include "video/ygv608.h"
diff --git a/src/mame/video/yiear.c b/src/mame/video/yiear.c
index 970f530b92d..0a143e210db 100644
--- a/src/mame/video/yiear.c
+++ b/src/mame/video/yiear.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/trackfld.h"
diff --git a/src/mame/video/yunsun16.c b/src/mame/video/yunsun16.c
index b5d5af8588f..85cd7ca1019 100644
--- a/src/mame/video/yunsun16.c
+++ b/src/mame/video/yunsun16.c
@@ -20,7 +20,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/yunsun16.h"
diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c
index 306cd06830f..7c06218a3ae 100644
--- a/src/mame/video/yunsung8.c
+++ b/src/mame/video/yunsung8.c
@@ -27,7 +27,7 @@ Note: if MAME_DEBUG is defined, pressing Z with:
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/yunsung8.h"
diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c
index 9c71134d45e..a909fe7b0d8 100644
--- a/src/mame/video/zac2650.c
+++ b/src/mame/video/zac2650.c
@@ -4,7 +4,7 @@
/* */
/*************************************************************/
-#include "driver.h"
+#include "emu.h"
UINT8 *zac2650_s2636_0_ram;
static bitmap_t *spritebitmap;
diff --git a/src/mame/video/zaccaria.c b/src/mame/video/zaccaria.c
index f370a2bf642..00423663c91 100644
--- a/src/mame/video/zaccaria.c
+++ b/src/mame/video/zaccaria.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
diff --git a/src/mame/video/zaxxon.c b/src/mame/video/zaxxon.c
index 0460f258c4b..1e7fb3de5a0 100644
--- a/src/mame/video/zaxxon.c
+++ b/src/mame/video/zaxxon.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "video/resnet.h"
#include "includes/zaxxon.h"
diff --git a/src/mame/video/zerozone.c b/src/mame/video/zerozone.c
index 9423018300d..a242a072d22 100644
--- a/src/mame/video/zerozone.c
+++ b/src/mame/video/zerozone.c
@@ -4,7 +4,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/zerozone.h"
WRITE16_HANDLER( zerozone_tilemap_w )
diff --git a/src/mame/video/zodiack.c b/src/mame/video/zodiack.c
index 26986606e75..b9e1fe7a46c 100644
--- a/src/mame/video/zodiack.c
+++ b/src/mame/video/zodiack.c
@@ -6,7 +6,7 @@
***************************************************************************/
-#include "driver.h"
+#include "emu.h"
#include "includes/espial.h"
WRITE8_HANDLER( zodiack_videoram_w )
diff --git a/src/osd/osdmini/minimain.c b/src/osd/osdmini/minimain.c
index 69f7c841002..a68fbed958c 100644
--- a/src/osd/osdmini/minimain.c
+++ b/src/osd/osdmini/minimain.c
@@ -39,10 +39,10 @@
//
//============================================================
+#include "emu.h"
#include "osdepend.h"
#include "render.h"
#include "clifront.h"
-#include "mame.h"
//============================================================
diff --git a/src/osd/windows/d3d8intf.c b/src/osd/windows/d3d8intf.c
index a37d16c22c7..d91bb7c0864 100644
--- a/src/osd/windows/d3d8intf.c
+++ b/src/osd/windows/d3d8intf.c
@@ -45,7 +45,7 @@
#include <d3d8.h>
// MAME headers
-#include "driver.h"
+#include "emu.h"
// MAMEOS headers
#include "d3dintf.h"
diff --git a/src/osd/windows/d3d9intf.c b/src/osd/windows/d3d9intf.c
index c90234bddac..18bd41074d8 100644
--- a/src/osd/windows/d3d9intf.c
+++ b/src/osd/windows/d3d9intf.c
@@ -45,7 +45,7 @@
#include <d3d9.h>
// MAME headers
-#include "driver.h"
+#include "emu.h"
// MAMEOS headers
#include "d3dintf.h"
diff --git a/src/osd/windows/debugwin.c b/src/osd/windows/debugwin.c
index ccc183b190f..a1760ff7796 100644
--- a/src/osd/windows/debugwin.c
+++ b/src/osd/windows/debugwin.c
@@ -49,7 +49,7 @@
#endif
// MAME headers
-#include "driver.h"
+#include "emu.h"
#include "uiinput.h"
#include "debug/debugvw.h"
#include "debug/debugcon.h"
diff --git a/src/osd/windows/drawd3d.c b/src/osd/windows/drawd3d.c
index 5c2429d8eff..6be6c022b8e 100644
--- a/src/osd/windows/drawd3d.c
+++ b/src/osd/windows/drawd3d.c
@@ -54,9 +54,6 @@
#include <mmsystem.h>
#include <d3d9.h>
-// standard C headers
-#include <math.h>
-
// MAME headers
#include "emu.h"
#include "render.h"
diff --git a/src/osd/windows/drawdd.c b/src/osd/windows/drawdd.c
index 4a5b26d552e..afb7e7728f2 100644
--- a/src/osd/windows/drawdd.c
+++ b/src/osd/windows/drawdd.c
@@ -45,9 +45,6 @@
#include <mmsystem.h>
#include <ddraw.h>
-// standard C headers
-#include <math.h>
-
// MAME headers
#include "emu.h"
#include "render.h"
diff --git a/src/osd/windows/input.c b/src/osd/windows/input.c
index 09750a094ac..e3bd1807b4b 100644
--- a/src/osd/windows/input.c
+++ b/src/osd/windows/input.c
@@ -59,7 +59,7 @@
// MAME headers
#include "osdepend.h"
-#include "driver.h"
+#include "emu.h"
#include "ui.h"
// MAMEOS headers
diff --git a/src/osd/windows/output.c b/src/osd/windows/output.c
index 252a6ea43da..eb2e1b3635f 100644
--- a/src/osd/windows/output.c
+++ b/src/osd/windows/output.c
@@ -45,7 +45,7 @@
// MAME headers
#include "osdepend.h"
-#include "driver.h"
+#include "emu.h"
// MAMEOS headers
#include "output.h"
diff --git a/src/osd/windows/sound.c b/src/osd/windows/sound.c
index a94b936d801..87a72fbd2d0 100644
--- a/src/osd/windows/sound.c
+++ b/src/osd/windows/sound.c
@@ -49,7 +49,7 @@
#include <dsound.h>
// MAME headers
-#include "driver.h"
+#include "emu.h"
#include "osdepend.h"
#include "emuopts.h"
diff --git a/src/osd/windows/video.c b/src/osd/windows/video.c
index fb29b9faae7..db9cfb012e6 100644
--- a/src/osd/windows/video.c
+++ b/src/osd/windows/video.c
@@ -43,16 +43,13 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
-// standard C headers
-#include <math.h>
-
// Windows 95/NT4 multimonitor stubs
#ifdef WIN95_MULTIMON
#include "multidef.h"
#endif
// MAME headers
-#include "driver.h"
+#include "emu.h"
#include "emuopts.h"
#include "osdepend.h"
#include "video/vector.h"
diff --git a/src/osd/windows/window.c b/src/osd/windows/window.c
index 1ba7f905610..70dc43ee43d 100644
--- a/src/osd/windows/window.c
+++ b/src/osd/windows/window.c
@@ -52,11 +52,10 @@
#include <mmsystem.h>
// standard C headers
-#include <math.h>
#include <process.h>
// MAME headers
-#include "driver.h"
+#include "emu.h"
#include "emuopts.h"
#include "uiinput.h"
diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c
index 13299b979a1..d50442b5948 100644
--- a/src/osd/windows/winmain.c
+++ b/src/osd/windows/winmain.c
@@ -51,7 +51,7 @@
#include <stdarg.h>
// MAME headers
-#include "driver.h"
+#include "emu.h"
#include "clifront.h"
#include "emuopts.h"