summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-02-27 22:16:07 +1100
committer 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)
***************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m6502.h"
-#include "sound/samples.h"
#include "includes/circus.h"
+#include "cpu/m6502/m6502.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "circus.lh"
#include "crash.lh"
diff --git a/src/mame/drivers/circusc.cpp b/src/mame/drivers/circusc.cpp
index 91d56abb2ce..c2ca81a6df1 100644
--- a/src/mame/drivers/circusc.cpp
+++ b/src/mame/drivers/circusc.cpp
@@ -53,6 +53,7 @@ This bug is due to 380_r02.6h, it differs from 380_q02.6h by 2 bytes, at
#include "emu.h"
#include "includes/circusc.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "machine/gen_latch.h"
@@ -61,6 +62,9 @@ This bug is due to 380_r02.6h, it differs from 380_q02.6h by 2 bytes, at
#include "sound/discrete.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
void circusc_state::machine_start()
{
diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp
index 186e16c83b6..f458f4570e9 100644
--- a/src/mame/drivers/cischeat.cpp
+++ b/src/mame/drivers/cischeat.cpp
@@ -170,11 +170,13 @@ Cisco Heat.
***************************************************************************/
#include "emu.h"
+#include "includes/cischeat.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
#include "machine/jalcrpt.h"
-#include "includes/cischeat.h"
+#include "speaker.h"
#include "cischeat.lh"
#include "f1gpstar.lh"
diff --git a/src/mame/drivers/citycon.cpp b/src/mame/drivers/citycon.cpp
index 807898d301c..f78d856f761 100644
--- a/src/mame/drivers/citycon.cpp
+++ b/src/mame/drivers/citycon.cpp
@@ -10,11 +10,14 @@ Dip locations added from dip listing at crazykong.com
***************************************************************************/
#include "emu.h"
+#include "includes/citycon.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
#include "sound/2203intf.h"
-#include "includes/citycon.h"
+#include "screen.h"
+#include "speaker.h"
READ8_MEMBER(citycon_state::citycon_in_r)
diff --git a/src/mame/drivers/clayshoo.cpp b/src/mame/drivers/clayshoo.cpp
index 8af858dfcf7..410042c304c 100644
--- a/src/mame/drivers/clayshoo.cpp
+++ b/src/mame/drivers/clayshoo.cpp
@@ -20,6 +20,7 @@
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/watchdog.h"
+#include "screen.h"
class clayshoo_state : public driver_device
diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp
index 5058ccd5ac0..c8c30cc11f4 100644
--- a/src/mame/drivers/clcd.cpp
+++ b/src/mame/drivers/clcd.cpp
@@ -22,8 +22,10 @@
#include "machine/msm58321.h"
#include "machine/ram.h"
#include "machine/nvram.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
class clcd_state : public driver_device
{
diff --git a/src/mame/drivers/cliffhgr.cpp b/src/mame/drivers/cliffhgr.cpp
index 71a88c07515..71771216d4b 100644
--- a/src/mame/drivers/cliffhgr.cpp
+++ b/src/mame/drivers/cliffhgr.cpp
@@ -76,13 +76,16 @@ Side 2 = 0x8F7DDD (or 0x880000 | ( 0x77 << 12 ) | 0x0DDD)
*********************************************************/
#include "emu.h"
+#include "audio/cliffhgr.h"
+
#include "cpu/z80/z80.h"
-#include "render.h"
#include "machine/ldpr8210.h"
#include "video/tms9928a.h"
-#include "sound/discrete.h"
#include "machine/nvram.h"
-#include "audio/cliffhgr.h"
+
+#include "render.h"
+#include "speaker.h"
+
#define CLIFF_ENABLE_SND_1 NODE_01
#define CLIFF_ENABLE_SND_2 NODE_02
diff --git a/src/mame/drivers/cloak.cpp b/src/mame/drivers/cloak.cpp
index 137fed27c22..1d2b38bb31f 100644
--- a/src/mame/drivers/cloak.cpp
+++ b/src/mame/drivers/cloak.cpp
@@ -117,11 +117,14 @@
*/
#include "emu.h"
+#include "includes/cloak.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/pokey.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
-#include "includes/cloak.h"
+#include "speaker.h"
+
/*************************************
*
diff --git a/src/mame/drivers/cloud9.cpp b/src/mame/drivers/cloud9.cpp
index f080e13730a..a50ff3ad021 100644
--- a/src/mame/drivers/cloud9.cpp
+++ b/src/mame/drivers/cloud9.cpp
@@ -93,10 +93,12 @@
***************************************************************************/
#include "emu.h"
+#include "includes/cloud9.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/watchdog.h"
#include "sound/pokey.h"
-#include "includes/cloud9.h"
+#include "speaker.h"
#define MASTER_CLOCK (10000000)
diff --git a/src/mame/drivers/clowndwn.cpp b/src/mame/drivers/clowndwn.cpp
index 2eacdadfc44..dc1f154534e 100644
--- a/src/mame/drivers/clowndwn.cpp
+++ b/src/mame/drivers/clowndwn.cpp
@@ -10,6 +10,7 @@ can't find any info on this?
*/
#include "emu.h"
+#include "speaker.h"
class clowndwn_state : public driver_device
diff --git a/src/mame/drivers/clshroad.cpp b/src/mame/drivers/clshroad.cpp
index 82967171193..8ec556b45d4 100644
--- a/src/mame/drivers/clshroad.cpp
+++ b/src/mame/drivers/clshroad.cpp
@@ -24,9 +24,13 @@ Notes:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "audio/wiping.h"
#include "includes/clshroad.h"
+#include "audio/wiping.h"
+
+#include "cpu/z80/z80.h"
+#include "screen.h"
+#include "speaker.h"
+
void clshroad_state::machine_reset()
{
diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp
index 9ee5942e43c..7d8d4e73b2f 100644
--- a/src/mame/drivers/cmi.cpp
+++ b/src/mame/drivers/cmi.cpp
@@ -100,22 +100,28 @@
#include "emu.h"
#include "emu.h"
-#include "cpu/m6809/m6809.h"
+
#include "cpu/m6800/m6800.h"
+#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
-#include "machine/clock.h"
-#include "machine/7474.h"
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
-#include "machine/mos6551.h"
+#include "machine/7474.h"
+#include "machine/clock.h"
#include "machine/i8214.h"
-#include "machine/wd_fdc.h"
-#include "machine/msm5832.h"
#include "machine/input_merger.h"
+#include "machine/mos6551.h"
+#include "machine/msm5832.h"
+#include "machine/wd_fdc.h"
+
#include "video/dl1416.h"
+#include "screen.h"
+#include "speaker.h"
+
+
#define Q209_CPU_CLOCK 4000000 // ?
#define M6809_CLOCK 8000000 // wrong
@@ -292,7 +298,7 @@ private:
int m_irq_state;
};
-const device_type CMI01A_CHANNEL_CARD = &device_creator<cmi01a_device>;
+const device_type CMI01A_CHANNEL_CARD = device_creator<cmi01a_device>;
cmi01a_device::cmi01a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, CMI01A_CHANNEL_CARD, "Fairlight CMI-01A Channel Card", tag, owner, clock, "cmi_01a", __FILE__)
diff --git a/src/mame/drivers/cmmb.cpp b/src/mame/drivers/cmmb.cpp
index 0a2ccacbcce..9b43af914f3 100644
--- a/src/mame/drivers/cmmb.cpp
+++ b/src/mame/drivers/cmmb.cpp
@@ -49,6 +49,7 @@ OSC @ 72.576MHz
#include "emu.h"
#include "cpu/m6502/m65sc02.h"
#include "machine/at29x.h"
+#include "screen.h"
#define MAIN_CLOCK XTAL_72_576MHz
diff --git a/src/mame/drivers/cninja.cpp b/src/mame/drivers/cninja.cpp
index 4449f489f2b..eb496bb7ba9 100644
--- a/src/mame/drivers/cninja.cpp
+++ b/src/mame/drivers/cninja.cpp
@@ -43,14 +43,16 @@ Note about version levels using Mutant Fighter as the example:
***************************************************************************/
#include "emu.h"
+#include "includes/cninja.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
-#include "includes/cninja.h"
#include "machine/decocrpt.h"
#include "sound/2203intf.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
+#include "speaker.h"
WRITE16_MEMBER(cninja_state::cninja_sound_w)
{
diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp
index ee5bbfd6a83..56884656be3 100644
--- a/src/mame/drivers/cntsteer.cpp
+++ b/src/mame/drivers/cntsteer.cpp
@@ -36,6 +36,8 @@
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
class cntsteer_state : public driver_device
diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp
index 762d4fcd6bd..97fd810c3ba 100644
--- a/src/mame/drivers/cobra.cpp
+++ b/src/mame/drivers/cobra.cpp
@@ -327,6 +327,7 @@
#include "video/rgbutil.h"
#include "sound/rf5c400.h"
#include "sound/dmadac.h"
+#include "speaker.h"
#define GFXFIFO_IN_VERBOSE 0
#define GFXFIFO_OUT_VERBOSE 0
@@ -508,7 +509,7 @@ private:
optional_ioport_array<2> m_player_ports;
};
-const device_type COBRA_JVS = &device_creator<cobra_jvs>;
+const device_type COBRA_JVS = device_creator<cobra_jvs>;
cobra_jvs::cobra_jvs(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: jvs_device(mconfig, COBRA_JVS, "JVS (COBRA)", tag, owner, clock, "cobra_jvs", __FILE__),
@@ -599,7 +600,7 @@ private:
int m_send_ptr;
};
-const device_type COBRA_JVS_HOST = &device_creator<cobra_jvs_host>;
+const device_type COBRA_JVS_HOST = device_creator<cobra_jvs_host>;
cobra_jvs_host::cobra_jvs_host(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: jvs_host(mconfig, COBRA_JVS_HOST, "JVS-HOST (COBRA)", tag, owner, clock, "cobra_jvs_host", __FILE__)
diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp
index 5e373f54ba1..10055494949 100644
--- a/src/mame/drivers/coco12.cpp
+++ b/src/mame/drivers/coco12.cpp
@@ -25,18 +25,23 @@
#include "emu.h"
#include "includes/coco12.h"
-#include "bus/coco/coco_t4426.h"
+
#include "bus/coco/coco_232.h"
-#include "bus/coco/coco_orch90.h"
-#include "bus/coco/coco_pak.h"
+#include "bus/coco/coco_dwsock.h"
#include "bus/coco/coco_fdc.h"
#include "bus/coco/coco_multi.h"
-#include "bus/coco/coco_dwsock.h"
+#include "bus/coco/coco_orch90.h"
+#include "bus/coco/coco_pak.h"
+#include "bus/coco/coco_t4426.h"
+
#include "cpu/m6809/m6809.h"
-#include "formats/coco_cas.h"
#include "imagedev/cassette.h"
#include "sound/volt_reg.h"
+
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/coco_cas.h"
//**************************************************************************
// ADDRESS MAPS
diff --git a/src/mame/drivers/cocoloco.cpp b/src/mame/drivers/cocoloco.cpp
index 2dc58a884a5..e6a4f8b3fdf 100644
--- a/src/mame/drivers/cocoloco.cpp
+++ b/src/mame/drivers/cocoloco.cpp
@@ -188,18 +188,22 @@
**************************************************************************************/
-
-#define MASTER_CLOCK XTAL_20MHz /* confirmed */
-#define CPU_CLOCK MASTER_CLOCK / 16 /* confirmed */
-#define SND_CLOCK MASTER_CLOCK / 8 /* confirmed */
-
#include "emu.h"
+
#include "cpu/m6502/m6502.h"
-#include "sound/ay8910.h"
#include "machine/netlist.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "netlist/devices/net_lib.h"
+#define MASTER_CLOCK XTAL_20MHz /* confirmed */
+#define CPU_CLOCK MASTER_CLOCK / 16 /* confirmed */
+#define SND_CLOCK MASTER_CLOCK / 8 /* confirmed */
+
+
class cocoloco_state : public driver_device
{
public:
diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp
index cd36a3a26a7..c8818ad16ae 100644
--- a/src/mame/drivers/coinmstr.cpp
+++ b/src/mame/drivers/coinmstr.cpp
@@ -127,16 +127,19 @@
==================================================================================*/
-#define MASTER_CLOCK XTAL_14MHz
-#define CPU_CLOCK (MASTER_CLOCK/4)
-#define SND_CLOCK (MASTER_CLOCK/8)
-
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/6821pia.h"
#include "video/mc6845.h"
#include "sound/ay8910.h"
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_14MHz
+#define CPU_CLOCK (MASTER_CLOCK/4)
+#define SND_CLOCK (MASTER_CLOCK/8)
class coinmstr_state : public driver_device
diff --git a/src/mame/drivers/coinmvga.cpp b/src/mame/drivers/coinmvga.cpp
index 63470c88a52..2cbb4927d0c 100644
--- a/src/mame/drivers/coinmvga.cpp
+++ b/src/mame/drivers/coinmvga.cpp
@@ -216,17 +216,19 @@
*******************************************************************************/
-
-#define CPU_CLOCK XTAL_14_7456MHz
-#define MACH_CLOCK XTAL_50MHz // 50.35
-#define COM_CLOCK XTAL_20MHz
-#define SND_CLOCK XTAL_16_9344MHz
-
#include "emu.h"
#include "cpu/h8/h83006.h"
#include "sound/ymz280b.h"
#include "machine/nvram.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define CPU_CLOCK XTAL_14_7456MHz
+#define MACH_CLOCK XTAL_50MHz // 50.35
+#define COM_CLOCK XTAL_20MHz
+#define SND_CLOCK XTAL_16_9344MHz
class coinmvga_state : public driver_device
diff --git a/src/mame/drivers/coleco.cpp b/src/mame/drivers/coleco.cpp
index a673fb42e28..f52baf74d2f 100644
--- a/src/mame/drivers/coleco.cpp
+++ b/src/mame/drivers/coleco.cpp
@@ -65,7 +65,9 @@
#include "emu.h"
#include "includes/coleco.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
/* Read/Write Handlers */
diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp
index e07de84e377..6db944fc147 100644
--- a/src/mame/drivers/combatsc.cpp
+++ b/src/mame/drivers/combatsc.cpp
@@ -121,11 +121,13 @@ Dip location and recommended settings verified with the US manual
***************************************************************************/
#include "emu.h"
+#include "includes/combatsc.h"
+
#include "cpu/m6809/hd6309.h"
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
-#include "includes/combatsc.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/comebaby.cpp b/src/mame/drivers/comebaby.cpp
index 10f3f11d820..8437f6282fa 100644
--- a/src/mame/drivers/comebaby.cpp
+++ b/src/mame/drivers/comebaby.cpp
@@ -182,6 +182,7 @@ Nearly everything.
#include "emu.h"
#include "cpu/i386/i386.h"
+#include "screen.h"
class comebaby_state : public driver_device
diff --git a/src/mame/drivers/commando.cpp b/src/mame/drivers/commando.cpp
index d7f29bc85d4..f48e5565a92 100644
--- a/src/mame/drivers/commando.cpp
+++ b/src/mame/drivers/commando.cpp
@@ -45,10 +45,13 @@ Note : there is an ingame typo bug that doesn't display the bonus life values
***************************************************************************/
#include "emu.h"
+#include "includes/commando.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/2203intf.h"
-#include "includes/commando.h"
+#include "screen.h"
+#include "speaker.h"
/* Memory Maps */
diff --git a/src/mame/drivers/compgolf.cpp b/src/mame/drivers/compgolf.cpp
index 54e364c9ebc..ba6f2db68b7 100644
--- a/src/mame/drivers/compgolf.cpp
+++ b/src/mame/drivers/compgolf.cpp
@@ -15,6 +15,9 @@
#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "includes/compgolf.h"
diff --git a/src/mame/drivers/compucolor.cpp b/src/mame/drivers/compucolor.cpp
index 60ff050a06b..73c565c7359 100644
--- a/src/mame/drivers/compucolor.cpp
+++ b/src/mame/drivers/compucolor.cpp
@@ -19,11 +19,6 @@
*/
-#define I8080_TAG "ua2"
-#define TMS5501_TAG "ud2"
-#define CRT5027_TAG "uf9"
-#define RS232_TAG "rs232"
-
#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/i8085/i8085.h"
@@ -31,8 +26,14 @@
#include "machine/ram.h"
#include "machine/tms5501.h"
#include "video/tms9927.h"
+#include "screen.h"
#include "softlist.h"
+#define I8080_TAG "ua2"
+#define TMS5501_TAG "ud2"
+#define CRT5027_TAG "uf9"
+#define RS232_TAG "rs232"
+
class compucolor2_state : public driver_device
{
public:
diff --git a/src/mame/drivers/comquest.cpp b/src/mame/drivers/comquest.cpp
index 34982b777cb..4c9d82e83fc 100644
--- a/src/mame/drivers/comquest.cpp
+++ b/src/mame/drivers/comquest.cpp
@@ -42,9 +42,12 @@ icq3250a-d
*/
#include "emu.h"
-#include "cpu/m6805/m6805.h"
#include "includes/comquest.h"
+#include "cpu/m6805/m6805.h"
+#include "screen.h"
+
+
#ifdef UNUSED_FUNCTION
READ8_MEMBER(comquest_state::comquest_read)
{
diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp
index f23d58f2120..c1925f003ef 100644
--- a/src/mame/drivers/comx35.cpp
+++ b/src/mame/drivers/comx35.cpp
@@ -14,6 +14,7 @@
#include "emu.h"
#include "includes/comx35.h"
#include "formats/imageutl.h"
+#include "screen.h"
#include "softlist.h"
/***************************************************************************
diff --git a/src/mame/drivers/concept.cpp b/src/mame/drivers/concept.cpp
index 97ba4ffbf5d..0bfa6f452d2 100644
--- a/src/mame/drivers/concept.cpp
+++ b/src/mame/drivers/concept.cpp
@@ -32,12 +32,15 @@
*/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "includes/concept.h"
+
+#include "cpu/m68000/m68000.h"
#include "bus/a2bus/a2corvus.h"
#include "bus/a2bus/corvfdc01.h"
#include "bus/a2bus/corvfdc02.h"
#include "bus/rs232/rs232.h"
+#include "screen.h"
+#include "speaker.h"
static ADDRESS_MAP_START(concept_memmap, AS_PROGRAM, 16, concept_state )
AM_RANGE(0x000000, 0x000007) AM_ROM AM_REGION("maincpu", 0x010000) /* boot ROM mirror */
diff --git a/src/mame/drivers/contra.cpp b/src/mame/drivers/contra.cpp
index 38a659b8ed1..70872bf8363 100644
--- a/src/mame/drivers/contra.cpp
+++ b/src/mame/drivers/contra.cpp
@@ -19,12 +19,14 @@ Dip locations and factory settings verified with manual
***************************************************************************/
#include "emu.h"
+#include "includes/contra.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/hd6309.h"
#include "cpu/m6809/m6809.h"
#include "machine/gen_latch.h"
#include "sound/ym2151.h"
-#include "includes/konamipt.h"
-#include "includes/contra.h"
+#include "speaker.h"
INTERRUPT_GEN_MEMBER(contra_state::contra_interrupt)
diff --git a/src/mame/drivers/coolpool.cpp b/src/mame/drivers/coolpool.cpp
index e6e0929fbff..f92ee4a445b 100644
--- a/src/mame/drivers/coolpool.cpp
+++ b/src/mame/drivers/coolpool.cpp
@@ -28,11 +28,14 @@
#include "emu.h"
#include "includes/coolpool.h"
+
#include "cpu/tms32010/tms32010.h"
#include "cpu/tms32025/tms32025.h"
#include "machine/nvram.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp
index 5e841a16011..3b4a1d70199 100644
--- a/src/mame/drivers/coolridr.cpp
+++ b/src/mame/drivers/coolridr.cpp
@@ -282,13 +282,17 @@ to the same bank as defined through A20.
#include "emu.h"
-#include "cpu/sh2/sh2.h"
#include "cpu/m68000/m68000.h"
-#include "sound/scsp.h"
+#include "cpu/sh2/sh2.h"
#include "machine/nvram.h"
+#include "sound/scsp.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "aquastge.lh"
+
#define CLIPMAXX_FULL (496-1)
#define CLIPMAXY_FULL (384-1)
#define CLIPMINX_FULL (0)
diff --git a/src/mame/drivers/cop01.cpp b/src/mame/drivers/cop01.cpp
index 2c31bb55ed8..d39649f0faa 100644
--- a/src/mame/drivers/cop01.cpp
+++ b/src/mame/drivers/cop01.cpp
@@ -54,10 +54,13 @@ Mighty Guy board layout:
***************************************************************************/
#include "emu.h"
+#include "includes/cop01.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/3526intf.h"
-#include "includes/cop01.h"
+#include "screen.h"
+#include "speaker.h"
#define MIGHTGUY_HACK 0
diff --git a/src/mame/drivers/cops.cpp b/src/mame/drivers/cops.cpp
index 36320353ead..2ca28f682db 100644
--- a/src/mame/drivers/cops.cpp
+++ b/src/mame/drivers/cops.cpp
@@ -36,8 +36,8 @@
#include "sound/sn76496.h"
#include "machine/msm6242.h"
#include "machine/ldp1450.h"
-
#include "machine/mos6551.h"
+#include "speaker.h"
#include "cops.lh"
diff --git a/src/mame/drivers/copsnrob.cpp b/src/mame/drivers/copsnrob.cpp
index 92177ecaea6..5081902011f 100644
--- a/src/mame/drivers/copsnrob.cpp
+++ b/src/mame/drivers/copsnrob.cpp
@@ -57,8 +57,11 @@ Added Dip locations according to manual.
***************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m6502.h"
#include "includes/copsnrob.h"
+
+#include "cpu/m6502/m6502.h"
+#include "speaker.h"
+
#include "copsnrob.lh"
diff --git a/src/mame/drivers/corona.cpp b/src/mame/drivers/corona.cpp
index ca0818f2ee4..7f6a48fdc22 100644
--- a/src/mame/drivers/corona.cpp
+++ b/src/mame/drivers/corona.cpp
@@ -300,6 +300,18 @@
**************************************************************************/
+#include "emu.h"
+#include "cpu/z80/z80.h"
+#include "machine/gen_latch.h"
+#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
+#include "re800.lh"
+#include "luckyrlt.lh"
+
+
#define WC81_MAIN_XTAL XTAL_24MHz /* Main crystal for Winners Circle 28*28 pins PCB's */
#define WC82_MAIN_XTAL XTAL_18_432MHz /* Main crystal for Winners Circle 18*22 pins PCB's */
#define RE_MAIN_XTAL XTAL_16MHz /* Main for roulette boards */
@@ -309,15 +321,6 @@
#define VIDEOBUF_SIZE 512*512
-#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
-#include "machine/gen_latch.h"
-#include "machine/nvram.h"
-#include "re800.lh"
-#include "luckyrlt.lh"
-
-
class corona_state : public driver_device
{
public:
diff --git a/src/mame/drivers/cosmic.cpp b/src/mame/drivers/cosmic.cpp
index 51a20cff4b5..9fc7f551b86 100644
--- a/src/mame/drivers/cosmic.cpp
+++ b/src/mame/drivers/cosmic.cpp
@@ -36,10 +36,12 @@ cosmicg - board can operate in b&w mode if there is no PROM, in this case
#include "emu.h"
#include "includes/cosmic.h"
+
#include "cpu/tms9900/tms9980a.h"
#include "cpu/z80/z80.h"
#include "sound/samples.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
/* Schematics show 12 triggers for discrete sound circuits */
diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp
index a92f57f7307..7ab8aa1e817 100644
--- a/src/mame/drivers/cosmicos.cpp
+++ b/src/mame/drivers/cosmicos.cpp
@@ -35,8 +35,12 @@
#include "emu.h"
#include "includes/cosmicos.h"
+
+#include "speaker.h"
+
#include "cosmicos.lh"
+
enum
{
MODE_RUN,
diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp
index 3d9dd7946dd..b375440c97c 100644
--- a/src/mame/drivers/cps1.cpp
+++ b/src/mame/drivers/cps1.cpp
@@ -238,6 +238,8 @@ Stephh's log (2006.09.20) :
***************************************************************************/
#include "emu.h"
+#include "includes/cps1.h"
+
#include "cpu/z80/z80.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "cpu/m68000/m68000.h"
@@ -246,7 +248,7 @@ Stephh's log (2006.09.20) :
#include "sound/okim6295.h"
#include "sound/qsound.h"
#include "machine/kabuki.h"
-#include "includes/cps1.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp
index d2be82309e7..6b066c24b50 100644
--- a/src/mame/drivers/cps2.cpp
+++ b/src/mame/drivers/cps2.cpp
@@ -632,6 +632,7 @@ Stephh's inputs notes (based on some tests on the "parent" set) :
#include "cpu/m68000/m68000.h"
#include "sound/qsound.h"
#include "sound/okim6295.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp
index d313d5959f0..1983758a118 100644
--- a/src/mame/drivers/cps3.cpp
+++ b/src/mame/drivers/cps3.cpp
@@ -467,6 +467,8 @@ hardware modification to the security cart.....
#include "bus/scsi/scsi.h"
#include "bus/scsi/scsicd.h"
#include "machine/wd33c93.h"
+#include "screen.h"
+#include "speaker.h"
#include "sfiii2.lh"
diff --git a/src/mame/drivers/craft.cpp b/src/mame/drivers/craft.cpp
index 1c85d5a90ea..0693991486f 100644
--- a/src/mame/drivers/craft.cpp
+++ b/src/mame/drivers/craft.cpp
@@ -12,6 +12,8 @@
#include "cpu/avr8/avr8.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
#define VERBOSE_LEVEL (0)
diff --git a/src/mame/drivers/crbaloon.cpp b/src/mame/drivers/crbaloon.cpp
index e7e4c3e4257..034acc2d81f 100644
--- a/src/mame/drivers/crbaloon.cpp
+++ b/src/mame/drivers/crbaloon.cpp
@@ -15,9 +15,11 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/crbaloon.h"
+#include "cpu/z80/z80.h"
+#include "screen.h"
+
/*************************************
*
diff --git a/src/mame/drivers/crgolf.cpp b/src/mame/drivers/crgolf.cpp
index 47492e66061..90687667347 100644
--- a/src/mame/drivers/crgolf.cpp
+++ b/src/mame/drivers/crgolf.cpp
@@ -90,10 +90,13 @@ protected or a snippet should do the aforementioned string copy.
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/crgolf.h"
+
+#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/msm5205.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp
index 6458cce8a71..c35f32de4fb 100644
--- a/src/mame/drivers/crimfght.cpp
+++ b/src/mame/drivers/crimfght.cpp
@@ -14,12 +14,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/konamipt.h"
+#include "includes/crimfght.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/crimfght.h"
+#include "speaker.h"
WRITE8_MEMBER(crimfght_state::crimfght_coin_w)
diff --git a/src/mame/drivers/crospang.cpp b/src/mame/drivers/crospang.cpp
index b2702b871ca..827e20ac4bf 100644
--- a/src/mame/drivers/crospang.cpp
+++ b/src/mame/drivers/crospang.cpp
@@ -33,11 +33,14 @@
*/
#include "emu.h"
+#include "includes/crospang.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "sound/3812intf.h"
-#include "includes/crospang.h"
+#include "screen.h"
+#include "speaker.h"
/* main cpu */
diff --git a/src/mame/drivers/crshrace.cpp b/src/mame/drivers/crshrace.cpp
index b4ad32f78c0..fb4c3dc74dd 100644
--- a/src/mame/drivers/crshrace.cpp
+++ b/src/mame/drivers/crshrace.cpp
@@ -129,10 +129,12 @@ Dip locations verified with Service Mode.
***************************************************************************/
#include "emu.h"
+#include "includes/crshrace.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
-
-#include "includes/crshrace.h"
+#include "screen.h"
+#include "speaker.h"
#define CRSHRACE_3P_HACK 0
diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp
index ea2cd71a269..2222abc56fd 100644
--- a/src/mame/drivers/crvision.cpp
+++ b/src/mame/drivers/crvision.cpp
@@ -129,7 +129,10 @@ CN1 - main board connector (17x2 pin header)
#include "emu.h"
#include "includes/crvision.h"
+
#include "softlist.h"
+#include "speaker.h"
+
/***************************************************************************
MEMORY MAPS
diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp
index 6dc5ec1e7ae..c0a7a39d24d 100644
--- a/src/mame/drivers/crystal.cpp
+++ b/src/mame/drivers/crystal.cpp
@@ -184,10 +184,12 @@ GUN_xP are 6 pin gun connectors (pins 1-4 match the UNICO sytle guns):
#include "emu.h"
#include "cpu/se3208/se3208.h"
-#include "video/vrender0.h"
#include "machine/ds1302.h"
-#include "sound/vrender0.h"
#include "machine/nvram.h"
+#include "sound/vrender0.h"
+#include "video/vrender0.h"
+#include "screen.h"
+#include "speaker.h"
#define IDLE_LOOP_SPEEDUP
@@ -206,7 +208,7 @@ public:
m_vr0(*this, "vr0"),
m_ds1302(*this, "rtc"),
m_screen(*this, "screen")
- { }
+ { }
/* memory pointers */
required_shared_ptr<uint32_t> m_sysregs;
diff --git a/src/mame/drivers/csplayh5.cpp b/src/mame/drivers/csplayh5.cpp
index 6c88bad56e4..7fb98fc1c9d 100644
--- a/src/mame/drivers/csplayh5.cpp
+++ b/src/mame/drivers/csplayh5.cpp
@@ -34,6 +34,7 @@
#include "sound/3812intf.h"
#include "sound/volt_reg.h"
#include "video/v9938.h"
+#include "speaker.h"
class csplayh5_state : public driver_device
diff --git a/src/mame/drivers/cswat.cpp b/src/mame/drivers/cswat.cpp
index 0b8fa738fe9..4dec7886d9a 100644
--- a/src/mame/drivers/cswat.cpp
+++ b/src/mame/drivers/cswat.cpp
@@ -22,9 +22,11 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "audio/namco52.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/mb88xx/mb88xx.h"
-#include "audio/namco52.h"
+#include "screen.h"
class cswat_state : public driver_device
diff --git a/src/mame/drivers/ct486.cpp b/src/mame/drivers/ct486.cpp
index 781f1ded72e..2d7e0e7c5ac 100644
--- a/src/mame/drivers/ct486.cpp
+++ b/src/mame/drivers/ct486.cpp
@@ -7,16 +7,21 @@
***************************************************************************/
#include "emu.h"
+
#include "cpu/i386/i386.h"
-#include "machine/ram.h"
-#include "machine/cs4031.h"
#include "machine/at_keybc.h"
-#include "bus/pc_kbd/pc_kbdc.h"
-#include "bus/pc_kbd/keyboards.h"
+#include "machine/cs4031.h"
+#include "machine/ram.h"
+#include "sound/spkrdev.h"
+
#include "bus/isa/isa.h"
#include "bus/isa/isa_cards.h"
-#include "sound/speaker.h"
+#include "bus/pc_kbd/keyboards.h"
+#include "bus/pc_kbd/pc_kbdc.h"
+
#include "softlist.h"
+#include "speaker.h"
+
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/drivers/cubeqst.cpp b/src/mame/drivers/cubeqst.cpp
index 73abd3dcaf3..02b3de025ff 100644
--- a/src/mame/drivers/cubeqst.cpp
+++ b/src/mame/drivers/cubeqst.cpp
@@ -26,6 +26,7 @@
#include "machine/nvram.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
class cubeqst_state : public driver_device
{
diff --git a/src/mame/drivers/cubo.cpp b/src/mame/drivers/cubo.cpp
index f6d8809b021..1d79bfd89b8 100644
--- a/src/mame/drivers/cubo.cpp
+++ b/src/mame/drivers/cubo.cpp
@@ -314,6 +314,7 @@ routines :
#include "includes/amiga.h"
#include "imagedev/chd_cd.h"
#include "machine/microtch.h"
+#include "speaker.h"
/* set to 0 to use control panel with only buttons (as in quiz games) - joy is default in dispenser setup */
diff --git a/src/mame/drivers/cultures.cpp b/src/mame/drivers/cultures.cpp
index 98582e6d02f..75ab788546b 100644
--- a/src/mame/drivers/cultures.cpp
+++ b/src/mame/drivers/cultures.cpp
@@ -12,8 +12,10 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/okim6295.h"
#include "machine/bankdev.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
#define MCLK 16000000
diff --git a/src/mame/drivers/cupidon.cpp b/src/mame/drivers/cupidon.cpp
index c1af7777bb2..2ecdcf66932 100644
--- a/src/mame/drivers/cupidon.cpp
+++ b/src/mame/drivers/cupidon.cpp
@@ -15,7 +15,8 @@
#include "emu.h"
#include "machine/68340.h"
-
+#include "screen.h"
+#include "speaker.h"
class cupidon_state : public driver_device
diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp
index 361ee318e92..3cc021fecae 100644
--- a/src/mame/drivers/cv1k.cpp
+++ b/src/mame/drivers/cv1k.cpp
@@ -172,13 +172,17 @@ Blitter Timing
*/
#include "emu.h"
-#include "cpu/sh4/sh4.h"
+
#include "cpu/sh4/sh3comn.h"
-#include "profiler.h"
+#include "cpu/sh4/sh4.h"
#include "machine/rtc9701.h"
+#include "machine/serflash.h"
#include "sound/ymz770.h"
#include "video/epic12.h"
-#include "machine/serflash.h"
+
+#include "profiler.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/cvs.cpp b/src/mame/drivers/cvs.cpp
index d331ed50507..df7d4f5b068 100644
--- a/src/mame/drivers/cvs.cpp
+++ b/src/mame/drivers/cvs.cpp
@@ -96,6 +96,7 @@ Todo & FIXME:
#include "includes/cvs.h"
#include "cpu/s2650/s2650.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
/* Turn to 1 so all inputs are always available (this shall only be a debug feature) */
diff --git a/src/mame/drivers/cxgz80.cpp b/src/mame/drivers/cxgz80.cpp
index 730b61fbe00..78f8bdf58b2 100644
--- a/src/mame/drivers/cxgz80.cpp
+++ b/src/mame/drivers/cxgz80.cpp
@@ -27,6 +27,7 @@ Chess 2001:
#include "cpu/z80/z80.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
// internal artwork
#include "cxg_ch2001.lh" // clickable
diff --git a/src/mame/drivers/cxhumax.cpp b/src/mame/drivers/cxhumax.cpp
index 77c055bbd91..d09cf159c53 100644
--- a/src/mame/drivers/cxhumax.cpp
+++ b/src/mame/drivers/cxhumax.cpp
@@ -15,6 +15,9 @@
#include "emu.h"
#include "includes/cxhumax.h"
+#include "screen.h"
+
+
#define VERBOSE_LEVEL ( 0 )
static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ...)
diff --git a/src/mame/drivers/cyberbal.cpp b/src/mame/drivers/cyberbal.cpp
index bbcb02505aa..6d5ce2752f3 100644
--- a/src/mame/drivers/cyberbal.cpp
+++ b/src/mame/drivers/cyberbal.cpp
@@ -23,9 +23,12 @@
#include "emu.h"
#include "includes/cyberbal.h"
+
#include "machine/watchdog.h"
#include "sound/ym2151.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "rendlay.h"
diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp
index aaa7d82eddc..b33b2231b5e 100644
--- a/src/mame/drivers/cybertnk.cpp
+++ b/src/mame/drivers/cybertnk.cpp
@@ -170,11 +170,13 @@ lev 7 : 0x7c : 0000 07e0 - input device clear?
*******************************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/8950intf.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
class cybertnk_state : public driver_device
diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp
index 03c385675b4..a9989184623 100644
--- a/src/mame/drivers/cybiko.cpp
+++ b/src/mame/drivers/cybiko.cpp
@@ -20,8 +20,11 @@ ToDo:
#include "emu.h"
#include "includes/cybiko.h"
-#include "rendlay.h"
+
#include "bus/rs232/rs232.h"
+#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
// +------------------------------------------------------+
// | Cybiko Classic (CY6411) | V2 |
diff --git a/src/mame/drivers/cyclemb.cpp b/src/mame/drivers/cyclemb.cpp
index 9365e2b0b72..449366280b4 100644
--- a/src/mame/drivers/cyclemb.cpp
+++ b/src/mame/drivers/cyclemb.cpp
@@ -72,10 +72,13 @@ Dumped by Chack'n
****************************************************************************************************/
#include "emu.h"
+#include "machine/tait8741.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/2203intf.h"
-#include "machine/tait8741.h"
+#include "screen.h"
+#include "speaker.h"
class cyclemb_state : public driver_device
diff --git a/src/mame/drivers/d6800.cpp b/src/mame/drivers/d6800.cpp
index 800d7c4a4c5..d3d91ca9c92 100644
--- a/src/mame/drivers/d6800.cpp
+++ b/src/mame/drivers/d6800.cpp
@@ -40,11 +40,13 @@
#include "emu.h"
#include "cpu/m6800/m6800.h"
-#include "sound/beep.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
-#include "sound/wave.h"
#include "machine/6821pia.h"
+#include "sound/beep.h"
+#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
class d6800_state : public driver_device
diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp
index f076490d0bc..7223405f627 100644
--- a/src/mame/drivers/d9final.cpp
+++ b/src/mame/drivers/d9final.cpp
@@ -29,6 +29,8 @@
#include "machine/msm6242.h"
#include "sound/es8712.h"
#include "sound/ym2413.h"
+#include "screen.h"
+#include "speaker.h"
class d9final_state : public driver_device
diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp
index 9dbf09247d1..6c328d238b7 100644
--- a/src/mame/drivers/dacholer.cpp
+++ b/src/mame/drivers/dacholer.cpp
@@ -38,6 +38,8 @@
#include "sound/msm5205.h"
#include "sound/ay8910.h"
#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
class dacholer_state : public driver_device
{
diff --git a/src/mame/drivers/dai.cpp b/src/mame/drivers/dai.cpp
index f4840b97104..9975834117a 100644
--- a/src/mame/drivers/dai.cpp
+++ b/src/mame/drivers/dai.cpp
@@ -62,7 +62,9 @@ Timings:
#include "emu.h"
#include "includes/dai.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
/* I/O ports */
static ADDRESS_MAP_START( dai_io , AS_IO, 8, dai_state )
diff --git a/src/mame/drivers/dai3wksi.cpp b/src/mame/drivers/dai3wksi.cpp
index f92884ea9ae..664b9e7a421 100644
--- a/src/mame/drivers/dai3wksi.cpp
+++ b/src/mame/drivers/dai3wksi.cpp
@@ -38,10 +38,14 @@ Driver Notes:
*/
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "sound/samples.h"
#include "machine/rescap.h"
+#include "sound/samples.h"
#include "sound/sn76477.h"
+#include "screen.h"
+#include "speaker.h"
+
#define USE_SAMPLES (1)
diff --git a/src/mame/drivers/dambustr.cpp b/src/mame/drivers/dambustr.cpp
index 73b83e92ffd..a1273562894 100644
--- a/src/mame/drivers/dambustr.cpp
+++ b/src/mame/drivers/dambustr.cpp
@@ -51,11 +51,12 @@ Stephh's notes (based on the games Z80 code and some tests) :
#include "emu.h"
+#include "includes/galaxold.h"
+#include "audio/galaxian.h"
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
-#include "audio/galaxian.h"
-#include "includes/galaxold.h"
+#include "speaker.h"
class dambustr_state : public galaxold_state
diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp
index 933e06e1666..12a4f4b8ec9 100644
--- a/src/mame/drivers/darius.cpp
+++ b/src/mame/drivers/darius.cpp
@@ -130,14 +130,18 @@ sounds.
***************************************************************************/
#include "emu.h"
+#include "includes/darius.h"
+#include "audio/taitosnd.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
-#include "audio/taitosnd.h"
#include "sound/2203intf.h"
-#include "sound/msm5205.h"
#include "sound/flt_vol.h"
-#include "includes/darius.h"
+#include "sound/msm5205.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "darius.lh"
diff --git a/src/mame/drivers/darkmist.cpp b/src/mame/drivers/darkmist.cpp
index b08e2357013..e14f1e4ebd6 100644
--- a/src/mame/drivers/darkmist.cpp
+++ b/src/mame/drivers/darkmist.cpp
@@ -29,8 +29,9 @@ TODO:
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/darkmist.h"
+#include "cpu/z80/z80.h"
+#include "speaker.h"
void darkmist_state::machine_start()
{
diff --git a/src/mame/drivers/darkseal.cpp b/src/mame/drivers/darkseal.cpp
index ddf00ff9679..b2c8c08d9ee 100644
--- a/src/mame/drivers/darkseal.cpp
+++ b/src/mame/drivers/darkseal.cpp
@@ -18,12 +18,16 @@
***************************************************************************/
#include "emu.h"
+#include "includes/darkseal.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "sound/2203intf.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/darkseal.h"
+#include "screen.h"
+#include "speaker.h"
+
/******************************************************************************/
diff --git a/src/mame/drivers/daruma.cpp b/src/mame/drivers/daruma.cpp
index 33f3226230c..5290821c49a 100644
--- a/src/mame/drivers/daruma.cpp
+++ b/src/mame/drivers/daruma.cpp
@@ -17,7 +17,8 @@
#include "emu.h"
#include "cpu/mcs51/mcs51.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "speaker.h"
//TODO: #include "ds348.lh"
class daruma_state : public driver_device
diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp
index 0758844c80c..5248221a79f 100644
--- a/src/mame/drivers/dassault.cpp
+++ b/src/mame/drivers/dassault.cpp
@@ -207,11 +207,15 @@ Dip locations verified with US conversion kit manual.
***************************************************************************/
#include "emu.h"
+#include "includes/dassault.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
-#include "includes/dassault.h"
#include "sound/2203intf.h"
#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
+
/**********************************************************************************/
diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp
index 9ba9a8c1525..e4fe267f8fd 100644
--- a/src/mame/drivers/dblcrown.cpp
+++ b/src/mame/drivers/dblcrown.cpp
@@ -50,6 +50,8 @@
#include "machine/i8255.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "screen.h"
+#include "speaker.h"
#include "dblcrown.lh"
#define DEBUG_VRAM
diff --git a/src/mame/drivers/dblewing.cpp b/src/mame/drivers/dblewing.cpp
index ce68c5e7336..f5d0265696c 100644
--- a/src/mame/drivers/dblewing.cpp
+++ b/src/mame/drivers/dblewing.cpp
@@ -67,16 +67,18 @@ Notes:
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
-#include "machine/decocrpt.h"
+#include "cpu/z80/z80.h"
#include "machine/deco102.h"
-#include "sound/ym2151.h"
+#include "machine/deco104.h"
+#include "machine/decocrpt.h"
+#include "machine/gen_latch.h"
#include "sound/okim6295.h"
+#include "sound/ym2151.h"
#include "video/deco16ic.h"
#include "video/decospr.h"
-#include "machine/deco104.h"
-#include "machine/gen_latch.h"
+#include "screen.h"
+#include "speaker.h"
class dblewing_state : public driver_device
{
diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp
index 18c8bf5bc77..3a7b9deab8d 100644
--- a/src/mame/drivers/dbz.cpp
+++ b/src/mame/drivers/dbz.cpp
@@ -53,11 +53,13 @@ Notes:
*/
#include "emu.h"
+#include "includes/dbz.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/dbz.h"
+#include "speaker.h"
TIMER_DEVICE_CALLBACK_MEMBER(dbz_state::dbz_scanline)
diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp
index cb96b4c7f88..a1e677aeaa1 100644
--- a/src/mame/drivers/dccons.cpp
+++ b/src/mame/drivers/dccons.cpp
@@ -261,17 +261,20 @@
*/
#include "emu.h"
+#include "includes/dccons.h"
+
#include "cpu/arm7/arm7.h"
-#include "cpu/sh4/sh4.h"
#include "cpu/arm7/arm7core.h"
-#include "sound/aica.h"
-#include "machine/aicartc.h"
-#include "includes/dc.h"
-#include "includes/dccons.h"
+#include "cpu/sh4/sh4.h"
#include "imagedev/chd_cd.h"
+#include "machine/aicartc.h"
#include "machine/dc-ctrl.h"
#include "machine/gdrom.h"
+#include "screen.h"
+#include "speaker.h"
+
+
#define CPU_CLOCK (200000000)
READ64_MEMBER(dc_cons_state::dcus_idle_skip_r )
diff --git a/src/mame/drivers/dcheese.cpp b/src/mame/drivers/dcheese.cpp
index 59d07364a06..2d3a4d0b93d 100644
--- a/src/mame/drivers/dcheese.cpp
+++ b/src/mame/drivers/dcheese.cpp
@@ -31,12 +31,14 @@
#include "emu.h"
-#include "cpu/m6809/m6809.h"
+#include "includes/dcheese.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/m6809/m6809.h"
#include "machine/eepromser.h"
#include "machine/ticket.h"
#include "machine/watchdog.h"
-#include "includes/dcheese.h"
+#include "speaker.h"
#define MAIN_OSC 14318180
diff --git a/src/mame/drivers/dcon.cpp b/src/mame/drivers/dcon.cpp
index 9a9aca38a4f..7bed52872e1 100644
--- a/src/mame/drivers/dcon.cpp
+++ b/src/mame/drivers/dcon.cpp
@@ -15,14 +15,17 @@
***************************************************************************/
#include "emu.h"
+#include "includes/dcon.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
#include "audio/seibu.h"
-#include "includes/dcon.h"
#include "video/seibu_crtc.h"
+#include "screen.h"
+#include "speaker.h"
/***************************************************************************/
diff --git a/src/mame/drivers/dct11em.cpp b/src/mame/drivers/dct11em.cpp
index 3241d2ca7be..0c17a23b282 100644
--- a/src/mame/drivers/dct11em.cpp
+++ b/src/mame/drivers/dct11em.cpp
@@ -10,6 +10,8 @@
#include "emu.h"
#include "cpu/t11/t11.h"
+#include "screen.h"
+
class dct11em_state : public driver_device
{
diff --git a/src/mame/drivers/dday.cpp b/src/mame/drivers/dday.cpp
index a9fbe5cd085..941572aa623 100644
--- a/src/mame/drivers/dday.cpp
+++ b/src/mame/drivers/dday.cpp
@@ -52,9 +52,11 @@ write:
***************************************************************************/
#include "emu.h"
+#include "includes/dday.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/dday.h"
+#include "speaker.h"
static ADDRESS_MAP_START( dday_map, AS_PROGRAM, 8, dday_state )
diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp
index 916f7d981ea..d8c389d181b 100644
--- a/src/mame/drivers/ddayjlc.cpp
+++ b/src/mame/drivers/ddayjlc.cpp
@@ -57,6 +57,8 @@ $842f = lives
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class ddayjlc_state : public driver_device
diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp
index 6ecf09b766a..5ec30e5d35f 100644
--- a/src/mame/drivers/ddealer.cpp
+++ b/src/mame/drivers/ddealer.cpp
@@ -116,6 +116,8 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
+#include "screen.h"
+#include "speaker.h"
class ddealer_state : public driver_device
{
diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp
index 96f7bdead39..f31472f5909 100644
--- a/src/mame/drivers/ddenlovr.cpp
+++ b/src/mame/drivers/ddenlovr.cpp
@@ -113,13 +113,16 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/dynax.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "machine/gen_latch.h"
#include "machine/msm6242.h"
#include "machine/nvram.h"
-#include "includes/dynax.h"
+
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/ddragon.cpp b/src/mame/drivers/ddragon.cpp
index 0ceccf6eec9..37c11373147 100644
--- a/src/mame/drivers/ddragon.cpp
+++ b/src/mame/drivers/ddragon.cpp
@@ -53,13 +53,16 @@ Dip locations verified with manual for ddragon & ddragon2
***************************************************************************/
#include "emu.h"
+#include "includes/ddragon.h"
+
#include "cpu/m6809/hd6309.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
#include "cpu/z80/z80.h"
-#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/ddragon.h"
+#include "sound/ym2151.h"
+
+#include "speaker.h"
#define MAIN_CLOCK XTAL_12MHz
diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp
index 46d9993b585..db6e118c371 100644
--- a/src/mame/drivers/ddragon3.cpp
+++ b/src/mame/drivers/ddragon3.cpp
@@ -183,10 +183,13 @@ ROMs (All ROMs are 27C010 EPROM. - means not populated)
#include "emu.h"
+#include "includes/ddragon3.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/ym2151.h"
-#include "includes/ddragon3.h"
+
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp
index 54f269efa4e..b4067ab0fd3 100644
--- a/src/mame/drivers/ddribble.cpp
+++ b/src/mame/drivers/ddribble.cpp
@@ -12,11 +12,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/ddribble.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
-#include "includes/konamipt.h"
-#include "includes/ddribble.h"
+#include "screen.h"
+#include "speaker.h"
INTERRUPT_GEN_MEMBER(ddribble_state::ddribble_interrupt_0)
diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp
index 628e46554de..51e9f3303de 100644
--- a/src/mame/drivers/de_2.cpp
+++ b/src/mame/drivers/de_2.cpp
@@ -11,15 +11,19 @@
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
-#include "machine/decopincpu.h"
#include "machine/6821pia.h"
-#include "sound/ym2151.h"
+#include "machine/decopincpu.h"
#include "sound/msm5205.h"
+#include "sound/ym2151.h"
+#include "speaker.h"
+
#include "de2.lh"
#include "de2a3.lh"
+
// To start Secret Service, hold I, O and Left ALT while pressing Start.
// To start Laser War, hold S, D, and F while pressing Start.
// To start Back to the Future, hold D and F while pressing Start.
diff --git a/src/mame/drivers/deadang.cpp b/src/mame/drivers/deadang.cpp
index b3eccfcd52f..d5612a06d73 100644
--- a/src/mame/drivers/deadang.cpp
+++ b/src/mame/drivers/deadang.cpp
@@ -41,11 +41,14 @@ Dip locations and factory settings verified with US manual
*/
#include "emu.h"
+#include "includes/deadang.h"
+
#include "cpu/nec/nec.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
#include "sound/msm5205.h"
-#include "includes/deadang.h"
+#include "screen.h"
+#include "speaker.h"
/* Read/Write Handlers */
diff --git a/src/mame/drivers/dec0.cpp b/src/mame/drivers/dec0.cpp
index 0e42f6eea9b..45be093de3d 100644
--- a/src/mame/drivers/dec0.cpp
+++ b/src/mame/drivers/dec0.cpp
@@ -329,16 +329,19 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/dec0.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
#include "cpu/h6280/h6280.h"
#include "cpu/z80/z80.h"
#include "cpu/mcs51/mcs51.h"
#include "cpu/m6805/m68705.h"
-#include "includes/dec0.h"
#include "sound/2203intf.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
/******************************************************************************/
diff --git a/src/mame/drivers/dec8.cpp b/src/mame/drivers/dec8.cpp
index 3912641269c..e1d95f58bb8 100644
--- a/src/mame/drivers/dec8.cpp
+++ b/src/mame/drivers/dec8.cpp
@@ -42,16 +42,20 @@ To do:
***************************************************************************/
#include "emu.h"
+#include "includes/dec8.h"
+
+#include "cpu/m6502/m6502.h"
#include "cpu/m6809/hd6309.h"
#include "cpu/m6809/m6809.h"
-#include "cpu/m6502/m6502.h"
#include "cpu/mcs51/mcs51.h"
+#include "machine/deco222.h"
#include "sound/2203intf.h"
-#include "sound/3812intf.h"
#include "sound/3526intf.h"
+#include "sound/3812intf.h"
#include "sound/msm5205.h"
-#include "includes/dec8.h"
-#include "machine/deco222.h"
+
+#include "screen.h"
+#include "speaker.h"
/******************************************************************************/
diff --git a/src/mame/drivers/deco156.cpp b/src/mame/drivers/deco156.cpp
index f273a4ad6a2..a837dc960f7 100644
--- a/src/mame/drivers/deco156.cpp
+++ b/src/mame/drivers/deco156.cpp
@@ -22,6 +22,8 @@
#include "sound/ymz280b.h"
#include "video/deco16ic.h"
#include "video/decospr.h"
+#include "screen.h"
+#include "speaker.h"
class deco156_state : public driver_device
{
diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp
index 65d833c0b87..ffb6d966dd5 100644
--- a/src/mame/drivers/deco32.cpp
+++ b/src/mame/drivers/deco32.cpp
@@ -363,6 +363,8 @@ NOTE: There are several unpopulated locations (denoted by *) for additional rom
***************************************************************************/
#include "emu.h"
+#include "includes/deco32.h"
+
#include "cpu/z80/z80.h"
#include "cpu/arm/arm.h"
#include "cpu/h6280/h6280.h"
@@ -370,7 +372,7 @@ NOTE: There are several unpopulated locations (denoted by *) for additional rom
#include "cpu/z80/z80.h"
#include "machine/decocrpt.h"
#include "machine/deco156.h"
-#include "includes/deco32.h"
+#include "speaker.h"
/**********************************************************************************/
diff --git a/src/mame/drivers/deco_ld.cpp b/src/mame/drivers/deco_ld.cpp
index 85c297161c6..b9736735627 100644
--- a/src/mame/drivers/deco_ld.cpp
+++ b/src/mame/drivers/deco_ld.cpp
@@ -114,6 +114,7 @@ Sound processor - 6502
#include "machine/ldp1000.h"
#include "machine/gen_latch.h"
#include "machine/6850acia.h"
+#include "speaker.h"
class deco_ld_state : public driver_device
diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp
index e9761f99b75..a2a5b530991 100644
--- a/src/mame/drivers/deco_mlc.cpp
+++ b/src/mame/drivers/deco_mlc.cpp
@@ -100,11 +100,13 @@
***************************************************************************/
#include "emu.h"
+#include "includes/deco_mlc.h"
+
#include "machine/deco156.h"
#include "machine/eepromser.h"
#include "cpu/arm/arm.h"
#include "cpu/sh2/sh2.h"
-#include "includes/deco_mlc.h"
+#include "speaker.h"
/***************************************************************************/
diff --git a/src/mame/drivers/decocass.cpp b/src/mame/drivers/decocass.cpp
index 0a4748abb1f..4bc706db9c2 100644
--- a/src/mame/drivers/decocass.cpp
+++ b/src/mame/drivers/decocass.cpp
@@ -42,12 +42,14 @@
***********************************************************************/
#include "emu.h"
+#include "includes/decocass.h"
+
#include "cpu/m6502/m6502.h"
#include "cpu/mcs48/mcs48.h"
-#include "includes/decocass.h"
+#include "machine/deco222.h"
#include "machine/decocass_tape.h"
#include "sound/ay8910.h"
-#include "machine/deco222.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_12MHz
#define HCLK (MASTER_CLOCK/2)
diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp
index cebcc1a64a2..9a7dfa56a52 100644
--- a/src/mame/drivers/dectalk.cpp
+++ b/src/mame/drivers/dectalk.cpp
@@ -267,6 +267,7 @@ dgc (dg(no!spam)cx@mac.com)
#include "machine/x2212.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
class dectalk_state : public driver_device
diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp
index 5a0f621f801..9a7087ec88e 100644
--- a/src/mame/drivers/decwritr.cpp
+++ b/src/mame/drivers/decwritr.cpp
@@ -11,10 +11,12 @@
// tech manual: http://manx.classiccmp.org/mirror/vt100.net/docs/la120-tm/la120tm1.pdf
#include "emu.h"
-#include "render.h"
#include "cpu/i8085/i8085.h"
#include "machine/i8251.h"
#include "sound/beep.h"
+#include "render.h"
+#include "speaker.h"
+
#define KBD_VERBOSE 1
#define LED_VERBOSE 1
diff --git a/src/mame/drivers/deniam.cpp b/src/mame/drivers/deniam.cpp
index 363b31bdaa9..ea4969c5a8e 100644
--- a/src/mame/drivers/deniam.cpp
+++ b/src/mame/drivers/deniam.cpp
@@ -44,11 +44,14 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/deniam.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
#include "sound/3812intf.h"
-#include "includes/deniam.h"
+#include "screen.h"
+#include "speaker.h"
WRITE16_MEMBER(deniam_state::sound_command_w)
diff --git a/src/mame/drivers/deshoros.cpp b/src/mame/drivers/deshoros.cpp
index 23bd00f1de7..52669b33d80 100644
--- a/src/mame/drivers/deshoros.cpp
+++ b/src/mame/drivers/deshoros.cpp
@@ -33,6 +33,8 @@ TODO:
#include "cpu/m6809/m6809.h"
#include "sound/beep.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
class destiny_state : public driver_device
{
diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp
index a63683c23e6..01bcc499706 100644
--- a/src/mame/drivers/destroyr.cpp
+++ b/src/mame/drivers/destroyr.cpp
@@ -15,6 +15,7 @@ TODO:
#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "machine/watchdog.h"
+#include "screen.h"
#include "destroyr.lh"
diff --git a/src/mame/drivers/dfruit.cpp b/src/mame/drivers/dfruit.cpp
index db33b51decd..4b74475dd79 100644
--- a/src/mame/drivers/dfruit.cpp
+++ b/src/mame/drivers/dfruit.cpp
@@ -19,9 +19,11 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/2203intf.h"
-#include "machine/tc009xlvc.h"
#include "machine/i8255.h"
+#include "machine/tc009xlvc.h"
+#include "sound/2203intf.h"
+#include "screen.h"
+#include "speaker.h"
class dfruit_state : public driver_device
{
@@ -30,7 +32,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu"),
m_vdp(*this, "tc0091lvc")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<tc0091lvc_device> m_vdp;
diff --git a/src/mame/drivers/dgn_beta.cpp b/src/mame/drivers/dgn_beta.cpp
index 9763d6467b4..a1a82b3af9c 100644
--- a/src/mame/drivers/dgn_beta.cpp
+++ b/src/mame/drivers/dgn_beta.cpp
@@ -41,15 +41,18 @@ documentation still exists.
***************************************************************************/
#include "emu.h"
+#include "includes/dgn_beta.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
-#include "includes/dgn_beta.h"
#include "machine/mos6551.h"
+#include "machine/ram.h"
+#include "video/mc6845.h"
+#include "screen.h"
+
#include "formats/vdk_dsk.h"
#include "formats/dmk_dsk.h"
#include "imagedev/flopdrv.h"
-#include "machine/ram.h"
-#include "video/mc6845.h"
/*
diff --git a/src/mame/drivers/dgpix.cpp b/src/mame/drivers/dgpix.cpp
index d6d3c1e6c90..46aaaed084f 100644
--- a/src/mame/drivers/dgpix.cpp
+++ b/src/mame/drivers/dgpix.cpp
@@ -152,8 +152,9 @@ Notes:
*********************************************************************/
#include "emu.h"
-#include "machine/nvram.h"
#include "cpu/e132xs/e132xs.h"
+#include "machine/nvram.h"
+#include "screen.h"
class dgpix_state : public driver_device
diff --git a/src/mame/drivers/didact.cpp b/src/mame/drivers/didact.cpp
index 3a71f1a790d..59067b10c2f 100644
--- a/src/mame/drivers/didact.cpp
+++ b/src/mame/drivers/didact.cpp
@@ -45,20 +45,24 @@
****************************************************************************/
#include "emu.h"
+
#include "cpu/m6800/m6800.h" // For mp68a, md6802 and e100
#include "cpu/m6809/m6809.h" // For candela
#include "machine/6821pia.h" // For all boards
#include "machine/6840ptm.h" // For candela
#include "machine/6850acia.h"// For candela
-#include "video/mc6845.h" // For candela
-#include "machine/wd_fdc.h" // For candela
+#include "machine/74145.h" // For the md6802 and e100
#include "machine/clock.h" // For candela
#include "machine/ram.h" // For candela
+#include "machine/wd_fdc.h" // For candela
#include "video/dm9368.h" // For the mp68a
-#include "machine/74145.h" // For the md6802 and e100
+#include "video/mc6845.h" // For candela
// Features
#include "imagedev/cassette.h"
#include "bus/rs232/rs232.h"
+
+#include "screen.h"
+
// Generated artwork includes
#include "mp68a.lh"
#include "md6802.lh"
diff --git a/src/mame/drivers/dietgo.cpp b/src/mame/drivers/dietgo.cpp
index 7c2cf0b489e..b19aa584ac4 100644
--- a/src/mame/drivers/dietgo.cpp
+++ b/src/mame/drivers/dietgo.cpp
@@ -21,6 +21,8 @@ PAL16R6A 11H
*/
#include "emu.h"
+#include "includes/dietgo.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "sound/ym2151.h"
@@ -28,7 +30,8 @@ PAL16R6A 11H
#include "machine/decocrpt.h"
#include "machine/deco102.h"
#include "machine/gen_latch.h"
-#include "includes/dietgo.h"
+#include "screen.h"
+#include "speaker.h"
READ16_MEMBER( dietgo_state::dietgo_protection_region_0_104_r )
diff --git a/src/mame/drivers/digel804.cpp b/src/mame/drivers/digel804.cpp
index b92ade882fc..50dbb4fa138 100644
--- a/src/mame/drivers/digel804.cpp
+++ b/src/mame/drivers/digel804.cpp
@@ -27,6 +27,20 @@
*
******************************************************************************/
+/* Core includes */
+#include "emu.h"
+#include "bus/rs232/rs232.h"
+#include "cpu/z80/z80.h"
+#include "machine/mm74c922.h"
+#include "machine/mos6551.h"
+#include "machine/ram.h"
+#include "machine/roc10937.h"
+#include "sound/spkrdev.h"
+#include "speaker.h"
+
+#include "digel804.lh"
+
+
// port 40 read reads eprom socket pins 11-13, 15-19 (i.e. eprom pin D0 to pin D7)
// port 40 write writes eprom socket pins 11-13, 15-19 (i.e. eprom pin D0 to pin D7)
@@ -53,18 +67,6 @@
// port 47 write is tim0-tim7
-/* Core includes */
-#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "sound/speaker.h"
-#include "machine/roc10937.h"
-#include "machine/mos6551.h"
-#include "machine/mm74c922.h"
-#include "machine/ram.h"
-#include "bus/rs232/rs232.h"
-#include "digel804.lh"
-
-
class digel804_state : public driver_device
{
public:
diff --git a/src/mame/drivers/dim68k.cpp b/src/mame/drivers/dim68k.cpp
index b935b9769d7..bf528eeff99 100644
--- a/src/mame/drivers/dim68k.cpp
+++ b/src/mame/drivers/dim68k.cpp
@@ -35,11 +35,13 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
-#include "sound/speaker.h"
-#include "video/mc6845.h"
#include "machine/keyboard.h"
#include "machine/upd765.h"
+#include "sound/spkrdev.h"
+#include "video/mc6845.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
class dim68k_state : public driver_device
{
diff --git a/src/mame/drivers/discoboy.cpp b/src/mame/drivers/discoboy.cpp
index afbf0c69d10..67c630b2995 100644
--- a/src/mame/drivers/discoboy.cpp
+++ b/src/mame/drivers/discoboy.cpp
@@ -43,10 +43,12 @@ Notes:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "machine/gen_latch.h"
#include "machine/74157.h"
+#include "machine/gen_latch.h"
#include "sound/msm5205.h"
#include "sound/3812intf.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/divebomb.cpp b/src/mame/drivers/divebomb.cpp
index 77d189daa20..e06dc334728 100644
--- a/src/mame/drivers/divebomb.cpp
+++ b/src/mame/drivers/divebomb.cpp
@@ -92,6 +92,8 @@ To verify against original HW:
#include "emu.h"
#include "includes/divebomb.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/diverboy.cpp b/src/mame/drivers/diverboy.cpp
index 7f726d3f827..0f6195056f4 100644
--- a/src/mame/drivers/diverboy.cpp
+++ b/src/mame/drivers/diverboy.cpp
@@ -53,6 +53,8 @@
#include "cpu/m68000/m68000.h"
#include "machine/gen_latch.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp
index c3f1fe73019..b0b88fc8ba4 100644
--- a/src/mame/drivers/djboy.cpp
+++ b/src/mame/drivers/djboy.cpp
@@ -139,11 +139,14 @@ Notes:
*/
#include "emu.h"
+#include "includes/djboy.h"
+
#include "cpu/z80/z80.h"
#include "cpu/mcs51/mcs51.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
-#include "includes/djboy.h"
+#include "screen.h"
+#include "speaker.h"
/* KANEKO BEAST state */
diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp
index cff47d0f6d6..c38d9060599 100644
--- a/src/mame/drivers/djmain.cpp
+++ b/src/mame/drivers/djmain.cpp
@@ -66,13 +66,15 @@ hard drive 3.5 adapter long 3.5 IDE cable 3.5 adapter PCB
*/
#include "emu.h"
+#include "includes/djmain.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/ataintf.h"
#include "sound/k054539.h"
-#include "includes/djmain.h"
#include "machine/idehd.h"
-
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp
index a871124363e..6f3bee6af35 100644
--- a/src/mame/drivers/dkong.cpp
+++ b/src/mame/drivers/dkong.cpp
@@ -407,12 +407,14 @@ Donkey Kong Notes
***************************************************************************/
#include "emu.h"
+#include "includes/dkong.h"
+
#include "cpu/z80/z80.h"
#include "cpu/s2650/s2650.h"
#include "cpu/m6502/m6502.h"
-#include "includes/dkong.h"
#include "machine/eepromser.h"
+
/*************************************
*
* Defines
diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp
index 802a2af1c3c..bfc45ed180c 100644
--- a/src/mame/drivers/dlair.cpp
+++ b/src/mame/drivers/dlair.cpp
@@ -35,7 +35,7 @@
*************************************************************************/
#include "emu.h"
-#include "render.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/ldv1000.h"
@@ -44,7 +44,10 @@
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
#include "sound/ay8910.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "render.h"
+#include "speaker.h"
+
#include "dlair.lh"
diff --git a/src/mame/drivers/dlair2.cpp b/src/mame/drivers/dlair2.cpp
index 05d95111598..4a590f8d824 100644
--- a/src/mame/drivers/dlair2.cpp
+++ b/src/mame/drivers/dlair2.cpp
@@ -32,6 +32,8 @@ http://www.dragons-lair-project.com/tech/pages/dl2.asp
#include "emu.h"
#include "cpu/i86/i86.h"
+#include "screen.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_30MHz
diff --git a/src/mame/drivers/dm7000.cpp b/src/mame/drivers/dm7000.cpp
index fa7ea856385..239a0e5c895 100644
--- a/src/mame/drivers/dm7000.cpp
+++ b/src/mame/drivers/dm7000.cpp
@@ -40,6 +40,7 @@
#include "emu.h"
#include "includes/dm7000.h"
+#include "screen.h"
#define VERBOSE_LEVEL ( 9 )
diff --git a/src/mame/drivers/dmndrby.cpp b/src/mame/drivers/dmndrby.cpp
index 77d521a461a..6c69ef087c5 100644
--- a/src/mame/drivers/dmndrby.cpp
+++ b/src/mame/drivers/dmndrby.cpp
@@ -53,10 +53,12 @@ DD10 DD14 DD18 H5 DD21
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
class dmndrby_state : public driver_device
diff --git a/src/mame/drivers/dms5000.cpp b/src/mame/drivers/dms5000.cpp
index ca4cbc7f732..72a4d2f64cb 100644
--- a/src/mame/drivers/dms5000.cpp
+++ b/src/mame/drivers/dms5000.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "cpu/i86/i86.h"
+#include "screen.h"
class dms5000_state : public driver_device
diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp
index 16dcaaab62e..a999ab1e9d3 100644
--- a/src/mame/drivers/dmv.cpp
+++ b/src/mame/drivers/dmv.cpp
@@ -10,15 +10,15 @@
#include "emu.h"
-#include "cpu/z80/z80.h"
+
#include "cpu/mcs48/mcs48.h"
-#include "machine/upd765.h"
+#include "cpu/z80/z80.h"
#include "machine/am9517a.h"
-#include "machine/pit8253.h"
#include "machine/dmv_keyb.h"
-#include "sound/speaker.h"
+#include "machine/pit8253.h"
+#include "machine/upd765.h"
+#include "sound/spkrdev.h"
#include "video/upd7220.h"
-#include "formats/dmv_dsk.h"
// expansion slots
#include "bus/dmv/dmvbus.h"
@@ -31,7 +31,11 @@
#include "bus/dmv/k806.h"
#include "bus/dmv/ram.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/dmv_dsk.h"
#include "dmv.lh"
diff --git a/src/mame/drivers/docastle.cpp b/src/mame/drivers/docastle.cpp
index 55d63c40872..b68e02187d2 100644
--- a/src/mame/drivers/docastle.cpp
+++ b/src/mame/drivers/docastle.cpp
@@ -156,10 +156,13 @@ Dip locations verified with manual for docastle, dorunrun and dowild.
***************************************************************************/
#include "emu.h"
+#include "includes/docastle.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/sn76496.h"
-#include "includes/docastle.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/dogfgt.cpp b/src/mame/drivers/dogfgt.cpp
index 2b829e47369..ff3ff5bd835 100644
--- a/src/mame/drivers/dogfgt.cpp
+++ b/src/mame/drivers/dogfgt.cpp
@@ -10,9 +10,11 @@ driver by Nicola Salmoria
***************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m6502.h"
#include "includes/dogfgt.h"
+
+#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
+#include "speaker.h"
READ8_MEMBER(dogfgt_state::sharedram_r)
diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp
index eaa053ce26c..df86f67e501 100644
--- a/src/mame/drivers/dolphunk.cpp
+++ b/src/mame/drivers/dolphunk.cpp
@@ -82,9 +82,11 @@
#include "emu.h"
#include "cpu/s2650/s2650.h"
-#include "sound/speaker.h"
#include "imagedev/cassette.h"
+#include "sound/spkrdev.h"
#include "sound/wave.h"
+#include "speaker.h"
+
#include "dolphunk.lh"
diff --git a/src/mame/drivers/dominob.cpp b/src/mame/drivers/dominob.cpp
index b2ea6cd2c0f..e0a9ab7f6a0 100644
--- a/src/mame/drivers/dominob.cpp
+++ b/src/mame/drivers/dominob.cpp
@@ -65,6 +65,8 @@ Notes:
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class dominob_state : public driver_device
{
diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp
index bbe3dbbd544..2caa7dab626 100644
--- a/src/mame/drivers/dooyong.cpp
+++ b/src/mame/drivers/dooyong.cpp
@@ -72,13 +72,17 @@ are almost identical, except for much darker BG layer colors).
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/dooyong.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/2203intf.h"
-#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/dooyong.h"
+#include "sound/ym2151.h"
+
+#include "speaker.h"
+
WRITE8_MEMBER(dooyong_z80_state::bankswitch_w)
{
diff --git a/src/mame/drivers/dorachan.cpp b/src/mame/drivers/dorachan.cpp
index e4fb72a615c..0d53cd09e56 100644
--- a/src/mame/drivers/dorachan.cpp
+++ b/src/mame/drivers/dorachan.cpp
@@ -12,6 +12,7 @@ Todo:
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class dorachan_state : public driver_device
diff --git a/src/mame/drivers/dotrikun.cpp b/src/mame/drivers/dotrikun.cpp
index a06ebd7ffcc..76441f045b5 100644
--- a/src/mame/drivers/dotrikun.cpp
+++ b/src/mame/drivers/dotrikun.cpp
@@ -28,6 +28,7 @@ TODO:
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
#include "dotrikun.lh"
diff --git a/src/mame/drivers/dragrace.cpp b/src/mame/drivers/dragrace.cpp
index a540f882473..07c40176dd5 100644
--- a/src/mame/drivers/dragrace.cpp
+++ b/src/mame/drivers/dragrace.cpp
@@ -7,9 +7,10 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/m6800/m6800.h"
#include "includes/dragrace.h"
+#include "cpu/m6800/m6800.h"
#include "sound/discrete.h"
+#include "speaker.h"
#include "dragrace.lh"
diff --git a/src/mame/drivers/dreambal.cpp b/src/mame/drivers/dreambal.cpp
index 59b95ffca12..12ea37fb4c2 100644
--- a/src/mame/drivers/dreambal.cpp
+++ b/src/mame/drivers/dreambal.cpp
@@ -21,14 +21,16 @@ lamps?
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
+#include "machine/deco104.h"
#include "machine/decocrpt.h"
+#include "machine/eepromser.h"
#include "sound/okim6295.h"
#include "video/deco16ic.h"
#include "video/decospr.h"
-#include "machine/eepromser.h"
-#include "machine/deco104.h"
+#include "screen.h"
+#include "speaker.h"
class dreambal_state : public driver_device
{
diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp
index 1d3d7580b4b..a712c70a08d 100644
--- a/src/mame/drivers/dreamwld.cpp
+++ b/src/mame/drivers/dreamwld.cpp
@@ -99,6 +99,8 @@ Stephh's notes (based on the game M68EC020 code and some tests) :
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class dreamwld_state : public driver_device
diff --git a/src/mame/drivers/drgnmst.cpp b/src/mame/drivers/drgnmst.cpp
index 3454528c6ee..03a8e521f2c 100644
--- a/src/mame/drivers/drgnmst.cpp
+++ b/src/mame/drivers/drgnmst.cpp
@@ -37,10 +37,13 @@ Notes:
*/
#include "emu.h"
+#include "includes/drgnmst.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "sound/okim6295.h"
-#include "includes/drgnmst.h"
+#include "screen.h"
+#include "speaker.h"
WRITE16_MEMBER(drgnmst_state::drgnmst_coin_w)
diff --git a/src/mame/drivers/dribling.cpp b/src/mame/drivers/dribling.cpp
index 2ac6caa7181..ac8504aae24 100644
--- a/src/mame/drivers/dribling.cpp
+++ b/src/mame/drivers/dribling.cpp
@@ -28,9 +28,11 @@
***************************************************************************/
#include "emu.h"
+#include "includes/dribling.h"
+
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
-#include "includes/dribling.h"
+#include "screen.h"
diff --git a/src/mame/drivers/drmicro.cpp b/src/mame/drivers/drmicro.cpp
index 63a018254a0..71aa57fbe06 100644
--- a/src/mame/drivers/drmicro.cpp
+++ b/src/mame/drivers/drmicro.cpp
@@ -11,10 +11,13 @@ Quite similar to Appoooh
*****************************************************************************/
#include "emu.h"
+#include "includes/drmicro.h"
+
#include "cpu/z80/z80.h"
#include "sound/msm5205.h"
#include "sound/sn76496.h"
-#include "includes/drmicro.h"
+#include "screen.h"
+#include "speaker.h"
#define MCLK 18432000
diff --git a/src/mame/drivers/drtomy.cpp b/src/mame/drivers/drtomy.cpp
index 62fb80d5498..827d5645e4f 100644
--- a/src/mame/drivers/drtomy.cpp
+++ b/src/mame/drivers/drtomy.cpp
@@ -12,6 +12,8 @@ similar hardware.
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class drtomy_state : public driver_device
{
diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp
index 5e785c75a24..01f5f3f0f09 100644
--- a/src/mame/drivers/drw80pkr.cpp
+++ b/src/mame/drivers/drw80pkr.cpp
@@ -28,9 +28,11 @@
***********************************************************************************/
#include "emu.h"
+#include "cpu/mcs48/mcs48.h"
#include "machine/nvram.h"
#include "sound/ay8910.h"
-#include "cpu/mcs48/mcs48.h"
+#include "screen.h"
+#include "speaker.h"
class drw80pkr_state : public driver_device
diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp
index 8fb863008e8..a81d7a672dd 100644
--- a/src/mame/drivers/dunhuang.cpp
+++ b/src/mame/drivers/dunhuang.cpp
@@ -57,6 +57,9 @@ Notes:
#include "sound/ay8910.h"
#include "sound/okim6295.h"
#include "sound/ym2413.h"
+#include "screen.h"
+#include "speaker.h"
+
#define DUNHUANG_DEBUG 0
diff --git a/src/mame/drivers/dvk_kcgd.cpp b/src/mame/drivers/dvk_kcgd.cpp
index c5e544cb166..a6d1717b72e 100644
--- a/src/mame/drivers/dvk_kcgd.cpp
+++ b/src/mame/drivers/dvk_kcgd.cpp
@@ -21,6 +21,8 @@
#include "cpu/t11/t11.h"
#include "machine/clock.h"
#include "machine/ms7004.h"
+#include "screen.h"
+
#define KCGD_TOTAL_HORZ 1000 // XXX verify
#define KCGD_DISP_HORZ 800
diff --git a/src/mame/drivers/dvk_ksm.cpp b/src/mame/drivers/dvk_ksm.cpp
index 994bddb8a48..d4d7cfec0a7 100644
--- a/src/mame/drivers/dvk_ksm.cpp
+++ b/src/mame/drivers/dvk_ksm.cpp
@@ -68,6 +68,8 @@ ksm|DVK KSM,
#include "machine/i8255.h"
#include "machine/ms7004.h"
#include "machine/pic8259.h"
+#include "screen.h"
+
#define SCREEN_PAGE (80*48)
diff --git a/src/mame/drivers/dwarfd.cpp b/src/mame/drivers/dwarfd.cpp
index 3c648817290..fb2675c07b4 100644
--- a/src/mame/drivers/dwarfd.cpp
+++ b/src/mame/drivers/dwarfd.cpp
@@ -301,6 +301,8 @@ uPC1352C @ N3
#include "cpu/i8085/i8085.h"
#include "sound/ay8910.h"
#include "video/i8275.h"
+#include "screen.h"
+#include "speaker.h"
class dwarfd_state : public driver_device
{
@@ -312,7 +314,7 @@ public:
m_crtc(*this, "i8275"),
m_charmap(*this, "gfx1"),
m_dsw2(*this, "DSW2")
- { }
+ { }
/* video-related */
int m_crt_access;
diff --git a/src/mame/drivers/dynadice.cpp b/src/mame/drivers/dynadice.cpp
index b2964b84082..ed8becac6ca 100644
--- a/src/mame/drivers/dynadice.cpp
+++ b/src/mame/drivers/dynadice.cpp
@@ -34,11 +34,13 @@ dy_6.bin (near Z80)
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
-#include "sound/ay8910.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class dynadice_state : public driver_device
diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp
index 71b245e8fe4..6c69d517e20 100644
--- a/src/mame/drivers/dynax.cpp
+++ b/src/mame/drivers/dynax.cpp
@@ -77,14 +77,18 @@ TODO:
*********************************************************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/dynax.h"
+
#include "cpu/tlcs90/tlcs90.h"
+#include "cpu/z80/z80.h"
+#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "sound/2203intf.h"
#include "sound/3812intf.h"
-#include "machine/nvram.h"
+
#include "rendlay.h"
+#include "speaker.h"
+
/***************************************************************************
diff --git a/src/mame/drivers/dynduke.cpp b/src/mame/drivers/dynduke.cpp
index 1c61c6a743a..b87f98df007 100644
--- a/src/mame/drivers/dynduke.cpp
+++ b/src/mame/drivers/dynduke.cpp
@@ -68,11 +68,14 @@ Also, implemented conditional port for Coin Mode (SW1:1)
***************************************************************************/
#include "emu.h"
+#include "includes/dynduke.h"
+
#include "cpu/nec/nec.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
-#include "includes/dynduke.h"
+#include "screen.h"
+#include "speaker.h"
/* Memory Maps */
diff --git a/src/mame/drivers/ec65.cpp b/src/mame/drivers/ec65.cpp
index c2ae59d01e8..c38efea6062 100644
--- a/src/mame/drivers/ec65.cpp
+++ b/src/mame/drivers/ec65.cpp
@@ -17,6 +17,7 @@
#include "machine/mos6551.h"
#include "machine/6850acia.h"
#include "machine/keyboard.h"
+#include "screen.h"
#define PIA6821_TAG "pia6821"
#define ACIA6850_TAG "acia6850"
diff --git a/src/mame/drivers/ecoinf3.cpp b/src/mame/drivers/ecoinf3.cpp
index 55a972cab68..3cb5a6b844c 100644
--- a/src/mame/drivers/ecoinf3.cpp
+++ b/src/mame/drivers/ecoinf3.cpp
@@ -13,12 +13,16 @@
// 2 of the sets contain program scrambled roms (where the last 0x2000 bytes match between games) why, badly dumped?
#include "emu.h"
+
#include "cpu/z180/z180.h"
#include "machine/i8255.h"
-#include "ecoinf3.lh"
#include "machine/steppers.h" // stepper motor
-#include "video/awpvid.h" // drawing reels
#include "sound/sn76496.h"
+#include "video/awpvid.h" // drawing reels
+#include "speaker.h"
+
+#include "ecoinf3.lh"
+
class ecoinf3_state : public driver_device
{
diff --git a/src/mame/drivers/egghunt.cpp b/src/mame/drivers/egghunt.cpp
index dda408b1058..56848cd393c 100644
--- a/src/mame/drivers/egghunt.cpp
+++ b/src/mame/drivers/egghunt.cpp
@@ -47,6 +47,8 @@ I dumped it with this configuration. In case I'll redump it desoldering pin 16 f
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class egghunt_state : public driver_device
{
diff --git a/src/mame/drivers/einstein.cpp b/src/mame/drivers/einstein.cpp
index bc6e026aa62..60f1648454c 100644
--- a/src/mame/drivers/einstein.cpp
+++ b/src/mame/drivers/einstein.cpp
@@ -55,13 +55,17 @@
******************************************************************************/
#include "emu.h"
-#include "machine/z80pio.h"
+#include "includes/einstein.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
+#include "machine/z80pio.h"
#include "sound/ay8910.h"
+
#include "rendlay.h"
-#include "includes/einstein.h"
#include "softlist.h"
+#include "speaker.h"
+
#define VERBOSE_KEYBOARD 0
#define VERBOSE_DISK 0
diff --git a/src/mame/drivers/electron.cpp b/src/mame/drivers/electron.cpp
index 5a3076e0a68..d2e90142081 100644
--- a/src/mame/drivers/electron.cpp
+++ b/src/mame/drivers/electron.cpp
@@ -72,7 +72,9 @@ Missing:
#include "formats/uef_cas.h"
#include "formats/csw_cas.h"
#include "sound/beep.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
static const rgb_t electron_palette[8]=
{
diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp
index a711c0d559b..8711f3177ea 100644
--- a/src/mame/drivers/elwro800.cpp
+++ b/src/mame/drivers/elwro800.cpp
@@ -21,7 +21,6 @@
#include "cpu/z80/z80.h"
#include "machine/upd765.h" /* for floppy disc controller */
#include "machine/i8255.h"
-#include "sound/speaker.h"
#include "sound/wave.h"
#include "bus/centronics/ctronics.h"
#include "machine/i8251.h"
@@ -30,7 +29,9 @@
#include "imagedev/cassette.h"
#include "formats/tzx_cas.h"
#include "machine/bankdev.h"
-#include "machine/ram.h"
+
+#include "screen.h"
+#include "speaker.h"
class elwro800_state : public spectrum_state
diff --git a/src/mame/drivers/embargo.cpp b/src/mame/drivers/embargo.cpp
index cab678421da..c783102994c 100644
--- a/src/mame/drivers/embargo.cpp
+++ b/src/mame/drivers/embargo.cpp
@@ -8,6 +8,7 @@
#include "emu.h"
#include "cpu/s2650/s2650.h"
+#include "screen.h"
class embargo_state : public driver_device
diff --git a/src/mame/drivers/enigma2.cpp b/src/mame/drivers/enigma2.cpp
index 017eb8cceb0..0e9ea57593e 100644
--- a/src/mame/drivers/enigma2.cpp
+++ b/src/mame/drivers/enigma2.cpp
@@ -27,6 +27,8 @@ TODO:
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
#define LOG_PROT (0)
diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp
index 4ab0c6c2379..01a4ca30f77 100644
--- a/src/mame/drivers/enmirage.cpp
+++ b/src/mame/drivers/enmirage.cpp
@@ -50,6 +50,7 @@
#include "machine/wd_fdc.h"
#include "formats/esq8_dsk.h"
#include "sound/es5503.h"
+#include "speaker.h"
#include "mirage.lh"
diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp
index 96244b23775..7aeb33a8f28 100644
--- a/src/mame/drivers/eolith.cpp
+++ b/src/mame/drivers/eolith.cpp
@@ -101,11 +101,13 @@
*********************************************************************/
#include "emu.h"
+#include "includes/eolith.h"
+
#include "cpu/e132xs/e132xs.h"
#include "cpu/mcs51/mcs51.h"
-
#include "machine/eepromser.h"
-#include "includes/eolith.h"
+
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/eolith16.cpp b/src/mame/drivers/eolith16.cpp
index 15e5fb7ac8c..d2f8d273ad0 100644
--- a/src/mame/drivers/eolith16.cpp
+++ b/src/mame/drivers/eolith16.cpp
@@ -12,11 +12,13 @@
**********************************************************************/
#include "emu.h"
+#include "includes/eolith.h"
+
#include "cpu/e132xs/e132xs.h"
#include "machine/eepromser.h"
-
#include "sound/okim6295.h"
-#include "includes/eolith.h"
+
+#include "speaker.h"
class eolith16_state : public eolith_state
diff --git a/src/mame/drivers/ep64.cpp b/src/mame/drivers/ep64.cpp
index f094b9dba0d..9f26f2642eb 100644
--- a/src/mame/drivers/ep64.cpp
+++ b/src/mame/drivers/ep64.cpp
@@ -150,18 +150,22 @@ Notes: (All IC's shown)
*/
#include "emu.h"
-#include "softlist.h"
-#include "sound/dave.h"
-#include "bus/rs232/rs232.h"
+
+#include "bus/centronics/ctronics.h"
#include "bus/ep64/exp.h"
+#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
+#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
-#include "bus/centronics/ctronics.h"
-#include "bus/generic/slot.h"
-#include "bus/generic/carts.h"
#include "machine/ram.h"
+#include "sound/dave.h"
#include "video/nick.h"
+#include "softlist.h"
+#include "speaker.h"
+
+
#define Z80_TAG "u1"
#define DAVE_TAG "u3"
#define NICK_TAG "u4"
diff --git a/src/mame/drivers/epos.cpp b/src/mame/drivers/epos.cpp
index 70844a39775..9d6dfb9b410 100644
--- a/src/mame/drivers/epos.cpp
+++ b/src/mame/drivers/epos.cpp
@@ -33,11 +33,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/epos.h"
+
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "includes/epos.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(epos_state::dealer_decrypt_rom)
{
diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp
index 15e6cc96bbd..d0e7da98a55 100644
--- a/src/mame/drivers/eprom.cpp
+++ b/src/mame/drivers/eprom.cpp
@@ -26,9 +26,11 @@
#include "emu.h"
+#include "includes/eprom.h"
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
-#include "includes/eprom.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp
index c07d0c42c7d..2fd26137390 100644
--- a/src/mame/drivers/equites.cpp
+++ b/src/mame/drivers/equites.cpp
@@ -360,6 +360,7 @@ D
#include "emu.h"
#include "includes/equites.h"
+
#include "cpu/alph8201/alph8201.h"
#include "cpu/i8085/i8085.h"
#include "cpu/m68000/m68000.h"
@@ -368,6 +369,7 @@ D
#include "machine/watchdog.h"
#include "sound/ay8910.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
#define FRQ_ADJUSTER_TAG "FRQ"
diff --git a/src/mame/drivers/ertictac.cpp b/src/mame/drivers/ertictac.cpp
index 416f2ce0d16..d08cfda714d 100644
--- a/src/mame/drivers/ertictac.cpp
+++ b/src/mame/drivers/ertictac.cpp
@@ -27,6 +27,7 @@ PCB has a single OSC at 24MHz
#include "machine/aakart.h"
#include "machine/i2cmem.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
class ertictac_state : public archimedes_state
diff --git a/src/mame/drivers/esd16.cpp b/src/mame/drivers/esd16.cpp
index 5dad197c838..97a97ae4c88 100644
--- a/src/mame/drivers/esd16.cpp
+++ b/src/mame/drivers/esd16.cpp
@@ -69,11 +69,14 @@ ToDo:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/esd16.h"
+
#include "cpu/m68000/m68000.h"
-#include "sound/okim6295.h"
+#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
-#include "includes/esd16.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/esh.cpp b/src/mame/drivers/esh.cpp
index c1966c1e119..7349ef53ad6 100644
--- a/src/mame/drivers/esh.cpp
+++ b/src/mame/drivers/esh.cpp
@@ -30,6 +30,7 @@ Todo:
#include "machine/ldv1000.h"
#include "machine/nvram.h"
#include "sound/beep.h"
+#include "speaker.h"
class esh_state : public driver_device
diff --git a/src/mame/drivers/espial.cpp b/src/mame/drivers/espial.cpp
index bb4a8abe7fb..8595c9d8b87 100644
--- a/src/mame/drivers/espial.cpp
+++ b/src/mame/drivers/espial.cpp
@@ -40,10 +40,12 @@ Stephh's notes (based on the games Z80 code and some tests) :
#include "emu.h"
#include "includes/espial.h"
+
#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/esq1.cpp b/src/mame/drivers/esq1.cpp
index 5f559cf0da3..a7702513507 100644
--- a/src/mame/drivers/esq1.cpp
+++ b/src/mame/drivers/esq1.cpp
@@ -183,10 +183,12 @@ NOTES:
#include "emu.h"
#include "bus/midi/midi.h"
#include "cpu/m6809/m6809.h"
-#include "sound/es5503.h"
#include "machine/mc68681.h"
#include "machine/wd_fdc.h"
#include "machine/esqpanel.h"
+#include "sound/es5503.h"
+#include "speaker.h"
+
#define WD1772_TAG "wd1772"
@@ -224,7 +226,7 @@ private:
void recalc_filter(filter &f);
};
-static const device_type ESQ1_FILTERS = &device_creator<esq1_filters>;
+static const device_type ESQ1_FILTERS = device_creator<esq1_filters>;
esq1_filters::esq1_filters(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ESQ1_FILTERS, "ESQ1 Filters stage", tag, owner, clock, "esq1-filters", __FILE__),
diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp
index 59a44729f47..d9aaaf6e576 100644
--- a/src/mame/drivers/esq5505.cpp
+++ b/src/mame/drivers/esq5505.cpp
@@ -127,20 +127,24 @@
***************************************************************************/
#include "emu.h"
-#include <cstdio>
#include "bus/midi/midi.h"
-#include "cpu/m68000/m68000.h"
-#include "sound/es5506.h"
-#include "sound/esqpump.h"
-#include "machine/mc68681.h"
#include "cpu/es5510/es5510.h"
-#include "machine/wd_fdc.h"
-#include "machine/hd63450.h" // compatible with MC68450, which is what these really have
+#include "cpu/m68000/m68000.h"
#include "formats/esq16_dsk.h"
-#include "machine/esqvfd.h"
#include "machine/esqlcd.h"
#include "machine/esqpanel.h"
+#include "machine/esqvfd.h"
+#include "machine/hd63450.h" // compatible with MC68450, which is what these really have
+#include "machine/mc68681.h"
+#include "machine/wd_fdc.h"
+#include "sound/es5506.h"
+#include "sound/esqpump.h"
+
+#include "speaker.h"
+
+#include <cstdio>
+
#define GENERIC (0)
#define EPS (1)
diff --git a/src/mame/drivers/esqasr.cpp b/src/mame/drivers/esqasr.cpp
index 7bdcc11d521..aa70e250b48 100644
--- a/src/mame/drivers/esqasr.cpp
+++ b/src/mame/drivers/esqasr.cpp
@@ -38,12 +38,15 @@
***************************************************************************/
#include "emu.h"
-#include "machine/68340.h"
-#include "sound/es5506.h"
+
#include "cpu/es5510/es5510.h"
+#include "machine/68340.h"
+#include "machine/esqvfd.h"
#include "machine/upd765.h"
+#include "sound/es5506.h"
+
+#include "speaker.h"
-#include "machine/esqvfd.h"
class esqasr_state : public driver_device
{
diff --git a/src/mame/drivers/esqkt.cpp b/src/mame/drivers/esqkt.cpp
index dd08a9438a5..3eb8e014c65 100644
--- a/src/mame/drivers/esqkt.cpp
+++ b/src/mame/drivers/esqkt.cpp
@@ -89,23 +89,27 @@
***************************************************************************/
#include "emu.h"
+#include "machine/esqpanel.h"
+
#include "bus/midi/midi.h"
-#include "cpu/m68000/m68000.h"
#include "cpu/es5510/es5510.h"
-#include "sound/es5506.h"
+#include "cpu/m68000/m68000.h"
#include "machine/mc68681.h"
-#include "machine/esqpanel.h"
+#include "sound/es5506.h"
+
+#include "speaker.h"
+
class esqkt_state : public driver_device
{
public:
esqkt_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_esp(*this, "esp"),
- m_duart(*this, "duart"),
- m_sq1panel(*this, "sq1panel"),
- m_mdout(*this, "mdout")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_esp(*this, "esp")
+ , m_duart(*this, "duart")
+ , m_sq1panel(*this, "sq1panel")
+ , m_mdout(*this, "mdout")
{ }
required_device<m68ec020_device> m_maincpu;
diff --git a/src/mame/drivers/esqmr.cpp b/src/mame/drivers/esqmr.cpp
index 1de6b16b3a4..c0c44843a6a 100644
--- a/src/mame/drivers/esqmr.cpp
+++ b/src/mame/drivers/esqmr.cpp
@@ -200,18 +200,21 @@
***************************************************************************/
#include "emu.h"
+#include "machine/esqvfd.h"
+
#include "machine/68340.h"
#include "sound/es5506.h"
-#include "machine/esqvfd.h"
+#include "speaker.h"
+
class esqmr_state : public driver_device
{
public:
esqmr_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_sq1vfd(*this, "sq1vfd")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_sq1vfd(*this, "sq1vfd")
{ }
required_device<m68340cpu_device> m_maincpu;
diff --git a/src/mame/drivers/esripsys.cpp b/src/mame/drivers/esripsys.cpp
index e8dc1a1e4e6..19f56d7371f 100644
--- a/src/mame/drivers/esripsys.cpp
+++ b/src/mame/drivers/esripsys.cpp
@@ -28,11 +28,13 @@
#include "emu.h"
#include "includes/esripsys.h"
+
#include "cpu/esrip/esrip.h"
#include "cpu/m6809/m6809.h"
#include "machine/6840ptm.h"
#include "machine/nvram.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp
index eb3c5515ad5..c32df7506db 100644
--- a/src/mame/drivers/et3400.cpp
+++ b/src/mame/drivers/et3400.cpp
@@ -29,6 +29,8 @@
#include "bus/rs232/rs232.h"
#include "imagedev/cassette.h"
#include "sound/wave.h"
+#include "speaker.h"
+
#include "et3400.lh"
diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp
index ddf6610f8ed..dad8f38b48c 100644
--- a/src/mame/drivers/eti660.cpp
+++ b/src/mame/drivers/eti660.cpp
@@ -38,6 +38,8 @@
#include "emu.h"
#include "includes/eti660.h"
+#include "speaker.h"
+
/* Read/Write Handlers */
diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp
index 1caee74215b..eacb5c5f4c3 100644
--- a/src/mame/drivers/ettrivia.cpp
+++ b/src/mame/drivers/ettrivia.cpp
@@ -28,9 +28,11 @@ Notes:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
class ettrivia_state : public driver_device
diff --git a/src/mame/drivers/excali64.cpp b/src/mame/drivers/excali64.cpp
index 9d7579a7ba9..ae830119a7e 100644
--- a/src/mame/drivers/excali64.cpp
+++ b/src/mame/drivers/excali64.cpp
@@ -30,23 +30,28 @@ ToDo:
#include "emu.h"
+
+#include "bus/centronics/ctronics.h"
+#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
+#include "imagedev/cassette.h"
+#include "machine/74123.h"
#include "machine/i8251.h"
-#include "bus/rs232/rs232.h"
-//#include "machine/clock.h"
-#include "machine/pit8253.h"
#include "machine/i8255.h"
-#include "bus/centronics/ctronics.h"
-#include "imagedev/cassette.h"
-#include "sound/wave.h"
-#include "sound/speaker.h"
-#include "machine/z80dma.h"
+#include "machine/pit8253.h"
#include "machine/rescap.h"
-#include "machine/74123.h"
#include "machine/wd_fdc.h"
+#include "machine/z80dma.h"
+#include "sound/spkrdev.h"
+#include "sound/wave.h"
+#include "video/mc6845.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "formats/excali64_dsk.h"
+
class excali64_state : public driver_device
{
public:
diff --git a/src/mame/drivers/exedexes.cpp b/src/mame/drivers/exedexes.cpp
index 8b740d73825..3be63007d7f 100644
--- a/src/mame/drivers/exedexes.cpp
+++ b/src/mame/drivers/exedexes.cpp
@@ -12,11 +12,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/exedexes.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
#include "sound/sn76496.h"
-#include "includes/exedexes.h"
+#include "screen.h"
+#include "speaker.h"
TIMER_DEVICE_CALLBACK_MEMBER(exedexes_state::exedexes_scanline)
diff --git a/src/mame/drivers/exelv.cpp b/src/mame/drivers/exelv.cpp
index b28baa0c1d5..65f98ca3915 100644
--- a/src/mame/drivers/exelv.cpp
+++ b/src/mame/drivers/exelv.cpp
@@ -53,14 +53,20 @@ TODO:
#include "emu.h"
+
#include "cpu/tms7000/tms7000.h"
-#include "video/tms3556.h"
-#include "sound/tms5220.h"
+//#include "imagedev/cassette.h"
#include "machine/spchrom.h"
+#include "sound/tms5220.h"
+#include "video/tms3556.h"
+
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
-//#include "imagedev/cassette.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
class exelv_state : public driver_device
{
diff --git a/src/mame/drivers/exerion.cpp b/src/mame/drivers/exerion.cpp
index bd73af6b6ac..fd30847f034 100644
--- a/src/mame/drivers/exerion.cpp
+++ b/src/mame/drivers/exerion.cpp
@@ -120,10 +120,12 @@ Stephh's notes (based on the games Z80 code and some tests) :
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/exerion.h"
+
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/exp85.cpp b/src/mame/drivers/exp85.cpp
index 56849f2d3c3..9b09545fe13 100644
--- a/src/mame/drivers/exp85.cpp
+++ b/src/mame/drivers/exp85.cpp
@@ -31,10 +31,12 @@
#include "emu.h"
#include "includes/exp85.h"
+
#include "cpu/i8085/i8085.h"
#include "machine/i8155.h"
#include "machine/i8355.h"
#include "machine/ram.h"
+#include "speaker.h"
/* Memory Maps */
diff --git a/src/mame/drivers/expro02.cpp b/src/mame/drivers/expro02.cpp
index 71fb2139dc9..f18f09f308c 100644
--- a/src/mame/drivers/expro02.cpp
+++ b/src/mame/drivers/expro02.cpp
@@ -205,13 +205,17 @@ TODO:
*/
#include "emu.h"
+#include "includes/galpnipt.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "machine/kaneko_hit.h"
#include "machine/watchdog.h"
#include "video/kaneko_tmap.h"
#include "video/kaneko_spr.h"
-#include "includes/galpnipt.h"
+#include "screen.h"
+#include "speaker.h"
+
class expro02_state : public driver_device
{
diff --git a/src/mame/drivers/exprraid.cpp b/src/mame/drivers/exprraid.cpp
index b04ab813bfc..53529696c91 100644
--- a/src/mame/drivers/exprraid.cpp
+++ b/src/mame/drivers/exprraid.cpp
@@ -206,12 +206,15 @@ Stephh's notes (based on the games M6502 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/exprraid.h"
+
#include "cpu/m6502/deco16.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
#include "sound/3526intf.h"
-#include "includes/exprraid.h"
+#include "screen.h"
+#include "speaker.h"
/*****************************************************************************************/
diff --git a/src/mame/drivers/exterm.cpp b/src/mame/drivers/exterm.cpp
index fa85d9eb7c5..7c072b6cd4d 100644
--- a/src/mame/drivers/exterm.cpp
+++ b/src/mame/drivers/exterm.cpp
@@ -64,6 +64,7 @@
#include "emu.h"
#include "includes/exterm.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
@@ -71,6 +72,8 @@
#include "sound/volt_reg.h"
#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/exzisus.cpp b/src/mame/drivers/exzisus.cpp
index dfa837d47f8..1ca41be0465 100644
--- a/src/mame/drivers/exzisus.cpp
+++ b/src/mame/drivers/exzisus.cpp
@@ -36,11 +36,14 @@ TODO:
****************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/exzisus.h"
#include "includes/taitoipt.h"
#include "audio/taitosnd.h"
+
+#include "cpu/z80/z80.h"
#include "sound/ym2151.h"
-#include "includes/exzisus.h"
+#include "screen.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/f-32.cpp b/src/mame/drivers/f-32.cpp
index c2cdd487bdc..e1d966fa8a8 100644
--- a/src/mame/drivers/f-32.cpp
+++ b/src/mame/drivers/f-32.cpp
@@ -32,6 +32,9 @@ f5
#include "machine/eepromser.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
class mosaicf2_state : public driver_device
{
diff --git a/src/mame/drivers/f1gp.cpp b/src/mame/drivers/f1gp.cpp
index 869630702fe..aefd269ba62 100644
--- a/src/mame/drivers/f1gp.cpp
+++ b/src/mame/drivers/f1gp.cpp
@@ -25,12 +25,16 @@
***************************************************************************/
#include "emu.h"
+#include "includes/f1gp.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
#include "sound/okim6295.h"
-#include "includes/f1gp.h"
+
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(f1gp_state::f1gp_sh_bankswitch_w)
diff --git a/src/mame/drivers/famibox.cpp b/src/mame/drivers/famibox.cpp
index e46d1b26855..31ba4eca55d 100644
--- a/src/mame/drivers/famibox.cpp
+++ b/src/mame/drivers/famibox.cpp
@@ -63,6 +63,8 @@ Notes/ToDo:
#include "video/ppu2c0x.h"
#include "cpu/m6502/n2a03.h"
#include "debugger.h"
+#include "screen.h"
+#include "speaker.h"
class famibox_state : public driver_device
diff --git a/src/mame/drivers/fantland.cpp b/src/mame/drivers/fantland.cpp
index 16fedf498ee..bb0ceb9c5c3 100644
--- a/src/mame/drivers/fantland.cpp
+++ b/src/mame/drivers/fantland.cpp
@@ -47,6 +47,7 @@ Year + Game Main CPU Sound CPU Sound Video
#include "emu.h"
#include "includes/fantland.h"
+
#include "cpu/i86/i86.h"
#include "cpu/nec/nec.h"
#include "cpu/z80/z80.h"
@@ -54,6 +55,8 @@ Year + Game Main CPU Sound CPU Sound Video
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "sound/ym2151.h"
+#include "speaker.h"
+
/***************************************************************************
diff --git a/src/mame/drivers/fanucspmg.cpp b/src/mame/drivers/fanucspmg.cpp
index 4918eb88a84..14b47870293 100644
--- a/src/mame/drivers/fanucspmg.cpp
+++ b/src/mame/drivers/fanucspmg.cpp
@@ -528,18 +528,23 @@ the keypad symbols seem to use a different matrix pattern from the rest?
****************************************************************************/
#include "emu.h"
-#include "cpu/i86/i86.h"
+
#include "cpu/i8085/i8085.h"
-#include "machine/ram.h"
+#include "cpu/i86/i86.h"
#include "machine/i8251.h"
#include "machine/i8257.h"
-#include "machine/upd765.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
+#include "machine/ram.h"
+#include "machine/upd765.h"
#include "machine/upd765.h"
#include "video/mc6845.h"
+
+#include "screen.h"
+
#include "formats/imd_dsk.h"
+
#define MAINCPU_TAG "maincpu"
#define SUBCPU_TAG "subcpu"
#define USART0_TAG "usart0"
diff --git a/src/mame/drivers/fastfred.cpp b/src/mame/drivers/fastfred.cpp
index c0e59a2f237..580e8cd5e07 100644
--- a/src/mame/drivers/fastfred.cpp
+++ b/src/mame/drivers/fastfred.cpp
@@ -11,12 +11,15 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/fastfred.h"
+
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
+#include "speaker.h"
+
void fastfred_state::machine_start()
{
diff --git a/src/mame/drivers/fastinvaders.cpp b/src/mame/drivers/fastinvaders.cpp
index 74970ccfabf..b08b0deaebe 100644
--- a/src/mame/drivers/fastinvaders.cpp
+++ b/src/mame/drivers/fastinvaders.cpp
@@ -11,12 +11,13 @@ http://www.citylan.it/wiki/index.php/Fast_Invaders_%288275_version%29
***************************************************************************/
#include "emu.h"
-#include "cpu/i8085/i8085.h"
+#include "cpu/i8085/i8085.h"
+#include "machine/i8257.h"
+#include "machine/pic8259.h"
#include "video/i8275.h"
#include "video/mc6845.h"
-#include "machine/pic8259.h"
-#include "machine/i8257.h"
+#include "screen.h"
class fastinvaders_state : public driver_device
diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp
index a0a2cd7bc45..f65fcd5f1ad 100644
--- a/src/mame/drivers/fastlane.cpp
+++ b/src/mame/drivers/fastlane.cpp
@@ -12,10 +12,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/fastlane.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/hd6309.h"
#include "machine/watchdog.h"
-#include "includes/konamipt.h"
-#include "includes/fastlane.h"
+
+#include "speaker.h"
+
TIMER_DEVICE_CALLBACK_MEMBER(fastlane_state::fastlane_scanline)
{
diff --git a/src/mame/drivers/fb01.cpp b/src/mame/drivers/fb01.cpp
index e344c87fbe5..e712ac0f546 100644
--- a/src/mame/drivers/fb01.cpp
+++ b/src/mame/drivers/fb01.cpp
@@ -7,14 +7,19 @@
***************************************************************************/
#include "emu.h"
+
+#include "bus/midi/midi.h"
#include "cpu/z80/z80.h"
-#include "sound/ym2151.h"
+#include "machine/clock.h"
+#include "machine/i8251.h"
#include "machine/nvram.h"
+#include "sound/ym2151.h"
#include "video/hd44780.h"
-#include "machine/i8251.h"
-#include "machine/clock.h"
-#include "bus/midi/midi.h"
+
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "fb01.lh"
diff --git a/src/mame/drivers/fc100.cpp b/src/mame/drivers/fc100.cpp
index 66cc7d74c4b..5f4d8deedfa 100644
--- a/src/mame/drivers/fc100.cpp
+++ b/src/mame/drivers/fc100.cpp
@@ -32,18 +32,22 @@ TODO:
#include "emu.h"
+
+#include "bus/centronics/ctronics.h"
+#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
#include "cpu/z80/z80.h"
-#include "video/mc6847.h"
-#include "machine/i8251.h"
+#include "imagedev/cassette.h"
+#include "machine/buffer.h"
#include "machine/clock.h"
+#include "machine/i8251.h"
#include "sound/ay8910.h"
-#include "imagedev/cassette.h"
#include "sound/wave.h"
+#include "video/mc6847.h"
+
+#include "speaker.h"
+
#include "formats/fc100_cas.h"
-#include "machine/buffer.h"
-#include "bus/centronics/ctronics.h"
-#include "bus/generic/slot.h"
-#include "bus/generic/carts.h"
class fc100_state : public driver_device
diff --git a/src/mame/drivers/fcombat.cpp b/src/mame/drivers/fcombat.cpp
index 74b0ebb6fbf..d0b76df12cd 100644
--- a/src/mame/drivers/fcombat.cpp
+++ b/src/mame/drivers/fcombat.cpp
@@ -32,10 +32,13 @@ inputs + notes by stephh
*/
#include "emu.h"
+#include "includes/fcombat.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
-#include "includes/fcombat.h"
+#include "screen.h"
+#include "speaker.h"
INPUT_CHANGED_MEMBER(fcombat_state::coin_inserted)
diff --git a/src/mame/drivers/fcrash.cpp b/src/mame/drivers/fcrash.cpp
index 3f747612e76..123c060e418 100644
--- a/src/mame/drivers/fcrash.cpp
+++ b/src/mame/drivers/fcrash.cpp
@@ -86,14 +86,17 @@ slampic: no sound. A priority problem between sprites and crowd.
*/
#include "emu.h"
+#include "includes/cps1.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
-#include "includes/cps1.h"
#include "sound/2203intf.h"
#include "sound/msm5205.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
#include "machine/eepromser.h"
+#include "speaker.h"
+
WRITE16_MEMBER( cps_state::fcrash_soundlatch_w )
{
diff --git a/src/mame/drivers/feversoc.cpp b/src/mame/drivers/feversoc.cpp
index ce9aa0d5e4a..75ce67684b1 100644
--- a/src/mame/drivers/feversoc.cpp
+++ b/src/mame/drivers/feversoc.cpp
@@ -72,6 +72,8 @@ U0564 LH28F800SU OBJ4-1
#include "machine/eepromser.h"
#include "machine/rtc4543.h"
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
class feversoc_state : public driver_device
diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp
index b7f3f7b9669..a186bf8a9e8 100644
--- a/src/mame/drivers/fidel6502.cpp
+++ b/src/mame/drivers/fidel6502.cpp
@@ -404,6 +404,7 @@ I/O is via TTL, very similar to Designer Display
#include "emu.h"
#include "includes/fidelbase.h"
+
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/r65c02.h"
#include "cpu/m6502/m65sc02.h"
@@ -411,6 +412,7 @@ I/O is via TTL, very similar to Designer Display
#include "machine/i8255.h"
#include "machine/nvram.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
// internal artwork
#include "fidel_chesster.lh" // clickable
diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp
index 3269d6d0c10..056928c3058 100644
--- a/src/mame/drivers/fidel68k.cpp
+++ b/src/mame/drivers/fidel68k.cpp
@@ -155,10 +155,12 @@ B0000x-xxxxxx: see V7, -800000
#include "emu.h"
#include "includes/fidelbase.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/ram.h"
#include "machine/nvram.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
// internal artwork
#include "fidel_ex_68k.lh" // clickable
diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp
index 254d3fc8fb8..3e0c2e18ed7 100644
--- a/src/mame/drivers/fidelz80.cpp
+++ b/src/mame/drivers/fidelz80.cpp
@@ -491,6 +491,7 @@ expect that the software reads these once on startup only.
#include "emu.h"
#include "includes/fidelbase.h"
+
#include "cpu/z80/z80.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/i8255.h"
@@ -498,6 +499,7 @@ expect that the software reads these once on startup only.
#include "machine/z80pio.h"
#include "sound/beep.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
// internal artwork
#include "fidel_cc.lh" // clickable
diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp
index 6fc8a45d826..dc71a032558 100644
--- a/src/mame/drivers/finalizr.cpp
+++ b/src/mame/drivers/finalizr.cpp
@@ -15,6 +15,7 @@
#include "emu.h"
#include "includes/finalizr.h"
#include "includes/konamipt.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/gen_latch.h"
@@ -24,6 +25,9 @@
#include "sound/sn76496.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
TIMER_DEVICE_CALLBACK_MEMBER(finalizr_state::finalizr_scanline)
{
diff --git a/src/mame/drivers/fireball.cpp b/src/mame/drivers/fireball.cpp
index bb8385e6cc5..f1c6ac2f2c6 100644
--- a/src/mame/drivers/fireball.cpp
+++ b/src/mame/drivers/fireball.cpp
@@ -17,9 +17,12 @@
#include "emu.h"
#include "cpu/mcs51/mcs51.h"
+#include "machine/eepromser.h"
#include "sound/ay8910.h"
+#include "speaker.h"
+
#include "fireball.lh"
-#include "machine/eepromser.h"
+
/****************************
* LOG defines *
diff --git a/src/mame/drivers/firebeat.cpp b/src/mame/drivers/firebeat.cpp
index e6c9c37629a..888d0bc33e6 100644
--- a/src/mame/drivers/firebeat.cpp
+++ b/src/mame/drivers/firebeat.cpp
@@ -137,18 +137,23 @@ Keyboard Mania 2nd Mix - dongle, program CD, audio CD
*/
#include "emu.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/powerpc/ppc.h"
#include "machine/ataintf.h"
-#include "machine/intelfsh.h"
-#include "machine/rtc65271.h"
+#include "machine/atapicdr.h"
#include "machine/ins8250.h"
+#include "machine/intelfsh.h"
#include "machine/midikbd.h"
-#include "machine/atapicdr.h"
-#include "sound/ymz280b.h"
+#include "machine/rtc65271.h"
#include "sound/cdda.h"
#include "sound/rf5c400.h"
+#include "sound/ymz280b.h"
#include "video/k057714.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "firebeat.lh"
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index 3a99b06518b..f4c337c75aa 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -38,6 +38,7 @@ but requires a special level III player for proper control. Video: CAV. Audio: A
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "machine/x2212.h"
+#include "speaker.h"
class firefox_state : public driver_device
diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp
index 300e65084b6..ddcf4f0850a 100644
--- a/src/mame/drivers/firetrap.cpp
+++ b/src/mame/drivers/firetrap.cpp
@@ -169,10 +169,13 @@ Stephh's notes (based on the games Z80 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/firetrap.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6502/m6502.h"
#include "sound/3526intf.h"
-#include "includes/firetrap.h"
+#include "screen.h"
+#include "speaker.h"
#define FIRETRAP_XTAL XTAL_12MHz
diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp
index 7a465d04edd..a9500e8919e 100644
--- a/src/mame/drivers/firetrk.cpp
+++ b/src/mame/drivers/firetrk.cpp
@@ -7,9 +7,10 @@ Atari Fire Truck + Super Bug + Monte Carlo driver
***************************************************************************/
#include "emu.h"
-#include "cpu/m6800/m6800.h"
#include "includes/firetrk.h"
+#include "cpu/m6800/m6800.h"
#include "sound/discrete.h"
+#include "speaker.h"
#include "superbug.lh"
diff --git a/src/mame/drivers/fitfight.cpp b/src/mame/drivers/fitfight.cpp
index 56e79aec2d8..da1ddd3e295 100644
--- a/src/mame/drivers/fitfight.cpp
+++ b/src/mame/drivers/fitfight.cpp
@@ -84,10 +84,14 @@ Stephh's notes :
*/
#include "emu.h"
+#include "includes/fitfight.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/upd7810/upd7810.h"
#include "sound/okim6295.h"
-#include "includes/fitfight.h"
+#include "screen.h"
+#include "speaker.h"
+
READ16_MEMBER( fitfight_state::hotmindff_unk_r )
{
diff --git a/src/mame/drivers/fk1.cpp b/src/mame/drivers/fk1.cpp
index 6ebc7dc719f..61ba3ffdf0f 100644
--- a/src/mame/drivers/fk1.cpp
+++ b/src/mame/drivers/fk1.cpp
@@ -14,6 +14,7 @@
#include "machine/pit8253.h"
#include "machine/i8251.h"
#include "machine/ram.h"
+#include "screen.h"
class fk1_state : public driver_device
diff --git a/src/mame/drivers/flipjack.cpp b/src/mame/drivers/flipjack.cpp
index 63d63b9803e..70bdc3f059f 100644
--- a/src/mame/drivers/flipjack.cpp
+++ b/src/mame/drivers/flipjack.cpp
@@ -81,6 +81,9 @@ ________________________|___________________________
#include "machine/i8255.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_16MHz
#define VIDEO_CLOCK XTAL_6MHz
diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp
index 51f03c95d88..11bfa29b78d 100644
--- a/src/mame/drivers/flkatck.cpp
+++ b/src/mame/drivers/flkatck.cpp
@@ -13,11 +13,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/flkatck.h"
+#include "includes/konamipt.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6809/hd6309.h"
#include "sound/ym2151.h"
-#include "includes/konamipt.h"
-#include "includes/flkatck.h"
+#include "screen.h"
+#include "speaker.h"
INTERRUPT_GEN_MEMBER(flkatck_state::flkatck_interrupt)
diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp
index 3b895ac8af8..63bfbfa3289 100644
--- a/src/mame/drivers/flower.cpp
+++ b/src/mame/drivers/flower.cpp
@@ -75,6 +75,7 @@ CHIP # POSITION TYPE
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class flower_state : public driver_device
{
diff --git a/src/mame/drivers/flstory.cpp b/src/mame/drivers/flstory.cpp
index 3d4aeff77ef..006bf279c6d 100644
--- a/src/mame/drivers/flstory.cpp
+++ b/src/mame/drivers/flstory.cpp
@@ -13,11 +13,15 @@
#include "emu.h"
#include "includes/flstory.h"
-#include "cpu/z80/z80.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"
+
READ8_MEMBER(flstory_state::from_snd_r)
{
diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp
index 43ea05f477e..05c7d9b5b87 100644
--- a/src/mame/drivers/flyball.cpp
+++ b/src/mame/drivers/flyball.cpp
@@ -20,6 +20,7 @@ TODO:
#include "emu.h"
#include "cpu/m6502/m6502.h"
+#include "screen.h"
#define MASTER_CLOCK XTAL_12_096MHz
#define PIXEL_CLOCK (MASTER_CLOCK / 2)
diff --git a/src/mame/drivers/fm7.cpp b/src/mame/drivers/fm7.cpp
index 2bb98c7c881..67811dc60b5 100644
--- a/src/mame/drivers/fm7.cpp
+++ b/src/mame/drivers/fm7.cpp
@@ -38,20 +38,28 @@
************************************************************************************************/
#include "emu.h"
+#include "includes/fm7.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/i86/i86.h"
#include "cpu/z80/z80.h"
+
#include "sound/ay8910.h"
#include "sound/2203intf.h"
#include "sound/wave.h"
#include "sound/beep.h"
+#include "bus/centronics/dsjoy.h"
+
#include "imagedev/cassette.h"
-#include "formats/fm7_cas.h"
#include "imagedev/flopdrv.h"
-#include "bus/centronics/dsjoy.h"
-#include "includes/fm7.h"
+
+#include "formats/fm7_cas.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
/* key scancode conversion table
* The FM-7 expects different scancodes when shift,ctrl or graph is held, or
diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp
index 183199157f1..bb2f2c7cd44 100644
--- a/src/mame/drivers/fmtowns.cpp
+++ b/src/mame/drivers/fmtowns.cpp
@@ -178,9 +178,13 @@ Notes:
#include "emu.h"
#include "includes/fmtowns.h"
+
#include "bus/scsi/scsi.h"
#include "bus/scsi/scsihd.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
// CD controller IRQ types
diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp
index a9ff781cd18..3ad8678a66e 100644
--- a/src/mame/drivers/foodf.cpp
+++ b/src/mame/drivers/foodf.cpp
@@ -76,11 +76,12 @@
#include "emu.h"
+#include "includes/foodf.h"
#include "cpu/m68000/m68000.h"
#include "machine/atarigen.h"
#include "machine/watchdog.h"
#include "sound/pokey.h"
-#include "includes/foodf.h"
+#include "speaker.h"
#define MASTER_CLOCK 12096000
diff --git a/src/mame/drivers/forte2.cpp b/src/mame/drivers/forte2.cpp
index 1e0d02f5920..8968e8b3307 100644
--- a/src/mame/drivers/forte2.cpp
+++ b/src/mame/drivers/forte2.cpp
@@ -40,6 +40,8 @@ found/dumped yet. */
#include "cpu/z80/z80.h"
#include "video/tms9928a.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class forte2_state : public driver_device
diff --git a/src/mame/drivers/fortecar.cpp b/src/mame/drivers/fortecar.cpp
index 3975a3cbeb9..b39d8ad14b7 100644
--- a/src/mame/drivers/fortecar.cpp
+++ b/src/mame/drivers/fortecar.cpp
@@ -308,26 +308,28 @@
**************************************************************************************************/
-
-#define MASTER_CLOCK XTAL_12MHz
-#define CPU_CLOCK (MASTER_CLOCK/4)
-#define CRTC_CLOCK (MASTER_CLOCK/8)
-#define AY_CLOCK (MASTER_CLOCK/8)
-
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
-#include "machine/watchdog.h"
-#include "sound/ay8910.h"
#include "machine/i8255.h"
+#include "machine/nvram.h"
#include "machine/v3021.h"
+#include "machine/watchdog.h"
+#include "sound/ay8910.h"
#include "video/mc6845.h"
-#include "machine/nvram.h"
#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
#include "fortecrd.lh"
+#define MASTER_CLOCK XTAL_12MHz
+#define CPU_CLOCK (MASTER_CLOCK/4)
+#define CRTC_CLOCK (MASTER_CLOCK/8)
+#define AY_CLOCK (MASTER_CLOCK/8)
+
+
class fortecar_state : public driver_device
{
public:
diff --git a/src/mame/drivers/fp1100.cpp b/src/mame/drivers/fp1100.cpp
index 0f473e169a2..536dd69b5fb 100644
--- a/src/mame/drivers/fp1100.cpp
+++ b/src/mame/drivers/fp1100.cpp
@@ -59,6 +59,8 @@
#include "sound/beep.h"
#include "bus/centronics/ctronics.h"
#include "imagedev/cassette.h"
+#include "screen.h"
+#include "speaker.h"
#define MAIN_CLOCK 15974400
#define LOG 0
diff --git a/src/mame/drivers/fp200.cpp b/src/mame/drivers/fp200.cpp
index 2c6608a3eef..38f228b773f 100644
--- a/src/mame/drivers/fp200.cpp
+++ b/src/mame/drivers/fp200.cpp
@@ -22,6 +22,8 @@
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "screen.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_6_144MHz
diff --git a/src/mame/drivers/fp6000.cpp b/src/mame/drivers/fp6000.cpp
index a2fd2098fa6..200dd9df10f 100644
--- a/src/mame/drivers/fp6000.cpp
+++ b/src/mame/drivers/fp6000.cpp
@@ -21,6 +21,7 @@
#include "emu.h"
#include "cpu/i86/i86.h"
#include "video/mc6845.h"
+#include "screen.h"
class fp6000_state : public driver_device
diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp
index 8ba1be91476..5e67ee8f78d 100644
--- a/src/mame/drivers/freekick.cpp
+++ b/src/mame/drivers/freekick.cpp
@@ -42,11 +42,14 @@ TODO:
*/
#include "emu.h"
+#include "includes/freekick.h"
+
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/mc8123.h"
#include "sound/sn76496.h"
-#include "includes/freekick.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp
index cbedc623176..15057673c66 100644
--- a/src/mame/drivers/fresh.cpp
+++ b/src/mame/drivers/fresh.cpp
@@ -23,7 +23,7 @@ rom 5 and 6 are prg roms
#include "emu.h"
#include "cpu/m68000/m68000.h"
-
+#include "screen.h"
diff --git a/src/mame/drivers/fromanc2.cpp b/src/mame/drivers/fromanc2.cpp
index b6b85fe9670..da1c4422fbf 100644
--- a/src/mame/drivers/fromanc2.cpp
+++ b/src/mame/drivers/fromanc2.cpp
@@ -19,11 +19,14 @@
******************************************************************************/
#include "emu.h"
+#include "includes/fromanc2.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/2610intf.h"
-#include "includes/fromanc2.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/fromance.cpp b/src/mame/drivers/fromance.cpp
index 6c52c93ab69..90bfaeefab9 100644
--- a/src/mame/drivers/fromance.cpp
+++ b/src/mame/drivers/fromance.cpp
@@ -80,11 +80,13 @@ with the following code:
******************************************************************************/
#include "emu.h"
+#include "includes/fromance.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "sound/ym2413.h"
#include "sound/msm5205.h"
-#include "includes/fromance.h"
+#include "sound/ym2413.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/funkball.cpp b/src/mame/drivers/funkball.cpp
index 589fb22b1e3..66940c5843c 100644
--- a/src/mame/drivers/funkball.cpp
+++ b/src/mame/drivers/funkball.cpp
@@ -71,14 +71,15 @@ Notes:
#include "emu.h"
#include "cpu/i386/i386.h"
+#include "machine/bankdev.h"
+#include "machine/idectrl.h"
+#include "machine/intelfsh.h"
#include "machine/lpci.h"
#include "machine/pckeybrd.h"
-#include "machine/idectrl.h"
-#include "video/voodoo.h"
#include "machine/pcshare.h"
-#include "machine/bankdev.h"
-#include "machine/intelfsh.h"
#include "machine/terminal.h"
+#include "video/voodoo.h"
+#include "screen.h"
class funkball_state : public pcat_base_state
diff --git a/src/mame/drivers/funkybee.cpp b/src/mame/drivers/funkybee.cpp
index fb41cc40e5a..3f237c9c38c 100644
--- a/src/mame/drivers/funkybee.cpp
+++ b/src/mame/drivers/funkybee.cpp
@@ -74,9 +74,12 @@ Stephh's notes (based on the games Z80 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/funkybee.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/funkybee.h"
+#include "screen.h"
+#include "speaker.h"
READ8_MEMBER(funkybee_state::funkybee_input_port_0_r)
diff --git a/src/mame/drivers/funkyjet.cpp b/src/mame/drivers/funkyjet.cpp
index f49468be8e1..d3e6b4476ae 100644
--- a/src/mame/drivers/funkyjet.cpp
+++ b/src/mame/drivers/funkyjet.cpp
@@ -90,13 +90,16 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/funkyjet.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "machine/decocrpt.h"
#include "machine/gen_latch.h"
-#include "includes/funkyjet.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
/******************************************************************************/
diff --git a/src/mame/drivers/funtech.cpp b/src/mame/drivers/funtech.cpp
index 626859ae1f7..dcd6263c6db 100644
--- a/src/mame/drivers/funtech.cpp
+++ b/src/mame/drivers/funtech.cpp
@@ -21,10 +21,14 @@ and an unpopulated position for a YM2413 or UM3567
*/
#include "emu.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "fts2in1.lh"
diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp
index 2baf272ad77..a45cded895f 100644
--- a/src/mame/drivers/funworld.cpp
+++ b/src/mame/drivers/funworld.cpp
@@ -991,17 +991,21 @@
#define CRTC_CLOCK (MASTER_CLOCK/8)
#include "emu.h"
-#include "cpu/m6502/r65c02.h"
+#include "includes/funworld.h"
+
#include "cpu/m6502/m65sc02.h"
-#include "video/mc6845.h"
+#include "cpu/m6502/r65c02.h"
#include "machine/6821pia.h"
-#include "sound/ay8910.h"
#include "machine/nvram.h"
-#include "jollycrd.lh"
+#include "sound/ay8910.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "bonuscrd.lh"
+#include "jollycrd.lh"
#include "novoplay.lh"
#include "royalcrd.lh"
-#include "includes/funworld.h"
/**********************
diff --git a/src/mame/drivers/funybubl.cpp b/src/mame/drivers/funybubl.cpp
index f961f6faf3b..2a353ac37b8 100644
--- a/src/mame/drivers/funybubl.cpp
+++ b/src/mame/drivers/funybubl.cpp
@@ -51,9 +51,12 @@ Note: SW2, SW3 & SW4 not populated
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/funybubl.h"
+#include "cpu/z80/z80.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(funybubl_state::funybubl_vidram_bank_w)
{
diff --git a/src/mame/drivers/fuukifg2.cpp b/src/mame/drivers/fuukifg2.cpp
index 083a8123a56..fd9edf74689 100644
--- a/src/mame/drivers/fuukifg2.cpp
+++ b/src/mame/drivers/fuukifg2.cpp
@@ -46,11 +46,13 @@ To Do:
***************************************************************************/
#include "emu.h"
+#include "includes/fuukifg2.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
#include "sound/3812intf.h"
-#include "includes/fuukifg2.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/fuukifg3.cpp b/src/mame/drivers/fuukifg3.cpp
index f2baa6c37ee..89e1003381a 100644
--- a/src/mame/drivers/fuukifg3.cpp
+++ b/src/mame/drivers/fuukifg3.cpp
@@ -157,10 +157,12 @@ FG-3J ROM-J 507KA0301P04 Rev:1.3
***************************************************************************/
#include "emu.h"
+#include "includes/fuukifg3.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/ymf278b.h"
-#include "includes/fuukifg3.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/g627.cpp b/src/mame/drivers/g627.cpp
index 27ae304b3b9..66c0919f050 100644
--- a/src/mame/drivers/g627.cpp
+++ b/src/mame/drivers/g627.cpp
@@ -40,10 +40,13 @@ ToDo:
#include "emu.h"
-#include "machine/genpin.h"
#include "cpu/z80/z80.h"
+#include "machine/genpin.h"
#include "machine/i8155.h"
#include "sound/astrocde.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "g627.lh"
diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp
index d339a03b0d5..d073b99ef58 100644
--- a/src/mame/drivers/gaelco.cpp
+++ b/src/mame/drivers/gaelco.cpp
@@ -19,12 +19,17 @@ Year Game PCB NOTES
***************************************************************************/
#include "emu.h"
+#include "includes/gaelco.h"
+
+#include "includes/gaelcrpt.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "sound/3812intf.h"
-#include "includes/gaelcrpt.h"
-#include "includes/gaelco.h"
+
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp
index ce2da07d012..6e5b3f82fe1 100644
--- a/src/mame/drivers/gaelco2.cpp
+++ b/src/mame/drivers/gaelco2.cpp
@@ -27,10 +27,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/gaelco2.h"
+
#include "machine/eepromser.h"
#include "sound/gaelco.h"
+
#include "rendlay.h"
-#include "includes/gaelco2.h"
+#include "screen.h"
+#include "speaker.h"
+
#define TILELAYOUT16(NUM) static const gfx_layout tilelayout16_##NUM = \
{ \
diff --git a/src/mame/drivers/gaelco3d.cpp b/src/mame/drivers/gaelco3d.cpp
index 14cfeb30156..aaa1aaee09a 100644
--- a/src/mame/drivers/gaelco3d.cpp
+++ b/src/mame/drivers/gaelco3d.cpp
@@ -145,16 +145,17 @@ REF. 970429
**************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "includes/gaelco3d.h"
-#include "cpu/tms32031/tms32031.h"
+
#include "cpu/adsp2100/adsp2100.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/tms32031/tms32031.h"
#include "machine/eepromser.h"
-#define LOG 0
-
+#include "speaker.h"
+#define LOG 0
WRITE_LINE_MEMBER(gaelco3d_state::ser_irq)
diff --git a/src/mame/drivers/gaiden.cpp b/src/mame/drivers/gaiden.cpp
index 838d879056a..e984e8fc034 100644
--- a/src/mame/drivers/gaiden.cpp
+++ b/src/mame/drivers/gaiden.cpp
@@ -131,13 +131,16 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/gaiden.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
-#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/gaiden.h"
+#include "sound/ym2151.h"
+#include "speaker.h"
+
WRITE16_MEMBER(gaiden_state::gaiden_sound_command_w)
{
diff --git a/src/mame/drivers/gal3.cpp b/src/mame/drivers/gal3.cpp
index 1004063b06e..2e8ac930b6d 100644
--- a/src/mame/drivers/gal3.cpp
+++ b/src/mame/drivers/gal3.cpp
@@ -127,13 +127,15 @@ better notes (complete chip lists) for each board still needed
*/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "includes/namcos2.h"
-#include "cpu/tms32025/tms32025.h"
#include "includes/namcoic.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cpu/tms32025/tms32025.h"
#include "machine/nvram.h"
#include "sound/c140.h"
#include "rendlay.h"
+#include "speaker.h"
class gal3_state : public namcos2_shared_state
diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp
index bca05374642..432d0e171c2 100644
--- a/src/mame/drivers/galaga.cpp
+++ b/src/mame/drivers/galaga.cpp
@@ -699,23 +699,26 @@ TODO:
***************************************************************************/
#include "emu.h"
-#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/bosco.h"
+#include "includes/digdug.h"
+#include "includes/galaga.h"
+#include "includes/xevious.h"
+#include "audio/namco52.h"
+#include "audio/namco54.h"
+
#include "cpu/mb88xx/mb88xx.h"
+#include "cpu/z80/z80.h"
#include "machine/atari_vg.h"
#include "machine/namco06.h"
#include "machine/namco50.h"
#include "machine/namco51.h"
#include "machine/namco53.h"
-#include "includes/galaga.h"
-#include "includes/xevious.h"
-#include "includes/bosco.h"
-#include "includes/digdug.h"
-#include "audio/namco52.h"
#include "machine/rescap.h"
#include "machine/watchdog.h"
#include "sound/samples.h"
-#include "audio/namco54.h"
+
+#include "speaker.h"
+
#define MASTER_CLOCK (XTAL_18_432MHz)
diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp
index 8fbdf6b1dea..6332928c77b 100644
--- a/src/mame/drivers/galaxi.cpp
+++ b/src/mame/drivers/galaxi.cpp
@@ -33,15 +33,18 @@
***************************************************************************/
-#define CPU_CLOCK (XTAL_10MHz)
-#define SND_CLOCK (XTAL_16MHz)/16
-
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "galaxi.lh"
+#define CPU_CLOCK (XTAL_10MHz)
+#define SND_CLOCK (XTAL_16MHz)/16
+
class galaxi_state : public driver_device
{
public:
diff --git a/src/mame/drivers/galaxia.cpp b/src/mame/drivers/galaxia.cpp
index ce83a5e81d2..bc775353c04 100644
--- a/src/mame/drivers/galaxia.cpp
+++ b/src/mame/drivers/galaxia.cpp
@@ -69,9 +69,11 @@ TODO:
*/
#include "emu.h"
+#include "includes/galaxia.h"
+
#include "machine/s2636.h"
#include "cpu/s2650/s2650.h"
-#include "includes/galaxia.h"
+#include "speaker.h"
INTERRUPT_GEN_MEMBER(galaxia_state::galaxia_interrupt)
diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp
index 482208de0ed..059b71cb0a0 100644
--- a/src/mame/drivers/galaxian.cpp
+++ b/src/mame/drivers/galaxian.cpp
@@ -658,12 +658,15 @@ TODO:
#include "includes/galaxian.h"
#include "audio/cclimber.h"
#include "audio/galaxian.h"
+
#include "cpu/s2650/s2650.h"
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/discrete.h"
#include "sound/sn76496.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
#define KONAMI_SOUND_CLOCK XTAL_14_31818MHz
diff --git a/src/mame/drivers/galaxold.cpp b/src/mame/drivers/galaxold.cpp
index fcd0caa8923..782622ae9dc 100644
--- a/src/mame/drivers/galaxold.cpp
+++ b/src/mame/drivers/galaxold.cpp
@@ -100,13 +100,15 @@ Stephh's notes (based on the games Z80 code and some tests) for other games :
***************************************************************************/
#include "emu.h"
+#include "includes/galaxold.h"
+#include "audio/galaxian.h"
+
#include "cpu/z80/z80.h"
#include "cpu/s2650/s2650.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
#include "sound/sn76496.h"
-#include "audio/galaxian.h"
-#include "includes/galaxold.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/galaxy.cpp b/src/mame/drivers/galaxy.cpp
index 79f3b47ee61..d941e53809c 100644
--- a/src/mame/drivers/galaxy.cpp
+++ b/src/mame/drivers/galaxy.cpp
@@ -24,15 +24,19 @@ Galaksija driver by Krzysztof Strzecha and Miodrag Milanovic
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "sound/wave.h"
#include "includes/galaxy.h"
-#include "imagedev/snapquik.h"
-#include "imagedev/cassette.h"
-#include "sound/ay8910.h"
+
+#include "cpu/z80/z80.h"
#include "formats/gtp_cas.h"
+#include "imagedev/cassette.h"
+#include "imagedev/snapquik.h"
#include "machine/ram.h"
+#include "sound/ay8910.h"
+#include "sound/wave.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START (galaxyp_io, AS_IO, 8, galaxy_state )
ADDRESS_MAP_GLOBAL_MASK(0x01)
diff --git a/src/mame/drivers/galeb.cpp b/src/mame/drivers/galeb.cpp
index 9faf0b73a54..3b7c629f0d0 100644
--- a/src/mame/drivers/galeb.cpp
+++ b/src/mame/drivers/galeb.cpp
@@ -15,8 +15,12 @@
#include "emu.h"
#include "includes/galeb.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
static GFXDECODE_START( galeb )
GFXDECODE_ENTRY( "gfx1", 0x0000, galeb_charlayout, 0, 1 )
diff --git a/src/mame/drivers/galgame.cpp b/src/mame/drivers/galgame.cpp
index fe400cf9d64..79640e233c6 100644
--- a/src/mame/drivers/galgame.cpp
+++ b/src/mame/drivers/galgame.cpp
@@ -12,6 +12,7 @@
#include "emu.h"
#include "cpu/t11/t11.h"
+#include "screen.h"
#define MAX_POINTS 2048
diff --git a/src/mame/drivers/galgames.cpp b/src/mame/drivers/galgames.cpp
index 0bd2bc8fa95..67d71171c56 100644
--- a/src/mame/drivers/galgames.cpp
+++ b/src/mame/drivers/galgames.cpp
@@ -40,6 +40,8 @@ Notes:
#include "machine/watchdog.h"
#include "sound/okim6295.h"
#include "video/cesblit.h"
+#include "screen.h"
+#include "speaker.h"
/***************************************************************************
@@ -113,7 +115,7 @@ protected:
};
// device type definition
-const device_type GALGAMES_CART = &device_creator<galgames_cart_device>;
+const device_type GALGAMES_CART = device_creator<galgames_cart_device>;
#define MCFG_GALGAMES_CART_INDEX(_cart) \
galgames_cart_device::static_set_cart(*device, _cart);
@@ -145,7 +147,7 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override { return MACHINE_CONFIG_NAME(bios); }
};
-const device_type GALGAMES_BIOS_CART = &device_creator<galgames_bios_cart_device>;
+const device_type GALGAMES_BIOS_CART = device_creator<galgames_bios_cart_device>;
#define MCFG_GALGAMES_BIOS_CART_ADD(_tag, _cart) \
MCFG_DEVICE_ADD(_tag, GALGAMES_BIOS_CART, 0) \
@@ -175,7 +177,7 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override { return MACHINE_CONFIG_NAME(starpak2); }
};
-const device_type GALGAMES_STARPAK2_CART = &device_creator<galgames_starpak2_cart_device>;
+const device_type GALGAMES_STARPAK2_CART = device_creator<galgames_starpak2_cart_device>;
#define MCFG_GALGAMES_STARPAK2_CART_ADD(_tag, _cart) \
MCFG_DEVICE_ADD(_tag, GALGAMES_STARPAK2_CART, 0) \
@@ -207,7 +209,7 @@ protected:
virtual machine_config_constructor device_mconfig_additions() const override { return MACHINE_CONFIG_NAME(starpak3); }
};
-const device_type GALGAMES_STARPAK3_CART = &device_creator<galgames_starpak3_cart_device>;
+const device_type GALGAMES_STARPAK3_CART = device_creator<galgames_starpak3_cart_device>;
#define MCFG_GALGAMES_STARPAK3_CART_ADD(_tag, _cart) \
MCFG_DEVICE_ADD(_tag, GALGAMES_STARPAK3_CART, 0) \
@@ -289,7 +291,7 @@ protected:
};
// device type definition
-const device_type GALGAMES_SLOT = &device_creator<galgames_slot_device>;
+const device_type GALGAMES_SLOT = device_creator<galgames_slot_device>;
#define MCFG_GALGAMES_SLOT_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, GALGAMES_SLOT, 0)
diff --git a/src/mame/drivers/galivan.cpp b/src/mame/drivers/galivan.cpp
index 6e2a1e4202e..1b434edd8a4 100644
--- a/src/mame/drivers/galivan.cpp
+++ b/src/mame/drivers/galivan.cpp
@@ -35,10 +35,13 @@ TODO
#include "emu.h"
#include "includes/galivan.h"
+
#include "cpu/z80/z80.h"
#include "sound/3526intf.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(galivan_state::galivan_sound_command_w)
diff --git a/src/mame/drivers/galpani2.cpp b/src/mame/drivers/galpani2.cpp
index 80e5ac5b9fc..6d9fb7a5692 100644
--- a/src/mame/drivers/galpani2.cpp
+++ b/src/mame/drivers/galpani2.cpp
@@ -79,9 +79,13 @@ Notes:
***************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "includes/galpani2.h"
+#include "cpu/m68000/m68000.h"
+#include "screen.h"
+#include "speaker.h"
+
+
/***************************************************************************
diff --git a/src/mame/drivers/galpani3.cpp b/src/mame/drivers/galpani3.cpp
index a048fa9ba34..30f068024a9 100644
--- a/src/mame/drivers/galpani3.cpp
+++ b/src/mame/drivers/galpani3.cpp
@@ -65,12 +65,14 @@ Dumped by Uki
#include "emu.h"
#include "cpu/m68000/m68000.h"
-#include "sound/ymz280b.h"
-#include "video/sknsspr.h"
#include "machine/eepromser.h"
-#include "machine/watchdog.h"
#include "machine/kaneko_toybox.h"
+#include "machine/watchdog.h"
+#include "sound/ymz280b.h"
#include "video/kaneko_grap2.h"
+#include "video/sknsspr.h"
+#include "screen.h"
+#include "speaker.h"
class galpani3_state : public driver_device
{
diff --git a/src/mame/drivers/galpanic.cpp b/src/mame/drivers/galpanic.cpp
index f855b3f25e0..a4ef62d4241 100644
--- a/src/mame/drivers/galpanic.cpp
+++ b/src/mame/drivers/galpanic.cpp
@@ -66,14 +66,17 @@ Stephh's additional notes :
***************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
+#include "includes/galpanic.h"
+#include "includes/galpnipt.h"
#include "includes/kaneko16.h"
+
+#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
#include "sound/okim6295.h"
#include "video/kan_pand.h"
#include "machine/kaneko_hit.h"
-#include "includes/galpanic.h"
-#include "includes/galpnipt.h"
+#include "speaker.h"
+
void galpanic_state::machine_start()
{
diff --git a/src/mame/drivers/galspnbl.cpp b/src/mame/drivers/galspnbl.cpp
index 31af356a85a..66bfb33ebab 100644
--- a/src/mame/drivers/galspnbl.cpp
+++ b/src/mame/drivers/galspnbl.cpp
@@ -38,11 +38,13 @@ Manuals for both games define the controls as 4 push buttons:
***************************************************************************/
#include "emu.h"
+#include "includes/galspnbl.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
#include "sound/3812intf.h"
-#include "includes/galspnbl.h"
+#include "speaker.h"
WRITE16_MEMBER(galspnbl_state::soundcommand_w)
diff --git a/src/mame/drivers/gamate.cpp b/src/mame/drivers/gamate.cpp
index b9d2dc11957..edf56c3761d 100644
--- a/src/mame/drivers/gamate.cpp
+++ b/src/mame/drivers/gamate.cpp
@@ -15,9 +15,11 @@
#include "emu.h"
#include "includes/gamate.h"
-#include "ui/uimain.h"
+
#include "rendlay.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
class gamate_state : public driver_device
{
@@ -208,7 +210,7 @@ READ8_MEMBER( gamate_state::gamate_video_r )
return 0;
uint8_t data = video.bitmap.data[video.bitmap.page2][video.y][video.x&(ARRAY_LENGTH(video.bitmap.data[0][0])-1)];
// if (m_maincpu->pc()<0xf000)
-// machine().ui().popup_time(2, "lcd read x:%x y:%x mode:%x data:%x\n", video.x, video.y, video.reg[1], data);
+// popmessage("lcd read x:%x y:%x mode:%x data:%x\n", video.x, video.y, video.reg[1], data);
if (video.y_increment)
video.y++;
else
@@ -220,7 +222,7 @@ READ8_MEMBER( gamate_state::gamate_video_r )
READ8_MEMBER( gamate_state::gamate_nmi_r )
{
uint8_t data=0;
- machine().ui().popup_time(2, "nmi/4800 read\n");
+ popmessage("nmi/4800 read\n");
return data;
}
diff --git a/src/mame/drivers/gambl186.cpp b/src/mame/drivers/gambl186.cpp
index 09e874d792c..b9d896ea5e3 100644
--- a/src/mame/drivers/gambl186.cpp
+++ b/src/mame/drivers/gambl186.cpp
@@ -50,9 +50,10 @@ TODO:
#include "emu.h"
#include "cpu/i86/i186.h"
-#include "video/clgd542x.h"
-#include "sound/upd7759.h"
#include "machine/nvram.h"
+#include "sound/upd7759.h"
+#include "video/clgd542x.h"
+#include "speaker.h"
class gambl186_state : public driver_device
diff --git a/src/mame/drivers/gamecom.cpp b/src/mame/drivers/gamecom.cpp
index 5f0d2ef985b..468abc79744 100644
--- a/src/mame/drivers/gamecom.cpp
+++ b/src/mame/drivers/gamecom.cpp
@@ -25,10 +25,15 @@ Game Status:
#include "emu.h"
#include "includes/gamecom.h"
+
#include "sound/volt_reg.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
#include "gamecom.lh"
+
static ADDRESS_MAP_START(gamecom_mem_map, AS_PROGRAM, 8, gamecom_state)
AM_RANGE( 0x0000, 0x0013 ) AM_RAM AM_REGION("maincpu", 0x00)
AM_RANGE( 0x0014, 0x0017 ) AM_READWRITE( gamecom_pio_r, gamecom_pio_w ) // buttons
diff --git a/src/mame/drivers/gamecstl.cpp b/src/mame/drivers/gamecstl.cpp
index f08e3836597..19f16bd744a 100644
--- a/src/mame/drivers/gamecstl.cpp
+++ b/src/mame/drivers/gamecstl.cpp
@@ -66,10 +66,11 @@
#include "emu.h"
#include "cpu/i386/i386.h"
+#include "machine/idectrl.h"
#include "machine/lpci.h"
-#include "machine/pcshare.h"
#include "machine/pckeybrd.h"
-#include "machine/idectrl.h"
+#include "machine/pcshare.h"
+#include "screen.h"
class gamecstl_state : public pcat_base_state
diff --git a/src/mame/drivers/gameking.cpp b/src/mame/drivers/gameking.cpp
index 97cb7c93273..6ec2dc1d045 100644
--- a/src/mame/drivers/gameking.cpp
+++ b/src/mame/drivers/gameking.cpp
@@ -25,13 +25,15 @@
Datasheet: http://www.generalplus.com/doc/ds/GPL133AV10_spec.pdf
*/
-#include <stddef.h>
#include "emu.h"
#include "cpu/m6502/r65c02.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "screen.h"
#include "softlist.h"
+#include <stddef.h>
+
class gameking_state : public driver_device
{
public:
diff --git a/src/mame/drivers/gameplan.cpp b/src/mame/drivers/gameplan.cpp
index a59919edc7c..6b7d4101535 100644
--- a/src/mame/drivers/gameplan.cpp
+++ b/src/mame/drivers/gameplan.cpp
@@ -77,9 +77,11 @@ TODO:
****************************************************************************/
#include "emu.h"
+#include "includes/gameplan.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
-#include "includes/gameplan.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/gamepock.cpp b/src/mame/drivers/gamepock.cpp
index 041633e3a01..50325e3ca79 100644
--- a/src/mame/drivers/gamepock.cpp
+++ b/src/mame/drivers/gamepock.cpp
@@ -3,12 +3,16 @@
#include "emu.h"
-#include "cpu/upd7810/upd7810.h"
-#include "sound/speaker.h"
-#include "bus/generic/carts.h"
#include "includes/gamepock.h"
+
+#include "bus/generic/carts.h"
+#include "cpu/upd7810/upd7810.h"
+
#include "rendlay.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START(gamepock_mem, AS_PROGRAM, 8, gamepock_state)
ADDRESS_MAP_UNMAP_HIGH
diff --git a/src/mame/drivers/gamtor.cpp b/src/mame/drivers/gamtor.cpp
index 46fe85f1d2f..2b7aa1ca10a 100644
--- a/src/mame/drivers/gamtor.cpp
+++ b/src/mame/drivers/gamtor.cpp
@@ -28,8 +28,10 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
-#include "video/pc_vga.h"
#include "machine/mcf5206e.h"
+#include "video/pc_vga.h"
+#include "speaker.h"
+
class gaminator_state : public driver_device
{
diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp
index b0fffcc7bda..a4b0fc366cf 100644
--- a/src/mame/drivers/gaplus.cpp
+++ b/src/mame/drivers/gaplus.cpp
@@ -152,11 +152,13 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "includes/gaplus.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/namco62.h"
#include "machine/watchdog.h"
#include "sound/samples.h"
-#include "includes/gaplus.h"
+#include "speaker.h"
WRITE8_MEMBER(gaplus_state::irq_1_ctrl_w)
diff --git a/src/mame/drivers/gatron.cpp b/src/mame/drivers/gatron.cpp
index b7e54dc6eb2..2dcef27e1e0 100644
--- a/src/mame/drivers/gatron.cpp
+++ b/src/mame/drivers/gatron.cpp
@@ -321,19 +321,23 @@
*****************************************************************************************/
-#define MASTER_CLOCK XTAL_16MHz
-
#include "emu.h"
+#include "includes/gatron.h"
+
#include "cpu/z80/z80.h"
-#include "sound/sn76496.h"
#include "machine/i8255.h"
#include "machine/nvram.h"
+#include "sound/sn76496.h"
+#include "screen.h"
+#include "speaker.h"
+
+#include "bingo.lh"
#include "poker41.lh"
#include "pulltabs.lh"
-#include "bingo.lh"
-#include "includes/gatron.h"
+#define MASTER_CLOCK XTAL_16MHz
+
/****************************
* Read/Write Handlers *
****************************/
diff --git a/src/mame/drivers/gauntlet.cpp b/src/mame/drivers/gauntlet.cpp
index cabe3ec5e8e..a1eb2ba0c42 100644
--- a/src/mame/drivers/gauntlet.cpp
+++ b/src/mame/drivers/gauntlet.cpp
@@ -121,13 +121,14 @@
#include "emu.h"
+#include "includes/gauntlet.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
#include "machine/watchdog.h"
#include "sound/tms5220.h"
#include "sound/ym2151.h"
#include "sound/pokey.h"
-#include "includes/gauntlet.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/gb.cpp b/src/mame/drivers/gb.cpp
index f7e21388537..928668dea91 100644
--- a/src/mame/drivers/gb.cpp
+++ b/src/mame/drivers/gb.cpp
@@ -299,7 +299,9 @@ space. This mapper uses 32KB sized banks.
#include "includes/gb.h"
#include "bus/gameboy/rom.h"
#include "bus/gameboy/mbc.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#define DMG_FRAMES_PER_SECOND 59.732155
diff --git a/src/mame/drivers/gba.cpp b/src/mame/drivers/gba.cpp
index 65f2bfe8efa..a2c4f35ff8b 100644
--- a/src/mame/drivers/gba.cpp
+++ b/src/mame/drivers/gba.cpp
@@ -12,12 +12,15 @@
#include "emu.h"
#include "includes/gba.h"
+
#include "bus/gba/rom.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
#include "sound/gb.h"
#include "sound/volt_reg.h"
#include "softlist.h"
+#include "speaker.h"
+
/* Sound Registers */
#define SOUNDCNT_L HWLO(0x080) /* 0x4000080 2 R/W Control Stereo/Volume/Enable */
diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp
index 275c40b59e2..63c8e06c465 100644
--- a/src/mame/drivers/gberet.cpp
+++ b/src/mame/drivers/gberet.cpp
@@ -73,11 +73,16 @@
***************************************************************************/
#include "emu.h"
+#include "includes/gberet.h"
+#include "includes/konamipt.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/sn76496.h"
-#include "includes/konamipt.h"
-#include "includes/gberet.h"
+
+#include "screen.h"
+#include "speaker.h"
+
/*************************************
*
diff --git a/src/mame/drivers/gcpinbal.cpp b/src/mame/drivers/gcpinbal.cpp
index 52dc6740326..ffda8f064cc 100644
--- a/src/mame/drivers/gcpinbal.cpp
+++ b/src/mame/drivers/gcpinbal.cpp
@@ -82,10 +82,13 @@ NOTE: Mask roms from Power Flipper Pinball Shooting have not been dumped, but as
***************************************************************************/
#include "emu.h"
+#include "includes/gcpinbal.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "sound/msm5205.h"
-#include "includes/gcpinbal.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/gei.cpp b/src/mame/drivers/gei.cpp
index e253782dc07..532c2ca46a7 100644
--- a/src/mame/drivers/gei.cpp
+++ b/src/mame/drivers/gei.cpp
@@ -78,6 +78,8 @@ NOTE: Trivia Question rom names are the internal names used. IE: read from the f
#include "machine/ticket.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
class gei_state : public driver_device
diff --git a/src/mame/drivers/geneve.cpp b/src/mame/drivers/geneve.cpp
index 89a3699d2e2..3e319004d3b 100644
--- a/src/mame/drivers/geneve.cpp
+++ b/src/mame/drivers/geneve.cpp
@@ -214,6 +214,9 @@
#include "bus/ti99_peb/peribox.h"
+#include "speaker.h"
+
+
#define TRACE_READY 0
#define TRACE_LINES 0
#define TRACE_CRU 0
diff --git a/src/mame/drivers/geniusiq.cpp b/src/mame/drivers/geniusiq.cpp
index 93a626db3d6..2817b9362c0 100644
--- a/src/mame/drivers/geniusiq.cpp
+++ b/src/mame/drivers/geniusiq.cpp
@@ -239,6 +239,7 @@ TMP47C241MG = TCLS-47 series 4-bit CPU with 2048x8 internal ROM
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "screen.h"
#include "softlist.h"
#define KEYBOARD_QUEUE_SIZE 0x80
diff --git a/src/mame/drivers/ggconnie.cpp b/src/mame/drivers/ggconnie.cpp
index 7b80bb746e4..e89dd7d1748 100644
--- a/src/mame/drivers/ggconnie.cpp
+++ b/src/mame/drivers/ggconnie.cpp
@@ -20,6 +20,7 @@
#include "emu.h"
#include "machine/pcecommn.h"
+
#include "video/huc6270.h"
#include "video/huc6260.h"
#include "video/huc6202.h"
@@ -27,16 +28,18 @@
#include "sound/c6280.h"
#include "sound/okim6295.h"
#include "machine/msm6242.h"
+#include "screen.h"
+#include "speaker.h"
class ggconnie_state : public pce_common_state
{
public:
ggconnie_state(const machine_config &mconfig, device_type type, const char *tag)
- : pce_common_state(mconfig, type, tag),
- m_rtc(*this, "rtc"),
- m_oki(*this, "oki")
- { }
+ : pce_common_state(mconfig, type, tag)
+ , m_rtc(*this, "rtc")
+ , m_oki(*this, "oki")
+ { }
required_device <msm6242_device> m_rtc;
required_device <okim6295_device> m_oki;
diff --git a/src/mame/drivers/ghosteo.cpp b/src/mame/drivers/ghosteo.cpp
index 282486b96cb..9e2e070df2f 100644
--- a/src/mame/drivers/ghosteo.cpp
+++ b/src/mame/drivers/ghosteo.cpp
@@ -64,6 +64,8 @@ ToDo: verify QS1000 hook-up
//#include "machine/smartmed.h"
#include "machine/i2cmem.h"
#include "sound/qs1000.h"
+#include "screen.h"
+#include "speaker.h"
#define NAND_LOG 0
diff --git a/src/mame/drivers/gijoe.cpp b/src/mame/drivers/gijoe.cpp
index 5b0368bde6b..94e0b981c89 100644
--- a/src/mame/drivers/gijoe.cpp
+++ b/src/mame/drivers/gijoe.cpp
@@ -105,12 +105,15 @@ Known Issues
***************************************************************************/
#include "emu.h"
+#include "includes/gijoe.h"
+#include "includes/konamipt.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
#include "sound/k054539.h"
-#include "includes/konamipt.h"
-#include "includes/gijoe.h"
+#include "speaker.h"
+
#define JOE_DEBUG 0
#define JOE_DMADELAY (attotime::from_nsec(42700 + 341300))
diff --git a/src/mame/drivers/ginganin.cpp b/src/mame/drivers/ginganin.cpp
index 1e5c2fe4e06..ffa0acd5a46 100644
--- a/src/mame/drivers/ginganin.cpp
+++ b/src/mame/drivers/ginganin.cpp
@@ -53,12 +53,16 @@ f5d6 print 7 digit BCD number: d0.l to (a1)+ color $3000
***************************************************************************/
#include "emu.h"
+#include "includes/ginganin.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/m6809/m6809.h"
+#include "machine/6840ptm.h"
#include "sound/ay8910.h"
#include "sound/8950intf.h"
-#include "includes/ginganin.h"
-#include "machine/6840ptm.h"
+
+#include "screen.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_6MHz
diff --git a/src/mame/drivers/gizmondo.cpp b/src/mame/drivers/gizmondo.cpp
index ecfc2f97276..33c1aefb832 100644
--- a/src/mame/drivers/gizmondo.cpp
+++ b/src/mame/drivers/gizmondo.cpp
@@ -35,6 +35,8 @@ SYSINTR_GPS = INT_EINT3, INT_EINT8_23 (EINT18)
#include "machine/s3c2440.h"
#include "video/gf4500.h"
#include "rendlay.h"
+#include "screen.h"
+
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/mame/drivers/gkigt.cpp b/src/mame/drivers/gkigt.cpp
index b7f536f13a5..8297782b0d6 100644
--- a/src/mame/drivers/gkigt.cpp
+++ b/src/mame/drivers/gkigt.cpp
@@ -85,8 +85,11 @@ More chips (from eBay auction):
#include "emu.h"
#include "cpu/i960/i960.h"
-#include "sound/ymz280b.h"
#include "machine/nvram.h"
+#include "sound/ymz280b.h"
+#include "screen.h"
+#include "speaker.h"
+
class igt_gameking_state : public driver_device
{
diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp
index 7b915a13739..cdc5cf0208a 100644
--- a/src/mame/drivers/gladiatr.cpp
+++ b/src/mame/drivers/gladiatr.cpp
@@ -201,6 +201,9 @@ TODO:
#include "sound/2203intf.h"
#include "sound/msm5205.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(gladiatr_state::gladiatr_bankswitch_w)
{
diff --git a/src/mame/drivers/glasgow.cpp b/src/mame/drivers/glasgow.cpp
index a08150ac9ca..29e70448073 100644
--- a/src/mame/drivers/glasgow.cpp
+++ b/src/mame/drivers/glasgow.cpp
@@ -44,8 +44,11 @@ ToDo:
#include "emu.h"
#include "cpu/m68000/m68000.h"
-#include "glasgow.lh"
#include "sound/beep.h"
+#include "speaker.h"
+
+#include "glasgow.lh"
+
class glasgow_state : public driver_device
{
diff --git a/src/mame/drivers/glass.cpp b/src/mame/drivers/glass.cpp
index a770362abef..866056a7359 100644
--- a/src/mame/drivers/glass.cpp
+++ b/src/mame/drivers/glass.cpp
@@ -12,9 +12,13 @@ except for the Promat licensed Korean version which is unprotected.
***************************************************************************/
#include "emu.h"
+#include "includes/glass.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
-#include "includes/glass.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE16_MEMBER(glass_state::clr_int_w)
{
diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp
index a2b46f8ebe8..cf3f3b5af6f 100644
--- a/src/mame/drivers/gluck2.cpp
+++ b/src/mame/drivers/gluck2.cpp
@@ -189,16 +189,18 @@
*******************************************************************************/
-
-#define MASTER_CLOCK XTAL_10MHz
-#define SND_CLOCK XTAL_3_579545MHz
-
#include "emu.h"
#include "cpu/m6502/m6502.h"
+#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "sound/ym2413.h"
#include "video/mc6845.h"
-#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_10MHz
+#define SND_CLOCK XTAL_3_579545MHz
class gluck2_state : public driver_device
diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp
index 0cbcb0c84cb..ecc0083885b 100644
--- a/src/mame/drivers/gmaster.cpp
+++ b/src/mame/drivers/gmaster.cpp
@@ -5,12 +5,18 @@
******************************************************************************/
#include "emu.h"
+
#include "cpu/upd7810/upd7810.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+
#include "rendlay.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
class gmaster_state : public driver_device
{
diff --git a/src/mame/drivers/gng.cpp b/src/mame/drivers/gng.cpp
index 656aa49b122..ce93aa172a9 100644
--- a/src/mame/drivers/gng.cpp
+++ b/src/mame/drivers/gng.cpp
@@ -23,11 +23,14 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/gng.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "machine/gen_latch.h"
#include "sound/2203intf.h"
-#include "includes/gng.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(gng_state::gng_bankswitch_w)
diff --git a/src/mame/drivers/go2000.cpp b/src/mame/drivers/go2000.cpp
index 2eccde30471..e7bb2bf49d9 100644
--- a/src/mame/drivers/go2000.cpp
+++ b/src/mame/drivers/go2000.cpp
@@ -37,6 +37,9 @@ Notes:
#include "machine/gen_latch.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
class go2000_state : public driver_device
{
diff --git a/src/mame/drivers/goal92.cpp b/src/mame/drivers/goal92.cpp
index 1e3f99e4f9c..0b9783f4cf3 100644
--- a/src/mame/drivers/goal92.cpp
+++ b/src/mame/drivers/goal92.cpp
@@ -10,11 +10,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/goal92.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
-#include "includes/goal92.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE16_MEMBER(goal92_state::goal92_sound_command_w)
{
diff --git a/src/mame/drivers/goindol.cpp b/src/mame/drivers/goindol.cpp
index 72dd3c7fed0..119c76192bb 100644
--- a/src/mame/drivers/goindol.cpp
+++ b/src/mame/drivers/goindol.cpp
@@ -20,10 +20,13 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/goindol.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/2203intf.h"
-#include "includes/goindol.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(goindol_state::goindol_bankswitch_w)
diff --git a/src/mame/drivers/goldngam.cpp b/src/mame/drivers/goldngam.cpp
index 4fe59c830b4..b1989ad8a6d 100644
--- a/src/mame/drivers/goldngam.cpp
+++ b/src/mame/drivers/goldngam.cpp
@@ -230,13 +230,15 @@
*******************************************************************************/
-
-#define MASTER_CLOCK XTAL_8MHz /* from CPU Board */
-#define SECONDARY_CLOCK XTAL_6MHz /* from GFX Board */
-
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_8MHz /* from CPU Board */
+#define SECONDARY_CLOCK XTAL_6MHz /* from GFX Board */
class goldngam_state : public driver_device
diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp
index 8ca168162d6..37edaa077be 100644
--- a/src/mame/drivers/goldnpkr.cpp
+++ b/src/mame/drivers/goldnpkr.cpp
@@ -1071,26 +1071,28 @@
************************************************************************************/
-
-#define MASTER_CLOCK XTAL_10MHz
-#define CPU_CLOCK (MASTER_CLOCK/16)
-
#include "emu.h"
+
#include "cpu/m6502/m6502.h"
-#include "video/mc6845.h"
+#include "cpu/z80/z80.h"
#include "machine/6821pia.h"
-#include "sound/discrete.h"
#include "machine/nvram.h"
-
-/* Extra CPUs, MCUs, devices, etc... */
-#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "sound/discrete.h"
+#include "video/mc6845.h"
+
+#include "screen.h"
+#include "speaker.h"
#include "pmpoker.lh"
#include "goldnpkr.lh"
#include "upndown.lh"
+#define MASTER_CLOCK XTAL_10MHz
+#define CPU_CLOCK (MASTER_CLOCK/16)
+
+
class goldnpkr_state : public driver_device
{
public:
diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp
index 173b04f54c1..e0603cbd732 100644
--- a/src/mame/drivers/goldstar.cpp
+++ b/src/mame/drivers/goldstar.cpp
@@ -219,14 +219,18 @@
#define OKI_CLOCK 1056000 /* unverified resonator */
#include "emu.h"
+#include "includes/goldstar.h"
+
#include "cpu/z80/z80.h"
+#include "machine/i8255.h"
+#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "sound/okim6295.h"
#include "sound/sn76496.h"
-#include "machine/i8255.h"
-#include "machine/nvram.h"
#include "video/ramdac.h"
-#include "includes/goldstar.h"
+
+#include "screen.h"
+#include "speaker.h"
#include "bingowng.lh"
#include "cherryb3.lh"
diff --git a/src/mame/drivers/gomoku.cpp b/src/mame/drivers/gomoku.cpp
index 4a425759fa3..32d2412485e 100644
--- a/src/mame/drivers/gomoku.cpp
+++ b/src/mame/drivers/gomoku.cpp
@@ -24,9 +24,11 @@ todo:
******************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/gomoku.h"
+#include "cpu/z80/z80.h"
+#include "speaker.h"
+
/* input ports are rotated 90 degrees */
READ8_MEMBER(gomoku_state::input_port_r)
diff --git a/src/mame/drivers/good.cpp b/src/mame/drivers/good.cpp
index a82e454f376..3000fa23278 100644
--- a/src/mame/drivers/good.cpp
+++ b/src/mame/drivers/good.cpp
@@ -35,6 +35,8 @@ voice.rom - VOICE ROM
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class good_state : public driver_device
diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp
index 9b0dfac068a..a05a7f8bad8 100644
--- a/src/mame/drivers/goodejan.cpp
+++ b/src/mame/drivers/goodejan.cpp
@@ -71,11 +71,14 @@ Secret menu hack [totmejan only] (I couldn't find official way to enter, so it's
*******************************************************************************************/
#include "emu.h"
-#include "cpu/nec/nec.h"
#include "audio/seibu.h"
+
+#include "cpu/nec/nec.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
#include "video/seibu_crtc.h"
+#include "screen.h"
+#include "speaker.h"
class goodejan_state : public driver_device
diff --git a/src/mame/drivers/gotcha.cpp b/src/mame/drivers/gotcha.cpp
index b0ab9b2a504..0196ce8a7d3 100644
--- a/src/mame/drivers/gotcha.cpp
+++ b/src/mame/drivers/gotcha.cpp
@@ -60,12 +60,17 @@ Notes:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/gotcha.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
-#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/gotcha.h"
+#include "sound/ym2151.h"
+
+#include "screen.h"
+#include "speaker.h"
+
WRITE16_MEMBER(gotcha_state::gotcha_lamps_w)
{
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp
index dd482a398c2..038f4927883 100644
--- a/src/mame/drivers/gottlieb.cpp
+++ b/src/mame/drivers/gottlieb.cpp
@@ -198,8 +198,10 @@ VBlank duration: 1/VSYNC * (16/256) = 1017.6 us
#include "emu.h"
#include "includes/gottlieb.h"
+
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "speaker.h"
#define LOG_AUDIO_DECODE (0)
diff --git a/src/mame/drivers/gotya.cpp b/src/mame/drivers/gotya.cpp
index f546b157885..ca07e25bac6 100644
--- a/src/mame/drivers/gotya.cpp
+++ b/src/mame/drivers/gotya.cpp
@@ -36,10 +36,13 @@ TODO: Emulated sound
****************************************************************************/
#include "emu.h"
+#include "includes/gotya.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/samples.h"
-#include "includes/gotya.h"
+#include "screen.h"
+#include "speaker.h"
static ADDRESS_MAP_START( gotya_map, AS_PROGRAM, 8, gotya_state )
diff --git a/src/mame/drivers/goupil.cpp b/src/mame/drivers/goupil.cpp
index c518e96783a..645c9f9a913 100644
--- a/src/mame/drivers/goupil.cpp
+++ b/src/mame/drivers/goupil.cpp
@@ -22,16 +22,19 @@
****************************************************************************/
#include "emu.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/6522via.h"
+#include "machine/6850acia.h"
#include "machine/i8279.h"
+#include "machine/wd_fdc.h"
#include "video/ef9364.h"
#include "video/mc6845.h"
-#include "machine/6850acia.h"
-#include "machine/wd_fdc.h"
+#include "screen.h"
#include "softlist.h"
+
#define MAIN_CLOCK XTAL_4MHz
#define VIDEO_CLOCK MAIN_CLOCK / 8 /* 1.75 Mhz */
#define CPU_CLOCK MAIN_CLOCK / 4 /* 1 Mhz */
diff --git a/src/mame/drivers/gp2x.cpp b/src/mame/drivers/gp2x.cpp
index 78ecdfb2545..3c1e9fabbcd 100644
--- a/src/mame/drivers/gp2x.cpp
+++ b/src/mame/drivers/gp2x.cpp
@@ -21,6 +21,8 @@
#include "emu.h"
#include "cpu/arm7/arm7.h"
+#include "screen.h"
+#include "speaker.h"
class gp2x_state : public driver_device
diff --git a/src/mame/drivers/gp32.cpp b/src/mame/drivers/gp32.cpp
index dc2db05bca6..abe3966d1d6 100644
--- a/src/mame/drivers/gp32.cpp
+++ b/src/mame/drivers/gp32.cpp
@@ -18,11 +18,16 @@
#include "emu.h"
#include "includes/gp32.h"
+
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
#include "sound/volt_reg.h"
+
#include "rendlay.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp
index 061e70e2fe6..d8f3a4f282f 100644
--- a/src/mame/drivers/gp_1.cpp
+++ b/src/mame/drivers/gp_1.cpp
@@ -21,11 +21,14 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/i8255.h"
#include "machine/z80ctc.h"
#include "sound/sn76477.h"
+#include "speaker.h"
+
#include "gp_1.lh"
class gp_1_state : public genpin_class
diff --git a/src/mame/drivers/gpworld.cpp b/src/mame/drivers/gpworld.cpp
index eb216e085ba..926c60d7625 100644
--- a/src/mame/drivers/gpworld.cpp
+++ b/src/mame/drivers/gpworld.cpp
@@ -44,6 +44,7 @@ Dumping Notes:
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/ldv1000.h"
+#include "speaker.h"
class gpworld_state : public driver_device
diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp
index 3e4da6283e7..7ee8624a245 100644
--- a/src/mame/drivers/gradius3.cpp
+++ b/src/mame/drivers/gradius3.cpp
@@ -23,14 +23,17 @@
***************************************************************************/
#include "emu.h"
+#include "includes/gradius3.h"
+#include "includes/konamipt.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/ym2151.h"
-#include "includes/konamipt.h"
-#include "includes/gradius3.h"
+
+#include "speaker.h"
+
READ16_MEMBER(gradius3_state::k052109_halfword_r)
{
diff --git a/src/mame/drivers/grchamp.cpp b/src/mame/drivers/grchamp.cpp
index c5cc36ece7a..9a854405c87 100644
--- a/src/mame/drivers/grchamp.cpp
+++ b/src/mame/drivers/grchamp.cpp
@@ -44,9 +44,11 @@
***************************************************************************/
#include "emu.h"
+#include "includes/grchamp.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/grchamp.h"
+#include "speaker.h"
#include "grchamp.lh"
diff --git a/src/mame/drivers/grfd2301.cpp b/src/mame/drivers/grfd2301.cpp
index 7362af49c07..c277766e1ea 100644
--- a/src/mame/drivers/grfd2301.cpp
+++ b/src/mame/drivers/grfd2301.cpp
@@ -30,9 +30,10 @@ A sticker on the back panel says: GenRad, Culver City CA, Model 2301-9001
*************************************************************************************************************/
-
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
+
class grfd2301_state : public driver_device
{
diff --git a/src/mame/drivers/gridlee.cpp b/src/mame/drivers/gridlee.cpp
index 23d20ad86ba..87f60fde51f 100644
--- a/src/mame/drivers/gridlee.cpp
+++ b/src/mame/drivers/gridlee.cpp
@@ -80,11 +80,13 @@
#include "emu.h"
+#include "includes/gridlee.h"
+
#include "cpu/m6809/m6809.h"
#include "sound/samples.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
-#include "includes/gridlee.h"
+#include "speaker.h"
/* constants */
diff --git a/src/mame/drivers/groundfx.cpp b/src/mame/drivers/groundfx.cpp
index 74faf324ed7..d97f23a7910 100644
--- a/src/mame/drivers/groundfx.cpp
+++ b/src/mame/drivers/groundfx.cpp
@@ -65,11 +65,13 @@
***************************************************************************/
#include "emu.h"
+#include "includes/groundfx.h"
+#include "audio/taito_en.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "sound/es5506.h"
-#include "audio/taito_en.h"
-#include "includes/groundfx.h"
+#include "screen.h"
/***********************************************************
diff --git a/src/mame/drivers/gstream.cpp b/src/mame/drivers/gstream.cpp
index 1eb7da63744..70537bb2bd9 100644
--- a/src/mame/drivers/gstream.cpp
+++ b/src/mame/drivers/gstream.cpp
@@ -136,6 +136,8 @@ RAM4 is HMC HM6264LP-70
#include "cpu/e132xs/e132xs.h"
#include "sound/okim6295.h"
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
class gstream_state : public driver_device
{
diff --git a/src/mame/drivers/gstriker.cpp b/src/mame/drivers/gstriker.cpp
index a56b4ae3cd3..1018d0e60ab 100644
--- a/src/mame/drivers/gstriker.cpp
+++ b/src/mame/drivers/gstriker.cpp
@@ -34,10 +34,13 @@ Missing mixer registers (mainly layer enable/disable)
******************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m68000/m68000.h"
#include "includes/gstriker.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "sound/2610intf.h"
+#include "speaker.h"
+
/*** README INFO **************************************************************
diff --git a/src/mame/drivers/gsword.cpp b/src/mame/drivers/gsword.cpp
index 3232cf2eb29..b0bbff0a297 100644
--- a/src/mame/drivers/gsword.cpp
+++ b/src/mame/drivers/gsword.cpp
@@ -150,6 +150,8 @@ reg: 0->1 (main->2nd) / : (1->0) 2nd->main :
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/tait8741.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/gticlub.cpp b/src/mame/drivers/gticlub.cpp
index 400f364e127..5f392819340 100644
--- a/src/mame/drivers/gticlub.cpp
+++ b/src/mame/drivers/gticlub.cpp
@@ -236,8 +236,9 @@ Hang Pilot (uses an unknown but similar video board) 12W
#include "video/k001006.h"
#include "video/k001604.h"
-
#include "rendlay.h"
+#include "speaker.h"
+
class gticlub_state : public driver_device
{
diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp
index 8dece23ecf8..7041ad77a4e 100644
--- a/src/mame/drivers/gts3a.cpp
+++ b/src/mame/drivers/gts3a.cpp
@@ -20,9 +20,12 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/m6502/m65c02.h"
#include "machine/6522via.h"
#include "video/mc6845.h"
+#include "screen.h"
+
class gts3a_state : public driver_device
{
diff --git a/src/mame/drivers/gts80.cpp b/src/mame/drivers/gts80.cpp
index 22ad342b9a0..1bb92bf44e8 100644
--- a/src/mame/drivers/gts80.cpp
+++ b/src/mame/drivers/gts80.cpp
@@ -27,6 +27,7 @@ ToDO:
#include "emu.h"
#include "machine/genpin.h"
#include "audio/gottlieb.h"
+#include "speaker.h"
#include "gts80.lh"
class gts80_state : public genpin_class
diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp
index 0521c7986a3..b3fece393f4 100644
--- a/src/mame/drivers/gts80a.cpp
+++ b/src/mame/drivers/gts80a.cpp
@@ -15,6 +15,9 @@
#include "machine/genpin.h"
#include "audio/gottlieb.h"
#include "cpu/i86/i86.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "gts80a.lh"
#include "gts80a_caveman.lh"
diff --git a/src/mame/drivers/gts80b.cpp b/src/mame/drivers/gts80b.cpp
index d4fef36b9df..ad9b87979e2 100644
--- a/src/mame/drivers/gts80b.cpp
+++ b/src/mame/drivers/gts80b.cpp
@@ -16,9 +16,13 @@
#include "emu.h"
#include "machine/genpin.h"
#include "audio/gottlieb.h"
+
#include "cpu/i86/i86.h"
+#include "speaker.h"
+
#include "gts80b.lh"
+
class gts80b_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp
index 3fae6e696cc..7ef39617c86 100644
--- a/src/mame/drivers/guab.cpp
+++ b/src/mame/drivers/guab.cpp
@@ -38,16 +38,20 @@
***************************************************************************/
#include "emu.h"
+
#include "cpu/m68000/m68000.h"
+#include "formats/guab_dsk.h"
#include "machine/6840ptm.h"
-#include "machine/i8255.h"
#include "machine/6850acia.h"
-#include "video/tms34061.h"
-#include "video/ef9369.h"
-#include "sound/sn76496.h"
+#include "machine/i8255.h"
#include "machine/wd_fdc.h"
-#include "formats/guab_dsk.h"
+#include "sound/sn76496.h"
+#include "video/ef9369.h"
+#include "video/tms34061.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
#include "guab.lh"
diff --git a/src/mame/drivers/gumbo.cpp b/src/mame/drivers/gumbo.cpp
index 99509e8ab1f..d0f9450a544 100644
--- a/src/mame/drivers/gumbo.cpp
+++ b/src/mame/drivers/gumbo.cpp
@@ -44,9 +44,13 @@ PCB Layout
*/
#include "emu.h"
+#include "includes/gumbo.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
-#include "includes/gumbo.h"
+#include "screen.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START( gumbo_map, AS_PROGRAM, 16, gumbo_state )
AM_RANGE(0x000000, 0x03ffff) AM_ROM
diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp
index b5e1d38b314..5fa812e813f 100644
--- a/src/mame/drivers/gunbustr.cpp
+++ b/src/mame/drivers/gunbustr.cpp
@@ -44,11 +44,13 @@
***************************************************************************/
#include "emu.h"
+#include "audio/taito_en.h"
+#include "includes/gunbustr.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "sound/es5506.h"
-#include "audio/taito_en.h"
-#include "includes/gunbustr.h"
+#include "screen.h"
/*********************************************************************/
diff --git a/src/mame/drivers/gundealr.cpp b/src/mame/drivers/gundealr.cpp
index 37eb95f4a91..957968f49f9 100644
--- a/src/mame/drivers/gundealr.cpp
+++ b/src/mame/drivers/gundealr.cpp
@@ -59,9 +59,13 @@ Z80 CPU - 12MHz/2
***************************************************************************/
#include "emu.h"
+#include "includes/gundealr.h"
+
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
-#include "includes/gundealr.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(gundealr_state::yamyam_bankswitch_w)
{
diff --git a/src/mame/drivers/gunpey.cpp b/src/mame/drivers/gunpey.cpp
index 78422ba6fb5..e9becf43084 100644
--- a/src/mame/drivers/gunpey.cpp
+++ b/src/mame/drivers/gunpey.cpp
@@ -192,6 +192,8 @@ Release: November 1999
#include "cpu/nec/nec.h"
#include "sound/okim6295.h"
#include "sound/ymz280b.h"
+#include "screen.h"
+#include "speaker.h"
class gunpey_state : public driver_device
diff --git a/src/mame/drivers/gunsmoke.cpp b/src/mame/drivers/gunsmoke.cpp
index 107b871a323..fc62ca64daf 100644
--- a/src/mame/drivers/gunsmoke.cpp
+++ b/src/mame/drivers/gunsmoke.cpp
@@ -70,11 +70,14 @@ Stephh's notes (based on the games Z80 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/gunsmoke.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
-#include "includes/gunsmoke.h"
+#include "screen.h"
+#include "speaker.h"
/* Read/Write Handlers */
diff --git a/src/mame/drivers/gyruss.cpp b/src/mame/drivers/gyruss.cpp
index c9edc5c9640..9dee79b4581 100644
--- a/src/mame/drivers/gyruss.cpp
+++ b/src/mame/drivers/gyruss.cpp
@@ -58,15 +58,18 @@ and 1 SFX channel controlled by an 8039:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/gyruss.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/m6809.h"
+#include "cpu/mcs48/mcs48.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/konami1.h"
-#include "cpu/mcs48/mcs48.h"
#include "sound/ay8910.h"
#include "sound/discrete.h"
-#include "includes/konamipt.h"
-#include "includes/gyruss.h"
+
+#include "speaker.h"
#define MASTER_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp
index d30363409fb..e45d4d7049e 100644
--- a/src/mame/drivers/h19.cpp
+++ b/src/mame/drivers/h19.cpp
@@ -53,10 +53,13 @@ Address Description
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
-#include "sound/beep.h"
#include "machine/ins8250.h"
#include "machine/mm5740.h"
+#include "sound/beep.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
// Standard H19 used a 2.048 MHz clock
#define H19_CLOCK (XTAL_12_288MHz / 6)
diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp
index 709363ed144..c9efaed1d60 100644
--- a/src/mame/drivers/h8.cpp
+++ b/src/mame/drivers/h8.cpp
@@ -47,12 +47,15 @@ TODO:
****************************************************************************/
#include "emu.h"
+
#include "cpu/i8085/i8085.h"
#include "machine/i8251.h"
#include "machine/clock.h"
#include "imagedev/cassette.h"
#include "sound/beep.h"
#include "sound/wave.h"
+#include "speaker.h"
+
#include "h8.lh"
diff --git a/src/mame/drivers/halleys.cpp b/src/mame/drivers/halleys.cpp
index f94c9616cbd..392cd9d0960 100644
--- a/src/mame/drivers/halleys.cpp
+++ b/src/mame/drivers/halleys.cpp
@@ -162,11 +162,15 @@ Video sync 6 F Video sync Post 6 F Post
// Compiler Directives
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/taitoipt.h"
-#include "machine/gen_latch.h"
+
#include "cpu/m6809/m6809.h"
+#include "cpu/z80/z80.h"
+#include "machine/gen_latch.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
#define HALLEYS_DEBUG 0
diff --git a/src/mame/drivers/hanaawas.cpp b/src/mame/drivers/hanaawas.cpp
index b45ef16435b..9ca0ec9bb0e 100644
--- a/src/mame/drivers/hanaawas.cpp
+++ b/src/mame/drivers/hanaawas.cpp
@@ -28,9 +28,13 @@
***************************************************************************/
#include "emu.h"
+#include "includes/hanaawas.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/hanaawas.h"
+#include "screen.h"
+#include "speaker.h"
+
READ8_MEMBER(hanaawas_state::hanaawas_input_port_0_r)
{
diff --git a/src/mame/drivers/hankin.cpp b/src/mame/drivers/hankin.cpp
index bb33f715794..10c46d70915 100644
--- a/src/mame/drivers/hankin.cpp
+++ b/src/mame/drivers/hankin.cpp
@@ -17,10 +17,13 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "hankin.lh"
class hankin_state : public genpin_class
diff --git a/src/mame/drivers/hapyfish.cpp b/src/mame/drivers/hapyfish.cpp
index 1d57c35c35a..cd41f22da9f 100644
--- a/src/mame/drivers/hapyfish.cpp
+++ b/src/mame/drivers/hapyfish.cpp
@@ -20,6 +20,7 @@
#include "emu.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
+#include "screen.h"
class hapyfish_state : public driver_device
diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp
index 76a0c668f9b..602046581e4 100644
--- a/src/mame/drivers/harddriv.cpp
+++ b/src/mame/drivers/harddriv.cpp
@@ -326,9 +326,12 @@ Notes:
#include "emu.h"
#include "includes/harddriv.h"
+
#include "includes/slapstic.h"
#include "machine/watchdog.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "racedrivpan.lh"
/*************************************
@@ -337,7 +340,7 @@ Notes:
*
*************************************/
-const device_type HARDDRIV_DEVICE = &device_creator<harddriv_state>;
+const device_type HARDDRIV_DEVICE = device_creator<harddriv_state>;
harddriv_state::harddriv_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, HARDDRIV_DEVICE, "Hard Drivin' PCB Family", tag, owner, clock, "harddriv_pcb", __FILE__),
@@ -1748,7 +1751,7 @@ static MACHINE_CONFIG_FRAGMENT( hdrivair )
MCFG_FRAGMENT_ADD( dsk2 ) /* DSK II board */
MACHINE_CONFIG_END
-const device_type HARDDRIV_BOARD_DEVICE = &device_creator<harddriv_board_device_state>;
+const device_type HARDDRIV_BOARD_DEVICE = device_creator<harddriv_board_device_state>;
harddriv_board_device_state::harddriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: harddriv_state(mconfig, tag, owner, clock)
@@ -1774,7 +1777,7 @@ void harddrivc_board_device_state::device_start()
harddriv_state::device_start();
}
-const device_type HARDDRIVC_BOARD_DEVICE = &device_creator<harddrivc_board_device_state>;
+const device_type HARDDRIVC_BOARD_DEVICE = device_creator<harddrivc_board_device_state>;
harddrivc_board_device_state::harddrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: harddriv_state(mconfig, tag, owner, clock)
@@ -1801,8 +1804,8 @@ void racedrivb1_board_device_state::device_start()
harddriv_state::device_start();
}
-const device_type RACEDRIV_BOARD_DEVICE = &device_creator<racedriv_board_device_state>;
-const device_type RACEDRIVB1_BOARD_DEVICE = &device_creator<racedrivb1_board_device_state>;
+const device_type RACEDRIV_BOARD_DEVICE = device_creator<racedriv_board_device_state>;
+const device_type RACEDRIVB1_BOARD_DEVICE = device_creator<racedrivb1_board_device_state>;
racedriv_board_device_state::racedriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: harddriv_state(mconfig, tag, owner, clock)
@@ -1837,9 +1840,9 @@ void racedrivc_panorama_side_board_device_state::device_start()
-const device_type RACEDRIVC_BOARD_DEVICE = &device_creator<racedrivc_board_device_state>;
-const device_type RACEDRIVC1_BOARD_DEVICE = &device_creator<racedrivc1_board_device_state>;
-const device_type RACEDRIVC_PANORAMA_SIDE_BOARD_DEVICE = &device_creator<racedrivc_panorama_side_board_device_state>;
+const device_type RACEDRIVC_BOARD_DEVICE = device_creator<racedrivc_board_device_state>;
+const device_type RACEDRIVC1_BOARD_DEVICE = device_creator<racedrivc1_board_device_state>;
+const device_type RACEDRIVC_PANORAMA_SIDE_BOARD_DEVICE = device_creator<racedrivc_panorama_side_board_device_state>;
racedrivc_board_device_state::racedrivc_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: harddriv_state(mconfig, tag, owner, clock)
@@ -1865,7 +1868,7 @@ void stunrun_board_device_state::device_start()
harddriv_state::device_start();
}
-const device_type STUNRUN_BOARD_DEVICE = &device_creator<stunrun_board_device_state>;
+const device_type STUNRUN_BOARD_DEVICE = device_creator<stunrun_board_device_state>;
stunrun_board_device_state::stunrun_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: harddriv_state(mconfig, tag, owner, clock)
@@ -1897,9 +1900,9 @@ void steeltalp_board_device_state::device_start()
harddriv_state::device_start();
}
-const device_type STEELTAL_BOARD_DEVICE = &device_creator<steeltal_board_device_state>;
-const device_type STEELTAL1_BOARD_DEVICE = &device_creator<steeltal1_board_device_state>;
-const device_type STEELTALP_BOARD_DEVICE = &device_creator<steeltalp_board_device_state>;
+const device_type STEELTAL_BOARD_DEVICE = device_creator<steeltal_board_device_state>;
+const device_type STEELTAL1_BOARD_DEVICE = device_creator<steeltal1_board_device_state>;
+const device_type STEELTALP_BOARD_DEVICE = device_creator<steeltalp_board_device_state>;
steeltal_board_device_state::steeltal_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: harddriv_state(mconfig, tag, owner, clock)
@@ -1919,7 +1922,7 @@ void strtdriv_board_device_state::device_start()
harddriv_state::device_start();
}
-const device_type STRTDRIV_BOARD_DEVICE = &device_creator<strtdriv_board_device_state>;
+const device_type STRTDRIV_BOARD_DEVICE = device_creator<strtdriv_board_device_state>;
strtdriv_board_device_state::strtdriv_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: harddriv_state(mconfig, tag, owner, clock)
@@ -1945,8 +1948,8 @@ void hdrivairp_board_device_state::device_start()
harddriv_state::device_start();
}
-const device_type HDRIVAIR_BOARD_DEVICE = &device_creator<hdrivair_board_device_state>;
-const device_type HDRIVAIRP_BOARD_DEVICE = &device_creator<hdrivairp_board_device_state>;
+const device_type HDRIVAIR_BOARD_DEVICE = device_creator<hdrivair_board_device_state>;
+const device_type HDRIVAIRP_BOARD_DEVICE = device_creator<hdrivairp_board_device_state>;
hdrivair_board_device_state::hdrivair_board_device_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: harddriv_state(mconfig, tag, owner, clock)
diff --git a/src/mame/drivers/harriet.cpp b/src/mame/drivers/harriet.cpp
index 1ef3b96c0c2..b3d9dec6a74 100644
--- a/src/mame/drivers/harriet.cpp
+++ b/src/mame/drivers/harriet.cpp
@@ -11,10 +11,11 @@
***************************************************************************/
-
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/terminal.h"
+#include "speaker.h"
+
#define TERMINAL_TAG "terminal"
diff --git a/src/mame/drivers/hazeltin.cpp b/src/mame/drivers/hazeltin.cpp
index c72d9c87c42..69f067f8312 100644
--- a/src/mame/drivers/hazeltin.cpp
+++ b/src/mame/drivers/hazeltin.cpp
@@ -24,6 +24,7 @@ References:
****************************************************************************/
#include "emu.h"
+
#include "cpu/i8085/i8085.h"
#include "machine/ay31015.h"
#include "machine/clock.h"
@@ -33,6 +34,9 @@ References:
#include "machine/nl_hazelvid.h"
#include "netlist/devices/net_lib.h"
+#include "screen.h"
+
+
#define CPU_TAG "maincpu"
#define NETLIST_TAG "videobrd"
#define UART_TAG "uart"
diff --git a/src/mame/drivers/hcastle.cpp b/src/mame/drivers/hcastle.cpp
index 9f69f78f072..7125a710ba2 100644
--- a/src/mame/drivers/hcastle.cpp
+++ b/src/mame/drivers/hcastle.cpp
@@ -9,14 +9,18 @@
***************************************************************************/
#include "emu.h"
+#include "includes/hcastle.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/konami.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/3812intf.h"
#include "sound/k051649.h"
-#include "includes/konamipt.h"
-#include "includes/hcastle.h"
+
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(hcastle_state::hcastle_bankswitch_w)
diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp
index 0cf030d632f..ccbb0bad2b6 100644
--- a/src/mame/drivers/headonb.cpp
+++ b/src/mame/drivers/headonb.cpp
@@ -30,6 +30,7 @@ Other outs:
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "screen.h"
class headonb_state : public driver_device
diff --git a/src/mame/drivers/hec2hrp.cpp b/src/mame/drivers/hec2hrp.cpp
index 012b852d1cc..7b990ed4edd 100644
--- a/src/mame/drivers/hec2hrp.cpp
+++ b/src/mame/drivers/hec2hrp.cpp
@@ -72,17 +72,22 @@
*/
#include "emu.h"
+#include "includes/hec2hrp.h"
+#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
-#include "formats/hect_tap.h"
#include "imagedev/printer.h"
-#include "sound/wave.h" /* for K7 sound*/
-#include "sound/discrete.h" /* for 1 Bit sound*/
#include "machine/upd765.h" /* for floppy disc controller */
-#include "cpu/z80/z80.h"
+#include "sound/discrete.h" /* for 1 Bit sound*/
+#include "sound/wave.h" /* for K7 sound*/
+
+#include "screen.h"
+#include "speaker.h"
+
#include "formats/hect_dsk.h"
+#include "formats/hect_tap.h"
#include "formats/hector_minidisc.h"
-#include "includes/hec2hrp.h"
+
/*****************************************************************************/
static ADDRESS_MAP_START(hecdisc2_mem, AS_PROGRAM, 8, hec2hrp_state )
diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp
index c2959a33711..837ce1f253a 100644
--- a/src/mame/drivers/hexion.cpp
+++ b/src/mame/drivers/hexion.cpp
@@ -79,12 +79,16 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/hexion.h"
+#include "includes/konamipt.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/okim6295.h"
#include "sound/k051649.h"
-#include "includes/konamipt.h"
-#include "includes/hexion.h"
+
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(hexion_state::coincntr_w)
diff --git a/src/mame/drivers/hh_amis2k.cpp b/src/mame/drivers/hh_amis2k.cpp
index c08b8a0f448..015d56c7ddd 100644
--- a/src/mame/drivers/hh_amis2k.cpp
+++ b/src/mame/drivers/hh_amis2k.cpp
@@ -25,7 +25,8 @@
#include "emu.h"
#include "cpu/amis2000/amis2000.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "speaker.h"
#include "wildfire.lh" // this is a test layout, use external artwork
diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp
index 482bb312d8f..89fba606990 100644
--- a/src/mame/drivers/hh_cop400.cpp
+++ b/src/mame/drivers/hh_cop400.cpp
@@ -13,10 +13,13 @@
#include "emu.h"
#include "cpu/cop400/cop400.h"
-#include "sound/speaker.h"
+
+#include "sound/spkrdev.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
//#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
// internal artwork
#include "bship82.lh" // clickable
diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp
index 15c84198628..8560fc7eb88 100644
--- a/src/mame/drivers/hh_hmcs40.cpp
+++ b/src/mame/drivers/hh_hmcs40.cpp
@@ -86,11 +86,13 @@
***************************************************************************/
#include "emu.h"
-#include "rendlay.h"
#include "cpu/hmcs40/hmcs40.h"
#include "cpu/cop400/cop400.h"
#include "machine/gen_latch.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
// internal artwork
#include "pairmtch.lh"
diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp
index 6da171f810b..1a0663fe254 100644
--- a/src/mame/drivers/hh_melps4.cpp
+++ b/src/mame/drivers/hh_melps4.cpp
@@ -8,9 +8,13 @@
***************************************************************************/
#include "emu.h"
-#include "rendlay.h"
+
#include "cpu/melps4/m58846.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+
+#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
//#include "hh_melps4_test.lh" // common test-layout - no svg artwork(yet), use external artwork
diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp
index 997bdf83401..0aaff36f731 100644
--- a/src/mame/drivers/hh_pic16.cpp
+++ b/src/mame/drivers/hh_pic16.cpp
@@ -47,7 +47,8 @@
#include "emu.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "machine/clock.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "speaker.h"
#include "hccbaskb.lh"
#include "leboom.lh" // clickable
diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp
index a0edf5bc8b8..9515983b463 100644
--- a/src/mame/drivers/hh_sm510.cpp
+++ b/src/mame/drivers/hh_sm510.cpp
@@ -12,7 +12,8 @@
#include "emu.h"
#include "cpu/sm510/sm510.h"
#include "cpu/sm510/kb1013vk1-2.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "speaker.h"
#include "hh_sm510_test.lh" // common test-layout - use external artwork
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index b3294fda2e4..9623f2ee921 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -134,11 +134,15 @@
#include "emu.h"
#include "includes/hh_tms1k.h"
+
#include "machine/tms1024.h"
-#include "video/hlcd0515.h"
#include "sound/beep.h"
-#include "sound/sn76477.h"
#include "sound/s14001a.h"
+#include "sound/sn76477.h"
+#include "video/hlcd0515.h"
+
+#include "screen.h"
+#include "speaker.h"
#include "rendlay.h"
// internal artwork
diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp
index f5e955eb68c..796fa6bfeba 100644
--- a/src/mame/drivers/hh_ucom4.cpp
+++ b/src/mame/drivers/hh_ucom4.cpp
@@ -69,6 +69,8 @@ TODO:
#include "emu.h"
#include "includes/hh_ucom4.h"
#include "video/hlcd0515.h"
+#include "screen.h"
+#include "speaker.h"
// internal artwork
#include "efball.lh"
diff --git a/src/mame/drivers/hideseek.cpp b/src/mame/drivers/hideseek.cpp
index edf55ea27bc..2d72d3c9750 100644
--- a/src/mame/drivers/hideseek.cpp
+++ b/src/mame/drivers/hideseek.cpp
@@ -28,24 +28,26 @@ Other stuff: NEC D4992 (RTC?) and xtal possibly 32.768kHz, 3V coin battery, 93L4
#include "emu.h"
#include "cpu/sh2/sh2.h"
+#include "screen.h"
+#include "speaker.h"
class hideseek_state : public driver_device
{
public:
hideseek_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu")
- { }
-
- required_device<cpu_device> m_maincpu;
-
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ {
+ }
DECLARE_DRIVER_INIT(hideseek);
virtual void video_start() override;
DECLARE_PALETTE_INIT(hideseek);
uint32_t screen_update_hideseek(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+protected:
+ required_device<cpu_device> m_maincpu;
};
diff --git a/src/mame/drivers/higemaru.cpp b/src/mame/drivers/higemaru.cpp
index bf341cbb92e..bae44989a52 100644
--- a/src/mame/drivers/higemaru.cpp
+++ b/src/mame/drivers/higemaru.cpp
@@ -13,9 +13,12 @@ Use Player 1 joystick and button, then press START1 to go to next screen.
****************************************************************************/
#include "emu.h"
+#include "includes/higemaru.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/higemaru.h"
+#include "screen.h"
+#include "speaker.h"
TIMER_DEVICE_CALLBACK_MEMBER(higemaru_state::higemaru_scanline)
diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp
index 1e9da3a340c..7476e1f0cf8 100644
--- a/src/mame/drivers/highvdeo.cpp
+++ b/src/mame/drivers/highvdeo.cpp
@@ -97,13 +97,18 @@ Game is V30 based, with rom banking (2Mb)
*************************************************************************************************/
#include "emu.h"
-#include "cpu/nec/nec.h"
+
#include "cpu/i86/i186.h"
-#include "sound/okim6376.h"
+#include "cpu/nec/nec.h"
#include "machine/nvram.h"
-#include "fashion.lh"
+#include "sound/okim6376.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
+
+#include "fashion.lh"
+
class highvdeo_state : public driver_device
{
diff --git a/src/mame/drivers/hikaru.cpp b/src/mame/drivers/hikaru.cpp
index ed2ef61da6c..aa18d0d14cf 100644
--- a/src/mame/drivers/hikaru.cpp
+++ b/src/mame/drivers/hikaru.cpp
@@ -383,6 +383,8 @@ Notes:
#include "emu.h"
#include "cpu/sh4/sh4.h"
+#include "screen.h"
+
#define CPU_CLOCK (200000000)
diff --git a/src/mame/drivers/himesiki.cpp b/src/mame/drivers/himesiki.cpp
index 4fbaf602e34..2646e71d392 100644
--- a/src/mame/drivers/himesiki.cpp
+++ b/src/mame/drivers/himesiki.cpp
@@ -92,10 +92,14 @@ A 12.000MHz
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "sound/2203intf.h"
#include "includes/himesiki.h"
+
+#include "cpu/z80/z80.h"
#include "machine/i8255.h"
+#include "sound/2203intf.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MCLK XTAL_12MHz // this is on the video board
#define CLK2 XTAL_8MHz // near the CPUs
diff --git a/src/mame/drivers/hitme.cpp b/src/mame/drivers/hitme.cpp
index d9e49335a36..067ec706d89 100644
--- a/src/mame/drivers/hitme.cpp
+++ b/src/mame/drivers/hitme.cpp
@@ -17,9 +17,11 @@
*/
#include "emu.h"
-#include "cpu/i8085/i8085.h"
#include "includes/hitme.h"
+
+#include "cpu/i8085/i8085.h"
#include "sound/discrete.h"
+#include "speaker.h"
#include "barricad.lh"
diff --git a/src/mame/drivers/hitpoker.cpp b/src/mame/drivers/hitpoker.cpp
index 8d3c8fd7409..44c2ca5c417 100644
--- a/src/mame/drivers/hitpoker.cpp
+++ b/src/mame/drivers/hitpoker.cpp
@@ -46,9 +46,11 @@ Some debug tricks (let's test this CPU as more as possible):
#include "emu.h"
#include "cpu/mc68hc11/mc68hc11.h"
+#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
-#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
class hitpoker_state : public driver_device
diff --git a/src/mame/drivers/hnayayoi.cpp b/src/mame/drivers/hnayayoi.cpp
index 64bfd0edb22..ed5612dea54 100644
--- a/src/mame/drivers/hnayayoi.cpp
+++ b/src/mame/drivers/hnayayoi.cpp
@@ -39,11 +39,14 @@ TODO:
****************************************************************************/
#include "emu.h"
+#include "includes/hnayayoi.h"
+
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/msm5205.h"
#include "machine/nvram.h"
-#include "includes/hnayayoi.h"
+#include "screen.h"
+#include "speaker.h"
READ8_MEMBER(hnayayoi_state::keyboard_0_r)
diff --git a/src/mame/drivers/hng64.cpp b/src/mame/drivers/hng64.cpp
index ad2a0f6513d..1f3a531136f 100644
--- a/src/mame/drivers/hng64.cpp
+++ b/src/mame/drivers/hng64.cpp
@@ -435,14 +435,15 @@ or Fatal Fury for example).
*/
-
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/hng64.h"
+
#include "cpu/mips/mips3.h"
+#include "cpu/z80/z80.h"
#include "machine/nvram.h"
-#include "includes/hng64.h"
#include "machine/hng64_net.h"
+
/* TODO: NOT measured! */
#define PIXEL_CLOCK ((HNG64_MASTER_CLOCK*2)/4) // x 2 is due of the interlaced screen ...
diff --git a/src/mame/drivers/holeland.cpp b/src/mame/drivers/holeland.cpp
index 54f19c3f6ed..3d22462253f 100644
--- a/src/mame/drivers/holeland.cpp
+++ b/src/mame/drivers/holeland.cpp
@@ -14,12 +14,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/holeland.h"
+
#include "cpu/z80/z80.h"
+#include "machine/nvram.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
#include "sound/sp0256.h"
-#include "machine/nvram.h"
-#include "includes/holeland.h"
+#include "screen.h"
+#include "speaker.h"
static ADDRESS_MAP_START( holeland_map, AS_PROGRAM, 8, holeland_state )
diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp
index 01e77b483df..a1a8423c637 100644
--- a/src/mame/drivers/homedata.cpp
+++ b/src/mame/drivers/homedata.cpp
@@ -235,11 +235,15 @@ Custom: GX61A01
#include "emu.h"
#include "includes/homedata.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/upd7810/upd7810.h"
#include "cpu/z80/z80.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
INTERRUPT_GEN_MEMBER(homedata_state::homedata_irq)
{
diff --git a/src/mame/drivers/homelab.cpp b/src/mame/drivers/homelab.cpp
index d07c8c6a56e..8393ede6b99 100644
--- a/src/mame/drivers/homelab.cpp
+++ b/src/mame/drivers/homelab.cpp
@@ -40,6 +40,8 @@ MB7051 - fuse programmed prom.
#include "sound/mea8000.h"
#include "sound/volt_reg.h"
#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/homerun.cpp b/src/mame/drivers/homerun.cpp
index 7417c5120ec..4fc062d6d21 100644
--- a/src/mame/drivers/homerun.cpp
+++ b/src/mame/drivers/homerun.cpp
@@ -51,11 +51,13 @@ Notes:
*/
#include "emu.h"
+#include "includes/homerun.h"
+
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "sound/2203intf.h"
#include "sound/samples.h"
-#include "includes/homerun.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp
index fe2c4cb8242..880bf285b71 100644
--- a/src/mame/drivers/homez80.cpp
+++ b/src/mame/drivers/homez80.cpp
@@ -22,6 +22,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class homez80_state : public driver_device
diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp
index 7ed25be4a93..4f86929cf3c 100644
--- a/src/mame/drivers/hornet.cpp
+++ b/src/mame/drivers/hornet.cpp
@@ -325,6 +325,8 @@
#include "video/voodoo.h"
#include "video/k037122.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
class hornet_state : public driver_device
diff --git a/src/mame/drivers/hotblock.cpp b/src/mame/drivers/hotblock.cpp
index 776c2635caf..1dd41f02888 100644
--- a/src/mame/drivers/hotblock.cpp
+++ b/src/mame/drivers/hotblock.cpp
@@ -41,6 +41,9 @@ so it could be by them instead
#include "emu.h"
#include "cpu/i86/i86.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
class hotblock_state : public driver_device
{
diff --git a/src/mame/drivers/hotstuff.cpp b/src/mame/drivers/hotstuff.cpp
index 3819bf68296..4ff5e2d339e 100644
--- a/src/mame/drivers/hotstuff.cpp
+++ b/src/mame/drivers/hotstuff.cpp
@@ -4,6 +4,7 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "screen.h"
class hotstuff_state : public driver_device
diff --git a/src/mame/drivers/hp16500.cpp b/src/mame/drivers/hp16500.cpp
index 4cbe85a3f35..4737c674b71 100644
--- a/src/mame/drivers/hp16500.cpp
+++ b/src/mame/drivers/hp16500.cpp
@@ -49,8 +49,10 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
-#include "video/mc6845.h"
#include "machine/mc68681.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
#define MAINCPU_TAG "maincpu"
#define CRTC_TAG "crtc"
diff --git a/src/mame/drivers/hp48.cpp b/src/mame/drivers/hp48.cpp
index a49c56c8ade..545aab99639 100644
--- a/src/mame/drivers/hp48.cpp
+++ b/src/mame/drivers/hp48.cpp
@@ -10,9 +10,13 @@
#include "emu.h"
#include "includes/hp48.h"
+
#include "cpu/saturn/saturn.h"
#include "machine/nvram.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
/* TODO:
- IR I/O port
diff --git a/src/mame/drivers/hp49gp.cpp b/src/mame/drivers/hp49gp.cpp
index 64b00197328..23dc2dd7cf9 100644
--- a/src/mame/drivers/hp49gp.cpp
+++ b/src/mame/drivers/hp49gp.cpp
@@ -10,6 +10,7 @@
#include "cpu/arm7/arm7.h"
#include "machine/s3c2410.h"
#include "rendlay.h"
+#include "screen.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/mame/drivers/hp64k.cpp b/src/mame/drivers/hp64k.cpp
index 98fcc823baf..8338550fb0d 100644
--- a/src/mame/drivers/hp64k.cpp
+++ b/src/mame/drivers/hp64k.cpp
@@ -150,15 +150,17 @@
//
#include "emu.h"
+#include "bus/rs232/rs232.h"
#include "cpu/hphybrid/hphybrid.h"
-#include "video/i8275.h"
-#include "machine/wd_fdc.h"
#include "machine/74123.h"
-#include "machine/rescap.h"
-#include "sound/beep.h"
#include "machine/com8116.h"
#include "machine/i8251.h"
-#include "bus/rs232/rs232.h"
+#include "machine/rescap.h"
+#include "machine/wd_fdc.h"
+#include "sound/beep.h"
+#include "video/i8275.h"
+#include "screen.h"
+#include "speaker.h"
#define BIT_MASK(n) (1U << (n))
diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp
index 670f038d365..3d764056aae 100644
--- a/src/mame/drivers/hp9845.cpp
+++ b/src/mame/drivers/hp9845.cpp
@@ -30,10 +30,15 @@
#include "emu.h"
#include "includes/hp9845.h"
-#include "softlist.h"
+
#include "bus/hp_optroms/hp_optrom.h"
-#include "hp9845b.lh"
+
#include "render.h"
+#include "softlist.h"
+#include "speaker.h"
+
+#include "hp9845b.lh"
+
#define BIT_MASK(n) (1U << (n))
diff --git a/src/mame/drivers/hp9k.cpp b/src/mame/drivers/hp9k.cpp
index 774a76632e2..4334057d4d6 100644
--- a/src/mame/drivers/hp9k.cpp
+++ b/src/mame/drivers/hp9k.cpp
@@ -42,6 +42,7 @@ TODO: boot tests fail
#include "video/mc6845.h"
#include "machine/terminal.h"
//#include "machine/ins8250.h"
+#include "screen.h"
#define HP9816_CHDIMX 8
#define HP9816_CHDIMY 16
diff --git a/src/mame/drivers/hp9k_3xx.cpp b/src/mame/drivers/hp9k_3xx.cpp
index e43b4cfe9cd..1f2db5192c5 100644
--- a/src/mame/drivers/hp9k_3xx.cpp
+++ b/src/mame/drivers/hp9k_3xx.cpp
@@ -50,6 +50,7 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/6840ptm.h"
+#include "screen.h"
#define MAINCPU_TAG "maincpu"
#define PTM6840_TAG "ptm"
diff --git a/src/mame/drivers/hprot1.cpp b/src/mame/drivers/hprot1.cpp
index 292f009cbf4..188297ca4a5 100644
--- a/src/mame/drivers/hprot1.cpp
+++ b/src/mame/drivers/hprot1.cpp
@@ -57,9 +57,11 @@ Infinite loop is reached at address 0x7699
#include "emu.h"
#include "cpu/mcs51/mcs51.h"
+#include "sound/spkrdev.h"
#include "video/hd44780.h"
-#include "sound/speaker.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
class hprot1_state : public driver_device
{
diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp
index fe64583f3fc..60eb7e4ad31 100644
--- a/src/mame/drivers/huebler.cpp
+++ b/src/mame/drivers/huebler.cpp
@@ -22,6 +22,7 @@
#include "emu.h"
#include "includes/huebler.h"
+#include "screen.h"
/* Keyboard */
diff --git a/src/mame/drivers/hunter2.cpp b/src/mame/drivers/hunter2.cpp
index 1657975efd0..fa4c0713aad 100644
--- a/src/mame/drivers/hunter2.cpp
+++ b/src/mame/drivers/hunter2.cpp
@@ -21,15 +21,18 @@
****************************************************************************/
#include "emu.h"
+#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
-#include "video/hd61830.h"
+#include "machine/bankdev.h"
#include "machine/mm58274c.h"
-#include "rendlay.h"
-#include "sound/speaker.h"
#include "machine/nsc810.h"
-#include "bus/rs232/rs232.h"
#include "machine/nvram.h"
-#include "machine/bankdev.h"
+#include "sound/spkrdev.h"
+#include "video/hd61830.h"
+#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
+
class hunter2_state : public driver_device
{
diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp
index a13120f1e67..c88cfec5542 100644
--- a/src/mame/drivers/hvyunit.cpp
+++ b/src/mame/drivers/hvyunit.cpp
@@ -65,6 +65,8 @@ To Do:
#include "machine/gen_latch.h"
#include "sound/2203intf.h"
#include "video/kan_pand.h"
+#include "screen.h"
+#include "speaker.h"
@@ -89,7 +91,7 @@ public:
m_soundlatch(*this, "soundlatch"),
m_videoram(*this, "videoram"),
m_colorram(*this, "colorram")
- { }
+ { }
/* Devices */
required_device<cpu_device> m_mastercpu;
diff --git a/src/mame/drivers/hx20.cpp b/src/mame/drivers/hx20.cpp
index 1b687435454..6243512b079 100644
--- a/src/mame/drivers/hx20.cpp
+++ b/src/mame/drivers/hx20.cpp
@@ -28,7 +28,9 @@
#include "emu.h"
#include "includes/hx20.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/hyhoo.cpp b/src/mame/drivers/hyhoo.cpp
index 270e7285daa..9b5770f3682 100644
--- a/src/mame/drivers/hyhoo.cpp
+++ b/src/mame/drivers/hyhoo.cpp
@@ -25,11 +25,13 @@ Memo:
#include "emu.h"
#include "includes/hyhoo.h"
+
#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
static ADDRESS_MAP_START( hyhoo_map, AS_PROGRAM, 8, hyhoo_state )
diff --git a/src/mame/drivers/hyperscan.cpp b/src/mame/drivers/hyperscan.cpp
index 6e8ba37bb1e..d8d616d9bb1 100644
--- a/src/mame/drivers/hyperscan.cpp
+++ b/src/mame/drivers/hyperscan.cpp
@@ -54,6 +54,7 @@
#include "emu.h"
#include "cpu/score/score.h"
+#include "screen.h"
#define LOG_SPG290_REGISTER_ACCESS (1)
diff --git a/src/mame/drivers/hyperspt.cpp b/src/mame/drivers/hyperspt.cpp
index dd97af0d79c..b96ef7ed5ed 100644
--- a/src/mame/drivers/hyperspt.cpp
+++ b/src/mame/drivers/hyperspt.cpp
@@ -9,10 +9,11 @@ Based on drivers from Juno First emulator by Chris Hardy (chrish@kcbbs.gen.nz)
***************************************************************************/
#include "emu.h"
-#include "includes/konamipt.h"
#include "includes/hyperspt.h"
-#include "audio/trackfld.h"
+#include "includes/konamipt.h"
#include "audio/hyprolyb.h"
+#include "audio/trackfld.h"
+
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
#include "cpu/z80/z80.h"
@@ -23,6 +24,9 @@ Based on drivers from Juno First emulator by Chris Hardy (chrish@kcbbs.gen.nz)
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
void hyperspt_state::machine_start()
{
diff --git a/src/mame/drivers/hyprduel.cpp b/src/mame/drivers/hyprduel.cpp
index e7bd0b1b34a..13c90e45ecd 100644
--- a/src/mame/drivers/hyprduel.cpp
+++ b/src/mame/drivers/hyprduel.cpp
@@ -37,11 +37,15 @@ fix comms so it boots, it's a bit of a hack for hyperduel at the moment ;-)
***************************************************************************/
#include "emu.h"
+#include "includes/hyprduel.h"
+
#include "cpu/m68000/m68000.h"
-#include "sound/ym2151.h"
#include "sound/okim6295.h"
+#include "sound/ym2151.h"
#include "sound/ym2413.h"
-#include "includes/hyprduel.h"
+
+#include "speaker.h"
+
/***************************************************************************
Interrupts
diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp
index acedd0a64c6..1d0b7d77ca4 100644
--- a/src/mame/drivers/i7000.cpp
+++ b/src/mame/drivers/i7000.cpp
@@ -43,13 +43,16 @@
****************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h" //CPU was actually a NSC800 (Z80 compatible)
#include "bus/generic/carts.h"
-#include "machine/pit8253.h"
+#include "cpu/z80/z80.h" //CPU was actually a NSC800 (Z80 compatible)
#include "machine/i8279.h"
-#include "sound/speaker.h"
+#include "machine/pit8253.h"
+#include "sound/spkrdev.h"
#include "video/mc6845.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
class i7000_state : public driver_device
{
diff --git a/src/mame/drivers/ibm3153.cpp b/src/mame/drivers/ibm3153.cpp
index 9e398633e67..d5e0e0225b0 100644
--- a/src/mame/drivers/ibm3153.cpp
+++ b/src/mame/drivers/ibm3153.cpp
@@ -39,6 +39,8 @@ ToDo:
#include "emu.h"
#include "cpu/mcs51/mcs51.h"
+#include "screen.h"
+
class ibm3153_state : public driver_device
{
diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp
index 1618a0a5af4..97b3cd07d45 100644
--- a/src/mame/drivers/ibm6580.cpp
+++ b/src/mame/drivers/ibm6580.cpp
@@ -95,6 +95,8 @@ Displaywriter System Manual S544-2023-0 (?) -- mentioned in US patents 4648071 a
//nclude "machine/ibm6580_fdc.h"
#include "machine/upd765.h"
+#include "screen.h"
+
#include "ibm6580.lh"
diff --git a/src/mame/drivers/ibmpcjr.cpp b/src/mame/drivers/ibmpcjr.cpp
index 5facc666246..de7382b4a2d 100644
--- a/src/mame/drivers/ibmpcjr.cpp
+++ b/src/mame/drivers/ibmpcjr.cpp
@@ -1,28 +1,32 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol
#include "emu.h"
+
#include "cpu/i86/i86.h"
-#include "sound/sn76496.h"
-#include "sound/speaker.h"
-#include "video/pc_t1t.h"
-#include "machine/ins8250.h"
+#include "imagedev/cassette.h"
#include "machine/i8255.h"
+#include "machine/ins8250.h"
+#include "machine/pc_fdc.h"
+#include "machine/pc_lpt.h"
+#include "machine/pckeybrd.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/ram.h"
-#include "machine/pckeybrd.h"
-#include "machine/pc_lpt.h"
-#include "machine/pc_fdc.h"
-#include "bus/rs232/rs232.h"
-#include "bus/rs232/ser_mouse.h"
-#include "bus/pc_joy/pc_joy.h"
-#include "bus/isa/fdc.h"
-#include "imagedev/cassette.h"
+#include "sound/sn76496.h"
+#include "sound/spkrdev.h"
+#include "video/pc_t1t.h"
-#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
+#include "bus/isa/fdc.h"
+#include "bus/pc_joy/pc_joy.h"
+#include "bus/rs232/rs232.h"
+#include "bus/rs232/ser_mouse.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
class pcjr_state : public driver_device
{
diff --git a/src/mame/drivers/icatel.cpp b/src/mame/drivers/icatel.cpp
index 2481a5a6521..240fce9f9fa 100644
--- a/src/mame/drivers/icatel.cpp
+++ b/src/mame/drivers/icatel.cpp
@@ -18,11 +18,15 @@
***************************************************************************/
#include "emu.h"
+
#include "cpu/mcs51/mcs51.h"
#include "video/hd44780.h"
//#include "sound/speaker.h"
-#include "rendlay.h"
+
#include "debugger.h"
+#include "rendlay.h"
+#include "screen.h"
+
class icatel_state : public driver_device
{
diff --git a/src/mame/drivers/ice_bozopail.cpp b/src/mame/drivers/ice_bozopail.cpp
index 0fb674c3e0e..76320a23b22 100644
--- a/src/mame/drivers/ice_bozopail.cpp
+++ b/src/mame/drivers/ice_bozopail.cpp
@@ -18,6 +18,7 @@ http://www.highwaygames.com/arcade-machines/bozo-s-grand-prize-game-6751/
*/
#include "emu.h"
+#include "speaker.h"
class ice_bozopail : public driver_device
{
diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp
index 2a4087b180a..4071226bf82 100644
--- a/src/mame/drivers/icecold.cpp
+++ b/src/mame/drivers/icecold.cpp
@@ -11,8 +11,11 @@
#include "machine/6821pia.h"
#include "machine/i8279.h"
#include "sound/ay8910.h"
+#include "speaker.h"
+
#include "icecold.lh"
+
class icecold_state : public driver_device
{
public:
diff --git a/src/mame/drivers/ichiban.cpp b/src/mame/drivers/ichiban.cpp
index 5b6d3dcaa08..a73da32455d 100644
--- a/src/mame/drivers/ichiban.cpp
+++ b/src/mame/drivers/ichiban.cpp
@@ -36,11 +36,13 @@ HSync - 15.510kHz
***************************************************************************/
-
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/ym2413.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MAIN_CLOCK XTAL_18_432MHz
@@ -48,8 +50,8 @@ class ichibanjyan_state : public driver_device
{
public:
ichibanjyan_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
{ }
// devices
diff --git a/src/mame/drivers/idsa.cpp b/src/mame/drivers/idsa.cpp
index eb88a57cf5b..d297f837a2c 100644
--- a/src/mame/drivers/idsa.cpp
+++ b/src/mame/drivers/idsa.cpp
@@ -27,10 +27,13 @@ ToDO:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/sp0256.h"
#include "machine/clock.h"
+#include "speaker.h"
+
class idsa_state : public genpin_class
{
diff --git a/src/mame/drivers/ie15.cpp b/src/mame/drivers/ie15.cpp
index cc247f67c2f..ac4bb501d65 100644
--- a/src/mame/drivers/ie15.cpp
+++ b/src/mame/drivers/ie15.cpp
@@ -13,13 +13,17 @@
#include "emu.h"
+#include "machine/ie15_kbd.h"
#include "bus/rs232/rs232.h"
#include "cpu/ie15/ie15.h"
-#include "machine/ie15_kbd.h"
#include "sound/beep.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "ie15.lh"
+
#define SCREEN_PAGE (80*48)
#define IE_TRUE 0x80
diff --git a/src/mame/drivers/if800.cpp b/src/mame/drivers/if800.cpp
index 4b93ffd07f1..ddb34e7d184 100644
--- a/src/mame/drivers/if800.cpp
+++ b/src/mame/drivers/if800.cpp
@@ -11,6 +11,7 @@
#include "cpu/i86/i86.h"
#include "machine/pic8259.h"
#include "video/upd7220.h"
+#include "screen.h"
class if800_state : public driver_device
diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp
index f10f8165918..21709d53c71 100644
--- a/src/mame/drivers/igs009.cpp
+++ b/src/mame/drivers/igs009.cpp
@@ -34,6 +34,9 @@ Year Game Manufacturer Notes
#include "sound/ym2413.h"
#include "sound/okim6295.h"
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
+
class igs009_state : public driver_device
{
diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp
index b86d6272d62..d9d350a29a0 100644
--- a/src/mame/drivers/igs011.cpp
+++ b/src/mame/drivers/igs011.cpp
@@ -70,6 +70,8 @@ Notes:
#include "sound/3812intf.h"
#include "sound/ics2115.h"
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
struct blitter_t
diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp
index e3ee18a5867..a175eaa785f 100644
--- a/src/mame/drivers/igs017.cpp
+++ b/src/mame/drivers/igs017.cpp
@@ -45,6 +45,7 @@ Notes:
************************************************************************************************************/
#include "emu.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z180/z180.h"
#include "machine/i8255.h"
@@ -55,6 +56,10 @@ Notes:
#include "machine/ticket.h"
#include "video/igs017_igs031.h"
+#include "screen.h"
+#include "speaker.h"
+
+
class igs017_state : public driver_device
{
public:
diff --git a/src/mame/drivers/igs_fear.cpp b/src/mame/drivers/igs_fear.cpp
index 3e01b2fe2a5..cad0ea39f1a 100644
--- a/src/mame/drivers/igs_fear.cpp
+++ b/src/mame/drivers/igs_fear.cpp
@@ -7,6 +7,8 @@
#include "machine/nvram.h"
#include "machine/pgmcrypt.h"
#include "sound/ics2115.h"
+#include "screen.h"
+#include "speaker.h"
class igs_fear_state : public driver_device
diff --git a/src/mame/drivers/igs_m027.cpp b/src/mame/drivers/igs_m027.cpp
index 2c1d9e053e6..0a8d950c17f 100644
--- a/src/mame/drivers/igs_m027.cpp
+++ b/src/mame/drivers/igs_m027.cpp
@@ -27,6 +27,7 @@
#include "machine/nvram.h"
#include "machine/pgmcrypt.h"
#include "video/igs017_igs031.h"
+#include "screen.h"
class igs_m027_state : public driver_device
{
diff --git a/src/mame/drivers/igs_m036.cpp b/src/mame/drivers/igs_m036.cpp
index bd26fda4433..c9759711520 100644
--- a/src/mame/drivers/igs_m036.cpp
+++ b/src/mame/drivers/igs_m036.cpp
@@ -61,6 +61,7 @@ check more info and photo from cjdh2.zip!!!
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
#include "machine/igs036crypt.h"
+#include "screen.h"
class igs_m036_state : public driver_device
diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp
index 532526dd575..5597e6280b2 100644
--- a/src/mame/drivers/igspoker.cpp
+++ b/src/mame/drivers/igspoker.cpp
@@ -64,15 +64,19 @@ FIX: PK Tetris have an input named AMUSE which I couldn't map. Maybe it is
*****************************************************************************/
-#define VERBOSE 0
-
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ym2413.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "igspoker.lh"
+#define VERBOSE 0
+
+
class igspoker_state : public driver_device
{
public:
diff --git a/src/mame/drivers/ikki.cpp b/src/mame/drivers/ikki.cpp
index 3b289da1a2f..4ed29121a72 100644
--- a/src/mame/drivers/ikki.cpp
+++ b/src/mame/drivers/ikki.cpp
@@ -15,9 +15,11 @@ TODO:
*****************************************************************************/
#include "emu.h"
+#include "includes/ikki.h"
+
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
-#include "includes/ikki.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp
index d515f81da33..306c69a76f8 100644
--- a/src/mame/drivers/imds2.cpp
+++ b/src/mame/drivers/imds2.cpp
@@ -89,6 +89,8 @@
#include "emu.h"
#include "includes/imds2.h"
+#include "screen.h"
+#include "speaker.h"
// CPU oscillator of IPC board: 8 MHz
#define IPC_XTAL_Y2 XTAL_8MHz
diff --git a/src/mame/drivers/imolagp.cpp b/src/mame/drivers/imolagp.cpp
index d1ec0167b0b..206390450ff 100644
--- a/src/mame/drivers/imolagp.cpp
+++ b/src/mame/drivers/imolagp.cpp
@@ -83,6 +83,8 @@ www.andys-arcade.com
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
#include "imolagp.lh"
diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp
index 186aa73e39f..999faa5ca1e 100644
--- a/src/mame/drivers/inder.cpp
+++ b/src/mame/drivers/inder.cpp
@@ -30,15 +30,19 @@
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/z80/z80.h"
+#include "machine/74157.h"
+#include "machine/7474.h"
#include "machine/i8255.h"
-#include "sound/sn76496.h"
#include "sound/ay8910.h"
#include "sound/msm5205.h"
-#include "machine/7474.h"
-#include "machine/74157.h"
+#include "sound/sn76496.h"
+#include "speaker.h"
+
#include "inder.lh"
+
class inder_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/indigo.cpp b/src/mame/drivers/indigo.cpp
index cad8d597283..cc8e0b9322e 100644
--- a/src/mame/drivers/indigo.cpp
+++ b/src/mame/drivers/indigo.cpp
@@ -19,14 +19,16 @@
\*********************************************************************/
#include "emu.h"
+#include "bus/scsi/scsi.h"
+#include "bus/scsi/scsicd.h"
#include "cpu/mips/mips3.h"
#include "cpu/mips/r3000.h"
#include "machine/8530scc.h"
-#include "machine/sgi.h"
#include "machine/eepromser.h"
-#include "bus/scsi/scsi.h"
-#include "bus/scsi/scsicd.h"
+#include "machine/sgi.h"
#include "machine/wd33c93.h"
+#include "screen.h"
+#include "speaker.h"
class indigo_state : public driver_device
{
diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp
index d5c0270a1a5..e138aca954a 100644
--- a/src/mame/drivers/indy_indigo2.cpp
+++ b/src/mame/drivers/indy_indigo2.cpp
@@ -41,23 +41,25 @@
\*********************************************************************/
#include "emu.h"
-#include "cpu/mips/mips3.h"
-#include "sound/cdda.h"
-#include "machine/sgi.h"
-#include "machine/pckeybrd.h"
-#include "machine/pc_lpt.h"
-#include "machine/8042kbdc.h"
-#include "machine/pit8253.h"
-#include "video/newport.h"
-#include "sound/dac.h"
-#include "sound/volt_reg.h"
+#include "bus/rs232/rs232.h"
#include "bus/scsi/scsi.h"
#include "bus/scsi/scsicd.h"
#include "bus/scsi/scsihd.h"
-#include "machine/wd33c93.h"
+#include "cpu/mips/mips3.h"
+#include "machine/8042kbdc.h"
#include "machine/ds1386.h"
+#include "machine/pc_lpt.h"
+#include "machine/pckeybrd.h"
+#include "machine/pit8253.h"
+#include "machine/sgi.h"
+#include "machine/wd33c93.h"
#include "machine/z80scc.h"
-#include "bus/rs232/rs232.h"
+#include "sound/cdda.h"
+#include "sound/dac.h"
+#include "sound/volt_reg.h"
+#include "video/newport.h"
+#include "screen.h"
+#include "speaker.h"
#define SCC_TAG "scc"
#define PI1_TAG "pi1"
@@ -151,8 +153,8 @@ public:
: ioc2_device(mconfig, type, name, tag, owner, clock, shortname, source, 0x20) { }
};
-const device_type SGI_IOC2_GUINNESS = &device_creator<ioc2_guinness_device>;
-const device_type SGI_IOC2_FULL_HOUSE = &device_creator<ioc2_full_house_device>;
+const device_type SGI_IOC2_GUINNESS = device_creator<ioc2_guinness_device>;
+const device_type SGI_IOC2_FULL_HOUSE = device_creator<ioc2_full_house_device>;
ioc2_guinness_device::ioc2_guinness_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: ioc2_guinness_device(mconfig, SGI_IOC2_GUINNESS, "SGI IOC2 (Guinness)", tag, owner, clock, "ioc2g", __FILE__)
diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp
index 29c77169dd7..c2af4a3452a 100644
--- a/src/mame/drivers/instruct.cpp
+++ b/src/mame/drivers/instruct.cpp
@@ -43,12 +43,16 @@
****************************************************************************/
#include "emu.h"
+
#include "cpu/s2650/s2650.h"
-#include "imagedev/snapquik.h"
#include "imagedev/cassette.h"
+#include "imagedev/snapquik.h"
#include "sound/wave.h"
+#include "speaker.h"
+
#include "instruct.lh"
+
class instruct_state : public driver_device
{
public:
diff --git a/src/mame/drivers/interact.cpp b/src/mame/drivers/interact.cpp
index 6da7f894e3f..3a09bff57e0 100644
--- a/src/mame/drivers/interact.cpp
+++ b/src/mame/drivers/interact.cpp
@@ -51,16 +51,18 @@
/* Mapping for joystick see hec2hrp.c*/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/hec2hrp.h"
+
#include "cpu/i8085/i8085.h"
-#include "imagedev/cassette.h"
+#include "cpu/z80/z80.h"
#include "formats/hect_tap.h"
+#include "imagedev/cassette.h"
#include "imagedev/printer.h"
-#include "sound/wave.h" /* for K7 sound*/
-#include "sound/discrete.h" /* for 1 Bit sound*/
#include "machine/upd765.h" /* for floppy disc controller */
+#include "sound/discrete.h" /* for 1 Bit sound*/
+#include "sound/wave.h" /* for K7 sound*/
+#include "screen.h"
#include "softlist.h"
-#include "includes/hec2hrp.h"
class interact_state : public hec2hrp_state
diff --git a/src/mame/drivers/intrscti.cpp b/src/mame/drivers/intrscti.cpp
index 3c52f82fe77..69d993bf9e9 100644
--- a/src/mame/drivers/intrscti.cpp
+++ b/src/mame/drivers/intrscti.cpp
@@ -15,6 +15,7 @@ I've not had a chance to wire up the board yet, but it might be possible to writ
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class intrscti_state : public driver_device
diff --git a/src/mame/drivers/intv.cpp b/src/mame/drivers/intv.cpp
index ec0a75f73b1..12834066b12 100644
--- a/src/mame/drivers/intv.cpp
+++ b/src/mame/drivers/intv.cpp
@@ -51,12 +51,15 @@ RO-3-9506 = 8KiB (4Kiw) self decoding address mask rom with external address dec
#include "emu.h"
+#include "includes/intv.h"
+
#include "cpu/m6502/m6502.h"
#include "cpu/cp1610/cp1610.h"
-#include "video/tms9927.h"
-#include "includes/intv.h"
#include "sound/ay8910.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
#ifndef VERBOSE
#ifdef MAME_DEBUG
diff --git a/src/mame/drivers/inufuku.cpp b/src/mame/drivers/inufuku.cpp
index 80ba8069177..fcbd860299e 100644
--- a/src/mame/drivers/inufuku.cpp
+++ b/src/mame/drivers/inufuku.cpp
@@ -73,12 +73,14 @@ TODO:
******************************************************************************/
#include "emu.h"
+#include "includes/inufuku.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
#include "sound/2610intf.h"
-#include "video/vsystem_spr.h"
-#include "includes/inufuku.h"
+#include "screen.h"
+#include "speaker.h"
/******************************************************************************
diff --git a/src/mame/drivers/invqix.cpp b/src/mame/drivers/invqix.cpp
index 20f755cc13d..7bec200f66f 100644
--- a/src/mame/drivers/invqix.cpp
+++ b/src/mame/drivers/invqix.cpp
@@ -122,6 +122,8 @@ as well as Up Right, Cocktail or Flip Screen from the service menu.
#include "cpu/h8/h8s2357.h"
#include "sound/okim9810.h"
#include "machine/eepromser.h"
+#include "screen.h"
+#include "speaker.h"
class invqix_state : public driver_device
{
diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp
index 7b3df48d8cc..102050d1ddc 100644
--- a/src/mame/drivers/ipds.cpp
+++ b/src/mame/drivers/ipds.cpp
@@ -12,6 +12,8 @@
#include "cpu/i8085/i8085.h"
#include "video/i8275.h"
#include "machine/keyboard.h"
+#include "screen.h"
+
class ipds_state : public driver_device
{
diff --git a/src/mame/drivers/iq151.cpp b/src/mame/drivers/iq151.cpp
index 66e946bbdb5..2e57b3bfaf9 100644
--- a/src/mame/drivers/iq151.cpp
+++ b/src/mame/drivers/iq151.cpp
@@ -44,11 +44,12 @@ ToDo:
****************************************************************************/
#include "emu.h"
+
#include "cpu/i8085/i8085.h"
-#include "machine/pic8259.h"
-#include "machine/i8255.h"
-#include "sound/speaker.h"
#include "imagedev/cassette.h"
+#include "machine/i8255.h"
+#include "machine/pic8259.h"
+#include "sound/spkrdev.h"
// cartridge slot
#include "bus/iq151/iq151.h"
@@ -61,7 +62,10 @@ ToDo:
#include "bus/iq151/video32.h"
#include "bus/iq151/video64.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
class iq151_state : public driver_device
{
diff --git a/src/mame/drivers/iqblock.cpp b/src/mame/drivers/iqblock.cpp
index 8f2fbb9d95a..843c582b3ce 100644
--- a/src/mame/drivers/iqblock.cpp
+++ b/src/mame/drivers/iqblock.cpp
@@ -52,11 +52,14 @@ Grndtour:
***************************************************************************/
#include "emu.h"
+#include "includes/iqblock.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z180/z180.h"
#include "machine/i8255.h"
-#include "includes/iqblock.h"
#include "sound/ym2413.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(iqblock_state::iqblock_prot_w)
diff --git a/src/mame/drivers/irisha.cpp b/src/mame/drivers/irisha.cpp
index 2f5142791a9..17d9752d6d3 100644
--- a/src/mame/drivers/irisha.cpp
+++ b/src/mame/drivers/irisha.cpp
@@ -18,11 +18,13 @@
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "machine/i8251.h"
#include "machine/i8255.h"
-#include "machine/pit8253.h"
#include "machine/pic8259.h"
-#include "machine/i8251.h"
-#include "sound/speaker.h"
+#include "machine/pit8253.h"
+#include "sound/spkrdev.h"
+#include "screen.h"
+#include "speaker.h"
class irisha_state : public driver_device
{
diff --git a/src/mame/drivers/irobot.cpp b/src/mame/drivers/irobot.cpp
index 0615ecd80a2..a95673ab6c2 100644
--- a/src/mame/drivers/irobot.cpp
+++ b/src/mame/drivers/irobot.cpp
@@ -80,10 +80,11 @@
****************************************************************************/
#include "emu.h"
+#include "includes/irobot.h"
#include "cpu/m6809/m6809.h"
#include "sound/pokey.h"
#include "machine/nvram.h"
-#include "includes/irobot.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_12_096MHz
#define VIDEO_CLOCK XTAL_20MHz
diff --git a/src/mame/drivers/ironhors.cpp b/src/mame/drivers/ironhors.cpp
index 3289e1b7e83..3aa0484b5e4 100644
--- a/src/mame/drivers/ironhors.cpp
+++ b/src/mame/drivers/ironhors.cpp
@@ -9,12 +9,16 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/ironhors.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/m6809.h"
+#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/discrete.h"
-#include "includes/konamipt.h"
-#include "includes/ironhors.h"
+#include "screen.h"
+#include "speaker.h"
+
/*************************************
*
diff --git a/src/mame/drivers/istellar.cpp b/src/mame/drivers/istellar.cpp
index ffc9a63c37d..4a273d6637c 100644
--- a/src/mame/drivers/istellar.cpp
+++ b/src/mame/drivers/istellar.cpp
@@ -23,8 +23,9 @@ Todo:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "render.h"
#include "machine/ldv1000.h"
+#include "render.h"
+#include "speaker.h"
class istellar_state : public driver_device
diff --git a/src/mame/drivers/istrebiteli.cpp b/src/mame/drivers/istrebiteli.cpp
index a304b71a7f3..9848869264d 100644
--- a/src/mame/drivers/istrebiteli.cpp
+++ b/src/mame/drivers/istrebiteli.cpp
@@ -24,6 +24,8 @@
#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "machine/i8255.h"
+#include "screen.h"
+#include "speaker.h"
#define I8080_TAG "maincpu"
@@ -58,7 +60,7 @@ extern const device_type ISTREBITELI_SOUND;
//////////////////////////////////////////////////////////////
-const device_type ISTREBITELI_SOUND = &device_creator<istrebiteli_sound_device>;
+const device_type ISTREBITELI_SOUND = device_creator<istrebiteli_sound_device>;
istrebiteli_sound_device::istrebiteli_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, ISTREBITELI_SOUND, "Istrebiteli Sound", tag, owner, clock, "istrebiteli_sound", __FILE__),
diff --git a/src/mame/drivers/iteagle.cpp b/src/mame/drivers/iteagle.cpp
index 6d67650daae..4bef385c3ab 100644
--- a/src/mame/drivers/iteagle.cpp
+++ b/src/mame/drivers/iteagle.cpp
@@ -110,6 +110,7 @@ www.multitech.com
#include "sound/es1373.h"
#include "machine/iteagle_fpga.h"
#include "machine/pci-ide.h"
+#include "screen.h"
//*************************************
diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp
index ad5e10a3241..9aa1288a2f9 100644
--- a/src/mame/drivers/itech32.cpp
+++ b/src/mame/drivers/itech32.cpp
@@ -351,17 +351,20 @@ Notes:
****************************************************************************/
#include "emu.h"
-#include "cpu/tms32031/tms32031.h"
+#include "includes/itech32.h"
+
#include "cpu/m6800/m6800.h"
-#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
+#include "cpu/m6809/m6809.h"
+#include "cpu/tms32031/tms32031.h"
#include "machine/6522via.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
+#include "machine/timekpr.h"
#include "machine/watchdog.h"
-#include "includes/itech32.h"
#include "sound/es5506.h"
-#include "machine/timekpr.h"
+
+#include "speaker.h"
#define FULL_LOGGING 0
diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp
index d6852ec9661..4ceb96e8ef3 100644
--- a/src/mame/drivers/itech8.cpp
+++ b/src/mame/drivers/itech8.cpp
@@ -497,19 +497,22 @@
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/itech8.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/m6809/hd6309.h"
#include "cpu/m6809/m6809.h"
-#include "machine/6821pia.h"
+#include "cpu/z80/z80.h"
#include "machine/6522via.h"
+#include "machine/6821pia.h"
#include "machine/nvram.h"
-#include "includes/itech8.h"
#include "sound/2203intf.h"
#include "sound/2608intf.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
+#include "speaker.h"
+
#define FULL_LOGGING 0
diff --git a/src/mame/drivers/itgambl2.cpp b/src/mame/drivers/itgambl2.cpp
index 2df7f95c7d9..698055beeff 100644
--- a/src/mame/drivers/itgambl2.cpp
+++ b/src/mame/drivers/itgambl2.cpp
@@ -53,12 +53,14 @@
************************************************************************/
-#define MAIN_CLOCK XTAL_16MHz
-#define SND_CLOCK XTAL_14_31818MHz
-
#include "emu.h"
#include "cpu/h8/h83337.h"
#include "sound/upd7759.h"
+#include "screen.h"
+#include "speaker.h"
+
+#define MAIN_CLOCK XTAL_16MHz
+#define SND_CLOCK XTAL_14_31818MHz
class itgambl2_state : public driver_device
diff --git a/src/mame/drivers/itgambl3.cpp b/src/mame/drivers/itgambl3.cpp
index 95a592a6f6f..a7450add868 100644
--- a/src/mame/drivers/itgambl3.cpp
+++ b/src/mame/drivers/itgambl3.cpp
@@ -40,11 +40,13 @@
************************************************************************/
-#define MAIN_CLOCK XTAL_16MHz
-
#include "emu.h"
#include "cpu/h8/h83048.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
+#define MAIN_CLOCK XTAL_16MHz
class itgambl3_state : public driver_device
diff --git a/src/mame/drivers/itgamble.cpp b/src/mame/drivers/itgamble.cpp
index d87374c380d..968d49e713f 100644
--- a/src/mame/drivers/itgamble.cpp
+++ b/src/mame/drivers/itgamble.cpp
@@ -47,6 +47,13 @@
*******************************************************************/
+#include "emu.h"
+#include "cpu/h8/h83048.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
+
#define MAIN_CLOCK XTAL_30MHz
#define SND_CLOCK XTAL_1MHz
@@ -56,11 +63,6 @@
#define EJOLLYX5_MAIN_CLOCK XTAL_16MHz
-#include "emu.h"
-#include "cpu/h8/h83048.h"
-#include "sound/okim6295.h"
-
-
class itgamble_state : public driver_device
{
public:
diff --git a/src/mame/drivers/itt3030.cpp b/src/mame/drivers/itt3030.cpp
index ab05c502fb5..46e1ae388b8 100644
--- a/src/mame/drivers/itt3030.cpp
+++ b/src/mame/drivers/itt3030.cpp
@@ -191,14 +191,19 @@ Beeper Circuit, all ICs shown:
#include "emu.h"
+#include "cpu/mcs48/mcs48.h" //Keyboard MCU ... talks to the 8278 on the keyboard circuit
#include "cpu/z80/z80.h"
-#include "machine/wd_fdc.h"
#include "machine/bankdev.h"
#include "machine/ram.h"
-#include "formats/itt3030_dsk.h"
-#include "video/tms9927.h" //Display hardware
+#include "machine/wd_fdc.h"
#include "sound/beep.h"
-#include "cpu/mcs48/mcs48.h" //Keyboard MCU ... talks to the 8278 on the keyboard circuit
+#include "video/tms9927.h" //Display hardware
+
+#include "screen.h"
+#include "speaker.h"
+
+#include "formats/itt3030_dsk.h"
+
#define MAIN_CLOCK XTAL_4.194MHz
diff --git a/src/mame/drivers/jack.cpp b/src/mame/drivers/jack.cpp
index fa3c4e70489..d941f12fd22 100644
--- a/src/mame/drivers/jack.cpp
+++ b/src/mame/drivers/jack.cpp
@@ -81,9 +81,12 @@ Stephh's Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/jack.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/jack.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/jackal.cpp b/src/mame/drivers/jackal.cpp
index 9b768ada806..ecb2710a4ed 100644
--- a/src/mame/drivers/jackal.cpp
+++ b/src/mame/drivers/jackal.cpp
@@ -70,11 +70,14 @@ Address Dir Data Description
***************************************************************************/
#include "emu.h"
+#include "includes/jackal.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/watchdog.h"
#include "sound/ym2151.h"
-#include "includes/jackal.h"
-#include "includes/konamipt.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp
index 98a7b1bf3c7..a9d5fb3888f 100644
--- a/src/mame/drivers/jackie.cpp
+++ b/src/mame/drivers/jackie.cpp
@@ -48,6 +48,8 @@ Note
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ym2413.h"
+#include "screen.h"
+#include "speaker.h"
class jackie_state : public driver_device
diff --git a/src/mame/drivers/jackpool.cpp b/src/mame/drivers/jackpool.cpp
index c0257234633..8432bea81ee 100644
--- a/src/mame/drivers/jackpool.cpp
+++ b/src/mame/drivers/jackpool.cpp
@@ -19,8 +19,10 @@ TODO:
#include "emu.h"
#include "cpu/m68000/m68000.h"
-#include "sound/okim6295.h"
#include "machine/eepromser.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class jackpool_state : public driver_device
diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp
index e1317a70ce2..f909f68a59e 100644
--- a/src/mame/drivers/jaguar.cpp
+++ b/src/mame/drivers/jaguar.cpp
@@ -348,6 +348,7 @@ Notes:
#include "sound/volt_reg.h"
#include "cdrom.h"
#include "softlist.h"
+#include "speaker.h"
#define COJAG_CLOCK XTAL_52MHz
#define R3000_CLOCK XTAL_40MHz
@@ -393,7 +394,7 @@ public:
}
};
-const device_type COJAG_HARDDISK = &device_creator<cojag_hdd>;
+const device_type COJAG_HARDDISK = device_creator<cojag_hdd>;
SLOT_INTERFACE_START(cojag_devices)
SLOT_INTERFACE("hdd", COJAG_HARDDISK)
diff --git a/src/mame/drivers/jailbrek.cpp b/src/mame/drivers/jailbrek.cpp
index 60164d7e823..97583d59fb5 100644
--- a/src/mame/drivers/jailbrek.cpp
+++ b/src/mame/drivers/jailbrek.cpp
@@ -86,12 +86,16 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/jailbrek.h"
+#include "includes/konamipt.h"
#include "machine/konami1.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/watchdog.h"
#include "sound/sn76496.h"
-#include "includes/konamipt.h"
-#include "includes/jailbrek.h"
+
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(jailbrek_state::ctrl_w)
diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp
index 5e9bd278174..74582939bb9 100644
--- a/src/mame/drivers/jalmah.cpp
+++ b/src/mame/drivers/jalmah.cpp
@@ -118,6 +118,8 @@ OSC: 12.000MHz
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class jalmah_state : public driver_device
diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp
index 37331c61d26..8615d4a1e69 100644
--- a/src/mame/drivers/jangou.cpp
+++ b/src/mame/drivers/jangou.cpp
@@ -26,15 +26,17 @@ $c088-$c095 player tiles
*******************************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "cpu/m6800/m6800.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
+#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "sound/hc55516.h"
#include "sound/msm5205.h"
-#include "video/resnet.h"
#include "video/jangou_blitter.h"
-#include "machine/nvram.h"
+#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_19_968MHz
diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp
index d94ebd1ae22..260874eaab0 100644
--- a/src/mame/drivers/jankenmn.cpp
+++ b/src/mame/drivers/jankenmn.cpp
@@ -145,8 +145,6 @@
***************************************************************************/
-#define MASTER_CLOCK XTAL_2_5MHz
-
#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
@@ -154,8 +152,12 @@
#include "machine/i8255.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "jankenmn.lh"
+#define MASTER_CLOCK XTAL_2_5MHz
+
class jankenmn_state : public driver_device
{
diff --git a/src/mame/drivers/jantotsu.cpp b/src/mame/drivers/jantotsu.cpp
index b115bb299e2..a77895515d8 100644
--- a/src/mame/drivers/jantotsu.cpp
+++ b/src/mame/drivers/jantotsu.cpp
@@ -98,6 +98,9 @@ dumped by sayu
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "sound/msm5205.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MAIN_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/jchan.cpp b/src/mame/drivers/jchan.cpp
index e24d28f5be2..5da50b63809 100644
--- a/src/mame/drivers/jchan.cpp
+++ b/src/mame/drivers/jchan.cpp
@@ -155,13 +155,15 @@ JC-301-00 W11 9510K7059 23C16000 U85
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "machine/eepromser.h"
#include "machine/nvram.h"
+#include "machine/watchdog.h"
#include "sound/ymz280b.h"
#include "video/sknsspr.h"
-#include "machine/eepromser.h"
-#include "machine/watchdog.h"
#include "video/kaneko_tmap.h"
#include "machine/kaneko_toybox.h"
+#include "screen.h"
+#include "speaker.h"
class jchan_state : public driver_device
{
@@ -180,7 +182,7 @@ public:
m_sprregs_2(*this, "sprregs_2"),
m_mainsub_shared_ram(*this, "mainsub_shared"),
m_ctrl(*this, "ctrl")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_subcpu;
diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp
index b25f1491c73..e23e859bc21 100644
--- a/src/mame/drivers/jclub2.cpp
+++ b/src/mame/drivers/jclub2.cpp
@@ -97,10 +97,11 @@ To do:
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
-#include "sound/okim6295.h"
+#include "machine/nvram.h"
#include "machine/st0016.h"
+#include "sound/okim6295.h"
#include "video/st0020.h"
-#include "machine/nvram.h"
+#include "speaker.h"
class darkhors_state : public driver_device
{
diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp
index c87ae070ac9..ed9e8efc485 100644
--- a/src/mame/drivers/jeutel.cpp
+++ b/src/mame/drivers/jeutel.cpp
@@ -17,12 +17,16 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "sound/ay8910.h"
#include "sound/tms5110.h"
+#include "speaker.h"
+
#include "jeutel.lh"
+
class jeutel_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/joctronic.cpp b/src/mame/drivers/joctronic.cpp
index d9b0470b771..f31a9449c90 100644
--- a/src/mame/drivers/joctronic.cpp
+++ b/src/mame/drivers/joctronic.cpp
@@ -11,6 +11,8 @@
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/msm5205.h"
+#include "speaker.h"
+
class joctronic_state : public driver_device
{
@@ -22,7 +24,7 @@ public:
, m_oki(*this, "oki")
, m_adpcm_select(*this, "adpcm_select")
, m_soundbank(*this, "soundbank")
- { }
+ { }
DECLARE_READ8_MEMBER(csin_r);
DECLARE_WRITE8_MEMBER(control_port_w);
diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp
index 304641d669d..99113017d09 100644
--- a/src/mame/drivers/jokrwild.cpp
+++ b/src/mame/drivers/jokrwild.cpp
@@ -71,13 +71,14 @@
*******************************************************************************/
-#define MASTER_CLOCK XTAL_8MHz /* guess */
-
#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "video/mc6845.h"
#include "machine/6821pia.h"
#include "machine/nvram.h"
+#include "screen.h"
+
+#define MASTER_CLOCK XTAL_8MHz /* guess */
class jokrwild_state : public driver_device
diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp
index c3db52b8913..7cc7832d790 100644
--- a/src/mame/drivers/jollyjgr.cpp
+++ b/src/mame/drivers/jollyjgr.cpp
@@ -120,6 +120,8 @@ Notes:
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class jollyjgr_state : public driver_device
diff --git a/src/mame/drivers/jongkyo.cpp b/src/mame/drivers/jongkyo.cpp
index eefafe13c89..7370947a73d 100644
--- a/src/mame/drivers/jongkyo.cpp
+++ b/src/mame/drivers/jongkyo.cpp
@@ -28,8 +28,10 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
#include "machine/segacrpt_device.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
#define JONGKYO_CLOCK 18432000
diff --git a/src/mame/drivers/jonos.cpp b/src/mame/drivers/jonos.cpp
index 9a9ee43fa2b..a3075fefd59 100644
--- a/src/mame/drivers/jonos.cpp
+++ b/src/mame/drivers/jonos.cpp
@@ -19,6 +19,7 @@ Data presented at 5000 will appear on screen in a dumb-terminal format.
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "screen.h"
class jonos_state : public driver_device
diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp
index 12a84006bed..e92b4d032f1 100644
--- a/src/mame/drivers/joystand.cpp
+++ b/src/mame/drivers/joystand.cpp
@@ -90,12 +90,14 @@ Notes:
#include "emu.h"
#include "cpu/m68000/m68000.h"
-#include "machine/tmp68301.h"
-#include "machine/msm6242.h"
#include "machine/eepromser.h"
#include "machine/intelfsh.h"
-#include "sound/ym2413.h"
+#include "machine/msm6242.h"
+#include "machine/tmp68301.h"
#include "sound/okim6295.h"
+#include "sound/ym2413.h"
+#include "screen.h"
+#include "speaker.h"
class joystand_state : public driver_device
{
diff --git a/src/mame/drivers/jp.cpp b/src/mame/drivers/jp.cpp
index 05544cc96d5..d1322f61742 100644
--- a/src/mame/drivers/jp.cpp
+++ b/src/mame/drivers/jp.cpp
@@ -19,10 +19,14 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "speaker.h"
+
#include "jp.lh"
+
class jp_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp
index 80024130d43..f513aabd29c 100644
--- a/src/mame/drivers/jpmimpct.cpp
+++ b/src/mame/drivers/jpmimpct.cpp
@@ -104,13 +104,16 @@ Thanks to Tony Friery and JPeMU for I/O routines and documentation.
#include "emu.h"
-#include "cpu/m68000/m68000.h"
-
#include "includes/jpmimpct.h"
+
+#include "cpu/m68000/m68000.h"
+#include "machine/i8255.h"
#include "machine/nvram.h"
-#include "jpmimpct.lh"
#include "video/awpvid.h"
-#include "machine/i8255.h"
+#include "screen.h"
+#include "speaker.h"
+
+#include "jpmimpct.lh"
/*************************************
*
diff --git a/src/mame/drivers/jpmmps.cpp b/src/mame/drivers/jpmmps.cpp
index 7986c1cdd70..b4d2a2c30b5 100644
--- a/src/mame/drivers/jpmmps.cpp
+++ b/src/mame/drivers/jpmmps.cpp
@@ -30,11 +30,14 @@
#include "emu.h"
+
#include "cpu/tms9900/tms9995.h"
#include "sound/sn76496.h"
#include "machine/i8255.h"
#include "machine/tms9902.h"
#include "machine/meters.h"
+#include "speaker.h"
+
#include "jpmmps.lh"
// MFME2MAME layouts:
diff --git a/src/mame/drivers/jpms80.cpp b/src/mame/drivers/jpms80.cpp
index 7bd9562c167..df240e73caa 100644
--- a/src/mame/drivers/jpms80.cpp
+++ b/src/mame/drivers/jpms80.cpp
@@ -27,6 +27,8 @@ System80 is based on the SRU platform, but with more outputs and finally a separ
#include "cpu/tms9900/tms9995.h"
#include "sound/ay8910.h"
#include "machine/tms9902.h"
+#include "speaker.h"
+
#include "jpms80.lh"
// MFME2MAME layouts:
diff --git a/src/mame/drivers/jpmsys5.cpp b/src/mame/drivers/jpmsys5.cpp
index 80fc2dc3ec6..fb807e877a5 100644
--- a/src/mame/drivers/jpmsys5.cpp
+++ b/src/mame/drivers/jpmsys5.cpp
@@ -33,10 +33,15 @@
#include "emu.h"
#include "includes/jpmsys5.h"
+
#include "machine/clock.h"
#include "sound/saa1099.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "jpmsys5.lh"
+
enum state { IDLE, START, DATA, STOP1, STOP2 };
/*************************************
diff --git a/src/mame/drivers/jpmsys7.cpp b/src/mame/drivers/jpmsys7.cpp
index 44b8134d67e..87232a18117 100644
--- a/src/mame/drivers/jpmsys7.cpp
+++ b/src/mame/drivers/jpmsys7.cpp
@@ -19,18 +19,18 @@ Pluto 8: ColdFire 5475
*/
-
-
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/mcf5206e.h"
+#include "speaker.h"
+
class jpmsys7_state : public driver_device
{
public:
jpmsys7_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
{ }
protected:
diff --git a/src/mame/drivers/jr100.cpp b/src/mame/drivers/jr100.cpp
index b5fa3f94cc4..9276ee528af 100644
--- a/src/mame/drivers/jr100.cpp
+++ b/src/mame/drivers/jr100.cpp
@@ -15,12 +15,14 @@
#include "emu.h"
#include "cpu/m6800/m6800.h"
-#include "machine/6522via.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
-#include "sound/speaker.h"
-#include "sound/beep.h"
#include "imagedev/snapquik.h"
+#include "machine/6522via.h"
+#include "sound/beep.h"
+#include "sound/spkrdev.h"
+#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
class jr100_state : public driver_device
diff --git a/src/mame/drivers/jr200.cpp b/src/mame/drivers/jr200.cpp
index 6b5a3315443..21d92e7903b 100644
--- a/src/mame/drivers/jr200.cpp
+++ b/src/mame/drivers/jr200.cpp
@@ -20,6 +20,8 @@
#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "sound/beep.h"
+#include "screen.h"
+#include "speaker.h"
class jr200_state : public driver_device
diff --git a/src/mame/drivers/jrpacman.cpp b/src/mame/drivers/jrpacman.cpp
index f0c42233d7a..7484ab4c550 100644
--- a/src/mame/drivers/jrpacman.cpp
+++ b/src/mame/drivers/jrpacman.cpp
@@ -101,9 +101,12 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/pacman.h"
+#include "cpu/z80/z80.h"
+#include "screen.h"
+#include "speaker.h"
+
class jrpacman_state : public pacman_state
{
diff --git a/src/mame/drivers/jtc.cpp b/src/mame/drivers/jtc.cpp
index 4e8eb6fd175..8618b25e7db 100644
--- a/src/mame/drivers/jtc.cpp
+++ b/src/mame/drivers/jtc.cpp
@@ -9,12 +9,14 @@
****************************************************************************/
#include "emu.h"
+#include "bus/centronics/ctronics.h"
#include "cpu/z8/z8.h"
#include "imagedev/cassette.h"
-#include "bus/centronics/ctronics.h"
#include "machine/ram.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
#define SCREEN_TAG "screen"
#define UB8830D_TAG "ub8830d"
diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp
index f7baa860525..79bd3f9383e 100644
--- a/src/mame/drivers/jubilee.cpp
+++ b/src/mame/drivers/jubilee.cpp
@@ -193,14 +193,15 @@
****************************************************************************************/
-#define MASTER_CLOCK XTAL_6MHz /* confirmed */
-#define CPU_CLOCK (MASTER_CLOCK / 2) /* guess */
-#define CRTC_CLOCK (MASTER_CLOCK / 8) /* guess */
-
#include "emu.h"
#include "cpu/tms9900/tms9980a.h"
-#include "video/mc6845.h"
#include "machine/nvram.h"
+#include "video/mc6845.h"
+#include "screen.h"
+
+#define MASTER_CLOCK XTAL_6MHz /* confirmed */
+#define CPU_CLOCK (MASTER_CLOCK / 2) /* guess */
+#define CRTC_CLOCK (MASTER_CLOCK / 8) /* guess */
class jubilee_state : public driver_device
diff --git a/src/mame/drivers/juicebox.cpp b/src/mame/drivers/juicebox.cpp
index 828a35afea1..a017084154a 100644
--- a/src/mame/drivers/juicebox.cpp
+++ b/src/mame/drivers/juicebox.cpp
@@ -15,7 +15,10 @@
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "rendlay.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
//#define JUICEBOX_ENTER_DEBUG_MENU
//#define JUICEBOX_DISPLAY_ROM_ID
diff --git a/src/mame/drivers/jungleyo.cpp b/src/mame/drivers/jungleyo.cpp
index 08db2988447..078fc267c60 100644
--- a/src/mame/drivers/jungleyo.cpp
+++ b/src/mame/drivers/jungleyo.cpp
@@ -40,6 +40,8 @@ PCB silkscreened: "MADE IN TAIWAN YONSHI PCB NO-006F"
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class jungleyo_state : public driver_device
diff --git a/src/mame/drivers/junofrst.cpp b/src/mame/drivers/junofrst.cpp
index 6bde5b95a91..07652b29703 100644
--- a/src/mame/drivers/junofrst.cpp
+++ b/src/mame/drivers/junofrst.cpp
@@ -80,8 +80,9 @@ Blitter source graphics
#include "emu.h"
-#include "includes/konamipt.h"
#include "includes/tutankhm.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/mcs48/mcs48.h"
#include "cpu/z80/z80.h"
@@ -92,6 +93,8 @@ Blitter source graphics
#include "sound/dac.h"
#include "sound/flt_rc.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
class junofrst_state : public tutankhm_state
diff --git a/src/mame/drivers/jupace.cpp b/src/mame/drivers/jupace.cpp
index 456bef25b12..bbb555bfd8b 100644
--- a/src/mame/drivers/jupace.cpp
+++ b/src/mame/drivers/jupace.cpp
@@ -44,7 +44,6 @@ Ports:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "formats/ace_tap.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
#include "bus/centronics/ctronics.h"
@@ -53,9 +52,15 @@ Ports:
#include "machine/z80pio.h"
#include "sound/ay8910.h"
#include "sound/sp0256.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "sound/wave.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/ace_tap.h"
+
#define Z80_TAG "z0"
#define AY8910_TAG "ay8910"
diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp
index 0f9803581cb..fa8e63511d8 100644
--- a/src/mame/drivers/jupiter.cpp
+++ b/src/mame/drivers/jupiter.cpp
@@ -19,13 +19,16 @@ ToDo:
***************************************************************************/
#include "emu.h"
+#include "includes/jupiter.h"
+
#include "cpu/m6800/m6800.h"
#include "cpu/z80/z80.h"
-#include "machine/ram.h"
#include "machine/keyboard.h"
+#include "machine/ram.h"
#include "machine/terminal.h"
#include "machine/wd_fdc.h"
-#include "includes/jupiter.h"
+
+#include "screen.h"
//**************************************************************************
diff --git a/src/mame/drivers/k28.cpp b/src/mame/drivers/k28.cpp
index 50420033dde..07f5393573f 100644
--- a/src/mame/drivers/k28.cpp
+++ b/src/mame/drivers/k28.cpp
@@ -23,6 +23,7 @@
#include "cpu/mcs48/mcs48.h"
#include "machine/tms6100.h"
#include "sound/votrax.h"
+#include "speaker.h"
#include "k28.lh"
diff --git a/src/mame/drivers/k8915.cpp b/src/mame/drivers/k8915.cpp
index 9c137b7759e..4e8961cf462 100644
--- a/src/mame/drivers/k8915.cpp
+++ b/src/mame/drivers/k8915.cpp
@@ -13,6 +13,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/keyboard.h"
+#include "screen.h"
class k8915_state : public driver_device
{
diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp
index 45355963f6d..07ebbf9d49e 100644
--- a/src/mame/drivers/kaneko16.cpp
+++ b/src/mame/drivers/kaneko16.cpp
@@ -97,12 +97,15 @@ Non-Bugs (happen on real PCB)
***************************************************************************/
#include "emu.h"
+#include "includes/kaneko16.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
-#include "includes/kaneko16.h"
#include "machine/watchdog.h"
#include "sound/ym2151.h"
#include "machine/kaneko_hit.h"
+#include "screen.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/kangaroo.cpp b/src/mame/drivers/kangaroo.cpp
index 112b9cad2e2..e74f17150ba 100644
--- a/src/mame/drivers/kangaroo.cpp
+++ b/src/mame/drivers/kangaroo.cpp
@@ -156,19 +156,20 @@
***************************************************************************/
#include "emu.h"
+#include "includes/kangaroo.h"
+
#include "cpu/mb88xx/mb88xx.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
-#include "includes/kangaroo.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_10MHz
-
-
/*************************************
*
* Machine init
diff --git a/src/mame/drivers/karnov.cpp b/src/mame/drivers/karnov.cpp
index 08421318114..872a11e03c5 100644
--- a/src/mame/drivers/karnov.cpp
+++ b/src/mame/drivers/karnov.cpp
@@ -79,12 +79,16 @@ Stephh's notes (based on the games M68000 code and some tests) :
*******************************************************************************/
#include "emu.h"
+#include "includes/karnov.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
#include "sound/3526intf.h"
-#include "includes/karnov.h"
#include "cpu/mcs51/mcs51.h"
+#include "screen.h"
+#include "speaker.h"
+
/*************************************
*
diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp
index 8c9f1ea8b4a..5da34fe0055 100644
--- a/src/mame/drivers/kas89.cpp
+++ b/src/mame/drivers/kas89.cpp
@@ -189,19 +189,21 @@
*************************************************************************************/
-#define MASTER_CLOCK XTAL_21_4772MHz
-#define VDP_MEM 0x40000
-
-
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
-#include "video/v9938.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "video/v9938.h"
+#include "speaker.h"
+
#include "kas89.lh"
+#define MASTER_CLOCK XTAL_21_4772MHz
+#define VDP_MEM 0x40000
+
+
class kas89_state : public driver_device
{
public:
diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp
index 005b1fbf314..a5d2039f6bf 100644
--- a/src/mame/drivers/kaypro.cpp
+++ b/src/mame/drivers/kaypro.cpp
@@ -43,9 +43,12 @@
#include "emu.h"
#include "includes/kaypro.h"
+
#include "machine/kay_kbd.h"
#include "formats/kaypro_dsk.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
READ8_MEMBER( kaypro_state::kaypro2x_87_r ) { return 0x7f; } /* to bypass unemulated HD controller */
diff --git a/src/mame/drivers/kc.cpp b/src/mame/drivers/kc.cpp
index ba3fec228c2..e83ba542781 100644
--- a/src/mame/drivers/kc.cpp
+++ b/src/mame/drivers/kc.cpp
@@ -13,11 +13,14 @@
******************************************************************************/
-
/* Core includes */
#include "emu.h"
#include "includes/kc.h"
+
#include "softlist.h"
+#include "screen.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START(kc85_4_io, AS_IO, 8, kc85_4_state)
ADDRESS_MAP_UNMAP_HIGH
diff --git a/src/mame/drivers/kchamp.cpp b/src/mame/drivers/kchamp.cpp
index b2e93fd1571..cb925f7af52 100644
--- a/src/mame/drivers/kchamp.cpp
+++ b/src/mame/drivers/kchamp.cpp
@@ -66,9 +66,12 @@ IO ports and memory map changes. Dip switches differ too.
#include "emu.h"
#include "includes/kchamp.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
/********************
diff --git a/src/mame/drivers/kickgoal.cpp b/src/mame/drivers/kickgoal.cpp
index 4a4b2b60df8..f653a717aba 100644
--- a/src/mame/drivers/kickgoal.cpp
+++ b/src/mame/drivers/kickgoal.cpp
@@ -37,11 +37,15 @@ lev 7 : 0x7c : 0000 0000 - x
*/
#include "emu.h"
+#include "includes/kickgoal.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "machine/eepromser.h"
#include "sound/okim6295.h"
-#include "includes/kickgoal.h"
+#include "screen.h"
+#include "speaker.h"
+
/**************************************************************************
This table converts commands sent from the main CPU, into sample numbers
diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp
index ab991ca97fd..087bc841830 100644
--- a/src/mame/drivers/kingdrby.cpp
+++ b/src/mame/drivers/kingdrby.cpp
@@ -72,13 +72,17 @@ sg1_b.e1 4096 0x92ef3c13 D2732D
*******************************************************************************************/
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
#include "machine/i8255.h"
+#include "machine/nvram.h"
+#include "sound/2203intf.h"
#include "sound/ay8910.h"
#include "sound/okim6295.h"
-#include "sound/2203intf.h"
-#include "machine/nvram.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "kingdrby.lh"
diff --git a/src/mame/drivers/kingobox.cpp b/src/mame/drivers/kingobox.cpp
index 7ce567dafe0..52ad6cfdbca 100644
--- a/src/mame/drivers/kingobox.cpp
+++ b/src/mame/drivers/kingobox.cpp
@@ -19,10 +19,14 @@ Main CPU:
#include "emu.h"
#include "includes/kingobox.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"
+
WRITE8_MEMBER(kingofb_state::video_interrupt_w)
{
diff --git a/src/mame/drivers/kingpin.cpp b/src/mame/drivers/kingpin.cpp
index 58026f44ccc..b581089475e 100644
--- a/src/mame/drivers/kingpin.cpp
+++ b/src/mame/drivers/kingpin.cpp
@@ -33,11 +33,12 @@ Todo:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "video/tms9928a.h"
-#include "sound/ay8910.h"
#include "machine/gen_latch.h"
#include "machine/i8255.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "video/tms9928a.h"
+#include "speaker.h"
class kingpin_state : public driver_device
diff --git a/src/mame/drivers/kinst.cpp b/src/mame/drivers/kinst.cpp
index da993b6e34f..58c7bda6d7f 100644
--- a/src/mame/drivers/kinst.cpp
+++ b/src/mame/drivers/kinst.cpp
@@ -131,11 +131,13 @@ Notes:
***************************************************************************/
#include "emu.h"
-#include "cpu/mips/mips3.h"
+#include "audio/dcs.h"
+
#include "cpu/adsp2100/adsp2100.h"
+#include "cpu/mips/mips3.h"
#include "machine/ataintf.h"
#include "machine/idehd.h"
-#include "audio/dcs.h"
+#include "screen.h"
class kinst_state : public driver_device
diff --git a/src/mame/drivers/klax.cpp b/src/mame/drivers/klax.cpp
index 77dca88d1a7..f5bdbcbd1e0 100644
--- a/src/mame/drivers/klax.cpp
+++ b/src/mame/drivers/klax.cpp
@@ -20,13 +20,15 @@
#include "emu.h"
-#include "cpu/m68000/m68000.h"
-#include "machine/watchdog.h"
-#include "sound/okim6295.h"
#include "includes/klax.h"
+#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
+#include "machine/watchdog.h"
+#include "sound/okim6295.h"
#include "sound/msm5205.h"
+#include "speaker.h"
+
/*************************************
*
diff --git a/src/mame/drivers/kncljoe.cpp b/src/mame/drivers/kncljoe.cpp
index 2343e57c5c6..39e5df12cac 100644
--- a/src/mame/drivers/kncljoe.cpp
+++ b/src/mame/drivers/kncljoe.cpp
@@ -28,10 +28,12 @@ Updates:
***************************************************************************/
#include "emu.h"
+#include "includes/kncljoe.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6800/m6800.h"
#include "sound/sn76496.h"
-#include "includes/kncljoe.h"
+#include "speaker.h"
WRITE8_MEMBER(kncljoe_state::sound_cmd_w)
diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp
index 672fdc1054b..3802e8e960b 100644
--- a/src/mame/drivers/koftball.cpp
+++ b/src/mame/drivers/koftball.cpp
@@ -35,6 +35,8 @@ ft5_v6_c4.u58 /
#include "sound/okim6295.h"
#include "sound/ym2413.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
class koftball_state : public driver_device
diff --git a/src/mame/drivers/koikoi.cpp b/src/mame/drivers/koikoi.cpp
index e0806a68345..7c066b35e9c 100644
--- a/src/mame/drivers/koikoi.cpp
+++ b/src/mame/drivers/koikoi.cpp
@@ -42,6 +42,8 @@ to prevent disabling inputs.
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
#define KOIKOI_CRYSTAL 15468000
diff --git a/src/mame/drivers/konamigq.cpp b/src/mame/drivers/konamigq.cpp
index 70440be9a9e..522c1571306 100644
--- a/src/mame/drivers/konamigq.cpp
+++ b/src/mame/drivers/konamigq.cpp
@@ -69,17 +69,20 @@
*/
#include "emu.h"
+#include "bus/scsi/scsi.h"
+#include "bus/scsi/scsihd.h"
#include "cpu/m68000/m68000.h"
#include "cpu/psx/psx.h"
#include "cpu/tms57002/tms57002.h"
-#include "video/psx.h"
#include "machine/am53cf96.h"
#include "machine/eepromser.h"
#include "machine/mb89371.h"
-#include "bus/scsi/scsi.h"
-#include "bus/scsi/scsihd.h"
-#include "sound/k056800.h"
+#include "machine/ram.h"
#include "sound/k054539.h"
+#include "sound/k056800.h"
+#include "video/psx.h"
+#include "speaker.h"
+
class konamigq_state : public driver_device
{
diff --git a/src/mame/drivers/konamigv.cpp b/src/mame/drivers/konamigv.cpp
index 16e162e49fa..c8aa17a5015 100644
--- a/src/mame/drivers/konamigv.cpp
+++ b/src/mame/drivers/konamigv.cpp
@@ -122,17 +122,20 @@ Notes:
*/
#include "emu.h"
-#include "cdrom.h"
+#include "bus/scsi/scsi.h"
+#include "bus/scsi/scsicd.h"
#include "cpu/psx/psx.h"
-#include "video/psx.h"
#include "machine/am53cf96.h"
#include "machine/eepromser.h"
#include "machine/intelfsh.h"
#include "machine/mb89371.h"
-#include "bus/scsi/scsi.h"
-#include "bus/scsi/scsicd.h"
-#include "sound/spu.h"
+#include "machine/ram.h"
#include "sound/cdda.h"
+#include "sound/spu.h"
+#include "video/psx.h"
+#include "speaker.h"
+#include "cdrom.h"
+
class konamigv_state : public driver_device
{
diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp
index e58a55202cc..b84e5086145 100644
--- a/src/mame/drivers/konamigx.cpp
+++ b/src/mame/drivers/konamigx.cpp
@@ -97,14 +97,17 @@
*/
#include "emu.h"
+#include "includes/konamigx.h"
+
#include "cpu/m68000/m68000.h"
-#include "cpu/z80/z80.h"
#include "cpu/tms57002/tms57002.h"
+#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
-#include "sound/k056800.h"
#include "sound/k054539.h"
-#include "includes/konamigx.h"
+#include "sound/k056800.h"
#include "rendlay.h"
+#include "speaker.h"
+
// TODO: check on PCB
#define MASTER_CLOCK XTAL_24MHz
diff --git a/src/mame/drivers/konamim2.cpp b/src/mame/drivers/konamim2.cpp
index 2b39ed49d0b..fb180a6874e 100644
--- a/src/mame/drivers/konamim2.cpp
+++ b/src/mame/drivers/konamim2.cpp
@@ -194,6 +194,7 @@ Notes:
#include "imagedev/chd_cd.h"
#include "machine/terminal.h"
#include "softlist.h"
+#include "screen.h"
struct CDE_DMA
{
diff --git a/src/mame/drivers/konendev.cpp b/src/mame/drivers/konendev.cpp
index c3c67107d41..4bbbfdc35ed 100644
--- a/src/mame/drivers/konendev.cpp
+++ b/src/mame/drivers/konendev.cpp
@@ -36,10 +36,12 @@
#include "emu.h"
#include "cpu/powerpc/ppc.h"
+#include "machine/eepromser.h"
+#include "machine/nvram.h"
#include "sound/ymz280b.h"
#include "video/k057714.h"
-#include "machine/nvram.h"
-#include "machine/eepromser.h"
+#include "screen.h"
+#include "speaker.h"
class konendev_state : public driver_device
{
diff --git a/src/mame/drivers/konmedal.cpp b/src/mame/drivers/konmedal.cpp
index 8ae098814f7..438e046e6f5 100644
--- a/src/mame/drivers/konmedal.cpp
+++ b/src/mame/drivers/konmedal.cpp
@@ -24,11 +24,13 @@ Inputs:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "machine/gen_latch.h"
#include "machine/eepromser.h"
-#include "video/konami_helper.h"
-#include "video/k054156_k054157_k056832.h"
+#include "machine/gen_latch.h"
#include "sound/ymz280b.h"
+#include "video/k054156_k054157_k056832.h"
+#include "video/konami_helper.h"
+#include "screen.h"
+#include "speaker.h"
class konmedal_state : public driver_device
{
@@ -39,7 +41,7 @@ public:
m_k056832(*this, "k056832"),
m_palette(*this, "palette"),
m_ymz(*this, "ymz")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<k056832_device> m_k056832;
diff --git a/src/mame/drivers/kontest.cpp b/src/mame/drivers/kontest.cpp
index 94d0004e875..e794a2fd9ad 100644
--- a/src/mame/drivers/kontest.cpp
+++ b/src/mame/drivers/kontest.cpp
@@ -23,6 +23,8 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
+#include "screen.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_24MHz
diff --git a/src/mame/drivers/kopunch.cpp b/src/mame/drivers/kopunch.cpp
index 37ef8db4194..50abe9a3b3c 100644
--- a/src/mame/drivers/kopunch.cpp
+++ b/src/mame/drivers/kopunch.cpp
@@ -32,9 +32,11 @@
********************************************************/
#include "emu.h"
+#include "includes/kopunch.h"
+
#include "cpu/i8085/i8085.h"
#include "machine/i8255.h"
-#include "includes/kopunch.h"
+#include "screen.h"
/********************************************************
diff --git a/src/mame/drivers/kramermc.cpp b/src/mame/drivers/kramermc.cpp
index b6b43e9f2d3..03f0fd2d900 100644
--- a/src/mame/drivers/kramermc.cpp
+++ b/src/mame/drivers/kramermc.cpp
@@ -10,9 +10,12 @@
#include "emu.h"
+#include "includes/kramermc.h"
+
#include "cpu/z80/z80.h"
#include "machine/z80pio.h"
-#include "includes/kramermc.h"
+#include "screen.h"
+
static GFXDECODE_START( kramermc )
GFXDECODE_ENTRY( "gfx1", 0x0000, kramermc_charlayout, 0, 1 )
diff --git a/src/mame/drivers/kron.cpp b/src/mame/drivers/kron.cpp
index 3df2fa1911f..74e7888b7d0 100644
--- a/src/mame/drivers/kron.cpp
+++ b/src/mame/drivers/kron.cpp
@@ -101,6 +101,7 @@
#include "emu.h"
#include "cpu/z180/z180.h"
#include "machine/pckeybrd.h"
+#include "screen.h"
#define VERBOSE 2
diff --git a/src/mame/drivers/ksayakyu.cpp b/src/mame/drivers/ksayakyu.cpp
index fa415d74da8..8c4846940ec 100644
--- a/src/mame/drivers/ksayakyu.cpp
+++ b/src/mame/drivers/ksayakyu.cpp
@@ -67,10 +67,14 @@ SRAM:
#include "emu.h"
#include "includes/ksayakyu.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"
+
#define MAIN_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp
index 442515fe917..0edb5b2d609 100644
--- a/src/mame/drivers/ksys573.cpp
+++ b/src/mame/drivers/ksys573.cpp
@@ -358,12 +358,15 @@ G: gun mania only, drives air soft gun (this game uses real BB bullet)
#include "machine/k573msu.h"
#include "machine/k573npu.h"
#include "machine/mb89371.h"
+#include "machine/ram.h"
#include "machine/timekpr.h"
#include "machine/upd4701.h"
#include "sound/spu.h"
#include "sound/cdda.h"
#include "video/psx.h"
#include "cdrom.h"
+#include "screen.h"
+#include "speaker.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp
index fda356a1cce..60e8417ef1d 100644
--- a/src/mame/drivers/kungfur.cpp
+++ b/src/mame/drivers/kungfur.cpp
@@ -58,8 +58,9 @@ mae(forward), migi(right), ushiro(back), hidari(left)
#include "emu.h"
#include "cpu/m6809/m6809.h"
-#include "sound/msm5205.h"
#include "machine/i8255.h"
+#include "sound/msm5205.h"
+#include "speaker.h"
#include "kungfur.lh"
diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp
index a0b1a5727e4..5a2fc951ae3 100644
--- a/src/mame/drivers/kurukuru.cpp
+++ b/src/mame/drivers/kurukuru.cpp
@@ -376,12 +376,13 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/gen_latch.h"
+#include "machine/nvram.h"
+#include "machine/ticket.h"
#include "sound/ay8910.h"
#include "sound/msm5205.h"
#include "video/v9938.h"
-#include "machine/ticket.h"
-#include "machine/nvram.h"
-#include "machine/gen_latch.h"
+#include "speaker.h"
#define UNICODE_10YEN "\xC2\xA5" "10"
#define UNICODE_100YEN "\xC2\xA5" "100"
diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp
index 4db25029c3b..22bfe9e15d7 100644
--- a/src/mame/drivers/kyocera.cpp
+++ b/src/mame/drivers/kyocera.cpp
@@ -69,6 +69,7 @@
#include "emu.h"
#include "includes/kyocera.h"
#include "softlist.h"
+#include "speaker.h"
/* Read/Write Handlers */
diff --git a/src/mame/drivers/kyugo.cpp b/src/mame/drivers/kyugo.cpp
index de6c30e318f..99411aa00fa 100644
--- a/src/mame/drivers/kyugo.cpp
+++ b/src/mame/drivers/kyugo.cpp
@@ -24,10 +24,13 @@
***************************************************************************/
#include "emu.h"
+#include "includes/kyugo.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "includes/kyugo.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/labyrunr.cpp b/src/mame/drivers/labyrunr.cpp
index 9b56dd489f3..636cd9aa1e3 100644
--- a/src/mame/drivers/labyrunr.cpp
+++ b/src/mame/drivers/labyrunr.cpp
@@ -11,12 +11,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/labyrunr.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/hd6309.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
-#include "includes/konamipt.h"
-#include "includes/labyrunr.h"
+#include "speaker.h"
INTERRUPT_GEN_MEMBER(labyrunr_state::labyrunr_vblank_interrupt)
diff --git a/src/mame/drivers/ladybug.cpp b/src/mame/drivers/ladybug.cpp
index b8d00dbd78e..21cdf5af40e 100644
--- a/src/mame/drivers/ladybug.cpp
+++ b/src/mame/drivers/ladybug.cpp
@@ -61,9 +61,12 @@ TODO:
*/
#include "emu.h"
+#include "includes/ladybug.h"
+
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
-#include "includes/ladybug.h"
+#include "screen.h"
+#include "speaker.h"
static ADDRESS_MAP_START( ladybug_map, AS_PROGRAM, 8, ladybug_state )
diff --git a/src/mame/drivers/ladyfrog.cpp b/src/mame/drivers/ladyfrog.cpp
index 2fadf53adab..6f91ad613e3 100644
--- a/src/mame/drivers/ladyfrog.cpp
+++ b/src/mame/drivers/ladyfrog.cpp
@@ -49,9 +49,12 @@ Notes:
*/
#include "emu.h"
+#include "includes/ladyfrog.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/ladyfrog.h"
+#include "screen.h"
+#include "speaker.h"
READ8_MEMBER(ladyfrog_state::from_snd_r)
diff --git a/src/mame/drivers/laser3k.cpp b/src/mame/drivers/laser3k.cpp
index c478f1cc07e..bd73426e89b 100644
--- a/src/mame/drivers/laser3k.cpp
+++ b/src/mame/drivers/laser3k.cpp
@@ -35,8 +35,10 @@
#include "machine/bankdev.h"
#include "machine/ram.h"
#include "machine/kb3600.h"
-#include "sound/speaker.h"
#include "sound/sn76496.h"
+#include "sound/spkrdev.h"
+#include "screen.h"
+#include "speaker.h"
enum
{
diff --git a/src/mame/drivers/laserbas.cpp b/src/mame/drivers/laserbas.cpp
index c079b525a74..db3f131962d 100644
--- a/src/mame/drivers/laserbas.cpp
+++ b/src/mame/drivers/laserbas.cpp
@@ -61,10 +61,12 @@ expected: 43 FB CC 9A D4 23 6C 01 3E <- From ROM 4
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
#include "machine/pit8253.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
class laserbas_state : public driver_device
{
diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp
index 049e4c0e573..db01721f61f 100644
--- a/src/mame/drivers/laserbat.cpp
+++ b/src/mame/drivers/laserbat.cpp
@@ -77,7 +77,6 @@
*/
#include "emu.h"
-
#include "includes/laserbat.h"
#include "cpu/m6800/m6800.h"
@@ -85,6 +84,8 @@
#include "machine/clock.h"
+#include "speaker.h"
+
WRITE8_MEMBER(laserbat_state_base::ct_io_w)
{
diff --git a/src/mame/drivers/lasso.cpp b/src/mame/drivers/lasso.cpp
index 7a765e90717..9eb4608ea68 100644
--- a/src/mame/drivers/lasso.cpp
+++ b/src/mame/drivers/lasso.cpp
@@ -32,11 +32,14 @@ DIP locations verified for:
#include "emu.h"
#include "includes/lasso.h"
+
#include "cpu/m6502/m6502.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"
INPUT_CHANGED_MEMBER(lasso_state::coin_inserted)
diff --git a/src/mame/drivers/lastbank.cpp b/src/mame/drivers/lastbank.cpp
index d89033ac514..38ba52af2bf 100644
--- a/src/mame/drivers/lastbank.cpp
+++ b/src/mame/drivers/lastbank.cpp
@@ -17,6 +17,9 @@
#include "sound/okim6295.h"
#include "machine/nvram.h"
#include "machine/tc009xlvc.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_14_31818MHz
diff --git a/src/mame/drivers/lastduel.cpp b/src/mame/drivers/lastduel.cpp
index 6cd3d5242f2..8d6e1f879a1 100644
--- a/src/mame/drivers/lastduel.cpp
+++ b/src/mame/drivers/lastduel.cpp
@@ -121,11 +121,14 @@ Notes:
**************************************************************************/
#include "emu.h"
+#include "includes/lastduel.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
-#include "includes/lastduel.h"
+#include "screen.h"
+#include "speaker.h"
/******************************************************************************/
diff --git a/src/mame/drivers/lastfght.cpp b/src/mame/drivers/lastfght.cpp
index e3808728387..326147d30b9 100644
--- a/src/mame/drivers/lastfght.cpp
+++ b/src/mame/drivers/lastfght.cpp
@@ -67,6 +67,8 @@ Notes:
#include "emu.h"
#include "cpu/h8/h83048.h"
#include "machine/nvram.h"
+#include "screen.h"
+
class lastfght_state : public driver_device
{
diff --git a/src/mame/drivers/laz_aftrshok.cpp b/src/mame/drivers/laz_aftrshok.cpp
index d9611e29dd6..28bd3e4e52e 100644
--- a/src/mame/drivers/laz_aftrshok.cpp
+++ b/src/mame/drivers/laz_aftrshok.cpp
@@ -31,6 +31,7 @@ https://www.youtube.com/watch?v=9DIhuOEVwf4
#include "emu.h"
#include "sound/okim6295.h"
+#include "speaker.h"
class aftrshok_state : public driver_device
diff --git a/src/mame/drivers/laz_awetoss.cpp b/src/mame/drivers/laz_awetoss.cpp
index e0ae4697f64..6e39139461b 100644
--- a/src/mame/drivers/laz_awetoss.cpp
+++ b/src/mame/drivers/laz_awetoss.cpp
@@ -11,6 +11,7 @@ Awesome tossem u21 = 27c512
#include "emu.h"
#include "sound/okim6295.h"
+#include "speaker.h"
class awetoss_state : public driver_device
diff --git a/src/mame/drivers/laz_ribrac.cpp b/src/mame/drivers/laz_ribrac.cpp
index fde9067a7b0..d8b19d7aecf 100644
--- a/src/mame/drivers/laz_ribrac.cpp
+++ b/src/mame/drivers/laz_ribrac.cpp
@@ -15,6 +15,7 @@ http://ohwow-arcade.com/Assets/Game_Manuals/RIBBIT%20RACIN.PDF
#include "emu.h"
#include "sound/okim6295.h"
+#include "speaker.h"
class laz_ribrac_state : public driver_device
diff --git a/src/mame/drivers/lazercmd.cpp b/src/mame/drivers/lazercmd.cpp
index c7ddcea5c2f..89aa2419121 100644
--- a/src/mame/drivers/lazercmd.cpp
+++ b/src/mame/drivers/lazercmd.cpp
@@ -236,6 +236,8 @@
#include "emu.h"
#include "includes/lazercmd.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
// color overlays, bbonk does not have an overlay
#include "lazercmd.lh"
diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp
index 4b9482f5bf3..908a6e49284 100644
--- a/src/mame/drivers/lbeach.cpp
+++ b/src/mame/drivers/lbeach.cpp
@@ -26,6 +26,7 @@ TODO:
#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "machine/nvram.h"
+#include "screen.h"
#include "lbeach.lh"
diff --git a/src/mame/drivers/lc80.cpp b/src/mame/drivers/lc80.cpp
index ec3f438297e..ef866d363ac 100644
--- a/src/mame/drivers/lc80.cpp
+++ b/src/mame/drivers/lc80.cpp
@@ -43,6 +43,7 @@
#include "emu.h"
#include "includes/lc80.h"
+#include "speaker.h"
#include "lc80.lh"
/* Memory Maps */
diff --git a/src/mame/drivers/lcmate2.cpp b/src/mame/drivers/lcmate2.cpp
index a7570d15f54..25fbc3ec82f 100644
--- a/src/mame/drivers/lcmate2.cpp
+++ b/src/mame/drivers/lcmate2.cpp
@@ -31,11 +31,13 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "machine/rp5c15.h"
#include "machine/nvram.h"
+#include "machine/rp5c15.h"
+#include "sound/spkrdev.h"
#include "video/hd44780.h"
-#include "sound/speaker.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
class lcmate2_state : public driver_device
diff --git a/src/mame/drivers/ldplayer.cpp b/src/mame/drivers/ldplayer.cpp
index bc5feb2d458..9fda0081662 100644
--- a/src/mame/drivers/ldplayer.cpp
+++ b/src/mame/drivers/ldplayer.cpp
@@ -9,16 +9,23 @@
**************************************************************************/
#include "emu.h"
-#include "emuopts.h"
-#include "chd.h"
+
#include "cpu/mcs48/mcs48.h"
#include "machine/ldpr8210.h"
#include "machine/ldv1000.h"
-#include <ctype.h>
+
#include "ui/uimain.h"
+#include "emuopts.h"
+#include "speaker.h"
+
+#include "chd.h"
+
#include "pr8210.lh"
+#include <ctype.h>
+
+
class ldplayer_state : public driver_device
{
public:
diff --git a/src/mame/drivers/leapster.cpp b/src/mame/drivers/leapster.cpp
index e25c835e763..ee2b853bfcf 100644
--- a/src/mame/drivers/leapster.cpp
+++ b/src/mame/drivers/leapster.cpp
@@ -210,8 +210,10 @@ PCB - LEAPSTER-TV:
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "cpu/arcompact/arcompact.h"
+#include "screen.h"
#include "softlist.h"
+
class leapster_state : public driver_device
{
public:
diff --git a/src/mame/drivers/legionna.cpp b/src/mame/drivers/legionna.cpp
index 7e420573db1..61121ceee76 100644
--- a/src/mame/drivers/legionna.cpp
+++ b/src/mame/drivers/legionna.cpp
@@ -81,12 +81,17 @@ Preliminary COP MCU memory map
***************************************************************************/
#include "emu.h"
+#include "includes/legionna.h"
+
+#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
#include "sound/ym2151.h"
-#include "cpu/m68000/m68000.h"
#include "machine/seicop.h"
-#include "includes/legionna.h"
+
+#include "screen.h"
+#include "speaker.h"
+
/*****************************************************************************/
diff --git a/src/mame/drivers/leland.cpp b/src/mame/drivers/leland.cpp
index 004d50b7b5f..64e83f6bd87 100644
--- a/src/mame/drivers/leland.cpp
+++ b/src/mame/drivers/leland.cpp
@@ -63,6 +63,7 @@
#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
/* Master Clock2 is for Asylum, Ataxx, Brute Force, Danny Sullivan's Indy Heat, World Soccer Finals */
diff --git a/src/mame/drivers/lemmings.cpp b/src/mame/drivers/lemmings.cpp
index 9e67c7ec820..3fb5d5d7bbd 100644
--- a/src/mame/drivers/lemmings.cpp
+++ b/src/mame/drivers/lemmings.cpp
@@ -18,11 +18,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/lemmings.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/lemmings.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE16_MEMBER(lemmings_state::lemmings_control_w)
{
diff --git a/src/mame/drivers/lethal.cpp b/src/mame/drivers/lethal.cpp
index c071377641a..8a00ea24dcd 100644
--- a/src/mame/drivers/lethal.cpp
+++ b/src/mame/drivers/lethal.cpp
@@ -247,13 +247,17 @@ maybe some sprite placement issues
***************************************************************************/
#include "emu.h"
+#include "includes/lethal.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/m6809/hd6309.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/eepromser.h"
#include "sound/k054539.h"
-#include "includes/lethal.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MAIN_CLOCK XTAL_24MHz
#define SOUND_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/lethalj.cpp b/src/mame/drivers/lethalj.cpp
index 2b4914e93ac..d55fd3490e7 100644
--- a/src/mame/drivers/lethalj.cpp
+++ b/src/mame/drivers/lethalj.cpp
@@ -140,9 +140,10 @@ Pin #11(+) | | R |
***************************************************************************/
#include "emu.h"
-#include "cpu/tms34010/tms34010.h"
#include "includes/lethalj.h"
+
#include "sound/okim6295.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_40MHz
diff --git a/src/mame/drivers/lgp.cpp b/src/mame/drivers/lgp.cpp
index 9b4e2dd8310..c9ccb9c9d93 100644
--- a/src/mame/drivers/lgp.cpp
+++ b/src/mame/drivers/lgp.cpp
@@ -67,8 +67,9 @@ Dumping Notes:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "render.h"
#include "machine/ldv1000.h"
+#include "render.h"
+#include "speaker.h"
class lgp_state : public driver_device
diff --git a/src/mame/drivers/liberate.cpp b/src/mame/drivers/liberate.cpp
index 1665d748bb9..d4c810d4eb6 100644
--- a/src/mame/drivers/liberate.cpp
+++ b/src/mame/drivers/liberate.cpp
@@ -17,11 +17,15 @@
*******************************************************************************/
#include "emu.h"
+#include "includes/liberate.h"
+
#include "cpu/m6502/deco16.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
-#include "includes/liberate.h"
#include "machine/deco222.h"
+#include "screen.h"
+#include "speaker.h"
+
/*************************************
*
diff --git a/src/mame/drivers/liberatr.cpp b/src/mame/drivers/liberatr.cpp
index e0626ac0cda..989b607e1fa 100644
--- a/src/mame/drivers/liberatr.cpp
+++ b/src/mame/drivers/liberatr.cpp
@@ -138,6 +138,7 @@
#include "emu.h"
#include "includes/liberatr.h"
+#include "speaker.h"
#define MASTER_CLOCK 20000000 /* 20Mhz Main Clock Xtal */
diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp
index 40b9c8f2997..aa249e7be94 100644
--- a/src/mame/drivers/limenko.cpp
+++ b/src/mame/drivers/limenko.cpp
@@ -28,8 +28,10 @@
#include "cpu/e132xs/e132xs.h"
#include "machine/eepromser.h"
#include "machine/gen_latch.h"
-#include "sound/qs1000.h"
#include "sound/okim6295.h"
+#include "sound/qs1000.h"
+#include "screen.h"
+#include "speaker.h"
class limenko_state : public driver_device
diff --git a/src/mame/drivers/lisa.cpp b/src/mame/drivers/lisa.cpp
index 1e5dad25b03..fb67ddd07f8 100644
--- a/src/mame/drivers/lisa.cpp
+++ b/src/mame/drivers/lisa.cpp
@@ -11,11 +11,13 @@
*********************************************************************/
#include "emu.h"
+#include "includes/lisa.h"
#include "cpu/m6502/m6504.h"
#include "cpu/cop400/cop400.h"
-#include "includes/lisa.h"
#include "formats/ap_dsk35.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
/***************************************************************************
ADDRESS MAP
diff --git a/src/mame/drivers/littlerb.cpp b/src/mame/drivers/littlerb.cpp
index 52bafd6cd9f..7e17e2abc02 100644
--- a/src/mame/drivers/littlerb.cpp
+++ b/src/mame/drivers/littlerb.cpp
@@ -8,9 +8,6 @@ David Haywood
*/
-#define littlerb_printf logerror
-#define littlerb_alt_printf logerror
-
/*
Notes:
@@ -71,6 +68,10 @@ Dip sw.2
#include "machine/inder_vid.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
+#define littlerb_printf logerror
+#define littlerb_alt_printf logerror
class littlerb_state : public driver_device
{
diff --git a/src/mame/drivers/lkage.cpp b/src/mame/drivers/lkage.cpp
index 91c84e8ee92..a9d9a413903 100644
--- a/src/mame/drivers/lkage.cpp
+++ b/src/mame/drivers/lkage.cpp
@@ -86,10 +86,14 @@ TODO:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+
+#include "includes/lkage.h"
#include "cpu/m6805/m6805.h"
+#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
-#include "includes/lkage.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MAIN_CPU_CLOCK (XTAL_12MHz/2)
#define SOUND_CPU_CLOCK (XTAL_8MHz/2)
diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp
index dd73108bab9..62d593778c5 100644
--- a/src/mame/drivers/llc.cpp
+++ b/src/mame/drivers/llc.cpp
@@ -48,10 +48,15 @@
#include "emu.h"
-#include "machine/keyboard.h"
#include "includes/llc.h"
+
+#include "machine/keyboard.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "llc1.lh"
+
/* Address maps */
static ADDRESS_MAP_START( llc1_mem, AS_PROGRAM, 8, llc_state )
AM_RANGE(0x0000, 0x07ff) AM_ROM // Monitor ROM
diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp
index 75e97a43ec1..a1e45abf147 100644
--- a/src/mame/drivers/lockon.cpp
+++ b/src/mame/drivers/lockon.cpp
@@ -12,11 +12,14 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/lockon.h"
+
#include "cpu/nec/nec.h"
+#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/flt_vol.h"
-#include "includes/lockon.h"
+#include "speaker.h"
+
#define V30_GND_ADDR ((m_ctrl_reg & 0x3) << 16)
#define V30_OBJ_ADDR ((m_ctrl_reg & 0x18) << 13)
diff --git a/src/mame/drivers/lola8a.cpp b/src/mame/drivers/lola8a.cpp
index 4e573c58a63..def2ca69321 100644
--- a/src/mame/drivers/lola8a.cpp
+++ b/src/mame/drivers/lola8a.cpp
@@ -21,10 +21,13 @@
#include "emu.h"
#include "cpu/i8085/i8085.h"
-#include "video/mc6845.h"
-#include "sound/ay8910.h"
#include "imagedev/cassette.h"
+#include "sound/ay8910.h"
#include "sound/wave.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
#define AY8910_TAG "g12"
#define HD46505SP_TAG "h45"
diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp
index 4b4218fc570..005b631a11a 100644
--- a/src/mame/drivers/looping.cpp
+++ b/src/mame/drivers/looping.cpp
@@ -65,6 +65,8 @@ L056-6 9A " " VLI-8-4 7A "
#include "sound/tms5220.h"
#include "sound/volt_reg.h"
#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp
index d80dfc1d1b8..999097f95d5 100644
--- a/src/mame/drivers/lordgun.cpp
+++ b/src/mame/drivers/lordgun.cpp
@@ -40,12 +40,14 @@ Notes:
*************************************************************************************************************/
#include "emu.h"
+#include "includes/lordgun.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "sound/3812intf.h"
#include "sound/ymf278b.h"
-#include "includes/lordgun.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/lsasquad.cpp b/src/mame/drivers/lsasquad.cpp
index 7934d6993dd..7f981732f4a 100644
--- a/src/mame/drivers/lsasquad.cpp
+++ b/src/mame/drivers/lsasquad.cpp
@@ -144,11 +144,14 @@ Notes:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/lsasquad.h"
+
#include "cpu/m6805/m6805.h"
-#include "sound/ay8910.h"
+#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
-#include "includes/lsasquad.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_24MHz
diff --git a/src/mame/drivers/ltcasino.cpp b/src/mame/drivers/ltcasino.cpp
index 458f27d342c..6a61524c346 100644
--- a/src/mame/drivers/ltcasino.cpp
+++ b/src/mame/drivers/ltcasino.cpp
@@ -18,6 +18,8 @@ etc.
#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class ltcasino_state : public driver_device
diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp
index a6fe6c1834d..fdb64913e44 100644
--- a/src/mame/drivers/ltd.cpp
+++ b/src/mame/drivers/ltd.cpp
@@ -42,10 +42,14 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "sound/ay8910.h"
+#include "speaker.h"
+
#include "ltd.lh"
+
class ltd_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp
index f95038a3b9c..d11ee713476 100644
--- a/src/mame/drivers/luckgrln.cpp
+++ b/src/mame/drivers/luckgrln.cpp
@@ -82,6 +82,9 @@
#include "emu.h"
#include "cpu/z180/z180.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "luckgrln.lh"
diff --git a/src/mame/drivers/lucky74.cpp b/src/mame/drivers/lucky74.cpp
index ffba1469bad..dd49c52350f 100644
--- a/src/mame/drivers/lucky74.cpp
+++ b/src/mame/drivers/lucky74.cpp
@@ -758,6 +758,20 @@
*****************************************************************************************/
+#include "emu.h"
+#include "includes/lucky74.h"
+
+#include "cpu/z80/z80.h"
+#include "sound/ay8910.h"
+#include "sound/msm5205.h"
+#include "sound/sn76496.h"
+#include "machine/i8255.h"
+#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
+
+#include "lucky74.lh"
+
#define MASTER_CLOCK XTAL_12MHz /* confirmed */
@@ -783,16 +797,6 @@
#define C_06B49P_CLKOUT_19 (MASTER_CLOCK/200000) /* 60 Hz. (V-Sync) */
-#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
-#include "sound/sn76496.h"
-#include "sound/msm5205.h"
-#include "machine/i8255.h"
-#include "machine/nvram.h"
-#include "lucky74.lh"
-#include "includes/lucky74.h"
-
void lucky74_state::machine_reset()
{
m_copro_sm7831 = 0;
diff --git a/src/mame/drivers/lvcards.cpp b/src/mame/drivers/lvcards.cpp
index e3d7f51cb22..5d3b6bb70fc 100644
--- a/src/mame/drivers/lvcards.cpp
+++ b/src/mame/drivers/lvcards.cpp
@@ -74,10 +74,13 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "includes/lvcards.h"
+
#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
#include "machine/nvram.h"
-#include "includes/lvcards.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
MACHINE_START_MEMBER(lvcards_state,lvpoker)
diff --git a/src/mame/drivers/lviv.cpp b/src/mame/drivers/lviv.cpp
index 8a5bc23658f..6be2f7aa9a1 100644
--- a/src/mame/drivers/lviv.cpp
+++ b/src/mame/drivers/lviv.cpp
@@ -283,16 +283,17 @@ Timings:
*******************************************************************************/
#include "emu.h"
+#include "includes/lviv.h"
+
#include "cpu/i8085/i8085.h"
-#include "sound/speaker.h"
#include "sound/wave.h"
-#include "machine/i8255.h"
-#include "includes/lviv.h"
-#include "imagedev/snapquik.h"
-#include "imagedev/cassette.h"
-#include "formats/lviv_lvt.h"
-#include "machine/ram.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/lviv_lvt.h"
+
/* I/O ports */
diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp
index 30a37fe3ecd..65a063bd636 100644
--- a/src/mame/drivers/lwings.cpp
+++ b/src/mame/drivers/lwings.cpp
@@ -50,11 +50,14 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/lwings.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
-#include "includes/lwings.h"
+#include "screen.h"
+#include "speaker.h"
/* Avengers runs on hardware almost identical to Trojan, but with a protection
* device and some small changes to the memory map and videohardware.
diff --git a/src/mame/drivers/lynx.cpp b/src/mame/drivers/lynx.cpp
index 4624a9e7f88..598ed06981c 100644
--- a/src/mame/drivers/lynx.cpp
+++ b/src/mame/drivers/lynx.cpp
@@ -9,10 +9,13 @@
******************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m65sc02.h"
-#include "audio/lynx.h"
#include "includes/lynx.h"
+#include "audio/lynx.h"
+
+#include "cpu/m6502/m65sc02.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#include "lynx.lh"
diff --git a/src/mame/drivers/m10.cpp b/src/mame/drivers/m10.cpp
index d2cf6c183dd..8489e7787b3 100644
--- a/src/mame/drivers/m10.cpp
+++ b/src/mame/drivers/m10.cpp
@@ -113,10 +113,12 @@ Notes (couriersud)
***************************************************************************/
#include "emu.h"
+#include "includes/m10.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/rescap.h"
#include "sound/samples.h"
-#include "includes/m10.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/m107.cpp b/src/mame/drivers/m107.cpp
index c2df3bc0ec2..74f6b79bcd2 100644
--- a/src/mame/drivers/m107.cpp
+++ b/src/mame/drivers/m107.cpp
@@ -26,13 +26,16 @@ confirmed for m107 games as well.
*******************************************************************************/
#include "emu.h"
-#include "cpu/nec/nec.h"
-#include "cpu/nec/v25.h"
#include "includes/m107.h"
#include "includes/iremipt.h"
+
+#include "cpu/nec/nec.h"
+#include "cpu/nec/v25.h"
#include "machine/irem_cpu.h"
#include "sound/ym2151.h"
#include "sound/iremga20.h"
+#include "speaker.h"
+
// this is the hacky code from m92.c, but better than per-game irq vector hacks.
#define USE_HACKED_IRQS
diff --git a/src/mame/drivers/m14.cpp b/src/mame/drivers/m14.cpp
index 43a8ae91449..e8a92f1cae4 100644
--- a/src/mame/drivers/m14.cpp
+++ b/src/mame/drivers/m14.cpp
@@ -54,6 +54,7 @@ Dumped by Chackn
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "screen.h"
class m14_state : public driver_device
diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp
index 12481737d0f..9abf3d68c91 100644
--- a/src/mame/drivers/m20.cpp
+++ b/src/mame/drivers/m20.cpp
@@ -37,21 +37,26 @@ E I1 Vectored interrupt error
#include "emu.h"
-#include "cpu/z8000/z8000.h"
+#include "machine/m20_8086.h"
+#include "machine/m20_kbd.h"
+
+#include "bus/rs232/rs232.h"
#include "cpu/i86/i86.h"
-#include "video/mc6845.h"
-#include "machine/ram.h"
-#include "machine/wd_fdc.h"
+#include "cpu/z8000/z8000.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
-#include "machine/pit8253.h"
#include "machine/pic8259.h"
+#include "machine/pit8253.h"
+#include "machine/ram.h"
+#include "machine/wd_fdc.h"
+#include "video/mc6845.h"
+
+#include "screen.h"
+#include "softlist.h"
+
#include "formats/m20_dsk.h"
#include "formats/pc_dsk.h"
-#include "machine/m20_kbd.h"
-#include "bus/rs232/rs232.h"
-#include "machine/m20_8086.h"
-#include "softlist.h"
+
class m20_state : public driver_device
{
diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp
index c1192e3f35d..2c7d99b81eb 100644
--- a/src/mame/drivers/m5.cpp
+++ b/src/mame/drivers/m5.cpp
@@ -275,24 +275,21 @@ Few other notes:
#include "emu.h"
+#include "includes/m5.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
-#include "formats/m5_dsk.h"
-#include "formats/sord_cas.h"
-#include "imagedev/cassette.h"
-#include "bus/centronics/ctronics.h"
-#include "machine/i8255.h"
-#include "machine/ram.h"
-#include "machine/wd_fdc.h" //brno mod
-#include "machine/upd765.h"
#include "machine/z80ctc.h"
#include "sound/sn76496.h"
#include "video/tms9928a.h"
-#include "bus/m5/slot.h"
+
#include "bus/m5/rom.h"
+
#include "softlist.h"
-#include "includes/m5.h"
+#include "speaker.h"
+#include "formats/m5_dsk.h"
+#include "formats/sord_cas.h"
diff --git a/src/mame/drivers/m57.cpp b/src/mame/drivers/m57.cpp
index 1b039cfe035..5a9f85c00d4 100644
--- a/src/mame/drivers/m57.cpp
+++ b/src/mame/drivers/m57.cpp
@@ -50,10 +50,13 @@
****************************************************************************/
#include "emu.h"
+#include "includes/m57.h"
+#include "includes/iremipt.h"
+
#include "cpu/z80/z80.h"
#include "audio/irem.h"
-#include "includes/iremipt.h"
-#include "includes/m57.h"
+
+#include "screen.h"
#define MASTER_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/m62.cpp b/src/mame/drivers/m62.cpp
index 25c0fce3020..a770110b9c0 100644
--- a/src/mame/drivers/m62.cpp
+++ b/src/mame/drivers/m62.cpp
@@ -70,9 +70,11 @@ other supported games as well.
**************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "includes/iremipt.h"
#include "includes/m62.h"
+#include "includes/iremipt.h"
+
+#include "cpu/z80/z80.h"
+#include "screen.h"
/* Lode Runner 2 seems to have a simple protection on the bank switching */
diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp
index 28d694dddda..57c9016fd72 100644
--- a/src/mame/drivers/m63.cpp
+++ b/src/mame/drivers/m63.cpp
@@ -123,6 +123,8 @@ Dip locations verified for:
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
#include "sound/samples.h"
+#include "screen.h"
+#include "speaker.h"
class m63_state : public driver_device
{
diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp
index ce12bce08da..2f5ae1657ec 100644
--- a/src/mame/drivers/m72.cpp
+++ b/src/mame/drivers/m72.cpp
@@ -186,6 +186,7 @@ other supported games as well.
#include "emu.h"
#include "includes/m72.h"
#include "includes/iremipt.h"
+
#include "cpu/mcs51/mcs51.h"
#include "cpu/nec/nec.h"
#include "cpu/nec/v25.h"
@@ -193,6 +194,8 @@ other supported games as well.
#include "machine/irem_cpu.h"
#include "sound/ym2151.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_32MHz
#define SOUND_CLOCK XTAL_3_579545MHz
diff --git a/src/mame/drivers/m79152pc.cpp b/src/mame/drivers/m79152pc.cpp
index 49819e96136..d216e0d588d 100644
--- a/src/mame/drivers/m79152pc.cpp
+++ b/src/mame/drivers/m79152pc.cpp
@@ -12,6 +12,8 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
+
class m79152pc_state : public driver_device
{
@@ -22,7 +24,7 @@ public:
, m_p_attributes(*this, "attributes")
, m_maincpu(*this, "maincpu")
, m_p_chargen(*this, "chargen")
- { }
+ { }
uint32_t screen_update_m79152pc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/drivers/m79amb.cpp b/src/mame/drivers/m79amb.cpp
index 8a331688c63..116018e518d 100644
--- a/src/mame/drivers/m79amb.cpp
+++ b/src/mame/drivers/m79amb.cpp
@@ -58,7 +58,11 @@ and two large (paddles pretending to be) guns.
#include "emu.h"
#include "includes/m79amb.h"
+
#include "cpu/i8085/i8085.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(m79amb_state::ramtek_videoram_w)
{
diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp
index b363d806a68..68c048a6f55 100644
--- a/src/mame/drivers/m90.cpp
+++ b/src/mame/drivers/m90.cpp
@@ -21,6 +21,7 @@
#include "emu.h"
#include "includes/m90.h"
#include "includes/iremipt.h"
+
#include "cpu/nec/nec.h"
#include "cpu/nec/v25.h"
#include "cpu/z80/z80.h"
@@ -28,6 +29,8 @@
#include "sound/dac.h"
#include "sound/ym2151.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
/***************************************************************************/
diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp
index 71cd8aca63d..cadf88db39d 100644
--- a/src/mame/drivers/m92.cpp
+++ b/src/mame/drivers/m92.cpp
@@ -201,13 +201,15 @@ psoldier dip locations still need verification.
*****************************************************************************/
#include "emu.h"
-#include "cpu/nec/nec.h"
-#include "cpu/nec/v25.h"
#include "includes/m92.h"
#include "includes/iremipt.h"
+
+#include "cpu/nec/nec.h"
+#include "cpu/nec/v25.h"
#include "machine/irem_cpu.h"
#include "sound/ym2151.h"
#include "sound/iremga20.h"
+#include "speaker.h"
// I haven't managed to find a way to keep nbbatman happy when using the proper upd71059c device
diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp
index fc02ed09196..d42f940160c 100644
--- a/src/mame/drivers/mac.cpp
+++ b/src/mame/drivers/mac.cpp
@@ -82,6 +82,7 @@
#include "machine/macadb.h"
#include "softlist.h"
+#include "speaker.h"
#include "mac.lh"
#define C7M (7833600)
diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp
index 44aa12ddd3b..3557adbe421 100644
--- a/src/mame/drivers/mac128.cpp
+++ b/src/mame/drivers/mac128.cpp
@@ -96,7 +96,9 @@ c0 8 data bits, Rx disabled
#include "bus/scsi/scsi.h"
#include "bus/scsi/scsihd.h"
#include "bus/scsi/scsicd.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#define MAC_SCREEN_NAME "screen"
#define MAC_539X_1_TAG "539x_1"
diff --git a/src/mame/drivers/macpci.cpp b/src/mame/drivers/macpci.cpp
index ad87d2bd1e8..e76ed9d4dac 100644
--- a/src/mame/drivers/macpci.cpp
+++ b/src/mame/drivers/macpci.cpp
@@ -41,7 +41,9 @@
#include "cpu/powerpc/ppc.h"
#include "imagedev/chd_cd.h"
#include "sound/cdda.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
READ64_MEMBER( macpci_state::unk1_r )
{
diff --git a/src/mame/drivers/macrossp.cpp b/src/mame/drivers/macrossp.cpp
index c893b353d35..57c12137b40 100644
--- a/src/mame/drivers/macrossp.cpp
+++ b/src/mame/drivers/macrossp.cpp
@@ -284,9 +284,12 @@ Notes:
#include "emu.h"
+#include "includes/macrossp.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/es5506.h"
-#include "includes/macrossp.h"
+#include "speaker.h"
+
/*** VARIOUS READ / WRITE HANDLERS *******************************************/
diff --git a/src/mame/drivers/madalien.cpp b/src/mame/drivers/madalien.cpp
index 15f9f3cdc87..ba4a1054aae 100644
--- a/src/mame/drivers/madalien.cpp
+++ b/src/mame/drivers/madalien.cpp
@@ -9,10 +9,13 @@
***************************************************************************/
#include "emu.h"
+#include "includes/madalien.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
-#include "includes/madalien.h"
+#include "screen.h"
+#include "speaker.h"
#define SOUND_CLOCK XTAL_4MHz
diff --git a/src/mame/drivers/madmotor.cpp b/src/mame/drivers/madmotor.cpp
index 12e134e15c5..dad6e18407b 100644
--- a/src/mame/drivers/madmotor.cpp
+++ b/src/mame/drivers/madmotor.cpp
@@ -15,12 +15,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/madmotor.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "sound/2203intf.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/madmotor.h"
+#include "screen.h"
+#include "speaker.h"
/******************************************************************************/
diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp
index 08612642b5d..0057e4db9cc 100644
--- a/src/mame/drivers/magic10.cpp
+++ b/src/mame/drivers/magic10.cpp
@@ -89,20 +89,24 @@
****************************************************************************/
-#define MAIN_CLOCK XTAL_20MHz
-#define AUX_CLOCK XTAL_30MHz
-
-#define CPU_CLOCK MAIN_CLOCK/2
-
-
#include "emu.h"
+
#include "cpu/m68000/m68000.h"
-#include "sound/okim6295.h"
#include "machine/nvram.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "sgsafari.lh"
#include "musicsrt.lh"
+#define MAIN_CLOCK XTAL_20MHz
+#define AUX_CLOCK XTAL_30MHz
+
+#define CPU_CLOCK MAIN_CLOCK/2
+
+
class magic10_state : public driver_device
{
public:
diff --git a/src/mame/drivers/magicard.cpp b/src/mame/drivers/magicard.cpp
index b6b868d8ade..2ff9031ceb1 100644
--- a/src/mame/drivers/magicard.cpp
+++ b/src/mame/drivers/magicard.cpp
@@ -160,15 +160,17 @@
*******************************************************************************/
-
-#define CLOCK_A XTAL_30MHz
-#define CLOCK_B XTAL_8MHz
-#define CLOCK_C XTAL_19_6608MHz
-
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/ym2413.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define CLOCK_A XTAL_30MHz
+#define CLOCK_B XTAL_8MHz
+#define CLOCK_C XTAL_19_6608MHz
class magicard_state : public driver_device
diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp
index 79c36c4dcc5..ee116e13b3a 100644
--- a/src/mame/drivers/magicfly.cpp
+++ b/src/mame/drivers/magicfly.cpp
@@ -440,15 +440,17 @@
*******************************************************************************/
-
-#define MASTER_CLOCK XTAL_10MHz
-
#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/nvram.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_10MHz
class magicfly_state : public driver_device
diff --git a/src/mame/drivers/magictg.cpp b/src/mame/drivers/magictg.cpp
index 58225283cd7..feede417431 100644
--- a/src/mame/drivers/magictg.cpp
+++ b/src/mame/drivers/magictg.cpp
@@ -132,11 +132,13 @@ Medium size chip with heat sink on it
***************************************************************************/
#include "emu.h"
-#include "cpu/mips/mips3.h"
#include "cpu/adsp2100/adsp2100.h"
+#include "cpu/mips/mips3.h"
+#include "machine/lpci.h"
#include "sound/dmadac.h"
#include "video/voodoo.h"
-#include "machine/lpci.h"
+#include "screen.h"
+#include "speaker.h"
/* TODO: Two 3Dfx Voodoo chipsets are used in SLI configuration */
diff --git a/src/mame/drivers/magmax.cpp b/src/mame/drivers/magmax.cpp
index 210f5988028..fb26b84c386 100644
--- a/src/mame/drivers/magmax.cpp
+++ b/src/mame/drivers/magmax.cpp
@@ -26,10 +26,12 @@ Stephh's notes (based on the game M68000 code and some tests) :
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/magmax.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/magmax.h"
+#include "speaker.h"
WRITE16_MEMBER(magmax_state::magmax_sound_w)
diff --git a/src/mame/drivers/magnum.cpp b/src/mame/drivers/magnum.cpp
index b59e9926586..773f44273d7 100644
--- a/src/mame/drivers/magnum.cpp
+++ b/src/mame/drivers/magnum.cpp
@@ -6,10 +6,12 @@
// http://www.eevblog.com/forum/blog/eevblog-949-vintage-australian-made-laptop-teardown/msg1080508/#msg1080508
#include "emu.h"
-#include "rendlay.h"
#include "cpu/i86/i186.h"
#include "machine/cdp1879.h"
#include "sound/beep.h"
+#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
class magnum_state : public driver_device
{
diff --git a/src/mame/drivers/mainevt.cpp b/src/mame/drivers/mainevt.cpp
index ee1cf77313f..9909d64fa3a 100644
--- a/src/mame/drivers/mainevt.cpp
+++ b/src/mame/drivers/mainevt.cpp
@@ -23,13 +23,16 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/mainevt.h"
+#include "includes/konamipt.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6809/hd6309.h"
#include "cpu/m6809/m6809.h"
#include "machine/gen_latch.h"
#include "sound/ym2151.h"
-#include "includes/konamipt.h"
-#include "includes/mainevt.h"
+#include "speaker.h"
+
INTERRUPT_GEN_MEMBER(mainevt_state::mainevt_interrupt)
{
diff --git a/src/mame/drivers/mainsnk.cpp b/src/mame/drivers/mainsnk.cpp
index c75e8ebda0f..cdb6ebc5575 100644
--- a/src/mame/drivers/mainsnk.cpp
+++ b/src/mame/drivers/mainsnk.cpp
@@ -110,9 +110,12 @@ cc_p14.j2 8192 0xedc6a1eb M5L2764k
*/
#include "emu.h"
+#include "includes/mainsnk.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/mainsnk.h"
+#include "screen.h"
+#include "speaker.h"
void mainsnk_state::machine_start()
diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp
index 8930ad58fd4..12b871bd641 100644
--- a/src/mame/drivers/majorpkr.cpp
+++ b/src/mame/drivers/majorpkr.cpp
@@ -449,20 +449,26 @@
**********************************************************************************/
-#define MASTER_CLOCK XTAL_12MHz
-#define CPU_CLOCK (MASTER_CLOCK / 2) // 6 MHz, measured.
-#define OKI_CLOCK (MASTER_CLOCK / 8) // 1.5 MHz, measured.
-#define CRTC_CLOCK (MASTER_CLOCK / 16) // 750 kHz, measured.
-
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
-#include "sound/okim6295.h"
#include "machine/bankdev.h"
#include "machine/nvram.h"
+#include "sound/okim6295.h"
+#include "video/mc6845.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "majorpkr.lh"
+#define MASTER_CLOCK XTAL_12MHz
+#define CPU_CLOCK (MASTER_CLOCK / 2) // 6 MHz, measured.
+#define OKI_CLOCK (MASTER_CLOCK / 8) // 1.5 MHz, measured.
+#define CRTC_CLOCK (MASTER_CLOCK / 16) // 750 kHz, measured.
+
+
class majorpkr_state : public driver_device
{
public:
diff --git a/src/mame/drivers/malzak.cpp b/src/mame/drivers/malzak.cpp
index 4b39c437037..bc92e18aacb 100644
--- a/src/mame/drivers/malzak.cpp
+++ b/src/mame/drivers/malzak.cpp
@@ -65,11 +65,13 @@
*/
#include "emu.h"
+#include "includes/malzak.h"
+
#include "cpu/s2650/s2650.h"
+#include "machine/nvram.h"
#include "sound/sn76477.h"
#include "video/saa5050.h"
-#include "machine/nvram.h"
-#include "includes/malzak.h"
+#include "speaker.h"
READ8_MEMBER(malzak_state::fake_VRLE_r)
diff --git a/src/mame/drivers/manohman.cpp b/src/mame/drivers/manohman.cpp
index 690eea8d2f5..08aff866efb 100644
--- a/src/mame/drivers/manohman.cpp
+++ b/src/mame/drivers/manohman.cpp
@@ -131,12 +131,13 @@
***************************************************************************/
-#define MASTER_CLOCK XTAL_8MHz
-#define SECONDARY_CLOCK XTAL_3_6864MHz
-
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/saa1099.h"
+#include "speaker.h"
+
+#define MASTER_CLOCK XTAL_8MHz
+#define SECONDARY_CLOCK XTAL_3_6864MHz
class _manohman_state : public driver_device
diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp
index 64feea7e074..def351c0926 100644
--- a/src/mame/drivers/mappy.cpp
+++ b/src/mame/drivers/mappy.cpp
@@ -550,9 +550,12 @@ TODO:
#include "emu.h"
#include "includes/mappy.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/watchdog.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
/*************************************
*
diff --git a/src/mame/drivers/marineb.cpp b/src/mame/drivers/marineb.cpp
index f04bccfe4df..55661a882c5 100644
--- a/src/mame/drivers/marineb.cpp
+++ b/src/mame/drivers/marineb.cpp
@@ -38,9 +38,12 @@ write
***************************************************************************/
#include "emu.h"
+#include "includes/marineb.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/marineb.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK (XTAL_12MHz)
#define CPU_CLOCK (MASTER_CLOCK/4)
diff --git a/src/mame/drivers/mario.cpp b/src/mame/drivers/mario.cpp
index 5c66ce11582..e2acb770428 100644
--- a/src/mame/drivers/mario.cpp
+++ b/src/mame/drivers/mario.cpp
@@ -92,9 +92,11 @@ write:
***************************************************************************/
#include "emu.h"
+#include "includes/mario.h"
+
#include "cpu/z80/z80.h"
#include "machine/z80dma.h"
-#include "includes/mario.h"
+#include "screen.h"
/*************************************
diff --git a/src/mame/drivers/markham.cpp b/src/mame/drivers/markham.cpp
index 74648b255f3..8481b4f0595 100644
--- a/src/mame/drivers/markham.cpp
+++ b/src/mame/drivers/markham.cpp
@@ -11,9 +11,12 @@
*****************************************************************************/
#include "emu.h"
+#include "includes/markham.h"
+
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
-#include "includes/markham.h"
+#include "screen.h"
+#include "speaker.h"
READ8_MEMBER(markham_state::markham_e004_r)
diff --git a/src/mame/drivers/marywu.cpp b/src/mame/drivers/marywu.cpp
index 676d879dd8d..11826be3965 100644
--- a/src/mame/drivers/marywu.cpp
+++ b/src/mame/drivers/marywu.cpp
@@ -18,8 +18,10 @@
#include "emu.h"
#include "cpu/mcs51/mcs51.h"
-#include "sound/ay8910.h"
#include "machine/i8279.h"
+#include "sound/ay8910.h"
+#include "speaker.h"
+
#include "marywu.lh"
class marywu_state : public driver_device
diff --git a/src/mame/drivers/mastboy.cpp b/src/mame/drivers/mastboy.cpp
index cf7241a0745..08fa73396c2 100644
--- a/src/mame/drivers/mastboy.cpp
+++ b/src/mame/drivers/mastboy.cpp
@@ -440,6 +440,8 @@
#include "sound/saa1099.h"
#include "sound/msm5205.h"
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
class mastboy_state : public driver_device
diff --git a/src/mame/drivers/matmania.cpp b/src/mame/drivers/matmania.cpp
index 2e3bf5022e3..33b915f8f4c 100644
--- a/src/mame/drivers/matmania.cpp
+++ b/src/mame/drivers/matmania.cpp
@@ -40,6 +40,7 @@ The driver has been updated accordingly.
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/maxaflex.cpp b/src/mame/drivers/maxaflex.cpp
index aa86318b42c..3154c9c8caf 100644
--- a/src/mame/drivers/maxaflex.cpp
+++ b/src/mame/drivers/maxaflex.cpp
@@ -20,11 +20,14 @@
#include "machine/6821pia.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "sound/pokey.h"
#include "video/gtia.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "maxaflex.lh"
diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp
index 9b84183349d..3f4de5b3cb6 100644
--- a/src/mame/drivers/maygay1b.cpp
+++ b/src/mame/drivers/maygay1b.cpp
@@ -73,6 +73,7 @@
******************************************************************************************/
#include "emu.h"
#include "includes/maygay1b.h"
+#include "speaker.h"
#include "maygay1b.lh"
diff --git a/src/mame/drivers/maygayep.cpp b/src/mame/drivers/maygayep.cpp
index ac28c22b2c9..469a2a08eaa 100644
--- a/src/mame/drivers/maygayep.cpp
+++ b/src/mame/drivers/maygayep.cpp
@@ -35,6 +35,7 @@
#include "emu.h"
#include "cpu/h8/h83002.h"
#include "sound/ymz280b.h"
+#include "speaker.h"
class maygayep_state : public driver_device
diff --git a/src/mame/drivers/maygayv1.cpp b/src/mame/drivers/maygayv1.cpp
index 755714ea928..6bc9d95668c 100644
--- a/src/mame/drivers/maygayv1.cpp
+++ b/src/mame/drivers/maygayv1.cpp
@@ -127,15 +127,19 @@ Find lamps/reels after UPD changes.
***************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "video/awpvid.h"
+
+#include "cpu/m68000/m68000.h"
#include "cpu/mcs51/mcs51.h"
-#include "machine/i8279.h"
#include "machine/6821pia.h"
+#include "machine/i8279.h"
#include "machine/mc68681.h"
-#include "sound/ym2413.h"
-#include "sound/upd7759.h"
#include "machine/nvram.h"
+#include "sound/upd7759.h"
+#include "sound/ym2413.h"
+
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/mayumi.cpp b/src/mame/drivers/mayumi.cpp
index 898d2ddf5d5..e6787480bc7 100644
--- a/src/mame/drivers/mayumi.cpp
+++ b/src/mame/drivers/mayumi.cpp
@@ -10,9 +10,11 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/2203intf.h"
#include "machine/nvram.h"
#include "machine/i8255.h"
+#include "sound/2203intf.h"
+#include "screen.h"
+#include "speaker.h"
#define MCLK XTAL_10MHz
@@ -25,7 +27,8 @@ public:
m_videoram(*this, "videoram"),
m_i8255(*this, "i8255"),
m_maincpu(*this, "maincpu"),
- m_gfxdecode(*this, "gfxdecode") { }
+ m_gfxdecode(*this, "gfxdecode")
+ { }
/* memory pointers */
required_shared_ptr<uint8_t> m_videoram;
diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp
index 305fac7235d..bda6e7bb89c 100644
--- a/src/mame/drivers/mazerbla.cpp
+++ b/src/mame/drivers/mazerbla.cpp
@@ -122,6 +122,8 @@ video z80
#include "sound/ay8910.h"
#include "video/resnet.h"
#include "video/mb_vcu.h"
+#include "screen.h"
+#include "speaker.h"
#define MAZERBLA 0x01
diff --git a/src/mame/drivers/mbc200.cpp b/src/mame/drivers/mbc200.cpp
index 8eb88009cf4..22934fbba2b 100644
--- a/src/mame/drivers/mbc200.cpp
+++ b/src/mame/drivers/mbc200.cpp
@@ -45,14 +45,16 @@ TODO:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "machine/i8255.h"
#include "machine/i8251.h"
-#include "video/mc6845.h"
+#include "machine/i8255.h"
+#include "machine/keyboard.h"
#include "machine/wd_fdc.h"
#include "sound/beep.h"
-#include "sound/speaker.h"
-#include "machine/keyboard.h"
+#include "sound/spkrdev.h"
+#include "video/mc6845.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
class mbc200_state : public driver_device
{
diff --git a/src/mame/drivers/mbc55x.cpp b/src/mame/drivers/mbc55x.cpp
index 836e408e91c..9d03830d6f1 100644
--- a/src/mame/drivers/mbc55x.cpp
+++ b/src/mame/drivers/mbc55x.cpp
@@ -18,7 +18,9 @@ ToDo:
#include "emu.h"
#include "includes/mbc55x.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
const unsigned char mbc55x_palette[SCREEN_NO_COLOURS][3] =
{
diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp
index 5ca412febef..ec8bc737c15 100644
--- a/src/mame/drivers/mbee.cpp
+++ b/src/mame/drivers/mbee.cpp
@@ -126,6 +126,7 @@ from Brett Selwood and Andrew Davies.
#include "emu.h"
#include "includes/mbee.h"
#include "formats/mbee_cas.h"
+#include "speaker.h"
#define XTAL_13_5MHz 13500000
diff --git a/src/mame/drivers/mc10.cpp b/src/mame/drivers/mc10.cpp
index 71387f8cb1c..d02d766b6c5 100644
--- a/src/mame/drivers/mc10.cpp
+++ b/src/mame/drivers/mc10.cpp
@@ -8,16 +8,21 @@
#include "emu.h"
+
#include "cpu/m6800/m6800.h"
-#include "formats/coco_cas.h"
#include "imagedev/cassette.h"
#include "imagedev/printer.h"
#include "machine/ram.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
-#include "video/mc6847.h"
#include "video/ef9345.h"
+#include "video/mc6847.h"
+
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/coco_cas.h"
+
//printer state
enum
@@ -36,14 +41,14 @@ class mc10_state : public driver_device
{
public:
mc10_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_mc6847(*this, "mc6847"),
- m_ef9345(*this, "ef9345"),
- m_dac(*this, "dac"),
- m_ram(*this, RAM_TAG),
- m_cassette(*this, "cassette"),
- m_printer(*this, "printer")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_mc6847(*this, "mc6847")
+ , m_ef9345(*this, "ef9345")
+ , m_dac(*this, "dac")
+ , m_ram(*this, RAM_TAG)
+ , m_cassette(*this, "cassette")
+ , m_printer(*this, "printer")
{ }
required_device<m6803_cpu_device> m_maincpu;
diff --git a/src/mame/drivers/mc1000.cpp b/src/mame/drivers/mc1000.cpp
index 85a7d67abd0..e3b855bbc00 100644
--- a/src/mame/drivers/mc1000.cpp
+++ b/src/mame/drivers/mc1000.cpp
@@ -22,16 +22,21 @@
*/
-#include "softlist.h"
#include "emu.h"
+
+#include "bus/centronics/ctronics.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
+#include "machine/ram.h"
+#include "machine/rescap.h"
+#include "sound/ay8910.h"
#include "video/mc6845.h"
#include "video/mc6847.h"
-#include "sound/ay8910.h"
-#include "bus/centronics/ctronics.h"
-#include "machine/rescap.h"
-#include "machine/ram.h"
+
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
+
#define SCREEN_TAG "screen"
#define Z80_TAG "u13"
diff --git a/src/mame/drivers/mc1502.cpp b/src/mame/drivers/mc1502.cpp
index 409798cd3a2..b62b15481ae 100644
--- a/src/mame/drivers/mc1502.cpp
+++ b/src/mame/drivers/mc1502.cpp
@@ -10,13 +10,15 @@
#include "emu.h"
#include "includes/mc1502.h"
-#include "bus/rs232/rs232.h"
+#include "bus/rs232/rs232.h"
#include "cpu/i86/i86.h"
#include "machine/kb_7007_3.h"
-#include "sound/speaker.h"
#include "sound/wave.h"
+
#include "softlist.h"
+#include "speaker.h"
+
#define VERBOSE_DBG 0
diff --git a/src/mame/drivers/mc80.cpp b/src/mame/drivers/mc80.cpp
index 967fc67f637..da71367b000 100644
--- a/src/mame/drivers/mc80.cpp
+++ b/src/mame/drivers/mc80.cpp
@@ -21,6 +21,7 @@ for various things, but none of that is working.
#include "emu.h"
#include "includes/mc80.h"
+#include "screen.h"
static ADDRESS_MAP_START(mc8020_mem, AS_PROGRAM, 8, mc80_state)
ADDRESS_MAP_UNMAP_HIGH
diff --git a/src/mame/drivers/mcatadv.cpp b/src/mame/drivers/mcatadv.cpp
index 594bdb960ad..3f7daf348e8 100644
--- a/src/mame/drivers/mcatadv.cpp
+++ b/src/mame/drivers/mcatadv.cpp
@@ -138,10 +138,13 @@ Stephh's notes (based on the games M68000 code and some tests) :
******************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/mcatadv.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "sound/2610intf.h"
-#include "includes/mcatadv.h"
+#include "screen.h"
+#include "speaker.h"
/*** Main CPU ***/
diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp
index cc65c692b69..473d593a37f 100644
--- a/src/mame/drivers/mcr.cpp
+++ b/src/mame/drivers/mcr.cpp
@@ -284,10 +284,13 @@
#include "emu.h"
+#include "includes/mcr.h"
+
#include "audio/midway.h"
-#include "sound/samples.h"
#include "machine/nvram.h"
-#include "includes/mcr.h"
+#include "sound/samples.h"
+#include "screen.h"
+#include "speaker.h"
#include "dpoker.lh"
diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp
index 9f45bcbfee1..966eb0c4bf6 100644
--- a/src/mame/drivers/mcr3.cpp
+++ b/src/mame/drivers/mcr3.cpp
@@ -104,13 +104,16 @@
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "machine/z80ctc.h"
+#include "includes/mcr.h"
+#include "includes/mcr3.h"
#include "audio/midway.h"
#include "audio/csd.h"
+
+#include "cpu/z80/z80.h"
#include "machine/nvram.h"
-#include "includes/mcr.h"
-#include "includes/mcr3.h"
+#include "machine/z80ctc.h"
+
+#include "speaker.h"
#include "spyhunt.lh"
#include "turbotag.lh"
diff --git a/src/mame/drivers/mcr68.cpp b/src/mame/drivers/mcr68.cpp
index a4d15922c0c..d24ea59af70 100644
--- a/src/mame/drivers/mcr68.cpp
+++ b/src/mame/drivers/mcr68.cpp
@@ -55,9 +55,12 @@
***************************************************************************/
#include "emu.h"
+#include "includes/mcr68.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
-#include "includes/mcr68.h"
+
+#include "speaker.h"
diff --git a/src/mame/drivers/meadows.cpp b/src/mame/drivers/meadows.cpp
index 8fdc182ae61..4d7032e1587 100644
--- a/src/mame/drivers/meadows.cpp
+++ b/src/mame/drivers/meadows.cpp
@@ -120,7 +120,10 @@
#include "emu.h"
#include "includes/meadows.h"
+
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "deadeye.lh"
#include "gypsyjug.lh"
#include "minferno.lh"
diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp
index 383330544a7..8afdc14d266 100644
--- a/src/mame/drivers/mediagx.cpp
+++ b/src/mame/drivers/mediagx.cpp
@@ -74,6 +74,8 @@
#include "machine/idectrl.h"
#include "sound/dmadac.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
#define SPEEDUP_HACKS 1
diff --git a/src/mame/drivers/megasys1.cpp b/src/mame/drivers/megasys1.cpp
index 121d4a0a0c7..364f01f3e8b 100644
--- a/src/mame/drivers/megasys1.cpp
+++ b/src/mame/drivers/megasys1.cpp
@@ -117,6 +117,16 @@ RAM RW 0f0000-0f3fff 0e0000-0effff? <
***************************************************************************/
+#include "emu.h"
+#include "includes/megasys1.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
+#include "sound/2203intf.h"
+#include "sound/ym2151.h"
+#include "machine/jalcrpt.h"
+#include "speaker.h"
+
#define SYS_A_CPU_CLOCK (XTAL_12MHz / 2) /* clock for main 68000 */
#define SYS_B_CPU_CLOCK XTAL_8MHz /* clock for main 68000 */
#define SYS_C_CPU_CLOCK (XTAL_24MHz / 2) /* clock for main 68000 */
@@ -124,14 +134,6 @@ RAM RW 0f0000-0f3fff 0e0000-0effff? <
#define SOUND_CPU_CLOCK XTAL_7MHz /* clock for sound 68000 */
#define OKI4_SOUND_CLOCK XTAL_4MHz
-#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m68000/m68000.h"
-#include "sound/2203intf.h"
-#include "sound/ym2151.h"
-#include "machine/jalcrpt.h"
-#include "includes/megasys1.h"
-
MACHINE_RESET_MEMBER(megasys1_state,megasys1)
{
diff --git a/src/mame/drivers/megazone.cpp b/src/mame/drivers/megazone.cpp
index 94738431af1..524e028228e 100644
--- a/src/mame/drivers/megazone.cpp
+++ b/src/mame/drivers/megazone.cpp
@@ -9,8 +9,9 @@ To enter service mode, keep 1&2 pressed on reset
***************************************************************************/
#include "emu.h"
-#include "includes/konamipt.h"
#include "includes/megazone.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/mcs48/mcs48.h"
#include "cpu/z80/z80.h"
@@ -21,6 +22,8 @@ To enter service mode, keep 1&2 pressed on reset
#include "sound/dac.h"
#include "sound/flt_rc.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
READ8_MEMBER(megazone_state::megazone_port_a_r)
diff --git a/src/mame/drivers/meijinsn.cpp b/src/mame/drivers/meijinsn.cpp
index f3c38c05d8b..116b72b6784 100644
--- a/src/mame/drivers/meijinsn.cpp
+++ b/src/mame/drivers/meijinsn.cpp
@@ -66,6 +66,8 @@ SOFT PSG & VOICE BY M.C & S.H
#include "machine/gen_latch.h"
#include "video/resnet.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class meijinsn_state : public driver_device
{
diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp
index 80f3d3bc00f..4bdfb6e8ef8 100644
--- a/src/mame/drivers/mekd2.cpp
+++ b/src/mame/drivers/mekd2.cpp
@@ -74,12 +74,14 @@ TODO
#include "emu.h"
#include "cpu/m6800/m6800.h"
+#include "imagedev/cassette.h"
+#include "imagedev/snapquik.h"
#include "machine/6821pia.h"
#include "machine/6850acia.h"
#include "machine/clock.h"
-#include "imagedev/cassette.h"
-#include "imagedev/snapquik.h"
#include "sound/wave.h"
+#include "speaker.h"
+
#include "mekd2.lh"
#define XTAL_MEKD2 1228800
diff --git a/src/mame/drivers/mephisto.cpp b/src/mame/drivers/mephisto.cpp
index b010de34dd8..03f660ccf15 100644
--- a/src/mame/drivers/mephisto.cpp
+++ b/src/mame/drivers/mephisto.cpp
@@ -65,6 +65,7 @@ Mephisto 4 Turbo Kit 18mhz - (mm4tk)
#include "emu.h"
#include "cpu/m6502/m65c02.h"
#include "sound/beep.h"
+#include "speaker.h"
//#include "mephisto.lh"
class mephisto_state : public driver_device
diff --git a/src/mame/drivers/mephistp.cpp b/src/mame/drivers/mephistp.cpp
index ef1634b5312..9f2c8fb6cad 100644
--- a/src/mame/drivers/mephistp.cpp
+++ b/src/mame/drivers/mephistp.cpp
@@ -20,6 +20,7 @@
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "sound/3812intf.h"
+#include "speaker.h"
// mephisto_state was also defined in mess/drivers/mephisto.c
class mephisto_pinball_state : public driver_device
diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp
index 6865af919f3..9f8cc5c873f 100644
--- a/src/mame/drivers/merit.cpp
+++ b/src/mame/drivers/merit.cpp
@@ -71,9 +71,11 @@ Merit Riviera Notes - There are several known versions:
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
+#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
-#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK (XTAL_10MHz)
#define CPU_CLOCK (MASTER_CLOCK / 4)
diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp
index e36e76aa987..77937db1ddb 100644
--- a/src/mame/drivers/meritm.cpp
+++ b/src/mame/drivers/meritm.cpp
@@ -172,17 +172,20 @@ Not all regional versions are available for each Megatouch series
*/
#include "emu.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
-#include "sound/ay8910.h"
-#include "video/v9938.h"
#include "machine/ds1204.h"
#include "machine/i8255.h"
-#include "machine/z80pio.h"
#include "machine/ins8250.h"
#include "machine/microtch.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "machine/z80pio.h"
+#include "sound/ay8910.h"
+#include "video/v9938.h"
+
+#include "speaker.h"
class meritm_state : public driver_device
diff --git a/src/mame/drivers/mermaid.cpp b/src/mame/drivers/mermaid.cpp
index e11d435d624..f5daf2efc84 100644
--- a/src/mame/drivers/mermaid.cpp
+++ b/src/mame/drivers/mermaid.cpp
@@ -117,9 +117,12 @@ Stephh's notes (based on the games Z80 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/mermaid.h"
+
#include "cpu/z80/z80.h"
#include "sound/msm5205.h"
-#include "includes/mermaid.h"
+#include "speaker.h"
+
/* Read/Write Handlers */
diff --git a/src/mame/drivers/mes.cpp b/src/mame/drivers/mes.cpp
index 25f7dc00098..d21bcae7a7a 100644
--- a/src/mame/drivers/mes.cpp
+++ b/src/mame/drivers/mes.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class mes_state : public driver_device
diff --git a/src/mame/drivers/metalmx.cpp b/src/mame/drivers/metalmx.cpp
index 7221eadcce2..bdb9d70843d 100644
--- a/src/mame/drivers/metalmx.cpp
+++ b/src/mame/drivers/metalmx.cpp
@@ -256,8 +256,9 @@ Logic:
***************************************************************************/
#include "emu.h"
-#include "audio/cage.h"
#include "includes/metalmx.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/metlclsh.cpp b/src/mame/drivers/metlclsh.cpp
index e4e1d362c87..eb07074ab7f 100644
--- a/src/mame/drivers/metlclsh.cpp
+++ b/src/mame/drivers/metlclsh.cpp
@@ -34,10 +34,13 @@ metlclsh:
***************************************************************************/
#include "emu.h"
+#include "includes/metlclsh.h"
+
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
#include "sound/3526intf.h"
-#include "includes/metlclsh.h"
+#include "screen.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/metlfrzr.cpp b/src/mame/drivers/metlfrzr.cpp
index 07509041d48..6ae92b9fc92 100644
--- a/src/mame/drivers/metlfrzr.cpp
+++ b/src/mame/drivers/metlfrzr.cpp
@@ -21,9 +21,12 @@
**************************************************************************************************************************/
#include "emu.h"
+#include "audio/t5182.h"
+
#include "cpu/z80/z80.h"
+#include "screen.h"
+#include "speaker.h"
-#include "audio/t5182.h"
class metlfrzr_state : public driver_device
{
@@ -37,7 +40,7 @@ public:
m_video_regs(*this, "vregs"),
m_palette(*this, "palette"),
m_gfxdecode(*this, "gfxdecode")
- { }
+ { }
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp
index a73b7dcda8b..1cb17cc7911 100644
--- a/src/mame/drivers/metro.cpp
+++ b/src/mame/drivers/metro.cpp
@@ -98,16 +98,18 @@ driver modified by Hau
***************************************************************************/
#include "emu.h"
+#include "includes/metro.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/upd7810/upd7810.h"
#include "cpu/h8/h83006.h"
-#include "includes/metro.h"
#include "machine/watchdog.h"
#include "sound/ym2413.h"
#include "sound/2610intf.h"
#include "sound/ymf278b.h"
+#include "speaker.h"
/***************************************************************************
@@ -1715,7 +1717,7 @@ private:
uint8_t value;
};
-const device_type PUZZLET_IO = &device_creator<puzzlet_io_device>;
+const device_type PUZZLET_IO = device_creator<puzzlet_io_device>;
puzzlet_io_device::puzzlet_io_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/mame/drivers/mexico86.cpp b/src/mame/drivers/mexico86.cpp
index fdc656f01df..1c63c75317b 100644
--- a/src/mame/drivers/mexico86.cpp
+++ b/src/mame/drivers/mexico86.cpp
@@ -53,6 +53,8 @@ PS4 J8635 PS4 J8541 PS4 J8648
#include "includes/mexico86.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/meyc8080.cpp b/src/mame/drivers/meyc8080.cpp
index 6888cf049cb..e7b54bd7cd7 100644
--- a/src/mame/drivers/meyc8080.cpp
+++ b/src/mame/drivers/meyc8080.cpp
@@ -60,6 +60,8 @@
#include "machine/nvram.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
#include "wldarrow.lh"
#include "mdrawpkr.lh"
@@ -70,12 +72,13 @@ class meyc8080_state : public driver_device
{
public:
meyc8080_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_videoram_0(*this, "vram0"),
- m_videoram_1(*this, "vram1"),
- m_videoram_2(*this, "vram2"),
- m_maincpu(*this, "maincpu"),
- m_dac(*this, "dac") { }
+ : driver_device(mconfig, type, tag)
+ , m_videoram_0(*this, "vram0")
+ , m_videoram_1(*this, "vram1")
+ , m_videoram_2(*this, "vram2")
+ , m_maincpu(*this, "maincpu")
+ , m_dac(*this, "dac")
+ { }
required_shared_ptr<uint8_t> m_videoram_0;
required_shared_ptr<uint8_t> m_videoram_1;
diff --git a/src/mame/drivers/meyc8088.cpp b/src/mame/drivers/meyc8088.cpp
index f95642afb58..bbacd7ba5ed 100644
--- a/src/mame/drivers/meyc8088.cpp
+++ b/src/mame/drivers/meyc8088.cpp
@@ -32,6 +32,9 @@
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "gldarrow.lh"
diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp
index 39c41f1811c..64953836fdd 100644
--- a/src/mame/drivers/mgames.cpp
+++ b/src/mame/drivers/mgames.cpp
@@ -217,6 +217,8 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/nvram.h"
+#include "screen.h"
+
#include "mgames.lh"
diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp
index d5efe2a703f..6b48e387cfa 100644
--- a/src/mame/drivers/mgavegas.cpp
+++ b/src/mame/drivers/mgavegas.cpp
@@ -19,13 +19,16 @@ Ver. 2.2 should exist
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
-#include "sound/msm5205.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
+#include "sound/ay8910.h"
#include "sound/flt_rc.h"
+#include "sound/msm5205.h"
+#include "speaker.h"
+
#include "mgavegas.lh"
+
/****************************
* LOG defines *
****************************/
diff --git a/src/mame/drivers/mgolf.cpp b/src/mame/drivers/mgolf.cpp
index ddd157745a8..3a46e4c6c41 100644
--- a/src/mame/drivers/mgolf.cpp
+++ b/src/mame/drivers/mgolf.cpp
@@ -8,6 +8,7 @@
#include "emu.h"
#include "cpu/m6502/m6502.h"
+#include "screen.h"
class mgolf_state : public driver_device
{
diff --git a/src/mame/drivers/mhavoc.cpp b/src/mame/drivers/mhavoc.cpp
index f5d58a08ca1..a8dcde55d5b 100644
--- a/src/mame/drivers/mhavoc.cpp
+++ b/src/mame/drivers/mhavoc.cpp
@@ -186,6 +186,8 @@
***************************************************************************/
#include "emu.h"
+#include "includes/mhavoc.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/atari_vg.h"
#include "video/avgdvg.h"
@@ -194,7 +196,9 @@
#include "sound/pokey.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
-#include "includes/mhavoc.h"
+#include "screen.h"
+#include "speaker.h"
+
/* Quad pokey hookup (based on schematics):
Address: 543210
diff --git a/src/mame/drivers/micral.cpp b/src/mame/drivers/micral.cpp
index 12ace551f1d..3130e5d0c71 100644
--- a/src/mame/drivers/micral.cpp
+++ b/src/mame/drivers/micral.cpp
@@ -25,6 +25,8 @@
#include "cpu/z80/z80.h"
#include "video/tms9927.h"
#include "sound/beep.h"
+#include "screen.h"
+#include "speaker.h"
class micral_state : public driver_device
diff --git a/src/mame/drivers/micro3d.cpp b/src/mame/drivers/micro3d.cpp
index eb87f1365df..150b22b84f2 100644
--- a/src/mame/drivers/micro3d.cpp
+++ b/src/mame/drivers/micro3d.cpp
@@ -24,14 +24,18 @@
****************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
+#include "includes/micro3d.h"
+
#include "cpu/am29000/am29000.h"
+#include "cpu/m68000/m68000.h"
#include "cpu/mcs51/mcs51.h"
#include "machine/mc68681.h"
#include "machine/mc68901.h"
-#include "sound/ym2151.h"
#include "machine/nvram.h"
-#include "includes/micro3d.h"
+#include "sound/ym2151.h"
+
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/micronic.cpp b/src/mame/drivers/micronic.cpp
index cbbcd78e40d..708f2783d35 100644
--- a/src/mame/drivers/micronic.cpp
+++ b/src/mame/drivers/micronic.cpp
@@ -112,10 +112,12 @@
*/
-
#include "emu.h"
#include "includes/micronic.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
+
READ8_MEMBER( micronic_state::keypad_r )
{
diff --git a/src/mame/drivers/micropin.cpp b/src/mame/drivers/micropin.cpp
index 91b55f3477d..d84eff02b73 100644
--- a/src/mame/drivers/micropin.cpp
+++ b/src/mame/drivers/micropin.cpp
@@ -23,12 +23,16 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
-#include "cpu/m6800/m6800.h"
+
#include "cpu/i8085/i8085.h"
+#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
#include "sound/beep.h"
+#include "speaker.h"
+
#include "micropin.lh"
+
class micropin_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/microtan.cpp b/src/mame/drivers/microtan.cpp
index 9b97bb0d17b..05e4b51f29a 100644
--- a/src/mame/drivers/microtan.cpp
+++ b/src/mame/drivers/microtan.cpp
@@ -39,18 +39,21 @@
/* Core includes */
#include "emu.h"
-#include "cpu/m6502/m6502.h"
#include "includes/microtan.h"
/* Components */
-#include "sound/ay8910.h"
-#include "sound/wave.h"
+#include "cpu/m6502/m6502.h"
#include "machine/6522via.h"
#include "machine/mos6551.h"
+#include "sound/ay8910.h"
+#include "sound/wave.h"
/* Devices */
#include "imagedev/cassette.h"
+#include "screen.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START( microtan_map, AS_PROGRAM, 8, microtan_state )
AM_RANGE(0x0000, 0x01ff) AM_RAM
diff --git a/src/mame/drivers/microvsn.cpp b/src/mame/drivers/microvsn.cpp
index 392f5a235ad..cf0ae613865 100644
--- a/src/mame/drivers/microvsn.cpp
+++ b/src/mame/drivers/microvsn.cpp
@@ -16,14 +16,16 @@ of the games were clocked at around 500KHz, 550KHz, or 300KHz.
****************************************************************************/
#include "emu.h"
-#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
#include "cpu/mcs48/mcs48.h"
#include "cpu/tms1000/tms1100.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "rendlay.h"
#include "softlist.h"
+#include "screen.h"
+#include "speaker.h"
#define LOG 0
diff --git a/src/mame/drivers/midas.cpp b/src/mame/drivers/midas.cpp
index e4a5b4aa61e..2dfdd7effb6 100644
--- a/src/mame/drivers/midas.cpp
+++ b/src/mame/drivers/midas.cpp
@@ -52,11 +52,14 @@
*************************************************************************************************************/
#include "emu.h"
+#include "includes/neogeo.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/ymz280b.h"
#include "machine/eepromser.h"
#include "machine/ticket.h"
-#include "includes/neogeo.h"
+#include "speaker.h"
+
class midas_state : public driver_device
{
@@ -70,7 +73,7 @@ public:
m_sprgen(*this, "spritegen"),
m_screen(*this, "screen"),
m_zoomram(*this, "zoomtable")
- { }
+ { }
DECLARE_READ16_MEMBER(ret_ffff);
DECLARE_WRITE16_MEMBER(midas_gfxregs_w);
diff --git a/src/mame/drivers/midtunit.cpp b/src/mame/drivers/midtunit.cpp
index 9e3ded89edc..789209e22e3 100644
--- a/src/mame/drivers/midtunit.cpp
+++ b/src/mame/drivers/midtunit.cpp
@@ -23,11 +23,14 @@
#include "emu.h"
-#include "cpu/tms34010/tms34010.h"
+#include "includes/midtunit.h"
+
#include "cpu/adsp2100/adsp2100.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
-#include "includes/midtunit.h"
+
+#include "screen.h"
+#include "speaker.h"
#define CPU_CLOCK (50000000)
diff --git a/src/mame/drivers/midwunit.cpp b/src/mame/drivers/midwunit.cpp
index a2c5302f4c9..92414874d81 100644
--- a/src/mame/drivers/midwunit.cpp
+++ b/src/mame/drivers/midwunit.cpp
@@ -91,12 +91,14 @@ Notes:
#include "emu.h"
+#include "includes/midtunit.h"
+#include "includes/midwunit.h"
+#include "audio/dcs.h"
+
#include "cpu/tms34010/tms34010.h"
#include "cpu/adsp2100/adsp2100.h"
-#include "audio/dcs.h"
#include "machine/nvram.h"
-#include "includes/midtunit.h"
-#include "includes/midwunit.h"
+#include "screen.h"
#define PIXEL_CLOCK (8000000)
diff --git a/src/mame/drivers/midxunit.cpp b/src/mame/drivers/midxunit.cpp
index 93c396177e8..850c904eab2 100644
--- a/src/mame/drivers/midxunit.cpp
+++ b/src/mame/drivers/midxunit.cpp
@@ -82,12 +82,15 @@ There's a separate sound board also, but it wasn't available so is not documente
**************************************************************************/
#include "emu.h"
-#include "cpu/tms34010/tms34010.h"
-#include "cpu/adsp2100/adsp2100.h"
-#include "audio/dcs.h"
-#include "machine/nvram.h"
#include "includes/midtunit.h"
#include "includes/midxunit.h"
+#include "audio/dcs.h"
+
+#include "cpu/adsp2100/adsp2100.h"
+#include "cpu/tms34010/tms34010.h"
+#include "machine/nvram.h"
+
+#include "screen.h"
#define PIXEL_CLOCK (8000000)
diff --git a/src/mame/drivers/midyunit.cpp b/src/mame/drivers/midyunit.cpp
index 4c802f59c4b..1e109bd5baf 100644
--- a/src/mame/drivers/midyunit.cpp
+++ b/src/mame/drivers/midyunit.cpp
@@ -115,9 +115,12 @@ Notes:
**************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/midyunit.h"
+#include "cpu/z80/z80.h"
+#include "screen.h"
+#include "speaker.h"
+
/* master clocks vary based on game */
#define SLOW_MASTER_CLOCK XTAL_40MHz /* "slow" == smashtv, trog, hiimpact */
diff --git a/src/mame/drivers/mikie.cpp b/src/mame/drivers/mikie.cpp
index 2790065e854..35ded5f2f99 100644
--- a/src/mame/drivers/mikie.cpp
+++ b/src/mame/drivers/mikie.cpp
@@ -39,13 +39,17 @@ Stephh's notes (based on the games M6809 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/mikie.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 "sound/sn76496.h"
-#include "includes/konamipt.h"
-#include "includes/mikie.h"
+
+#include "screen.h"
+#include "speaker.h"
#define MIKIE_TIMER_RATE 512
diff --git a/src/mame/drivers/mikro80.cpp b/src/mame/drivers/mikro80.cpp
index 083edea51da..0c1d3ff91d2 100644
--- a/src/mame/drivers/mikro80.cpp
+++ b/src/mame/drivers/mikro80.cpp
@@ -15,7 +15,9 @@
#include "includes/mikro80.h"
#include "sound/volt_reg.h"
#include "sound/wave.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
/* Address maps */
static ADDRESS_MAP_START(mikro80_mem, AS_PROGRAM, 8, mikro80_state )
diff --git a/src/mame/drivers/mikrosha.cpp b/src/mame/drivers/mikrosha.cpp
index d94a0387fc6..233fdbde003 100644
--- a/src/mame/drivers/mikrosha.cpp
+++ b/src/mame/drivers/mikrosha.cpp
@@ -10,22 +10,29 @@
#include "emu.h"
+#include "includes/radio86.h"
+
#include "cpu/i8085/i8085.h"
-#include "sound/wave.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/wave.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/rk_cas.h"
+
class mikrosha_state : public radio86_state
{
public:
mikrosha_state(const machine_config &mconfig, device_type type, const char *tag)
- : radio86_state(mconfig, type, tag),
- m_cart(*this, "cartslot")
- { }
+ : radio86_state(mconfig, type, tag)
+ , m_cart(*this, "cartslot")
+ { }
+
DECLARE_WRITE_LINE_MEMBER(mikrosha_pit_out2);
I8275_DRAW_CHARACTER_MEMBER(display_pixels);
DECLARE_MACHINE_RESET(mikrosha);
diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp
index 1de41c22541..52b0d120002 100644
--- a/src/mame/drivers/mil4000.cpp
+++ b/src/mame/drivers/mil4000.cpp
@@ -107,19 +107,22 @@
*******************************************************************************************/
-#define MAIN_CLOCK XTAL_12MHz
-#define SEC_CLOCK XTAL_14_31818MHz
-
-#define CPU_CLOCK MAIN_CLOCK
-
-
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "mil4000.lh"
+#define MAIN_CLOCK XTAL_12MHz
+#define SEC_CLOCK XTAL_14_31818MHz
+
+#define CPU_CLOCK MAIN_CLOCK
+
+
class mil4000_state : public driver_device
{
public:
diff --git a/src/mame/drivers/mini2440.cpp b/src/mame/drivers/mini2440.cpp
index 4d62449303c..6d4ad637a96 100644
--- a/src/mame/drivers/mini2440.cpp
+++ b/src/mame/drivers/mini2440.cpp
@@ -13,6 +13,9 @@
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
+
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp
index e8f71329de4..feac53e1b2b 100644
--- a/src/mame/drivers/miniboy7.cpp
+++ b/src/mame/drivers/miniboy7.cpp
@@ -132,18 +132,21 @@
*******************************************************************************/
-
-#define MASTER_CLOCK XTAL_12_4725MHz /* 12.4725 MHz */
-
#include "emu.h"
#include "cpu/m6502/m6502.h"
-#include "video/mc6845.h"
#include "machine/6821pia.h"
-#include "sound/ay8910.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "miniboy7.lh"
+#define MASTER_CLOCK XTAL_12_4725MHz /* 12.4725 MHz */
+
+
class miniboy7_state : public driver_device
{
public:
diff --git a/src/mame/drivers/minivadr.cpp b/src/mame/drivers/minivadr.cpp
index 4fb18b916ed..b2e11eb42d6 100644
--- a/src/mame/drivers/minivadr.cpp
+++ b/src/mame/drivers/minivadr.cpp
@@ -36,6 +36,7 @@ Notes: (all ICs shown)
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class minivadr_state : public driver_device
diff --git a/src/mame/drivers/mirage.cpp b/src/mame/drivers/mirage.cpp
index 10e7bc9749f..2a977a668f6 100644
--- a/src/mame/drivers/mirage.cpp
+++ b/src/mame/drivers/mirage.cpp
@@ -46,6 +46,8 @@ MR_01-.3A [a0b758aa]
#include "sound/okim6295.h"
#include "video/bufsprite.h"
#include "video/decospr.h"
+#include "screen.h"
+#include "speaker.h"
// mirage_state was also defined in mess/drivers/mirage.c
class miragemj_state : public driver_device
diff --git a/src/mame/drivers/mirax.cpp b/src/mame/drivers/mirax.cpp
index 01ca6221106..ff0a166a23b 100644
--- a/src/mame/drivers/mirax.cpp
+++ b/src/mame/drivers/mirax.cpp
@@ -104,6 +104,8 @@ Stephh's notes (based on the games Z80 code and some tests) :
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class mirax_state : public driver_device
diff --git a/src/mame/drivers/missb2.cpp b/src/mame/drivers/missb2.cpp
index 25571d051cd..b0dea93a3c0 100644
--- a/src/mame/drivers/missb2.cpp
+++ b/src/mame/drivers/missb2.cpp
@@ -18,10 +18,13 @@ OKI M6295 sound ROM dump is bad.
*/
#include "emu.h"
+#include "includes/bublbobl.h"
+
#include "cpu/z80/z80.h"
-#include "sound/okim6295.h"
#include "sound/3526intf.h"
-#include "includes/bublbobl.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class missb2_state : public bublbobl_state
diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp
index 11c4f6b3e8a..49196586e38 100644
--- a/src/mame/drivers/missile.cpp
+++ b/src/mame/drivers/missile.cpp
@@ -354,6 +354,8 @@ Super Missile Attack Board Layout
#include "machine/watchdog.h"
#include "sound/pokey.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class missile_state : public driver_device
{
diff --git a/src/mame/drivers/mitchell.cpp b/src/mame/drivers/mitchell.cpp
index 8f6c676a608..162e20c7eb5 100644
--- a/src/mame/drivers/mitchell.cpp
+++ b/src/mame/drivers/mitchell.cpp
@@ -118,13 +118,16 @@ mw-9.rom = ST M27C1001 / GFX
#include "emu.h"
+#include "includes/mitchell.h"
+
#include "cpu/z80/z80.h"
#include "machine/kabuki.h" // needed for decoding functions only
-#include "includes/mitchell.h"
#include "sound/okim6295.h"
#include "sound/3812intf.h"
#include "sound/ym2413.h"
#include "sound/msm5205.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/mjkjidai.cpp b/src/mame/drivers/mjkjidai.cpp
index 366849496d3..f964372558d 100644
--- a/src/mame/drivers/mjkjidai.cpp
+++ b/src/mame/drivers/mjkjidai.cpp
@@ -24,9 +24,12 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "includes/mjkjidai.h"
+
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
-#include "includes/mjkjidai.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(mjkjidai_state::adpcm_w)
diff --git a/src/mame/drivers/mjsenpu.cpp b/src/mame/drivers/mjsenpu.cpp
index ba5c9dbe789..f2f7e99987b 100644
--- a/src/mame/drivers/mjsenpu.cpp
+++ b/src/mame/drivers/mjsenpu.cpp
@@ -44,9 +44,11 @@
#include "emu.h"
#include "cpu/e132xs/e132xs.h"
-#include "sound/okim6295.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class mjsenpu_state : public driver_device
{
diff --git a/src/mame/drivers/mjsister.cpp b/src/mame/drivers/mjsister.cpp
index 5b2f2f36e3e..8d31a66a739 100644
--- a/src/mame/drivers/mjsister.cpp
+++ b/src/mame/drivers/mjsister.cpp
@@ -13,6 +13,9 @@
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MCLK 12000000
diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp
index 4018daf4c47..dff0ff8119b 100644
--- a/src/mame/drivers/mk14.cpp
+++ b/src/mame/drivers/mk14.cpp
@@ -33,12 +33,15 @@ ToDo:
*********************************************************************************************************************************/
#include "emu.h"
+
#include "cpu/scmp/scmp.h"
#include "imagedev/cassette.h"
#include "machine/ins8154.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "sound/wave.h"
+#include "speaker.h"
+
#include "mk14.lh"
diff --git a/src/mame/drivers/mk2.cpp b/src/mame/drivers/mk2.cpp
index 7749e4dbf06..df887a44e7a 100644
--- a/src/mame/drivers/mk2.cpp
+++ b/src/mame/drivers/mk2.cpp
@@ -50,9 +50,12 @@ Usage:
******************************************************************************/
#include "emu.h"
-#include "machine/mos6530.h"
+
#include "cpu/m6502/m6504.h"
-#include "sound/speaker.h"
+#include "machine/mos6530.h"
+#include "sound/spkrdev.h"
+#include "speaker.h"
+
#include "mk2.lh"
@@ -60,10 +63,10 @@ class mk2_state : public driver_device
{
public:
mk2_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_speaker(*this, "speaker"),
- m_miot(*this, "miot")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_speaker(*this, "speaker")
+ , m_miot(*this, "miot")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/mk85.cpp b/src/mame/drivers/mk85.cpp
index 8442093fbf5..67cb4db34b8 100644
--- a/src/mame/drivers/mk85.cpp
+++ b/src/mame/drivers/mk85.cpp
@@ -21,14 +21,17 @@ Models:
#include "emu.h"
#include "cpu/t11/t11.h"
+#include "screen.h"
class mk85_state : public driver_device
{
public:
mk85_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag) ,
- m_maincpu(*this, "maincpu") { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ {
+ }
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/drivers/mk90.cpp b/src/mame/drivers/mk90.cpp
index d90142bf109..356be54115e 100644
--- a/src/mame/drivers/mk90.cpp
+++ b/src/mame/drivers/mk90.cpp
@@ -18,6 +18,7 @@ months for an average citizen.
#include "emu.h"
#include "cpu/t11/t11.h"
+#include "screen.h"
class mk90_state : public driver_device
diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp
index b9577d2df34..f7f3b626d84 100644
--- a/src/mame/drivers/mkit09.cpp
+++ b/src/mame/drivers/mkit09.cpp
@@ -33,9 +33,11 @@ Test Paste:
#include "emu.h"
#include "cpu/m6809/m6809.h"
-#include "machine/6821pia.h"
#include "imagedev/cassette.h"
+#include "machine/6821pia.h"
#include "sound/wave.h"
+#include "speaker.h"
+
#include "mkit09.lh"
diff --git a/src/mame/drivers/mlanding.cpp b/src/mame/drivers/mlanding.cpp
index f7e78ffd41e..3e2f436ddff 100644
--- a/src/mame/drivers/mlanding.cpp
+++ b/src/mame/drivers/mlanding.cpp
@@ -44,14 +44,18 @@
****************************************************************************/
#include "emu.h"
+#include "includes/taitoipt.h"
+#include "audio/taitosnd.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/tms32025/tms32025.h"
#include "cpu/z80/z80.h"
-#include "includes/taitoipt.h"
#include "machine/z80ctc.h"
-#include "audio/taitosnd.h"
-#include "sound/ym2151.h"
#include "sound/msm5205.h"
+#include "sound/ym2151.h"
+
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/mmagic.cpp b/src/mame/drivers/mmagic.cpp
index 89415a179bc..52548495a86 100644
--- a/src/mame/drivers/mmagic.cpp
+++ b/src/mame/drivers/mmagic.cpp
@@ -49,6 +49,7 @@
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "screen.h"
//**************************************************************************
diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp
index 0c9a576d708..50c2cfda0e1 100644
--- a/src/mame/drivers/mmodular.cpp
+++ b/src/mame/drivers/mmodular.cpp
@@ -74,15 +74,18 @@ Bit 5+6 LED 1-8 enable
*/
#include "emu.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m65c02.h"
-#include "sound/beep.h"
//#include "machine/mos6551.h"
+#include "machine/nvram.h"
+#include "sound/beep.h"
#include "video/hd44780.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
-#include "machine/nvram.h"
//static uint16_t unknown2_data = 0;
// Berlin Pro 68020
diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp
index 33de2f62680..a10f23e3bd0 100644
--- a/src/mame/drivers/model1.cpp
+++ b/src/mame/drivers/model1.cpp
@@ -631,12 +631,11 @@ Notes:
*/
#include "emu.h"
-#include "cpu/v60/v60.h"
-#include "video/segaic24.h"
-#include "cpu/mb86233/mb86233.h"
-#include "machine/nvram.h"
#include "includes/model1.h"
+#include "machine/nvram.h"
+#include "speaker.h"
+
#include "vr.lh"
diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp
index 39cae4f09b1..e5c526655c9 100644
--- a/src/mame/drivers/model2.cpp
+++ b/src/mame/drivers/model2.cpp
@@ -114,17 +114,20 @@
*/
#include "emu.h"
-#include "machine/eepromser.h"
-#include "machine/nvram.h"
-#include "video/segaic24.h"
+#include "includes/model2.h"
+
#include "cpu/i960/i960.h"
#include "cpu/m68000/m68000.h"
-#include "cpu/sharc/sharc.h"
#include "cpu/mb86233/mb86233.h"
#include "cpu/mb86235/mb86235.h"
+#include "cpu/sharc/sharc.h"
#include "cpu/z80/z80.h"
+#include "machine/eepromser.h"
+#include "machine/nvram.h"
#include "sound/2612intf.h"
-#include "includes/model2.h"
+#include "video/segaic24.h"
+#include "speaker.h"
+
enum {
DSP_TYPE_TGP = 1,
diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp
index be16bdf15f0..0706dad5f4b 100644
--- a/src/mame/drivers/model3.cpp
+++ b/src/mame/drivers/model3.cpp
@@ -732,12 +732,15 @@ JP4/5/6/7 - Jumpers to configure ROMs
*/
#include "emu.h"
+#include "includes/model3.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "machine/53c810.h"
#include "machine/nvram.h"
#include "machine/m3comm.h"
-#include "includes/model3.h"
+#include "speaker.h"
+
void model3_state::update_irq_state()
{
diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp
index a6ffd1694fc..dac0082e9a7 100644
--- a/src/mame/drivers/modellot.cpp
+++ b/src/mame/drivers/modellot.cpp
@@ -19,6 +19,8 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/keyboard.h"
+#include "screen.h"
+
class modellot_state : public driver_device
{
diff --git a/src/mame/drivers/mogura.cpp b/src/mame/drivers/mogura.cpp
index d9990833a08..e52e3af829c 100644
--- a/src/mame/drivers/mogura.cpp
+++ b/src/mame/drivers/mogura.cpp
@@ -3,10 +3,14 @@
/* Mogura Desse */
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/konamipt.h"
+
+#include "cpu/z80/z80.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
class mogura_state : public driver_device
{
diff --git a/src/mame/drivers/mole.cpp b/src/mame/drivers/mole.cpp
index 12b2ca6c2ee..8e3e218c493 100644
--- a/src/mame/drivers/mole.cpp
+++ b/src/mame/drivers/mole.cpp
@@ -52,6 +52,8 @@
#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class mole_state : public driver_device
diff --git a/src/mame/drivers/molecular.cpp b/src/mame/drivers/molecular.cpp
index b12b14b198b..1439eabf44b 100644
--- a/src/mame/drivers/molecular.cpp
+++ b/src/mame/drivers/molecular.cpp
@@ -47,11 +47,13 @@ TODO:
***********************************************************************************/
-
#include "emu.h"
#include "cpu/i86/i86.h"
#include "cpu/z80/z80.h"
//#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
#define I86_CLOCK XTAL_24MHz
#define Z80_CLOCK XTAL_16MHz
diff --git a/src/mame/drivers/momoko.cpp b/src/mame/drivers/momoko.cpp
index 3feb5c7fa37..1fedaa73dda 100644
--- a/src/mame/drivers/momoko.cpp
+++ b/src/mame/drivers/momoko.cpp
@@ -46,11 +46,14 @@ Stephh's notes (based on the game Z80 code and some tests) :
*****************************************************************************/
#include "emu.h"
+#include "includes/momoko.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
-#include "includes/momoko.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(momoko_state::momoko_bg_read_bank_w)
diff --git a/src/mame/drivers/monty.cpp b/src/mame/drivers/monty.cpp
index a2210d1e53e..f8dc3071cdc 100644
--- a/src/mame/drivers/monty.cpp
+++ b/src/mame/drivers/monty.cpp
@@ -30,8 +30,10 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "sound/spkrdev.h"
#include "video/sed1520.h"
-#include "sound/speaker.h"
+#include "screen.h"
+#include "speaker.h"
class monty_state : public driver_device
diff --git a/src/mame/drivers/monzagp.cpp b/src/mame/drivers/monzagp.cpp
index 6b36dcc15f7..ed09e7d9fb4 100644
--- a/src/mame/drivers/monzagp.cpp
+++ b/src/mame/drivers/monzagp.cpp
@@ -33,6 +33,7 @@ Lower board (MGP_01):
#include "cpu/mcs48/mcs48.h"
#include "machine/nvram.h"
#include "video/resnet.h"
+#include "screen.h"
#include "monzagp.lh"
diff --git a/src/mame/drivers/moo.cpp b/src/mame/drivers/moo.cpp
index bb6f2344e54..117c3c337bc 100644
--- a/src/mame/drivers/moo.cpp
+++ b/src/mame/drivers/moo.cpp
@@ -115,14 +115,16 @@ Bucky:
***************************************************************************/
#include "emu.h"
+#include "includes/moo.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/okim6295.h"
#include "sound/k054539.h"
-#include "includes/konamipt.h"
-#include "includes/moo.h"
+#include "speaker.h"
#define MOO_DEBUG 0
#define MOO_DMADELAY (100)
diff --git a/src/mame/drivers/mosaic.cpp b/src/mame/drivers/mosaic.cpp
index edbbcff08f9..fa8284734a6 100644
--- a/src/mame/drivers/mosaic.cpp
+++ b/src/mame/drivers/mosaic.cpp
@@ -10,9 +10,13 @@
***************************************************************************/
#include "emu.h"
+#include "includes/mosaic.h"
+
#include "cpu/z180/z180.h"
#include "sound/2203intf.h"
-#include "includes/mosaic.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(mosaic_state::protection_w)
{
diff --git a/src/mame/drivers/mouser.cpp b/src/mame/drivers/mouser.cpp
index a64e53aa513..d1a096749f5 100644
--- a/src/mame/drivers/mouser.cpp
+++ b/src/mame/drivers/mouser.cpp
@@ -15,9 +15,13 @@
*******************************************************************************/
#include "emu.h"
+#include "includes/mouser.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/mouser.h"
+#include "screen.h"
+#include "speaker.h"
+
/* Mouser has external masking circuitry around
* the NMI input on the main CPU */
diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp
index 378252a0563..53911636fb6 100644
--- a/src/mame/drivers/mpf1.cpp
+++ b/src/mame/drivers/mpf1.cpp
@@ -50,6 +50,8 @@
#include "emu.h"
#include "includes/mpf1.h"
+#include "speaker.h"
+
#include "mpf1.lh"
#include "mpf1b.lh"
#include "mpf1p.lh"
diff --git a/src/mame/drivers/mpu12wbk.cpp b/src/mame/drivers/mpu12wbk.cpp
index 31e0b05bf44..dfd26114196 100644
--- a/src/mame/drivers/mpu12wbk.cpp
+++ b/src/mame/drivers/mpu12wbk.cpp
@@ -205,14 +205,16 @@
*****************************************************************************************/
-
-#define MASTER_CLOCK XTAL_8MHz
-
#include "emu.h"
#include "cpu/m6809/m6809.h"
-#include "video/mc6845.h"
-#include "sound/ay8910.h"
//#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_8MHz
class mpu12wbk_state : public driver_device
diff --git a/src/mame/drivers/mpu4.cpp b/src/mame/drivers/mpu4.cpp
index ebda900681e..f889fa3af7f 100644
--- a/src/mame/drivers/mpu4.cpp
+++ b/src/mame/drivers/mpu4.cpp
@@ -260,12 +260,12 @@ TODO: - Distinguish door switches using manual
- Per game inputs not currently supported, may need to do something about DIPs, inverted lines etc.
***********************************************************************************************************/
#include "emu.h"
-
#include "includes/mpu4.h"
-
#include "video/awpvid.h" //Fruit Machines Only
+#include "speaker.h"
+
#include "mpu4.lh"
#include "mpu4ext.lh"
diff --git a/src/mame/drivers/mpu4dealem.cpp b/src/mame/drivers/mpu4dealem.cpp
index 37063826098..8327c7e983f 100644
--- a/src/mame/drivers/mpu4dealem.cpp
+++ b/src/mame/drivers/mpu4dealem.cpp
@@ -15,17 +15,20 @@ the Deal 'Em board design, rather than the one they ultimately used, suggesting
#include "emu.h"
#include "includes/mpu4.h"
+
#include "video/resnet.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
class mpu4dealem_state : public mpu4_state
{
public:
mpu4dealem_state(const machine_config &mconfig, device_type type, const char *tag)
- : mpu4_state(mconfig, type, tag),
- m_dealem_videoram(*this, "dealem_videoram"),
- m_gfxdecode(*this, "gfxdecode")
+ : mpu4_state(mconfig, type, tag)
+ , m_dealem_videoram(*this, "dealem_videoram")
+ , m_gfxdecode(*this, "gfxdecode")
{
}
diff --git a/src/mame/drivers/mpu4plasma.cpp b/src/mame/drivers/mpu4plasma.cpp
index a6675fc3b6e..ef2f442f5c2 100644
--- a/src/mame/drivers/mpu4plasma.cpp
+++ b/src/mame/drivers/mpu4plasma.cpp
@@ -7,7 +7,10 @@
#include "emu.h"
#include "includes/mpu4.h"
+
#include "cpu/m68000/m68000.h"
+#include "screen.h"
+
#include "mpu4plasma.lh"
diff --git a/src/mame/drivers/mpu4vid.cpp b/src/mame/drivers/mpu4vid.cpp
index 09ea564b857..18d1e439d4e 100644
--- a/src/mame/drivers/mpu4vid.cpp
+++ b/src/mame/drivers/mpu4vid.cpp
@@ -176,26 +176,33 @@ TODO:
approximation of the SCN2674 scanline logic, but this is perhaps better served as a proper device.
***********************************************************************************************************/
#include "emu.h"
+#include "includes/mpu4.h"
+
+#include "cpu/m6809/m6809.h"
+#include "cpu/m68000/m68000.h"
+
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
+#include "machine/6850acia.h"
+#include "machine/meters.h"
#include "machine/nvram.h"
+#include "machine/roc10937.h"
+#include "machine/steppers.h"
-#include "cpu/m6809/m6809.h"
#include "sound/ay8910.h"
#include "sound/okim6376.h"
-#include "sound/ym2413.h"
+#include "sound/saa1099.h"
#include "sound/upd7759.h"
-#include "machine/steppers.h"
-#include "machine/roc10937.h"
-#include "machine/meters.h"
-#include "video/scn2674.h"
+#include "sound/ym2413.h"
+
#include "video/ef9369.h"
-#include "cpu/m68000/m68000.h"
-#include "machine/6850acia.h"
-#include "sound/saa1099.h"
+#include "video/scn2674.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "crmaze2p.lh"
#include "crmaze4p.lh"
-#include "includes/mpu4.h"
struct bt471_t
diff --git a/src/mame/drivers/mpu5.cpp b/src/mame/drivers/mpu5.cpp
index 62227614415..af1e49b57e4 100644
--- a/src/mame/drivers/mpu5.cpp
+++ b/src/mame/drivers/mpu5.cpp
@@ -44,7 +44,10 @@
#include "emu.h"
+#include "machine/68340.h"
#include "machine/sec.h"
+#include "speaker.h"
+
#include "mpu5.lh"
// MFME2MAME layouts:
@@ -196,8 +199,6 @@
#include "m5xfact11.lh"
-#include "machine/68340.h"
-
class mpu5_state : public driver_device
{
public:
diff --git a/src/mame/drivers/mquake.cpp b/src/mame/drivers/mquake.cpp
index 064e66bd19d..47e009cd4b4 100644
--- a/src/mame/drivers/mquake.cpp
+++ b/src/mame/drivers/mquake.cpp
@@ -35,20 +35,22 @@
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "includes/amiga.h"
-#include "sound/es5503.h"
+
+#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
#include "machine/amigafdc.h"
+#include "sound/es5503.h"
+#include "speaker.h"
class mquake_state : public amiga_state
{
public:
mquake_state(const machine_config &mconfig, device_type type, const char *tag)
- : amiga_state(mconfig, type, tag),
- m_es5503(*this, "es5503"),
- m_es5503_rom(*this, "es5503")
+ : amiga_state(mconfig, type, tag),
+ m_es5503(*this, "es5503"),
+ m_es5503_rom(*this, "es5503")
{ }
DECLARE_DRIVER_INIT(mquake);
diff --git a/src/mame/drivers/mrdo.cpp b/src/mame/drivers/mrdo.cpp
index a95c42c71ec..8501dde3262 100644
--- a/src/mame/drivers/mrdo.cpp
+++ b/src/mame/drivers/mrdo.cpp
@@ -22,9 +22,12 @@ There's a chance that certain bootlegs might have the different 8/20 MHz XTALS.
***************************************************************************/
#include "emu.h"
+#include "includes/mrdo.h"
+
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
-#include "includes/mrdo.h"
+#include "screen.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_8_2MHz
diff --git a/src/mame/drivers/mrflea.cpp b/src/mame/drivers/mrflea.cpp
index ac14b0ae87c..99ba8b6109e 100644
--- a/src/mame/drivers/mrflea.cpp
+++ b/src/mame/drivers/mrflea.cpp
@@ -66,9 +66,11 @@ Stephh's notes (based on the games Z80 code and some tests) :
******************************************************************/
#include "emu.h"
+#include "includes/mrflea.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/mrflea.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/mrgame.cpp b/src/mame/drivers/mrgame.cpp
index 66a9333be43..ea3065cc1a1 100644
--- a/src/mame/drivers/mrgame.cpp
+++ b/src/mame/drivers/mrgame.cpp
@@ -31,7 +31,6 @@ ToDo:
*****************************************************************************************/
-
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
@@ -41,6 +40,9 @@ ToDo:
#include "sound/tms5220.h"
#include "sound/volt_reg.h"
#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
+
class mrgame_state : public driver_device
{
diff --git a/src/mame/drivers/mrjong.cpp b/src/mame/drivers/mrjong.cpp
index 57f09a19316..23bf9a6c0db 100644
--- a/src/mame/drivers/mrjong.cpp
+++ b/src/mame/drivers/mrjong.cpp
@@ -46,9 +46,12 @@ ROMs 6A, 7A, 8A, 9A: 2764
***************************************************************************/
#include "emu.h"
+#include "includes/mrjong.h"
+
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
-#include "includes/mrjong.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/ms0515.cpp b/src/mame/drivers/ms0515.cpp
index 957fe421217..a4bcd1c1ad5 100644
--- a/src/mame/drivers/ms0515.cpp
+++ b/src/mame/drivers/ms0515.cpp
@@ -26,7 +26,6 @@
#include "bus/rs232/rs232.h"
#include "cpu/t11/t11.h"
-#include "formats/ms0515_dsk.h"
#include "machine/clock.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
@@ -34,9 +33,13 @@
#include "machine/pit8253.h"
#include "machine/ram.h"
#include "machine/wd_fdc.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "sound/wave.h"
+#include "screen.h"
+
+#include "formats/ms0515_dsk.h"
+
#include "ms0515.lh"
diff --git a/src/mame/drivers/ms32.cpp b/src/mame/drivers/ms32.cpp
index b1007f5e45e..e97a1f14543 100644
--- a/src/mame/drivers/ms32.cpp
+++ b/src/mame/drivers/ms32.cpp
@@ -169,11 +169,13 @@ Super Strong Warriors
/********** BITS & PIECES **********/
#include "emu.h"
+#include "includes/ms32.h"
+#include "machine/jalcrpt.h"
+
#include "cpu/z80/z80.h"
#include "cpu/v60/v60.h"
#include "sound/ymf271.h"
-#include "machine/jalcrpt.h"
-#include "includes/ms32.h"
+#include "speaker.h"
/********** READ INPUTS **********/
diff --git a/src/mame/drivers/msisaac.cpp b/src/mame/drivers/msisaac.cpp
index 48ec76311a2..9c2977cce73 100644
--- a/src/mame/drivers/msisaac.cpp
+++ b/src/mame/drivers/msisaac.cpp
@@ -9,10 +9,14 @@
****************************************************************************/
#include "emu.h"
+#include "includes/msisaac.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
#include "sound/ay8910.h"
-#include "includes/msisaac.h"
+#include "screen.h"
+#include "speaker.h"
+
/*
TO DO:
diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp
index da34f317971..0c2b515fee5 100644
--- a/src/mame/drivers/mstation.cpp
+++ b/src/mame/drivers/mstation.cpp
@@ -30,9 +30,11 @@
#include "cpu/z80/z80.h"
#include "machine/bankdev.h"
#include "machine/intelfsh.h"
-#include "machine/rp5c01.h"
#include "machine/ram.h"
+#include "machine/rp5c01.h"
#include "rendlay.h"
+#include "screen.h"
+
class mstation_state : public driver_device
{
diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp
index f8d672f5ba0..ab5ea0e9a42 100644
--- a/src/mame/drivers/msx.cpp
+++ b/src/mame/drivers/msx.cpp
@@ -534,7 +534,9 @@ PCB Layouts missing
#include "machine/msx_s1985.h"
#include "machine/msx_systemflags.h"
#include "sound/volt_reg.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
static ADDRESS_MAP_START ( msx_memory_map, AS_PROGRAM, 8, msx_state )
diff --git a/src/mame/drivers/mtx.cpp b/src/mame/drivers/mtx.cpp
index a2d69798559..99fff4172dd 100644
--- a/src/mame/drivers/mtx.cpp
+++ b/src/mame/drivers/mtx.cpp
@@ -23,17 +23,21 @@
#include "emu.h"
#include "includes/mtx.h"
+
+#include "bus/centronics/ctronics.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "imagedev/cassette.h"
-#include "machine/ram.h"
#include "imagedev/snapquik.h"
-#include "bus/centronics/ctronics.h"
+#include "machine/ram.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
-#include "video/tms9928a.h"
#include "sound/sn76496.h"
+#include "video/tms9928a.h"
+
#include "softlist.h"
+#include "speaker.h"
+
/***************************************************************************
MEMORY MAPS
diff --git a/src/mame/drivers/mugsmash.cpp b/src/mame/drivers/mugsmash.cpp
index 2b61c560ce1..29d713fab2f 100644
--- a/src/mame/drivers/mugsmash.cpp
+++ b/src/mame/drivers/mugsmash.cpp
@@ -42,11 +42,15 @@ behavior we use .
*/
#include "emu.h"
+#include "includes/mugsmash.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/mugsmash.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE16_MEMBER(mugsmash_state::mugsmash_reg2_w)
{
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index b06bc7d9f41..431f6efeed2 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -184,6 +184,9 @@ below are simply made to the banking address to run on other boards.
#include "emu.h"
#include "includes/multfish.h"
+#include "speaker.h"
+
+
TILE_GET_INFO_MEMBER(igrosoft_gamble_state::get_igrosoft_gamble_tile_info)
{
int code = m_vid[tile_index*2+0x0000] | (m_vid[tile_index*2+0x0001] << 8);
diff --git a/src/mame/drivers/multi16.cpp b/src/mame/drivers/multi16.cpp
index 5a5911f6c7b..3193c2e9e23 100644
--- a/src/mame/drivers/multi16.cpp
+++ b/src/mame/drivers/multi16.cpp
@@ -8,8 +8,9 @@
#include "emu.h"
#include "cpu/i86/i86.h"
-#include "video/mc6845.h"
#include "machine/pic8259.h"
+#include "video/mc6845.h"
+#include "screen.h"
class multi16_state : public driver_device
diff --git a/src/mame/drivers/multi8.cpp b/src/mame/drivers/multi8.cpp
index 5f9c0603af6..61c5291ff11 100644
--- a/src/mame/drivers/multi8.cpp
+++ b/src/mame/drivers/multi8.cpp
@@ -16,10 +16,12 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/2203intf.h"
-#include "video/mc6845.h"
#include "machine/i8255.h"
+#include "sound/2203intf.h"
#include "sound/beep.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
class multi8_state : public driver_device
@@ -32,7 +34,7 @@ public:
, m_ppi(*this, "ppi8255_0")
, m_crtc(*this, "crtc")
, m_beeper(*this, "beeper")
- { }
+ { }
DECLARE_WRITE8_MEMBER(multi8_6845_w);
DECLARE_READ8_MEMBER(key_input_r);
diff --git a/src/mame/drivers/multigam.cpp b/src/mame/drivers/multigam.cpp
index 87c92d7851f..dee9c71d0fb 100644
--- a/src/mame/drivers/multigam.cpp
+++ b/src/mame/drivers/multigam.cpp
@@ -109,6 +109,8 @@ Eproms are 27512,27010,274001
#include "emu.h"
#include "cpu/m6502/n2a03.h"
#include "video/ppu2c0x.h"
+#include "screen.h"
+#include "speaker.h"
class multigam_state : public driver_device
diff --git a/src/mame/drivers/munchmo.cpp b/src/mame/drivers/munchmo.cpp
index e0bc16b6530..2b59c1520b2 100644
--- a/src/mame/drivers/munchmo.cpp
+++ b/src/mame/drivers/munchmo.cpp
@@ -26,9 +26,12 @@ Stephh's notes (based on the game Z80 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/munchmo.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/munchmo.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/murogem.cpp b/src/mame/drivers/murogem.cpp
index 9935e42dea5..fce442574e8 100644
--- a/src/mame/drivers/murogem.cpp
+++ b/src/mame/drivers/murogem.cpp
@@ -108,9 +108,11 @@ val (hex): 27 20 22 04 26 00 20 20 00 07 00 00 80 00 00 00 ns
#include "emu.h"
#include "cpu/m6800/m6800.h"
-#include "video/mc6845.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
class murogem_state : public driver_device
diff --git a/src/mame/drivers/murogmbl.cpp b/src/mame/drivers/murogmbl.cpp
index e2b827548da..e8f19e19b69 100644
--- a/src/mame/drivers/murogmbl.cpp
+++ b/src/mame/drivers/murogmbl.cpp
@@ -39,6 +39,8 @@ Dumped: 06/04/2009 f205v
#include "cpu/z80/z80.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
class murogmbl_state : public driver_device
diff --git a/src/mame/drivers/mustache.cpp b/src/mame/drivers/mustache.cpp
index 0080e6dcf29..5110bba8a7c 100644
--- a/src/mame/drivers/mustache.cpp
+++ b/src/mame/drivers/mustache.cpp
@@ -30,10 +30,13 @@ YM2151:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/mustache.h"
#include "audio/t5182.h"
+#include "cpu/z80/z80.h"
+#include "speaker.h"
+
+
#define XTAL1 14318180
#define XTAL2 18432000
#define XTAL3 12000000
diff --git a/src/mame/drivers/mwarr.cpp b/src/mame/drivers/mwarr.cpp
index 6d34a3363e8..d97533bda3b 100644
--- a/src/mame/drivers/mwarr.cpp
+++ b/src/mame/drivers/mwarr.cpp
@@ -43,6 +43,9 @@ Notes:
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_12MHz
#define SOUND_CLOCK XTAL_45MHz
diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp
index 861eb19f318..442013d9283 100644
--- a/src/mame/drivers/mx2178.cpp
+++ b/src/mame/drivers/mx2178.cpp
@@ -22,10 +22,12 @@
#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
#include "machine/6850acia.h"
#include "machine/clock.h"
#include "machine/keyboard.h"
+#include "video/mc6845.h"
+#include "screen.h"
+
class mx2178_state : public driver_device
{
diff --git a/src/mame/drivers/myb3k.cpp b/src/mame/drivers/myb3k.cpp
index 8b6f6b00a40..fe7446f27b1 100644
--- a/src/mame/drivers/myb3k.cpp
+++ b/src/mame/drivers/myb3k.cpp
@@ -14,8 +14,9 @@
#include "emu.h"
#include "cpu/i86/i86.h"
-#include "video/mc6845.h"
#include "machine/wd_fdc.h"
+#include "video/mc6845.h"
+#include "screen.h"
class myb3k_state : public driver_device
{
diff --git a/src/mame/drivers/mycom.cpp b/src/mame/drivers/mycom.cpp
index 6b736e15afd..600999a942e 100644
--- a/src/mame/drivers/mycom.cpp
+++ b/src/mame/drivers/mycom.cpp
@@ -50,13 +50,15 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
-#include "machine/i8255.h"
-#include "sound/sn76496.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
+#include "machine/i8255.h"
#include "machine/msm5832.h"
#include "machine/wd_fdc.h"
+#include "sound/sn76496.h"
+#include "sound/wave.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
class mycom_state : public driver_device
@@ -78,7 +80,7 @@ public:
, m_palette(*this, "palette")
, m_p_videoram(*this, "vram")
, m_p_chargen(*this, "chargen")
- { }
+ { }
DECLARE_READ8_MEMBER(mycom_upper_r);
DECLARE_WRITE8_MEMBER(mycom_upper_w);
diff --git a/src/mame/drivers/mystston.cpp b/src/mame/drivers/mystston.cpp
index abe70753f9c..5fec3ea95cb 100644
--- a/src/mame/drivers/mystston.cpp
+++ b/src/mame/drivers/mystston.cpp
@@ -16,9 +16,11 @@
***************************************************************************/
#include "emu.h"
+#include "includes/mystston.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
-#include "includes/mystston.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/mystwarr.cpp b/src/mame/drivers/mystwarr.cpp
index 3d2ec6f3c07..6a469728c42 100644
--- a/src/mame/drivers/mystwarr.cpp
+++ b/src/mame/drivers/mystwarr.cpp
@@ -133,14 +133,16 @@ we have no way of knowing which is the later/corrected version.
**************************************************************************/
#include "emu.h"
-#include "video/k053250.h"
+#include "includes/mystwarr.h"
#include "includes/konamigx.h"
+#include "includes/konamipt.h"
+#include "video/k053250.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
#include "sound/k054539.h"
-#include "includes/konamipt.h"
-#include "includes/mystwarr.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/myvision.cpp b/src/mame/drivers/myvision.cpp
index 5a2e6b8554b..ea048d9eda0 100644
--- a/src/mame/drivers/myvision.cpp
+++ b/src/mame/drivers/myvision.cpp
@@ -24,12 +24,17 @@
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "video/tms9928a.h"
#include "sound/ay8910.h"
+#include "video/tms9928a.h"
+
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+
#include "softlist.h"
+#include "speaker.h"
+
class myvision_state : public driver_device
{
diff --git a/src/mame/drivers/mz2000.cpp b/src/mame/drivers/mz2000.cpp
index 93540e603e0..823ee098c44 100644
--- a/src/mame/drivers/mz2000.cpp
+++ b/src/mame/drivers/mz2000.cpp
@@ -18,19 +18,25 @@
****************************************************************************/
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "machine/z80pio.h"
+#include "imagedev/cassette.h"
+#include "imagedev/flopdrv.h"
#include "machine/i8255.h"
-#include "machine/wd_fdc.h"
#include "machine/pit8253.h"
+#include "machine/rp5c15.h"
+#include "machine/wd_fdc.h"
+#include "machine/z80pio.h"
#include "sound/beep.h"
#include "sound/wave.h"
-#include "machine/rp5c15.h"
-#include "imagedev/cassette.h"
-#include "imagedev/flopdrv.h"
+
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
+
#include "formats/2d_dsk.h"
#include "formats/mz_cas.h"
-#include "softlist.h"
+
#define MASTER_CLOCK XTAL_17_73447MHz/5 /* TODO: was 4 MHz, but otherwise cassette won't work due of a bug with MZF support ... */
diff --git a/src/mame/drivers/mz2500.cpp b/src/mame/drivers/mz2500.cpp
index c7fb550dd22..0de63ed8a50 100644
--- a/src/mame/drivers/mz2500.cpp
+++ b/src/mame/drivers/mz2500.cpp
@@ -46,15 +46,17 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "machine/z80pio.h"
-#include "machine/z80dart.h"
#include "machine/i8255.h"
-#include "machine/wd_fdc.h"
#include "machine/pit8253.h"
+#include "machine/rp5c15.h"
+#include "machine/wd_fdc.h"
+#include "machine/z80dart.h"
+#include "machine/z80pio.h"
#include "sound/2203intf.h"
#include "sound/beep.h"
-#include "machine/rp5c15.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
//#include "imagedev/cassette.h"
#include "imagedev/flopdrv.h"
diff --git a/src/mame/drivers/mz3500.cpp b/src/mame/drivers/mz3500.cpp
index 20f46da0cc7..badf86c6d19 100644
--- a/src/mame/drivers/mz3500.cpp
+++ b/src/mame/drivers/mz3500.cpp
@@ -35,6 +35,8 @@
#include "machine/pit8253.h"
#include "sound/beep.h"
#include "video/upd7220.h"
+#include "screen.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_8MHz
diff --git a/src/mame/drivers/mz6500.cpp b/src/mame/drivers/mz6500.cpp
index 4314226b988..c33b3943411 100644
--- a/src/mame/drivers/mz6500.cpp
+++ b/src/mame/drivers/mz6500.cpp
@@ -12,6 +12,7 @@
#include "cpu/i86/i86.h"
#include "machine/upd765.h"
#include "video/upd7220.h"
+#include "screen.h"
class mz6500_state : public driver_device
{
diff --git a/src/mame/drivers/mz700.cpp b/src/mame/drivers/mz700.cpp
index ed715c4acb0..93125aac2df 100644
--- a/src/mame/drivers/mz700.cpp
+++ b/src/mame/drivers/mz700.cpp
@@ -81,19 +81,18 @@
#include "emu.h"
#include "includes/mz700.h"
+
#include "cpu/z80/z80.h"
-#include "machine/i8255.h"
-#include "machine/pit8253.h"
-#include "machine/z80pio.h"
#include "machine/74145.h"
-#include "bus/centronics/ctronics.h"
#include "sound/sn76496.h"
-#include "sound/speaker.h"
#include "sound/wave.h"
-#include "imagedev/cassette.h"
-#include "machine/ram.h"
-#include "formats/mz_cas.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/mz_cas.h"
+
/***************************************************************************
TIMER DEVICE CALLBACKS
diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp
index 13f1eb7d50e..fda11575bd4 100644
--- a/src/mame/drivers/mz80.cpp
+++ b/src/mame/drivers/mz80.cpp
@@ -30,6 +30,10 @@ MZ80B
#include "emu.h"
#include "includes/mz80.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "formats/mz_cas.h"
diff --git a/src/mame/drivers/n64.cpp b/src/mame/drivers/n64.cpp
index 09b736400c2..7b368074370 100644
--- a/src/mame/drivers/n64.cpp
+++ b/src/mame/drivers/n64.cpp
@@ -10,14 +10,17 @@
*/
#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 "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "imagedev/harddriv.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
class n64_mess_state : public n64_state
{
diff --git a/src/mame/drivers/nakajies.cpp b/src/mame/drivers/nakajies.cpp
index 051aededa15..14ac132d6dc 100644
--- a/src/mame/drivers/nakajies.cpp
+++ b/src/mame/drivers/nakajies.cpp
@@ -274,8 +274,10 @@ disabled). Perhaps power on/off related??
#include "emu.h"
#include "cpu/nec/nec.h"
#include "machine/rp5c01.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
#define LOG 0
diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp
index 1b0ffebe86d..c42cae2be32 100644
--- a/src/mame/drivers/namcofl.cpp
+++ b/src/mame/drivers/namcofl.cpp
@@ -158,13 +158,16 @@ OSC3: 48.384MHz
*/
#include "emu.h"
+#include "includes/namcofl.h"
#include "includes/namcoic.h"
+
#include "cpu/i960/i960.h"
#include "sound/c352.h"
#include "machine/namcomcu.h"
#include "machine/nvram.h"
+#include "speaker.h"
+
#include "namcofl.lh"
-#include "includes/namcofl.h"
READ32_MEMBER(namcofl_state::fl_unk1_r)
diff --git a/src/mame/drivers/namcona1.cpp b/src/mame/drivers/namcona1.cpp
index 575248ac9fd..93dd8adc6e5 100644
--- a/src/mame/drivers/namcona1.cpp
+++ b/src/mame/drivers/namcona1.cpp
@@ -166,9 +166,10 @@ Notes:
***************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "includes/namcona1.h"
+#include "cpu/m68000/m68000.h"
#include "machine/namcomcu.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_50_113MHz
diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp
index cacefc14731..1f5e2ff2aba 100644
--- a/src/mame/drivers/namconb1.cpp
+++ b/src/mame/drivers/namconb1.cpp
@@ -271,12 +271,16 @@ GFX: Custom 145 ( 80 pin PQFP)
Custom 169 (120 pin PQFP)
*/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "includes/namconb1.h"
#include "includes/namcoic.h"
+
+#include "cpu/m68000/m68000.h"
#include "machine/namcomcu.h"
#include "sound/c352.h"
+#include "speaker.h"
+
+
#define MASTER_CLOCK XTAL_48_384MHz
#define ENABLE_LOGGING (0)
diff --git a/src/mame/drivers/namcond1.cpp b/src/mame/drivers/namcond1.cpp
index ff0662c4c91..2123d28d516 100644
--- a/src/mame/drivers/namcond1.cpp
+++ b/src/mame/drivers/namcond1.cpp
@@ -69,11 +69,15 @@ Notes:
*************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
-#include "cpu/h8/h83002.h"
#include "includes/namcond1.h"
-#include "sound/c352.h"
+
+#include "cpu/h8/h83002.h"
+#include "cpu/m68000/m68000.h"
#include "machine/at28c16.h"
+#include "sound/c352.h"
+#include "screen.h"
+#include "speaker.h"
+
/*************************************************************/
diff --git a/src/mame/drivers/namcops2.cpp b/src/mame/drivers/namcops2.cpp
index b37e15ea9a8..c2088b7db6f 100644
--- a/src/mame/drivers/namcops2.cpp
+++ b/src/mame/drivers/namcops2.cpp
@@ -873,6 +873,7 @@ Notes:
#include "emu.h"
#include "cpu/mips/mips3.h"
#include "cpu/mips/r3000.h"
+#include "screen.h"
class namcops2_state : public driver_device
diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp
index 3c7a6452a6c..0853def98ec 100644
--- a/src/mame/drivers/namcos1.cpp
+++ b/src/mame/drivers/namcos1.cpp
@@ -337,11 +337,14 @@ C - uses sub board with support for player 3 and 4 controls
#include "emu.h"
#include "includes/namcos1.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
#include "machine/nvram.h"
#include "sound/volt_reg.h"
#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
/**********************************************************************/
diff --git a/src/mame/drivers/namcos10.cpp b/src/mame/drivers/namcos10.cpp
index b9f7ae9a3ef..69c5feacae2 100644
--- a/src/mame/drivers/namcos10.cpp
+++ b/src/mame/drivers/namcos10.cpp
@@ -267,9 +267,13 @@ Kono Tako 10021 Ver.A KC034A 8E, 8D
*/
#include "emu.h"
+#include "machine/ns10crypt.h"
+
#include "cpu/psx/psx.h"
+#include "machine/ram.h"
#include "video/psx.h"
-#include "machine/ns10crypt.h"
+#include "speaker.h"
+
class namcos10_state : public driver_device
{
diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp
index dbc273e8397..c4d6b45cf80 100644
--- a/src/mame/drivers/namcos11.cpp
+++ b/src/mame/drivers/namcos11.cpp
@@ -295,11 +295,13 @@ Pin 22 Solder Side - Gun 2 Trigger
#include "emu.h"
#include "cpu/psx/psx.h"
-#include "video/psx.h"
#include "machine/at28c16.h"
#include "machine/namcomcu.h"
#include "machine/ns11prot.h"
+#include "machine/ram.h"
#include "sound/c352.h"
+#include "video/psx.h"
+#include "speaker.h"
#define C76_SPEEDUP ( 1 ) /* sound cpu idle skipping */
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp
index 747ee95237f..1186aac3cfc 100644
--- a/src/mame/drivers/namcos12.cpp
+++ b/src/mame/drivers/namcos12.cpp
@@ -1090,9 +1090,13 @@ The lever must be wired to analog port 0 (pin B22 parts side) of the Namco 48-wa
#include "cpu/h8/h83337.h"
#include "video/psx.h"
#include "machine/at28c16.h"
+#include "machine/ram.h"
#include "sound/c352.h"
#include "machine/rtc4543.h"
#include "machine/namco_settings.h"
+#include "screen.h"
+#include "speaker.h"
+
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/mame/drivers/namcos2.cpp b/src/mame/drivers/namcos2.cpp
index 84044e5c1a0..dc73bbb17f7 100644
--- a/src/mame/drivers/namcos2.cpp
+++ b/src/mame/drivers/namcos2.cpp
@@ -446,14 +446,16 @@ $a00000 checks have been seen on the Final Lap boards.
***************************************************************************/
#include "emu.h"
+#include "includes/namcos2.h"
+#include "includes/namcoic.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/m6805/m6805.h"
-#include "includes/namcos2.h"
#include "cpu/m6809/m6809.h"
-#include "includes/namcoic.h"
#include "machine/nvram.h"
#include "sound/ym2151.h"
#include "sound/c140.h"
+#include "speaker.h"
#include "finallap.lh"
diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp
index 808cbb501b0..c6c75b97772 100644
--- a/src/mame/drivers/namcos21.cpp
+++ b/src/mame/drivers/namcos21.cpp
@@ -519,15 +519,18 @@ Filter Board
*/
#include "emu.h"
+#include "includes/namcos21.h"
+#include "includes/namcoic.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/m6805/m6805.h"
#include "cpu/m6809/m6809.h"
#include "cpu/tms32025/tms32025.h"
-#include "includes/namcoic.h"
#include "sound/ym2151.h"
-#include "sound/c140.h"
-#include "includes/namcos21.h"
#include "machine/nvram.h"
+#include "sound/c140.h"
+#include "speaker.h"
+
#define PTRAM_SIZE 0x20000
// TODO: basic parameters to get 60.606060 Hz, x2 is for interlace
diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp
index 3dae90a4618..aae96ea6c37 100644
--- a/src/mame/drivers/namcos22.cpp
+++ b/src/mame/drivers/namcos22.cpp
@@ -1158,10 +1158,13 @@
#include "emu.h"
#include "includes/namcos22.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/tms32025/tms32025.h"
#include "machine/namcomcu.h"
#include "sound/c352.h"
+#include "speaker.h"
+
#define SS22_MASTER_CLOCK (XTAL_49_152MHz) /* info from Guru */
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index b79ac26831f..54c3bd4fb02 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -1255,16 +1255,19 @@ Notes:
*/
#include "emu.h"
-#include <float.h>
-#include "video/poly.h"
-#include "cpu/mips/mips3.h"
#include "cpu/h8/h83002.h"
#include "cpu/h8/h83337.h"
+#include "cpu/mips/mips3.h"
#include "cpu/sh2/sh2.h"
-#include "sound/c352.h"
+#include "machine/namco_settings.h"
#include "machine/nvram.h"
#include "machine/rtc4543.h"
-#include "machine/namco_settings.h"
+#include "sound/c352.h"
+#include "video/poly.h"
+#include "speaker.h"
+
+#include <float.h>
+
#define JVSCLOCK (XTAL_14_7456MHz)
diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp
index e4455cac255..f3939ef636c 100644
--- a/src/mame/drivers/namcos86.cpp
+++ b/src/mame/drivers/namcos86.cpp
@@ -175,11 +175,15 @@ TODO:
*******************************************************************/
#include "emu.h"
+#include "includes/namcos86.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
#include "sound/ym2151.h"
#include "sound/n63701x.h"
-#include "includes/namcos86.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(namcos86_state::bankswitch1_w)
{
diff --git a/src/mame/drivers/nanos.cpp b/src/mame/drivers/nanos.cpp
index 95571f39104..91f1754a7ce 100644
--- a/src/mame/drivers/nanos.cpp
+++ b/src/mame/drivers/nanos.cpp
@@ -9,14 +9,18 @@
****************************************************************************/
#include "emu.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
-#include "machine/z80pio.h"
-#include "machine/z80dart.h"
-#include "machine/z80ctc.h"
+#include "machine/ram.h"
#include "machine/upd765.h"
+#include "machine/z80ctc.h"
+#include "machine/z80dart.h"
+#include "machine/z80pio.h"
+
#include "formats/nanos_dsk.h"
-#include "machine/ram.h"
+
+#include "screen.h"
class nanos_state : public driver_device
diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp
index f73b07088db..d175262dc6c 100644
--- a/src/mame/drivers/naomi.cpp
+++ b/src/mame/drivers/naomi.cpp
@@ -1572,6 +1572,9 @@ Premier Eleven
#include "emu.h"
#include "includes/naomi.h"
+#include "screen.h"
+#include "speaker.h"
+
#define CPU_CLOCK (200000000)
diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp
index 29908fb149e..adb296ff2e5 100644
--- a/src/mame/drivers/nascom1.cpp
+++ b/src/mame/drivers/nascom1.cpp
@@ -9,16 +9,21 @@
***************************************************************************/
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "machine/ram.h"
-#include "machine/z80pio.h"
-#include "machine/ay31015.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
+#include "machine/ay31015.h"
+#include "machine/ram.h"
+#include "machine/z80pio.h"
+
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "bus/nasbus/nasbus.h"
+
#include "softlist.h"
+#include "screen.h"
+
//**************************************************************************
// CONSTANTS/MACROS
diff --git a/src/mame/drivers/naughtyb.cpp b/src/mame/drivers/naughtyb.cpp
index 21ee2d04a88..0d60bc8e915 100644
--- a/src/mame/drivers/naughtyb.cpp
+++ b/src/mame/drivers/naughtyb.cpp
@@ -105,9 +105,11 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "includes/naughtyb.h"
+
#include "cpu/z80/z80.h"
#include "sound/tms36xx.h"
-#include "includes/naughtyb.h"
+#include "speaker.h"
#define CLOCK_XTAL 12000000
diff --git a/src/mame/drivers/nbmj8688.cpp b/src/mame/drivers/nbmj8688.cpp
index 9ab21bbf0b4..78d7ce180de 100644
--- a/src/mame/drivers/nbmj8688.cpp
+++ b/src/mame/drivers/nbmj8688.cpp
@@ -32,6 +32,7 @@ TODO:
#include "emu.h"
#include "includes/nbmj8688.h"
+
#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "sound/3812intf.h"
@@ -39,6 +40,9 @@ TODO:
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "nbmj8688.lh"
diff --git a/src/mame/drivers/nbmj8891.cpp b/src/mame/drivers/nbmj8891.cpp
index ee393bce6a9..1a69bb994e4 100644
--- a/src/mame/drivers/nbmj8891.cpp
+++ b/src/mame/drivers/nbmj8891.cpp
@@ -42,12 +42,14 @@ TODO:
#include "emu.h"
#include "includes/nbmj8891.h"
+
#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "sound/3812intf.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
DRIVER_INIT_MEMBER(nbmj8891_state,gionbana)
diff --git a/src/mame/drivers/nbmj8900.cpp b/src/mame/drivers/nbmj8900.cpp
index 29712b4136b..2447bbe193e 100644
--- a/src/mame/drivers/nbmj8900.cpp
+++ b/src/mame/drivers/nbmj8900.cpp
@@ -27,10 +27,12 @@ TODO:
#include "emu.h"
#include "includes/nbmj8900.h"
+
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
DRIVER_INIT_MEMBER(nbmj8900_state,ohpaipee)
diff --git a/src/mame/drivers/nbmj8991.cpp b/src/mame/drivers/nbmj8991.cpp
index 3f53ef95270..a4e60c609d5 100644
--- a/src/mame/drivers/nbmj8991.cpp
+++ b/src/mame/drivers/nbmj8991.cpp
@@ -32,12 +32,14 @@ Notes:
#include "emu.h"
#include "includes/nbmj8991.h"
+
#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "sound/3812intf.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
WRITE8_MEMBER(nbmj8991_state::soundbank_w)
diff --git a/src/mame/drivers/nbmj9195.cpp b/src/mame/drivers/nbmj9195.cpp
index 53ed32df3f8..742075e35dd 100644
--- a/src/mame/drivers/nbmj9195.cpp
+++ b/src/mame/drivers/nbmj9195.cpp
@@ -24,11 +24,13 @@ Notes:
#include "emu.h"
#include "includes/nbmj9195.h"
#include "includes/nb1413m3.h" // needed for mahjong input controller
+
#include "machine/gen_latch.h"
#include "machine/nvram.h"
#include "sound/3812intf.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
void nbmj9195_state::machine_start()
diff --git a/src/mame/drivers/nc.cpp b/src/mame/drivers/nc.cpp
index 301a49e5b9f..f63b8650666 100644
--- a/src/mame/drivers/nc.cpp
+++ b/src/mame/drivers/nc.cpp
@@ -96,15 +96,16 @@
******************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/nc.h"
+
+#include "cpu/z80/z80.h"
#include "machine/mc146818.h" /* for NC200 real time clock */
-#include "machine/rp5c01.h" /* for NC100 real time clock */
+#include "machine/rp5c01.h" /* for NC100 real time clock */
#include "machine/upd765.h" /* for NC200 disk drive interface */
#include "formats/pc_dsk.h" /* for NC200 disk image */
-#include "sound/beep.h"
-#include "machine/ram.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
#define VERBOSE 0
diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp
index 515efc4c294..faea4873a3a 100644
--- a/src/mame/drivers/nemesis.cpp
+++ b/src/mame/drivers/nemesis.cpp
@@ -49,6 +49,9 @@ So this is the correct behavior of real hardware, not an emulation bug.
***************************************************************************/
#include "emu.h"
+#include "includes/nemesis.h"
+#include "includes/konamipt.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
@@ -57,8 +60,7 @@ So this is the correct behavior of real hardware, not an emulation bug.
#include "sound/ym2151.h"
#include "sound/3812intf.h"
#include "sound/k051649.h"
-#include "includes/nemesis.h"
-#include "includes/konamipt.h"
+#include "speaker.h"
#include "konamigt.lh"
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp
index 6be7974edc3..dc42437997a 100644
--- a/src/mame/drivers/neogeo.cpp
+++ b/src/mame/drivers/neogeo.cpp
@@ -463,9 +463,12 @@
#include "emu.h"
#include "includes/neogeo.h"
+
#include "machine/nvram.h"
#include "machine/watchdog.h"
#include "softlist.h"
+#include "speaker.h"
+
#include "neogeo.lh"
diff --git a/src/mame/drivers/neoprint.cpp b/src/mame/drivers/neoprint.cpp
index d26bb9a2ba2..4eb4f0bdafc 100644
--- a/src/mame/drivers/neoprint.cpp
+++ b/src/mame/drivers/neoprint.cpp
@@ -25,8 +25,10 @@
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
-#include "sound/2610intf.h"
#include "machine/upd1990a.h"
+#include "sound/2610intf.h"
+#include "screen.h"
+#include "speaker.h"
class neoprint_state : public driver_device
diff --git a/src/mame/drivers/neptunp2.cpp b/src/mame/drivers/neptunp2.cpp
index 4090216a4f4..952291942ae 100644
--- a/src/mame/drivers/neptunp2.cpp
+++ b/src/mame/drivers/neptunp2.cpp
@@ -11,6 +11,8 @@
#include "emu.h"
#include "cpu/i86/i186.h"
+#include "screen.h"
+#include "speaker.h"
class neptunp2_state : public driver_device
diff --git a/src/mame/drivers/nes.cpp b/src/mame/drivers/nes.cpp
index 5c894331c59..2e22e40df43 100644
--- a/src/mame/drivers/nes.cpp
+++ b/src/mame/drivers/nes.cpp
@@ -14,8 +14,12 @@
#include "emu.h"
#include "includes/nes.h"
+
#include "cpu/m6502/n2a03.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
WRITE8_MEMBER(nes_state::nes_vh_sprite_dma_w)
{
diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp
index 80fb3dcc764..54f12085371 100644
--- a/src/mame/drivers/newbrain.cpp
+++ b/src/mame/drivers/newbrain.cpp
@@ -50,6 +50,9 @@
#include "emu.h"
#include "includes/newbrain.h"
+
+#include "screen.h"
+
#include "newbrain.lh"
#include "newbraina.lh"
diff --git a/src/mame/drivers/news.cpp b/src/mame/drivers/news.cpp
index 5bca38ad047..603b631dc02 100644
--- a/src/mame/drivers/news.cpp
+++ b/src/mame/drivers/news.cpp
@@ -16,9 +16,12 @@ driver by David Haywood
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/news.h"
+
+#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
static ADDRESS_MAP_START( news_map, AS_PROGRAM, 8, news_state )
diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp
index 40d04fa363a..586e3cedbf9 100644
--- a/src/mame/drivers/next.cpp
+++ b/src/mame/drivers/next.cpp
@@ -27,12 +27,16 @@
#include "emu.h"
#include "includes/next.h"
-#include "formats/pc_dsk.h"
-#include "formats/mfi_dsk.h"
+
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
+#include "screen.h"
#include "softlist.h"
+#include "formats/mfi_dsk.h"
+#include "formats/pc_dsk.h"
+
+
uint32_t next_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
// We don't handle partial updates, but we don't generate them either :-)
diff --git a/src/mame/drivers/nexus3d.cpp b/src/mame/drivers/nexus3d.cpp
index 53b4385462e..e8430db92d0 100644
--- a/src/mame/drivers/nexus3d.cpp
+++ b/src/mame/drivers/nexus3d.cpp
@@ -17,6 +17,7 @@
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
#include "machine/serflash.h"
+#include "screen.h"
//#include "machine/i2cmem.h"
@@ -50,9 +51,6 @@ public:
-
-
-
READ32_MEMBER(nexus3d_state::nexus3d_unk_r)
{
return machine().rand() ^ (machine().rand() << 16);
diff --git a/src/mame/drivers/ngen.cpp b/src/mame/drivers/ngen.cpp
index 31a69f410ba..e23e94b889d 100644
--- a/src/mame/drivers/ngen.cpp
+++ b/src/mame/drivers/ngen.cpp
@@ -62,20 +62,22 @@
*/
#include "emu.h"
-#include "cpu/i86/i186.h"
+#include "bus/rs232/rs232.h"
#include "cpu/i386/i386.h"
-#include "video/mc6845.h"
-#include "machine/i8251.h"
+#include "cpu/i86/i186.h"
+#include "imagedev/harddriv.h"
#include "machine/am9517a.h"
+#include "machine/clock.h"
+#include "machine/i8251.h"
+#include "machine/ngen_kb.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
-#include "machine/z80dart.h"
-#include "machine/wd_fdc.h"
#include "machine/wd2010.h"
-#include "bus/rs232/rs232.h"
-#include "machine/ngen_kb.h"
-#include "machine/clock.h"
-#include "imagedev/harddriv.h"
+#include "machine/wd_fdc.h"
+#include "machine/z80dart.h"
+#include "video/mc6845.h"
+#include "screen.h"
+
class ngen_state : public driver_device
{
diff --git a/src/mame/drivers/ngp.cpp b/src/mame/drivers/ngp.cpp
index 6a90badb6d8..dcbd70a8d81 100644
--- a/src/mame/drivers/ngp.cpp
+++ b/src/mame/drivers/ngp.cpp
@@ -107,7 +107,9 @@ the Neogeo Pocket.
#include "sound/volt_reg.h"
#include "video/k1ge.h"
#include "rendlay.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
enum flash_state
{
diff --git a/src/mame/drivers/nibble.cpp b/src/mame/drivers/nibble.cpp
index 61275ba4dc1..0a0ad62d7a0 100644
--- a/src/mame/drivers/nibble.cpp
+++ b/src/mame/drivers/nibble.cpp
@@ -46,14 +46,15 @@
*************************************************************************/
-
-#define MASTER_CLOCK XTAL_12MHz
-
#include "emu.h"
#include "cpu/tms9900/tms9980a.h"
//#include "cpu/tms9900/tms9900.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
+#include "screen.h"
+
+
+#define MASTER_CLOCK XTAL_12MHz
class nibble_state : public driver_device
diff --git a/src/mame/drivers/nightgal.cpp b/src/mame/drivers/nightgal.cpp
index d56b3b545d7..1d1186222a9 100644
--- a/src/mame/drivers/nightgal.cpp
+++ b/src/mame/drivers/nightgal.cpp
@@ -18,12 +18,16 @@ TODO:
*******************************************************************************************/
#include "emu.h"
-#include "sound/ay8910.h"
-#include "sound/2203intf.h"
-#include "cpu/z80/z80.h"
+
#include "cpu/m6800/m6800.h"
+#include "cpu/z80/z80.h"
+#include "sound/2203intf.h"
+#include "sound/ay8910.h"
#include "video/jangou_blitter.h"
#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_19_968MHz
diff --git a/src/mame/drivers/ninjakd2.cpp b/src/mame/drivers/ninjakd2.cpp
index cbd9f4f845d..e585971c771 100644
--- a/src/mame/drivers/ninjakd2.cpp
+++ b/src/mame/drivers/ninjakd2.cpp
@@ -151,11 +151,14 @@ TODO:
******************************************************************************/
#include "emu.h"
+#include "includes/ninjakd2.h"
+
#include "cpu/z80/z80.h"
-#include "sound/2203intf.h"
#include "machine/gen_latch.h"
#include "machine/mc8123.h"
-#include "includes/ninjakd2.h"
+#include "sound/2203intf.h"
+#include "speaker.h"
+
#define MAIN_CLOCK_12 XTAL_12MHz
#define MAIN_CLOCK_5 XTAL_5MHz
diff --git a/src/mame/drivers/ninjaw.cpp b/src/mame/drivers/ninjaw.cpp
index b2c54139331..409281acad2 100644
--- a/src/mame/drivers/ninjaw.cpp
+++ b/src/mame/drivers/ninjaw.cpp
@@ -316,11 +316,14 @@ rumbling on a subwoofer in the cabinet.)
***************************************************************************/
#include "emu.h"
+#include "includes/ninjaw.h"
+#include "includes/taitoipt.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
-#include "includes/taitoipt.h"
-#include "includes/ninjaw.h"
+#include "screen.h"
+#include "speaker.h"
#include "ninjaw.lh"
@@ -649,7 +652,7 @@ private:
extern const device_type SUBWOOFER;
-const device_type SUBWOOFER = &device_creator<subwoofer_device>;
+const device_type SUBWOOFER = device_creator<subwoofer_device>;
subwoofer_device::subwoofer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SUBWOOFER, "Subwoofer", tag, owner, clock),
diff --git a/src/mame/drivers/nitedrvr.cpp b/src/mame/drivers/nitedrvr.cpp
index 85d07411d48..1e006b023c9 100644
--- a/src/mame/drivers/nitedrvr.cpp
+++ b/src/mame/drivers/nitedrvr.cpp
@@ -37,11 +37,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/nitedrvr.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/rescap.h"
#include "machine/watchdog.h"
#include "sound/discrete.h"
-#include "includes/nitedrvr.h"
+#include "screen.h"
+#include "speaker.h"
/* Memory Map */
diff --git a/src/mame/drivers/niyanpai.cpp b/src/mame/drivers/niyanpai.cpp
index ec3a2d80938..03ce359a07f 100644
--- a/src/mame/drivers/niyanpai.cpp
+++ b/src/mame/drivers/niyanpai.cpp
@@ -38,6 +38,7 @@ Memo:
#include "emu.h"
#include "includes/niyanpai.h"
#include "includes/nb1413m3.h"
+
#include "cpu/z80/tmpz84c011.h"
#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
@@ -45,6 +46,7 @@ Memo:
#include "sound/3812intf.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
WRITE8_MEMBER(niyanpai_state::soundbank_w)
diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp
index 78b0759f371..f4cb152f221 100644
--- a/src/mame/drivers/nmg5.cpp
+++ b/src/mame/drivers/nmg5.cpp
@@ -222,12 +222,15 @@ Stephh's notes (based on the games M68000 code and some tests) :
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
-#include "sound/okim6295.h"
#include "sound/3812intf.h"
+#include "sound/okim6295.h"
#include "video/decospr.h"
+#include "screen.h"
+#include "speaker.h"
+
class nmg5_state : public driver_device
{
diff --git a/src/mame/drivers/nmk16.cpp b/src/mame/drivers/nmk16.cpp
index 4a9ad0fbb4f..ae2c019c7c3 100644
--- a/src/mame/drivers/nmk16.cpp
+++ b/src/mame/drivers/nmk16.cpp
@@ -147,17 +147,21 @@ Afega stands for "Art-Fiction Electronic Game"
********************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/tlcs90/tlcs90.h"
-#include "cpu/m68000/m68000.h"
+#include "includes/nmk16.h"
#include "audio/seibu.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cpu/pic16c5x/pic16c5x.h"
+#include "cpu/tlcs90/tlcs90.h"
+#include "cpu/z80/z80.h"
+#include "machine/nmk004.h"
#include "sound/2203intf.h"
-#include "sound/okim6295.h"
#include "sound/3812intf.h"
+#include "sound/okim6295.h"
#include "sound/ym2151.h"
-#include "machine/nmk004.h"
-#include "cpu/pic16c5x/pic16c5x.h"
-#include "includes/nmk16.h"
+
+#include "screen.h"
+#include "speaker.h"
WRITE16_MEMBER(nmk16_state::nmk16_x0016_w)
diff --git a/src/mame/drivers/nokia_3310.cpp b/src/mame/drivers/nokia_3310.cpp
index b7bc6672b6f..afa83f973b2 100644
--- a/src/mame/drivers/nokia_3310.cpp
+++ b/src/mame/drivers/nokia_3310.cpp
@@ -12,11 +12,14 @@
// if anybody has solid information to aid in the emulation of this (or other phones) please contribute.
#include "emu.h"
+
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
#include "machine/intelfsh.h"
#include "video/pcd8544.h"
+
#include "debugger.h"
+#include "screen.h"
#define LOG_MAD2_REGISTER_ACCESS (0)
diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp
index 1f387ab36cd..ae4b4db6c39 100644
--- a/src/mame/drivers/norautp.cpp
+++ b/src/mame/drivers/norautp.cpp
@@ -544,23 +544,27 @@
*******************************************************************************/
-
-#define NORAUT_MASTER_CLOCK XTAL_18_432MHz
-#define DPHL_MASTER_CLOCK XTAL_18MHz
-#define NORAUT_CPU_CLOCK NORAUT_MASTER_CLOCK / 8 /* 2.30275 MHz - Measured: 2.305 MHz */
-#define DPHL_CPU_CLOCK DPHL_MASTER_CLOCK / 9 /* 2 MHz (from 8224) */
-
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/norautp.h"
+
#include "cpu/i8085/i8085.h"
+#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/nvram.h"
-#include "includes/norautp.h"
+
+#include "screen.h"
+#include "speaker.h"
#include "noraut11.lh"
#include "noraut12.lh"
+#define NORAUT_MASTER_CLOCK XTAL_18_432MHz
+#define DPHL_MASTER_CLOCK XTAL_18MHz
+#define NORAUT_CPU_CLOCK NORAUT_MASTER_CLOCK / 8 /* 2.30275 MHz - Measured: 2.305 MHz */
+#define DPHL_CPU_CLOCK DPHL_MASTER_CLOCK / 9 /* 2 MHz (from 8224) */
+
+
/*************************
* Video Hardware *
*************************/
diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp
index 36ad2a4e6d7..d82d9e6cce2 100644
--- a/src/mame/drivers/notetaker.cpp
+++ b/src/mame/drivers/notetaker.cpp
@@ -83,6 +83,9 @@ DONE:
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "video/tms9927.h"
+#include "screen.h"
+#include "speaker.h"
+
class notetaker_state : public driver_device
{
diff --git a/src/mame/drivers/nova2001.cpp b/src/mame/drivers/nova2001.cpp
index f35c26daf8c..5e6e3b2d491 100644
--- a/src/mame/drivers/nova2001.cpp
+++ b/src/mame/drivers/nova2001.cpp
@@ -122,10 +122,14 @@ e000 - e7ff R/W Work RAM
******************************************************************************/
#include "emu.h"
+#include "includes/nova2001.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "includes/nova2001.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MAIN_CLOCK XTAL_12MHz
diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp
index 3f1a99e59b7..e367580f29a 100644
--- a/src/mame/drivers/novag6502.cpp
+++ b/src/mame/drivers/novag6502.cpp
@@ -57,11 +57,14 @@ instead of magnet sensors.
#include "emu.h"
#include "includes/novagbase.h"
+
+#include "bus/rs232/rs232.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/m65c02.h"
-#include "bus/rs232/rs232.h"
#include "machine/mos6551.h"
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
// internal artwork
#include "novag_cforte.lh" // clickable
diff --git a/src/mame/drivers/novag68k.cpp b/src/mame/drivers/novag68k.cpp
index af7c4efa693..3d270f14218 100644
--- a/src/mame/drivers/novag68k.cpp
+++ b/src/mame/drivers/novag68k.cpp
@@ -26,9 +26,12 @@ Diablo 68000:
#include "emu.h"
#include "includes/novagbase.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/mos6551.h"
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
// internal artwork
#include "novag_diablo68k.lh" // clickable
diff --git a/src/mame/drivers/nsm.cpp b/src/mame/drivers/nsm.cpp
index cab7f8820ac..049cd61eb53 100644
--- a/src/mame/drivers/nsm.cpp
+++ b/src/mame/drivers/nsm.cpp
@@ -22,6 +22,8 @@ ToDo:
#include "cpu/tms9900/tms9995.h"
#include "sound/ay8910.h"
+#include "speaker.h"
+
#include "nsm.lh"
diff --git a/src/mame/drivers/nsmpoker.cpp b/src/mame/drivers/nsmpoker.cpp
index 318e7d23cff..6589293b7ef 100644
--- a/src/mame/drivers/nsmpoker.cpp
+++ b/src/mame/drivers/nsmpoker.cpp
@@ -58,12 +58,13 @@
*******************************************************************************/
-
-#define MASTER_CLOCK XTAL_22_1184MHz
-
#include "emu.h"
#include "cpu/tms9900/tms9995.h"
#include "sound/ay8910.h"
+#include "screen.h"
+
+
+#define MASTER_CLOCK XTAL_22_1184MHz
class nsmpoker_state : public driver_device
diff --git a/src/mame/drivers/nss.cpp b/src/mame/drivers/nss.cpp
index d8285756571..5c6f8803b27 100644
--- a/src/mame/drivers/nss.cpp
+++ b/src/mame/drivers/nss.cpp
@@ -294,13 +294,15 @@ Contra III CONTRA_III_1 TC574000 CONTRA_III_0 TC574000 GAME1_NSSU
***************************************************************************/
#include "emu.h"
+#include "includes/snes.h"
+
#include "cpu/z80/z80.h"
#include "machine/m6m80011ap.h"
#include "machine/s3520cf.h"
#include "machine/rp5h01.h"
#include "video/m50458.h"
-#include "includes/snes.h"
#include "rendlay.h"
+#include "speaker.h"
class nss_state : public snes_state
diff --git a/src/mame/drivers/nwk-tr.cpp b/src/mame/drivers/nwk-tr.cpp
index 3df6f9ab198..37a603a1fcc 100644
--- a/src/mame/drivers/nwk-tr.cpp
+++ b/src/mame/drivers/nwk-tr.cpp
@@ -259,6 +259,8 @@ Thrill Drive 713A13 - 713A14 -
#include "sound/k056800.h"
#include "video/voodoo.h"
#include "video/k001604.h"
+#include "screen.h"
+#include "speaker.h"
class nwktr_state : public driver_device
diff --git a/src/mame/drivers/nycaptor.cpp b/src/mame/drivers/nycaptor.cpp
index 6a5ba1aad0c..f26b3744a2d 100644
--- a/src/mame/drivers/nycaptor.cpp
+++ b/src/mame/drivers/nycaptor.cpp
@@ -190,17 +190,20 @@ Stephh's additional notes (based on the game Z80 code and some tests) :
***************************************************************************/
-//#define USE_MCU
-
-
#include "emu.h"
#include "includes/nycaptor.h"
+#include "includes/taitoipt.h"
+
#include "cpu/m6805/m6805.h"
#include "cpu/z80/z80.h"
-#include "includes/taitoipt.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+//#define USE_MCU
WRITE8_MEMBER(nycaptor_state::sub_cpu_halt_w)
diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp
index 876b9cfed00..3cfbe24f1b9 100644
--- a/src/mame/drivers/nyny.cpp
+++ b/src/mame/drivers/nyny.cpp
@@ -64,7 +64,7 @@
***************************************************************************/
#include "emu.h"
-#include "emu.h"
+
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
@@ -77,6 +77,9 @@
#include "sound/volt_reg.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MAIN_CPU_MASTER_CLOCK XTAL_11_2MHz
#define PIXEL_CLOCK (MAIN_CPU_MASTER_CLOCK / 2)
diff --git a/src/mame/drivers/octopus.cpp b/src/mame/drivers/octopus.cpp
index 4504a24c902..2d1f2c9c919 100644
--- a/src/mame/drivers/octopus.cpp
+++ b/src/mame/drivers/octopus.cpp
@@ -106,30 +106,36 @@ It's a very rare computer. It has 2 processors, Z80 and 8088, so it can run both
****************************************************************************/
#include "emu.h"
+
#include "cpu/i86/i86.h"
#include "cpu/z80/z80.h"
-#include "video/scn2674.h"
+#include "imagedev/floppy.h"
#include "machine/am9517a.h"
-#include "machine/pic8259.h"
-#include "machine/mc146818.h"
-#include "machine/i8255.h"
-#include "machine/wd_fdc.h"
-#include "machine/i8251.h"
+#include "machine/bankdev.h"
#include "machine/clock.h"
-#include "imagedev/floppy.h"
-#include "machine/pit8253.h"
-#include "sound/speaker.h"
-#include "machine/z80dart.h"
+#include "machine/i8251.h"
+#include "machine/i8255.h"
+#include "machine/mc146818.h"
#include "machine/octo_kbd.h"
-#include "machine/bankdev.h"
+#include "machine/pic8259.h"
+#include "machine/pit8253.h"
#include "machine/ram.h"
+#include "machine/wd_fdc.h"
+#include "machine/z80dart.h"
+#include "sound/spkrdev.h"
+#include "video/scn2674.h"
+
#include "bus/centronics/ctronics.h"
#include "bus/centronics/comxpl80.h"
#include "bus/centronics/epson_ex800.h"
#include "bus/centronics/epson_lx800.h"
#include "bus/centronics/epson_lx810l.h"
#include "bus/centronics/printer.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
class octopus_state : public driver_device
{
diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp
index dcac941e74d..09250f96e85 100644
--- a/src/mame/drivers/odyssey2.cpp
+++ b/src/mame/drivers/odyssey2.cpp
@@ -12,13 +12,18 @@
***************************************************************************/
#include "emu.h"
+
#include "cpu/mcs48/mcs48.h"
-#include "video/i8244.h"
#include "machine/i8243.h"
#include "video/ef9340_1.h"
+#include "video/i8244.h"
#include "bus/odyssey2/slot.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
class odyssey2_state : public driver_device
{
diff --git a/src/mame/drivers/offtwall.cpp b/src/mame/drivers/offtwall.cpp
index 1a052608e7e..a105469525d 100644
--- a/src/mame/drivers/offtwall.cpp
+++ b/src/mame/drivers/offtwall.cpp
@@ -20,9 +20,11 @@
#include "emu.h"
+#include "includes/offtwall.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
-#include "includes/offtwall.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/ohmygod.cpp b/src/mame/drivers/ohmygod.cpp
index 19432ad7651..a93238fcdd9 100644
--- a/src/mame/drivers/ohmygod.cpp
+++ b/src/mame/drivers/ohmygod.cpp
@@ -14,10 +14,13 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/ohmygod.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
#include "sound/okim6295.h"
-#include "includes/ohmygod.h"
+#include "screen.h"
+#include "speaker.h"
WRITE16_MEMBER(ohmygod_state::ohmygod_ctrl_w)
diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp
index 843b73b91d7..95ad666a87f 100644
--- a/src/mame/drivers/ojankohs.cpp
+++ b/src/mame/drivers/ojankohs.cpp
@@ -34,11 +34,13 @@ Memo:
******************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/ojankohs.h"
+
+#include "cpu/z80/z80.h"
+#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "sound/msm5205.h"
-#include "machine/nvram.h"
+#include "speaker.h"
WRITE8_MEMBER(ojankohs_state::ojankohs_rombank_w)
diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp
index a1657b61367..2fa47418255 100644
--- a/src/mame/drivers/okean240.cpp
+++ b/src/mame/drivers/okean240.cpp
@@ -53,6 +53,8 @@ Usage of terminal:
#include "cpu/i8085/i8085.h"
#include "machine/keyboard.h"
#include "machine/terminal.h"
+#include "screen.h"
+
class okean240_state : public driver_device
{
diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp
index cce3d18d002..5bf02fb5dda 100644
--- a/src/mame/drivers/olibochu.cpp
+++ b/src/mame/drivers/olibochu.cpp
@@ -57,6 +57,8 @@ $7004 writes, related to $7000 reads
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class olibochu_state : public driver_device
{
diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp
index ba37b547ab8..4e6fc310fdd 100644
--- a/src/mame/drivers/omegrace.cpp
+++ b/src/mame/drivers/omegrace.cpp
@@ -223,6 +223,8 @@
#include "machine/gen_latch.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "screen.h"
+#include "speaker.h"
#include "omegrace.lh"
diff --git a/src/mame/drivers/ondra.cpp b/src/mame/drivers/ondra.cpp
index b8c0402709b..40c7028d7e5 100644
--- a/src/mame/drivers/ondra.cpp
+++ b/src/mame/drivers/ondra.cpp
@@ -10,12 +10,16 @@
#include "emu.h"
+#include "includes/ondra.h"
+
#include "cpu/z80/z80.h"
-#include "sound/wave.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
-#include "includes/ondra.h"
+#include "sound/wave.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
/* Address maps */
static ADDRESS_MAP_START(ondra_mem, AS_PROGRAM, 8, ondra_state )
diff --git a/src/mame/drivers/oneshot.cpp b/src/mame/drivers/oneshot.cpp
index 3ef8f98f588..54cfc96b2a8 100644
--- a/src/mame/drivers/oneshot.cpp
+++ b/src/mame/drivers/oneshot.cpp
@@ -36,12 +36,17 @@ NOTE: An eBay auction of the PCB shows "1996.9.16 PROMAT" on the JAMMA+ adapter
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m68000/m68000.h"
#include "includes/oneshot.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
-#include "sound/okim6295.h"
#include "sound/3812intf.h"
+#include "sound/okim6295.h"
+
+#include "screen.h"
+#include "speaker.h"
+
READ16_MEMBER(oneshot_state::oneshot_in0_word_r)
{
diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp
index 4087d0a435a..bbd211588ac 100644
--- a/src/mame/drivers/onetwo.cpp
+++ b/src/mame/drivers/onetwo.cpp
@@ -45,8 +45,10 @@ Note: this is quite clearly a 'Korean bootleg' of Shisensho - Joshiryo-Hen / Mat
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
-#include "sound/okim6295.h"
#include "sound/3812intf.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_4MHz
diff --git a/src/mame/drivers/opwolf.cpp b/src/mame/drivers/opwolf.cpp
index 72853c009a0..2041f3529a9 100644
--- a/src/mame/drivers/opwolf.cpp
+++ b/src/mame/drivers/opwolf.cpp
@@ -274,13 +274,17 @@ register. So what is controlling priority.
#define SOUND_CPU_CLOCK (XTAL_8MHz / 2) /* clock for Z80 sound CPU */
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/opwolf.h"
+#include "audio/taitosnd.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "includes/taitoipt.h"
-#include "audio/taitosnd.h"
-#include "sound/ym2151.h"
#include "sound/msm5205.h"
-#include "includes/opwolf.h"
+#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
+
READ16_MEMBER(opwolf_state::cchip_r)
{
diff --git a/src/mame/drivers/orao.cpp b/src/mame/drivers/orao.cpp
index 46632ff1a2b..d2b27d8ab79 100644
--- a/src/mame/drivers/orao.cpp
+++ b/src/mame/drivers/orao.cpp
@@ -13,13 +13,17 @@
****************************************************************************/
#include "emu.h"
+#include "includes/orao.h"
+
#include "cpu/m6502/m6502.h"
-#include "sound/speaker.h"
#include "sound/wave.h"
-#include "includes/orao.h"
-#include "imagedev/cassette.h"
-#include "formats/orao_cas.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/orao_cas.h"
+
/* Address maps */
static ADDRESS_MAP_START(orao_mem, AS_PROGRAM, 8, orao_state )
diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp
index a2e1370fbaf..7cbf45b2308 100644
--- a/src/mame/drivers/orbit.cpp
+++ b/src/mame/drivers/orbit.cpp
@@ -20,10 +20,12 @@ Atari Orbit Driver
***************************************************************************/
#include "emu.h"
-#include "cpu/m6800/m6800.h"
#include "includes/orbit.h"
+
+#include "cpu/m6800/m6800.h"
#include "machine/watchdog.h"
#include "sound/discrete.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_12_096MHz
diff --git a/src/mame/drivers/oric.cpp b/src/mame/drivers/oric.cpp
index dc2fb6b5ad3..05432a58d21 100644
--- a/src/mame/drivers/oric.cpp
+++ b/src/mame/drivers/oric.cpp
@@ -20,19 +20,25 @@
*********************************************************************/
#include "emu.h"
+
+#include "bus/centronics/ctronics.h"
#include "bus/oricext/oricext.h"
#include "cpu/m6502/m6502.h"
-#include "sound/ay8910.h"
-#include "sound/wave.h"
+#include "imagedev/cassette.h"
+#include "imagedev/floppy.h"
#include "machine/6522via.h"
#include "machine/mos6551.h"
-#include "bus/centronics/ctronics.h"
-#include "imagedev/floppy.h"
-#include "imagedev/cassette.h"
#include "machine/wd_fdc.h"
+#include "sound/ay8910.h"
+#include "sound/wave.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "formats/oric_dsk.h"
#include "formats/oric_tap.h"
+
class oric_state : public driver_device
{
public:
diff --git a/src/mame/drivers/orion.cpp b/src/mame/drivers/orion.cpp
index 7f3b9326ff4..15e2e5947e9 100644
--- a/src/mame/drivers/orion.cpp
+++ b/src/mame/drivers/orion.cpp
@@ -12,10 +12,15 @@
#include "emu.h"
#include "includes/orion.h"
+
#include "imagedev/cassette.h"
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
+
#include "formats/smx_dsk.h"
#include "formats/rk_cas.h"
-#include "softlist.h"
+
/* Address maps */
diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp
index 28d02a1b624..6adf765ef59 100644
--- a/src/mame/drivers/osbexec.cpp
+++ b/src/mame/drivers/osbexec.cpp
@@ -7,16 +7,21 @@
***************************************************************************/
#include "emu.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
-#include "sound/speaker.h"
-#include "machine/wd_fdc.h"
#include "machine/6821pia.h"
-#include "machine/z80dart.h"
+#include "machine/input_merger.h"
#include "machine/pit8253.h"
#include "machine/ram.h"
-#include "machine/input_merger.h"
+#include "machine/wd_fdc.h"
+#include "machine/z80dart.h"
+#include "sound/spkrdev.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
#define MAIN_CLOCK 23961600
diff --git a/src/mame/drivers/osborne1.cpp b/src/mame/drivers/osborne1.cpp
index 87fe3842ecd..43e5c995e5d 100644
--- a/src/mame/drivers/osborne1.cpp
+++ b/src/mame/drivers/osborne1.cpp
@@ -58,7 +58,7 @@ Schematics specify a WD1793 floppy controller, but we're using the Fujitsu
equivalent MB8877 here. Is it known that the original machines used one or
the other exclusively? In any case MAME emulates them identically.
-The installing the SCREEN-PAC requires the CPU and character generator ROM
+Installation of the SCREEN-PAC requires the CPU and character generator ROM
to be transplanted to the add-on board, and cables run to the sockets that
previously held these chips. It contains additional RAM clocked at twice
the speed of the main system RAM. Writes to video memory get sent to this
@@ -72,9 +72,8 @@ character generator ROM, so the mainboard's character generator ROM doesn't
need to be moved. However, it doesn't behave like the SCREEN-PAC. It uses
a Synertek SY6545-1 with its pixel clock derived from a 12.288MHz crystal
mapped at 0x04/0x05 in I/O space. It runs at 640x240 (80x24) at just below
-60Hz and doesn't allow resolution switching. We don't know how video RAM
-contention on video RAM is handled, or whether the CRTC can generate VBL
-interrupts.
+60Hz and doesn't allow resolution switching. We don't know how contention
+for video RAM is handled, or whether the CRTC can generate VBL interrupts.
TODO:
@@ -93,6 +92,8 @@ TODO:
#include "includes/osborne1.h"
#include "bus/rs232/rs232.h"
+#include "screen.h"
+#include "speaker.h"
#include "softlist.h"
diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp
index c9382f0c27c..92d96939619 100644
--- a/src/mame/drivers/osi.cpp
+++ b/src/mame/drivers/osi.cpp
@@ -218,7 +218,11 @@ PRINT FRE(0)
#include "emu.h"
#include "includes/osi.h"
+
#include "machine/clock.h"
+#include "screen.h"
+#include "speaker.h"
+
/* Sound */
diff --git a/src/mame/drivers/othello.cpp b/src/mame/drivers/othello.cpp
index 49adc51e733..f3255e3d740 100644
--- a/src/mame/drivers/othello.cpp
+++ b/src/mame/drivers/othello.cpp
@@ -38,8 +38,9 @@ Limit for help/undo (matta):
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
+
#include "cpu/mcs48/mcs48.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/i8243.h"
#include "sound/ay8910.h"
@@ -47,6 +48,9 @@ Limit for help/undo (matta):
#include "sound/volt_reg.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
#define TILE_WIDTH 6
diff --git a/src/mame/drivers/othunder.cpp b/src/mame/drivers/othunder.cpp
index dc830b11a3c..8efd0b53ac8 100644
--- a/src/mame/drivers/othunder.cpp
+++ b/src/mame/drivers/othunder.cpp
@@ -285,14 +285,17 @@ TODO:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/othunder.h"
+#include "includes/taitoipt.h"
+#include "audio/taitosnd.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
-#include "audio/taitosnd.h"
#include "sound/2610intf.h"
#include "sound/flt_vol.h"
-#include "includes/othunder.h"
-#include "includes/taitoipt.h"
+#include "screen.h"
+#include "speaker.h"
/***********************************************************
diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp
index 3daa286fcd4..f0fd002521e 100644
--- a/src/mame/drivers/overdriv.cpp
+++ b/src/mame/drivers/overdriv.cpp
@@ -27,13 +27,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/overdriv.h"
+
#include "cpu/m68000/m68000.h"
-#include "video/k053250.h"
-#include "machine/eepromser.h"
#include "cpu/m6809/m6809.h"
-#include "sound/ym2151.h"
+#include "machine/eepromser.h"
#include "sound/k053260.h"
-#include "includes/overdriv.h"
+#include "sound/ym2151.h"
+#include "video/k053250.h"
+#include "speaker.h"
#include "overdriv.lh"
diff --git a/src/mame/drivers/p112.cpp b/src/mame/drivers/p112.cpp
index f6f6cee8262..3707ce10c70 100644
--- a/src/mame/drivers/p112.cpp
+++ b/src/mame/drivers/p112.cpp
@@ -35,6 +35,7 @@ Some of the parts:
#include "emu.h"
#include "cpu/z180/z180.h"
+#include "screen.h"
class p112_state : public driver_device
diff --git a/src/mame/drivers/p2000t.cpp b/src/mame/drivers/p2000t.cpp
index 1e512cf4e95..0472d3dbe44 100644
--- a/src/mame/drivers/p2000t.cpp
+++ b/src/mame/drivers/p2000t.cpp
@@ -31,6 +31,9 @@ Philips P2000 1 Memory map
#include "emu.h"
#include "includes/p2000t.h"
+#include "screen.h"
+#include "speaker.h"
+
/* port i/o functions */
static ADDRESS_MAP_START( p2000t_io, AS_IO, 8, p2000t_state )
diff --git a/src/mame/drivers/p8k.cpp b/src/mame/drivers/p8k.cpp
index 3335a839372..11735b65f05 100644
--- a/src/mame/drivers/p8k.cpp
+++ b/src/mame/drivers/p8k.cpp
@@ -49,15 +49,17 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "cpu/z8000/z8000.h"
#include "cpu/z80/z80daisy.h"
+#include "cpu/z8000/z8000.h"
+#include "machine/terminal.h"
#include "machine/upd765.h"
#include "machine/z80ctc.h"
-#include "machine/z80pio.h"
#include "machine/z80dart.h"
#include "machine/z80dma.h"
+#include "machine/z80pio.h"
#include "sound/beep.h"
-#include "machine/terminal.h"
+#include "speaker.h"
+
#define TERMINAL_TAG "terminal"
diff --git a/src/mame/drivers/pachifev.cpp b/src/mame/drivers/pachifev.cpp
index d3b5fdc6972..37999a46caf 100644
--- a/src/mame/drivers/pachifev.cpp
+++ b/src/mame/drivers/pachifev.cpp
@@ -81,9 +81,10 @@ Stephh's notes (based on the game TMS9995 code and some tests) :
#include "emu.h"
#include "cpu/tms9900/tms9995.h"
-#include "video/tms9928a.h"
#include "sound/msm5205.h"
#include "sound/sn76496.h"
+#include "video/tms9928a.h"
+#include "speaker.h"
#define USE_MSM 0
#define NUM_PLUNGER_REPEATS 50
diff --git a/src/mame/drivers/pacland.cpp b/src/mame/drivers/pacland.cpp
index f7b7eaca34f..8af5fcafd5b 100644
--- a/src/mame/drivers/pacland.cpp
+++ b/src/mame/drivers/pacland.cpp
@@ -191,10 +191,12 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/pacland.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
#include "machine/watchdog.h"
-#include "includes/pacland.h"
+#include "speaker.h"
void pacland_state::machine_start()
diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp
index 99790e35523..0258e638730 100644
--- a/src/mame/drivers/pacman.cpp
+++ b/src/mame/drivers/pacman.cpp
@@ -337,16 +337,19 @@ Boards:
****************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/pacman.h"
+#include "machine/epos.h"
+#include "machine/jumpshot.h"
+#include "machine/pacplus.h"
+
#include "cpu/s2650/s2650.h"
+#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
#include "sound/sn76496.h"
-#include "machine/epos.h"
-#include "machine/jumpshot.h"
-#include "machine/pacplus.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/palm.cpp b/src/mame/drivers/palm.cpp
index 2ff0dae6309..4b8c6d795bb 100644
--- a/src/mame/drivers/palm.cpp
+++ b/src/mame/drivers/palm.cpp
@@ -18,6 +18,8 @@
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
#define MC68328_TAG "dragonball"
diff --git a/src/mame/drivers/palmz22.cpp b/src/mame/drivers/palmz22.cpp
index 596411c90fe..3ca31438d5a 100644
--- a/src/mame/drivers/palmz22.cpp
+++ b/src/mame/drivers/palmz22.cpp
@@ -68,6 +68,7 @@ end
#include "machine/s3c2410.h"
#include "machine/smartmed.h"
#include "rendlay.h"
+#include "screen.h"
#define PALM_Z22_BATTERY_LEVEL 75
diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp
index f6d0ad273d9..5709670fd9a 100644
--- a/src/mame/drivers/pandoras.cpp
+++ b/src/mame/drivers/pandoras.cpp
@@ -26,6 +26,7 @@ Boards:
#include "emu.h"
#include "includes/pandoras.h"
#include "includes/konamipt.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/mcs48/mcs48.h"
#include "cpu/z80/z80.h"
@@ -34,6 +35,8 @@ Boards:
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/pangofun.cpp b/src/mame/drivers/pangofun.cpp
index 5c676615dca..e334f3043c4 100644
--- a/src/mame/drivers/pangofun.cpp
+++ b/src/mame/drivers/pangofun.cpp
@@ -98,6 +98,7 @@ Arcade Version (Coin-Op) by InfoCube (Pisa, Italy)
#include "cpu/i386/i386.h"
#include "machine/pcshare.h"
#include "video/pc_vga.h"
+#include "screen.h"
class pangofun_state : public pcat_base_state
diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp
index 4396f3b3830..be6dd72e7e0 100644
--- a/src/mame/drivers/panicr.cpp
+++ b/src/mame/drivers/panicr.cpp
@@ -61,10 +61,13 @@ D.9B [f99cac4b] /
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/nec/nec.h"
#include "audio/t5182.h"
+#include "cpu/nec/nec.h"
+#include "cpu/z80/z80.h"
+#include "screen.h"
+#include "speaker.h"
+
class panicr_state : public driver_device
{
diff --git a/src/mame/drivers/paradise.cpp b/src/mame/drivers/paradise.cpp
index 706538e8eef..b14985e7f9c 100644
--- a/src/mame/drivers/paradise.cpp
+++ b/src/mame/drivers/paradise.cpp
@@ -87,9 +87,12 @@ sticker from Jan 95 and factory sticker 94*41.
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/paradise.h"
+#include "cpu/z80/z80.h"
+#include "speaker.h"
+
+
/***************************************************************************
Memory Maps
diff --git a/src/mame/drivers/paranoia.cpp b/src/mame/drivers/paranoia.cpp
index 71d233a30ac..83f9659bd4e 100644
--- a/src/mame/drivers/paranoia.cpp
+++ b/src/mame/drivers/paranoia.cpp
@@ -36,14 +36,18 @@ HuC6280A (Hudson)
****************************************************************************/
#include "emu.h"
+#include "machine/pcecommn.h"
+
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
#include "machine/i8155.h"
-#include "machine/pcecommn.h"
#include "video/huc6260.h"
#include "video/huc6270.h"
#include "cpu/h6280/h6280.h"
#include "sound/c6280.h"
+#include "screen.h"
+#include "speaker.h"
+
class paranoia_state : public pce_common_state
{
diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp
index d608636c982..a06b4792169 100644
--- a/src/mame/drivers/parodius.cpp
+++ b/src/mame/drivers/parodius.cpp
@@ -9,13 +9,16 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/parodius.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */
+#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ym2151.h"
#include "sound/k053260.h"
-#include "includes/konamipt.h"
-#include "includes/parodius.h"
+#include "speaker.h"
+
INTERRUPT_GEN_MEMBER(parodius_state::parodius_interrupt)
{
diff --git a/src/mame/drivers/partner.cpp b/src/mame/drivers/partner.cpp
index bca616fbad5..e3ae867cd45 100644
--- a/src/mame/drivers/partner.cpp
+++ b/src/mame/drivers/partner.cpp
@@ -10,16 +10,19 @@
#include "emu.h"
+#include "includes/partner.h"
+
#include "cpu/i8085/i8085.h"
-#include "sound/wave.h"
-#include "machine/i8255.h"
#include "imagedev/cassette.h"
-#include "formats/smx_dsk.h"
-#include "formats/rk_cas.h"
-#include "includes/radio86.h"
-#include "machine/ram.h"
-#include "includes/partner.h"
+#include "sound/wave.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/rk_cas.h"
+#include "formats/smx_dsk.h"
+
/* Address maps */
static ADDRESS_MAP_START(partner_mem, AS_PROGRAM, 8, partner_state )
diff --git a/src/mame/drivers/pasha2.cpp b/src/mame/drivers/pasha2.cpp
index 1cb7718de67..0834666f3d8 100644
--- a/src/mame/drivers/pasha2.cpp
+++ b/src/mame/drivers/pasha2.cpp
@@ -77,6 +77,8 @@ Notes:
#include "cpu/e132xs/e132xs.h"
#include "machine/eepromser.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class pasha2_state : public driver_device
{
diff --git a/src/mame/drivers/paso1600.cpp b/src/mame/drivers/paso1600.cpp
index ae2292309cf..5d1524b77fa 100644
--- a/src/mame/drivers/paso1600.cpp
+++ b/src/mame/drivers/paso1600.cpp
@@ -12,9 +12,10 @@
#include "emu.h"
#include "cpu/i86/i86.h"
-#include "video/mc6845.h"
-#include "machine/pic8259.h"
#include "machine/am9517a.h"
+#include "machine/pic8259.h"
+#include "video/mc6845.h"
+#include "screen.h"
class paso1600_state : public driver_device
@@ -32,7 +33,8 @@ public:
, m_p_pcg(*this, "pcg")
, m_gfxdecode(*this, "gfxdecode")
, m_palette(*this, "palette")
- { }
+ {
+ }
DECLARE_READ8_MEMBER(paso1600_pcg_r);
DECLARE_WRITE8_MEMBER(paso1600_pcg_w);
diff --git a/src/mame/drivers/pasopia.cpp b/src/mame/drivers/pasopia.cpp
index ab98af7c72f..2403fc33829 100644
--- a/src/mame/drivers/pasopia.cpp
+++ b/src/mame/drivers/pasopia.cpp
@@ -11,12 +11,15 @@
****************************************************************************/
#include "emu.h"
+#include "includes/pasopia.h"
+
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
#include "video/mc6845.h"
-#include "includes/pasopia.h"
+#include "screen.h"
+
class pasopia_state : public driver_device
{
diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp
index fe8bc8fda12..7d4ea993e16 100644
--- a/src/mame/drivers/pasopia7.cpp
+++ b/src/mame/drivers/pasopia7.cpp
@@ -22,15 +22,20 @@
***************************************************************************************************/
#include "emu.h"
+#include "includes/pasopia.h"
+
#include "cpu/z80/z80.h"
-#include "machine/z80ctc.h"
#include "machine/i8255.h"
-#include "machine/z80pio.h"
#include "machine/upd765.h"
+#include "machine/z80ctc.h"
+#include "machine/z80pio.h"
#include "sound/sn76496.h"
#include "video/mc6845.h"
+
#include "rendlay.h"
-#include "includes/pasopia.h"
+#include "screen.h"
+#include "speaker.h"
+
class pasopia7_state : public driver_device
{
diff --git a/src/mame/drivers/pass.cpp b/src/mame/drivers/pass.cpp
index 6177ecc7ff2..a7931dfab4e 100644
--- a/src/mame/drivers/pass.cpp
+++ b/src/mame/drivers/pass.cpp
@@ -102,12 +102,15 @@
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/pass.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
-#include "includes/pass.h"
+#include "screen.h"
+#include "speaker.h"
/* todo: check all memory regions actually readable / read from */
diff --git a/src/mame/drivers/pastelg.cpp b/src/mame/drivers/pastelg.cpp
index 8f6650bb425..e493578bef2 100644
--- a/src/mame/drivers/pastelg.cpp
+++ b/src/mame/drivers/pastelg.cpp
@@ -24,11 +24,13 @@ Memo:
#include "emu.h"
#include "includes/pastelg.h"
+
#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
void pastelg_state::machine_start()
diff --git a/src/mame/drivers/pb1000.cpp b/src/mame/drivers/pb1000.cpp
index c289c38731f..cd68ade4272 100644
--- a/src/mame/drivers/pb1000.cpp
+++ b/src/mame/drivers/pb1000.cpp
@@ -21,14 +21,18 @@
#include "emu.h"
#include "cpu/hd61700/hd61700.h"
-#include "video/hd44352.h"
#include "machine/nvram.h"
#include "sound/beep.h"
+#include "video/hd44352.h"
+
#include "rendlay.h"
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
-#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
-#include "softlist.h"
+#include "bus/generic/slot.h"
+
class pb1000_state : public driver_device
{
diff --git a/src/mame/drivers/pbaction.cpp b/src/mame/drivers/pbaction.cpp
index 0bf9eca3ce1..e3fe16b9265 100644
--- a/src/mame/drivers/pbaction.cpp
+++ b/src/mame/drivers/pbaction.cpp
@@ -66,10 +66,13 @@ Stephh's notes (based on the game Z80 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/pbaction.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "machine/segacrpt_device.h"
-#include "includes/pbaction.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(pbaction_state::pbaction_sh_command_w)
diff --git a/src/mame/drivers/pc100.cpp b/src/mame/drivers/pc100.cpp
index 96762ead797..c31e5a30128 100644
--- a/src/mame/drivers/pc100.cpp
+++ b/src/mame/drivers/pc100.cpp
@@ -53,17 +53,23 @@
****************************************************************************/
#include "emu.h"
+
#include "cpu/i86/i86.h"
#include "imagedev/flopdrv.h"
-#include "formats/mfi_dsk.h"
-#include "formats/d88_dsk.h"
+#include "machine/i8251.h"
#include "machine/i8255.h"
+#include "machine/msm58321.h"
#include "machine/pic8259.h"
#include "machine/upd765.h"
-#include "machine/msm58321.h"
-#include "machine/i8251.h"
#include "sound/beep.h"
+#include "screen.h"
+#include "speaker.h"
+
+#include "formats/d88_dsk.h"
+#include "formats/mfi_dsk.h"
+
+
class pc100_state : public driver_device
{
public:
diff --git a/src/mame/drivers/pc1500.cpp b/src/mame/drivers/pc1500.cpp
index 170ba554176..c359696f279 100644
--- a/src/mame/drivers/pc1500.cpp
+++ b/src/mame/drivers/pc1500.cpp
@@ -16,6 +16,8 @@
#include "cpu/lh5801/lh5801.h"
#include "machine/lh5810.h"
#include "machine/upd1990a.h"
+#include "screen.h"
+
#include "pc1500.lh"
diff --git a/src/mame/drivers/pc1512.cpp b/src/mame/drivers/pc1512.cpp
index 535102971f7..aad7d0d066c 100644
--- a/src/mame/drivers/pc1512.cpp
+++ b/src/mame/drivers/pc1512.cpp
@@ -97,6 +97,7 @@ PC1640-HD30: Western Digital 95038 [-chs 615,6,17 -ss 512]
#include "bus/rs232/rs232.h"
#include "bus/isa/ega.h"
#include "softlist.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp
index eb570a109c1..85d433e195a 100644
--- a/src/mame/drivers/pc2000.cpp
+++ b/src/mame/drivers/pc2000.cpp
@@ -15,31 +15,36 @@
#include "emu.h"
+
#include "cpu/z80/z80.h"
+#include "sound/beep.h"
#include "video/hd44780.h"
#include "video/sed1520.h"
-#include "sound/beep.h"
-#include "rendlay.h"
-#include "softlist.h"
-#include "gl3000s.lh"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "rendlay.h"
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
+
+#include "gl3000s.lh"
+
class pc2000_state : public driver_device
{
public:
pc2000_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_lcdc(*this, "hd44780"),
- m_beep(*this, "beeper"),
- m_cart(*this, "cartslot"),
- m_bank0(*this, "bank0"),
- m_bank1(*this, "bank1"),
- m_bank2(*this, "bank2")
- { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_lcdc(*this, "hd44780")
+ , m_beep(*this, "beeper")
+ , m_cart(*this, "cartslot")
+ , m_bank0(*this, "bank0")
+ , m_bank1(*this, "bank1")
+ , m_bank2(*this, "bank2")
+ { }
required_device<cpu_device> m_maincpu;
optional_device<hd44780_device> m_lcdc;
diff --git a/src/mame/drivers/pc4.cpp b/src/mame/drivers/pc4.cpp
index 7cd3cdab7e1..1aa193eb344 100644
--- a/src/mame/drivers/pc4.cpp
+++ b/src/mame/drivers/pc4.cpp
@@ -25,10 +25,14 @@
#include "emu.h"
+#include "includes/pc4.h"
+
#include "cpu/z80/z80.h"
#include "machine/rp5c01.h"
+
#include "rendlay.h"
-#include "includes/pc4.h"
+#include "screen.h"
+#include "speaker.h"
READ8_MEMBER( pc4_state::kb_r )
diff --git a/src/mame/drivers/pc6001.cpp b/src/mame/drivers/pc6001.cpp
index 76d46f2455d..9fd2c50a98f 100644
--- a/src/mame/drivers/pc6001.cpp
+++ b/src/mame/drivers/pc6001.cpp
@@ -125,17 +125,21 @@ irq vector 0x26:
*******************************************************************************************************************************************************/
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "machine/i8255.h"
+#include "imagedev/cassette.h"
#include "machine/i8251.h"
-#include "video/mc6847.h"
+#include "machine/i8255.h"
#include "sound/ay8910.h"
#include "sound/upd7752.h"
#include "sound/wave.h"
+#include "video/mc6847.h"
-#include "imagedev/cassette.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+
+#include "speaker.h"
+
#include "formats/p6001_cas.h"
diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp
index 07bc719676a..eba3531fb75 100644
--- a/src/mame/drivers/pc8001.cpp
+++ b/src/mame/drivers/pc8001.cpp
@@ -25,6 +25,8 @@
#include "emu.h"
#include "includes/pc8001.h"
+#include "screen.h"
+#include "speaker.h"
/* Read/Write Handlers */
diff --git a/src/mame/drivers/pc8801.cpp b/src/mame/drivers/pc8801.cpp
index b4b22573b16..dc825df33eb 100644
--- a/src/mame/drivers/pc8801.cpp
+++ b/src/mame/drivers/pc8801.cpp
@@ -255,19 +255,20 @@
#include "emu.h"
+#include "bus/centronics/ctronics.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
-#include "bus/centronics/ctronics.h"
+#include "machine/i8214.h"
+#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/upd1990a.h"
#include "machine/upd765.h"
-#include "machine/i8214.h"
-#include "machine/i8251.h"
#include "sound/2203intf.h"
#include "sound/2608intf.h"
#include "sound/beep.h"
+#include "screen.h"
#include "softlist.h"
-//#include "includes/pc8801.h"
+#include "speaker.h"
//#define USE_PROPER_I8214
diff --git a/src/mame/drivers/pc88va.cpp b/src/mame/drivers/pc88va.cpp
index 1e76df1ce4f..50ddb757152 100644
--- a/src/mame/drivers/pc88va.cpp
+++ b/src/mame/drivers/pc88va.cpp
@@ -25,17 +25,23 @@
********************************************************************************************/
#include "emu.h"
+
#include "cpu/nec/nec.h"
#include "cpu/z80/z80.h"
+#include "machine/am9517a.h"
#include "machine/i8255.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
+//#include "machine/upd71071.h"
#include "machine/upd765.h"
#include "sound/2203intf.h"
-#include "formats/xdf_dsk.h"
-//#include "machine/upd71071.h"
-#include "machine/am9517a.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/xdf_dsk.h"
+
/* Note: for the time being, just disable FDC CPU, it's for PC-8801 compatibility mode anyway ... */
#define TEST_SUBFDC 0
diff --git a/src/mame/drivers/pc9801.cpp b/src/mame/drivers/pc9801.cpp
index d473260994c..3a58027ac1f 100644
--- a/src/mame/drivers/pc9801.cpp
+++ b/src/mame/drivers/pc9801.cpp
@@ -383,41 +383,33 @@ Keyboard TX commands:
#include "emu.h"
+#include "cpu/i386/i386.h"
+#include "cpu/i86/i286.h"
#include "cpu/i86/i86.h"
#include "cpu/nec/nec.h"
-#include "cpu/i86/i286.h"
-#include "cpu/i386/i386.h"
-#include "machine/i8255.h"
-#include "machine/pit8253.h"
#include "machine/am9517a.h"
+#include "machine/bankdev.h"
+#include "machine/buffer.h"
+#include "machine/i8251.h"
+#include "machine/i8255.h"
+#include "machine/latch.h"
#include "machine/pic8259.h"
-#include "machine/upd765.h"
+#include "machine/pit8253.h"
+#include "machine/ram.h"
#include "machine/upd1990a.h"
-#include "machine/i8251.h"
-#include "machine/bankdev.h"
+#include "machine/upd765.h"
#include "bus/scsi/pc9801_sasi.h"
#include "bus/scsi/scsi.h"
#include "bus/scsi/scsihd.h"
-#include "machine/buffer.h"
-#include "machine/latch.h"
-#include "sound/beep.h"
-#include "sound/speaker.h"
#include "sound/2608intf.h"
+#include "sound/beep.h"
+#include "sound/spkrdev.h"
#include "video/upd7220.h"
-#include "machine/ram.h"
-
-#include "formats/pc98_dsk.h"
-#include "formats/pc98fdi_dsk.h"
-#include "formats/fdd_dsk.h"
-#include "formats/dcp_dsk.h"
-#include "formats/dip_dsk.h"
-#include "formats/nfd_dsk.h"
-
#include "machine/pc9801_26.h"
#include "machine/pc9801_86.h"
#include "machine/pc9801_118.h"
@@ -429,7 +421,16 @@ Keyboard TX commands:
#include "machine/idehd.h"
#include "debugger.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/pc98_dsk.h"
+#include "formats/pc98fdi_dsk.h"
+#include "formats/fdd_dsk.h"
+#include "formats/dcp_dsk.h"
+#include "formats/dip_dsk.h"
+#include "formats/nfd_dsk.h"
#define UPD1990A_TAG "upd1990a"
#define UPD8251_TAG "upd8251"
diff --git a/src/mame/drivers/pcat_dyn.cpp b/src/mame/drivers/pcat_dyn.cpp
index 8b3dc32570d..d01fb0c8a14 100644
--- a/src/mame/drivers/pcat_dyn.cpp
+++ b/src/mame/drivers/pcat_dyn.cpp
@@ -21,18 +21,23 @@ If the output isn't satisfactory, it prints "I/O BOARD FAILURE".
********************************************************************************************************************/
#include "emu.h"
+
#include "cpu/i386/i386.h"
#include "machine/pcshare.h"
-#include "bus/isa/trident.h"
#include "machine/bankdev.h"
#include "machine/ds128x.h"
#include "machine/ins8250.h"
#include "machine/nvram.h"
#include "sound/ad1848.h"
-#include "bus/rs232/rs232.h"
-#include "bus/rs232/ser_mouse.h"
+
#include "bus/isa/isa.h"
#include "bus/isa/sblaster.h"
+#include "bus/isa/trident.h"
+#include "bus/rs232/rs232.h"
+#include "bus/rs232/ser_mouse.h"
+
+#include "screen.h"
+
class pcat_dyn_state : public pcat_base_state
{
diff --git a/src/mame/drivers/pcd.cpp b/src/mame/drivers/pcd.cpp
index ab8e25c8eb1..76522771379 100644
--- a/src/mame/drivers/pcd.cpp
+++ b/src/mame/drivers/pcd.cpp
@@ -9,19 +9,24 @@
***************************************************************************/
#include "emu.h"
+#include "machine/pcd_kbd.h"
+#include "video/pcd.h"
+
+#include "bus/rs232/rs232.h"
+#include "bus/scsi/omti5100.h"
#include "cpu/i86/i186.h"
-#include "machine/ram.h"
+#include "machine/mc146818.h"
+#include "machine/mc2661.h"
#include "machine/nvram.h"
#include "machine/pic8259.h"
-#include "machine/mc2661.h"
+#include "machine/ram.h"
#include "machine/wd_fdc.h"
-#include "machine/mc146818.h"
-#include "machine/pcd_kbd.h"
-#include "video/pcd.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+
+#include "speaker.h"
+
#include "formats/pc_dsk.h"
-#include "bus/scsi/omti5100.h"
-#include "bus/rs232/rs232.h"
+
//**************************************************************************
// TYPE DEFINITIONS
@@ -30,19 +35,19 @@
class pcd_state : public driver_device
{
public:
- pcd_state(const machine_config &mconfig, device_type type, const char *tag) :
- driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_pic1(*this, "pic1"),
- m_pic2(*this, "pic2"),
- m_speaker(*this, "speaker"),
- m_fdc(*this, "fdc"),
- m_rtc(*this, "rtc"),
- m_scsi(*this, "scsi"),
- m_scsi_data_out(*this, "scsi_data_out"),
- m_scsi_data_in(*this, "scsi_data_in"),
- m_ram(*this, "ram"),
- m_req_hack(nullptr)
+ pcd_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_pic1(*this, "pic1")
+ , m_pic2(*this, "pic2")
+ , m_speaker(*this, "speaker")
+ , m_fdc(*this, "fdc")
+ , m_rtc(*this, "rtc")
+ , m_scsi(*this, "scsi")
+ , m_scsi_data_out(*this, "scsi_data_out")
+ , m_scsi_data_in(*this, "scsi_data_in")
+ , m_ram(*this, "ram")
+ , m_req_hack(nullptr)
{ }
DECLARE_READ8_MEMBER( irq_callback );
diff --git a/src/mame/drivers/pce.cpp b/src/mame/drivers/pce.cpp
index be00259e717..dd1d22ee450 100644
--- a/src/mame/drivers/pce.cpp
+++ b/src/mame/drivers/pce.cpp
@@ -57,15 +57,20 @@ Super System Card:
**********************************************************************/
#include "emu.h"
-#include "cpu/h6280/h6280.h"
#include "includes/pce.h"
+
#include "bus/pce/pce_rom.h"
+#include "cpu/h6280/h6280.h"
#include "sound/c6280.h"
#include "sound/cdda.h"
#include "sound/msm5205.h"
-#include "video/huc6270.h"
#include "video/huc6202.h"
+#include "video/huc6270.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
/* todo: alternate forms of input (multitap, mouse, etc.) */
static INPUT_PORTS_START( pce )
diff --git a/src/mame/drivers/pce220.cpp b/src/mame/drivers/pce220.cpp
index 8c2add74f39..7e2e457fc6c 100644
--- a/src/mame/drivers/pce220.cpp
+++ b/src/mame/drivers/pce220.cpp
@@ -26,14 +26,16 @@
****************************************************************************/
-
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/nvram.h"
+#include "machine/pce220_ser.h"
#include "machine/ram.h"
#include "sound/beep.h"
-#include "machine/pce220_ser.h"
-#include "machine/nvram.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
+
// Interrupt flags
#define IRQ_FLAG_KEY 0x01
diff --git a/src/mame/drivers/pcfx.cpp b/src/mame/drivers/pcfx.cpp
index 58c719db9a8..26dafc00080 100644
--- a/src/mame/drivers/pcfx.cpp
+++ b/src/mame/drivers/pcfx.cpp
@@ -15,6 +15,7 @@
#include "video/huc6270.h"
#include "video/huc6271.h"
#include "video/huc6272.h"
+#include "screen.h"
struct pcfx_pad_t
{
diff --git a/src/mame/drivers/pcktgal.cpp b/src/mame/drivers/pcktgal.cpp
index 27d8562897a..f09610cd8f4 100644
--- a/src/mame/drivers/pcktgal.cpp
+++ b/src/mame/drivers/pcktgal.cpp
@@ -15,11 +15,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/pcktgal.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
#include "sound/3812intf.h"
-#include "includes/pcktgal.h"
#include "machine/deco222.h"
+#include "screen.h"
+#include "speaker.h"
+
/***************************************************************************/
diff --git a/src/mame/drivers/pcm.cpp b/src/mame/drivers/pcm.cpp
index 4a5fc324760..5f954f2bf98 100644
--- a/src/mame/drivers/pcm.cpp
+++ b/src/mame/drivers/pcm.cpp
@@ -53,15 +53,17 @@
****************************************************************************/
#include "emu.h"
-#include "machine/z80ctc.h"
-#include "machine/z80pio.h"
-#include "machine/z80dart.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "imagedev/cassette.h"
-#include "sound/speaker.h"
-#include "sound/wave.h"
#include "machine/k7659kb.h"
+#include "machine/z80ctc.h"
+#include "machine/z80dart.h"
+#include "machine/z80pio.h"
+#include "sound/spkrdev.h"
+#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
class pcm_state : public driver_device
@@ -79,7 +81,8 @@ public:
, m_cass(*this, "cassette")
, m_p_videoram(*this, "videoram")
, m_p_chargen(*this, "chargen")
- { }
+ {
+ }
DECLARE_READ8_MEMBER( pcm_85_r );
DECLARE_WRITE_LINE_MEMBER( pcm_82_w );
diff --git a/src/mame/drivers/pcw.cpp b/src/mame/drivers/pcw.cpp
index f213848c86e..d43b926341f 100644
--- a/src/mame/drivers/pcw.cpp
+++ b/src/mame/drivers/pcw.cpp
@@ -95,17 +95,18 @@
- emulation of other hardware...?
******************************************************************************/
#include "emu.h"
+// pcw video hardware
+#include "includes/pcw.h"
+
#include "cpu/z80/z80.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/i8243.h"
-// upd765 interface
#include "machine/upd765.h"
-// pcw video hardware
-#include "includes/pcw.h"
// pcw/pcw16 beeper
#include "sound/beep.h"
#include "machine/ram.h"
#include "softlist.h"
+#include "speaker.h"
#include "pcw.lh"
diff --git a/src/mame/drivers/pcw16.cpp b/src/mame/drivers/pcw16.cpp
index 8e53b675631..cd1bab1f3db 100644
--- a/src/mame/drivers/pcw16.cpp
+++ b/src/mame/drivers/pcw16.cpp
@@ -93,7 +93,9 @@ TODO:
#include "includes/pcw16.h"
#include "bus/rs232/rs232.h"
#include "bus/rs232/ser_mouse.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
// interrupt counter
/* controls which bank of 2mb address space is paged into memory */
diff --git a/src/mame/drivers/pcxt.cpp b/src/mame/drivers/pcxt.cpp
index 318c91b5508..cbe24788965 100644
--- a/src/mame/drivers/pcxt.cpp
+++ b/src/mame/drivers/pcxt.cpp
@@ -104,7 +104,7 @@ public:
virtual const tiny_rom_entry *device_rom_region() const override;
};
-const device_type ISA8_CGA_FILETTO = &device_creator<isa8_cga_filetto_device>;
+const device_type ISA8_CGA_FILETTO = device_creator<isa8_cga_filetto_device>;
//-------------------------------------------------
// isa8_cga_filetto_device - constructor
@@ -145,7 +145,7 @@ private:
/* for superimposing CGA over a different source video (i.e. tetriskr) */
-const device_type ISA8_CGA_TETRISKR = &device_creator<isa8_cga_tetriskr_device>;
+const device_type ISA8_CGA_TETRISKR = device_creator<isa8_cga_tetriskr_device>;
//-------------------------------------------------
// isa8_cga_tetriskr_device - constructor
diff --git a/src/mame/drivers/pda600.cpp b/src/mame/drivers/pda600.cpp
index a9aa4589742..64914230cb8 100644
--- a/src/mame/drivers/pda600.cpp
+++ b/src/mame/drivers/pda600.cpp
@@ -60,6 +60,7 @@
#include "machine/nvram.h"
#include "machine/hd64610.h"
#include "rendlay.h"
+#include "screen.h"
class pda600_state : public driver_device
diff --git a/src/mame/drivers/pdp1.cpp b/src/mame/drivers/pdp1.cpp
index 6fcb5a367e7..25576561e5f 100644
--- a/src/mame/drivers/pdp1.cpp
+++ b/src/mame/drivers/pdp1.cpp
@@ -56,9 +56,12 @@ To load and play a game:
*/
#include "emu.h"
-#include "cpu/pdp1/pdp1.h"
#include "includes/pdp1.h"
+
+#include "cpu/pdp1/pdp1.h"
#include "video/crt.h"
+#include "screen.h"
+
/*
*
@@ -687,7 +690,7 @@ protected:
virtual void device_start() override { }
};
-const device_type PDP1_READTAPE = &device_creator<pdp1_readtape_image_device>;
+const device_type PDP1_READTAPE = device_creator<pdp1_readtape_image_device>;
pdp1_readtape_image_device::pdp1_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PDP1_READTAPE, "PDP1 Tape Reader", tag, owner, clock, "pdp1_readtape_image", __FILE__),
@@ -720,7 +723,7 @@ protected:
virtual void device_start() override { }
};
-const device_type PDP1_PUNCHTAPE = &device_creator<pdp1_punchtape_image_device>;
+const device_type PDP1_PUNCHTAPE = device_creator<pdp1_punchtape_image_device>;
pdp1_punchtape_image_device::pdp1_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PDP1_PUNCHTAPE, "PDP1 Tape Puncher", tag, owner, clock, "pdp1_punchtape_image", __FILE__),
@@ -754,7 +757,7 @@ protected:
virtual void device_start() override { }
};
-const device_type PDP1_PRINTER = &device_creator<pdp1_printer_image_device>;
+const device_type PDP1_PRINTER = device_creator<pdp1_printer_image_device>;
pdp1_printer_image_device::pdp1_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PDP1_PRINTER, "PDP1 Typewriter", tag, owner, clock, "pdp1_printer_image", __FILE__),
@@ -787,7 +790,7 @@ protected:
virtual void device_start() override { }
};
-const device_type PDP1_CYLINDER = &device_creator<pdp1_cylinder_image_device>;
+const device_type PDP1_CYLINDER = device_creator<pdp1_cylinder_image_device>;
pdp1_cylinder_image_device::pdp1_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PDP1_CYLINDER, "PDP1 Cylinder", tag, owner, clock, "pdp1_cylinder_image", __FILE__),
diff --git a/src/mame/drivers/pecom.cpp b/src/mame/drivers/pecom.cpp
index 5a32fcf84e6..e3a7c09abef 100644
--- a/src/mame/drivers/pecom.cpp
+++ b/src/mame/drivers/pecom.cpp
@@ -9,12 +9,12 @@
****************************************************************************/
#include "emu.h"
-#include "cpu/cosmac/cosmac.h"
-#include "sound/cdp1869.h"
-#include "sound/wave.h"
-#include "machine/ram.h"
#include "includes/pecom.h"
+
+#include "sound/wave.h"
#include "softlist.h"
+#include "speaker.h"
+
/* Address maps */
static ADDRESS_MAP_START(pecom64_mem, AS_PROGRAM, 8, pecom_state )
diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp
index f509c095e46..441f3eae6d0 100644
--- a/src/mame/drivers/pegasus.cpp
+++ b/src/mame/drivers/pegasus.cpp
@@ -38,13 +38,15 @@
****************************************************************************/
#include "emu.h"
+#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
#include "cpu/m6809/m6809.h"
-#include "machine/6821pia.h"
#include "imagedev/cassette.h"
+#include "machine/6821pia.h"
#include "sound/wave.h"
-#include "bus/generic/slot.h"
-#include "bus/generic/carts.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
class pegasus_state : public driver_device
diff --git a/src/mame/drivers/pencil2.cpp b/src/mame/drivers/pencil2.cpp
index 85cb0a884b2..de259bedd5a 100644
--- a/src/mame/drivers/pencil2.cpp
+++ b/src/mame/drivers/pencil2.cpp
@@ -81,15 +81,19 @@ ToDo:
****************************************************************************/
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "video/tms9928a.h"
-#include "sound/sn76496.h"
-#include "bus/centronics/ctronics.h"
#include "imagedev/cassette.h"
+#include "sound/sn76496.h"
#include "sound/wave.h"
+#include "video/tms9928a.h"
+
+#include "bus/centronics/ctronics.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+
#include "softlist.h"
+#include "speaker.h"
class pencil2_state : public driver_device
{
diff --git a/src/mame/drivers/pengadvb.cpp b/src/mame/drivers/pengadvb.cpp
index 21c71645e8e..5bf0abc267c 100644
--- a/src/mame/drivers/pengadvb.cpp
+++ b/src/mame/drivers/pengadvb.cpp
@@ -30,6 +30,8 @@ NOTE! switches 1, 3 & 5 must be ON or the game will not boot.
#include "sound/ay8910.h"
#include "machine/i8255.h"
#include "machine/bankdev.h"
+#include "screen.h"
+#include "speaker.h"
class pengadvb_state : public driver_device
diff --git a/src/mame/drivers/pengo.cpp b/src/mame/drivers/pengo.cpp
index 1e9f04fe512..bfdf991f4eb 100644
--- a/src/mame/drivers/pengo.cpp
+++ b/src/mame/drivers/pengo.cpp
@@ -64,9 +64,12 @@
***************************************************************************/
#include "emu.h"
+#include "includes/pacman.h"
+
#include "cpu/z80/z80.h"
#include "machine/segacrpt_device.h"
-#include "includes/pacman.h"
+#include "screen.h"
+#include "speaker.h"
class pengo_state : public pacman_state
diff --git a/src/mame/drivers/pentagon.cpp b/src/mame/drivers/pentagon.cpp
index 725e3003b2c..0908792973f 100644
--- a/src/mame/drivers/pentagon.cpp
+++ b/src/mame/drivers/pentagon.cpp
@@ -3,15 +3,16 @@
#include "emu.h"
#include "includes/spectrum.h"
#include "includes/spec128.h"
-#include "imagedev/snapquik.h"
-#include "imagedev/cassette.h"
-#include "sound/ay8910.h"
-#include "sound/speaker.h"
-#include "formats/tzx_cas.h"
+
#include "machine/beta.h"
-#include "machine/ram.h"
+#include "sound/ay8910.h"
+
+#include "screen.h"
#include "softlist.h"
-#include "machine/spec_snqk.h"
+#include "speaker.h"
+
+#include "formats/tzx_cas.h"
+
class pentagon_state : public spectrum_state
{
diff --git a/src/mame/drivers/peoplepc.cpp b/src/mame/drivers/peoplepc.cpp
index 51ed69a429d..bf74ab4926b 100644
--- a/src/mame/drivers/peoplepc.cpp
+++ b/src/mame/drivers/peoplepc.cpp
@@ -12,6 +12,7 @@
#include "video/mc6845.h"
#include "bus/rs232/rs232.h"
#include "bus/rs232/keyboard.h"
+#include "screen.h"
class peoplepc_state : public driver_device
{
diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp
index 930cc3ecdde..3dd638353cf 100644
--- a/src/mame/drivers/peplus.cpp
+++ b/src/mame/drivers/peplus.cpp
@@ -197,11 +197,14 @@ A Note about Best Bet Products.
***********************************************************************************/
#include "emu.h"
-#include "sound/ay8910.h"
-#include "machine/nvram.h"
+
#include "cpu/mcs51/mcs51.h"
#include "machine/i2cmem.h"
+#include "machine/nvram.h"
+#include "sound/ay8910.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
#include "peplus.lh"
#include "pe_schip.lh"
diff --git a/src/mame/drivers/pes.cpp b/src/mame/drivers/pes.cpp
index 5016cc07b28..0461e47042b 100644
--- a/src/mame/drivers/pes.cpp
+++ b/src/mame/drivers/pes.cpp
@@ -53,17 +53,20 @@ Address map:
port 3.7: write, /RD (general) and /OE (pin 22) for unpopulated 6164 SRAM
*/
+#include "emu.h"
+#include "includes/pes.h"
+
+#include "cpu/mcs51/mcs51.h"
+#include "sound/tms5220.h"
+#include "speaker.h"
+
+
#define CPU_CLOCK XTAL_10_245MHz
#undef DEBUG_FIFO
#undef DEBUG_SERIAL_CB
#undef DEBUG_PORTS
-/* Core includes */
-#include "emu.h"
-#include "includes/pes.h"
-#include "cpu/mcs51/mcs51.h"
-#include "sound/tms5220.h"
/* Devices */
WRITE8_MEMBER(pes_state::pes_kbd_input)
diff --git a/src/mame/drivers/pet.cpp b/src/mame/drivers/pet.cpp
index ca63cc6cbe2..c61110972ff 100644
--- a/src/mame/drivers/pet.cpp
+++ b/src/mame/drivers/pet.cpp
@@ -150,7 +150,9 @@ ROM sockets: UA3 2K or 4K character
*/
#include "emu.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "bus/ieee488/c2040.h"
@@ -166,7 +168,7 @@ ROM sockets: UA3 2K or 4K character
#include "machine/cbm_snqk.h"
#include "machine/pla.h"
#include "machine/ram.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "video/mc6845.h"
#define M6502_TAG "f3"
diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp
index aeafb8576bc..97dc88a6624 100644
--- a/src/mame/drivers/peyper.cpp
+++ b/src/mame/drivers/peyper.cpp
@@ -35,9 +35,12 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/z80/z80.h"
#include "machine/i8279.h"
#include "sound/ay8910.h"
+#include "speaker.h"
+
#include "peyper.lh"
class peyper_state : public genpin_class
diff --git a/src/mame/drivers/pg685.cpp b/src/mame/drivers/pg685.cpp
index 8cfbfa7e2d3..7a6cc974b42 100644
--- a/src/mame/drivers/pg685.cpp
+++ b/src/mame/drivers/pg685.cpp
@@ -79,10 +79,9 @@ Memory: 54x 64KBit RAM, 18 empty sockets, 9 bit and 4 bit wire straps
****************************************************************************/
#include "emu.h"
-#include "cpu/nec/nec.h"
-#include "cpu/i86/i86.h"
#include "cpu/i86/i286.h"
-#include "video/mc6845.h"
+#include "cpu/i86/i86.h"
+#include "cpu/nec/nec.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/i8279.h"
@@ -90,8 +89,10 @@ Memory: 54x 64KBit RAM, 18 empty sockets, 9 bit and 4 bit wire straps
#include "machine/mm58167.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
-#include "machine/wd_fdc.h"
#include "machine/wd2010.h"
+#include "machine/wd_fdc.h"
+#include "video/mc6845.h"
+#include "screen.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp
index ff30d11ee7a..31a4bfe23cf 100644
--- a/src/mame/drivers/pgm.cpp
+++ b/src/mame/drivers/pgm.cpp
@@ -187,10 +187,9 @@ Notes:
*/
-#define PGMLOGERROR 0
-
#include "emu.h"
#include "includes/pgm.h"
+
#include "machine/pgmprot_igs025_igs012.h"
#include "machine/pgmprot_igs025_igs022.h"
#include "machine/pgmprot_igs025_igs028.h"
@@ -199,6 +198,12 @@ Notes:
#include "machine/pgmprot_igs027a_type3.h"
#include "machine/pgmprot_orlegend.h"
+#include "screen.h"
+#include "speaker.h"
+
+#define PGMLOGERROR 0
+
+
READ16_MEMBER(pgm_state::pgm_videoram_r)
{
if (offset < 0x4000 / 2)
diff --git a/src/mame/drivers/pgm2.cpp b/src/mame/drivers/pgm2.cpp
index 5a47728810f..15df4e616ac 100644
--- a/src/mame/drivers/pgm2.cpp
+++ b/src/mame/drivers/pgm2.cpp
@@ -53,6 +53,8 @@
#include "cpu/arm7/arm7core.h"
#include "sound/ymz770.h"
#include "machine/igs036crypt.h"
+#include "screen.h"
+#include "speaker.h"
class pgm2_state : public driver_device
{
diff --git a/src/mame/drivers/pgm3.cpp b/src/mame/drivers/pgm3.cpp
index 218dd683b5d..6bcdd3f91ae 100644
--- a/src/mame/drivers/pgm3.cpp
+++ b/src/mame/drivers/pgm3.cpp
@@ -53,6 +53,7 @@
#include "emu.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
+#include "screen.h"
class pgm3_state : public driver_device
diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp
index a009bc99fc8..905504b6fbf 100644
--- a/src/mame/drivers/phc25.cpp
+++ b/src/mame/drivers/phc25.cpp
@@ -40,6 +40,9 @@ RUN
#include "emu.h"
#include "includes/phc25.h"
+#include "speaker.h"
+
+
/* Read/Write Handlers */
READ8_MEMBER( phc25_state::port40_r )
diff --git a/src/mame/drivers/phoenix.cpp b/src/mame/drivers/phoenix.cpp
index bb3e1e0e370..b1f955395c6 100644
--- a/src/mame/drivers/phoenix.cpp
+++ b/src/mame/drivers/phoenix.cpp
@@ -28,10 +28,13 @@ Pleiads:
***************************************************************************/
#include "emu.h"
+#include "includes/phoenix.h"
+
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
#include "sound/ay8910.h"
-#include "includes/phoenix.h"
+#include "screen.h"
+#include "speaker.h"
static ADDRESS_MAP_START( phoenix_memory_map, AS_PROGRAM, 8, phoenix_state )
diff --git a/src/mame/drivers/photon.cpp b/src/mame/drivers/photon.cpp
index bd965a5bf6e..ef1b28fdccf 100644
--- a/src/mame/drivers/photon.cpp
+++ b/src/mame/drivers/photon.cpp
@@ -18,10 +18,13 @@
*/
#include "emu.h"
-#include "cpu/i8085/i8085.h"
#include "includes/pk8000.h"
+
+#include "cpu/i8085/i8085.h"
#include "machine/i8255.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "screen.h"
+#include "speaker.h"
class photon_state : public pk8000_base_state
diff --git a/src/mame/drivers/photon2.cpp b/src/mame/drivers/photon2.cpp
index af17cb91d56..2cf2362e086 100644
--- a/src/mame/drivers/photon2.cpp
+++ b/src/mame/drivers/photon2.cpp
@@ -23,7 +23,9 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "screen.h"
+#include "speaker.h"
class photon2_state : public driver_device
diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp
index c7cbf6a0728..2a70fb87a1a 100644
--- a/src/mame/drivers/phunsy.cpp
+++ b/src/mame/drivers/phunsy.cpp
@@ -28,11 +28,13 @@
#include "emu.h"
#include "cpu/s2650/s2650.h"
-#include "machine/keyboard.h"
-#include "sound/speaker.h"
#include "imagedev/cassette.h"
-#include "sound/wave.h"
#include "imagedev/snapquik.h"
+#include "machine/keyboard.h"
+#include "sound/spkrdev.h"
+#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
#define LOG 1
diff --git a/src/mame/drivers/piggypas.cpp b/src/mame/drivers/piggypas.cpp
index e1a0d8e16d1..d1eda58516d 100644
--- a/src/mame/drivers/piggypas.cpp
+++ b/src/mame/drivers/piggypas.cpp
@@ -14,9 +14,12 @@ game details unknown
#include "machine/ticket.h"
#include "sound/okim6295.h"
#include "video/hd44780.h"
+#include "screen.h"
+#include "speaker.h"
#include "piggypas.lh"
+
class piggypas_state : public driver_device
{
public:
diff --git a/src/mame/drivers/pinball2k.cpp b/src/mame/drivers/pinball2k.cpp
index b79dbea3fca..85c522d4df0 100644
--- a/src/mame/drivers/pinball2k.cpp
+++ b/src/mame/drivers/pinball2k.cpp
@@ -20,11 +20,14 @@
#include "emu.h"
#include "cpu/i386/i386.h"
+#include "machine/idectrl.h"
#include "machine/lpci.h"
-#include "machine/pcshare.h"
#include "machine/pckeybrd.h"
-#include "machine/idectrl.h"
+#include "machine/pcshare.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
+
class pinball2k_state : public pcat_base_state
{
diff --git a/src/mame/drivers/pingpong.cpp b/src/mame/drivers/pingpong.cpp
index 4b1210999ca..03a5fc68e39 100644
--- a/src/mame/drivers/pingpong.cpp
+++ b/src/mame/drivers/pingpong.cpp
@@ -7,11 +7,14 @@ Ping Pong (c) 1985 Konami
***************************************************************************/
#include "emu.h"
+#include "includes/pingpong.h"
+
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
-#include "includes/pingpong.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/pinkiri8.cpp b/src/mame/drivers/pinkiri8.cpp
index 1995ad424d4..1416bdc446a 100644
--- a/src/mame/drivers/pinkiri8.cpp
+++ b/src/mame/drivers/pinkiri8.cpp
@@ -41,6 +41,8 @@ Dumped by Chackn
#include "emu.h"
#include "cpu/z180/z180.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class pinkiri8_state : public driver_device
@@ -130,7 +132,7 @@ DEVICE_ADDRESS_MAP_START( map, 8, janshi_vdp_device )
AM_RANGE(0xff6000, 0xff601f) AM_RAM AM_SHARE("crtc_regs")
ADDRESS_MAP_END
-const device_type JANSHIVDP = &device_creator<janshi_vdp_device>;
+const device_type JANSHIVDP = device_creator<janshi_vdp_device>;
janshi_vdp_device::janshi_vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, JANSHIVDP, "Janshi VDP", tag, owner, clock, "janshi_vdp", __FILE__),
diff --git a/src/mame/drivers/pipedrm.cpp b/src/mame/drivers/pipedrm.cpp
index 6f8764ac51f..b6c68fd4bf7 100644
--- a/src/mame/drivers/pipedrm.cpp
+++ b/src/mame/drivers/pipedrm.cpp
@@ -163,10 +163,12 @@ Added Multiple Coin Feature:
#include "emu.h"
+#include "includes/fromance.h"
+
#include "cpu/z80/z80.h"
#include "sound/2608intf.h"
#include "sound/2610intf.h"
-#include "includes/fromance.h"
+#include "speaker.h"
class pipedrm_state : public fromance_state
diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp
index b7298c672b2..40cce978752 100644
--- a/src/mame/drivers/pipeline.cpp
+++ b/src/mame/drivers/pipeline.cpp
@@ -76,6 +76,9 @@ Stephh's notes (based on the games Z80 code and some tests) :
#include "sound/2203intf.h"
+#include "screen.h"
+#include "speaker.h"
+
class pipeline_state : public driver_device
{
@@ -88,8 +91,8 @@ public:
, m_palette(*this, "palette")
, m_vram1(*this, "vram1")
, m_vram2(*this, "vram2")
- {
- }
+ {
+ }
DECLARE_WRITE8_MEMBER(vram2_w);
DECLARE_WRITE8_MEMBER(vram1_w);
diff --git a/src/mame/drivers/pirates.cpp b/src/mame/drivers/pirates.cpp
index c315a705688..e31a6f56fd1 100644
--- a/src/mame/drivers/pirates.cpp
+++ b/src/mame/drivers/pirates.cpp
@@ -90,10 +90,13 @@ Notes:
---*/
#include "emu.h"
+#include "includes/pirates.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "sound/okim6295.h"
-#include "includes/pirates.h"
+#include "screen.h"
+#include "speaker.h"
WRITE16_MEMBER(pirates_state::out_w)
diff --git a/src/mame/drivers/pitagjr.cpp b/src/mame/drivers/pitagjr.cpp
index 81dd4b007d6..db7a8dc2044 100644
--- a/src/mame/drivers/pitagjr.cpp
+++ b/src/mame/drivers/pitagjr.cpp
@@ -152,16 +152,19 @@
#include "emu.h"
#include "cpu/m6805/m6805.h"
+
#include "rendlay.h"
+#include "screen.h"
+
class pitagjr_state : public driver_device
{
public:
pitagjr_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_rombank(*this, "rombank")
- { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_rombank(*this, "rombank")
+ { }
required_device<cpu_device> m_maincpu;
required_memory_bank m_rombank;
diff --git a/src/mame/drivers/pitnrun.cpp b/src/mame/drivers/pitnrun.cpp
index 80d20ddf5b9..ca31ba1fd5d 100644
--- a/src/mame/drivers/pitnrun.cpp
+++ b/src/mame/drivers/pitnrun.cpp
@@ -76,6 +76,9 @@ K1000233A
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
INTERRUPT_GEN_MEMBER(pitnrun_state::nmi_source)
{
diff --git a/src/mame/drivers/pk8000.cpp b/src/mame/drivers/pk8000.cpp
index 35d0a1234ff..c004cc43fda 100644
--- a/src/mame/drivers/pk8000.cpp
+++ b/src/mame/drivers/pk8000.cpp
@@ -10,15 +10,20 @@
****************************************************************************/
#include "emu.h"
+#include "includes/pk8000.h"
+
#include "cpu/i8085/i8085.h"
#include "machine/i8255.h"
#include "imagedev/cassette.h"
-#include "formats/fmsx_cas.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "sound/wave.h"
-#include "includes/pk8000.h"
#include "machine/ram.h"
+#include "screen.h"
+#include "speaker.h"
+
+#include "formats/fmsx_cas.h"
+
class pk8000_state : public pk8000_base_state
{
diff --git a/src/mame/drivers/pk8020.cpp b/src/mame/drivers/pk8020.cpp
index a2b86af09cf..b8fc7507c18 100644
--- a/src/mame/drivers/pk8020.cpp
+++ b/src/mame/drivers/pk8020.cpp
@@ -11,13 +11,16 @@
#include "emu.h"
+#include "includes/pk8020.h"
+
#include "cpu/i8085/i8085.h"
#include "machine/i8255.h"
#include "imagedev/flopdrv.h"
#include "formats/pk8020_dsk.h"
-#include "includes/pk8020.h"
#include "machine/ram.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
/* Address maps */
static ADDRESS_MAP_START(pk8020_mem, AS_PROGRAM, 8, pk8020_state )
diff --git a/src/mame/drivers/pkscram.cpp b/src/mame/drivers/pkscram.cpp
index cf431d9c6cd..a2286f6064a 100644
--- a/src/mame/drivers/pkscram.cpp
+++ b/src/mame/drivers/pkscram.cpp
@@ -15,8 +15,10 @@ driver by David Haywood and few bits by Pierpaolo Prazzoli
#include "emu.h"
#include "cpu/m68000/m68000.h"
-#include "sound/2203intf.h"
#include "machine/nvram.h"
+#include "sound/2203intf.h"
+#include "screen.h"
+#include "speaker.h"
class pkscram_state : public driver_device
diff --git a/src/mame/drivers/pktgaldx.cpp b/src/mame/drivers/pktgaldx.cpp
index b22a56bf92f..9574d25c432 100644
--- a/src/mame/drivers/pktgaldx.cpp
+++ b/src/mame/drivers/pktgaldx.cpp
@@ -55,11 +55,15 @@ bootleg todo:
*/
#include "emu.h"
+#include "includes/pktgaldx.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/decocrpt.h"
#include "machine/deco102.h"
#include "sound/okim6295.h"
-#include "includes/pktgaldx.h"
+#include "screen.h"
+#include "speaker.h"
+
/**********************************************************************************/
diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp
index ee02d3373b1..59dc7f07194 100644
--- a/src/mame/drivers/plan80.cpp
+++ b/src/mame/drivers/plan80.cpp
@@ -25,6 +25,7 @@
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "screen.h"
class plan80_state : public driver_device
diff --git a/src/mame/drivers/play_1.cpp b/src/mame/drivers/play_1.cpp
index c5109c99bac..a48e8b08efa 100644
--- a/src/mame/drivers/play_1.cpp
+++ b/src/mame/drivers/play_1.cpp
@@ -19,14 +19,17 @@ Others: When starting the game, hold down X, then release and hit Z, otherwise
**********************************************************************************/
-
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/cosmac/cosmac.h"
#include "machine/clock.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "speaker.h"
+
#include "play_1.lh"
+
class play_1_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/play_2.cpp b/src/mame/drivers/play_2.cpp
index d5f294c9e24..0f7ba393990 100644
--- a/src/mame/drivers/play_2.cpp
+++ b/src/mame/drivers/play_2.cpp
@@ -33,14 +33,18 @@ Notes:
#include "emu.h"
#include "machine/genpin.h"
-#include "cpu/cosmac/cosmac.h"
+
#include "cpu/cop400/cop400.h"
-#include "machine/clock.h"
+#include "cpu/cosmac/cosmac.h"
#include "machine/7474.h"
+#include "machine/clock.h"
#include "sound/ay8910.h"
#include "sound/cdp1863.h"
+#include "speaker.h"
+
#include "play_2.lh"
+
class play_2_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/play_3.cpp b/src/mame/drivers/play_3.cpp
index 8f07acf7d1e..af22906fa49 100644
--- a/src/mame/drivers/play_3.cpp
+++ b/src/mame/drivers/play_3.cpp
@@ -45,14 +45,18 @@ The manual is not that clear, there's a lot we don't know, this *seems* to work.
#include "emu.h"
#include "machine/genpin.h"
+#include "audio/efo_zsu.h"
+
#include "cpu/cosmac/cosmac.h"
#include "machine/clock.h"
#include "machine/7474.h"
#include "sound/ay8910.h"
-#include "audio/efo_zsu.h"
+#include "speaker.h"
+
#include "play_3.lh"
+
class play_3_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp
index 3e36bd64fde..f3a5a5f8722 100644
--- a/src/mame/drivers/playch10.cpp
+++ b/src/mame/drivers/playch10.cpp
@@ -292,13 +292,16 @@ Notes & Todo:
***************************************************************************/
#include "emu.h"
+#include "includes/playch10.h"
+
#include "cpu/m6502/n2a03.h"
#include "cpu/z80/z80.h"
#include "machine/rp5h01.h"
#include "machine/nvram.h"
#include "rendlay.h"
-#include "includes/playch10.h"
+#include "screen.h"
+#include "speaker.h"
/* clock frequency */
#define N2A03_DEFAULTCLOCK (21477272.724 / 12)
diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp
index 489e681bd9a..6ec5e882504 100644
--- a/src/mame/drivers/playmark.cpp
+++ b/src/mame/drivers/playmark.cpp
@@ -61,13 +61,16 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "includes/playmark.h"
+
#include "cpu/m68000/m68000.h"
-#include "machine/eepromser.h"
#include "cpu/pic16c5x/pic16c5x.h"
-#include "sound/okim6295.h"
-#include "includes/playmark.h"
-#include "machine/ticket.h"
+#include "machine/eepromser.h"
#include "machine/nvram.h"
+#include "machine/ticket.h"
+#include "screen.h"
+#include "sound/okim6295.h"
+#include "speaker.h"
WRITE16_MEMBER(playmark_state::coinctrl_w)
diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp
index ab96baf6bb8..38dd420dfd3 100644
--- a/src/mame/drivers/plus4.cpp
+++ b/src/mame/drivers/plus4.cpp
@@ -12,7 +12,9 @@
*/
#include "emu.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#include "bus/cbmiec/cbmiec.h"
#include "bus/pet/cass.h"
#include "bus/plus4/exp.h"
diff --git a/src/mame/drivers/pluto5.cpp b/src/mame/drivers/pluto5.cpp
index 6a9fe99efa1..f6e5fce2e01 100644
--- a/src/mame/drivers/pluto5.cpp
+++ b/src/mame/drivers/pluto5.cpp
@@ -179,6 +179,7 @@
#include "emu.h"
#include "machine/68340.h"
+#include "speaker.h"
class pluto5_state : public driver_device
{
diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp
index 18c48c18925..69901872957 100644
--- a/src/mame/drivers/plygonet.cpp
+++ b/src/mame/drivers/plygonet.cpp
@@ -63,13 +63,16 @@
*/
+#include "includes/plygonet.h"
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
-#include "sound/k054539.h"
#include "machine/watchdog.h"
-#include "includes/plygonet.h"
+#include "sound/k054539.h"
+#include "screen.h"
+#include "speaker.h"
+
enum { BANK_GROUP_A, BANK_GROUP_B, INVALID_BANK_GROUP };
diff --git a/src/mame/drivers/pmd85.cpp b/src/mame/drivers/pmd85.cpp
index 143963a5f0f..af3ca41d182 100644
--- a/src/mame/drivers/pmd85.cpp
+++ b/src/mame/drivers/pmd85.cpp
@@ -172,16 +172,22 @@ I/O ports
*******************************************************************************/
#include "emu.h"
+#include "includes/pmd85.h"
+
#include "cpu/i8085/i8085.h"
-#include "sound/wave.h"
#include "imagedev/cassette.h"
-#include "includes/pmd85.h"
+#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/pit8253.h"
-#include "machine/i8251.h"
-#include "formats/pmd_cas.h"
#include "machine/ram.h"
+#include "sound/wave.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/pmd_cas.h"
+
//**************************************************************************
// VIDEO EMULATION
diff --git a/src/mame/drivers/pntnpuzl.cpp b/src/mame/drivers/pntnpuzl.cpp
index 724e662f24a..5b5dcba359f 100644
--- a/src/mame/drivers/pntnpuzl.cpp
+++ b/src/mame/drivers/pntnpuzl.cpp
@@ -126,6 +126,7 @@ CN1 standard DB15 VGA connector (15KHz)
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "video/pc_vga.h"
+#include "screen.h"
class pntnpuzl_state : public driver_device
@@ -135,7 +136,7 @@ public:
: driver_device(mconfig, type, tag),
m_maincpu(*this,"maincpu"),
m_eeprom(*this, "eeprom")
- { }
+ { }
uint16_t m_eeprom_data;
uint16_t m_pntpzl_200000;
diff --git a/src/mame/drivers/pockchal.cpp b/src/mame/drivers/pockchal.cpp
index 1b2206bf2a8..facc24e60d6 100644
--- a/src/mame/drivers/pockchal.cpp
+++ b/src/mame/drivers/pockchal.cpp
@@ -21,11 +21,15 @@ Cart sizes: 1MB, 2MB, 4MB
********************************************************************/
#include "emu.h"
+
#include "cpu/tlcs90/tlcs90.h"
-#include "softlist.h"
+
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "screen.h"
+#include "softlist.h"
+
class pockchalv1_state : public driver_device
{
@@ -34,7 +38,7 @@ public:
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_cart(*this, "cartslot")
- { }
+ { }
virtual void machine_start() override;
virtual void machine_reset() override;
diff --git a/src/mame/drivers/pocketc.cpp b/src/mame/drivers/pocketc.cpp
index 6af288dc643..1fbb9501f14 100644
--- a/src/mame/drivers/pocketc.cpp
+++ b/src/mame/drivers/pocketc.cpp
@@ -7,15 +7,18 @@
******************************************************************************/
#include "emu.h"
-#include "cpu/sc61860/sc61860.h"
-
#include "includes/pocketc.h"
#include "includes/pc1401.h"
#include "includes/pc1251.h"
#include "includes/pc1350.h"
#include "includes/pc1403.h"
+
+#include "cpu/sc61860/sc61860.h"
#include "machine/ram.h"
+#include "screen.h"
+
+
/* pc1430 no peek poke operations! */
/* pc1280?? */
diff --git a/src/mame/drivers/pockstat.cpp b/src/mame/drivers/pockstat.cpp
index f373c53256a..8c83cbc9b4e 100644
--- a/src/mame/drivers/pockstat.cpp
+++ b/src/mame/drivers/pockstat.cpp
@@ -47,6 +47,8 @@ If you do nothing for about 20 secs, it turns itself off (screen goes white).
#include "cpu/arm7/arm7core.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
#define MAX_PS_TIMERS 3
diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp
index cbe4eea2cf2..5d9b7ac92b1 100644
--- a/src/mame/drivers/pofo.cpp
+++ b/src/mame/drivers/pofo.cpp
@@ -33,8 +33,7 @@
*/
#include "emu.h"
-#include "rendlay.h"
-#include "softlist.h"
+
#include "cpu/i86/i86.h"
#include "bus/pofo/ccm.h"
#include "bus/pofo/exp.h"
@@ -43,6 +42,11 @@
#include "sound/pcd3311.h"
#include "video/hd61830.h"
+#include "rendlay.h"
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
+
//**************************************************************************
diff --git a/src/mame/drivers/poisk1.cpp b/src/mame/drivers/poisk1.cpp
index c42205446e3..7fd8d30d95c 100644
--- a/src/mame/drivers/poisk1.cpp
+++ b/src/mame/drivers/poisk1.cpp
@@ -9,21 +9,22 @@
***************************************************************************/
#include "emu.h"
-
#include "machine/kb_poisk1.h"
-#include "video/cgapal.h"
+
+#include "bus/isa/isa.h"
+#include "bus/isa/xsu_cards.h"
+#include "cpu/i86/i86.h"
#include "imagedev/cassette.h"
#include "machine/i8255.h"
-#include "bus/isa/isa.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
#include "machine/ram.h"
-#include "bus/isa/xsu_cards.h"
-#include "sound/speaker.h"
-
-#include "cpu/i86/i86.h"
+#include "sound/spkrdev.h"
+#include "video/cgapal.h"
#include "softlist.h"
+#include "speaker.h"
+
#define CGA_PALETTE_SETS 83
/* one for colour, one for mono, 81 for colour composite */
diff --git a/src/mame/drivers/pokechmp.cpp b/src/mame/drivers/pokechmp.cpp
index 58767d749b7..4885939cd14 100644
--- a/src/mame/drivers/pokechmp.cpp
+++ b/src/mame/drivers/pokechmp.cpp
@@ -41,11 +41,16 @@ ClawGrip, Jul 2006
*/
#include "emu.h"
+#include "includes/pokechmp.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
-#include "includes/pokechmp.h"
+
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(pokechmp_state::pokechmp_bank_w)
{
diff --git a/src/mame/drivers/pokemini.cpp b/src/mame/drivers/pokemini.cpp
index 0287115cdd1..6f75c5b1d5c 100644
--- a/src/mame/drivers/pokemini.cpp
+++ b/src/mame/drivers/pokemini.cpp
@@ -10,13 +10,15 @@ The LCD is likely to be a SSD1828 LCD.
********************************************************************/
#include "emu.h"
-#include "sound/speaker.h"
-#include "machine/i2cmem.h"
#include "cpu/minx/minx.h"
+#include "machine/i2cmem.h"
+#include "sound/spkrdev.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "rendlay.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
struct PRC
{
diff --git a/src/mame/drivers/poker72.cpp b/src/mame/drivers/poker72.cpp
index 9ecc000c37f..903b8a322df 100644
--- a/src/mame/drivers/poker72.cpp
+++ b/src/mame/drivers/poker72.cpp
@@ -21,6 +21,8 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class poker72_state : public driver_device
diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp
index bcddb13d8b2..6a7b0dc8509 100644
--- a/src/mame/drivers/polepos.cpp
+++ b/src/mame/drivers/polepos.cpp
@@ -218,20 +218,22 @@ Todo:
***************************************************************************/
#include "emu.h"
+#include "includes/polepos.h"
+#include "audio/namco52.h"
+#include "audio/namco54.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z8000/z8000.h"
#include "cpu/mb88xx/mb88xx.h"
#include "machine/namco06.h"
#include "machine/namco51.h"
#include "machine/namco53.h"
-#include "audio/namco52.h"
-#include "audio/namco54.h"
-#include "includes/polepos.h"
+#include "machine/nvram.h"
+#include "machine/watchdog.h"
#include "sound/dac.h"
#include "sound/tms5220.h"
#include "sound/volt_reg.h"
-#include "machine/nvram.h"
-#include "machine/watchdog.h"
+#include "speaker.h"
#include "polepos.lh"
#include "topracer.lh"
diff --git a/src/mame/drivers/policetr.cpp b/src/mame/drivers/policetr.cpp
index bbd958b02df..4b5a7f55f37 100644
--- a/src/mame/drivers/policetr.cpp
+++ b/src/mame/drivers/policetr.cpp
@@ -87,10 +87,12 @@ PC5380-9651 5380-JY3306A 5380-N1045503A
***************************************************************************/
#include "emu.h"
+#include "includes/policetr.h"
+
#include "cpu/mips/r3000.h"
#include "machine/eepromser.h"
-#include "includes/policetr.h"
#include "sound/bsmt2000.h"
+#include "speaker.h"
/* constants */
diff --git a/src/mame/drivers/poly.cpp b/src/mame/drivers/poly.cpp
index 6771465d81a..cc70f11556f 100644
--- a/src/mame/drivers/poly.cpp
+++ b/src/mame/drivers/poly.cpp
@@ -36,10 +36,13 @@
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
#include "machine/clock.h"
+#include "machine/keyboard.h"
#include "machine/mc6854.h"
+#include "sound/spkrdev.h"
#include "video/saa5050.h"
-#include "machine/keyboard.h"
-#include "sound/speaker.h"
+#include "screen.h"
+#include "speaker.h"
+
class poly_state : public driver_device
{
diff --git a/src/mame/drivers/poly88.cpp b/src/mame/drivers/poly88.cpp
index 6ba6267499b..1d991d6ab67 100644
--- a/src/mame/drivers/poly88.cpp
+++ b/src/mame/drivers/poly88.cpp
@@ -27,10 +27,14 @@
****************************************************************************/
#include "emu.h"
+#include "includes/poly88.h"
+
#include "cpu/i8085/i8085.h"
#include "imagedev/cassette.h"
#include "sound/wave.h"
-#include "includes/poly88.h"
+#include "screen.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START(poly88_mem, AS_PROGRAM, 8, poly88_state )
ADDRESS_MAP_UNMAP_HIGH
diff --git a/src/mame/drivers/polyplay.cpp b/src/mame/drivers/polyplay.cpp
index 8ca87d1058a..9e957d405bf 100644
--- a/src/mame/drivers/polyplay.cpp
+++ b/src/mame/drivers/polyplay.cpp
@@ -132,11 +132,17 @@ this.)
***************************************************************************/
#include "emu.h"
+#include "includes/polyplay.h"
+
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
-#include "includes/polyplay.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "polyplay.lh"
+
static const z80_daisy_config daisy_chain_zre[] =
{
{ Z80CTC_TAG },
diff --git a/src/mame/drivers/pong.cpp b/src/mame/drivers/pong.cpp
index d9c67a78e6b..27eddca1a71 100644
--- a/src/mame/drivers/pong.cpp
+++ b/src/mame/drivers/pong.cpp
@@ -59,6 +59,9 @@ TODO: Superpong is believed to use the Pong (Rev E) PCB with some minor modifica
#include "machine/nl_pong.h"
#include "machine/nl_pongd.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "breakout.lh"
#include <cmath>
diff --git a/src/mame/drivers/poolshrk.cpp b/src/mame/drivers/poolshrk.cpp
index 7a26d97eed7..b9d29968640 100644
--- a/src/mame/drivers/poolshrk.cpp
+++ b/src/mame/drivers/poolshrk.cpp
@@ -7,10 +7,13 @@ Atari Poolshark Driver
***************************************************************************/
#include "emu.h"
-#include "cpu/m6800/m6800.h"
#include "includes/poolshrk.h"
+
+#include "cpu/m6800/m6800.h"
#include "sound/discrete.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/pooyan.cpp b/src/mame/drivers/pooyan.cpp
index 12e69043404..4988e2caf7e 100644
--- a/src/mame/drivers/pooyan.cpp
+++ b/src/mame/drivers/pooyan.cpp
@@ -11,12 +11,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/pooyan.h"
+#include "includes/konamipt.h"
+#include "audio/timeplt.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
-#include "audio/timeplt.h"
-#include "includes/pooyan.h"
-#include "includes/konamipt.h"
+#include "screen.h"
#define MASTER_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/popeye.cpp b/src/mame/drivers/popeye.cpp
index 794ae326bb8..93646d51a2b 100644
--- a/src/mame/drivers/popeye.cpp
+++ b/src/mame/drivers/popeye.cpp
@@ -18,12 +18,17 @@ Notes:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
#include "includes/popeye.h"
+
+#include "cpu/z80/z80.h"
#include "machine/netlist.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "netlist/devices/net_lib.h"
+
/* This is the output stage of the audio circuit.
* It is solely an impedance changer and could be left away
*/
diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp
index ceddfcd3847..45368f8efd6 100644
--- a/src/mame/drivers/popobear.cpp
+++ b/src/mame/drivers/popobear.cpp
@@ -81,6 +81,8 @@ Component Side A B Solder Side
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "sound/ym2413.h"
+#include "screen.h"
+#include "speaker.h"
class popobear_state : public driver_device
{
diff --git a/src/mame/drivers/portrait.cpp b/src/mame/drivers/portrait.cpp
index b21d2f4c39f..d4f78eee780 100644
--- a/src/mame/drivers/portrait.cpp
+++ b/src/mame/drivers/portrait.cpp
@@ -86,11 +86,15 @@ DM81LS95 = TriState buffer
**************************************************************************/
#include "emu.h"
+#include "includes/portrait.h"
+
#include "cpu/z80/z80.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
-#include "includes/portrait.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(portrait_state::ctrl_w)
{
diff --git a/src/mame/drivers/potgoldu.cpp b/src/mame/drivers/potgoldu.cpp
index a950e50f19c..a9d32615689 100644
--- a/src/mame/drivers/potgoldu.cpp
+++ b/src/mame/drivers/potgoldu.cpp
@@ -21,6 +21,7 @@
#include "emu.h"
#include "cpu/tms34010/tms34010.h"
+#include "screen.h"
class potgold_state : public driver_device
diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp
index 879b0c00e91..29fbf0c0d17 100644
--- a/src/mame/drivers/powerbal.cpp
+++ b/src/mame/drivers/powerbal.cpp
@@ -16,17 +16,22 @@ Magic Sticks:
*/
#include "emu.h"
+#include "includes/playmark.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "sound/okim6295.h"
-#include "includes/playmark.h"
+#include "screen.h"
+#include "speaker.h"
+
class powerbal_state : public playmark_state
{
public:
powerbal_state(const machine_config &mconfig, device_type type, const char *tag)
- : playmark_state(mconfig, type, tag),
- m_eeprom(*this, "eeprom") { }
+ : playmark_state(mconfig, type, tag)
+ , m_eeprom(*this, "eeprom")
+ { }
/* powerbal-specific */
int m_tilebank;
diff --git a/src/mame/drivers/powerins.cpp b/src/mame/drivers/powerins.cpp
index 06953b82de4..fe58539eaa1 100644
--- a/src/mame/drivers/powerins.cpp
+++ b/src/mame/drivers/powerins.cpp
@@ -31,12 +31,14 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "includes/powerins.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "machine/gen_latch.h"
#include "sound/okim6295.h"
#include "sound/2203intf.h"
-#include "includes/powerins.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/pp01.cpp b/src/mame/drivers/pp01.cpp
index 2ef15721130..e9ae497286d 100644
--- a/src/mame/drivers/pp01.cpp
+++ b/src/mame/drivers/pp01.cpp
@@ -8,10 +8,12 @@
****************************************************************************/
-
#include "emu.h"
#include "includes/pp01.h"
+#include "screen.h"
+#include "speaker.h"
+
/* Address maps */
static ADDRESS_MAP_START(pp01_mem, AS_PROGRAM, 8, pp01_state )
diff --git a/src/mame/drivers/ppmast93.cpp b/src/mame/drivers/ppmast93.cpp
index 60422c41e82..0d06ff0da02 100644
--- a/src/mame/drivers/ppmast93.cpp
+++ b/src/mame/drivers/ppmast93.cpp
@@ -137,6 +137,8 @@ Dip locations added based on the notes above.
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "sound/ym2413.h"
+#include "screen.h"
+#include "speaker.h"
class ppmast93_state : public driver_device
diff --git a/src/mame/drivers/prehisle.cpp b/src/mame/drivers/prehisle.cpp
index 1bca554476d..2810eb5afa3 100644
--- a/src/mame/drivers/prehisle.cpp
+++ b/src/mame/drivers/prehisle.cpp
@@ -11,10 +11,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/prehisle.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/3812intf.h"
-#include "includes/prehisle.h"
+#include "screen.h"
+#include "speaker.h"
+
/******************************************************************************/
diff --git a/src/mame/drivers/prestige.cpp b/src/mame/drivers/prestige.cpp
index 94b547e7dfc..996f8ac0687 100644
--- a/src/mame/drivers/prestige.cpp
+++ b/src/mame/drivers/prestige.cpp
@@ -78,14 +78,18 @@ Notes:
#include "emu.h"
+
#include "cpu/z80/z80.h"
#include "machine/ram.h"
-#include "rendlay.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+
+#include "rendlay.h"
+#include "screen.h"
#include "softlist.h"
+
class prestige_state : public driver_device
{
public:
@@ -101,7 +105,7 @@ public:
, m_bank3(*this, "bank3")
, m_bank4(*this, "bank4")
, m_bank5(*this, "bank5")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<ram_device> m_ram;
diff --git a/src/mame/drivers/primo.cpp b/src/mame/drivers/primo.cpp
index 7a1e8cbc9be..3b87115ed8e 100644
--- a/src/mame/drivers/primo.cpp
+++ b/src/mame/drivers/primo.cpp
@@ -107,14 +107,15 @@ Interrupts:
*******************************************************************************/
#include "emu.h"
-#include "sound/speaker.h"
-#include "sound/wave.h"
#include "includes/primo.h"
+
#include "cpu/z80/z80.h"
-#include "imagedev/cassette.h"
-#include "imagedev/snapquik.h"
+#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "formats/primoptp.h"
-#include "bus/cbmiec/cbmiec.h"
+
static ADDRESS_MAP_START( primoa_port, AS_IO, 8, primo_state )
ADDRESS_MAP_GLOBAL_MASK(0xff)
diff --git a/src/mame/drivers/pro80.cpp b/src/mame/drivers/pro80.cpp
index f2fb3385f80..18323aad76a 100644
--- a/src/mame/drivers/pro80.cpp
+++ b/src/mame/drivers/pro80.cpp
@@ -19,12 +19,17 @@ The cassette uses 2 bits for input, plus a D flipflop and a 74LS221 oneshot, wit
#include "emu.h"
+
#include "cpu/z80/z80.h"
#include "machine/z80pio.h"
#include "imagedev/cassette.h"
#include "sound/wave.h"
+
+#include "speaker.h"
+
#include "pro80.lh"
+
class pro80_state : public driver_device
{
public:
diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp
index dbff3d2d993..6abac672b61 100644
--- a/src/mame/drivers/proconn.cpp
+++ b/src/mame/drivers/proconn.cpp
@@ -25,17 +25,21 @@
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "machine/z80pio.h"
+#include "machine/meters.h"
+#include "machine/roc10937.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
+#include "machine/z80pio.h"
#include "sound/ay8910.h"
#include "video/awpvid.h"
-#include "machine/roc10937.h"
-#include "machine/meters.h"
+
+#include "speaker.h"
#include "proconn.lh"
+
class proconn_state : public driver_device
{
public:
diff --git a/src/mame/drivers/prof180x.cpp b/src/mame/drivers/prof180x.cpp
index 0039a148067..6b4119ec559 100644
--- a/src/mame/drivers/prof180x.cpp
+++ b/src/mame/drivers/prof180x.cpp
@@ -24,11 +24,12 @@
#include "emu.h"
+#include "includes/prof180x.h"
+
#include "cpu/z80/z80.h"
#include "machine/ram.h"
-#include "bus/centronics/ctronics.h"
#include "machine/upd765.h"
-#include "includes/prof180x.h"
+#include "screen.h"
#include "softlist.h"
uint32_t prof180x_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/mame/drivers/progolf.cpp b/src/mame/drivers/progolf.cpp
index 3db5b9fb7ea..5534af9c152 100644
--- a/src/mame/drivers/progolf.cpp
+++ b/src/mame/drivers/progolf.cpp
@@ -58,6 +58,9 @@ Twenty four 8116 rams.
#include "video/mc6845.h"
#include "machine/deco222.h"
#include "machine/decocpu6.h"
+#include "screen.h"
+#include "speaker.h"
+
class progolf_state : public driver_device
{
diff --git a/src/mame/drivers/proteus3.cpp b/src/mame/drivers/proteus3.cpp
index d689f6e56c3..670700347e8 100644
--- a/src/mame/drivers/proteus3.cpp
+++ b/src/mame/drivers/proteus3.cpp
@@ -45,15 +45,20 @@
******************************************************************************/
#include "emu.h"
+
#include "cpu/m6800/m6800.h"
+#include "imagedev/cassette.h"
#include "machine/6821pia.h"
#include "machine/6850acia.h"
#include "machine/clock.h"
#include "machine/keyboard.h"
-#include "imagedev/cassette.h"
#include "sound/wave.h"
+
#include "bus/rs232/rs232.h"
+#include "screen.h"
+#include "speaker.h"
+
class proteus3_state : public driver_device
{
diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp
index ebf33ed19d1..1f58d334425 100644
--- a/src/mame/drivers/psikyo.cpp
+++ b/src/mame/drivers/psikyo.cpp
@@ -66,12 +66,14 @@ This was pointed out by Bart Puype
*****/
#include "emu.h"
+#include "includes/psikyo.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
#include "sound/ymf278b.h"
#include "sound/okim6295.h"
-#include "includes/psikyo.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp
index 4c8baad4221..f7a4f1addfd 100644
--- a/src/mame/drivers/psikyo4.cpp
+++ b/src/mame/drivers/psikyo4.cpp
@@ -131,7 +131,10 @@ ROMs -
#include "emu.h"
#include "includes/psikyo4.h"
+
#include "rendlay.h"
+#include "speaker.h"
+
static GFXLAYOUT_RAW( layout_16x16x8, 16, 16, 16*8, 16*16*8 )
diff --git a/src/mame/drivers/psikyosh.cpp b/src/mame/drivers/psikyosh.cpp
index 40d6ac54e22..5d31831df47 100644
--- a/src/mame/drivers/psikyosh.cpp
+++ b/src/mame/drivers/psikyosh.cpp
@@ -274,13 +274,14 @@ Notes:
*/
#include "emu.h"
+#include "includes/psikyosh.h"
#include "cpu/sh2/sh2.h"
#include "machine/eepromser.h"
#include "machine/watchdog.h"
#include "sound/ymf278b.h"
+#include "speaker.h"
-#include "includes/psikyosh.h"
static const gfx_layout layout_16x16x4 =
{
diff --git a/src/mame/drivers/psion.cpp b/src/mame/drivers/psion.cpp
index 32cb938fb87..382a0e05208 100644
--- a/src/mame/drivers/psion.cpp
+++ b/src/mame/drivers/psion.cpp
@@ -22,8 +22,12 @@
#include "emu.h"
#include "includes/psion.h"
+
#include "rendlay.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
TIMER_DEVICE_CALLBACK_MEMBER(psion_state::nmi_timer)
{
diff --git a/src/mame/drivers/psx.cpp b/src/mame/drivers/psx.cpp
index 1b3536e4f50..b4d8124b2dd 100644
--- a/src/mame/drivers/psx.cpp
+++ b/src/mame/drivers/psx.cpp
@@ -10,16 +10,21 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/psx/psx.h"
+
+#include "bus/psx/ctlrport.h"
#include "cpu/m6805/m6805.h"
-#include "video/psx.h"
-#include "imagedev/snapquik.h"
+#include "cpu/psx/psx.h"
#include "imagedev/chd_cd.h"
+#include "imagedev/snapquik.h"
+#include "machine/psxcd.h"
+#include "machine/ram.h"
#include "sound/spu.h"
+#include "video/psx.h"
+
#include "debugger.h"
-#include "machine/psxcd.h"
-#include "bus/psx/ctlrport.h"
#include "softlist.h"
+#include "speaker.h"
+
#define PSXCD_TAG "psxcd"
diff --git a/src/mame/drivers/psychic5.cpp b/src/mame/drivers/psychic5.cpp
index 0333e04e0a3..1c41e5ee726 100644
--- a/src/mame/drivers/psychic5.cpp
+++ b/src/mame/drivers/psychic5.cpp
@@ -330,10 +330,13 @@ Notes (23-Jan-2016 AS):
*/
#include "emu.h"
+#include "includes/psychic5.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/2203intf.h"
-#include "includes/psychic5.h"
+#include "screen.h"
+#include "speaker.h"
MACHINE_START_MEMBER(psychic5_state, psychic5)
diff --git a/src/mame/drivers/pt68k4.cpp b/src/mame/drivers/pt68k4.cpp
index 86f5203f4a2..a1761baaf5c 100644
--- a/src/mame/drivers/pt68k4.cpp
+++ b/src/mame/drivers/pt68k4.cpp
@@ -54,18 +54,24 @@ TODO: 68230 device
****************************************************************************/
#include "emu.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/mc68681.h"
+#include "machine/pc_fdc.h"
#include "machine/timekpr.h"
#include "machine/wd_fdc.h"
-#include "machine/pc_fdc.h"
-#include "formats/imd_dsk.h"
+#include "sound/spkrdev.h"
+
#include "bus/isa/isa.h"
#include "bus/isa/isa_cards.h"
-#include "bus/pc_kbd/pc_kbdc.h"
#include "bus/pc_kbd/keyboards.h"
-#include "sound/speaker.h"
+#include "bus/pc_kbd/pc_kbdc.h"
+
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/imd_dsk.h"
+
#define M68K_TAG "maincpu"
#define DUART1_TAG "duart1"
diff --git a/src/mame/drivers/ptcsol.cpp b/src/mame/drivers/ptcsol.cpp
index a5b419fdcb2..163d48a16b6 100644
--- a/src/mame/drivers/ptcsol.cpp
+++ b/src/mame/drivers/ptcsol.cpp
@@ -111,14 +111,20 @@
****************************************************************************/
#include "emu.h"
+
#include "cpu/i8085/i8085.h"
-#include "machine/keyboard.h"
-#include "sound/speaker.h"
-#include "sound/wave.h"
#include "imagedev/cassette.h"
#include "machine/ay31015.h"
-#include "formats/sol_cas.h"
+#include "machine/keyboard.h"
+#include "sound/spkrdev.h"
+#include "sound/wave.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/sol_cas.h"
+
struct cass_data_t {
struct {
diff --git a/src/mame/drivers/pturn.cpp b/src/mame/drivers/pturn.cpp
index d519858b38c..e14e863d215 100644
--- a/src/mame/drivers/pturn.cpp
+++ b/src/mame/drivers/pturn.cpp
@@ -80,6 +80,8 @@ ROMS: All ROM labels say only "PROM" and a number.
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class pturn_state : public driver_device
diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp
index fd630c64908..0003da071d5 100644
--- a/src/mame/drivers/punchout.cpp
+++ b/src/mame/drivers/punchout.cpp
@@ -115,12 +115,15 @@ DIP locations verified for:
***************************************************************************/
#include "emu.h"
+#include "includes/punchout.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6502/n2a03.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
#include "rendlay.h"
-#include "includes/punchout.h"
+#include "screen.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/pv1000.cpp b/src/mame/drivers/pv1000.cpp
index 868ad081443..2b6ea9a2b12 100644
--- a/src/mame/drivers/pv1000.cpp
+++ b/src/mame/drivers/pv1000.cpp
@@ -10,7 +10,11 @@
#include "cpu/z80/z80.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+
// PV-1000 Sound device
class pv1000_sound_device : public device_t,
@@ -43,7 +47,7 @@ private:
extern const device_type PV1000;
-const device_type PV1000 = &device_creator<pv1000_sound_device>;
+const device_type PV1000 = device_creator<pv1000_sound_device>;
pv1000_sound_device::pv1000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, PV1000, "NEC D65010G031", tag, owner, clock, "pv1000_sound", __FILE__),
diff --git a/src/mame/drivers/pv2000.cpp b/src/mame/drivers/pv2000.cpp
index 5e549743719..c2ae369f0c7 100644
--- a/src/mame/drivers/pv2000.cpp
+++ b/src/mame/drivers/pv2000.cpp
@@ -37,7 +37,9 @@ For BIOS CRC confirmation
#include "imagedev/cassette.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
class pv2000_state : public driver_device
{
diff --git a/src/mame/drivers/pv9234.cpp b/src/mame/drivers/pv9234.cpp
index 233b7b5c177..97263c9bdc3 100644
--- a/src/mame/drivers/pv9234.cpp
+++ b/src/mame/drivers/pv9234.cpp
@@ -22,6 +22,7 @@ be found!
#include "emu.h"
#include "cpu/arm7/arm7.h"
+#include "screen.h"
class pv9234_state : public driver_device
diff --git a/src/mame/drivers/pve500.cpp b/src/mame/drivers/pve500.cpp
index 168f142a3ce..40208e508e0 100644
--- a/src/mame/drivers/pve500.cpp
+++ b/src/mame/drivers/pve500.cpp
@@ -45,13 +45,15 @@
#define DEBUGGING_INDUCE_SELFDIAGNOSE 0
#include "emu.h"
-#include "cpu/z80/tmpz84c015.h"
+#include "bus/rs232/rs232.h" /* actually meant to be RS422 ports */
#include "cpu/mb88xx/mb88xx.h"
+#include "cpu/z80/tmpz84c015.h"
+#include "machine/eepromser.h"
+#include "machine/mb8421.h"
#include "sound/beep.h"
-#include "bus/rs232/rs232.h" /* actually meant to be RS422 ports */
+#include "speaker.h"
+
#include "pve500.lh"
-#include "machine/mb8421.h"
-#include "machine/eepromser.h"
#define IO_EXPANDER_PORTA 0
#define IO_EXPANDER_PORTB 1
diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp
index 0a06a626736..0a5d764f8ba 100644
--- a/src/mame/drivers/px4.cpp
+++ b/src/mame/drivers/px4.cpp
@@ -10,19 +10,25 @@
***************************************************************************/
#include "emu.h"
+
+#include "bus/centronics/ctronics.h"
+#include "bus/epson_sio/epson_sio.h"
+#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
-#include "machine/ram.h"
-#include "bus/epson_sio/epson_sio.h"
-#include "bus/centronics/ctronics.h"
#include "imagedev/cassette.h"
-#include "machine/ram.h"
#include "machine/nvram.h"
-#include "sound/speaker.h"
-#include "bus/generic/slot.h"
-#include "bus/generic/carts.h"
-#include "coreutil.h"
+#include "machine/ram.h"
+#include "machine/ram.h"
+#include "sound/spkrdev.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "coreutil.h"
+
#include "px4.lh"
diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp
index 23f9e0ee79c..a443bb7ddfd 100644
--- a/src/mame/drivers/px8.cpp
+++ b/src/mame/drivers/px8.cpp
@@ -31,9 +31,14 @@
#include "emu.h"
#include "includes/px8.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
#include "px8.lh"
+
/***************************************************************************
CONSTANTS
***************************************************************************/
diff --git a/src/mame/drivers/pyl601.cpp b/src/mame/drivers/pyl601.cpp
index 2e33ed2164d..fc6cc6250db 100644
--- a/src/mame/drivers/pyl601.cpp
+++ b/src/mame/drivers/pyl601.cpp
@@ -35,13 +35,19 @@
****************************************************************************/
#include "emu.h"
+
#include "cpu/m6800/m6800.h"
-#include "video/mc6845.h"
-#include "sound/speaker.h"
-#include "formats/pyldin_dsk.h"
-#include "machine/upd765.h"
#include "machine/ram.h"
+#include "machine/upd765.h"
+#include "sound/spkrdev.h"
+#include "video/mc6845.h"
+
#include "softlist.h"
+#include "screen.h"
+#include "speaker.h"
+
+#include "formats/pyldin_dsk.h"
+
class pyl601_state : public driver_device
{
diff --git a/src/mame/drivers/pyson.cpp b/src/mame/drivers/pyson.cpp
index 77b705974a8..b117c8ee69c 100644
--- a/src/mame/drivers/pyson.cpp
+++ b/src/mame/drivers/pyson.cpp
@@ -153,6 +153,7 @@ Notes:
#include "emu.h"
#include "cpu/mips/mips3.h"
#include "cpu/mips/r3000.h"
+#include "screen.h"
class pyson_state : public driver_device
diff --git a/src/mame/drivers/pzletime.cpp b/src/mame/drivers/pzletime.cpp
index 74d4bf61664..02d1e525624 100644
--- a/src/mame/drivers/pzletime.cpp
+++ b/src/mame/drivers/pzletime.cpp
@@ -20,6 +20,9 @@
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
#include "machine/eepromser.h"
+#include "screen.h"
+#include "speaker.h"
+
class pzletime_state : public driver_device
{
diff --git a/src/mame/drivers/qdrmfgp.cpp b/src/mame/drivers/qdrmfgp.cpp
index a13681e1c3c..86c65c32b4b 100644
--- a/src/mame/drivers/qdrmfgp.cpp
+++ b/src/mame/drivers/qdrmfgp.cpp
@@ -25,11 +25,14 @@ GP1 HDD data contents:
***************************************************************************/
#include "emu.h"
+#include "includes/qdrmfgp.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/ataintf.h"
-#include "sound/k054539.h"
#include "machine/nvram.h"
-#include "includes/qdrmfgp.h"
+#include "sound/k054539.h"
+#include "screen.h"
+#include "speaker.h"
#define IDE_HACK 1
diff --git a/src/mame/drivers/ql.cpp b/src/mame/drivers/ql.cpp
index 00a6e144564..d176bc61843 100644
--- a/src/mame/drivers/ql.cpp
+++ b/src/mame/drivers/ql.cpp
@@ -74,7 +74,7 @@
*/
#include "emu.h"
-#include "softlist.h"
+
#include "bus/ql/exp.h"
#include "bus/ql/rom.h"
#include "bus/rs232/rs232.h"
@@ -84,9 +84,14 @@
#include "machine/qimi.h"
#include "machine/ram.h"
#include "machine/zx8302.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "video/zx8301.h"
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
+
+
#define SCREEN_TAG "screen"
#define M68008_TAG "ic18"
diff --git a/src/mame/drivers/quakeat.cpp b/src/mame/drivers/quakeat.cpp
index b8878f28b92..f2b9c1d734c 100644
--- a/src/mame/drivers/quakeat.cpp
+++ b/src/mame/drivers/quakeat.cpp
@@ -63,6 +63,7 @@ TODO:
#include "emu.h"
#include "cpu/i386/i386.h"
#include "machine/pcshare.h"
+#include "screen.h"
class quakeat_state : public pcat_base_state
diff --git a/src/mame/drivers/quantum.cpp b/src/mame/drivers/quantum.cpp
index bcf7502206c..ca30f154fd7 100644
--- a/src/mame/drivers/quantum.cpp
+++ b/src/mame/drivers/quantum.cpp
@@ -56,6 +56,8 @@ NOTE: The Atari 136002-125 PROM in the sets below wasn't dumped from an actual
#include "sound/discrete.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "screen.h"
+#include "speaker.h"
class quantum_state : public driver_device
diff --git a/src/mame/drivers/quasar.cpp b/src/mame/drivers/quasar.cpp
index be86a5230c2..d04955d3249 100644
--- a/src/mame/drivers/quasar.cpp
+++ b/src/mame/drivers/quasar.cpp
@@ -34,6 +34,7 @@ I8085 Sound Board
#include "cpu/s2650/s2650.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
/************************************************************************
diff --git a/src/mame/drivers/quizdna.cpp b/src/mame/drivers/quizdna.cpp
index 14394cdd58c..c500ce37ecb 100644
--- a/src/mame/drivers/quizdna.cpp
+++ b/src/mame/drivers/quizdna.cpp
@@ -11,10 +11,13 @@ Quiz Gekiretsu Scramble (Gakuen Paradise 2) (c) 1993 Face
*****************************************************************************/
#include "emu.h"
+#include "includes/quizdna.h"
+
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
-#include "includes/quizdna.h"
+#include "screen.h"
+#include "speaker.h"
#define MCLK 16000000
diff --git a/src/mame/drivers/quizo.cpp b/src/mame/drivers/quizo.cpp
index ca0e7a36ee1..cbcf43a90f4 100644
--- a/src/mame/drivers/quizo.cpp
+++ b/src/mame/drivers/quizo.cpp
@@ -28,6 +28,8 @@ Xtals 8MHz, 21.47727MHz
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class quizo_state : public driver_device
diff --git a/src/mame/drivers/quizpani.cpp b/src/mame/drivers/quizpani.cpp
index 4c1f412a4c4..2ec0fe4fa5f 100644
--- a/src/mame/drivers/quizpani.cpp
+++ b/src/mame/drivers/quizpani.cpp
@@ -48,9 +48,13 @@ Stephh's notes (based on the games M68000 code and some tests) :
*************************************************************************/
#include "emu.h"
+#include "includes/quizpani.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
-#include "includes/quizpani.h"
+#include "screen.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START( quizpani_map, AS_PROGRAM, 16, quizpani_state )
AM_RANGE(0x000000, 0x07ffff) AM_ROM
diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp
index 4f6b61ed3a5..a440a716014 100644
--- a/src/mame/drivers/quizpun2.cpp
+++ b/src/mame/drivers/quizpun2.cpp
@@ -91,6 +91,9 @@ Notes:
#include "sound/2203intf.h"
+#include "screen.h"
+#include "speaker.h"
+
// very preliminary quizpun2 protection simulation
diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp
index 205c5bfec00..3bc63a6bb56 100644
--- a/src/mame/drivers/quizshow.cpp
+++ b/src/mame/drivers/quizshow.cpp
@@ -18,6 +18,8 @@ TODO:
#include "cpu/s2650/s2650.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
#include "quizshow.lh"
diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp
index ef973a9b4e9..39d88731b0d 100644
--- a/src/mame/drivers/qx10.cpp
+++ b/src/mame/drivers/qx10.cpp
@@ -32,20 +32,24 @@
#include "emu.h"
+
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
-#include "machine/pit8253.h"
+#include "machine/am9517a.h"
+#include "machine/i8255.h"
+#include "machine/mc146818.h"
#include "machine/pic8259.h"
+#include "machine/pit8253.h"
+#include "machine/qx10kbd.h"
+#include "machine/ram.h"
+#include "machine/upd765.h"
#include "machine/z80dart.h"
-#include "machine/mc146818.h"
-#include "machine/i8255.h"
-#include "machine/am9517a.h"
#include "video/upd7220.h"
-#include "machine/upd765.h"
-#include "machine/ram.h"
-#include "machine/qx10kbd.h"
+
+#include "screen.h"
#include "softlist.h"
+
#define MAIN_CLK 15974400
#define RS232_TAG "rs232"
diff --git a/src/mame/drivers/r2dtank.cpp b/src/mame/drivers/r2dtank.cpp
index 869cb28f145..0e74270699c 100644
--- a/src/mame/drivers/r2dtank.cpp
+++ b/src/mame/drivers/r2dtank.cpp
@@ -33,15 +33,17 @@ RAM = 4116 (x11)
********************************************************************/
#include "emu.h"
-#include "machine/rescap.h"
-#include "machine/6821pia.h"
-#include "machine/74123.h"
-#include "video/mc6845.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
-#include "sound/ay8910.h"
+#include "machine/6821pia.h"
+#include "machine/74123.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
+#include "machine/rescap.h"
+#include "sound/ay8910.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
#define LOG_AUDIO_COMM (0)
diff --git a/src/mame/drivers/r2dx_v33.cpp b/src/mame/drivers/r2dx_v33.cpp
index 8f592bbae63..4e876c7a23c 100644
--- a/src/mame/drivers/r2dx_v33.cpp
+++ b/src/mame/drivers/r2dx_v33.cpp
@@ -63,15 +63,19 @@ Then it puts settings at 0x9e08 and 0x9e0a (bp 91acb)
*/
#include "emu.h"
+#include "includes/raiden2.h"
+
#include "cpu/nec/nec.h"
#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
#include "sound/3812intf.h"
//#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/raiden2.h"
#include "machine/r2crypt.h"
+#include "screen.h"
+#include "speaker.h"
+
class r2dx_v33_state : public raiden2_state
{
diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp
index 771595bba2d..22befac6560 100644
--- a/src/mame/drivers/rabbit.cpp
+++ b/src/mame/drivers/rabbit.cpp
@@ -85,6 +85,8 @@ Custom: Imagetek I5000 (2ch video & 2ch sound)
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "sound/i5000.h"
+#include "screen.h"
+#include "speaker.h"
class rabbit_state : public driver_device
diff --git a/src/mame/drivers/radio86.cpp b/src/mame/drivers/radio86.cpp
index 3ecd30c7a86..e63771694aa 100644
--- a/src/mame/drivers/radio86.cpp
+++ b/src/mame/drivers/radio86.cpp
@@ -10,13 +10,19 @@
#include "emu.h"
+#include "includes/radio86.h"
+
#include "cpu/i8085/i8085.h"
-#include "sound/wave.h"
-#include "machine/i8255.h"
#include "imagedev/cassette.h"
-#include "formats/rk_cas.h"
-#include "includes/radio86.h"
+#include "machine/i8255.h"
+#include "sound/wave.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/rk_cas.h"
+
/* Address maps */
static ADDRESS_MAP_START(radio86_mem, AS_PROGRAM, 8, radio86_state )
diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp
index d3bf1fac4ec..03c61ce25ea 100644
--- a/src/mame/drivers/raiden.cpp
+++ b/src/mame/drivers/raiden.cpp
@@ -70,12 +70,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/raiden.h"
+
#include "cpu/nec/nec.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
-#include "includes/raiden.h"
#include "video/seibu_crtc.h"
+#include "screen.h"
+#include "speaker.h"
/******************************************************************************/
diff --git a/src/mame/drivers/raiden2.cpp b/src/mame/drivers/raiden2.cpp
index d3351d4ab06..c41267d3750 100644
--- a/src/mame/drivers/raiden2.cpp
+++ b/src/mame/drivers/raiden2.cpp
@@ -169,16 +169,21 @@ Protection Notes:
********************************************************************************************************/
#include "emu.h"
-#include "debugger.h"
+#include "includes/raiden2.h"
+
#include "cpu/nec/nec.h"
#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
#include "sound/3812intf.h"
-#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/raiden2.h"
+#include "sound/ym2151.h"
#include "machine/r2crypt.h"
+#include "debugger.h"
+#include "screen.h"
+#include "speaker.h"
+
+
void raiden2_state::machine_start()
{
save_item(NAME(bg_bank));
diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp
index 6ec195e768d..536478746c0 100644
--- a/src/mame/drivers/rainbow.cpp
+++ b/src/mame/drivers/rainbow.cpp
@@ -340,6 +340,39 @@ WIRE CONNECTORS - SEEN ON SCHEMATICS - NOT PRESENT ON DEC-100 B (-A only?):
W16 pulls J2 printer port pin 1 to GND when set (chassis to logical GND).
W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND).
****************************************************************************/
+#include "emu.h"
+
+#include "cpu/i86/i86.h"
+#include "cpu/z80/z80.h"
+#include "video/vtvideo.h"
+#include "video/upd7220.h"
+
+#include "machine/wd_fdc.h"
+#include "formats/rx50_dsk.h"
+#include "formats/pc_dsk.h" // PC Formats
+#include "imagedev/flopdrv.h"
+
+#include "imagedev/harddriv.h"
+#include "machine/wd2010.h"
+#include "machine/corvushd.h"
+
+#include "machine/z80dart.h"
+#include "bus/rs232/rs232.h"
+#include "imagedev/bitbngr.h"
+#include "machine/com8116.h"
+
+#include "machine/i8251.h"
+#include "machine/clock.h"
+#include "machine/dec_lk201.h"
+#include "machine/nvram.h"
+
+#include "machine/ds1315.h"
+#include "softlist.h"
+#include "screen.h"
+
+#include "rainbow.lh" // BEZEL - LAYOUT with LEDs for diag 1-7, keyboard 8-11 and floppy 20-23
+
+
#define RD51_MAX_HEAD 8
#define RD51_MAX_CYLINDER 1024
#define RD51_SECTORS_PER_TRACK 17
@@ -442,36 +475,6 @@ W17 pulls J1 serial port pin 1 to GND when set (chassis to logical GND).
#define DUAL_MONITOR 0x03
// ----------------------------------------------------------------------------------------------
-#include "emu.h"
-#include "cpu/i86/i86.h"
-#include "cpu/z80/z80.h"
-#include "video/vtvideo.h"
-#include "video/upd7220.h"
-
-#include "machine/wd_fdc.h"
-#include "formats/rx50_dsk.h"
-#include "formats/pc_dsk.h" // PC Formats
-#include "imagedev/flopdrv.h"
-
-#include "imagedev/harddriv.h"
-#include "machine/wd2010.h"
-#include "machine/corvushd.h"
-
-#include "machine/z80dart.h"
-#include "bus/rs232/rs232.h"
-#include "imagedev/bitbngr.h"
-#include "machine/com8116.h"
-
-#include "machine/i8251.h"
-#include "machine/clock.h"
-#include "machine/dec_lk201.h"
-#include "machine/nvram.h"
-
-#include "machine/ds1315.h"
-#include "softlist.h"
-
-#include "rainbow.lh" // BEZEL - LAYOUT with LEDs for diag 1-7, keyboard 8-11 and floppy 20-23
-
#define LK201_TAG "lk201"
#define FD1793_TAG "fd1793x"
diff --git a/src/mame/drivers/rallyx.cpp b/src/mame/drivers/rallyx.cpp
index 0fafe690ce2..7ff9e2e5800 100644
--- a/src/mame/drivers/rallyx.cpp
+++ b/src/mame/drivers/rallyx.cpp
@@ -191,11 +191,14 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "includes/rallyx.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/samples.h"
-#include "includes/rallyx.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/rampart.cpp b/src/mame/drivers/rampart.cpp
index c11fab13496..7857d2ea4d3 100644
--- a/src/mame/drivers/rampart.cpp
+++ b/src/mame/drivers/rampart.cpp
@@ -25,11 +25,13 @@
#include "emu.h"
+#include "includes/rampart.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
#include "sound/okim6295.h"
#include "sound/ym2413.h"
-#include "includes/rampart.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_14_31818MHz
diff --git a/src/mame/drivers/rastan.cpp b/src/mame/drivers/rastan.cpp
index 05dc3ec558f..cc565b9b069 100644
--- a/src/mame/drivers/rastan.cpp
+++ b/src/mame/drivers/rastan.cpp
@@ -154,14 +154,18 @@ Note: The 'rastsagaa' set's rom numbers were named as RSxx_37 through RSxx_42
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m68000/m68000.h"
-#include "machine/watchdog.h"
+#include "includes/rastan.h"
#include "includes/taitoipt.h"
#include "audio/taitosnd.h"
-#include "sound/ym2151.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
+#include "machine/watchdog.h"
#include "sound/msm5205.h"
-#include "includes/rastan.h"
+#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(rastan_state::rastan_bankswitch_w)
{
diff --git a/src/mame/drivers/rastersp.cpp b/src/mame/drivers/rastersp.cpp
index 9064893edd5..51e03a03249 100644
--- a/src/mame/drivers/rastersp.cpp
+++ b/src/mame/drivers/rastersp.cpp
@@ -24,6 +24,8 @@
#include "machine/nvram.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
*
diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp
index 818f99665f5..69873b3c8b5 100644
--- a/src/mame/drivers/ravens.cpp
+++ b/src/mame/drivers/ravens.cpp
@@ -70,13 +70,17 @@ ToDo:
****************************************************************************/
#include "emu.h"
+
#include "cpu/s2650/s2650.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
#include "machine/terminal.h"
#include "sound/wave.h"
+#include "speaker.h"
+
#include "ravens.lh"
+
#define TERMINAL_TAG "terminal"
class ravens_state : public driver_device
diff --git a/src/mame/drivers/rbisland.cpp b/src/mame/drivers/rbisland.cpp
index 2631795c844..8bef6c3c775 100644
--- a/src/mame/drivers/rbisland.cpp
+++ b/src/mame/drivers/rbisland.cpp
@@ -320,14 +320,16 @@ Stephh's notes (based on the game M68000 code and some tests) :
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m68000/m68000.h"
+#include "includes/rbisland.h"
#include "includes/taitoipt.h"
#include "audio/taitosnd.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/ym2151.h"
-#include "includes/rbisland.h"
-
+#include "screen.h"
+#include "speaker.h"
WRITE16_MEMBER(rbisland_state::jumping_sound_w)
diff --git a/src/mame/drivers/rbmk.cpp b/src/mame/drivers/rbmk.cpp
index 59f83c6889e..52b4c6214ab 100644
--- a/src/mame/drivers/rbmk.cpp
+++ b/src/mame/drivers/rbmk.cpp
@@ -52,11 +52,15 @@ Notes:
*/
#include "emu.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/mcs51/mcs51.h"
+#include "machine/eepromser.h"
#include "sound/okim6295.h"
#include "sound/ym2151.h"
-#include "machine/eepromser.h"
+
+#include "screen.h"
+#include "speaker.h"
class rbmk_state : public driver_device
diff --git a/src/mame/drivers/rc702.cpp b/src/mame/drivers/rc702.cpp
index d9091585e84..5b3e9d30859 100644
--- a/src/mame/drivers/rc702.cpp
+++ b/src/mame/drivers/rc702.cpp
@@ -19,19 +19,23 @@ Issues:
****************************************************************************************************************/
#include "emu.h"
+
+#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
-#include "machine/upd765.h"
#include "cpu/z80/z80daisy.h"
-#include "machine/z80pio.h"
-#include "machine/z80dart.h"
-#include "machine/z80ctc.h"
-#include "machine/am9517a.h"
#include "machine/7474.h"
-#include "bus/rs232/rs232.h"
+#include "machine/am9517a.h"
#include "machine/clock.h"
-#include "video/i8275.h"
#include "machine/keyboard.h"
+#include "machine/upd765.h"
+#include "machine/z80ctc.h"
+#include "machine/z80dart.h"
+#include "machine/z80pio.h"
#include "sound/beep.h"
+#include "video/i8275.h"
+
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/rc759.cpp b/src/mame/drivers/rc759.cpp
index 6c914262cec..6e0b2f11b1a 100644
--- a/src/mame/drivers/rc759.cpp
+++ b/src/mame/drivers/rc759.cpp
@@ -9,21 +9,26 @@
***************************************************************************/
#include "emu.h"
+
#include "cpu/i86/i186.h"
-#include "machine/ram.h"
-#include "machine/nvram.h"
+#include "imagedev/cassette.h"
+#include "machine/i8255.h"
+#include "machine/keyboard.h"
#include "machine/mm58167.h"
+#include "machine/nvram.h"
#include "machine/pic8259.h"
-#include "machine/i8255.h"
-#include "video/i82730.h"
-#include "sound/speaker.h"
+#include "machine/ram.h"
+#include "machine/wd_fdc.h"
#include "sound/sn76496.h"
-#include "machine/keyboard.h"
+#include "sound/spkrdev.h"
+#include "video/i82730.h"
+
#include "bus/centronics/ctronics.h"
-#include "machine/wd_fdc.h"
-#include "imagedev/cassette.h"
#include "bus/isbx/isbx.h"
+#include "screen.h"
+#include "speaker.h"
+
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/drivers/rcorsair.cpp b/src/mame/drivers/rcorsair.cpp
index acf53d6a4df..168d8d519c0 100644
--- a/src/mame/drivers/rcorsair.cpp
+++ b/src/mame/drivers/rcorsair.cpp
@@ -57,6 +57,7 @@ Notes added 2014-09-10:
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "screen.h"
class rcorsair_state : public driver_device
diff --git a/src/mame/drivers/rd100.cpp b/src/mame/drivers/rd100.cpp
index a2bfaeead02..6ac7b25cc99 100644
--- a/src/mame/drivers/rd100.cpp
+++ b/src/mame/drivers/rd100.cpp
@@ -13,6 +13,7 @@
#include "emu.h"
#include "cpu/m6809/m6809.h"
+#include "screen.h"
diff --git a/src/mame/drivers/rd110.cpp b/src/mame/drivers/rd110.cpp
index 65363abdaef..8a107b20811 100644
--- a/src/mame/drivers/rd110.cpp
+++ b/src/mame/drivers/rd110.cpp
@@ -18,10 +18,11 @@
*/
#include "emu.h"
-#include "machine/ram.h"
+#include "cpu/mcs96/i8x9x.h"
#include "machine/nvram.h"
+#include "machine/ram.h"
#include "video/msm6222b.h"
-#include "cpu/mcs96/i8x9x.h"
+#include "screen.h"
static INPUT_PORTS_START( d110 )
PORT_START("SC0")
diff --git a/src/mame/drivers/re900.cpp b/src/mame/drivers/re900.cpp
index 46812d9df5f..2f07d80a0b4 100644
--- a/src/mame/drivers/re900.cpp
+++ b/src/mame/drivers/re900.cpp
@@ -71,19 +71,23 @@
***********************************************************************************/
-
-#define MAIN_CLOCK XTAL_11_0592MHz
-#define VDP_CLOCK XTAL_10_730MHz
-#define TMS_CLOCK VDP_CLOCK / 24
-
#include "emu.h"
+
#include "cpu/mcs51/mcs51.h"
-#include "video/tms9928a.h"
-#include "sound/ay8910.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "video/tms9928a.h"
+
+#include "speaker.h"
+
#include "re900.lh"
+#define MAIN_CLOCK XTAL_11_0592MHz
+#define VDP_CLOCK XTAL_10_730MHz
+#define TMS_CLOCK VDP_CLOCK / 24
+
+
class re900_state : public driver_device
{
public:
diff --git a/src/mame/drivers/realbrk.cpp b/src/mame/drivers/realbrk.cpp
index 414c69389c4..594629c2840 100644
--- a/src/mame/drivers/realbrk.cpp
+++ b/src/mame/drivers/realbrk.cpp
@@ -44,10 +44,12 @@ To Do:
***************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "includes/realbrk.h"
+
+#include "cpu/m68000/m68000.h"
#include "sound/ym2413.h"
#include "sound/ymz280b.h"
+#include "speaker.h"
/* Read 4 ten bit dip switches */
diff --git a/src/mame/drivers/redclash.cpp b/src/mame/drivers/redclash.cpp
index 6cd3042d8be..b05ea64ee5e 100644
--- a/src/mame/drivers/redclash.cpp
+++ b/src/mame/drivers/redclash.cpp
@@ -23,9 +23,12 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "includes/redclash.h"
+
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
-#include "includes/redclash.h"
+#include "screen.h"
+#include "speaker.h"
/* Sound comm between CPU's */
diff --git a/src/mame/drivers/relief.cpp b/src/mame/drivers/relief.cpp
index 8b8a3dfd2a1..107cbc7aa6f 100644
--- a/src/mame/drivers/relief.cpp
+++ b/src/mame/drivers/relief.cpp
@@ -20,12 +20,14 @@
#include "emu.h"
+#include "includes/relief.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
#include "machine/atarigen.h"
#include "sound/okim6295.h"
#include "sound/ym2413.h"
-#include "includes/relief.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/renegade.cpp b/src/mame/drivers/renegade.cpp
index 0e918dfa31a..47a5871b089 100644
--- a/src/mame/drivers/renegade.cpp
+++ b/src/mame/drivers/renegade.cpp
@@ -103,10 +103,13 @@ $8000 - $ffff ROM
***************************************************************************/
#include "emu.h"
+#include "includes/renegade.h"
+
#include "cpu/m6502/m6502.h"
#include "cpu/m6809/m6809.h"
#include "sound/3526intf.h"
-#include "includes/renegade.h"
+#include "screen.h"
+#include "speaker.h"
/**************************************************************************/
diff --git a/src/mame/drivers/replicator.cpp b/src/mame/drivers/replicator.cpp
index 66c6ae1bad6..93faf5c73b7 100644
--- a/src/mame/drivers/replicator.cpp
+++ b/src/mame/drivers/replicator.cpp
@@ -25,11 +25,13 @@
// * implement avr8 WDR (watchdog reset) opcode
#include "emu.h"
-#include "rendlay.h"
#include "cpu/avr8/avr8.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "video/hd44780.h"
+#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK 16000000
#define LOG_PORTS 0
diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp
index eefdd9f1dfc..aec4c2d9d30 100644
--- a/src/mame/drivers/retofinv.cpp
+++ b/src/mame/drivers/retofinv.cpp
@@ -45,6 +45,8 @@ Notes:
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/sn76496.h"
+#include "screen.h"
+#include "speaker.h"
void retofinv_state::machine_start()
diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp
index 3de5b113e7d..893bb5860d9 100644
--- a/src/mame/drivers/rex6000.cpp
+++ b/src/mame/drivers/rex6000.cpp
@@ -37,6 +37,9 @@
#include "imagedev/snapquik.h"
#include "sound/beep.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MAKE_BANK(lo, hi) ((lo) | ((hi)<<8))
diff --git a/src/mame/drivers/rgum.cpp b/src/mame/drivers/rgum.cpp
index 145b5c64fc5..d5b64dce64f 100644
--- a/src/mame/drivers/rgum.cpp
+++ b/src/mame/drivers/rgum.cpp
@@ -14,11 +14,13 @@ The ppi at 3000-3003 seems to be a dual port communication thing with the z80.
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "cpu/m6502/m65c02.h"
-#include "video/mc6845.h"
+#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "sound/ay8910.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
class rgum_state : public driver_device
diff --git a/src/mame/drivers/risc2500.cpp b/src/mame/drivers/risc2500.cpp
index 3bc0a373b93..fde81bfd102 100644
--- a/src/mame/drivers/risc2500.cpp
+++ b/src/mame/drivers/risc2500.cpp
@@ -17,6 +17,8 @@
#include "machine/nvram.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
#include "risc2500.lh"
diff --git a/src/mame/drivers/riscpc.cpp b/src/mame/drivers/riscpc.cpp
index fa0d0771a90..8eba052f3c2 100644
--- a/src/mame/drivers/riscpc.cpp
+++ b/src/mame/drivers/riscpc.cpp
@@ -19,6 +19,8 @@
#include "emu.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
+#include "screen.h"
+#include "speaker.h"
class riscpc_state : public driver_device
diff --git a/src/mame/drivers/rltennis.cpp b/src/mame/drivers/rltennis.cpp
index 4eb15de6106..61e39626ef7 100644
--- a/src/mame/drivers/rltennis.cpp
+++ b/src/mame/drivers/rltennis.cpp
@@ -63,10 +63,14 @@ player - when there's nothing to play - first, empty 2k of ROMs are selected.
#include "emu.h"
#include "includes/rltennis.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
#include "sound/volt_reg.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
+
#define RLT_REFRESH_RATE 60
#define RLT_TIMER_FREQ (RLT_REFRESH_RATE*256)
diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp
index b5b7405b5f9..b9651de896c 100644
--- a/src/mame/drivers/rm380z.cpp
+++ b/src/mame/drivers/rm380z.cpp
@@ -168,6 +168,9 @@ Module timer tag static_vblank_timer name m_expire.seconds
#include "emu.h"
#include "includes/rm380z.h"
+#include "screen.h"
+
+
static ADDRESS_MAP_START(rm380z_mem, AS_PROGRAM, 8, rm380z_state)
AM_RANGE( 0xe000, 0xefff ) AM_ROM AM_REGION(RM380Z_MAINCPU_TAG, 0)
AM_RANGE( 0xf000, 0xf5ff ) AM_READWRITE(videoram_read,videoram_write)
diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp
index d55d122d7c5..d319bcfa1bc 100644
--- a/src/mame/drivers/rmhaihai.cpp
+++ b/src/mame/drivers/rmhaihai.cpp
@@ -34,6 +34,8 @@ TODO:
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/msm5205.h"
+#include "screen.h"
+#include "speaker.h"
class rmhaihai_state : public driver_device
diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp
index acad5d477d7..b0a50622cb0 100644
--- a/src/mame/drivers/rmnimbus.cpp
+++ b/src/mame/drivers/rmnimbus.cpp
@@ -11,16 +11,22 @@
#include "emu.h"
#include "includes/rmnimbus.h"
+#include "machine/rmnkbd.h"
+
#include "cpu/mcs51/mcs51.h"
#include "imagedev/flopdrv.h"
-#include "formats/pc_dsk.h"
-#include "bus/scsi/scsihd.h"
-#include "bus/scsi/s1410.h"
-#include "bus/scsi/acb4070.h"
+
#include "bus/isa/fdc.h"
#include "bus/rs232/rs232.h"
-#include "machine/rmnkbd.h"
+#include "bus/scsi/acb4070.h"
+#include "bus/scsi/s1410.h"
+#include "bus/scsi/scsihd.h"
+
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/pc_dsk.h"
+
static SLOT_INTERFACE_START(rmnimbus_floppies)
SLOT_INTERFACE( "35dd", FLOPPY_35_DD )
diff --git a/src/mame/drivers/rmt32.cpp b/src/mame/drivers/rmt32.cpp
index 192d4f32fa4..0be194f8d94 100644
--- a/src/mame/drivers/rmt32.cpp
+++ b/src/mame/drivers/rmt32.cpp
@@ -161,9 +161,10 @@ Notes: (All IC's listed for completeness)
*/
#include "emu.h"
+#include "cpu/mcs96/i8x9x.h"
#include "machine/ram.h"
#include "video/sed1200.h"
-#include "cpu/mcs96/i8x9x.h"
+#include "screen.h"
static INPUT_PORTS_START( mt32 )
PORT_START("SC0")
diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp
index 481a38c7942..1fc107b2c53 100644
--- a/src/mame/drivers/rockrage.cpp
+++ b/src/mame/drivers/rockrage.cpp
@@ -50,12 +50,15 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/rockrage.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/m6809/hd6309.h"
#include "machine/watchdog.h"
#include "sound/ym2151.h"
-#include "includes/rockrage.h"
-#include "includes/konamipt.h"
+#include "screen.h"
+#include "speaker.h"
INTERRUPT_GEN_MEMBER(rockrage_state::rockrage_interrupt)
diff --git a/src/mame/drivers/rocnrope.cpp b/src/mame/drivers/rocnrope.cpp
index 15fbc197f78..fc532094a31 100644
--- a/src/mame/drivers/rocnrope.cpp
+++ b/src/mame/drivers/rocnrope.cpp
@@ -9,13 +9,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/rocnrope.h"
+#include "includes/konamipt.h"
+#include "audio/timeplt.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/konami1.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
-#include "audio/timeplt.h"
-#include "includes/konamipt.h"
-#include "includes/rocnrope.h"
+#include "screen.h"
#define MASTER_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/rohga.cpp b/src/mame/drivers/rohga.cpp
index 3cb74af0a69..093f9218b14 100644
--- a/src/mame/drivers/rohga.cpp
+++ b/src/mame/drivers/rohga.cpp
@@ -108,13 +108,17 @@
***************************************************************************/
#include "emu.h"
+#include "includes/rohga.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "machine/decocrpt.h"
#include "machine/gen_latch.h"
-#include "includes/rohga.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
READ16_MEMBER(rohga_state::rohga_irq_ack_r)
{
diff --git a/src/mame/drivers/rollerg.cpp b/src/mame/drivers/rollerg.cpp
index b795c02089c..e8c9651e2b8 100644
--- a/src/mame/drivers/rollerg.cpp
+++ b/src/mame/drivers/rollerg.cpp
@@ -13,12 +13,17 @@
***************************************************************************/
#include "emu.h"
+#include "includes/rollerg.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/3812intf.h"
#include "sound/k053260.h"
-#include "includes/rollerg.h"
+
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(rollerg_state::rollerg_0010_w)
{
diff --git a/src/mame/drivers/rollrace.cpp b/src/mame/drivers/rollrace.cpp
index 91ef405f523..c91c490d6cd 100644
--- a/src/mame/drivers/rollrace.cpp
+++ b/src/mame/drivers/rollrace.cpp
@@ -10,10 +10,13 @@ Issues:
***************************************************************************/
#include "emu.h"
+#include "includes/rollrace.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
-#include "includes/rollrace.h"
+#include "screen.h"
+#include "speaker.h"
void rollrace_state::machine_start()
diff --git a/src/mame/drivers/rotaryf.cpp b/src/mame/drivers/rotaryf.cpp
index 8b3d83f1b7b..86bce2a785b 100644
--- a/src/mame/drivers/rotaryf.cpp
+++ b/src/mame/drivers/rotaryf.cpp
@@ -15,10 +15,15 @@ driver by Barry Rodewald
*/
#include "emu.h"
+
#include "cpu/i8085/i8085.h"
#include "sound/samples.h"
#include "sound/sn76477.h"
+#include "screen.h"
+#include "speaker.h"
+
+
class rotaryf_state : public driver_device
{
public:
@@ -28,7 +33,8 @@ public:
m_samples(*this, "samples"),
m_sn(*this, "snsnd"),
m_videoram(*this, "videoram")
- { }
+ {
+ }
required_device<cpu_device> m_maincpu;
required_device<samples_device> m_samples;
diff --git a/src/mame/drivers/roul.cpp b/src/mame/drivers/roul.cpp
index 3feedd95e9b..bb32d609302 100644
--- a/src/mame/drivers/roul.cpp
+++ b/src/mame/drivers/roul.cpp
@@ -65,9 +65,12 @@ Stephh's notes (based on the game Z80 code and some tests) :
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
+#include "machine/nvram.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "roul.lh"
-#include "machine/nvram.h"
class roul_state : public driver_device
diff --git a/src/mame/drivers/route16.cpp b/src/mame/drivers/route16.cpp
index a11149d963d..f0839becc48 100644
--- a/src/mame/drivers/route16.cpp
+++ b/src/mame/drivers/route16.cpp
@@ -71,14 +71,14 @@
#include "emu.h"
#include "includes/route16.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"
/*************************************
diff --git a/src/mame/drivers/rowamet.cpp b/src/mame/drivers/rowamet.cpp
index 8520da0c303..9de28405c7c 100644
--- a/src/mame/drivers/rowamet.cpp
+++ b/src/mame/drivers/rowamet.cpp
@@ -23,12 +23,16 @@ ToDO:
*************************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "machine/genpin.h"
+
+#include "cpu/z80/z80.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "rowamet.lh"
+
class rowamet_state : public driver_device
{
public:
diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp
index 1c229246af0..2bdead129b4 100644
--- a/src/mame/drivers/royalmah.cpp
+++ b/src/mame/drivers/royalmah.cpp
@@ -101,6 +101,8 @@ Stephh's notes (based on the games Z80 code and some tests) :
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
class royalmah_state : public driver_device
diff --git a/src/mame/drivers/rpunch.cpp b/src/mame/drivers/rpunch.cpp
index c709755b7cf..ace85ef6b83 100644
--- a/src/mame/drivers/rpunch.cpp
+++ b/src/mame/drivers/rpunch.cpp
@@ -107,11 +107,13 @@
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/rpunch.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/m6809/m6809.h"
+#include "cpu/z80/z80.h"
#include "sound/ym2151.h"
-#include "includes/rpunch.h"
+#include "speaker.h"
#define MASTER_CLOCK 16000000
diff --git a/src/mame/drivers/rt1715.cpp b/src/mame/drivers/rt1715.cpp
index f3c1ac92e6d..241f2d5648e 100644
--- a/src/mame/drivers/rt1715.cpp
+++ b/src/mame/drivers/rt1715.cpp
@@ -16,12 +16,13 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/ram.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
-#include "machine/z80pio.h"
#include "machine/z80dma.h"
-#include "machine/ram.h"
+#include "machine/z80pio.h"
#include "video/i8275.h"
+#include "screen.h"
class rt1715_state : public driver_device
diff --git a/src/mame/drivers/runaway.cpp b/src/mame/drivers/runaway.cpp
index 56169afc1cf..30080a0aabf 100644
--- a/src/mame/drivers/runaway.cpp
+++ b/src/mame/drivers/runaway.cpp
@@ -13,10 +13,12 @@
****************************************************************************/
#include "emu.h"
+#include "includes/runaway.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/atari_vg.h"
#include "sound/pokey.h"
-#include "includes/runaway.h"
+#include "speaker.h"
TIMER_CALLBACK_MEMBER(runaway_state::interrupt_callback)
diff --git a/src/mame/drivers/rungun.cpp b/src/mame/drivers/rungun.cpp
index 9be2143f413..3e98d7bdb21 100644
--- a/src/mame/drivers/rungun.cpp
+++ b/src/mame/drivers/rungun.cpp
@@ -36,14 +36,15 @@
*************************************************************************/
#include "emu.h"
-
+#include "includes/rungun.h"
+#include "includes/konamipt.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
#include "sound/k054539.h"
-#include "includes/konamipt.h"
-#include "includes/rungun.h"
+#include "speaker.h"
+
#include "rungun_dual.lh"
diff --git a/src/mame/drivers/rx78.cpp b/src/mame/drivers/rx78.cpp
index 7a94d61b1bc..10d428a1446 100644
--- a/src/mame/drivers/rx78.cpp
+++ b/src/mame/drivers/rx78.cpp
@@ -48,7 +48,9 @@
#include "machine/ram.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
class rx78_state : public driver_device
{
diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp
index e7b5091223c..5a0a2df0658 100644
--- a/src/mame/drivers/s11.cpp
+++ b/src/mame/drivers/s11.cpp
@@ -19,11 +19,15 @@ ToDo:
#include "emu.h"
#include "includes/s11.h"
+
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "s11.lh"
+
static ADDRESS_MAP_START( s11_main_map, AS_PROGRAM, 8, s11_state )
AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x2100, 0x2103) AM_DEVREADWRITE("pia21", pia6821_device, read, write) // sound+solenoids
diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp
index 05eab97c7c2..97c172ba119 100644
--- a/src/mame/drivers/s11a.cpp
+++ b/src/mame/drivers/s11a.cpp
@@ -22,11 +22,15 @@ Note: To start a game, certain switches need to be activated. You must first pr
#include "emu.h"
#include "includes/s11a.h"
+
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "s11a.lh"
+
static ADDRESS_MAP_START( s11a_main_map, AS_PROGRAM, 8, s11a_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x2100, 0x2103) AM_MIRROR(0x00fc) AM_DEVREADWRITE("pia21", pia6821_device, read, write) // sound+solenoids
diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp
index 05443b13153..9504203e5ea 100644
--- a/src/mame/drivers/s11b.cpp
+++ b/src/mame/drivers/s11b.cpp
@@ -22,11 +22,15 @@
#include "emu.h"
#include "includes/s11b.h"
+
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "s11b.lh"
+
static ADDRESS_MAP_START( s11b_main_map, AS_PROGRAM, 8, s11b_state )
AM_RANGE(0x0000, 0x0fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x2100, 0x2103) AM_MIRROR(0x00fc) AM_DEVREADWRITE("pia21", pia6821_device, read, write) // sound+solenoids
diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp
index 0e7f18e46a7..c18fb6f74a2 100644
--- a/src/mame/drivers/s11c.cpp
+++ b/src/mame/drivers/s11c.cpp
@@ -6,8 +6,11 @@
#include "emu.h"
#include "includes/s11c.h"
+
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
+#include "speaker.h"
+
#include "s11c.lh"
diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp
index 8fe0a73af6a..d64759c4239 100644
--- a/src/mame/drivers/s3.cpp
+++ b/src/mame/drivers/s3.cpp
@@ -38,13 +38,17 @@ ToDo:
************************************************************************************/
#include "emu.h"
+#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
-#include "machine/genpin.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "s3.lh"
+
class s3_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp
index 0ed0f6b95fa..41c30194278 100644
--- a/src/mame/drivers/s4.cpp
+++ b/src/mame/drivers/s4.cpp
@@ -32,11 +32,14 @@ ToDo:
************************************************************************************/
#include "emu.h"
+#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
-#include "machine/genpin.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "s4.lh"
diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp
index f52ee45639b..34ff6fa5924 100644
--- a/src/mame/drivers/s6.cpp
+++ b/src/mame/drivers/s6.cpp
@@ -47,12 +47,15 @@ ToDo:
************************************************************************************/
#include "emu.h"
+#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
-#include "machine/genpin.h"
#include "sound/dac.h"
#include "sound/hc55516.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "s6.lh"
diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp
index ee5581f4819..d1a6eaa0e4b 100644
--- a/src/mame/drivers/s6a.cpp
+++ b/src/mame/drivers/s6a.cpp
@@ -40,12 +40,15 @@ ToDo:
************************************************************************************/
#include "emu.h"
+#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
-#include "machine/genpin.h"
#include "sound/dac.h"
#include "sound/hc55516.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "s6a.lh"
diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp
index d1f59c3775b..dd38d479a5e 100644
--- a/src/mame/drivers/s7.cpp
+++ b/src/mame/drivers/s7.cpp
@@ -57,14 +57,18 @@ ToDo:
*****************************************************************************************/
#include "emu.h"
+#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
-#include "machine/genpin.h"
#include "sound/dac.h"
#include "sound/hc55516.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "s7.lh"
+
class s7_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp
index 34eb9afd9c5..afa9baa5c14 100644
--- a/src/mame/drivers/s8.cpp
+++ b/src/mame/drivers/s8.cpp
@@ -45,13 +45,17 @@ ToDo:
************************************************************************************/
#include "emu.h"
+#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
-#include "machine/genpin.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "s8.lh"
+
class s8_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp
index 9232ee5c4fa..2158f1a5fb2 100644
--- a/src/mame/drivers/s8a.cpp
+++ b/src/mame/drivers/s8a.cpp
@@ -21,13 +21,17 @@ ToDo:
************************************************************************************/
#include "emu.h"
+#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
-#include "machine/genpin.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "s8a.lh"
+
class s8a_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp
index a29202cd095..9ed3d272b49 100644
--- a/src/mame/drivers/s9.cpp
+++ b/src/mame/drivers/s9.cpp
@@ -35,9 +35,11 @@ ToDo:
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
#include "machine/genpin.h"
-#include "sound/hc55516.h"
#include "sound/dac.h"
+#include "sound/hc55516.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "s9.lh"
class s9_state : public genpin_class
diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp
index e5bde2e2117..31ac6dc22df 100644
--- a/src/mame/drivers/safarir.cpp
+++ b/src/mame/drivers/safarir.cpp
@@ -52,6 +52,8 @@ modified by Hau
#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "sound/samples.h"
+#include "screen.h"
+#include "speaker.h"
class safarir_state : public driver_device
{
diff --git a/src/mame/drivers/samcoupe.cpp b/src/mame/drivers/samcoupe.cpp
index d99fd035066..45e52df5119 100644
--- a/src/mame/drivers/samcoupe.cpp
+++ b/src/mame/drivers/samcoupe.cpp
@@ -28,15 +28,16 @@
/* core includes */
#include "emu.h"
#include "includes/samcoupe.h"
-#
-/* components */
+
#include "cpu/z80/z80.h"
#include "sound/saa1099.h"
-/* devices */
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
+
#include "formats/tzx_cas.h"
#include "formats/coupedsk.h"
-#include "softlist.h"
/***************************************************************************
CONSTANTS
diff --git a/src/mame/drivers/sandscrp.cpp b/src/mame/drivers/sandscrp.cpp
index 6ada148276e..6f93f857004 100644
--- a/src/mame/drivers/sandscrp.cpp
+++ b/src/mame/drivers/sandscrp.cpp
@@ -83,6 +83,8 @@ Is there another alt program rom set labeled 9 & 10?
#include "video/kan_pand.h"
#include "machine/kaneko_hit.h"
#include "video/kaneko_tmap.h"
+#include "screen.h"
+#include "speaker.h"
class sandscrp_state : public driver_device
diff --git a/src/mame/drivers/sangho.cpp b/src/mame/drivers/sangho.cpp
index 5acaf1e6400..effa5a5886e 100644
--- a/src/mame/drivers/sangho.cpp
+++ b/src/mame/drivers/sangho.cpp
@@ -49,6 +49,8 @@ TODO:
#include "cpu/z80/z80.h"
#include "video/v9938.h"
#include "sound/ym2413.h"
+#include "screen.h"
+#include "speaker.h"
class sangho_state : public driver_device
diff --git a/src/mame/drivers/sanremmg.cpp b/src/mame/drivers/sanremmg.cpp
index d16bbd61ca4..c2e18c7a287 100644
--- a/src/mame/drivers/sanremmg.cpp
+++ b/src/mame/drivers/sanremmg.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
+#include "screen.h"
class sanremmg_state : public driver_device
diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp
index ed4706e0571..87ac4241e53 100644
--- a/src/mame/drivers/sanremo.cpp
+++ b/src/mame/drivers/sanremo.cpp
@@ -90,6 +90,16 @@
*******************************************************************************/
+#include "emu.h"
+#include "cpu/z80/z80.h"
+#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
+#include "sanremo.lh"
+
#define MASTER_CLOCK XTAL_18MHz
@@ -97,13 +107,6 @@
#define SND_CLOCK MASTER_CLOCK/12
#define CRTC_CLOCK MASTER_CLOCK/12
-#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
-#include "sound/ay8910.h"
-#include "machine/nvram.h"
-#include "sanremo.lh"
-
class sanremo_state : public driver_device
{
diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp
index afda5083ffc..cca28a27b31 100644
--- a/src/mame/drivers/sapi1.cpp
+++ b/src/mame/drivers/sapi1.cpp
@@ -33,10 +33,11 @@ Unable to proceed due to no info available (& in English).
#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
-#include "machine/ram.h"
#include "machine/keyboard.h"
+#include "machine/ram.h"
#include "machine/terminal.h"
+#include "video/mc6845.h"
+#include "screen.h"
class sapi1_state : public driver_device
{
diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp
index 331b08d39c9..ead98088cfe 100644
--- a/src/mame/drivers/saturn.cpp
+++ b/src/mame/drivers/saturn.cpp
@@ -423,35 +423,41 @@ test1f diagnostic hacks:
****************************************************************************************************/
#include "emu.h"
+#include "includes/saturn.h"
+
#include "cpu/m68000/m68000.h"
-#include "machine/eepromser.h"
-#include "cpu/sh2/sh2.h"
#include "cpu/scudsp/scudsp.h"
-#include "sound/scsp.h"
-#include "sound/cdda.h"
-#include "machine/smpc.h"
-#include "machine/nvram.h"
-#include "includes/saturn.h"
+#include "cpu/sh2/sh2.h"
#include "imagedev/chd_cd.h"
-#include "coreutil.h"
+#include "machine/eepromser.h"
+#include "machine/nvram.h"
+#include "machine/smpc.h"
+#include "machine/stvcd.h"
+#include "sound/cdda.h"
+#include "sound/scsp.h"
#include "video/stvvdp1.h"
#include "video/stvvdp2.h"
-#include "machine/stvcd.h"
-#include "bus/saturn/sat_slot.h"
-#include "bus/saturn/rom.h"
-#include "bus/saturn/dram.h"
#include "bus/saturn/bram.h"
+#include "bus/saturn/dram.h"
+#include "bus/saturn/rom.h"
+#include "bus/saturn/sat_slot.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "coreutil.h"
+
class sat_console_state : public saturn_state
{
public:
sat_console_state(const machine_config &mconfig, device_type type, const char *tag)
- : saturn_state(mconfig, type, tag)
- , m_exp(*this, "exp")
- , m_nvram(*this, "nvram")
- , m_smpc_nv(*this, "smpc_nv")
+ : saturn_state(mconfig, type, tag)
+ , m_exp(*this, "exp")
+ , m_nvram(*this, "nvram")
+ , m_smpc_nv(*this, "smpc_nv")
{ }
DECLARE_INPUT_CHANGED_MEMBER(nmi_reset);
diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp
index 0a16a00dcf9..68afb235f4c 100644
--- a/src/mame/drivers/sauro.cpp
+++ b/src/mame/drivers/sauro.cpp
@@ -123,11 +123,14 @@ Stephh's notes (based on the games Z80 code and some tests) :
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "sound/3812intf.h"
#include "includes/sauro.h"
+
+#include "cpu/z80/z80.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "sound/3812intf.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(sauro_state::sauro_sound_command_w)
diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp
index 2f4a7ddca20..85f5f011270 100644
--- a/src/mame/drivers/sbasketb.cpp
+++ b/src/mame/drivers/sbasketb.cpp
@@ -44,6 +44,7 @@ CPU/Video Board Parts:
#include "includes/sbasketb.h"
#include "includes/konamipt.h"
#include "audio/trackfld.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
@@ -51,6 +52,9 @@ CPU/Video Board Parts:
#include "machine/watchdog.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(sbasketb_state::sbasketb_sh_irqtrigger_w)
{
diff --git a/src/mame/drivers/sbc6510.cpp b/src/mame/drivers/sbc6510.cpp
index 725c0aa0ac6..0d2db6317fa 100644
--- a/src/mame/drivers/sbc6510.cpp
+++ b/src/mame/drivers/sbc6510.cpp
@@ -51,11 +51,12 @@ ToDo:
****************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m6510.h"
#include "cpu/avr8/avr8.h"
+#include "cpu/m6502/m6510.h"
#include "machine/mos6526.h"
-#include "sound/ay8910.h"
#include "machine/terminal.h"
+#include "sound/ay8910.h"
+#include "speaker.h"
#define TERMINAL_TAG "terminal"
diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp
index 2d0ad09d251..d0c75f64b7a 100644
--- a/src/mame/drivers/sbowling.cpp
+++ b/src/mame/drivers/sbowling.cpp
@@ -43,8 +43,10 @@ PROMs : NEC B406 (1kx4) x2
#include "cpu/i8085/i8085.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/watchdog.h"
-#include "video/resnet.h"
#include "sound/ay8910.h"
+#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
class sbowling_state : public driver_device
diff --git a/src/mame/drivers/sbrain.cpp b/src/mame/drivers/sbrain.cpp
index aaf052af8ac..575d01ebcf6 100644
--- a/src/mame/drivers/sbrain.cpp
+++ b/src/mame/drivers/sbrain.cpp
@@ -38,11 +38,14 @@ To Do:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "machine/wd_fdc.h"
+#include "machine/com8116.h"
#include "machine/i8251.h"
#include "machine/i8255.h"
-#include "machine/com8116.h"
+#include "machine/wd_fdc.h"
#include "sound/beep.h"
+#include "screen.h"
+#include "speaker.h"
+
class sbrain_state : public driver_device
{
diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp
index 839200e4f14..03027619d66 100644
--- a/src/mame/drivers/sbrkout.cpp
+++ b/src/mame/drivers/sbrkout.cpp
@@ -39,6 +39,8 @@
#include "machine/watchdog.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
#include "sbrkout.lh"
class sbrkout_state : public driver_device
diff --git a/src/mame/drivers/sbugger.cpp b/src/mame/drivers/sbugger.cpp
index 21c5f6747b0..1e0a91f9832 100644
--- a/src/mame/drivers/sbugger.cpp
+++ b/src/mame/drivers/sbugger.cpp
@@ -100,10 +100,13 @@ Sound PCB
*/
#include "emu.h"
+#include "includes/sbugger.h"
+
#include "cpu/i8085/i8085.h"
#include "machine/i8155.h"
#include "sound/sn76496.h"
-#include "includes/sbugger.h"
+#include "screen.h"
+#include "speaker.h"
/* memory maps */
diff --git a/src/mame/drivers/sc1.cpp b/src/mame/drivers/sc1.cpp
index 66db53c118d..d2cb8ee3b8f 100644
--- a/src/mame/drivers/sc1.cpp
+++ b/src/mame/drivers/sc1.cpp
@@ -38,8 +38,10 @@ Port 82 in - upper byte = 0 thru 7
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/speaker.h"
#include "machine/z80pio.h"
+#include "sound/spkrdev.h"
+#include "speaker.h"
+
#include "sc1.lh"
@@ -47,9 +49,9 @@ class sc1_state : public driver_device
{
public:
sc1_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_speaker(*this, "speaker")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_speaker(*this, "speaker")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/sc2.cpp b/src/mame/drivers/sc2.cpp
index c91c070f141..fcf348ae093 100644
--- a/src/mame/drivers/sc2.cpp
+++ b/src/mame/drivers/sc2.cpp
@@ -13,8 +13,10 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "machine/z80pio.h"
#include "sound/beep.h"
+#include "machine/z80pio.h"
+#include "speaker.h"
+
#include "sc2.lh"
class sc2_state : public driver_device
diff --git a/src/mame/drivers/scobra.cpp b/src/mame/drivers/scobra.cpp
index b3b23842dea..00893cc6174 100644
--- a/src/mame/drivers/scobra.cpp
+++ b/src/mame/drivers/scobra.cpp
@@ -36,11 +36,13 @@ Notes/Tidbits:
***************************************************************************/
#include "emu.h"
+#include "includes/scramble.h"
+
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "includes/scramble.h"
+#include "speaker.h"
class scobra_state : public scramble_state
diff --git a/src/mame/drivers/scorpion.cpp b/src/mame/drivers/scorpion.cpp
index 80b8dca50de..1f2b7596edb 100644
--- a/src/mame/drivers/scorpion.cpp
+++ b/src/mame/drivers/scorpion.cpp
@@ -4,14 +4,11 @@
#include "emu.h"
#include "includes/spectrum.h"
#include "includes/spec128.h"
-#include "imagedev/snapquik.h"
-#include "imagedev/cassette.h"
+
+#include "machine/beta.h"
#include "sound/ay8910.h"
-#include "sound/speaker.h"
+
#include "formats/tzx_cas.h"
-#include "machine/beta.h"
-#include "machine/ram.h"
-#include "machine/spec_snqk.h"
class scorpion_state : public spectrum_state
diff --git a/src/mame/drivers/scotrsht.cpp b/src/mame/drivers/scotrsht.cpp
index b28e0888e2d..723bad4544f 100644
--- a/src/mame/drivers/scotrsht.cpp
+++ b/src/mame/drivers/scotrsht.cpp
@@ -35,12 +35,16 @@ Stephh's notes (based on the game M6502 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/scotrsht.h"
+#include "includes/konamipt.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
-#include "includes/konamipt.h"
-#include "includes/scotrsht.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(scotrsht_state::ctrl_w)
{
diff --git a/src/mame/drivers/scramble.cpp b/src/mame/drivers/scramble.cpp
index 37da3330846..6dfe59d3b00 100644
--- a/src/mame/drivers/scramble.cpp
+++ b/src/mame/drivers/scramble.cpp
@@ -29,14 +29,15 @@ Notes:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/scramble.h"
+
#include "cpu/s2650/s2650.h"
-#include "sound/ay8910.h"
-#include "machine/i8255.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
+#include "machine/i8255.h"
#include "machine/watchdog.h"
-#include "includes/scramble.h"
-
+#include "sound/ay8910.h"
+#include "speaker.h"
static ADDRESS_MAP_START( scramble_map, AS_PROGRAM, 8, scramble_state )
diff --git a/src/mame/drivers/scregg.cpp b/src/mame/drivers/scregg.cpp
index b151ee3cfc0..1070b75929e 100644
--- a/src/mame/drivers/scregg.cpp
+++ b/src/mame/drivers/scregg.cpp
@@ -52,9 +52,12 @@ it as ASCII text.
***************************************************************************/
#include "emu.h"
+#include "includes/btime.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
-#include "includes/btime.h"
+#include "speaker.h"
+
class scregg_state : public btime_state
{
diff --git a/src/mame/drivers/scv.cpp b/src/mame/drivers/scv.cpp
index 59c1dbca9f1..821dac8425c 100644
--- a/src/mame/drivers/scv.cpp
+++ b/src/mame/drivers/scv.cpp
@@ -11,7 +11,9 @@
#include "sound/upd1771.h"
#include "bus/scv/slot.h"
#include "bus/scv/rom.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
class scv_state : public driver_device
diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp
index 5e5e03d850a..41cc2729c94 100644
--- a/src/mame/drivers/sderby.cpp
+++ b/src/mame/drivers/sderby.cpp
@@ -61,14 +61,18 @@
*******************************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
-#include "sound/okim6295.h"
#include "includes/sderby.h"
+
+#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+#include "pmroulet.lh"
#include "sderby.lh"
#include "spacewin.lh"
-#include "pmroulet.lh"
+
/***************************
* R/W Handlers *
diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp
index 808c736c53f..914a8ba7c0e 100644
--- a/src/mame/drivers/seabattl.cpp
+++ b/src/mame/drivers/seabattl.cpp
@@ -35,6 +35,9 @@ the sound board should be fully discrete.
#include "cpu/s2650/s2650.h"
#include "machine/s2636.h"
#include "video/dm9368.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "seabattl.lh"
diff --git a/src/mame/drivers/sealy.cpp b/src/mame/drivers/sealy.cpp
index 85bd14c25af..59def9aee7f 100644
--- a/src/mame/drivers/sealy.cpp
+++ b/src/mame/drivers/sealy.cpp
@@ -27,12 +27,14 @@ Notes:
***************************************************************************/
-// 13.0 MHz? PCB is labeled with 13.5M
-#define MAIN_CLOCK 13000000
-
#include "emu.h"
#include "cpu/h8/h83048.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
+// 13.0 MHz? PCB is labeled with 13.5M
+#define MAIN_CLOCK 13000000
class sealy_state : public driver_device
{
diff --git a/src/mame/drivers/seattle.cpp b/src/mame/drivers/seattle.cpp
index e4ca5c22a37..4b9699a6694 100644
--- a/src/mame/drivers/seattle.cpp
+++ b/src/mame/drivers/seattle.cpp
@@ -185,15 +185,19 @@
**************************************************************************/
#include "emu.h"
+#include "audio/cage.h"
+#include "audio/dcs.h"
+
#include "cpu/adsp2100/adsp2100.h"
#include "cpu/mips/mips3.h"
-#include "audio/dcs.h"
-#include "audio/cage.h"
#include "machine/idectrl.h"
#include "machine/midwayic.h"
+#include "machine/nvram.h"
#include "machine/smc91c9x.h"
#include "video/voodoo.h"
-#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "calspeed.lh"
#include "vaportrx.lh"
#include "hyprdriv.lh"
diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp
index b09da29d778..2154839f6d2 100644
--- a/src/mame/drivers/segac2.cpp
+++ b/src/mame/drivers/segac2.cpp
@@ -74,6 +74,9 @@
#include "emu.h"
+#include "includes/megadriv.h"
+#include "includes/segaipt.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
#include "machine/315_5296.h"
@@ -81,9 +84,7 @@
#include "sound/sn76496.h"
#include "sound/2612intf.h"
#include "sound/upd7759.h"
-#include "includes/segaipt.h"
-
-#include "includes/megadriv.h"
+#include "speaker.h"
#define XL1_CLOCK XTAL_640kHz
diff --git a/src/mame/drivers/segae.cpp b/src/mame/drivers/segae.cpp
index b8770aaf79b..e9fc82cf5e1 100644
--- a/src/mame/drivers/segae.cpp
+++ b/src/mame/drivers/segae.cpp
@@ -293,12 +293,14 @@ GND 8A 8B GND
#include "emu.h"
+#include "includes/segaipt.h"
+
#include "cpu/z80/z80.h"
-#include "sound/sn76496.h"
#include "machine/mc8123.h"
#include "machine/segacrp2_device.h"
+#include "sound/sn76496.h"
#include "video/315_5124.h"
-#include "includes/segaipt.h"
+#include "speaker.h"
class systeme_state : public driver_device
diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp
index d374bc6d561..e964523a73a 100644
--- a/src/mame/drivers/segag80r.cpp
+++ b/src/mame/drivers/segag80r.cpp
@@ -107,13 +107,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/segag80r.h"
+#include "machine/segag80.h"
+
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "sound/samples.h"
#include "machine/i8255.h"
#include "machine/segacrpt_device.h"
-#include "machine/segag80.h"
-#include "includes/segag80r.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/segag80v.cpp b/src/mame/drivers/segag80v.cpp
index d666177c92d..7cf4919bd57 100644
--- a/src/mame/drivers/segag80v.cpp
+++ b/src/mame/drivers/segag80v.cpp
@@ -135,11 +135,13 @@
***************************************************************************/
#include "emu.h"
+#include "includes/segag80v.h"
+#include "machine/segag80.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/samples.h"
-#include "machine/segag80.h"
-#include "includes/segag80v.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp
index 0ef5a5d2ae2..13e3a4ea4ea 100644
--- a/src/mame/drivers/segahang.cpp
+++ b/src/mame/drivers/segahang.cpp
@@ -17,12 +17,14 @@
#include "emu.h"
#include "includes/segahang.h"
+#include "includes/segaipt.h"
+
#include "machine/fd1089.h"
#include "machine/fd1094.h"
#include "sound/2203intf.h"
#include "sound/ym2151.h"
#include "sound/segapcm.h"
-#include "includes/segaipt.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp
index 5be8ec1a10d..ae6ba2372e1 100644
--- a/src/mame/drivers/segajw.cpp
+++ b/src/mame/drivers/segajw.cpp
@@ -35,6 +35,8 @@ Also seem to be running on the same/similar hardware:
#include "sound/2612intf.h"
#include "video/hd63484.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
#include "segajw.lh"
diff --git a/src/mame/drivers/segald.cpp b/src/mame/drivers/segald.cpp
index baccda5a7e4..8a950115fda 100644
--- a/src/mame/drivers/segald.cpp
+++ b/src/mame/drivers/segald.cpp
@@ -22,6 +22,7 @@ Todo:
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/ldv1000.h"
+#include "speaker.h"
#define SCHEMATIC_CLOCK (20000000)
diff --git a/src/mame/drivers/segam1.cpp b/src/mame/drivers/segam1.cpp
index 2b492439475..2f5cd4c3729 100644
--- a/src/mame/drivers/segam1.cpp
+++ b/src/mame/drivers/segam1.cpp
@@ -34,6 +34,8 @@ uses s24 style tilemaps (ram based?)
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "screen.h"
+#include "speaker.h"
@@ -41,9 +43,9 @@ class segam1_state : public driver_device
{
public:
segam1_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu")
- { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ { }
virtual void video_start() override;
uint32_t screen_update_segam1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/drivers/segaorun.cpp b/src/mame/drivers/segaorun.cpp
index 16c68004b0b..ec48b1d206c 100644
--- a/src/mame/drivers/segaorun.cpp
+++ b/src/mame/drivers/segaorun.cpp
@@ -273,10 +273,12 @@ Notes:
#include "emu.h"
#include "includes/segaorun.h"
+#include "includes/segaipt.h"
+
#include "machine/fd1089.h"
#include "sound/ym2151.h"
#include "sound/segapcm.h"
-#include "includes/segaipt.h"
+#include "speaker.h"
#include "outrun.lh"
diff --git a/src/mame/drivers/segapm.cpp b/src/mame/drivers/segapm.cpp
index 5ccbe62838e..1f70e62bda1 100644
--- a/src/mame/drivers/segapm.cpp
+++ b/src/mame/drivers/segapm.cpp
@@ -9,6 +9,7 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
+#include "screen.h"
class segapm_state : public driver_device
diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp
index 6c72db14c1d..1e1de35534b 100644
--- a/src/mame/drivers/segas16a.cpp
+++ b/src/mame/drivers/segas16a.cpp
@@ -149,11 +149,14 @@ Tetris - - - - EPR12169 EPR12170 -
#include "emu.h"
#include "includes/segas16a.h"
#include "includes/segaipt.h"
+
#include "machine/fd1089.h"
#include "machine/nvram.h"
#include "machine/segacrp2_device.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
//**************************************************************************
// PPI READ/WRITE CALLBACKS
diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp
index cfd0d6c79b9..5ce8c3737cc 100644
--- a/src/mame/drivers/segas16b.cpp
+++ b/src/mame/drivers/segas16b.cpp
@@ -870,9 +870,12 @@ S11 S13 S15 S17 |EPR12194 - - - EPR12195 - -
#include "emu.h"
#include "includes/segas16b.h"
-#include "machine/mc8123.h"
#include "includes/segaipt.h"
+
+#include "machine/mc8123.h"
#include "sound/okim6295.h"
+#include "speaker.h"
+
//**************************************************************************
// CONSTANTS
diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp
index 067311bd557..c44c31e66cf 100644
--- a/src/mame/drivers/segas18.cpp
+++ b/src/mame/drivers/segas18.cpp
@@ -32,11 +32,13 @@
***************************************************************************/
#include "emu.h"
-#include "machine/nvram.h"
#include "includes/segas18.h"
+#include "includes/segaipt.h"
+
+#include "machine/nvram.h"
#include "sound/2612intf.h"
#include "sound/rf5c68.h"
-#include "includes/segaipt.h"
+#include "speaker.h"
/*************************************
*
diff --git a/src/mame/drivers/segas24.cpp b/src/mame/drivers/segas24.cpp
index 75e27d04679..47939a14c2a 100644
--- a/src/mame/drivers/segas24.cpp
+++ b/src/mame/drivers/segas24.cpp
@@ -338,12 +338,15 @@ Notes:
#include "emu.h"
#include "includes/segas24.h"
#include "includes/segaipt.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/fd1094.h"
#include "machine/nvram.h"
#include "sound/volt_reg.h"
#include "sound/ym2151.h"
#include "video/segaic24.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_20MHz
#define VIDEO_CLOCK XTAL_32MHz
diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp
index d890f22ad09..30786ef711b 100644
--- a/src/mame/drivers/segas32.cpp
+++ b/src/mame/drivers/segas32.cpp
@@ -524,18 +524,22 @@ orunners: Interleaved with the dj and << >> buttons is the data the drives the
****************************************************************************/
#include "emu.h"
+#include "includes/segas32.h"
+
#include "cpu/z80/z80.h"
#include "cpu/v60/v60.h"
#include "cpu/nec/v25.h"
-#include "rendlay.h"
-#include "includes/segas32.h"
#include "machine/eepromser.h"
#include "sound/2612intf.h"
#include "sound/rf5c68.h"
+#include "rendlay.h"
+#include "speaker.h"
+
#include "radr.lh"
-const device_type SEGA_S32_PCB = &device_creator<segas32_state>;
+
+const device_type SEGA_S32_PCB = device_creator<segas32_state>;
segas32_state::segas32_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SEGA_S32_PCB, "Sega System 32 PCB", tag, owner, clock, "segas32_pcb", __FILE__),
@@ -2512,7 +2516,7 @@ static MACHINE_CONFIG_FRAGMENT( system32 )
MCFG_S32COMM_ADD("s32comm")
MACHINE_CONFIG_END
-const device_type SEGA_S32_REGULAR_DEVICE = &device_creator<segas32_regular_state>;
+const device_type SEGA_S32_REGULAR_DEVICE = device_creator<segas32_regular_state>;
segas32_regular_state::segas32_regular_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: segas32_state(mconfig, tag, owner, clock)
@@ -2536,7 +2540,7 @@ static MACHINE_CONFIG_FRAGMENT( system32_v25 )
MCFG_V25_CONFIG(ga2_v25_opcode_table)
MACHINE_CONFIG_END
-const device_type SEGA_S32_V25_DEVICE = &device_creator<segas32_v25_state>;
+const device_type SEGA_S32_V25_DEVICE = device_creator<segas32_v25_state>;
segas32_v25_state::segas32_v25_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: segas32_state(mconfig, tag, owner, clock)
@@ -2599,7 +2603,7 @@ static MACHINE_CONFIG_FRAGMENT( multi32 )
MACHINE_CONFIG_END
-const device_type SEGA_MULTI32_DEVICE = &device_creator<sega_multi32_state>;
+const device_type SEGA_MULTI32_DEVICE = device_creator<sega_multi32_state>;
sega_multi32_state::sega_multi32_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: segas32_state(mconfig, tag, owner, clock)
diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp
index 08ac876661e..66479d9bd54 100644
--- a/src/mame/drivers/segaufo.cpp
+++ b/src/mame/drivers/segaufo.cpp
@@ -47,6 +47,7 @@
#include "machine/315_5296.h"
#include "sound/2612intf.h"
#include "sound/upd7759.h"
+#include "speaker.h"
// the layouts are very similar to eachother
#include "newufo.lh"
diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp
index c33521f6361..986cbb1a5ee 100644
--- a/src/mame/drivers/segaxbd.cpp
+++ b/src/mame/drivers/segaxbd.cpp
@@ -262,12 +262,15 @@ ROMs:
#include "emu.h"
#include "includes/segaxbd.h"
+#include "includes/segaipt.h"
+
#include "machine/nvram.h"
#include "sound/ym2151.h"
#include "sound/segapcm.h"
-#include "includes/segaipt.h"
+#include "speaker.h"
+
-const device_type SEGA_XBD_PCB = &device_creator<segaxbd_state>;
+const device_type SEGA_XBD_PCB = device_creator<segaxbd_state>;
segaxbd_state::segaxbd_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, SEGA_XBD_PCB, "Sega X-Board PCB", tag, owner, clock, "segaxbd_pcb", __FILE__),
@@ -1866,7 +1869,7 @@ static MACHINE_CONFIG_FRAGMENT( xboard )
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_REGULAR_DEVICE = &device_creator<segaxbd_regular_state>;
+const device_type SEGA_XBD_REGULAR_DEVICE = device_creator<segaxbd_regular_state>;
segaxbd_regular_state::segaxbd_regular_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: segaxbd_state(mconfig, tag, owner, clock)
@@ -1892,7 +1895,7 @@ static MACHINE_CONFIG_FRAGMENT( xboard_fd1094 )
MCFG_CPU_DECRYPTED_OPCODES_MAP(decrypted_opcodes_map)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_FD1094_DEVICE = &device_creator<segaxbd_fd1094_state>;
+const device_type SEGA_XBD_FD1094_DEVICE = device_creator<segaxbd_fd1094_state>;
segaxbd_fd1094_state::segaxbd_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: segaxbd_state(mconfig, tag, owner, clock)
@@ -1934,7 +1937,7 @@ static MACHINE_CONFIG_FRAGMENT( lastsurv_fd1094 )
MCFG_SOUND_ROUTE(1, "lspeaker", 0.43)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_LASTSURV_FD1094_DEVICE = &device_creator<segaxbd_lastsurv_fd1094_state>;
+const device_type SEGA_XBD_LASTSURV_FD1094_DEVICE = device_creator<segaxbd_lastsurv_fd1094_state>;
segaxbd_lastsurv_fd1094_state::segaxbd_lastsurv_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: segaxbd_state(mconfig, tag, owner, clock)
@@ -1964,7 +1967,7 @@ static MACHINE_CONFIG_FRAGMENT( lastsurv )
MCFG_SOUND_ROUTE(1, "lspeaker", 0.43)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_LASTSURV_DEVICE = &device_creator<segaxbd_lastsurv_state>;
+const device_type SEGA_XBD_LASTSURV_DEVICE = device_creator<segaxbd_lastsurv_state>;
segaxbd_lastsurv_state::segaxbd_lastsurv_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: segaxbd_state(mconfig, tag, owner, clock)
@@ -2007,7 +2010,7 @@ static MACHINE_CONFIG_FRAGMENT( smgp_fd1094 )
MCFG_SOUND_ROUTE(1, "rearright", 1.0)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_SMGP_FD1094_DEVICE = &device_creator<segaxbd_smgp_fd1094_state>;
+const device_type SEGA_XBD_SMGP_FD1094_DEVICE = device_creator<segaxbd_smgp_fd1094_state>;
segaxbd_smgp_fd1094_state::segaxbd_smgp_fd1094_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: segaxbd_state(mconfig, tag, owner, clock)
@@ -2050,7 +2053,7 @@ static MACHINE_CONFIG_FRAGMENT( smgp )
MCFG_SOUND_ROUTE(1, "rearright", 1.0)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_SMGP_DEVICE = &device_creator<segaxbd_smgp_state>;
+const device_type SEGA_XBD_SMGP_DEVICE = device_creator<segaxbd_smgp_state>;
segaxbd_smgp_state::segaxbd_smgp_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: segaxbd_state(mconfig, tag, owner, clock)
@@ -2076,7 +2079,7 @@ static MACHINE_CONFIG_FRAGMENT( rascot )
MCFG_CPU_IO_MAP(rascot_z80_portmap)
MACHINE_CONFIG_END
-const device_type SEGA_XBD_RASCOT_DEVICE = &device_creator<segaxbd_rascot_state>;
+const device_type SEGA_XBD_RASCOT_DEVICE = device_creator<segaxbd_rascot_state>;
segaxbd_rascot_state::segaxbd_rascot_state(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: segaxbd_state(mconfig, tag, owner, clock)
diff --git a/src/mame/drivers/segaybd.cpp b/src/mame/drivers/segaybd.cpp
index e456ba3d3a7..235ca02a91b 100644
--- a/src/mame/drivers/segaybd.cpp
+++ b/src/mame/drivers/segaybd.cpp
@@ -58,11 +58,13 @@ MB89372 - Uses 3 serial data transfer protocols: ASYNC, COP & BOP. Has a built
#include "emu.h"
#include "includes/segaybd.h"
+#include "includes/segaipt.h"
+
#include "machine/mb8421.h"
#include "machine/nvram.h"
-#include "sound/ym2151.h"
#include "sound/segapcm.h"
-#include "includes/segaipt.h"
+#include "sound/ym2151.h"
+#include "speaker.h"
#include "pdrift.lh"
diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp
index 38d2c6c6135..bbc030efa1a 100644
--- a/src/mame/drivers/seibuspi.cpp
+++ b/src/mame/drivers/seibuspi.cpp
@@ -846,18 +846,23 @@ Notes:
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/seibuspi.h"
+
#include "cpu/i386/i386.h"
+#include "cpu/z80/z80.h"
+#include "machine/7200fifo.h"
#include "machine/ds2404.h"
#include "machine/eepromser.h"
#include "machine/intelfsh.h"
-#include "machine/7200fifo.h"
+#include "machine/seibuspi.h"
#include "sound/okim6295.h"
#include "sound/ymf271.h"
#include "sound/ymz280b.h"
-#include "machine/seibuspi.h"
#include "video/seibu_crtc.h"
-#include "includes/seibuspi.h"
+
+#include "screen.h"
+#include "speaker.h"
+
// default values written to CRTC (note: SYS386F does not have this chip)
#define PIXEL_CLOCK (XTAL_28_63636MHz/4)
diff --git a/src/mame/drivers/seicross.cpp b/src/mame/drivers/seicross.cpp
index e29c2260692..d0d3b8bea78 100644
--- a/src/mame/drivers/seicross.cpp
+++ b/src/mame/drivers/seicross.cpp
@@ -46,11 +46,15 @@ This info came from http://www.ne.jp/asahi/cc-sakura/akkun/old/fryski.html
#include "emu.h"
#include "includes/seicross.h"
+
#include "cpu/m6800/m6800.h"
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
void seicross_state::nvram_init(nvram_device &nvram, void *data, size_t size)
{
diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp
index 8662811ba53..f68cfbb815e 100644
--- a/src/mame/drivers/seicupbl.cpp
+++ b/src/mame/drivers/seicupbl.cpp
@@ -15,11 +15,14 @@
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
+#include "machine/gen_latch.h"
#include "machine/seicop.h"
#include "sound/okim6295.h"
-#include "machine/gen_latch.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MAIN_CLOCK XTAL_8MHz
diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp
index 1926b208b9a..8f5b522356f 100644
--- a/src/mame/drivers/sengokmj.cpp
+++ b/src/mame/drivers/sengokmj.cpp
@@ -54,12 +54,15 @@ RSSENGO2.72 chr.
*******************************************************************************************/
#include "emu.h"
-#include "cpu/nec/nec.h"
#include "audio/seibu.h"
+
+#include "cpu/nec/nec.h"
+#include "machine/nvram.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
#include "video/seibu_crtc.h"
-#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
class sengokmj_state : public driver_device
diff --git a/src/mame/drivers/senjyo.cpp b/src/mame/drivers/senjyo.cpp
index e0d5af33981..5390c5c9676 100644
--- a/src/mame/drivers/senjyo.cpp
+++ b/src/mame/drivers/senjyo.cpp
@@ -79,10 +79,14 @@ I/O read/write
#include "emu.h"
#include "includes/senjyo.h"
+
#include "cpu/z80/z80.h"
#include "machine/segacrpt_device.h"
#include "sound/sn76496.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
void senjyo_state::machine_start()
{
diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp
index f292518cda7..22ef3e0da83 100644
--- a/src/mame/drivers/seta.cpp
+++ b/src/mame/drivers/seta.cpp
@@ -1360,21 +1360,26 @@ Note: on screen copyright is (c)1998 Coinmaster.
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m68000/m68000.h"
-#include "cpu/m6502/m65c02.h"
#include "includes/seta.h"
+
+#include "cpu/m6502/m65c02.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/6821pia.h"
#include "machine/6850acia.h"
#include "machine/msm6242.h"
+#include "machine/nvram.h"
#include "machine/pit8253.h"
+#include "machine/watchdog.h"
#include "sound/2203intf.h"
#include "sound/2612intf.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
#include "sound/ym2151.h"
-#include "machine/nvram.h"
-#include "machine/watchdog.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#if __uPD71054_TIMER
// this mess should be replaced with pit8254, see madshark
diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp
index a35bcc51ff6..d960d447f06 100644
--- a/src/mame/drivers/seta2.cpp
+++ b/src/mame/drivers/seta2.cpp
@@ -109,12 +109,15 @@ reelquak:
#include "emu.h"
#include "includes/seta2.h"
-#include "cpu/m68000/m68000.h"
+
#include "cpu/h8/h83006.h"
+#include "cpu/m68000/m68000.h"
+#include "machine/mcf5206e.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
#include "machine/watchdog.h"
-#include "machine/mcf5206e.h"
+#include "speaker.h"
+
/***************************************************************************
@@ -651,7 +654,7 @@ private:
uint8_t m_serial[4];
};
-const device_type FUNCUBE_TOUCHSCREEN = &device_creator<funcube_touchscreen_device>;
+const device_type FUNCUBE_TOUCHSCREEN = device_creator<funcube_touchscreen_device>;
static INPUT_PORTS_START( funcube_touchscreen )
PORT_START("touch_btn")
diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp
index 3efa952ebd6..a97deabca80 100644
--- a/src/mame/drivers/sf.cpp
+++ b/src/mame/drivers/sf.cpp
@@ -12,10 +12,13 @@
***************************************************************************/
#include "emu.h"
+#include "includes/sf.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/ym2151.h"
-#include "includes/sf.h"
+#include "screen.h"
+#include "speaker.h"
/* The protection of the Japanese (and alt US) version */
diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp
index 426126dcb84..bd9ee52f5dc 100644
--- a/src/mame/drivers/sfbonus.cpp
+++ b/src/mame/drivers/sfbonus.cpp
@@ -274,11 +274,14 @@ MH86171 Color Palette RAMDAC
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/nvram.h"
#include "sound/okim6295.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
#include "pirpok2.lh"
-#include "machine/nvram.h"
+
class sfbonus_state : public driver_device
{
diff --git a/src/mame/drivers/sfcbox.cpp b/src/mame/drivers/sfcbox.cpp
index 8934f40c330..16e4b6152df 100644
--- a/src/mame/drivers/sfcbox.cpp
+++ b/src/mame/drivers/sfcbox.cpp
@@ -118,21 +118,24 @@ How does the Super Famicom Box operates
***************************************************************************/
#include "emu.h"
+#include "includes/snes.h"
+
#include "cpu/z180/z180.h"
#include "machine/s3520cf.h"
#include "video/mb90082.h"
-#include "includes/snes.h"
#include "rendlay.h"
+#include "speaker.h"
+
class sfcbox_state : public snes_state
{
public:
sfcbox_state(const machine_config &mconfig, device_type type, const char *tag)
- : snes_state(mconfig, type, tag),
- m_bios(*this, "bios"),
- m_mb90082(*this,"mb90082"),
- m_s3520cf(*this, "s3520cf")
- { }
+ : snes_state(mconfig, type, tag)
+ , m_bios(*this, "bios")
+ , m_mb90082(*this,"mb90082")
+ , m_s3520cf(*this, "s3520cf")
+ { }
required_device<cpu_device> m_bios;
required_device<mb90082_device> m_mb90082;
diff --git a/src/mame/drivers/sfkick.cpp b/src/mame/drivers/sfkick.cpp
index f5211ae3dae..315aca95721 100644
--- a/src/mame/drivers/sfkick.cpp
+++ b/src/mame/drivers/sfkick.cpp
@@ -158,6 +158,8 @@ DIPSW-2
#include "machine/gen_latch.h"
#include "machine/i8255.h"
#include "sound/2203intf.h"
+#include "screen.h"
+#include "speaker.h"
class sfkick_state : public driver_device
diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp
index e0e64fd58b9..d49ba948c5c 100644
--- a/src/mame/drivers/sg1000.cpp
+++ b/src/mame/drivers/sg1000.cpp
@@ -68,6 +68,7 @@ Notes:
#include "includes/sg1000.h"
#include "bus/rs232/rs232.h"
#include "softlist.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/sg1000a.cpp b/src/mame/drivers/sg1000a.cpp
index 1fd74dd7204..daf023f95c1 100644
--- a/src/mame/drivers/sg1000a.cpp
+++ b/src/mame/drivers/sg1000a.cpp
@@ -119,6 +119,7 @@ CN4 CN5
#include "video/tms9928a.h"
#include "machine/i8255.h"
#include "machine/segacrpt_device.h"
+#include "speaker.h"
class sg1000a_state : public driver_device
diff --git a/src/mame/drivers/shadfrce.cpp b/src/mame/drivers/shadfrce.cpp
index 5805a88c2e0..65c66f172f9 100644
--- a/src/mame/drivers/shadfrce.cpp
+++ b/src/mame/drivers/shadfrce.cpp
@@ -140,11 +140,13 @@ lev 7 : 0x7c : 0000 11d0 - just rte
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/shadfrce.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ym2151.h"
-#include "includes/shadfrce.h"
+#include "speaker.h"
WRITE16_MEMBER(shadfrce_state::flip_screen)
diff --git a/src/mame/drivers/shangha3.cpp b/src/mame/drivers/shangha3.cpp
index 4e53418f39e..a20591b2ddc 100644
--- a/src/mame/drivers/shangha3.cpp
+++ b/src/mame/drivers/shangha3.cpp
@@ -34,11 +34,13 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/shangha3.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/2612intf.h"
-#include "includes/shangha3.h"
+#include "speaker.h"
/* this looks like a simple protection check */
diff --git a/src/mame/drivers/shanghai.cpp b/src/mame/drivers/shanghai.cpp
index a81c08a0620..4245a0e287a 100644
--- a/src/mame/drivers/shanghai.cpp
+++ b/src/mame/drivers/shanghai.cpp
@@ -20,10 +20,13 @@ displayed.
***************************************************************************/
#include "emu.h"
+#include "audio/seibu.h"
+
#include "cpu/nec/nec.h"
#include "sound/2203intf.h"
-#include "audio/seibu.h"
#include "video/hd63484.h"
+#include "screen.h"
+#include "speaker.h"
class shanghai_state : public driver_device
diff --git a/src/mame/drivers/shangkid.cpp b/src/mame/drivers/shangkid.cpp
index 1a5adeee78b..8386ffb9edb 100644
--- a/src/mame/drivers/shangkid.cpp
+++ b/src/mame/drivers/shangkid.cpp
@@ -52,10 +52,14 @@ Games by Nihon Game/Culture Brain:
#include "emu.h"
#include "includes/shangkid.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"
+
/***************************************************************************************/
diff --git a/src/mame/drivers/shaolins.cpp b/src/mame/drivers/shaolins.cpp
index 613cf9e3620..cd914cb8b5e 100644
--- a/src/mame/drivers/shaolins.cpp
+++ b/src/mame/drivers/shaolins.cpp
@@ -9,10 +9,14 @@ driver by Allard van der Bas
***************************************************************************/
#include "emu.h"
+#include "includes/shaolins.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/watchdog.h"
#include "sound/sn76496.h"
-#include "includes/shaolins.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/shisen.cpp b/src/mame/drivers/shisen.cpp
index 7e8eba9c78f..c3ce31f1181 100644
--- a/src/mame/drivers/shisen.cpp
+++ b/src/mame/drivers/shisen.cpp
@@ -10,9 +10,13 @@ driver by Nicola Salmoria
#include "emu.h"
#include "includes/shisen.h"
+
#include "cpu/z80/z80.h"
#include "sound/ym2151.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
READ8_MEMBER(shisen_state::dsw1_r)
{
diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp
index e839031a544..c5dfaf0108f 100644
--- a/src/mame/drivers/shootout.cpp
+++ b/src/mame/drivers/shootout.cpp
@@ -43,10 +43,13 @@
*/
#include "emu.h"
+#include "includes/shootout.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
-#include "includes/shootout.h"
#include "machine/deco222.h"
+#include "screen.h"
+#include "speaker.h"
/*******************************************************************************/
diff --git a/src/mame/drivers/shougi.cpp b/src/mame/drivers/shougi.cpp
index 05a90de94ed..554150d2892 100644
--- a/src/mame/drivers/shougi.cpp
+++ b/src/mame/drivers/shougi.cpp
@@ -83,6 +83,8 @@ PROM : Type MB7051
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
class shougi_state : public driver_device
diff --git a/src/mame/drivers/shtzone.cpp b/src/mame/drivers/shtzone.cpp
index 0ae2cd0b470..c83dc552550 100644
--- a/src/mame/drivers/shtzone.cpp
+++ b/src/mame/drivers/shtzone.cpp
@@ -51,6 +51,7 @@ Notes:
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class shtzone_state : public driver_device
{
diff --git a/src/mame/drivers/shuuz.cpp b/src/mame/drivers/shuuz.cpp
index d79c5362997..1bf575d14f6 100644
--- a/src/mame/drivers/shuuz.cpp
+++ b/src/mame/drivers/shuuz.cpp
@@ -20,10 +20,12 @@
#include "emu.h"
+#include "includes/shuuz.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
#include "sound/okim6295.h"
-#include "includes/shuuz.h"
+#include "speaker.h"
void shuuz_state::machine_start()
diff --git a/src/mame/drivers/sidearms.cpp b/src/mame/drivers/sidearms.cpp
index 5b929909c4a..243ba0df289 100644
--- a/src/mame/drivers/sidearms.cpp
+++ b/src/mame/drivers/sidearms.cpp
@@ -45,12 +45,15 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/sidearms.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
#include "sound/ym2151.h"
-#include "includes/sidearms.h"
+#include "screen.h"
+#include "speaker.h"
void sidearms_state::machine_start()
{
diff --git a/src/mame/drivers/sidepckt.cpp b/src/mame/drivers/sidepckt.cpp
index 1530e0ba7af..f69930110b5 100644
--- a/src/mame/drivers/sidepckt.cpp
+++ b/src/mame/drivers/sidepckt.cpp
@@ -132,11 +132,15 @@ Additional notes:
***************************************************************************/
#include "emu.h"
+#include "includes/sidepckt.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
#include "sound/3526intf.h"
-#include "includes/sidepckt.h"
+#include "screen.h"
+#include "speaker.h"
+
// protection tables
static const uint8_t sidepckt_prot_table_1[0x10]={0x05,0x03,0x02,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff};
diff --git a/src/mame/drivers/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp
index 9bee6451b65..099cf63f603 100644
--- a/src/mame/drivers/sigmab52.cpp
+++ b/src/mame/drivers/sigmab52.cpp
@@ -118,11 +118,6 @@
*******************************************************************************/
-
-#define MAIN_CLOCK XTAL_18MHz
-#define SEC_CLOCK XTAL_8MHz
-#define AUX_CLOCK XTAL_3_579545MHz
-
#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/6840ptm.h"
@@ -131,9 +126,16 @@
#include "machine/nvram.h"
#include "sound/3812intf.h"
#include "video/hd63484.h"
+#include "screen.h"
+#include "speaker.h"
#include "sigmab52.lh"
+
+#define MAIN_CLOCK XTAL_18MHz
+#define SEC_CLOCK XTAL_8MHz
+#define AUX_CLOCK XTAL_3_579545MHz
+
class sigmab52_state : public driver_device
{
public:
diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp
index e5f4e796a1a..6754bf7a421 100644
--- a/src/mame/drivers/sigmab98.cpp
+++ b/src/mame/drivers/sigmab98.cpp
@@ -111,13 +111,16 @@ Notes:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "video/bufsprite.h"
-#include "sound/okim9810.h"
-#include "sound/ymz280b.h"
#include "machine/eepromser.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
#include "machine/watchdog.h"
+#include "sound/okim9810.h"
+#include "sound/ymz280b.h"
+#include "video/bufsprite.h"
+#include "screen.h"
+#include "speaker.h"
+
class sigmab98_state : public driver_device
{
diff --git a/src/mame/drivers/silkroad.cpp b/src/mame/drivers/silkroad.cpp
index a4ecac4b4e8..18c6a20e325 100644
--- a/src/mame/drivers/silkroad.cpp
+++ b/src/mame/drivers/silkroad.cpp
@@ -7,10 +7,13 @@
/* and preliminary sound hookup by R. Belmont + fixes by Pierpaolo Prazzoli */
#include "emu.h"
+#include "includes/silkroad.h"
+
#include "cpu/m68000/m68000.h"
-#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/silkroad.h"
+#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
/*
diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp
index a365dd8a2fc..38457eed1b8 100644
--- a/src/mame/drivers/silvmil.cpp
+++ b/src/mame/drivers/silvmil.cpp
@@ -28,8 +28,10 @@ Very likely to be 'whatever crystals we had on hand which were close enough for
#include "cpu/m68000/m68000.h"
#include "machine/gen_latch.h"
#include "sound/okim6295.h"
-#include "video/decospr.h"
#include "sound/ym2151.h"
+#include "video/decospr.h"
+#include "screen.h"
+#include "speaker.h"
class silvmil_state : public driver_device
diff --git a/src/mame/drivers/simpl156.cpp b/src/mame/drivers/simpl156.cpp
index ef947234d02..042794d2b21 100644
--- a/src/mame/drivers/simpl156.cpp
+++ b/src/mame/drivers/simpl156.cpp
@@ -91,12 +91,16 @@ Are the OKI M6295 clocks from Heavy Smash are correct at least for the Mitchell
*/
#include "emu.h"
+#include "includes/simpl156.h"
+
#include "machine/decocrpt.h"
#include "machine/deco156.h"
#include "cpu/arm/arm.h"
-#include "includes/simpl156.h"
#include "machine/eepromser.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
static INPUT_PORTS_START( simpl156 )
PORT_START("IN0")
diff --git a/src/mame/drivers/simpsons.cpp b/src/mame/drivers/simpsons.cpp
index 117110d950f..be92748a0c4 100644
--- a/src/mame/drivers/simpsons.cpp
+++ b/src/mame/drivers/simpsons.cpp
@@ -97,15 +97,16 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/simpsons.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */
#include "cpu/z80/z80.h"
-
#include "machine/eepromser.h"
#include "machine/watchdog.h"
#include "sound/ym2151.h"
#include "sound/k053260.h"
-#include "includes/simpsons.h"
-#include "includes/konamipt.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/skeetsht.cpp b/src/mame/drivers/skeetsht.cpp
index 2842d1ba1f9..70ae23c3fc4 100644
--- a/src/mame/drivers/skeetsht.cpp
+++ b/src/mame/drivers/skeetsht.cpp
@@ -17,6 +17,8 @@
#include "cpu/tms34010/tms34010.h"
#include "sound/ay8910.h"
#include "video/tlc34076.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/skimaxx.cpp b/src/mame/drivers/skimaxx.cpp
index de0a8fc86b4..77d7b3b67c7 100644
--- a/src/mame/drivers/skimaxx.cpp
+++ b/src/mame/drivers/skimaxx.cpp
@@ -40,6 +40,8 @@
#include "cpu/m68000/m68000.h"
#include "cpu/tms34010/tms34010.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class skimaxx_state : public driver_device
diff --git a/src/mame/drivers/skullxbo.cpp b/src/mame/drivers/skullxbo.cpp
index c7246308fd6..718fc4d14c6 100644
--- a/src/mame/drivers/skullxbo.cpp
+++ b/src/mame/drivers/skullxbo.cpp
@@ -20,9 +20,11 @@
#include "emu.h"
+#include "includes/skullxbo.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
-#include "includes/skullxbo.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/skyarmy.cpp b/src/mame/drivers/skyarmy.cpp
index 32a25ee6349..84ad8c752c5 100644
--- a/src/mame/drivers/skyarmy.cpp
+++ b/src/mame/drivers/skyarmy.cpp
@@ -24,10 +24,12 @@
- cpu clock .. now 4 mhz
*/
-
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
class skyarmy_state : public driver_device
{
diff --git a/src/mame/drivers/skydiver.cpp b/src/mame/drivers/skydiver.cpp
index a6ee208c139..d394ce6ad6d 100644
--- a/src/mame/drivers/skydiver.cpp
+++ b/src/mame/drivers/skydiver.cpp
@@ -89,9 +89,12 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/m6800/m6800.h"
#include "includes/skydiver.h"
+
+#include "cpu/m6800/m6800.h"
#include "sound/discrete.h"
+#include "screen.h"
+#include "speaker.h"
#include "skydiver.lh"
diff --git a/src/mame/drivers/skyfox.cpp b/src/mame/drivers/skyfox.cpp
index 7542ed58c7c..1292900c77f 100644
--- a/src/mame/drivers/skyfox.cpp
+++ b/src/mame/drivers/skyfox.cpp
@@ -20,9 +20,11 @@ Verified Dip locations and recommended settings with manual
***************************************************************************/
#include "emu.h"
+#include "includes/skyfox.h"
+
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
-#include "includes/skyfox.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/skykid.cpp b/src/mame/drivers/skykid.cpp
index ab61672e02e..3dbbd540388 100644
--- a/src/mame/drivers/skykid.cpp
+++ b/src/mame/drivers/skykid.cpp
@@ -16,11 +16,14 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/skykid.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
#include "machine/watchdog.h"
#include "sound/namco.h"
-#include "includes/skykid.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(skykid_state::inputport_select_w)
diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp
index 995fa3d821d..0efea30de67 100644
--- a/src/mame/drivers/skylncr.cpp
+++ b/src/mame/drivers/skylncr.cpp
@@ -117,21 +117,23 @@
***************************************************************************************************/
-
-#define MASTER_CLOCK XTAL_12MHz /* confirmed */
-#define HOPPER_PULSE 50 // guessed
-
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
#include "machine/i8255.h"
#include "machine/nvram.h"
#include "machine/ticket.h"
+#include "sound/ay8910.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
#include <algorithm>
+#define MASTER_CLOCK XTAL_12MHz /* confirmed */
+#define HOPPER_PULSE 50 // guessed
+
+
class skylncr_state : public driver_device
{
public:
diff --git a/src/mame/drivers/skyraid.cpp b/src/mame/drivers/skyraid.cpp
index a21ee106272..7feae556898 100644
--- a/src/mame/drivers/skyraid.cpp
+++ b/src/mame/drivers/skyraid.cpp
@@ -7,9 +7,12 @@ Atari Sky Raider driver
***************************************************************************/
#include "emu.h"
+#include "includes/skyraid.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/watchdog.h"
-#include "includes/skyraid.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/slapfght.cpp b/src/mame/drivers/slapfght.cpp
index 276f9592ce5..d2d41191d3b 100644
--- a/src/mame/drivers/slapfght.cpp
+++ b/src/mame/drivers/slapfght.cpp
@@ -258,10 +258,12 @@ Stephh's notes (based on the games Z80 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/slapfght.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
#include "sound/ay8910.h"
-#include "includes/slapfght.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/slapshot.cpp b/src/mame/drivers/slapshot.cpp
index 1c754a78cc1..2892cd7b4fa 100644
--- a/src/mame/drivers/slapshot.cpp
+++ b/src/mame/drivers/slapshot.cpp
@@ -134,12 +134,15 @@ Region byte at offset 0x031:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m68000/m68000.h"
+#include "includes/slapshot.h"
#include "audio/taitosnd.h"
-#include "sound/2610intf.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/timekpr.h"
-#include "includes/slapshot.h"
+#include "sound/2610intf.h"
+#include "screen.h"
+#include "speaker.h"
/***********************************************************
diff --git a/src/mame/drivers/slc1.cpp b/src/mame/drivers/slc1.cpp
index 36975858218..692d48e2779 100644
--- a/src/mame/drivers/slc1.cpp
+++ b/src/mame/drivers/slc1.cpp
@@ -50,7 +50,9 @@ Pasting doesn't work, but if it did...
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "speaker.h"
+
#include "slc1.lh"
diff --git a/src/mame/drivers/sliver.cpp b/src/mame/drivers/sliver.cpp
index 69e7f03c1ca..f56192b1537 100644
--- a/src/mame/drivers/sliver.cpp
+++ b/src/mame/drivers/sliver.cpp
@@ -65,11 +65,16 @@ Notes:
*/
#include "emu.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/mcs51/mcs51.h"
#include "machine/gen_latch.h"
#include "sound/okim6295.h"
-#include "cpu/mcs51/mcs51.h"
#include "video/ramdac.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "jpeglib.h"
diff --git a/src/mame/drivers/slotcarn.cpp b/src/mame/drivers/slotcarn.cpp
index 00117e54269..d9552c2a898 100644
--- a/src/mame/drivers/slotcarn.cpp
+++ b/src/mame/drivers/slotcarn.cpp
@@ -18,9 +18,12 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
#include "machine/i8255.h"
+#include "sound/ay8910.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MASTER_CLOCK (XTAL_10MHz)
#define CPU_CLOCK (MASTER_CLOCK / 4)
diff --git a/src/mame/drivers/sm1800.cpp b/src/mame/drivers/sm1800.cpp
index f7ae90084d3..c753cd46f16 100644
--- a/src/mame/drivers/sm1800.cpp
+++ b/src/mame/drivers/sm1800.cpp
@@ -20,18 +20,19 @@
#include "machine/i8255.h"
#include "machine/i8251.h"
#include "video/i8275.h"
+#include "screen.h"
class sm1800_state : public driver_device
{
public:
sm1800_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_uart(*this, "i8251"),
- m_ppi(*this, "i8255"),
- m_crtc(*this, "i8275"),
- m_palette(*this, "palette")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_uart(*this, "i8251")
+ , m_ppi(*this, "i8255")
+ , m_crtc(*this, "i8275")
+ , m_palette(*this, "palette")
{ }
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/sm7238.cpp b/src/mame/drivers/sm7238.cpp
index ab918d75e9a..299c6330cdb 100644
--- a/src/mame/drivers/sm7238.cpp
+++ b/src/mame/drivers/sm7238.cpp
@@ -28,6 +28,7 @@
#include "machine/pic8259.h"
#include "machine/km035.h"
#include "machine/nvram.h"
+#include "screen.h"
#define KSM_COLUMNS 80 // or 132
diff --git a/src/mame/drivers/smc777.cpp b/src/mame/drivers/smc777.cpp
index 3d1776728b2..1f62cd90fba 100644
--- a/src/mame/drivers/smc777.cpp
+++ b/src/mame/drivers/smc777.cpp
@@ -21,12 +21,15 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/sn76496.h"
+#include "imagedev/flopdrv.h"
+#include "machine/wd_fdc.h"
#include "sound/beep.h"
+#include "sound/sn76496.h"
#include "video/mc6845.h"
-#include "machine/wd_fdc.h"
-#include "imagedev/flopdrv.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_4_028MHz
diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp
index cab5f9c85f5..130bffc78cd 100644
--- a/src/mame/drivers/sms.cpp
+++ b/src/mame/drivers/sms.cpp
@@ -244,15 +244,15 @@ DC00 - Selection buttons #2, 9-16 (R)
******************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "sound/sn76496.h"
-#include "sound/ym2413.h"
-#include "video/315_5124.h"
#include "includes/sms.h"
+
+#include "cpu/z80/z80.h"
#include "softlist.h"
+#include "speaker.h"
#include "sms1.lh"
+
#define MASTER_CLOCK_GG 32215905
#define MASTER_CLOCK_PALN 10746168
// The clocks for PAL and PAL-M used here differ from their nominal values,
diff --git a/src/mame/drivers/sms_bootleg.cpp b/src/mame/drivers/sms_bootleg.cpp
index b9aa5a66d14..7fa9a6f3412 100644
--- a/src/mame/drivers/sms_bootleg.cpp
+++ b/src/mame/drivers/sms_bootleg.cpp
@@ -117,12 +117,11 @@ A Korean version has been seen too (unless this can be switched?)
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "sound/sn76496.h"
-#include "sound/ym2413.h"
-#include "video/315_5124.h"
#include "includes/sms_bootleg.h"
+#include "cpu/z80/z80.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START( sms_supergame_map, AS_PROGRAM, 8, smsbootleg_state )
diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp
index 4bfcaecae2b..ffcf08257a9 100644
--- a/src/mame/drivers/smsmcorp.cpp
+++ b/src/mame/drivers/smsmcorp.cpp
@@ -217,9 +217,11 @@ U145 1Brown PAL14H4CN
#include "emu.h"
#include "cpu/i86/i86.h"
#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
#include "machine/i8255.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class smsmfg_state : public driver_device
diff --git a/src/mame/drivers/snes.cpp b/src/mame/drivers/snes.cpp
index 52425957519..f4b37f7b05e 100644
--- a/src/mame/drivers/snes.cpp
+++ b/src/mame/drivers/snes.cpp
@@ -27,15 +27,19 @@
***************************************************************************/
#include "emu.h"
+#include "includes/snes.h"
#include "audio/snes_snd.h"
+
#include "cpu/spc700/spc700.h"
-#include "includes/snes.h"
#include "machine/snescx4.h"
#include "bus/snes/snes_slot.h"
#include "bus/snes/snes_carts.h"
#include "bus/snes_ctrl/ctrl.h"
+
#include "softlist.h"
+#include "speaker.h"
+
class snes_console_state : public snes_state
{
diff --git a/src/mame/drivers/snesb.cpp b/src/mame/drivers/snesb.cpp
index 0010ac07d65..9180ad2f9a0 100644
--- a/src/mame/drivers/snesb.cpp
+++ b/src/mame/drivers/snesb.cpp
@@ -148,6 +148,7 @@ Iron PCB (same as Final Fight 2?)
#include "emu.h"
#include "includes/snes.h"
#include "cpu/mcs51/mcs51.h"
+#include "speaker.h"
class snesb_state : public snes_state
{
diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp
index 51b79cc09c8..13c282826f1 100644
--- a/src/mame/drivers/snk.cpp
+++ b/src/mame/drivers/snk.cpp
@@ -270,13 +270,15 @@ TODO:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/snk.h"
+
+#include "cpu/z80/z80.h"
#include "sound/snkwave.h"
#include "sound/ay8910.h"
#include "sound/3526intf.h"
#include "sound/3812intf.h"
#include "sound/8950intf.h"
+#include "speaker.h"
/*********************************************************************/
diff --git a/src/mame/drivers/snk6502.cpp b/src/mame/drivers/snk6502.cpp
index 11c33a9a8d5..c1f73160acc 100644
--- a/src/mame/drivers/snk6502.cpp
+++ b/src/mame/drivers/snk6502.cpp
@@ -280,10 +280,13 @@ Stephh's notes (based on the games M6502 code and some tests) :
*/
#include "emu.h"
+#include "includes/snk6502.h"
+
#include "cpu/m6502/m6502.h"
-#include "video/mc6845.h"
#include "sound/samples.h"
-#include "includes/snk6502.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_11_289MHz
diff --git a/src/mame/drivers/snk68.cpp b/src/mame/drivers/snk68.cpp
index be39dc214f3..61302b76d23 100644
--- a/src/mame/drivers/snk68.cpp
+++ b/src/mame/drivers/snk68.cpp
@@ -43,10 +43,13 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/snk68.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
-#include "includes/snk68.h"
+#include "speaker.h"
+
/******************************************************************************/
diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp
index 5c7161a028f..1f2088476d1 100644
--- a/src/mame/drivers/snookr10.cpp
+++ b/src/mame/drivers/snookr10.cpp
@@ -614,16 +614,20 @@
***********************************************************************************/
-#define MASTER_CLOCK XTAL_16MHz
-
#include "emu.h"
+#include "includes/snookr10.h"
+
#include "cpu/m6502/m65sc02.h"
+#include "machine/nvram.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "snookr10.lh"
-#include "includes/snookr10.h"
-#include "machine/nvram.h"
+#define MASTER_CLOCK XTAL_16MHz
+
/**********************
* Read/Write Handlers *
* - Input Ports - *
diff --git a/src/mame/drivers/snowbros.cpp b/src/mame/drivers/snowbros.cpp
index b33963c7871..1cf0faeeead 100644
--- a/src/mame/drivers/snowbros.cpp
+++ b/src/mame/drivers/snowbros.cpp
@@ -76,12 +76,16 @@ a joystick. This is not an emulation bug.
#include "emu.h"
#include "includes/snowbros.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/mcs51/mcs51.h" // for semicom mcu
#include "cpu/z80/z80.h"
+#include "machine/watchdog.h"
#include "sound/ym2151.h"
#include "sound/3812intf.h"
-#include "cpu/mcs51/mcs51.h" // for semicom mcu
-#include "machine/watchdog.h"
+
+#include "screen.h"
+#include "speaker.h"
WRITE16_MEMBER(snowbros_state::snowbros_flipscreen_w)
diff --git a/src/mame/drivers/socrates.cpp b/src/mame/drivers/socrates.cpp
index e3e6b734626..ce7218901ac 100644
--- a/src/mame/drivers/socrates.cpp
+++ b/src/mame/drivers/socrates.cpp
@@ -83,11 +83,16 @@ TODO:
/* Core includes */
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "audio/socrates.h"
-#include "bus/generic/slot.h"
+
#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
+#include "cpu/z80/z80.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
class socrates_state : public driver_device
{
diff --git a/src/mame/drivers/solomon.cpp b/src/mame/drivers/solomon.cpp
index c4a9345de87..4912adeaf3d 100644
--- a/src/mame/drivers/solomon.cpp
+++ b/src/mame/drivers/solomon.cpp
@@ -9,9 +9,13 @@ driver by Mirko Buffoni
***************************************************************************/
#include "emu.h"
+#include "includes/solomon.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/solomon.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(solomon_state::solomon_sh_command_w)
{
diff --git a/src/mame/drivers/sonson.cpp b/src/mame/drivers/sonson.cpp
index 41fd40305b1..ee93eaec869 100644
--- a/src/mame/drivers/sonson.cpp
+++ b/src/mame/drivers/sonson.cpp
@@ -51,10 +51,13 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "includes/sonson.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
-#include "includes/sonson.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(sonson_state::sonson_sh_irqtrigger_w)
diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp
index d6a6f3554ed..7740badf571 100644
--- a/src/mame/drivers/sorcerer.cpp
+++ b/src/mame/drivers/sorcerer.cpp
@@ -163,7 +163,10 @@ NOTES (2016-06-06)
#include "emu.h"
#include "includes/sorcerer.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START( sorcerer_mem, AS_PROGRAM, 8, sorcerer_state)
ADDRESS_MAP_UNMAP_HIGH
diff --git a/src/mame/drivers/sothello.cpp b/src/mame/drivers/sothello.cpp
index 6c53747b815..d99a27c75a7 100644
--- a/src/mame/drivers/sothello.cpp
+++ b/src/mame/drivers/sothello.cpp
@@ -37,12 +37,13 @@ OSC : 8.0000MHz(X1) 21.477 MHz(X2) 384kHz(X3)
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/2203intf.h"
#include "sound/msm5205.h"
#include "video/v9938.h"
+#include "speaker.h"
class sothello_state : public driver_device
diff --git a/src/mame/drivers/spaceg.cpp b/src/mame/drivers/spaceg.cpp
index e52dcf0edac..d3635c9845d 100644
--- a/src/mame/drivers/spaceg.cpp
+++ b/src/mame/drivers/spaceg.cpp
@@ -165,7 +165,9 @@ Notes:
#include "emu.h"
#include "includes/mw8080bw.h"
+
#include "cpu/z80/z80.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp
index c7e1bc4ea1d..1b81403ad19 100644
--- a/src/mame/drivers/spartanxtec.cpp
+++ b/src/mame/drivers/spartanxtec.cpp
@@ -20,10 +20,14 @@ probably an original bug?
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/iremipt.h"
+
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
class spartanxtec_state : public driver_device
{
diff --git a/src/mame/drivers/spbactn.cpp b/src/mame/drivers/spbactn.cpp
index c3494b35116..3f61ac65e6d 100644
--- a/src/mame/drivers/spbactn.cpp
+++ b/src/mame/drivers/spbactn.cpp
@@ -132,11 +132,13 @@ cpu #0 (PC=00001A1A): unmapped memory word write to 00090030 = 00F7 & 00FF
*******************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/spbactn.h"
+
#include "cpu/m68000/m68000.h"
-#include "sound/okim6295.h"
+#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
-#include "includes/spbactn.h"
+#include "sound/okim6295.h"
+#include "speaker.h"
WRITE16_MEMBER(spbactn_state::soundcommand_w)
diff --git a/src/mame/drivers/spc1000.cpp b/src/mame/drivers/spc1000.cpp
index 8a50e490ffc..10b26c44c55 100644
--- a/src/mame/drivers/spc1000.cpp
+++ b/src/mame/drivers/spc1000.cpp
@@ -129,20 +129,24 @@ NOTE: 2014-09-13: added code from someone's modified MESS driver for floppy
*/
#include "emu.h"
+
#include "cpu/z80/z80.h"
+#include "imagedev/cassette.h"
#include "machine/ram.h"
#include "sound/ay8910.h"
#include "sound/wave.h"
#include "video/mc6847.h"
-#include "imagedev/cassette.h"
-#include "formats/spc1000_cas.h"
-#include "bus/centronics/ctronics.h"
+#include "bus/centronics/ctronics.h"
#include "bus/spc1000/exp.h"
#include "bus/spc1000/fdd.h"
#include "bus/spc1000/vdp.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/spc1000_cas.h"
+
class spc1000_state : public driver_device
{
diff --git a/src/mame/drivers/spc1500.cpp b/src/mame/drivers/spc1500.cpp
index 78331202047..ee3fd20f9e7 100644
--- a/src/mame/drivers/spc1500.cpp
+++ b/src/mame/drivers/spc1500.cpp
@@ -222,17 +222,23 @@ TODO:
*/
#include "emu.h"
+
+#include "bus/centronics/ctronics.h"
#include "cpu/z80/z80.h"
-#include "machine/ram.h"
+#include "imagedev/cassette.h"
#include "machine/i8255.h"
+#include "machine/ram.h"
#include "sound/ay8910.h"
#include "sound/wave.h"
#include "video/mc6845.h"
-#include "imagedev/cassette.h"
+
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
+
#include "formats/spc1000_cas.h"
-#include "bus/centronics/ctronics.h"
+
#define VDP_CLOCK XTAL_42_9545MHz
-#include "softlist.h"
class spc1500_state : public driver_device
{
diff --git a/src/mame/drivers/spcforce.cpp b/src/mame/drivers/spcforce.cpp
index 9e1d05d49f1..d30e8c22586 100644
--- a/src/mame/drivers/spcforce.cpp
+++ b/src/mame/drivers/spcforce.cpp
@@ -36,10 +36,14 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "includes/spcforce.h"
+
#include "cpu/i8085/i8085.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/gen_latch.h"
-#include "includes/spcforce.h"
+#include "screen.h"
+#include "speaker.h"
+
void spcforce_state::machine_start()
{
diff --git a/src/mame/drivers/spdodgeb.cpp b/src/mame/drivers/spdodgeb.cpp
index 487f6985823..f8583a17e93 100644
--- a/src/mame/drivers/spdodgeb.cpp
+++ b/src/mame/drivers/spdodgeb.cpp
@@ -24,10 +24,12 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/spdodgeb.h"
+
#include "cpu/m6502/m6502.h"
#include "cpu/m6809/m6809.h"
#include "sound/3812intf.h"
-#include "includes/spdodgeb.h"
+#include "speaker.h"
WRITE8_MEMBER(spdodgeb_state::sound_command_w)
diff --git a/src/mame/drivers/spec128.cpp b/src/mame/drivers/spec128.cpp
index 7558332bc2d..9e85d1ba47f 100644
--- a/src/mame/drivers/spec128.cpp
+++ b/src/mame/drivers/spec128.cpp
@@ -151,15 +151,16 @@ resulting mess can be seen in the F4 viewer display.
*******************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/spectrum.h"
#include "includes/spec128.h"
-#include "imagedev/snapquik.h"
-#include "imagedev/cassette.h"
+
+#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "sound/speaker.h"
+
+#include "screen.h"
+
#include "formats/tzx_cas.h"
-#include "machine/ram.h"
+
/****************************************************************************************************/
/* Spectrum 128 specific functions */
diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp
index 479cdbffcc1..1530648d38c 100644
--- a/src/mame/drivers/special.cpp
+++ b/src/mame/drivers/special.cpp
@@ -11,8 +11,12 @@
#include "emu.h"
#include "includes/special.h"
+
#include "sound/volt_reg.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
/* Address maps */
static ADDRESS_MAP_START(specialist_mem, AS_PROGRAM, 8, special_state )
diff --git a/src/mame/drivers/specpls3.cpp b/src/mame/drivers/specpls3.cpp
index 2564a2aeda3..a187d43958d 100644
--- a/src/mame/drivers/specpls3.cpp
+++ b/src/mame/drivers/specpls3.cpp
@@ -150,16 +150,14 @@ http://www.z88forever.org.uk/zxplus3e/
#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 "formats/tzx_cas.h"
-/* +3 hardware */
-#include "machine/ram.h"
+#include "screen.h"
#include "softlist.h"
+#include "formats/tzx_cas.h"
+
/****************************************************************************************************/
/* Spectrum + 3 specific functions */
/* This driver uses some of the spectrum_128 functions. The +3 is similar to a spectrum 128
diff --git a/src/mame/drivers/spectra.cpp b/src/mame/drivers/spectra.cpp
index aca18c8f8cc..29b3b71963e 100644
--- a/src/mame/drivers/spectra.cpp
+++ b/src/mame/drivers/spectra.cpp
@@ -35,9 +35,12 @@
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/6532riot.h"
#include "sound/sn76477.h"
+#include "speaker.h"
+
#include "spectra.lh"
diff --git a/src/mame/drivers/spectrum.cpp b/src/mame/drivers/spectrum.cpp
index e0d8d945abf..79c1c4ab200 100644
--- a/src/mame/drivers/spectrum.cpp
+++ b/src/mame/drivers/spectrum.cpp
@@ -276,12 +276,18 @@ SamRam
*******************************************************************************/
#include "emu.h"
+#include "includes/spectrum.h"
+
#include "cpu/z80/z80.h"
#include "sound/wave.h"
-#include "includes/spectrum.h"
-#include "formats/tzx_cas.h"
#include "machine/spec_snqk.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/tzx_cas.h"
+
/****************************************************************************************************/
/* Spectrum 48k functions */
diff --git a/src/mame/drivers/speedatk.cpp b/src/mame/drivers/speedatk.cpp
index 18205a0c5d4..5e2d0c021a7 100644
--- a/src/mame/drivers/speedatk.cpp
+++ b/src/mame/drivers/speedatk.cpp
@@ -76,10 +76,14 @@ PS / PD : key matrix
*****************************************************************************************/
#include "emu.h"
+#include "includes/speedatk.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "includes/speedatk.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_12MHz
diff --git a/src/mame/drivers/speedbal.cpp b/src/mame/drivers/speedbal.cpp
index a4777576d2b..6617a853e1a 100644
--- a/src/mame/drivers/speedbal.cpp
+++ b/src/mame/drivers/speedbal.cpp
@@ -30,9 +30,13 @@ Interrupt frequency on audio CPU is not a periodical signal, but there are a lot
***************************************************************************/
#include "emu.h"
+#include "includes/speedbal.h"
+
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
-#include "includes/speedbal.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "speedbal.lh"
diff --git a/src/mame/drivers/speedspn.cpp b/src/mame/drivers/speedspn.cpp
index 24fc6a2ccb9..99e75c8e18d 100644
--- a/src/mame/drivers/speedspn.cpp
+++ b/src/mame/drivers/speedspn.cpp
@@ -22,9 +22,13 @@ TODO:
******************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/speedspn.h"
+#include "cpu/z80/z80.h"
+#include "screen.h"
+#include "speaker.h"
+
+
/*** README INFO **************************************************************
ROMSET: speedspn
diff --git a/src/mame/drivers/spiders.cpp b/src/mame/drivers/spiders.cpp
index afebaa035b3..715faac00b3 100644
--- a/src/mame/drivers/spiders.cpp
+++ b/src/mame/drivers/spiders.cpp
@@ -190,14 +190,16 @@
***************************************************************************/
#include "emu.h"
-#include "machine/rescap.h"
+#include "includes/spiders.h"
+
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
-#include "video/mc6845.h"
#include "machine/6821pia.h"
#include "machine/74123.h"
-#include "includes/spiders.h"
#include "machine/nvram.h"
+#include "machine/rescap.h"
+#include "video/mc6845.h"
+#include "screen.h"
#define MAIN_CPU_MASTER_CLOCK (11200000)
diff --git a/src/mame/drivers/spinb.cpp b/src/mame/drivers/spinb.cpp
index 6ed8ae51f9b..70962152bea 100644
--- a/src/mame/drivers/spinb.cpp
+++ b/src/mame/drivers/spinb.cpp
@@ -32,12 +32,17 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
-#include "cpu/z80/z80.h"
+
#include "cpu/mcs51/mcs51.h"
+#include "cpu/z80/z80.h"
+#include "machine/74157.h"
+#include "machine/7474.h"
#include "machine/i8255.h"
#include "sound/msm5205.h"
-#include "machine/7474.h"
-#include "machine/74157.h"
+
+#include "screen.h"
+#include "speaker.h"
+
class spinb_state : public genpin_class
{
diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp
index 8178529d159..38bd11cecc0 100644
--- a/src/mame/drivers/splash.cpp
+++ b/src/mame/drivers/splash.cpp
@@ -44,11 +44,14 @@ More notes about Funny Strip protection issues at the bottom of source file (DRI
***************************************************************************/
#include "emu.h"
+#include "includes/splash.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
#include "sound/3812intf.h"
-#include "includes/splash.h"
+#include "screen.h"
+#include "speaker.h"
WRITE16_MEMBER(splash_state::splash_sh_irqtrigger_w)
{
diff --git a/src/mame/drivers/splus.cpp b/src/mame/drivers/splus.cpp
index 03409649a3c..a449d8aca88 100644
--- a/src/mame/drivers/splus.cpp
+++ b/src/mame/drivers/splus.cpp
@@ -21,13 +21,17 @@
***********************************************************************************/
#include "emu.h"
-#include "sound/ay8910.h"
-#include "machine/nvram.h"
+
#include "cpu/mcs51/mcs51.h"
#include "machine/i2cmem.h"
+#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
#include "splus.lh"
+
#define DEBUG_OUTPUT 0
class splus_state : public driver_device
diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp
index 969faca2280..41cd5c08a4c 100644
--- a/src/mame/drivers/spoker.cpp
+++ b/src/mame/drivers/spoker.cpp
@@ -34,6 +34,8 @@
#include "sound/ym2413.h"
#include "sound/okim6295.h"
#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
class spoker_state : public driver_device
diff --git a/src/mame/drivers/spool99.cpp b/src/mame/drivers/spool99.cpp
index 7418d0f7939..56e59cdc589 100644
--- a/src/mame/drivers/spool99.cpp
+++ b/src/mame/drivers/spool99.cpp
@@ -93,8 +93,11 @@ Note
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/okim6295.h"
#include "machine/eepromser.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
+
class spool99_state : public driver_device
{
diff --git a/src/mame/drivers/sprcros2.cpp b/src/mame/drivers/sprcros2.cpp
index 8acd06cca06..812703941df 100644
--- a/src/mame/drivers/sprcros2.cpp
+++ b/src/mame/drivers/sprcros2.cpp
@@ -55,6 +55,8 @@ SC-61.5A
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
+#include "screen.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_10MHz
diff --git a/src/mame/drivers/sprint2.cpp b/src/mame/drivers/sprint2.cpp
index f57d3d54c84..6a21fc6d182 100644
--- a/src/mame/drivers/sprint2.cpp
+++ b/src/mame/drivers/sprint2.cpp
@@ -20,9 +20,11 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m6502.h"
#include "includes/sprint2.h"
+
+#include "cpu/m6502/m6502.h"
#include "sound/discrete.h"
+#include "speaker.h"
#define MACHINE_IS_SPRINT1 (m_game == 1)
#define MACHINE_IS_SPRINT2 (m_game == 2)
diff --git a/src/mame/drivers/sprint4.cpp b/src/mame/drivers/sprint4.cpp
index 28267e732ba..668bf7ce965 100644
--- a/src/mame/drivers/sprint4.cpp
+++ b/src/mame/drivers/sprint4.cpp
@@ -7,9 +7,11 @@ Atari Sprint 4 driver
***************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m6502.h"
-#include "audio/sprint4.h"
#include "includes/sprint4.h"
+#include "audio/sprint4.h"
+
+#include "cpu/m6502/m6502.h"
+#include "speaker.h"
#define MASTER_CLOCK 12096000
diff --git a/src/mame/drivers/sprint8.cpp b/src/mame/drivers/sprint8.cpp
index 9a39559cf50..125651e6e69 100644
--- a/src/mame/drivers/sprint8.cpp
+++ b/src/mame/drivers/sprint8.cpp
@@ -7,8 +7,9 @@ Atari Sprint 8 driver
***************************************************************************/
#include "emu.h"
-#include "cpu/m6800/m6800.h"
#include "includes/sprint8.h"
+#include "cpu/m6800/m6800.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/spy.cpp b/src/mame/drivers/spy.cpp
index 1396d404b8c..6d0553fd57f 100644
--- a/src/mame/drivers/spy.cpp
+++ b/src/mame/drivers/spy.cpp
@@ -20,13 +20,16 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/spy.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/m6809.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/spy.h"
+#include "speaker.h"
+
INTERRUPT_GEN_MEMBER(spy_state::spy_interrupt)
{
diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp
index 377f858786d..05c8126f29d 100644
--- a/src/mame/drivers/spyhuntertec.cpp
+++ b/src/mame/drivers/spyhuntertec.cpp
@@ -21,6 +21,9 @@ sound system appears to be the same as 'spartanxtec.cpp'
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "spyhunttec.lh"
class spyhuntertec_state : public driver_device
diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp
index 8cec6f28245..f3644c61104 100644
--- a/src/mame/drivers/squale.cpp
+++ b/src/mame/drivers/squale.cpp
@@ -55,15 +55,19 @@
****************************************************************************/
#include "emu.h"
+
+#include "bus/generic/carts.h"
#include "cpu/m6809/m6809.h"
-#include "video/ef9365.h"
#include "machine/6821pia.h"
#include "machine/6850acia.h"
-#include "sound/ay8910.h"
#include "machine/wd_fdc.h"
-#include "bus/generic/carts.h"
+#include "sound/ay8910.h"
+#include "video/ef9365.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
#define MAIN_CLOCK XTAL_14MHz
#define AY_CLOCK MAIN_CLOCK / 8 /* 1.75 Mhz */
diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp
index b5bb65f22ef..1d7c3027880 100644
--- a/src/mame/drivers/srmp2.cpp
+++ b/src/mame/drivers/srmp2.cpp
@@ -58,12 +58,16 @@ Note:
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/srmp2.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
+#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "sound/msm5205.h"
-#include "includes/srmp2.h"
-#include "machine/nvram.h"
+#include "screen.h"
+#include "speaker.h"
+
/***************************************************************************
diff --git a/src/mame/drivers/srmp6.cpp b/src/mame/drivers/srmp6.cpp
index 901bc10c095..5add9eef53d 100644
--- a/src/mame/drivers/srmp6.cpp
+++ b/src/mame/drivers/srmp6.cpp
@@ -71,6 +71,9 @@ Dumped 06/15/2000
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/nile.h"
+#include "screen.h"
+#include "speaker.h"
+
class srmp6_state : public driver_device
{
diff --git a/src/mame/drivers/srumbler.cpp b/src/mame/drivers/srumbler.cpp
index 67f4ba16fea..92bcd4c26d9 100644
--- a/src/mame/drivers/srumbler.cpp
+++ b/src/mame/drivers/srumbler.cpp
@@ -13,11 +13,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/srumbler.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6809/m6809.h"
#include "machine/gen_latch.h"
#include "sound/2203intf.h"
-#include "includes/srumbler.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(srumbler_state::bankswitch_w)
diff --git a/src/mame/drivers/ssem.cpp b/src/mame/drivers/ssem.cpp
index b108c9cfee3..20e684d8493 100644
--- a/src/mame/drivers/ssem.cpp
+++ b/src/mame/drivers/ssem.cpp
@@ -6,10 +6,11 @@
Driver by Ryan Holtz
*/
-
#include "emu.h"
#include "cpu/ssem/ssem.h"
#include "imagedev/snapquik.h"
+#include "screen.h"
+
class ssem_state : public driver_device
{
diff --git a/src/mame/drivers/ssfindo.cpp b/src/mame/drivers/ssfindo.cpp
index 7ea734f7c43..b611d16a3ad 100644
--- a/src/mame/drivers/ssfindo.cpp
+++ b/src/mame/drivers/ssfindo.cpp
@@ -127,6 +127,8 @@ Notes:
#include "emu.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
+#include "screen.h"
+#include "speaker.h"
enum
{
diff --git a/src/mame/drivers/sshangha.cpp b/src/mame/drivers/sshangha.cpp
index c17263953fc..012ce5bad91 100644
--- a/src/mame/drivers/sshangha.cpp
+++ b/src/mame/drivers/sshangha.cpp
@@ -47,12 +47,16 @@ Stephh's notes (based on the games M68000 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/sshangha.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2203intf.h"
#include "sound/okim6295.h"
-#include "includes/sshangha.h"
#include "machine/deco146.h"
+#include "screen.h"
+#include "speaker.h"
+
#define SSHANGHA_HACK 0
diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp
index 7eb2c4eba6e..1d8eca3b2da 100644
--- a/src/mame/drivers/sshot.cpp
+++ b/src/mame/drivers/sshot.cpp
@@ -164,6 +164,7 @@ Given CS numbers this is released after the other GunChamp
#include "emu.h"
#include "cpu/scmp/scmp.h"
+#include "screen.h"
#include "gunchamps.lh"
diff --git a/src/mame/drivers/ssingles.cpp b/src/mame/drivers/ssingles.cpp
index 89ed37dc7c2..badf29eccb7 100644
--- a/src/mame/drivers/ssingles.cpp
+++ b/src/mame/drivers/ssingles.cpp
@@ -150,6 +150,8 @@ Dumped by Chack'n
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
#define NUM_PENS (4*8)
#define VMEM_SIZE 0x100
diff --git a/src/mame/drivers/sslam.cpp b/src/mame/drivers/sslam.cpp
index 2c7cd1ff4c8..6bad5f3dc21 100644
--- a/src/mame/drivers/sslam.cpp
+++ b/src/mame/drivers/sslam.cpp
@@ -83,9 +83,12 @@ Notes:
#include "emu.h"
+#include "includes/sslam.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/mcs51/mcs51.h"
-#include "includes/sslam.h"
+#include "screen.h"
+#include "speaker.h"
#define oki_time_base 0x08
diff --git a/src/mame/drivers/ssozumo.cpp b/src/mame/drivers/ssozumo.cpp
index ce6287a4948..ce68b106b13 100644
--- a/src/mame/drivers/ssozumo.cpp
+++ b/src/mame/drivers/ssozumo.cpp
@@ -11,11 +11,14 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/10/04
#include "emu.h"
#include "includes/ssozumo.h"
+
#include "cpu/m6502/m6502.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"
void ssozumo_state::machine_start()
diff --git a/src/mame/drivers/sspeedr.cpp b/src/mame/drivers/sspeedr.cpp
index 204e9f66eb7..eef9029b87c 100644
--- a/src/mame/drivers/sspeedr.cpp
+++ b/src/mame/drivers/sspeedr.cpp
@@ -7,10 +7,13 @@ Taito Super Speed Race driver
***************************************************************************/
#include "emu.h"
+#include "includes/sspeedr.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
+#include "screen.h"
+
#include "sspeedr.lh"
-#include "includes/sspeedr.h"
diff --git a/src/mame/drivers/ssrj.cpp b/src/mame/drivers/ssrj.cpp
index 22e8c43d2cf..83fb0847811 100644
--- a/src/mame/drivers/ssrj.cpp
+++ b/src/mame/drivers/ssrj.cpp
@@ -32,9 +32,13 @@ HW info :
************************************/
#include "emu.h"
+#include "includes/ssrj.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/ssrj.h"
+#include "screen.h"
+#include "speaker.h"
+
void ssrj_state::machine_start()
{
diff --git a/src/mame/drivers/sstrangr.cpp b/src/mame/drivers/sstrangr.cpp
index 68bb374fdbf..97da000c732 100644
--- a/src/mame/drivers/sstrangr.cpp
+++ b/src/mame/drivers/sstrangr.cpp
@@ -9,6 +9,7 @@
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "screen.h"
#include "sstrangr.lh"
diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp
index b58cede8b8d..594f65a25e1 100644
--- a/src/mame/drivers/ssv.cpp
+++ b/src/mame/drivers/ssv.cpp
@@ -162,11 +162,14 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/ssv.h"
+
#include "cpu/v810/v810.h"
#include "cpu/v60/v60.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
-#include "includes/ssv.h"
+#include "speaker.h"
+
/***************************************************************************
diff --git a/src/mame/drivers/ssystem3.cpp b/src/mame/drivers/ssystem3.cpp
index 613d489876b..bf793b6a82e 100644
--- a/src/mame/drivers/ssystem3.cpp
+++ b/src/mame/drivers/ssystem3.cpp
@@ -36,9 +36,10 @@ backup of playfield rom and picture/description of its board
*/
#include "emu.h"
-
#include "includes/ssystem3.h"
+
#include "cpu/m6502/m6502.h"
+#include "screen.h"
// in my opinion own cpu to display lcd field and to handle own buttons
diff --git a/src/mame/drivers/st17xx.cpp b/src/mame/drivers/st17xx.cpp
index 57892ae33ad..5f45b8a23fb 100644
--- a/src/mame/drivers/st17xx.cpp
+++ b/src/mame/drivers/st17xx.cpp
@@ -35,10 +35,11 @@
*/
-
#include "emu.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
+#include "screen.h"
+
#define SCREEN_TAG "screen"
diff --git a/src/mame/drivers/st_mp200.cpp b/src/mame/drivers/st_mp200.cpp
index 022cb119e68..25955cf0f87 100644
--- a/src/mame/drivers/st_mp200.cpp
+++ b/src/mame/drivers/st_mp200.cpp
@@ -18,9 +18,12 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
#include "sound/s14001a.h"
+#include "speaker.h"
+
#include "st_mp200.lh"
#define S14001_CLOCK (25e5)
diff --git a/src/mame/drivers/stadhero.cpp b/src/mame/drivers/stadhero.cpp
index 0b96752214f..1a67ea6778a 100644
--- a/src/mame/drivers/stadhero.cpp
+++ b/src/mame/drivers/stadhero.cpp
@@ -21,12 +21,16 @@
***************************************************************************/
#include "emu.h"
+#include "includes/stadhero.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
-#include "includes/stadhero.h"
+#include "screen.h"
+#include "speaker.h"
+
/******************************************************************************/
diff --git a/src/mame/drivers/starcrus.cpp b/src/mame/drivers/starcrus.cpp
index 9c42109b9f4..ec2c9fa09c0 100644
--- a/src/mame/drivers/starcrus.cpp
+++ b/src/mame/drivers/starcrus.cpp
@@ -12,9 +12,13 @@ palazzol@home.com
***************************************************************************/
#include "emu.h"
+#include "includes/starcrus.h"
+
#include "cpu/i8085/i8085.h"
#include "sound/samples.h"
-#include "includes/starcrus.h"
+#include "screen.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START( starcrus_map, AS_PROGRAM, 8, starcrus_state )
AM_RANGE(0x0000, 0x0fff) AM_ROM
diff --git a/src/mame/drivers/starfire.cpp b/src/mame/drivers/starfire.cpp
index 70bdce04ba0..795cf1b859e 100644
--- a/src/mame/drivers/starfire.cpp
+++ b/src/mame/drivers/starfire.cpp
@@ -47,9 +47,11 @@ starfira has one less rom in total than starfire but everything passes as
***************************************************************************/
#include "emu.h"
+#include "includes/starfire.h"
+
#include "cpu/z80/z80.h"
#include "sound/samples.h"
-#include "includes/starfire.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/starshp1.cpp b/src/mame/drivers/starshp1.cpp
index c98d491a4e8..126fb856326 100644
--- a/src/mame/drivers/starshp1.cpp
+++ b/src/mame/drivers/starshp1.cpp
@@ -10,8 +10,9 @@ Atari Starship 1 driver
***************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m6502.h"
#include "includes/starshp1.h"
+#include "cpu/m6502/m6502.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/starwars.cpp b/src/mame/drivers/starwars.cpp
index 59320b60504..6b9a0cb0acf 100644
--- a/src/mame/drivers/starwars.cpp
+++ b/src/mame/drivers/starwars.cpp
@@ -25,6 +25,9 @@
***************************************************************************/
#include "emu.h"
+#include "includes/starwars.h"
+#include "includes/slapstic.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/watchdog.h"
#include "video/vector.h"
@@ -32,8 +35,8 @@
#include "sound/tms5220.h"
#include "sound/pokey.h"
#include "machine/x2212.h"
-#include "includes/starwars.h"
-#include "includes/slapstic.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK (XTAL_12_096MHz)
diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp
index d226c24900d..01c42e33525 100644
--- a/src/mame/drivers/statriv2.cpp
+++ b/src/mame/drivers/statriv2.cpp
@@ -72,24 +72,26 @@ quaquiz2 - no inputs, needs NVRAM
#include "emu.h"
#include "cpu/i8085/i8085.h"
-#include "sound/ay8910.h"
#include "machine/i8255.h"
-#include "video/tms9927.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "video/tms9927.h"
+#include "screen.h"
+#include "speaker.h"
class statriv2_state : public driver_device
{
public:
statriv2_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_tms(*this, "tms"),
- m_videoram(*this, "videoram"),
- m_question_offset(*this, "question_offset"),
- m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette")
- { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_tms(*this, "tms")
+ , m_videoram(*this, "videoram")
+ , m_question_offset(*this, "question_offset")
+ , m_gfxdecode(*this, "gfxdecode")
+ , m_palette(*this, "palette")
+ { }
required_device<cpu_device> m_maincpu;
required_device<tms9927_device> m_tms;
diff --git a/src/mame/drivers/stfight.cpp b/src/mame/drivers/stfight.cpp
index 2f6586d9bcd..7882a12f711 100644
--- a/src/mame/drivers/stfight.cpp
+++ b/src/mame/drivers/stfight.cpp
@@ -263,6 +263,8 @@ TODO:
#include "sound/2203intf.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START( cpu1_map, AS_PROGRAM, 8, stfight_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
diff --git a/src/mame/drivers/stlforce.cpp b/src/mame/drivers/stlforce.cpp
index 196684e83f1..b95b9627174 100644
--- a/src/mame/drivers/stlforce.cpp
+++ b/src/mame/drivers/stlforce.cpp
@@ -70,10 +70,13 @@ TO DO :
*/
#include "emu.h"
+#include "includes/stlforce.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "sound/okim6295.h"
-#include "includes/stlforce.h"
+#include "screen.h"
+#include "speaker.h"
WRITE16_MEMBER(stlforce_state::eeprom_w)
diff --git a/src/mame/drivers/stratos.cpp b/src/mame/drivers/stratos.cpp
index 16a18ecdd2c..89970ff4aff 100644
--- a/src/mame/drivers/stratos.cpp
+++ b/src/mame/drivers/stratos.cpp
@@ -9,6 +9,7 @@
#include "emu.h"
#include "cpu/m6502/m65c02.h"
#include "machine/nvram.h"
+#include "screen.h"
class stratos_state : public driver_device
{
diff --git a/src/mame/drivers/strnskil.cpp b/src/mame/drivers/strnskil.cpp
index 33335cf6d58..3e43a9345f7 100644
--- a/src/mame/drivers/strnskil.cpp
+++ b/src/mame/drivers/strnskil.cpp
@@ -19,10 +19,13 @@ Notes:
*****************************************************************************/
#include "emu.h"
+#include "includes/strnskil.h"
+
#include "cpu/z80/z80.h"
#include "cpu/mb88xx/mb88xx.h"
#include "sound/sn76496.h"
-#include "includes/strnskil.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/studio2.cpp b/src/mame/drivers/studio2.cpp
index 267a0679f12..20d4d341bfd 100644
--- a/src/mame/drivers/studio2.cpp
+++ b/src/mame/drivers/studio2.cpp
@@ -184,6 +184,7 @@ Notes:
*/
#include "emu.h"
+
#include "cpu/cosmac/cosmac.h"
#include "sound/beep.h"
#include "sound/cdp1864.h"
@@ -192,7 +193,10 @@ Notes:
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+
#include "softlist.h"
+#include "speaker.h"
+
#define CDP1802_TAG "ic1"
#define CDP1861_TAG "ic2"
diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp
index a3767fdb07e..92e9641004e 100644
--- a/src/mame/drivers/stuntair.cpp
+++ b/src/mame/drivers/stuntair.cpp
@@ -83,6 +83,9 @@ Bprom dump by f205v
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
class stuntair_state : public driver_device
{
diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp
index 212e6cec3e8..c73059efdaf 100644
--- a/src/mame/drivers/stv.cpp
+++ b/src/mame/drivers/stv.cpp
@@ -35,19 +35,25 @@
************************************************************************************************************************/
#include "emu.h"
-#include "cpu/sh2/sh2.h"
+#include "includes/stv.h"
+#include "audio/rax.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/scudsp/scudsp.h"
+#include "cpu/sh2/sh2.h"
+#include "imagedev/chd_cd.h"
#include "machine/eepromser.h"
-#include "sound/scsp.h"
-#include "sound/cdda.h"
-#include "audio/rax.h"
#include "machine/smpc.h"
#include "machine/stvprot.h"
-#include "includes/stv.h"
-#include "imagedev/chd_cd.h"
-#include "coreutil.h"
+#include "sound/cdda.h"
+#include "sound/scsp.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "coreutil.h"
+
#define FIRST_SPEEDUP_SLOT (2) // in case we remove/alter the BIOS speedups later
diff --git a/src/mame/drivers/sub.cpp b/src/mame/drivers/sub.cpp
index e2a4b7178e9..c860afdd287 100644
--- a/src/mame/drivers/sub.cpp
+++ b/src/mame/drivers/sub.cpp
@@ -112,6 +112,8 @@ PCB2 (Top board, CPU board)
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/subhuntr.cpp b/src/mame/drivers/subhuntr.cpp
index db541799019..33b61913da6 100644
--- a/src/mame/drivers/subhuntr.cpp
+++ b/src/mame/drivers/subhuntr.cpp
@@ -21,6 +21,8 @@ QTY Type position
#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "machine/s2636.h"
+#include "screen.h"
+#include "speaker.h"
class subhuntr_state : public driver_device
diff --git a/src/mame/drivers/subs.cpp b/src/mame/drivers/subs.cpp
index e0420d3ca23..84d1c34425b 100644
--- a/src/mame/drivers/subs.cpp
+++ b/src/mame/drivers/subs.cpp
@@ -20,10 +20,14 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m6502.h"
#include "includes/subs.h"
+
+#include "cpu/m6502/m6502.h"
#include "sound/discrete.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
+
/*************************************
*
diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp
index 9dfe27bb789..cca15d88f5d 100644
--- a/src/mame/drivers/subsino.cpp
+++ b/src/mame/drivers/subsino.cpp
@@ -224,6 +224,8 @@ To Do:
#include "sound/okim6295.h"
#include "sound/ym2413.h"
#include "sound/3812intf.h"
+#include "screen.h"
+#include "speaker.h"
#include "victor5.lh"
#include "victor21.lh"
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index 291589fb135..58593f5c348 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -44,11 +44,13 @@ To do:
#include "cpu/h8/h83048.h"
#include "cpu/i86/i186.h"
#include "cpu/z180/z180.h"
-#include "sound/3812intf.h"
-#include "sound/okim6295.h"
#include "machine/nvram.h"
#include "machine/subsino.h"
#include "machine/ticket.h"
+#include "sound/3812intf.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
enum tilesize_t
diff --git a/src/mame/drivers/summit.cpp b/src/mame/drivers/summit.cpp
index 4556bc83e5c..323958899a0 100644
--- a/src/mame/drivers/summit.cpp
+++ b/src/mame/drivers/summit.cpp
@@ -19,6 +19,7 @@ needs inputs, prom decode, sound, artwork (lamps), probably some irq masking and
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
+#include "screen.h"
class summit_state : public driver_device
diff --git a/src/mame/drivers/sun2.cpp b/src/mame/drivers/sun2.cpp
index e438a07a01f..7ec40dd829d 100644
--- a/src/mame/drivers/sun2.cpp
+++ b/src/mame/drivers/sun2.cpp
@@ -121,6 +121,7 @@ How the architecture works:
#include "machine/z80scc.h"
#include "machine/bankdev.h"
#include "bus/rs232/rs232.h"
+#include "screen.h"
#define SCC1_TAG "scc1"
#define SCC2_TAG "scc2"
@@ -138,16 +139,16 @@ class sun2_state : public driver_device
{
public:
sun2_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_rom(*this, "bootprom"),
- m_idprom(*this, "idprom"),
- m_ram(*this, RAM_TAG),
- m_type0space(*this, "type0"),
- m_type1space(*this, "type1"),
- m_type2space(*this, "type2"),
- m_type3space(*this, "type3"),
- m_bw2_vram(*this, "bw2_vram")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_rom(*this, "bootprom")
+ , m_idprom(*this, "idprom")
+ , m_ram(*this, RAM_TAG)
+ , m_type0space(*this, "type0")
+ , m_type1space(*this, "type1")
+ , m_type2space(*this, "type2")
+ , m_type3space(*this, "type3")
+ , m_bw2_vram(*this, "bw2_vram")
{ }
required_device<m68010_device> m_maincpu;
diff --git a/src/mame/drivers/sun3.cpp b/src/mame/drivers/sun3.cpp
index acd6a799872..561f35739f7 100644
--- a/src/mame/drivers/sun3.cpp
+++ b/src/mame/drivers/sun3.cpp
@@ -179,15 +179,20 @@ fefc34a - start of mem_size, which queries ECC registers for each memory board
****************************************************************************/
#include "emu.h"
+
#include "cpu/m68000/m68000.h"
-#include "machine/timekpr.h"
-#include "machine/ram.h"
-#include "machine/z80scc.h"
#include "machine/bankdev.h"
#include "machine/nvram.h"
+#include "machine/ram.h"
+#include "machine/timekpr.h"
+#include "machine/z80scc.h"
+
#include "bus/rs232/rs232.h"
#include "bus/sunkbd/sunkbd.h"
+#include "screen.h"
+
+
#define TIMEKEEPER_TAG "timekpr"
#define SCC1_TAG "scc1"
#define SCC2_TAG "scc2"
diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp
index 2d93a6f3718..a1b34b48752 100644
--- a/src/mame/drivers/sun3x.cpp
+++ b/src/mame/drivers/sun3x.cpp
@@ -129,19 +129,23 @@
****************************************************************************/
#include "emu.h"
-#include "emu.h"
-#include "cpu/m68000/m68000.h"
-#include "machine/timekpr.h"
-#include "machine/z80scc.h"
+
#include "bus/scsi/scsi.h"
-#include "bus/scsi/scsihd.h"
#include "bus/scsi/scsicd.h"
+#include "bus/scsi/scsihd.h"
+#include "cpu/m68000/m68000.h"
+#include "formats/mfi_dsk.h"
+#include "formats/pc_dsk.h"
#include "machine/ncr539x.h"
+#include "machine/timekpr.h"
#include "machine/upd765.h"
-#include "formats/pc_dsk.h"
-#include "formats/mfi_dsk.h"
+#include "machine/z80scc.h"
+
#include "bus/rs232/rs232.h"
+#include "screen.h"
+
+
#define TIMEKEEPER_TAG "timekpr"
#define SCC1_TAG "scc1"
#define SCC2_TAG "scc2"
@@ -161,7 +165,7 @@ public:
m_fdc(*this, FDC_TAG),
m_p_ram(*this, "p_ram"),
m_bw2_vram(*this, "bw2_vram")
- { }
+ { }
required_device<cpu_device> m_maincpu;
required_device<z80scc_device> m_scc1;
diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp
index 3e77d8e21da..f0a13378a24 100644
--- a/src/mame/drivers/sun4.cpp
+++ b/src/mame/drivers/sun4.cpp
@@ -410,26 +410,30 @@
****************************************************************************/
#include "emu.h"
-#include "cpu/sparc/sparc.h"
-#include "machine/timekpr.h"
-#include "machine/ram.h"
-#include "machine/z80scc.h"
-#include "machine/bankdev.h"
-#include "machine/nvram.h"
+
#include "bus/rs232/rs232.h"
#include "bus/sunkbd/sunkbd.h"
-#include "machine/timekpr.h"
+#include "cpu/sparc/sparc.h"
+#include "machine/bankdev.h"
+#include "machine/ncr5390.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
-#include "machine/ncr5390.h"
+#include "machine/nvram.h"
+#include "machine/ram.h"
+#include "machine/timekpr.h"
+#include "machine/timekpr.h"
#include "machine/upd765.h"
-#include "formats/pc_dsk.h"
-#include "formats/mfi_dsk.h"
+#include "machine/z80scc.h"
#include "debug/debugcon.h"
#include "debug/debugcmd.h"
#include "debugger.h"
+#include "screen.h"
+
+#include "formats/mfi_dsk.h"
+#include "formats/pc_dsk.h"
+
#define SUN4_LOG_FCODES (0)
diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp
index 6d8b54d0bae..b264d29e3fe 100644
--- a/src/mame/drivers/suna16.cpp
+++ b/src/mame/drivers/suna16.cpp
@@ -26,6 +26,7 @@ Year + Game By Board Hardware
#include "emu.h"
#include "includes/suna16.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/3526intf.h"
@@ -33,6 +34,8 @@ Year + Game By Board Hardware
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "sound/ym2151.h"
+#include "speaker.h"
+
/***************************************************************************
diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp
index d63735cf2e5..0e315115ea6 100644
--- a/src/mame/drivers/suna8.cpp
+++ b/src/mame/drivers/suna8.cpp
@@ -37,6 +37,7 @@ Notes:
#include "emu.h"
#include "includes/suna8.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/2203intf.h"
@@ -44,6 +45,8 @@ Notes:
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#define SUNA8_MASTER_CLOCK XTAL_24MHz
diff --git a/src/mame/drivers/supbtime.cpp b/src/mame/drivers/supbtime.cpp
index d4d4ff92354..7ccf5109050 100644
--- a/src/mame/drivers/supbtime.cpp
+++ b/src/mame/drivers/supbtime.cpp
@@ -23,11 +23,15 @@ down hardware (it doesn't write any good sound data btw, mostly zeros).
***************************************************************************/
#include "emu.h"
+#include "includes/supbtime.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/supbtime.h"
+#include "screen.h"
+#include "speaker.h"
+
/******************************************************************************/
diff --git a/src/mame/drivers/supdrapo.cpp b/src/mame/drivers/supdrapo.cpp
index 7db30ec1645..26e37acb32a 100644
--- a/src/mame/drivers/supdrapo.cpp
+++ b/src/mame/drivers/supdrapo.cpp
@@ -57,16 +57,18 @@
************************************************************************/
-
-#define MASTER_CLOCK XTAL_12MHz
-#define CPU_CLOCK MASTER_CLOCK/4 /* guess */
-#define SND_CLOCK MASTER_CLOCK/8 /* guess */
-
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_12MHz
+#define CPU_CLOCK MASTER_CLOCK/4 /* guess */
+#define SND_CLOCK MASTER_CLOCK/8 /* guess */
class supdrapo_state : public driver_device
{
diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp
index a32ea281822..258aec04a26 100644
--- a/src/mame/drivers/supduck.cpp
+++ b/src/mame/drivers/supduck.cpp
@@ -28,6 +28,8 @@ All clock timing comes from crystal 1
#include "sound/okim6295.h"
#include "video/bufsprite.h"
#include "video/tigeroad_spr.h"
+#include "screen.h"
+#include "speaker.h"
class supduck_state : public driver_device
{
diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp
index 0461b300d48..820c9c5b866 100644
--- a/src/mame/drivers/super80.cpp
+++ b/src/mame/drivers/super80.cpp
@@ -217,9 +217,14 @@ ToDo:
***********************************************************************************************************/
#include "emu.h"
-#include "super80.lh"
#include "includes/super80.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "super80.lh"
+
#define MASTER_CLOCK (XTAL_12MHz)
#define PIXEL_CLOCK (MASTER_CLOCK/2)
diff --git a/src/mame/drivers/superchs.cpp b/src/mame/drivers/superchs.cpp
index f0b49df03dc..436646a5880 100644
--- a/src/mame/drivers/superchs.cpp
+++ b/src/mame/drivers/superchs.cpp
@@ -41,13 +41,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/superchs.h"
+#include "audio/taito_en.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "sound/es5506.h"
-#include "audio/taito_en.h"
+#include "screen.h"
#include "superchs.lh"
-#include "includes/superchs.h"
/*********************************************************************/
diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp
index 044661c4805..359110b6645 100644
--- a/src/mame/drivers/supercrd.cpp
+++ b/src/mame/drivers/supercrd.cpp
@@ -160,15 +160,17 @@
***********************************************************************************/
-
-#define MASTER_CLOCK XTAL_16MHz
-
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
-#include "video/mc6845.h"
#include "machine/nvram.h"
+#include "video/mc6845.h"
#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_16MHz
class supercrd_state : public driver_device
diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp
index 2b3dbb856ef..7705d317aee 100644
--- a/src/mame/drivers/superdq.cpp
+++ b/src/mame/drivers/superdq.cpp
@@ -19,14 +19,16 @@
*************************************************************************/
-#define MASTER_CLOCK 20000000
-
-
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/sn76496.h"
#include "machine/ldv1000.h"
+#include "sound/sn76496.h"
#include "video/resnet.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK 20000000
+
class superdq_state : public driver_device
{
diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp
index 56d9aa54adb..28a1d9e275c 100644
--- a/src/mame/drivers/superqix.cpp
+++ b/src/mame/drivers/superqix.cpp
@@ -172,6 +172,8 @@ code at z80:0093:
#include "cpu/z80/z80.h"
#include "cpu/mcs51/mcs51.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
SAMPLES_START_CB_MEMBER(hotsmash_state::pbillian_sh_start)
diff --git a/src/mame/drivers/supertnk.cpp b/src/mame/drivers/supertnk.cpp
index c2b53c2c369..0a8e6388689 100644
--- a/src/mame/drivers/supertnk.cpp
+++ b/src/mame/drivers/supertnk.cpp
@@ -101,6 +101,8 @@ CRU lines:
#include "cpu/tms9900/tms9980a.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp
index b0df93878b7..45480e8454a 100644
--- a/src/mame/drivers/superwng.cpp
+++ b/src/mame/drivers/superwng.cpp
@@ -35,6 +35,9 @@ TODO:
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp
index 2459e7229aa..db7f74e59e1 100644
--- a/src/mame/drivers/supracan.cpp
+++ b/src/mame/drivers/supracan.cpp
@@ -80,6 +80,7 @@ DEBUG TRICKS:
#include "cpu/m6502/m6502.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "screen.h"
#include "softlist.h"
#define SOUNDCPU_BOOT_HACK (1)
diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp
index ec9fb798a3a..beec8b8ea15 100644
--- a/src/mame/drivers/suprgolf.cpp
+++ b/src/mame/drivers/suprgolf.cpp
@@ -24,9 +24,12 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/i8255.h"
#include "sound/2203intf.h"
#include "sound/msm5205.h"
-#include "machine/i8255.h"
+#include "screen.h"
+#include "speaker.h"
+
class suprgolf_state : public driver_device
{
diff --git a/src/mame/drivers/suprloco.cpp b/src/mame/drivers/suprloco.cpp
index 89c53cda56c..5ec6b24f543 100644
--- a/src/mame/drivers/suprloco.cpp
+++ b/src/mame/drivers/suprloco.cpp
@@ -22,10 +22,13 @@ Sega PCB 834-5137
******************************************************************************/
#include "emu.h"
+#include "includes/suprloco.h"
+
#include "cpu/z80/z80.h"
#include "machine/segacrpt_device.h"
#include "sound/sn76496.h"
-#include "includes/suprloco.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(suprloco_state::soundport_w)
{
diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp
index 34a3e480ce2..b92e5264bcd 100644
--- a/src/mame/drivers/suprnova.cpp
+++ b/src/mame/drivers/suprnova.cpp
@@ -147,12 +147,16 @@ NEP-16
*/
#include "emu.h"
-#include "sound/ymz280b.h"
-#include "cpu/sh2/sh2.h"
-#include "machine/nvram.h"
-#include "video/sknsspr.h"
#include "includes/suprnova.h"
+
+#include "cpu/sh2/sh2.h"
#include "machine/msm6242.h"
+#include "machine/nvram.h"
+#include "sound/ymz280b.h"
+
+#include "screen.h"
+#include "speaker.h"
+
static void hit_calc_orig(uint16_t p, uint16_t s, uint16_t org, uint16_t *l, uint16_t *r)
{
diff --git a/src/mame/drivers/suprridr.cpp b/src/mame/drivers/suprridr.cpp
index c6693b017c4..2bda5fe3f9c 100644
--- a/src/mame/drivers/suprridr.cpp
+++ b/src/mame/drivers/suprridr.cpp
@@ -84,10 +84,13 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/suprridr.h"
+
+#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
void suprridr_state::machine_start()
diff --git a/src/mame/drivers/suprslam.cpp b/src/mame/drivers/suprslam.cpp
index b6e2a0e700a..be6890306b1 100644
--- a/src/mame/drivers/suprslam.cpp
+++ b/src/mame/drivers/suprslam.cpp
@@ -83,12 +83,13 @@ EB26IC73.BIN 27C240 / Main Program
******************************************************************************/
#include "emu.h"
+#include "includes/suprslam.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
-
#include "sound/2610intf.h"
-#include "video/vsystem_spr.h"
-#include "includes/suprslam.h"
+#include "screen.h"
+#include "speaker.h"
/*** SOUND *******************************************************************/
diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp
index df8cce02f09..2e226c1fa96 100644
--- a/src/mame/drivers/surpratk.cpp
+++ b/src/mame/drivers/surpratk.cpp
@@ -11,11 +11,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/surpratk.h"
+#include "includes/konamipt.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/surpratk.h"
+#include "speaker.h"
+
INTERRUPT_GEN_MEMBER(surpratk_state::surpratk_interrupt)
{
diff --git a/src/mame/drivers/sv8000.cpp b/src/mame/drivers/sv8000.cpp
index 4c45c6aed9e..e0ba58e1387 100644
--- a/src/mame/drivers/sv8000.cpp
+++ b/src/mame/drivers/sv8000.cpp
@@ -32,7 +32,9 @@ Looking at the code of the cartridges it seems there is:
#include "video/mc6847.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
class sv8000_state : public driver_device
{
diff --git a/src/mame/drivers/svi318.cpp b/src/mame/drivers/svi318.cpp
index 6708230dfbc..ddd80d54f46 100644
--- a/src/mame/drivers/svi318.cpp
+++ b/src/mame/drivers/svi318.cpp
@@ -8,20 +8,25 @@
***************************************************************************/
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "machine/ram.h"
+#include "imagedev/cassette.h"
#include "machine/bankdev.h"
#include "machine/i8255.h"
-#include "video/tms9928a.h"
+#include "machine/ram.h"
#include "sound/ay8910.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "sound/wave.h"
-#include "imagedev/cassette.h"
-#include "formats/svi_cas.h"
-#include "bus/generic/slot.h"
+#include "video/tms9928a.h"
+
#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
#include "bus/svi3x8/expander/expander.h"
+
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/svi_cas.h"
//**************************************************************************
diff --git a/src/mame/drivers/svision.cpp b/src/mame/drivers/svision.cpp
index 1ac8bbe699c..bcd5649eb4a 100644
--- a/src/mame/drivers/svision.cpp
+++ b/src/mame/drivers/svision.cpp
@@ -8,10 +8,13 @@
#include "emu.h"
#include "includes/svision.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#include "svision.lh"
+
#define MAKE8_RGB32(red3, green3, blue2) ( ( (red3)<<(16+5)) | ( (green3)<<(8+5)) | ( (blue2)<<(0+6)) )
#define MAKE9_RGB32(red3, green3, blue3) ( ( (red3)<<(16+5)) | ( (green3)<<(8+5)) | ( (blue3)<<(0+5)) )
#define MAKE12_RGB32(red4, green4, blue4) ( ( (red4)<<(16+4)) | ((green4)<<(8+4)) | ((blue4)<<(0+4)) )
diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp
index adb16ad8f1a..f67d892c818 100644
--- a/src/mame/drivers/svmu.cpp
+++ b/src/mame/drivers/svmu.cpp
@@ -16,10 +16,14 @@
#include "cpu/lc8670/lc8670.h"
#include "imagedev/snapquik.h"
#include "machine/intelfsh.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
#include "svmu.lh"
+
#define PIXEL_SIZE 7
#define PIXEL_DISTANCE 1
diff --git a/src/mame/drivers/swyft.cpp b/src/mame/drivers/swyft.cpp
index a1da07c95e8..733e921accb 100644
--- a/src/mame/drivers/swyft.cpp
+++ b/src/mame/drivers/swyft.cpp
@@ -253,6 +253,17 @@ ToDo:
****************************************************************************/
+// Includes
+#include "emu.h"
+#include "bus/centronics/ctronics.h"
+#include "cpu/m68000/m68000.h"
+#include "machine/6522via.h"
+#include "machine/6850acia.h"
+#include "machine/clock.h"
+#include "sound/spkrdev.h"
+#include "screen.h"
+
+
// Defines
#undef DEBUG_GA2OPR_W
@@ -284,15 +295,6 @@ ToDo:
#define DEBUG_SWYFT_VIA1 1
-// Includes
-#include "emu.h"
-#include "cpu/m68000/m68000.h"
-#include "machine/clock.h"
-#include "machine/6850acia.h"
-#include "machine/6522via.h"
-#include "sound/speaker.h"
-#include "bus/centronics/ctronics.h"
-
class swyft_state : public driver_device
{
public:
diff --git a/src/mame/drivers/sym1.cpp b/src/mame/drivers/sym1.cpp
index e2fffd8ee1c..a6674507be4 100644
--- a/src/mame/drivers/sym1.cpp
+++ b/src/mame/drivers/sym1.cpp
@@ -7,12 +7,16 @@
***************************************************************************/
#include "emu.h"
+
#include "cpu/m6502/m6502.h"
-#include "machine/ram.h"
-#include "sound/speaker.h"
-#include "machine/mos6530n.h"
#include "machine/6522via.h"
#include "machine/74145.h"
+#include "machine/mos6530n.h"
+#include "machine/ram.h"
+#include "sound/spkrdev.h"
+
+#include "speaker.h"
+
#include "sym1.lh"
diff --git a/src/mame/drivers/sys2900.cpp b/src/mame/drivers/sys2900.cpp
index 3e263d74931..ecfb5e89659 100644
--- a/src/mame/drivers/sys2900.cpp
+++ b/src/mame/drivers/sys2900.cpp
@@ -37,6 +37,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class sys2900_state : public driver_device
diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp
index 2322dd300f4..47f623c9bbe 100644
--- a/src/mame/drivers/system1.cpp
+++ b/src/mame/drivers/system1.cpp
@@ -218,12 +218,14 @@ seem to have access to.
******************************************************************************/
#include "emu.h"
+#include "includes/system1.h"
+
#include "cpu/mcs51/mcs51.h"
#include "machine/z80pio.h"
#include "machine/segacrpt_device.h"
#include "machine/mc8123.h"
#include "sound/sn76496.h"
-#include "includes/system1.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_20MHz
diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp
index 0f7bc02bb07..79d7e6376fc 100644
--- a/src/mame/drivers/system16.cpp
+++ b/src/mame/drivers/system16.cpp
@@ -89,15 +89,18 @@
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "includes/segaipt.h"
#include "includes/system16.h"
+#include "includes/segaipt.h"
+
#include "cpu/m68000/m68000.h"
-#include "sound/ym2151.h"
-#include "sound/2612intf.h"
-#include "sound/rf5c68.h"
+#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
+#include "sound/2612intf.h"
#include "sound/okim6295.h"
+#include "sound/rf5c68.h"
+#include "sound/ym2151.h"
+#include "speaker.h"
+
#define SHADOW_COLORS_MULTIPLIER 3
diff --git a/src/mame/drivers/tagteam.cpp b/src/mame/drivers/tagteam.cpp
index cc593cfd304..a8878e6c30c 100644
--- a/src/mame/drivers/tagteam.cpp
+++ b/src/mame/drivers/tagteam.cpp
@@ -28,10 +28,14 @@ TODO:
#include "emu.h"
#include "includes/tagteam.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
void tagteam_state::machine_start()
{
diff --git a/src/mame/drivers/tail2nos.cpp b/src/mame/drivers/tail2nos.cpp
index ffee9010381..521f4a6c53d 100644
--- a/src/mame/drivers/tail2nos.cpp
+++ b/src/mame/drivers/tail2nos.cpp
@@ -11,10 +11,13 @@
***************************************************************************/
#include "emu.h"
+#include "includes/tail2nos.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/2608intf.h"
-#include "includes/tail2nos.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(tail2nos_state::sound_command_w)
diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp
index 1bd08268b01..51158caca72 100644
--- a/src/mame/drivers/taito.cpp
+++ b/src/mame/drivers/taito.cpp
@@ -42,16 +42,20 @@ ToDO:
*****************************************************************************************/
#include "emu.h"
+#include "machine/genpin.h"
+
#include "cpu/i8085/i8085.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
-#include "machine/genpin.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/votrax.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#include "taito.lh"
+
class taito_state : public genpin_class
{
public:
diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp
index 93c3fe445f7..e97878c4030 100644
--- a/src/mame/drivers/taito_b.cpp
+++ b/src/mame/drivers/taito_b.cpp
@@ -179,15 +179,18 @@ TODO!
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/taito_b.h"
#include "includes/taitoipt.h"
+#include "audio/taitosnd.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
-#include "audio/taitosnd.h"
#include "sound/2203intf.h"
#include "sound/2610intf.h"
#include "sound/okim6295.h"
-#include "includes/taito_b.h"
+#include "speaker.h"
+
WRITE8_MEMBER(taitob_state::bankswitch_w)
{
diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp
index fdcbb3e53d9..3d4975db4f0 100644
--- a/src/mame/drivers/taito_f2.cpp
+++ b/src/mame/drivers/taito_f2.cpp
@@ -265,15 +265,18 @@ Notes:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/taito_f2.h"
#include "includes/taitoipt.h"
+#include "audio/taitosnd.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
-#include "audio/taitosnd.h"
-#include "includes/taito_f2.h"
#include "sound/2203intf.h"
#include "sound/2610intf.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
/**********************************************************
diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp
index 0606a1e194f..dab3f71648f 100644
--- a/src/mame/drivers/taito_f3.cpp
+++ b/src/mame/drivers/taito_f3.cpp
@@ -33,12 +33,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/taito_f3.h"
+#include "audio/taito_en.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
-#include "includes/taito_f3.h"
#include "sound/es5506.h"
-#include "audio/taito_en.h"
#include "sound/okim6295.h"
+#include "speaker.h"
/******************************************************************************/
diff --git a/src/mame/drivers/taito_h.cpp b/src/mame/drivers/taito_h.cpp
index 9a2c1932e7e..ad53e20112c 100644
--- a/src/mame/drivers/taito_h.cpp
+++ b/src/mame/drivers/taito_h.cpp
@@ -143,12 +143,15 @@ some kind of zoom table?
****************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m68000/m68000.h"
+#include "includes/taito_h.h"
#include "includes/taitoipt.h"
#include "audio/taitosnd.h"
+
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
-#include "includes/taito_h.h"
+#include "screen.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp
index 268e222bdc3..85f7cb46a9f 100644
--- a/src/mame/drivers/taito_l.cpp
+++ b/src/mame/drivers/taito_l.cpp
@@ -65,6 +65,9 @@ puzznici note
#include "sound/2610intf.h"
#include "sound/msm5205.h"
+#include "screen.h"
+#include "speaker.h"
+
namespace {
diff --git a/src/mame/drivers/taito_o.cpp b/src/mame/drivers/taito_o.cpp
index 224d5f3b746..4ad121ed8ef 100644
--- a/src/mame/drivers/taito_o.cpp
+++ b/src/mame/drivers/taito_o.cpp
@@ -31,10 +31,14 @@ TODO:
*****************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/taito_o.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
-#include "includes/taito_o.h"
+#include "screen.h"
+#include "speaker.h"
+
static const int clear_hack = 1;
diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp
index 215a125b58a..0ebaead9075 100644
--- a/src/mame/drivers/taito_x.cpp
+++ b/src/mame/drivers/taito_x.cpp
@@ -316,14 +316,18 @@ Stephh's notes (based on the game M68000 code and some tests) :
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m68000/m68000.h"
+#include "includes/taito_x.h"
#include "includes/taitoipt.h"
#include "audio/taitosnd.h"
-#include "includes/taito_x.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/cchip.h"
#include "sound/2610intf.h"
#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
+
READ16_MEMBER(taitox_state::superman_dsw_input_r)
{
diff --git a/src/mame/drivers/taito_z.cpp b/src/mame/drivers/taito_z.cpp
index fa5da0a08a9..3b60793109f 100644
--- a/src/mame/drivers/taito_z.cpp
+++ b/src/mame/drivers/taito_z.cpp
@@ -968,17 +968,21 @@ DIP switches are not verified
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/taito_z.h"
#include "includes/taitoipt.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
#include "sound/2610intf.h"
#include "sound/flt_vol.h"
-#include "includes/taito_z.h"
+#include "screen.h"
+#include "speaker.h"
#include "contcirc.lh"
#include "dblaxle.lh"
+
void taitoz_state::parse_cpu_control( )
{
/* bit 0 enables cpu B */
diff --git a/src/mame/drivers/taitoair.cpp b/src/mame/drivers/taitoair.cpp
index 98d84752749..4bc372f2ab1 100644
--- a/src/mame/drivers/taitoair.cpp
+++ b/src/mame/drivers/taitoair.cpp
@@ -195,13 +195,16 @@ perhaps? The two writes seem to take only two values.
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m68000/m68000.h"
-#include "includes/taitoipt.h"
#include "includes/taitoair.h"
+#include "includes/taitoipt.h"
#include "audio/taitosnd.h"
+
+#include "cpu/m68000/m68000.h"
#include "cpu/tms32025/tms32025.h"
+#include "cpu/z80/z80.h"
#include "sound/2610intf.h"
+#include "speaker.h"
+
/***********************************************************
MEMORY handlers
diff --git a/src/mame/drivers/taitogn.cpp b/src/mame/drivers/taitogn.cpp
index 17f9344ae1f..12d18960d51 100644
--- a/src/mame/drivers/taitogn.cpp
+++ b/src/mame/drivers/taitogn.cpp
@@ -331,17 +331,21 @@ Type 3 (PCMCIA Compact Flash Adaptor + Compact Flash card, sealed together with
#include "emu.h"
#include "audio/taito_zm.h"
+
#include "cpu/psx/psx.h"
#include "machine/at28c16.h"
#include "machine/ataflash.h"
#include "machine/bankdev.h"
+#include "machine/cat702.h"
#include "machine/intelfsh.h"
#include "machine/mb3773.h"
+#include "machine/ram.h"
#include "machine/rf5c296.h"
-#include "machine/cat702.h"
#include "machine/znmcu.h"
#include "sound/spu.h"
#include "video/psx.h"
+#include "speaker.h"
+
class taitogn_state : public driver_device
{
diff --git a/src/mame/drivers/taitojc.cpp b/src/mame/drivers/taitojc.cpp
index 8e857650e7f..6a21eacf9dd 100644
--- a/src/mame/drivers/taitojc.cpp
+++ b/src/mame/drivers/taitojc.cpp
@@ -377,15 +377,18 @@ Notes:
*/
#include "emu.h"
-#include "cpu/tms32051/tms32051.h"
+#include "includes/taitojc.h"
+#include "audio/taito_en.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/mc68hc11/mc68hc11.h"
+#include "cpu/tms32051/tms32051.h"
+#include "machine/eepromser.h"
+#include "machine/taitoio.h"
#include "sound/es5506.h"
#include "sound/okim6295.h"
-#include "machine/taitoio.h"
-#include "machine/eepromser.h"
-#include "audio/taito_en.h"
-#include "includes/taitojc.h"
+
+#include "speaker.h"
#include "dendego.lh"
diff --git a/src/mame/drivers/taitosj.cpp b/src/mame/drivers/taitosj.cpp
index 1e3d6578a6a..1f5e1fcf184 100644
--- a/src/mame/drivers/taitosj.cpp
+++ b/src/mame/drivers/taitosj.cpp
@@ -167,8 +167,10 @@ TODO:
#include "emu.h"
#include "includes/taitosj.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
+#include "speaker.h"
WRITE8_MEMBER(taitosj_state::taitosj_sndnmi_msk_w)
diff --git a/src/mame/drivers/taitotx.cpp b/src/mame/drivers/taitotx.cpp
index 864d9e0e830..1aff70a3115 100644
--- a/src/mame/drivers/taitotx.cpp
+++ b/src/mame/drivers/taitotx.cpp
@@ -118,6 +118,7 @@
#include "emu.h"
#include "cpu/i386/i386.h"
+#include "screen.h"
class taito_type_x_state : public driver_device
{
diff --git a/src/mame/drivers/taitowlf.cpp b/src/mame/drivers/taitowlf.cpp
index 0e9268ee8ad..d04f99726c3 100644
--- a/src/mame/drivers/taitowlf.cpp
+++ b/src/mame/drivers/taitowlf.cpp
@@ -25,9 +25,10 @@ clocks 50MHz (near 3DFX) and 14.31818MHz (near RAMDAC)
*/
+#include "emu.h"
+
#define ENABLE_VGA 0
-#include "emu.h"
#include "cpu/i386/i386.h"
#include "machine/lpci.h"
#include "machine/pcshare.h"
@@ -35,6 +36,7 @@ clocks 50MHz (near 3DFX) and 14.31818MHz (near RAMDAC)
#if ENABLE_VGA
#include "video/pc_vga.h"
#endif
+#include "screen.h"
class taitowlf_state : public pcat_base_state
{
diff --git a/src/mame/drivers/tamag1.cpp b/src/mame/drivers/tamag1.cpp
index 36dd47e59e7..9a654fe3ecd 100644
--- a/src/mame/drivers/tamag1.cpp
+++ b/src/mame/drivers/tamag1.cpp
@@ -10,7 +10,9 @@
#include "emu.h"
#include "cpu/e0c6200/e0c6s46.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "screen.h"
+#include "speaker.h"
#include "tama.lh"
diff --git a/src/mame/drivers/tandy1t.cpp b/src/mame/drivers/tandy1t.cpp
index fbd4aadea87..8a14fd740de 100644
--- a/src/mame/drivers/tandy1t.cpp
+++ b/src/mame/drivers/tandy1t.cpp
@@ -62,7 +62,7 @@ void t1000_mb_device::device_start()
{
}
-const device_type T1000_MOTHERBOARD = &device_creator<t1000_mb_device>;
+const device_type T1000_MOTHERBOARD = device_creator<t1000_mb_device>;
class tandy1000_state : public driver_device
{
diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp
index f99b575f520..5220fb7e5a9 100644
--- a/src/mame/drivers/tandy2k.cpp
+++ b/src/mame/drivers/tandy2k.cpp
@@ -24,8 +24,12 @@
#include "emu.h"
#include "includes/tandy2k.h"
+
#include "machine/pckeybrd.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
#define LOG 1
diff --git a/src/mame/drivers/tank8.cpp b/src/mame/drivers/tank8.cpp
index bd1f7938c70..790f5432829 100644
--- a/src/mame/drivers/tank8.cpp
+++ b/src/mame/drivers/tank8.cpp
@@ -7,9 +7,10 @@ Atari Tank 8 driver
***************************************************************************/
#include "emu.h"
-#include "cpu/m6800/m6800.h"
#include "includes/tank8.h"
+#include "cpu/m6800/m6800.h"
#include "sound/discrete.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/tankbatt.cpp b/src/mame/drivers/tankbatt.cpp
index 9db62e1f5e2..fd53ec06a7e 100644
--- a/src/mame/drivers/tankbatt.cpp
+++ b/src/mame/drivers/tankbatt.cpp
@@ -59,9 +59,12 @@ Known issues:
***************************************************************************/
#include "emu.h"
+#include "includes/tankbatt.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/samples.h"
-#include "includes/tankbatt.h"
+#include "screen.h"
+#include "speaker.h"
void tankbatt_state::machine_start()
diff --git a/src/mame/drivers/tankbust.cpp b/src/mame/drivers/tankbust.cpp
index 3624a255485..cefbaf8934a 100644
--- a/src/mame/drivers/tankbust.cpp
+++ b/src/mame/drivers/tankbust.cpp
@@ -19,9 +19,12 @@ To do:
***************************************************************************/
#include "emu.h"
+#include "includes/tankbust.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
-#include "includes/tankbust.h"
+#include "screen.h"
+#include "speaker.h"
void tankbust_state::machine_start()
diff --git a/src/mame/drivers/taotaido.cpp b/src/mame/drivers/taotaido.cpp
index a0b9c4c572f..3f5fa1c362b 100644
--- a/src/mame/drivers/taotaido.cpp
+++ b/src/mame/drivers/taotaido.cpp
@@ -63,14 +63,15 @@ zooming might be wrong
***************************************************************************/
-
-
#include "emu.h"
+#include "includes/taotaido.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
-#include "video/vsystem_spr.h"
-#include "includes/taotaido.h"
+#include "screen.h"
+#include "speaker.h"
+
#define TAOTAIDO_SHOW_ALL_INPUTS 0
diff --git a/src/mame/drivers/tapatune.cpp b/src/mame/drivers/tapatune.cpp
index b09c1bd95be..2ded0fe499c 100644
--- a/src/mame/drivers/tapatune.cpp
+++ b/src/mame/drivers/tapatune.cpp
@@ -41,6 +41,8 @@
#include "machine/ticket.h"
#include "sound/bsmt2000.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp
index 81d810a1211..6a82c2b6c5f 100644
--- a/src/mame/drivers/targeth.cpp
+++ b/src/mame/drivers/targeth.cpp
@@ -11,9 +11,13 @@ The DS5002FP has 32KB undumped gameplay code making the game unplayable :_(
***************************************************************************/
#include "emu.h"
+#include "includes/targeth.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
-#include "includes/targeth.h"
+#include "screen.h"
+#include "speaker.h"
+
static const gfx_layout tilelayout16_0x080000 =
{
diff --git a/src/mame/drivers/tasman.cpp b/src/mame/drivers/tasman.cpp
index cdaf9f6ed0d..c2a0e534600 100644
--- a/src/mame/drivers/tasman.cpp
+++ b/src/mame/drivers/tasman.cpp
@@ -28,6 +28,8 @@
#include "video/k054156_k054157_k056832.h"
#include "video/k055555.h"
#include "machine/eepromser.h"
+#include "speaker.h"
+
#define CUSTOM_DRAW 1
diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp
index 7d500174c79..768128b7a86 100644
--- a/src/mame/drivers/tatsumi.cpp
+++ b/src/mame/drivers/tatsumi.cpp
@@ -140,11 +140,14 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/nec/nec.h"
#include "includes/tatsumi.h"
-#include "sound/ym2151.h"
+
+#include "cpu/nec/nec.h"
+#include "cpu/z80/z80.h"
#include "machine/nvram.h"
+#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
#include "roundup5.lh"
diff --git a/src/mame/drivers/tattack.cpp b/src/mame/drivers/tattack.cpp
index 290f03c17d5..cf981a9cdff 100644
--- a/src/mame/drivers/tattack.cpp
+++ b/src/mame/drivers/tattack.cpp
@@ -46,6 +46,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class tattack_state : public driver_device
diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp
index e6198db3d6f..2de47b6e89c 100644
--- a/src/mame/drivers/tavernie.cpp
+++ b/src/mame/drivers/tavernie.cpp
@@ -49,18 +49,23 @@ Z - more scan lines per row (cursor is bigger)
****************************************************************************/
#include "emu.h"
+
#include "bus/rs232/rs232.h"
#include "cpu/m6809/m6809.h"
+#include "imagedev/cassette.h"
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
#include "machine/clock.h"
-#include "video/mc6845.h"
#include "machine/keyboard.h"
-#include "imagedev/cassette.h"
#include "machine/wd_fdc.h"
-#include "sound/wave.h"
#include "sound/beep.h"
+#include "sound/wave.h"
+#include "video/mc6845.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "tavernie.lh"
class tavernie_state : public driver_device
diff --git a/src/mame/drivers/taxidriv.cpp b/src/mame/drivers/taxidriv.cpp
index b811df8009c..b36d5dcfae8 100644
--- a/src/mame/drivers/taxidriv.cpp
+++ b/src/mame/drivers/taxidriv.cpp
@@ -12,10 +12,13 @@ OTHER: 5 * M5L8255AP
***************************************************************************/
#include "emu.h"
+#include "includes/taxidriv.h"
+
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
-#include "includes/taxidriv.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
void taxidriv_state::machine_start()
diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp
index 5e372595193..f7ff8bbbb5c 100644
--- a/src/mame/drivers/tbowl.cpp
+++ b/src/mame/drivers/tbowl.cpp
@@ -15,10 +15,14 @@ Might be some priority glitches
***/
#include "emu.h"
+#include "includes/tbowl.h"
+
#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
+
#include "rendlay.h"
-#include "includes/tbowl.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(tbowl_state::coincounter_w)
diff --git a/src/mame/drivers/tceptor.cpp b/src/mame/drivers/tceptor.cpp
index 6530eb6bd51..4a6a51709cf 100644
--- a/src/mame/drivers/tceptor.cpp
+++ b/src/mame/drivers/tceptor.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "includes/tceptor.h"
+
#include "cpu/m6502/m65c02.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
@@ -19,8 +20,11 @@
#include "sound/ym2151.h"
#include "sound/volt_reg.h"
#include "rendlay.h"
+#include "speaker.h"
+
#include "tceptor2.lh"
+
/*******************************************************************/
diff --git a/src/mame/drivers/tcl.cpp b/src/mame/drivers/tcl.cpp
index 88e43458c33..9b64631fb91 100644
--- a/src/mame/drivers/tcl.cpp
+++ b/src/mame/drivers/tcl.cpp
@@ -44,6 +44,8 @@ Notes:
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class tcl_state : public driver_device
diff --git a/src/mame/drivers/tdv2324.cpp b/src/mame/drivers/tdv2324.cpp
index ef0756c4a34..1e7d5c4f792 100644
--- a/src/mame/drivers/tdv2324.cpp
+++ b/src/mame/drivers/tdv2324.cpp
@@ -102,8 +102,11 @@
#include "emu.h"
#include "includes/tdv2324.h"
+
+#include "screen.h"
#include "softlist.h"
+
READ8_MEMBER( tdv2324_state::tdv2324_main_io_30 )
{
return 0xff;
diff --git a/src/mame/drivers/tec1.cpp b/src/mame/drivers/tec1.cpp
index a45c5022e99..c305b936050 100644
--- a/src/mame/drivers/tec1.cpp
+++ b/src/mame/drivers/tec1.cpp
@@ -73,9 +73,11 @@ JMON ToDo:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/speaker.h"
-#include "sound/wave.h"
#include "imagedev/cassette.h"
+#include "sound/spkrdev.h"
+#include "sound/wave.h"
+#include "speaker.h"
+
#include "tec1.lh"
diff --git a/src/mame/drivers/tecmo.cpp b/src/mame/drivers/tecmo.cpp
index c9f11f0d603..f06f31e2d96 100644
--- a/src/mame/drivers/tecmo.cpp
+++ b/src/mame/drivers/tecmo.cpp
@@ -55,11 +55,13 @@ f80b ????
***************************************************************************/
#include "emu.h"
+#include "includes/tecmo.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/3526intf.h"
#include "sound/3812intf.h"
-#include "includes/tecmo.h"
+#include "speaker.h"
WRITE8_MEMBER(tecmo_state::bankswitch_w)
diff --git a/src/mame/drivers/tecmo16.cpp b/src/mame/drivers/tecmo16.cpp
index 6a34ed999a9..86b2cb1ba9c 100644
--- a/src/mame/drivers/tecmo16.cpp
+++ b/src/mame/drivers/tecmo16.cpp
@@ -26,11 +26,14 @@ Notes:
******************************************************************************/
#include "emu.h"
+#include "includes/tecmo16.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
-#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/tecmo16.h"
+#include "sound/ym2151.h"
+#include "speaker.h"
+
/******************************************************************************/
diff --git a/src/mame/drivers/tecmosys.cpp b/src/mame/drivers/tecmosys.cpp
index 7dbac955c3d..6c9e5a7c88d 100644
--- a/src/mame/drivers/tecmosys.cpp
+++ b/src/mame/drivers/tecmosys.cpp
@@ -183,12 +183,14 @@ ae500w07.ad1 - M6295 Samples (23c4001)
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/tecmosys.h"
+
#include "cpu/m68000/m68000.h"
-#include "sound/okim6295.h"
+#include "cpu/z80/z80.h"
#include "sound/262intf.h"
+#include "sound/okim6295.h"
#include "sound/ymz280b.h"
+#include "speaker.h"
// It looks like this needs a synch between z80 and 68k ??? See z80:006A-0091
diff --git a/src/mame/drivers/tehkanwc.cpp b/src/mame/drivers/tehkanwc.cpp
index c97671a8230..9c6eba4621d 100644
--- a/src/mame/drivers/tehkanwc.cpp
+++ b/src/mame/drivers/tehkanwc.cpp
@@ -89,11 +89,15 @@ TO DO :
*/
#include "emu.h"
+#include "includes/tehkanwc.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "gridiron.lh"
-#include "includes/tehkanwc.h"
void tehkanwc_state::machine_start()
diff --git a/src/mame/drivers/tek405x.cpp b/src/mame/drivers/tek405x.cpp
index 2ce8c38351f..b15cb5f7d13 100644
--- a/src/mame/drivers/tek405x.cpp
+++ b/src/mame/drivers/tek405x.cpp
@@ -27,7 +27,10 @@
#include "emu.h"
#include "includes/tek405x.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
//**************************************************************************
// MACROS / CONSTANTS
diff --git a/src/mame/drivers/tek410x.cpp b/src/mame/drivers/tek410x.cpp
index 407658e0280..4aa5f7239c8 100644
--- a/src/mame/drivers/tek410x.cpp
+++ b/src/mame/drivers/tek410x.cpp
@@ -19,6 +19,8 @@
#include "emu.h"
#include "cpu/i86/i186.h"
+#include "screen.h"
+
#define I80188_TAG "i80188"
#define SCREEN_TAG "screen"
diff --git a/src/mame/drivers/tek440x.cpp b/src/mame/drivers/tek440x.cpp
index baa1b57970e..f1bb716e35e 100644
--- a/src/mame/drivers/tek440x.cpp
+++ b/src/mame/drivers/tek440x.cpp
@@ -42,11 +42,13 @@
***************************************************************************/
#include "emu.h"
+#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
#include "cpu/m6502/m6502.h"
#include "machine/mos6551.h" // debug tty
#include "machine/mc146818.h"
-#include "bus/rs232/rs232.h"
+#include "screen.h"
+
class tek440x_state : public driver_device
{
diff --git a/src/mame/drivers/tekxp33x.cpp b/src/mame/drivers/tekxp33x.cpp
index f6216f97b05..facbf3e3fb7 100644
--- a/src/mame/drivers/tekxp33x.cpp
+++ b/src/mame/drivers/tekxp33x.cpp
@@ -38,6 +38,8 @@
#include "emu.h"
#include "cpu/mips/r3000.h"
#include "cpu/tms34010/tms34010.h"
+#include "screen.h"
+
#define SCREEN_TAG "screen"
diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp
index 52aa2e411b1..23b38702f8d 100644
--- a/src/mame/drivers/tempest.cpp
+++ b/src/mame/drivers/tempest.cpp
@@ -283,6 +283,8 @@ Note: Roms for Tempest Analog Vector-Generator PCB Assembly A037383-03 or A03738
#include "video/vector.h"
#include "machine/atari_vg.h"
#include "sound/pokey.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK (XTAL_12_096MHz)
diff --git a/src/mame/drivers/terak.cpp b/src/mame/drivers/terak.cpp
index d16ac63cb67..b97a4e95311 100644
--- a/src/mame/drivers/terak.cpp
+++ b/src/mame/drivers/terak.cpp
@@ -10,6 +10,8 @@
#include "emu.h"
#include "cpu/t11/t11.h"
+#include "screen.h"
+
class terak_state : public driver_device
{
diff --git a/src/mame/drivers/terracre.cpp b/src/mame/drivers/terracre.cpp
index c9e2b6bd0dc..61e3a7ee078 100644
--- a/src/mame/drivers/terracre.cpp
+++ b/src/mame/drivers/terracre.cpp
@@ -82,12 +82,15 @@ AT-2
#include "emu.h"
#include "includes/terracre.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/3526intf.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
static const uint16_t mAmazonProtData[] =
diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp
index 379f92d38d9..ec9e10ff388 100644
--- a/src/mame/drivers/tetrisp2.cpp
+++ b/src/mame/drivers/tetrisp2.cpp
@@ -49,14 +49,19 @@ stepstag:
***************************************************************************/
#include "emu.h"
+#include "includes/tetrisp2.h"
+
#include "cpu/m68000/m68000.h"
+#include "machine/nvram.h"
+#include "machine/watchdog.h"
#include "sound/okim6295.h"
#include "sound/ymz280b.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "rocknms.lh"
#include "stepstag.lh"
-#include "includes/tetrisp2.h"
-#include "machine/nvram.h"
-#include "machine/watchdog.h"
/***************************************************************************
diff --git a/src/mame/drivers/tgtpanic.cpp b/src/mame/drivers/tgtpanic.cpp
index 9aeefbe5e37..fcc5d569b8c 100644
--- a/src/mame/drivers/tgtpanic.cpp
+++ b/src/mame/drivers/tgtpanic.cpp
@@ -13,6 +13,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class tgtpanic_state : public driver_device
diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp
index e427dd226e8..1ce7ade58b6 100644
--- a/src/mame/drivers/thayers.cpp
+++ b/src/mame/drivers/thayers.cpp
@@ -13,12 +13,15 @@
*/
#include "emu.h"
+#include "cpu/cop400/cop400.h"
#include "cpu/z80/z80.h"
#include "machine/ldstub.h"
#include "machine/ldv1000.h"
-#include "cpu/cop400/cop400.h"
+#include "speaker.h"
+
#include "thayers.lh"
+
#define LOG 0
struct ssi263_t
diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp
index 02273c20b22..de0200ec9b9 100644
--- a/src/mame/drivers/thedealr.cpp
+++ b/src/mame/drivers/thedealr.cpp
@@ -30,10 +30,13 @@
#include "emu.h"
#include "cpu/m6502/r65c02.h"
-#include "video/seta001.h"
-#include "sound/ay8910.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "sound/ay8910.h"
+#include "video/seta001.h"
+#include "screen.h"
+#include "speaker.h"
+
class thedealr_state : public driver_device
{
@@ -44,7 +47,7 @@ public:
m_subcpu(*this, "subcpu"),
m_seta001(*this, "spritegen"),
m_palette(*this, "palette")
- { }
+ { }
// devices
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/thedeep.cpp b/src/mame/drivers/thedeep.cpp
index 4917798bcc6..512d4c902b8 100644
--- a/src/mame/drivers/thedeep.cpp
+++ b/src/mame/drivers/thedeep.cpp
@@ -27,11 +27,15 @@ Notes:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/thedeep.h"
+
#include "cpu/m6502/m65c02.h"
#include "cpu/mcs51/mcs51.h"
-#include "includes/thedeep.h"
+#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
+#include "screen.h"
+#include "speaker.h"
+
/***************************************************************************
diff --git a/src/mame/drivers/thepit.cpp b/src/mame/drivers/thepit.cpp
index 28ebfb31d38..bd8fe558636 100644
--- a/src/mame/drivers/thepit.cpp
+++ b/src/mame/drivers/thepit.cpp
@@ -153,11 +153,14 @@ Player 2 and Player 1 share the same controls !
***************************************************************************/
#include "emu.h"
+#include "includes/thepit.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "includes/thepit.h"
+#include "screen.h"
+#include "speaker.h"
#define MASTER_CLOCK (18432000)
diff --git a/src/mame/drivers/thief.cpp b/src/mame/drivers/thief.cpp
index 071e348f26a..b7adbd56750 100644
--- a/src/mame/drivers/thief.cpp
+++ b/src/mame/drivers/thief.cpp
@@ -25,10 +25,14 @@ Credits:
******************************************************************/
#include "emu.h"
+#include "includes/thief.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
#include "sound/samples.h"
-#include "includes/thief.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_20MHz
diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp
index d08ae214174..8d91433c861 100644
--- a/src/mame/drivers/thomson.cpp
+++ b/src/mame/drivers/thomson.cpp
@@ -78,17 +78,21 @@
#include "emu.h"
#include "includes/thomson.h"
+
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
-#include "formats/cd90_640_dsk.h"
-#include "formats/basicdsk.h"
#include "imagedev/flopdrv.h"
#include "machine/6821pia.h"
#include "machine/clock.h"
#include "machine/ram.h"
#include "machine/wd_fdc.h"
#include "sound/volt_reg.h"
+
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/basicdsk.h"
+#include "formats/cd90_640_dsk.h"
/**************************** common *******************************/
diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp
index dff9d269dc4..a231bc3ce3e 100644
--- a/src/mame/drivers/thoop2.cpp
+++ b/src/mame/drivers/thoop2.cpp
@@ -16,10 +16,13 @@ pf: but some gameplay bugs - sprite positioning is incorrect, no enemies, jump a
***************************************************************************/
#include "emu.h"
+#include "includes/thoop2.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
#include "sound/okim6295.h"
-#include "includes/thoop2.h"
+#include "screen.h"
+#include "speaker.h"
void thoop2_state::machine_start()
diff --git a/src/mame/drivers/thunderj.cpp b/src/mame/drivers/thunderj.cpp
index 2521c4e20f1..da56a785aa1 100644
--- a/src/mame/drivers/thunderj.cpp
+++ b/src/mame/drivers/thunderj.cpp
@@ -37,10 +37,11 @@
#include "emu.h"
+#include "includes/thunderj.h"
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
#include "machine/atarigen.h"
-#include "includes/thunderj.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/thunderx.cpp b/src/mame/drivers/thunderx.cpp
index eb6557969fa..b384a0b94cc 100644
--- a/src/mame/drivers/thunderx.cpp
+++ b/src/mame/drivers/thunderx.cpp
@@ -33,13 +33,15 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/thunderx.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/ym2151.h"
-#include "includes/konamipt.h"
-#include "includes/thunderx.h"
+#include "speaker.h"
INTERRUPT_GEN_MEMBER(thunderx_state::vblank_interrupt)
diff --git a/src/mame/drivers/ti630.cpp b/src/mame/drivers/ti630.cpp
index 37dfbd6007d..5ebfadb696f 100644
--- a/src/mame/drivers/ti630.cpp
+++ b/src/mame/drivers/ti630.cpp
@@ -38,6 +38,8 @@ It means we probably would have to emulate a modem device for it to treat commun
#include "cpu/mcs51/mcs51.h"
#include "video/hd44780.h"
#include "rendlay.h"
+#include "screen.h"
+
class ti630_state : public driver_device
{
diff --git a/src/mame/drivers/ti74.cpp b/src/mame/drivers/ti74.cpp
index 7ae4ab0b623..1c0f4ae2f41 100644
--- a/src/mame/drivers/ti74.cpp
+++ b/src/mame/drivers/ti74.cpp
@@ -70,11 +70,12 @@
***************************************************************************/
#include "emu.h"
+#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
#include "cpu/tms7000/tms7000.h"
-#include "video/hd44780.h"
#include "machine/nvram.h"
-#include "bus/generic/slot.h"
-#include "bus/generic/carts.h"
+#include "video/hd44780.h"
+#include "screen.h"
#include "softlist.h"
#include "ti74.lh"
diff --git a/src/mame/drivers/ti85.cpp b/src/mame/drivers/ti85.cpp
index 179149c33d6..fc8aab49ddf 100644
--- a/src/mame/drivers/ti85.cpp
+++ b/src/mame/drivers/ti85.cpp
@@ -202,10 +202,14 @@ TI-86 ports:
***************************************************************************/
#include "emu.h"
+#include "includes/ti85.h"
+
#include "cpu/z80/z80.h"
#include "imagedev/snapquik.h"
-#include "includes/ti85.h"
#include "machine/bankdev.h"
+#include "screen.h"
+#include "speaker.h"
+
/* port i/o functions */
diff --git a/src/mame/drivers/ti89.cpp b/src/mame/drivers/ti89.cpp
index 34eabdebae4..9d79267f0bc 100644
--- a/src/mame/drivers/ti89.cpp
+++ b/src/mame/drivers/ti89.cpp
@@ -17,13 +17,15 @@
****************************************************************************/
-
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "includes/ti89.h"
-#include "machine/nvram.h"
+
+#include "cpu/m68000/m68000.h"
#include "machine/intelfsh.h"
+#include "machine/nvram.h"
#include "rendlay.h"
+#include "screen.h"
+
uint8_t ti68k_state::keypad_r()
{
diff --git a/src/mame/drivers/ti99_2.cpp b/src/mame/drivers/ti99_2.cpp
index 82415956646..b38df29fea5 100644
--- a/src/mame/drivers/ti99_2.cpp
+++ b/src/mame/drivers/ti99_2.cpp
@@ -82,6 +82,7 @@ would just have taken three extra tracks on the main board and a OR gate in an A
#include "emu.h"
#include "machine/tms9901.h"
#include "cpu/tms9900/tms9995.h"
+#include "screen.h"
class ti99_2_state : public driver_device
{
diff --git a/src/mame/drivers/ti99_4p.cpp b/src/mame/drivers/ti99_4p.cpp
index 00a4c3d779c..b846210f33c 100644
--- a/src/mame/drivers/ti99_4p.cpp
+++ b/src/mame/drivers/ti99_4p.cpp
@@ -116,14 +116,14 @@
*****************************************************************************/
#include "emu.h"
+#include "bus/ti99_peb/peribox.h"
+#include "bus/ti99x/joyport.h"
#include "cpu/tms9900/tms9900.h"
-#include "sound/wave.h"
-
-#include "machine/tms9901.h"
#include "imagedev/cassette.h"
-#include "bus/ti99x/joyport.h"
-#include "bus/ti99_peb/peribox.h"
#include "machine/ram.h"
+#include "machine/tms9901.h"
+#include "sound/wave.h"
+#include "speaker.h"
#define TMS9901_TAG "tms9901"
#define SGCPU_TAG "sgcpu"
diff --git a/src/mame/drivers/ti99_4x.cpp b/src/mame/drivers/ti99_4x.cpp
index 68960c44902..d42e0a4261f 100644
--- a/src/mame/drivers/ti99_4x.cpp
+++ b/src/mame/drivers/ti99_4x.cpp
@@ -52,9 +52,11 @@
#include "bus/ti99x/joyport.h"
#include "bus/ti99_peb/peribox.h"
-#include "softlist.h"
#include "machine/ram.h"
+#include "softlist.h"
+#include "speaker.h"
+
// Debugging
#define TRACE_READY 0
#define TRACE_INTERRUPTS 0
diff --git a/src/mame/drivers/ti99_8.cpp b/src/mame/drivers/ti99_8.cpp
index 8cc915b6a64..5d5c52888ca 100644
--- a/src/mame/drivers/ti99_8.cpp
+++ b/src/mame/drivers/ti99_8.cpp
@@ -188,6 +188,7 @@ Known Issues (MZ, 2010-11-07)
#include "bus/ti99_peb/peribox.h"
#include "softlist.h"
+#include "speaker.h"
// Debugging
#define TRACE_READY 0
diff --git a/src/mame/drivers/tiamc1.cpp b/src/mame/drivers/tiamc1.cpp
index 2af637a0f19..69ee80cead6 100644
--- a/src/mame/drivers/tiamc1.cpp
+++ b/src/mame/drivers/tiamc1.cpp
@@ -117,15 +117,20 @@
*/
+#include "emu.h"
+#include "includes/tiamc1.h"
+
+#include "cpu/i8085/i8085.h"
+#include "machine/i8255.h"
+#include "screen.h"
+#include "speaker.h"
+
+
#define MASTER_CLOCK (15750000)
#define CPU_CLOCK (MASTER_CLOCK / 9)
#define SND_CLOCK (MASTER_CLOCK / 9)
#define PIXEL_CLOCK (MASTER_CLOCK / 3)
-#include "emu.h"
-#include "cpu/i8085/i8085.h"
-#include "machine/i8255.h"
-#include "includes/tiamc1.h"
void tiamc1_state::machine_reset()
{
diff --git a/src/mame/drivers/ticalc1x.cpp b/src/mame/drivers/ticalc1x.cpp
index 40f27fce750..d7f52c1cf0b 100644
--- a/src/mame/drivers/ticalc1x.cpp
+++ b/src/mame/drivers/ticalc1x.cpp
@@ -21,6 +21,8 @@
#include "emu.h"
#include "includes/hh_tms1k.h"
+#include "speaker.h"
+
// internal artwork
#include "cmulti8.lh"
#include "dataman.lh"
diff --git a/src/mame/drivers/tickee.cpp b/src/mame/drivers/tickee.cpp
index e4305c097da..9cc0f2afb4a 100644
--- a/src/mame/drivers/tickee.cpp
+++ b/src/mame/drivers/tickee.cpp
@@ -23,12 +23,14 @@
#include "emu.h"
#include "cpu/tms34010/tms34010.h"
+#include "machine/nvram.h"
#include "machine/ticket.h"
-#include "video/tlc34076.h"
+#include "machine/watchdog.h"
#include "sound/ay8910.h"
#include "sound/okim6295.h"
-#include "machine/nvram.h"
-#include "machine/watchdog.h"
+#include "video/tlc34076.h"
+#include "screen.h"
+#include "speaker.h"
class tickee_state : public driver_device
diff --git a/src/mame/drivers/tigeroad.cpp b/src/mame/drivers/tigeroad.cpp
index 25164f91ad0..2d949670cbd 100644
--- a/src/mame/drivers/tigeroad.cpp
+++ b/src/mame/drivers/tigeroad.cpp
@@ -47,6 +47,8 @@ single plane board.
#include "emu.h"
#include "includes/tigeroad.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp
index 6104269de12..91149a0d020 100644
--- a/src/mame/drivers/tiki100.cpp
+++ b/src/mame/drivers/tiki100.cpp
@@ -24,7 +24,11 @@
#include "emu.h"
#include "includes/tiki100.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
/* Memory Banking */
diff --git a/src/mame/drivers/tim011.cpp b/src/mame/drivers/tim011.cpp
index 90b46467809..2e95c9de071 100644
--- a/src/mame/drivers/tim011.cpp
+++ b/src/mame/drivers/tim011.cpp
@@ -11,6 +11,7 @@
#include "emu.h"
#include "cpu/z180/z180.h"
#include "machine/upd765.h"
+#include "screen.h"
#define FDC9266_TAG "u43"
diff --git a/src/mame/drivers/tim100.cpp b/src/mame/drivers/tim100.cpp
index 382293af94c..5e80ae8c2f5 100644
--- a/src/mame/drivers/tim100.cpp
+++ b/src/mame/drivers/tim100.cpp
@@ -17,11 +17,12 @@ Notes:
*******************************************************************************************************/
#include "emu.h"
+#include "bus/rs232/rs232.h"
#include "cpu/i8085/i8085.h"
+#include "machine/clock.h"
#include "machine/i8251.h"
#include "video/i8275.h"
-#include "bus/rs232/rs232.h"
-#include "machine/clock.h"
+#include "screen.h"
class tim100_state : public driver_device
{
diff --git a/src/mame/drivers/timelimt.cpp b/src/mame/drivers/timelimt.cpp
index 0f130df9535..06147a0c131 100644
--- a/src/mame/drivers/timelimt.cpp
+++ b/src/mame/drivers/timelimt.cpp
@@ -14,11 +14,15 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/timelimt.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "includes/timelimt.h"
+#include "screen.h"
+#include "speaker.h"
+
/***************************************************************************/
diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp
index c1f189bde95..5c782878f65 100644
--- a/src/mame/drivers/timeplt.cpp
+++ b/src/mame/drivers/timeplt.cpp
@@ -48,13 +48,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/timeplt.h"
+#include "includes/konamipt.h"
+#include "audio/timeplt.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
-#include "includes/konamipt.h"
-#include "audio/timeplt.h"
#include "sound/ay8910.h"
-#include "includes/timeplt.h"
#define MASTER_CLOCK XTAL_18_432MHz
diff --git a/src/mame/drivers/timetrv.cpp b/src/mame/drivers/timetrv.cpp
index 044392c7e4c..b1e966c2bcc 100644
--- a/src/mame/drivers/timetrv.cpp
+++ b/src/mame/drivers/timetrv.cpp
@@ -27,6 +27,7 @@ CPU is an Intel 80188
#include "emu.h"
#include "cpu/i86/i186.h"
+#include "screen.h"
class timetrv_state : public driver_device
diff --git a/src/mame/drivers/timex.cpp b/src/mame/drivers/timex.cpp
index 84cec4ee21d..01478571d19 100644
--- a/src/mame/drivers/timex.cpp
+++ b/src/mame/drivers/timex.cpp
@@ -147,20 +147,19 @@ http://www.z88forever.org.uk/zxplus3e/
*******************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
#include "includes/spectrum.h"
#include "includes/spec128.h"
#include "includes/timex.h"
-#include "imagedev/snapquik.h"
-#include "imagedev/cassette.h"
-#include "sound/speaker.h"
-#include "sound/ay8910.h"
-#include "formats/tzx_cas.h"
-#include "machine/spec_snqk.h"
+
+#include "cpu/z80/z80.h"
#include "machine/beta.h"
-#include "machine/ram.h"
+#include "sound/ay8910.h"
+
+#include "screen.h"
#include "softlist.h"
-#include "machine/spec_snqk.h"
+
+#include "formats/tzx_cas.h"
+
/****************************************************************************************************/
/* TS2048 specific functions */
diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp
index ab986c29b12..5209008003c 100644
--- a/src/mame/drivers/tispeak.cpp
+++ b/src/mame/drivers/tispeak.cpp
@@ -400,11 +400,14 @@ K28 modules:
#include "emu.h"
#include "includes/hh_tms1k.h"
-#include "sound/tms5110.h"
-#include "machine/tms6100.h"
-#include "bus/generic/slot.h"
+
#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
+#include "machine/tms6100.h"
+#include "sound/tms5110.h"
+
#include "softlist.h"
+#include "speaker.h"
// internal artwork
#include "k28m2.lh"
diff --git a/src/mame/drivers/tispellb.cpp b/src/mame/drivers/tispellb.cpp
index 00a2f492878..f4c212e1d2e 100644
--- a/src/mame/drivers/tispellb.cpp
+++ b/src/mame/drivers/tispellb.cpp
@@ -58,7 +58,9 @@
#include "emu.h"
#include "includes/hh_tms1k.h"
+
#include "machine/tms6100.h"
+#include "speaker.h"
// internal artwork
#include "spellb.lh"
diff --git a/src/mame/drivers/tk2000.cpp b/src/mame/drivers/tk2000.cpp
index f83f6058186..3ce8c5593dd 100644
--- a/src/mame/drivers/tk2000.cpp
+++ b/src/mame/drivers/tk2000.cpp
@@ -15,14 +15,20 @@
************************************************************************/
#include "emu.h"
+#include "video/apple2.h"
+
+#include "cpu/m6502/m6502.h"
+#include "imagedev/cassette.h"
+#include "imagedev/flopdrv.h"
#include "machine/bankdev.h"
#include "machine/ram.h"
-#include "sound/speaker.h"
-#include "imagedev/flopdrv.h"
-#include "imagedev/cassette.h"
+#include "sound/spkrdev.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "formats/ap2_dsk.h"
-#include "cpu/m6502/m6502.h"
-#include "video/apple2.h"
+
#define A2_CPU_TAG "maincpu"
#define A2_BUS_TAG "a2bus"
diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp
index d19c135dfa1..0677dc63199 100644
--- a/src/mame/drivers/tk80bs.cpp
+++ b/src/mame/drivers/tk80bs.cpp
@@ -26,6 +26,7 @@ TODO:
#include "cpu/i8085/i8085.h"
#include "machine/i8255.h"
#include "machine/keyboard.h"
+#include "screen.h"
class tk80bs_state : public driver_device
{
diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp
index 801503c2521..0aca5c2a070 100644
--- a/src/mame/drivers/tm990189.cpp
+++ b/src/mame/drivers/tm990189.cpp
@@ -60,16 +60,21 @@
******************************************************************************************/
#include "emu.h"
+
#include "cpu/tms9900/tms9980a.h"
+#include "imagedev/cassette.h"
#include "machine/tms9901.h"
#include "machine/tms9902.h"
-#include "video/tms9928a.h"
-#include "imagedev/cassette.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
#include "sound/wave.h"
+#include "video/tms9928a.h"
+
+#include "speaker.h"
+
#include "tm990189.lh"
#include "tm990189v.lh"
+
#define TMS9901_0_TAG "tms9901_usr"
#define TMS9901_1_TAG "tms9901_sys"
@@ -77,15 +82,16 @@ class tm990189_state : public driver_device
{
public:
tm990189_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_tms9980a(*this, "maincpu"),
- m_speaker(*this, "speaker"),
- m_cass(*this, "cassette"),
- m_tms9918(*this, "tms9918" ),
- m_maincpu(*this, "maincpu"),
- m_cassette(*this, "cassette"),
- m_tms9901_usr(*this, TMS9901_0_TAG),
- m_tms9901_sys(*this, TMS9901_1_TAG) { }
+ : driver_device(mconfig, type, tag)
+ , m_tms9980a(*this, "maincpu")
+ , m_speaker(*this, "speaker")
+ , m_cass(*this, "cassette")
+ , m_tms9918(*this, "tms9918")
+ , m_maincpu(*this, "maincpu")
+ , m_cassette(*this, "cassette")
+ , m_tms9901_usr(*this, TMS9901_0_TAG)
+ , m_tms9901_sys(*this, TMS9901_1_TAG)
+ { }
required_device<tms9980a_device> m_tms9980a;
required_device<speaker_sound_device> m_speaker;
@@ -451,7 +457,7 @@ protected:
virtual void device_start() override;
};
-const device_type TM990_189_RS232 = &device_creator<tm990_189_rs232_image_device>;
+const device_type TM990_189_RS232 = device_creator<tm990_189_rs232_image_device>;
tm990_189_rs232_image_device::tm990_189_rs232_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TM990_189_RS232, "TM990/189 RS232 port", tag, owner, clock, "tm990_189_rs232_image", __FILE__),
diff --git a/src/mame/drivers/tmaster.cpp b/src/mame/drivers/tmaster.cpp
index f007a779173..6df266eda4f 100644
--- a/src/mame/drivers/tmaster.cpp
+++ b/src/mame/drivers/tmaster.cpp
@@ -99,6 +99,8 @@ Chips:
#include "machine/watchdog.h"
#include "sound/okim6295.h"
#include "video/cesblit.h"
+#include "screen.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp
index 432aadc2e86..ccb0e237740 100644
--- a/src/mame/drivers/tmc1800.cpp
+++ b/src/mame/drivers/tmc1800.cpp
@@ -115,7 +115,10 @@ Notes:
#include "emu.h"
#include "includes/tmc1800.h"
+
#include "sound/beep.h"
+#include "speaker.h"
+
/* Read/Write Handlers */
diff --git a/src/mame/drivers/tmc2000e.cpp b/src/mame/drivers/tmc2000e.cpp
index 81185e93e83..d59a58bb42a 100644
--- a/src/mame/drivers/tmc2000e.cpp
+++ b/src/mame/drivers/tmc2000e.cpp
@@ -34,6 +34,9 @@
#include "emu.h"
#include "includes/tmc2000e.h"
+#include "speaker.h"
+
+
/* Read/Write Handlers */
READ8_MEMBER( tmc2000e_state::vismac_r )
diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp
index 3040b47386b..76f82812c5a 100644
--- a/src/mame/drivers/tmmjprd.cpp
+++ b/src/mame/drivers/tmmjprd.cpp
@@ -34,6 +34,8 @@
#include "machine/eepromser.h"
#include "sound/i5000.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
class tmmjprd_state : public driver_device
diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp
index 0c4dfafd384..117680078a3 100644
--- a/src/mame/drivers/tmnt.cpp
+++ b/src/mame/drivers/tmnt.cpp
@@ -54,18 +54,21 @@ Updates:
***************************************************************************/
#include "emu.h"
-#include "machine/eepromser.h"
+#include "includes/tmnt.h"
+#include "includes/konamipt.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
-#include "sound/ym2151.h"
-#include "sound/okim6295.h"
-#include "sound/samples.h"
-#include "sound/k054539.h"
+#include "machine/eepromser.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
-#include "includes/tmnt.h"
-#include "includes/konamipt.h"
+#include "sound/k054539.h"
+#include "sound/okim6295.h"
+#include "sound/samples.h"
+#include "sound/ym2151.h"
+#include "speaker.h"
+
READ16_MEMBER(tmnt_state::k052109_word_noA12_r)
{
diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp
index a131ca4444f..13beb6fadc4 100644
--- a/src/mame/drivers/tmspoker.cpp
+++ b/src/mame/drivers/tmspoker.cpp
@@ -207,13 +207,14 @@
*******************************************************************************/
-
-#define MASTER_CLOCK XTAL_6MHz /* confirmed */
-
#include "emu.h"
#include "cpu/tms9900/tms9980a.h"
-#include "video/mc6845.h"
#include "sound/sn76477.h"
+#include "video/mc6845.h"
+#include "screen.h"
+
+
+#define MASTER_CLOCK XTAL_6MHz /* confirmed */
class tmspoker_state : public driver_device
diff --git a/src/mame/drivers/tnzs.cpp b/src/mame/drivers/tnzs.cpp
index bb901a80f6b..d0a7352cd0f 100644
--- a/src/mame/drivers/tnzs.cpp
+++ b/src/mame/drivers/tnzs.cpp
@@ -623,10 +623,14 @@ Driver by Takahiro Nogi (nogi@kt.rim.or.jp) 1999/11/06
#include "emu.h"
#include "includes/tnzs.h"
#include "includes/taitoipt.h"
+
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/volt_reg.h"
#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
+
SAMPLES_START_CB_MEMBER(kageki_state::init_samples)
{
diff --git a/src/mame/drivers/toaplan1.cpp b/src/mame/drivers/toaplan1.cpp
index cd89cc365c2..6fea2e940d4 100644
--- a/src/mame/drivers/toaplan1.cpp
+++ b/src/mame/drivers/toaplan1.cpp
@@ -606,12 +606,14 @@ Stephh's and AWJ's notes (based on the games M68000 and Z80 code and some tests)
***************************************************************************/
#include "emu.h"
+#include "includes/toaplan1.h"
+#include "includes/toaplipt.h"
+
+#include "cpu/tms32010/tms32010.h"
#include "cpu/z80/z80.h"
#include "cpu/z180/z180.h"
-#include "cpu/tms32010/tms32010.h"
-#include "includes/toaplipt.h"
-#include "includes/toaplan1.h"
#include "sound/3812intf.h"
+#include "speaker.h"
/***************************** 68000 Memory Map *****************************/
diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp
index ce751775a85..ff16f261af6 100644
--- a/src/mame/drivers/toaplan2.cpp
+++ b/src/mame/drivers/toaplan2.cpp
@@ -362,15 +362,18 @@ To reset the NVRAM in Othello Derby, hold P1 Button 1 down while booting.
#include "emu.h"
+#include "includes/toaplan2.h"
+#include "includes/toaplipt.h"
+
#include "cpu/nec/v25.h"
#include "cpu/z80/z80.h"
#include "cpu/z180/z180.h"
#include "machine/nvram.h"
-#include "sound/ym2151.h"
#include "sound/3812intf.h"
+#include "sound/ym2151.h"
#include "sound/ymz280b.h"
-#include "includes/toaplan2.h"
-#include "includes/toaplipt.h"
+#include "speaker.h"
+
#define UNICODE_YEN "\xC2\xA5"
#define PWRKICK_HOPPER_PULSE 50 // time between hopper pulses in milliseconds (probably wrong)
diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp
index e2b56a2adc5..0a6b57de6b5 100644
--- a/src/mame/drivers/toki.cpp
+++ b/src/mame/drivers/toki.cpp
@@ -93,12 +93,15 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/toki.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
-#include "includes/toki.h"
+#include "speaker.h"
+
WRITE16_MEMBER(toki_state::tokib_soundcommand_w)
{
diff --git a/src/mame/drivers/tokyocop.cpp b/src/mame/drivers/tokyocop.cpp
index 79858537a41..0261cbe55e8 100644
--- a/src/mame/drivers/tokyocop.cpp
+++ b/src/mame/drivers/tokyocop.cpp
@@ -24,6 +24,7 @@ I/O Board with Altera Flex EPF15K50EQC240-3
#include "emu.h"
#include "cpu/i386/i386.h"
+#include "screen.h"
class tokyocop_state : public driver_device
diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp
index 76dd559079d..dfd9ebf8ee5 100644
--- a/src/mame/drivers/tomcat.cpp
+++ b/src/mame/drivers/tomcat.cpp
@@ -37,6 +37,8 @@
#include "sound/pokey.h"
#include "sound/tms5220.h"
#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/tonton.cpp b/src/mame/drivers/tonton.cpp
index c972ac250d2..efef89e5df8 100644
--- a/src/mame/drivers/tonton.cpp
+++ b/src/mame/drivers/tonton.cpp
@@ -25,10 +25,11 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/nvram.h"
+#include "machine/ticket.h"
#include "sound/ay8910.h"
#include "video/v9938.h"
-#include "machine/ticket.h"
-#include "machine/nvram.h"
+#include "speaker.h"
class tonton_state : public driver_device
{
diff --git a/src/mame/drivers/toobin.cpp b/src/mame/drivers/toobin.cpp
index d35126e0033..e039a1d0434 100644
--- a/src/mame/drivers/toobin.cpp
+++ b/src/mame/drivers/toobin.cpp
@@ -20,10 +20,11 @@
#include "emu.h"
+#include "includes/toobin.h"
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
#include "machine/atarigen.h"
-#include "includes/toobin.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_32MHz
diff --git a/src/mame/drivers/topspeed.cpp b/src/mame/drivers/topspeed.cpp
index 66c587d1aba..a7c1abdd37f 100644
--- a/src/mame/drivers/topspeed.cpp
+++ b/src/mame/drivers/topspeed.cpp
@@ -156,16 +156,20 @@ From JP manual
***************************************************************************/
#include "emu.h"
+#include "includes/topspeed.h"
+#include "includes/taitoipt.h"
+#include "audio/taitosnd.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
-#include "machine/z80ctc.h"
#include "machine/taitoio.h"
-#include "audio/taitosnd.h"
-#include "sound/ym2151.h"
-#include "sound/msm5205.h"
+#include "machine/z80ctc.h"
#include "sound/flt_vol.h"
-#include "includes/taitoipt.h"
-#include "includes/topspeed.h"
+#include "sound/msm5205.h"
+#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "topspeed.lh"
diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp
index a94bdc0928d..a60cb5ede94 100644
--- a/src/mame/drivers/toratora.cpp
+++ b/src/mame/drivers/toratora.cpp
@@ -46,6 +46,8 @@ TODO:
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
#include "sound/sn76477.h"
+#include "screen.h"
+#include "speaker.h"
class toratora_state : public driver_device
diff --git a/src/mame/drivers/tourtabl.cpp b/src/mame/drivers/tourtabl.cpp
index a826ebacafe..2c7d91f6c7d 100644
--- a/src/mame/drivers/tourtabl.cpp
+++ b/src/mame/drivers/tourtabl.cpp
@@ -14,6 +14,8 @@
#include "machine/watchdog.h"
#include "sound/tiaintf.h"
#include "video/tia.h"
+#include "screen.h"
+#include "speaker.h"
class tourtabl_state : public driver_device
diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp
index 3966a61b465..a4090b82075 100644
--- a/src/mame/drivers/tourvis.cpp
+++ b/src/mame/drivers/tourvis.cpp
@@ -283,25 +283,31 @@ http://blog.system11.org/?p=1943
****************************************************************************/
#include "emu.h"
-#include "cpu/i8085/i8085.h"
#include "machine/pcecommn.h"
+
+#include "cpu/h6280/h6280.h"
+#include "cpu/i8085/i8085.h"
#include "video/huc6260.h"
#include "video/huc6270.h"
-#include "cpu/h6280/h6280.h"
#include "sound/c6280.h"
#include "machine/i8155.h"
-#include "softlist.h"
+
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
+
+
class tourvision_state : public pce_common_state
{
public:
tourvision_state(const machine_config &mconfig, device_type type, const char *tag)
- : pce_common_state(mconfig, type, tag),
- m_subcpu(*this, "subcpu"),
- m_cart(*this, "cartslot")
- { }
+ : pce_common_state(mconfig, type, tag)
+ , m_subcpu(*this, "subcpu")
+ , m_cart(*this, "cartslot")
+ { }
DECLARE_WRITE8_MEMBER(tourvision_8085_d000_w);
DECLARE_WRITE8_MEMBER(tourvision_i8155_a_w);
diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp
index 015f3e01dc7..0a2bfe6af56 100644
--- a/src/mame/drivers/toypop.cpp
+++ b/src/mame/drivers/toypop.cpp
@@ -26,10 +26,14 @@
****************************************/
#include "emu.h"
+#include "machine/namcoio.h"
+
#include "cpu/m6809/m6809.h"
#include "cpu/m68000/m68000.h"
-#include "machine/namcoio.h"
#include "sound/namco.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_6_144MHz
diff --git a/src/mame/drivers/tp84.cpp b/src/mame/drivers/tp84.cpp
index cd1cb1905ff..3cf5ee6bd08 100644
--- a/src/mame/drivers/tp84.cpp
+++ b/src/mame/drivers/tp84.cpp
@@ -64,15 +64,17 @@ C004 76489 #4 trigger
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/tp84.h"
+#include "includes/konamipt.h"
+
#include "cpu/m6809/m6809.h"
+#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
-#include "sound/sn76496.h"
#include "sound/flt_rc.h"
-#include "includes/konamipt.h"
-#include "includes/tp84.h"
+#include "sound/sn76496.h"
+#include "speaker.h"
void tp84_state::machine_start()
diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp
index a9220cf428f..b749b17c225 100644
--- a/src/mame/drivers/trackfld.cpp
+++ b/src/mame/drivers/trackfld.cpp
@@ -183,8 +183,9 @@ MAIN BOARD:
#include "emu.h"
#include "includes/trackfld.h"
#include "includes/konamipt.h"
-#include "audio/trackfld.h"
#include "audio/hyprolyb.h"
+#include "audio/trackfld.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
@@ -193,6 +194,9 @@ MAIN BOARD:
#include "machine/watchdog.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_18_432MHz
#define SOUND_CLOCK XTAL_14_31818MHz
diff --git a/src/mame/drivers/tranz330.cpp b/src/mame/drivers/tranz330.cpp
index a77efc57efe..97874e0b349 100644
--- a/src/mame/drivers/tranz330.cpp
+++ b/src/mame/drivers/tranz330.cpp
@@ -22,8 +22,12 @@
#include "emu.h"
#include "includes/tranz330.h"
+
+#include "speaker.h"
+
#include "tranz330.lh"
+
static void construct_address_map_tranz330_mem(address_map &map)
{
map.configure(AS_PROGRAM, 8);
diff --git a/src/mame/drivers/travrusa.cpp b/src/mame/drivers/travrusa.cpp
index 2ea0f82f416..9eb1c058c42 100644
--- a/src/mame/drivers/travrusa.cpp
+++ b/src/mame/drivers/travrusa.cpp
@@ -51,9 +51,11 @@ and 2764 eprom (swapped D3/D4 and D5/D6 data lines)
****************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "audio/irem.h"
#include "includes/travrusa.h"
+#include "audio/irem.h"
+
+#include "cpu/z80/z80.h"
+#include "screen.h"
static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, travrusa_state )
diff --git a/src/mame/drivers/triforce.cpp b/src/mame/drivers/triforce.cpp
index b71dc1319a7..236a86267ef 100644
--- a/src/mame/drivers/triforce.cpp
+++ b/src/mame/drivers/triforce.cpp
@@ -445,6 +445,8 @@ Notes:
#include "emu.h"
#include "cpu/powerpc/ppc.h"
#include "machine/naomigd.h"
+#include "screen.h"
+
class triforce_state : public driver_device
{
diff --git a/src/mame/drivers/triplhnt.cpp b/src/mame/drivers/triplhnt.cpp
index 9f6e1d288c1..a165bc4183a 100644
--- a/src/mame/drivers/triplhnt.cpp
+++ b/src/mame/drivers/triplhnt.cpp
@@ -9,9 +9,10 @@ Atari Triple Hunt Driver
***************************************************************************/
#include "emu.h"
+#include "includes/triplhnt.h"
#include "cpu/m6800/m6800.h"
#include "machine/nvram.h"
-#include "includes/triplhnt.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp
index c62f0b23407..f3c3e3aa306 100644
--- a/src/mame/drivers/trs80.cpp
+++ b/src/mame/drivers/trs80.cpp
@@ -137,6 +137,10 @@ There don't seem to be any JV1 boot disks for Model III/4.
#include "emu.h"
#include "includes/trs80.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "formats/trs80_dsk.h"
#include "formats/dmk_dsk.h"
diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp
index 11d41386006..2231afb6e36 100644
--- a/src/mame/drivers/trs80m2.cpp
+++ b/src/mame/drivers/trs80m2.cpp
@@ -23,8 +23,11 @@
#include "emu.h"
#include "includes/trs80m2.h"
+
+#include "screen.h"
#include "softlist.h"
+
#define KEYBOARD_TAG "keyboard"
diff --git a/src/mame/drivers/truco.cpp b/src/mame/drivers/truco.cpp
index ad9fb1fd633..24dee6ebd60 100644
--- a/src/mame/drivers/truco.cpp
+++ b/src/mame/drivers/truco.cpp
@@ -201,16 +201,20 @@
*******************************************************************************************************/
-#define MASTER_CLOCK XTAL_12MHz /* confirmed */
-#define CPU_CLOCK (MASTER_CLOCK/16) /* guess */
-#define CRTC_CLOCK (MASTER_CLOCK/8) /* guess */
-
#include "emu.h"
#include "includes/truco.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
#include "sound/volt_reg.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_12MHz /* confirmed */
+#define CPU_CLOCK (MASTER_CLOCK/16) /* guess */
+#define CRTC_CLOCK (MASTER_CLOCK/8) /* guess */
/*******************************************
* Read/Write Handlers *
diff --git a/src/mame/drivers/trucocl.cpp b/src/mame/drivers/trucocl.cpp
index 5eb979039b8..6f3d262d701 100644
--- a/src/mame/drivers/trucocl.cpp
+++ b/src/mame/drivers/trucocl.cpp
@@ -36,9 +36,13 @@ Daughterboard: Custom made, plugged in the 2 roms and Z80 mainboard sockets.
#include "emu.h"
#include "includes/trucocl.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(trucocl_state::irq_enable_w)
{
diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp
index 7e630d1717e..ea31e27cf16 100644
--- a/src/mame/drivers/trvmadns.cpp
+++ b/src/mame/drivers/trvmadns.cpp
@@ -90,6 +90,8 @@ Technology = NMOS
#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class trvmadns_state : public driver_device
diff --git a/src/mame/drivers/trvquest.cpp b/src/mame/drivers/trvquest.cpp
index 7d32adce5a8..0c5eb0f4544 100644
--- a/src/mame/drivers/trvquest.cpp
+++ b/src/mame/drivers/trvquest.cpp
@@ -37,11 +37,14 @@ Notes:
*/
#include "emu.h"
+#include "includes/gameplan.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/6522via.h"
-#include "sound/ay8910.h"
-#include "includes/gameplan.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "speaker.h"
+
READ8_MEMBER(gameplan_state::trvquest_question_r)
{
diff --git a/src/mame/drivers/tryout.cpp b/src/mame/drivers/tryout.cpp
index 5ff8ea95660..24887efe4cb 100644
--- a/src/mame/drivers/tryout.cpp
+++ b/src/mame/drivers/tryout.cpp
@@ -20,9 +20,13 @@ $208 strikes count
****************************************************************/
#include "emu.h"
+#include "includes/tryout.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/2203intf.h"
-#include "includes/tryout.h"
+#include "screen.h"
+#include "speaker.h"
+
WRITE8_MEMBER(tryout_state::nmi_ack_w)
{
diff --git a/src/mame/drivers/ts803.cpp b/src/mame/drivers/ts803.cpp
index 70b30542dfa..db2260f484e 100644
--- a/src/mame/drivers/ts803.cpp
+++ b/src/mame/drivers/ts803.cpp
@@ -56,6 +56,7 @@ PAGE SEL bit in PORT0 set to 1:
#include "machine/wd_fdc.h"
#include "machine/z80sti.h"
#include "video/mc6845.h"
+#include "screen.h"
class ts803_state : public driver_device
diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp
index 29d88419a53..391f10a70c6 100644
--- a/src/mame/drivers/tsamurai.cpp
+++ b/src/mame/drivers/tsamurai.cpp
@@ -40,10 +40,13 @@ the "America" release.
#include "emu.h"
#include "includes/tsamurai.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 tsamurai_state::machine_start()
diff --git a/src/mame/drivers/tsispch.cpp b/src/mame/drivers/tsispch.cpp
index 0d328891f0d..5478f1f124b 100644
--- a/src/mame/drivers/tsispch.cpp
+++ b/src/mame/drivers/tsispch.cpp
@@ -112,6 +112,7 @@
/* Core includes */
#include "emu.h"
#include "includes/tsispch.h"
+
#include "cpu/i86/i86.h"
#include "cpu/upd7725/upd7725.h"
#include "machine/i8251.h"
@@ -119,6 +120,8 @@
#include "machine/terminal.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
// defines
#define DEBUG_PARAM 1
diff --git a/src/mame/drivers/ttchamp.cpp b/src/mame/drivers/ttchamp.cpp
index 89faf78435c..0581ac6ddb9 100644
--- a/src/mame/drivers/ttchamp.cpp
+++ b/src/mame/drivers/ttchamp.cpp
@@ -68,8 +68,10 @@ we currently simulate this as the PIC is read protected.
#include "emu.h"
#include "cpu/nec/nec.h"
-#include "sound/okim6295.h"
#include "machine/nvram.h"
+#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class ttchamp_state : public driver_device
diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp
index bedbfe33415..12284ffd479 100644
--- a/src/mame/drivers/tubep.cpp
+++ b/src/mame/drivers/tubep.cpp
@@ -101,12 +101,14 @@ TP-S.1 TP-S.2 TP-S.3 TP-B.1 8212 TP-B.2 TP-B.3 TP-B.4
#include "emu.h"
+#include "includes/tubep.h"
+
#include "cpu/m6800/m6800.h"
#include "cpu/z80/z80.h"
#include "cpu/m6805/m6805.h"
#include "sound/ay8910.h"
#include "sound/msm5205.h"
-#include "includes/tubep.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/tugboat.cpp b/src/mame/drivers/tugboat.cpp
index 201dbce16ae..b8d88f8cc84 100644
--- a/src/mame/drivers/tugboat.cpp
+++ b/src/mame/drivers/tugboat.cpp
@@ -29,6 +29,8 @@ always false - counter was reloaded and incremented before interrupt occurs
#include "cpu/m6502/m6502.h"
#include "machine/6821pia.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class tugboat_state : public driver_device
diff --git a/src/mame/drivers/tumbleb.cpp b/src/mame/drivers/tumbleb.cpp
index 3854d8d855d..c800a3e1f25 100644
--- a/src/mame/drivers/tumbleb.cpp
+++ b/src/mame/drivers/tumbleb.cpp
@@ -298,6 +298,8 @@ Stephh's notes (based on the games M68000 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/tumbleb.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
@@ -306,7 +308,8 @@ Stephh's notes (based on the games M68000 code and some tests) :
#include "sound/ym2151.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
-#include "includes/tumbleb.h"
+#include "screen.h"
+#include "speaker.h"
#define TUMBLEP_HACK 0
diff --git a/src/mame/drivers/tumblep.cpp b/src/mame/drivers/tumblep.cpp
index 35b9fd46b66..f0d237ede43 100644
--- a/src/mame/drivers/tumblep.cpp
+++ b/src/mame/drivers/tumblep.cpp
@@ -42,13 +42,16 @@ Stephh's notes (based on the games M68000 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/tumblep.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "machine/decocrpt.h"
#include "sound/ym2151.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
-#include "includes/tumblep.h"
+#include "screen.h"
+#include "speaker.h"
#define TUMBLEP_HACK 0
diff --git a/src/mame/drivers/tunhunt.cpp b/src/mame/drivers/tunhunt.cpp
index d45840ddc43..38430300be4 100644
--- a/src/mame/drivers/tunhunt.cpp
+++ b/src/mame/drivers/tunhunt.cpp
@@ -46,9 +46,11 @@
***************************************************************************/
#include "emu.h"
+#include "includes/tunhunt.h"
+
#include "cpu/m6502/m6502.h"
#include "sound/pokey.h"
-#include "includes/tunhunt.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/turrett.cpp b/src/mame/drivers/turrett.cpp
index 8002946d82d..fa8aa2e6f49 100644
--- a/src/mame/drivers/turrett.cpp
+++ b/src/mame/drivers/turrett.cpp
@@ -9,9 +9,11 @@
****************************************************************************/
#include "emu.h"
+#include "includes/turrett.h"
+
#include "cpu/mips/r3000.h"
#include "machine/ataintf.h"
-#include "includes/turrett.h"
+#include "speaker.h"
@@ -336,7 +338,7 @@ public:
}
};
-const device_type TURRETT_HARDDISK = &device_creator<turrett_hdd>;
+const device_type TURRETT_HARDDISK = device_creator<turrett_hdd>;
SLOT_INTERFACE_START(turrett_devices)
SLOT_INTERFACE("hdd", TURRETT_HARDDISK)
diff --git a/src/mame/drivers/tutankhm.cpp b/src/mame/drivers/tutankhm.cpp
index a00e1e674a7..b32ccde28e3 100644
--- a/src/mame/drivers/tutankhm.cpp
+++ b/src/mame/drivers/tutankhm.cpp
@@ -51,12 +51,14 @@
***************************************************************************/
#include "emu.h"
+#include "includes/tutankhm.h"
+#include "includes/konamipt.h"
+#include "audio/timeplt.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
-#include "includes/konamipt.h"
-#include "audio/timeplt.h"
-#include "includes/tutankhm.h"
+#include "screen.h"
/*************************************
diff --git a/src/mame/drivers/tutor.cpp b/src/mame/drivers/tutor.cpp
index 8a87122cd32..838a904207d 100644
--- a/src/mame/drivers/tutor.cpp
+++ b/src/mame/drivers/tutor.cpp
@@ -169,15 +169,20 @@ A=AMA, P=PRO, these keys don't exist, and so the games cannot be played.
*********************************************************************************************************/
#include "emu.h"
+
#include "cpu/tms9900/tms9995.h"
-#include "sound/wave.h"
-#include "video/tms9928a.h"
#include "imagedev/cassette.h"
#include "sound/sn76496.h"
+#include "sound/wave.h"
+#include "video/tms9928a.h"
+
#include "bus/centronics/ctronics.h"
-#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "bus/generic/slot.h"
+
#include "softlist.h"
+#include "speaker.h"
+
class tutor_state : public driver_device
{
diff --git a/src/mame/drivers/tv910.cpp b/src/mame/drivers/tv910.cpp
index 60471c5915d..adc6615e63c 100644
--- a/src/mame/drivers/tv910.cpp
+++ b/src/mame/drivers/tv910.cpp
@@ -21,11 +21,12 @@
****************************************************************************/
#include "emu.h"
+#include "bus/rs232/rs232.h"
#include "cpu/m6502/m6502.h"
-#include "video/mc6845.h"
-#include "machine/mos6551.h"
#include "machine/kb3600.h"
-#include "bus/rs232/rs232.h"
+#include "machine/mos6551.h"
+#include "video/mc6845.h"
+#include "screen.h"
#define ACIA_TAG "acia1"
#define CRTC_TAG "crtc"
diff --git a/src/mame/drivers/tv950.cpp b/src/mame/drivers/tv950.cpp
index 93bda1fa95b..cec50bc958c 100644
--- a/src/mame/drivers/tv950.cpp
+++ b/src/mame/drivers/tv950.cpp
@@ -35,11 +35,12 @@
****************************************************************************/
#include "emu.h"
+#include "bus/rs232/rs232.h"
#include "cpu/m6502/m6502.h"
-#include "video/mc6845.h"
#include "machine/6522via.h"
#include "machine/mos6551.h"
-#include "bus/rs232/rs232.h"
+#include "video/mc6845.h"
+#include "screen.h"
#define ACIA1_TAG "acia1"
#define ACIA2_TAG "acia2"
diff --git a/src/mame/drivers/tv990.cpp b/src/mame/drivers/tv990.cpp
index fc7dd583340..a8f093c087b 100644
--- a/src/mame/drivers/tv990.cpp
+++ b/src/mame/drivers/tv990.cpp
@@ -30,13 +30,16 @@
****************************************************************************/
#include "emu.h"
+#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
-#include "machine/ins8250.h"
#include "machine/8042kbdc.h"
-#include "bus/rs232/rs232.h"
-#include "machine/pc_lpt.h"
+#include "machine/ins8250.h"
#include "machine/nvram.h"
+#include "machine/pc_lpt.h"
#include "sound/beep.h"
+#include "screen.h"
+#include "speaker.h"
+
#define UART0_TAG "ns16450_0"
#define UART1_TAG "ns16450_1"
diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp
index ad7f22aac7c..1804e78dd04 100644
--- a/src/mame/drivers/tvc.cpp
+++ b/src/mame/drivers/tvc.cpp
@@ -13,21 +13,25 @@
****************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "video/mc6845.h"
-#include "machine/ram.h"
#include "audio/tvc.h"
-#include "bus/centronics/ctronics.h"
+
+#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
-#include "formats/tvc_cas.h"
+#include "machine/ram.h"
+#include "video/mc6845.h"
-#include "bus/tvc/tvc.h"
-#include "bus/tvc/hbf.h"
+#include "bus/centronics/ctronics.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "bus/tvc/tvc.h"
+#include "bus/tvc/hbf.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/tvc_cas.h"
#define TVC_RAM_BANK 1
#define TVC_ROM_BANK 2
diff --git a/src/mame/drivers/tvcapcom.cpp b/src/mame/drivers/tvcapcom.cpp
index 587be636c36..293d3638621 100644
--- a/src/mame/drivers/tvcapcom.cpp
+++ b/src/mame/drivers/tvcapcom.cpp
@@ -12,6 +12,7 @@
#include "emu.h"
#include "cpu/powerpc/ppc.h"
+#include "screen.h"
class tvcapcom_state : public driver_device
{
diff --git a/src/mame/drivers/tvgame.cpp b/src/mame/drivers/tvgame.cpp
index 7f27b7e16e4..4fee6adf61a 100644
--- a/src/mame/drivers/tvgame.cpp
+++ b/src/mame/drivers/tvgame.cpp
@@ -13,7 +13,9 @@
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "screen.h"
+#include "speaker.h"
class tvgame_state : public driver_device
diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp
index 4d6ff2ef0e6..e1844f3d911 100644
--- a/src/mame/drivers/twin16.cpp
+++ b/src/mame/drivers/twin16.cpp
@@ -46,15 +46,16 @@ Known Issues:
*/
#include "emu.h"
+#include "includes/twin16.h"
+#include "includes/konamipt.h"
+
#include "cpu/m68000/m68000.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/twin16.h"
-#include "includes/konamipt.h"
-
+#include "sound/ym2151.h"
+#include "speaker.h"
#define CPUA_IRQ_ENABLE (m_CPUA_register & 0x20)
diff --git a/src/mame/drivers/twincobr.cpp b/src/mame/drivers/twincobr.cpp
index 78414fd7a58..d05a5f46654 100644
--- a/src/mame/drivers/twincobr.cpp
+++ b/src/mame/drivers/twincobr.cpp
@@ -378,14 +378,15 @@ Shark Zame
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/twincobr.h"
+#include "includes/toaplipt.h"
+
#include "cpu/m68000/m68000.h"
-#include "cpu/tms32010/tms32010.h"
#include "cpu/mcs48/mcs48.h"
-#include "includes/toaplipt.h"
-#include "includes/twincobr.h"
+#include "cpu/tms32010/tms32010.h"
+#include "cpu/z80/z80.h"
#include "sound/3812intf.h"
-
+#include "speaker.h"
diff --git a/src/mame/drivers/twinkle.cpp b/src/mame/drivers/twinkle.cpp
index 051608c3d04..f15375168ea 100644
--- a/src/mame/drivers/twinkle.cpp
+++ b/src/mame/drivers/twinkle.cpp
@@ -238,12 +238,14 @@ Notes:
#include "machine/ataintf.h"
#include "machine/fdc37c665gt.h"
#include "machine/i2cmem.h"
+#include "machine/ram.h"
#include "machine/rtc65271.h"
#include "machine/watchdog.h"
#include "machine/x76f041.h"
#include "sound/spu.h"
#include "sound/cdda.h"
#include "sound/rf5c400.h"
+#include "speaker.h"
class twinkle_state : public driver_device
{
diff --git a/src/mame/drivers/twins.cpp b/src/mame/drivers/twins.cpp
index e47f6099980..fcfa4544a1a 100644
--- a/src/mame/drivers/twins.cpp
+++ b/src/mame/drivers/twins.cpp
@@ -65,19 +65,22 @@ this requires the -joystick_contradictory switch on the commandline.
#include "sound/ay8910.h"
#include "machine/i2cmem.h"
#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
+
class twins_state : public driver_device
{
public:
twins_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_paletteram(*this, "paletteram"),
- m_palette(*this, "palette"),
- m_i2cmem(*this, "i2cmem"),
- m_spritesinit(0),
- m_videorambank(0)
- { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_paletteram(*this, "paletteram")
+ , m_palette(*this, "palette")
+ , m_i2cmem(*this, "i2cmem")
+ , m_spritesinit(0)
+ , m_videorambank(0)
+ { }
required_device<cpu_device> m_maincpu;
optional_shared_ptr<uint16_t> m_paletteram;
diff --git a/src/mame/drivers/tx0.cpp b/src/mame/drivers/tx0.cpp
index 13a7844c1d7..98de0440aeb 100644
--- a/src/mame/drivers/tx0.cpp
+++ b/src/mame/drivers/tx0.cpp
@@ -7,9 +7,11 @@
*/
#include "emu.h"
-#include "cpu/pdp1/tx0.h"
#include "includes/tx0.h"
+
+#include "cpu/pdp1/tx0.h"
#include "video/crt.h"
+#include "screen.h"
/*
@@ -377,7 +379,7 @@ protected:
virtual void device_start() override { }
};
-const device_type TX0_READTAPE = &device_creator<tx0_readtape_image_device>;
+const device_type TX0_READTAPE = device_creator<tx0_readtape_image_device>;
tx0_readtape_image_device::tx0_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TX0_READTAPE, "TX0 Tape Reader", tag, owner, clock, "tx0_readtape_image", __FILE__),
@@ -410,7 +412,7 @@ protected:
virtual void device_start() override { }
};
-const device_type TX0_PUNCHTAPE = &device_creator<tx0_punchtape_image_device>;
+const device_type TX0_PUNCHTAPE = device_creator<tx0_punchtape_image_device>;
tx0_punchtape_image_device::tx0_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TX0_PUNCHTAPE, "TX0 Tape Puncher", tag, owner, clock, "tx0_punchtape_image", __FILE__),
@@ -444,7 +446,7 @@ protected:
virtual void device_start() override { }
};
-const device_type TX0_PRINTER = &device_creator<tx0_printer_image_device>;
+const device_type TX0_PRINTER = device_creator<tx0_printer_image_device>;
tx0_printer_image_device::tx0_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TX0_PRINTER, "TX0 Typewriter", tag, owner, clock, "tx0_printer_image", __FILE__),
@@ -477,7 +479,7 @@ protected:
virtual void device_start() override;
};
-const device_type TX0_MAGTAPE = &device_creator<tx0_magtape_image_device>;
+const device_type TX0_MAGTAPE = device_creator<tx0_magtape_image_device>;
tx0_magtape_image_device::tx0_magtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, TX0_MAGTAPE, "TX0 Magnetic Tape", tag, owner, clock, "tx0_magtape_image", __FILE__),
diff --git a/src/mame/drivers/tx1.cpp b/src/mame/drivers/tx1.cpp
index 88afc8c75ab..bf397deb3fc 100644
--- a/src/mame/drivers/tx1.cpp
+++ b/src/mame/drivers/tx1.cpp
@@ -41,14 +41,16 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/tx1.h"
+
#include "cpu/i86/i86.h"
+#include "cpu/z80/z80.h"
#include "machine/i8255.h"
-#include "sound/ay8910.h"
-#include "rendlay.h"
-#include "includes/tx1.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
+#include "sound/ay8910.h"
+#include "rendlay.h"
+#include "speaker.h"
#include "tx1.lh"
#include "buggyboy.lh"
diff --git a/src/mame/drivers/uapce.cpp b/src/mame/drivers/uapce.cpp
index 88785d74e40..9a205c149b2 100644
--- a/src/mame/drivers/uapce.cpp
+++ b/src/mame/drivers/uapce.cpp
@@ -93,14 +93,18 @@ Alien Crush & Pac_Land: dumps made from PC-Engine dumps of JP versions
*/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "machine/pcecommn.h"
+
#include "cpu/h6280/h6280.h"
+#include "cpu/z80/z80.h"
#include "video/huc6260.h"
#include "video/huc6270.h"
#include "sound/c6280.h"
-#include "machine/pcecommn.h"
#include "sound/discrete.h"
+#include "screen.h"
+#include "speaker.h"
+
class uapce_state : public pce_common_state
{
diff --git a/src/mame/drivers/uknc.cpp b/src/mame/drivers/uknc.cpp
index db66b91d523..8154368c50e 100644
--- a/src/mame/drivers/uknc.cpp
+++ b/src/mame/drivers/uknc.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "cpu/t11/t11.h"
+#include "screen.h"
class uknc_state : public driver_device
diff --git a/src/mame/drivers/ultraman.cpp b/src/mame/drivers/ultraman.cpp
index 77aabf6aa2f..c39b3815374 100644
--- a/src/mame/drivers/ultraman.cpp
+++ b/src/mame/drivers/ultraman.cpp
@@ -12,12 +12,15 @@
***************************************************************************/
#include "emu.h"
+#include "includes/ultraman.h"
+
#include "cpu/z80/z80.h"
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/ultraman.h"
+#include "speaker.h"
+
WRITE16_MEMBER(ultraman_state::sound_cmd_w)
{
diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp
index b4ee892ce4c..8d8c8731c97 100644
--- a/src/mame/drivers/ultratnk.cpp
+++ b/src/mame/drivers/ultratnk.cpp
@@ -7,9 +7,10 @@ Atari Ultra Tank driver
***************************************************************************/
#include "emu.h"
-#include "cpu/m6502/m6502.h"
#include "includes/ultratnk.h"
#include "audio/sprint4.h"
+#include "cpu/m6502/m6502.h"
+#include "speaker.h"
#define MASTER_CLOCK XTAL_12_096MHz
diff --git a/src/mame/drivers/ultrsprt.cpp b/src/mame/drivers/ultrsprt.cpp
index f7489774d36..b60b1f91378 100644
--- a/src/mame/drivers/ultrsprt.cpp
+++ b/src/mame/drivers/ultrsprt.cpp
@@ -9,9 +9,12 @@
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/powerpc/ppc.h"
-#include "sound/k054539.h"
#include "machine/eepromser.h"
+#include "sound/k054539.h"
#include "sound/k056800.h"
+#include "screen.h"
+#include "speaker.h"
+
class ultrsprt_state : public driver_device
{
diff --git a/src/mame/drivers/umipoker.cpp b/src/mame/drivers/umipoker.cpp
index 936af9d7dd6..772dee4513c 100644
--- a/src/mame/drivers/umipoker.cpp
+++ b/src/mame/drivers/umipoker.cpp
@@ -16,11 +16,16 @@
***************************************************************************/
#include "emu.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
+#include "machine/nvram.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
-#include "machine/nvram.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "saiyukip.lh"
diff --git a/src/mame/drivers/undrfire.cpp b/src/mame/drivers/undrfire.cpp
index 2a32dd649ea..21ba3b7481d 100644
--- a/src/mame/drivers/undrfire.cpp
+++ b/src/mame/drivers/undrfire.cpp
@@ -189,12 +189,14 @@ Board contains only 29 ROMs and not much else.
***************************************************************************/
#include "emu.h"
+#include "includes/undrfire.h"
+#include "audio/taito_en.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
#include "machine/watchdog.h"
#include "sound/es5506.h"
-#include "audio/taito_en.h"
-#include "includes/undrfire.h"
+#include "screen.h"
#include "cbombers.lh"
diff --git a/src/mame/drivers/unichamp.cpp b/src/mame/drivers/unichamp.cpp
index 1a855f83822..abb021d6cf3 100644
--- a/src/mame/drivers/unichamp.cpp
+++ b/src/mame/drivers/unichamp.cpp
@@ -37,12 +37,17 @@
************************************************************************/
#include "emu.h"
+
#include "cpu/cp1610/cp1610.h"
#include "video/gic.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
class unichamp_state : public driver_device
{
diff --git a/src/mame/drivers/unico.cpp b/src/mame/drivers/unico.cpp
index 86500eab80a..0cd5aa02ebd 100644
--- a/src/mame/drivers/unico.cpp
+++ b/src/mame/drivers/unico.cpp
@@ -25,12 +25,15 @@ Year + Game PCB Notes
***************************************************************************/
#include "emu.h"
+#include "includes/unico.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/eepromser.h"
-#include "includes/unico.h"
-#include "sound/ym2151.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
+#include "sound/ym2151.h"
+#include "speaker.h"
+
/***************************************************************************
diff --git a/src/mame/drivers/unior.cpp b/src/mame/drivers/unior.cpp
index b8b6dc62193..00fbd9cdb72 100644
--- a/src/mame/drivers/unior.cpp
+++ b/src/mame/drivers/unior.cpp
@@ -43,7 +43,9 @@ ToDo:
#include "machine/i8255.h"
#include "machine/i8257.h"
#include "video/i8275.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "screen.h"
+#include "speaker.h"
class unior_state : public driver_device
diff --git a/src/mame/drivers/unistar.cpp b/src/mame/drivers/unistar.cpp
index ca67999c223..fc141caecb6 100644
--- a/src/mame/drivers/unistar.cpp
+++ b/src/mame/drivers/unistar.cpp
@@ -12,6 +12,7 @@
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "screen.h"
class unistar_state : public driver_device
@@ -21,7 +22,7 @@ public:
: driver_device(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_p_chargen(*this, "chargen")
- { }
+ { }
DECLARE_PALETTE_INIT(unistar);
uint32_t screen_update_unistar(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff --git a/src/mame/drivers/univac.cpp b/src/mame/drivers/univac.cpp
index d419f478fc5..88a78da0e6c 100644
--- a/src/mame/drivers/univac.cpp
+++ b/src/mame/drivers/univac.cpp
@@ -27,6 +27,7 @@
#include "machine/nvram.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
+#include "screen.h"
class univac_state : public driver_device
diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp
index e1a338113b0..2eb0c34cca2 100644
--- a/src/mame/drivers/unixpc.cpp
+++ b/src/mame/drivers/unixpc.cpp
@@ -20,6 +20,8 @@
#include "machine/ram.h"
#include "machine/wd_fdc.h"
#include "machine/bankdev.h"
+#include "screen.h"
+
#include "unixpc.lh"
diff --git a/src/mame/drivers/unkhorse.cpp b/src/mame/drivers/unkhorse.cpp
index dcb26296c3e..67460abb150 100644
--- a/src/mame/drivers/unkhorse.cpp
+++ b/src/mame/drivers/unkhorse.cpp
@@ -22,7 +22,10 @@ TODO:
#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "machine/i8155.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+#include "screen.h"
+#include "speaker.h"
+
class horse_state : public driver_device
{
diff --git a/src/mame/drivers/upscope.cpp b/src/mame/drivers/upscope.cpp
index 20a79f6a81f..e82ca3eb601 100644
--- a/src/mame/drivers/upscope.cpp
+++ b/src/mame/drivers/upscope.cpp
@@ -26,10 +26,11 @@
**********************************************************************************/
#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"
class upscope_state : public amiga_state
diff --git a/src/mame/drivers/usgames.cpp b/src/mame/drivers/usgames.cpp
index ab4fd3878ae..055c580a33e 100644
--- a/src/mame/drivers/usgames.cpp
+++ b/src/mame/drivers/usgames.cpp
@@ -26,11 +26,15 @@ Sound: AY-3-8912
*/
#include "emu.h"
-#include "cpu/m6809/m6809.h"
-#include "video/mc6845.h"
-#include "sound/ay8910.h"
#include "includes/usgames.h"
+
+#include "cpu/m6809/m6809.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
void usgames_state::machine_start()
{
diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp
index 0a65815816a..2a1ea0fbec1 100644
--- a/src/mame/drivers/ut88.cpp
+++ b/src/mame/drivers/ut88.cpp
@@ -24,10 +24,14 @@ Paste facility was tested but doesn't work, so all code remnants removed.
#include "emu.h"
#include "includes/ut88.h"
+
#include "formats/rk_cas.h"
#include "softlist.h"
#include "ut88mini.lh"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
static GFXDECODE_START( ut88 )
GFXDECODE_ENTRY( "chargen", 0x0000, ut88_charlayout, 0, 1 )
diff --git a/src/mame/drivers/uzebox.cpp b/src/mame/drivers/uzebox.cpp
index f857d40c529..1f07f7a1372 100644
--- a/src/mame/drivers/uzebox.cpp
+++ b/src/mame/drivers/uzebox.cpp
@@ -13,12 +13,17 @@
****************************************************************************/
#include "emu.h"
+
#include "cpu/avr8/avr8.h"
-#include "sound/speaker.h"
+#include "sound/spkrdev.h"
+
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "bus/snes_ctrl/ctrl.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
// overclocked to 8 * NTSC burst frequency
#define MASTER_CLOCK 28618180
diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp
index 53772cbbbd6..899640d33d1 100644
--- a/src/mame/drivers/v1050.cpp
+++ b/src/mame/drivers/v1050.cpp
@@ -151,8 +151,12 @@ Notes:
#include "emu.h"
#include "includes/v1050.h"
+
#include "bus/rs232/rs232.h"
+
#include "softlist.h"
+#include "speaker.h"
+
void v1050_state::set_interrupt(int line, int state)
{
diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp
index 79ae7acec9b..66540576ac6 100644
--- a/src/mame/drivers/v6809.cpp
+++ b/src/mame/drivers/v6809.cpp
@@ -52,13 +52,16 @@ ToDo:
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
-#include "machine/clock.h"
-#include "video/mc6845.h"
#include "machine/6850acia.h"
-#include "machine/mm58274c.h"
+#include "machine/clock.h"
#include "machine/keyboard.h"
-#include "sound/speaker.h"
+#include "machine/mm58274c.h"
#include "machine/wd_fdc.h"
+#include "sound/spkrdev.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
class v6809_state : public driver_device
{
diff --git a/src/mame/drivers/vamphalf.cpp b/src/mame/drivers/vamphalf.cpp
index 55cde0286e4..06a5b2abfde 100644
--- a/src/mame/drivers/vamphalf.cpp
+++ b/src/mame/drivers/vamphalf.cpp
@@ -61,13 +61,15 @@ TODO:
*********************************************************************/
#include "emu.h"
-#include "cpu/mcs51/mcs51.h"
#include "cpu/e132xs/e132xs.h"
+#include "cpu/mcs51/mcs51.h"
#include "machine/eepromser.h"
#include "machine/nvram.h"
+#include "sound/okim6295.h"
#include "sound/qs1000.h"
#include "sound/ym2151.h"
-#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
class vamphalf_state : public driver_device
diff --git a/src/mame/drivers/vaportra.cpp b/src/mame/drivers/vaportra.cpp
index a62d3f80ae6..ef99c3874ee 100644
--- a/src/mame/drivers/vaportra.cpp
+++ b/src/mame/drivers/vaportra.cpp
@@ -17,12 +17,16 @@
***************************************************************************/
#include "emu.h"
+#include "includes/vaportra.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/h6280/h6280.h"
#include "sound/2203intf.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/vaportra.h"
+#include "screen.h"
+#include "speaker.h"
+
/******************************************************************************/
diff --git a/src/mame/drivers/vastar.cpp b/src/mame/drivers/vastar.cpp
index aab81092505..bc3f7c329ec 100644
--- a/src/mame/drivers/vastar.cpp
+++ b/src/mame/drivers/vastar.cpp
@@ -103,10 +103,13 @@ Vsync : 60.58hz
#include "emu.h"
+#include "includes/vastar.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "includes/vastar.h"
+#include "screen.h"
+#include "speaker.h"
void vastar_state::machine_start()
diff --git a/src/mame/drivers/vball.cpp b/src/mame/drivers/vball.cpp
index 616a6593f6b..aa933868d46 100644
--- a/src/mame/drivers/vball.cpp
+++ b/src/mame/drivers/vball.cpp
@@ -85,11 +85,13 @@ VBlank = 58Hz
*********************************************************************************************************************/
#include "emu.h"
+#include "includes/vball.h"
+
#include "cpu/m6502/m6502.h"
#include "cpu/z80/z80.h"
#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/vball.h"
+#include "speaker.h"
#define MAIN_CLOCK XTAL_12MHz
#define CPU_CLOCK MAIN_CLOCK / 6
diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp
index 544a67c8a5d..18d5cc65ecb 100644
--- a/src/mame/drivers/vboy.cpp
+++ b/src/mame/drivers/vboy.cpp
@@ -27,13 +27,18 @@
****************************************************************************/
#include "emu.h"
-#include "cpu/v810/v810.h"
#include "audio/vboy.h"
+
+#include "cpu/v810/v810.h"
#include "bus/vboy/slot.h"
#include "bus/vboy/rom.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
#include "vboy.lh"
+
#define READ_BGMAP(bgoffs) m_bgmap[(bgoffs) & 0xffff]
#define READ_WORLD(wldoffs) READ_BGMAP((0x1d800 >> 1) + wldoffs)
#define READ_COLTAB1(wldoffs) READ_BGMAP((0x1dc00 >> 1) + wldoffs)
diff --git a/src/mame/drivers/vc4000.cpp b/src/mame/drivers/vc4000.cpp
index cbb93613e74..ab4b2c560f0 100644
--- a/src/mame/drivers/vc4000.cpp
+++ b/src/mame/drivers/vc4000.cpp
@@ -134,6 +134,8 @@ Q-0900^76203F0161063005080E492DCD4890597877103F020E75105A0A0C1E89F4101879
#include "emu.h"
#include "includes/vc4000.h"
#include "softlist.h"
+#include "speaker.h"
+
READ8_MEMBER( vc4000_state::vc4000_key_r )
{
diff --git a/src/mame/drivers/vcombat.cpp b/src/mame/drivers/vcombat.cpp
index 84682063c58..b16c1aec187 100644
--- a/src/mame/drivers/vcombat.cpp
+++ b/src/mame/drivers/vcombat.cpp
@@ -83,14 +83,16 @@ TODO : This is a partially working driver. Most of the memory maps for
*/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
#include "cpu/i860/i860.h"
+#include "cpu/m68000/m68000.h"
#include "machine/nvram.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
-#include "video/tlc34076.h"
#include "video/mc6845.h"
+#include "video/tlc34076.h"
#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
class vcombat_state : public driver_device
diff --git a/src/mame/drivers/vd.cpp b/src/mame/drivers/vd.cpp
index bec44471b92..fd253aa90b6 100644
--- a/src/mame/drivers/vd.cpp
+++ b/src/mame/drivers/vd.cpp
@@ -17,16 +17,19 @@
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
+#include "speaker.h"
+
#include "vd.lh"
class vd_state : public driver_device
{
public:
vd_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
{ }
DECLARE_READ8_MEMBER(ack_r);
diff --git a/src/mame/drivers/vector06.cpp b/src/mame/drivers/vector06.cpp
index 8567fa3d3d6..88bbe937128 100644
--- a/src/mame/drivers/vector06.cpp
+++ b/src/mame/drivers/vector06.cpp
@@ -26,7 +26,9 @@ TODO:
#include "emu.h"
#include "includes/vector06.h"
#include "formats/vector06_dsk.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
/* Address maps */
static ADDRESS_MAP_START(vector06_mem, AS_PROGRAM, 8, vector06_state)
diff --git a/src/mame/drivers/vectrex.cpp b/src/mame/drivers/vectrex.cpp
index 402f30b27cb..5759a3a6c9f 100644
--- a/src/mame/drivers/vectrex.cpp
+++ b/src/mame/drivers/vectrex.cpp
@@ -12,13 +12,17 @@ Bruce Tomlin (hardware info)
#include "emu.h"
#include "includes/vectrex.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/6522via.h"
#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "sound/volt_reg.h"
#include "video/vector.h"
+
#include "softlist.h"
+#include "speaker.h"
+
static ADDRESS_MAP_START(vectrex_map, AS_PROGRAM, 8, vectrex_state )
AM_RANGE(0x0000, 0x7fff) AM_NOP // cart area, handled at machine_start
diff --git a/src/mame/drivers/vega.cpp b/src/mame/drivers/vega.cpp
index 0626200b647..f07f81b2c6c 100644
--- a/src/mame/drivers/vega.cpp
+++ b/src/mame/drivers/vega.cpp
@@ -80,6 +80,8 @@ TODO:
#include "machine/i8255.h"
#include "machine/ins8154.h"
#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
struct vega_obj
@@ -102,13 +104,15 @@ class vega_state : public driver_device
public:
vega_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_i8255(*this, "ppi8255"),
- m_ins8154(*this, "ins8154"),
- m_ay8910(*this, "ay8910"),
- m_gfxdecode(*this, "gfxdecode"),
- m_palette(*this, "palette") {}
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_i8255(*this, "ppi8255")
+ , m_ins8154(*this, "ins8154")
+ , m_ay8910(*this, "ay8910")
+ , m_gfxdecode(*this, "gfxdecode")
+ , m_palette(*this, "palette")
+ {
+ }
required_device<cpu_device> m_maincpu;
required_device<i8255_device> m_i8255;
diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp
index f0e9e1ade1b..efc1b61154d 100644
--- a/src/mame/drivers/vegaeo.cpp
+++ b/src/mame/drivers/vegaeo.cpp
@@ -14,11 +14,13 @@
*********************************************************************/
#include "emu.h"
+#include "includes/eolith.h"
+
#include "cpu/e132xs/e132xs.h"
#include "machine/at28c16.h"
#include "machine/gen_latch.h"
#include "sound/qs1000.h"
-#include "includes/eolith.h"
+#include "speaker.h"
class vegaeo_state : public eolith_state
diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp
index 33e7e4cabce..52ed8641791 100644
--- a/src/mame/drivers/vegas.cpp
+++ b/src/mame/drivers/vegas.cpp
@@ -275,14 +275,16 @@
**************************************************************************/
#include "emu.h"
+#include "audio/dcs.h"
+
#include "cpu/adsp2100/adsp2100.h"
#include "cpu/mips/mips3.h"
-#include "audio/dcs.h"
-#include "machine/timekpr.h"
#include "machine/idectrl.h"
#include "machine/midwayic.h"
#include "machine/smc91c9x.h"
+#include "machine/timekpr.h"
#include "video/voodoo.h"
+#include "screen.h"
/*************************************
diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp
index 28aae924d76..694faee3bf3 100644
--- a/src/mame/drivers/vendetta.cpp
+++ b/src/mame/drivers/vendetta.cpp
@@ -89,15 +89,17 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/vendetta.h"
+#include "includes/konamipt.h"
#include "cpu/m6809/konami.h" /* for the callback and the firq irq definition */
+#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
#include "machine/watchdog.h"
#include "sound/ym2151.h"
#include "sound/k053260.h"
-#include "includes/konamipt.h"
-#include "includes/vendetta.h"
+#include "speaker.h"
+
/***************************************************************************
diff --git a/src/mame/drivers/vertigo.cpp b/src/mame/drivers/vertigo.cpp
index ca0a87b71a2..7070aff0c52 100644
--- a/src/mame/drivers/vertigo.cpp
+++ b/src/mame/drivers/vertigo.cpp
@@ -12,11 +12,13 @@
***************************************************************************/
#include "emu.h"
+#include "includes/vertigo.h"
+
#include "cpu/m6805/m6805.h"
#include "cpu/m68000/m68000.h"
#include "machine/pit8253.h"
#include "machine/nvram.h"
-#include "includes/vertigo.h"
+#include "screen.h"
diff --git a/src/mame/drivers/vg5k.cpp b/src/mame/drivers/vg5k.cpp
index 44d754f7a85..41c73f6d31a 100644
--- a/src/mame/drivers/vg5k.cpp
+++ b/src/mame/drivers/vg5k.cpp
@@ -49,29 +49,35 @@
#include "emu.h"
+
#include "cpu/z80/z80.h"
-#include "formats/vg5k_cas.h"
#include "imagedev/cassette.h"
#include "imagedev/printer.h"
#include "machine/ram.h"
#include "sound/dac.h"
-#include "sound/wave.h"
#include "sound/volt_reg.h"
+#include "sound/wave.h"
#include "video/ef9345.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/vg5k_cas.h"
+
class vg5k_state : public driver_device
{
public:
vg5k_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_ef9345(*this, "ef9345"),
- m_dac(*this, "dac"),
- m_printer(*this, "printer"),
- m_cassette(*this, "cassette"),
- m_ram(*this, RAM_TAG)
- { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_ef9345(*this, "ef9345")
+ , m_dac(*this, "dac")
+ , m_printer(*this, "printer")
+ , m_cassette(*this, "cassette")
+ , m_ram(*this, RAM_TAG)
+ { }
required_device<cpu_device> m_maincpu;
required_device<ef9345_device> m_ef9345;
diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp
index 872307109ab..7e540c62ec1 100644
--- a/src/mame/drivers/vgmplay.cpp
+++ b/src/mame/drivers/vgmplay.cpp
@@ -4,30 +4,33 @@
// A "virtual" driver to play vgm files
// Use with mame vgmplay -bitb file.vgm
-#include <zlib.h>
-
#include "emu.h"
-#include "debugger.h"
+
#include "imagedev/bitbngr.h"
-#include "cpu/m6502/n2a03.h"
#include "cpu/h6280/h6280.h"
-#include "sound/2612intf.h"
-#include "sound/ym2151.h"
-#include "sound/ym2413.h"
+#include "cpu/m6502/n2a03.h"
#include "sound/2203intf.h"
+#include "sound/2612intf.h"
#include "sound/3526intf.h"
#include "sound/3812intf.h"
#include "sound/ay8910.h"
+#include "sound/c352.h"
#include "sound/c6280.h"
-#include "sound/sn76496.h"
+#include "sound/gb.h"
#include "sound/k053260.h"
-#include "sound/segapcm.h"
#include "sound/multipcm.h"
-#include "sound/gb.h"
-#include "sound/pokey.h"
-#include "sound/c352.h"
#include "sound/okim6295.h"
+#include "sound/pokey.h"
+#include "sound/segapcm.h"
+#include "sound/sn76496.h"
+#include "sound/ym2151.h"
+#include "sound/ym2413.h"
+
+#include "debugger.h"
+#include "speaker.h"
+
+#include <zlib.h>
#define AS_IO16 AS_1
#define MCFG_CPU_IO16_MAP MCFG_CPU_DATA_MAP
@@ -125,7 +128,7 @@ private:
void blocks_clear();
};
-const device_type VGMPLAY = &device_creator<vgmplay_device>;
+const device_type VGMPLAY = device_creator<vgmplay_device>;
class vgmplay_state : public driver_device
{
diff --git a/src/mame/drivers/vic10.cpp b/src/mame/drivers/vic10.cpp
index e2540ebd8e7..b6a207cf2b7 100644
--- a/src/mame/drivers/vic10.cpp
+++ b/src/mame/drivers/vic10.cpp
@@ -10,7 +10,9 @@
*/
#include "emu.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#include "bus/pet/cass.h"
#include "bus/vic10/exp.h"
#include "bus/vcs_ctrl/ctrl.h"
diff --git a/src/mame/drivers/vic20.cpp b/src/mame/drivers/vic20.cpp
index 22e5f0462a1..67a3547188a 100644
--- a/src/mame/drivers/vic20.cpp
+++ b/src/mame/drivers/vic20.cpp
@@ -10,7 +10,9 @@
*/
#include "emu.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
#include "bus/cbmiec/cbmiec.h"
#include "bus/pet/cass.h"
#include "bus/vcs_ctrl/ctrl.h"
diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp
index a6a2d6a64a5..a4a1910b3c1 100644
--- a/src/mame/drivers/vicdual.cpp
+++ b/src/mame/drivers/vicdual.cpp
@@ -52,8 +52,6 @@
****************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/i8085/i8085.h"
#include "includes/vicdual.h"
#include "audio/carnival.h"
#include "audio/depthch.h"
@@ -61,6 +59,10 @@
#include "audio/pulsar.h"
#include "audio/vicdual.h"
+#include "cpu/i8085/i8085.h"
+#include "cpu/z80/z80.h"
+#include "speaker.h"
+
#include "depthch.lh"
diff --git a/src/mame/drivers/victor9k.cpp b/src/mame/drivers/victor9k.cpp
index 86f2e8c1b32..5b59ebbff2c 100644
--- a/src/mame/drivers/victor9k.cpp
+++ b/src/mame/drivers/victor9k.cpp
@@ -23,7 +23,6 @@
*/
#include "emu.h"
-#include "softlist.h"
#include "bus/centronics/ctronics.h"
#include "bus/ieee488/ieee488.h"
#include "bus/rs232/rs232.h"
@@ -40,6 +39,9 @@
#include "machine/z80dart.h"
#include "sound/hc55516.h"
#include "video/mc6845.h"
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
#define I8088_TAG "8l"
#define I8253_TAG "13h"
diff --git a/src/mame/drivers/vidbrain.cpp b/src/mame/drivers/vidbrain.cpp
index 59782424003..f5a134439c1 100644
--- a/src/mame/drivers/vidbrain.cpp
+++ b/src/mame/drivers/vidbrain.cpp
@@ -37,9 +37,12 @@
#include "emu.h"
#include "includes/vidbrain.h"
+
#include "machine/rescap.h"
#include "sound/volt_reg.h"
#include "softlist.h"
+#include "speaker.h"
+
#include "vidbrain.lh"
diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp
index 083befd86e5..ed83948190a 100644
--- a/src/mame/drivers/videopin.cpp
+++ b/src/mame/drivers/videopin.cpp
@@ -18,11 +18,14 @@ solarwar
*************************************************************************/
#include "emu.h"
+#include "includes/videopin.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/watchdog.h"
-#include "includes/videopin.h"
-#include "videopin.lh"
#include "sound/discrete.h"
+#include "speaker.h"
+
+#include "videopin.lh"
void videopin_state::update_plunger()
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp
index 282246b1242..26b0b171ac2 100644
--- a/src/mame/drivers/videopkr.cpp
+++ b/src/mame/drivers/videopkr.cpp
@@ -273,25 +273,30 @@
**************************************************************************/
-#define CPU_CLOCK (XTAL_6MHz) /* main cpu clock */
-#define CPU_CLOCK_ALT (XTAL_8MHz) /* alternative main cpu clock for newer games */
-#define SOUND_CLOCK (XTAL_8MHz) /* sound cpu clock */
-#define VIDEO_CLOCK (XTAL_7.8643MHz)
-
-
#include "emu.h"
+
#include "cpu/mcs48/mcs48.h"
#include "cpu/mcs51/mcs51.h"
#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
-#include "videopkr.lh"
+
+#include "screen.h"
+#include "speaker.h"
+
+#include "babydad.lh"
+#include "babypkr.lh"
#include "blckjack.lh"
#include "videocba.lh"
#include "videodad.lh"
-#include "babypkr.lh"
-#include "babydad.lh"
+#include "videopkr.lh"
+
+
+#define CPU_CLOCK (XTAL_6MHz) /* main cpu clock */
+#define CPU_CLOCK_ALT (XTAL_8MHz) /* alternative main cpu clock for newer games */
+#define SOUND_CLOCK (XTAL_8MHz) /* sound cpu clock */
+#define VIDEO_CLOCK (XTAL_7.8643MHz)
class videopkr_state : public driver_device
diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp
index 944c5cd1239..cebf0c1a97a 100644
--- a/src/mame/drivers/vigilant.cpp
+++ b/src/mame/drivers/vigilant.cpp
@@ -24,10 +24,14 @@ Bottom board - M75-B-A (all versions regardless of mask ROM/EPROM)
#include "emu.h"
#include "includes/vigilant.h"
#include "includes/iremipt.h"
+
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
#include "sound/volt_reg.h"
#include "sound/ym2151.h"
+#include "screen.h"
+#include "speaker.h"
+
void vigilant_state::machine_start()
{
diff --git a/src/mame/drivers/vii.cpp b/src/mame/drivers/vii.cpp
index 4026b81fa5e..01fcc6b65b0 100644
--- a/src/mame/drivers/vii.cpp
+++ b/src/mame/drivers/vii.cpp
@@ -74,14 +74,17 @@ Detailed list of bugs:
*******************************************************************************/
#include "emu.h"
+
#include "cpu/unsp/unsp.h"
#include "machine/i2cmem.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
+#include "screen.h"
#include "softlist.h"
+
#define PAGE_ENABLE_MASK 0x0008
#define PAGE_DEPTH_FLAG_MASK 0x3000
diff --git a/src/mame/drivers/vindictr.cpp b/src/mame/drivers/vindictr.cpp
index aa8a0653db5..93dbb21c466 100644
--- a/src/mame/drivers/vindictr.cpp
+++ b/src/mame/drivers/vindictr.cpp
@@ -20,9 +20,11 @@
#include "emu.h"
+#include "includes/vindictr.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
-#include "includes/vindictr.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp
index 8411fc750ef..a70675f905a 100644
--- a/src/mame/drivers/vip.cpp
+++ b/src/mame/drivers/vip.cpp
@@ -221,7 +221,9 @@ Notes:
#include "emu.h"
#include "includes/vip.h"
+
#include "softlist.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp
index 92d6a128102..2ce03887b29 100644
--- a/src/mame/drivers/viper.cpp
+++ b/src/mame/drivers/viper.cpp
@@ -348,11 +348,14 @@ some other components. It will be documented at a later date.
#include "emu.h"
#include "cpu/powerpc/ppc.h"
-#include "machine/lpci.h"
#include "machine/ataintf.h"
#include "machine/idehd.h"
+#include "machine/lpci.h"
#include "machine/timekpr.h"
#include "video/voodoo.h"
+#include "screen.h"
+#include "speaker.h"
+
#define VIPER_DEBUG_LOG
#define VIPER_DEBUG_EPIC_INTS 0
diff --git a/src/mame/drivers/vis.cpp b/src/mame/drivers/vis.cpp
index bedd268d398..719666cbce5 100644
--- a/src/mame/drivers/vis.cpp
+++ b/src/mame/drivers/vis.cpp
@@ -2,14 +2,16 @@
// copyright-holders:Carl
#include "emu.h"
+#include "bus/isa/isa_cards.h"
#include "cpu/i86/i286.h"
+#include "machine/8042kbdc.h"
#include "machine/at.h"
#include "sound/262intf.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "video/pc_vga.h"
-#include "bus/isa/isa_cards.h"
-#include "machine/8042kbdc.h"
+#include "speaker.h"
+
class vis_audio_device : public device_t,
public device_isa16_card_interface
@@ -39,7 +41,7 @@ private:
emu_timer *m_pcm;
};
-const device_type VIS_AUDIO = &device_creator<vis_audio_device>;
+const device_type VIS_AUDIO = device_creator<vis_audio_device>;
vis_audio_device::vis_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: device_t(mconfig, VIS_AUDIO, "vis_pcm", tag, owner, clock, "vis_pcm", __FILE__),
@@ -250,7 +252,7 @@ private:
uint8_t m_crtc_regs[0x31];
};
-const device_type VIS_VGA = &device_creator<vis_vga_device>;
+const device_type VIS_VGA = device_creator<vis_vga_device>;
vis_vga_device::vis_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
: svga_device(mconfig, VIS_VGA, "vis_vga", tag, owner, clock, "vis_vga", __FILE__),
diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp
index 43f2c5ebdc0..bf001194069 100644
--- a/src/mame/drivers/vixen.cpp
+++ b/src/mame/drivers/vixen.cpp
@@ -55,7 +55,10 @@ Notes:
#include "emu.h"
#include "includes/vixen.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp
index 19783e644d9..df9b4873af7 100644
--- a/src/mame/drivers/vk100.cpp
+++ b/src/mame/drivers/vk100.cpp
@@ -125,6 +125,20 @@ This test writes 00 to all the crtc registers and checks to be sure an rst7.5
Not sure exactly what this tests, likely tries firing the vector generator
state machine and sees if the GO bit ever finishes and goes back to 0
*/
+#include "emu.h"
+
+#include "bus/rs232/rs232.h"
+#include "cpu/i8085/i8085.h"
+#include "sound/beep.h"
+#include "video/mc6845.h"
+#include "machine/com8116.h"
+#include "machine/i8251.h"
+
+#include "screen.h"
+#include "speaker.h"
+
+#include "vk100.lh"
+
// named timer IDs
#define TID_I8251_RX 1
@@ -148,15 +162,6 @@ state machine and sees if the GO bit ever finishes and goes back to 0
// debug state dump for the vector generator
#undef DEBUG_VG_STATE
-#include "emu.h"
-#include "bus/rs232/rs232.h"
-#include "cpu/i8085/i8085.h"
-#include "sound/beep.h"
-#include "video/mc6845.h"
-#include "machine/com8116.h"
-#include "machine/i8251.h"
-#include "vk100.lh"
-
#define RS232_TAG "rs232"
#define COM5016T_TAG "com5016t"
diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp
index 8fae31892a6..d07c5a66852 100644
--- a/src/mame/drivers/vlc.cpp
+++ b/src/mame/drivers/vlc.cpp
@@ -123,23 +123,25 @@ nevada TYPE2 : 64 45 51 06 32 02 31 31
*/
-#define MASTER_CLOCK XTAL_16MHz
-#define MASTER_CPU ((MASTER_CLOCK)/2) // 8mhz
-#define SOUND_CLOCK ((MASTER_CLOCK) /8) // 2mhz
-
-#define VIDEO_CLOCK XTAL_33MHz
-#define MC6845_CLOCK ((VIDEO_CLOCK)/4/16) // 0.515625 MHZ
-
-
#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/mc68681.h"
+#include "machine/microtch.h"
+#include "machine/msm6242.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
-#include "video/mc6845.h"
#include "sound/ay8910.h"
-#include "machine/msm6242.h"
-#include "machine/microtch.h"
+#include "video/mc6845.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+#define MASTER_CLOCK XTAL_16MHz
+#define MASTER_CPU ((MASTER_CLOCK)/2) // 8mhz
+#define SOUND_CLOCK ((MASTER_CLOCK) /8) // 2mhz
+
+#define VIDEO_CLOCK XTAL_33MHz
+#define MC6845_CLOCK ((VIDEO_CLOCK)/4/16) // 0.515625 MHZ
/***************************************************************************
diff --git a/src/mame/drivers/volfied.cpp b/src/mame/drivers/volfied.cpp
index 7e59452db78..39fb13bfbc6 100644
--- a/src/mame/drivers/volfied.cpp
+++ b/src/mame/drivers/volfied.cpp
@@ -44,18 +44,21 @@ Stephh's notes (based on the game M68000 code and some tests) :
********************************************************************/
-/* Define clocks based on actual OSC on the PCB */
-
-#define CPU_CLOCK (XTAL_32MHz / 4) /* 8 MHz clock for 68000 */
-#define SOUND_CPU_CLOCK (XTAL_32MHz / 8) /* 4 MHz clock for Z80 sound CPU */
-
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "cpu/m68000/m68000.h"
+#include "includes/volfied.h"
#include "includes/taitoipt.h"
#include "audio/taitosnd.h"
+
+#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
-#include "includes/volfied.h"
+#include "speaker.h"
+
+
+/* Define clocks based on actual OSC on the PCB */
+
+#define CPU_CLOCK (XTAL_32MHz / 4) /* 8 MHz clock for 68000 */
+#define SOUND_CPU_CLOCK (XTAL_32MHz / 8) /* 4 MHz clock for Z80 sound CPU */
/***********************************************************
diff --git a/src/mame/drivers/votrpss.cpp b/src/mame/drivers/votrpss.cpp
index 680199a9142..fc70577202a 100644
--- a/src/mame/drivers/votrpss.cpp
+++ b/src/mame/drivers/votrpss.cpp
@@ -69,21 +69,24 @@ Things to be looked at:
/* Core includes */
#include "emu.h"
+
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
//#include "votrpss.lh"
/* Components */
-#include "sound/ay8910.h"
-#include "sound/votrax.h"
#include "machine/clock.h"
+#include "machine/i8251.h"
#include "machine/i8255.h"
#include "machine/pit8253.h"
-#include "machine/i8251.h"
+#include "sound/ay8910.h"
+#include "sound/votrax.h"
/* For testing */
#include "machine/terminal.h"
+#include "speaker.h"
+
#define TERMINAL_TAG "terminal"
class votrpss_state : public driver_device
diff --git a/src/mame/drivers/votrtnt.cpp b/src/mame/drivers/votrtnt.cpp
index 2d85211429e..c8751fb71af 100644
--- a/src/mame/drivers/votrtnt.cpp
+++ b/src/mame/drivers/votrtnt.cpp
@@ -38,6 +38,8 @@
#include "machine/6850acia.h"
#include "machine/clock.h"
#include "sound/votrax.h"
+#include "speaker.h"
+
#include "votrtnt.lh"
diff --git a/src/mame/drivers/voyager.cpp b/src/mame/drivers/voyager.cpp
index 1ffb2a7f987..789465d1bc5 100644
--- a/src/mame/drivers/voyager.cpp
+++ b/src/mame/drivers/voyager.cpp
@@ -15,14 +15,20 @@ TODO: VIA KT133a chipset support, GeForce 2MX video support, lots of things ;-)
*************************************************************************************/
#include "emu.h"
+
#include "cpu/i386/i386.h"
+#include "machine/idectrl.h"
#include "machine/lpci.h"
-#include "machine/pcshare.h"
#include "machine/pckeybrd.h"
-#include "machine/idectrl.h"
+#include "machine/pcshare.h"
#include "video/pc_vga.h"
+
#include "bus/isa/trident.h"
+#include "screen.h"
+#include "speaker.h"
+
+
class voyager_state : public pcat_base_state
{
public:
diff --git a/src/mame/drivers/vp101.cpp b/src/mame/drivers/vp101.cpp
index 67044a2d8f5..3f3f90e4b8a 100644
--- a/src/mame/drivers/vp101.cpp
+++ b/src/mame/drivers/vp101.cpp
@@ -18,6 +18,7 @@
#include "emu.h"
#include "cpu/mips/mips3.h"
#include "machine/ataintf.h"
+#include "screen.h"
class vp10x_state : public driver_device
diff --git a/src/mame/drivers/vpoker.cpp b/src/mame/drivers/vpoker.cpp
index 7f217396265..5d72ebd56f9 100644
--- a/src/mame/drivers/vpoker.cpp
+++ b/src/mame/drivers/vpoker.cpp
@@ -101,6 +101,8 @@
#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "machine/6840ptm.h"
+#include "screen.h"
+#include "speaker.h"
class vpoker_state : public driver_device
diff --git a/src/mame/drivers/vroulet.cpp b/src/mame/drivers/vroulet.cpp
index c6d342b9c6b..43b2449fbe2 100644
--- a/src/mame/drivers/vroulet.cpp
+++ b/src/mame/drivers/vroulet.cpp
@@ -39,8 +39,10 @@ Tomasz Slanina 20050225
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
-#include "sound/ay8910.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class vroulet_state : public driver_device
diff --git a/src/mame/drivers/vsnes.cpp b/src/mame/drivers/vsnes.cpp
index af7490da434..0b27c15c664 100644
--- a/src/mame/drivers/vsnes.cpp
+++ b/src/mame/drivers/vsnes.cpp
@@ -140,11 +140,15 @@ Changes:
***************************************************************************/
#include "emu.h"
+#include "includes/vsnes.h"
+
#include "cpu/m6502/n2a03.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "rendlay.h"
-#include "includes/vsnes.h"
+#include "screen.h"
+#include "speaker.h"
+
/******************************************************************************/
diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp
index df93efa2564..bf2a2a09463 100644
--- a/src/mame/drivers/vt100.cpp
+++ b/src/mame/drivers/vt100.cpp
@@ -20,6 +20,7 @@
****************************************************************************/
#include "emu.h"
+
#include "bus/rs232/rs232.h"
#include "cpu/i8085/i8085.h"
#include "cpu/z80/z80.h"
@@ -27,8 +28,12 @@
#include "machine/i8251.h"
#include "sound/beep.h"
#include "video/vtvideo.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "vt100.lh"
+
#define RS232_TAG "rs232"
#define COM5016T_TAG "com5016t"
diff --git a/src/mame/drivers/vt220.cpp b/src/mame/drivers/vt220.cpp
index 7076980954b..266d9115166 100644
--- a/src/mame/drivers/vt220.cpp
+++ b/src/mame/drivers/vt220.cpp
@@ -14,6 +14,7 @@
#include "emu.h"
#include "cpu/mcs51/mcs51.h"
#include "machine/ram.h"
+#include "screen.h"
class vt220_state : public driver_device
diff --git a/src/mame/drivers/vt240.cpp b/src/mame/drivers/vt240.cpp
index 9a60e923277..32696fa611f 100644
--- a/src/mame/drivers/vt240.cpp
+++ b/src/mame/drivers/vt240.cpp
@@ -19,12 +19,14 @@
#include "machine/bankdev.h"
#include "machine/x2212.h"
#include "video/upd7220.h"
+#include "screen.h"
+
#define VERBOSE_DBG 0 /* general debug messages */
#define DBG_LOG(N,M,A) \
do { \
- if(VERBOSE_DBG>=N) \
+ if(VERBOSE_DBG>=N) \
{ \
logerror("%11.6f at %s: ",machine().time().as_double(),machine().describe_context()); \
logerror A; \
@@ -35,20 +37,22 @@ class vt240_state : public driver_device
{
public:
vt240_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_i8085(*this, "charcpu"),
- m_i8251(*this, "i8251"),
- m_duart(*this, "duart"),
- m_host(*this, "host"),
- m_hgdc(*this, "upd7220"),
- m_bank(*this, "bank"),
- m_nvram(*this, "x2212"),
- m_palette(*this, "palette"),
- m_rom(*this, "maincpu"),
- m_video_ram(*this, "vram"),
- m_monitor(*this, "monitor"),
- m_lk201(*this, "lk201"){ }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_i8085(*this, "charcpu")
+ , m_i8251(*this, "i8251")
+ , m_duart(*this, "duart")
+ , m_host(*this, "host")
+ , m_hgdc(*this, "upd7220")
+ , m_bank(*this, "bank")
+ , m_nvram(*this, "x2212")
+ , m_palette(*this, "palette")
+ , m_rom(*this, "maincpu")
+ , m_video_ram(*this, "vram")
+ , m_monitor(*this, "monitor")
+ , m_lk201(*this, "lk201")
+ {
+ }
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_i8085;
diff --git a/src/mame/drivers/vt320.cpp b/src/mame/drivers/vt320.cpp
index f468ac7a2c1..0bb658bcd1f 100644
--- a/src/mame/drivers/vt320.cpp
+++ b/src/mame/drivers/vt320.cpp
@@ -11,15 +11,18 @@
#include "emu.h"
#include "cpu/mcs51/mcs51.h"
#include "machine/ram.h"
+#include "screen.h"
class vt320_state : public driver_device
{
public:
vt320_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag) ,
- m_maincpu(*this, "maincpu"),
- m_ram(*this, RAM_TAG) { }
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_ram(*this, RAM_TAG)
+ {
+ }
virtual void machine_reset() override;
virtual void video_start() override;
diff --git a/src/mame/drivers/vt520.cpp b/src/mame/drivers/vt520.cpp
index a6a0af9c645..ccb9d33fe23 100644
--- a/src/mame/drivers/vt520.cpp
+++ b/src/mame/drivers/vt520.cpp
@@ -9,8 +9,9 @@
****************************************************************************/
#include "emu.h"
-#include "machine/ram.h"
#include "cpu/mcs51/mcs51.h"
+#include "machine/ram.h"
+#include "screen.h"
class vt520_state : public driver_device
diff --git a/src/mame/drivers/vta2000.cpp b/src/mame/drivers/vta2000.cpp
index f0703c42413..acc2064ad6a 100644
--- a/src/mame/drivers/vta2000.cpp
+++ b/src/mame/drivers/vta2000.cpp
@@ -20,6 +20,7 @@ Note: port 0 bit 4 is NOT a speaker bit. See code at 027B.
#include "emu.h"
#include "cpu/i8085/i8085.h"
+#include "screen.h"
class vta2000_state : public driver_device
diff --git a/src/mame/drivers/vtech1.cpp b/src/mame/drivers/vtech1.cpp
index 84cf16cdaf3..d24cb5ce684 100644
--- a/src/mame/drivers/vtech1.cpp
+++ b/src/mame/drivers/vtech1.cpp
@@ -31,17 +31,22 @@ Todo:
***************************************************************************/
#include "emu.h"
-#include "formats/imageutl.h"
-#include "cpu/z80/z80.h"
-#include "video/mc6847.h"
+
#include "bus/vtech/ioexp/ioexp.h"
#include "bus/vtech/memexp/memexp.h"
-#include "sound/wave.h"
-#include "sound/speaker.h"
-#include "imagedev/snapquik.h"
+#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
-#include "formats/vt_cas.h"
+#include "imagedev/snapquik.h"
+#include "sound/spkrdev.h"
+#include "sound/wave.h"
+#include "video/mc6847.h"
+
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/imageutl.h"
+#include "formats/vt_cas.h"
+
/***************************************************************************
CONSTANTS & MACROS
diff --git a/src/mame/drivers/vtech2.cpp b/src/mame/drivers/vtech2.cpp
index 0a72bb80273..d87b59474ae 100644
--- a/src/mame/drivers/vtech2.cpp
+++ b/src/mame/drivers/vtech2.cpp
@@ -66,14 +66,18 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "sound/speaker.h"
-#include "sound/wave.h"
#include "includes/vtech2.h"
-#include "imagedev/cassette.h"
+
+#include "cpu/z80/z80.h"
#include "imagedev/flopdrv.h"
+#include "sound/wave.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#include "formats/vt_cas.h"
+
static ADDRESS_MAP_START(vtech2_mem, AS_PROGRAM, 8, vtech2_state )
ADDRESS_MAP_UNMAP_HIGH
AM_RANGE(0x0000, 0x3fff) AM_RAMBANK("bank1")
diff --git a/src/mame/drivers/vulgus.cpp b/src/mame/drivers/vulgus.cpp
index c64408cdd06..358dff49947 100644
--- a/src/mame/drivers/vulgus.cpp
+++ b/src/mame/drivers/vulgus.cpp
@@ -44,10 +44,13 @@ All Clocks and Vsync verified by Corrado Tomaselli (August 2012)
***************************************************************************/
#include "emu.h"
+#include "includes/vulgus.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
-#include "includes/vulgus.h"
+#include "screen.h"
+#include "speaker.h"
INTERRUPT_GEN_MEMBER(vulgus_state::vblank_irq)
diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp
index 4a29a46eae1..524e529d0df 100644
--- a/src/mame/drivers/wacky_gator.cpp
+++ b/src/mame/drivers/wacky_gator.cpp
@@ -21,8 +21,9 @@
#include "machine/i8255.h"
#include "machine/pit8253.h"
#include "machine/ticket.h"
-#include "sound/ym2413.h"
#include "sound/msm5205.h"
+#include "sound/ym2413.h"
+#include "speaker.h"
#include "wackygtr.lh"
diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp
index 77a25599bc3..1afee902a0e 100644
--- a/src/mame/drivers/wallc.cpp
+++ b/src/mame/drivers/wallc.cpp
@@ -51,8 +51,10 @@ Thanks to HIGHWAYMAN for providing info on how to get to these epoxies
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "video/resnet.h"
#include "sound/ay8910.h"
+#include "video/resnet.h"
+#include "screen.h"
+#include "speaker.h"
class wallc_state : public driver_device
diff --git a/src/mame/drivers/wardner.cpp b/src/mame/drivers/wardner.cpp
index c8fb9684c25..b5f5c483819 100644
--- a/src/mame/drivers/wardner.cpp
+++ b/src/mame/drivers/wardner.cpp
@@ -127,12 +127,14 @@ out:
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/twincobr.h"
+#include "includes/toaplipt.h"
+
#include "cpu/tms32010/tms32010.h"
-#include "sound/3812intf.h"
+#include "cpu/z80/z80.h"
#include "machine/bankdev.h"
-#include "includes/toaplipt.h"
-#include "includes/twincobr.h"
+#include "sound/3812intf.h"
+#include "speaker.h"
class wardner_state : public twincobr_state
diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp
index dd1eed7ac61..1bedf832669 100644
--- a/src/mame/drivers/warpsped.cpp
+++ b/src/mame/drivers/warpsped.cpp
@@ -87,6 +87,7 @@ L10, L15, L18 and G18 all read the same
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "screen.h"
class warpspeed_state : public driver_device
{
diff --git a/src/mame/drivers/warpwarp.cpp b/src/mame/drivers/warpwarp.cpp
index ff642caf1f8..5d2bfdff051 100644
--- a/src/mame/drivers/warpwarp.cpp
+++ b/src/mame/drivers/warpwarp.cpp
@@ -127,9 +127,12 @@ Notes:
***************************************************************************/
#include "emu.h"
-#include "cpu/i8085/i8085.h"
#include "includes/warpwarp.h"
+#include "cpu/i8085/i8085.h"
+#include "screen.h"
+#include "speaker.h"
+
#include "geebee.lh"
#include "navarone.lh"
diff --git a/src/mame/drivers/warriorb.cpp b/src/mame/drivers/warriorb.cpp
index af46700c7be..6ae23e97825 100644
--- a/src/mame/drivers/warriorb.cpp
+++ b/src/mame/drivers/warriorb.cpp
@@ -147,12 +147,16 @@ Colscroll effects?
***************************************************************************/
#include "emu.h"
+#include "includes/warriorb.h"
+#include "includes/taitoipt.h"
+
#include "cpu/z80/z80.h"
-#include "rendlay.h"
#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
-#include "includes/warriorb.h"
-#include "includes/taitoipt.h"
+
+#include "rendlay.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/wc90.cpp b/src/mame/drivers/wc90.cpp
index e9d2e50871f..29efcaebcff 100644
--- a/src/mame/drivers/wc90.cpp
+++ b/src/mame/drivers/wc90.cpp
@@ -54,10 +54,13 @@ Press one of the start buttons to exit.
*/
#include "emu.h"
+#include "includes/wc90.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/2608intf.h"
-#include "includes/wc90.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(wc90_state::bankswitch_w)
diff --git a/src/mame/drivers/wc90b.cpp b/src/mame/drivers/wc90b.cpp
index 4d3f0a0564e..f7bec2930b5 100644
--- a/src/mame/drivers/wc90b.cpp
+++ b/src/mame/drivers/wc90b.cpp
@@ -85,9 +85,13 @@ Noted added by ClawGrip 28-Mar-2008:
*/
#include "emu.h"
+#include "includes/wc90b.h"
+
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
-#include "includes/wc90b.h"
+#include "screen.h"
+#include "speaker.h"
+
#define TEST_DIPS false /* enable to test unmapped dip switches */
diff --git a/src/mame/drivers/wecleman.cpp b/src/mame/drivers/wecleman.cpp
index cd63386c90b..b2fcacb7b70 100644
--- a/src/mame/drivers/wecleman.cpp
+++ b/src/mame/drivers/wecleman.cpp
@@ -262,12 +262,15 @@ TODO:
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/wecleman.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/m6809/m6809.h"
+#include "cpu/z80/z80.h"
#include "sound/ym2151.h"
+#include "speaker.h"
+
#include "wecleman.lh"
-#include "includes/wecleman.h"
/***************************************************************************
diff --git a/src/mame/drivers/welltris.cpp b/src/mame/drivers/welltris.cpp
index 3890b725a77..30a1fcdc197 100644
--- a/src/mame/drivers/welltris.cpp
+++ b/src/mame/drivers/welltris.cpp
@@ -312,15 +312,18 @@ TODO:
*******************************************************************************/
-#define WELLTRIS_4P_HACK 0
-
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/welltris.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "sound/2610intf.h"
-#include "includes/welltris.h"
+#include "screen.h"
+#include "speaker.h"
+#define WELLTRIS_4P_HACK 0
+
WRITE8_MEMBER(welltris_state::sound_bankswitch_w)
{
diff --git a/src/mame/drivers/wgp.cpp b/src/mame/drivers/wgp.cpp
index 49a1175c7f3..dbaa2a12778 100644
--- a/src/mame/drivers/wgp.cpp
+++ b/src/mame/drivers/wgp.cpp
@@ -397,12 +397,16 @@ Stephh's notes (based on the game M68000 code and some tests) :
***************************************************************************/
#include "emu.h"
-#include "cpu/z80/z80.h"
+#include "includes/wgp.h"
#include "includes/taitoipt.h"
-#include "cpu/m68000/m68000.h"
#include "audio/taitosnd.h"
+
+#include "cpu/z80/z80.h"
+#include "cpu/m68000/m68000.h"
#include "sound/2610intf.h"
-#include "includes/wgp.h"
+#include "screen.h"
+#include "speaker.h"
+
void wgp_state::parse_control()
{
diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp
index 42822170f78..58a7f45e778 100644
--- a/src/mame/drivers/wheelfir.cpp
+++ b/src/mame/drivers/wheelfir.cpp
@@ -212,6 +212,9 @@ suspicious code:
#include "machine/gen_latch.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "screen.h"
+#include "speaker.h"
+
static const int ZOOM_TABLE_SIZE=1<<14;
static const int NUM_SCANLINES=256-8;
diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp
index cafa5dba988..087d1511fba 100644
--- a/src/mame/drivers/wicat.cpp
+++ b/src/mame/drivers/wicat.cpp
@@ -17,18 +17,21 @@ Wicat - various systems.
*/
#include "emu.h"
+
#include "bus/rs232/rs232.h"
+#include "cpu/8x300/8x300.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z8000/z8000.h"
-#include "cpu/8x300/8x300.h"
#include "machine/6522via.h"
-#include "machine/mm58274c.h"
-#include "machine/mc2661.h"
-#include "machine/im6402.h"
-#include "video/i8275.h"
#include "machine/am9517a.h"
-#include "machine/x2212.h"
+#include "machine/im6402.h"
+#include "machine/mc2661.h"
+#include "machine/mm58274c.h"
#include "machine/wd_fdc.h"
+#include "machine/x2212.h"
+#include "video/i8275.h"
+#include "screen.h"
+
#include "wicat.lh"
class wicat_state : public driver_device
diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp
index 11842256358..dfb546fe6ba 100644
--- a/src/mame/drivers/wico.cpp
+++ b/src/mame/drivers/wico.cpp
@@ -38,8 +38,11 @@ ToDo:
#include "emu.h"
#include "machine/genpin.h"
+
#include "cpu/m6809/m6809.h"
#include "sound/sn76496.h"
+#include "speaker.h"
+
#include "wico.lh"
diff --git a/src/mame/drivers/wildpkr.cpp b/src/mame/drivers/wildpkr.cpp
index b7bfb266624..daee72a23c4 100644
--- a/src/mame/drivers/wildpkr.cpp
+++ b/src/mame/drivers/wildpkr.cpp
@@ -156,6 +156,14 @@
*******************************************************************************/
+#include "emu.h"
+#include "cpu/m68000/m68000.h"
+#include "sound/ay8910.h"
+//#include "video/hd63484.h"
+#include "video/ramdac.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MAIN_CLOCK XTAL_12MHz
#define AY_CLOCK MAIN_CLOCK / 8
@@ -163,12 +171,6 @@
#define AUX1_CLOCK XTAL_26MHz
#define AUX2_CLOCK XTAL_24MHz
-#include "emu.h"
-#include "cpu/m68000/m68000.h"
-//#include "video/hd63484.h"
-#include "video/ramdac.h"
-#include "sound/ay8910.h"
-
class wildpkr_state : public driver_device
{
diff --git a/src/mame/drivers/williams.cpp b/src/mame/drivers/williams.cpp
index c08487a33b5..c1fdbbfc83b 100644
--- a/src/mame/drivers/williams.cpp
+++ b/src/mame/drivers/williams.cpp
@@ -502,9 +502,11 @@ Reference video: https://www.youtube.com/watch?v=R5OeC6Wc_yI
#include "emu.h"
#include "includes/williams.h"
+
#include "machine/nvram.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
#define MASTER_CLOCK (XTAL_12MHz)
diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp
index 3648378aa2a..3a9340da411 100644
--- a/src/mame/drivers/wink.cpp
+++ b/src/mame/drivers/wink.cpp
@@ -14,9 +14,11 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "sound/ay8910.h"
#include "machine/gen_latch.h"
#include "machine/nvram.h"
+#include "sound/ay8910.h"
+#include "screen.h"
+#include "speaker.h"
class wink_state : public driver_device
diff --git a/src/mame/drivers/wiping.cpp b/src/mame/drivers/wiping.cpp
index 64d6e9d462f..3ea4b14ff93 100644
--- a/src/mame/drivers/wiping.cpp
+++ b/src/mame/drivers/wiping.cpp
@@ -36,10 +36,13 @@ dip: 6.7 7.7
***************************************************************************/
#include "emu.h"
+#include "includes/wiping.h"
+#include "audio/wiping.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
-#include "audio/wiping.h"
-#include "includes/wiping.h"
+#include "screen.h"
+#include "speaker.h"
void wiping_state::machine_start()
diff --git a/src/mame/drivers/witch.cpp b/src/mame/drivers/witch.cpp
index 6248da7343e..4adc5f27bb4 100644
--- a/src/mame/drivers/witch.cpp
+++ b/src/mame/drivers/witch.cpp
@@ -219,6 +219,19 @@ TODO :
- Hook up the OKI M5202
*/
+#include "emu.h"
+
+#include "cpu/z80/z80.h"
+#include "machine/i8255.h"
+#include "machine/nvram.h"
+#include "machine/ticket.h"
+#include "sound/2203intf.h"
+#include "sound/es8712.h"
+
+#include "screen.h"
+#include "speaker.h"
+
+
#define MAIN_CLOCK XTAL_12MHz
#define CPU_CLOCK MAIN_CLOCK / 4
#define YM2203_CLOCK MAIN_CLOCK / 4
@@ -226,14 +239,6 @@ TODO :
#define HOPPER_PULSE 50 // time between hopper pulses in milliseconds (not right for attendant pay)
-#include "emu.h"
-#include "cpu/z80/z80.h"
-#include "sound/es8712.h"
-#include "sound/2203intf.h"
-#include "machine/i8255.h"
-#include "machine/nvram.h"
-#include "machine/ticket.h"
-
class witch_state : public driver_device
{
diff --git a/src/mame/drivers/wiz.cpp b/src/mame/drivers/wiz.cpp
index 08bcb0d4f60..e2892d43d29 100644
--- a/src/mame/drivers/wiz.cpp
+++ b/src/mame/drivers/wiz.cpp
@@ -177,11 +177,14 @@ Stephh's notes (based on the games Z80 code and some tests) :
***************************************************************************/
#include "emu.h"
+#include "includes/wiz.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "includes/wiz.h"
+#include "screen.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/wmg.cpp b/src/mame/drivers/wmg.cpp
index 07f5ae8e726..cbe0f878cce 100644
--- a/src/mame/drivers/wmg.cpp
+++ b/src/mame/drivers/wmg.cpp
@@ -70,10 +70,13 @@ of save-state is also needed.
#include "emu.h"
#include "includes/williams.h"
+
#include "cpu/m6800/m6800.h"
#include "machine/nvram.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
+#include "speaker.h"
+
#define MASTER_CLOCK (XTAL_12MHz)
#define SOUND_CLOCK (XTAL_3_579545MHz)
diff --git a/src/mame/drivers/wms.cpp b/src/mame/drivers/wms.cpp
index c196ba7559a..01d9d085ce3 100644
--- a/src/mame/drivers/wms.cpp
+++ b/src/mame/drivers/wms.cpp
@@ -73,6 +73,12 @@
***************************************************************************************************/
+#include "emu.h"
+#include "cpu/i86/i186.h"
+#include "cpu/adsp2100/adsp2100.h"
+#include "screen.h"
+
+
#define MAIN_CLOCK XTAL_40MHz // Pletronics 40.000 MHz. Crystal. Used for CPU clock.
#define VIDEO_CLOCK XTAL_14_31818MHz // Pletronics MP49 14.31818 MHz. Crystal. Used in common VGA ISA cards.
@@ -80,11 +86,6 @@
// (16 * 115200 baud, 192 * 9600 baud, 1536 * 1200 baud, etc...)
-#include "emu.h"
-#include "cpu/i86/i186.h"
-#include "cpu/adsp2100/adsp2100.h"
-
-
class wms_state : public driver_device
{
public:
diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp
index 34bc3289fce..ca8156a4e13 100644
--- a/src/mame/drivers/wolfpack.cpp
+++ b/src/mame/drivers/wolfpack.cpp
@@ -7,9 +7,11 @@
***************************************************************************/
#include "emu.h"
+#include "includes/wolfpack.h"
+
#include "cpu/m6502/m6502.h"
#include "machine/watchdog.h"
-#include "includes/wolfpack.h"
+#include "speaker.h"
void wolfpack_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp
index f584fd6ac50..930fcf0180d 100644
--- a/src/mame/drivers/wpc_an.cpp
+++ b/src/mame/drivers/wpc_an.cpp
@@ -6,12 +6,16 @@
#include "emu.h"
-#include "cpu/m6809/m6809.h"
#include "audio/s11c_bg.h"
#include "audio/wpcsnd.h"
+
+#include "cpu/m6809/m6809.h"
#include "machine/wpc.h"
+#include "speaker.h"
+
#include "wpc_an.lh"
+
#define LOG_WPC (1)
class wpc_an_state : public driver_device
diff --git a/src/mame/drivers/wpc_dot.cpp b/src/mame/drivers/wpc_dot.cpp
index 58eba16f1fd..4a72919ffcf 100644
--- a/src/mame/drivers/wpc_dot.cpp
+++ b/src/mame/drivers/wpc_dot.cpp
@@ -5,6 +5,8 @@
#include "emu.h"
#include "includes/wpc_dot.h"
+#include "screen.h"
+#include "speaker.h"
static ADDRESS_MAP_START( wpc_dot_map, AS_PROGRAM, 8, wpc_dot_state )
diff --git a/src/mame/drivers/wpc_flip1.cpp b/src/mame/drivers/wpc_flip1.cpp
index 2add74c0e4b..55498d58334 100644
--- a/src/mame/drivers/wpc_flip1.cpp
+++ b/src/mame/drivers/wpc_flip1.cpp
@@ -5,6 +5,8 @@
#include "emu.h"
#include "includes/wpc_flip1.h"
+#include "screen.h"
+#include "speaker.h"
static ADDRESS_MAP_START( wpc_flip1_map, AS_PROGRAM, 8, wpc_flip1_state )
diff --git a/src/mame/drivers/wpc_flip2.cpp b/src/mame/drivers/wpc_flip2.cpp
index 7501047949f..8cbdd80b8d9 100644
--- a/src/mame/drivers/wpc_flip2.cpp
+++ b/src/mame/drivers/wpc_flip2.cpp
@@ -5,6 +5,8 @@
#include "emu.h"
#include "includes/wpc_flip2.h"
+#include "screen.h"
+#include "speaker.h"
static ADDRESS_MAP_START( wpc_flip2_map, AS_PROGRAM, 8, wpc_flip2_state )
diff --git a/src/mame/drivers/wrally.cpp b/src/mame/drivers/wrally.cpp
index 6281a5b1f32..ee94f3a410e 100644
--- a/src/mame/drivers/wrally.cpp
+++ b/src/mame/drivers/wrally.cpp
@@ -104,10 +104,13 @@ The PCB has a layout that can either use the 4 rom set of I7, I9, I11 & I 13 or
***************************************************************************/
#include "emu.h"
+#include "includes/wrally.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/mcs51/mcs51.h"
#include "sound/okim6295.h"
-#include "includes/wrally.h"
+#include "screen.h"
+#include "speaker.h"
static ADDRESS_MAP_START( wrally_map, AS_PROGRAM, 16, wrally_state )
diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp
index 0dcaa416e0b..5790c1de45d 100644
--- a/src/mame/drivers/wswan.cpp
+++ b/src/mame/drivers/wswan.cpp
@@ -35,7 +35,11 @@
#include "emu.h"
#include "includes/wswan.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
#include "wswan.lh"
static ADDRESS_MAP_START (wswan_mem, AS_PROGRAM, 8, wswan_state)
diff --git a/src/mame/drivers/wwfsstar.cpp b/src/mame/drivers/wwfsstar.cpp
index d22c6dd3255..d54104fdbf1 100644
--- a/src/mame/drivers/wwfsstar.cpp
+++ b/src/mame/drivers/wwfsstar.cpp
@@ -154,11 +154,14 @@ Notes:
*******************************************************************************/
#include "emu.h"
+#include "includes/wwfsstar.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
-#include "sound/ym2151.h"
#include "sound/okim6295.h"
-#include "includes/wwfsstar.h"
+#include "sound/ym2151.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_20MHz
#define CPU_CLOCK MASTER_CLOCK / 2
diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp
index a7728f9c6a9..7ff061a75f3 100644
--- a/src/mame/drivers/wyvernf0.cpp
+++ b/src/mame/drivers/wyvernf0.cpp
@@ -34,6 +34,9 @@ Actual game video: http://www.nicozon.net/watch/sm10823430
#include "machine/gen_latch.h"
#include "sound/ay8910.h"
#include "sound/msm5232.h"
+#include "screen.h"
+#include "speaker.h"
+
class wyvernf0_state : public driver_device
{
diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp
index 084c5c49959..c4a2a292132 100644
--- a/src/mame/drivers/x07.cpp
+++ b/src/mame/drivers/x07.cpp
@@ -30,7 +30,11 @@
#include "emu.h"
#include "includes/x07.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
/***************************************************************************
T6834 IMPLEMENTATION
diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp
index e9f58f9ac8e..ef10422cf31 100644
--- a/src/mame/drivers/x1.cpp
+++ b/src/mame/drivers/x1.cpp
@@ -208,8 +208,13 @@
#include "emu.h"
#include "includes/x1.h"
-#include "formats/2d_dsk.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/2d_dsk.h"
+
#define MAIN_CLOCK XTAL_16MHz
#define VDP_CLOCK XTAL_42_9545MHz
diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp
index 9cb3158cb84..6d16b959d83 100644
--- a/src/mame/drivers/x1twin.cpp
+++ b/src/mame/drivers/x1twin.cpp
@@ -16,19 +16,21 @@
#include "emu.h"
#include "includes/x1.h"
-
#include "includes/pce.h"
-//#include "cpu/h6280/h6280.h"
-//#include "sound/c6280.h"
-#include "softlist.h"
+
#include "rendlay.h"
+#include "screen.h"
+#include "softlist.h"
+#include "speaker.h"
+
class x1twin_state : public x1_state
{
- public:
- x1twin_state(const machine_config &mconfig, device_type type, const char *tag)
+public:
+ x1twin_state(const machine_config &mconfig, device_type type, const char *tag)
: x1_state(mconfig, type, tag)
{ }
+
uint32_t screen_update_x1pce(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
DECLARE_INPUT_CHANGED_MEMBER(ipl_reset);
DECLARE_INPUT_CHANGED_MEMBER(nmi_reset);
diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp
index dcb19498ca7..2183dc4cb48 100644
--- a/src/mame/drivers/x68k.cpp
+++ b/src/mame/drivers/x68k.cpp
@@ -116,24 +116,25 @@
*/
#include "emu.h"
-#include "machine/mc68901.h"
-#include "machine/upd765.h"
-#include "sound/okim6258.h"
-#include "machine/rp5c15.h"
-#include "machine/mb89352.h"
-#include "formats/xdf_dsk.h"
-#include "formats/dim_dsk.h"
+#include "includes/x68k.h"
#include "machine/x68k_hdc.h"
#include "machine/x68k_kbd.h"
-#include "includes/x68k.h"
-#include "machine/ram.h"
+
+#include "machine/mb89352.h"
#include "machine/nvram.h"
+
#include "bus/x68k/x68kexp.h"
#include "bus/x68k/x68k_neptunex.h"
#include "bus/x68k/x68k_scsiext.h"
#include "bus/scsi/scsi.h"
#include "bus/scsi/scsihd.h"
+
#include "softlist.h"
+#include "speaker.h"
+
+#include "formats/dim_dsk.h"
+#include "formats/xdf_dsk.h"
+
#include "x68000.lh"
diff --git a/src/mame/drivers/xain.cpp b/src/mame/drivers/xain.cpp
index 10936337727..79ef95e19b1 100644
--- a/src/mame/drivers/xain.cpp
+++ b/src/mame/drivers/xain.cpp
@@ -144,6 +144,8 @@ Updates by Bryan McPhail, 12/12/2004:
#include "cpu/m6809/m6809.h"
#include "sound/2203intf.h"
+#include "speaker.h"
+
#define MASTER_CLOCK XTAL_12MHz
#define CPU_CLOCK MASTER_CLOCK / 8
diff --git a/src/mame/drivers/xavix.cpp b/src/mame/drivers/xavix.cpp
index b3bf1762f8f..c08f46819a0 100644
--- a/src/mame/drivers/xavix.cpp
+++ b/src/mame/drivers/xavix.cpp
@@ -14,9 +14,12 @@
#include "emu.h"
+#include "cpu/g65816/g65816.h"
#include "cpu/m6502/m6502.h"
//#include "sound/ay8910.h"
-#include "cpu/g65816/g65816.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MAIN_CLOCK XTAL_21_4772MHz
diff --git a/src/mame/drivers/xbox.cpp b/src/mame/drivers/xbox.cpp
index c187622a3a7..263c141db19 100644
--- a/src/mame/drivers/xbox.cpp
+++ b/src/mame/drivers/xbox.cpp
@@ -10,21 +10,21 @@
#include "emu.h"
+#include "includes/xbox.h"
+
#include "cpu/i386/i386.h"
+#include "machine/atapicdr.h"
+#include "machine/idehd.h"
#include "machine/lpci.h"
-#include "machine/pic8259.h"
#include "machine/pit8253.h"
-#include "machine/idectrl.h"
-#include "machine/idehd.h"
-#include "machine/atapicdr.h"
-#include "video/poly.h"
-#include "bitmap.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 "speaker.h"
+
+#include "bitmap.h"
+
#define CPU_DIV 64
diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp
index 278cb12f202..ba78325ab91 100644
--- a/src/mame/drivers/xerox820.cpp
+++ b/src/mame/drivers/xerox820.cpp
@@ -49,7 +49,12 @@
#include "emu.h"
#include "includes/xerox820.h"
+
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
+
+
/* Read/Write Handlers */
void xerox820_state::bankswitch(int bank)
diff --git a/src/mame/drivers/xexex.cpp b/src/mame/drivers/xexex.cpp
index 6882a31f5fb..25a88cdce64 100644
--- a/src/mame/drivers/xexex.cpp
+++ b/src/mame/drivers/xexex.cpp
@@ -132,15 +132,18 @@ Unresolved Issues:
***************************************************************************/
#include "emu.h"
+#include "includes/xexex.h"
+#include "includes/konamipt.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
#include "machine/k053252.h"
+#include "sound/flt_vol.h"
#include "sound/k054539.h"
#include "sound/ym2151.h"
-#include "sound/flt_vol.h"
-#include "includes/xexex.h"
-#include "includes/konamipt.h"
+#include "speaker.h"
+
#define XE_DEBUG 0
#define XE_SKIPIDLE 1
diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp
index 717b52153d5..9ce6c484615 100644
--- a/src/mame/drivers/xmen.cpp
+++ b/src/mame/drivers/xmen.cpp
@@ -16,15 +16,17 @@ likewise a 2 screen game
***************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
+#include "includes/xmen.h"
+#include "includes/konamipt.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "machine/eepromser.h"
#include "machine/watchdog.h"
-#include "cpu/z80/z80.h"
#include "sound/ym2151.h"
#include "rendlay.h"
-#include "includes/xmen.h"
-#include "includes/konamipt.h"
+#include "speaker.h"
+
/***************************************************************************
diff --git a/src/mame/drivers/xorworld.cpp b/src/mame/drivers/xorworld.cpp
index ccf8ae9d980..332cf52e6d1 100644
--- a/src/mame/drivers/xorworld.cpp
+++ b/src/mame/drivers/xorworld.cpp
@@ -30,10 +30,14 @@ EEPROM chip: 93C46
***************************************************************************/
#include "emu.h"
-#include "machine/eepromser.h"
+#include "includes/xorworld.h"
+
#include "cpu/m68000/m68000.h"
+#include "machine/eepromser.h"
#include "sound/saa1099.h"
-#include "includes/xorworld.h"
+
+#include "screen.h"
+#include "speaker.h"
/****************************************************************
diff --git a/src/mame/drivers/xtheball.cpp b/src/mame/drivers/xtheball.cpp
index cff86858d25..22638d9ebed 100644
--- a/src/mame/drivers/xtheball.cpp
+++ b/src/mame/drivers/xtheball.cpp
@@ -16,6 +16,9 @@
#include "sound/dac.h"
#include "sound/volt_reg.h"
#include "video/tlc34076.h"
+#include "screen.h"
+#include "speaker.h"
+
class xtheball_state : public driver_device
{
diff --git a/src/mame/drivers/xxmissio.cpp b/src/mame/drivers/xxmissio.cpp
index b5ee061d7ad..79d22d91cbb 100644
--- a/src/mame/drivers/xxmissio.cpp
+++ b/src/mame/drivers/xxmissio.cpp
@@ -11,9 +11,12 @@ XX Mission (c) 1986 UPL
*****************************************************************************/
#include "emu.h"
+#include "includes/xxmissio.h"
+
#include "cpu/z80/z80.h"
#include "sound/2203intf.h"
-#include "includes/xxmissio.h"
+#include "screen.h"
+#include "speaker.h"
WRITE8_MEMBER(xxmissio_state::bank_sel_w)
diff --git a/src/mame/drivers/xybots.cpp b/src/mame/drivers/xybots.cpp
index eb46b3d5015..b564c0cedb8 100644
--- a/src/mame/drivers/xybots.cpp
+++ b/src/mame/drivers/xybots.cpp
@@ -20,10 +20,12 @@
#include "emu.h"
+#include "includes/xybots.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
#include "machine/atarigen.h"
-#include "includes/xybots.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp
index 1c142e979cc..bc72efd1d1c 100644
--- a/src/mame/drivers/xyonix.cpp
+++ b/src/mame/drivers/xyonix.cpp
@@ -23,9 +23,11 @@ TODO:
******************************************************************************/
#include "emu.h"
+#include "includes/xyonix.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
-#include "includes/xyonix.h"
+#include "screen.h"
+#include "speaker.h"
void xyonix_state::machine_start()
diff --git a/src/mame/drivers/yiear.cpp b/src/mame/drivers/yiear.cpp
index 550e7152f14..1ef1d9a0e5b 100644
--- a/src/mame/drivers/yiear.cpp
+++ b/src/mame/drivers/yiear.cpp
@@ -97,12 +97,15 @@ Sound: VLM5030 at 7B
***************************************************************************/
#include "emu.h"
+#include "includes/yiear.h"
+#include "includes/konamipt.h"
+#include "audio/trackfld.h"
+
#include "cpu/m6809/m6809.h"
#include "machine/watchdog.h"
#include "sound/sn76496.h"
-#include "includes/konamipt.h"
-#include "audio/trackfld.h"
-#include "includes/yiear.h"
+#include "screen.h"
+#include "speaker.h"
diff --git a/src/mame/drivers/ymmu100.cpp b/src/mame/drivers/ymmu100.cpp
index ccd087375b2..da11e35f9ee 100644
--- a/src/mame/drivers/ymmu100.cpp
+++ b/src/mame/drivers/ymmu100.cpp
@@ -115,12 +115,17 @@
**************************************************************************************/
#include "emu.h"
-#include "debugger.h"
+
+#include "bus/midi/midiinport.h"
+#include "bus/midi/midioutport.h"
#include "cpu/h8/h8s2655.h"
#include "video/hd44780.h"
+
+#include "debugger.h"
#include "rendlay.h"
-#include "bus/midi/midiinport.h"
-#include "bus/midi/midioutport.h"
+#include "screen.h"
+#include "speaker.h"
+
static INPUT_PORTS_START( mu100 )
PORT_START("P7")
diff --git a/src/mame/drivers/yunsun16.cpp b/src/mame/drivers/yunsun16.cpp
index 388f058c2fd..ceb08fa8665 100644
--- a/src/mame/drivers/yunsun16.cpp
+++ b/src/mame/drivers/yunsun16.cpp
@@ -89,10 +89,12 @@ Stephh's notes (based on the games M68000 code and some tests) :
#include "emu.h"
#include "includes/yunsun16.h"
-#include "cpu/z80/z80.h"
+
#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
#include "sound/okim6295.h"
#include "sound/3812intf.h"
+#include "speaker.h"
/***************************************************************************
diff --git a/src/mame/drivers/yunsung8.cpp b/src/mame/drivers/yunsung8.cpp
index 22ea8b11633..e198e9d649d 100644
--- a/src/mame/drivers/yunsung8.cpp
+++ b/src/mame/drivers/yunsung8.cpp
@@ -28,10 +28,14 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/yunsung8.h"
+
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
#include "sound/3812intf.h"
-#include "includes/yunsung8.h"
+#include "screen.h"
+#include "speaker.h"
+
/***************************************************************************
diff --git a/src/mame/drivers/z100.cpp b/src/mame/drivers/z100.cpp
index d4571f68526..70c3f9fec9f 100644
--- a/src/mame/drivers/z100.cpp
+++ b/src/mame/drivers/z100.cpp
@@ -145,11 +145,12 @@ ZDIPSW EQU 0FFH ; Configuration dip switches
#include "emu.h"
#include "cpu/i86/i86.h"
-#include "video/mc6845.h"
-#include "machine/pic8259.h"
+#include "imagedev/flopdrv.h"
#include "machine/6821pia.h"
+#include "machine/pic8259.h"
#include "machine/wd_fdc.h"
-#include "imagedev/flopdrv.h"
+#include "video/mc6845.h"
+#include "screen.h"
class z100_state : public driver_device
{
diff --git a/src/mame/drivers/z1013.cpp b/src/mame/drivers/z1013.cpp
index 5f05d470866..ce59dec2464 100644
--- a/src/mame/drivers/z1013.cpp
+++ b/src/mame/drivers/z1013.cpp
@@ -52,9 +52,11 @@ Due to no input checking, misuse of commands can crash the system.
#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/z80pio.h"
-#include "imagedev/snapquik.h"
#include "imagedev/cassette.h"
+#include "imagedev/snapquik.h"
#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
class z1013_state : public driver_device
@@ -66,7 +68,7 @@ public:
, m_cass(*this, "cassette")
, m_p_videoram(*this, "videoram")
, m_p_chargen(*this, "chargen")
- { }
+ { }
DECLARE_WRITE8_MEMBER(z1013_keyboard_w);
DECLARE_READ8_MEMBER(port_b_r);
diff --git a/src/mame/drivers/z88.cpp b/src/mame/drivers/z88.cpp
index 647ac4affe9..87ec399d8a0 100644
--- a/src/mame/drivers/z88.cpp
+++ b/src/mame/drivers/z88.cpp
@@ -20,6 +20,8 @@
#include "emu.h"
#include "includes/z88.h"
+#include "screen.h"
+#include "speaker.h"
/* Assumption:
diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp
index c2da9e1da96..e842e268ebc 100644
--- a/src/mame/drivers/z9001.cpp
+++ b/src/mame/drivers/z9001.cpp
@@ -29,12 +29,14 @@ ToDo:
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "machine/z80pio.h"
-#include "machine/z80ctc.h"
#include "cpu/z80/z80daisy.h"
-#include "sound/wave.h"
#include "imagedev/cassette.h"
+#include "machine/z80ctc.h"
+#include "machine/z80pio.h"
#include "sound/beep.h"
+#include "sound/wave.h"
+#include "screen.h"
+#include "speaker.h"
// temporary
#include "machine/keyboard.h"
diff --git a/src/mame/drivers/zac2650.cpp b/src/mame/drivers/zac2650.cpp
index 3fe273ddf5e..1bc2e0f61f5 100644
--- a/src/mame/drivers/zac2650.cpp
+++ b/src/mame/drivers/zac2650.cpp
@@ -15,10 +15,12 @@
*/
#include "emu.h"
+#include "includes/zac2650.h"
+
#include "cpu/s2650/s2650.h"
+#include "speaker.h"
#include "tinv2650.lh"
-#include "includes/zac2650.h"
/***********************************************************************************************/
diff --git a/src/mame/drivers/zaccaria.cpp b/src/mame/drivers/zaccaria.cpp
index dc345153403..6332f15e54c 100644
--- a/src/mame/drivers/zaccaria.cpp
+++ b/src/mame/drivers/zaccaria.cpp
@@ -40,10 +40,13 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/zaccaria.h"
+
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/watchdog.h"
-#include "includes/zaccaria.h"
+#include "screen.h"
+#include "speaker.h"
void zaccaria_state::machine_start()
diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp
index 2a069ab3117..fe86bec9ec1 100644
--- a/src/mame/drivers/zaurus.cpp
+++ b/src/mame/drivers/zaurus.cpp
@@ -1403,11 +1403,13 @@ Note:
*****************************************************************************************************************************************/
-
#include "emu.h"
#include "cpu/arm7/arm7.h"
#include "cpu/arm7/arm7core.h"
#include "machine/pxa255.h"
+#include "screen.h"
+#include "speaker.h"
+
#define MAIN_CLOCK XTAL_8MHz
@@ -1415,9 +1417,9 @@ class zaurus_state : public driver_device
{
public:
zaurus_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_ram(*this, "ram")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_ram(*this, "ram")
{ }
// devices
diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp
index 4d20840ac07..9c3cd3f05c8 100644
--- a/src/mame/drivers/zaxxon.cpp
+++ b/src/mame/drivers/zaxxon.cpp
@@ -254,15 +254,18 @@
***************************************************************************/
#include "emu.h"
+#include "includes/zaxxon.h"
+#include "audio/segasnd.h"
+
#include "cpu/z80/z80.h"
-#include "sound/sn76496.h"
-#include "sound/samples.h"
#include "machine/gen_latch.h"
-#include "machine/segacrpt_device.h"
#include "machine/i8255.h"
-#include "audio/segasnd.h"
-#include "includes/zaxxon.h"
+#include "machine/segacrpt_device.h"
+#include "sound/samples.h"
+#include "sound/sn76496.h"
+#include "screen.h"
+#include "speaker.h"
/*************************************
diff --git a/src/mame/drivers/zerozone.cpp b/src/mame/drivers/zerozone.cpp
index 640c179c3db..1c654bd43da 100644
--- a/src/mame/drivers/zerozone.cpp
+++ b/src/mame/drivers/zerozone.cpp
@@ -32,8 +32,11 @@
#include "emu.h"
#include "includes/zerozone.h"
+
#include "cpu/m68000/m68000.h"
#include "sound/okim6295.h"
+#include "screen.h"
+#include "speaker.h"
WRITE16_MEMBER( zerozone_state::sound_w )
diff --git a/src/mame/drivers/zn.cpp b/src/mame/drivers/zn.cpp
index 84a8bb6975a..9c7aecf08ea 100644
--- a/src/mame/drivers/zn.cpp
+++ b/src/mame/drivers/zn.cpp
@@ -11,27 +11,33 @@
***************************************************************************/
#include "emu.h"
+#include "audio/rax.h"
+#include "audio/taito_zm.h"
+#include "audio/taitosnd.h"
+
#include "cpu/m68000/m68000.h"
#include "cpu/psx/psx.h"
#include "cpu/z80/z80.h"
-#include "video/psx.h"
-#include "machine/at28c16.h"
-#include "machine/nvram.h"
-#include "machine/mb3773.h"
#include "machine/7200fifo.h"
-#include "machine/cat702.h"
-#include "machine/znmcu.h"
+#include "machine/at28c16.h"
#include "machine/ataintf.h"
-#include "machine/vt83c461.h"
+#include "machine/cat702.h"
#include "machine/gen_latch.h"
-#include "audio/taitosnd.h"
+#include "machine/mb3773.h"
+#include "machine/nvram.h"
+#include "machine/ram.h"
+#include "machine/vt83c461.h"
+#include "machine/znmcu.h"
#include "sound/2610intf.h"
-#include "sound/ymz280b.h"
#include "sound/qsound.h"
#include "sound/spu.h"
#include "sound/ymf271.h"
-#include "audio/rax.h"
-#include "audio/taito_zm.h"
+#include "sound/ymz280b.h"
+#include "video/psx.h"
+
+#include "screen.h"
+#include "speaker.h"
+
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/mame/drivers/zodiack.cpp b/src/mame/drivers/zodiack.cpp
index 67a087a0f26..63d26577a6d 100644
--- a/src/mame/drivers/zodiack.cpp
+++ b/src/mame/drivers/zodiack.cpp
@@ -89,10 +89,14 @@ Notes:
***************************************************************************/
#include "emu.h"
+#include "includes/zodiack.h"
+
#include "cpu/z80/z80.h"
#include "machine/watchdog.h"
#include "sound/ay8910.h"
-#include "includes/zodiack.h"
+#include "screen.h"
+#include "speaker.h"
+
#define PIXEL_CLOCK (XTAL_18_432MHz/3)
diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp
index 2eea03ad2e6..35cc3f64d21 100644
--- a/src/mame/drivers/zorba.cpp
+++ b/src/mame/drivers/zorba.cpp
@@ -66,7 +66,9 @@ ToDo:
#include "machine/latch.h"
#include "machine/pit8253.h"
+#include "screen.h"
#include "softlist.h"
+#include "speaker.h"
namespace {
diff --git a/src/mame/drivers/zr107.cpp b/src/mame/drivers/zr107.cpp
index 311366f4bb2..2138b499618 100644
--- a/src/mame/drivers/zr107.cpp
+++ b/src/mame/drivers/zr107.cpp
@@ -181,6 +181,7 @@ Check gticlub.c for details on the bottom board.
#include "video/k001006.h"
#include "video/k054156_k054157_k056832.h"
#include "video/konami_helper.h"
+#include "speaker.h"
class zr107_state : public driver_device
diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp
index e7a1c85467f..cf1b0a0fa85 100644
--- a/src/mame/drivers/zrt80.cpp
+++ b/src/mame/drivers/zrt80.cpp
@@ -22,6 +22,8 @@
#include "machine/ins8250.h"
#include "machine/keyboard.h"
#include "sound/beep.h"
+#include "screen.h"
+#include "speaker.h"
class zrt80_state : public driver_device
{
diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp
index efb42e78cd7..01591f36d27 100644
--- a/src/mame/drivers/zwackery.cpp
+++ b/src/mame/drivers/zwackery.cpp
@@ -18,11 +18,14 @@
***************************************************************************/
#include "emu.h"
+#include "audio/csd.h"
+
#include "cpu/m68000/m68000.h"
#include "machine/6821pia.h"
#include "machine/6840ptm.h"
#include "machine/watchdog.h"
-#include "audio/csd.h"
+#include "screen.h"
+#include "speaker.h"
//**************************************************************************
diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp
index 3ef04292ed1..aa853f8c0f8 100644
--- a/src/mame/drivers/zx.cpp
+++ b/src/mame/drivers/zx.cpp
@@ -45,6 +45,9 @@
#include "emu.h"
#include "includes/zx.h"
+#include "speaker.h"
+
+
/* Memory Maps */
static ADDRESS_MAP_START( zx80_map, AS_PROGRAM, 8, zx_state )