summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2019-08-21 14:09:01 -0400
committerGravatarGravatar AJR <ajrhacker@users.noreply.github.com>2019-08-21 14:09:01 -0400
commit121326f802fc04a70c3e9929f33973ade9c389ee (patch)
tree400f7164e2bfe33680702e50834bcb1845263052 /src
parent084c0472a4f09e8ad9a20294809fbae7de49d562 (diff)
Remove tilemap.h from emu.h (nw)
Diffstat (limited to 'src')
-rw-r--r--src/devices/machine/tc009xlvc.h1
-rw-r--r--src/emu/driver.cpp1
-rw-r--r--src/emu/emu.h1
-rw-r--r--src/emu/machine.cpp1
-rw-r--r--src/emu/tilemap.cpp1
-rw-r--r--src/emu/tilemap.h4
-rw-r--r--src/frontend/mame/ui/viewgfx.cpp1
-rw-r--r--src/mame/drivers/1945kiii.cpp1
-rw-r--r--src/mame/drivers/3x3puzzl.cpp1
-rw-r--r--src/mame/drivers/akkaarrh.cpp2
-rw-r--r--src/mame/drivers/albazg.cpp1
-rw-r--r--src/mame/drivers/ambush.cpp1
-rw-r--r--src/mame/drivers/amusco.cpp1
-rw-r--r--src/mame/drivers/avt.cpp1
-rw-r--r--src/mame/drivers/bestleag.cpp1
-rw-r--r--src/mame/drivers/bionicc.cpp1
-rw-r--r--src/mame/drivers/blackt96.cpp1
-rw-r--r--src/mame/drivers/blockade.cpp1
-rw-r--r--src/mame/drivers/bmcpokr.cpp1
-rw-r--r--src/mame/drivers/bnstars.cpp1
-rw-r--r--src/mame/drivers/cabaret.cpp1
-rw-r--r--src/mame/drivers/calorie.cpp1
-rw-r--r--src/mame/drivers/carjmbre.cpp1
-rw-r--r--src/mame/drivers/caswin.cpp1
-rw-r--r--src/mame/drivers/cb2001.cpp1
-rw-r--r--src/mame/drivers/cball.cpp1
-rw-r--r--src/mame/drivers/chanbara.cpp1
-rw-r--r--src/mame/drivers/chance32.cpp1
-rw-r--r--src/mame/drivers/chinsan.cpp1
-rw-r--r--src/mame/drivers/clpoker.cpp1
-rw-r--r--src/mame/drivers/cntsteer.cpp1
-rw-r--r--src/mame/drivers/coinmstr.cpp1
-rw-r--r--src/mame/drivers/cswat.cpp1
-rw-r--r--src/mame/drivers/cultures.cpp1
-rw-r--r--src/mame/drivers/cybertnk.cpp1
-rw-r--r--src/mame/drivers/d9final.cpp1
-rw-r--r--src/mame/drivers/dacholer.cpp1
-rw-r--r--src/mame/drivers/ddayjlc.cpp1
-rw-r--r--src/mame/drivers/ddealer.cpp1
-rw-r--r--src/mame/drivers/dmndrby.cpp1
-rw-r--r--src/mame/drivers/dreamwld.cpp1
-rw-r--r--src/mame/drivers/drtomy.cpp1
-rw-r--r--src/mame/drivers/drw80pkr.cpp2
-rw-r--r--src/mame/drivers/dunhuang.cpp1
-rw-r--r--src/mame/drivers/dynadice.cpp1
-rw-r--r--src/mame/drivers/egghunt.cpp1
-rw-r--r--src/mame/drivers/ettrivia.cpp1
-rw-r--r--src/mame/drivers/firefox.cpp1
-rw-r--r--src/mame/drivers/flower.cpp1
-rw-r--r--src/mame/drivers/flyball.cpp1
-rw-r--r--src/mame/drivers/fresh.cpp1
-rw-r--r--src/mame/drivers/funtech.cpp1
-rw-r--r--src/mame/drivers/galaxi.cpp1
-rw-r--r--src/mame/drivers/gluck2.cpp1
-rw-r--r--src/mame/drivers/goldnpkr.cpp1
-rw-r--r--src/mame/drivers/good.cpp1
-rw-r--r--src/mame/drivers/goodejan.cpp1
-rw-r--r--src/mame/drivers/headonb.cpp1
-rw-r--r--src/mame/drivers/hvyunit.cpp1
-rw-r--r--src/mame/drivers/i7000.cpp1
-rw-r--r--src/mame/drivers/igs009.cpp1
-rw-r--r--src/mame/drivers/igspoker.cpp1
-rw-r--r--src/mame/drivers/istrebiteli.cpp1
-rw-r--r--src/mame/drivers/jackie.cpp1
-rw-r--r--src/mame/drivers/jalmah.cpp1
-rw-r--r--src/mame/drivers/jclub2.cpp4
-rw-r--r--src/mame/drivers/jokrwild.cpp1
-rw-r--r--src/mame/drivers/jollyjgr.cpp1
-rw-r--r--src/mame/drivers/joystand.cpp1
-rw-r--r--src/mame/drivers/jubilee.cpp1
-rw-r--r--src/mame/drivers/kingdrby.cpp1
-rw-r--r--src/mame/drivers/koftball.cpp1
-rw-r--r--src/mame/drivers/koikoi.cpp1
-rw-r--r--src/mame/drivers/lbeach.cpp1
-rw-r--r--src/mame/drivers/limenko.cpp1
-rw-r--r--src/mame/drivers/looping.cpp1
-rw-r--r--src/mame/drivers/ltcasino.cpp2
-rw-r--r--src/mame/drivers/luckgrln.cpp1
-rw-r--r--src/mame/drivers/m14.cpp1
-rw-r--r--src/mame/drivers/m63.cpp1
-rw-r--r--src/mame/drivers/magic10.cpp1
-rw-r--r--src/mame/drivers/magicfly.cpp1
-rw-r--r--src/mame/drivers/majorpkr.cpp1
-rw-r--r--src/mame/drivers/marinedt.cpp1
-rw-r--r--src/mame/drivers/mastboyo.cpp3
-rw-r--r--src/mame/drivers/mgames.cpp1
-rw-r--r--src/mame/drivers/mgolf.cpp1
-rw-r--r--src/mame/drivers/mil4000.cpp1
-rw-r--r--src/mame/drivers/mogura.cpp1
-rw-r--r--src/mame/drivers/mole.cpp1
-rw-r--r--src/mame/drivers/mpu12wbk.cpp1
-rw-r--r--src/mame/drivers/namcos23.cpp1
-rw-r--r--src/mame/drivers/nibble.cpp1
-rw-r--r--src/mame/drivers/nmg5.cpp1
-rw-r--r--src/mame/drivers/nsmpoker.cpp1
-rw-r--r--src/mame/drivers/olibochu.cpp1
-rw-r--r--src/mame/drivers/onetwo.cpp1
-rw-r--r--src/mame/drivers/panicr.cpp1
-rw-r--r--src/mame/drivers/patapata.cpp1
-rw-r--r--src/mame/drivers/peplus.cpp1
-rw-r--r--src/mame/drivers/pipeline.cpp1
-rw-r--r--src/mame/drivers/pkscram.cpp1
-rw-r--r--src/mame/drivers/popobear.cpp1
-rw-r--r--src/mame/drivers/popper.cpp1
-rw-r--r--src/mame/drivers/powerbal.cpp1
-rw-r--r--src/mame/drivers/ppmast93.cpp1
-rw-r--r--src/mame/drivers/pturn.cpp1
-rw-r--r--src/mame/drivers/pzletime.cpp1
-rw-r--r--src/mame/drivers/quickpick5.cpp1
-rw-r--r--src/mame/drivers/quizpun2.cpp1
-rw-r--r--src/mame/drivers/quizshow.cpp1
-rw-r--r--src/mame/drivers/rabbit.cpp1
-rw-r--r--src/mame/drivers/rmhaihai.cpp1
-rw-r--r--src/mame/drivers/safarir.cpp1
-rw-r--r--src/mame/drivers/sanremo.cpp1
-rw-r--r--src/mame/drivers/sbowling.cpp1
-rw-r--r--src/mame/drivers/sbrkout.cpp1
-rw-r--r--src/mame/drivers/seabattl.cpp1
-rw-r--r--src/mame/drivers/seicupbl.cpp1
-rw-r--r--src/mame/drivers/sengokmj.cpp1
-rw-r--r--src/mame/drivers/sfbonus.cpp1
-rw-r--r--src/mame/drivers/silvmil.cpp1
-rw-r--r--src/mame/drivers/skyarmy.cpp1
-rw-r--r--src/mame/drivers/skylncr.cpp1
-rw-r--r--src/mame/drivers/spartanxtec.cpp1
-rw-r--r--src/mame/drivers/spoker.cpp1
-rw-r--r--src/mame/drivers/spool99.cpp1
-rw-r--r--src/mame/drivers/spyhuntertec.cpp1
-rw-r--r--src/mame/drivers/sshot.cpp1
-rw-r--r--src/mame/drivers/statriv2.cpp1
-rw-r--r--src/mame/drivers/stuntair.cpp1
-rw-r--r--src/mame/drivers/subsino.cpp1
-rw-r--r--src/mame/drivers/subsino2.cpp1
-rw-r--r--src/mame/drivers/supduck.cpp1
-rw-r--r--src/mame/drivers/supercrd.cpp1
-rw-r--r--src/mame/drivers/superdq.cpp1
-rw-r--r--src/mame/drivers/superwng.cpp1
-rw-r--r--src/mame/drivers/supracan.cpp1
-rw-r--r--src/mame/drivers/suprgolf.cpp1
-rw-r--r--src/mame/drivers/taitopjc.cpp1
-rw-r--r--src/mame/drivers/tattack.cpp1
-rw-r--r--src/mame/drivers/tmspoker.cpp1
-rw-r--r--src/mame/drivers/trvmadns.cpp1
-rw-r--r--src/mame/drivers/umipoker.cpp1
-rw-r--r--src/mame/drivers/videopkr.cpp1
-rw-r--r--src/mame/drivers/vlc.cpp1
-rw-r--r--src/mame/drivers/vroulet.cpp1
-rw-r--r--src/mame/drivers/wallc.cpp1
-rw-r--r--src/mame/drivers/warpsped.cpp1
-rw-r--r--src/mame/drivers/wink.cpp1
-rw-r--r--src/mame/drivers/wyvernf0.cpp1
-rw-r--r--src/mame/drivers/zwackery.cpp1
-rw-r--r--src/mame/includes/1942.h1
-rw-r--r--src/mame/includes/1943.h1
-rw-r--r--src/mame/includes/40love.h1
-rw-r--r--src/mame/includes/4enraya.h1
-rw-r--r--src/mame/includes/aeroboto.h1
-rw-r--r--src/mame/includes/aerofgt.h1
-rw-r--r--src/mame/includes/airbustr.h1
-rw-r--r--src/mame/includes/alpha68k.h1
-rw-r--r--src/mame/includes/ampoker2.h1
-rw-r--r--src/mame/includes/amspdwy.h1
-rw-r--r--src/mame/includes/angelkds.h2
-rw-r--r--src/mame/includes/appoooh.h1
-rw-r--r--src/mame/includes/aquarium.h1
-rw-r--r--src/mame/includes/aquarius.h1
-rw-r--r--src/mame/includes/argus.h1
-rw-r--r--src/mame/includes/arkanoid.h1
-rw-r--r--src/mame/includes/armedf.h1
-rw-r--r--src/mame/includes/ashnojoe.h1
-rw-r--r--src/mame/includes/atarifb.h1
-rw-r--r--src/mame/includes/atarig1.h1
-rw-r--r--src/mame/includes/atarig42.h1
-rw-r--r--src/mame/includes/atarigt.h1
-rw-r--r--src/mame/includes/atarigx2.h1
-rw-r--r--src/mame/includes/atarisy1.h1
-rw-r--r--src/mame/includes/atarisy2.h1
-rw-r--r--src/mame/includes/atetris.h1
-rw-r--r--src/mame/includes/badlands.h1
-rw-r--r--src/mame/includes/bagman.h1
-rw-r--r--src/mame/includes/bankp.h1
-rw-r--r--src/mame/includes/baraduke.h1
-rw-r--r--src/mame/includes/batman.h1
-rw-r--r--src/mame/includes/battlane.h1
-rw-r--r--src/mame/includes/battlex.h1
-rw-r--r--src/mame/includes/bbusters.h1
-rw-r--r--src/mame/includes/bigstrkb.h1
-rw-r--r--src/mame/includes/bking.h1
-rw-r--r--src/mame/includes/blktiger.h1
-rw-r--r--src/mame/includes/blmbycar.h3
-rw-r--r--src/mame/includes/bloodbro.h1
-rw-r--r--src/mame/includes/blstroid.h1
-rw-r--r--src/mame/includes/blueprnt.h1
-rw-r--r--src/mame/includes/bogeyman.h1
-rw-r--r--src/mame/includes/bombjack.h1
-rw-r--r--src/mame/includes/bosco.h1
-rw-r--r--src/mame/includes/brkthru.h1
-rw-r--r--src/mame/includes/bsktball.h1
-rw-r--r--src/mame/includes/bwing.h1
-rw-r--r--src/mame/includes/cabal.h1
-rw-r--r--src/mame/includes/calomega.h1
-rw-r--r--src/mame/includes/canyon.h1
-rw-r--r--src/mame/includes/cave.h1
-rw-r--r--src/mame/includes/cbasebal.h1
-rw-r--r--src/mame/includes/cclimber.h1
-rw-r--r--src/mame/includes/centiped.h1
-rw-r--r--src/mame/includes/chaknpop.h1
-rw-r--r--src/mame/includes/champbas.h1
-rw-r--r--src/mame/includes/cheekyms.h1
-rw-r--r--src/mame/includes/circus.h1
-rw-r--r--src/mame/includes/circusc.h1
-rw-r--r--src/mame/includes/citycon.h1
-rw-r--r--src/mame/includes/cloak.h1
-rw-r--r--src/mame/includes/clshroad.h1
-rw-r--r--src/mame/includes/combatsc.h1
-rw-r--r--src/mame/includes/commando.h1
-rw-r--r--src/mame/includes/compgolf.h1
-rw-r--r--src/mame/includes/contra.h1
-rw-r--r--src/mame/includes/cop01.h1
-rw-r--r--src/mame/includes/cps1.h1
-rw-r--r--src/mame/includes/crbaloon.h1
-rw-r--r--src/mame/includes/crospang.h1
-rw-r--r--src/mame/includes/crshrace.h1
-rw-r--r--src/mame/includes/cyberbal.h1
-rw-r--r--src/mame/includes/cybstorm.h1
-rw-r--r--src/mame/includes/darius.h1
-rw-r--r--src/mame/includes/darkmist.h1
-rw-r--r--src/mame/includes/dbz.h1
-rw-r--r--src/mame/includes/dcon.h1
-rw-r--r--src/mame/includes/dday.h1
-rw-r--r--src/mame/includes/ddragon.h1
-rw-r--r--src/mame/includes/ddragon3.h1
-rw-r--r--src/mame/includes/ddribble.h1
-rw-r--r--src/mame/includes/deadang.h1
-rw-r--r--src/mame/includes/dec8.h1
-rw-r--r--src/mame/includes/decocass.h1
-rw-r--r--src/mame/includes/deniam.h1
-rw-r--r--src/mame/includes/digdug.h1
-rw-r--r--src/mame/includes/divebomb.h1
-rw-r--r--src/mame/includes/djboy.h1
-rw-r--r--src/mame/includes/dkong.h1
-rw-r--r--src/mame/includes/docastle.h1
-rw-r--r--src/mame/includes/dogfgt.h1
-rw-r--r--src/mame/includes/dragrace.h1
-rw-r--r--src/mame/includes/drgnmst.h1
-rw-r--r--src/mame/includes/drmicro.h1
-rw-r--r--src/mame/includes/dynduke.h1
-rw-r--r--src/mame/includes/efdt.h1
-rw-r--r--src/mame/includes/eprom.h1
-rw-r--r--src/mame/includes/equites.h1
-rw-r--r--src/mame/includes/esd16.h1
-rw-r--r--src/mame/includes/espial.h1
-rw-r--r--src/mame/includes/exedexes.h1
-rw-r--r--src/mame/includes/exprraid.h1
-rw-r--r--src/mame/includes/f1gp.h1
-rw-r--r--src/mame/includes/fastfred.h1
-rw-r--r--src/mame/includes/fastlane.h1
-rw-r--r--src/mame/includes/fcombat.h1
-rw-r--r--src/mame/includes/finalizr.h1
-rw-r--r--src/mame/includes/firetrap.h1
-rw-r--r--src/mame/includes/firetrk.h1
-rw-r--r--src/mame/includes/fitfight.h1
-rw-r--r--src/mame/includes/flkatck.h1
-rw-r--r--src/mame/includes/flstory.h1
-rw-r--r--src/mame/includes/foodf.h1
-rw-r--r--src/mame/includes/freekick.h1
-rw-r--r--src/mame/includes/fromanc2.h1
-rw-r--r--src/mame/includes/fromance.h1
-rw-r--r--src/mame/includes/funkybee.h1
-rw-r--r--src/mame/includes/funworld.h1
-rw-r--r--src/mame/includes/funybubl.h1
-rw-r--r--src/mame/includes/fuukifg2.h1
-rw-r--r--src/mame/includes/fuukifg3.h1
-rw-r--r--src/mame/includes/gaelco.h1
-rw-r--r--src/mame/includes/gaelco2.h1
-rw-r--r--src/mame/includes/gaiden.h1
-rw-r--r--src/mame/includes/galaga.h1
-rw-r--r--src/mame/includes/galaxia.h1
-rw-r--r--src/mame/includes/galaxian.h1
-rw-r--r--src/mame/includes/galaxold.h1
-rw-r--r--src/mame/includes/galivan.h1
-rw-r--r--src/mame/includes/gaplus.h1
-rw-r--r--src/mame/includes/gatron.h3
-rw-r--r--src/mame/includes/gauntlet.h1
-rw-r--r--src/mame/includes/gberet.h1
-rw-r--r--src/mame/includes/gcpinbal.h1
-rw-r--r--src/mame/includes/ginganin.h1
-rw-r--r--src/mame/includes/gladiatr.h1
-rw-r--r--src/mame/includes/glass.h1
-rw-r--r--src/mame/includes/gng.h1
-rw-r--r--src/mame/includes/goal92.h1
-rw-r--r--src/mame/includes/goindol.h1
-rw-r--r--src/mame/includes/goldstar.h1
-rw-r--r--src/mame/includes/gomoku.h1
-rw-r--r--src/mame/includes/gotcha.h1
-rw-r--r--src/mame/includes/gottlieb.h1
-rw-r--r--src/mame/includes/gotya.h1
-rw-r--r--src/mame/includes/grchamp.h1
-rw-r--r--src/mame/includes/gsword.h1
-rw-r--r--src/mame/includes/gumbo.h2
-rw-r--r--src/mame/includes/gundealr.h1
-rw-r--r--src/mame/includes/gunsmoke.h1
-rw-r--r--src/mame/includes/gyruss.h1
-rw-r--r--src/mame/includes/hanaawas.h1
-rw-r--r--src/mame/includes/hcastle.h1
-rw-r--r--src/mame/includes/hexion.h1
-rw-r--r--src/mame/includes/higemaru.h1
-rw-r--r--src/mame/includes/himesiki.h1
-rw-r--r--src/mame/includes/hitme.h1
-rw-r--r--src/mame/includes/hng64.h1
-rw-r--r--src/mame/includes/holeland.h1
-rw-r--r--src/mame/includes/homedata.h1
-rw-r--r--src/mame/includes/homerun.h1
-rw-r--r--src/mame/includes/hyperspt.h1
-rw-r--r--src/mame/includes/inufuku.h1
-rw-r--r--src/mame/includes/iqblock.h1
-rw-r--r--src/mame/includes/ironhors.h1
-rw-r--r--src/mame/includes/jack.h1
-rw-r--r--src/mame/includes/jackal.h1
-rw-r--r--src/mame/includes/jailbrek.h1
-rw-r--r--src/mame/includes/karnov.h1
-rw-r--r--src/mame/includes/kchamp.h1
-rw-r--r--src/mame/includes/kickgoal.h1
-rw-r--r--src/mame/includes/kingobox.h1
-rw-r--r--src/mame/includes/klax.h1
-rw-r--r--src/mame/includes/kncljoe.h1
-rw-r--r--src/mame/includes/konamigx.h1
-rw-r--r--src/mame/includes/kopunch.h1
-rw-r--r--src/mame/includes/ksayakyu.h1
-rw-r--r--src/mame/includes/kyugo.h1
-rw-r--r--src/mame/includes/labyrunr.h1
-rw-r--r--src/mame/includes/ladybug.h1
-rw-r--r--src/mame/includes/ladyfrog.h1
-rw-r--r--src/mame/includes/lasso.h1
-rw-r--r--src/mame/includes/lastduel.h1
-rw-r--r--src/mame/includes/legionna.h1
-rw-r--r--src/mame/includes/leland.h1
-rw-r--r--src/mame/includes/lemmings.h1
-rw-r--r--src/mame/includes/liberate.h1
-rw-r--r--src/mame/includes/lkage.h1
-rw-r--r--src/mame/includes/lockon.h1
-rw-r--r--src/mame/includes/lordgun.h1
-rw-r--r--src/mame/includes/lucky74.h1
-rw-r--r--src/mame/includes/lvcards.h1
-rw-r--r--src/mame/includes/lwings.h1
-rw-r--r--src/mame/includes/m10.h1
-rw-r--r--src/mame/includes/m107.h1
-rw-r--r--src/mame/includes/m52.h1
-rw-r--r--src/mame/includes/m57.h1
-rw-r--r--src/mame/includes/m58.h1
-rw-r--r--src/mame/includes/m62.h1
-rw-r--r--src/mame/includes/m72.h1
-rw-r--r--src/mame/includes/m90.h1
-rw-r--r--src/mame/includes/m92.h1
-rw-r--r--src/mame/includes/macrossp.h1
-rw-r--r--src/mame/includes/madalien.h1
-rw-r--r--src/mame/includes/mainsnk.h1
-rw-r--r--src/mame/includes/mappy.h1
-rw-r--r--src/mame/includes/marineb.h1
-rw-r--r--src/mame/includes/mario.h1
-rw-r--r--src/mame/includes/markham.h1
-rw-r--r--src/mame/includes/mcatadv.h1
-rw-r--r--src/mame/includes/mcr.h1
-rw-r--r--src/mame/includes/mcr3.h1
-rw-r--r--src/mame/includes/mcr68.h1
-rw-r--r--src/mame/includes/meadows.h1
-rw-r--r--src/mame/includes/mermaid.h1
-rw-r--r--src/mame/includes/metlclsh.h1
-rw-r--r--src/mame/includes/metro.h1
-rw-r--r--src/mame/includes/microtan.h1
-rw-r--r--src/mame/includes/mikie.h1
-rw-r--r--src/mame/includes/mitchell.h1
-rw-r--r--src/mame/includes/mjkjidai.h1
-rw-r--r--src/mame/includes/model3.h1
-rw-r--r--src/mame/includes/mosaic.h2
-rw-r--r--src/mame/includes/mrdo.h1
-rw-r--r--src/mame/includes/mrjong.h1
-rw-r--r--src/mame/includes/ms32.h1
-rw-r--r--src/mame/includes/msisaac.h1
-rw-r--r--src/mame/includes/mugsmash.h1
-rw-r--r--src/mame/includes/multfish.h1
-rw-r--r--src/mame/includes/mustache.h1
-rw-r--r--src/mame/includes/mystston.h1
-rw-r--r--src/mame/includes/mystwarr.h1
-rw-r--r--src/mame/includes/namcona1.h1
-rw-r--r--src/mame/includes/namcos22.h1
-rw-r--r--src/mame/includes/namcos86.h1
-rw-r--r--src/mame/includes/nemesis.h1
-rw-r--r--src/mame/includes/news.h2
-rw-r--r--src/mame/includes/ninjakd2.h1
-rw-r--r--src/mame/includes/nmk16.h1
-rw-r--r--src/mame/includes/nova2001.h1
-rw-r--r--src/mame/includes/nycaptor.h1
-rw-r--r--src/mame/includes/offtwall.h1
-rw-r--r--src/mame/includes/ohmygod.h1
-rw-r--r--src/mame/includes/ojankohs.h1
-rw-r--r--src/mame/includes/oneshot.h1
-rw-r--r--src/mame/includes/orbit.h1
-rw-r--r--src/mame/includes/osborne1.h1
-rw-r--r--src/mame/includes/pacland.h1
-rw-r--r--src/mame/includes/pacman.h1
-rw-r--r--src/mame/includes/pandoras.h1
-rw-r--r--src/mame/includes/paradise.h1
-rw-r--r--src/mame/includes/pass.h2
-rw-r--r--src/mame/includes/pbaction.h1
-rw-r--r--src/mame/includes/pgm.h1
-rw-r--r--src/mame/includes/pgm2.h1
-rw-r--r--src/mame/includes/phoenix.h1
-rw-r--r--src/mame/includes/pingpong.h1
-rw-r--r--src/mame/includes/pirates.h1
-rw-r--r--src/mame/includes/pitnrun.h1
-rw-r--r--src/mame/includes/playch10.h1
-rw-r--r--src/mame/includes/playmark.h1
-rw-r--r--src/mame/includes/plygonet.h1
-rw-r--r--src/mame/includes/pokechmp.h1
-rw-r--r--src/mame/includes/polepos.h1
-rw-r--r--src/mame/includes/poolshrk.h1
-rw-r--r--src/mame/includes/pooyan.h1
-rw-r--r--src/mame/includes/popeye.h1
-rw-r--r--src/mame/includes/portrait.h1
-rw-r--r--src/mame/includes/powerins.h1
-rw-r--r--src/mame/includes/prehisle.h1
-rw-r--r--src/mame/includes/psikyo.h1
-rw-r--r--src/mame/includes/psychic5.h1
-rw-r--r--src/mame/includes/punchout.h1
-rw-r--r--src/mame/includes/quizdna.h1
-rw-r--r--src/mame/includes/quizpani.h1
-rw-r--r--src/mame/includes/raiden.h1
-rw-r--r--src/mame/includes/raiden2.h1
-rw-r--r--src/mame/includes/rallyx.h1
-rw-r--r--src/mame/includes/realbrk.h1
-rw-r--r--src/mame/includes/redclash.h1
-rw-r--r--src/mame/includes/relief.h1
-rw-r--r--src/mame/includes/renegade.h1
-rw-r--r--src/mame/includes/retofinv.h1
-rw-r--r--src/mame/includes/rocnrope.h1
-rw-r--r--src/mame/includes/rollrace.h1
-rw-r--r--src/mame/includes/rpunch.h1
-rw-r--r--src/mame/includes/runaway.h1
-rw-r--r--src/mame/includes/rungun.h1
-rw-r--r--src/mame/includes/sauro.h1
-rw-r--r--src/mame/includes/sbasketb.h1
-rw-r--r--src/mame/includes/sbugger.h1
-rw-r--r--src/mame/includes/scotrsht.h1
-rw-r--r--src/mame/includes/sderby.h1
-rw-r--r--src/mame/includes/segag80r.h1
-rw-r--r--src/mame/includes/segas32.h1
-rw-r--r--src/mame/includes/seibuspi.h1
-rw-r--r--src/mame/includes/seicross.h1
-rw-r--r--src/mame/includes/senjyo.h1
-rw-r--r--src/mame/includes/seta.h1
-rw-r--r--src/mame/includes/sf.h1
-rw-r--r--src/mame/includes/shadfrce.h1
-rw-r--r--src/mame/includes/shangkid.h1
-rw-r--r--src/mame/includes/shaolins.h1
-rw-r--r--src/mame/includes/shisen.h1
-rw-r--r--src/mame/includes/shootout.h1
-rw-r--r--src/mame/includes/shuuz.h1
-rw-r--r--src/mame/includes/sidearms.h1
-rw-r--r--src/mame/includes/sidepckt.h1
-rw-r--r--src/mame/includes/silkroad.h1
-rw-r--r--src/mame/includes/skullxbo.h1
-rw-r--r--src/mame/includes/skydiver.h1
-rw-r--r--src/mame/includes/skykid.h1
-rw-r--r--src/mame/includes/slapfght.h1
-rw-r--r--src/mame/includes/snk.h1
-rw-r--r--src/mame/includes/snk6502.h1
-rw-r--r--src/mame/includes/snk68.h1
-rw-r--r--src/mame/includes/snookr10.h1
-rw-r--r--src/mame/includes/solomon.h1
-rw-r--r--src/mame/includes/sonson.h1
-rw-r--r--src/mame/includes/spbactn.h1
-rw-r--r--src/mame/includes/spdodgeb.h1
-rw-r--r--src/mame/includes/speedbal.h1
-rw-r--r--src/mame/includes/speedspn.h1
-rw-r--r--src/mame/includes/splash.h1
-rw-r--r--src/mame/includes/sprint2.h1
-rw-r--r--src/mame/includes/sprint4.h1
-rw-r--r--src/mame/includes/sprint8.h1
-rw-r--r--src/mame/includes/srumbler.h1
-rw-r--r--src/mame/includes/sslam.h1
-rw-r--r--src/mame/includes/ssozumo.h1
-rw-r--r--src/mame/includes/ssrj.h1
-rw-r--r--src/mame/includes/ssv.h1
-rw-r--r--src/mame/includes/stadhero.h1
-rw-r--r--src/mame/includes/starshp1.h1
-rw-r--r--src/mame/includes/sub.h1
-rw-r--r--src/mame/includes/suna8.h1
-rw-r--r--src/mame/includes/superqix.h1
-rw-r--r--src/mame/includes/suprloco.h1
-rw-r--r--src/mame/includes/suprnova.h1
-rw-r--r--src/mame/includes/suprridr.h1
-rw-r--r--src/mame/includes/suprslam.h1
-rw-r--r--src/mame/includes/system1.h1
-rw-r--r--src/mame/includes/system16.h1
-rw-r--r--src/mame/includes/tagteam.h1
-rw-r--r--src/mame/includes/tail2nos.h1
-rw-r--r--src/mame/includes/taito_f3.h1
-rw-r--r--src/mame/includes/taito_l.h1
-rw-r--r--src/mame/includes/taitojc.h1
-rw-r--r--src/mame/includes/tank8.h1
-rw-r--r--src/mame/includes/tankbatt.h1
-rw-r--r--src/mame/includes/tankbust.h1
-rw-r--r--src/mame/includes/taotaido.h1
-rw-r--r--src/mame/includes/targeth.h1
-rw-r--r--src/mame/includes/tatsumi.h1
-rw-r--r--src/mame/includes/tbowl.h1
-rw-r--r--src/mame/includes/tceptor.h1
-rw-r--r--src/mame/includes/tecmo.h1
-rw-r--r--src/mame/includes/tecmo16.h1
-rw-r--r--src/mame/includes/tecmosys.h1
-rw-r--r--src/mame/includes/tehkanwc.h1
-rw-r--r--src/mame/includes/terracre.h1
-rw-r--r--src/mame/includes/tetrisp2.h1
-rw-r--r--src/mame/includes/thedeep.h1
-rw-r--r--src/mame/includes/thepit.h1
-rw-r--r--src/mame/includes/thoop2.h1
-rw-r--r--src/mame/includes/thunderj.h1
-rw-r--r--src/mame/includes/tiamc1.h1
-rw-r--r--src/mame/includes/tigeroad.h1
-rw-r--r--src/mame/includes/timelimt.h1
-rw-r--r--src/mame/includes/timeplt.h1
-rw-r--r--src/mame/includes/tmnt.h1
-rw-r--r--src/mame/includes/toaplan1.h1
-rw-r--r--src/mame/includes/toaplan2.h1
-rw-r--r--src/mame/includes/toki.h1
-rw-r--r--src/mame/includes/toobin.h1
-rw-r--r--src/mame/includes/tp84.h1
-rw-r--r--src/mame/includes/trackfld.h1
-rw-r--r--src/mame/includes/travrusa.h1
-rw-r--r--src/mame/includes/triplhnt.h1
-rw-r--r--src/mame/includes/trucocl.h1
-rw-r--r--src/mame/includes/tryout.h1
-rw-r--r--src/mame/includes/tsamurai.h1
-rw-r--r--src/mame/includes/tumbleb.h1
-rw-r--r--src/mame/includes/tunhunt.h1
-rw-r--r--src/mame/includes/turbo.h1
-rw-r--r--src/mame/includes/twin16.h1
-rw-r--r--src/mame/includes/twincobr.h1
-rw-r--r--src/mame/includes/ultratnk.h1
-rw-r--r--src/mame/includes/unico.h1
-rw-r--r--src/mame/includes/vastar.h1
-rw-r--r--src/mame/includes/vball.h1
-rw-r--r--src/mame/includes/videopin.h1
-rw-r--r--src/mame/includes/vindictr.h1
-rw-r--r--src/mame/includes/vulgus.h1
-rw-r--r--src/mame/includes/warpwarp.h1
-rw-r--r--src/mame/includes/wc90.h1
-rw-r--r--src/mame/includes/wc90b.h1
-rw-r--r--src/mame/includes/wecleman.h1
-rw-r--r--src/mame/includes/welltris.h1
-rw-r--r--src/mame/includes/wgp.h1
-rw-r--r--src/mame/includes/williams.h1
-rw-r--r--src/mame/includes/witch.h1
-rw-r--r--src/mame/includes/wrally.h3
-rw-r--r--src/mame/includes/wwfsstar.h1
-rw-r--r--src/mame/includes/x68k.h1
-rw-r--r--src/mame/includes/xain.h1
-rw-r--r--src/mame/includes/xevious.h1
-rw-r--r--src/mame/includes/xorworld.h1
-rw-r--r--src/mame/includes/xxmissio.h1
-rw-r--r--src/mame/includes/xybots.h1
-rw-r--r--src/mame/includes/xyonix.h1
-rw-r--r--src/mame/includes/yiear.h1
-rw-r--r--src/mame/includes/yunsun16.h1
-rw-r--r--src/mame/includes/yunsung8.h1
-rw-r--r--src/mame/includes/zac2650.h1
-rw-r--r--src/mame/includes/zaccaria.h1
-rw-r--r--src/mame/includes/zaxxon.h1
-rw-r--r--src/mame/includes/zerozone.h1
-rw-r--r--src/mame/machine/megacd.h1
-rw-r--r--src/mame/machine/nb1414m4.h2
-rw-r--r--src/mame/video/airraid_dev.h1
-rw-r--r--src/mame/video/atarivad.h1
-rw-r--r--src/mame/video/bfm_adr2.h2
-rw-r--r--src/mame/video/c45.h2
-rw-r--r--src/mame/video/decbac06.h1
-rw-r--r--src/mame/video/deco16ic.h2
-rw-r--r--src/mame/video/dooyong.h1
-rw-r--r--src/mame/video/edevices.h1
-rw-r--r--src/mame/video/gp9001.h1
-rw-r--r--src/mame/video/igs017_igs031.h1
-rw-r--r--src/mame/video/k001604.h2
-rw-r--r--src/mame/video/k007121.cpp1
-rw-r--r--src/mame/video/k007342.h2
-rw-r--r--src/mame/video/k037122.h2
-rw-r--r--src/mame/video/k051316.h2
-rw-r--r--src/mame/video/k052109.h1
-rw-r--r--src/mame/video/k053251.cpp1
-rw-r--r--src/mame/video/k053936.h1
-rw-r--r--src/mame/video/k054156_k054157_k056832.h1
-rw-r--r--src/mame/video/kaneko_tmap.h2
-rw-r--r--src/mame/video/ladybug.h1
-rw-r--r--src/mame/video/mb60553.h2
-rw-r--r--src/mame/video/ms1_tmap.h2
-rw-r--r--src/mame/video/namco_c123tmap.h1
-rw-r--r--src/mame/video/namco_c169roz.h2
-rw-r--r--src/mame/video/namcos2_roz.h1
-rw-r--r--src/mame/video/orca40c.h2
-rw-r--r--src/mame/video/pc080sn.h3
-rw-r--r--src/mame/video/segaic16.h2
-rw-r--r--src/mame/video/segaic24.h2
-rw-r--r--src/mame/video/st0020.h2
-rw-r--r--src/mame/video/stfight_dev.h1
-rw-r--r--src/mame/video/tc0080vco.h3
-rw-r--r--src/mame/video/tc0100scn.h1
-rw-r--r--src/mame/video/tc0180vcu.h3
-rw-r--r--src/mame/video/tc0280grd.h3
-rw-r--r--src/mame/video/tc0480scp.h2
-rw-r--r--src/mame/video/vs920a.h2
610 files changed, 649 insertions, 9 deletions
diff --git a/src/devices/machine/tc009xlvc.h b/src/devices/machine/tc009xlvc.h
index 4c316540eaf..201511526ce 100644
--- a/src/devices/machine/tc009xlvc.h
+++ b/src/devices/machine/tc009xlvc.h
@@ -12,6 +12,7 @@
#pragma once
#include "machine/bankdev.h"
+#include "tilemap.h"
class tc0091lvc_device : public device_t, public device_gfx_interface
{
diff --git a/src/emu/driver.cpp b/src/emu/driver.cpp
index 57d68c929ef..8dde7622da6 100644
--- a/src/emu/driver.cpp
+++ b/src/emu/driver.cpp
@@ -11,6 +11,7 @@
#include "emu.h"
#include "image.h"
#include "drivenum.h"
+#include "tilemap.h"
//**************************************************************************
diff --git a/src/emu/emu.h b/src/emu/emu.h
index 9ed7d10240d..9c9b2c78e4e 100644
--- a/src/emu/emu.h
+++ b/src/emu/emu.h
@@ -94,7 +94,6 @@
// video-related
#include "drawgfx.h"
-#include "tilemap.h"
#include "video.h"
// sound-related
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp
index 77a1d204b31..0ca233a5d38 100644
--- a/src/emu/machine.cpp
+++ b/src/emu/machine.cpp
@@ -83,6 +83,7 @@
#include "image.h"
#include "network.h"
#include "romload.h"
+#include "tilemap.h"
#include "ui/uimain.h"
#include <time.h>
#include <rapidjson/writer.h>
diff --git a/src/emu/tilemap.cpp b/src/emu/tilemap.cpp
index a1479129405..11842e15901 100644
--- a/src/emu/tilemap.cpp
+++ b/src/emu/tilemap.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "screen.h"
+#include "tilemap.h"
//**************************************************************************
diff --git a/src/emu/tilemap.h b/src/emu/tilemap.h
index 15794247a4f..185311c389a 100644
--- a/src/emu/tilemap.h
+++ b/src/emu/tilemap.h
@@ -300,10 +300,6 @@
#pragma once
-#ifndef __EMU_H__
-#error Dont include this file directly; include emu.h instead.
-#endif
-
#ifndef MAME_EMU_TILEMAP_H
#define MAME_EMU_TILEMAP_H
diff --git a/src/frontend/mame/ui/viewgfx.cpp b/src/frontend/mame/ui/viewgfx.cpp
index 1dd210fa88a..c8caca655d3 100644
--- a/src/frontend/mame/ui/viewgfx.cpp
+++ b/src/frontend/mame/ui/viewgfx.cpp
@@ -15,6 +15,7 @@
#include "render.h"
#include "rendfont.h"
#include "rendutil.h"
+#include "tilemap.h"
#include "ui/viewgfx.h"
diff --git a/src/mame/drivers/1945kiii.cpp b/src/mame/drivers/1945kiii.cpp
index a17c8ad962a..d77122dedde 100644
--- a/src/mame/drivers/1945kiii.cpp
+++ b/src/mame/drivers/1945kiii.cpp
@@ -50,6 +50,7 @@ Notes:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(16'000'000)
diff --git a/src/mame/drivers/3x3puzzl.cpp b/src/mame/drivers/3x3puzzl.cpp
index b390a774651..6c9025a6f73 100644
--- a/src/mame/drivers/3x3puzzl.cpp
+++ b/src/mame/drivers/3x3puzzl.cpp
@@ -46,6 +46,7 @@ Notes:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MAIN_CLOCK XTAL(10'000'000)
diff --git a/src/mame/drivers/akkaarrh.cpp b/src/mame/drivers/akkaarrh.cpp
index 71d5c22f5b4..49240528d8d 100644
--- a/src/mame/drivers/akkaarrh.cpp
+++ b/src/mame/drivers/akkaarrh.cpp
@@ -21,6 +21,8 @@
#include "sound/pokey.h"
#include "emupal.h"
#include "speaker.h"
+#include "tilemap.h"
+
#include "akkaarrh.lh"
diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp
index 0e550b4eac7..fe708a49954 100644
--- a/src/mame/drivers/albazg.cpp
+++ b/src/mame/drivers/albazg.cpp
@@ -44,6 +44,7 @@ PCB:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(12'000'000)
diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp
index 0e50532b217..bb6b400b7a2 100644
--- a/src/mame/drivers/ambush.cpp
+++ b/src/mame/drivers/ambush.cpp
@@ -51,6 +51,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
//**************************************************************************
diff --git a/src/mame/drivers/amusco.cpp b/src/mame/drivers/amusco.cpp
index 6f7bb41e466..b9e367d3a37 100644
--- a/src/mame/drivers/amusco.cpp
+++ b/src/mame/drivers/amusco.cpp
@@ -83,6 +83,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "amusco.lh"
diff --git a/src/mame/drivers/avt.cpp b/src/mame/drivers/avt.cpp
index 7441facec1f..06ec55e013b 100644
--- a/src/mame/drivers/avt.cpp
+++ b/src/mame/drivers/avt.cpp
@@ -427,6 +427,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(16'000'000) /* unknown */
diff --git a/src/mame/drivers/bestleag.cpp b/src/mame/drivers/bestleag.cpp
index 8916f5382fd..77fa89cd590 100644
--- a/src/mame/drivers/bestleag.cpp
+++ b/src/mame/drivers/bestleag.cpp
@@ -26,6 +26,7 @@ Dip Locations added according to Service Mode
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class bestleag_state : public driver_device
diff --git a/src/mame/drivers/bionicc.cpp b/src/mame/drivers/bionicc.cpp
index 596106b8f85..700e494bec5 100644
--- a/src/mame/drivers/bionicc.cpp
+++ b/src/mame/drivers/bionicc.cpp
@@ -91,6 +91,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
//**************************************************************************
diff --git a/src/mame/drivers/blackt96.cpp b/src/mame/drivers/blackt96.cpp
index 690fab53182..b27ff71a5a1 100644
--- a/src/mame/drivers/blackt96.cpp
+++ b/src/mame/drivers/blackt96.cpp
@@ -85,6 +85,7 @@ Bugs (all of these looks BTANBs):
#include "video/snk68_spr.h"
#include "emupal.h"
#include "speaker.h"
+#include "tilemap.h"
class blackt96_state : public driver_device
diff --git a/src/mame/drivers/blockade.cpp b/src/mame/drivers/blockade.cpp
index acfcdb18dc5..990d2d5d357 100644
--- a/src/mame/drivers/blockade.cpp
+++ b/src/mame/drivers/blockade.cpp
@@ -19,6 +19,7 @@
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "blockade.lh"
diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp
index 2c38363c6b9..4dfc66aad2d 100644
--- a/src/mame/drivers/bmcpokr.cpp
+++ b/src/mame/drivers/bmcpokr.cpp
@@ -26,6 +26,7 @@ Other: BMC B816140 (CPLD)
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class bmcpokr_state : public driver_device
{
diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp
index 1ca4030d50a..3c2bf793f92 100644
--- a/src/mame/drivers/bnstars.cpp
+++ b/src/mame/drivers/bnstars.cpp
@@ -98,6 +98,7 @@ ROMs : MR96004-10.1 [125661cd] (IC5 - Samples)
#include "rendlay.h"
#include "speaker.h"
+#include "tilemap.h"
class bnstars_state : public ms32_state
diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp
index eaf24dac033..bf7333cf798 100644
--- a/src/mame/drivers/cabaret.cpp
+++ b/src/mame/drivers/cabaret.cpp
@@ -30,6 +30,7 @@ are the same of IGS. AMT may be previous IGS name.
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class cabaret_state : public driver_device
diff --git a/src/mame/drivers/calorie.cpp b/src/mame/drivers/calorie.cpp
index ad1109fffdf..41c3028527c 100644
--- a/src/mame/drivers/calorie.cpp
+++ b/src/mame/drivers/calorie.cpp
@@ -87,6 +87,7 @@ Notes:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class calorie_state : public driver_device
diff --git a/src/mame/drivers/carjmbre.cpp b/src/mame/drivers/carjmbre.cpp
index e482a16d989..4f41fa0d45a 100644
--- a/src/mame/drivers/carjmbre.cpp
+++ b/src/mame/drivers/carjmbre.cpp
@@ -49,6 +49,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class carjmbre_state : public driver_device
{
diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp
index bdffe165e77..06e4c1cac33 100644
--- a/src/mame/drivers/caswin.cpp
+++ b/src/mame/drivers/caswin.cpp
@@ -74,6 +74,7 @@ TODO:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class caswin_state : public driver_device
diff --git a/src/mame/drivers/cb2001.cpp b/src/mame/drivers/cb2001.cpp
index 62af00fb8d5..669049d97d4 100644
--- a/src/mame/drivers/cb2001.cpp
+++ b/src/mame/drivers/cb2001.cpp
@@ -49,6 +49,7 @@ this seems more like 8-bit hardware, maybe it should be v25, not v35...
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class cb2001_state : public driver_device
diff --git a/src/mame/drivers/cball.cpp b/src/mame/drivers/cball.cpp
index 50dc9b7cc90..b022aeade1a 100644
--- a/src/mame/drivers/cball.cpp
+++ b/src/mame/drivers/cball.cpp
@@ -10,6 +10,7 @@
#include "cpu/m6800/m6800.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class cball_state : public driver_device
diff --git a/src/mame/drivers/chanbara.cpp b/src/mame/drivers/chanbara.cpp
index cfb43647cac..feac1e17267 100644
--- a/src/mame/drivers/chanbara.cpp
+++ b/src/mame/drivers/chanbara.cpp
@@ -56,6 +56,7 @@ ToDo:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class chanbara_state : public driver_device
diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp
index 6c1fa01d690..ed07e57eab8 100644
--- a/src/mame/drivers/chance32.cpp
+++ b/src/mame/drivers/chance32.cpp
@@ -25,6 +25,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "chance32.lh"
diff --git a/src/mame/drivers/chinsan.cpp b/src/mame/drivers/chinsan.cpp
index fa5a8fbcaa2..e6ddc7b5e71 100644
--- a/src/mame/drivers/chinsan.cpp
+++ b/src/mame/drivers/chinsan.cpp
@@ -29,6 +29,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
//**************************************************************************
diff --git a/src/mame/drivers/clpoker.cpp b/src/mame/drivers/clpoker.cpp
index 71f1c76c27a..10a41c9ec71 100644
--- a/src/mame/drivers/clpoker.cpp
+++ b/src/mame/drivers/clpoker.cpp
@@ -29,6 +29,7 @@ There also are unpopulated locations that might fit a YM3812 and YM3014.
#include "emu.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/nvram.h"
diff --git a/src/mame/drivers/cntsteer.cpp b/src/mame/drivers/cntsteer.cpp
index 28b2727846e..757a89c2995 100644
--- a/src/mame/drivers/cntsteer.cpp
+++ b/src/mame/drivers/cntsteer.cpp
@@ -44,6 +44,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class cntsteer_state : public driver_device
diff --git a/src/mame/drivers/coinmstr.cpp b/src/mame/drivers/coinmstr.cpp
index 0461da5f541..ced82d97625 100644
--- a/src/mame/drivers/coinmstr.cpp
+++ b/src/mame/drivers/coinmstr.cpp
@@ -136,6 +136,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(14'000'000)
diff --git a/src/mame/drivers/cswat.cpp b/src/mame/drivers/cswat.cpp
index 7052a3b98d3..de0127175ae 100644
--- a/src/mame/drivers/cswat.cpp
+++ b/src/mame/drivers/cswat.cpp
@@ -28,6 +28,7 @@ TODO:
#include "cpu/mb88xx/mb88xx.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class cswat_state : public driver_device
diff --git a/src/mame/drivers/cultures.cpp b/src/mame/drivers/cultures.cpp
index 23e0fc58f67..69f636b5c74 100644
--- a/src/mame/drivers/cultures.cpp
+++ b/src/mame/drivers/cultures.cpp
@@ -17,6 +17,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MCLK 16000000
diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp
index fa85d13f0d3..7a834e49f94 100644
--- a/src/mame/drivers/cybertnk.cpp
+++ b/src/mame/drivers/cybertnk.cpp
@@ -178,6 +178,7 @@ lev 7 : 0x7c : 0000 07e0 - input device clear?
#include "rendlay.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class cybertnk_state : public driver_device
diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp
index 7590a51ce4b..419556358d4 100644
--- a/src/mame/drivers/d9final.cpp
+++ b/src/mame/drivers/d9final.cpp
@@ -32,6 +32,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class d9final_state : public driver_device
diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp
index ccfd15fe060..5952739664b 100644
--- a/src/mame/drivers/dacholer.cpp
+++ b/src/mame/drivers/dacholer.cpp
@@ -41,6 +41,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class dacholer_state : public driver_device
{
diff --git a/src/mame/drivers/ddayjlc.cpp b/src/mame/drivers/ddayjlc.cpp
index 1747087b79e..a6a77990714 100644
--- a/src/mame/drivers/ddayjlc.cpp
+++ b/src/mame/drivers/ddayjlc.cpp
@@ -67,6 +67,7 @@ $842f = lives
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class ddayjlc_state : public driver_device
diff --git a/src/mame/drivers/ddealer.cpp b/src/mame/drivers/ddealer.cpp
index d46ca085054..dbec61011c7 100644
--- a/src/mame/drivers/ddealer.cpp
+++ b/src/mame/drivers/ddealer.cpp
@@ -120,6 +120,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class ddealer_state : public driver_device
{
diff --git a/src/mame/drivers/dmndrby.cpp b/src/mame/drivers/dmndrby.cpp
index e1a46b7172d..1ed12af43c3 100644
--- a/src/mame/drivers/dmndrby.cpp
+++ b/src/mame/drivers/dmndrby.cpp
@@ -60,6 +60,7 @@ DD10 DD14 DD18 H5 DD21
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class dmndrby_state : public driver_device
diff --git a/src/mame/drivers/dreamwld.cpp b/src/mame/drivers/dreamwld.cpp
index 8c933089052..073aded87c4 100644
--- a/src/mame/drivers/dreamwld.cpp
+++ b/src/mame/drivers/dreamwld.cpp
@@ -103,6 +103,7 @@ Stephh's notes (based on the game M68EC020 code and some tests) :
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include <algorithm>
diff --git a/src/mame/drivers/drtomy.cpp b/src/mame/drivers/drtomy.cpp
index 722585083db..b5a4143b42e 100644
--- a/src/mame/drivers/drtomy.cpp
+++ b/src/mame/drivers/drtomy.cpp
@@ -15,6 +15,7 @@ similar hardware.
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class drtomy_state : public driver_device
{
diff --git a/src/mame/drivers/drw80pkr.cpp b/src/mame/drivers/drw80pkr.cpp
index 4cbdce3e6f1..f47b0810145 100644
--- a/src/mame/drivers/drw80pkr.cpp
+++ b/src/mame/drivers/drw80pkr.cpp
@@ -27,6 +27,7 @@
company in 1981 and changed its name to IGT.
***********************************************************************************/
+
#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/nvram.h"
@@ -34,6 +35,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class drw80pkr_state : public driver_device
diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp
index 2ef9246b647..765ce20c49e 100644
--- a/src/mame/drivers/dunhuang.cpp
+++ b/src/mame/drivers/dunhuang.cpp
@@ -61,6 +61,7 @@ Notes:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define DUNHUANG_DEBUG 0
diff --git a/src/mame/drivers/dynadice.cpp b/src/mame/drivers/dynadice.cpp
index 73048c13abd..b3e216fa517 100644
--- a/src/mame/drivers/dynadice.cpp
+++ b/src/mame/drivers/dynadice.cpp
@@ -42,6 +42,7 @@ dy_6.bin (near Z80)
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class dynadice_state : public driver_device
diff --git a/src/mame/drivers/egghunt.cpp b/src/mame/drivers/egghunt.cpp
index b01bd8a025a..ce5844d122d 100644
--- a/src/mame/drivers/egghunt.cpp
+++ b/src/mame/drivers/egghunt.cpp
@@ -50,6 +50,7 @@ I dumped it with this configuration. In case I'll redump it desoldering pin 16 f
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class egghunt_state : public driver_device
{
diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp
index 9ad1b40a8bb..ce0840bf3ce 100644
--- a/src/mame/drivers/ettrivia.cpp
+++ b/src/mame/drivers/ettrivia.cpp
@@ -34,6 +34,7 @@ Notes:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class ettrivia_state : public driver_device
diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp
index a2bd450efd6..695345457f3 100644
--- a/src/mame/drivers/firefox.cpp
+++ b/src/mame/drivers/firefox.cpp
@@ -43,6 +43,7 @@ but requires a special level III player for proper control. Video: CAV. Audio: A
#include "machine/x2212.h"
#include "emupal.h"
#include "speaker.h"
+#include "tilemap.h"
class firefox_state : public driver_device
diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp
index e007c8decf4..2365317fa78 100644
--- a/src/mame/drivers/flower.cpp
+++ b/src/mame/drivers/flower.cpp
@@ -85,6 +85,7 @@ CHIP # POSITION TYPE
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(18'432'000)
diff --git a/src/mame/drivers/flyball.cpp b/src/mame/drivers/flyball.cpp
index 38105aab8d2..b7f4f04bb05 100644
--- a/src/mame/drivers/flyball.cpp
+++ b/src/mame/drivers/flyball.cpp
@@ -23,6 +23,7 @@ TODO:
#include "machine/74259.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
static constexpr XTAL MASTER_CLOCK = 12.096_MHz_XTAL;
static constexpr XTAL PIXEL_CLOCK = MASTER_CLOCK / 2;
diff --git a/src/mame/drivers/fresh.cpp b/src/mame/drivers/fresh.cpp
index d097612ba12..df20525425a 100644
--- a/src/mame/drivers/fresh.cpp
+++ b/src/mame/drivers/fresh.cpp
@@ -28,6 +28,7 @@ rom 5 and 6 are prg roms
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
diff --git a/src/mame/drivers/funtech.cpp b/src/mame/drivers/funtech.cpp
index 47e48e8ac9e..7b87b19291e 100644
--- a/src/mame/drivers/funtech.cpp
+++ b/src/mame/drivers/funtech.cpp
@@ -29,6 +29,7 @@ and an unpopulated position for a YM2413 or UM3567
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "fts2in1.lh"
diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp
index 7eafa021b35..3f9e2472e51 100644
--- a/src/mame/drivers/galaxi.cpp
+++ b/src/mame/drivers/galaxi.cpp
@@ -40,6 +40,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "galaxi.lh"
diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp
index f9eaa68d99c..5a71b4e55c5 100644
--- a/src/mame/drivers/gluck2.cpp
+++ b/src/mame/drivers/gluck2.cpp
@@ -198,6 +198,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(10'000'000)
diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp
index edcd783a1b7..20249cc90c6 100644
--- a/src/mame/drivers/goldnpkr.cpp
+++ b/src/mame/drivers/goldnpkr.cpp
@@ -1289,6 +1289,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "pmpoker.lh"
#include "goldnpkr.lh"
diff --git a/src/mame/drivers/good.cpp b/src/mame/drivers/good.cpp
index 3de57828b26..bab6011a41d 100644
--- a/src/mame/drivers/good.cpp
+++ b/src/mame/drivers/good.cpp
@@ -38,6 +38,7 @@ voice.rom - VOICE ROM
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class good_state : public driver_device
diff --git a/src/mame/drivers/goodejan.cpp b/src/mame/drivers/goodejan.cpp
index 15cccf3795b..2c492468c14 100644
--- a/src/mame/drivers/goodejan.cpp
+++ b/src/mame/drivers/goodejan.cpp
@@ -80,6 +80,7 @@ Secret menu hack [totmejan only] (I couldn't find official way to enter, so it's
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class goodejan_state : public driver_device, public seibu_sound_common
diff --git a/src/mame/drivers/headonb.cpp b/src/mame/drivers/headonb.cpp
index f4577a1056e..14271fa90ae 100644
--- a/src/mame/drivers/headonb.cpp
+++ b/src/mame/drivers/headonb.cpp
@@ -32,6 +32,7 @@ Other outs:
#include "cpu/i8085/i8085.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class headonb_state : public driver_device
diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp
index 2e577976c26..3063cb1f774 100644
--- a/src/mame/drivers/hvyunit.cpp
+++ b/src/mame/drivers/hvyunit.cpp
@@ -69,6 +69,7 @@ To Do:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
diff --git a/src/mame/drivers/i7000.cpp b/src/mame/drivers/i7000.cpp
index 0d196e1a8ba..4d1b8d0ed8a 100644
--- a/src/mame/drivers/i7000.cpp
+++ b/src/mame/drivers/i7000.cpp
@@ -54,6 +54,7 @@
#include "screen.h"
#include "softlist.h"
#include "speaker.h"
+#include "tilemap.h"
class i7000_state : public driver_device
diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp
index 226392ab8cc..459cf6c8e05 100644
--- a/src/mame/drivers/igs009.cpp
+++ b/src/mame/drivers/igs009.cpp
@@ -37,6 +37,7 @@ Year Game Manufacturer Notes
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class igs009_state : public driver_device
diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp
index d7aa30413af..d14052dbd2a 100644
--- a/src/mame/drivers/igspoker.cpp
+++ b/src/mame/drivers/igspoker.cpp
@@ -73,6 +73,7 @@ FIX: PK Tetris have an input named AMUSE which I couldn't map. Maybe it is
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "igspoker.lh"
diff --git a/src/mame/drivers/istrebiteli.cpp b/src/mame/drivers/istrebiteli.cpp
index 257b08a40d4..9eb028d49ac 100644
--- a/src/mame/drivers/istrebiteli.cpp
+++ b/src/mame/drivers/istrebiteli.cpp
@@ -27,6 +27,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define I8080_TAG "maincpu"
diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp
index 6bc24229045..7f85992824b 100644
--- a/src/mame/drivers/jackie.cpp
+++ b/src/mame/drivers/jackie.cpp
@@ -53,6 +53,7 @@ Note
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class jackie_state : public driver_device
diff --git a/src/mame/drivers/jalmah.cpp b/src/mame/drivers/jalmah.cpp
index 02bad953018..8ebc1901104 100644
--- a/src/mame/drivers/jalmah.cpp
+++ b/src/mame/drivers/jalmah.cpp
@@ -116,6 +116,7 @@ OSC: 12.000MHz
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class jalmah_state : public driver_device
diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp
index b5720c16a48..75a13ac9a58 100644
--- a/src/mame/drivers/jclub2.cpp
+++ b/src/mame/drivers/jclub2.cpp
@@ -106,9 +106,11 @@
#include "machine/timer.h"
#include "machine/watchdog.h"
#include "sound/okim6295.h"
+#include "video/st0020.h"
#include "emupal.h"
#include "speaker.h"
-#include "video/st0020.h"
+#include "tilemap.h"
+
#include "jclub2o.lh"
#include "jclub2.lh"
diff --git a/src/mame/drivers/jokrwild.cpp b/src/mame/drivers/jokrwild.cpp
index c87df8fd1da..56cb3c75da9 100644
--- a/src/mame/drivers/jokrwild.cpp
+++ b/src/mame/drivers/jokrwild.cpp
@@ -78,6 +78,7 @@
#include "machine/nvram.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(8'000'000) /* guess */
diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp
index f745cad2888..668790c38d7 100644
--- a/src/mame/drivers/jollyjgr.cpp
+++ b/src/mame/drivers/jollyjgr.cpp
@@ -123,6 +123,7 @@ Notes:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class jollyjgr_state : public driver_device
diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp
index 2d6544d7069..bbb763fd696 100644
--- a/src/mame/drivers/joystand.cpp
+++ b/src/mame/drivers/joystand.cpp
@@ -99,6 +99,7 @@ Notes:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class joystand_state : public driver_device
{
diff --git a/src/mame/drivers/jubilee.cpp b/src/mame/drivers/jubilee.cpp
index 8e0f025d0bb..ab49044d7ba 100644
--- a/src/mame/drivers/jubilee.cpp
+++ b/src/mame/drivers/jubilee.cpp
@@ -199,6 +199,7 @@
#include "video/mc6845.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(6'000'000) /* confirmed */
#define CPU_CLOCK MASTER_CLOCK /* guess */
diff --git a/src/mame/drivers/kingdrby.cpp b/src/mame/drivers/kingdrby.cpp
index 1cb5982c4e7..d07979c4e74 100644
--- a/src/mame/drivers/kingdrby.cpp
+++ b/src/mame/drivers/kingdrby.cpp
@@ -83,6 +83,7 @@ sg1_b.e1 4096 0x92ef3c13 D2732D
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "kingdrby.lh"
diff --git a/src/mame/drivers/koftball.cpp b/src/mame/drivers/koftball.cpp
index 2b1c1658888..9429cf05bf9 100644
--- a/src/mame/drivers/koftball.cpp
+++ b/src/mame/drivers/koftball.cpp
@@ -37,6 +37,7 @@ ft5_v6_c4.u58 /
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define NVRAM_HACK 1
diff --git a/src/mame/drivers/koikoi.cpp b/src/mame/drivers/koikoi.cpp
index e2ee71ee3a5..57ff82295c5 100644
--- a/src/mame/drivers/koikoi.cpp
+++ b/src/mame/drivers/koikoi.cpp
@@ -45,6 +45,7 @@ to prevent disabling inputs.
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define KOIKOI_CRYSTAL 15468000
diff --git a/src/mame/drivers/lbeach.cpp b/src/mame/drivers/lbeach.cpp
index d0f15f067c9..96cec48d265 100644
--- a/src/mame/drivers/lbeach.cpp
+++ b/src/mame/drivers/lbeach.cpp
@@ -28,6 +28,7 @@ TODO:
#include "machine/nvram.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#include "lbeach.lh"
diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp
index 7934d4b3b3b..7a19838d41e 100644
--- a/src/mame/drivers/limenko.cpp
+++ b/src/mame/drivers/limenko.cpp
@@ -33,6 +33,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class limenko_state : public driver_device
diff --git a/src/mame/drivers/looping.cpp b/src/mame/drivers/looping.cpp
index 86448a1593b..5b0d253411d 100644
--- a/src/mame/drivers/looping.cpp
+++ b/src/mame/drivers/looping.cpp
@@ -69,6 +69,7 @@ L056-6 9A " " VLI-8-4 7A "
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
/*************************************
diff --git a/src/mame/drivers/ltcasino.cpp b/src/mame/drivers/ltcasino.cpp
index 0e6e5d0cec7..180f5611986 100644
--- a/src/mame/drivers/ltcasino.cpp
+++ b/src/mame/drivers/ltcasino.cpp
@@ -77,6 +77,8 @@ Other: Hitachi HD46821P 1MHz NMOS Peripheral Interface Adapter (PIA) x 2
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
+
#include "ltcasino.lh"
#include "ltcasinn.lh"
diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp
index dba1b870111..35f096e6dc3 100644
--- a/src/mame/drivers/luckgrln.cpp
+++ b/src/mame/drivers/luckgrln.cpp
@@ -82,6 +82,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "luckgrln.lh"
#include "7smash.lh"
diff --git a/src/mame/drivers/m14.cpp b/src/mame/drivers/m14.cpp
index a7f37c66748..f277b331ce6 100644
--- a/src/mame/drivers/m14.cpp
+++ b/src/mame/drivers/m14.cpp
@@ -54,6 +54,7 @@ Dumped by Chackn
#include "screen.h"
#include "sound/samples.h"
#include "speaker.h"
+#include "tilemap.h"
class m14_state : public driver_device
diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp
index 36043376f5b..56b13888e04 100644
--- a/src/mame/drivers/m63.cpp
+++ b/src/mame/drivers/m63.cpp
@@ -127,6 +127,7 @@ Dip locations verified for:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class m63_state : public driver_device
{
diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp
index c67df432427..bb144c81a3a 100644
--- a/src/mame/drivers/magic10.cpp
+++ b/src/mame/drivers/magic10.cpp
@@ -127,6 +127,7 @@ Both setups show different variants for components layout, memory size, NVRAM, e
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "sgsafari.lh"
#include "musicsrt.lh"
diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp
index 98aa04dd621..63c2f06d573 100644
--- a/src/mame/drivers/magicfly.cpp
+++ b/src/mame/drivers/magicfly.cpp
@@ -449,6 +449,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(10'000'000)
diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp
index 16fb1363344..a0379db64a6 100644
--- a/src/mame/drivers/majorpkr.cpp
+++ b/src/mame/drivers/majorpkr.cpp
@@ -460,6 +460,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "majorpkr.lh"
diff --git a/src/mame/drivers/marinedt.cpp b/src/mame/drivers/marinedt.cpp
index df3077e542b..76150efe426 100644
--- a/src/mame/drivers/marinedt.cpp
+++ b/src/mame/drivers/marinedt.cpp
@@ -106,6 +106,7 @@ Lower PCB is plugged in with components facing up.
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MAIN_CLOCK XTAL(9'987'000)
diff --git a/src/mame/drivers/mastboyo.cpp b/src/mame/drivers/mastboyo.cpp
index 344f94cb2f8..748154d4531 100644
--- a/src/mame/drivers/mastboyo.cpp
+++ b/src/mame/drivers/mastboyo.cpp
@@ -11,11 +11,12 @@
#include "emu.h"
#include "cpu/z80/z80.h"
+#include "machine/nvram.h"
#include "sound/ay8910.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
-#include "machine/nvram.h"
+#include "tilemap.h"
class mastboyo_state : public driver_device
diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp
index 82e504689fc..58b0a2406ba 100644
--- a/src/mame/drivers/mgames.cpp
+++ b/src/mame/drivers/mgames.cpp
@@ -219,6 +219,7 @@
#include "machine/nvram.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#include "mgames.lh"
diff --git a/src/mame/drivers/mgolf.cpp b/src/mame/drivers/mgolf.cpp
index 47d12299405..a04d2c47e9e 100644
--- a/src/mame/drivers/mgolf.cpp
+++ b/src/mame/drivers/mgolf.cpp
@@ -10,6 +10,7 @@
#include "cpu/m6502/m6502.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class mgolf_state : public driver_device
{
diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp
index d4e37d14353..61f33968369 100644
--- a/src/mame/drivers/mil4000.cpp
+++ b/src/mame/drivers/mil4000.cpp
@@ -114,6 +114,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "mil4000.lh"
diff --git a/src/mame/drivers/mogura.cpp b/src/mame/drivers/mogura.cpp
index 71965ec7e99..75ce2cffd23 100644
--- a/src/mame/drivers/mogura.cpp
+++ b/src/mame/drivers/mogura.cpp
@@ -11,6 +11,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class mogura_state : public driver_device
diff --git a/src/mame/drivers/mole.cpp b/src/mame/drivers/mole.cpp
index 83702b50d6b..a217508e49d 100644
--- a/src/mame/drivers/mole.cpp
+++ b/src/mame/drivers/mole.cpp
@@ -55,6 +55,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class mole_state : public driver_device
diff --git a/src/mame/drivers/mpu12wbk.cpp b/src/mame/drivers/mpu12wbk.cpp
index b4845fffd59..ba6be725812 100644
--- a/src/mame/drivers/mpu12wbk.cpp
+++ b/src/mame/drivers/mpu12wbk.cpp
@@ -213,6 +213,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(8'000'000)
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index 69a9134b2c4..669dcc50200 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -1267,6 +1267,7 @@ Notes:
#include "video/poly.h"
#include "emupal.h"
#include "speaker.h"
+#include "tilemap.h"
#include <float.h>
diff --git a/src/mame/drivers/nibble.cpp b/src/mame/drivers/nibble.cpp
index c658937cfe7..dab1ae412ff 100644
--- a/src/mame/drivers/nibble.cpp
+++ b/src/mame/drivers/nibble.cpp
@@ -54,6 +54,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(12'000'000)
diff --git a/src/mame/drivers/nmg5.cpp b/src/mame/drivers/nmg5.cpp
index f3867cd07b0..1f3def2ebe7 100644
--- a/src/mame/drivers/nmg5.cpp
+++ b/src/mame/drivers/nmg5.cpp
@@ -231,6 +231,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class nmg5_state : public driver_device
diff --git a/src/mame/drivers/nsmpoker.cpp b/src/mame/drivers/nsmpoker.cpp
index a9f4e995120..edf4bc36707 100644
--- a/src/mame/drivers/nsmpoker.cpp
+++ b/src/mame/drivers/nsmpoker.cpp
@@ -63,6 +63,7 @@
#include "sound/ay8910.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(22'118'400)
diff --git a/src/mame/drivers/olibochu.cpp b/src/mame/drivers/olibochu.cpp
index 8f43d64288f..376d66307ff 100644
--- a/src/mame/drivers/olibochu.cpp
+++ b/src/mame/drivers/olibochu.cpp
@@ -61,6 +61,7 @@ $7004 writes, related to $7000 reads
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class olibochu_state : public driver_device
{
diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp
index 2bfb51fcb1d..1f624b1ef54 100644
--- a/src/mame/drivers/onetwo.cpp
+++ b/src/mame/drivers/onetwo.cpp
@@ -50,6 +50,7 @@ Note: this is quite clearly a 'Korean bootleg' of Shisensho - Joshiryo-Hen / Mat
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class onetwo_state : public driver_device
{
diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp
index 09dbedb077b..2fb4549b3cc 100644
--- a/src/mame/drivers/panicr.cpp
+++ b/src/mame/drivers/panicr.cpp
@@ -69,6 +69,7 @@ D.9B [f99cac4b] /
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class panicr_state : public driver_device
diff --git a/src/mame/drivers/patapata.cpp b/src/mame/drivers/patapata.cpp
index 9638f33ef2b..8139df2dcce 100644
--- a/src/mame/drivers/patapata.cpp
+++ b/src/mame/drivers/patapata.cpp
@@ -27,6 +27,7 @@ maybe close to jalmah.cpp?
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class patapata_state : public driver_device
diff --git a/src/mame/drivers/peplus.cpp b/src/mame/drivers/peplus.cpp
index b6c11b0a3d2..6778945bb33 100644
--- a/src/mame/drivers/peplus.cpp
+++ b/src/mame/drivers/peplus.cpp
@@ -209,6 +209,7 @@ A Note about Best Bet Products.
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "peplus.lh"
#include "pe_schip.lh"
diff --git a/src/mame/drivers/pipeline.cpp b/src/mame/drivers/pipeline.cpp
index a6a0194655a..6a2b52a8345 100644
--- a/src/mame/drivers/pipeline.cpp
+++ b/src/mame/drivers/pipeline.cpp
@@ -79,6 +79,7 @@ Stephh's notes (based on the games Z80 code and some tests) :
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class pipeline_state : public driver_device
diff --git a/src/mame/drivers/pkscram.cpp b/src/mame/drivers/pkscram.cpp
index 7fb4b3a5f8c..b2793f6fcf4 100644
--- a/src/mame/drivers/pkscram.cpp
+++ b/src/mame/drivers/pkscram.cpp
@@ -21,6 +21,7 @@ driver by David Haywood and few bits by Pierpaolo Prazzoli
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class pkscram_state : public driver_device
diff --git a/src/mame/drivers/popobear.cpp b/src/mame/drivers/popobear.cpp
index 672c799b83e..7113cf2a8ab 100644
--- a/src/mame/drivers/popobear.cpp
+++ b/src/mame/drivers/popobear.cpp
@@ -85,6 +85,7 @@ Component Side A B Solder Side
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class popobear_state : public driver_device
{
diff --git a/src/mame/drivers/popper.cpp b/src/mame/drivers/popper.cpp
index 93bd11f34ab..58e2fd41026 100644
--- a/src/mame/drivers/popper.cpp
+++ b/src/mame/drivers/popper.cpp
@@ -45,6 +45,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
//**************************************************************************
diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp
index d5ae925c83e..b16ecb924ac 100644
--- a/src/mame/drivers/powerbal.cpp
+++ b/src/mame/drivers/powerbal.cpp
@@ -23,6 +23,7 @@ Magic Sticks:
#include "sound/okim6295.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class powerbal_state : public playmark_state
diff --git a/src/mame/drivers/ppmast93.cpp b/src/mame/drivers/ppmast93.cpp
index 5294c66c52f..e6388df9651 100644
--- a/src/mame/drivers/ppmast93.cpp
+++ b/src/mame/drivers/ppmast93.cpp
@@ -140,6 +140,7 @@ Dip locations added based on the notes above.
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class ppmast93_state : public driver_device
diff --git a/src/mame/drivers/pturn.cpp b/src/mame/drivers/pturn.cpp
index 41d42fb1870..9539652aa3c 100644
--- a/src/mame/drivers/pturn.cpp
+++ b/src/mame/drivers/pturn.cpp
@@ -84,6 +84,7 @@ ROMS: All ROM labels say only "PROM" and a number.
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class pturn_state : public driver_device
diff --git a/src/mame/drivers/pzletime.cpp b/src/mame/drivers/pzletime.cpp
index e50232b3b23..afa04dcf963 100644
--- a/src/mame/drivers/pzletime.cpp
+++ b/src/mame/drivers/pzletime.cpp
@@ -23,6 +23,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class pzletime_state : public driver_device
diff --git a/src/mame/drivers/quickpick5.cpp b/src/mame/drivers/quickpick5.cpp
index 0cee52878be..5f551fd27d0 100644
--- a/src/mame/drivers/quickpick5.cpp
+++ b/src/mame/drivers/quickpick5.cpp
@@ -33,6 +33,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class quickpick5_state : public driver_device
{
diff --git a/src/mame/drivers/quizpun2.cpp b/src/mame/drivers/quizpun2.cpp
index ef4be0ec9ec..7227d56d725 100644
--- a/src/mame/drivers/quizpun2.cpp
+++ b/src/mame/drivers/quizpun2.cpp
@@ -95,6 +95,7 @@ Notes:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class quizpun2_state : public driver_device
diff --git a/src/mame/drivers/quizshow.cpp b/src/mame/drivers/quizshow.cpp
index 4474842a909..2bc43a9b89a 100644
--- a/src/mame/drivers/quizshow.cpp
+++ b/src/mame/drivers/quizshow.cpp
@@ -22,6 +22,7 @@ TODO:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "quizshow.lh"
diff --git a/src/mame/drivers/rabbit.cpp b/src/mame/drivers/rabbit.cpp
index 620b52b1e3e..e84e0781c59 100644
--- a/src/mame/drivers/rabbit.cpp
+++ b/src/mame/drivers/rabbit.cpp
@@ -86,6 +86,7 @@ Custom: Imagetek I5000 (2ch video & 2ch sound)
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class rabbit_state : public driver_device
diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp
index 5bd7aeb155c..46558a70a50 100644
--- a/src/mame/drivers/rmhaihai.cpp
+++ b/src/mame/drivers/rmhaihai.cpp
@@ -36,6 +36,7 @@ TODO:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class rmhaihai_state : public driver_device
diff --git a/src/mame/drivers/safarir.cpp b/src/mame/drivers/safarir.cpp
index 9f6451f38ca..f7c6b9c0904 100644
--- a/src/mame/drivers/safarir.cpp
+++ b/src/mame/drivers/safarir.cpp
@@ -55,6 +55,7 @@ modified by Hau
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class safarir_state : public driver_device
{
diff --git a/src/mame/drivers/sanremo.cpp b/src/mame/drivers/sanremo.cpp
index a6ca9ac326a..9f5cd7f919d 100644
--- a/src/mame/drivers/sanremo.cpp
+++ b/src/mame/drivers/sanremo.cpp
@@ -98,6 +98,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "sanremo.lh"
diff --git a/src/mame/drivers/sbowling.cpp b/src/mame/drivers/sbowling.cpp
index 44d6ae78789..da8e1a3ce06 100644
--- a/src/mame/drivers/sbowling.cpp
+++ b/src/mame/drivers/sbowling.cpp
@@ -49,6 +49,7 @@ PROMs : NEC B406 (1kx4) x2
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class sbowling_state : public driver_device
diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp
index d0cf0367822..164c30ffa42 100644
--- a/src/mame/drivers/sbrkout.cpp
+++ b/src/mame/drivers/sbrkout.cpp
@@ -43,6 +43,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "sbrkout.lh"
class sbrkout_state : public driver_device
diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp
index 60bd8b24567..c633cc62da7 100644
--- a/src/mame/drivers/seabattl.cpp
+++ b/src/mame/drivers/seabattl.cpp
@@ -38,6 +38,7 @@ the sound board should be fully discrete.
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "seabattl.lh"
diff --git a/src/mame/drivers/seicupbl.cpp b/src/mame/drivers/seicupbl.cpp
index db8ef01a0c7..f78135f7d0a 100644
--- a/src/mame/drivers/seicupbl.cpp
+++ b/src/mame/drivers/seicupbl.cpp
@@ -30,6 +30,7 @@ Measured clocks:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class seicupbl_state : public driver_device
diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp
index b66abfed4fe..4990225bdb9 100644
--- a/src/mame/drivers/sengokmj.cpp
+++ b/src/mame/drivers/sengokmj.cpp
@@ -64,6 +64,7 @@ RSSENGO2.72 chr.
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class sengokmj_state : public driver_device, public seibu_sound_common
diff --git a/src/mame/drivers/sfbonus.cpp b/src/mame/drivers/sfbonus.cpp
index 75b6ecea05f..b4bd4a8f996 100644
--- a/src/mame/drivers/sfbonus.cpp
+++ b/src/mame/drivers/sfbonus.cpp
@@ -280,6 +280,7 @@ MH86171 Color Palette RAMDAC
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "pirpok2.lh"
diff --git a/src/mame/drivers/silvmil.cpp b/src/mame/drivers/silvmil.cpp
index dfd7e380e28..2d3b3e0110a 100644
--- a/src/mame/drivers/silvmil.cpp
+++ b/src/mame/drivers/silvmil.cpp
@@ -33,6 +33,7 @@ Very likely to be 'whatever crystals we had on hand which were close enough for
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class silvmil_state : public driver_device
diff --git a/src/mame/drivers/skyarmy.cpp b/src/mame/drivers/skyarmy.cpp
index b1569bd04d7..d905c1895ce 100644
--- a/src/mame/drivers/skyarmy.cpp
+++ b/src/mame/drivers/skyarmy.cpp
@@ -36,6 +36,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class skyarmy_state : public driver_device
diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp
index 7cb8bbf80ee..4d6b135eb48 100644
--- a/src/mame/drivers/skylncr.cpp
+++ b/src/mame/drivers/skylncr.cpp
@@ -127,6 +127,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include <algorithm>
diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp
index f8258357338..13b94fb7e3e 100644
--- a/src/mame/drivers/spartanxtec.cpp
+++ b/src/mame/drivers/spartanxtec.cpp
@@ -28,6 +28,7 @@ probably an original bug?
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class spartanxtec_state : public driver_device
diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp
index db4fe210f9c..e1123669dd5 100644
--- a/src/mame/drivers/spoker.cpp
+++ b/src/mame/drivers/spoker.cpp
@@ -37,6 +37,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class spoker_state : public driver_device
diff --git a/src/mame/drivers/spool99.cpp b/src/mame/drivers/spool99.cpp
index 7eb2bb75e2a..3c010b1fc7c 100644
--- a/src/mame/drivers/spool99.cpp
+++ b/src/mame/drivers/spool99.cpp
@@ -98,6 +98,7 @@ Note
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class spool99_state : public driver_device
diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp
index 6bd9b1c6bf3..c040381635d 100644
--- a/src/mame/drivers/spyhuntertec.cpp
+++ b/src/mame/drivers/spyhuntertec.cpp
@@ -25,6 +25,7 @@ sound system appears to be the same as 'spartanxtec.cpp'
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "spyhunttec.lh"
diff --git a/src/mame/drivers/sshot.cpp b/src/mame/drivers/sshot.cpp
index 195a5abd836..0cfeabd8617 100644
--- a/src/mame/drivers/sshot.cpp
+++ b/src/mame/drivers/sshot.cpp
@@ -166,6 +166,7 @@ Given CS numbers this is released after the other GunChamp
#include "cpu/scmp/scmp.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#include "gunchamps.lh"
diff --git a/src/mame/drivers/statriv2.cpp b/src/mame/drivers/statriv2.cpp
index ca3bc5a3cea..924a4d88e82 100644
--- a/src/mame/drivers/statriv2.cpp
+++ b/src/mame/drivers/statriv2.cpp
@@ -78,6 +78,7 @@ Issues:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class statriv2_state : public driver_device
diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp
index 9cce11f085f..90595acce81 100644
--- a/src/mame/drivers/stuntair.cpp
+++ b/src/mame/drivers/stuntair.cpp
@@ -89,6 +89,7 @@ Bprom dump by f205v
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class stuntair_state : public driver_device
diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp
index 16c238dcdd7..ee303d94b25 100644
--- a/src/mame/drivers/subsino.cpp
+++ b/src/mame/drivers/subsino.cpp
@@ -235,6 +235,7 @@ To Do:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "victor5.lh"
#include "victor21.lh"
diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp
index d022a80c8e8..c36e97d4276 100644
--- a/src/mame/drivers/subsino2.cpp
+++ b/src/mame/drivers/subsino2.cpp
@@ -55,6 +55,7 @@ To do:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
enum tilesize_t
diff --git a/src/mame/drivers/supduck.cpp b/src/mame/drivers/supduck.cpp
index 0d1eef70286..4975b2bb9c3 100644
--- a/src/mame/drivers/supduck.cpp
+++ b/src/mame/drivers/supduck.cpp
@@ -31,6 +31,7 @@ All clock timing comes from crystal 1
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class supduck_state : public driver_device
{
diff --git a/src/mame/drivers/supercrd.cpp b/src/mame/drivers/supercrd.cpp
index f49c2a19a7f..1c0b72af8b5 100644
--- a/src/mame/drivers/supercrd.cpp
+++ b/src/mame/drivers/supercrd.cpp
@@ -169,6 +169,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(16'000'000)
diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp
index 5bc30815604..ddaecea02b7 100644
--- a/src/mame/drivers/superdq.cpp
+++ b/src/mame/drivers/superdq.cpp
@@ -26,6 +26,7 @@
#include "video/resnet.h"
#include "emupal.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK 20000000
diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp
index b32a9b82861..54eb52208b8 100644
--- a/src/mame/drivers/superwng.cpp
+++ b/src/mame/drivers/superwng.cpp
@@ -38,6 +38,7 @@ TODO:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(18'432'000)
diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp
index c0a04d4cecb..93cba03b964 100644
--- a/src/mame/drivers/supracan.cpp
+++ b/src/mame/drivers/supracan.cpp
@@ -83,6 +83,7 @@ DEBUG TRICKS:
#include "emupal.h"
#include "screen.h"
#include "softlist.h"
+#include "tilemap.h"
#define SOUNDCPU_BOOT_HACK (1)
diff --git a/src/mame/drivers/suprgolf.cpp b/src/mame/drivers/suprgolf.cpp
index b17af194452..45b4915cd77 100644
--- a/src/mame/drivers/suprgolf.cpp
+++ b/src/mame/drivers/suprgolf.cpp
@@ -30,6 +30,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class suprgolf_state : public driver_device
diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp
index b456d0220ee..06d1cca07f7 100644
--- a/src/mame/drivers/taitopjc.cpp
+++ b/src/mame/drivers/taitopjc.cpp
@@ -91,6 +91,7 @@
#include "video/tc0780fpa.h"
#include "machine/nvram.h"
#include "emupal.h"
+#include "tilemap.h"
#define LOG_TLCS_TO_PPC_COMMANDS 1
#define LOG_PPC_TO_TLCS_COMMANDS 1
diff --git a/src/mame/drivers/tattack.cpp b/src/mame/drivers/tattack.cpp
index 13696b3c0b2..d040ae8ad39 100644
--- a/src/mame/drivers/tattack.cpp
+++ b/src/mame/drivers/tattack.cpp
@@ -54,6 +54,7 @@
#include "screen.h"
#include "sound/samples.h"
#include "speaker.h"
+#include "tilemap.h"
class tattack_state : public driver_device
diff --git a/src/mame/drivers/tmspoker.cpp b/src/mame/drivers/tmspoker.cpp
index 9ce277d021a..bf06b7801a0 100644
--- a/src/mame/drivers/tmspoker.cpp
+++ b/src/mame/drivers/tmspoker.cpp
@@ -212,6 +212,7 @@
#include "video/mc6845.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(6'000'000) /* confirmed */
diff --git a/src/mame/drivers/trvmadns.cpp b/src/mame/drivers/trvmadns.cpp
index 93e34381e1d..9c7af1d9443 100644
--- a/src/mame/drivers/trvmadns.cpp
+++ b/src/mame/drivers/trvmadns.cpp
@@ -93,6 +93,7 @@ Technology = NMOS
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class trvmadns_state : public driver_device
diff --git a/src/mame/drivers/umipoker.cpp b/src/mame/drivers/umipoker.cpp
index beffe16c657..454845a2672 100644
--- a/src/mame/drivers/umipoker.cpp
+++ b/src/mame/drivers/umipoker.cpp
@@ -26,6 +26,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "saiyukip.lh"
diff --git a/src/mame/drivers/videopkr.cpp b/src/mame/drivers/videopkr.cpp
index 06083641f7a..45dfbfe6e99 100644
--- a/src/mame/drivers/videopkr.cpp
+++ b/src/mame/drivers/videopkr.cpp
@@ -287,6 +287,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#include "babydad.lh"
#include "babypkr.lh"
diff --git a/src/mame/drivers/vlc.cpp b/src/mame/drivers/vlc.cpp
index 7dd326753c3..42ae414d6eb 100644
--- a/src/mame/drivers/vlc.cpp
+++ b/src/mame/drivers/vlc.cpp
@@ -135,6 +135,7 @@ nevada TYPE2 : 64 45 51 06 32 02 31 31
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(16'000'000)
diff --git a/src/mame/drivers/vroulet.cpp b/src/mame/drivers/vroulet.cpp
index b9f4a448bfc..5d6f3dc0796 100644
--- a/src/mame/drivers/vroulet.cpp
+++ b/src/mame/drivers/vroulet.cpp
@@ -44,6 +44,7 @@ Tomasz Slanina 20050225
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class vroulet_state : public driver_device
diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp
index 942902e8211..238e9aed912 100644
--- a/src/mame/drivers/wallc.cpp
+++ b/src/mame/drivers/wallc.cpp
@@ -56,6 +56,7 @@ Thanks to HIGHWAYMAN for providing info on how to get to these epoxies
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class wallc_state : public driver_device
diff --git a/src/mame/drivers/warpsped.cpp b/src/mame/drivers/warpsped.cpp
index 65b6c21651f..183434821ae 100644
--- a/src/mame/drivers/warpsped.cpp
+++ b/src/mame/drivers/warpsped.cpp
@@ -89,6 +89,7 @@ L10, L15, L18 and G18 all read the same
#include "cpu/z80/z80.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class warpspeed_state : public driver_device
{
diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp
index 440e5e652db..725a831122c 100644
--- a/src/mame/drivers/wink.cpp
+++ b/src/mame/drivers/wink.cpp
@@ -21,6 +21,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class wink_state : public driver_device
diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp
index 09761cf9fde..2cfe5ce46ff 100644
--- a/src/mame/drivers/wyvernf0.cpp
+++ b/src/mame/drivers/wyvernf0.cpp
@@ -43,6 +43,7 @@ TODO:
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class wyvernf0_state : public driver_device
diff --git a/src/mame/drivers/zwackery.cpp b/src/mame/drivers/zwackery.cpp
index d9d7a5f4cc3..ec2b8202d77 100644
--- a/src/mame/drivers/zwackery.cpp
+++ b/src/mame/drivers/zwackery.cpp
@@ -28,6 +28,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
//**************************************************************************
diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h
index c9b3c8d5a22..18830458fe4 100644
--- a/src/mame/includes/1942.h
+++ b/src/mame/includes/1942.h
@@ -13,6 +13,7 @@
#include "machine/gen_latch.h"
#include "machine/timer.h"
#include "emupal.h"
+#include "tilemap.h"
class _1942_state : public driver_device
{
diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h
index a3a91aac59a..208b1bbdf7b 100644
--- a/src/mame/includes/1943.h
+++ b/src/mame/includes/1943.h
@@ -13,6 +13,7 @@
#include "cpu/mcs51/mcs51.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class _1943_state : public driver_device
{
diff --git a/src/mame/includes/40love.h b/src/mame/includes/40love.h
index 574e3e3c0d1..f4699a5a279 100644
--- a/src/mame/includes/40love.h
+++ b/src/mame/includes/40love.h
@@ -11,6 +11,7 @@
#include "sound/ay8910.h"
#include "sound/ta7630.h"
#include "emupal.h"
+#include "tilemap.h"
class fortyl_state : public driver_device
{
diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h
index edd11139ae8..5eebfabf593 100644
--- a/src/mame/includes/4enraya.h
+++ b/src/mame/includes/4enraya.h
@@ -13,6 +13,7 @@
#include "sound/ay8910.h"
#include "emupal.h"
+#include "tilemap.h"
class _4enraya_state : public driver_device
{
diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h
index d851db0b32c..b2a2e29453b 100644
--- a/src/mame/includes/aeroboto.h
+++ b/src/mame/includes/aeroboto.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class aeroboto_state : public driver_device
{
diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h
index a8f8496fb13..19c6ac112d9 100644
--- a/src/mame/includes/aerofgt.h
+++ b/src/mame/includes/aerofgt.h
@@ -11,6 +11,7 @@
#include "sound/okim6295.h"
#include "sound/upd7759.h"
#include "emupal.h"
+#include "tilemap.h"
class aerofgt_state : public driver_device
{
diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h
index 7a420c8c612..b44e16d0fde 100644
--- a/src/mame/includes/airbustr.h
+++ b/src/mame/includes/airbustr.h
@@ -16,6 +16,7 @@
#include "video/kan_pand.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class airbustr_state : public driver_device
{
diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h
index 5ab7d7ced66..e7cecdfbb6a 100644
--- a/src/mame/includes/alpha68k.h
+++ b/src/mame/includes/alpha68k.h
@@ -14,6 +14,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class alpha68k_state : public driver_device
{
diff --git a/src/mame/includes/ampoker2.h b/src/mame/includes/ampoker2.h
index 4a5f699cbfe..45c1a4dbc56 100644
--- a/src/mame/includes/ampoker2.h
+++ b/src/mame/includes/ampoker2.h
@@ -7,6 +7,7 @@
#include "machine/watchdog.h"
#include "emupal.h"
+#include "tilemap.h"
class ampoker2_state : public driver_device
{
diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h
index f9a8e9ec63e..cbd4bf74ef4 100644
--- a/src/mame/includes/amspdwy.h
+++ b/src/mame/includes/amspdwy.h
@@ -14,6 +14,7 @@
#include "sound/ym2151.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class amspdwy_state : public driver_device
{
diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h
index 94addea45ea..c46f10a6e81 100644
--- a/src/mame/includes/angelkds.h
+++ b/src/mame/includes/angelkds.h
@@ -10,6 +10,8 @@
#pragma once
+#include "tilemap.h"
+
class angelkds_state : public driver_device
{
public:
diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h
index b0f75867c3c..88673f98215 100644
--- a/src/mame/includes/appoooh.h
+++ b/src/mame/includes/appoooh.h
@@ -7,6 +7,7 @@
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class appoooh_state : public driver_device
{
diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h
index 16ac7c0fefb..cf2c03e4f48 100644
--- a/src/mame/includes/aquarium.h
+++ b/src/mame/includes/aquarium.h
@@ -11,6 +11,7 @@
#include "video/excellent_spr.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class aquarium_state : public driver_device
{
diff --git a/src/mame/includes/aquarius.h b/src/mame/includes/aquarius.h
index de6f01b28f6..2d8ebfaa678 100644
--- a/src/mame/includes/aquarius.h
+++ b/src/mame/includes/aquarius.h
@@ -22,6 +22,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class aquarius_state : public driver_device
diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h
index e163fc93d6e..83aac1282eb 100644
--- a/src/mame/includes/argus.h
+++ b/src/mame/includes/argus.h
@@ -5,6 +5,7 @@
#include "video/jalblend.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class argus_state : public driver_device
{
diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h
index b901438462c..82a62040406 100644
--- a/src/mame/includes/arkanoid.h
+++ b/src/mame/includes/arkanoid.h
@@ -7,6 +7,7 @@
#include "machine/taito68705interface.h"
#include "emupal.h"
+#include "tilemap.h"
/* This it the best way to allow game specific kludges until the system is fully understood */
enum {
diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h
index 3702ee2b129..02f8e6c27d7 100644
--- a/src/mame/includes/armedf.h
+++ b/src/mame/includes/armedf.h
@@ -9,6 +9,7 @@
#include "machine/gen_latch.h"
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class armedf_state : public driver_device
{
diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h
index bcbe689ae82..e5b5e669594 100644
--- a/src/mame/includes/ashnojoe.h
+++ b/src/mame/includes/ashnojoe.h
@@ -13,6 +13,7 @@
#include "machine/gen_latch.h"
#include "sound/msm5205.h"
+#include "tilemap.h"
class ashnojoe_state : public driver_device
{
diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h
index bafd63d026b..d3d6ea9b31f 100644
--- a/src/mame/includes/atarifb.h
+++ b/src/mame/includes/atarifb.h
@@ -13,6 +13,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/* Discrete Sound Input Nodes */
diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h
index cef0d9c29bd..04d31106dca 100644
--- a/src/mame/includes/atarig1.h
+++ b/src/mame/includes/atarig1.h
@@ -11,6 +11,7 @@
#include "machine/atarigen.h"
#include "video/atarirle.h"
#include "cpu/m68000/m68000.h"
+#include "tilemap.h"
class atarig1_state : public atarigen_state
{
diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h
index 56ee8830eea..05f8f6469fe 100644
--- a/src/mame/includes/atarig42.h
+++ b/src/mame/includes/atarig42.h
@@ -16,6 +16,7 @@
#include "cpu/m68000/m68000.h"
#include "machine/adc0808.h"
#include "machine/asic65.h"
+#include "tilemap.h"
class atarig42_state : public atarigen_state
{
diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h
index 06d67b9812d..8add09e4d9d 100644
--- a/src/mame/includes/atarigt.h
+++ b/src/mame/includes/atarigt.h
@@ -11,6 +11,7 @@
#include "machine/atarigen.h"
#include "video/atarirle.h"
#include "emupal.h"
+#include "tilemap.h"
#define CRAM_ENTRIES 0x4000
#define TRAM_ENTRIES 0x4000
diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h
index 2bef2eaa7f4..3da9f15394a 100644
--- a/src/mame/includes/atarigx2.h
+++ b/src/mame/includes/atarigx2.h
@@ -15,6 +15,7 @@
#include "machine/atarigen.h"
#include "machine/atarixga.h"
#include "video/atarirle.h"
+#include "tilemap.h"
class atarigx2_state : public atarigen_state
diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h
index 1efd96e076d..bbd62b5cf24 100644
--- a/src/mame/includes/atarisy1.h
+++ b/src/mame/includes/atarisy1.h
@@ -19,6 +19,7 @@
#include "sound/ym2151.h"
#include "video/atarimo.h"
#include "emupal.h"
+#include "tilemap.h"
class atarisy1_state : public atarigen_state
{
diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h
index f714e366ef2..4be2bb7faf1 100644
--- a/src/mame/includes/atarisy2.h
+++ b/src/mame/includes/atarisy2.h
@@ -17,6 +17,7 @@
#include "sound/tms5220.h"
#include "emupal.h"
#include "slapstic.h"
+#include "tilemap.h"
class atarisy2_state : public atarigen_state
{
diff --git a/src/mame/includes/atetris.h b/src/mame/includes/atetris.h
index a6d8e90fe29..cda95e72691 100644
--- a/src/mame/includes/atetris.h
+++ b/src/mame/includes/atetris.h
@@ -15,6 +15,7 @@
#include "machine/gen_latch.h"
#include "sound/sn76496.h"
#include "screen.h"
+#include "tilemap.h"
class atetris_state : public driver_device
{
diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h
index 1b45cffd8a9..8c5f7cc8b1c 100644
--- a/src/mame/includes/badlands.h
+++ b/src/mame/includes/badlands.h
@@ -21,6 +21,7 @@
#include "video/atarimo.h"
#include "speaker.h"
+#include "tilemap.h"
/*----------- defined in machine/badlands.cpp -----------*/
diff --git a/src/mame/includes/bagman.h b/src/mame/includes/bagman.h
index 5cd0950f7d8..1973072600b 100644
--- a/src/mame/includes/bagman.h
+++ b/src/mame/includes/bagman.h
@@ -9,6 +9,7 @@
#include "machine/74259.h"
#include "sound/tms5110.h"
#include "emupal.h"
+#include "tilemap.h"
class bagman_state : public driver_device
{
diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h
index 9d7569c9ba4..bd716183e49 100644
--- a/src/mame/includes/bankp.h
+++ b/src/mame/includes/bankp.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class bankp_state : public driver_device
{
diff --git a/src/mame/includes/baraduke.h b/src/mame/includes/baraduke.h
index a901186185e..b2893b57a69 100644
--- a/src/mame/includes/baraduke.h
+++ b/src/mame/includes/baraduke.h
@@ -8,6 +8,7 @@
#include "cpu/m6800/m6801.h"
#include "sound/namco.h"
#include "emupal.h"
+#include "tilemap.h"
class baraduke_state : public driver_device
{
diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h
index 195dd53c1b0..811d410c91b 100644
--- a/src/mame/includes/batman.h
+++ b/src/mame/includes/batman.h
@@ -15,6 +15,7 @@
#include "video/atarivad.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class batman_state : public driver_device
{
diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h
index 16116cb08e4..25103c5057a 100644
--- a/src/mame/includes/battlane.h
+++ b/src/mame/includes/battlane.h
@@ -7,6 +7,7 @@
***************************************************************************/
#include "emupal.h"
+#include "tilemap.h"
class battlane_state : public driver_device
{
diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h
index 387a7b4471b..f38fc2606a1 100644
--- a/src/mame/includes/battlex.h
+++ b/src/mame/includes/battlex.h
@@ -7,6 +7,7 @@
***************************************************************************/
#include "emupal.h"
+#include "tilemap.h"
class battlex_state : public driver_device
{
diff --git a/src/mame/includes/bbusters.h b/src/mame/includes/bbusters.h
index d078fe982d0..e0e23fd988c 100644
--- a/src/mame/includes/bbusters.h
+++ b/src/mame/includes/bbusters.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "video/bufsprite.h"
#include "screen.h"
+#include "tilemap.h"
class bbusters_state_base : public driver_device
{
diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h
index 78716ec432b..27aedc05d4b 100644
--- a/src/mame/includes/bigstrkb.h
+++ b/src/mame/includes/bigstrkb.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class bigstrkb_state : public driver_device
{
diff --git a/src/mame/includes/bking.h b/src/mame/includes/bking.h
index 2745ec8de13..08ca168388c 100644
--- a/src/mame/includes/bking.h
+++ b/src/mame/includes/bking.h
@@ -10,6 +10,7 @@
#include "machine/input_merger.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class bking_state : public driver_device
{
diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h
index f2dbc03422d..29931735e6a 100644
--- a/src/mame/includes/blktiger.h
+++ b/src/mame/includes/blktiger.h
@@ -13,6 +13,7 @@
#include "cpu/mcs51/mcs51.h"
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class blktiger_state : public driver_device
{
diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h
index fb7982ff6b5..cb8735713a9 100644
--- a/src/mame/includes/blmbycar.h
+++ b/src/mame/includes/blmbycar.h
@@ -6,8 +6,9 @@
***************************************************************************/
-#include "emupal.h"
#include "video/gaelco_wrally_sprites.h"
+#include "emupal.h"
+#include "tilemap.h"
class blmbycar_state : public driver_device
{
diff --git a/src/mame/includes/bloodbro.h b/src/mame/includes/bloodbro.h
index 8451ef2e3e9..ea83cb37be6 100644
--- a/src/mame/includes/bloodbro.h
+++ b/src/mame/includes/bloodbro.h
@@ -9,6 +9,7 @@
#include "sound/3812intf.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class bloodbro_state : public driver_device, public seibu_sound_common
{
diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h
index 78c48fcbb0c..7f6ef7803aa 100644
--- a/src/mame/includes/blstroid.h
+++ b/src/mame/includes/blstroid.h
@@ -13,6 +13,7 @@
#include "machine/atarigen.h"
#include "audio/atarijsa.h"
#include "video/atarimo.h"
+#include "tilemap.h"
class blstroid_state : public atarigen_state
{
diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h
index ac5b38783d0..aba9cf20950 100644
--- a/src/mame/includes/blueprnt.h
+++ b/src/mame/includes/blueprnt.h
@@ -12,6 +12,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class blueprnt_state : public driver_device
{
diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h
index cbbaafc6c32..93dcb22febb 100644
--- a/src/mame/includes/bogeyman.h
+++ b/src/mame/includes/bogeyman.h
@@ -12,6 +12,7 @@
#include "sound/ay8910.h"
#include "emupal.h"
+#include "tilemap.h"
class bogeyman_state : public driver_device
{
diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h
index b9940c9a041..3ce4bbaaf3e 100644
--- a/src/mame/includes/bombjack.h
+++ b/src/mame/includes/bombjack.h
@@ -12,6 +12,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class bombjack_state : public driver_device
{
diff --git a/src/mame/includes/bosco.h b/src/mame/includes/bosco.h
index 81f1d940a08..77eeddae20e 100644
--- a/src/mame/includes/bosco.h
+++ b/src/mame/includes/bosco.h
@@ -6,6 +6,7 @@
#pragma once
#include "galaga.h"
+#include "tilemap.h"
class bosco_state : public galaga_state
{
diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h
index 1db10b0652f..c8fcc491ba0 100644
--- a/src/mame/includes/brkthru.h
+++ b/src/mame/includes/brkthru.h
@@ -12,6 +12,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class brkthru_state : public driver_device
{
diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h
index 5ae3792bd25..975be60d772 100644
--- a/src/mame/includes/bsktball.h
+++ b/src/mame/includes/bsktball.h
@@ -13,6 +13,7 @@
#include "machine/timer.h"
#include "sound/discrete.h"
#include "emupal.h"
+#include "tilemap.h"
/* Discrete Sound Input Nodes */
#define BSKTBALL_NOTE_DATA NODE_01
diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h
index ae637a488a9..9c017d299e2 100644
--- a/src/mame/includes/bwing.h
+++ b/src/mame/includes/bwing.h
@@ -9,6 +9,7 @@
#include "machine/bankdev.h"
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
#define BW_DEBUG 0
diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h
index ec9d7561d91..c3f3a6d8ddf 100644
--- a/src/mame/includes/cabal.h
+++ b/src/mame/includes/cabal.h
@@ -8,6 +8,7 @@
#include "audio/seibu.h"
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class cabal_state : public driver_device
{
diff --git a/src/mame/includes/calomega.h b/src/mame/includes/calomega.h
index 491ed7db0dc..721c6563e44 100644
--- a/src/mame/includes/calomega.h
+++ b/src/mame/includes/calomega.h
@@ -9,6 +9,7 @@
#include "machine/6850acia.h"
#include "machine/clock.h"
#include "emupal.h"
+#include "tilemap.h"
class calomega_state : public driver_device
{
diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h
index 8fc9ce9f167..440db879b0d 100644
--- a/src/mame/includes/canyon.h
+++ b/src/mame/includes/canyon.h
@@ -14,6 +14,7 @@
#include "machine/watchdog.h"
#include "sound/discrete.h"
#include "emupal.h"
+#include "tilemap.h"
/* Discrete Sound Input Nodes */
#define CANYON_MOTOR1_DATA NODE_01
diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h
index d4c97b78cb8..5420a40b8b8 100644
--- a/src/mame/includes/cave.h
+++ b/src/mame/includes/cave.h
@@ -17,6 +17,7 @@
#include "sound/okim6295.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class cave_state : public driver_device
{
diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h
index 6c8ee6c88d5..fdc500074ff 100644
--- a/src/mame/includes/cbasebal.h
+++ b/src/mame/includes/cbasebal.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "emupal.h"
+#include "tilemap.h"
class cbasebal_state : public driver_device
{
diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h
index 63689b3d5b9..23b97a39ffd 100644
--- a/src/mame/includes/cclimber.h
+++ b/src/mame/includes/cclimber.h
@@ -9,6 +9,7 @@
#include "machine/gen_latch.h"
#include "machine/segacrpt_device.h"
#include "emupal.h"
+#include "tilemap.h"
class cclimber_state : public driver_device
{
diff --git a/src/mame/includes/centiped.h b/src/mame/includes/centiped.h
index d5cd85fd4b8..c9b57d2c9c8 100644
--- a/src/mame/includes/centiped.h
+++ b/src/mame/includes/centiped.h
@@ -17,6 +17,7 @@
#include "sound/ay8910.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class centiped_state : public driver_device
{
diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h
index 76c38a87345..7378a133d95 100644
--- a/src/mame/includes/chaknpop.h
+++ b/src/mame/includes/chaknpop.h
@@ -7,6 +7,7 @@
#include "machine/taito68705interface.h"
#include "emupal.h"
+#include "tilemap.h"
class chaknpop_state : public driver_device
{
diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h
index 341e3feb601..fe9737411e4 100644
--- a/src/mame/includes/champbas.h
+++ b/src/mame/includes/champbas.h
@@ -15,6 +15,7 @@
#include "machine/timer.h"
#include "machine/watchdog.h"
#include "emupal.h"
+#include "tilemap.h"
class champbas_state : public driver_device
diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h
index 47c83df6ed3..0992ecbf486 100644
--- a/src/mame/includes/cheekyms.h
+++ b/src/mame/includes/cheekyms.h
@@ -14,6 +14,7 @@
#include "sound/dac.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class cheekyms_state : public driver_device
{
diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h
index 180f7b3aa4f..d081c378530 100644
--- a/src/mame/includes/circus.h
+++ b/src/mame/includes/circus.h
@@ -9,6 +9,7 @@
#include "sound/discrete.h"
#include "sound/samples.h"
#include "emupal.h"
+#include "tilemap.h"
class circus_state : public driver_device
{
diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h
index ca07104ff9d..892d803c7af 100644
--- a/src/mame/includes/circusc.h
+++ b/src/mame/includes/circusc.h
@@ -14,6 +14,7 @@
#include "sound/sn76496.h"
#include "sound/discrete.h"
#include "emupal.h"
+#include "tilemap.h"
class circusc_state : public driver_device
{
diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h
index 397bd70d733..575107088a3 100644
--- a/src/mame/includes/citycon.h
+++ b/src/mame/includes/citycon.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class citycon_state : public driver_device
{
diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h
index 766ed157c4b..42f7c8e3cd5 100644
--- a/src/mame/includes/cloak.h
+++ b/src/mame/includes/cloak.h
@@ -12,6 +12,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class cloak_state : public driver_device
{
diff --git a/src/mame/includes/clshroad.h b/src/mame/includes/clshroad.h
index f80f05f4d67..82a8b23df83 100644
--- a/src/mame/includes/clshroad.h
+++ b/src/mame/includes/clshroad.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class clshroad_state : public driver_device
{
diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h
index 798da2fd520..57ac5f6f52f 100644
--- a/src/mame/includes/combatsc.h
+++ b/src/mame/includes/combatsc.h
@@ -16,6 +16,7 @@
#include "video/k007121.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class combatsc_state : public driver_device
{
diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h
index 3cbd975fc83..e0810e7494d 100644
--- a/src/mame/includes/commando.h
+++ b/src/mame/includes/commando.h
@@ -12,6 +12,7 @@
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class commando_state : public driver_device
{
diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h
index 0c59bb2418a..1f537f56b1f 100644
--- a/src/mame/includes/compgolf.h
+++ b/src/mame/includes/compgolf.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class compgolf_state : public driver_device
{
diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h
index 1f6588bec56..a24cd8e5252 100644
--- a/src/mame/includes/contra.h
+++ b/src/mame/includes/contra.h
@@ -13,6 +13,7 @@
#include "video/k007121.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class contra_state : public driver_device
{
diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h
index ddd5f3acf22..d7bd67d3458 100644
--- a/src/mame/includes/cop01.h
+++ b/src/mame/includes/cop01.h
@@ -13,6 +13,7 @@
#include "machine/gen_latch.h"
#include "machine/nb1412m2.h"
#include "emupal.h"
+#include "tilemap.h"
class cop01_state : public driver_device
{
diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h
index 21aa62441d0..5bc48968064 100644
--- a/src/mame/includes/cps1.h
+++ b/src/mame/includes/cps1.h
@@ -18,6 +18,7 @@
#include "cpu/m68000/m68000.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
// Video raw params
// measured clocks:
diff --git a/src/mame/includes/crbaloon.h b/src/mame/includes/crbaloon.h
index dac1ac17fc0..46509e6a8e9 100644
--- a/src/mame/includes/crbaloon.h
+++ b/src/mame/includes/crbaloon.h
@@ -13,6 +13,7 @@ Crazy Ballooon
#include "sound/discrete.h"
#include "sound/sn76477.h"
#include "emupal.h"
+#include "tilemap.h"
#define CRBALOON_MASTER_XTAL (XTAL(9'987'000))
diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h
index c470eeaaab7..e350ebf037d 100644
--- a/src/mame/includes/crospang.h
+++ b/src/mame/includes/crospang.h
@@ -12,6 +12,7 @@
#include "machine/gen_latch.h"
#include "video/decospr.h"
+#include "tilemap.h"
class crospang_state : public driver_device
{
diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h
index 2f7324d7e97..8bead5943f1 100644
--- a/src/mame/includes/crshrace.h
+++ b/src/mame/includes/crshrace.h
@@ -11,6 +11,7 @@
#include "video/vsystem_spr.h"
#include "video/k053936.h"
#include "emupal.h"
+#include "tilemap.h"
class crshrace_state : public driver_device
{
diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h
index d330b4cdb14..64b4fd1551d 100644
--- a/src/mame/includes/cyberbal.h
+++ b/src/mame/includes/cyberbal.h
@@ -19,6 +19,7 @@
#include "sound/ym2151.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class cyberbal_base_state : public atarigen_state
{
diff --git a/src/mame/includes/cybstorm.h b/src/mame/includes/cybstorm.h
index 29e741c1a93..c734e67d985 100644
--- a/src/mame/includes/cybstorm.h
+++ b/src/mame/includes/cybstorm.h
@@ -14,6 +14,7 @@
#include "machine/bankdev.h"
#include "video/atarivad.h"
#include "screen.h"
+#include "tilemap.h"
class cybstorm_state : public driver_device
diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h
index a5f8671bc46..500c2ea9bdc 100644
--- a/src/mame/includes/darius.h
+++ b/src/mame/includes/darius.h
@@ -14,6 +14,7 @@
#include "sound/msm5205.h"
#include "video/pc080sn.h"
#include "emupal.h"
+#include "tilemap.h"
#define VOL_MAX (3 * 2 + 2)
#define PAN_MAX (2 + 2 + 1) /* FM 2port + PSG 2port + DA 1port */
diff --git a/src/mame/includes/darkmist.h b/src/mame/includes/darkmist.h
index 44335380090..1516ec41c17 100644
--- a/src/mame/includes/darkmist.h
+++ b/src/mame/includes/darkmist.h
@@ -9,6 +9,7 @@
#include "machine/timer.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class darkmist_state : public driver_device
{
diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h
index 464639852c1..3f2b7b99de6 100644
--- a/src/mame/includes/dbz.h
+++ b/src/mame/includes/dbz.h
@@ -18,6 +18,7 @@
#include "video/k053936.h"
#include "video/k053251.h"
#include "video/konami_helper.h"
+#include "tilemap.h"
class dbz_state : public driver_device
{
diff --git a/src/mame/includes/dcon.h b/src/mame/includes/dcon.h
index 029a73e3fa7..54ef3c3bf05 100644
--- a/src/mame/includes/dcon.h
+++ b/src/mame/includes/dcon.h
@@ -7,6 +7,7 @@
#include "audio/seibu.h"
#include "emupal.h"
+#include "tilemap.h"
class dcon_state : public driver_device, public seibu_sound_common
{
diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h
index 21be46f3479..8f163343ac0 100644
--- a/src/mame/includes/dday.h
+++ b/src/mame/includes/dday.h
@@ -13,6 +13,7 @@
#include "emupal.h"
#include "screen.h"
#include "sound/ay8910.h"
+#include "tilemap.h"
class dday_state : public driver_device
diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h
index db4a5313ee2..bf659d5dd82 100644
--- a/src/mame/includes/ddragon.h
+++ b/src/mame/includes/ddragon.h
@@ -17,6 +17,7 @@
#include "sound/msm5205.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class ddragon_state : public driver_device
diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h
index 394fba2b248..686f77c26e5 100644
--- a/src/mame/includes/ddragon3.h
+++ b/src/mame/includes/ddragon3.h
@@ -17,6 +17,7 @@
#include "video/bufsprite.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class ddragon3_state : public driver_device
diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h
index c6067a32389..45d1a7d88ae 100644
--- a/src/mame/includes/ddribble.h
+++ b/src/mame/includes/ddribble.h
@@ -13,6 +13,7 @@
#include "sound/flt_rc.h"
#include "sound/vlm5030.h"
#include "emupal.h"
+#include "tilemap.h"
class ddribble_state : public driver_device
{
diff --git a/src/mame/includes/deadang.h b/src/mame/includes/deadang.h
index 23a880b08c4..2ee6c6aa4b8 100644
--- a/src/mame/includes/deadang.h
+++ b/src/mame/includes/deadang.h
@@ -10,6 +10,7 @@
#include "sound/ym2151.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class deadang_state : public driver_device
{
diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h
index f3a1ea0c225..761658e0a98 100644
--- a/src/mame/includes/dec8.h
+++ b/src/mame/includes/dec8.h
@@ -15,6 +15,7 @@
#include "video/decmxc06.h"
#include "video/decrmc3.h"
#include "screen.h"
+#include "tilemap.h"
class dec8_state : public driver_device
{
diff --git a/src/mame/includes/decocass.h b/src/mame/includes/decocass.h
index 4db894b4a30..6efe74ffc17 100644
--- a/src/mame/includes/decocass.h
+++ b/src/mame/includes/decocass.h
@@ -19,6 +19,7 @@
#include "cpu/mcs48/mcs48.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define T1PROM 1
#define T1DIRECT 2
diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h
index 1f8e2dbb696..b491d49133d 100644
--- a/src/mame/includes/deniam.h
+++ b/src/mame/includes/deniam.h
@@ -10,6 +10,7 @@
#include "machine/gen_latch.h"
#include "sound/okim6295.h"
#include "emupal.h"
+#include "tilemap.h"
class deniam_state : public driver_device
{
diff --git a/src/mame/includes/digdug.h b/src/mame/includes/digdug.h
index 40a5d85416b..9c7258544a6 100644
--- a/src/mame/includes/digdug.h
+++ b/src/mame/includes/digdug.h
@@ -6,6 +6,7 @@
#pragma once
#include "machine/er2055.h"
+#include "tilemap.h"
class digdug_state : public galaga_state
{
diff --git a/src/mame/includes/divebomb.h b/src/mame/includes/divebomb.h
index b4bb739fafa..8ad9025236a 100644
--- a/src/mame/includes/divebomb.h
+++ b/src/mame/includes/divebomb.h
@@ -17,6 +17,7 @@
#include "sound/sn76496.h"
#include "video/k051316.h"
#include "emupal.h"
+#include "tilemap.h"
#define XTAL1 XTAL(24'000'000)
diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h
index 873dadbb918..8c72f1c3d31 100644
--- a/src/mame/includes/djboy.h
+++ b/src/mame/includes/djboy.h
@@ -11,6 +11,7 @@
#include "machine/timer.h"
#include "video/kan_pand.h"
#include "emupal.h"
+#include "tilemap.h"
#define PROT_OUTPUT_BUFFER_SIZE 8
diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h
index 4f77b975fb4..dfcdc948c3b 100644
--- a/src/mame/includes/dkong.h
+++ b/src/mame/includes/dkong.h
@@ -22,6 +22,7 @@
#include "sound/tms5110.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/*
diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h
index dd65ec46835..b099ad6ef67 100644
--- a/src/mame/includes/docastle.h
+++ b/src/mame/includes/docastle.h
@@ -14,6 +14,7 @@
#include "video/mc6845.h"
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class docastle_state : public driver_device
{
diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h
index 427d5940bf1..1c41ad924ef 100644
--- a/src/mame/includes/dogfgt.h
+++ b/src/mame/includes/dogfgt.h
@@ -8,6 +8,7 @@
#include "sound/ay8910.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define PIXMAP_COLOR_BASE (16 + 32)
#define BITMAPRAM_SIZE 0x6000
diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h
index 5ee3b611cfb..80a08bbbf59 100644
--- a/src/mame/includes/dragrace.h
+++ b/src/mame/includes/dragrace.h
@@ -15,6 +15,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/* Discrete Sound Input Nodes */
#define DRAGRACE_SCREECH1_EN NODE_01
diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h
index 6ac2260b005..22f1b34df91 100644
--- a/src/mame/includes/drgnmst.h
+++ b/src/mame/includes/drgnmst.h
@@ -8,6 +8,7 @@
#include "cpu/pic16c5x/pic16c5x.h"
#include "sound/okim6295.h"
#include "emupal.h"
+#include "tilemap.h"
class drgnmst_state : public driver_device
{
diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h
index 229a367d423..b4ede40f7ac 100644
--- a/src/mame/includes/drmicro.h
+++ b/src/mame/includes/drmicro.h
@@ -12,6 +12,7 @@
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class drmicro_state : public driver_device
{
diff --git a/src/mame/includes/dynduke.h b/src/mame/includes/dynduke.h
index ac93799df10..1f4b6298894 100644
--- a/src/mame/includes/dynduke.h
+++ b/src/mame/includes/dynduke.h
@@ -8,6 +8,7 @@
#include "audio/seibu.h"
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class dynduke_state : public driver_device
{
diff --git a/src/mame/includes/efdt.h b/src/mame/includes/efdt.h
index 1993699377a..c8f145bb95c 100644
--- a/src/mame/includes/efdt.h
+++ b/src/mame/includes/efdt.h
@@ -7,6 +7,7 @@
#include "machine/74259.h"
#include "emupal.h"
+#include "tilemap.h"
class efdt_state : public driver_device
diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h
index 53a76497084..202b1367a7c 100644
--- a/src/mame/includes/eprom.h
+++ b/src/mame/includes/eprom.h
@@ -15,6 +15,7 @@
#include "audio/atarijsa.h"
#include "video/atarimo.h"
#include "emupal.h"
+#include "tilemap.h"
class eprom_state : public atarigen_state
{
diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h
index b7b32ec1167..139b6a1965e 100644
--- a/src/mame/includes/equites.h
+++ b/src/mame/includes/equites.h
@@ -21,6 +21,7 @@
#include "sound/samples.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class equites_state : public driver_device
diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h
index 62682d3f280..3a4dad4d109 100644
--- a/src/mame/includes/esd16.h
+++ b/src/mame/includes/esd16.h
@@ -13,6 +13,7 @@
#include "machine/eepromser.h"
#include "machine/gen_latch.h"
#include "video/decospr.h"
+#include "tilemap.h"
class esd16_state : public driver_device
{
diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h
index 0e04ab984dd..e6cefe3b371 100644
--- a/src/mame/includes/espial.h
+++ b/src/mame/includes/espial.h
@@ -14,6 +14,7 @@
#include "machine/gen_latch.h"
#include "machine/timer.h"
#include "emupal.h"
+#include "tilemap.h"
class espial_state : public driver_device
{
diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h
index 6a010e5dd1c..6892ca4d757 100644
--- a/src/mame/includes/exedexes.h
+++ b/src/mame/includes/exedexes.h
@@ -13,6 +13,7 @@
#include "machine/timer.h"
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class exedexes_state : public driver_device
{
diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h
index 14e625448e8..7ca44eb3d04 100644
--- a/src/mame/includes/exprraid.h
+++ b/src/mame/includes/exprraid.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class exprraid_state : public driver_device
{
diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h
index a9f9a7d17e0..44ceb7b01a1 100644
--- a/src/mame/includes/f1gp.h
+++ b/src/mame/includes/f1gp.h
@@ -11,6 +11,7 @@
#include "video/vsystem_spr2.h"
#include "video/k053936.h"
#include "emupal.h"
+#include "tilemap.h"
class f1gp_state : public driver_device
{
diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h
index 8e62cd2cbce..0a5efe8377b 100644
--- a/src/mame/includes/fastfred.h
+++ b/src/mame/includes/fastfred.h
@@ -13,6 +13,7 @@
#include "machine/74259.h"
#include "includes/galaxold.h"
+#include "tilemap.h"
class fastfred_state : public galaxold_state
{
diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h
index 3772b09035f..dd139c48f47 100644
--- a/src/mame/includes/fastlane.h
+++ b/src/mame/includes/fastlane.h
@@ -16,6 +16,7 @@
#include "video/k051733.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class fastlane_state : public driver_device
{
diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h
index 33832d0d5b4..160c3188016 100644
--- a/src/mame/includes/fcombat.h
+++ b/src/mame/includes/fcombat.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
// this is copied from Exerion, but it should be correct
diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h
index 8124ba3af56..d5e09023f6b 100644
--- a/src/mame/includes/finalizr.h
+++ b/src/mame/includes/finalizr.h
@@ -13,6 +13,7 @@
#include "cpu/mcs48/mcs48.h"
#include "machine/timer.h"
#include "emupal.h"
+#include "tilemap.h"
class finalizr_state : public driver_device
{
diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h
index fcdaacaa3ab..e43f0016fca 100644
--- a/src/mame/includes/firetrap.h
+++ b/src/mame/includes/firetrap.h
@@ -14,6 +14,7 @@
#include "machine/gen_latch.h"
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class firetrap_state : public driver_device
{
diff --git a/src/mame/includes/firetrk.h b/src/mame/includes/firetrk.h
index 958f3068b14..447e7cb6e98 100644
--- a/src/mame/includes/firetrk.h
+++ b/src/mame/includes/firetrk.h
@@ -15,6 +15,7 @@ Atari Fire Truck + Super Bug + Monte Carlo driver
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define FIRETRUCK_MOTOR_DATA NODE_01
#define FIRETRUCK_HORN_EN NODE_02
diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h
index bc5d61da401..2a4fe86a4b0 100644
--- a/src/mame/includes/fitfight.h
+++ b/src/mame/includes/fitfight.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class fitfight_state : public driver_device
{
diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h
index f2b8eef0201..46232fe7366 100644
--- a/src/mame/includes/flkatck.h
+++ b/src/mame/includes/flkatck.h
@@ -14,6 +14,7 @@
#include "machine/watchdog.h"
#include "sound/k007232.h"
#include "video/k007121.h"
+#include "tilemap.h"
class flkatck_state : public driver_device
{
diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h
index daca51946ef..c1a101d43e2 100644
--- a/src/mame/includes/flstory.h
+++ b/src/mame/includes/flstory.h
@@ -12,6 +12,7 @@
#include "sound/ta7630.h"
#include "sound/ay8910.h"
#include "emupal.h"
+#include "tilemap.h"
class flstory_state : public driver_device
{
diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h
index fe615016523..7a4d2c03695 100644
--- a/src/mame/includes/foodf.h
+++ b/src/mame/includes/foodf.h
@@ -14,6 +14,7 @@
#include "machine/x2212.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class foodf_state : public driver_device
{
diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h
index da360babc90..c7ecc6d8397 100644
--- a/src/mame/includes/freekick.h
+++ b/src/mame/includes/freekick.h
@@ -3,6 +3,7 @@
#include "machine/74259.h"
#include "emupal.h"
+#include "tilemap.h"
class freekick_state : public driver_device
{
diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h
index 6bf0456c7f2..627dabf0362 100644
--- a/src/mame/includes/fromanc2.h
+++ b/src/mame/includes/fromanc2.h
@@ -9,6 +9,7 @@
#include "machine/eepromser.h"
#include "machine/ins8250.h"
#include "emupal.h"
+#include "tilemap.h"
class fromanc2_state : public driver_device
{
diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h
index 31894d52cd1..7f15cd564b6 100644
--- a/src/mame/includes/fromance.h
+++ b/src/mame/includes/fromance.h
@@ -19,6 +19,7 @@
#include "video/vsystem_spr2.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class fromance_state : public driver_device
{
diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h
index d650e58ea71..a90b285b836 100644
--- a/src/mame/includes/funkybee.h
+++ b/src/mame/includes/funkybee.h
@@ -7,6 +7,7 @@
#include "machine/watchdog.h"
#include "emupal.h"
+#include "tilemap.h"
class funkybee_state : public driver_device
diff --git a/src/mame/includes/funworld.h b/src/mame/includes/funworld.h
index 752ebc2173b..7168d56c7ee 100644
--- a/src/mame/includes/funworld.h
+++ b/src/mame/includes/funworld.h
@@ -9,6 +9,7 @@
#include "machine/i2cmem.h"
#include "sound/ay8910.h"
#include "video/mc6845.h"
+#include "tilemap.h"
class funworld_state : public driver_device
{
diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h
index ce65a1e8173..3283ee71f85 100644
--- a/src/mame/includes/funybubl.h
+++ b/src/mame/includes/funybubl.h
@@ -9,6 +9,7 @@
#include "machine/gen_latch.h"
#include "sound/okim6295.h"
#include "emupal.h"
+#include "tilemap.h"
class funybubl_state : public driver_device
{
diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h
index 9ee6d47b03f..402a6e01641 100644
--- a/src/mame/includes/fuukifg2.h
+++ b/src/mame/includes/fuukifg2.h
@@ -10,6 +10,7 @@
#include "video/fuukifg.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class fuuki16_state : public driver_device
{
diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h
index 562dc760d8e..08c37caae04 100644
--- a/src/mame/includes/fuukifg3.h
+++ b/src/mame/includes/fuukifg3.h
@@ -8,6 +8,7 @@
#include "video/fuukifg.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/* Define clocks based on actual OSC on the PCB */
diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h
index 8421dade291..4ccec091749 100644
--- a/src/mame/includes/gaelco.h
+++ b/src/mame/includes/gaelco.h
@@ -9,6 +9,7 @@
#include "machine/gen_latch.h"
#include "machine/74259.h"
#include "emupal.h"
+#include "tilemap.h"
class gaelco_state : public driver_device
{
diff --git a/src/mame/includes/gaelco2.h b/src/mame/includes/gaelco2.h
index ccacfef6737..a4a3de25b8b 100644
--- a/src/mame/includes/gaelco2.h
+++ b/src/mame/includes/gaelco2.h
@@ -6,6 +6,7 @@
#include "machine/eepromser.h"
#include "machine/timer.h"
#include "emupal.h"
+#include "tilemap.h"
class gaelco2_state : public driver_device
{
diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h
index 36d7c102c0f..d55a4d38867 100644
--- a/src/mame/includes/gaiden.h
+++ b/src/mame/includes/gaiden.h
@@ -19,6 +19,7 @@
#include "video/tecmo_mix.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class gaiden_state : public driver_device
{
diff --git a/src/mame/includes/galaga.h b/src/mame/includes/galaga.h
index 2a8b3faa780..0256aa94552 100644
--- a/src/mame/includes/galaga.h
+++ b/src/mame/includes/galaga.h
@@ -11,6 +11,7 @@
#include "sound/samples.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class galaga_state : public driver_device
{
diff --git a/src/mame/includes/galaxia.h b/src/mame/includes/galaxia.h
index 08ab94e8fe0..6930f83cb23 100644
--- a/src/mame/includes/galaxia.h
+++ b/src/mame/includes/galaxia.h
@@ -11,6 +11,7 @@
#pragma once
#include "includes/cvs.h"
+#include "tilemap.h"
class galaxia_state : public cvs_state
{
diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h
index a6b7bdef871..c21573a4123 100644
--- a/src/mame/includes/galaxian.h
+++ b/src/mame/includes/galaxian.h
@@ -19,6 +19,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
namespace {
diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h
index 71c91132daf..3a098047430 100644
--- a/src/mame/includes/galaxold.h
+++ b/src/mame/includes/galaxold.h
@@ -20,6 +20,7 @@
#include "machine/timer.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/* star circuit */
#define STAR_COUNT 252
diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h
index cb694f624a2..684aba87089 100644
--- a/src/mame/includes/galivan.h
+++ b/src/mame/includes/galivan.h
@@ -15,6 +15,7 @@
#include "machine/gen_latch.h"
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class galivan_state : public driver_device
{
diff --git a/src/mame/includes/gaplus.h b/src/mame/includes/gaplus.h
index 3ebef7acebc..74e227dd09f 100644
--- a/src/mame/includes/gaplus.h
+++ b/src/mame/includes/gaplus.h
@@ -10,6 +10,7 @@
#include "machine/namcoio.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class gaplus_base_state : public driver_device
{
diff --git a/src/mame/includes/gatron.h b/src/mame/includes/gatron.h
index a57a25a7a45..82aed496533 100644
--- a/src/mame/includes/gatron.h
+++ b/src/mame/includes/gatron.h
@@ -1,5 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Roberto Fresca
+
+#include "tilemap.h"
+
class gatron_state : public driver_device
{
public:
diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h
index bc547db18d0..cc659577ff3 100644
--- a/src/mame/includes/gauntlet.h
+++ b/src/mame/includes/gauntlet.h
@@ -16,6 +16,7 @@
#include "sound/ym2151.h"
#include "sound/pokey.h"
#include "sound/tms5220.h"
+#include "tilemap.h"
class gauntlet_state : public atarigen_state
{
diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h
index b4918e2cd96..9ad3e9f220f 100644
--- a/src/mame/includes/gberet.h
+++ b/src/mame/includes/gberet.h
@@ -13,6 +13,7 @@
#include "machine/timer.h"
#include "sound/sn76496.h"
#include "emupal.h"
+#include "tilemap.h"
class gberet_state : public driver_device
{
diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h
index 5db19303316..87bfeb48dfb 100644
--- a/src/mame/includes/gcpinbal.h
+++ b/src/mame/includes/gcpinbal.h
@@ -13,6 +13,7 @@
#include "emupal.h"
#include "machine/timer.h"
#include "screen.h"
+#include "tilemap.h"
class gcpinbal_state : public driver_device
{
diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h
index b348486f471..8f2123d1b8a 100644
--- a/src/mame/includes/ginganin.h
+++ b/src/mame/includes/ginganin.h
@@ -12,6 +12,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class ginganin_state : public driver_device
{
diff --git a/src/mame/includes/gladiatr.h b/src/mame/includes/gladiatr.h
index 93c8dc6e60d..44eb567fc50 100644
--- a/src/mame/includes/gladiatr.h
+++ b/src/mame/includes/gladiatr.h
@@ -7,6 +7,7 @@
#include "cpu/mcs48/mcs48.h"
#include "cpu/z80/z80.h"
#include "emupal.h"
+#include "tilemap.h"
class gladiatr_state_base : public driver_device
diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h
index 4c159306386..4f71dcd4f43 100644
--- a/src/mame/includes/glass.h
+++ b/src/mame/includes/glass.h
@@ -8,6 +8,7 @@
#include "machine/74259.h"
#include "emupal.h"
+#include "tilemap.h"
class glass_state : public driver_device
{
diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h
index 3905f28b70b..771633c5719 100644
--- a/src/mame/includes/gng.h
+++ b/src/mame/includes/gng.h
@@ -13,6 +13,7 @@
#include "sound/2203intf.h"
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class gng_state : public driver_device
{
diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h
index 294cd88a8ac..635e243f772 100644
--- a/src/mame/includes/goal92.h
+++ b/src/mame/includes/goal92.h
@@ -13,6 +13,7 @@
#include "machine/gen_latch.h"
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class goal92_state : public driver_device
{
diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h
index f475a9df5dc..ab0a40d73b5 100644
--- a/src/mame/includes/goindol.h
+++ b/src/mame/includes/goindol.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class goindol_state : public driver_device
{
diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h
index c746ba56d38..274c58ae52b 100644
--- a/src/mame/includes/goldstar.h
+++ b/src/mame/includes/goldstar.h
@@ -9,6 +9,7 @@
#include "machine/i8255.h"
#include "machine/ticket.h"
#include "emupal.h"
+#include "tilemap.h"
class goldstar_state : public driver_device
diff --git a/src/mame/includes/gomoku.h b/src/mame/includes/gomoku.h
index d97afcd5ba5..619b1962d7f 100644
--- a/src/mame/includes/gomoku.h
+++ b/src/mame/includes/gomoku.h
@@ -7,6 +7,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class gomoku_state : public driver_device
{
diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h
index 0b533095761..0ab6aa39e29 100644
--- a/src/mame/includes/gotcha.h
+++ b/src/mame/includes/gotcha.h
@@ -12,6 +12,7 @@
#include "sound/okim6295.h"
#include "video/decospr.h"
+#include "tilemap.h"
class gotcha_state : public driver_device
{
diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h
index d0bd03806c7..f0c86f5f0a9 100644
--- a/src/mame/includes/gottlieb.h
+++ b/src/mame/includes/gottlieb.h
@@ -13,6 +13,7 @@
#include "machine/ldpr8210.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define GOTTLIEB_VIDEO_HCOUNT 318
diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h
index b0d388633f7..a5a715cac3c 100644
--- a/src/mame/includes/gotya.h
+++ b/src/mame/includes/gotya.h
@@ -7,6 +7,7 @@
#include "sound/samples.h"
#include "emupal.h"
+#include "tilemap.h"
class gotya_state : public driver_device
{
diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h
index b7b0c0a6b77..5b8525f3931 100644
--- a/src/mame/includes/grchamp.h
+++ b/src/mame/includes/grchamp.h
@@ -15,6 +15,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class grchamp_state : public driver_device
{
diff --git a/src/mame/includes/gsword.h b/src/mame/includes/gsword.h
index fde871a6fad..8067f6b96bd 100644
--- a/src/mame/includes/gsword.h
+++ b/src/mame/includes/gsword.h
@@ -9,6 +9,7 @@
#include "sound/ay8910.h"
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class gsword_state_base : public driver_device
{
diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h
index 2b766560396..7462a8073b2 100644
--- a/src/mame/includes/gumbo.h
+++ b/src/mame/includes/gumbo.h
@@ -10,6 +10,8 @@
#pragma once
+#include "tilemap.h"
+
class gumbo_state : public driver_device
{
public:
diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h
index 2bdad732f6b..9fab0d78f11 100644
--- a/src/mame/includes/gundealr.h
+++ b/src/mame/includes/gundealr.h
@@ -8,6 +8,7 @@
#include "machine/timer.h"
#include "emupal.h"
+#include "tilemap.h"
class gundealr_state : public driver_device
{
diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h
index 6255ee95e27..b47509bd3c4 100644
--- a/src/mame/includes/gunsmoke.h
+++ b/src/mame/includes/gunsmoke.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class gunsmoke_state : public driver_device
{
diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h
index e3ffb3c164e..df368d3530d 100644
--- a/src/mame/includes/gyruss.h
+++ b/src/mame/includes/gyruss.h
@@ -14,6 +14,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class gyruss_state : public driver_device
{
diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h
index 75bffa921ab..f0f916efc7d 100644
--- a/src/mame/includes/hanaawas.h
+++ b/src/mame/includes/hanaawas.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class hanaawas_state : public driver_device
{
diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h
index 32e6fc79cbf..f546449a1e9 100644
--- a/src/mame/includes/hcastle.h
+++ b/src/mame/includes/hcastle.h
@@ -14,6 +14,7 @@
#include "sound/k007232.h"
#include "video/k007121.h"
#include "emupal.h"
+#include "tilemap.h"
class hcastle_state : public driver_device
{
diff --git a/src/mame/includes/hexion.h b/src/mame/includes/hexion.h
index a7b53615181..6496eaeaa41 100644
--- a/src/mame/includes/hexion.h
+++ b/src/mame/includes/hexion.h
@@ -8,6 +8,7 @@
#include "machine/k053252.h"
#include "machine/timer.h"
#include "emupal.h"
+#include "tilemap.h"
class hexion_state : public driver_device
{
diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h
index a744663a45b..19a5f7324b0 100644
--- a/src/mame/includes/higemaru.h
+++ b/src/mame/includes/higemaru.h
@@ -12,6 +12,7 @@
#include "machine/timer.h"
#include "emupal.h"
+#include "tilemap.h"
class higemaru_state : public driver_device
{
diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h
index f47fb3a77cd..b5d42e6af77 100644
--- a/src/mame/includes/himesiki.h
+++ b/src/mame/includes/himesiki.h
@@ -13,6 +13,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class himesiki_state : public driver_device
{
diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h
index 88306210ca0..6ad92d4af9f 100644
--- a/src/mame/includes/hitme.h
+++ b/src/mame/includes/hitme.h
@@ -12,6 +12,7 @@
#include "sound/discrete.h"
#include "screen.h"
+#include "tilemap.h"
/* Discrete Sound Input Nodes */
#define HITME_DOWNCOUNT_VAL NODE_01
diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h
index 2ba112d4d78..6c3d528ca8d 100644
--- a/src/mame/includes/hng64.h
+++ b/src/mame/includes/hng64.h
@@ -15,6 +15,7 @@
#include "machine/mb8421.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
enum hng64trans_t
{
diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h
index 40e3b0644b9..bb0341abeaa 100644
--- a/src/mame/includes/holeland.h
+++ b/src/mame/includes/holeland.h
@@ -12,6 +12,7 @@
#include "machine/74259.h"
#include "emupal.h"
+#include "tilemap.h"
class holeland_state : public driver_device
{
diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h
index e767abe4bae..9041a29bdd8 100644
--- a/src/mame/includes/homedata.h
+++ b/src/mame/includes/homedata.h
@@ -10,6 +10,7 @@
#include "sound/sn76496.h"
#include "sound/2203intf.h"
#include "emupal.h"
+#include "tilemap.h"
class homedata_state : public driver_device
{
diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h
index 4bddc7a73bc..0b953c267df 100644
--- a/src/mame/includes/homerun.h
+++ b/src/mame/includes/homerun.h
@@ -10,6 +10,7 @@
#include "sound/samples.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class homerun_state : public driver_device
{
diff --git a/src/mame/includes/hyperspt.h b/src/mame/includes/hyperspt.h
index d47c670cfa6..9c3bc00839b 100644
--- a/src/mame/includes/hyperspt.h
+++ b/src/mame/includes/hyperspt.h
@@ -12,6 +12,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class hyperspt_state : public driver_device
{
diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h
index 4a6e2207f97..6986ee213ba 100644
--- a/src/mame/includes/inufuku.h
+++ b/src/mame/includes/inufuku.h
@@ -6,6 +6,7 @@
#include "video/vsystem_spr.h"
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class inufuku_state : public driver_device
{
diff --git a/src/mame/includes/iqblock.h b/src/mame/includes/iqblock.h
index 2e19c9e830b..57e1ffa5fe8 100644
--- a/src/mame/includes/iqblock.h
+++ b/src/mame/includes/iqblock.h
@@ -6,6 +6,7 @@
#pragma once
#include "machine/timer.h"
+#include "tilemap.h"
class iqblock_state : public driver_device
{
diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h
index 5c9a9e01864..6eea4b11dd7 100644
--- a/src/mame/includes/ironhors.h
+++ b/src/mame/includes/ironhors.h
@@ -15,6 +15,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class ironhors_state : public driver_device
{
diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h
index 8192534831f..07e118fb7a6 100644
--- a/src/mame/includes/jack.h
+++ b/src/mame/includes/jack.h
@@ -13,6 +13,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class jack_state : public driver_device
{
diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h
index ad6d7457170..ea420998744 100644
--- a/src/mame/includes/jackal.h
+++ b/src/mame/includes/jackal.h
@@ -7,6 +7,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(18'432'000)
#define SOUND_CLOCK XTAL(3'579'545)
diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h
index 44b02339ee0..1ed00e95e2b 100644
--- a/src/mame/includes/jailbrek.h
+++ b/src/mame/includes/jailbrek.h
@@ -12,6 +12,7 @@
#include "sound/vlm5030.h"
#include "emupal.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(18'432'000)
#define VOICE_CLOCK XTAL(3'579'545)
diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h
index 5744dd30b56..0663838e93a 100644
--- a/src/mame/includes/karnov.h
+++ b/src/mame/includes/karnov.h
@@ -10,6 +10,7 @@
#include "video/bufsprite.h"
#include "video/deckarn.h"
#include "video/decrmc3.h"
+#include "tilemap.h"
class karnov_state : public driver_device
{
diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h
index 3b3a0d1db45..0606ee7c4fb 100644
--- a/src/mame/includes/kchamp.h
+++ b/src/mame/includes/kchamp.h
@@ -16,6 +16,7 @@
#include "sound/msm5205.h"
#include "sound/dac.h"
#include "emupal.h"
+#include "tilemap.h"
class kchamp_state : public driver_device
{
diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h
index 10d327a26b1..591e183b99b 100644
--- a/src/mame/includes/kickgoal.h
+++ b/src/mame/includes/kickgoal.h
@@ -15,6 +15,7 @@
#include "machine/gen_latch.h"
#include "sound/okim6295.h"
#include "emupal.h"
+#include "tilemap.h"
class kickgoal_state : public driver_device
{
diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h
index ccd6c86e15f..52ec5871118 100644
--- a/src/mame/includes/kingobox.h
+++ b/src/mame/includes/kingobox.h
@@ -13,6 +13,7 @@
#include "machine/gen_latch.h"
#include "machine/input_merger.h"
#include "emupal.h"
+#include "tilemap.h"
class kingofb_state : public driver_device
{
diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h
index 82e9d0a8bfb..f3be41db77c 100644
--- a/src/mame/includes/klax.h
+++ b/src/mame/includes/klax.h
@@ -12,6 +12,7 @@
#include "machine/atarigen.h"
#include "video/atarimo.h"
+#include "tilemap.h"
class klax_state : public atarigen_state
{
diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h
index 17820edd036..7f37b00ed00 100644
--- a/src/mame/includes/kncljoe.h
+++ b/src/mame/includes/kncljoe.h
@@ -14,6 +14,7 @@
#include "sound/ay8910.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class kncljoe_state : public driver_device
{
diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h
index 8174e31ca23..26cca5cbced 100644
--- a/src/mame/includes/konamigx.h
+++ b/src/mame/includes/konamigx.h
@@ -19,6 +19,7 @@
#include "video/k055555.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class konamigx_state : public driver_device
{
diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h
index 84e4d99a4db..682c5976a74 100644
--- a/src/mame/includes/kopunch.h
+++ b/src/mame/includes/kopunch.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class kopunch_state : public driver_device
{
diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h
index 671d7f9957a..f17fdd280fb 100644
--- a/src/mame/includes/ksayakyu.h
+++ b/src/mame/includes/ksayakyu.h
@@ -13,6 +13,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class ksayakyu_state : public driver_device
{
diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h
index e9140239f1e..79ed308d3bd 100644
--- a/src/mame/includes/kyugo.h
+++ b/src/mame/includes/kyugo.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class kyugo_state : public driver_device
{
diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h
index 144b8c43da4..2e83afbe09b 100644
--- a/src/mame/includes/labyrunr.h
+++ b/src/mame/includes/labyrunr.h
@@ -14,6 +14,7 @@
#include "video/k051733.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class labyrunr_state : public driver_device
{
diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h
index d9924f51948..78f89b580f5 100644
--- a/src/mame/includes/ladybug.h
+++ b/src/mame/includes/ladybug.h
@@ -12,6 +12,7 @@
#include "video/ladybug.h"
#include "emupal.h"
+#include "tilemap.h"
class ladybug_base_state : public driver_device
diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h
index b8ef2b0638e..9f3c728a2c9 100644
--- a/src/mame/includes/ladyfrog.h
+++ b/src/mame/includes/ladyfrog.h
@@ -13,6 +13,7 @@
#include "machine/gen_latch.h"
#include "sound/msm5232.h"
#include "emupal.h"
+#include "tilemap.h"
class ladyfrog_state : public driver_device
{
diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h
index 04d3707058c..01406e21540 100644
--- a/src/mame/includes/lasso.h
+++ b/src/mame/includes/lasso.h
@@ -13,6 +13,7 @@
#include "machine/gen_latch.h"
#include "sound/sn76496.h"
#include "emupal.h"
+#include "tilemap.h"
class lasso_state : public driver_device
{
diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h
index 0e59d87106a..2d1494df9db 100644
--- a/src/mame/includes/lastduel.h
+++ b/src/mame/includes/lastduel.h
@@ -14,6 +14,7 @@
#include "machine/timer.h"
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class lastduel_state : public driver_device
{
diff --git a/src/mame/includes/legionna.h b/src/mame/includes/legionna.h
index 2a3064559ec..b2e3267444c 100644
--- a/src/mame/includes/legionna.h
+++ b/src/mame/includes/legionna.h
@@ -11,6 +11,7 @@
#include "machine/seibucop/seibucop.h"
#include "video/seibu_crtc.h"
#include "emupal.h"
+#include "tilemap.h"
#include <algorithm>
diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h
index c34b3312949..88fed5f9449 100644
--- a/src/mame/includes/leland.h
+++ b/src/mame/includes/leland.h
@@ -15,6 +15,7 @@
#include "sound/ay8910.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define LELAND_BATTERY_RAM_SIZE 0x4000
#define ATAXX_EXTRA_TRAM_SIZE 0x800
diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h
index ec8c8e18628..e5c909fa06d 100644
--- a/src/mame/includes/lemmings.h
+++ b/src/mame/includes/lemmings.h
@@ -5,6 +5,7 @@
#include "machine/deco146.h"
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class lemmings_state : public driver_device
{
diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h
index 20c1760a3d0..e3fe540e7e7 100644
--- a/src/mame/includes/liberate.h
+++ b/src/mame/includes/liberate.h
@@ -7,6 +7,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class liberate_state : public driver_device
{
diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h
index ab4c69b1d9e..dd1eade2765 100644
--- a/src/mame/includes/lkage.h
+++ b/src/mame/includes/lkage.h
@@ -9,6 +9,7 @@
#include "machine/input_merger.h"
#include "machine/taito68705interface.h"
#include "emupal.h"
+#include "tilemap.h"
class lkage_state : public driver_device
{
diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h
index abdbbe9219c..419e7479e3b 100644
--- a/src/mame/includes/lockon.h
+++ b/src/mame/includes/lockon.h
@@ -14,6 +14,7 @@
#include "sound/flt_vol.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/* Calculated from CRT controller writes */
#define PIXEL_CLOCK (XTAL(21'000'000) / 3)
diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h
index 57b28249f28..22e0be35d42 100644
--- a/src/mame/includes/lordgun.h
+++ b/src/mame/includes/lordgun.h
@@ -10,6 +10,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
struct lordgun_gun_data
{
diff --git a/src/mame/includes/lucky74.h b/src/mame/includes/lucky74.h
index 109e7e6e01c..630f96a2ffc 100644
--- a/src/mame/includes/lucky74.h
+++ b/src/mame/includes/lucky74.h
@@ -7,6 +7,7 @@
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class lucky74_state : public driver_device
{
diff --git a/src/mame/includes/lvcards.h b/src/mame/includes/lvcards.h
index bf9d07580a1..90e553d57c1 100644
--- a/src/mame/includes/lvcards.h
+++ b/src/mame/includes/lvcards.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class lvcards_state : public driver_device
{
diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h
index 192ff10f07d..8cb077bc842 100644
--- a/src/mame/includes/lwings.h
+++ b/src/mame/includes/lwings.h
@@ -5,6 +5,7 @@
#include "machine/gen_latch.h"
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class lwings_state : public driver_device
{
diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h
index 9ec34e917dd..d2de401cb94 100644
--- a/src/mame/includes/m10.h
+++ b/src/mame/includes/m10.h
@@ -14,6 +14,7 @@
#include "machine/74123.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define IREMM10_MASTER_CLOCK (12500000)
diff --git a/src/mame/includes/m107.h b/src/mame/includes/m107.h
index f18573bd514..97ab0fae6e5 100644
--- a/src/mame/includes/m107.h
+++ b/src/mame/includes/m107.h
@@ -16,6 +16,7 @@
#include "video/bufsprite.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
struct pf_layer_info
{
diff --git a/src/mame/includes/m52.h b/src/mame/includes/m52.h
index 8d11a75d229..29893892d0a 100644
--- a/src/mame/includes/m52.h
+++ b/src/mame/includes/m52.h
@@ -7,6 +7,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class m52_state : public driver_device
{
diff --git a/src/mame/includes/m57.h b/src/mame/includes/m57.h
index a325bc34830..e15f4549736 100644
--- a/src/mame/includes/m57.h
+++ b/src/mame/includes/m57.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class m57_state : public driver_device
{
diff --git a/src/mame/includes/m58.h b/src/mame/includes/m58.h
index 660a8326b69..05f9b96166b 100644
--- a/src/mame/includes/m58.h
+++ b/src/mame/includes/m58.h
@@ -13,6 +13,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class m58_state : public driver_device
{
diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h
index 6bb54deaafe..579111838d8 100644
--- a/src/mame/includes/m62.h
+++ b/src/mame/includes/m62.h
@@ -7,6 +7,7 @@
#include "audio/irem.h"
#include "emupal.h"
+#include "tilemap.h"
class m62_state : public driver_device
{
diff --git a/src/mame/includes/m72.h b/src/mame/includes/m72.h
index d5bf12336d3..d1c696b5840 100644
--- a/src/mame/includes/m72.h
+++ b/src/mame/includes/m72.h
@@ -19,6 +19,7 @@
#include "sound/dac.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define M81_B_B_JUMPER_J3_S \
PORT_START("JumperJ3") \
diff --git a/src/mame/includes/m90.h b/src/mame/includes/m90.h
index 8425971ce29..bf902d73521 100644
--- a/src/mame/includes/m90.h
+++ b/src/mame/includes/m90.h
@@ -9,6 +9,7 @@
#include "cpu/nec/v25.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class m90_state : public driver_device
{
diff --git a/src/mame/includes/m92.h b/src/mame/includes/m92.h
index 0dcd1dd2043..bf057b6c95e 100644
--- a/src/mame/includes/m92.h
+++ b/src/mame/includes/m92.h
@@ -17,6 +17,7 @@
#include "video/bufsprite.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
struct M92_pf_layer_info
{
diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h
index d08b039c0c7..51458fd6d8d 100644
--- a/src/mame/includes/macrossp.h
+++ b/src/mame/includes/macrossp.h
@@ -14,6 +14,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class macrossp_state : public driver_device
{
diff --git a/src/mame/includes/madalien.h b/src/mame/includes/madalien.h
index 473a9f2dc0b..aa675e08a0d 100644
--- a/src/mame/includes/madalien.h
+++ b/src/mame/includes/madalien.h
@@ -15,6 +15,7 @@
#include "machine/gen_latch.h"
#include "sound/discrete.h"
#include "emupal.h"
+#include "tilemap.h"
#define MADALIEN_MAIN_CLOCK XTAL(10'595'000)
diff --git a/src/mame/includes/mainsnk.h b/src/mame/includes/mainsnk.h
index 4711e811236..b83ce24f567 100644
--- a/src/mame/includes/mainsnk.h
+++ b/src/mame/includes/mainsnk.h
@@ -7,6 +7,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class mainsnk_state : public driver_device
{
diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h
index 4137691847a..7a5845b9e28 100644
--- a/src/mame/includes/mappy.h
+++ b/src/mame/includes/mappy.h
@@ -10,6 +10,7 @@
#include "sound/namco.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class mappy_state : public driver_device
{
diff --git a/src/mame/includes/marineb.h b/src/mame/includes/marineb.h
index ed70b14892c..469f212fb95 100644
--- a/src/mame/includes/marineb.h
+++ b/src/mame/includes/marineb.h
@@ -7,6 +7,7 @@
#include "machine/74259.h"
#include "emupal.h"
+#include "tilemap.h"
class marineb_state : public driver_device
{
diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h
index 9e490383fba..8d2767477d6 100644
--- a/src/mame/includes/mario.h
+++ b/src/mame/includes/mario.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "machine/z80dma.h"
#include "emupal.h"
+#include "tilemap.h"
#define OLD_SOUND (0)
diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h
index 4e94ddc4390..a8890e473e1 100644
--- a/src/mame/includes/markham.h
+++ b/src/mame/includes/markham.h
@@ -20,6 +20,7 @@
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
class markham_state : public driver_device
{
diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h
index 3ba72fcffc9..4e92fdb7838 100644
--- a/src/mame/includes/mcatadv.h
+++ b/src/mame/includes/mcatadv.h
@@ -7,6 +7,7 @@
#include "machine/watchdog.h"
#include "emupal.h"
+#include "tilemap.h"
class mcatadv_state : public driver_device
{
diff --git a/src/mame/includes/mcr.h b/src/mame/includes/mcr.h
index 6205110d251..8276bd32bcf 100644
--- a/src/mame/includes/mcr.h
+++ b/src/mame/includes/mcr.h
@@ -22,6 +22,7 @@
#include "audio/csd.h"
#include "sound/samples.h"
#include "emupal.h"
+#include "tilemap.h"
/* constants */
#define MAIN_OSC_MCR_I XTAL(19'968'000)
diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h
index 3224846502e..14a3129c9c6 100644
--- a/src/mame/includes/mcr3.h
+++ b/src/mame/includes/mcr3.h
@@ -15,6 +15,7 @@
#include "machine/74259.h"
#include "machine/adc0844.h"
#include "screen.h"
+#include "tilemap.h"
class mcr3_state : public mcr_state
{
diff --git a/src/mame/includes/mcr68.h b/src/mame/includes/mcr68.h
index 4e3b6b53f51..00eafc5ea01 100644
--- a/src/mame/includes/mcr68.h
+++ b/src/mame/includes/mcr68.h
@@ -17,6 +17,7 @@
#include "machine/6840ptm.h"
#include "machine/adc0844.h"
#include "screen.h"
+#include "tilemap.h"
class mcr68_state : public driver_device
{
diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h
index 66bf2262f35..2177fd9e729 100644
--- a/src/mame/includes/meadows.h
+++ b/src/mame/includes/meadows.h
@@ -15,6 +15,7 @@
#include "sound/samples.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class meadows_state : public driver_device
{
diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h
index 6ed14f00197..31d43d03d77 100644
--- a/src/mame/includes/mermaid.h
+++ b/src/mame/includes/mermaid.h
@@ -16,6 +16,7 @@
#include "sound/ay8910.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class mermaid_state : public driver_device
{
diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h
index 7f0e22ef7bc..41485c25efd 100644
--- a/src/mame/includes/metlclsh.h
+++ b/src/mame/includes/metlclsh.h
@@ -7,6 +7,7 @@
*************************************************************************/
#include "emupal.h"
+#include "tilemap.h"
class metlclsh_state : public driver_device
{
diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h
index c25f3a32a53..37c8f9b2c1e 100644
--- a/src/mame/includes/metro.h
+++ b/src/mame/includes/metro.h
@@ -19,6 +19,7 @@
#include "machine/gen_latch.h"
#include "machine/timer.h"
#include "screen.h"
+#include "tilemap.h"
class metro_state : public driver_device
{
diff --git a/src/mame/includes/microtan.h b/src/mame/includes/microtan.h
index 133278b8a42..4d0d2f899fc 100644
--- a/src/mame/includes/microtan.h
+++ b/src/mame/includes/microtan.h
@@ -25,6 +25,7 @@
#include "machine/timer.h"
#include "bus/tanbus/tanbus.h"
#include "imagedev/snapquik.h"
+#include "tilemap.h"
class microtan_state : public driver_device
{
diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h
index c58a465ee12..8fb2e8aee04 100644
--- a/src/mame/includes/mikie.h
+++ b/src/mame/includes/mikie.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class mikie_state : public driver_device
{
diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h
index adde1a1fd82..38fa3bbb39f 100644
--- a/src/mame/includes/mitchell.h
+++ b/src/mame/includes/mitchell.h
@@ -14,6 +14,7 @@
#include "sound/msm5205.h"
#include "sound/okim6295.h"
#include "emupal.h"
+#include "tilemap.h"
class mitchell_state : public driver_device
{
diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h
index 8524ba78051..887c36f6b5c 100644
--- a/src/mame/includes/mjkjidai.h
+++ b/src/mame/includes/mjkjidai.h
@@ -8,6 +8,7 @@
#include "machine/nvram.h"
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class mjkjidai_state : public driver_device
{
diff --git a/src/mame/includes/model3.h b/src/mame/includes/model3.h
index 34718b9cdd5..b5055e48af8 100644
--- a/src/mame/includes/model3.h
+++ b/src/mame/includes/model3.h
@@ -18,6 +18,7 @@
#include "machine/timer.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
typedef float MATRIX[4][4];
typedef float VECTOR[4];
diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h
index 094ddaa6c30..e83b3fc902c 100644
--- a/src/mame/includes/mosaic.h
+++ b/src/mame/includes/mosaic.h
@@ -10,6 +10,8 @@
#pragma once
+#include "tilemap.h"
+
class mosaic_state : public driver_device
{
public:
diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h
index 0896d2661c7..377c66dfc61 100644
--- a/src/mame/includes/mrdo.h
+++ b/src/mame/includes/mrdo.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class mrdo_state : public driver_device
{
diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h
index 8e5907c66da..adfd472e028 100644
--- a/src/mame/includes/mrjong.h
+++ b/src/mame/includes/mrjong.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class mrjong_state : public driver_device
{
diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h
index 2a11409fedb..2e49fc23eba 100644
--- a/src/mame/includes/ms32.h
+++ b/src/mame/includes/ms32.h
@@ -9,6 +9,7 @@
#include "machine/timer.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class ms32_state : public driver_device
{
diff --git a/src/mame/includes/msisaac.h b/src/mame/includes/msisaac.h
index 452dd16432c..eb7129e2bbc 100644
--- a/src/mame/includes/msisaac.h
+++ b/src/mame/includes/msisaac.h
@@ -10,6 +10,7 @@
#include "sound/msm5232.h"
#include "sound/ta7630.h"
#include "emupal.h"
+#include "tilemap.h"
/* Disabled because the mcu dump is currently unavailable. -AS */
//#define USE_MCU
diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h
index a0f7a40631c..6622876f9a9 100644
--- a/src/mame/includes/mugsmash.h
+++ b/src/mame/includes/mugsmash.h
@@ -3,6 +3,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class mugsmash_state : public driver_device
{
diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h
index 1f0b5e28303..fadec1b8efe 100644
--- a/src/mame/includes/multfish.h
+++ b/src/mame/includes/multfish.h
@@ -10,6 +10,7 @@
#include "machine/ticket.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define igrosoft_gamble_ROM_SIZE 0x80000
#define igrosoft_gamble_VIDRAM_SIZE (0x2000*0x04)
diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h
index 852843dd6bb..25f8d451377 100644
--- a/src/mame/includes/mustache.h
+++ b/src/mame/includes/mustache.h
@@ -9,6 +9,7 @@
#include "machine/timer.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class mustache_state : public driver_device
{
diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h
index 47fc6636e5e..94bb6d94895 100644
--- a/src/mame/includes/mystston.h
+++ b/src/mame/includes/mystston.h
@@ -11,6 +11,7 @@
#include "sound/ay8910.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define MYSTSTON_MASTER_CLOCK (XTAL(12'000'000))
diff --git a/src/mame/includes/mystwarr.h b/src/mame/includes/mystwarr.h
index 7a07c077fcd..e114635a339 100644
--- a/src/mame/includes/mystwarr.h
+++ b/src/mame/includes/mystwarr.h
@@ -10,6 +10,7 @@
#include "video/k054000.h"
#include "machine/k054321.h"
#include "machine/timer.h"
+#include "tilemap.h"
class mystwarr_state : public konamigx_state
{
diff --git a/src/mame/includes/namcona1.h b/src/mame/includes/namcona1.h
index ad06f75aa48..c41bf3349b8 100644
--- a/src/mame/includes/namcona1.h
+++ b/src/mame/includes/namcona1.h
@@ -17,6 +17,7 @@
#include "sound/c140.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class namcona1_state : public driver_device
diff --git a/src/mame/includes/namcos22.h b/src/mame/includes/namcos22.h
index f61174d4457..398385c3cb8 100644
--- a/src/mame/includes/namcos22.h
+++ b/src/mame/includes/namcos22.h
@@ -20,6 +20,7 @@
#include "video/poly.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
enum
{
diff --git a/src/mame/includes/namcos86.h b/src/mame/includes/namcos86.h
index 691c740ad69..8ecfd39b9bf 100644
--- a/src/mame/includes/namcos86.h
+++ b/src/mame/includes/namcos86.h
@@ -10,6 +10,7 @@
#include "sound/n63701x.h"
#include "sound/namco.h"
#include "emupal.h"
+#include "tilemap.h"
class namcos86_state : public driver_device
{
diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h
index c83825ad2fb..3a6ee6fe785 100644
--- a/src/mame/includes/nemesis.h
+++ b/src/mame/includes/nemesis.h
@@ -13,6 +13,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class nemesis_state : public driver_device
diff --git a/src/mame/includes/news.h b/src/mame/includes/news.h
index 257c4559361..efebee554d7 100644
--- a/src/mame/includes/news.h
+++ b/src/mame/includes/news.h
@@ -5,6 +5,8 @@
#pragma once
+#include "tilemap.h"
+
class news_state : public driver_device
{
public:
diff --git a/src/mame/includes/ninjakd2.h b/src/mame/includes/ninjakd2.h
index 5df65126962..4df0adb69cc 100644
--- a/src/mame/includes/ninjakd2.h
+++ b/src/mame/includes/ninjakd2.h
@@ -13,6 +13,7 @@
#include "sound/samples.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class ninjakd2_state : public driver_device
{
diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h
index def0caf7585..6ca71cf63e9 100644
--- a/src/mame/includes/nmk16.h
+++ b/src/mame/includes/nmk16.h
@@ -13,6 +13,7 @@
#include "sound/okim6295.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class nmk16_state : public driver_device, public seibu_sound_common
{
diff --git a/src/mame/includes/nova2001.h b/src/mame/includes/nova2001.h
index e63b8116496..75fd4b41786 100644
--- a/src/mame/includes/nova2001.h
+++ b/src/mame/includes/nova2001.h
@@ -7,6 +7,7 @@
#include "cpu/z80/z80.h"
#include "emupal.h"
+#include "tilemap.h"
class nova2001_state : public driver_device
{
diff --git a/src/mame/includes/nycaptor.h b/src/mame/includes/nycaptor.h
index f99bc09b840..80f35592eec 100644
--- a/src/mame/includes/nycaptor.h
+++ b/src/mame/includes/nycaptor.h
@@ -10,6 +10,7 @@
#include "sound/msm5232.h"
#include "machine/taito68705interface.h"
#include "emupal.h"
+#include "tilemap.h"
class nycaptor_state : public driver_device
{
diff --git a/src/mame/includes/offtwall.h b/src/mame/includes/offtwall.h
index cb068fdb889..6c25fd48750 100644
--- a/src/mame/includes/offtwall.h
+++ b/src/mame/includes/offtwall.h
@@ -14,6 +14,7 @@
#include "video/atarimo.h"
#include "video/atarivad.h"
#include "screen.h"
+#include "tilemap.h"
class offtwall_state : public driver_device
{
diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h
index c10fd682a58..3376bd5e55c 100644
--- a/src/mame/includes/ohmygod.h
+++ b/src/mame/includes/ohmygod.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class ohmygod_state : public driver_device
{
diff --git a/src/mame/includes/ojankohs.h b/src/mame/includes/ojankohs.h
index c70a5a10e8c..a51ec147091 100644
--- a/src/mame/includes/ojankohs.h
+++ b/src/mame/includes/ojankohs.h
@@ -13,6 +13,7 @@
#include "sound/msm5205.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class ojankohs_state : public driver_device
{
diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h
index b38e88fbbbd..5d411762cb5 100644
--- a/src/mame/includes/oneshot.h
+++ b/src/mame/includes/oneshot.h
@@ -7,6 +7,7 @@
#include "sound/okim6295.h"
#include "emupal.h"
+#include "tilemap.h"
class oneshot_state : public driver_device
{
diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h
index 2f25989efa5..24776a12a2e 100644
--- a/src/mame/includes/orbit.h
+++ b/src/mame/includes/orbit.h
@@ -15,6 +15,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/* Discrete Sound Input Nodes */
#define ORBIT_NOTE_FREQ NODE_01
diff --git a/src/mame/includes/osborne1.h b/src/mame/includes/osborne1.h
index 5bcfbbceef7..c972e777e16 100644
--- a/src/mame/includes/osborne1.h
+++ b/src/mame/includes/osborne1.h
@@ -28,6 +28,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class osborne1_state : public driver_device
diff --git a/src/mame/includes/pacland.h b/src/mame/includes/pacland.h
index c7318b1a482..2598cac9350 100644
--- a/src/mame/includes/pacland.h
+++ b/src/mame/includes/pacland.h
@@ -9,6 +9,7 @@
#include "sound/namco.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class pacland_state : public driver_device
{
diff --git a/src/mame/includes/pacman.h b/src/mame/includes/pacman.h
index da0ccd3c4cd..cefa2fc4b1c 100644
--- a/src/mame/includes/pacman.h
+++ b/src/mame/includes/pacman.h
@@ -9,6 +9,7 @@
#include "machine/watchdog.h"
#include "sound/namco.h"
#include "emupal.h"
+#include "tilemap.h"
/*************************************************************************
diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h
index af483dd4b35..0598d443943 100644
--- a/src/mame/includes/pandoras.h
+++ b/src/mame/includes/pandoras.h
@@ -12,6 +12,7 @@
#include "cpu/mcs48/mcs48.h"
#include "emupal.h"
+#include "tilemap.h"
class pandoras_state : public driver_device
{
diff --git a/src/mame/includes/paradise.h b/src/mame/includes/paradise.h
index 54cd338d76d..6ef945255b9 100644
--- a/src/mame/includes/paradise.h
+++ b/src/mame/includes/paradise.h
@@ -8,6 +8,7 @@
#include "sound/okim6295.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class paradise_state : public driver_device
{
diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h
index c27be53d147..8ed2a2ece2c 100644
--- a/src/mame/includes/pass.h
+++ b/src/mame/includes/pass.h
@@ -5,6 +5,8 @@
#pragma once
+#include "tilemap.h"
+
class pass_state : public driver_device
{
public:
diff --git a/src/mame/includes/pbaction.h b/src/mame/includes/pbaction.h
index 3ebc7d442db..c347478a79a 100644
--- a/src/mame/includes/pbaction.h
+++ b/src/mame/includes/pbaction.h
@@ -14,6 +14,7 @@
#include "machine/gen_latch.h"
#include "machine/z80ctc.h"
#include "emupal.h"
+#include "tilemap.h"
class pbaction_state : public driver_device
{
diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h
index 4e4fa293562..d7f08beb67f 100644
--- a/src/mame/includes/pgm.h
+++ b/src/mame/includes/pgm.h
@@ -20,6 +20,7 @@
#include "machine/v3021.h"
#include "sound/ics2115.h"
#include "emupal.h"
+#include "tilemap.h"
#define PGMARM7LOGERROR 0
diff --git a/src/mame/includes/pgm2.h b/src/mame/includes/pgm2.h
index 6064d5dee5f..276886c7928 100644
--- a/src/mame/includes/pgm2.h
+++ b/src/mame/includes/pgm2.h
@@ -16,6 +16,7 @@
#include "machine/atmel_arm_aic.h"
#include "machine/pgm2_memcard.h"
#include "emupal.h"
+#include "tilemap.h"
struct kov3_module_key
{
diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h
index e66be308575..05c8dce06cb 100644
--- a/src/mame/includes/phoenix.h
+++ b/src/mame/includes/phoenix.h
@@ -7,6 +7,7 @@
#include "audio/pleiads.h"
#include "emupal.h"
+#include "tilemap.h"
class phoenix_state : public driver_device
{
diff --git a/src/mame/includes/pingpong.h b/src/mame/includes/pingpong.h
index fab62d8945c..237490a086b 100644
--- a/src/mame/includes/pingpong.h
+++ b/src/mame/includes/pingpong.h
@@ -7,6 +7,7 @@
#include "machine/timer.h"
#include "emupal.h"
+#include "tilemap.h"
class pingpong_state : public driver_device
{
diff --git a/src/mame/includes/pirates.h b/src/mame/includes/pirates.h
index 3e75ed67d2e..fc6133d51dc 100644
--- a/src/mame/includes/pirates.h
+++ b/src/mame/includes/pirates.h
@@ -8,6 +8,7 @@
#include "machine/eepromser.h"
#include "sound/okim6295.h"
#include "emupal.h"
+#include "tilemap.h"
class pirates_state : public driver_device
{
diff --git a/src/mame/includes/pitnrun.h b/src/mame/includes/pitnrun.h
index 405fe188c1e..79fdd0a2ae7 100644
--- a/src/mame/includes/pitnrun.h
+++ b/src/mame/includes/pitnrun.h
@@ -7,6 +7,7 @@
#include "cpu/m6805/m68705.h"
#include "emupal.h"
+#include "tilemap.h"
class pitnrun_state : public driver_device
{
diff --git a/src/mame/includes/playch10.h b/src/mame/includes/playch10.h
index b844b5beb4a..6a1efd3072b 100644
--- a/src/mame/includes/playch10.h
+++ b/src/mame/includes/playch10.h
@@ -9,6 +9,7 @@
#include "machine/rp5h01.h"
#include "video/ppu2c0x.h"
#include "emupal.h"
+#include "tilemap.h"
class playch10_state : public driver_device
{
diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h
index a2dbede2a02..9c11504b8a6 100644
--- a/src/mame/includes/playmark.h
+++ b/src/mame/includes/playmark.h
@@ -10,6 +10,7 @@
#include "machine/ticket.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "emupal.h"
+#include "tilemap.h"
class playmark_state : public driver_device
{
diff --git a/src/mame/includes/plygonet.h b/src/mame/includes/plygonet.h
index 566d6289d03..55615a4761b 100644
--- a/src/mame/includes/plygonet.h
+++ b/src/mame/includes/plygonet.h
@@ -10,6 +10,7 @@
#include "video/k053936.h"
#include "cpu/dsp56156/dsp56156.h"
#include "emupal.h"
+#include "tilemap.h"
static const uint16_t dsp56156_bank00_size = 0x1000;
diff --git a/src/mame/includes/pokechmp.h b/src/mame/includes/pokechmp.h
index d7c05861837..ab72fb3baea 100644
--- a/src/mame/includes/pokechmp.h
+++ b/src/mame/includes/pokechmp.h
@@ -7,6 +7,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class pokechmp_state : public driver_device
{
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index accfbd89b9a..1bf2f37aa84 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -16,6 +16,7 @@
#include "sound/namco.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class polepos_state : public driver_device
diff --git a/src/mame/includes/poolshrk.h b/src/mame/includes/poolshrk.h
index 84aa6ccbc3d..6ff8cfaa90e 100644
--- a/src/mame/includes/poolshrk.h
+++ b/src/mame/includes/poolshrk.h
@@ -13,6 +13,7 @@
#include "machine/watchdog.h"
#include "sound/discrete.h"
#include "emupal.h"
+#include "tilemap.h"
/* Discrete Sound Input Nodes */
diff --git a/src/mame/includes/pooyan.h b/src/mame/includes/pooyan.h
index 8f743096232..b8e826fa5de 100644
--- a/src/mame/includes/pooyan.h
+++ b/src/mame/includes/pooyan.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class pooyan_state : public driver_device
{
diff --git a/src/mame/includes/popeye.h b/src/mame/includes/popeye.h
index 8cb8a79d1de..05903d9aecf 100644
--- a/src/mame/includes/popeye.h
+++ b/src/mame/includes/popeye.h
@@ -10,6 +10,7 @@
#include "sound/ay8910.h"
#include "video/resnet.h"
#include "emupal.h"
+#include "tilemap.h"
class tnx1_state : public driver_device
{
diff --git a/src/mame/includes/portrait.h b/src/mame/includes/portrait.h
index e3db2e6a473..e33a7cce80d 100644
--- a/src/mame/includes/portrait.h
+++ b/src/mame/includes/portrait.h
@@ -7,6 +7,7 @@
#include "sound/tms5220.h"
#include "emupal.h"
+#include "tilemap.h"
class portrait_state : public driver_device
{
diff --git a/src/mame/includes/powerins.h b/src/mame/includes/powerins.h
index 2db86d7839b..c1b18d63a13 100644
--- a/src/mame/includes/powerins.h
+++ b/src/mame/includes/powerins.h
@@ -5,6 +5,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class powerins_state : public driver_device
{
diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h
index 862d33ea4fb..e3ba5cbba53 100644
--- a/src/mame/includes/prehisle.h
+++ b/src/mame/includes/prehisle.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "sound/upd7759.h"
#include "emupal.h"
+#include "tilemap.h"
class prehisle_state : public driver_device
{
diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h
index 39f361150ee..9f9e0815e58 100644
--- a/src/mame/includes/psikyo.h
+++ b/src/mame/includes/psikyo.h
@@ -15,6 +15,7 @@
#include "sound/okim6295.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#include <algorithm>
diff --git a/src/mame/includes/psychic5.h b/src/mame/includes/psychic5.h
index 73f43f8ff3c..3f2da46a08a 100644
--- a/src/mame/includes/psychic5.h
+++ b/src/mame/includes/psychic5.h
@@ -5,6 +5,7 @@
#include "machine/timer.h"
#include "video/jalblend.h"
#include "emupal.h"
+#include "tilemap.h"
class psychic5_state : public driver_device
{
diff --git a/src/mame/includes/punchout.h b/src/mame/includes/punchout.h
index 1b5043de301..e544bf42c9d 100644
--- a/src/mame/includes/punchout.h
+++ b/src/mame/includes/punchout.h
@@ -15,6 +15,7 @@
#include "machine/rp5h01.h"
#include "sound/vlm5030.h"
#include "emupal.h"
+#include "tilemap.h"
class punchout_state : public driver_device
{
diff --git a/src/mame/includes/quizdna.h b/src/mame/includes/quizdna.h
index 58bbb57c8d0..4e35e89c3a2 100644
--- a/src/mame/includes/quizdna.h
+++ b/src/mame/includes/quizdna.h
@@ -2,6 +2,7 @@
// copyright-holders:Uki
#include "emupal.h"
+#include "tilemap.h"
class quizdna_state : public driver_device
{
diff --git a/src/mame/includes/quizpani.h b/src/mame/includes/quizpani.h
index 0108bc4a0f5..ed9048acc95 100644
--- a/src/mame/includes/quizpani.h
+++ b/src/mame/includes/quizpani.h
@@ -6,6 +6,7 @@
#pragma once
#include "machine/nmk112.h"
+#include "tilemap.h"
class quizpani_state : public driver_device
{
diff --git a/src/mame/includes/raiden.h b/src/mame/includes/raiden.h
index ad84385f5fc..613875b7925 100644
--- a/src/mame/includes/raiden.h
+++ b/src/mame/includes/raiden.h
@@ -13,6 +13,7 @@
#include "audio/seibu.h"
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class raiden_state : public driver_device, public seibu_sound_common
{
diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h
index aacca62d6f1..3027b1eaab3 100644
--- a/src/mame/includes/raiden2.h
+++ b/src/mame/includes/raiden2.h
@@ -11,6 +11,7 @@
#include "video/seibu_crtc.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#include <algorithm>
diff --git a/src/mame/includes/rallyx.h b/src/mame/includes/rallyx.h
index 4c93463801e..7ce65190614 100644
--- a/src/mame/includes/rallyx.h
+++ b/src/mame/includes/rallyx.h
@@ -10,6 +10,7 @@
#include "sound/samples.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class rallyx_state : public driver_device
{
diff --git a/src/mame/includes/realbrk.h b/src/mame/includes/realbrk.h
index 7c0c1546673..21bdc6a0ca0 100644
--- a/src/mame/includes/realbrk.h
+++ b/src/mame/includes/realbrk.h
@@ -8,6 +8,7 @@
#include "machine/tmp68301.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class realbrk_state : public driver_device
{
diff --git a/src/mame/includes/redclash.h b/src/mame/includes/redclash.h
index 3238f9485c1..7c71f7d1767 100644
--- a/src/mame/includes/redclash.h
+++ b/src/mame/includes/redclash.h
@@ -12,6 +12,7 @@
#include "video/ladybug.h"
#include "emupal.h"
+#include "tilemap.h"
// redclash/zerohour
diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h
index efa82079070..fe9a12ac0de 100644
--- a/src/mame/includes/relief.h
+++ b/src/mame/includes/relief.h
@@ -15,6 +15,7 @@
#include "video/atarimo.h"
#include "video/atarivad.h"
#include "screen.h"
+#include "tilemap.h"
class relief_state : public driver_device
{
diff --git a/src/mame/includes/renegade.h b/src/mame/includes/renegade.h
index 34ea2c4369f..bc7feefec58 100644
--- a/src/mame/includes/renegade.h
+++ b/src/mame/includes/renegade.h
@@ -10,6 +10,7 @@
#include "machine/gen_latch.h"
#include "machine/timer.h"
#include "sound/msm5205.h"
+#include "tilemap.h"
class renegade_state : public driver_device
{
diff --git a/src/mame/includes/retofinv.h b/src/mame/includes/retofinv.h
index 3d535ba906f..46cd3264881 100644
--- a/src/mame/includes/retofinv.h
+++ b/src/mame/includes/retofinv.h
@@ -8,6 +8,7 @@
#include "machine/74259.h"
#include "machine/taito68705interface.h"
#include "emupal.h"
+#include "tilemap.h"
class retofinv_state : public driver_device
{
diff --git a/src/mame/includes/rocnrope.h b/src/mame/includes/rocnrope.h
index 216dd87c068..d640ec125ba 100644
--- a/src/mame/includes/rocnrope.h
+++ b/src/mame/includes/rocnrope.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class rocnrope_state : public driver_device
{
diff --git a/src/mame/includes/rollrace.h b/src/mame/includes/rollrace.h
index 1bdf698dbcc..5cc4bb668f5 100644
--- a/src/mame/includes/rollrace.h
+++ b/src/mame/includes/rollrace.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class rollrace_state : public driver_device
{
diff --git a/src/mame/includes/rpunch.h b/src/mame/includes/rpunch.h
index 3a8f2b2409a..973b59e47b7 100644
--- a/src/mame/includes/rpunch.h
+++ b/src/mame/includes/rpunch.h
@@ -10,6 +10,7 @@
#include "video/vsystem_gga.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class rpunch_state : public driver_device
{
diff --git a/src/mame/includes/runaway.h b/src/mame/includes/runaway.h
index 2e26ed709f4..3e34bf2c34f 100644
--- a/src/mame/includes/runaway.h
+++ b/src/mame/includes/runaway.h
@@ -8,6 +8,7 @@
#include "machine/er2055.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class runaway_state : public driver_device
{
diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h
index 8b811b3a494..9e8b6424e82 100644
--- a/src/mame/includes/rungun.h
+++ b/src/mame/includes/rungun.h
@@ -18,6 +18,7 @@
#include "video/konami_helper.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class rungun_state : public driver_device
{
diff --git a/src/mame/includes/sauro.h b/src/mame/includes/sauro.h
index e44e3fd4bc6..ace9c6679ce 100644
--- a/src/mame/includes/sauro.h
+++ b/src/mame/includes/sauro.h
@@ -9,6 +9,7 @@
#include "machine/gen_latch.h"
#include "sound/sp0256.h"
#include "emupal.h"
+#include "tilemap.h"
class sauro_state : public driver_device
{
diff --git a/src/mame/includes/sbasketb.h b/src/mame/includes/sbasketb.h
index 663f93cbc11..ac17b189226 100644
--- a/src/mame/includes/sbasketb.h
+++ b/src/mame/includes/sbasketb.h
@@ -12,6 +12,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class sbasketb_state : public driver_device
{
diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h
index 7ff4fc098cd..b6eefaa585d 100644
--- a/src/mame/includes/sbugger.h
+++ b/src/mame/includes/sbugger.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class sbugger_state : public driver_device
{
diff --git a/src/mame/includes/scotrsht.h b/src/mame/includes/scotrsht.h
index 19c426e91b5..37d54e82413 100644
--- a/src/mame/includes/scotrsht.h
+++ b/src/mame/includes/scotrsht.h
@@ -7,6 +7,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class scotrsht_state : public driver_device
{
diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h
index d2b296df083..2f072b31c73 100644
--- a/src/mame/includes/sderby.h
+++ b/src/mame/includes/sderby.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class sderby_state : public driver_device
{
diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h
index ad0d0bd4ea5..0d2e9c0e6e5 100644
--- a/src/mame/includes/segag80r.h
+++ b/src/mame/includes/segag80r.h
@@ -18,6 +18,7 @@
#include "sound/sn76496.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class sega005_sound_device;
diff --git a/src/mame/includes/segas32.h b/src/mame/includes/segas32.h
index c11ec474096..a37e2f47414 100644
--- a/src/mame/includes/segas32.h
+++ b/src/mame/includes/segas32.h
@@ -15,6 +15,7 @@
#include "machine/timer.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
diff --git a/src/mame/includes/seibuspi.h b/src/mame/includes/seibuspi.h
index e7f2d933fa0..f0ccdc21003 100644
--- a/src/mame/includes/seibuspi.h
+++ b/src/mame/includes/seibuspi.h
@@ -10,6 +10,7 @@
#include "machine/7200fifo.h"
#include "sound/okim6295.h"
#include "emupal.h"
+#include "tilemap.h"
class seibuspi_state : public driver_device
{
diff --git a/src/mame/includes/seicross.h b/src/mame/includes/seicross.h
index 0e6ef27d025..73e0aaac085 100644
--- a/src/mame/includes/seicross.h
+++ b/src/mame/includes/seicross.h
@@ -8,6 +8,7 @@
#include "machine/nvram.h"
#include "sound/dac.h"
#include "emupal.h"
+#include "tilemap.h"
class seicross_state : public driver_device
{
diff --git a/src/mame/includes/senjyo.h b/src/mame/includes/senjyo.h
index 064ba50c532..cdb7a520186 100644
--- a/src/mame/includes/senjyo.h
+++ b/src/mame/includes/senjyo.h
@@ -10,6 +10,7 @@
#include "machine/z80pio.h"
#include "machine/z80ctc.h"
#include "emupal.h"
+#include "tilemap.h"
class senjyo_state : public driver_device
{
diff --git a/src/mame/includes/seta.h b/src/mame/includes/seta.h
index 5e63b144804..85880b3ca6c 100644
--- a/src/mame/includes/seta.h
+++ b/src/mame/includes/seta.h
@@ -22,6 +22,7 @@
#include "sound/x1_010.h"
#include "video/seta001.h"
#include "emupal.h"
+#include "tilemap.h"
class seta_state : public driver_device
diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h
index 61dfb063187..164a5a8ba6b 100644
--- a/src/mame/includes/sf.h
+++ b/src/mame/includes/sf.h
@@ -9,6 +9,7 @@
#include "machine/gen_latch.h"
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class sf_state : public driver_device
{
diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h
index 23b1648b41f..a4af2479394 100644
--- a/src/mame/includes/shadfrce.h
+++ b/src/mame/includes/shadfrce.h
@@ -10,6 +10,7 @@
#include "sound/okim6295.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class shadfrce_state : public driver_device
{
diff --git a/src/mame/includes/shangkid.h b/src/mame/includes/shangkid.h
index 54c815018ee..b5173afeadf 100644
--- a/src/mame/includes/shangkid.h
+++ b/src/mame/includes/shangkid.h
@@ -7,6 +7,7 @@
#include "sound/ay8910.h"
#include "emupal.h"
+#include "tilemap.h"
class shangkid_state : public driver_device
{
diff --git a/src/mame/includes/shaolins.h b/src/mame/includes/shaolins.h
index 15db04608a2..3acd717905d 100644
--- a/src/mame/includes/shaolins.h
+++ b/src/mame/includes/shaolins.h
@@ -7,6 +7,7 @@
#include "machine/timer.h"
#include "emupal.h"
+#include "tilemap.h"
class shaolins_state : public driver_device
{
diff --git a/src/mame/includes/shisen.h b/src/mame/includes/shisen.h
index 8c5234ab35d..3d40d800f85 100644
--- a/src/mame/includes/shisen.h
+++ b/src/mame/includes/shisen.h
@@ -7,6 +7,7 @@
#include "audio/m72.h"
#include "emupal.h"
+#include "tilemap.h"
class shisen_state : public driver_device
{
diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h
index 4ce7bebfd51..8fd6e1e580c 100644
--- a/src/mame/includes/shootout.h
+++ b/src/mame/includes/shootout.h
@@ -7,6 +7,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class shootout_state : public driver_device
{
diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h
index dd5295aabce..64238963601 100644
--- a/src/mame/includes/shuuz.h
+++ b/src/mame/includes/shuuz.h
@@ -13,6 +13,7 @@
#include "machine/atarigen.h"
#include "video/atarimo.h"
#include "video/atarivad.h"
+#include "tilemap.h"
class shuuz_state : public atarigen_state
{
diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h
index ed9d18420d4..3e73728ba45 100644
--- a/src/mame/includes/sidearms.h
+++ b/src/mame/includes/sidearms.h
@@ -7,6 +7,7 @@
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class sidearms_state : public driver_device
{
diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h
index 37a9318a810..9106e341866 100644
--- a/src/mame/includes/sidepckt.h
+++ b/src/mame/includes/sidepckt.h
@@ -12,6 +12,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class sidepckt_state : public driver_device
{
diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h
index e6c68f80a96..74b6b47614a 100644
--- a/src/mame/includes/silkroad.h
+++ b/src/mame/includes/silkroad.h
@@ -7,6 +7,7 @@
#include "sound/okim6295.h"
#include "emupal.h"
+#include "tilemap.h"
class silkroad_state : public driver_device
{
diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h
index b3f71e9d440..f0f63570766 100644
--- a/src/mame/includes/skullxbo.h
+++ b/src/mame/includes/skullxbo.h
@@ -14,6 +14,7 @@
#include "machine/timer.h"
#include "audio/atarijsa.h"
#include "video/atarimo.h"
+#include "tilemap.h"
class skullxbo_state : public atarigen_state
{
diff --git a/src/mame/includes/skydiver.h b/src/mame/includes/skydiver.h
index 7c93886212c..61d20dedae1 100644
--- a/src/mame/includes/skydiver.h
+++ b/src/mame/includes/skydiver.h
@@ -14,6 +14,7 @@
#include "machine/watchdog.h"
#include "sound/discrete.h"
#include "emupal.h"
+#include "tilemap.h"
/* Discrete Sound Input Nodes */
#define SKYDIVER_RANGE_DATA NODE_01
diff --git a/src/mame/includes/skykid.h b/src/mame/includes/skykid.h
index 91bbf51f3ad..7b3552c0e38 100644
--- a/src/mame/includes/skykid.h
+++ b/src/mame/includes/skykid.h
@@ -8,6 +8,7 @@
#include "cpu/m6800/m6801.h"
#include "sound/namco.h"
#include "emupal.h"
+#include "tilemap.h"
class skykid_state : public driver_device
{
diff --git a/src/mame/includes/slapfght.h b/src/mame/includes/slapfght.h
index 1e18f8e9729..04eaddc123a 100644
--- a/src/mame/includes/slapfght.h
+++ b/src/mame/includes/slapfght.h
@@ -15,6 +15,7 @@
#include "machine/taito68705interface.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class slapfght_state : public driver_device
{
diff --git a/src/mame/includes/snk.h b/src/mame/includes/snk.h
index 0f5fd5727e3..928f44eda8f 100644
--- a/src/mame/includes/snk.h
+++ b/src/mame/includes/snk.h
@@ -15,6 +15,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class snk_state : public driver_device
{
diff --git a/src/mame/includes/snk6502.h b/src/mame/includes/snk6502.h
index 065ee6169bf..9d57812d7ac 100644
--- a/src/mame/includes/snk6502.h
+++ b/src/mame/includes/snk6502.h
@@ -12,6 +12,7 @@
#include "machine/timer.h"
#include "emupal.h"
+#include "tilemap.h"
class fantasy_sound_device;
diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h
index 15c86a84241..1cddf5b8532 100644
--- a/src/mame/includes/snk68.h
+++ b/src/mame/includes/snk68.h
@@ -5,6 +5,7 @@
#include "sound/upd7759.h"
#include "video/snk68_spr.h"
#include "screen.h"
+#include "tilemap.h"
class snk68_state : public driver_device
{
diff --git a/src/mame/includes/snookr10.h b/src/mame/includes/snookr10.h
index 2958a559c6d..23a5e302a56 100644
--- a/src/mame/includes/snookr10.h
+++ b/src/mame/includes/snookr10.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class snookr10_state : public driver_device
{
diff --git a/src/mame/includes/solomon.h b/src/mame/includes/solomon.h
index 4fb5cf33f90..297316277ff 100644
--- a/src/mame/includes/solomon.h
+++ b/src/mame/includes/solomon.h
@@ -7,6 +7,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class solomon_state : public driver_device
{
diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h
index f152500d746..10842adafef 100644
--- a/src/mame/includes/sonson.h
+++ b/src/mame/includes/sonson.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class sonson_state : public driver_device
{
diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h
index 4b0975858f7..6106095d078 100644
--- a/src/mame/includes/spbactn.h
+++ b/src/mame/includes/spbactn.h
@@ -10,6 +10,7 @@
#include "video/tecmo_mix.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class spbactn_state : public driver_device
{
diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h
index 88c6890744c..9de7b4407bb 100644
--- a/src/mame/includes/spdodgeb.h
+++ b/src/mame/includes/spdodgeb.h
@@ -15,6 +15,7 @@
#include "sound/msm5205.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class spdodgeb_state : public driver_device
{
diff --git a/src/mame/includes/speedbal.h b/src/mame/includes/speedbal.h
index da1d25dbb91..a1e6ff64ce5 100644
--- a/src/mame/includes/speedbal.h
+++ b/src/mame/includes/speedbal.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class speedbal_state : public driver_device
{
diff --git a/src/mame/includes/speedspn.h b/src/mame/includes/speedspn.h
index 9e18f8da368..be752bb5f20 100644
--- a/src/mame/includes/speedspn.h
+++ b/src/mame/includes/speedspn.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "sound/okim6295.h"
#include "emupal.h"
+#include "tilemap.h"
class speedspn_state : public driver_device
{
diff --git a/src/mame/includes/splash.h b/src/mame/includes/splash.h
index 74fcb56a686..a6c24bf86e7 100644
--- a/src/mame/includes/splash.h
+++ b/src/mame/includes/splash.h
@@ -10,6 +10,7 @@
#include "machine/74259.h"
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class splash_state : public driver_device
{
diff --git a/src/mame/includes/sprint2.h b/src/mame/includes/sprint2.h
index 4cb35258f75..845fa4dca70 100644
--- a/src/mame/includes/sprint2.h
+++ b/src/mame/includes/sprint2.h
@@ -15,6 +15,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/* Discrete Sound Input Nodes */
#define SPRINT2_SKIDSND1_EN NODE_01
diff --git a/src/mame/includes/sprint4.h b/src/mame/includes/sprint4.h
index d51a4a5030b..802a0db5d88 100644
--- a/src/mame/includes/sprint4.h
+++ b/src/mame/includes/sprint4.h
@@ -9,6 +9,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class sprint4_state : public driver_device
{
diff --git a/src/mame/includes/sprint8.h b/src/mame/includes/sprint8.h
index 9392b32d06d..9c66c6cae20 100644
--- a/src/mame/includes/sprint8.h
+++ b/src/mame/includes/sprint8.h
@@ -10,6 +10,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class sprint8_state : public driver_device
{
diff --git a/src/mame/includes/srumbler.h b/src/mame/includes/srumbler.h
index e3b5432c514..8a5a45bfdea 100644
--- a/src/mame/includes/srumbler.h
+++ b/src/mame/includes/srumbler.h
@@ -4,6 +4,7 @@
#include "machine/timer.h"
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class srumbler_state : public driver_device
{
diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h
index 52e3cfcd63d..585c4b64db0 100644
--- a/src/mame/includes/sslam.h
+++ b/src/mame/includes/sslam.h
@@ -9,6 +9,7 @@
#include "machine/gen_latch.h"
#include "sound/okim6295.h"
#include "emupal.h"
+#include "tilemap.h"
class sslam_state : public driver_device
{
diff --git a/src/mame/includes/ssozumo.h b/src/mame/includes/ssozumo.h
index 0d0a1d757bb..3ee36a6312c 100644
--- a/src/mame/includes/ssozumo.h
+++ b/src/mame/includes/ssozumo.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class ssozumo_state : public driver_device
{
diff --git a/src/mame/includes/ssrj.h b/src/mame/includes/ssrj.h
index de8ee0af577..ea8d658d8f8 100644
--- a/src/mame/includes/ssrj.h
+++ b/src/mame/includes/ssrj.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class ssrj_state : public driver_device
{
diff --git a/src/mame/includes/ssv.h b/src/mame/includes/ssv.h
index 00b1bd83412..23819cdf9dd 100644
--- a/src/mame/includes/ssv.h
+++ b/src/mame/includes/ssv.h
@@ -14,6 +14,7 @@
#include "sound/es5506.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class ssv_state : public driver_device
{
diff --git a/src/mame/includes/stadhero.h b/src/mame/includes/stadhero.h
index 20d6844771f..e741c6444c9 100644
--- a/src/mame/includes/stadhero.h
+++ b/src/mame/includes/stadhero.h
@@ -4,6 +4,7 @@
#include "machine/gen_latch.h"
#include "video/decbac06.h"
#include "video/decmxc06.h"
+#include "tilemap.h"
class stadhero_state : public driver_device
{
diff --git a/src/mame/includes/starshp1.h b/src/mame/includes/starshp1.h
index 028746b6ec7..324dd17654c 100644
--- a/src/mame/includes/starshp1.h
+++ b/src/mame/includes/starshp1.h
@@ -33,6 +33,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define STARSHP1_MASTER_CLOCK (12096000)
diff --git a/src/mame/includes/sub.h b/src/mame/includes/sub.h
index 7737f8c6d53..c61c3a9b270 100644
--- a/src/mame/includes/sub.h
+++ b/src/mame/includes/sub.h
@@ -18,6 +18,7 @@ Submarine (c) 1985 Sigma
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MASTER_CLOCK XTAL(18'432'000)
diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h
index 9a6f0347dc0..48ca4387928 100644
--- a/src/mame/includes/suna8.h
+++ b/src/mame/includes/suna8.h
@@ -10,6 +10,7 @@
#include "sound/samples.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define TILEMAPS 0
diff --git a/src/mame/includes/superqix.h b/src/mame/includes/superqix.h
index 1fdcc69f995..deea3f3b15b 100644
--- a/src/mame/includes/superqix.h
+++ b/src/mame/includes/superqix.h
@@ -10,6 +10,7 @@
#include "sound/ay8910.h"
#include "sound/samples.h"
#include "emupal.h"
+#include "tilemap.h"
class superqix_state_base : public driver_device
{
diff --git a/src/mame/includes/suprloco.h b/src/mame/includes/suprloco.h
index 5527b1e1611..dbfe7476e46 100644
--- a/src/mame/includes/suprloco.h
+++ b/src/mame/includes/suprloco.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class suprloco_state : public driver_device
{
diff --git a/src/mame/includes/suprnova.h b/src/mame/includes/suprnova.h
index 9519c775319..cd64317a0c1 100644
--- a/src/mame/includes/suprnova.h
+++ b/src/mame/includes/suprnova.h
@@ -7,6 +7,7 @@
#include "cpu/sh/sh2.h"
#include "emupal.h"
+#include "tilemap.h"
struct hit_t
diff --git a/src/mame/includes/suprridr.h b/src/mame/includes/suprridr.h
index cc41d4540aa..215c7a177c6 100644
--- a/src/mame/includes/suprridr.h
+++ b/src/mame/includes/suprridr.h
@@ -12,6 +12,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class suprridr_state : public driver_device
{
diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h
index 6086505018d..28316caff44 100644
--- a/src/mame/includes/suprslam.h
+++ b/src/mame/includes/suprslam.h
@@ -13,6 +13,7 @@
#include "video/vsystem_spr.h"
#include "machine/gen_latch.h"
#include "video/k053936.h"
+#include "tilemap.h"
class suprslam_state : public driver_device
{
diff --git a/src/mame/includes/system1.h b/src/mame/includes/system1.h
index cc57eae6e58..060603b2cc2 100644
--- a/src/mame/includes/system1.h
+++ b/src/mame/includes/system1.h
@@ -14,6 +14,7 @@
#include "machine/timer.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class system1_state : public driver_device
{
diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h
index eece6d88ce8..6d58f568b65 100644
--- a/src/mame/includes/system16.h
+++ b/src/mame/includes/system16.h
@@ -11,6 +11,7 @@
#include "machine/segaic16.h"
#include "sound/msm5205.h"
#include "sound/upd7759.h"
+#include "tilemap.h"
class segas1x_bootleg_state : public sega_16bit_common_base
{
diff --git a/src/mame/includes/tagteam.h b/src/mame/includes/tagteam.h
index 0aa2de1cbdd..dff31f7d55c 100644
--- a/src/mame/includes/tagteam.h
+++ b/src/mame/includes/tagteam.h
@@ -7,6 +7,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class tagteam_state : public driver_device
{
diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h
index 8410d827090..78d013b8838 100644
--- a/src/mame/includes/tail2nos.h
+++ b/src/mame/includes/tail2nos.h
@@ -14,6 +14,7 @@
#include "machine/gen_latch.h"
#include "video/k051316.h"
#include "emupal.h"
+#include "tilemap.h"
class tail2nos_state : public driver_device
{
diff --git a/src/mame/includes/taito_f3.h b/src/mame/includes/taito_f3.h
index 069a216de80..00e0f44cd82 100644
--- a/src/mame/includes/taito_f3.h
+++ b/src/mame/includes/taito_f3.h
@@ -11,6 +11,7 @@
#include "sound/okim6295.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/* This it the best way to allow game specific kludges until the system is fully understood */
enum {
diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h
index 97839725a92..65156356ed4 100644
--- a/src/mame/includes/taito_l.h
+++ b/src/mame/includes/taito_l.h
@@ -12,6 +12,7 @@
#include "sound/msm5205.h"
#include "sound/2203intf.h"
#include "emupal.h"
+#include "tilemap.h"
class taitol_state : public driver_device
diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h
index 735c5ec5c2f..24819e6d47c 100644
--- a/src/mame/includes/taitojc.h
+++ b/src/mame/includes/taitojc.h
@@ -10,6 +10,7 @@
#include "machine/taitoio.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class taitojc_state : public driver_device
{
diff --git a/src/mame/includes/tank8.h b/src/mame/includes/tank8.h
index 833b5bebfb4..952954ae1f0 100644
--- a/src/mame/includes/tank8.h
+++ b/src/mame/includes/tank8.h
@@ -13,6 +13,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/* Discrete Sound Input Nodes */
#define TANK8_CRASH_EN NODE_01
diff --git a/src/mame/includes/tankbatt.h b/src/mame/includes/tankbatt.h
index 3be649e07bc..199c6cff39a 100644
--- a/src/mame/includes/tankbatt.h
+++ b/src/mame/includes/tankbatt.h
@@ -7,6 +7,7 @@
#include "sound/samples.h"
#include "emupal.h"
+#include "tilemap.h"
class tankbatt_state : public driver_device
{
diff --git a/src/mame/includes/tankbust.h b/src/mame/includes/tankbust.h
index 8a525853ca6..c0d02de132d 100644
--- a/src/mame/includes/tankbust.h
+++ b/src/mame/includes/tankbust.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class tankbust_state : public driver_device
{
diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h
index 5a19f50a0e7..c2eeca27260 100644
--- a/src/mame/includes/taotaido.h
+++ b/src/mame/includes/taotaido.h
@@ -8,6 +8,7 @@
#include "video/vsystem_spr.h"
#include "machine/gen_latch.h"
#include "machine/mb3773.h"
+#include "tilemap.h"
class taotaido_state : public driver_device
{
diff --git a/src/mame/includes/targeth.h b/src/mame/includes/targeth.h
index 12108b2b81b..3cc08ead1da 100644
--- a/src/mame/includes/targeth.h
+++ b/src/mame/includes/targeth.h
@@ -8,6 +8,7 @@
#include "machine/74259.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class targeth_state : public driver_device
{
diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h
index faa1e7963c8..e0f0d1dfcea 100644
--- a/src/mame/includes/tatsumi.h
+++ b/src/mame/includes/tatsumi.h
@@ -11,6 +11,7 @@
#include "machine/cxd1095.h"
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class tatsumi_state : public driver_device
{
diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h
index 538e85b5861..8eb7ce5f151 100644
--- a/src/mame/includes/tbowl.h
+++ b/src/mame/includes/tbowl.h
@@ -9,6 +9,7 @@
#include "sound/msm5205.h"
#include "video/tecmo_spr.h"
#include "emupal.h"
+#include "tilemap.h"
class tbowl_state : public driver_device
{
diff --git a/src/mame/includes/tceptor.h b/src/mame/includes/tceptor.h
index 2ce49c8892e..7b56d27d468 100644
--- a/src/mame/includes/tceptor.h
+++ b/src/mame/includes/tceptor.h
@@ -10,6 +10,7 @@
#include "video/c45.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class tceptor_state : public driver_device
{
diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h
index 66579f650e3..f73fa14731b 100644
--- a/src/mame/includes/tecmo.h
+++ b/src/mame/includes/tecmo.h
@@ -9,6 +9,7 @@
#include "video/tecmo_spr.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class tecmo_state : public driver_device
{
diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h
index b1e30d2af77..9115ebc007c 100644
--- a/src/mame/includes/tecmo16.h
+++ b/src/mame/includes/tecmo16.h
@@ -10,6 +10,7 @@
#include "video/tecmo_mix.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class tecmo16_state : public driver_device
{
diff --git a/src/mame/includes/tecmosys.h b/src/mame/includes/tecmosys.h
index d04175c69e4..3d0ab29231c 100644
--- a/src/mame/includes/tecmosys.h
+++ b/src/mame/includes/tecmosys.h
@@ -16,6 +16,7 @@
#include "machine/watchdog.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class tecmosys_state : public driver_device
{
diff --git a/src/mame/includes/tehkanwc.h b/src/mame/includes/tehkanwc.h
index 7f8dfb7aad4..0dad35b272d 100644
--- a/src/mame/includes/tehkanwc.h
+++ b/src/mame/includes/tehkanwc.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class tehkanwc_state : public driver_device
{
diff --git a/src/mame/includes/terracre.h b/src/mame/includes/terracre.h
index 9eedc5773f6..04634a678a2 100644
--- a/src/mame/includes/terracre.h
+++ b/src/mame/includes/terracre.h
@@ -9,6 +9,7 @@
#include "machine/gen_latch.h"
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class terracre_state : public driver_device
{
diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h
index 03ee0bf053a..93bf1af326a 100644
--- a/src/mame/includes/tetrisp2.h
+++ b/src/mame/includes/tetrisp2.h
@@ -3,6 +3,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class tetrisp2_state : public driver_device
{
diff --git a/src/mame/includes/thedeep.h b/src/mame/includes/thedeep.h
index 992a2fc9182..787f1980e74 100644
--- a/src/mame/includes/thedeep.h
+++ b/src/mame/includes/thedeep.h
@@ -11,6 +11,7 @@
#include "video/decbac06.h"
#include "video/decmxc06.h"
#include "emupal.h"
+#include "tilemap.h"
class thedeep_state : public driver_device
diff --git a/src/mame/includes/thepit.h b/src/mame/includes/thepit.h
index b3220c936c1..08a41e664f3 100644
--- a/src/mame/includes/thepit.h
+++ b/src/mame/includes/thepit.h
@@ -7,6 +7,7 @@
#include "machine/74259.h"
#include "emupal.h"
+#include "tilemap.h"
class thepit_state : public driver_device
{
diff --git a/src/mame/includes/thoop2.h b/src/mame/includes/thoop2.h
index c311ba62982..e3e98bdc7d8 100644
--- a/src/mame/includes/thoop2.h
+++ b/src/mame/includes/thoop2.h
@@ -7,6 +7,7 @@
#include "machine/74259.h"
#include "emupal.h"
+#include "tilemap.h"
class thoop2_state : public driver_device
{
diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h
index 4825b4dfaa0..dea00caf7b6 100644
--- a/src/mame/includes/thunderj.h
+++ b/src/mame/includes/thunderj.h
@@ -14,6 +14,7 @@
#include "video/atarimo.h"
#include "video/atarivad.h"
#include "screen.h"
+#include "tilemap.h"
class thunderj_state : public driver_device
{
diff --git a/src/mame/includes/tiamc1.h b/src/mame/includes/tiamc1.h
index 8c7c09c3358..d0e7fa9a006 100644
--- a/src/mame/includes/tiamc1.h
+++ b/src/mame/includes/tiamc1.h
@@ -8,6 +8,7 @@
#include "machine/pit8253.h"
#include "sound/spkrdev.h"
#include "emupal.h"
+#include "tilemap.h"
class tiamc1_state : public driver_device
{
diff --git a/src/mame/includes/tigeroad.h b/src/mame/includes/tigeroad.h
index cec75405f12..26fd3646a43 100644
--- a/src/mame/includes/tigeroad.h
+++ b/src/mame/includes/tigeroad.h
@@ -16,6 +16,7 @@
#include "video/bufsprite.h"
#include "emupal.h"
+#include "tilemap.h"
class tigeroad_state : public driver_device
diff --git a/src/mame/includes/timelimt.h b/src/mame/includes/timelimt.h
index 175d6e3ea22..b7b4f6552eb 100644
--- a/src/mame/includes/timelimt.h
+++ b/src/mame/includes/timelimt.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class timelimt_state : public driver_device
{
diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h
index 628e6097176..97e64a6a347 100644
--- a/src/mame/includes/timeplt.h
+++ b/src/mame/includes/timeplt.h
@@ -14,6 +14,7 @@
#include "sound/tc8830f.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class timeplt_state : public driver_device
{
diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h
index 4714b66055e..cf532358d85 100644
--- a/src/mame/includes/tmnt.h
+++ b/src/mame/includes/tmnt.h
@@ -18,6 +18,7 @@
#include "video/k054000.h"
#include "video/konami_helper.h"
#include "emupal.h"
+#include "tilemap.h"
class tmnt_state : public driver_device
{
diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h
index 83d8d7f666e..497c115e384 100644
--- a/src/mame/includes/toaplan1.h
+++ b/src/mame/includes/toaplan1.h
@@ -15,6 +15,7 @@
#include "video/toaplan_scu.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class toaplan1_state : public driver_device
{
diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h
index 4722e840e37..604b759c489 100644
--- a/src/mame/includes/toaplan2.h
+++ b/src/mame/includes/toaplan2.h
@@ -15,6 +15,7 @@
#include "sound/okim6295.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/**************** Machine stuff ******************/
diff --git a/src/mame/includes/toki.h b/src/mame/includes/toki.h
index 70d31eca3a0..db207df1546 100644
--- a/src/mame/includes/toki.h
+++ b/src/mame/includes/toki.h
@@ -11,6 +11,7 @@
#include "video/bufsprite.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class toki_state : public driver_device
{
diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h
index c461c6f4c7f..8422a2f15dc 100644
--- a/src/mame/includes/toobin.h
+++ b/src/mame/includes/toobin.h
@@ -14,6 +14,7 @@
#include "audio/atarijsa.h"
#include "video/atarimo.h"
#include "emupal.h"
+#include "tilemap.h"
class toobin_state : public atarigen_state
{
diff --git a/src/mame/includes/tp84.h b/src/mame/includes/tp84.h
index 71b0f0239b7..8fc1bdfa6e8 100644
--- a/src/mame/includes/tp84.h
+++ b/src/mame/includes/tp84.h
@@ -8,6 +8,7 @@
#include "sound/flt_rc.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class tp84_state : public driver_device
{
diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h
index af09148d340..00a9396ffc2 100644
--- a/src/mame/includes/trackfld.h
+++ b/src/mame/includes/trackfld.h
@@ -18,6 +18,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class trackfld_state : public driver_device
{
diff --git a/src/mame/includes/travrusa.h b/src/mame/includes/travrusa.h
index da97b371b90..a4016f324f4 100644
--- a/src/mame/includes/travrusa.h
+++ b/src/mame/includes/travrusa.h
@@ -7,6 +7,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class travrusa_state : public driver_device
{
diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h
index 7e2674c1fda..d0d6011e20a 100644
--- a/src/mame/includes/triplhnt.h
+++ b/src/mame/includes/triplhnt.h
@@ -16,6 +16,7 @@
#include "sound/samples.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/* Discrete Sound Input Nodes */
diff --git a/src/mame/includes/trucocl.h b/src/mame/includes/trucocl.h
index 16492a9b8e5..e59c14931a6 100644
--- a/src/mame/includes/trucocl.h
+++ b/src/mame/includes/trucocl.h
@@ -7,6 +7,7 @@
#include "sound/dac.h"
#include "emupal.h"
+#include "tilemap.h"
class trucocl_state : public driver_device
{
diff --git a/src/mame/includes/tryout.h b/src/mame/includes/tryout.h
index 1d88c06a29d..fa1d39b39f4 100644
--- a/src/mame/includes/tryout.h
+++ b/src/mame/includes/tryout.h
@@ -7,6 +7,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class tryout_state : public driver_device
{
diff --git a/src/mame/includes/tsamurai.h b/src/mame/includes/tsamurai.h
index fc7a10dcae9..6dee7b81c5c 100644
--- a/src/mame/includes/tsamurai.h
+++ b/src/mame/includes/tsamurai.h
@@ -7,6 +7,7 @@
#include "machine/gen_latch.h"
#include "emupal.h"
+#include "tilemap.h"
class tsamurai_state : public driver_device
{
diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h
index cc4f15aee52..f01bdd54471 100644
--- a/src/mame/includes/tumbleb.h
+++ b/src/mame/includes/tumbleb.h
@@ -10,6 +10,7 @@
#include "video/decospr.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class tumbleb_state : public driver_device
{
diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h
index 078534d2d28..1b6c948028c 100644
--- a/src/mame/includes/tunhunt.h
+++ b/src/mame/includes/tunhunt.h
@@ -7,6 +7,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class tunhunt_state : public driver_device
{
diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h
index 077e1ec3e62..49c8714db09 100644
--- a/src/mame/includes/turbo.h
+++ b/src/mame/includes/turbo.h
@@ -16,6 +16,7 @@
#include "sound/samples.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/* sprites are scaled in the analog domain; to give a better */
/* rendition of this, we scale in the X direction by this factor */
diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h
index 0d85b6d89ba..2ebc77ae155 100644
--- a/src/mame/includes/twin16.h
+++ b/src/mame/includes/twin16.h
@@ -10,6 +10,7 @@
#include "sound/k007232.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class twin16_state : public driver_device
{
diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h
index 8d2354db661..63a4ee7d6c5 100644
--- a/src/mame/includes/twincobr.h
+++ b/src/mame/includes/twincobr.h
@@ -16,6 +16,7 @@
#include "video/toaplan_scu.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class twincobr_state : public driver_device
{
diff --git a/src/mame/includes/ultratnk.h b/src/mame/includes/ultratnk.h
index e1464eff0e8..8c2943e1f58 100644
--- a/src/mame/includes/ultratnk.h
+++ b/src/mame/includes/ultratnk.h
@@ -14,6 +14,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class ultratnk_state : public driver_device
{
diff --git a/src/mame/includes/unico.h b/src/mame/includes/unico.h
index 8cf16f5bccd..d81341eae1e 100644
--- a/src/mame/includes/unico.h
+++ b/src/mame/includes/unico.h
@@ -9,6 +9,7 @@
#include "machine/eepromser.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class unico_state : public driver_device
{
diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h
index 05a0eeaf24d..c02a3941b0d 100644
--- a/src/mame/includes/vastar.h
+++ b/src/mame/includes/vastar.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class vastar_common_state : public driver_device
{
diff --git a/src/mame/includes/vball.h b/src/mame/includes/vball.h
index 4d576b8670d..3bc2a5a62ca 100644
--- a/src/mame/includes/vball.h
+++ b/src/mame/includes/vball.h
@@ -5,6 +5,7 @@
#include "machine/timer.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class vball_state : public driver_device
{
diff --git a/src/mame/includes/videopin.h b/src/mame/includes/videopin.h
index 17002b6f535..151badea154 100644
--- a/src/mame/includes/videopin.h
+++ b/src/mame/includes/videopin.h
@@ -13,6 +13,7 @@
#include "sound/discrete.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
/* Discrete Sound Input Nodes */
#define VIDEOPIN_OCTAVE_DATA NODE_01
diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h
index 1e18879ed2a..a92a6a6b632 100644
--- a/src/mame/includes/vindictr.h
+++ b/src/mame/includes/vindictr.h
@@ -14,6 +14,7 @@
#include "audio/atarijsa.h"
#include "video/atarimo.h"
#include "emupal.h"
+#include "tilemap.h"
class vindictr_state : public atarigen_state
{
diff --git a/src/mame/includes/vulgus.h b/src/mame/includes/vulgus.h
index 6b15716b687..f12d0b09c38 100644
--- a/src/mame/includes/vulgus.h
+++ b/src/mame/includes/vulgus.h
@@ -11,6 +11,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class vulgus_state : public driver_device
{
diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h
index 371712b84e6..523a0797cc8 100644
--- a/src/mame/includes/warpwarp.h
+++ b/src/mame/includes/warpwarp.h
@@ -10,6 +10,7 @@
#include "audio/geebee.h"
#include "audio/warpwarp.h"
#include "emupal.h"
+#include "tilemap.h"
class warpwarp_state : public driver_device
{
diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h
index 854d877977e..7417271b442 100644
--- a/src/mame/includes/wc90.h
+++ b/src/mame/includes/wc90.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "video/tecmo_spr.h"
#include "emupal.h"
+#include "tilemap.h"
class wc90_state : public driver_device
{
diff --git a/src/mame/includes/wc90b.h b/src/mame/includes/wc90b.h
index 12a4c0505a8..3466f647871 100644
--- a/src/mame/includes/wc90b.h
+++ b/src/mame/includes/wc90b.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class wc90b_state : public driver_device
{
diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h
index b2f07de2a10..a6625413b96 100644
--- a/src/mame/includes/wecleman.h
+++ b/src/mame/includes/wecleman.h
@@ -10,6 +10,7 @@
#include "video/k051316.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class wecleman_state : public driver_device
{
diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h
index 21951770449..1d6ea72da81 100644
--- a/src/mame/includes/welltris.h
+++ b/src/mame/includes/welltris.h
@@ -8,6 +8,7 @@
#include "machine/gen_latch.h"
#include "video/vsystem_spr2.h"
#include "screen.h"
+#include "tilemap.h"
class welltris_state : public driver_device
{
diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h
index f7872c96077..a6b16d9ec51 100644
--- a/src/mame/includes/wgp.h
+++ b/src/mame/includes/wgp.h
@@ -14,6 +14,7 @@
#include "machine/taitoio.h"
#include "video/tc0100scn.h"
#include "emupal.h"
+#include "tilemap.h"
class wgp_state : public driver_device
diff --git a/src/mame/includes/williams.h b/src/mame/includes/williams.h
index 9ddc4f82823..f574732ea73 100644
--- a/src/mame/includes/williams.h
+++ b/src/mame/includes/williams.h
@@ -22,6 +22,7 @@
#include "sound/hc55516.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class williams_state : public driver_device
{
diff --git a/src/mame/includes/witch.h b/src/mame/includes/witch.h
index f63f953b063..6167c05f594 100644
--- a/src/mame/includes/witch.h
+++ b/src/mame/includes/witch.h
@@ -21,6 +21,7 @@ Witch / Pinball Champ '95 / Keirin Ou
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+#include "tilemap.h"
#define MAIN_CLOCK XTAL(12'000'000)
#define CPU_CLOCK MAIN_CLOCK / 4
diff --git a/src/mame/includes/wrally.h b/src/mame/includes/wrally.h
index d9e04714e8c..7449bcc51d4 100644
--- a/src/mame/includes/wrally.h
+++ b/src/mame/includes/wrally.h
@@ -6,8 +6,9 @@
#pragma once
#include "machine/74259.h"
-#include "emupal.h"
#include "video/gaelco_wrally_sprites.h"
+#include "emupal.h"
+#include "tilemap.h"
class wrally_state : public driver_device
{
diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h
index 8fef284f708..7372e9385af 100644
--- a/src/mame/includes/wwfsstar.h
+++ b/src/mame/includes/wwfsstar.h
@@ -9,6 +9,7 @@
#include "machine/timer.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class wwfsstar_state : public driver_device
{
diff --git a/src/mame/includes/x68k.h b/src/mame/includes/x68k.h
index 357b606f840..6e5f38e31ce 100644
--- a/src/mame/includes/x68k.h
+++ b/src/mame/includes/x68k.h
@@ -31,6 +31,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
#define GFX16 0
#define GFX256 1
diff --git a/src/mame/includes/xain.h b/src/mame/includes/xain.h
index 60837bd9752..55b91e03d9c 100644
--- a/src/mame/includes/xain.h
+++ b/src/mame/includes/xain.h
@@ -11,6 +11,7 @@
#include "machine/timer.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class xain_state : public driver_device
{
diff --git a/src/mame/includes/xevious.h b/src/mame/includes/xevious.h
index 94bd28dd61e..34d8e820fa5 100644
--- a/src/mame/includes/xevious.h
+++ b/src/mame/includes/xevious.h
@@ -7,6 +7,7 @@
#pragma once
#include "machine/timer.h"
+#include "tilemap.h"
class xevious_state : public galaga_state
{
diff --git a/src/mame/includes/xorworld.h b/src/mame/includes/xorworld.h
index cce8e69d69d..1a041515346 100644
--- a/src/mame/includes/xorworld.h
+++ b/src/mame/includes/xorworld.h
@@ -7,6 +7,7 @@
#include "machine/eepromser.h"
#include "emupal.h"
+#include "tilemap.h"
class xorworld_state : public driver_device
{
diff --git a/src/mame/includes/xxmissio.h b/src/mame/includes/xxmissio.h
index 9a027094fa3..5dcbbc64c65 100644
--- a/src/mame/includes/xxmissio.h
+++ b/src/mame/includes/xxmissio.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class xxmissio_state : public driver_device
{
diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h
index 90d7c6477e4..0153b3c62b1 100644
--- a/src/mame/includes/xybots.h
+++ b/src/mame/includes/xybots.h
@@ -13,6 +13,7 @@
#include "machine/atarigen.h"
#include "audio/atarijsa.h"
#include "video/atarimo.h"
+#include "tilemap.h"
class xybots_state : public atarigen_state
{
diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h
index 85d3a9362e7..c2b8d8f241a 100644
--- a/src/mame/includes/xyonix.h
+++ b/src/mame/includes/xyonix.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
class xyonix_state : public driver_device
{
diff --git a/src/mame/includes/yiear.h b/src/mame/includes/yiear.h
index 7b1c7ea08b5..7ebda885169 100644
--- a/src/mame/includes/yiear.h
+++ b/src/mame/includes/yiear.h
@@ -12,6 +12,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class yiear_state : public driver_device
{
diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h
index 6da9e985cd6..06269a05e4d 100644
--- a/src/mame/includes/yunsun16.h
+++ b/src/mame/includes/yunsun16.h
@@ -14,6 +14,7 @@
#include "machine/gen_latch.h"
#include "screen.h"
#include "emupal.h"
+#include "tilemap.h"
class yunsun16_state : public driver_device
{
diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h
index 836b64d2683..4d435e3d1cb 100644
--- a/src/mame/includes/yunsung8.h
+++ b/src/mame/includes/yunsung8.h
@@ -9,6 +9,7 @@
#include "machine/74157.h"
#include "sound/msm5205.h"
#include "emupal.h"
+#include "tilemap.h"
class yunsung8_state : public driver_device
{
diff --git a/src/mame/includes/zac2650.h b/src/mame/includes/zac2650.h
index 4e8a3c2ba23..798192778d8 100644
--- a/src/mame/includes/zac2650.h
+++ b/src/mame/includes/zac2650.h
@@ -8,6 +8,7 @@
#include "machine/s2636.h"
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
class zac2650_state : public driver_device
{
diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h
index 52b6e25a529..1ebbc50452a 100644
--- a/src/mame/includes/zaccaria.h
+++ b/src/mame/includes/zaccaria.h
@@ -7,6 +7,7 @@
#include "audio/zaccaria.h"
#include "emupal.h"
+#include "tilemap.h"
class zaccaria_state : public driver_device
{
diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h
index 3c2cd1f5d98..5a0e113ff8d 100644
--- a/src/mame/includes/zaxxon.h
+++ b/src/mame/includes/zaxxon.h
@@ -14,6 +14,7 @@
#include "machine/i8255.h"
#include "sound/samples.h"
#include "emupal.h"
+#include "tilemap.h"
class zaxxon_state : public driver_device
{
diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h
index 48c864fff85..5fec4635730 100644
--- a/src/mame/includes/zerozone.h
+++ b/src/mame/includes/zerozone.h
@@ -12,6 +12,7 @@
#include "machine/gen_latch.h"
#include "cpu/z80/z80.h"
+#include "tilemap.h"
class zerozone_state : public driver_device
{
diff --git a/src/mame/machine/megacd.h b/src/mame/machine/megacd.h
index 1a063ede233..e50287a83df 100644
--- a/src/mame/machine/megacd.h
+++ b/src/mame/machine/megacd.h
@@ -11,6 +11,7 @@
#include "machine/megacdcd.h"
#include "sound/rf5c68.h"
#include "screen.h"
+#include "tilemap.h"
class sega_segacd_device : public device_t, public device_gfx_interface, public device_video_interface
{
diff --git a/src/mame/machine/nb1414m4.h b/src/mame/machine/nb1414m4.h
index 8989e421417..7d6b844114e 100644
--- a/src/mame/machine/nb1414m4.h
+++ b/src/mame/machine/nb1414m4.h
@@ -5,6 +5,8 @@
#pragma once
+#include "tilemap.h"
+
class nb1414m4_device : public device_t, public device_video_interface
{
public:
diff --git a/src/mame/video/airraid_dev.h b/src/mame/video/airraid_dev.h
index d95971d412e..2322379510c 100644
--- a/src/mame/video/airraid_dev.h
+++ b/src/mame/video/airraid_dev.h
@@ -8,6 +8,7 @@
#include "emupal.h"
#include "screen.h"
+#include "tilemap.h"
DECLARE_DEVICE_TYPE(AIRRAID_VIDEO, airraid_video_device)
diff --git a/src/mame/video/atarivad.h b/src/mame/video/atarivad.h
index 01230e5062e..32f24b5044a 100644
--- a/src/mame/video/atarivad.h
+++ b/src/mame/video/atarivad.h
@@ -12,6 +12,7 @@
#define MAME_VIDEO_ATARIVAD_H
#include "video/atarimo.h"
+#include "tilemap.h"
//**************************************************************************
diff --git a/src/mame/video/bfm_adr2.h b/src/mame/video/bfm_adr2.h
index 71f878981f8..ee5e9b61a10 100644
--- a/src/mame/video/bfm_adr2.h
+++ b/src/mame/video/bfm_adr2.h
@@ -5,6 +5,8 @@
#pragma once
+#include "tilemap.h"
+
class bfm_adder2_device : public device_t, public device_gfx_interface
{
diff --git a/src/mame/video/c45.h b/src/mame/video/c45.h
index 7508c538a12..4dd82227c5a 100644
--- a/src/mame/video/c45.h
+++ b/src/mame/video/c45.h
@@ -5,6 +5,8 @@
#pragma once
+#include "tilemap.h"
+
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/video/decbac06.h b/src/mame/video/decbac06.h
index 35b8a105098..9607daea8bb 100644
--- a/src/mame/video/decbac06.h
+++ b/src/mame/video/decbac06.h
@@ -6,6 +6,7 @@
#pragma once
#include "screen.h"
+#include "tilemap.h"
#include <memory>
class deco_bac06_device : public device_t
diff --git a/src/mame/video/deco16ic.h b/src/mame/video/deco16ic.h
index cc7fc38bf5d..34956db7391 100644
--- a/src/mame/video/deco16ic.h
+++ b/src/mame/video/deco16ic.h
@@ -13,6 +13,8 @@
#pragma once
+#include "tilemap.h"
+
#define DECO_32x32 0
#define DECO_64x32 1
diff --git a/src/mame/video/dooyong.h b/src/mame/video/dooyong.h
index 8c1c76012ee..58ce4ecf5c0 100644
--- a/src/mame/video/dooyong.h
+++ b/src/mame/video/dooyong.h
@@ -6,6 +6,7 @@
#pragma once
#include "video/bufsprite.h"
+#include "tilemap.h"
DECLARE_DEVICE_TYPE(DOOYONG_ROM_TILEMAP, dooyong_rom_tilemap_device)
DECLARE_DEVICE_TYPE(RSHARK_ROM_TILEMAP, rshark_rom_tilemap_device)
diff --git a/src/mame/video/edevices.h b/src/mame/video/edevices.h
index dcb91a67b45..0147c742e63 100644
--- a/src/mame/video/edevices.h
+++ b/src/mame/video/edevices.h
@@ -7,6 +7,7 @@
#include "screen.h"
#include "emupal.h"
+#include "tilemap.h"
class edevices_device : public device_t
{
diff --git a/src/mame/video/gp9001.h b/src/mame/video/gp9001.h
index 13704fd8e07..d022f0ac5d4 100644
--- a/src/mame/video/gp9001.h
+++ b/src/mame/video/gp9001.h
@@ -7,6 +7,7 @@
#pragma once
#include "video/bufsprite.h"
+#include "tilemap.h"
class gp9001vdp_device : public device_t,
public device_gfx_interface,
diff --git a/src/mame/video/igs017_igs031.h b/src/mame/video/igs017_igs031.h
index 06f1432e385..11b7407ece1 100644
--- a/src/mame/video/igs017_igs031.h
+++ b/src/mame/video/igs017_igs031.h
@@ -7,6 +7,7 @@
#include "machine/i8255.h"
#include "emupal.h"
+#include "tilemap.h"
typedef device_delegate<u16 (u16)> igs017_igs031_palette_scramble_delegate;
diff --git a/src/mame/video/k001604.h b/src/mame/video/k001604.h
index c0e39ceb266..34a05006527 100644
--- a/src/mame/video/k001604.h
+++ b/src/mame/video/k001604.h
@@ -5,6 +5,8 @@
#pragma once
+#include "tilemap.h"
+
class k001604_device : public device_t, public device_gfx_interface
{
diff --git a/src/mame/video/k007121.cpp b/src/mame/video/k007121.cpp
index d8519e4a3fc..8fc9c30d0c3 100644
--- a/src/mame/video/k007121.cpp
+++ b/src/mame/video/k007121.cpp
@@ -115,6 +115,7 @@ control registers
#include "emu.h"
#include "k007121.h"
#include "konami_helper.h"
+#include "tilemap.h"
#define VERBOSE 0
#define LOG(x) do { if (VERBOSE) logerror x; } while (0)
diff --git a/src/mame/video/k007342.h b/src/mame/video/k007342.h
index 6012e6fab51..807e93db1ff 100644
--- a/src/mame/video/k007342.h
+++ b/src/mame/video/k007342.h
@@ -5,6 +5,8 @@
#pragma once
+#include "tilemap.h"
+
typedef device_delegate<void (int layer, int bank, int *code, int *color, int *flags)> k007342_delegate;
diff --git a/src/mame/video/k037122.h b/src/mame/video/k037122.h
index baea2034cd0..12535127d28 100644
--- a/src/mame/video/k037122.h
+++ b/src/mame/video/k037122.h
@@ -4,6 +4,8 @@
#define MAME_VIDEO_K037122_H
#pragma once
+#include "tilemap.h"
+
class k037122_device : public device_t,
public device_video_interface,
public device_gfx_interface
diff --git a/src/mame/video/k051316.h b/src/mame/video/k051316.h
index d6ebe726a81..8d655fc6877 100644
--- a/src/mame/video/k051316.h
+++ b/src/mame/video/k051316.h
@@ -5,6 +5,8 @@
#pragma once
+#include "tilemap.h"
+
typedef device_delegate<void (int *code, int *color, int *flags)> k051316_cb_delegate;
#define K051316_CB_MEMBER(_name) void _name(int *code, int *color, int *flags)
diff --git a/src/mame/video/k052109.h b/src/mame/video/k052109.h
index cbb325e16c8..1cb9aa5c358 100644
--- a/src/mame/video/k052109.h
+++ b/src/mame/video/k052109.h
@@ -6,6 +6,7 @@
#pragma once
#include "screen.h"
+#include "tilemap.h"
typedef device_delegate<void (int layer, int bank, int *code, int *color, int *flags, int *priority)> k052109_cb_delegate;
#define K052109_CB_MEMBER(_name) void _name(int layer, int bank, int *code, int *color, int *flags, int *priority)
diff --git a/src/mame/video/k053251.cpp b/src/mame/video/k053251.cpp
index 5822683ea3d..c162e35f06b 100644
--- a/src/mame/video/k053251.cpp
+++ b/src/mame/video/k053251.cpp
@@ -120,6 +120,7 @@ actually used, since the priority is taken from the external ports.
#include "emu.h"
#include "k053251.h"
#include "konami_helper.h"
+#include "tilemap.h"
#define VERBOSE 0
#include "logmacro.h"
diff --git a/src/mame/video/k053936.h b/src/mame/video/k053936.h
index 8d30ace34af..8f9b85077ba 100644
--- a/src/mame/video/k053936.h
+++ b/src/mame/video/k053936.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
void K053936_0_zoom_draw(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect,tilemap_t *tmap,int flags,uint32_t priority, int glfgreat_hack);
diff --git a/src/mame/video/k054156_k054157_k056832.h b/src/mame/video/k054156_k054157_k056832.h
index 846b09093ec..4be43e75517 100644
--- a/src/mame/video/k054156_k054157_k056832.h
+++ b/src/mame/video/k054156_k054157_k056832.h
@@ -6,6 +6,7 @@
#pragma once
#include "video/k055555.h" // still needs k055555_get_palette_index
+#include "tilemap.h"
typedef device_delegate<void (int layer, int *code, int *color, int *flags)> k056832_cb_delegate;
#define K056832_CB_MEMBER(_name) void _name(int layer, int *code, int *color, int *flags)
diff --git a/src/mame/video/kaneko_tmap.h b/src/mame/video/kaneko_tmap.h
index a57d5fd0ee2..5984fb0fc54 100644
--- a/src/mame/video/kaneko_tmap.h
+++ b/src/mame/video/kaneko_tmap.h
@@ -5,6 +5,8 @@
#pragma once
+#include "tilemap.h"
+
class kaneko_view2_tilemap_device : public device_t, public device_gfx_interface
{
public:
diff --git a/src/mame/video/ladybug.h b/src/mame/video/ladybug.h
index a747e490434..d408bd223bd 100644
--- a/src/mame/video/ladybug.h
+++ b/src/mame/video/ladybug.h
@@ -6,6 +6,7 @@
#pragma once
#include "screen.h"
+#include "tilemap.h"
// used by ladybug and sraider
diff --git a/src/mame/video/mb60553.h b/src/mame/video/mb60553.h
index 4b8d37a2742..5783b9b4729 100644
--- a/src/mame/video/mb60553.h
+++ b/src/mame/video/mb60553.h
@@ -7,6 +7,8 @@
#pragma once
+#include "tilemap.h"
+
class mb60553_zooming_tilemap_device : public device_t
{
diff --git a/src/mame/video/ms1_tmap.h b/src/mame/video/ms1_tmap.h
index 99e24bc30f0..aaf722b62ca 100644
--- a/src/mame/video/ms1_tmap.h
+++ b/src/mame/video/ms1_tmap.h
@@ -13,6 +13,8 @@
#pragma once
+#include "tilemap.h"
+
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/video/namco_c123tmap.h b/src/mame/video/namco_c123tmap.h
index ce1d8e5a613..1fae2b006b6 100644
--- a/src/mame/video/namco_c123tmap.h
+++ b/src/mame/video/namco_c123tmap.h
@@ -7,6 +7,7 @@
#pragma once
#include "screen.h"
+#include "tilemap.h"
class namco_c123tmap_device : public device_t, public device_gfx_interface
{
diff --git a/src/mame/video/namco_c169roz.h b/src/mame/video/namco_c169roz.h
index 90507f9e1b1..901a659c2b6 100644
--- a/src/mame/video/namco_c169roz.h
+++ b/src/mame/video/namco_c169roz.h
@@ -7,6 +7,8 @@
#pragma once
+#include "tilemap.h"
+
class namco_c169roz_device : public device_t, public device_gfx_interface
{
public:
diff --git a/src/mame/video/namcos2_roz.h b/src/mame/video/namcos2_roz.h
index e513251fa5a..6c5327fdec9 100644
--- a/src/mame/video/namcos2_roz.h
+++ b/src/mame/video/namcos2_roz.h
@@ -7,6 +7,7 @@
#pragma once
#include "screen.h"
+#include "tilemap.h"
class namcos2_roz_device : public device_t, public device_gfx_interface
diff --git a/src/mame/video/orca40c.h b/src/mame/video/orca40c.h
index a493edf8e15..4bef1695096 100644
--- a/src/mame/video/orca40c.h
+++ b/src/mame/video/orca40c.h
@@ -13,6 +13,8 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
+
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/video/pc080sn.h b/src/mame/video/pc080sn.h
index 76232b54ab1..1c607573196 100644
--- a/src/mame/video/pc080sn.h
+++ b/src/mame/video/pc080sn.h
@@ -5,6 +5,9 @@
#pragma once
+#include "tilemap.h"
+
+
class pc080sn_device : public device_t
{
public:
diff --git a/src/mame/video/segaic16.h b/src/mame/video/segaic16.h
index 76fb4fb280d..13fe52179c6 100644
--- a/src/mame/video/segaic16.h
+++ b/src/mame/video/segaic16.h
@@ -10,6 +10,8 @@
#pragma once
+#include "tilemap.h"
+
typedef device_delegate<void (int, uint16_t*, uint16_t*, uint16_t*, uint16_t*)> segaic16_video_pagelatch_delegate;
diff --git a/src/mame/video/segaic24.h b/src/mame/video/segaic24.h
index 0691d59499a..096b5572740 100644
--- a/src/mame/video/segaic24.h
+++ b/src/mame/video/segaic24.h
@@ -10,6 +10,8 @@
#pragma once
+#include "tilemap.h"
+
class segas24_tile_device : public device_t, public device_gfx_interface
{
diff --git a/src/mame/video/st0020.h b/src/mame/video/st0020.h
index d7409365ca3..851c8d79a91 100644
--- a/src/mame/video/st0020.h
+++ b/src/mame/video/st0020.h
@@ -5,6 +5,8 @@
#pragma once
+#include "tilemap.h"
+
class st0020_device : public device_t, public device_gfx_interface
{
diff --git a/src/mame/video/stfight_dev.h b/src/mame/video/stfight_dev.h
index b5559e3f82d..ac43c146e88 100644
--- a/src/mame/video/stfight_dev.h
+++ b/src/mame/video/stfight_dev.h
@@ -7,6 +7,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
diff --git a/src/mame/video/tc0080vco.h b/src/mame/video/tc0080vco.h
index f68d156e4b8..34f804bda6b 100644
--- a/src/mame/video/tc0080vco.h
+++ b/src/mame/video/tc0080vco.h
@@ -5,6 +5,9 @@
#pragma once
+#include "tilemap.h"
+
+
class tc0080vco_device : public device_t, public device_gfx_interface
{
public:
diff --git a/src/mame/video/tc0100scn.h b/src/mame/video/tc0100scn.h
index 3e68339a606..ad2ba68644a 100644
--- a/src/mame/video/tc0100scn.h
+++ b/src/mame/video/tc0100scn.h
@@ -6,6 +6,7 @@
#pragma once
#include "emupal.h"
+#include "tilemap.h"
enum {
TC0100SCN_LAYOUT_DEFAULT = 0,
diff --git a/src/mame/video/tc0180vcu.h b/src/mame/video/tc0180vcu.h
index 0692158d5e2..857575a24e4 100644
--- a/src/mame/video/tc0180vcu.h
+++ b/src/mame/video/tc0180vcu.h
@@ -5,6 +5,9 @@
#pragma once
+#include "tilemap.h"
+
+
class tc0180vcu_device : public device_t, public device_gfx_interface, public device_video_interface
{
public:
diff --git a/src/mame/video/tc0280grd.h b/src/mame/video/tc0280grd.h
index 62be80e1ff2..bb4da5ad670 100644
--- a/src/mame/video/tc0280grd.h
+++ b/src/mame/video/tc0280grd.h
@@ -5,6 +5,9 @@
#pragma once
+#include "tilemap.h"
+
+
class tc0280grd_device : public device_t, public device_gfx_interface
{
public:
diff --git a/src/mame/video/tc0480scp.h b/src/mame/video/tc0480scp.h
index 5cc5bb9c1eb..14a307e38cd 100644
--- a/src/mame/video/tc0480scp.h
+++ b/src/mame/video/tc0480scp.h
@@ -5,6 +5,8 @@
#pragma once
+#include "tilemap.h"
+
enum
{
TC0480SCP_LAYOUT_COMMON = 0, // default layout
diff --git a/src/mame/video/vs920a.h b/src/mame/video/vs920a.h
index 8607329d5a0..2d1241040fe 100644
--- a/src/mame/video/vs920a.h
+++ b/src/mame/video/vs920a.h
@@ -5,6 +5,8 @@
#pragma once
+#include "tilemap.h"
+
class vs920a_text_tilemap_device : public device_t
{