summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers
diff options
context:
space:
mode:
authorGravatarGravatar Vas Crabb <vas@vastheman.com>2017-02-27 22:16:07 +1100
committerGravatarGravatar Vas Crabb <vas@vastheman.com>2017-02-27 22:57:14 +1100
commit6c23897483a0201dd0b65b450253fd9bf8fb8723 (patch)
tree62a083b4801f63b09bed57ae0c9e8f646aaa3200 /src/mame/drivers
parentb07c572f709e95dcd1e2e4b9d4c696e122f67655 (diff)
Self-registering devices prep:
* Make device_creator a variable template and get rid of the ampersands * Remove screen.h and speaker.h from emu.h and add where necessary * Centralise instantiations of screen and speaker finder templates * Add/standardise #include guards in many hearers * Remove many redundant #includes * Order #includesr to help catch headers that can't be #included alone (nw) This changes #include order to be prefix, unit header if applicable then other stuff roughly in order from most dependent to least dependent library. This helps catch headers that don't #include things that they use.
Diffstat (limited to 'src/mame/drivers')
-rw-r--r--src/mame/drivers/1942.cpp7
-rw-r--r--src/mame/drivers/1943.cpp5
-rw-r--r--src/mame/drivers/1945kiii.cpp2
-rw-r--r--src/mame/drivers/20pacgal.cpp2
-rw-r--r--src/mame/drivers/2mindril.cpp4
-rw-r--r--src/mame/drivers/30test.cpp2
-rw-r--r--src/mame/drivers/39in1.cpp2
-rw-r--r--src/mame/drivers/3do.cpp4
-rw-r--r--src/mame/drivers/3x3puzzl.cpp2
-rw-r--r--src/mame/drivers/4004clk.cpp2
-rw-r--r--src/mame/drivers/40love.cpp4
-rw-r--r--src/mame/drivers/4dpi.cpp1
-rw-r--r--src/mame/drivers/4enlinea.cpp23
-rw-r--r--src/mame/drivers/4enraya.cpp5
-rw-r--r--src/mame/drivers/4roses.cpp14
-rw-r--r--src/mame/drivers/5clown.cpp10
-rw-r--r--src/mame/drivers/8080bw.cpp6
-rw-r--r--src/mame/drivers/88games.cpp8
-rw-r--r--src/mame/drivers/a2600.cpp2
-rw-r--r--src/mame/drivers/a5105.cpp14
-rw-r--r--src/mame/drivers/a51xx.cpp2
-rw-r--r--src/mame/drivers/a6809.cpp2
-rw-r--r--src/mame/drivers/a7150.cpp1
-rw-r--r--src/mame/drivers/a7800.cpp2
-rw-r--r--src/mame/drivers/aa310.cpp4
-rw-r--r--src/mame/drivers/abc80.cpp2
-rw-r--r--src/mame/drivers/abc80x.cpp1
-rw-r--r--src/mame/drivers/ac1.cpp8
-rw-r--r--src/mame/drivers/ace.cpp1
-rw-r--r--src/mame/drivers/acefruit.cpp1
-rw-r--r--src/mame/drivers/aces1.cpp5
-rw-r--r--src/mame/drivers/acommand.cpp2
-rw-r--r--src/mame/drivers/acrnsys1.cpp2
-rw-r--r--src/mame/drivers/actfancr.cpp5
-rw-r--r--src/mame/drivers/adam.cpp2
-rw-r--r--src/mame/drivers/adp.cpp8
-rw-r--r--src/mame/drivers/advision.cpp4
-rw-r--r--src/mame/drivers/aeroboto.cpp6
-rw-r--r--src/mame/drivers/aerofgt.cpp5
-rw-r--r--src/mame/drivers/age_candy.cpp1
-rw-r--r--src/mame/drivers/aim65.cpp3
-rw-r--r--src/mame/drivers/airbustr.cpp5
-rw-r--r--src/mame/drivers/airraid.cpp23
-rw-r--r--src/mame/drivers/ajax.cpp7
-rw-r--r--src/mame/drivers/albazc.cpp2
-rw-r--r--src/mame/drivers/albazg.cpp2
-rw-r--r--src/mame/drivers/aleck64.cpp6
-rw-r--r--src/mame/drivers/aleisttl.cpp1
-rw-r--r--src/mame/drivers/alesis.cpp1
-rw-r--r--src/mame/drivers/alg.cpp5
-rw-r--r--src/mame/drivers/alien.cpp2
-rw-r--r--src/mame/drivers/aliens.cpp6
-rw-r--r--src/mame/drivers/alinvade.cpp4
-rw-r--r--src/mame/drivers/alpha68k.cpp4
-rw-r--r--src/mame/drivers/alphasma.cpp1
-rw-r--r--src/mame/drivers/alphatro.cpp10
-rw-r--r--src/mame/drivers/alto2.cpp5
-rw-r--r--src/mame/drivers/amaticmg.cpp16
-rw-r--r--src/mame/drivers/amazonlf.cpp1
-rw-r--r--src/mame/drivers/ambush.cpp2
-rw-r--r--src/mame/drivers/amerihok.cpp1
-rw-r--r--src/mame/drivers/amiga.cpp1
-rw-r--r--src/mame/drivers/ampoker2.cpp8
-rw-r--r--src/mame/drivers/amspdwy.cpp4
-rw-r--r--src/mame/drivers/amstrad.cpp1
-rw-r--r--src/mame/drivers/amusco.cpp27
-rw-r--r--src/mame/drivers/amust.cpp10
-rw-r--r--src/mame/drivers/angelkds.cpp8
-rw-r--r--src/mame/drivers/anzterm.cpp1
-rw-r--r--src/mame/drivers/apc.cpp10
-rw-r--r--src/mame/drivers/apexc.cpp7
-rw-r--r--src/mame/drivers/apf.cpp16
-rw-r--r--src/mame/drivers/apogee.cpp16
-rw-r--r--src/mame/drivers/apollo.cpp12
-rw-r--r--src/mame/drivers/apple1.cpp1
-rw-r--r--src/mame/drivers/apple2.cpp55
-rw-r--r--src/mame/drivers/apple2e.cpp29
-rw-r--r--src/mame/drivers/apple2gs.cpp22
-rw-r--r--src/mame/drivers/apple3.cpp5
-rw-r--r--src/mame/drivers/applix.cpp15
-rw-r--r--src/mame/drivers/appoooh.cpp5
-rw-r--r--src/mame/drivers/apricot.cpp22
-rw-r--r--src/mame/drivers/apricotf.cpp7
-rw-r--r--src/mame/drivers/apricotp.cpp6
-rw-r--r--src/mame/drivers/aquarium.cpp4
-rw-r--r--src/mame/drivers/aquarius.cpp3
-rw-r--r--src/mame/drivers/arabian.cpp8
-rw-r--r--src/mame/drivers/arachnid.cpp5
-rw-r--r--src/mame/drivers/arcadecl.cpp3
-rw-r--r--src/mame/drivers/arcadia.cpp1
-rw-r--r--src/mame/drivers/argo.cpp3
-rw-r--r--src/mame/drivers/argus.cpp4
-rw-r--r--src/mame/drivers/aristmk4.cpp2
-rw-r--r--src/mame/drivers/aristmk5.cpp6
-rw-r--r--src/mame/drivers/aristmk6.cpp1
-rw-r--r--src/mame/drivers/arkanoid.cpp3
-rw-r--r--src/mame/drivers/armedf.cpp3
-rw-r--r--src/mame/drivers/arsystems.cpp4
-rw-r--r--src/mame/drivers/artmagic.cpp10
-rw-r--r--src/mame/drivers/ashnojoe.cpp6
-rw-r--r--src/mame/drivers/asst128.cpp2
-rw-r--r--src/mame/drivers/asterix.cpp8
-rw-r--r--src/mame/drivers/asteroid.cpp14
-rw-r--r--src/mame/drivers/astinvad.cpp2
-rw-r--r--src/mame/drivers/astrcorp.cpp5
-rw-r--r--src/mame/drivers/astrocde.cpp5
-rw-r--r--src/mame/drivers/astrof.cpp2
-rw-r--r--src/mame/drivers/astrohome.cpp15
-rw-r--r--src/mame/drivers/asuka.cpp15
-rw-r--r--src/mame/drivers/at.cpp17
-rw-r--r--src/mame/drivers/atari400.cpp2
-rw-r--r--src/mame/drivers/atari_s1.cpp3
-rw-r--r--src/mame/drivers/atari_s2.cpp3
-rw-r--r--src/mame/drivers/atarifb.cpp3
-rw-r--r--src/mame/drivers/atarig1.cpp4
-rw-r--r--src/mame/drivers/atarig42.cpp4
-rw-r--r--src/mame/drivers/atarigx2.cpp4
-rw-r--r--src/mame/drivers/atarist.cpp2
-rw-r--r--src/mame/drivers/atarisy1.cpp3
-rw-r--r--src/mame/drivers/atarisy2.cpp1
-rw-r--r--src/mame/drivers/atarisy4.cpp1
-rw-r--r--src/mame/drivers/atarittl.cpp1
-rw-r--r--src/mame/drivers/atetris.cpp1
-rw-r--r--src/mame/drivers/atm.cpp6
-rw-r--r--src/mame/drivers/atom.cpp2
-rw-r--r--src/mame/drivers/atronic.cpp1
-rw-r--r--src/mame/drivers/attache.cpp17
-rw-r--r--src/mame/drivers/attckufo.cpp1
-rw-r--r--src/mame/drivers/atvtrack.cpp1
-rw-r--r--src/mame/drivers/aussiebyte.cpp3
-rw-r--r--src/mame/drivers/avalnche.cpp4
-rw-r--r--src/mame/drivers/avigo.cpp4
-rw-r--r--src/mame/drivers/avt.cpp12
-rw-r--r--src/mame/drivers/ax20.cpp3
-rw-r--r--src/mame/drivers/aztarac.cpp8
-rw-r--r--src/mame/drivers/b16.cpp3
-rw-r--r--src/mame/drivers/b2m.cpp2
-rw-r--r--src/mame/drivers/backfire.cpp4
-rw-r--r--src/mame/drivers/badlands.cpp3
-rw-r--r--src/mame/drivers/bagman.cpp5
-rw-r--r--src/mame/drivers/balsente.cpp4
-rw-r--r--src/mame/drivers/banctec.cpp3
-rw-r--r--src/mame/drivers/bankp.cpp5
-rw-r--r--src/mame/drivers/baraduke.cpp5
-rw-r--r--src/mame/drivers/barata.cpp8
-rw-r--r--src/mame/drivers/bartop52.cpp8
-rw-r--r--src/mame/drivers/batman.cpp3
-rw-r--r--src/mame/drivers/battlane.cpp6
-rw-r--r--src/mame/drivers/battlera.cpp3
-rw-r--r--src/mame/drivers/battlex.cpp5
-rw-r--r--src/mame/drivers/battlnts.cpp7
-rw-r--r--src/mame/drivers/bbc.cpp9
-rw-r--r--src/mame/drivers/bbusters.cpp7
-rw-r--r--src/mame/drivers/bcs3.cpp2
-rw-r--r--src/mame/drivers/beaminv.cpp2
-rw-r--r--src/mame/drivers/beathead.cpp1
-rw-r--r--src/mame/drivers/bebox.cpp1
-rw-r--r--src/mame/drivers/beehive.cpp1
-rw-r--r--src/mame/drivers/beezer.cpp2
-rw-r--r--src/mame/drivers/belatra.cpp1
-rw-r--r--src/mame/drivers/berzerk.cpp5
-rw-r--r--src/mame/drivers/bestleag.cpp2
-rw-r--r--src/mame/drivers/beta.cpp4
-rw-r--r--src/mame/drivers/bfcobra.cpp12
-rw-r--r--src/mame/drivers/bfm_ad5.cpp1
-rw-r--r--src/mame/drivers/bfm_sc1.cpp1
-rw-r--r--src/mame/drivers/bfm_sc2.cpp8
-rw-r--r--src/mame/drivers/bfm_sc4.cpp16
-rw-r--r--src/mame/drivers/bfm_sc5.cpp8
-rw-r--r--src/mame/drivers/bfm_swp.cpp2
-rw-r--r--src/mame/drivers/bfmsys83.cpp1
-rw-r--r--src/mame/drivers/bfmsys85.cpp1
-rw-r--r--src/mame/drivers/big10.cpp2
-rw-r--r--src/mame/drivers/bigbord2.cpp12
-rw-r--r--src/mame/drivers/bigevglf.cpp6
-rw-r--r--src/mame/drivers/bigstrkb.cpp5
-rw-r--r--src/mame/drivers/binbug.cpp5
-rw-r--r--src/mame/drivers/bingoc.cpp2
-rw-r--r--src/mame/drivers/bingoman.cpp2
-rw-r--r--src/mame/drivers/bingor.cpp2
-rw-r--r--src/mame/drivers/bionicc.cpp5
-rw-r--r--src/mame/drivers/bishi.cpp5
-rw-r--r--src/mame/drivers/bitgraph.cpp3
-rw-r--r--src/mame/drivers/bk.cpp10
-rw-r--r--src/mame/drivers/bking.cpp2
-rw-r--r--src/mame/drivers/blackt96.cpp2
-rw-r--r--src/mame/drivers/bladestl.cpp7
-rw-r--r--src/mame/drivers/blitz.cpp13
-rw-r--r--src/mame/drivers/blitz68k.cpp7
-rw-r--r--src/mame/drivers/blktiger.cpp7
-rw-r--r--src/mame/drivers/blmbycar.cpp5
-rw-r--r--src/mame/drivers/blockade.cpp5
-rw-r--r--src/mame/drivers/blockhl.cpp7
-rw-r--r--src/mame/drivers/blockout.cpp5
-rw-r--r--src/mame/drivers/bloodbro.cpp5
-rw-r--r--src/mame/drivers/blstroid.cpp6
-rw-r--r--src/mame/drivers/blueprnt.cpp7
-rw-r--r--src/mame/drivers/bmcbowl.cpp2
-rw-r--r--src/mame/drivers/bmcpokr.cpp2
-rw-r--r--src/mame/drivers/bmjr.cpp4
-rw-r--r--src/mame/drivers/bml3.cpp11
-rw-r--r--src/mame/drivers/bnstars.cpp7
-rw-r--r--src/mame/drivers/bntyhunt.cpp1
-rw-r--r--src/mame/drivers/bogeyman.cpp5
-rw-r--r--src/mame/drivers/bombjack.cpp5
-rw-r--r--src/mame/drivers/boogwing.cpp6
-rw-r--r--src/mame/drivers/bottom9.cpp7
-rw-r--r--src/mame/drivers/bowltry.cpp1
-rw-r--r--src/mame/drivers/boxer.cpp1
-rw-r--r--src/mame/drivers/br8641.cpp1
-rw-r--r--src/mame/drivers/brkthru.cpp5
-rw-r--r--src/mame/drivers/bsktball.cpp2
-rw-r--r--src/mame/drivers/btime.cpp4
-rw-r--r--src/mame/drivers/btoads.cpp2
-rw-r--r--src/mame/drivers/bublbobl.cpp7
-rw-r--r--src/mame/drivers/buggychl.cpp4
-rw-r--r--src/mame/drivers/busicom.cpp4
-rw-r--r--src/mame/drivers/buster.cpp2
-rw-r--r--src/mame/drivers/bw12.cpp2
-rw-r--r--src/mame/drivers/bw2.cpp1
-rw-r--r--src/mame/drivers/bwidow.cpp4
-rw-r--r--src/mame/drivers/bwing.cpp3
-rw-r--r--src/mame/drivers/by35.cpp8
-rw-r--r--src/mame/drivers/byvid.cpp3
-rw-r--r--src/mame/drivers/bzone.cpp5
-rw-r--r--src/mame/drivers/c10.cpp3
-rw-r--r--src/mame/drivers/c128.cpp2
-rw-r--r--src/mame/drivers/c64.cpp2
-rw-r--r--src/mame/drivers/c64dtv.cpp1
-rw-r--r--src/mame/drivers/c65.cpp2
-rw-r--r--src/mame/drivers/c80.cpp4
-rw-r--r--src/mame/drivers/cabal.cpp6
-rw-r--r--src/mame/drivers/cabaret.cpp2
-rw-r--r--src/mame/drivers/calchase.cpp2
-rw-r--r--src/mame/drivers/calomega.cpp20
-rw-r--r--src/mame/drivers/calorie.cpp2
-rw-r--r--src/mame/drivers/camplynx.cpp12
-rw-r--r--src/mame/drivers/canyon.cpp4
-rw-r--r--src/mame/drivers/capbowl.cpp4
-rw-r--r--src/mame/drivers/capr1.cpp1
-rw-r--r--src/mame/drivers/cardline.cpp3
-rw-r--r--src/mame/drivers/carjmbre.cpp4
-rw-r--r--src/mame/drivers/carpolo.cpp4
-rw-r--r--src/mame/drivers/carrera.cpp2
-rw-r--r--src/mame/drivers/casloopy.cpp3
-rw-r--r--src/mame/drivers/caswin.cpp2
-rw-r--r--src/mame/drivers/cat.cpp20
-rw-r--r--src/mame/drivers/cave.cpp7
-rw-r--r--src/mame/drivers/cavepc.cpp2
-rw-r--r--src/mame/drivers/cb2001.cpp4
-rw-r--r--src/mame/drivers/cball.cpp1
-rw-r--r--src/mame/drivers/cbasebal.cpp5
-rw-r--r--src/mame/drivers/cbm2.cpp2
-rw-r--r--src/mame/drivers/cbuster.cpp6
-rw-r--r--src/mame/drivers/cc40.cpp3
-rw-r--r--src/mame/drivers/ccastles.cpp4
-rw-r--r--src/mame/drivers/cchance.cpp6
-rw-r--r--src/mame/drivers/cchasm.cpp2
-rw-r--r--src/mame/drivers/cclimber.cpp7
-rw-r--r--src/mame/drivers/cd2650.cpp8
-rw-r--r--src/mame/drivers/cdc721.cpp6
-rw-r--r--src/mame/drivers/cdi.cpp18
-rw-r--r--src/mame/drivers/cedar_magnet.cpp3
-rw-r--r--src/mame/drivers/centiped.cpp4
-rw-r--r--src/mame/drivers/cesclass.cpp15
-rw-r--r--src/mame/drivers/cfx9850.cpp1
-rw-r--r--src/mame/drivers/cgc7900.cpp1
-rw-r--r--src/mame/drivers/cgenie.cpp3
-rw-r--r--src/mame/drivers/chaknpop.cpp6
-rw-r--r--src/mame/drivers/cham24.cpp2
-rw-r--r--src/mame/drivers/champbas.cpp2
-rw-r--r--src/mame/drivers/champbwl.cpp4
-rw-r--r--src/mame/drivers/chanbara.cpp2
-rw-r--r--src/mame/drivers/chance32.cpp2
-rw-r--r--src/mame/drivers/changela.cpp1
-rw-r--r--src/mame/drivers/channelf.cpp2
-rw-r--r--src/mame/drivers/cheekyms.cpp2
-rw-r--r--src/mame/drivers/chessmst.cpp12
-rw-r--r--src/mame/drivers/chexx.cpp5
-rw-r--r--src/mame/drivers/chihiro.cpp27
-rw-r--r--src/mame/drivers/chinagat.cpp11
-rw-r--r--src/mame/drivers/chinsan.cpp2
-rw-r--r--src/mame/drivers/chqflag.cpp7
-rw-r--r--src/mame/drivers/chsuper.cpp4
-rw-r--r--src/mame/drivers/cinemat.cpp1
-rw-r--r--src/mame/drivers/circus.cpp6
-rw-r--r--src/mame/drivers/circusc.cpp4
-rw-r--r--src/mame/drivers/cischeat.cpp4
-rw-r--r--src/mame/drivers/citycon.cpp5
-rw-r--r--src/mame/drivers/clayshoo.cpp1
-rw-r--r--src/mame/drivers/clcd.cpp4
-rw-r--r--src/mame/drivers/cliffhgr.cpp9
-rw-r--r--src/mame/drivers/cloak.cpp5
-rw-r--r--src/mame/drivers/cloud9.cpp4
-rw-r--r--src/mame/drivers/clowndwn.cpp1
-rw-r--r--src/mame/drivers/clshroad.cpp8
-rw-r--r--src/mame/drivers/cmi.cpp20
-rw-r--r--src/mame/drivers/cmmb.cpp1
-rw-r--r--src/mame/drivers/cninja.cpp4
-rw-r--r--src/mame/drivers/cntsteer.cpp2
-rw-r--r--src/mame/drivers/cobra.cpp5
-rw-r--r--src/mame/drivers/coco12.cpp15
-rw-r--r--src/mame/drivers/cocoloco.cpp16
-rw-r--r--src/mame/drivers/coinmstr.cpp11
-rw-r--r--src/mame/drivers/coinmvga.cpp14
-rw-r--r--src/mame/drivers/coleco.cpp2
-rw-r--r--src/mame/drivers/combatsc.cpp4
-rw-r--r--src/mame/drivers/comebaby.cpp1
-rw-r--r--src/mame/drivers/commando.cpp5
-rw-r--r--src/mame/drivers/compgolf.cpp3
-rw-r--r--src/mame/drivers/compucolor.cpp11
-rw-r--r--src/mame/drivers/comquest.cpp5
-rw-r--r--src/mame/drivers/comx35.cpp1
-rw-r--r--src/mame/drivers/concept.cpp5
-rw-r--r--src/mame/drivers/contra.cpp6
-rw-r--r--src/mame/drivers/coolpool.cpp3
-rw-r--r--src/mame/drivers/coolridr.cpp8
-rw-r--r--src/mame/drivers/cop01.cpp5
-rw-r--r--src/mame/drivers/cops.cpp2
-rw-r--r--src/mame/drivers/copsnrob.cpp5
-rw-r--r--src/mame/drivers/corona.cpp21
-rw-r--r--src/mame/drivers/cosmic.cpp2
-rw-r--r--src/mame/drivers/cosmicos.cpp4
-rw-r--r--src/mame/drivers/cps1.cpp4
-rw-r--r--src/mame/drivers/cps2.cpp1
-rw-r--r--src/mame/drivers/cps3.cpp2
-rw-r--r--src/mame/drivers/craft.cpp2
-rw-r--r--src/mame/drivers/crbaloon.cpp4
-rw-r--r--src/mame/drivers/crgolf.cpp5
-rw-r--r--src/mame/drivers/crimfght.cpp6
-rw-r--r--src/mame/drivers/crospang.cpp5
-rw-r--r--src/mame/drivers/crshrace.cpp6
-rw-r--r--src/mame/drivers/crvision.cpp3
-rw-r--r--src/mame/drivers/crystal.cpp8
-rw-r--r--src/mame/drivers/csplayh5.cpp1
-rw-r--r--src/mame/drivers/cswat.cpp4
-rw-r--r--src/mame/drivers/ct486.cpp15
-rw-r--r--src/mame/drivers/cubeqst.cpp1
-rw-r--r--src/mame/drivers/cubo.cpp1
-rw-r--r--src/mame/drivers/cultures.cpp4
-rw-r--r--src/mame/drivers/cupidon.cpp3
-rw-r--r--src/mame/drivers/cv1k.cpp10
-rw-r--r--src/mame/drivers/cvs.cpp1
-rw-r--r--src/mame/drivers/cxgz80.cpp1
-rw-r--r--src/mame/drivers/cxhumax.cpp3
-rw-r--r--src/mame/drivers/cyberbal.cpp3
-rw-r--r--src/mame/drivers/cybertnk.cpp4
-rw-r--r--src/mame/drivers/cybiko.cpp5
-rw-r--r--src/mame/drivers/cyclemb.cpp5
-rw-r--r--src/mame/drivers/d6800.cpp6
-rw-r--r--src/mame/drivers/d9final.cpp2
-rw-r--r--src/mame/drivers/dacholer.cpp2
-rw-r--r--src/mame/drivers/dai.cpp2
-rw-r--r--src/mame/drivers/dai3wksi.cpp6
-rw-r--r--src/mame/drivers/dambustr.cpp5
-rw-r--r--src/mame/drivers/darius.cpp10
-rw-r--r--src/mame/drivers/darkmist.cpp3
-rw-r--r--src/mame/drivers/darkseal.cpp6
-rw-r--r--src/mame/drivers/daruma.cpp3
-rw-r--r--src/mame/drivers/dassault.cpp6
-rw-r--r--src/mame/drivers/dblcrown.cpp2
-rw-r--r--src/mame/drivers/dblewing.cpp12
-rw-r--r--src/mame/drivers/dbz.cpp4
-rw-r--r--src/mame/drivers/dccons.cpp13
-rw-r--r--src/mame/drivers/dcheese.cpp6
-rw-r--r--src/mame/drivers/dcon.cpp5
-rw-r--r--src/mame/drivers/dct11em.cpp2
-rw-r--r--src/mame/drivers/dday.cpp4
-rw-r--r--src/mame/drivers/ddayjlc.cpp2
-rw-r--r--src/mame/drivers/ddealer.cpp2
-rw-r--r--src/mame/drivers/ddenlovr.cpp5
-rw-r--r--src/mame/drivers/ddragon.cpp7
-rw-r--r--src/mame/drivers/ddragon3.cpp5
-rw-r--r--src/mame/drivers/ddribble.cpp7
-rw-r--r--src/mame/drivers/de_2.cpp8
-rw-r--r--src/mame/drivers/deadang.cpp5
-rw-r--r--src/mame/drivers/dec0.cpp5
-rw-r--r--src/mame/drivers/dec8.cpp12
-rw-r--r--src/mame/drivers/deco156.cpp2
-rw-r--r--src/mame/drivers/deco32.cpp4
-rw-r--r--src/mame/drivers/deco_ld.cpp1
-rw-r--r--src/mame/drivers/deco_mlc.cpp4
-rw-r--r--src/mame/drivers/decocass.cpp6
-rw-r--r--src/mame/drivers/dectalk.cpp1
-rw-r--r--src/mame/drivers/decwritr.cpp4
-rw-r--r--src/mame/drivers/deniam.cpp5
-rw-r--r--src/mame/drivers/deshoros.cpp2
-rw-r--r--src/mame/drivers/destroyr.cpp1
-rw-r--r--src/mame/drivers/dfruit.cpp8
-rw-r--r--src/mame/drivers/dgn_beta.cpp9
-rw-r--r--src/mame/drivers/dgpix.cpp3
-rw-r--r--src/mame/drivers/didact.cpp10
-rw-r--r--src/mame/drivers/dietgo.cpp5
-rw-r--r--src/mame/drivers/digel804.cpp26
-rw-r--r--src/mame/drivers/dim68k.cpp6
-rw-r--r--src/mame/drivers/discoboy.cpp4
-rw-r--r--src/mame/drivers/divebomb.cpp2
-rw-r--r--src/mame/drivers/diverboy.cpp2
-rw-r--r--src/mame/drivers/djboy.cpp5
-rw-r--r--src/mame/drivers/djmain.cpp6
-rw-r--r--src/mame/drivers/dkong.cpp4
-rw-r--r--src/mame/drivers/dlair.cpp7
-rw-r--r--src/mame/drivers/dlair2.cpp2
-rw-r--r--src/mame/drivers/dm7000.cpp1
-rw-r--r--src/mame/drivers/dmndrby.cpp4
-rw-r--r--src/mame/drivers/dms5000.cpp1
-rw-r--r--src/mame/drivers/dmv.cpp14
-rw-r--r--src/mame/drivers/docastle.cpp5
-rw-r--r--src/mame/drivers/dogfgt.cpp4
-rw-r--r--src/mame/drivers/dolphunk.cpp4
-rw-r--r--src/mame/drivers/dominob.cpp2
-rw-r--r--src/mame/drivers/dooyong.cpp10
-rw-r--r--src/mame/drivers/dorachan.cpp1
-rw-r--r--src/mame/drivers/dotrikun.cpp1
-rw-r--r--src/mame/drivers/dragrace.cpp3
-rw-r--r--src/mame/drivers/dreambal.cpp8
-rw-r--r--src/mame/drivers/dreamwld.cpp2
-rw-r--r--src/mame/drivers/drgnmst.cpp5
-rw-r--r--src/mame/drivers/dribling.cpp4
-rw-r--r--src/mame/drivers/drmicro.cpp5
-rw-r--r--src/mame/drivers/drtomy.cpp2
-rw-r--r--src/mame/drivers/drw80pkr.cpp4
-rw-r--r--src/mame/drivers/dunhuang.cpp3
-rw-r--r--src/mame/drivers/dvk_kcgd.cpp2
-rw-r--r--src/mame/drivers/dvk_ksm.cpp2
-rw-r--r--src/mame/drivers/dwarfd.cpp4
-rw-r--r--src/mame/drivers/dynadice.cpp6
-rw-r--r--src/mame/drivers/dynax.cpp8
-rw-r--r--src/mame/drivers/dynduke.cpp5
-rw-r--r--src/mame/drivers/ec65.cpp1
-rw-r--r--src/mame/drivers/ecoinf3.cpp8
-rw-r--r--src/mame/drivers/egghunt.cpp2
-rw-r--r--src/mame/drivers/einstein.cpp8
-rw-r--r--src/mame/drivers/electron.cpp2
-rw-r--r--src/mame/drivers/elwro800.cpp5
-rw-r--r--src/mame/drivers/embargo.cpp1
-rw-r--r--src/mame/drivers/enigma2.cpp2
-rw-r--r--src/mame/drivers/enmirage.cpp1
-rw-r--r--src/mame/drivers/eolith.cpp6
-rw-r--r--src/mame/drivers/eolith16.cpp6
-rw-r--r--src/mame/drivers/ep64.cpp16
-rw-r--r--src/mame/drivers/epos.cpp6
-rw-r--r--src/mame/drivers/eprom.cpp4
-rw-r--r--src/mame/drivers/equites.cpp2
-rw-r--r--src/mame/drivers/ertictac.cpp1
-rw-r--r--src/mame/drivers/esd16.cpp9
-rw-r--r--src/mame/drivers/esh.cpp1
-rw-r--r--src/mame/drivers/espial.cpp4
-rw-r--r--src/mame/drivers/esq1.cpp6
-rw-r--r--src/mame/drivers/esq5505.cpp20
-rw-r--r--src/mame/drivers/esqasr.cpp9
-rw-r--r--src/mame/drivers/esqkt.cpp22
-rw-r--r--src/mame/drivers/esqmr.cpp11
-rw-r--r--src/mame/drivers/esripsys.cpp2
-rw-r--r--src/mame/drivers/et3400.cpp2
-rw-r--r--src/mame/drivers/eti660.cpp2
-rw-r--r--src/mame/drivers/ettrivia.cpp4
-rw-r--r--src/mame/drivers/excali64.cpp25
-rw-r--r--src/mame/drivers/exedexes.cpp5
-rw-r--r--src/mame/drivers/exelv.cpp12
-rw-r--r--src/mame/drivers/exerion.cpp4
-rw-r--r--src/mame/drivers/exp85.cpp2
-rw-r--r--src/mame/drivers/expro02.cpp6
-rw-r--r--src/mame/drivers/exprraid.cpp5
-rw-r--r--src/mame/drivers/exterm.cpp3
-rw-r--r--src/mame/drivers/exzisus.cpp7
-rw-r--r--src/mame/drivers/f-32.cpp3
-rw-r--r--src/mame/drivers/f1gp.cpp6
-rw-r--r--src/mame/drivers/famibox.cpp2
-rw-r--r--src/mame/drivers/fantland.cpp3
-rw-r--r--src/mame/drivers/fanucspmg.cpp11
-rw-r--r--src/mame/drivers/fastfred.cpp5
-rw-r--r--src/mame/drivers/fastinvaders.cpp7
-rw-r--r--src/mame/drivers/fastlane.cpp8
-rw-r--r--src/mame/drivers/fb01.cpp13
-rw-r--r--src/mame/drivers/fc100.cpp18
-rw-r--r--src/mame/drivers/fcombat.cpp5
-rw-r--r--src/mame/drivers/fcrash.cpp5
-rw-r--r--src/mame/drivers/feversoc.cpp2
-rw-r--r--src/mame/drivers/fidel6502.cpp2
-rw-r--r--src/mame/drivers/fidel68k.cpp2
-rw-r--r--src/mame/drivers/fidelz80.cpp2
-rw-r--r--src/mame/drivers/finalizr.cpp4
-rw-r--r--src/mame/drivers/fireball.cpp5
-rw-r--r--src/mame/drivers/firebeat.cpp13
-rw-r--r--src/mame/drivers/firefox.cpp1
-rw-r--r--src/mame/drivers/firetrap.cpp5
-rw-r--r--src/mame/drivers/firetrk.cpp3
-rw-r--r--src/mame/drivers/fitfight.cpp6
-rw-r--r--src/mame/drivers/fk1.cpp1
-rw-r--r--src/mame/drivers/flipjack.cpp3
-rw-r--r--src/mame/drivers/flkatck.cpp7
-rw-r--r--src/mame/drivers/flower.cpp1
-rw-r--r--src/mame/drivers/flstory.cpp6
-rw-r--r--src/mame/drivers/flyball.cpp1
-rw-r--r--src/mame/drivers/fm7.cpp14
-rw-r--r--src/mame/drivers/fmtowns.cpp4
-rw-r--r--src/mame/drivers/foodf.cpp3
-rw-r--r--src/mame/drivers/forte2.cpp2
-rw-r--r--src/mame/drivers/fortecar.cpp20
-rw-r--r--src/mame/drivers/fp1100.cpp2
-rw-r--r--src/mame/drivers/fp200.cpp2
-rw-r--r--src/mame/drivers/fp6000.cpp1
-rw-r--r--src/mame/drivers/freekick.cpp5
-rw-r--r--src/mame/drivers/fresh.cpp2
-rw-r--r--src/mame/drivers/fromanc2.cpp5
-rw-r--r--src/mame/drivers/fromance.cpp6
-rw-r--r--src/mame/drivers/funkball.cpp9
-rw-r--r--src/mame/drivers/funkybee.cpp5
-rw-r--r--src/mame/drivers/funkyjet.cpp5
-rw-r--r--src/mame/drivers/funtech.cpp4
-rw-r--r--src/mame/drivers/funworld.cpp14
-rw-r--r--src/mame/drivers/funybubl.cpp5
-rw-r--r--src/mame/drivers/fuukifg2.cpp4
-rw-r--r--src/mame/drivers/fuukifg3.cpp4
-rw-r--r--src/mame/drivers/g627.cpp5
-rw-r--r--src/mame/drivers/gaelco.cpp9
-rw-r--r--src/mame/drivers/gaelco2.cpp7
-rw-r--r--src/mame/drivers/gaelco3d.cpp9
-rw-r--r--src/mame/drivers/gaiden.cpp7
-rw-r--r--src/mame/drivers/gal3.cpp6
-rw-r--r--src/mame/drivers/galaga.cpp19
-rw-r--r--src/mame/drivers/galaxi.cpp9
-rw-r--r--src/mame/drivers/galaxia.cpp4
-rw-r--r--src/mame/drivers/galaxian.cpp3
-rw-r--r--src/mame/drivers/galaxold.cpp6
-rw-r--r--src/mame/drivers/galaxy.cpp14
-rw-r--r--src/mame/drivers/galeb.cpp4
-rw-r--r--src/mame/drivers/galgame.cpp1
-rw-r--r--src/mame/drivers/galgames.cpp12
-rw-r--r--src/mame/drivers/galivan.cpp3
-rw-r--r--src/mame/drivers/galpani2.cpp6
-rw-r--r--src/mame/drivers/galpani3.cpp8
-rw-r--r--src/mame/drivers/galpanic.cpp9
-rw-r--r--src/mame/drivers/galspnbl.cpp4
-rw-r--r--src/mame/drivers/gamate.cpp8
-rw-r--r--src/mame/drivers/gambl186.cpp5
-rw-r--r--src/mame/drivers/gamecom.cpp5
-rw-r--r--src/mame/drivers/gamecstl.cpp5
-rw-r--r--src/mame/drivers/gameking.cpp4
-rw-r--r--src/mame/drivers/gameplan.cpp4
-rw-r--r--src/mame/drivers/gamepock.cpp10
-rw-r--r--src/mame/drivers/gamtor.cpp4
-rw-r--r--src/mame/drivers/gaplus.cpp4
-rw-r--r--src/mame/drivers/gatron.cpp14
-rw-r--r--src/mame/drivers/gauntlet.cpp3
-rw-r--r--src/mame/drivers/gb.cpp2
-rw-r--r--src/mame/drivers/gba.cpp3
-rw-r--r--src/mame/drivers/gberet.cpp9
-rw-r--r--src/mame/drivers/gcpinbal.cpp5
-rw-r--r--src/mame/drivers/gei.cpp2
-rw-r--r--src/mame/drivers/geneve.cpp3
-rw-r--r--src/mame/drivers/geniusiq.cpp1
-rw-r--r--src/mame/drivers/ggconnie.cpp11
-rw-r--r--src/mame/drivers/ghosteo.cpp2
-rw-r--r--src/mame/drivers/gijoe.cpp7
-rw-r--r--src/mame/drivers/ginganin.cpp8
-rw-r--r--src/mame/drivers/gizmondo.cpp2
-rw-r--r--src/mame/drivers/gkigt.cpp5
-rw-r--r--src/mame/drivers/gladiatr.cpp3
-rw-r--r--src/mame/drivers/glasgow.cpp5
-rw-r--r--src/mame/drivers/glass.cpp6
-rw-r--r--src/mame/drivers/gluck2.cpp12
-rw-r--r--src/mame/drivers/gmaster.cpp8
-rw-r--r--src/mame/drivers/gng.cpp5
-rw-r--r--src/mame/drivers/go2000.cpp3
-rw-r--r--src/mame/drivers/goal92.cpp6
-rw-r--r--src/mame/drivers/goindol.cpp5
-rw-r--r--src/mame/drivers/goldngam.cpp10
-rw-r--r--src/mame/drivers/goldnpkr.cpp20
-rw-r--r--src/mame/drivers/goldstar.cpp10
-rw-r--r--src/mame/drivers/gomoku.cpp4
-rw-r--r--src/mame/drivers/good.cpp2
-rw-r--r--src/mame/drivers/goodejan.cpp5
-rw-r--r--src/mame/drivers/gotcha.cpp11
-rw-r--r--src/mame/drivers/gottlieb.cpp2
-rw-r--r--src/mame/drivers/gotya.cpp5
-rw-r--r--src/mame/drivers/goupil.cpp7
-rw-r--r--src/mame/drivers/gp2x.cpp2
-rw-r--r--src/mame/drivers/gp32.cpp5
-rw-r--r--src/mame/drivers/gp_1.cpp3
-rw-r--r--src/mame/drivers/gpworld.cpp1
-rw-r--r--src/mame/drivers/gradius3.cpp7
-rw-r--r--src/mame/drivers/grchamp.cpp4
-rw-r--r--src/mame/drivers/grfd2301.cpp3
-rw-r--r--src/mame/drivers/gridlee.cpp4
-rw-r--r--src/mame/drivers/groundfx.cpp6
-rw-r--r--src/mame/drivers/gstream.cpp2
-rw-r--r--src/mame/drivers/gstriker.cpp7
-rw-r--r--src/mame/drivers/gsword.cpp2
-rw-r--r--src/mame/drivers/gticlub.cpp3
-rw-r--r--src/mame/drivers/gts3a.cpp3
-rw-r--r--src/mame/drivers/gts80.cpp1
-rw-r--r--src/mame/drivers/gts80a.cpp3
-rw-r--r--src/mame/drivers/gts80b.cpp4
-rw-r--r--src/mame/drivers/guab.cpp14
-rw-r--r--src/mame/drivers/gumbo.cpp6
-rw-r--r--src/mame/drivers/gunbustr.cpp6
-rw-r--r--src/mame/drivers/gundealr.cpp6
-rw-r--r--src/mame/drivers/gunpey.cpp2
-rw-r--r--src/mame/drivers/gunsmoke.cpp5
-rw-r--r--src/mame/drivers/gyruss.cpp11
-rw-r--r--src/mame/drivers/h19.cpp7
-rw-r--r--src/mame/drivers/h8.cpp3
-rw-r--r--src/mame/drivers/halleys.cpp8
-rw-r--r--src/mame/drivers/hanaawas.cpp6
-rw-r--r--src/mame/drivers/hankin.cpp3
-rw-r--r--src/mame/drivers/hapyfish.cpp1
-rw-r--r--src/mame/drivers/harddriv.cpp33
-rw-r--r--src/mame/drivers/harriet.cpp3
-rw-r--r--src/mame/drivers/hazeltin.cpp4
-rw-r--r--src/mame/drivers/hcastle.cpp8
-rw-r--r--src/mame/drivers/headonb.cpp1
-rw-r--r--src/mame/drivers/hec2hrp.cpp15
-rw-r--r--src/mame/drivers/hexion.cpp8
-rw-r--r--src/mame/drivers/hh_amis2k.cpp3
-rw-r--r--src/mame/drivers/hh_cop400.cpp5
-rw-r--r--src/mame/drivers/hh_hmcs40.cpp6
-rw-r--r--src/mame/drivers/hh_melps4.cpp8
-rw-r--r--src/mame/drivers/hh_pic16.cpp3
-rw-r--r--src/mame/drivers/hh_sm510.cpp3
-rw-r--r--src/mame/drivers/hh_tms1k.cpp8
-rw-r--r--src/mame/drivers/hh_ucom4.cpp2
-rw-r--r--src/mame/drivers/hideseek.cpp14
-rw-r--r--src/mame/drivers/higemaru.cpp5
-rw-r--r--src/mame/drivers/highvdeo.cpp11
-rw-r--r--src/mame/drivers/hikaru.cpp2
-rw-r--r--src/mame/drivers/himesiki.cpp8
-rw-r--r--src/mame/drivers/hitme.cpp4
-rw-r--r--src/mame/drivers/hitpoker.cpp4
-rw-r--r--src/mame/drivers/hnayayoi.cpp5
-rw-r--r--src/mame/drivers/hng64.cpp7
-rw-r--r--src/mame/drivers/holeland.cpp7
-rw-r--r--src/mame/drivers/homedata.cpp4
-rw-r--r--src/mame/drivers/homelab.cpp2
-rw-r--r--src/mame/drivers/homerun.cpp4
-rw-r--r--src/mame/drivers/homez80.cpp1
-rw-r--r--src/mame/drivers/hornet.cpp2
-rw-r--r--src/mame/drivers/hotblock.cpp3
-rw-r--r--src/mame/drivers/hotstuff.cpp1
-rw-r--r--src/mame/drivers/hp16500.cpp4
-rw-r--r--src/mame/drivers/hp48.cpp4
-rw-r--r--src/mame/drivers/hp49gp.cpp1
-rw-r--r--src/mame/drivers/hp64k.cpp12
-rw-r--r--src/mame/drivers/hp9845.cpp9
-rw-r--r--src/mame/drivers/hp9k.cpp1
-rw-r--r--src/mame/drivers/hp9k_3xx.cpp1
-rw-r--r--src/mame/drivers/hprot1.cpp4
-rw-r--r--src/mame/drivers/huebler.cpp1
-rw-r--r--src/mame/drivers/hunter2.cpp13
-rw-r--r--src/mame/drivers/hvyunit.cpp4
-rw-r--r--src/mame/drivers/hx20.cpp2
-rw-r--r--src/mame/drivers/hyhoo.cpp2
-rw-r--r--src/mame/drivers/hyperscan.cpp1
-rw-r--r--src/mame/drivers/hyperspt.cpp8
-rw-r--r--src/mame/drivers/hyprduel.cpp8
-rw-r--r--src/mame/drivers/i7000.cpp9
-rw-r--r--src/mame/drivers/ibm3153.cpp2
-rw-r--r--src/mame/drivers/ibm6580.cpp2
-rw-r--r--src/mame/drivers/ibmpcjr.cpp30
-rw-r--r--src/mame/drivers/icatel.cpp6
-rw-r--r--src/mame/drivers/ice_bozopail.cpp1
-rw-r--r--src/mame/drivers/icecold.cpp3
-rw-r--r--src/mame/drivers/ichiban.cpp8
-rw-r--r--src/mame/drivers/idsa.cpp3
-rw-r--r--src/mame/drivers/ie15.cpp6
-rw-r--r--src/mame/drivers/if800.cpp1
-rw-r--r--src/mame/drivers/igs009.cpp3
-rw-r--r--src/mame/drivers/igs011.cpp2
-rw-r--r--src/mame/drivers/igs017.cpp5
-rw-r--r--src/mame/drivers/igs_fear.cpp2
-rw-r--r--src/mame/drivers/igs_m027.cpp1
-rw-r--r--src/mame/drivers/igs_m036.cpp1
-rw-r--r--src/mame/drivers/igspoker.cpp8
-rw-r--r--src/mame/drivers/ikki.cpp4
-rw-r--r--src/mame/drivers/imds2.cpp2
-rw-r--r--src/mame/drivers/imolagp.cpp2
-rw-r--r--src/mame/drivers/inder.cpp10
-rw-r--r--src/mame/drivers/indigo.cpp8
-rw-r--r--src/mame/drivers/indy_indigo2.cpp30
-rw-r--r--src/mame/drivers/instruct.cpp6
-rw-r--r--src/mame/drivers/interact.cpp12
-rw-r--r--src/mame/drivers/intrscti.cpp1
-rw-r--r--src/mame/drivers/intv.cpp7
-rw-r--r--src/mame/drivers/inufuku.cpp6
-rw-r--r--src/mame/drivers/invqix.cpp2
-rw-r--r--src/mame/drivers/ipds.cpp2
-rw-r--r--src/mame/drivers/iq151.cpp10
-rw-r--r--src/mame/drivers/iqblock.cpp5
-rw-r--r--src/mame/drivers/irisha.cpp8
-rw-r--r--src/mame/drivers/irobot.cpp3
-rw-r--r--src/mame/drivers/ironhors.cpp10
-rw-r--r--src/mame/drivers/istellar.cpp3
-rw-r--r--src/mame/drivers/istrebiteli.cpp4
-rw-r--r--src/mame/drivers/iteagle.cpp1
-rw-r--r--src/mame/drivers/itech32.cpp11
-rw-r--r--src/mame/drivers/itech8.cpp9
-rw-r--r--src/mame/drivers/itgambl2.cpp8
-rw-r--r--src/mame/drivers/itgambl3.cpp6
-rw-r--r--src/mame/drivers/itgamble.cpp12
-rw-r--r--src/mame/drivers/itt3030.cpp13
-rw-r--r--src/mame/drivers/jack.cpp5
-rw-r--r--src/mame/drivers/jackal.cpp7
-rw-r--r--src/mame/drivers/jackie.cpp2
-rw-r--r--src/mame/drivers/jackpool.cpp4
-rw-r--r--src/mame/drivers/jaguar.cpp3
-rw-r--r--src/mame/drivers/jailbrek.cpp8
-rw-r--r--src/mame/drivers/jalmah.cpp2
-rw-r--r--src/mame/drivers/jangou.cpp8
-rw-r--r--src/mame/drivers/jankenmn.cpp6
-rw-r--r--src/mame/drivers/jantotsu.cpp3
-rw-r--r--src/mame/drivers/jchan.cpp8
-rw-r--r--src/mame/drivers/jclub2.cpp5
-rw-r--r--src/mame/drivers/jeutel.cpp4
-rw-r--r--src/mame/drivers/joctronic.cpp4
-rw-r--r--src/mame/drivers/jokrwild.cpp5
-rw-r--r--src/mame/drivers/jollyjgr.cpp2
-rw-r--r--src/mame/drivers/jongkyo.cpp4
-rw-r--r--src/mame/drivers/jonos.cpp1
-rw-r--r--src/mame/drivers/joystand.cpp8
-rw-r--r--src/mame/drivers/jp.cpp4
-rw-r--r--src/mame/drivers/jpmimpct.cpp11
-rw-r--r--src/mame/drivers/jpmmps.cpp3
-rw-r--r--src/mame/drivers/jpms80.cpp2
-rw-r--r--src/mame/drivers/jpmsys5.cpp5
-rw-r--r--src/mame/drivers/jpmsys7.cpp8
-rw-r--r--src/mame/drivers/jr100.cpp10
-rw-r--r--src/mame/drivers/jr200.cpp2
-rw-r--r--src/mame/drivers/jrpacman.cpp5
-rw-r--r--src/mame/drivers/jtc.cpp6
-rw-r--r--src/mame/drivers/jubilee.cpp11
-rw-r--r--src/mame/drivers/juicebox.cpp3
-rw-r--r--src/mame/drivers/jungleyo.cpp2
-rw-r--r--src/mame/drivers/junofrst.cpp5
-rw-r--r--src/mame/drivers/jupace.cpp9
-rw-r--r--src/mame/drivers/jupiter.cpp7
-rw-r--r--src/mame/drivers/k28.cpp1
-rw-r--r--src/mame/drivers/k8915.cpp1
-rw-r--r--src/mame/drivers/kaneko16.cpp5
-rw-r--r--src/mame/drivers/kangaroo.cpp7
-rw-r--r--src/mame/drivers/karnov.cpp6
-rw-r--r--src/mame/drivers/kas89.cpp14
-rw-r--r--src/mame/drivers/kaypro.cpp3
-rw-r--r--src/mame/drivers/kc.cpp5
-rw-r--r--src/mame/drivers/kchamp.cpp3
-rw-r--r--src/mame/drivers/kickgoal.cpp6
-rw-r--r--src/mame/drivers/kingdrby.cpp10
-rw-r--r--src/mame/drivers/kingobox.cpp4
-rw-r--r--src/mame/drivers/kingpin.cpp5
-rw-r--r--src/mame/drivers/kinst.cpp6
-rw-r--r--src/mame/drivers/klax.cpp8
-rw-r--r--src/mame/drivers/kncljoe.cpp4
-rw-r--r--src/mame/drivers/koftball.cpp2
-rw-r--r--src/mame/drivers/koikoi.cpp2
-rw-r--r--src/mame/drivers/konamigq.cpp11
-rw-r--r--src/mame/drivers/konamigv.cpp13
-rw-r--r--src/mame/drivers/konamigx.cpp9
-rw-r--r--src/mame/drivers/konamim2.cpp1
-rw-r--r--src/mame/drivers/konendev.cpp6
-rw-r--r--src/mame/drivers/konmedal.cpp10
-rw-r--r--src/mame/drivers/kontest.cpp2
-rw-r--r--src/mame/drivers/kopunch.cpp4
-rw-r--r--src/mame/drivers/kramermc.cpp5
-rw-r--r--src/mame/drivers/kron.cpp1
-rw-r--r--src/mame/drivers/ksayakyu.cpp4
-rw-r--r--src/mame/drivers/ksys573.cpp3
-rw-r--r--src/mame/drivers/kungfur.cpp3
-rw-r--r--src/mame/drivers/kurukuru.cpp7
-rw-r--r--src/mame/drivers/kyocera.cpp1
-rw-r--r--src/mame/drivers/kyugo.cpp5
-rw-r--r--src/mame/drivers/labyrunr.cpp6
-rw-r--r--src/mame/drivers/ladybug.cpp5
-rw-r--r--src/mame/drivers/ladyfrog.cpp5
-rw-r--r--src/mame/drivers/laser3k.cpp4
-rw-r--r--src/mame/drivers/laserbas.cpp4
-rw-r--r--src/mame/drivers/laserbat.cpp3
-rw-r--r--src/mame/drivers/lasso.cpp3
-rw-r--r--src/mame/drivers/lastbank.cpp3
-rw-r--r--src/mame/drivers/lastduel.cpp5
-rw-r--r--src/mame/drivers/lastfght.cpp2
-rw-r--r--src/mame/drivers/laz_aftrshok.cpp1
-rw-r--r--src/mame/drivers/laz_awetoss.cpp1
-rw-r--r--src/mame/drivers/laz_ribrac.cpp1
-rw-r--r--src/mame/drivers/lazercmd.cpp2
-rw-r--r--src/mame/drivers/lbeach.cpp1
-rw-r--r--src/mame/drivers/lc80.cpp1
-rw-r--r--src/mame/drivers/lcmate2.cpp6
-rw-r--r--src/mame/drivers/ldplayer.cpp13
-rw-r--r--src/mame/drivers/leapster.cpp2
-rw-r--r--src/mame/drivers/legionna.cpp9
-rw-r--r--src/mame/drivers/leland.cpp1
-rw-r--r--src/mame/drivers/lemmings.cpp6
-rw-r--r--src/mame/drivers/lethal.cpp6
-rw-r--r--src/mame/drivers/lethalj.cpp3
-rw-r--r--src/mame/drivers/lgp.cpp3
-rw-r--r--src/mame/drivers/liberate.cpp6
-rw-r--r--src/mame/drivers/liberatr.cpp1
-rw-r--r--src/mame/drivers/limenko.cpp4
-rw-r--r--src/mame/drivers/lisa.cpp4
-rw-r--r--src/mame/drivers/littlerb.cpp7
-rw-r--r--src/mame/drivers/lkage.cpp8
-rw-r--r--src/mame/drivers/llc.cpp7
-rw-r--r--src/mame/drivers/lockon.cpp7
-rw-r--r--src/mame/drivers/lola8a.cpp7
-rw-r--r--src/mame/drivers/looping.cpp2
-rw-r--r--src/mame/drivers/lordgun.cpp4
-rw-r--r--src/mame/drivers/lsasquad.cpp9
-rw-r--r--src/mame/drivers/ltcasino.cpp2
-rw-r--r--src/mame/drivers/ltd.cpp4
-rw-r--r--src/mame/drivers/luckgrln.cpp3
-rw-r--r--src/mame/drivers/lucky74.cpp24
-rw-r--r--src/mame/drivers/lvcards.cpp7
-rw-r--r--src/mame/drivers/lviv.cpp15
-rw-r--r--src/mame/drivers/lwings.cpp5
-rw-r--r--src/mame/drivers/lynx.cpp7
-rw-r--r--src/mame/drivers/m10.cpp4
-rw-r--r--src/mame/drivers/m107.cpp7
-rw-r--r--src/mame/drivers/m14.cpp1
-rw-r--r--src/mame/drivers/m20.cpp23
-rw-r--r--src/mame/drivers/m5.cpp17
-rw-r--r--src/mame/drivers/m57.cpp7
-rw-r--r--src/mame/drivers/m62.cpp6
-rw-r--r--src/mame/drivers/m63.cpp2
-rw-r--r--src/mame/drivers/m72.cpp3
-rw-r--r--src/mame/drivers/m79152pc.cpp4
-rw-r--r--src/mame/drivers/m79amb.cpp4
-rw-r--r--src/mame/drivers/m90.cpp3
-rw-r--r--src/mame/drivers/m92.cpp6
-rw-r--r--src/mame/drivers/mac.cpp1
-rw-r--r--src/mame/drivers/mac128.cpp2
-rw-r--r--src/mame/drivers/macpci.cpp2
-rw-r--r--src/mame/drivers/macrossp.cpp5
-rw-r--r--src/mame/drivers/madalien.cpp5
-rw-r--r--src/mame/drivers/madmotor.cpp5
-rw-r--r--src/mame/drivers/magic10.cpp18
-rw-r--r--src/mame/drivers/magicard.cpp12
-rw-r--r--src/mame/drivers/magicfly.cpp8
-rw-r--r--src/mame/drivers/magictg.cpp6
-rw-r--r--src/mame/drivers/magmax.cpp6
-rw-r--r--src/mame/drivers/magnum.cpp4
-rw-r--r--src/mame/drivers/mainevt.cpp7
-rw-r--r--src/mame/drivers/mainsnk.cpp5
-rw-r--r--src/mame/drivers/majorpkr.cpp20
-rw-r--r--src/mame/drivers/malzak.cpp6
-rw-r--r--src/mame/drivers/manohman.cpp7
-rw-r--r--src/mame/drivers/mappy.cpp3
-rw-r--r--src/mame/drivers/marineb.cpp5
-rw-r--r--src/mame/drivers/mario.cpp4
-rw-r--r--src/mame/drivers/markham.cpp5
-rw-r--r--src/mame/drivers/marywu.cpp4
-rw-r--r--src/mame/drivers/mastboy.cpp2
-rw-r--r--src/mame/drivers/matmania.cpp1
-rw-r--r--src/mame/drivers/maxaflex.cpp5
-rw-r--r--src/mame/drivers/maygay1b.cpp1
-rw-r--r--src/mame/drivers/maygayep.cpp1
-rw-r--r--src/mame/drivers/maygayv1.cpp12
-rw-r--r--src/mame/drivers/mayumi.cpp7
-rw-r--r--src/mame/drivers/mazerbla.cpp2
-rw-r--r--src/mame/drivers/mbc200.cpp10
-rw-r--r--src/mame/drivers/mbc55x.cpp2
-rw-r--r--src/mame/drivers/mbee.cpp1
-rw-r--r--src/mame/drivers/mc10.cpp25
-rw-r--r--src/mame/drivers/mc1000.cpp15
-rw-r--r--src/mame/drivers/mc1502.cpp6
-rw-r--r--src/mame/drivers/mc80.cpp1
-rw-r--r--src/mame/drivers/mcatadv.cpp7
-rw-r--r--src/mame/drivers/mcr.cpp7
-rw-r--r--src/mame/drivers/mcr3.cpp11
-rw-r--r--src/mame/drivers/mcr68.cpp5
-rw-r--r--src/mame/drivers/meadows.cpp3
-rw-r--r--src/mame/drivers/mediagx.cpp2
-rw-r--r--src/mame/drivers/megasys1.cpp18
-rw-r--r--src/mame/drivers/megazone.cpp5
-rw-r--r--src/mame/drivers/meijinsn.cpp2
-rw-r--r--src/mame/drivers/mekd2.cpp6
-rw-r--r--src/mame/drivers/mephisto.cpp1
-rw-r--r--src/mame/drivers/mephistp.cpp1
-rw-r--r--src/mame/drivers/merit.cpp4
-rw-r--r--src/mame/drivers/meritm.cpp9
-rw-r--r--src/mame/drivers/mermaid.cpp5
-rw-r--r--src/mame/drivers/mes.cpp1
-rw-r--r--src/mame/drivers/metalmx.cpp3
-rw-r--r--src/mame/drivers/metlclsh.cpp5
-rw-r--r--src/mame/drivers/metlfrzr.cpp7
-rw-r--r--src/mame/drivers/metro.cpp6
-rw-r--r--src/mame/drivers/mexico86.cpp2
-rw-r--r--src/mame/drivers/meyc8080.cpp15
-rw-r--r--src/mame/drivers/meyc8088.cpp3
-rw-r--r--src/mame/drivers/mgames.cpp2
-rw-r--r--src/mame/drivers/mgavegas.cpp7
-rw-r--r--src/mame/drivers/mgolf.cpp1
-rw-r--r--src/mame/drivers/mhavoc.cpp6
-rw-r--r--src/mame/drivers/micral.cpp2
-rw-r--r--src/mame/drivers/micro3d.cpp10
-rw-r--r--src/mame/drivers/micronic.cpp4
-rw-r--r--src/mame/drivers/micropin.cpp6
-rw-r--r--src/mame/drivers/microtan.cpp9
-rw-r--r--src/mame/drivers/microvsn.cpp4
-rw-r--r--src/mame/drivers/midas.cpp7
-rw-r--r--src/mame/drivers/midtunit.cpp7
-rw-r--r--src/mame/drivers/midwunit.cpp8
-rw-r--r--src/mame/drivers/midxunit.cpp11
-rw-r--r--src/mame/drivers/midyunit.cpp5
-rw-r--r--src/mame/drivers/mikie.cpp8
-rw-r--r--src/mame/drivers/mikro80.cpp2
-rw-r--r--src/mame/drivers/mikrosha.cpp21
-rw-r--r--src/mame/drivers/mil4000.cpp15
-rw-r--r--src/mame/drivers/mini2440.cpp3
-rw-r--r--src/mame/drivers/miniboy7.cpp13
-rw-r--r--src/mame/drivers/minivadr.cpp1
-rw-r--r--src/mame/drivers/mirage.cpp2
-rw-r--r--src/mame/drivers/mirax.cpp2
-rw-r--r--src/mame/drivers/missb2.cpp7
-rw-r--r--src/mame/drivers/missile.cpp2
-rw-r--r--src/mame/drivers/mitchell.cpp5
-rw-r--r--src/mame/drivers/mjkjidai.cpp5
-rw-r--r--src/mame/drivers/mjsenpu.cpp4
-rw-r--r--src/mame/drivers/mjsister.cpp3
-rw-r--r--src/mame/drivers/mk14.cpp3
-rw-r--r--src/mame/drivers/mk2.cpp15
-rw-r--r--src/mame/drivers/mk85.cpp7
-rw-r--r--src/mame/drivers/mk90.cpp1
-rw-r--r--src/mame/drivers/mkit09.cpp4
-rw-r--r--src/mame/drivers/mlanding.cpp10
-rw-r--r--src/mame/drivers/mmagic.cpp1
-rw-r--r--src/mame/drivers/mmodular.cpp7
-rw-r--r--src/mame/drivers/model1.cpp7
-rw-r--r--src/mame/drivers/model2.cpp13
-rw-r--r--src/mame/drivers/model3.cpp5
-rw-r--r--src/mame/drivers/modellot.cpp2
-rw-r--r--src/mame/drivers/mogura.cpp6
-rw-r--r--src/mame/drivers/mole.cpp2
-rw-r--r--src/mame/drivers/molecular.cpp4
-rw-r--r--src/mame/drivers/momoko.cpp5
-rw-r--r--src/mame/drivers/monty.cpp4
-rw-r--r--src/mame/drivers/monzagp.cpp1
-rw-r--r--src/mame/drivers/moo.cpp6
-rw-r--r--src/mame/drivers/mosaic.cpp6
-rw-r--r--src/mame/drivers/mouser.cpp6
-rw-r--r--src/mame/drivers/mpf1.cpp2
-rw-r--r--src/mame/drivers/mpu12wbk.cpp12
-rw-r--r--src/mame/drivers/mpu4.cpp4
-rw-r--r--src/mame/drivers/mpu4dealem.cpp9
-rw-r--r--src/mame/drivers/mpu4plasma.cpp3
-rw-r--r--src/mame/drivers/mpu4vid.cpp27
-rw-r--r--src/mame/drivers/mpu5.cpp5
-rw-r--r--src/mame/drivers/mquake.cpp12
-rw-r--r--src/mame/drivers/mrdo.cpp5
-rw-r--r--src/mame/drivers/mrflea.cpp4
-rw-r--r--src/mame/drivers/mrgame.cpp4
-rw-r--r--src/mame/drivers/mrjong.cpp5
-rw-r--r--src/mame/drivers/ms0515.cpp7
-rw-r--r--src/mame/drivers/ms32.cpp6
-rw-r--r--src/mame/drivers/msisaac.cpp6
-rw-r--r--src/mame/drivers/mstation.cpp4
-rw-r--r--src/mame/drivers/msx.cpp2
-rw-r--r--src/mame/drivers/mtx.cpp10
-rw-r--r--src/mame/drivers/mugsmash.cpp6
-rw-r--r--src/mame/drivers/multfish.cpp3
-rw-r--r--src/mame/drivers/multi16.cpp3
-rw-r--r--src/mame/drivers/multi8.cpp8
-rw-r--r--src/mame/drivers/multigam.cpp2
-rw-r--r--src/mame/drivers/munchmo.cpp5
-rw-r--r--src/mame/drivers/murogem.cpp4
-rw-r--r--src/mame/drivers/murogmbl.cpp2
-rw-r--r--src/mame/drivers/mustache.cpp5
-rw-r--r--src/mame/drivers/mwarr.cpp3
-rw-r--r--src/mame/drivers/mx2178.cpp4
-rw-r--r--src/mame/drivers/myb3k.cpp3
-rw-r--r--src/mame/drivers/mycom.cpp12
-rw-r--r--src/mame/drivers/mystston.cpp4
-rw-r--r--src/mame/drivers/mystwarr.cpp8
-rw-r--r--src/mame/drivers/myvision.cpp7
-rw-r--r--src/mame/drivers/mz2000.cpp18
-rw-r--r--src/mame/drivers/mz2500.cpp10
-rw-r--r--src/mame/drivers/mz3500.cpp2
-rw-r--r--src/mame/drivers/mz6500.cpp1
-rw-r--r--src/mame/drivers/mz700.cpp15
-rw-r--r--src/mame/drivers/mz80.cpp4
-rw-r--r--src/mame/drivers/n64.cpp5
-rw-r--r--src/mame/drivers/nakajies.cpp4
-rw-r--r--src/mame/drivers/namcofl.cpp5
-rw-r--r--src/mame/drivers/namcona1.cpp3
-rw-r--r--src/mame/drivers/namconb1.cpp6
-rw-r--r--src/mame/drivers/namcond1.cpp10
-rw-r--r--src/mame/drivers/namcops2.cpp1
-rw-r--r--src/mame/drivers/namcos1.cpp3
-rw-r--r--src/mame/drivers/namcos10.cpp6
-rw-r--r--src/mame/drivers/namcos11.cpp4
-rw-r--r--src/mame/drivers/namcos12.cpp4
-rw-r--r--src/mame/drivers/namcos2.cpp6
-rw-r--r--src/mame/drivers/namcos21.cpp9
-rw-r--r--src/mame/drivers/namcos22.cpp3
-rw-r--r--src/mame/drivers/namcos23.cpp13
-rw-r--r--src/mame/drivers/namcos86.cpp6
-rw-r--r--src/mame/drivers/nanos.cpp12
-rw-r--r--src/mame/drivers/naomi.cpp3
-rw-r--r--src/mame/drivers/nascom1.cpp11
-rw-r--r--src/mame/drivers/naughtyb.cpp4
-rw-r--r--src/mame/drivers/nbmj8688.cpp4
-rw-r--r--src/mame/drivers/nbmj8891.cpp2
-rw-r--r--src/mame/drivers/nbmj8900.cpp2
-rw-r--r--src/mame/drivers/nbmj8991.cpp2
-rw-r--r--src/mame/drivers/nbmj9195.cpp2
-rw-r--r--src/mame/drivers/nc.cpp9
-rw-r--r--src/mame/drivers/nemesis.cpp6
-rw-r--r--src/mame/drivers/neogeo.cpp3
-rw-r--r--src/mame/drivers/neoprint.cpp4
-rw-r--r--src/mame/drivers/neptunp2.cpp2
-rw-r--r--src/mame/drivers/nes.cpp4
-rw-r--r--src/mame/drivers/newbrain.cpp3
-rw-r--r--src/mame/drivers/news.cpp5
-rw-r--r--src/mame/drivers/next.cpp8
-rw-r--r--src/mame/drivers/nexus3d.cpp4
-rw-r--r--src/mame/drivers/ngen.cpp20
-rw-r--r--src/mame/drivers/ngp.cpp2
-rw-r--r--src/mame/drivers/nibble.cpp7
-rw-r--r--src/mame/drivers/nightgal.cpp10
-rw-r--r--src/mame/drivers/ninjakd2.cpp7
-rw-r--r--src/mame/drivers/ninjaw.cpp9
-rw-r--r--src/mame/drivers/nitedrvr.cpp5
-rw-r--r--src/mame/drivers/niyanpai.cpp2
-rw-r--r--src/mame/drivers/nmg5.cpp7
-rw-r--r--src/mame/drivers/nmk16.cpp18
-rw-r--r--src/mame/drivers/nokia_3310.cpp3
-rw-r--r--src/mame/drivers/norautp.cpp20
-rw-r--r--src/mame/drivers/notetaker.cpp3
-rw-r--r--src/mame/drivers/nova2001.cpp6
-rw-r--r--src/mame/drivers/novag6502.cpp5
-rw-r--r--src/mame/drivers/novag68k.cpp3
-rw-r--r--src/mame/drivers/nsm.cpp2
-rw-r--r--src/mame/drivers/nsmpoker.cpp7
-rw-r--r--src/mame/drivers/nss.cpp4
-rw-r--r--src/mame/drivers/nwk-tr.cpp2
-rw-r--r--src/mame/drivers/nycaptor.cpp11
-rw-r--r--src/mame/drivers/nyny.cpp5
-rw-r--r--src/mame/drivers/octopus.cpp28
-rw-r--r--src/mame/drivers/odyssey2.cpp7
-rw-r--r--src/mame/drivers/offtwall.cpp4
-rw-r--r--src/mame/drivers/ohmygod.cpp5
-rw-r--r--src/mame/drivers/ojankohs.cpp6
-rw-r--r--src/mame/drivers/okean240.cpp2
-rw-r--r--src/mame/drivers/olibochu.cpp2
-rw-r--r--src/mame/drivers/omegrace.cpp2
-rw-r--r--src/mame/drivers/ondra.cpp8
-rw-r--r--src/mame/drivers/oneshot.cpp11
-rw-r--r--src/mame/drivers/onetwo.cpp4
-rw-r--r--src/mame/drivers/opwolf.cpp12
-rw-r--r--src/mame/drivers/orao.cpp12
-rw-r--r--src/mame/drivers/orbit.cpp4
-rw-r--r--src/mame/drivers/oric.cpp16
-rw-r--r--src/mame/drivers/orion.cpp7
-rw-r--r--src/mame/drivers/osbexec.cpp13
-rw-r--r--src/mame/drivers/osborne1.cpp9
-rw-r--r--src/mame/drivers/osi.cpp4
-rw-r--r--src/mame/drivers/othello.cpp6
-rw-r--r--src/mame/drivers/othunder.cpp11
-rw-r--r--src/mame/drivers/overdriv.cpp10
-rw-r--r--src/mame/drivers/p112.cpp1
-rw-r--r--src/mame/drivers/p2000t.cpp3
-rw-r--r--src/mame/drivers/p8k.cpp8
-rw-r--r--src/mame/drivers/pachifev.cpp3
-rw-r--r--src/mame/drivers/pacland.cpp4
-rw-r--r--src/mame/drivers/pacman.cpp11
-rw-r--r--src/mame/drivers/palm.cpp2
-rw-r--r--src/mame/drivers/palmz22.cpp1
-rw-r--r--src/mame/drivers/pandoras.cpp3
-rw-r--r--src/mame/drivers/pangofun.cpp1
-rw-r--r--src/mame/drivers/panicr.cpp7
-rw-r--r--src/mame/drivers/paradise.cpp5
-rw-r--r--src/mame/drivers/paranoia.cpp6
-rw-r--r--src/mame/drivers/parodius.cpp9
-rw-r--r--src/mame/drivers/partner.cpp17
-rw-r--r--src/mame/drivers/pasha2.cpp2
-rw-r--r--src/mame/drivers/paso1600.cpp8
-rw-r--r--src/mame/drivers/pasopia.cpp5
-rw-r--r--src/mame/drivers/pasopia7.cpp11
-rw-r--r--src/mame/drivers/pass.cpp7
-rw-r--r--src/mame/drivers/pastelg.cpp2
-rw-r--r--src/mame/drivers/pb1000.cpp10
-rw-r--r--src/mame/drivers/pbaction.cpp5
-rw-r--r--src/mame/drivers/pc100.cpp14
-rw-r--r--src/mame/drivers/pc1500.cpp2
-rw-r--r--src/mame/drivers/pc1512.cpp1
-rw-r--r--src/mame/drivers/pc2000.cpp31
-rw-r--r--src/mame/drivers/pc4.cpp6
-rw-r--r--src/mame/drivers/pc6001.cpp10
-rw-r--r--src/mame/drivers/pc8001.cpp2
-rw-r--r--src/mame/drivers/pc8801.cpp9
-rw-r--r--src/mame/drivers/pc88va.cpp12
-rw-r--r--src/mame/drivers/pc9801.cpp41
-rw-r--r--src/mame/drivers/pcat_dyn.cpp11
-rw-r--r--src/mame/drivers/pcd.cpp47
-rw-r--r--src/mame/drivers/pce.cpp9
-rw-r--r--src/mame/drivers/pce220.cpp8
-rw-r--r--src/mame/drivers/pcfx.cpp1
-rw-r--r--src/mame/drivers/pcktgal.cpp6
-rw-r--r--src/mame/drivers/pcm.cpp15
-rw-r--r--src/mame/drivers/pcw.cpp7
-rw-r--r--src/mame/drivers/pcw16.cpp2
-rw-r--r--src/mame/drivers/pcxt.cpp4
-rw-r--r--src/mame/drivers/pda600.cpp1
-rw-r--r--src/mame/drivers/pdp1.cpp13
-rw-r--r--src/mame/drivers/pecom.cpp8
-rw-r--r--src/mame/drivers/pegasus.cpp8
-rw-r--r--src/mame/drivers/pencil2.cpp10
-rw-r--r--src/mame/drivers/pengadvb.cpp2
-rw-r--r--src/mame/drivers/pengo.cpp5
-rw-r--r--src/mame/drivers/pentagon.cpp15
-rw-r--r--src/mame/drivers/peoplepc.cpp1
-rw-r--r--src/mame/drivers/peplus.cpp7
-rw-r--r--src/mame/drivers/pes.cpp13
-rw-r--r--src/mame/drivers/pet.cpp4
-rw-r--r--src/mame/drivers/peyper.cpp3
-rw-r--r--src/mame/drivers/pg685.cpp9
-rw-r--r--src/mame/drivers/pgm.cpp9
-rw-r--r--src/mame/drivers/pgm2.cpp2
-rw-r--r--src/mame/drivers/pgm3.cpp1
-rw-r--r--src/mame/drivers/phc25.cpp3
-rw-r--r--src/mame/drivers/phoenix.cpp5
-rw-r--r--src/mame/drivers/photon.cpp7
-rw-r--r--src/mame/drivers/photon2.cpp4
-rw-r--r--src/mame/drivers/phunsy.cpp8
-rw-r--r--src/mame/drivers/piggypas.cpp3
-rw-r--r--src/mame/drivers/pinball2k.cpp7
-rw-r--r--src/mame/drivers/pingpong.cpp5
-rw-r--r--src/mame/drivers/pinkiri8.cpp4
-rw-r--r--src/mame/drivers/pipedrm.cpp4
-rw-r--r--src/mame/drivers/pipeline.cpp7
-rw-r--r--src/mame/drivers/pirates.cpp5
-rw-r--r--src/mame/drivers/pitagjr.cpp11
-rw-r--r--src/mame/drivers/pitnrun.cpp3
-rw-r--r--src/mame/drivers/pk8000.cpp11
-rw-r--r--src/mame/drivers/pk8020.cpp5
-rw-r--r--src/mame/drivers/pkscram.cpp4
-rw-r--r--src/mame/drivers/pktgaldx.cpp6
-rw-r--r--src/mame/drivers/plan80.cpp1
-rw-r--r--src/mame/drivers/play_1.cpp7
-rw-r--r--src/mame/drivers/play_2.cpp8
-rw-r--r--src/mame/drivers/play_3.cpp6
-rw-r--r--src/mame/drivers/playch10.cpp5
-rw-r--r--src/mame/drivers/playmark.cpp11
-rw-r--r--src/mame/drivers/plus4.cpp2
-rw-r--r--src/mame/drivers/pluto5.cpp1
-rw-r--r--src/mame/drivers/plygonet.cpp7
-rw-r--r--src/mame/drivers/pmd85.cpp14
-rw-r--r--src/mame/drivers/pntnpuzl.cpp3
-rw-r--r--src/mame/drivers/pockchal.cpp8
-rw-r--r--src/mame/drivers/pocketc.cpp7
-rw-r--r--src/mame/drivers/pockstat.cpp2
-rw-r--r--src/mame/drivers/pofo.cpp8
-rw-r--r--src/mame/drivers/poisk1.cpp15
-rw-r--r--src/mame/drivers/pokechmp.cpp7
-rw-r--r--src/mame/drivers/pokemini.cpp6
-rw-r--r--src/mame/drivers/poker72.cpp2
-rw-r--r--src/mame/drivers/polepos.cpp12
-rw-r--r--src/mame/drivers/policetr.cpp4
-rw-r--r--src/mame/drivers/poly.cpp7
-rw-r--r--src/mame/drivers/poly88.cpp6
-rw-r--r--src/mame/drivers/polyplay.cpp8
-rw-r--r--src/mame/drivers/pong.cpp3
-rw-r--r--src/mame/drivers/poolshrk.cpp5
-rw-r--r--src/mame/drivers/pooyan.cpp8
-rw-r--r--src/mame/drivers/popeye.cpp9
-rw-r--r--src/mame/drivers/popobear.cpp2
-rw-r--r--src/mame/drivers/portrait.cpp6
-rw-r--r--src/mame/drivers/potgoldu.cpp1
-rw-r--r--src/mame/drivers/powerbal.cpp11
-rw-r--r--src/mame/drivers/powerins.cpp4
-rw-r--r--src/mame/drivers/pp01.cpp4
-rw-r--r--src/mame/drivers/ppmast93.cpp2
-rw-r--r--src/mame/drivers/prehisle.cpp6
-rw-r--r--src/mame/drivers/prestige.cpp8
-rw-r--r--src/mame/drivers/primo.cpp11
-rw-r--r--src/mame/drivers/pro80.cpp5
-rw-r--r--src/mame/drivers/proconn.cpp10
-rw-r--r--src/mame/drivers/prof180x.cpp5
-rw-r--r--src/mame/drivers/progolf.cpp3
-rw-r--r--src/mame/drivers/proteus3.cpp7
-rw-r--r--src/mame/drivers/psikyo.cpp4
-rw-r--r--src/mame/drivers/psikyo4.cpp3
-rw-r--r--src/mame/drivers/psikyosh.cpp3
-rw-r--r--src/mame/drivers/psion.cpp4
-rw-r--r--src/mame/drivers/psx.cpp15
-rw-r--r--src/mame/drivers/psychic5.cpp5
-rw-r--r--src/mame/drivers/pt68k4.cpp14
-rw-r--r--src/mame/drivers/ptcsol.cpp14
-rw-r--r--src/mame/drivers/pturn.cpp2
-rw-r--r--src/mame/drivers/punchout.cpp5
-rw-r--r--src/mame/drivers/pv1000.cpp6
-rw-r--r--src/mame/drivers/pv2000.cpp2
-rw-r--r--src/mame/drivers/pv9234.cpp1
-rw-r--r--src/mame/drivers/pve500.cpp10
-rw-r--r--src/mame/drivers/px4.cpp22
-rw-r--r--src/mame/drivers/px8.cpp5
-rw-r--r--src/mame/drivers/pyl601.cpp14
-rw-r--r--src/mame/drivers/pyson.cpp1
-rw-r--r--src/mame/drivers/pzletime.cpp3
-rw-r--r--src/mame/drivers/qdrmfgp.cpp7
-rw-r--r--src/mame/drivers/ql.cpp9
-rw-r--r--src/mame/drivers/quakeat.cpp1
-rw-r--r--src/mame/drivers/quantum.cpp2
-rw-r--r--src/mame/drivers/quasar.cpp1
-rw-r--r--src/mame/drivers/quizdna.cpp5
-rw-r--r--src/mame/drivers/quizo.cpp2
-rw-r--r--src/mame/drivers/quizpani.cpp6
-rw-r--r--src/mame/drivers/quizpun2.cpp3
-rw-r--r--src/mame/drivers/quizshow.cpp2
-rw-r--r--src/mame/drivers/qx10.cpp18
-rw-r--r--src/mame/drivers/r2dtank.cpp12
-rw-r--r--src/mame/drivers/r2dx_v33.cpp6
-rw-r--r--src/mame/drivers/rabbit.cpp2
-rw-r--r--src/mame/drivers/radio86.cpp14
-rw-r--r--src/mame/drivers/raiden.cpp5
-rw-r--r--src/mame/drivers/raiden2.cpp11
-rw-r--r--src/mame/drivers/rainbow.cpp63
-rw-r--r--src/mame/drivers/rallyx.cpp5
-rw-r--r--src/mame/drivers/rampart.cpp4
-rw-r--r--src/mame/drivers/rastan.cpp14
-rw-r--r--src/mame/drivers/rastersp.cpp2
-rw-r--r--src/mame/drivers/ravens.cpp4
-rw-r--r--src/mame/drivers/rbisland.cpp10
-rw-r--r--src/mame/drivers/rbmk.cpp6
-rw-r--r--src/mame/drivers/rc702.cpp18
-rw-r--r--src/mame/drivers/rc759.cpp21
-rw-r--r--src/mame/drivers/rcorsair.cpp1
-rw-r--r--src/mame/drivers/rd100.cpp1
-rw-r--r--src/mame/drivers/rd110.cpp5
-rw-r--r--src/mame/drivers/re900.cpp18
-rw-r--r--src/mame/drivers/realbrk.cpp4
-rw-r--r--src/mame/drivers/redclash.cpp5
-rw-r--r--src/mame/drivers/relief.cpp4
-rw-r--r--src/mame/drivers/renegade.cpp5
-rw-r--r--src/mame/drivers/replicator.cpp4
-rw-r--r--src/mame/drivers/retofinv.cpp2
-rw-r--r--src/mame/drivers/rex6000.cpp3
-rw-r--r--src/mame/drivers/rgum.cpp6
-rw-r--r--src/mame/drivers/risc2500.cpp2
-rw-r--r--src/mame/drivers/riscpc.cpp2
-rw-r--r--src/mame/drivers/rltennis.cpp4
-rw-r--r--src/mame/drivers/rm380z.cpp3
-rw-r--r--src/mame/drivers/rmhaihai.cpp2
-rw-r--r--src/mame/drivers/rmnimbus.cpp16
-rw-r--r--src/mame/drivers/rmt32.cpp3
-rw-r--r--src/mame/drivers/rockrage.cpp7
-rw-r--r--src/mame/drivers/rocnrope.cpp8
-rw-r--r--src/mame/drivers/rohga.cpp6
-rw-r--r--src/mame/drivers/rollerg.cpp7
-rw-r--r--src/mame/drivers/rollrace.cpp5
-rw-r--r--src/mame/drivers/rotaryf.cpp8
-rw-r--r--src/mame/drivers/roul.cpp5
-rw-r--r--src/mame/drivers/route16.cpp6
-rw-r--r--src/mame/drivers/rowamet.cpp6
-rw-r--r--src/mame/drivers/royalmah.cpp2
-rw-r--r--src/mame/drivers/rpunch.cpp6
-rw-r--r--src/mame/drivers/rt1715.cpp5
-rw-r--r--src/mame/drivers/runaway.cpp4
-rw-r--r--src/mame/drivers/rungun.cpp7
-rw-r--r--src/mame/drivers/rx78.cpp2
-rw-r--r--src/mame/drivers/s11.cpp4
-rw-r--r--src/mame/drivers/s11a.cpp4
-rw-r--r--src/mame/drivers/s11b.cpp4
-rw-r--r--src/mame/drivers/s11c.cpp3
-rw-r--r--src/mame/drivers/s3.cpp6
-rw-r--r--src/mame/drivers/s4.cpp5
-rw-r--r--src/mame/drivers/s6.cpp5
-rw-r--r--src/mame/drivers/s6a.cpp5
-rw-r--r--src/mame/drivers/s7.cpp6
-rw-r--r--src/mame/drivers/s8.cpp6
-rw-r--r--src/mame/drivers/s8a.cpp6
-rw-r--r--src/mame/drivers/s9.cpp4
-rw-r--r--src/mame/drivers/safarir.cpp2
-rw-r--r--src/mame/drivers/samcoupe.cpp9
-rw-r--r--src/mame/drivers/sandscrp.cpp2
-rw-r--r--src/mame/drivers/sangho.cpp2
-rw-r--r--src/mame/drivers/sanremmg.cpp1
-rw-r--r--src/mame/drivers/sanremo.cpp17
-rw-r--r--src/mame/drivers/sapi1.cpp5
-rw-r--r--src/mame/drivers/saturn.cpp38
-rw-r--r--src/mame/drivers/sauro.cpp7
-rw-r--r--src/mame/drivers/sbasketb.cpp4
-rw-r--r--src/mame/drivers/sbc6510.cpp5
-rw-r--r--src/mame/drivers/sbowling.cpp4
-rw-r--r--src/mame/drivers/sbrain.cpp7
-rw-r--r--src/mame/drivers/sbrkout.cpp2
-rw-r--r--src/mame/drivers/sbugger.cpp5
-rw-r--r--src/mame/drivers/sc1.cpp10
-rw-r--r--src/mame/drivers/sc2.cpp4
-rw-r--r--src/mame/drivers/scobra.cpp4
-rw-r--r--src/mame/drivers/scorpion.cpp9
-rw-r--r--src/mame/drivers/scotrsht.cpp8
-rw-r--r--src/mame/drivers/scramble.cpp11
-rw-r--r--src/mame/drivers/scregg.cpp5
-rw-r--r--src/mame/drivers/scv.cpp2
-rw-r--r--src/mame/drivers/sderby.cpp10
-rw-r--r--src/mame/drivers/seabattl.cpp3
-rw-r--r--src/mame/drivers/sealy.cpp8
-rw-r--r--src/mame/drivers/seattle.cpp10
-rw-r--r--src/mame/drivers/segac2.cpp7
-rw-r--r--src/mame/drivers/segae.cpp6
-rw-r--r--src/mame/drivers/segag80r.cpp6
-rw-r--r--src/mame/drivers/segag80v.cpp6
-rw-r--r--src/mame/drivers/segahang.cpp4
-rw-r--r--src/mame/drivers/segajw.cpp2
-rw-r--r--src/mame/drivers/segald.cpp1
-rw-r--r--src/mame/drivers/segam1.cpp8
-rw-r--r--src/mame/drivers/segaorun.cpp4
-rw-r--r--src/mame/drivers/segapm.cpp1
-rw-r--r--src/mame/drivers/segas16a.cpp3
-rw-r--r--src/mame/drivers/segas16b.cpp5
-rw-r--r--src/mame/drivers/segas18.cpp6
-rw-r--r--src/mame/drivers/segas24.cpp3
-rw-r--r--src/mame/drivers/segas32.cpp16
-rw-r--r--src/mame/drivers/segaufo.cpp1
-rw-r--r--src/mame/drivers/segaxbd.cpp21
-rw-r--r--src/mame/drivers/segaybd.cpp6
-rw-r--r--src/mame/drivers/seibuspi.cpp13
-rw-r--r--src/mame/drivers/seicross.cpp4
-rw-r--r--src/mame/drivers/seicupbl.cpp7
-rw-r--r--src/mame/drivers/sengokmj.cpp7
-rw-r--r--src/mame/drivers/senjyo.cpp4
-rw-r--r--src/mame/drivers/seta.cpp15
-rw-r--r--src/mame/drivers/seta2.cpp9
-rw-r--r--src/mame/drivers/sf.cpp5
-rw-r--r--src/mame/drivers/sfbonus.cpp5
-rw-r--r--src/mame/drivers/sfcbox.cpp15
-rw-r--r--src/mame/drivers/sfkick.cpp2
-rw-r--r--src/mame/drivers/sg1000.cpp1
-rw-r--r--src/mame/drivers/sg1000a.cpp1
-rw-r--r--src/mame/drivers/shadfrce.cpp6
-rw-r--r--src/mame/drivers/shangha3.cpp4
-rw-r--r--src/mame/drivers/shanghai.cpp5
-rw-r--r--src/mame/drivers/shangkid.cpp4
-rw-r--r--src/mame/drivers/shaolins.cpp6
-rw-r--r--src/mame/drivers/shisen.cpp4
-rw-r--r--src/mame/drivers/shootout.cpp5
-rw-r--r--src/mame/drivers/shougi.cpp2
-rw-r--r--src/mame/drivers/shtzone.cpp1
-rw-r--r--src/mame/drivers/shuuz.cpp4
-rw-r--r--src/mame/drivers/sidearms.cpp5
-rw-r--r--src/mame/drivers/sidepckt.cpp6
-rw-r--r--src/mame/drivers/sigmab52.cpp12
-rw-r--r--src/mame/drivers/sigmab98.cpp9
-rw-r--r--src/mame/drivers/silkroad.cpp7
-rw-r--r--src/mame/drivers/silvmil.cpp4
-rw-r--r--src/mame/drivers/simpl156.cpp6
-rw-r--r--src/mame/drivers/simpsons.cpp7
-rw-r--r--src/mame/drivers/skeetsht.cpp2
-rw-r--r--src/mame/drivers/skimaxx.cpp2
-rw-r--r--src/mame/drivers/skullxbo.cpp4
-rw-r--r--src/mame/drivers/skyarmy.cpp4
-rw-r--r--src/mame/drivers/skydiver.cpp5
-rw-r--r--src/mame/drivers/skyfox.cpp4
-rw-r--r--src/mame/drivers/skykid.cpp5
-rw-r--r--src/mame/drivers/skylncr.cpp12
-rw-r--r--src/mame/drivers/skyraid.cpp5
-rw-r--r--src/mame/drivers/slapfght.cpp4
-rw-r--r--src/mame/drivers/slapshot.cpp11
-rw-r--r--src/mame/drivers/slc1.cpp4
-rw-r--r--src/mame/drivers/sliver.cpp7
-rw-r--r--src/mame/drivers/slotcarn.cpp5
-rw-r--r--src/mame/drivers/sm1800.cpp13
-rw-r--r--src/mame/drivers/sm7238.cpp1
-rw-r--r--src/mame/drivers/smc777.cpp9
-rw-r--r--src/mame/drivers/sms.cpp8
-rw-r--r--src/mame/drivers/sms_bootleg.cpp7
-rw-r--r--src/mame/drivers/smsmcorp.cpp4
-rw-r--r--src/mame/drivers/snes.cpp6
-rw-r--r--src/mame/drivers/snesb.cpp1
-rw-r--r--src/mame/drivers/snk.cpp4
-rw-r--r--src/mame/drivers/snk6502.cpp7
-rw-r--r--src/mame/drivers/snk68.cpp5
-rw-r--r--src/mame/drivers/snookr10.cpp12
-rw-r--r--src/mame/drivers/snowbros.cpp8
-rw-r--r--src/mame/drivers/socrates.cpp9
-rw-r--r--src/mame/drivers/solomon.cpp6
-rw-r--r--src/mame/drivers/sonson.cpp5
-rw-r--r--src/mame/drivers/sorcerer.cpp3
-rw-r--r--src/mame/drivers/sothello.cpp3
-rw-r--r--src/mame/drivers/spaceg.cpp2
-rw-r--r--src/mame/drivers/spartanxtec.cpp6
-rw-r--r--src/mame/drivers/spbactn.cpp8
-rw-r--r--src/mame/drivers/spc1000.cpp10
-rw-r--r--src/mame/drivers/spc1500.cpp14
-rw-r--r--src/mame/drivers/spcforce.cpp6
-rw-r--r--src/mame/drivers/spdodgeb.cpp4
-rw-r--r--src/mame/drivers/spec128.cpp11
-rw-r--r--src/mame/drivers/special.cpp4
-rw-r--r--src/mame/drivers/specpls3.cpp10
-rw-r--r--src/mame/drivers/spectra.cpp3
-rw-r--r--src/mame/drivers/spectrum.cpp10
-rw-r--r--src/mame/drivers/speedatk.cpp6
-rw-r--r--src/mame/drivers/speedbal.cpp6
-rw-r--r--src/mame/drivers/speedspn.cpp6
-rw-r--r--src/mame/drivers/spiders.cpp8
-rw-r--r--src/mame/drivers/spinb.cpp11
-rw-r--r--src/mame/drivers/splash.cpp5
-rw-r--r--src/mame/drivers/splus.cpp8
-rw-r--r--src/mame/drivers/spoker.cpp2
-rw-r--r--src/mame/drivers/spool99.cpp5
-rw-r--r--src/mame/drivers/sprcros2.cpp2
-rw-r--r--src/mame/drivers/sprint2.cpp4
-rw-r--r--src/mame/drivers/sprint4.cpp6
-rw-r--r--src/mame/drivers/sprint8.cpp3
-rw-r--r--src/mame/drivers/spy.cpp9
-rw-r--r--src/mame/drivers/spyhuntertec.cpp3
-rw-r--r--src/mame/drivers/squale.cpp10
-rw-r--r--src/mame/drivers/srmp2.cpp10
-rw-r--r--src/mame/drivers/srmp6.cpp3
-rw-r--r--src/mame/drivers/srumbler.cpp5
-rw-r--r--src/mame/drivers/ssem.cpp3
-rw-r--r--src/mame/drivers/ssfindo.cpp2
-rw-r--r--src/mame/drivers/sshangha.cpp6
-rw-r--r--src/mame/drivers/sshot.cpp1
-rw-r--r--src/mame/drivers/ssingles.cpp2
-rw-r--r--src/mame/drivers/sslam.cpp5
-rw-r--r--src/mame/drivers/ssozumo.cpp3
-rw-r--r--src/mame/drivers/sspeedr.cpp5
-rw-r--r--src/mame/drivers/ssrj.cpp6
-rw-r--r--src/mame/drivers/sstrangr.cpp1
-rw-r--r--src/mame/drivers/ssv.cpp5
-rw-r--r--src/mame/drivers/ssystem3.cpp3
-rw-r--r--src/mame/drivers/st17xx.cpp3
-rw-r--r--src/mame/drivers/st_mp200.cpp3
-rw-r--r--src/mame/drivers/stadhero.cpp6
-rw-r--r--src/mame/drivers/starcrus.cpp6
-rw-r--r--src/mame/drivers/starfire.cpp4
-rw-r--r--src/mame/drivers/starshp1.cpp3
-rw-r--r--src/mame/drivers/starwars.cpp7
-rw-r--r--src/mame/drivers/statriv2.cpp22
-rw-r--r--src/mame/drivers/stfight.cpp2
-rw-r--r--src/mame/drivers/stlforce.cpp5
-rw-r--r--src/mame/drivers/stratos.cpp1
-rw-r--r--src/mame/drivers/strnskil.cpp5
-rw-r--r--src/mame/drivers/studio2.cpp4
-rw-r--r--src/mame/drivers/stuntair.cpp3
-rw-r--r--src/mame/drivers/stv.cpp20
-rw-r--r--src/mame/drivers/sub.cpp2
-rw-r--r--src/mame/drivers/subhuntr.cpp2
-rw-r--r--src/mame/drivers/subs.cpp6
-rw-r--r--src/mame/drivers/subsino.cpp2
-rw-r--r--src/mame/drivers/subsino2.cpp6
-rw-r--r--src/mame/drivers/summit.cpp1
-rw-r--r--src/mame/drivers/sun2.cpp21
-rw-r--r--src/mame/drivers/sun3.cpp11
-rw-r--r--src/mame/drivers/sun3x.cpp20
-rw-r--r--src/mame/drivers/sun4.cpp24
-rw-r--r--src/mame/drivers/suna16.cpp3
-rw-r--r--src/mame/drivers/suna8.cpp3
-rw-r--r--src/mame/drivers/supbtime.cpp6
-rw-r--r--src/mame/drivers/supdrapo.cpp12
-rw-r--r--src/mame/drivers/supduck.cpp2
-rw-r--r--src/mame/drivers/super80.cpp7
-rw-r--r--src/mame/drivers/superchs.cpp6
-rw-r--r--src/mame/drivers/supercrd.cpp10
-rw-r--r--src/mame/drivers/superdq.cpp10
-rw-r--r--src/mame/drivers/superqix.cpp2
-rw-r--r--src/mame/drivers/supertnk.cpp2
-rw-r--r--src/mame/drivers/superwng.cpp3
-rw-r--r--src/mame/drivers/supracan.cpp1
-rw-r--r--src/mame/drivers/suprgolf.cpp5
-rw-r--r--src/mame/drivers/suprloco.cpp5
-rw-r--r--src/mame/drivers/suprnova.cpp12
-rw-r--r--src/mame/drivers/suprridr.cpp5
-rw-r--r--src/mame/drivers/suprslam.cpp7
-rw-r--r--src/mame/drivers/surpratk.cpp7
-rw-r--r--src/mame/drivers/sv8000.cpp2
-rw-r--r--src/mame/drivers/svi318.cpp17
-rw-r--r--src/mame/drivers/svision.cpp3
-rw-r--r--src/mame/drivers/svmu.cpp6
-rw-r--r--src/mame/drivers/swyft.cpp20
-rw-r--r--src/mame/drivers/sym1.cpp10
-rw-r--r--src/mame/drivers/sys2900.cpp1
-rw-r--r--src/mame/drivers/system1.cpp4
-rw-r--r--src/mame/drivers/system16.cpp13
-rw-r--r--src/mame/drivers/tagteam.cpp4
-rw-r--r--src/mame/drivers/tail2nos.cpp5
-rw-r--r--src/mame/drivers/taito.cpp6
-rw-r--r--src/mame/drivers/taito_b.cpp9
-rw-r--r--src/mame/drivers/taito_f2.cpp9
-rw-r--r--src/mame/drivers/taito_f3.cpp6
-rw-r--r--src/mame/drivers/taito_h.cpp9
-rw-r--r--src/mame/drivers/taito_l.cpp3
-rw-r--r--src/mame/drivers/taito_o.cpp8
-rw-r--r--src/mame/drivers/taito_x.cpp10
-rw-r--r--src/mame/drivers/taito_z.cpp8
-rw-r--r--src/mame/drivers/taitoair.cpp9
-rw-r--r--src/mame/drivers/taitogn.cpp6
-rw-r--r--src/mame/drivers/taitojc.cpp13
-rw-r--r--src/mame/drivers/taitosj.cpp2
-rw-r--r--src/mame/drivers/taitotx.cpp1
-rw-r--r--src/mame/drivers/taitowlf.cpp4
-rw-r--r--src/mame/drivers/tamag1.cpp4
-rw-r--r--src/mame/drivers/tandy1t.cpp2
-rw-r--r--src/mame/drivers/tandy2k.cpp4
-rw-r--r--src/mame/drivers/tank8.cpp3
-rw-r--r--src/mame/drivers/tankbatt.cpp5
-rw-r--r--src/mame/drivers/tankbust.cpp5
-rw-r--r--src/mame/drivers/taotaido.cpp9
-rw-r--r--src/mame/drivers/tapatune.cpp2
-rw-r--r--src/mame/drivers/targeth.cpp6
-rw-r--r--src/mame/drivers/tasman.cpp2
-rw-r--r--src/mame/drivers/tatsumi.cpp9
-rw-r--r--src/mame/drivers/tattack.cpp1
-rw-r--r--src/mame/drivers/tavernie.cpp11
-rw-r--r--src/mame/drivers/taxidriv.cpp5
-rw-r--r--src/mame/drivers/tbowl.cpp6
-rw-r--r--src/mame/drivers/tceptor.cpp4
-rw-r--r--src/mame/drivers/tcl.cpp2
-rw-r--r--src/mame/drivers/tdv2324.cpp3
-rw-r--r--src/mame/drivers/tec1.cpp6
-rw-r--r--src/mame/drivers/tecmo.cpp4
-rw-r--r--src/mame/drivers/tecmo16.cpp7
-rw-r--r--src/mame/drivers/tecmosys.cpp6
-rw-r--r--src/mame/drivers/tehkanwc.cpp6
-rw-r--r--src/mame/drivers/tek405x.cpp3
-rw-r--r--src/mame/drivers/tek410x.cpp2
-rw-r--r--src/mame/drivers/tek440x.cpp4
-rw-r--r--src/mame/drivers/tekxp33x.cpp2
-rw-r--r--src/mame/drivers/tempest.cpp2
-rw-r--r--src/mame/drivers/terak.cpp2
-rw-r--r--src/mame/drivers/terracre.cpp3
-rw-r--r--src/mame/drivers/tetrisp2.cpp11
-rw-r--r--src/mame/drivers/tgtpanic.cpp1
-rw-r--r--src/mame/drivers/thayers.cpp5
-rw-r--r--src/mame/drivers/thedealr.cpp9
-rw-r--r--src/mame/drivers/thedeep.cpp8
-rw-r--r--src/mame/drivers/thepit.cpp5
-rw-r--r--src/mame/drivers/thief.cpp6
-rw-r--r--src/mame/drivers/thomson.cpp8
-rw-r--r--src/mame/drivers/thoop2.cpp5
-rw-r--r--src/mame/drivers/thunderj.cpp3
-rw-r--r--src/mame/drivers/thunderx.cpp8
-rw-r--r--src/mame/drivers/ti630.cpp2
-rw-r--r--src/mame/drivers/ti74.cpp7
-rw-r--r--src/mame/drivers/ti85.cpp6
-rw-r--r--src/mame/drivers/ti89.cpp8
-rw-r--r--src/mame/drivers/ti99_2.cpp1
-rw-r--r--src/mame/drivers/ti99_4p.cpp10
-rw-r--r--src/mame/drivers/ti99_4x.cpp4
-rw-r--r--src/mame/drivers/ti99_8.cpp1
-rw-r--r--src/mame/drivers/tiamc1.cpp13
-rw-r--r--src/mame/drivers/ticalc1x.cpp2
-rw-r--r--src/mame/drivers/tickee.cpp8
-rw-r--r--src/mame/drivers/tigeroad.cpp2
-rw-r--r--src/mame/drivers/tiki100.cpp4
-rw-r--r--src/mame/drivers/tim011.cpp1
-rw-r--r--src/mame/drivers/tim100.cpp5
-rw-r--r--src/mame/drivers/timelimt.cpp6
-rw-r--r--src/mame/drivers/timeplt.cpp7
-rw-r--r--src/mame/drivers/timetrv.cpp1
-rw-r--r--src/mame/drivers/timex.cpp17
-rw-r--r--src/mame/drivers/tispeak.cpp9
-rw-r--r--src/mame/drivers/tispellb.cpp2
-rw-r--r--src/mame/drivers/tk2000.cpp16
-rw-r--r--src/mame/drivers/tk80bs.cpp1
-rw-r--r--src/mame/drivers/tm990189.cpp32
-rw-r--r--src/mame/drivers/tmaster.cpp2
-rw-r--r--src/mame/drivers/tmc1800.cpp3
-rw-r--r--src/mame/drivers/tmc2000e.cpp3
-rw-r--r--src/mame/drivers/tmmjprd.cpp2
-rw-r--r--src/mame/drivers/tmnt.cpp17
-rw-r--r--src/mame/drivers/tmspoker.cpp9
-rw-r--r--src/mame/drivers/tnzs.cpp4
-rw-r--r--src/mame/drivers/toaplan1.cpp8
-rw-r--r--src/mame/drivers/toaplan2.cpp9
-rw-r--r--src/mame/drivers/toki.cpp5
-rw-r--r--src/mame/drivers/tokyocop.cpp1
-rw-r--r--src/mame/drivers/tomcat.cpp2
-rw-r--r--src/mame/drivers/tonton.cpp5
-rw-r--r--src/mame/drivers/toobin.cpp3
-rw-r--r--src/mame/drivers/topspeed.cpp16
-rw-r--r--src/mame/drivers/toratora.cpp2
-rw-r--r--src/mame/drivers/tourtabl.cpp2
-rw-r--r--src/mame/drivers/tourvis.cpp20
-rw-r--r--src/mame/drivers/toypop.cpp6
-rw-r--r--src/mame/drivers/tp84.cpp10
-rw-r--r--src/mame/drivers/trackfld.cpp6
-rw-r--r--src/mame/drivers/tranz330.cpp4
-rw-r--r--src/mame/drivers/travrusa.cpp6
-rw-r--r--src/mame/drivers/triforce.cpp2
-rw-r--r--src/mame/drivers/triplhnt.cpp3
-rw-r--r--src/mame/drivers/trs80.cpp4
-rw-r--r--src/mame/drivers/trs80m2.cpp3
-rw-r--r--src/mame/drivers/truco.cpp12
-rw-r--r--src/mame/drivers/trucocl.cpp4
-rw-r--r--src/mame/drivers/trvmadns.cpp2
-rw-r--r--src/mame/drivers/trvquest.cpp7
-rw-r--r--src/mame/drivers/tryout.cpp6
-rw-r--r--src/mame/drivers/ts803.cpp1
-rw-r--r--src/mame/drivers/tsamurai.cpp3
-rw-r--r--src/mame/drivers/tsispch.cpp3
-rw-r--r--src/mame/drivers/ttchamp.cpp4
-rw-r--r--src/mame/drivers/tubep.cpp4
-rw-r--r--src/mame/drivers/tugboat.cpp2
-rw-r--r--src/mame/drivers/tumbleb.cpp5
-rw-r--r--src/mame/drivers/tumblep.cpp5
-rw-r--r--src/mame/drivers/tunhunt.cpp4
-rw-r--r--src/mame/drivers/turrett.cpp6
-rw-r--r--src/mame/drivers/tutankhm.cpp8
-rw-r--r--src/mame/drivers/tutor.cpp11
-rw-r--r--src/mame/drivers/tv910.cpp7
-rw-r--r--src/mame/drivers/tv950.cpp5
-rw-r--r--src/mame/drivers/tv990.cpp9
-rw-r--r--src/mame/drivers/tvc.cpp18
-rw-r--r--src/mame/drivers/tvcapcom.cpp1
-rw-r--r--src/mame/drivers/tvgame.cpp4
-rw-r--r--src/mame/drivers/twin16.cpp9
-rw-r--r--src/mame/drivers/twincobr.cpp11
-rw-r--r--src/mame/drivers/twinkle.cpp2
-rw-r--r--src/mame/drivers/twins.cpp19
-rw-r--r--src/mame/drivers/tx0.cpp12
-rw-r--r--src/mame/drivers/tx1.cpp10
-rw-r--r--src/mame/drivers/uapce.cpp8
-rw-r--r--src/mame/drivers/uknc.cpp1
-rw-r--r--src/mame/drivers/ultraman.cpp5
-rw-r--r--src/mame/drivers/ultratnk.cpp3
-rw-r--r--src/mame/drivers/ultrsprt.cpp5
-rw-r--r--src/mame/drivers/umipoker.cpp7
-rw-r--r--src/mame/drivers/undrfire.cpp6
-rw-r--r--src/mame/drivers/unichamp.cpp5
-rw-r--r--src/mame/drivers/unico.cpp7
-rw-r--r--src/mame/drivers/unior.cpp4
-rw-r--r--src/mame/drivers/unistar.cpp3
-rw-r--r--src/mame/drivers/univac.cpp1
-rw-r--r--src/mame/drivers/unixpc.cpp2
-rw-r--r--src/mame/drivers/unkhorse.cpp5
-rw-r--r--src/mame/drivers/upscope.cpp3
-rw-r--r--src/mame/drivers/usgames.cpp10
-rw-r--r--src/mame/drivers/ut88.cpp4
-rw-r--r--src/mame/drivers/uzebox.cpp7
-rw-r--r--src/mame/drivers/v1050.cpp4
-rw-r--r--src/mame/drivers/v6809.cpp11
-rw-r--r--src/mame/drivers/vamphalf.cpp6
-rw-r--r--src/mame/drivers/vaportra.cpp6
-rw-r--r--src/mame/drivers/vastar.cpp5
-rw-r--r--src/mame/drivers/vball.cpp4
-rw-r--r--src/mame/drivers/vboy.cpp7
-rw-r--r--src/mame/drivers/vc4000.cpp2
-rw-r--r--src/mame/drivers/vcombat.cpp6
-rw-r--r--src/mame/drivers/vd.cpp7
-rw-r--r--src/mame/drivers/vector06.cpp2
-rw-r--r--src/mame/drivers/vectrex.cpp4
-rw-r--r--src/mame/drivers/vega.cpp18
-rw-r--r--src/mame/drivers/vegaeo.cpp4
-rw-r--r--src/mame/drivers/vegas.cpp6
-rw-r--r--src/mame/drivers/vendetta.cpp8
-rw-r--r--src/mame/drivers/vertigo.cpp4
-rw-r--r--src/mame/drivers/vg5k.cpp26
-rw-r--r--src/mame/drivers/vgmplay.cpp29
-rw-r--r--src/mame/drivers/vic10.cpp2
-rw-r--r--src/mame/drivers/vic20.cpp2
-rw-r--r--src/mame/drivers/vicdual.cpp6
-rw-r--r--src/mame/drivers/victor9k.cpp4
-rw-r--r--src/mame/drivers/vidbrain.cpp3
-rw-r--r--src/mame/drivers/videopin.cpp7
-rw-r--r--src/mame/drivers/videopkr.cpp23
-rw-r--r--src/mame/drivers/vigilant.cpp4
-rw-r--r--src/mame/drivers/vii.cpp3
-rw-r--r--src/mame/drivers/vindictr.cpp4
-rw-r--r--src/mame/drivers/vip.cpp2
-rw-r--r--src/mame/drivers/viper.cpp5
-rw-r--r--src/mame/drivers/vis.cpp10
-rw-r--r--src/mame/drivers/vixen.cpp3
-rw-r--r--src/mame/drivers/vk100.cpp23
-rw-r--r--src/mame/drivers/vlc.cpp24
-rw-r--r--src/mame/drivers/volfied.cpp19
-rw-r--r--src/mame/drivers/votrpss.cpp9
-rw-r--r--src/mame/drivers/votrtnt.cpp2
-rw-r--r--src/mame/drivers/voyager.cpp10
-rw-r--r--src/mame/drivers/vp101.cpp1
-rw-r--r--src/mame/drivers/vpoker.cpp2
-rw-r--r--src/mame/drivers/vroulet.cpp4
-rw-r--r--src/mame/drivers/vsnes.cpp6
-rw-r--r--src/mame/drivers/vt100.cpp5
-rw-r--r--src/mame/drivers/vt220.cpp1
-rw-r--r--src/mame/drivers/vt240.cpp34
-rw-r--r--src/mame/drivers/vt320.cpp9
-rw-r--r--src/mame/drivers/vt520.cpp3
-rw-r--r--src/mame/drivers/vta2000.cpp1
-rw-r--r--src/mame/drivers/vtech1.cpp19
-rw-r--r--src/mame/drivers/vtech2.cpp12
-rw-r--r--src/mame/drivers/vulgus.cpp5
-rw-r--r--src/mame/drivers/wacky_gator.cpp3
-rw-r--r--src/mame/drivers/wallc.cpp4
-rw-r--r--src/mame/drivers/wardner.cpp10
-rw-r--r--src/mame/drivers/warpsped.cpp1
-rw-r--r--src/mame/drivers/warpwarp.cpp5
-rw-r--r--src/mame/drivers/warriorb.cpp10
-rw-r--r--src/mame/drivers/wc90.cpp5
-rw-r--r--src/mame/drivers/wc90b.cpp6
-rw-r--r--src/mame/drivers/wecleman.cpp7
-rw-r--r--src/mame/drivers/welltris.cpp11
-rw-r--r--src/mame/drivers/wgp.cpp10
-rw-r--r--src/mame/drivers/wheelfir.cpp3
-rw-r--r--src/mame/drivers/wicat.cpp15
-rw-r--r--src/mame/drivers/wico.cpp3
-rw-r--r--src/mame/drivers/wildpkr.cpp14
-rw-r--r--src/mame/drivers/williams.cpp2
-rw-r--r--src/mame/drivers/wink.cpp4
-rw-r--r--src/mame/drivers/wiping.cpp7
-rw-r--r--src/mame/drivers/witch.cpp21
-rw-r--r--src/mame/drivers/wiz.cpp5
-rw-r--r--src/mame/drivers/wmg.cpp3
-rw-r--r--src/mame/drivers/wms.cpp11
-rw-r--r--src/mame/drivers/wolfpack.cpp4
-rw-r--r--src/mame/drivers/wpc_an.cpp6
-rw-r--r--src/mame/drivers/wpc_dot.cpp2
-rw-r--r--src/mame/drivers/wpc_flip1.cpp2
-rw-r--r--src/mame/drivers/wpc_flip2.cpp2
-rw-r--r--src/mame/drivers/wrally.cpp5
-rw-r--r--src/mame/drivers/wswan.cpp4
-rw-r--r--src/mame/drivers/wwfsstar.cpp7
-rw-r--r--src/mame/drivers/wyvernf0.cpp3
-rw-r--r--src/mame/drivers/x07.cpp4
-rw-r--r--src/mame/drivers/x1.cpp7
-rw-r--r--src/mame/drivers/x1twin.cpp14
-rw-r--r--src/mame/drivers/x68k.cpp19
-rw-r--r--src/mame/drivers/xain.cpp2
-rw-r--r--src/mame/drivers/xavix.cpp5
-rw-r--r--src/mame/drivers/xbox.cpp20
-rw-r--r--src/mame/drivers/xerox820.cpp5
-rw-r--r--src/mame/drivers/xexex.cpp9
-rw-r--r--src/mame/drivers/xmen.cpp10
-rw-r--r--src/mame/drivers/xorworld.cpp8
-rw-r--r--src/mame/drivers/xtheball.cpp3
-rw-r--r--src/mame/drivers/xxmissio.cpp5
-rw-r--r--src/mame/drivers/xybots.cpp4
-rw-r--r--src/mame/drivers/xyonix.cpp4
-rw-r--r--src/mame/drivers/yiear.cpp9
-rw-r--r--src/mame/drivers/ymmu100.cpp11
-rw-r--r--src/mame/drivers/yunsun16.cpp4
-rw-r--r--src/mame/drivers/yunsung8.cpp6
-rw-r--r--src/mame/drivers/z100.cpp7
-rw-r--r--src/mame/drivers/z1013.cpp6
-rw-r--r--src/mame/drivers/z88.cpp2
-rw-r--r--src/mame/drivers/z9001.cpp8
-rw-r--r--src/mame/drivers/zac2650.cpp4
-rw-r--r--src/mame/drivers/zaccaria.cpp5
-rw-r--r--src/mame/drivers/zaurus.cpp10
-rw-r--r--src/mame/drivers/zaxxon.cpp13
-rw-r--r--src/mame/drivers/zerozone.cpp3
-rw-r--r--src/mame/drivers/zn.cpp28
-rw-r--r--src/mame/drivers/zodiack.cpp6
-rw-r--r--src/mame/drivers/zorba.cpp2
-rw-r--r--src/mame/drivers/zr107.cpp1
-rw-r--r--src/mame/drivers/zrt80.cpp2
-rw-r--r--src/mame/drivers/zwackery.cpp5
-rw-r--r--src/mame/drivers/zx.cpp3
1749 files changed, 7497 insertions, 3012 deletions
diff --git a/src/mame/drivers/1942.cpp b/src/mame/drivers/1942.cpp
index 95d49796004..551d519d3ac 100644
--- a/src/mame/drivers/1942.cpp
+++ b/src/mame/drivers/1942.cpp
@@ -73,12 +73,15 @@ correctly.
#define AUDIO_CLOCK_1942P (MASTER_CLOCK_1942P/16)
#include "emu.h"
+#include "includes/1942.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "machine/netlist.h"
-#include "netlist/devices/net_lib.h"
+#include "screen.h"
+#include "speaker.h"
-#include "includes/1942.h"
+#include "netlist/devices/net_lib.h"
#define NLFILT(RA, R1, C1, R2) \
NET_C(RA.1, V5) \
diff --git a/src/mame/drivers/1943.cpp b/src/mame/drivers/1943.cpp
index a9528c41d2c..76685cd365d 100644
--- a/src/mame/drivers/1943.cpp
+++ b/src/mame/drivers/1943.cpp
@@ -32,11 +32,14 @@
*/
#include "emu.h"
+#include "includes/1943.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
-#include "includes/1943.h"
+#include "screen.h"
+#include "speaker.h"
/* Protection Handlers */
diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp
index ad061060db0..aef9295fd60 100644
--- a/src/mame/drivers/1945kiii.cpp
+++ b/src/mame/drivers/1945kiii.cpp
@@ -47,6 +47,8 @@ Notes:
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_16MHz
diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp
index 59705e05803..dce6c82f6cd 100644
--- a/src/mame/drivers/20pacgal.cpp
+++ b/src/mame/drivers/20pacgal.cpp
@@ -85,11 +85,13 @@ Graphics: CY37256P160-83AC x 2 (Ultra37000 CPLD family - 160 pin TQFP, 256 Macro
#include "emu.h"
#include "includes/20pacgal.h"
+
#include "cpu/z180/z180.h"
#include "machine/eepromser.h"
#include "machine/watchdog.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp
index 6b91ead3e95..b39c80c16c9 100644
--- a/src/mame/drivers/2mindril.cpp
+++ b/src/mame/drivers/2mindril.cpp
@@ -35,9 +35,11 @@ DAC -26.6860Mhz
*/
#include "emu.h"
+#include "includes/taito_f3.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
-#include "includes/taito_f3.h"
+#include "speaker.h"
class _2mindril_state : public taito_f3_state
diff --git a/src/mame/drivers/30test.cpp b/src/mame/drivers/30test.cpp
index bb82cbba362..264603adad2 100644
--- a/src/mame/drivers/30test.cpp
+++ b/src/mame/drivers/30test.cpp
@@ -46,6 +46,8 @@ http://blogs.yahoo.co.jp/nadegatayosoyuki/59285865.html
#include "emu.h"
#include "cpu/mc68hc11/mc68hc11.h"
#include "sound/okim6295.h"
+#include "speaker.h"
+
#include "30test.lh"
#define MAIN_CLOCK XTAL_16MHz
diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp
index e85eca6370f..49cd262b39b 100644
--- a/src/mame/drivers/39in1.cpp
+++ b/src/mame/drivers/39in1.cpp
@@ -28,6 +28,8 @@
#include "machine/eepromser.h"
#include "machine/pxa255.h"
#include "sound/dmadac.h"
+#include "screen.h"
+#include "speaker.h"
class _39in1_state : public driver_device
{
diff --git a/src/mame/drivers/3do.cpp b/src/mame/drivers/3do.cpp
index 6aab517506c..db5db112604 100644
--- a/src/mame/drivers/3do.cpp
+++ b/src/mame/drivers/3do.cpp
@@ -95,9 +95,11 @@ Part list of Goldstar 3DO Interactive Multiplayer
#include "emu.h"
#include "includes/3do.h"
-#include "imagedev/chd_cd.h"
+
#include "cpu/arm/arm.h"
#include "cpu/arm7/arm7.h"
+#include "imagedev/chd_cd.h"
+#include "screen.h"
#define X2_CLOCK_PAL 59000000
diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp
index 2417d15debb..814333ff455 100644
--- a/src/mame/drivers/3x3puzzl.cpp
+++ b/src/mame/drivers/3x3puzzl.cpp
@@ -43,6 +43,8 @@ Notes:
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_10MHz
diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp
index d383d35df13..db89509ff84 100644
--- a/src/mame/drivers/4004clk.cpp
+++ b/src/mame/drivers/4004clk.cpp
@@ -12,6 +12,8 @@
#include "cpu/i4004/i4004.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "4004clk.lh"
class nixieclock_state : public driver_device
diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp
index 417429e9e17..4ab8a49dc7f 100644
--- a/src/mame/drivers/40love.cpp
+++ b/src/mame/drivers/40love.cpp
@@ -223,11 +223,15 @@ Notes - Has jumper setting for 122HZ or 61HZ)
#include "emu.h"
#include "includes/40love.h"
+
#include "cpu/m6805/m6805.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
void fortyl_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
{
diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp
index 1ed49924c8e..b7d359fc845 100644
--- a/src/mame/drivers/4dpi.cpp
+++ b/src/mame/drivers/4dpi.cpp
@@ -17,6 +17,7 @@
#include "emu.h"
#include "cpu/mips/r3000.h"
+#include "screen.h"
struct ip6_regs_t
diff --git a/src/mame/drivers/4enlinea.cpp b/src/mame/drivers/4enlinea.cpp
index 084ca4ba964..7651be0d2d6 100644
--- a/src/mame/drivers/4enlinea.cpp
+++ b/src/mame/drivers/4enlinea.cpp
@@ -186,6 +186,16 @@
*************************************************************************/
+#include "emu.h"
+#include "bus/isa/cga.h"
+#include "bus/isa/isa.h"
+#include "cpu/z80/z80.h"
+#include "sound/ay8910.h"
+#include "video/cgapal.h"
+#include "video/mc6845.h"
+#include "speaker.h"
+
+
#define MAIN_CLOCK XTAL_16MHz
#define SEC_CLOCK XTAL_8MHz
#define HCGA_CLOCK XTAL_14_31818MHz
@@ -195,15 +205,6 @@
#define SND_AY_CLOCK SEC_CLOCK /4 /* 2 MHz. (measured) */
#define CRTC_CLOCK SEC_CLOCK /2 /* 8 MHz. (measured) */
-
-#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
-#include "sound/ay8910.h"
-#include "bus/isa/isa.h"
-#include "bus/isa/cga.h"
-#include "video/cgapal.h"
-
class _4enlinea_state : public driver_device
{
public:
@@ -211,7 +212,7 @@ public:
: driver_device(mconfig, type, tag),
m_ay(*this, "aysnd"),
m_maincpu(*this, "maincpu")
- { }
+ { }
required_device<ay8910_device> m_ay;
@@ -257,7 +258,7 @@ const tiny_rom_entry *isa8_cga_4enlinea_device::device_rom_region() const
return nullptr;
}
-const device_type ISA8_CGA_4ENLINEA = &device_creator<isa8_cga_4enlinea_device>;
+const device_type ISA8_CGA_4ENLINEA = device_creator<isa8_cga_4enlinea_device>;
isa8_cga_4enlinea_device::isa8_cga_4enlinea_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
isa8_cga_device( mconfig, ISA8_CGA_4ENLINEA, "ISA8_CGA_4ENLINEA", tag, owner, clock, "4enlinea_cga", __FILE__)
diff --git a/src/mame/drivers/4enraya.cpp b/src/mame/drivers/4enraya.cpp
index a546f764d5f..199172c4f45 100644
--- a/src/mame/drivers/4enraya.cpp
+++ b/src/mame/drivers/4enraya.cpp
@@ -119,9 +119,12 @@
***************************************************************************/
#include "emu.h"
+#include "includes/4enraya.h"
+
#include "cpu/z80/z80.h"
#include "machine/nvram.h"
-#include "includes/4enraya.h"
+#include "screen.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_8MHz
diff --git a/src/mame/drivers/4roses.cpp b/src/mame/drivers/4roses.cpp
index acfa158233b..8d7a41c02d4 100644
--- a/src/mame/drivers/4roses.cpp
+++ b/src/mame/drivers/4roses.cpp
@@ -172,15 +172,19 @@
***********************************************************************************/
-#define MASTER_CLOCK XTAL_16MHz
-
#include "emu.h"
+#include "includes/funworld.h"
+
#include "cpu/m6502/m65c02.h"
-#include "video/mc6845.h"
-#include "sound/ay8910.h"
#include "machine/nvram.h"
-#include "includes/funworld.h"
+#include "sound/ay8910.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_16MHz
class _4roses_state : public funworld_state
{
diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp
index 56cdac32fe2..3fad2e4af5a 100644
--- a/src/mame/drivers/5clown.cpp
+++ b/src/mame/drivers/5clown.cpp
@@ -441,16 +441,18 @@
*******************************************************************************/
-
-#define MASTER_CLOCK XTAL_10MHz
-
#include "emu.h"
#include "cpu/m6502/m6502.h"
-#include "video/mc6845.h"
#include "machine/6821pia.h"
#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "sound/okim6295.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_10MHz
class _5clown_state : public driver_device
diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp
index d8f2987d712..22a356902fb 100644
--- a/src/mame/drivers/8080bw.cpp
+++ b/src/mame/drivers/8080bw.cpp
@@ -194,12 +194,14 @@
*****************************************************************************/
#include "emu.h"
+#include "includes/8080bw.h"
+
#include "cpu/m6800/m6800.h"
#include "cpu/i8085/i8085.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "sound/speaker.h"
-#include "includes/8080bw.h"
+
+#include "speaker.h"
#include "attackfc.lh"
#include "cosmicm.lh"
diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp
index 5ec57a8a11e..17364b242d5 100644
--- a/src/mame/drivers/88games.cpp
+++ b/src/mame/drivers/88games.cpp
@@ -7,13 +7,17 @@
***************************************************************************/
#include "emu.h"
+#include "includes/88games.h"
+
#include "cpu/m6809/konami.h"
#include "cpu/z80/z80.h"
-#include "sound/ym2151.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
-#include "includes/88games.h"
+#include "sound/ym2151.h"
+
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/a2600.cpp b/src/mame/drivers/a2600.cpp
index 3613753f6e4..3130f962317 100644
--- a/src/mame/drivers/a2600.cpp
+++ b/src/mame/drivers/a2600.cpp
@@ -27,7 +27,9 @@ TODO:
#include "bus/vcs/scharger.h"
#include "bus/vcs/compumat.h"
#include "bus/vcs_ctrl/ctrl.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#if USE_NEW_RIOT
diff --git a/src/mame/drivers/a5105.cpp b/src/mame/drivers/a5105.cpp
index 148eae300a2..7b0cdd48a33 100644
--- a/src/mame/drivers/a5105.cpp
+++ b/src/mame/drivers/a5105.cpp
@@ -20,18 +20,22 @@ ToDo:
****************************************************************************/
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "video/upd7220.h"
+#include "imagedev/cassette.h"
+#include "imagedev/flopdrv.h"
#include "machine/ram.h"
#include "machine/upd765.h"
-#include "formats/a5105_dsk.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
-#include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
-#include "sound/wave.h"
#include "sound/beep.h"
+#include "sound/wave.h"
+#include "video/upd7220.h"
+
+#include "screen.h"
+#include "speaker.h"
+#include "formats/a5105_dsk.h"
class a5105_state : public driver_device
diff --git a/src/mame/drivers/a51xx.cpp b/src/mame/drivers/a51xx.cpp
index 39c613d64dc..80162f77bfd 100644
--- a/src/mame/drivers/a51xx.cpp
+++ b/src/mame/drivers/a51xx.cpp
@@ -14,6 +14,8 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
+
class a51xx_state : public driver_device
{
diff --git a/src/mame/drivers/a6809.cpp b/src/mame/drivers/a6809.cpp
index 6e0da15aac4..fbf33520990 100644
--- a/src/mame/drivers/a6809.cpp
+++ b/src/mame/drivers/a6809.cpp
@@ -57,6 +57,8 @@ enter show next address
#include "video/mc6845.h"
#include "imagedev/cassette.h"
#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
class a6809_state : public driver_device
diff --git a/src/mame/drivers/a7150.cpp b/src/mame/drivers/a7150.cpp
index 825413856a8..d681f7140d7 100644
--- a/src/mame/drivers/a7150.cpp
+++ b/src/mame/drivers/a7150.cpp
@@ -12,6 +12,7 @@
#include "emu.h"
#include "cpu/i86/i86.h"
+#include "screen.h"
class a7150_state : public driver_device
diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp
index 7477b35cc0f..9c61a85c3c3 100644
--- a/src/mame/drivers/a7800.cpp
+++ b/src/mame/drivers/a7800.cpp
@@ -103,7 +103,9 @@
#include "machine/mos6530n.h"
#include "video/maria.h"
#include "bus/a7800/a78_carts.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#define A7800_NTSC_Y1 XTAL_14_31818MHz
#define CLK_PAL 1773447
diff --git a/src/mame/drivers/aa310.cpp b/src/mame/drivers/aa310.cpp
index 00e468750b5..69e29745673 100644
--- a/src/mame/drivers/aa310.cpp
+++ b/src/mame/drivers/aa310.cpp
@@ -84,8 +84,9 @@
#include "emu.h"
-#include "cpu/arm/arm.h"
#include "includes/archimds.h"
+
+#include "cpu/arm/arm.h"
#include "formats/acorn_dsk.h"
#include "formats/apd_dsk.h"
#include "machine/i2cmem.h"
@@ -93,6 +94,7 @@
#include "machine/wd_fdc.h"
#include "sound/volt_reg.h"
#include "softlist.h"
+#include "speaker.h"
class aa310_state : public archimedes_state
{
diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp
index f52b903183d..0d9e2655a8f 100644
--- a/src/mame/drivers/abc80.cpp
+++ b/src/mame/drivers/abc80.cpp
@@ -76,7 +76,9 @@ Notes:
#include "emu.h"
#include "includes/abc80.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp
index f41cc37831b..c64c80b9bba 100644
--- a/src/mame/drivers/abc80x.cpp
+++ b/src/mame/drivers/abc80x.cpp
@@ -153,6 +153,7 @@ Notes:
#include "video/abc802.h"
#include "video/abc806.h"
#include "softlist.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/ac1.cpp b/src/mame/drivers/ac1.cpp
index ba3f64c8836..3f3dc6518d6 100644
--- a/src/mame/drivers/ac1.cpp
+++ b/src/mame/drivers/ac1.cpp
@@ -19,11 +19,15 @@
****************************************************************************/
#include "emu.h"
+#include "includes/ac1.h"
+
#include "cpu/z80/z80.h"
-#include "machine/z80pio.h"
#include "imagedev/cassette.h"
+#include "machine/z80pio.h"
#include "sound/wave.h"
-#include "includes/ac1.h"
+#include "screen.h"
+#include "speaker.h"
+
static GFXDECODE_START( ac1 )
GFXDECODE_ENTRY( "gfx1", 0x0000, ac1_charlayout, 0, 1 )
diff --git a/src/mame/drivers/ace.cpp b/src/mame/drivers/ace.cpp
index 711ed70fe55..a7c855c71ef 100644
--- a/src/mame/drivers/ace.cpp
+++ b/src/mame/drivers/ace.cpp
@@ -41,6 +41,7 @@ A1 2101 2101
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "screen.h"
#include "ace.lh"
diff --git a/src/mame/drivers/acefruit.cpp b/src/mame/drivers/acefruit.cpp
index 40741a064c7..1b67896a6c6 100644
--- a/src/mame/drivers/acefruit.cpp
+++ b/src/mame/drivers/acefruit.cpp
@@ -14,6 +14,7 @@ Inputs and Dip Switches by Stephh
#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "screen.h"
#include "sidewndr.lh"
diff --git a/src/mame/drivers/aces1.cpp b/src/mame/drivers/aces1.cpp
index e26422f13af..4c1e55cf97a 100644
--- a/src/mame/drivers/aces1.cpp
+++ b/src/mame/drivers/aces1.cpp
@@ -26,11 +26,14 @@ JPM style Reel MCU? Certainly reel data seems to be muxed together in aweird way
#include "emu.h"
+#include "video/awpvid.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "machine/i8255.h"
#include "machine/steppers.h"
-#include "video/awpvid.h"
+#include "speaker.h"
+
#include "aces1.lh"
// MFME2MAME layouts:
diff --git a/src/mame/drivers/acommand.cpp b/src/mame/drivers/acommand.cpp
index a410152deb4..2debf884361 100644
--- a/src/mame/drivers/acommand.cpp
+++ b/src/mame/drivers/acommand.cpp
@@ -60,6 +60,8 @@ JALCF1 BIN 1,048,576 02-07-99 1:11a JALCF1.BIN
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class acommand_state : public driver_device
diff --git a/src/mame/drivers/acrnsys1.cpp b/src/mame/drivers/acrnsys1.cpp
index 480719fb6b8..a9faef5e6df 100644
--- a/src/mame/drivers/acrnsys1.cpp
+++ b/src/mame/drivers/acrnsys1.cpp
@@ -52,6 +52,8 @@ Note that left-most digit is not wired up, and therefore will always be blank.
#include "machine/74145.h"
#include "imagedev/cassette.h"
#include "sound/wave.h"
+#include "speaker.h"
+
#include "acrnsys1.lh"
diff --git a/src/mame/drivers/actfancr.cpp b/src/mame/drivers/actfancr.cpp
index 6d898b20901..679feec959e 100644
--- a/src/mame/drivers/actfancr.cpp
+++ b/src/mame/drivers/actfancr.cpp
@@ -25,12 +25,15 @@
*******************************************************************************/
#include "emu.h"
+#include "includes/actfancr.h"
+
#include "cpu/m6502/m6502.h"
#include "cpu/h6280/h6280.h"
#include "sound/2203intf.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
-#include "includes/actfancr.h"
+#include "screen.h"
+#include "speaker.h"
/******************************************************************************/
diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp
index 918132a6ae9..230518deb05 100644
--- a/src/mame/drivers/adam.cpp
+++ b/src/mame/drivers/adam.cpp
@@ -301,7 +301,9 @@ Mark Gordon
#include "emu.h"
#include "includes/adam.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/adp.cpp b/src/mame/drivers/adp.cpp
index ee1c0d38363..eec373a4bf3 100644
--- a/src/mame/drivers/adp.cpp
+++ b/src/mame/drivers/adp.cpp
@@ -156,13 +156,15 @@ Quick Jack administration/service mode:
#include "emu.h"
#include "cpu/m68000/m68000.h"
-#include "sound/ay8910.h"
-#include "video/hd63484.h"
-#include "machine/microtch.h"
#include "machine/mc68681.h"
+#include "machine/microtch.h"
#include "machine/msm6242.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "video/hd63484.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
class adp_state : public driver_device
diff --git a/src/mame/drivers/advision.cpp b/src/mame/drivers/advision.cpp
index 077970ef936..d715478c9ec 100644
--- a/src/mame/drivers/advision.cpp
+++ b/src/mame/drivers/advision.cpp
@@ -19,10 +19,14 @@
#include "emu.h"
#include "includes/advision.h"
+
#include "cpu/mcs48/mcs48.h"
#include "cpu/cop400/cop400.h"
#include "sound/volt_reg.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
/* Memory Maps */
diff --git a/src/mame/drivers/aeroboto.cpp b/src/mame/drivers/aeroboto.cpp
index c06625387cf..25dd1ee8cf4 100644
--- a/src/mame/drivers/aeroboto.cpp
+++ b/src/mame/drivers/aeroboto.cpp
@@ -25,10 +25,14 @@ Revisions:
****************************************************************************/
#include "emu.h"
+#include "includes/aeroboto.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
-#include "includes/aeroboto.h"
+
+#include "screen.h"
+#include "speaker.h"
READ8_MEMBER(aeroboto_state::aeroboto_201_r)
diff --git a/src/mame/drivers/aerofgt.cpp b/src/mame/drivers/aerofgt.cpp
index 2fb4748ccdd..b9695300597 100644
--- a/src/mame/drivers/aerofgt.cpp
+++ b/src/mame/drivers/aerofgt.cpp
@@ -61,11 +61,14 @@ Verification still needed for the other PCBs.
***************************************************************************/
#include "emu.h"
+#include "includes/aerofgt.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/2610intf.h"
#include "sound/3812intf.h"
-#include "includes/aerofgt.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(aerofgt_state::sound_command_w)
diff --git a/src/mame/drivers/age_candy.cpp b/src/mame/drivers/age_candy.cpp
index 986b9d3771c..42ac7a8e293 100644
--- a/src/mame/drivers/age_candy.cpp
+++ b/src/mame/drivers/age_candy.cpp
@@ -13,6 +13,7 @@ Device is a 27c256 location U3
*/
#include "emu.h"
+#include "speaker.h"
class age_candy_state : public driver_device
diff --git a/src/mame/drivers/aim65.cpp b/src/mame/drivers/aim65.cpp
index c454952b037..24345c59557 100644
--- a/src/mame/drivers/aim65.cpp
+++ b/src/mame/drivers/aim65.cpp
@@ -26,7 +26,10 @@ Bugs
#include "emu.h"
#include "includes/aim65.h"
+
#include "softlist.h"
+#include "speaker.h"
+
#include "aim65.lh"
diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp
index ceb26ccd0c3..847e509686d 100644
--- a/src/mame/drivers/airbustr.cpp
+++ b/src/mame/drivers/airbustr.cpp
@@ -220,10 +220,13 @@ Code at 505: waits for bit 1 to go low, writes command, waits for bit
*/
#include "emu.h"
+#include "includes/airbustr.h"
+
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
-#include "includes/airbustr.h"
+#include "speaker.h"
+
/* Read/Write Handlers */
READ8_MEMBER(airbustr_state::devram_r)
diff --git a/src/mame/drivers/airraid.cpp b/src/mame/drivers/airraid.cpp
index 4d38e6d20ea..483e0215932 100644
--- a/src/mame/drivers/airraid.cpp
+++ b/src/mame/drivers/airraid.cpp
@@ -149,23 +149,26 @@ Stephh's notes (based on the game Z80 code and some tests) :
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "sound/ym2151.h"
#include "audio/seibu.h"
#include "video/airraid_dev.h"
+#include "cpu/z80/z80.h"
+#include "sound/ym2151.h"
+#include "speaker.h"
+
+
class airraid_state : public driver_device
{
public:
airraid_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_seibu_sound(*this, "seibu_sound"),
- m_mainram(*this, "mainram"),
- m_palette(*this, "palette"),
- m_decrypted_opcodes(*this, "decrypted_opcodes"),
- m_airraid_video(*this,"airraid_vid")
- { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_seibu_sound(*this, "seibu_sound")
+ , m_mainram(*this, "mainram")
+ , m_palette(*this, "palette")
+ , m_decrypted_opcodes(*this, "decrypted_opcodes")
+ , m_airraid_video(*this,"airraid_vid")
+ { }
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/ajax.cpp b/src/mame/drivers/ajax.cpp
index f2e1680228f..71e22cdc537 100644
--- a/src/mame/drivers/ajax.cpp
+++ b/src/mame/drivers/ajax.cpp
@@ -13,12 +13,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/ajax.h"
+#include "includes/konamipt.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6809/konami.h"
#include "sound/ym2151.h"
-#include "includes/ajax.h"
-#include "includes/konamipt.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START( ajax_main_map, AS_PROGRAM, 8, ajax_state )
AM_RANGE(0x0000, 0x01c0) AM_READWRITE(ls138_f10_r, ls138_f10_w) /* bankswitch + sound command + FIRQ command */
diff --git a/src/mame/drivers/albazc.cpp b/src/mame/drivers/albazc.cpp
index c69d8d9f75f..48b5b9cf030 100644
--- a/src/mame/drivers/albazc.cpp
+++ b/src/mame/drivers/albazc.cpp
@@ -15,6 +15,8 @@ TODO:
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class albazc_state : public driver_device
{
diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp
index f5d2978b4be..87631b6fc1a 100644
--- a/src/mame/drivers/albazg.cpp
+++ b/src/mame/drivers/albazg.cpp
@@ -41,6 +41,8 @@ PCB:
#include "machine/watchdog.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_12MHz
diff --git a/src/mame/drivers/aleck64.cpp b/src/mame/drivers/aleck64.cpp
index 2dcc1a094bd..6f6893ec760 100644
--- a/src/mame/drivers/aleck64.cpp
+++ b/src/mame/drivers/aleck64.cpp
@@ -174,10 +174,14 @@ Notes:
*/
#include "emu.h"
+#include "includes/n64.h"
+
#include "cpu/rsp/rsp.h"
#include "cpu/mips/mips3.h"
#include "sound/dmadac.h"
-#include "includes/n64.h"
+#include "screen.h"
+#include "speaker.h"
+
class aleck64_state : public n64_state
{
diff --git a/src/mame/drivers/aleisttl.cpp b/src/mame/drivers/aleisttl.cpp
index 51c2e64ff1a..dce966f2c5e 100644
--- a/src/mame/drivers/aleisttl.cpp
+++ b/src/mame/drivers/aleisttl.cpp
@@ -30,6 +30,7 @@
#include "machine/netlist.h"
#include "netlist/devices/net_lib.h"
#include "video/fixfreq.h"
+#include "screen.h"
// copied by Pong, not accurate for this driver!
// start
diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp
index d8c117ce0b9..5c6710d4630 100644
--- a/src/mame/drivers/alesis.cpp
+++ b/src/mame/drivers/alesis.cpp
@@ -15,6 +15,7 @@
#include "emu.h"
#include "includes/alesis.h"
#include "sr16.lh"
+#include "screen.h"
WRITE8_MEMBER( alesis_state::kb_matrix_w )
diff --git a/src/mame/drivers/alg.cpp b/src/mame/drivers/alg.cpp
index 258e2df1a35..4a41651b219 100644
--- a/src/mame/drivers/alg.cpp
+++ b/src/mame/drivers/alg.cpp
@@ -23,12 +23,13 @@
**************************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
-#include "render.h"
#include "includes/amiga.h"
+#include "cpu/m68000/m68000.h"
#include "machine/ldp1450.h"
#include "machine/nvram.h"
#include "machine/amigafdc.h"
+#include "render.h"
+#include "speaker.h"
class alg_state : public amiga_state
diff --git a/src/mame/drivers/alien.cpp b/src/mame/drivers/alien.cpp
index e3104b47231..4b18f13034e 100644
--- a/src/mame/drivers/alien.cpp
+++ b/src/mame/drivers/alien.cpp
@@ -18,6 +18,8 @@
#include "emu.h"
#include "cpu/sh4/sh4.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_200MHz
diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp
index 257c70ab0ab..4809e3846e6 100644
--- a/src/mame/drivers/aliens.cpp
+++ b/src/mame/drivers/aliens.cpp
@@ -10,12 +10,14 @@ Preliminary driver by:
***************************************************************************/
#include "emu.h"
+#include "includes/aliens.h"
+#include "includes/konamipt.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */
#include "machine/watchdog.h"
#include "sound/ym2151.h"
-#include "includes/konamipt.h"
-#include "includes/aliens.h"
+#include "speaker.h"
WRITE8_MEMBER(aliens_state::aliens_coin_counter_w)
diff --git a/src/mame/drivers/alinvade.cpp b/src/mame/drivers/alinvade.cpp
index f3f7b3781b6..f7d83ccc975 100644
--- a/src/mame/drivers/alinvade.cpp
+++ b/src/mame/drivers/alinvade.cpp
@@ -22,8 +22,12 @@
#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/discrete.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "alinvade.lh"
+
class alinvade_state : public driver_device
{
public:
diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp
index df37a9da3f3..43f9acf7a42 100644
--- a/src/mame/drivers/alpha68k.cpp
+++ b/src/mame/drivers/alpha68k.cpp
@@ -186,6 +186,7 @@ DIP locations verified from manuals for:
#include "emu.h"
#include "includes/alpha68k.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/mcs48/mcs48.h"
#include "cpu/z80/z80.h"
@@ -195,7 +196,8 @@ DIP locations verified from manuals for:
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "sound/ym2413.h"
-
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp
index 8e2e440bcb9..86b6145ab2b 100644
--- a/src/mame/drivers/alphasma.cpp
+++ b/src/mame/drivers/alphasma.cpp
@@ -18,6 +18,7 @@
#include "machine/ram.h"
#include "video/hd44780.h"
#include "rendlay.h"
+#include "screen.h"
class alphasmart_state : public driver_device
{
diff --git a/src/mame/drivers/alphatro.cpp b/src/mame/drivers/alphatro.cpp
index 10960dd493d..9380cd1db3a 100644
--- a/src/mame/drivers/alphatro.cpp
+++ b/src/mame/drivers/alphatro.cpp
@@ -38,14 +38,16 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
-#include "machine/i8251.h"
-#include "machine/clock.h"
#include "imagedev/cassette.h"
+#include "machine/clock.h"
+#include "machine/i8251.h"
+#include "machine/ram.h"
#include "sound/beep.h"
#include "sound/wave.h"
-#include "machine/ram.h"
+#include "video/mc6845.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_4MHz
diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp
index cd69efbe400..3d3ae5cdb9e 100644
--- a/src/mame/drivers/alto2.cpp
+++ b/src/mame/drivers/alto2.cpp
@@ -6,10 +6,11 @@
***************************************************************************/
#include "emu.h"
-#include "rendlay.h"
-#include "sound/speaker.h"
#include "cpu/alto2/alto2cpu.h"
#include "machine/diablo_hd.h"
+#include "screen.h"
+#include "rendlay.h"
+#include "speaker.h"
class alto2_state : public driver_device
{
diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp
index be832f8c9cf..443e13a0f7e 100644
--- a/src/mame/drivers/amaticmg.cpp
+++ b/src/mame/drivers/amaticmg.cpp
@@ -410,22 +410,24 @@
***********************************************************************************/
-#define MASTER_CLOCK XTAL_16MHz
-#define CPU_CLOCK MASTER_CLOCK/4 /* guess */
-#define SND_CLOCK MASTER_CLOCK/4 /* guess */
-#define CRTC_CLOCK MASTER_CLOCK/8 /* guess */
-
-
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
#include "machine/i8255.h"
#include "sound/3812intf.h"
+#include "video/mc6845.h"
//#include "sound/dac.h"
+#include "screen.h"
+#include "speaker.h"
#include "suprstar.lh"
+#define MASTER_CLOCK XTAL_16MHz
+#define CPU_CLOCK MASTER_CLOCK/4 /* guess */
+#define SND_CLOCK MASTER_CLOCK/4 /* guess */
+#define CRTC_CLOCK MASTER_CLOCK/8 /* guess */
+
+
class amaticmg_state : public driver_device
{
public:
diff --git a/src/mame/drivers/amazonlf.cpp b/src/mame/drivers/amazonlf.cpp
index c5273db0d7d..8cf69f73a26 100644
--- a/src/mame/drivers/amazonlf.cpp
+++ b/src/mame/drivers/amazonlf.cpp
@@ -8,6 +8,7 @@
#include "emu.h"
#include "cpu/se3208/se3208.h"
+#include "screen.h"
class amazonlf_state : public driver_device
diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp
index 1bd1ed724b6..963881a350e 100644
--- a/src/mame/drivers/ambush.cpp
+++ b/src/mame/drivers/ambush.cpp
@@ -47,6 +47,8 @@
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/amerihok.cpp b/src/mame/drivers/amerihok.cpp
index aa8a19ae9e2..9813a6f0379 100644
--- a/src/mame/drivers/amerihok.cpp
+++ b/src/mame/drivers/amerihok.cpp
@@ -17,6 +17,7 @@ Processor is unknown
#include "emu.h"
#include "sound/okim6295.h"
+#include "speaker.h"
class amerihok_state : public driver_device
diff --git a/src/mame/drivers/amiga.cpp b/src/mame/drivers/amiga.cpp
index 868ce35a369..7942fe75515 100644
--- a/src/mame/drivers/amiga.cpp
+++ b/src/mame/drivers/amiga.cpp
@@ -24,6 +24,7 @@
#include "machine/cr511b.h"
#include "machine/rp5c01.h"
#include "softlist.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/ampoker2.cpp b/src/mame/drivers/ampoker2.cpp
index ac9028853cd..4064a91aa5b 100644
--- a/src/mame/drivers/ampoker2.cpp
+++ b/src/mame/drivers/ampoker2.cpp
@@ -377,12 +377,16 @@
#define MASTER_CLOCK XTAL_6MHz
#include "emu.h"
+#include "includes/ampoker2.h"
+
#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "ampoker2.lh"
#include "sigmapkr.lh"
-#include "includes/ampoker2.h"
/**********************
* Read/Write Handlers *
diff --git a/src/mame/drivers/amspdwy.cpp b/src/mame/drivers/amspdwy.cpp
index 750cee42f04..2cd9a43f0f3 100644
--- a/src/mame/drivers/amspdwy.cpp
+++ b/src/mame/drivers/amspdwy.cpp
@@ -16,8 +16,10 @@ Sound: YM2151
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/amspdwy.h"
+#include "cpu/z80/z80.h"
+#include "speaker.h"
+
/***************************************************************************
diff --git a/src/mame/drivers/amstrad.cpp b/src/mame/drivers/amstrad.cpp
index 4cc247e17ea..78d6f3ac514 100644
--- a/src/mame/drivers/amstrad.cpp
+++ b/src/mame/drivers/amstrad.cpp
@@ -110,6 +110,7 @@ Some bugs left :
#include "machine/ram.h"
#include "softlist.h"
+#include "speaker.h"
#define MANUFACTURER_NAME 0x07
#define TV_REFRESH_RATE 0x10
diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp
index b367be69283..0204669d39e 100644
--- a/src/mame/drivers/amusco.cpp
+++ b/src/mame/drivers/amusco.cpp
@@ -70,6 +70,21 @@
*******************************************************************************/
+#include "emu.h"
+#include "cpu/i86/i86.h"
+#include "machine/i8155.h"
+#include "machine/i8255.h"
+#include "machine/msm5832.h"
+#include "machine/pic8259.h"
+#include "machine/pit8253.h"
+#include "machine/ticket.h"
+#include "sound/sn76496.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
+#include "amusco.lh"
+
#define MASTER_CLOCK XTAL_22_1184MHz /* confirmed */
#define SECOND_CLOCK XTAL_15MHz /* confirmed */
@@ -82,18 +97,6 @@
#define COIN_IMPULSE 3
-#include "emu.h"
-#include "cpu/i86/i86.h"
-#include "video/mc6845.h"
-#include "machine/i8155.h"
-#include "machine/i8255.h"
-#include "sound/sn76496.h"
-#include "machine/pic8259.h"
-#include "machine/pit8253.h"
-#include "machine/msm5832.h"
-#include "machine/ticket.h"
-#include "amusco.lh"
-
class amusco_state : public driver_device
{
diff --git a/src/mame/drivers/amust.cpp b/src/mame/drivers/amust.cpp
index aede4b8c60a..ddfabb1315d 100644
--- a/src/mame/drivers/amust.cpp
+++ b/src/mame/drivers/amust.cpp
@@ -82,13 +82,15 @@ ToDo:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
-#include "machine/upd765.h"
+#include "machine/i8251.h"
+#include "machine/i8255.h"
#include "machine/keyboard.h"
#include "machine/pit8253.h"
-#include "machine/i8255.h"
-#include "machine/i8251.h"
+#include "machine/upd765.h"
#include "sound/beep.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
class amust_state : public driver_device
diff --git a/src/mame/drivers/angelkds.cpp b/src/mame/drivers/angelkds.cpp
index a3c9500c2e5..508ee65216f 100644
--- a/src/mame/drivers/angelkds.cpp
+++ b/src/mame/drivers/angelkds.cpp
@@ -124,13 +124,15 @@ Dumped by Chackn
#include "emu.h"
+#include "includes/angelkds.h"
+
#include "cpu/z80/z80.h"
+#include "machine/i8255.h"
#include "machine/segacrp2_device.h"
#include "sound/2203intf.h"
-#include "includes/angelkds.h"
-#include "machine/i8255.h"
-
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/anzterm.cpp b/src/mame/drivers/anzterm.cpp
index f65a2d4e7f9..a35bb37c52d 100644
--- a/src/mame/drivers/anzterm.cpp
+++ b/src/mame/drivers/anzterm.cpp
@@ -350,6 +350,7 @@ Components:
#include "machine/6850acia.h"
#include "machine/i8214.h"
#include "machine/mc6854.h"
+#include "screen.h"
namespace {
diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp
index a103be3142e..6d5a6014e8e 100644
--- a/src/mame/drivers/apc.cpp
+++ b/src/mame/drivers/apc.cpp
@@ -54,15 +54,17 @@
#include "emu.h"
#include "cpu/i86/i86.h"
-#include "sound/upd1771.h"
+#include "machine/am9517a.h"
+#include "machine/nvram.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
-#include "machine/am9517a.h"
-#include "machine/upd765.h"
#include "machine/upd1990a.h"
-#include "machine/nvram.h"
+#include "machine/upd765.h"
+#include "sound/upd1771.h"
#include "video/upd7220.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
//#include "sound/ay8910.h"
#define MAIN_CLOCK XTAL_5MHz
diff --git a/src/mame/drivers/apexc.cpp b/src/mame/drivers/apexc.cpp
index 4e2337ad84d..434ff5f9c14 100644
--- a/src/mame/drivers/apexc.cpp
+++ b/src/mame/drivers/apexc.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "cpu/apexc/apexc.h"
+#include "screen.h"
class apexc_state : public driver_device
@@ -96,7 +97,7 @@ private:
int m_writable;
};
-const device_type APEXC_CYLINDER = &device_creator<apexc_cylinder_image_device>;
+const device_type APEXC_CYLINDER = device_creator<apexc_cylinder_image_device>;
apexc_cylinder_image_device::apexc_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, APEXC_CYLINDER, "APEXC Cylinder", tag, owner, clock, "apexc_cylinder_image", __FILE__),
@@ -218,7 +219,7 @@ protected:
virtual void device_start() override { }
};
-const device_type APEXC_TAPE_PUNCHER = &device_creator<apexc_tape_puncher_image_device>;
+const device_type APEXC_TAPE_PUNCHER = device_creator<apexc_tape_puncher_image_device>;
apexc_tape_puncher_image_device::apexc_tape_puncher_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, APEXC_TAPE_PUNCHER, "APEXC Tape Puncher", tag, owner, clock, "apexc_tape_puncher_image", __FILE__),
@@ -250,7 +251,7 @@ protected:
virtual void device_start() override { }
};
-const device_type APEXC_TAPE_READER = &device_creator<apexc_tape_reader_image_device>;
+const device_type APEXC_TAPE_READER = device_creator<apexc_tape_reader_image_device>;
apexc_tape_reader_image_device::apexc_tape_reader_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, APEXC_TAPE_READER, "APEXC Tape Reader", tag, owner, clock, "apexc_tape_reader_image", __FILE__),
diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp
index 75f6e772a93..4560eb43d4b 100644
--- a/src/mame/drivers/apf.cpp
+++ b/src/mame/drivers/apf.cpp
@@ -69,20 +69,24 @@ ToDo:
******************************************************************************************************************/
#include "emu.h"
+
#include "cpu/m6800/m6800.h"
-#include "video/mc6847.h"
-#include "sound/speaker.h"
-#include "sound/wave.h"
-#include "machine/6821pia.h"
-#include "machine/wd_fdc.h"
-#include "imagedev/cassette.h"
#include "formats/apf_apt.h"
+#include "imagedev/cassette.h"
+#include "machine/6821pia.h"
#include "machine/ram.h"
+#include "machine/wd_fdc.h"
+#include "sound/spkrdev.h"
+#include "sound/wave.h"
+#include "video/mc6847.h"
#include "bus/apf/slot.h"
#include "bus/apf/rom.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
class apf_state : public driver_device
{
diff --git a/src/mame/drivers/apogee.cpp b/src/mame/drivers/apogee.cpp
index dce85b753b8..eb402beb804 100644
--- a/src/mame/drivers/apogee.cpp
+++ b/src/mame/drivers/apogee.cpp
@@ -10,15 +10,21 @@
#include "emu.h"
+#include "includes/radio86.h"
+
#include "cpu/i8085/i8085.h"
-#include "sound/wave.h"
-#include "sound/speaker.h"
+#include "imagedev/cassette.h"
#include "machine/i8255.h"
#include "machine/pit8253.h"
-#include "imagedev/cassette.h"
-#include "formats/rk_cas.h"
-#include "includes/radio86.h"
+#include "sound/spkrdev.h"
+#include "sound/wave.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/rk_cas.h"
+
class apogee_state : public radio86_state
{
diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp
index 0610626d2b9..957de372d17 100644
--- a/src/mame/drivers/apollo.cpp
+++ b/src/mame/drivers/apollo.cpp
@@ -23,19 +23,25 @@
* - data sheets from Intel and Motorola
*/
+#include "emu.h"
+
#define VERBOSE 0
-#include "emu.h"
#include "includes/apollo.h"
-#include "debugger.h"
+
#include "cpu/m68000/m68kcpu.h"
#include "sound/beep.h"
-#include "apollo_dsp.lh"
// we use set_verbose
#include "bus/isa/omti8621.h"
#include "bus/isa/3c505.h"
+#include "debugger.h"
+#include "speaker.h"
+
+#include "apollo_dsp.lh"
+
+
#define TERMINAL_TAG "terminal"
// we use this to prevent excessive logging (if emulation runs amok)
diff --git a/src/mame/drivers/apple1.cpp b/src/mame/drivers/apple1.cpp
index 99d7f4b58b0..b343274879f 100644
--- a/src/mame/drivers/apple1.cpp
+++ b/src/mame/drivers/apple1.cpp
@@ -80,6 +80,7 @@
#include "bus/a1bus/a1cassette.h"
#include "bus/a1bus/a1cffa.h"
+#include "screen.h"
#include "softlist.h"
#define A1_CPU_TAG "maincpu"
diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp
index 17a77f3ba3a..409dfd8f671 100644
--- a/src/mame/drivers/apple2.cpp
+++ b/src/mame/drivers/apple2.cpp
@@ -39,50 +39,49 @@ II Plus: RAM options reduced to 16/32/48 KB.
************************************************************************/
#include "emu.h"
-#include "machine/bankdev.h"
-#include "machine/ram.h"
-#include "machine/kb3600.h"
-#include "sound/speaker.h"
-#include "imagedev/flopdrv.h"
-#include "imagedev/cassette.h"
-#include "formats/ap2_dsk.h"
-#include "cpu/m6502/m6502.h"
#include "includes/apple2.h"
#include "video/apple2.h"
-#include "bus/a2bus/a2bus.h"
+#include "machine/bankdev.h"
+#include "imagedev/flopdrv.h"
+
+#include "bus/a2bus/a2alfam2.h"
+#include "bus/a2bus/a2applicard.h"
+#include "bus/a2bus/a2arcadebd.h"
+#include "bus/a2bus/a2cffa.h"
+#include "bus/a2bus/a2corvus.h"
#include "bus/a2bus/a2diskii.h"
#include "bus/a2bus/a2diskiing.h"
-#include "bus/a2bus/a2mockingboard.h"
-#include "bus/a2bus/a2cffa.h"
+#include "bus/a2bus/a2dx1.h"
+#include "bus/a2bus/a2echoii.h"
+#include "bus/a2bus/a2mcms.h"
#include "bus/a2bus/a2memexp.h"
+#include "bus/a2bus/a2midi.h"
+#include "bus/a2bus/a2mockingboard.h"
+#include "bus/a2bus/a2pic.h"
+#include "bus/a2bus/a2sam.h"
#include "bus/a2bus/a2scsi.h"
-#include "bus/a2bus/a2thunderclock.h"
#include "bus/a2bus/a2softcard.h"
-#include "bus/a2bus/a2videoterm.h"
#include "bus/a2bus/a2ssc.h"
#include "bus/a2bus/a2swyft.h"
#include "bus/a2bus/a2themill.h"
-#include "bus/a2bus/a2sam.h"
-#include "bus/a2bus/a2alfam2.h"
-#include "bus/a2bus/laser128.h"
-#include "bus/a2bus/a2echoii.h"
-#include "bus/a2bus/a2arcadebd.h"
-#include "bus/a2bus/a2midi.h"
-#include "bus/a2bus/a2zipdrive.h"
-#include "bus/a2bus/a2applicard.h"
+#include "bus/a2bus/a2thunderclock.h"
#include "bus/a2bus/a2ultraterm.h"
-#include "bus/a2bus/a2pic.h"
-#include "bus/a2bus/a2corvus.h"
-#include "bus/a2bus/a2mcms.h"
-#include "bus/a2bus/a2dx1.h"
-#include "bus/a2bus/timemasterho.h"
+#include "bus/a2bus/a2videoterm.h"
+#include "bus/a2bus/a2zipdrive.h"
+#include "bus/a2bus/ezcgi.h"
+#include "bus/a2bus/laser128.h"
#include "bus/a2bus/mouse.h"
-#include "bus/a2bus/ramcard16k.h"
#include "bus/a2bus/ramcard128k.h"
-#include "bus/a2bus/ezcgi.h"
+#include "bus/a2bus/ramcard16k.h"
+#include "bus/a2bus/timemasterho.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/ap2_dsk.h"
+
#define A2_CPU_TAG "maincpu"
#define A2_KBDC_TAG "ay3600"
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index 80d3cc41f95..b00021c6f61 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -97,23 +97,20 @@ Address bus A0-A11 is Y0-Y11
***************************************************************************/
#include "emu.h"
-#include "machine/bankdev.h"
-#include "machine/ram.h"
-#include "machine/kb3600.h"
-#include "sound/speaker.h"
-#include "imagedev/flopdrv.h"
-#include "imagedev/cassette.h"
-#include "formats/ap2_dsk.h"
+#include "video/apple2.h"
+
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/m65c02.h"
-#include "cpu/z80/z80.h"
#include "cpu/mcs48/mcs48.h"
-#include "formats/ap_dsk35.h"
-#include "machine/sonydriv.h"
+#include "cpu/z80/z80.h"
+#include "imagedev/cassette.h"
+#include "imagedev/flopdrv.h"
#include "machine/appldriv.h"
-#include "bus/rs232/rs232.h"
+#include "machine/bankdev.h"
+#include "machine/kb3600.h"
#include "machine/mos6551.h"
-#include "video/apple2.h"
+#include "machine/ram.h"
+#include "machine/sonydriv.h"
#include "bus/a2bus/a2bus.h"
#include "bus/a2bus/a2diskii.h"
@@ -150,7 +147,15 @@ Address bus A0-A11 is Y0-Y11
#include "bus/a2bus/a2eext80col.h"
#include "bus/a2bus/a2eramworks3.h"
+#include "bus/rs232/rs232.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/ap2_dsk.h"
+#include "formats/ap_dsk35.h"
+
#define A2_CPU_TAG "maincpu"
#define A2_KBDC_TAG "ay3600"
diff --git a/src/mame/drivers/apple2gs.cpp b/src/mame/drivers/apple2gs.cpp
index 5d31f13b25e..251c754b77c 100644
--- a/src/mame/drivers/apple2gs.cpp
+++ b/src/mame/drivers/apple2gs.cpp
@@ -44,22 +44,18 @@
#include "emu.h"
-#include "cpu/g65816/g65816.h"
#include "includes/apple2.h"
#include "includes/apple2e.h"
-#include "imagedev/flopdrv.h"
-#include "formats/ap2_dsk.h"
-#include "formats/ap_dsk35.h"
#include "includes/apple2gs.h"
-#include "machine/sonydriv.h"
+
+#include "cpu/g65816/g65816.h"
+#include "imagedev/flopdrv.h"
#include "machine/appldriv.h"
-#include "sound/es5503.h"
#include "machine/applefdc.h"
+#include "machine/sonydriv.h"
#include "machine/z80scc.h"
-#include "sound/speaker.h"
-#include "machine/ram.h"
+#include "sound/es5503.h"
-#include "bus/a2bus/a2bus.h"
#include "bus/a2bus/a2diskii.h"
#include "bus/a2bus/a2mockingboard.h"
#include "bus/a2bus/a2cffa.h"
@@ -78,9 +74,13 @@
//#include "bus/a2bus/a2udrive.h"
#include "bus/a2bus/a2hsscsi.h"
-#include "bus/rs232/rs232.h"
-
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/ap_dsk35.h"
+#include "formats/ap2_dsk.h"
+
static const gfx_layout apple2gs_text_layout =
{
diff --git a/src/mame/drivers/apple3.cpp b/src/mame/drivers/apple3.cpp
index 68a43923597..d78f7c6e80b 100644
--- a/src/mame/drivers/apple3.cpp
+++ b/src/mame/drivers/apple3.cpp
@@ -19,7 +19,6 @@
#include "emu.h"
#include "includes/apple3.h"
#include "includes/apple2.h"
-#include "bus/rs232/rs232.h"
#include "sound/volt_reg.h"
#include "formats/ap2_dsk.h"
@@ -28,7 +27,11 @@
#include "bus/a2bus/a2thunderclock.h"
#include "bus/a2bus/mouse.h"
+#include "bus/rs232/rs232.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
static ADDRESS_MAP_START( apple3_map, AS_PROGRAM, 8, apple3_state )
AM_RANGE(0x0000, 0xffff) AM_READWRITE(apple3_memory_r, apple3_memory_w)
diff --git a/src/mame/drivers/applix.cpp b/src/mame/drivers/applix.cpp
index f0a23ef55f1..04316b8a2a3 100644
--- a/src/mame/drivers/applix.cpp
+++ b/src/mame/drivers/applix.cpp
@@ -35,18 +35,23 @@
****************************************************************************/
#include "emu.h"
+
+#include "bus/centronics/ctronics.h"
#include "cpu/m68000/m68000.h"
-#include "cpu/z80/z80.h"
#include "cpu/mcs51/mcs51.h"
-#include "video/mc6845.h"
+#include "cpu/z80/z80.h"
+#include "imagedev/cassette.h"
#include "machine/6522via.h"
#include "machine/wd_fdc.h"
#include "sound/dac.h"
-#include "sound/wave.h"
#include "sound/volt_reg.h"
+#include "sound/wave.h"
+#include "video/mc6845.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "formats/applix_dsk.h"
-#include "imagedev/cassette.h"
-#include "bus/centronics/ctronics.h"
diff --git a/src/mame/drivers/appoooh.cpp b/src/mame/drivers/appoooh.cpp
index a2aab70cc97..826102a3001 100644
--- a/src/mame/drivers/appoooh.cpp
+++ b/src/mame/drivers/appoooh.cpp
@@ -164,10 +164,13 @@ Language
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/appoooh.h"
+
+#include "cpu/z80/z80.h"
#include "machine/segacrp2_device.h"
#include "sound/sn76496.h"
+#include "screen.h"
+#include "speaker.h"
WRITE_LINE_MEMBER(appoooh_state::adpcm_int)
diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp
index 91f6842d433..8926e21e3e8 100644
--- a/src/mame/drivers/apricot.cpp
+++ b/src/mame/drivers/apricot.cpp
@@ -12,24 +12,26 @@
***************************************************************************/
#include "emu.h"
+#include "bus/apricot/expansion/expansion.h"
+#include "bus/apricot/keyboard/keyboard.h"
+#include "bus/centronics/ctronics.h"
+#include "bus/rs232/rs232.h"
#include "cpu/i86/i86.h"
#include "cpu/i8089/i8089.h"
+#include "formats/apridisk.h"
+#include "imagedev/flopdrv.h"
#include "machine/ram.h"
-#include "machine/pit8253.h"
+#include "machine/74153.h"
#include "machine/i8255.h"
#include "machine/pic8259.h"
-#include "machine/z80dart.h"
-#include "machine/74153.h"
+#include "machine/pit8253.h"
#include "machine/wd_fdc.h"
-#include "video/mc6845.h"
+#include "machine/z80dart.h"
#include "sound/sn76496.h"
-#include "imagedev/flopdrv.h"
-#include "formats/apridisk.h"
-#include "bus/centronics/ctronics.h"
-#include "bus/rs232/rs232.h"
-#include "bus/apricot/expansion/expansion.h"
-#include "bus/apricot/keyboard/keyboard.h"
+#include "video/mc6845.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/apricotf.cpp b/src/mame/drivers/apricotf.cpp
index f6acd741289..ea689b1ea29 100644
--- a/src/mame/drivers/apricotf.cpp
+++ b/src/mame/drivers/apricotf.cpp
@@ -25,17 +25,18 @@
*/
#include "emu.h"
+#include "bus/centronics/ctronics.h"
#include "cpu/i86/i86.h"
#include "cpu/z80/z80daisy.h"
+#include "formats/apridisk.h"
#include "imagedev/flopdrv.h"
#include "machine/apricotkb.h"
#include "machine/buffer.h"
-#include "bus/centronics/ctronics.h"
+#include "machine/input_merger.h"
#include "machine/wd_fdc.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
-#include "machine/input_merger.h"
-#include "formats/apridisk.h"
+#include "screen.h"
//**************************************************************************
diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp
index 9a7170f8d6d..e80068a7f2a 100644
--- a/src/mame/drivers/apricotp.cpp
+++ b/src/mame/drivers/apricotp.cpp
@@ -25,11 +25,12 @@
*/
#include "emu.h"
+#include "bus/centronics/ctronics.h"
#include "cpu/i86/i86.h"
#include "cpu/m6800/m6800.h"
+#include "formats/apridisk.h"
#include "machine/am9517a.h"
#include "machine/apricotkb.h"
-#include "bus/centronics/ctronics.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/ram.h"
@@ -37,7 +38,8 @@
#include "machine/z80dart.h"
#include "sound/sn76496.h"
#include "video/mc6845.h"
-#include "formats/apridisk.h"
+#include "screen.h"
+#include "speaker.h"
#include "apricotp.lh"
diff --git a/src/mame/drivers/aquarium.cpp b/src/mame/drivers/aquarium.cpp
index 128de28049c..dd76b6167f4 100644
--- a/src/mame/drivers/aquarium.cpp
+++ b/src/mame/drivers/aquarium.cpp
@@ -51,10 +51,12 @@ Notes:
#include "emu.h"
+#include "includes/aquarium.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/ym2151.h"
-#include "includes/aquarium.h"
+#include "speaker.h"
READ16_MEMBER(aquarium_state::aquarium_coins_r)
diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp
index 8aab033b2eb..987e23c69d0 100644
--- a/src/mame/drivers/aquarius.cpp
+++ b/src/mame/drivers/aquarius.cpp
@@ -23,7 +23,10 @@
#include "emu.h"
#include "includes/aquarius.h"
+
#include "softlist.h"
+#include "speaker.h"
+
/***************************************************************************
CONSTANTS
diff --git a/src/mame/drivers/arabian.cpp b/src/mame/drivers/arabian.cpp
index df243930db2..fa511214a28 100644
--- a/src/mame/drivers/arabian.cpp
+++ b/src/mame/drivers/arabian.cpp
@@ -45,10 +45,14 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/mb88xx/mb88xx.h"
#include "includes/arabian.h"
+
+#include "cpu/mb88xx/mb88xx.h"
+#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
/* constants */
#define MAIN_OSC XTAL_12MHz
diff --git a/src/mame/drivers/arachnid.cpp b/src/mame/drivers/arachnid.cpp
index 9256ff64deb..8e3e2506e55 100644
--- a/src/mame/drivers/arachnid.cpp
+++ b/src/mame/drivers/arachnid.cpp
@@ -61,10 +61,11 @@
#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
-#include "machine/ram.h"
#include "machine/6840ptm.h"
+#include "machine/ram.h"
+#include "sound/spkrdev.h"
#include "video/tms9928a.h"
-#include "sound/speaker.h"
+#include "speaker.h"
#define SCREEN_TAG "screen"
#define M6809_TAG "u3"
diff --git a/src/mame/drivers/arcadecl.cpp b/src/mame/drivers/arcadecl.cpp
index 1fd36da6c5f..0c6b488ea7a 100644
--- a/src/mame/drivers/arcadecl.cpp
+++ b/src/mame/drivers/arcadecl.cpp
@@ -69,11 +69,12 @@
#include "emu.h"
+#include "includes/arcadecl.h"
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
#include "sound/okim6295.h"
#include "video/atarimo.h"
-#include "includes/arcadecl.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_14_31818MHz
diff --git a/src/mame/drivers/arcadia.cpp b/src/mame/drivers/arcadia.cpp
index d747a5bd795..905f0b0b70d 100644
--- a/src/mame/drivers/arcadia.cpp
+++ b/src/mame/drivers/arcadia.cpp
@@ -122,6 +122,7 @@ anything in hardware. No cartridge has been found which uses them.
#include "emu.h"
#include "includes/arcadia.h"
#include "softlist.h"
+#include "speaker.h"
static ADDRESS_MAP_START( arcadia_mem, AS_PROGRAM, 8, arcadia_state )
AM_RANGE( 0x0000, 0x0fff) AM_DEVREAD("cartslot", arcadia_cart_slot_device, read_rom)
diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp
index 6aac2c8c2eb..26658e884d0 100644
--- a/src/mame/drivers/argo.cpp
+++ b/src/mame/drivers/argo.cpp
@@ -25,6 +25,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class argo_state : public driver_device
@@ -40,7 +41,7 @@ public:
, m_maincpu(*this, "maincpu")
, m_p_videoram(*this, "videoram")
, m_p_chargen(*this, "chargen")
- { }
+ { }
DECLARE_WRITE8_MEMBER(argo_videoram_w);
DECLARE_READ8_MEMBER(argo_io_r);
diff --git a/src/mame/drivers/argus.cpp b/src/mame/drivers/argus.cpp
index 36e9d6606ce..d70019516d4 100644
--- a/src/mame/drivers/argus.cpp
+++ b/src/mame/drivers/argus.cpp
@@ -120,10 +120,12 @@ Known issues :
#include "emu.h"
+#include "includes/argus.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/2203intf.h"
-#include "includes/argus.h"
+#include "speaker.h"
void argus_state::machine_start()
diff --git a/src/mame/drivers/aristmk4.cpp b/src/mame/drivers/aristmk4.cpp
index 0ccc8880f28..c551afcf7f3 100644
--- a/src/mame/drivers/aristmk4.cpp
+++ b/src/mame/drivers/aristmk4.cpp
@@ -320,6 +320,8 @@
#include "sound/samples.h"
#include "machine/mc146818.h" // DALLAS1287 is functionally compatible.
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
// Button panel and lamps
#include "aristmk4.lh" // AU 90cr with gamble
diff --git a/src/mame/drivers/aristmk5.cpp b/src/mame/drivers/aristmk5.cpp
index 0951825a890..181536eb02f 100644
--- a/src/mame/drivers/aristmk5.cpp
+++ b/src/mame/drivers/aristmk5.cpp
@@ -167,10 +167,9 @@
*****************************************************************************************************************/
-#define MASTER_CLOCK XTAL_72MHz /* confirmed */
-
#include "emu.h"
#include "includes/archimds.h"
+
#include "cpu/arm/arm.h"
#include "machine/ds1302.h"
#include "machine/watchdog.h"
@@ -181,10 +180,13 @@
#include "machine/ins8250.h"
#include "machine/ticket.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
#include "aristmk5.lh"
#include "aristmk5_us.lh"
+#define MASTER_CLOCK XTAL_72MHz /* confirmed */
+
class aristmk5_state : public archimedes_state
{
public:
diff --git a/src/mame/drivers/aristmk6.cpp b/src/mame/drivers/aristmk6.cpp
index bbe82626e13..23fd68d8cf3 100644
--- a/src/mame/drivers/aristmk6.cpp
+++ b/src/mame/drivers/aristmk6.cpp
@@ -27,6 +27,7 @@ notes:
#include "cpu/sh4/sh4.h"
#include "machine/ins8250.h"
#include "machine/eepromser.h"
+#include "screen.h"
class aristmk6_state : public driver_device
{
diff --git a/src/mame/drivers/arkanoid.cpp b/src/mame/drivers/arkanoid.cpp
index c0a3ae1546c..22e579fe13c 100644
--- a/src/mame/drivers/arkanoid.cpp
+++ b/src/mame/drivers/arkanoid.cpp
@@ -792,6 +792,9 @@ DIP locations verified for:
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
/***************************************************************************/
diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp
index 7de230d0770..eba42d271af 100644
--- a/src/mame/drivers/armedf.cpp
+++ b/src/mame/drivers/armedf.cpp
@@ -314,6 +314,7 @@ Notes:
#include "emu.h"
#include "includes/armedf.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "cpu/mcs51/mcs51.h"
@@ -321,6 +322,8 @@ Notes:
#include "sound/3812intf.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
#define LEGION_HACK 0
diff --git a/src/mame/drivers/arsystems.cpp b/src/mame/drivers/arsystems.cpp
index 25e81048373..1462b3a770e 100644
--- a/src/mame/drivers/arsystems.cpp
+++ b/src/mame/drivers/arsystems.cpp
@@ -51,10 +51,12 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "includes/amiga.h"
+
+#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
#include "machine/amigafdc.h"
+#include "speaker.h"
// arcadia_state was also defined in mess/includes/arcadia.h
diff --git a/src/mame/drivers/artmagic.cpp b/src/mame/drivers/artmagic.cpp
index 0a19087b19a..ab622dfd96a 100644
--- a/src/mame/drivers/artmagic.cpp
+++ b/src/mame/drivers/artmagic.cpp
@@ -25,13 +25,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/artmagic.h"
+
#include "cpu/m68000/m68000.h"
-#include "cpu/tms34010/tms34010.h"
#include "cpu/mcs51/mcs51.h"
-#include "video/tlc34076.h"
-#include "includes/artmagic.h"
-#include "sound/okim6295.h"
+#include "cpu/tms34010/tms34010.h"
#include "machine/nvram.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK_40MHz (XTAL_40MHz)
diff --git a/src/mame/drivers/ashnojoe.cpp b/src/mame/drivers/ashnojoe.cpp
index 3bab957d1fc..bdccb3808de 100644
--- a/src/mame/drivers/ashnojoe.cpp
+++ b/src/mame/drivers/ashnojoe.cpp
@@ -75,10 +75,14 @@ Coin B is not used
*************************************************************************/
#include "emu.h"
+#include "includes/ashnojoe.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
-#include "includes/ashnojoe.h"
+#include "screen.h"
+#include "speaker.h"
+
READ16_MEMBER(ashnojoe_state::fake_4a00a_r)
{
diff --git a/src/mame/drivers/asst128.cpp b/src/mame/drivers/asst128.cpp
index fb4e47c8f08..78062f8b173 100644
--- a/src/mame/drivers/asst128.cpp
+++ b/src/mame/drivers/asst128.cpp
@@ -24,7 +24,7 @@ DEVICE_ADDRESS_MAP_START( map, 8, asst128_mb_device )
AM_RANGE(0x00a0, 0x00a1) AM_WRITE(nmi_enable_w)
ADDRESS_MAP_END
-const device_type ASST128_MOTHERBOARD = &device_creator<asst128_mb_device>;
+const device_type ASST128_MOTHERBOARD = device_creator<asst128_mb_device>;
class asst128_state : public driver_device
{
diff --git a/src/mame/drivers/asterix.cpp b/src/mame/drivers/asterix.cpp
index 870b05d527c..b6f0d8dd47c 100644
--- a/src/mame/drivers/asterix.cpp
+++ b/src/mame/drivers/asterix.cpp
@@ -13,13 +13,17 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "includes/asterix.h"
+#include "includes/konamipt.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
#include "sound/ym2151.h"
#include "sound/k053260.h"
-#include "includes/konamipt.h"
-#include "includes/asterix.h"
+#include "screen.h"
+#include "speaker.h"
+
#if 0
READ16_MEMBER(asterix_state::control2_r)
diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp
index 08520d50cbd..b3dc69b8303 100644
--- a/src/mame/drivers/asteroid.cpp
+++ b/src/mame/drivers/asteroid.cpp
@@ -186,20 +186,22 @@ There is not a rev 03 known or dumped. An Asteroids rev 03 is not mentioned in a
***************************************************************************/
#include "emu.h"
+#include "includes/asteroid.h"
+#include "audio/llander.h"
#include "cpu/m6502/m6502.h"
-#include "machine/watchdog.h"
-#include "video/vector.h"
-#include "video/avgdvg.h"
#include "machine/atari_vg.h"
-#include "includes/asteroid.h"
+#include "machine/watchdog.h"
#include "sound/discrete.h"
#include "sound/pokey.h"
-#include "audio/llander.h"
+#include "video/avgdvg.h"
+#include "video/vector.h"
+#include "screen.h"
+#include "speaker.h"
#include "astdelux.lh"
#define MASTER_CLOCK (XTAL_12_096MHz)
-#define CLOCK_3KHZ ((double)MASTER_CLOCK / 4096)
+#define CLOCK_3KHZ (double(MASTER_CLOCK) / 4096)
/*************************************
*
diff --git a/src/mame/drivers/astinvad.cpp b/src/mame/drivers/astinvad.cpp
index 9eb6740ee0d..5c1dc027068 100644
--- a/src/mame/drivers/astinvad.cpp
+++ b/src/mame/drivers/astinvad.cpp
@@ -22,6 +22,8 @@ DIP locations verified for:
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "sound/samples.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_2MHz
diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp
index 3f59c92a7cc..c6c5d982231 100644
--- a/src/mame/drivers/astrcorp.cpp
+++ b/src/mame/drivers/astrcorp.cpp
@@ -39,9 +39,12 @@ To do:
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
-#include "machine/ticket.h"
#include "machine/nvram.h"
+#include "machine/ticket.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
class astrocorp_state : public driver_device
{
diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp
index 864c8bd14ad..243e4c3084d 100644
--- a/src/mame/drivers/astrocde.cpp
+++ b/src/mame/drivers/astrocde.cpp
@@ -114,14 +114,17 @@
****************************************************************************/
#include "emu.h"
+#include "includes/astrocde.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
-#include "includes/astrocde.h"
#include "machine/z80ctc.h"
#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "sound/votrax.h"
+#include "speaker.h"
+
#include "gorf.lh"
#include "seawolf2.lh"
#include "spacezap.lh"
diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp
index 278773aefa2..9d82c53b56e 100644
--- a/src/mame/drivers/astrof.cpp
+++ b/src/mame/drivers/astrof.cpp
@@ -59,8 +59,8 @@
#include "emu.h"
-#include "cpu/m6502/m6502.h"
#include "includes/astrof.h"
+#include "cpu/m6502/m6502.h"
#define MASTER_CLOCK (XTAL_10_595MHz)
diff --git a/src/mame/drivers/astrohome.cpp b/src/mame/drivers/astrohome.cpp
index 6881bd86ed6..d26d30c8ce4 100644
--- a/src/mame/drivers/astrohome.cpp
+++ b/src/mame/drivers/astrohome.cpp
@@ -7,24 +7,29 @@
****************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/astrocde.h"
+
+#include "cpu/z80/z80.h"
#include "machine/ram.h"
#include "sound/astrocde.h"
+
#include "bus/astrocde/slot.h"
#include "bus/astrocde/rom.h"
#include "bus/astrocde/exp.h"
#include "bus/astrocde/ram.h"
+
#include "softlist.h"
+#include "speaker.h"
+
class astrocde_mess_state : public astrocde_state
{
public:
astrocde_mess_state(const machine_config &mconfig, device_type type, const char *tag)
- : astrocde_state(mconfig, type, tag),
- m_cart(*this, "cartslot"),
- m_exp(*this, "exp")
- { }
+ : astrocde_state(mconfig, type, tag)
+ , m_cart(*this, "cartslot")
+ , m_exp(*this, "exp")
+ { }
required_device<astrocade_cart_slot_device> m_cart;
required_device<astrocade_exp_device> m_exp;
diff --git a/src/mame/drivers/asuka.cpp b/src/mame/drivers/asuka.cpp
index 3c31e120919..f3024183f46 100644
--- a/src/mame/drivers/asuka.cpp
+++ b/src/mame/drivers/asuka.cpp
@@ -216,17 +216,20 @@ DIP locations verified for:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/z180/z180.h"
-#include "cpu/m68000/m68000.h"
+#include "includes/asuka.h"
#include "includes/taitoipt.h"
#include "audio/taitosnd.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cpu/z180/z180.h"
+#include "cpu/z80/z80.h"
+#include "machine/bonzeadv.h"
#include "machine/watchdog.h"
#include "sound/2610intf.h"
-#include "sound/ym2151.h"
#include "sound/msm5205.h"
-#include "includes/asuka.h"
-#include "machine/bonzeadv.h"
+#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
/***********************************************************
diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp
index aa6d3028863..2ab4695d0d0 100644
--- a/src/mame/drivers/at.cpp
+++ b/src/mame/drivers/at.cpp
@@ -13,19 +13,20 @@
#include "emu.h"
-#include "cpu/i86/i286.h"
+#include "bus/isa/isa_cards.h"
+#include "bus/lpci/pci.h"
+#include "bus/lpci/vt82c505.h"
+#include "bus/pc_kbd/keyboards.h"
#include "cpu/i386/i386.h"
+#include "cpu/i86/i286.h"
#include "machine/at.h"
-#include "machine/wd7600.h"
#include "machine/cs8221.h"
-#include "machine/nvram.h"
-#include "machine/vt82c496.h"
-#include "bus/lpci/pci.h"
-#include "bus/lpci/vt82c505.h"
#include "machine/ds128x.h"
+#include "machine/nvram.h"
#include "machine/ram.h"
-#include "bus/isa/isa_cards.h"
-#include "bus/pc_kbd/keyboards.h"
+#include "machine/vt82c496.h"
+#include "machine/wd7600.h"
+#include "speaker.h"
class at_state : public driver_device
{
diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp
index 1f61e7917d2..6ec9f45976a 100644
--- a/src/mame/drivers/atari400.cpp
+++ b/src/mame/drivers/atari400.cpp
@@ -52,7 +52,9 @@
#include "bus/a800/a800_slot.h"
#include "bus/a800/a800_carts.h"
#include "bus/a800/a8sio.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
/******************************************************************************
Atari 800 memory map (preliminary)
diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp
index 3e0bd7cf300..17b7542c5f9 100644
--- a/src/mame/drivers/atari_s1.cpp
+++ b/src/mame/drivers/atari_s1.cpp
@@ -45,10 +45,13 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/watchdog.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "atari_s1.lh"
diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp
index dd6c3e13a22..9c73c3f77d0 100644
--- a/src/mame/drivers/atari_s2.cpp
+++ b/src/mame/drivers/atari_s2.cpp
@@ -23,10 +23,13 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/watchdog.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "atari_s2.lh"
diff --git a/src/mame/drivers/atarifb.cpp b/src/mame/drivers/atarifb.cpp
index 64572ecbc7d..f4974d239a1 100644
--- a/src/mame/drivers/atarifb.cpp
+++ b/src/mame/drivers/atarifb.cpp
@@ -105,10 +105,11 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m6502.h"
#include "includes/atarifb.h"
+#include "cpu/m6502/m6502.h"
#include "machine/watchdog.h"
#include "sound/discrete.h"
+#include "speaker.h"
#include "atarifb.lh"
#include "atarifb4.lh"
diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp
index 4a9bd7b1bd1..2cb0c189ce4 100644
--- a/src/mame/drivers/atarig1.cpp
+++ b/src/mame/drivers/atarig1.cpp
@@ -21,9 +21,9 @@
#include "emu.h"
-#include "machine/watchdog.h"
-#include "video/atarirle.h"
#include "includes/atarig1.h"
+#include "machine/watchdog.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp
index 1f02a5905c2..4bf18c78daf 100644
--- a/src/mame/drivers/atarig42.cpp
+++ b/src/mame/drivers/atarig42.cpp
@@ -20,9 +20,9 @@
***************************************************************************/
#include "emu.h"
-#include "machine/watchdog.h"
-#include "video/atarirle.h"
#include "includes/atarig42.h"
+#include "machine/watchdog.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/atarigx2.cpp b/src/mame/drivers/atarigx2.cpp
index a76373cbe92..59976ccdc3e 100644
--- a/src/mame/drivers/atarigx2.cpp
+++ b/src/mame/drivers/atarigx2.cpp
@@ -25,9 +25,9 @@
#include "emu.h"
-#include "cpu/m68000/m68000.h"
-#include "video/atarirle.h"
#include "includes/atarigx2.h"
+#include "cpu/m68000/m68000.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index 45c18c7e10a..db674a69a93 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -5,7 +5,9 @@
#include "machine/clock.h"
#include "bus/midi/midi.h"
#include "video/atarist.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
/*
diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp
index f00048b8e6d..6a2401f2a97 100644
--- a/src/mame/drivers/atarisy1.cpp
+++ b/src/mame/drivers/atarisy1.cpp
@@ -191,6 +191,7 @@ RoadBlasters (aka Future Vette):005*
#include "emu.h"
+#include "includes/atarisy1.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
#include "machine/atarigen.h"
@@ -199,7 +200,7 @@ RoadBlasters (aka Future Vette):005*
#include "sound/ym2151.h"
#include "sound/pokey.h"
#include "video/atarimo.h"
-#include "includes/atarisy1.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp
index 707aaf7923f..504dc4d9e52 100644
--- a/src/mame/drivers/atarisy2.cpp
+++ b/src/mame/drivers/atarisy2.cpp
@@ -127,6 +127,7 @@
#include "emu.h"
#include "includes/atarisy2.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_20MHz
diff --git a/src/mame/drivers/atarisy4.cpp b/src/mame/drivers/atarisy4.cpp
index ede54766efa..f9cd66b4a72 100644
--- a/src/mame/drivers/atarisy4.cpp
+++ b/src/mame/drivers/atarisy4.cpp
@@ -20,6 +20,7 @@
#include "cpu/m68000/m68000.h"
#include "cpu/tms32010/tms32010.h"
#include "video/poly.h"
+#include "screen.h"
struct atarisy4_polydata
diff --git a/src/mame/drivers/atarittl.cpp b/src/mame/drivers/atarittl.cpp
index b63e10a6a70..924aec9995e 100644
--- a/src/mame/drivers/atarittl.cpp
+++ b/src/mame/drivers/atarittl.cpp
@@ -78,6 +78,7 @@
#include "machine/nl_stuntcyc.h"
#include "netlist/devices/net_lib.h"
#include "video/fixfreq.h"
+#include "screen.h"
// copied by Pong, not accurate for this driver!
diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp
index 47c639be6a6..942f5ae08f1 100644
--- a/src/mame/drivers/atetris.cpp
+++ b/src/mame/drivers/atetris.cpp
@@ -57,6 +57,7 @@
#include "sound/pokey.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_14_31818MHz
diff --git a/src/mame/drivers/atm.cpp b/src/mame/drivers/atm.cpp
index 0f944ac9d8b..90742ae87fb 100644
--- a/src/mame/drivers/atm.cpp
+++ b/src/mame/drivers/atm.cpp
@@ -15,13 +15,9 @@ computer to boot up (with keyboard problems).
#include "includes/spectrum.h"
#include "includes/spec128.h"
#include "includes/specpls3.h"
-#include "imagedev/snapquik.h"
-#include "imagedev/cassette.h"
+
#include "sound/ay8910.h"
-#include "sound/speaker.h"
#include "machine/beta.h"
-#include "machine/ram.h"
-#include "machine/spec_snqk.h"
class atm_state : public spectrum_state
diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp
index 46c50225bf7..20c35fe70f3 100644
--- a/src/mame/drivers/atom.cpp
+++ b/src/mame/drivers/atom.cpp
@@ -115,7 +115,9 @@ Hardware: PPIA 8255
#include "emu.h"
#include "includes/atom.h"
#include "formats/imageutl.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
/***************************************************************************
PARAMETERS
diff --git a/src/mame/drivers/atronic.cpp b/src/mame/drivers/atronic.cpp
index a213c0a95a9..2dc995b858e 100644
--- a/src/mame/drivers/atronic.cpp
+++ b/src/mame/drivers/atronic.cpp
@@ -16,6 +16,7 @@
#include "emu.h"
#include "cpu/z180/z180.h"
+#include "screen.h"
class atronic_state : public driver_device
diff --git a/src/mame/drivers/attache.cpp b/src/mame/drivers/attache.cpp
index 48571180652..ec039e61d6a 100644
--- a/src/mame/drivers/attache.cpp
+++ b/src/mame/drivers/attache.cpp
@@ -52,19 +52,24 @@
*/
#include "emu.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
-#include "sound/ay8910.h"
+#include "machine/am9517a.h"
#include "machine/msm5832.h"
+#include "machine/nvram.h"
+#include "machine/ram.h"
+#include "machine/upd765.h"
+#include "machine/z80ctc.h"
#include "machine/z80dart.h"
#include "machine/z80pio.h"
-#include "machine/z80ctc.h"
-#include "machine/am9517a.h"
-#include "machine/upd765.h"
+#include "sound/ay8910.h"
#include "video/tms9927.h"
-#include "machine/ram.h"
-#include "machine/nvram.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
class attache_state : public driver_device
{
diff --git a/src/mame/drivers/attckufo.cpp b/src/mame/drivers/attckufo.cpp
index 3c826afd1ae..fe89d3ba6b7 100644
--- a/src/mame/drivers/attckufo.cpp
+++ b/src/mame/drivers/attckufo.cpp
@@ -14,6 +14,7 @@
#include "cpu/m6502/m6502.h"
#include "machine/6821pia.h"
#include "sound/mos6560.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/atvtrack.cpp b/src/mame/drivers/atvtrack.cpp
index 8d624e22ebc..9803bd1cdde 100644
--- a/src/mame/drivers/atvtrack.cpp
+++ b/src/mame/drivers/atvtrack.cpp
@@ -94,6 +94,7 @@ TODO:
#include "emu.h"
#include "cpu/sh4/sh4.h"
#include "debugger.h"
+#include "screen.h"
//#define SPECIALMODE 1 // Alternate code path
diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp
index f6af1fc31f7..1b15abc1bc9 100644
--- a/src/mame/drivers/aussiebyte.cpp
+++ b/src/mame/drivers/aussiebyte.cpp
@@ -33,6 +33,9 @@
#include "emu.h"
#include "includes/aussiebyte.h"
+#include "screen.h"
+#include "speaker.h"
+
/***********************************************************
diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp
index 6efd0fed41d..0ac8ba7b61d 100644
--- a/src/mame/drivers/avalnche.cpp
+++ b/src/mame/drivers/avalnche.cpp
@@ -31,10 +31,12 @@
***************************************************************************/
#include "emu.h"
+#include "includes/avalnche.h"
#include "cpu/m6502/m6502.h"
#include "machine/watchdog.h"
#include "sound/discrete.h"
-#include "includes/avalnche.h"
+#include "screen.h"
+#include "speaker.h"
#include "avalnche.lh"
diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp
index 775fce5ce1b..b0d826f4403 100644
--- a/src/mame/drivers/avigo.cpp
+++ b/src/mame/drivers/avigo.cpp
@@ -71,6 +71,10 @@
#include "emu.h"
#include "includes/avigo.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "avigo.lh"
diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp
index 51beaec77b4..27a70b3663e 100644
--- a/src/mame/drivers/avt.cpp
+++ b/src/mame/drivers/avt.cpp
@@ -404,11 +404,6 @@
************************************************************************************************/
-
-#define MASTER_CLOCK XTAL_16MHz /* unknown */
-#define CPU_CLOCK MASTER_CLOCK/4 /* guess... seems accurate */
-#define CRTC_CLOCK MASTER_CLOCK/24 /* it gives 63.371293 Hz. with current settings */
-
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/nvram.h"
@@ -416,6 +411,13 @@
#include "video/mc6845.h"
//#include "machine/z80ctc.h"
//#include "machine/z80pio.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_16MHz /* unknown */
+#define CPU_CLOCK MASTER_CLOCK/4 /* guess... seems accurate */
+#define CRTC_CLOCK MASTER_CLOCK/24 /* it gives 63.371293 Hz. with current settings */
class avt_state : public driver_device
diff --git a/src/mame/drivers/ax20.cpp b/src/mame/drivers/ax20.cpp
index 6851d677fce..3d4d16805f2 100644
--- a/src/mame/drivers/ax20.cpp
+++ b/src/mame/drivers/ax20.cpp
@@ -17,8 +17,9 @@
****************************************************************************/
#include "emu.h"
-#include "cpu/i86/i86.h"
#include "bus/isa/fdc.h"
+#include "cpu/i86/i86.h"
+#include "screen.h"
class ax20_state : public driver_device
{
diff --git a/src/mame/drivers/aztarac.cpp b/src/mame/drivers/aztarac.cpp
index 56de6ca3405..83d09547a1c 100644
--- a/src/mame/drivers/aztarac.cpp
+++ b/src/mame/drivers/aztarac.cpp
@@ -16,12 +16,14 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m68000/m68000.h"
#include "includes/aztarac.h"
-#include "sound/ay8910.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "sound/ay8910.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/b16.cpp b/src/mame/drivers/b16.cpp
index a7190a97d69..e79f5118d9c 100644
--- a/src/mame/drivers/b16.cpp
+++ b/src/mame/drivers/b16.cpp
@@ -15,8 +15,9 @@
#include "emu.h"
#include "cpu/i86/i86.h"
-#include "video/mc6845.h"
#include "machine/am9517a.h"
+#include "video/mc6845.h"
+#include "screen.h"
diff --git a/src/mame/drivers/b2m.cpp b/src/mame/drivers/b2m.cpp
index 36fe7c2bd44..e2c5cc17ec5 100644
--- a/src/mame/drivers/b2m.cpp
+++ b/src/mame/drivers/b2m.cpp
@@ -19,7 +19,9 @@
#include "machine/ram.h"
#include "includes/b2m.h"
#include "formats/smx_dsk.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
/* Address maps */
static ADDRESS_MAP_START(b2m_mem, AS_PROGRAM, 8, b2m_state )
diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp
index cc203c5a623..f47a0122384 100644
--- a/src/mame/drivers/backfire.cpp
+++ b/src/mame/drivers/backfire.cpp
@@ -21,8 +21,10 @@
#include "sound/ymz280b.h"
#include "cpu/arm/arm.h"
#include "video/deco16ic.h"
-#include "rendlay.h"
#include "video/decospr.h"
+#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
class backfire_state : public driver_device
diff --git a/src/mame/drivers/badlands.cpp b/src/mame/drivers/badlands.cpp
index 35eff4cdd6b..5bbeabdf668 100644
--- a/src/mame/drivers/badlands.cpp
+++ b/src/mame/drivers/badlands.cpp
@@ -164,12 +164,13 @@ Measurements -
#include "emu.h"
+#include "includes/badlands.h"
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
#include "machine/watchdog.h"
#include "sound/ym2151.h"
-#include "includes/badlands.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/bagman.cpp b/src/mame/drivers/bagman.cpp
index b71fbcfaa86..b086c18a1cc 100644
--- a/src/mame/drivers/bagman.cpp
+++ b/src/mame/drivers/bagman.cpp
@@ -63,9 +63,12 @@ DIP locations verified for:
***************************************************************************/
#include "emu.h"
+#include "includes/bagman.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/bagman.h"
+#include "screen.h"
+#include "speaker.h"
void bagman_state::machine_start()
diff --git a/src/mame/drivers/balsente.cpp b/src/mame/drivers/balsente.cpp
index 4c8c9fc79f2..a151aeaeb7f 100644
--- a/src/mame/drivers/balsente.cpp
+++ b/src/mame/drivers/balsente.cpp
@@ -227,13 +227,15 @@ DIP locations verified for:
***************************************************************************/
#include "emu.h"
+#include "includes/balsente.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
-#include "includes/balsente.h"
#include "sound/cem3394.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "speaker.h"
#include "stocker.lh"
diff --git a/src/mame/drivers/banctec.cpp b/src/mame/drivers/banctec.cpp
index 7ab55d544fb..1fc03c95f40 100644
--- a/src/mame/drivers/banctec.cpp
+++ b/src/mame/drivers/banctec.cpp
@@ -19,6 +19,7 @@
#include "cpu/mcs51/mcs51.h"
#include "cpu/m6800/m6800.h"
#include "video/mc6845.h"
+#include "screen.h"
class banctec_state : public driver_device
{
@@ -30,7 +31,7 @@ public:
, m_maincpu(*this, "maincpu")
, m_videoram(*this, "videoram")
, m_p_chargen(*this, "chargen")
- { }
+ { }
MC6845_UPDATE_ROW(crtc_update_row);
MC6845_ON_UPDATE_ADDR_CHANGED(crtc_addr);
diff --git a/src/mame/drivers/bankp.cpp b/src/mame/drivers/bankp.cpp
index cc7372de331..d9e507395d5 100644
--- a/src/mame/drivers/bankp.cpp
+++ b/src/mame/drivers/bankp.cpp
@@ -94,9 +94,12 @@
***************************************************************************/
#include "emu.h"
+#include "includes/bankp.h"
+
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
-#include "includes/bankp.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_15_468MHz
diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp
index 04d17275f26..fc01cad9c2a 100644
--- a/src/mame/drivers/baraduke.cpp
+++ b/src/mame/drivers/baraduke.cpp
@@ -108,10 +108,13 @@ DIP locations verified for:
***************************************************************************/
#include "emu.h"
+#include "includes/baraduke.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
#include "machine/watchdog.h"
-#include "includes/baraduke.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(baraduke_state::inputport_select_w)
diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp
index e70eeeb5ccb..97dedb53ecb 100644
--- a/src/mame/drivers/barata.cpp
+++ b/src/mame/drivers/barata.cpp
@@ -34,12 +34,14 @@
**************************************************************************/
-#define CPU_CLOCK (XTAL_6MHz) /* main cpu clock */
-
#include "emu.h"
#include "cpu/mcs51/mcs51.h"
-#include "barata.lh"
#include "rendlay.h"
+#include "speaker.h"
+
+#include "barata.lh"
+
+#define CPU_CLOCK (XTAL_6MHz) /* main cpu clock */
class barata_state : public driver_device
{
diff --git a/src/mame/drivers/bartop52.cpp b/src/mame/drivers/bartop52.cpp
index 49c15875705..30b2ba9f84f 100644
--- a/src/mame/drivers/bartop52.cpp
+++ b/src/mame/drivers/bartop52.cpp
@@ -18,12 +18,16 @@
*/
#include "emu.h"
-#include "cpu/m6502/m6502.h"
#include "includes/atari400.h"
-#include "sound/speaker.h"
+
+#include "cpu/m6502/m6502.h"
+#include "sound/spkrdev.h"
#include "sound/pokey.h"
#include "video/gtia.h"
+#include "screen.h"
+#include "speaker.h"
+
class bartop52_state : public atari_common_state
{
diff --git a/src/mame/drivers/batman.cpp b/src/mame/drivers/batman.cpp
index 24f7a2677ff..aff359cac85 100644
--- a/src/mame/drivers/batman.cpp
+++ b/src/mame/drivers/batman.cpp
@@ -20,10 +20,11 @@
#include "emu.h"
+#include "includes/batman.h"
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
#include "video/atarimo.h"
-#include "includes/batman.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/battlane.cpp b/src/mame/drivers/battlane.cpp
index fa459ced611..4f35cb7c9ad 100644
--- a/src/mame/drivers/battlane.cpp
+++ b/src/mame/drivers/battlane.cpp
@@ -12,9 +12,13 @@
***************************************************************************/
#include "emu.h"
+#include "includes/battlane.h"
+
#include "cpu/m6809/m6809.h"
#include "sound/3526intf.h"
-#include "includes/battlane.h"
+#include "screen.h"
+#include "speaker.h"
+
/*************************************
*
diff --git a/src/mame/drivers/battlera.cpp b/src/mame/drivers/battlera.cpp
index 072f1db8325..42a4d47b1f1 100644
--- a/src/mame/drivers/battlera.cpp
+++ b/src/mame/drivers/battlera.cpp
@@ -93,10 +93,11 @@ Notes:
**********************************************************************/
#include "emu.h"
+#include "includes/battlera.h"
#include "cpu/h6280/h6280.h"
#include "sound/2203intf.h"
#include "sound/c6280.h"
-#include "includes/battlera.h"
+#include "speaker.h"
void battlera_state::machine_start()
diff --git a/src/mame/drivers/battlex.cpp b/src/mame/drivers/battlex.cpp
index 48f450da13b..641682a25c5 100644
--- a/src/mame/drivers/battlex.cpp
+++ b/src/mame/drivers/battlex.cpp
@@ -45,9 +45,12 @@
#include "emu.h"
+#include "includes/battlex.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/battlex.h"
+#include "screen.h"
+#include "speaker.h"
INTERRUPT_GEN_MEMBER(battlex_state::battlex_interrupt)
diff --git a/src/mame/drivers/battlnts.cpp b/src/mame/drivers/battlnts.cpp
index 5b76d2b7aa5..a6c298df3a7 100644
--- a/src/mame/drivers/battlnts.cpp
+++ b/src/mame/drivers/battlnts.cpp
@@ -13,13 +13,16 @@
***************************************************************************/
#include "emu.h"
+#include "includes/battlnts.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/hd6309.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/3812intf.h"
-#include "includes/konamipt.h"
-#include "includes/battlnts.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp
index 5f254fc3ccc..eee2bbf9444 100644
--- a/src/mame/drivers/bbc.cpp
+++ b/src/mame/drivers/bbc.cpp
@@ -40,6 +40,7 @@
/* Core includes */
#include "emu.h"
+#include "includes/bbc.h"
/* Components */
#include "bus/rs232/rs232.h"
@@ -50,8 +51,6 @@
#include "bus/econet/econet.h"
#include "sound/tms5220.h" /* Speech */
#include "video/saa5050.h" /* Teletext */
-#include "bbc.lh"
-#include "bbcm.lh"
/* Devices */
#include "formats/acorn_dsk.h"
@@ -59,8 +58,12 @@
#include "imagedev/cassette.h"
#include "formats/uef_cas.h"
#include "formats/csw_cas.h"
-#include "includes/bbc.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "bbc.lh"
+#include "bbcm.lh"
/******************************************************************************
A = BBC Model A
diff --git a/src/mame/drivers/bbusters.cpp b/src/mame/drivers/bbusters.cpp
index c9cdc938d14..f3bb91fdf1d 100644
--- a/src/mame/drivers/bbusters.cpp
+++ b/src/mame/drivers/bbusters.cpp
@@ -195,12 +195,15 @@ foreground and not behind the moving elevator layer.
***************************************************************************/
#include "emu.h"
+#include "includes/bbusters.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
+#include "machine/nvram.h"
#include "sound/2608intf.h"
#include "sound/2610intf.h"
-#include "includes/bbusters.h"
-#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
/******************************************************************************/
diff --git a/src/mame/drivers/bcs3.cpp b/src/mame/drivers/bcs3.cpp
index 6dcfa62f4db..496b43d317a 100644
--- a/src/mame/drivers/bcs3.cpp
+++ b/src/mame/drivers/bcs3.cpp
@@ -53,6 +53,8 @@
#include "cpu/z80/z80daisy.h"
#include "machine/z80ctc.h"
#include "imagedev/cassette.h"
+#include "screen.h"
+#include "speaker.h"
class bcs3_state : public driver_device
diff --git a/src/mame/drivers/beaminv.cpp b/src/mame/drivers/beaminv.cpp
index 5d2cf1a7561..dcd8e7d0594 100644
--- a/src/mame/drivers/beaminv.cpp
+++ b/src/mame/drivers/beaminv.cpp
@@ -55,6 +55,8 @@ Stephh's notes (based on the games Z80 code and some tests) :
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
+
#include "beaminv.lh"
diff --git a/src/mame/drivers/beathead.cpp b/src/mame/drivers/beathead.cpp
index adb7b8f55d5..f8f5c0a89d0 100644
--- a/src/mame/drivers/beathead.cpp
+++ b/src/mame/drivers/beathead.cpp
@@ -103,6 +103,7 @@
#include "includes/beathead.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "speaker.h"
#define MAX_SCANLINES 262
diff --git a/src/mame/drivers/bebox.cpp b/src/mame/drivers/bebox.cpp
index ffc715efa9a..047a1486f9c 100644
--- a/src/mame/drivers/bebox.cpp
+++ b/src/mame/drivers/bebox.cpp
@@ -21,6 +21,7 @@
#include "machine/pckeybrd.h"
#include "bus/lpci/mpc105.h"
#include "bus/scsi/scsi.h"
+#include "speaker.h"
/* Devices */
#include "bus/scsi/scsicd.h"
diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp
index d243c6eee78..e8da27e5015 100644
--- a/src/mame/drivers/beehive.cpp
+++ b/src/mame/drivers/beehive.cpp
@@ -22,6 +22,7 @@
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "screen.h"
class beehive_state : public driver_device
diff --git a/src/mame/drivers/beezer.cpp b/src/mame/drivers/beezer.cpp
index cc6e0a58bd8..2490f0eb008 100644
--- a/src/mame/drivers/beezer.cpp
+++ b/src/mame/drivers/beezer.cpp
@@ -33,6 +33,8 @@
#include "sound/mm5837.h"
#include "sound/dac76.h"
#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/belatra.cpp b/src/mame/drivers/belatra.cpp
index cb996f09781..7c94c0eec1c 100644
--- a/src/mame/drivers/belatra.cpp
+++ b/src/mame/drivers/belatra.cpp
@@ -44,6 +44,7 @@ Viking?s Fun Mill
#include "emu.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
+#include "speaker.h"
class belatra_state : public driver_device
{
diff --git a/src/mame/drivers/berzerk.cpp b/src/mame/drivers/berzerk.cpp
index 4efbd6fba8a..1b83f20cbe6 100644
--- a/src/mame/drivers/berzerk.cpp
+++ b/src/mame/drivers/berzerk.cpp
@@ -11,12 +11,15 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "audio/exidy.h"
+
+#include "cpu/z80/z80.h"
#include "machine/74181.h"
#include "machine/nvram.h"
#include "sound/s14001a.h"
#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
class berzerk_state : public driver_device
diff --git a/src/mame/drivers/bestleag.cpp b/src/mame/drivers/bestleag.cpp
index bca0b7cfa54..ca0175f0c39 100644
--- a/src/mame/drivers/bestleag.cpp
+++ b/src/mame/drivers/bestleag.cpp
@@ -23,6 +23,8 @@ Dip Locations added according to Service Mode
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class bestleag_state : public driver_device
diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp
index a762114cb7a..f9e1cbf22de 100644
--- a/src/mame/drivers/beta.cpp
+++ b/src/mame/drivers/beta.cpp
@@ -34,11 +34,13 @@
#include "cpu/m6502/m6502.h"
#include "machine/mos6530n.h"
#include "machine/ram.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "speaker.h"
+
#include "beta.lh"
#define SCREEN_TAG "screen"
diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp
index 2533e233674..6feee17b8f0 100644
--- a/src/mame/drivers/bfcobra.cpp
+++ b/src/mame/drivers/bfcobra.cpp
@@ -75,15 +75,17 @@
******************************************************************************/
#include "emu.h"
-#include "machine/clock.h"
+#include "cpu/m6809/m6809.h"
+#include "cpu/z80/z80.h"
#include "machine/6850acia.h"
+#include "machine/clock.h"
#include "machine/meters.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m6809/m6809.h"
-#include "sound/upd7759.h"
-#include "sound/ay8910.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "sound/upd7759.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
/*
diff --git a/src/mame/drivers/bfm_ad5.cpp b/src/mame/drivers/bfm_ad5.cpp
index 0f04d132e40..a40e3782982 100644
--- a/src/mame/drivers/bfm_ad5.cpp
+++ b/src/mame/drivers/bfm_ad5.cpp
@@ -15,6 +15,7 @@
#include "includes/bfm_ad5.h"
#include "machine/mcf5206e.h"
#include "machine/bfm_sc45_helper.h"
+#include "speaker.h"
DRIVER_INIT_MEMBER(adder5_state,ad5)
{
diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp
index 50e78799359..f0c5764dabc 100644
--- a/src/mame/drivers/bfm_sc1.cpp
+++ b/src/mame/drivers/bfm_sc1.cpp
@@ -101,6 +101,7 @@ Optional (on expansion card) (Viper)
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "machine/bfm_comn.h"
+#include "speaker.h"
#include "sc1_vfd.lh"
#include "sc1_vid.lh"
diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp
index 28fc948f7fd..f684fb88430 100644
--- a/src/mame/drivers/bfm_sc2.cpp
+++ b/src/mame/drivers/bfm_sc2.cpp
@@ -142,6 +142,7 @@ Adder hardware:
***************************************************************************/
#include "emu.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/nvram.h"
@@ -154,11 +155,14 @@ Adder hardware:
/* fruit machines only */
#include "video/awpvid.h"
-#include "machine/steppers.h" // stepper motor
+#include "video/bfm_dm01.h"
+#include "machine/steppers.h"
#include "machine/bfm_bd1.h" // vfd
#include "machine/meters.h"
+#include "speaker.h"
+
#include "sc2_vid.lh"
#include "gldncrwn.lh"
#include "paradice.lh"
@@ -169,8 +173,6 @@ Adder hardware:
#include "sltblgtk.lh"
#include "slots.lh"
-/* fruit machines only */
-#include "video/bfm_dm01.h"
#include "sc2_vfd.lh"
#include "sc2_dmd.lh"
#include "drwho.lh"
diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp
index 2d60baec04b..4fa9a38450c 100644
--- a/src/mame/drivers/bfm_sc4.cpp
+++ b/src/mame/drivers/bfm_sc4.cpp
@@ -40,6 +40,15 @@
#include "includes/bfm_sc4.h"
#include "machine/bfm_sc45_helper.h"
+#include "cpu/m68000/m68000.h"
+#include "machine/68307.h"
+#include "machine/68340.h"
+#include "video/awpvid.h"
+//DMD01
+#include "cpu/m6809/m6809.h"
+
+#include "speaker.h"
+
#include "bfm_sc4.lh"
#include "sc4_dmd.lh"
@@ -248,13 +257,6 @@
-#include "cpu/m68000/m68000.h"
-#include "machine/68307.h"
-#include "machine/68340.h"
-#include "video/awpvid.h"
-//DMD01
-#include "cpu/m6809/m6809.h"
-
uint8_t sc4_state::read_input_matrix(int row)
diff --git a/src/mame/drivers/bfm_sc5.cpp b/src/mame/drivers/bfm_sc5.cpp
index bd9b4d2f2a4..6093b486c18 100644
--- a/src/mame/drivers/bfm_sc5.cpp
+++ b/src/mame/drivers/bfm_sc5.cpp
@@ -12,14 +12,14 @@
#include "emu.h"
-
#include "includes/bfm_sc5.h"
-
+#include "machine/bfm_sc45_helper.h"
#include "machine/mcf5206e.h"
-#include "bfm_sc5.lh"
#include "video/awpvid.h"
-#include "machine/bfm_sc45_helper.h"
+#include "speaker.h"
+
+#include "bfm_sc5.lh"
diff --git a/src/mame/drivers/bfm_swp.cpp b/src/mame/drivers/bfm_swp.cpp
index e6240a9ecea..da25b10fedf 100644
--- a/src/mame/drivers/bfm_swp.cpp
+++ b/src/mame/drivers/bfm_swp.cpp
@@ -104,6 +104,8 @@ TEST.TXT - suggests the content of a prototype version, which was expanded to ma
#include "emu.h"
#include "machine/68340.h"
#include "sound/ymz280b.h"
+#include "screen.h"
+#include "speaker.h"
class bfm_swp_state : public driver_device
{
diff --git a/src/mame/drivers/bfmsys83.cpp b/src/mame/drivers/bfmsys83.cpp
index 2a297628db9..507846cc83c 100644
--- a/src/mame/drivers/bfmsys83.cpp
+++ b/src/mame/drivers/bfmsys83.cpp
@@ -6,6 +6,7 @@
#include "cpu/m6800/m6800.h"
#include "sound/ay8910.h"
#include "machine/bfm_comn.h"
+#include "speaker.h"
class bfmsys83_state : public driver_device
diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp
index 352d55121ea..af8b8027c53 100644
--- a/src/mame/drivers/bfmsys85.cpp
+++ b/src/mame/drivers/bfmsys85.cpp
@@ -67,6 +67,7 @@ ___________________________________________________________________________
#include "sound/ay8910.h"
#include "machine/nvram.h"
#include "machine/bfm_comn.h"
+#include "speaker.h"
#include "bfmsys85.lh"
diff --git a/src/mame/drivers/big10.cpp b/src/mame/drivers/big10.cpp
index 39e27fab893..07de2867879 100644
--- a/src/mame/drivers/big10.cpp
+++ b/src/mame/drivers/big10.cpp
@@ -64,6 +64,8 @@
#include "video/v9938.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
+#include "screen.h"
+#include "speaker.h"
class big10_state : public driver_device
diff --git a/src/mame/drivers/bigbord2.cpp b/src/mame/drivers/bigbord2.cpp
index 0daaad3156b..796532a4ce5 100644
--- a/src/mame/drivers/bigbord2.cpp
+++ b/src/mame/drivers/bigbord2.cpp
@@ -73,14 +73,16 @@ X - change banks
#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
+#include "machine/clock.h"
+#include "machine/keyboard.h"
+#include "machine/wd_fdc.h"
#include "machine/z80ctc.h"
-#include "machine/z80sio.h"
#include "machine/z80dma.h"
-#include "video/mc6845.h"
-#include "machine/keyboard.h"
+#include "machine/z80sio.h"
#include "sound/beep.h"
-#include "machine/wd_fdc.h"
-#include "machine/clock.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
class bigbord2_state : public driver_device
diff --git a/src/mame/drivers/bigevglf.cpp b/src/mame/drivers/bigevglf.cpp
index d35dbf7ac29..e4346c0ba16 100644
--- a/src/mame/drivers/bigevglf.cpp
+++ b/src/mame/drivers/bigevglf.cpp
@@ -58,10 +58,12 @@ J1100072A
***************************************************************************/
#include "emu.h"
+#include "includes/bigevglf.h"
+
+#include "cpu/m6805/m6805.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "cpu/m6805/m6805.h"
-#include "includes/bigevglf.h"
+#include "speaker.h"
WRITE8_MEMBER(bigevglf_state::beg_banking_w)
diff --git a/src/mame/drivers/bigstrkb.cpp b/src/mame/drivers/bigstrkb.cpp
index 864a0194a0b..77790e633d2 100644
--- a/src/mame/drivers/bigstrkb.cpp
+++ b/src/mame/drivers/bigstrkb.cpp
@@ -15,9 +15,12 @@
*/
#include "emu.h"
+#include "includes/bigstrkb.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
-#include "includes/bigstrkb.h"
+#include "screen.h"
+#include "speaker.h"
/*
diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp
index 63da0224639..ddf5fbace5f 100644
--- a/src/mame/drivers/binbug.cpp
+++ b/src/mame/drivers/binbug.cpp
@@ -54,8 +54,11 @@
#include "bus/rs232/keyboard.h"
#include "cpu/s2650/s2650.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "imagedev/snapquik.h"
+#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
+
class binbug_state : public driver_device
{
diff --git a/src/mame/drivers/bingoc.cpp b/src/mame/drivers/bingoc.cpp
index 7735444b6c3..aeb1fbc789c 100644
--- a/src/mame/drivers/bingoc.cpp
+++ b/src/mame/drivers/bingoc.cpp
@@ -35,6 +35,8 @@ SOUND : YM2151 uPD7759C
#include "machine/gen_latch.h"
#include "sound/ym2151.h"
#include "sound/upd7759.h"
+#include "screen.h"
+#include "speaker.h"
class bingoc_state : public driver_device
diff --git a/src/mame/drivers/bingoman.cpp b/src/mame/drivers/bingoman.cpp
index 3817029ef34..2bfae7e4c33 100644
--- a/src/mame/drivers/bingoman.cpp
+++ b/src/mame/drivers/bingoman.cpp
@@ -241,6 +241,8 @@
#include "emu.h"
#include "cpu/h8/h83002.h"
+#include "screen.h"
+#include "speaker.h"
class bingoman_state : public driver_device
diff --git a/src/mame/drivers/bingor.cpp b/src/mame/drivers/bingor.cpp
index 277452dd760..9dad543d4c6 100644
--- a/src/mame/drivers/bingor.cpp
+++ b/src/mame/drivers/bingor.cpp
@@ -443,6 +443,8 @@
#include "cpu/i86/i186.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "sound/saa1099.h"
+#include "screen.h"
+#include "speaker.h"
class bingor_state : public driver_device
diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp
index c5e74a50220..a455ffcf57f 100644
--- a/src/mame/drivers/bionicc.cpp
+++ b/src/mame/drivers/bionicc.cpp
@@ -81,10 +81,13 @@
******************************************************************************************/
#include "emu.h"
+#include "includes/bionicc.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/ym2151.h"
-#include "includes/bionicc.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/bishi.cpp b/src/mame/drivers/bishi.cpp
index 77feb8f19be..d309852008a 100644
--- a/src/mame/drivers/bishi.cpp
+++ b/src/mame/drivers/bishi.cpp
@@ -86,9 +86,12 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/bishi.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/ymz280b.h"
-#include "includes/bishi.h"
+#include "speaker.h"
+
READ16_MEMBER(bishi_state::control_r)
{
diff --git a/src/mame/drivers/bitgraph.cpp b/src/mame/drivers/bitgraph.cpp
index eb992b25fa9..e2ce9502253 100644
--- a/src/mame/drivers/bitgraph.cpp
+++ b/src/mame/drivers/bitgraph.cpp
@@ -55,6 +55,9 @@
#include "machine/ram.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "bitgrpha.lh"
#include "bitgrphb.lh"
diff --git a/src/mame/drivers/bk.cpp b/src/mame/drivers/bk.cpp
index adb25ef5bc2..85ad0f6387d 100644
--- a/src/mame/drivers/bk.cpp
+++ b/src/mame/drivers/bk.cpp
@@ -10,14 +10,18 @@
#include "emu.h"
+#include "includes/bk.h"
+
#include "cpu/t11/t11.h"
#include "sound/wave.h"
-#include "includes/bk.h"
-#include "imagedev/cassette.h"
#include "formats/rk_cas.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
- /* Address maps */
+/* Address maps */
static ADDRESS_MAP_START(bk0010_mem, AS_PROGRAM, 16, bk_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE( 0x0000, 0x3fff ) AM_RAM // RAM
diff --git a/src/mame/drivers/bking.cpp b/src/mame/drivers/bking.cpp
index a32dab40bc7..42289be2989 100644
--- a/src/mame/drivers/bking.cpp
+++ b/src/mame/drivers/bking.cpp
@@ -19,12 +19,14 @@ DIP Locations verified for:
#include "emu.h"
#include "includes/bking.h"
+
#include "cpu/m6805/m6805.h"
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
READ8_MEMBER(bking_state::bking_sndnmi_disable_r)
diff --git a/src/mame/drivers/blackt96.cpp b/src/mame/drivers/blackt96.cpp
index ebd9fd728e2..8ec6989d997 100644
--- a/src/mame/drivers/blackt96.cpp
+++ b/src/mame/drivers/blackt96.cpp
@@ -66,6 +66,8 @@ There are some unmapped writes past the end of text ram too
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "video/snk68_spr.h"
+#include "speaker.h"
+
class blackt96_state : public driver_device
{
diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp
index a3d9d00834c..3aa9b337a15 100644
--- a/src/mame/drivers/bladestl.cpp
+++ b/src/mame/drivers/bladestl.cpp
@@ -29,12 +29,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/bladestl.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/m6809/hd6309.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
-#include "includes/konamipt.h"
-#include "includes/bladestl.h"
+#include "screen.h"
+#include "speaker.h"
TIMER_DEVICE_CALLBACK_MEMBER(bladestl_state::bladestl_scanline)
diff --git a/src/mame/drivers/blitz.cpp b/src/mame/drivers/blitz.cpp
index 51ee39fd0fc..8100078f6d3 100644
--- a/src/mame/drivers/blitz.cpp
+++ b/src/mame/drivers/blitz.cpp
@@ -254,15 +254,17 @@
***************************************************************************************************/
-#define MASTER_CLOCK XTAL_10MHz
-#define CPU_CLOCK (MASTER_CLOCK/16)
-
#include "emu.h"
#include "cpu/m6502/m6502.h"
//#include "cpu/m6805/m6805.h"
-#include "video/mc6845.h"
#include "machine/6821pia.h"
#include "sound/discrete.h"
+#include "video/mc6845.h"
+#include "screen.h"
+
+
+#define MASTER_CLOCK XTAL_10MHz
+#define CPU_CLOCK (MASTER_CLOCK/16)
class blitz_state : public driver_device
@@ -273,7 +275,8 @@ public:
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram"),
m_maincpu(*this, "maincpu"),
- m_gfxdecode(*this, "gfxdecode") { }
+ m_gfxdecode(*this, "gfxdecode")
+ { }
required_shared_ptr<uint8_t> m_videoram;
required_shared_ptr<uint8_t> m_colorram;
diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp
index 21dbd7203e4..82b0d16dee7 100644
--- a/src/mame/drivers/blitz68k.cpp
+++ b/src/mame/drivers/blitz68k.cpp
@@ -46,10 +46,13 @@ To Do:
#include "emu.h"
#include "cpu/m68000/m68000.h"
-#include "video/mc6845.h"
-#include "sound/saa1099.h"
#include "machine/nvram.h"
+#include "sound/saa1099.h"
+#include "video/mc6845.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
+
class blitz68k_state : public driver_device
{
diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp
index 0b18489b55a..ff27e34b5a3 100644
--- a/src/mame/drivers/blktiger.cpp
+++ b/src/mame/drivers/blktiger.cpp
@@ -16,12 +16,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/blktiger.h"
+
+#include "cpu/mcs51/mcs51.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
-#include "cpu/mcs51/mcs51.h"
-#include "includes/blktiger.h"
+#include "screen.h"
+#include "speaker.h"
/**************************************************
diff --git a/src/mame/drivers/blmbycar.cpp b/src/mame/drivers/blmbycar.cpp
index 646e610c8f9..fcb641e12f1 100644
--- a/src/mame/drivers/blmbycar.cpp
+++ b/src/mame/drivers/blmbycar.cpp
@@ -26,9 +26,12 @@ Check game speed, it depends on a bit we toggle..
***************************************************************************/
#include "emu.h"
+#include "includes/blmbycar.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
-#include "includes/blmbycar.h"
+#include "screen.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp
index 6cc2af4ae90..8b4f9ae6d79 100644
--- a/src/mame/drivers/blockade.cpp
+++ b/src/mame/drivers/blockade.cpp
@@ -11,9 +11,12 @@
***************************************************************************/
#include "emu.h"
+
#include "cpu/i8085/i8085.h"
-#include "sound/samples.h"
#include "sound/discrete.h"
+#include "sound/samples.h"
+#include "screen.h"
+#include "speaker.h"
#include "blockade.lh"
diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp
index f1a77468574..7c460f1238d 100644
--- a/src/mame/drivers/blockhl.cpp
+++ b/src/mame/drivers/blockhl.cpp
@@ -18,15 +18,18 @@
*******************************************************************************/
#include "emu.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/konami.h"
#include "cpu/z80/z80.h"
#include "machine/bankdev.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
+#include "sound/ym2151.h"
#include "video/k052109.h"
#include "video/k051960.h"
-#include "sound/ym2151.h"
-#include "includes/konamipt.h"
+
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/blockout.cpp b/src/mame/drivers/blockout.cpp
index c9c719ed387..d570082f33f 100644
--- a/src/mame/drivers/blockout.cpp
+++ b/src/mame/drivers/blockout.cpp
@@ -67,11 +67,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/blockout.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/blockout.h"
+#include "speaker.h"
+
#define MAIN_CLOCK XTAL_10MHz
#define AUDIO_CLOCK XTAL_3_579545MHz
diff --git a/src/mame/drivers/bloodbro.cpp b/src/mame/drivers/bloodbro.cpp
index 1e445a31e1b..e11893aef69 100644
--- a/src/mame/drivers/bloodbro.cpp
+++ b/src/mame/drivers/bloodbro.cpp
@@ -130,12 +130,15 @@ DIP locations verified for Blood Bros. & Sky Smasher via manual & DIP-SW setting
**************************************************************************/
#include "emu.h"
+#include "includes/bloodbro.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
-#include "includes/bloodbro.h"
#include "video/seibu_crtc.h"
+#include "screen.h"
+#include "speaker.h"
/* Memory Maps */
diff --git a/src/mame/drivers/blstroid.cpp b/src/mame/drivers/blstroid.cpp
index 3f87c2599d4..cbe8a9c9981 100644
--- a/src/mame/drivers/blstroid.cpp
+++ b/src/mame/drivers/blstroid.cpp
@@ -20,10 +20,12 @@
#include "emu.h"
+#include "includes/blstroid.h"
+#include "machine/atarigen.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
-#include "machine/atarigen.h"
-#include "includes/blstroid.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp
index 6de7c1437a4..c506ca81ecd 100644
--- a/src/mame/drivers/blueprnt.cpp
+++ b/src/mame/drivers/blueprnt.cpp
@@ -49,10 +49,15 @@
#include "emu.h"
+#include "includes/blueprnt.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "includes/blueprnt.h"
+
+#include "screen.h"
+#include "speaker.h"
+
/*************************************
*
diff --git a/src/mame/drivers/bmcbowl.cpp b/src/mame/drivers/bmcbowl.cpp
index 74c4e122bfe..ac80d19365b 100644
--- a/src/mame/drivers/bmcbowl.cpp
+++ b/src/mame/drivers/bmcbowl.cpp
@@ -109,6 +109,8 @@ Main board:
#include "sound/okim6295.h"
#include "sound/ym2413.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
#define NVRAM_HACK
diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp
index eb60d4c4875..be65f5cc638 100644
--- a/src/mame/drivers/bmcpokr.cpp
+++ b/src/mame/drivers/bmcpokr.cpp
@@ -22,6 +22,8 @@ Other: BMC B816140 (CPLD)
#include "sound/okim6295.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
+#include "screen.h"
+#include "speaker.h"
class bmcpokr_state : public driver_device
{
diff --git a/src/mame/drivers/bmjr.cpp b/src/mame/drivers/bmjr.cpp
index bfce39ad282..ff366367ada 100644
--- a/src/mame/drivers/bmjr.cpp
+++ b/src/mame/drivers/bmjr.cpp
@@ -16,9 +16,11 @@
#include "emu.h"
#include "cpu/m6800/m6800.h"
-#include "sound/beep.h"
#include "imagedev/cassette.h"
+#include "sound/beep.h"
#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
class bmjr_state : public driver_device
diff --git a/src/mame/drivers/bml3.cpp b/src/mame/drivers/bml3.cpp
index e4dfe07015f..2d63a712ab0 100644
--- a/src/mame/drivers/bml3.cpp
+++ b/src/mame/drivers/bml3.cpp
@@ -14,20 +14,25 @@
**************************************************************************************/
#include "emu.h"
+
#include "cpu/m6809/m6809.h"
-#include "video/mc6845.h"
+#include "imagedev/cassette.h"
#include "machine/6821pia.h"
#include "machine/6850acia.h"
#include "machine/clock.h"
#include "sound/2203intf.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "sound/wave.h"
-#include "imagedev/cassette.h"
+#include "video/mc6845.h"
+
#include "bus/bml3/bml3bus.h"
#include "bus/bml3/bml3mp1802.h"
#include "bus/bml3/bml3mp1805.h"
#include "bus/bml3/bml3kanji.h"
+#include "screen.h"
+#include "speaker.h"
+
// System clock definitions, from the MB-6890 servce manual, p.48:
#define MASTER_CLOCK ( 32256000 ) // Master clock crystal (X1) frequency, 32.256 MHz. "fx" in the manual.
diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp
index 293a1d147c6..f0f26625060 100644
--- a/src/mame/drivers/bnstars.cpp
+++ b/src/mame/drivers/bnstars.cpp
@@ -89,13 +89,16 @@ ROMs : MR96004-10.1 [125661cd] (IC5 - Samples)
*/
#include "emu.h"
+#include "includes/ms32.h"
+
#include "cpu/z80/z80.h"
#include "cpu/v60/v60.h"
-#include "rendlay.h"
#include "sound/ymf271.h"
-#include "includes/ms32.h"
#include "machine/jalcrpt.h"
+#include "rendlay.h"
+#include "speaker.h"
+
class bnstars_state : public ms32_state
{
diff --git a/src/mame/drivers/bntyhunt.cpp b/src/mame/drivers/bntyhunt.cpp
index 1bddbd854eb..dd26f58f34c 100644
--- a/src/mame/drivers/bntyhunt.cpp
+++ b/src/mame/drivers/bntyhunt.cpp
@@ -9,6 +9,7 @@
#include "emu.h"
#include "cpu/i386/i386.h"
+#include "screen.h"
class bntyhunt_state : public driver_device
diff --git a/src/mame/drivers/bogeyman.cpp b/src/mame/drivers/bogeyman.cpp
index bddda1d5862..21ec9ea846c 100644
--- a/src/mame/drivers/bogeyman.cpp
+++ b/src/mame/drivers/bogeyman.cpp
@@ -14,9 +14,12 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m6502.h"
#include "includes/bogeyman.h"
+#include "cpu/m6502/m6502.h"
+#include "screen.h"
+#include "speaker.h"
+
/* Read/Write Handlers */
diff --git a/src/mame/drivers/bombjack.cpp b/src/mame/drivers/bombjack.cpp
index e58bc46a8ef..3f0fb247ef6 100644
--- a/src/mame/drivers/bombjack.cpp
+++ b/src/mame/drivers/bombjack.cpp
@@ -98,9 +98,12 @@ Dip Locations and factory settings verified with manual
***************************************************************************/
#include "emu.h"
+#include "includes/bombjack.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/bombjack.h"
+#include "screen.h"
+#include "speaker.h"
TIMER_CALLBACK_MEMBER(bombjack_state::soundlatch_callback)
diff --git a/src/mame/drivers/boogwing.cpp b/src/mame/drivers/boogwing.cpp
index 9c7d3843621..eafe82e6e18 100644
--- a/src/mame/drivers/boogwing.cpp
+++ b/src/mame/drivers/boogwing.cpp
@@ -81,14 +81,18 @@
*/
#include "emu.h"
+#include "includes/boogwing.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
-#include "includes/boogwing.h"
#include "machine/deco102.h"
#include "machine/decocrpt.h"
#include "machine/gen_latch.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
READ16_MEMBER( boogwing_state::boogwing_protection_region_0_104_r )
{
diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp
index f0a45d49d1e..b3cc769e523 100644
--- a/src/mame/drivers/bottom9.cpp
+++ b/src/mame/drivers/bottom9.cpp
@@ -15,12 +15,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/bottom9.h"
+#include "includes/konamipt.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
-#include "includes/konamipt.h"
-#include "includes/bottom9.h"
+#include "speaker.h"
+
INTERRUPT_GEN_MEMBER(bottom9_state::bottom9_interrupt)
{
diff --git a/src/mame/drivers/bowltry.cpp b/src/mame/drivers/bowltry.cpp
index 742463a4f2d..cd3d2d650a7 100644
--- a/src/mame/drivers/bowltry.cpp
+++ b/src/mame/drivers/bowltry.cpp
@@ -30,6 +30,7 @@
#include "emu.h"
#include "cpu/h8/h83008.h"
+#include "screen.h"
#define HACK_ENABLED 0
diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp
index 2e554dceb29..5ac60774766 100644
--- a/src/mame/drivers/boxer.cpp
+++ b/src/mame/drivers/boxer.cpp
@@ -13,6 +13,7 @@
#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/watchdog.h"
+#include "screen.h"
#define MASTER_CLOCK XTAL_12_096MHz
diff --git a/src/mame/drivers/br8641.cpp b/src/mame/drivers/br8641.cpp
index 81ef7be0161..b24d817be00 100644
--- a/src/mame/drivers/br8641.cpp
+++ b/src/mame/drivers/br8641.cpp
@@ -28,6 +28,7 @@ ToDo:
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "sound/beep.h"
+#include "speaker.h"
class brandt8641_state : public driver_device
{
diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp
index 11fb1213db2..d31a6f7a413 100644
--- a/src/mame/drivers/brkthru.cpp
+++ b/src/mame/drivers/brkthru.cpp
@@ -52,10 +52,13 @@
***************************************************************************/
#include "emu.h"
+#include "includes/brkthru.h"
+
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
#include "sound/3526intf.h"
-#include "includes/brkthru.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_12MHz
diff --git a/src/mame/drivers/bsktball.cpp b/src/mame/drivers/bsktball.cpp
index 90052c677af..5fcc6bf3cec 100644
--- a/src/mame/drivers/bsktball.cpp
+++ b/src/mame/drivers/bsktball.cpp
@@ -29,6 +29,8 @@
#include "cpu/m6502/m6502.h"
#include "includes/bsktball.h"
#include "sound/discrete.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/btime.cpp b/src/mame/drivers/btime.cpp
index 8ef4113c171..6697f58b6a0 100644
--- a/src/mame/drivers/btime.cpp
+++ b/src/mame/drivers/btime.cpp
@@ -140,12 +140,14 @@ A few notes:
***************************************************************************/
#include "emu.h"
+#include "includes/btime.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
#include "sound/discrete.h"
-#include "includes/btime.h"
#include "machine/decocpu7.h"
#include "machine/deco222.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_12MHz
#define HCLK (MASTER_CLOCK/2)
diff --git a/src/mame/drivers/btoads.cpp b/src/mame/drivers/btoads.cpp
index c87a4403079..ca703c7c948 100644
--- a/src/mame/drivers/btoads.cpp
+++ b/src/mame/drivers/btoads.cpp
@@ -11,6 +11,8 @@
#include "emu.h"
#include "includes/btoads.h"
+#include "speaker.h"
+
#define CPU_CLOCK XTAL_64MHz
#define VIDEO_CLOCK XTAL_20MHz
diff --git a/src/mame/drivers/bublbobl.cpp b/src/mame/drivers/bublbobl.cpp
index 8c84a56b31b..458c493e70e 100644
--- a/src/mame/drivers/bublbobl.cpp
+++ b/src/mame/drivers/bublbobl.cpp
@@ -274,12 +274,15 @@ TODO:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/bublbobl.h"
+
#include "cpu/m6800/m6800.h"
+#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
#include "sound/3526intf.h"
-#include "includes/bublbobl.h"
+#include "screen.h"
+#include "speaker.h"
#define MAIN_XTAL XTAL_24MHz
diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp
index c202e50609d..af4c211167e 100644
--- a/src/mame/drivers/buggychl.cpp
+++ b/src/mame/drivers/buggychl.cpp
@@ -78,11 +78,13 @@ Dip locations and factory settings verified from dip listing
***************************************************************************/
#include "emu.h"
+#include "includes/buggychl.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "includes/buggychl.h"
+#include "speaker.h"
#include "buggychl.lh"
diff --git a/src/mame/drivers/busicom.cpp b/src/mame/drivers/busicom.cpp
index 5303328c792..338f42d3cf7 100644
--- a/src/mame/drivers/busicom.cpp
+++ b/src/mame/drivers/busicom.cpp
@@ -9,9 +9,11 @@
****************************************************************************/
#include "emu.h"
-#include "cpu/i4004/i4004.h"
#include "includes/busicom.h"
+#include "cpu/i4004/i4004.h"
+#include "screen.h"
+
uint8_t busicom_state::get_bit_selected(uint32_t val,int num)
{
diff --git a/src/mame/drivers/buster.cpp b/src/mame/drivers/buster.cpp
index 75823f90d39..823fe6dfd35 100644
--- a/src/mame/drivers/buster.cpp
+++ b/src/mame/drivers/buster.cpp
@@ -12,6 +12,8 @@ Video Fruit Machine
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
class buster_state : public driver_device
diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp
index e337cbf7f1b..0d5b6df097b 100644
--- a/src/mame/drivers/bw12.cpp
+++ b/src/mame/drivers/bw12.cpp
@@ -30,7 +30,9 @@
#include "bus/rs232/rs232.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
/*
diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp
index 7bf927b074e..a20616600af 100644
--- a/src/mame/drivers/bw2.cpp
+++ b/src/mame/drivers/bw2.cpp
@@ -27,6 +27,7 @@
#include "emu.h"
#include "includes/bw2.h"
#include "bus/rs232/rs232.h"
+#include "screen.h"
#include "softlist.h"
diff --git a/src/mame/drivers/bwidow.cpp b/src/mame/drivers/bwidow.cpp
index e9d7c1c4629..3337d7b043d 100644
--- a/src/mame/drivers/bwidow.cpp
+++ b/src/mame/drivers/bwidow.cpp
@@ -219,6 +219,8 @@
***************************************************************************/
#include "emu.h"
+#include "includes/bwidow.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/watchdog.h"
#include "video/vector.h"
@@ -227,7 +229,7 @@
#include "sound/pokey.h"
#include "sound/discrete.h"
-#include "includes/bwidow.h"
+#include "screen.h"
diff --git a/src/mame/drivers/bwing.cpp b/src/mame/drivers/bwing.cpp
index a46def8ecea..c6eb42d9052 100644
--- a/src/mame/drivers/bwing.cpp
+++ b/src/mame/drivers/bwing.cpp
@@ -26,11 +26,14 @@ Known issues:
#include "emu.h"
#include "includes/bwing.h"
+
#include "cpu/m6502/deco16.h"
#include "cpu/m6809/m6809.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
//****************************************************************************
diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp
index e4f2a0cbbe8..236aa64d2fb 100644
--- a/src/mame/drivers/by35.cpp
+++ b/src/mame/drivers/by35.cpp
@@ -68,12 +68,16 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
-#include "by35.lh"
-#include "by35_playboy.lh"
#include "sound/discrete.h"
#include "render.h"
+#include "speaker.h"
+
+#include "by35.lh"
+#include "by35_playboy.lh"
+
class by35_state : public genpin_class
{
diff --git a/src/mame/drivers/byvid.cpp b/src/mame/drivers/byvid.cpp
index 386a6e76bfc..8a76cd98297 100644
--- a/src/mame/drivers/byvid.cpp
+++ b/src/mame/drivers/byvid.cpp
@@ -40,12 +40,13 @@ ToDo (granny):
#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
-#include "video/tms9928a.h"
#include "machine/6821pia.h"
#include "machine/nvram.h"
#include "sound/beep.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "video/tms9928a.h"
+#include "speaker.h"
class by133_state : public driver_device
{
diff --git a/src/mame/drivers/bzone.cpp b/src/mame/drivers/bzone.cpp
index 2da43382822..3ec19892346 100644
--- a/src/mame/drivers/bzone.cpp
+++ b/src/mame/drivers/bzone.cpp
@@ -207,13 +207,16 @@
***************************************************************************/
#include "emu.h"
+#include "includes/bzone.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/watchdog.h"
#include "video/vector.h"
#include "video/avgdvg.h"
#include "machine/atari_vg.h"
-#include "includes/bzone.h"
#include "sound/pokey.h"
+#include "screen.h"
+#include "speaker.h"
#include "bzone.lh"
#include "redbaron.lh"
diff --git a/src/mame/drivers/c10.cpp b/src/mame/drivers/c10.cpp
index 413569ab0c1..647fed9995d 100644
--- a/src/mame/drivers/c10.cpp
+++ b/src/mame/drivers/c10.cpp
@@ -14,6 +14,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class c10_state : public driver_device
@@ -29,7 +30,7 @@ public:
, m_maincpu(*this, "maincpu")
, m_p_videoram(*this, "videoram")
, m_p_chargen(*this, "chargen")
- { }
+ { }
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_DRIVER_INIT(c10);
diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp
index 2b2791337b0..94476a3f0a0 100644
--- a/src/mame/drivers/c128.cpp
+++ b/src/mame/drivers/c128.cpp
@@ -9,7 +9,9 @@
*/
#include "emu.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#include "bus/c64/exp.h"
#include "bus/cbmiec/cbmiec.h"
#include "bus/cbmiec/c1571.h"
diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp
index d9f7dd31d7e..616a95b1563 100644
--- a/src/mame/drivers/c64.cpp
+++ b/src/mame/drivers/c64.cpp
@@ -15,7 +15,9 @@
*/
#include "emu.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#include "bus/cbmiec/cbmiec.h"
#include "bus/cbmiec/c1541.h"
#include "bus/c64/exp.h"
diff --git a/src/mame/drivers/c64dtv.cpp b/src/mame/drivers/c64dtv.cpp
index 7673b067dcc..bb05a15effa 100644
--- a/src/mame/drivers/c64dtv.cpp
+++ b/src/mame/drivers/c64dtv.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
#include "emu.h"
+#include "screen.h"
//**************************************************************************
diff --git a/src/mame/drivers/c65.cpp b/src/mame/drivers/c65.cpp
index 0c2362ce6a5..0e6ce438ee7 100644
--- a/src/mame/drivers/c65.cpp
+++ b/src/mame/drivers/c65.cpp
@@ -21,7 +21,9 @@ Note:
#include "emu.h"
#include "cpu/m6502/m4510.h"
#include "machine/mos6526.h"
+#include "screen.h"
#include "softlist_dev.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_3_5MHz
diff --git a/src/mame/drivers/c80.cpp b/src/mame/drivers/c80.cpp
index bc02ae1513e..2c0f3163f43 100644
--- a/src/mame/drivers/c80.cpp
+++ b/src/mame/drivers/c80.cpp
@@ -54,9 +54,13 @@ data of next byte, and so on.
#include "emu.h"
#include "includes/c80.h"
+
#include "sound/wave.h"
+#include "speaker.h"
+
#include "c80.lh"
+
/* Memory Maps */
static ADDRESS_MAP_START( c80_mem, AS_PROGRAM, 8, c80_state )
diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp
index 8d4ba39b7af..c902f0c13de 100644
--- a/src/mame/drivers/cabal.cpp
+++ b/src/mame/drivers/cabal.cpp
@@ -44,12 +44,16 @@ Dip locations verified with Fabtek manual for the trackball version
******************************************************************/
#include "emu.h"
+#include "includes/cabal.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ym2151.h"
#include "sound/msm5205.h"
-#include "includes/cabal.h"
+#include "screen.h"
+#include "speaker.h"
+
MACHINE_START_MEMBER(cabal_state,cabal)
{
diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp
index 65af500cac9..cc4412f52e2 100644
--- a/src/mame/drivers/cabaret.cpp
+++ b/src/mame/drivers/cabaret.cpp
@@ -26,6 +26,8 @@ are the same of IGS. AMT may be previous IGS name.
#include "emu.h"
#include "cpu/z180/z180.h"
#include "sound/ym2413.h"
+#include "screen.h"
+#include "speaker.h"
class cabaret_state : public driver_device
diff --git a/src/mame/drivers/calchase.cpp b/src/mame/drivers/calchase.cpp
index 0f014a7c846..9f557291980 100644
--- a/src/mame/drivers/calchase.cpp
+++ b/src/mame/drivers/calchase.cpp
@@ -138,6 +138,8 @@ something wrong in the disk geometry reported by calchase.chd (20,255,63) since
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "video/pc_vga.h"
+#include "screen.h"
+#include "speaker.h"
class calchase_state : public pcat_base_state
diff --git a/src/mame/drivers/calomega.cpp b/src/mame/drivers/calomega.cpp
index ee0636433df..e8b2d46fa88 100644
--- a/src/mame/drivers/calomega.cpp
+++ b/src/mame/drivers/calomega.cpp
@@ -639,20 +639,24 @@
***********************************************************************************/
-
-#define MASTER_CLOCK XTAL_10MHz
-#define CPU_CLOCK (MASTER_CLOCK/16)
-#define UART_CLOCK (MASTER_CLOCK/16)
-#define SND_CLOCK (MASTER_CLOCK/8)
-
#include "emu.h"
+#include "includes/calomega.h"
+
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/m65c02.h"
-#include "video/mc6845.h"
#include "machine/6821pia.h"
#include "machine/nvram.h"
#include "sound/ay8910.h"
-#include "includes/calomega.h"
+#include "video/mc6845.h"
+
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_10MHz
+#define CPU_CLOCK (MASTER_CLOCK/16)
+#define UART_CLOCK (MASTER_CLOCK/16)
+#define SND_CLOCK (MASTER_CLOCK/8)
/**************************************************
diff --git a/src/mame/drivers/calorie.cpp b/src/mame/drivers/calorie.cpp
index 46acb198bab..0bae419c172 100644
--- a/src/mame/drivers/calorie.cpp
+++ b/src/mame/drivers/calorie.cpp
@@ -84,6 +84,8 @@ Notes:
#include "machine/gen_latch.h"
#include "machine/segacrp2_device.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class calorie_state : public driver_device
diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp
index 2f9207f1e0f..1c4977bd8e8 100644
--- a/src/mame/drivers/camplynx.cpp
+++ b/src/mame/drivers/camplynx.cpp
@@ -117,16 +117,22 @@
****************************************************************************/
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
#include "imagedev/cassette.h"
+#include "machine/wd_fdc.h"
#include "sound/dac.h"
-#include "sound/wave.h"
#include "sound/volt_reg.h"
+#include "sound/wave.h"
+#include "video/mc6845.h"
+
#include "formats/camplynx_cas.h"
-#include "machine/wd_fdc.h"
#include "formats/camplynx_dsk.h"
+#include "screen.h"
+#include "speaker.h"
+
+
class camplynx_state : public driver_device
{
public:
diff --git a/src/mame/drivers/canyon.cpp b/src/mame/drivers/canyon.cpp
index 537a736fb57..3af43dc4181 100644
--- a/src/mame/drivers/canyon.cpp
+++ b/src/mame/drivers/canyon.cpp
@@ -39,9 +39,11 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m6502.h"
#include "includes/canyon.h"
+#include "cpu/m6502/m6502.h"
#include "sound/discrete.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/capbowl.cpp b/src/mame/drivers/capbowl.cpp
index 384b276f3ed..b9874a45ad4 100644
--- a/src/mame/drivers/capbowl.cpp
+++ b/src/mame/drivers/capbowl.cpp
@@ -88,12 +88,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/capbowl.h"
+
#include "machine/ticket.h"
#include "cpu/m6809/m6809.h"
-#include "includes/capbowl.h"
#include "sound/2203intf.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_8MHz
diff --git a/src/mame/drivers/capr1.cpp b/src/mame/drivers/capr1.cpp
index 8fb6a9e5930..d8c614cb99c 100644
--- a/src/mame/drivers/capr1.cpp
+++ b/src/mame/drivers/capr1.cpp
@@ -31,6 +31,7 @@ TODO:
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
+#include "speaker.h"
class capr1_state : public driver_device
diff --git a/src/mame/drivers/cardline.cpp b/src/mame/drivers/cardline.cpp
index 705a73bc345..776f1a4da99 100644
--- a/src/mame/drivers/cardline.cpp
+++ b/src/mame/drivers/cardline.cpp
@@ -25,9 +25,12 @@
#include "cpu/mcs51/mcs51.h"
#include "sound/okim6295.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
#include "cardline.lh"
+
#define MASTER_CLOCK XTAL_12MHz
class cardline_state : public driver_device
diff --git a/src/mame/drivers/carjmbre.cpp b/src/mame/drivers/carjmbre.cpp
index bc067f86cf6..30442716e7b 100644
--- a/src/mame/drivers/carjmbre.cpp
+++ b/src/mame/drivers/carjmbre.cpp
@@ -41,8 +41,10 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
-#include "video/resnet.h"
#include "sound/ay8910.h"
+#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
class carjmbre_state : public driver_device
{
diff --git a/src/mame/drivers/carpolo.cpp b/src/mame/drivers/carpolo.cpp
index a01cc10da50..c6dcb4efaed 100644
--- a/src/mame/drivers/carpolo.cpp
+++ b/src/mame/drivers/carpolo.cpp
@@ -19,10 +19,12 @@
****************************************************************************/
#include "emu.h"
+#include "includes/carpolo.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/74153.h"
#include "machine/6821pia.h"
-#include "includes/carpolo.h"
+#include "screen.h"
diff --git a/src/mame/drivers/carrera.cpp b/src/mame/drivers/carrera.cpp
index 004de507e99..73b05f2e635 100644
--- a/src/mame/drivers/carrera.cpp
+++ b/src/mame/drivers/carrera.cpp
@@ -52,6 +52,8 @@ TODO:
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
class carrera_state : public driver_device
diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp
index 6165d1bb437..46de2b0e821 100644
--- a/src/mame/drivers/casloopy.cpp
+++ b/src/mame/drivers/casloopy.cpp
@@ -151,10 +151,11 @@ PCB 'Z545-1 A240570-1'
#include "emu.h"
#include "cpu/sh2/sh2.h"
-//#include "cpu/v60/v60.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
class casloopy_state : public driver_device
{
diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp
index ca62aec9c86..ef2a120315c 100644
--- a/src/mame/drivers/caswin.cpp
+++ b/src/mame/drivers/caswin.cpp
@@ -71,6 +71,8 @@ TODO:
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
class caswin_state : public driver_device
diff --git a/src/mame/drivers/cat.cpp b/src/mame/drivers/cat.cpp
index 084c1e6c9a9..7b8cd8a35c9 100644
--- a/src/mame/drivers/cat.cpp
+++ b/src/mame/drivers/cat.cpp
@@ -190,6 +190,17 @@ ToDo:
****************************************************************************/
+#include "emu.h"
+#include "cpu/m68000/m68000.h"
+#include "machine/clock.h"
+#include "machine/mc68681.h"
+#include "machine/nvram.h"
+#include "sound/spkrdev.h"
+#include "bus/centronics/ctronics.h"
+#include "screen.h"
+#include "speaker.h"
+
+
// Defines
#undef DEBUG_GA2OPR_W
@@ -221,15 +232,6 @@ ToDo:
#define DEBUG_SWYFT_VIA1 1
-// Includes
-#include "emu.h"
-#include "cpu/m68000/m68000.h"
-#include "machine/clock.h"
-#include "machine/mc68681.h"
-#include "machine/nvram.h"
-#include "sound/speaker.h"
-#include "bus/centronics/ctronics.h"
-
class cat_state : public driver_device
{
public:
diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp
index e4f35f9f86f..96d24aba949 100644
--- a/src/mame/drivers/cave.cpp
+++ b/src/mame/drivers/cave.cpp
@@ -75,17 +75,20 @@ Versions known to exist but not dumped:
***************************************************************************/
#include "emu.h"
+#include "includes/cave.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
-#include "cpu/z80/z80.h"
-#include "includes/cave.h"
#include "sound/2203intf.h"
#include "sound/ym2151.h"
#include "sound/ymz280b.h"
+#include "speaker.h"
#include "ppsatan.lh"
+
/***************************************************************************
diff --git a/src/mame/drivers/cavepc.cpp b/src/mame/drivers/cavepc.cpp
index 4854ec018d9..84f915d9be8 100644
--- a/src/mame/drivers/cavepc.cpp
+++ b/src/mame/drivers/cavepc.cpp
@@ -52,7 +52,7 @@
#include "emu.h"
#include "cpu/i386/i386.h"
-
+#include "screen.h"
class cavepc_state : public driver_device
diff --git a/src/mame/drivers/cb2001.cpp b/src/mame/drivers/cb2001.cpp
index 84e1e615b0c..10d2a83fb3e 100644
--- a/src/mame/drivers/cb2001.cpp
+++ b/src/mame/drivers/cb2001.cpp
@@ -44,8 +44,10 @@ this seems more like 8-bit hardware, maybe it should be v25, not v35...
#include "emu.h"
#include "cpu/nec/v25.h"
-#include "sound/ay8910.h"
#include "machine/i8255.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class cb2001_state : public driver_device
diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp
index 1a7d204b77f..1df363c46c8 100644
--- a/src/mame/drivers/cball.cpp
+++ b/src/mame/drivers/cball.cpp
@@ -8,6 +8,7 @@
#include "emu.h"
#include "cpu/m6800/m6800.h"
+#include "screen.h"
class cball_state : public driver_device
diff --git a/src/mame/drivers/cbasebal.cpp b/src/mame/drivers/cbasebal.cpp
index fa46ad67413..57066cb94db 100644
--- a/src/mame/drivers/cbasebal.cpp
+++ b/src/mame/drivers/cbasebal.cpp
@@ -15,12 +15,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/cbasebal.h"
+
#include "cpu/z80/z80.h"
#include "machine/kabuki.h" // needed for decoding functions only
-#include "includes/cbasebal.h"
#include "machine/eepromser.h"
#include "sound/okim6295.h"
#include "sound/ym2413.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp
index 6899d9e5b77..d77d68f55a0 100644
--- a/src/mame/drivers/cbm2.cpp
+++ b/src/mame/drivers/cbm2.cpp
@@ -11,7 +11,9 @@
*/
#include "emu.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#include "bus/cbm2/exp.h"
#include "bus/cbm2/user.h"
#include "bus/ieee488/ieee488.h"
diff --git a/src/mame/drivers/cbuster.cpp b/src/mame/drivers/cbuster.cpp
index 3cf150aac11..e4361c72f8c 100644
--- a/src/mame/drivers/cbuster.cpp
+++ b/src/mame/drivers/cbuster.cpp
@@ -32,12 +32,16 @@
***************************************************************************/
#include "emu.h"
+#include "includes/cbuster.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
-#include "includes/cbuster.h"
#include "sound/2203intf.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE16_MEMBER(cbuster_state::twocrude_control_w)
{
diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp
index e6b97398ebd..151c67a21a0 100644
--- a/src/mame/drivers/cc40.cpp
+++ b/src/mame/drivers/cc40.cpp
@@ -80,7 +80,10 @@
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "video/hd44780.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#include "cc40.lh"
diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp
index ef9c31078fc..70d3d844d65 100644
--- a/src/mame/drivers/ccastles.cpp
+++ b/src/mame/drivers/ccastles.cpp
@@ -120,10 +120,12 @@
***************************************************************************/
#include "emu.h"
+#include "includes/ccastles.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/watchdog.h"
#include "sound/pokey.h"
-#include "includes/ccastles.h"
+#include "speaker.h"
#define MASTER_CLOCK (10000000)
diff --git a/src/mame/drivers/cchance.cpp b/src/mame/drivers/cchance.cpp
index 199631d4f04..f67c8a3e923 100644
--- a/src/mame/drivers/cchance.cpp
+++ b/src/mame/drivers/cchance.cpp
@@ -35,9 +35,13 @@ cha3 $10d8
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/tnzs.h"
+
+#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
class cchance_state : public tnzs_base_state
{
diff --git a/src/mame/drivers/cchasm.cpp b/src/mame/drivers/cchasm.cpp
index c4124e0c902..2806c648439 100644
--- a/src/mame/drivers/cchasm.cpp
+++ b/src/mame/drivers/cchasm.cpp
@@ -16,6 +16,7 @@
#include "emu.h"
#include "includes/cchasm.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "cpu/m68000/m68000.h"
@@ -24,6 +25,7 @@
#include "machine/watchdog.h"
#include "sound/ay8910.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
#define CCHASM_68K_CLOCK (XTAL_8MHz)
diff --git a/src/mame/drivers/cclimber.cpp b/src/mame/drivers/cclimber.cpp
index 65f4aca72f1..0e0790b370e 100644
--- a/src/mame/drivers/cclimber.cpp
+++ b/src/mame/drivers/cclimber.cpp
@@ -238,12 +238,15 @@ Dip location verified from manual for: cclimber, guzzler, swimmer
***************************************************************************/
#include "emu.h"
+#include "includes/cclimber.h"
+#include "audio/cclimber.h"
+
#include "cpu/z80/z80.h"
#include "machine/segacrpt_device.h"
#include "sound/ay8910.h"
#include "sound/samples.h"
-#include "audio/cclimber.h"
-#include "includes/cclimber.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp
index 3d7b860a464..bed15d8e2ea 100644
--- a/src/mame/drivers/cd2650.cpp
+++ b/src/mame/drivers/cd2650.cpp
@@ -30,11 +30,13 @@ TODO
#include "emu.h"
#include "cpu/s2650/s2650.h"
-#include "machine/keyboard.h"
-#include "imagedev/snapquik.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
+#include "imagedev/snapquik.h"
+#include "machine/keyboard.h"
#include "sound/beep.h"
+#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
class cd2650_state : public driver_device
{
diff --git a/src/mame/drivers/cdc721.cpp b/src/mame/drivers/cdc721.cpp
index 397f5fa562a..e427048a09f 100644
--- a/src/mame/drivers/cdc721.cpp
+++ b/src/mame/drivers/cdc721.cpp
@@ -9,9 +9,10 @@ Control Data Corporation CDC 721 Terminal (Viking)
*************************************************************************************************************/
-
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
+
class cdc721_state : public driver_device
{
@@ -21,7 +22,8 @@ public:
, m_p_videoram(*this, "videoram")
, m_maincpu(*this, "maincpu")
, m_p_chargen(*this, "chargen")
- { }
+ {
+ }
uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
DECLARE_PALETTE_INIT(cdc721);
diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp
index 0cdcea594ee..f1fca2328fb 100644
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@@ -26,19 +26,25 @@ TODO:
*******************************************************************************/
-#define CLOCK_A XTAL_30MHz
-#define CLOCK_B XTAL_19_6608MHz
-
#include "emu.h"
+#include "includes/cdi.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/m6805/m6805.h"
-#include "includes/cdi.h"
+#include "imagedev/chd_cd.h"
#include "machine/timekpr.h"
#include "sound/cdda.h"
+
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
+
#include "cdrom.h"
+
#include "cdi.lh"
-#include "imagedev/chd_cd.h"
-#include "softlist.h"
+
+#define CLOCK_A XTAL_30MHz
+#define CLOCK_B XTAL_19_6608MHz
#if ENABLE_VERBOSE_LOG
static inline void ATTR_PRINTF(3,4) verboselog(device_t& device, int n_level, const char *s_fmt, ...)
diff --git a/src/mame/drivers/cedar_magnet.cpp b/src/mame/drivers/cedar_magnet.cpp
index 09d91496f82..efe3a5e1873 100644
--- a/src/mame/drivers/cedar_magnet.cpp
+++ b/src/mame/drivers/cedar_magnet.cpp
@@ -115,6 +115,9 @@ I suspect the additional memory was an afterthought.
#include "machine/cedar_magnet_sprite.h"
#include "machine/cedar_magnet_flop.h"
+#include "screen.h"
+
+
#define LOG_IC49_PIO_PB 0
#define LOG_IC48_PIO_PB 0
#define LOG_IC48_PIO_PA 0
diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp
index 034f9abdeac..21f395df5fa 100644
--- a/src/mame/drivers/centiped.cpp
+++ b/src/mame/drivers/centiped.cpp
@@ -415,13 +415,15 @@ each direction to assign the boundries.
***************************************************************************/
#include "emu.h"
+#include "includes/centiped.h"
+
#include "cpu/m6502/m6502.h"
#include "cpu/s2650/s2650.h"
#include "machine/watchdog.h"
#include "machine/atari_vg.h"
-#include "includes/centiped.h"
#include "sound/sn76496.h"
#include "sound/pokey.h"
+#include "speaker.h"
/*************************************
*
diff --git a/src/mame/drivers/cesclass.cpp b/src/mame/drivers/cesclass.cpp
index 7897f551c1c..48e0a078c7b 100644
--- a/src/mame/drivers/cesclass.cpp
+++ b/src/mame/drivers/cesclass.cpp
@@ -25,18 +25,21 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
-#include "rendlay.h"
#include "machine/nvram.h"
+#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
class cesclassic_state : public driver_device
{
public:
cesclassic_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_oki(*this, "oki"),
- m_vram(*this, "vram"),
- m_palette(*this, "palette") { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_oki(*this, "oki")
+ , m_vram(*this, "vram")
+ , m_palette(*this, "palette")
+ { }
DECLARE_WRITE16_MEMBER(irq2_ack_w);
DECLARE_WRITE16_MEMBER(irq3_ack_w);
diff --git a/src/mame/drivers/cfx9850.cpp b/src/mame/drivers/cfx9850.cpp
index 5c120979a51..64c49741a92 100644
--- a/src/mame/drivers/cfx9850.cpp
+++ b/src/mame/drivers/cfx9850.cpp
@@ -22,6 +22,7 @@ Debugging information:
#include "emu.h"
#include "cpu/hcd62121/hcd62121.h"
#include "rendlay.h"
+#include "screen.h"
class cfx9850_state : public driver_device
{
diff --git a/src/mame/drivers/cgc7900.cpp b/src/mame/drivers/cgc7900.cpp
index c99f7f98c32..3d2df7b32e7 100644
--- a/src/mame/drivers/cgc7900.cpp
+++ b/src/mame/drivers/cgc7900.cpp
@@ -37,6 +37,7 @@
#include "emu.h"
#include "includes/cgc7900.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/cgenie.cpp b/src/mame/drivers/cgenie.cpp
index 95b8b661f65..b8e7f6135ec 100644
--- a/src/mame/drivers/cgenie.cpp
+++ b/src/mame/drivers/cgenie.cpp
@@ -22,7 +22,10 @@
#include "bus/rs232/rs232.h"
#include "bus/cgenie/expansion/expansion.h"
#include "bus/cgenie/parallel/parallel.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/drivers/chaknpop.cpp b/src/mame/drivers/chaknpop.cpp
index 45d5540c1e9..d88f3ba3420 100644
--- a/src/mame/drivers/chaknpop.cpp
+++ b/src/mame/drivers/chaknpop.cpp
@@ -110,9 +110,13 @@ Notes:
*/
#include "emu.h"
+#include "includes/chaknpop.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/chaknpop.h"
+#include "screen.h"
+#include "speaker.h"
+
/***************************************************************************
diff --git a/src/mame/drivers/cham24.cpp b/src/mame/drivers/cham24.cpp
index 5adcefbd222..a6ad7a89a63 100644
--- a/src/mame/drivers/cham24.cpp
+++ b/src/mame/drivers/cham24.cpp
@@ -59,6 +59,8 @@ Notes:
#include "emu.h"
#include "cpu/m6502/n2a03.h"
#include "video/ppu2c0x.h"
+#include "screen.h"
+#include "speaker.h"
class cham24_state : public driver_device
diff --git a/src/mame/drivers/champbas.cpp b/src/mame/drivers/champbas.cpp
index 42b6d2f383c..8db48119ce4 100644
--- a/src/mame/drivers/champbas.cpp
+++ b/src/mame/drivers/champbas.cpp
@@ -86,6 +86,8 @@ TODO:
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/champbwl.cpp b/src/mame/drivers/champbwl.cpp
index 5e213440836..f78aa2d96e6 100644
--- a/src/mame/drivers/champbwl.cpp
+++ b/src/mame/drivers/champbwl.cpp
@@ -154,10 +154,12 @@ Notes:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/x1_010.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
+#include "sound/x1_010.h"
#include "video/seta001.h"
+#include "screen.h"
+#include "speaker.h"
class champbwl_state : public driver_device
{
diff --git a/src/mame/drivers/chanbara.cpp b/src/mame/drivers/chanbara.cpp
index 7303bd08329..d31dc17f154 100644
--- a/src/mame/drivers/chanbara.cpp
+++ b/src/mame/drivers/chanbara.cpp
@@ -53,6 +53,8 @@ ToDo:
#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
+#include "screen.h"
+#include "speaker.h"
class chanbara_state : public driver_device
diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp
index 3b52a804378..1e45c54de6a 100644
--- a/src/mame/drivers/chance32.cpp
+++ b/src/mame/drivers/chance32.cpp
@@ -22,6 +22,8 @@
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
#include "chance32.lh"
diff --git a/src/mame/drivers/changela.cpp b/src/mame/drivers/changela.cpp
index a05e9d1478f..b439776f39a 100644
--- a/src/mame/drivers/changela.cpp
+++ b/src/mame/drivers/changela.cpp
@@ -16,6 +16,7 @@ Tomasz Slanina
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
+#include "speaker.h"
#include "changela.lh"
diff --git a/src/mame/drivers/channelf.cpp b/src/mame/drivers/channelf.cpp
index 9e0e8c6bfa4..e3f545add2d 100644
--- a/src/mame/drivers/channelf.cpp
+++ b/src/mame/drivers/channelf.cpp
@@ -16,7 +16,9 @@
#include "emu.h"
#include "includes/channelf.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#ifndef VERBOSE
#define VERBOSE 0
diff --git a/src/mame/drivers/cheekyms.cpp b/src/mame/drivers/cheekyms.cpp
index 39c9972c1d1..597df4f82de 100644
--- a/src/mame/drivers/cheekyms.cpp
+++ b/src/mame/drivers/cheekyms.cpp
@@ -8,8 +8,10 @@
#include "emu.h"
#include "includes/cheekyms.h"
+
#include "cpu/z80/z80.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
INPUT_CHANGED_MEMBER(cheekyms_state::coin_inserted)
diff --git a/src/mame/drivers/chessmst.cpp b/src/mame/drivers/chessmst.cpp
index 1b4687e0596..9b5fb2c5f69 100644
--- a/src/mame/drivers/chessmst.cpp
+++ b/src/mame/drivers/chessmst.cpp
@@ -11,17 +11,21 @@
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "machine/z80pio.h"
#include "machine/clock.h"
-#include "sound/speaker.h"
+#include "machine/z80pio.h"
#include "sound/beep.h"
-#include "chessmst.lh"
-#include "chessmstdm.lh"
+#include "sound/spkrdev.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "speaker.h"
+
+#include "chessmst.lh"
+#include "chessmstdm.lh"
+
class chessmst_state : public driver_device
{
diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp
index 665a234ee12..c33e0b8ea8d 100644
--- a/src/mame/drivers/chexx.cpp
+++ b/src/mame/drivers/chexx.cpp
@@ -17,11 +17,14 @@ Electro-mechanical bubble hockey games:
#include "emu.h"
#include "cpu/m6502/m6502.h"
+#include "machine/6522via.h"
#include "sound/ay8910.h"
#include "sound/digitalk.h"
-#include "machine/6522via.h"
+#include "speaker.h"
+
#include "chexx.lh"
+
#define MAIN_CLOCK XTAL_4MHz
class chexx_state : public driver_device
diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp
index e49b17d38b8..0faeb150bfa 100644
--- a/src/mame/drivers/chihiro.cpp
+++ b/src/mame/drivers/chihiro.cpp
@@ -373,23 +373,20 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info.
*/
-#include <functional>
-
#include "emu.h"
+#include "includes/xbox.h"
+
#include "cpu/i386/i386.h"
-#include "machine/pic8259.h"
-#include "machine/idectrl.h"
#include "machine/idehd.h"
+#include "machine/jvs13551.h"
+#include "machine/jvshost.h"
#include "machine/naomigd.h"
-#include "video/poly.h"
-#include "debug/debugcon.h"
+
#include "debug/debugcmd.h"
+#include "debug/debugcon.h"
#include "debugger.h"
-#include "includes/xbox_nv2a.h"
-#include "includes/xbox.h"
-#include "includes/xbox_usb.h"
-#include "machine/jvshost.h"
-#include "machine/jvs13551.h"
+
+#include <functional>
#define LOG_PCI
//#define LOG_BASEBOARD
@@ -410,7 +407,7 @@ public:
int received_packet(uint8_t *buffer);
};
-const device_type JVS_MASTER = &device_creator<jvs_master>;
+const device_type JVS_MASTER = device_creator<jvs_master>;
jvs_master::jvs_master(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: jvs_host(mconfig, JVS_MASTER, "JVS MASTER", tag, owner, clock, "jvs_master", __FILE__)
@@ -496,7 +493,7 @@ private:
} jvs;
};
-const device_type OHCI_HLEAN2131QC = &device_creator<ohci_hlean2131qc_device>;
+const device_type OHCI_HLEAN2131QC = device_creator<ohci_hlean2131qc_device>;
extern const device_type OHCI_HLEAN2131SC;
@@ -527,7 +524,7 @@ private:
uint8_t *region;
};
-const device_type OHCI_HLEAN2131SC = &device_creator<ohci_hlean2131sc_device>;
+const device_type OHCI_HLEAN2131SC = device_creator<ohci_hlean2131sc_device>;
class chihiro_state : public xbox_base_state
{
@@ -1286,7 +1283,7 @@ protected:
//**************************************************************************
// device type definition
-const device_type IDE_BASEBOARD = &device_creator<ide_baseboard_device>;
+const device_type IDE_BASEBOARD = device_creator<ide_baseboard_device>;
//-------------------------------------------------
// ide_baseboard_device - constructor
diff --git a/src/mame/drivers/chinagat.cpp b/src/mame/drivers/chinagat.cpp
index cf794a7eea5..c5159482ae9 100644
--- a/src/mame/drivers/chinagat.cpp
+++ b/src/mame/drivers/chinagat.cpp
@@ -69,17 +69,18 @@ Input is unique but has a few similarities to DD2 (the coin inputs)
Dip locations and factory settings verified with China Gate US manual.
*/
-
-
#include "emu.h"
+#include "includes/ddragon.h"
+
#include "cpu/m6809/hd6309.h"
#include "cpu/m6809/m6809.h"
-#include "cpu/z80/z80.h"
#include "cpu/mcs48/mcs48.h"
-#include "sound/ym2151.h"
+#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
-#include "includes/ddragon.h"
+#include "sound/ym2151.h"
+#include "speaker.h"
+
#define MAIN_CLOCK XTAL_12MHz
#define PIXEL_CLOCK MAIN_CLOCK / 2
diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp
index f6551dbef10..0ca869a58c5 100644
--- a/src/mame/drivers/chinsan.cpp
+++ b/src/mame/drivers/chinsan.cpp
@@ -48,6 +48,8 @@ MM63.10N
#include "machine/mc8123.h"
#include "sound/2203intf.h"
#include "sound/msm5205.h"
+#include "screen.h"
+#include "speaker.h"
class chinsan_state : public driver_device
{
diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp
index a1a00780ef1..e2f97417977 100644
--- a/src/mame/drivers/chqflag.cpp
+++ b/src/mame/drivers/chqflag.cpp
@@ -15,12 +15,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/chqflag.h"
+#include "includes/konamipt.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6809/konami.h"
#include "machine/watchdog.h"
#include "sound/ym2151.h"
-#include "includes/chqflag.h"
-#include "includes/konamipt.h"
+#include "speaker.h"
+
#include "chqflag.lh"
diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp
index 5f201d16a29..32ab18639a2 100644
--- a/src/mame/drivers/chsuper.cpp
+++ b/src/mame/drivers/chsuper.cpp
@@ -26,8 +26,12 @@
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "chsuper.lh"
+
class chsuper_state : public driver_device
{
public:
diff --git a/src/mame/drivers/cinemat.cpp b/src/mame/drivers/cinemat.cpp
index d6012b4b3df..bae64d2f0d7 100644
--- a/src/mame/drivers/cinemat.cpp
+++ b/src/mame/drivers/cinemat.cpp
@@ -33,7 +33,6 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/ccpu/ccpu.h"
#include "includes/cinemat.h"
#include "armora.lh"
diff --git a/src/mame/drivers/circus.cpp b/src/mame/drivers/circus.cpp
index 518fb0488e0..facf52901b5 100644
--- a/src/mame/drivers/circus.cpp
+++ b/src/mame/drivers/circus.cpp
@@ -46,10 +46,12 @@ D000 Paddle Position and Interrupt Reset (where applicable)
*****************************************************************