summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/audio/arcadia.cpp1
-rw-r--r--src/mame/audio/cclimber.h1
-rw-r--r--src/mame/audio/csd.cpp1
-rw-r--r--src/mame/audio/csd.h1
-rw-r--r--src/mame/audio/dai_snd.h1
-rw-r--r--src/mame/audio/decobsmt.h1
-rw-r--r--src/mame/audio/dsbz80.h1
-rw-r--r--src/mame/audio/gottlieb.cpp1
-rw-r--r--src/mame/audio/gottlieb.h1
-rw-r--r--src/mame/audio/hng64.cpp1
-rw-r--r--src/mame/audio/laserbat.cpp1
-rw-r--r--src/mame/audio/m72.cpp1
-rw-r--r--src/mame/audio/m72.h1
-rw-r--r--src/mame/audio/s11c_bg.cpp1
-rw-r--r--src/mame/audio/s11c_bg.h1
-rw-r--r--src/mame/audio/segam1audio.cpp1
-rw-r--r--src/mame/audio/segam1audio.h1
-rw-r--r--src/mame/audio/special.cpp1
-rw-r--r--src/mame/audio/special.h1
-rw-r--r--src/mame/audio/vc4000.cpp1
-rw-r--r--src/mame/audio/vc4000.h1
-rw-r--r--src/mame/audio/williams.h1
-rw-r--r--src/mame/audio/wpcsnd.cpp1
-rw-r--r--src/mame/audio/wpcsnd.h1
-rw-r--r--src/mame/audio/wswan.cpp1
-rw-r--r--src/mame/audio/wswan.h1
-rw-r--r--src/mame/audio/zaccaria.h1
-rw-r--r--src/mame/drivers/68ksbc.cpp1
-rw-r--r--src/mame/drivers/abc1600.cpp1
-rw-r--r--src/mame/drivers/abc80.cpp1
-rw-r--r--src/mame/drivers/abc80x.cpp1
-rw-r--r--src/mame/drivers/adam.cpp1
-rw-r--r--src/mame/drivers/allied.cpp1
-rw-r--r--src/mame/drivers/altair.cpp1
-rw-r--r--src/mame/drivers/altos5.cpp1
-rw-r--r--src/mame/drivers/ampro.cpp1
-rw-r--r--src/mame/drivers/apollo.cpp1
-rw-r--r--src/mame/drivers/apricot.cpp1
-rw-r--r--src/mame/drivers/aquarius.cpp1
-rw-r--r--src/mame/drivers/arcadia.cpp1
-rw-r--r--src/mame/drivers/atari_s1.cpp1
-rw-r--r--src/mame/drivers/atari_s2.cpp1
-rw-r--r--src/mame/drivers/atarist.cpp1
-rw-r--r--src/mame/drivers/atom.cpp1
-rw-r--r--src/mame/drivers/aussiebyte.cpp1
-rw-r--r--src/mame/drivers/avigo.cpp1
-rw-r--r--src/mame/drivers/barni.cpp1
-rw-r--r--src/mame/drivers/binbug.cpp1
-rw-r--r--src/mame/drivers/bullet.cpp1
-rw-r--r--src/mame/drivers/bw12.cpp1
-rw-r--r--src/mame/drivers/bw2.cpp1
-rw-r--r--src/mame/drivers/by17.cpp1
-rw-r--r--src/mame/drivers/by35.cpp1
-rw-r--r--src/mame/drivers/by6803.cpp1
-rw-r--r--src/mame/drivers/c80.cpp1
-rw-r--r--src/mame/drivers/cgc7900.cpp1
-rw-r--r--src/mame/drivers/channelf.cpp1
-rw-r--r--src/mame/drivers/cidelsa.cpp1
-rw-r--r--src/mame/drivers/clcd.cpp1
-rw-r--r--src/mame/drivers/cmi.cpp1
-rw-r--r--src/mame/drivers/coco12.cpp1
-rw-r--r--src/mame/drivers/coco3.cpp1
-rw-r--r--src/mame/drivers/coleco.cpp1
-rw-r--r--src/mame/drivers/compucolor.cpp1
-rw-r--r--src/mame/drivers/comx35.cpp1
-rw-r--r--src/mame/drivers/coolpool.cpp1
-rw-r--r--src/mame/drivers/cosmicos.cpp1
-rw-r--r--src/mame/drivers/crvision.cpp1
-rw-r--r--src/mame/drivers/cybiko.cpp1
-rw-r--r--src/mame/drivers/dectalk.cpp1
-rw-r--r--src/mame/drivers/dragon.cpp1
-rw-r--r--src/mame/drivers/elf.cpp1
-rw-r--r--src/mame/drivers/esq1.cpp1
-rw-r--r--src/mame/drivers/esq5505.cpp1
-rw-r--r--src/mame/drivers/esqkt.cpp1
-rw-r--r--src/mame/drivers/eti660.cpp1
-rw-r--r--src/mame/drivers/exp85.cpp1
-rw-r--r--src/mame/drivers/fidel6502.cpp1
-rw-r--r--src/mame/drivers/fidel68k.cpp1
-rw-r--r--src/mame/drivers/fidelz80.cpp1
-rw-r--r--src/mame/drivers/flicker.cpp1
-rw-r--r--src/mame/drivers/fmtowns.cpp1
-rw-r--r--src/mame/drivers/g627.cpp1
-rw-r--r--src/mame/drivers/galaga.cpp1
-rw-r--r--src/mame/drivers/gamecom.cpp1
-rw-r--r--src/mame/drivers/gottlieb.cpp1
-rw-r--r--src/mame/drivers/gp_1.cpp1
-rw-r--r--src/mame/drivers/gp_2.cpp1
-rw-r--r--src/mame/drivers/gts1.cpp1
-rw-r--r--src/mame/drivers/gts3.cpp1
-rw-r--r--src/mame/drivers/gts3a.cpp1
-rw-r--r--src/mame/drivers/gts80.cpp1
-rw-r--r--src/mame/drivers/gts80a.cpp1
-rw-r--r--src/mame/drivers/gts80b.cpp1
-rw-r--r--src/mame/drivers/h89.cpp1
-rw-r--r--src/mame/drivers/hankin.cpp1
-rw-r--r--src/mame/drivers/hh_tms1k.cpp1
-rw-r--r--src/mame/drivers/hh_ucom4.cpp1
-rw-r--r--src/mame/drivers/horizon.cpp1
-rw-r--r--src/mame/drivers/ht68k.cpp1
-rw-r--r--src/mame/drivers/huebler.cpp1
-rw-r--r--src/mame/drivers/hx20.cpp1
-rw-r--r--src/mame/drivers/idsa.cpp1
-rw-r--r--src/mame/drivers/imds2.cpp1
-rw-r--r--src/mame/drivers/inder.cpp1
-rw-r--r--src/mame/drivers/inderp.cpp1
-rw-r--r--src/mame/drivers/indiana.cpp1
-rw-r--r--src/mame/drivers/interpro.cpp1
-rw-r--r--src/mame/drivers/isbc.cpp1
-rw-r--r--src/mame/drivers/jeutel.cpp1
-rw-r--r--src/mame/drivers/jp.cpp1
-rw-r--r--src/mame/drivers/kaypro.cpp1
-rw-r--r--src/mame/drivers/kim1.cpp1
-rw-r--r--src/mame/drivers/ksys573.cpp1
-rw-r--r--src/mame/drivers/kyocera.cpp1
-rw-r--r--src/mame/drivers/lc80.cpp1
-rw-r--r--src/mame/drivers/llc.cpp1
-rw-r--r--src/mame/drivers/ltd.cpp1
-rw-r--r--src/mame/drivers/macp.cpp1
-rw-r--r--src/mame/drivers/mbc55x.cpp1
-rw-r--r--src/mame/drivers/mbee.cpp1
-rw-r--r--src/mame/drivers/mc80.cpp1
-rw-r--r--src/mame/drivers/meadows.cpp1
-rw-r--r--src/mame/drivers/micropin.cpp1
-rw-r--r--src/mame/drivers/mikromik.cpp1
-rw-r--r--src/mame/drivers/mpf1.cpp1
-rw-r--r--src/mame/drivers/mpz80.cpp1
-rw-r--r--src/mame/drivers/msx.cpp1
-rw-r--r--src/mame/drivers/multfish.cpp1
-rw-r--r--src/mame/drivers/multfish_boot.cpp1
-rw-r--r--src/mame/drivers/mx2178.cpp1
-rw-r--r--src/mame/drivers/mz80.cpp1
-rw-r--r--src/mame/drivers/newbrain.cpp1
-rw-r--r--src/mame/drivers/next.cpp1
-rw-r--r--src/mame/drivers/notetaker.cpp1
-rw-r--r--src/mame/drivers/novag6502.cpp1
-rw-r--r--src/mame/drivers/novag68k.cpp1
-rw-r--r--src/mame/drivers/nsm.cpp1
-rw-r--r--src/mame/drivers/nyny.cpp1
-rw-r--r--src/mame/drivers/ob68k1a.cpp1
-rw-r--r--src/mame/drivers/osi.cpp1
-rw-r--r--src/mame/drivers/p2000t.cpp1
-rw-r--r--src/mame/drivers/pc1512.cpp1
-rw-r--r--src/mame/drivers/pc8001.cpp1
-rw-r--r--src/mame/drivers/pc8401a.cpp1
-rw-r--r--src/mame/drivers/pcw16.cpp1
-rw-r--r--src/mame/drivers/peyper.cpp1
-rw-r--r--src/mame/drivers/phc25.cpp1
-rw-r--r--src/mame/drivers/pipbug.cpp1
-rw-r--r--src/mame/drivers/play_1.cpp1
-rw-r--r--src/mame/drivers/play_2.cpp1
-rw-r--r--src/mame/drivers/play_3.cpp1
-rw-r--r--src/mame/drivers/poly880.cpp1
-rw-r--r--src/mame/drivers/pp01.cpp1
-rw-r--r--src/mame/drivers/prof80.cpp1
-rw-r--r--src/mame/drivers/psikyo4.cpp1
-rw-r--r--src/mame/drivers/pulsar.cpp1
-rw-r--r--src/mame/drivers/px4.cpp1
-rw-r--r--src/mame/drivers/px8.cpp1
-rw-r--r--src/mame/drivers/qx10.cpp1
-rw-r--r--src/mame/drivers/rm380z.cpp1
-rw-r--r--src/mame/drivers/rmnimbus.cpp1
-rw-r--r--src/mame/drivers/s11.cpp1
-rw-r--r--src/mame/drivers/s11a.cpp1
-rw-r--r--src/mame/drivers/s11b.cpp1
-rw-r--r--src/mame/drivers/s11c.cpp1
-rw-r--r--src/mame/drivers/sage2.cpp1
-rw-r--r--src/mame/drivers/sdk86.cpp1
-rw-r--r--src/mame/drivers/sg1000.cpp1
-rw-r--r--src/mame/drivers/softbox.cpp1
-rw-r--r--src/mame/drivers/sorcerer.cpp1
-rw-r--r--src/mame/drivers/special.cpp1
-rw-r--r--src/mame/drivers/spectra.cpp1
-rw-r--r--src/mame/drivers/spinb.cpp1
-rw-r--r--src/mame/drivers/st_mp100.cpp1
-rw-r--r--src/mame/drivers/st_mp200.cpp1
-rw-r--r--src/mame/drivers/sun3x.cpp1
-rw-r--r--src/mame/drivers/super6.cpp1
-rw-r--r--src/mame/drivers/superslave.cpp1
-rw-r--r--src/mame/drivers/tandy2k.cpp1
-rw-r--r--src/mame/drivers/tavernie.cpp1
-rw-r--r--src/mame/drivers/tb303.cpp1
-rw-r--r--src/mame/drivers/tdv2324.cpp1
-rw-r--r--src/mame/drivers/techno.cpp1
-rw-r--r--src/mame/drivers/tek405x.cpp1
-rw-r--r--src/mame/drivers/thomson.cpp1
-rw-r--r--src/mame/drivers/ticalc1x.cpp1
-rw-r--r--src/mame/drivers/tiki100.cpp1
-rw-r--r--src/mame/drivers/tispeak.cpp1
-rw-r--r--src/mame/drivers/tispellb.cpp1
-rw-r--r--src/mame/drivers/tmc1800.cpp1
-rw-r--r--src/mame/drivers/tmc2000e.cpp1
-rw-r--r--src/mame/drivers/tmc600.cpp1
-rw-r--r--src/mame/drivers/tr606.cpp1
-rw-r--r--src/mame/drivers/tranz330.cpp1
-rw-r--r--src/mame/drivers/trs80.cpp1
-rw-r--r--src/mame/drivers/trs80m2.cpp1
-rw-r--r--src/mame/drivers/ut88.cpp1
-rw-r--r--src/mame/drivers/v1050.cpp1
-rw-r--r--src/mame/drivers/vc4000.cpp1
-rw-r--r--src/mame/drivers/vcs80.cpp1
-rw-r--r--src/mame/drivers/vd.cpp1
-rw-r--r--src/mame/drivers/vector06.cpp1
-rw-r--r--src/mame/drivers/vidbrain.cpp1
-rw-r--r--src/mame/drivers/vip.cpp1
-rw-r--r--src/mame/drivers/vixen.cpp1
-rw-r--r--src/mame/drivers/vk100.cpp1
-rw-r--r--src/mame/drivers/votrpss.cpp1
-rw-r--r--src/mame/drivers/votrtnt.cpp1
-rw-r--r--src/mame/drivers/vt100.cpp1
-rw-r--r--src/mame/drivers/wicat.cpp1
-rw-r--r--src/mame/drivers/wico.cpp1
-rw-r--r--src/mame/drivers/wpc_dot.cpp1
-rw-r--r--src/mame/drivers/wpc_flip1.cpp1
-rw-r--r--src/mame/drivers/wpc_flip2.cpp1
-rw-r--r--src/mame/drivers/wswan.cpp1
-rw-r--r--src/mame/drivers/x07.cpp1
-rw-r--r--src/mame/drivers/x1.cpp1
-rw-r--r--src/mame/drivers/x1twin.cpp1
-rw-r--r--src/mame/drivers/xerox820.cpp1
-rw-r--r--src/mame/drivers/xor100.cpp1
-rw-r--r--src/mame/drivers/z88.cpp1
-rw-r--r--src/mame/drivers/zac_1.cpp1
-rw-r--r--src/mame/drivers/zac_2.cpp1
-rw-r--r--src/mame/drivers/zac_proto.cpp1
-rw-r--r--src/mame/drivers/zx.cpp1
-rw-r--r--src/mame/includes/adam.h1
-rw-r--r--src/mame/includes/apollo.h1
-rw-r--r--src/mame/includes/apple2.h1
-rw-r--r--src/mame/includes/aquarius.h1
-rw-r--r--src/mame/includes/arcadia.h1
-rw-r--r--src/mame/includes/atom.h1
-rw-r--r--src/mame/includes/aussiebyte.h1
-rw-r--r--src/mame/includes/bebox.h1
-rw-r--r--src/mame/includes/bullet.h1
-rw-r--r--src/mame/includes/bw12.h1
-rw-r--r--src/mame/includes/bw2.h1
-rw-r--r--src/mame/includes/c80.h1
-rw-r--r--src/mame/includes/cgc7900.h1
-rw-r--r--src/mame/includes/channelf.h1
-rw-r--r--src/mame/includes/cidelsa.h1
-rw-r--r--src/mame/includes/coco.h1
-rw-r--r--src/mame/includes/coleco.h1
-rw-r--r--src/mame/includes/comx35.h1
-rw-r--r--src/mame/includes/coolpool.h1
-rw-r--r--src/mame/includes/cosmicos.h1
-rw-r--r--src/mame/includes/crvision.h1
-rw-r--r--src/mame/includes/cybiko.h1
-rw-r--r--src/mame/includes/dm7000.h1
-rw-r--r--src/mame/includes/einstein.h1
-rw-r--r--src/mame/includes/elf.h1
-rw-r--r--src/mame/includes/eti660.h1
-rw-r--r--src/mame/includes/fidelbase.h1
-rw-r--r--src/mame/includes/fmtowns.h1
-rw-r--r--src/mame/includes/gamecom.h1
-rw-r--r--src/mame/includes/goldstar.h1
-rw-r--r--src/mame/includes/gottlieb.h1
-rw-r--r--src/mame/includes/hh_tms1k.h1
-rw-r--r--src/mame/includes/hh_ucom4.h1
-rw-r--r--src/mame/includes/hp9845.h1
-rw-r--r--src/mame/includes/huebler.h1
-rw-r--r--src/mame/includes/imds2.h1
-rw-r--r--src/mame/includes/interpro.h3
-rw-r--r--src/mame/includes/kaypro.h1
-rw-r--r--src/mame/includes/kim1.h1
-rw-r--r--src/mame/includes/lc80.h1
-rw-r--r--src/mame/includes/lisa.h1
-rw-r--r--src/mame/includes/llc.h1
-rw-r--r--src/mame/includes/mbc55x.h1
-rw-r--r--src/mame/includes/mbee.h1
-rw-r--r--src/mame/includes/mc80.h1
-rw-r--r--src/mame/includes/meadows.h1
-rw-r--r--src/mame/includes/mpf1.h1
-rw-r--r--src/mame/includes/mpz80.h1
-rw-r--r--src/mame/includes/msx.h1
-rw-r--r--src/mame/includes/multfish.h1
-rw-r--r--src/mame/includes/mz80.h1
-rw-r--r--src/mame/includes/newbrain.h1
-rw-r--r--src/mame/includes/next.h1
-rw-r--r--src/mame/includes/novagbase.h1
-rw-r--r--src/mame/includes/osi.h1
-rw-r--r--src/mame/includes/p2000t.h1
-rw-r--r--src/mame/includes/pc1512.h1
-rw-r--r--src/mame/includes/pc8001.h1
-rw-r--r--src/mame/includes/pc8401a.h1
-rw-r--r--src/mame/includes/pcw16.h1
-rw-r--r--src/mame/includes/phc25.h1
-rw-r--r--src/mame/includes/poly880.h1
-rw-r--r--src/mame/includes/pp01.h1
-rw-r--r--src/mame/includes/psikyo4.h1
-rw-r--r--src/mame/includes/px8.h1
-rw-r--r--src/mame/includes/rm380z.h1
-rw-r--r--src/mame/includes/rmnimbus.h1
-rw-r--r--src/mame/includes/sage2.h1
-rw-r--r--src/mame/includes/sg1000.h1
-rw-r--r--src/mame/includes/slapstic.h1
-rw-r--r--src/mame/includes/softbox.h1
-rw-r--r--src/mame/includes/sorcerer.h1
-rw-r--r--src/mame/includes/special.h1
-rw-r--r--src/mame/includes/super6.h1
-rw-r--r--src/mame/includes/super80.h1
-rw-r--r--src/mame/includes/swtpc09.h1
-rw-r--r--src/mame/includes/tandy2k.h1
-rw-r--r--src/mame/includes/tdv2324.h1
-rw-r--r--src/mame/includes/tek405x.h1
-rw-r--r--src/mame/includes/thomson.h1
-rw-r--r--src/mame/includes/tiki100.h1
-rw-r--r--src/mame/includes/tmc1800.h1
-rw-r--r--src/mame/includes/tmc2000e.h1
-rw-r--r--src/mame/includes/tmc600.h1
-rw-r--r--src/mame/includes/tranz330.h1
-rw-r--r--src/mame/includes/trs80.h1
-rw-r--r--src/mame/includes/trs80m2.h1
-rw-r--r--src/mame/includes/ut88.h1
-rw-r--r--src/mame/includes/v1050.h1
-rw-r--r--src/mame/includes/vc4000.h1
-rw-r--r--src/mame/includes/vcs80.h1
-rw-r--r--src/mame/includes/vector06.h1
-rw-r--r--src/mame/includes/vidbrain.h1
-rw-r--r--src/mame/includes/vip.h1
-rw-r--r--src/mame/includes/wpc_dot.h1
-rw-r--r--src/mame/includes/wswan.h1
-rw-r--r--src/mame/includes/x07.h1
-rw-r--r--src/mame/includes/x1.h1
-rw-r--r--src/mame/includes/xerox820.h1
-rw-r--r--src/mame/includes/xor100.h1
-rw-r--r--src/mame/includes/z88.h1
-rw-r--r--src/mame/includes/zaccaria.h1
-rw-r--r--src/mame/includes/zerozone.h1
-rw-r--r--src/mame/includes/zodiack.h1
-rw-r--r--src/mame/includes/zx.h1
-rw-r--r--src/mame/machine/315_5296.cpp1
-rw-r--r--src/mame/machine/315_5296.h1
-rw-r--r--src/mame/machine/6883sam.cpp1
-rw-r--r--src/mame/machine/6883sam.h1
-rw-r--r--src/mame/machine/abc1600mac.cpp1
-rw-r--r--src/mame/machine/abc1600mac.h1
-rw-r--r--src/mame/machine/abc80kb.cpp1
-rw-r--r--src/mame/machine/abc80kb.h1
-rw-r--r--src/mame/machine/alpha8201.cpp1
-rw-r--r--src/mame/machine/alpha8201.h1
-rw-r--r--src/mame/machine/apollo.cpp1
-rw-r--r--src/mame/machine/apollo_dbg.cpp1
-rw-r--r--src/mame/machine/apollo_dbg.h1
-rw-r--r--src/mame/machine/apollo_kbd.cpp1
-rw-r--r--src/mame/machine/apollo_kbd.h1
-rw-r--r--src/mame/machine/apricotkb.cpp1
-rw-r--r--src/mame/machine/apricotkb.h1
-rw-r--r--src/mame/machine/at.cpp1
-rw-r--r--src/mame/machine/at.h1
-rw-r--r--src/mame/machine/cammu.cpp1
-rw-r--r--src/mame/machine/cammu.h3
-rw-r--r--src/mame/machine/cat702.cpp1
-rw-r--r--src/mame/machine/cat702.h1
-rw-r--r--src/mame/machine/cdi070.h1
-rw-r--r--src/mame/machine/cdicdic.h1
-rw-r--r--src/mame/machine/cdislave.h1
-rw-r--r--src/mame/machine/coco.cpp1
-rw-r--r--src/mame/machine/coco12.cpp1
-rw-r--r--src/mame/machine/coco3.cpp1
-rw-r--r--src/mame/machine/compiskb.cpp1
-rw-r--r--src/mame/machine/compiskb.h1
-rw-r--r--src/mame/machine/cuda.h1
-rw-r--r--src/mame/machine/cybiko.cpp1
-rw-r--r--src/mame/machine/dec_lk201.h1
-rw-r--r--src/mame/machine/deco222.cpp1
-rw-r--r--src/mame/machine/deco222.h1
-rw-r--r--src/mame/machine/decocpu6.cpp1
-rw-r--r--src/mame/machine/decocpu6.h1
-rw-r--r--src/mame/machine/decocpu7.cpp1
-rw-r--r--src/mame/machine/decocpu7.h1
-rw-r--r--src/mame/machine/decopincpu.cpp1
-rw-r--r--src/mame/machine/decopincpu.h1
-rw-r--r--src/mame/machine/dgnalpha.cpp1
-rw-r--r--src/mame/machine/dmv_keyb.cpp1
-rw-r--r--src/mame/machine/dmv_keyb.h1
-rw-r--r--src/mame/machine/dragon.cpp1
-rw-r--r--src/mame/machine/egret.h1
-rw-r--r--src/mame/machine/esqlcd.cpp1
-rw-r--r--src/mame/machine/esqlcd.h1
-rw-r--r--src/mame/machine/esqpanel.h1
-rw-r--r--src/mame/machine/esqvfd.cpp1
-rw-r--r--src/mame/machine/esqvfd.h1
-rw-r--r--src/mame/machine/gamecom.cpp1
-rw-r--r--src/mame/machine/gdrom.cpp1
-rw-r--r--src/mame/machine/genpin.cpp1
-rw-r--r--src/mame/machine/genpin.h1
-rw-r--r--src/mame/machine/hng64_net.cpp1
-rw-r--r--src/mame/machine/ibm6580_fdc.cpp1
-rw-r--r--src/mame/machine/ibm6580_fdc.h1
-rw-r--r--src/mame/machine/ibm6580_kbd.cpp1
-rw-r--r--src/mame/machine/ibm6580_kbd.h1
-rw-r--r--src/mame/machine/ie15_kbd.cpp1
-rw-r--r--src/mame/machine/ie15_kbd.h1
-rw-r--r--src/mame/machine/igs036crypt.cpp1
-rw-r--r--src/mame/machine/igs036crypt.h1
-rw-r--r--src/mame/machine/interpro_ioga.cpp1
-rw-r--r--src/mame/machine/interpro_ioga.h3
-rw-r--r--src/mame/machine/interpro_mcga.cpp3
-rw-r--r--src/mame/machine/interpro_mcga.h3
-rw-r--r--src/mame/machine/interpro_sga.cpp1
-rw-r--r--src/mame/machine/interpro_sga.h3
-rw-r--r--src/mame/machine/isbc_208.cpp1
-rw-r--r--src/mame/machine/isbc_208.h1
-rw-r--r--src/mame/machine/isbc_215g.cpp1
-rw-r--r--src/mame/machine/isbc_215g.h1
-rw-r--r--src/mame/machine/iteagle_fpga.cpp1
-rw-r--r--src/mame/machine/jvs13551.cpp1
-rw-r--r--src/mame/machine/jvs13551.h1
-rw-r--r--src/mame/machine/k573cass.cpp1
-rw-r--r--src/mame/machine/k573mcr.cpp1
-rw-r--r--src/mame/machine/k573mcr.h1
-rw-r--r--src/mame/machine/k573msu.cpp1
-rw-r--r--src/mame/machine/k573msu.h1
-rw-r--r--src/mame/machine/k573npu.cpp1
-rw-r--r--src/mame/machine/k573npu.h1
-rw-r--r--src/mame/machine/k7659kb.cpp1
-rw-r--r--src/mame/machine/k7659kb.h1
-rw-r--r--src/mame/machine/kabuki.h1
-rw-r--r--src/mame/machine/kaypro.cpp1
-rw-r--r--src/mame/machine/km035.h1
-rw-r--r--src/mame/machine/lisa.cpp1
-rw-r--r--src/mame/machine/llc.cpp1
-rw-r--r--src/mame/machine/m20_8086.cpp1
-rw-r--r--src/mame/machine/m20_8086.h1
-rw-r--r--src/mame/machine/m20_kbd.cpp1
-rw-r--r--src/mame/machine/m24_kbd.cpp1
-rw-r--r--src/mame/machine/m24_kbd.h1
-rw-r--r--src/mame/machine/m24_z8000.cpp1
-rw-r--r--src/mame/machine/m24_z8000.h1
-rw-r--r--src/mame/machine/m2comm.h1
-rw-r--r--src/mame/machine/mackbd.h1
-rw-r--r--src/mame/machine/mbc55x.cpp1
-rw-r--r--src/mame/machine/mbee.cpp1
-rw-r--r--src/mame/machine/mc80.cpp1
-rw-r--r--src/mame/machine/meters.h1
-rw-r--r--src/mame/machine/midikbd.cpp1
-rw-r--r--src/mame/machine/midikbd.h1
-rw-r--r--src/mame/machine/mm1kb.cpp1
-rw-r--r--src/mame/machine/mm1kb.h1
-rw-r--r--src/mame/machine/ms7004.h1
-rw-r--r--src/mame/machine/msx.cpp1
-rw-r--r--src/mame/machine/mz80.cpp1
-rw-r--r--src/mame/machine/nextkbd.cpp1
-rw-r--r--src/mame/machine/nextkbd.h1
-rw-r--r--src/mame/machine/ngen_kb.cpp1
-rw-r--r--src/mame/machine/ns11prot.cpp1
-rw-r--r--src/mame/machine/ns11prot.h1
-rw-r--r--src/mame/machine/octo_kbd.cpp1
-rw-r--r--src/mame/machine/p2000t.cpp1
-rw-r--r--src/mame/machine/pc1512kb.cpp1
-rw-r--r--src/mame/machine/pc1512kb.h1
-rw-r--r--src/mame/machine/pc9801_cbus.cpp1
-rw-r--r--src/mame/machine/pc9801_cbus.h1
-rw-r--r--src/mame/machine/pc9801_cd.cpp1
-rw-r--r--src/mame/machine/pcd_kbd.cpp1
-rw-r--r--src/mame/machine/pcd_kbd.h1
-rw-r--r--src/mame/machine/pp01.cpp1
-rw-r--r--src/mame/machine/prof80mmu.cpp1
-rw-r--r--src/mame/machine/prof80mmu.h1
-rw-r--r--src/mame/machine/qimi.cpp1
-rw-r--r--src/mame/machine/qimi.h1
-rw-r--r--src/mame/machine/qx10kbd.cpp1
-rw-r--r--src/mame/machine/rm380z.cpp1
-rw-r--r--src/mame/machine/rmnimbus.cpp1
-rw-r--r--src/mame/machine/rmnkbd.cpp1
-rw-r--r--src/mame/machine/segabb.cpp1
-rw-r--r--src/mame/machine/segacrp2_device.h1
-rw-r--r--src/mame/machine/segacrpt_device.h1
-rw-r--r--src/mame/machine/slapstic.cpp1
-rw-r--r--src/mame/machine/sorcerer.cpp1
-rw-r--r--src/mame/machine/special.cpp1
-rw-r--r--src/mame/machine/st0016.cpp1
-rw-r--r--src/mame/machine/st0016.h1
-rw-r--r--src/mame/machine/subsino.h1
-rw-r--r--src/mame/machine/super80.cpp1
-rw-r--r--src/mame/machine/swim.cpp1
-rw-r--r--src/mame/machine/tandy2kb.cpp1
-rw-r--r--src/mame/machine/tandy2kb.h1
-rw-r--r--src/mame/machine/teleprinter.cpp1
-rw-r--r--src/mame/machine/thomflop.cpp1
-rw-r--r--src/mame/machine/trs80.cpp1
-rw-r--r--src/mame/machine/trs80m2kb.cpp1
-rw-r--r--src/mame/machine/trs80m2kb.h1
-rw-r--r--src/mame/machine/upd65031.cpp1
-rw-r--r--src/mame/machine/upd65031.h1
-rw-r--r--src/mame/machine/v1050kb.cpp1
-rw-r--r--src/mame/machine/v1050kb.h1
-rw-r--r--src/mame/machine/vector06.cpp1
-rw-r--r--src/mame/machine/victor9k_fdc.cpp1
-rw-r--r--src/mame/machine/victor9k_fdc.h1
-rw-r--r--src/mame/machine/victor9kb.cpp1
-rw-r--r--src/mame/machine/victor9kb.h1
-rw-r--r--src/mame/machine/wangpckb.cpp1
-rw-r--r--src/mame/machine/wangpckb.h1
-rw-r--r--src/mame/machine/wpc.cpp1
-rw-r--r--src/mame/machine/wpc.h1
-rw-r--r--src/mame/machine/wswan.cpp1
-rw-r--r--src/mame/machine/x1.cpp1
-rw-r--r--src/mame/machine/x68k_hdc.cpp1
-rw-r--r--src/mame/machine/x68k_hdc.h1
-rw-r--r--src/mame/machine/x68k_kbd.cpp1
-rw-r--r--src/mame/machine/x820kb.cpp1
-rw-r--r--src/mame/machine/x820kb.h1
-rw-r--r--src/mame/machine/znmcu.cpp1
-rw-r--r--src/mame/machine/znmcu.h1
-rw-r--r--src/mame/machine/zs01.cpp1
-rw-r--r--src/mame/machine/zx.cpp1
-rw-r--r--src/mame/machine/zx8302.h1
-rw-r--r--src/mame/video/abc1600.cpp1
-rw-r--r--src/mame/video/abc1600.h1
-rw-r--r--src/mame/video/abc800.cpp1
-rw-r--r--src/mame/video/abc802.cpp1
-rw-r--r--src/mame/video/abc806.cpp1
-rw-r--r--src/mame/video/antic.cpp1
-rw-r--r--src/mame/video/antic.h1
-rw-r--r--src/mame/video/apollo.cpp1
-rw-r--r--src/mame/video/apple2.h1
-rw-r--r--src/mame/video/arcadia.cpp1
-rw-r--r--src/mame/video/aussiebyte.cpp1
-rw-r--r--src/mame/video/channelf.cpp1
-rw-r--r--src/mame/video/decodmd1.cpp1
-rw-r--r--src/mame/video/decodmd1.h1
-rw-r--r--src/mame/video/decodmd2.cpp1
-rw-r--r--src/mame/video/decodmd2.h1
-rw-r--r--src/mame/video/decodmd3.cpp1
-rw-r--r--src/mame/video/decodmd3.h1
-rw-r--r--src/mame/video/gamecom.cpp1
-rw-r--r--src/mame/video/gic.h1
-rw-r--r--src/mame/video/gottlieb.cpp1
-rw-r--r--src/mame/video/gtia.h1
-rw-r--r--src/mame/video/k053250.cpp1
-rw-r--r--src/mame/video/k053250.h1
-rw-r--r--src/mame/video/kaypro.cpp1
-rw-r--r--src/mame/video/kyocera.cpp1
-rw-r--r--src/mame/video/laserbat.cpp1
-rw-r--r--src/mame/video/llc.cpp1
-rw-r--r--src/mame/video/maria.h1
-rw-r--r--src/mame/video/mbc55x.cpp1
-rw-r--r--src/mame/video/mbee.cpp1
-rw-r--r--src/mame/video/mc80.cpp1
-rw-r--r--src/mame/video/mcd212.h1
-rw-r--r--src/mame/video/mikromik.cpp1
-rw-r--r--src/mame/video/mz80.cpp1
-rw-r--r--src/mame/video/n64.h1
-rw-r--r--src/mame/video/newbrain.cpp1
-rw-r--r--src/mame/video/nick.cpp1
-rw-r--r--src/mame/video/nick.h1
-rw-r--r--src/mame/video/osi.cpp1
-rw-r--r--src/mame/video/p2000t.cpp1
-rw-r--r--src/mame/video/pc1512.cpp1
-rw-r--r--src/mame/video/pc8401a.cpp1
-rw-r--r--src/mame/video/pcd.cpp1
-rw-r--r--src/mame/video/pcd.h1
-rw-r--r--src/mame/video/pin64.cpp1
-rw-r--r--src/mame/video/pin64.h3
-rw-r--r--src/mame/video/pp01.cpp1
-rw-r--r--src/mame/video/psikyo4.cpp1
-rw-r--r--src/mame/video/rdpblend.h1
-rw-r--r--src/mame/video/rdptpipe.h1
-rw-r--r--src/mame/video/rm380z.cpp1
-rw-r--r--src/mame/video/special.cpp1
-rw-r--r--src/mame/video/super80.cpp1
-rw-r--r--src/mame/video/taito_helper.cpp1
-rw-r--r--src/mame/video/taito_helper.h1
-rw-r--r--src/mame/video/thomson.cpp1
-rw-r--r--src/mame/video/trs80.cpp1
-rw-r--r--src/mame/video/ut88.cpp1
-rw-r--r--src/mame/video/uv201.cpp1
-rw-r--r--src/mame/video/uv201.h1
-rw-r--r--src/mame/video/v1050.cpp1
-rw-r--r--src/mame/video/vc4000.cpp1
-rw-r--r--src/mame/video/vector06.cpp1
-rw-r--r--src/mame/video/vtvideo.h1
-rw-r--r--src/mame/video/wswan.cpp1
-rw-r--r--src/mame/video/wswan.h1
-rw-r--r--src/mame/video/z88.cpp1
-rw-r--r--src/mame/video/zx.cpp1
-rw-r--r--src/mame/video/zx8301.cpp1
-rw-r--r--src/mame/video/zx8301.h1
580 files changed, 370 insertions, 224 deletions
diff --git a/src/mame/audio/arcadia.cpp b/src/mame/audio/arcadia.cpp
index ccb04e0f4c7..00085a7ec9e 100644
--- a/src/mame/audio/arcadia.cpp
+++ b/src/mame/audio/arcadia.cpp
@@ -12,6 +12,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/arcadia.h"
//known UVI audio clocks
diff --git a/src/mame/audio/cclimber.h b/src/mame/audio/cclimber.h
index 3fffe35f824..f839cb800e0 100644
--- a/src/mame/audio/cclimber.h
+++ b/src/mame/audio/cclimber.h
@@ -13,7 +13,6 @@
#ifndef __CCLIMBER_AUDIO__
#define __CCLIMBER_AUDIO__
-#include "emu.h"
#include "sound/samples.h"
//**************************************************************************
// GLOBAL VARIABLES
diff --git a/src/mame/audio/csd.cpp b/src/mame/audio/csd.cpp
index 47cc6c8589f..dac8d4ebd9a 100644
--- a/src/mame/audio/csd.cpp
+++ b/src/mame/audio/csd.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "csd.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/audio/csd.h b/src/mame/audio/csd.h
index a8febae22c2..87e657135b9 100644
--- a/src/mame/audio/csd.h
+++ b/src/mame/audio/csd.h
@@ -11,7 +11,6 @@
#ifndef MAME_AUDIO_CSD_H
#define MAME_AUDIO_CSD_H
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/6821pia.h"
#include "sound/dac.h"
diff --git a/src/mame/audio/dai_snd.h b/src/mame/audio/dai_snd.h
index fb844476662..82aab50027a 100644
--- a/src/mame/audio/dai_snd.h
+++ b/src/mame/audio/dai_snd.h
@@ -9,7 +9,6 @@
#ifndef DAI_SND_H_
#define DAI_SND_H_
-#include "emu.h"
// ======================> dai_sound_device
diff --git a/src/mame/audio/decobsmt.h b/src/mame/audio/decobsmt.h
index a259d793123..a16165e0b22 100644
--- a/src/mame/audio/decobsmt.h
+++ b/src/mame/audio/decobsmt.h
@@ -5,7 +5,6 @@
#ifndef __DECOBSMT_H__
#define __DECOBSMT_H__
-#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/bsmt2000.h"
diff --git a/src/mame/audio/dsbz80.h b/src/mame/audio/dsbz80.h
index 3d4aae3a2b3..2a10e8bf432 100644
--- a/src/mame/audio/dsbz80.h
+++ b/src/mame/audio/dsbz80.h
@@ -5,7 +5,6 @@
#ifndef __DSBZ80_H__
#define __DSBZ80_H__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/mpeg_audio.h"
diff --git a/src/mame/audio/gottlieb.cpp b/src/mame/audio/gottlieb.cpp
index 75308e7902b..ca2281fdd50 100644
--- a/src/mame/audio/gottlieb.cpp
+++ b/src/mame/audio/gottlieb.cpp
@@ -10,6 +10,7 @@
***************************************************************************/
+#include "emu.h"
#include "audio/gottlieb.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/audio/gottlieb.h b/src/mame/audio/gottlieb.h
index b32b70c4c69..78625e293fc 100644
--- a/src/mame/audio/gottlieb.h
+++ b/src/mame/audio/gottlieb.h
@@ -6,7 +6,6 @@
***************************************************************************/
-#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "machine/mos6530.h"
#include "machine/6532riot.h"
diff --git a/src/mame/audio/hng64.cpp b/src/mame/audio/hng64.cpp
index 2c826b91329..b53ff9e4b6e 100644
--- a/src/mame/audio/hng64.cpp
+++ b/src/mame/audio/hng64.cpp
@@ -39,6 +39,7 @@ so levels 0,1,2,5 are unmasked, vectors get set during the sound CPU init code.
*/
+#include "emu.h"
#include "includes/hng64.h"
// save the sound program?
diff --git a/src/mame/audio/laserbat.cpp b/src/mame/audio/laserbat.cpp
index 963f3aa7f76..4efcfee9c9b 100644
--- a/src/mame/audio/laserbat.cpp
+++ b/src/mame/audio/laserbat.cpp
@@ -7,6 +7,7 @@
audio emulation by Vas Crabb
*/
+#include "emu.h"
#include "includes/laserbat.h"
diff --git a/src/mame/audio/m72.cpp b/src/mame/audio/m72.cpp
index 020e89f78e6..101cb1c9f51 100644
--- a/src/mame/audio/m72.cpp
+++ b/src/mame/audio/m72.cpp
@@ -43,6 +43,7 @@ Shisensho II 1993 Rev 3.34 M81 Yes
***************************************************************************/
+#include "emu.h"
#include "m72.h"
diff --git a/src/mame/audio/m72.h b/src/mame/audio/m72.h
index f2d30cf0ae2..26317e436ab 100644
--- a/src/mame/audio/m72.h
+++ b/src/mame/audio/m72.h
@@ -6,7 +6,6 @@
****************************************************************************/
-#include "emu.h"
#include "machine/gen_latch.h"
#include "sound/dac.h"
diff --git a/src/mame/audio/s11c_bg.cpp b/src/mame/audio/s11c_bg.cpp
index be3f0c00956..fc5b2f0af86 100644
--- a/src/mame/audio/s11c_bg.cpp
+++ b/src/mame/audio/s11c_bg.cpp
@@ -7,6 +7,7 @@
* Author: bsr
*/
+#include "emu.h"
#include "s11c_bg.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/audio/s11c_bg.h b/src/mame/audio/s11c_bg.h
index 3b0dd5aae32..3dc1a79a8e0 100644
--- a/src/mame/audio/s11c_bg.h
+++ b/src/mame/audio/s11c_bg.h
@@ -9,7 +9,6 @@
#ifndef S11C_BG_H_
#define S11C_BG_H_
-#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/ym2151.h"
#include "sound/hc55516.h"
diff --git a/src/mame/audio/segam1audio.cpp b/src/mame/audio/segam1audio.cpp
index 925db00dd24..6e210e1992c 100644
--- a/src/mame/audio/segam1audio.cpp
+++ b/src/mame/audio/segam1audio.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "audio/segam1audio.h"
#define M68000_TAG "m1sndcpu"
diff --git a/src/mame/audio/segam1audio.h b/src/mame/audio/segam1audio.h
index a3d17e4e447..6298ad7440f 100644
--- a/src/mame/audio/segam1audio.h
+++ b/src/mame/audio/segam1audio.h
@@ -5,7 +5,6 @@
#ifndef __SEGAM1AUDIO_H__
#define __SEGAM1AUDIO_H__
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "sound/2612intf.h"
#include "sound/multipcm.h"
diff --git a/src/mame/audio/special.cpp b/src/mame/audio/special.cpp
index f81e203bd9a..60dcabf0839 100644
--- a/src/mame/audio/special.cpp
+++ b/src/mame/audio/special.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "special.h"
diff --git a/src/mame/audio/special.h b/src/mame/audio/special.h
index 78e05bc319d..7fceceaf1ea 100644
--- a/src/mame/audio/special.h
+++ b/src/mame/audio/special.h
@@ -9,7 +9,6 @@
#ifndef SPECIAL_SND_H_
#define SPECIAL_SND_H_
-#include "emu.h"
class specimx_sound_device : public device_t,
public device_sound_interface
diff --git a/src/mame/audio/vc4000.cpp b/src/mame/audio/vc4000.cpp
index 2ebe85deecf..79eee1b1b71 100644
--- a/src/mame/audio/vc4000.cpp
+++ b/src/mame/audio/vc4000.cpp
@@ -7,6 +7,7 @@
***************************************************************************/
+#include "emu.h"
#include "vc4000.h"
diff --git a/src/mame/audio/vc4000.h b/src/mame/audio/vc4000.h
index 7bcb82825c7..ab62a5e5965 100644
--- a/src/mame/audio/vc4000.h
+++ b/src/mame/audio/vc4000.h
@@ -9,7 +9,6 @@
#ifndef _VC4000SND_H_
#define _VC4000SND_H_
-#include "emu.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/audio/williams.h b/src/mame/audio/williams.h
index 7cde77968a9..be8de0b0765 100644
--- a/src/mame/audio/williams.h
+++ b/src/mame/audio/williams.h
@@ -8,7 +8,6 @@
****************************************************************************/
-#include "emu.h"
#include "machine/6821pia.h"
#include "cpu/m6809/m6809.h"
#include "sound/ym2151.h"
diff --git a/src/mame/audio/wpcsnd.cpp b/src/mame/audio/wpcsnd.cpp
index 7603432ba54..6d78a05a176 100644
--- a/src/mame/audio/wpcsnd.cpp
+++ b/src/mame/audio/wpcsnd.cpp
@@ -7,6 +7,7 @@
* Created on: 4/10/2013
*/
+#include "emu.h"
#include "wpcsnd.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/audio/wpcsnd.h b/src/mame/audio/wpcsnd.h
index 2fd33d03d1f..f0eab0ce220 100644
--- a/src/mame/audio/wpcsnd.h
+++ b/src/mame/audio/wpcsnd.h
@@ -9,7 +9,6 @@
#ifndef WPCSND_H_
#define WPCSND_H_
-#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "sound/ym2151.h"
#include "sound/hc55516.h"
diff --git a/src/mame/audio/wswan.cpp b/src/mame/audio/wswan.cpp
index 377b4a5e19d..68a9e264f51 100644
--- a/src/mame/audio/wswan.cpp
+++ b/src/mame/audio/wswan.cpp
@@ -13,6 +13,7 @@ The noise taps and behavior are the same as the Virtual Boy.
**************************************************************************************/
+#include "emu.h"
#include "wswan.h"
diff --git a/src/mame/audio/wswan.h b/src/mame/audio/wswan.h
index c47443ed525..8d957e80b5e 100644
--- a/src/mame/audio/wswan.h
+++ b/src/mame/audio/wswan.h
@@ -11,7 +11,6 @@
#ifndef _WSWAN_SND_H_
#define _WSWAN_SND_H_
-#include "emu.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/mame/audio/zaccaria.h b/src/mame/audio/zaccaria.h
index b4557ab96b3..3b77bb0e637 100644
--- a/src/mame/audio/zaccaria.h
+++ b/src/mame/audio/zaccaria.h
@@ -5,7 +5,6 @@
#ifndef __AUDIO_ZACCARIA_H__
#define __AUDIO_ZACCARIA_H__
-#include "emu.h"
#include "machine/6821pia.h"
#include "machine/netlist.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/68ksbc.cpp b/src/mame/drivers/68ksbc.cpp
index 2ff1bc85cac..ad824e11f61 100644
--- a/src/mame/drivers/68ksbc.cpp
+++ b/src/mame/drivers/68ksbc.cpp
@@ -26,6 +26,7 @@
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
#include "machine/6850acia.h"
diff --git a/src/mame/drivers/abc1600.cpp b/src/mame/drivers/abc1600.cpp
index 0fb1e911ae1..6e0fc84551a 100644
--- a/src/mame/drivers/abc1600.cpp
+++ b/src/mame/drivers/abc1600.cpp
@@ -53,6 +53,7 @@
*/
+#include "emu.h"
#include "includes/abc1600.h"
#include "softlist.h"
diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp
index 75ddb6bc5c6..f03fc92f19b 100644
--- a/src/mame/drivers/abc80.cpp
+++ b/src/mame/drivers/abc80.cpp
@@ -74,6 +74,7 @@ Notes:
*/
+#include "emu.h"
#include "includes/abc80.h"
#include "softlist.h"
diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp
index 2330b3d22cb..f41cc37831b 100644
--- a/src/mame/drivers/abc80x.cpp
+++ b/src/mame/drivers/abc80x.cpp
@@ -147,6 +147,7 @@ Notes:
*/
+#include "emu.h"
#include "includes/abc80x.h"
#include "video/abc800.h"
#include "video/abc802.h"
diff --git a/src/mame/drivers/adam.cpp b/src/mame/drivers/adam.cpp
index cd0d992ae56..918132a6ae9 100644
--- a/src/mame/drivers/adam.cpp
+++ b/src/mame/drivers/adam.cpp
@@ -299,6 +299,7 @@ Mark Gordon
*/
+#include "emu.h"
#include "includes/adam.h"
#include "softlist.h"
diff --git a/src/mame/drivers/allied.cpp b/src/mame/drivers/allied.cpp
index 1c17b4661ae..a268442da83 100644
--- a/src/mame/drivers/allied.cpp
+++ b/src/mame/drivers/allied.cpp
@@ -42,6 +42,7 @@ ToDo:
***************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6502/m6504.h"
#include "machine/mos6530.h"
diff --git a/src/mame/drivers/altair.cpp b/src/mame/drivers/altair.cpp
index 35bcf228fcb..a72174da336 100644
--- a/src/mame/drivers/altair.cpp
+++ b/src/mame/drivers/altair.cpp
@@ -23,6 +23,7 @@
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/i8085/i8085.h"
#include "machine/6850acia.h"
diff --git a/src/mame/drivers/altos5.cpp b/src/mame/drivers/altos5.cpp
index 5930715bfcf..356fc28c48f 100644
--- a/src/mame/drivers/altos5.cpp
+++ b/src/mame/drivers/altos5.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/drivers/ampro.cpp b/src/mame/drivers/ampro.cpp
index 1873fff2807..1064043115f 100644
--- a/src/mame/drivers/ampro.cpp
+++ b/src/mame/drivers/ampro.cpp
@@ -21,6 +21,7 @@ ToDo:
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp
index a44c8178a00..0610626d2b9 100644
--- a/src/mame/drivers/apollo.cpp
+++ b/src/mame/drivers/apollo.cpp
@@ -25,6 +25,7 @@
#define VERBOSE 0
+#include "emu.h"
#include "includes/apollo.h"
#include "debugger.h"
#include "cpu/m68000/m68kcpu.h"
diff --git a/src/mame/drivers/apricot.cpp b/src/mame/drivers/apricot.cpp
index bf693bdcc69..91f6842d433 100644
--- a/src/mame/drivers/apricot.cpp
+++ b/src/mame/drivers/apricot.cpp
@@ -11,6 +11,7 @@
***************************************************************************/
+#include "emu.h"
#include "cpu/i86/i86.h"
#include "cpu/i8089/i8089.h"
#include "machine/ram.h"
diff --git a/src/mame/drivers/aquarius.cpp b/src/mame/drivers/aquarius.cpp
index 2ee6a42c36a..8aab033b2eb 100644
--- a/src/mame/drivers/aquarius.cpp
+++ b/src/mame/drivers/aquarius.cpp
@@ -21,6 +21,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/aquarius.h"
#include "softlist.h"
diff --git a/src/mame/drivers/arcadia.cpp b/src/mame/drivers/arcadia.cpp
index 0b0b4f5dc6e..d747a5bd795 100644
--- a/src/mame/drivers/arcadia.cpp
+++ b/src/mame/drivers/arcadia.cpp
@@ -119,6 +119,7 @@ anything in hardware. No cartridge has been found which uses them.
******************************************************************************/
+#include "emu.h"
#include "includes/arcadia.h"
#include "softlist.h"
diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp
index 5621fe88c64..3e0bd7cf300 100644
--- a/src/mame/drivers/atari_s1.cpp
+++ b/src/mame/drivers/atari_s1.cpp
@@ -43,6 +43,7 @@ ToDo:
************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "machine/watchdog.h"
diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp
index 0307a3f376d..dd6c3e13a22 100644
--- a/src/mame/drivers/atari_s2.cpp
+++ b/src/mame/drivers/atari_s2.cpp
@@ -21,6 +21,7 @@ ToDo:
*****************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "machine/watchdog.h"
diff --git a/src/mame/drivers/atarist.cpp b/src/mame/drivers/atarist.cpp
index 1e22354365d..45c18c7e10a 100644
--- a/src/mame/drivers/atarist.cpp
+++ b/src/mame/drivers/atarist.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder, Olivier Galibert
+#include "emu.h"
#include "includes/atarist.h"
#include "machine/clock.h"
#include "bus/midi/midi.h"
diff --git a/src/mame/drivers/atom.cpp b/src/mame/drivers/atom.cpp
index 9f9a2da2a5d..46c50225bf7 100644
--- a/src/mame/drivers/atom.cpp
+++ b/src/mame/drivers/atom.cpp
@@ -112,6 +112,7 @@ Hardware: PPIA 8255
*/
+#include "emu.h"
#include "includes/atom.h"
#include "formats/imageutl.h"
#include "softlist.h"
diff --git a/src/mame/drivers/aussiebyte.cpp b/src/mame/drivers/aussiebyte.cpp
index aa4aa967e11..18a2736a8a0 100644
--- a/src/mame/drivers/aussiebyte.cpp
+++ b/src/mame/drivers/aussiebyte.cpp
@@ -30,6 +30,7 @@
Includes
************************************************************/
+#include "emu.h"
#include "includes/aussiebyte.h"
diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp
index 99adc8b5122..775fce5ce1b 100644
--- a/src/mame/drivers/avigo.cpp
+++ b/src/mame/drivers/avigo.cpp
@@ -69,6 +69,7 @@
******************************************************************************/
+#include "emu.h"
#include "includes/avigo.h"
#include "avigo.lh"
diff --git a/src/mame/drivers/barni.cpp b/src/mame/drivers/barni.cpp
index ffd4cbeb15d..2e2c93788c7 100644
--- a/src/mame/drivers/barni.cpp
+++ b/src/mame/drivers/barni.cpp
@@ -16,6 +16,7 @@ DISPLAY: 5x6 digit 7 or 16 segment display
SOUND: basically the same as Bally's Squalk & Talk -61 board but missing AY8912 synth chip
*/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp
index acda6b96d55..27dfc0405a0 100644
--- a/src/mame/drivers/binbug.cpp
+++ b/src/mame/drivers/binbug.cpp
@@ -50,6 +50,7 @@
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/keyboard.h"
#include "cpu/s2650/s2650.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/drivers/bullet.cpp b/src/mame/drivers/bullet.cpp
index 8613727569c..58d444e0d26 100644
--- a/src/mame/drivers/bullet.cpp
+++ b/src/mame/drivers/bullet.cpp
@@ -58,6 +58,7 @@ Notes:
*/
+#include "emu.h"
#include "includes/bullet.h"
#include "bus/rs232/rs232.h"
#include "bus/scsi/scsihd.h"
diff --git a/src/mame/drivers/bw12.cpp b/src/mame/drivers/bw12.cpp
index c8043423661..e337cbf7f1b 100644
--- a/src/mame/drivers/bw12.cpp
+++ b/src/mame/drivers/bw12.cpp
@@ -25,6 +25,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/bw12.h"
#include "bus/rs232/rs232.h"
#include "sound/dac.h"
diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp
index 1ebd72f6bc4..7bf927b074e 100644
--- a/src/mame/drivers/bw2.cpp
+++ b/src/mame/drivers/bw2.cpp
@@ -24,6 +24,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/bw2.h"
#include "bus/rs232/rs232.h"
#include "softlist.h"
diff --git a/src/mame/drivers/by17.cpp b/src/mame/drivers/by17.cpp
index 6dd0795465c..6caa08eabd6 100644
--- a/src/mame/drivers/by17.cpp
+++ b/src/mame/drivers/by17.cpp
@@ -18,6 +18,7 @@ ToDo:
*********************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp
index b5fbb39cbd8..e4f2a0cbbe8 100644
--- a/src/mame/drivers/by35.cpp
+++ b/src/mame/drivers/by35.cpp
@@ -66,6 +66,7 @@ ToDo:
*********************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/by6803.cpp b/src/mame/drivers/by6803.cpp
index f9db5db9e53..fde70694d11 100644
--- a/src/mame/drivers/by6803.cpp
+++ b/src/mame/drivers/by6803.cpp
@@ -20,6 +20,7 @@ ToDo:
*********************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
//#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/c80.cpp b/src/mame/drivers/c80.cpp
index e9a89b2f6e8..bc02ae1513e 100644
--- a/src/mame/drivers/c80.cpp
+++ b/src/mame/drivers/c80.cpp
@@ -52,6 +52,7 @@ data of next byte, and so on.
****************************************************************************/
+#include "emu.h"
#include "includes/c80.h"
#include "sound/wave.h"
#include "c80.lh"
diff --git a/src/mame/drivers/cgc7900.cpp b/src/mame/drivers/cgc7900.cpp
index 55123f9be74..c99f7f98c32 100644
--- a/src/mame/drivers/cgc7900.cpp
+++ b/src/mame/drivers/cgc7900.cpp
@@ -35,6 +35,7 @@
*/
+#include "emu.h"
#include "includes/cgc7900.h"
diff --git a/src/mame/drivers/channelf.cpp b/src/mame/drivers/channelf.cpp
index 073bf9ba04f..9e0e8c6bfa4 100644
--- a/src/mame/drivers/channelf.cpp
+++ b/src/mame/drivers/channelf.cpp
@@ -14,6 +14,7 @@
*
******************************************************************/
+#include "emu.h"
#include "includes/channelf.h"
#include "softlist.h"
diff --git a/src/mame/drivers/cidelsa.cpp b/src/mame/drivers/cidelsa.cpp
index 700dc773a31..333b670de2d 100644
--- a/src/mame/drivers/cidelsa.cpp
+++ b/src/mame/drivers/cidelsa.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
+#include "emu.h"
#include "includes/cidelsa.h"
/* CDP1802 Interface */
diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp
index 063cc6bc154..5058ccd5ac0 100644
--- a/src/mame/drivers/clcd.cpp
+++ b/src/mame/drivers/clcd.cpp
@@ -12,6 +12,7 @@
****************************************************************************/
+#include "emu.h"
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
#include "cpu/m6502/m65c02.h"
diff --git a/src/mame/drivers/cmi.cpp b/src/mame/drivers/cmi.cpp
index ea3f01ea1c4..9ee5942e43c 100644
--- a/src/mame/drivers/cmi.cpp
+++ b/src/mame/drivers/cmi.cpp
@@ -99,6 +99,7 @@
****************************************************************************/
#include "emu.h"
+#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/drivers/coco12.cpp b/src/mame/drivers/coco12.cpp
index 7b4c38df94f..5e373f54ba1 100644
--- a/src/mame/drivers/coco12.cpp
+++ b/src/mame/drivers/coco12.cpp
@@ -23,6 +23,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/coco12.h"
#include "bus/coco/coco_t4426.h"
#include "bus/coco/coco_232.h"
diff --git a/src/mame/drivers/coco3.cpp b/src/mame/drivers/coco3.cpp
index 15f41f0f42d..29e2f9a760d 100644
--- a/src/mame/drivers/coco3.cpp
+++ b/src/mame/drivers/coco3.cpp
@@ -12,6 +12,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/coco3.h"
#include "cpu/m6809/m6809.h"
#include "cpu/m6809/hd6309.h"
diff --git a/src/mame/drivers/coleco.cpp b/src/mame/drivers/coleco.cpp
index f8037d1b7a4..a673fb42e28 100644
--- a/src/mame/drivers/coleco.cpp
+++ b/src/mame/drivers/coleco.cpp
@@ -63,6 +63,7 @@
*/
+#include "emu.h"
#include "includes/coleco.h"
#include "softlist.h"
diff --git a/src/mame/drivers/compucolor.cpp b/src/mame/drivers/compucolor.cpp
index 812b18edf13..60ff050a06b 100644
--- a/src/mame/drivers/compucolor.cpp
+++ b/src/mame/drivers/compucolor.cpp
@@ -24,6 +24,7 @@
#define CRT5027_TAG "uf9"
#define RS232_TAG "rs232"
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/i8085/i8085.h"
#include "bus/compucolor/floppy.h"
diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp
index 150ffcd7960..f23d58f2120 100644
--- a/src/mame/drivers/comx35.cpp
+++ b/src/mame/drivers/comx35.cpp
@@ -11,6 +11,7 @@
*/
+#include "emu.h"
#include "includes/comx35.h"
#include "formats/imageutl.h"
#include "softlist.h"
diff --git a/src/mame/drivers/coolpool.cpp b/src/mame/drivers/coolpool.cpp
index 82c26da2862..e6e0929fbff 100644
--- a/src/mame/drivers/coolpool.cpp
+++ b/src/mame/drivers/coolpool.cpp
@@ -26,6 +26,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/coolpool.h"
#include "cpu/tms32010/tms32010.h"
#include "cpu/tms32025/tms32025.h"
diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp
index e6a23ee5c9e..a92f57f7307 100644
--- a/src/mame/drivers/cosmicos.cpp
+++ b/src/mame/drivers/cosmicos.cpp
@@ -33,6 +33,7 @@
*/
+#include "emu.h"
#include "includes/cosmicos.h"
#include "cosmicos.lh"
diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp
index d6b634c5ab8..ea2cd71a269 100644
--- a/src/mame/drivers/crvision.cpp
+++ b/src/mame/drivers/crvision.cpp
@@ -127,6 +127,7 @@ CN1 - main board connector (17x2 pin header)
*/
+#include "emu.h"
#include "includes/crvision.h"
#include "softlist.h"
diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp
index 9bfb0ca4504..03c385675b4 100644
--- a/src/mame/drivers/cybiko.cpp
+++ b/src/mame/drivers/cybiko.cpp
@@ -18,6 +18,7 @@ ToDo:
**************************************************************************************/
+#include "emu.h"
#include "includes/cybiko.h"
#include "rendlay.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/drivers/dectalk.cpp b/src/mame/drivers/dectalk.cpp
index 37201be3a96..0b515d26413 100644
--- a/src/mame/drivers/dectalk.cpp
+++ b/src/mame/drivers/dectalk.cpp
@@ -259,6 +259,7 @@ dgc (dg(no!spam)cx@mac.com)
#undef SERIAL_TO_STDERR
/* Core includes */
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
#include "cpu/tms32010/tms32010.h"
diff --git a/src/mame/drivers/dragon.cpp b/src/mame/drivers/dragon.cpp
index 1151c6c28bd..9c267fe9201 100644
--- a/src/mame/drivers/dragon.cpp
+++ b/src/mame/drivers/dragon.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/dragon.h"
#include "includes/dgnalpha.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp
index e4fdc6a2ce4..c953f21a327 100644
--- a/src/mame/drivers/elf.cpp
+++ b/src/mame/drivers/elf.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "includes/elf.h"
#include "elf2.lh"
diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp
index aa4a9b129a2..5f559cf0da3 100644
--- a/src/mame/drivers/esq1.cpp
+++ b/src/mame/drivers/esq1.cpp
@@ -180,6 +180,7 @@ NOTES:
***************************************************************************/
+#include "emu.h"
#include "bus/midi/midi.h"
#include "cpu/m6809/m6809.h"
#include "sound/es5503.h"
diff --git a/src/mame/drivers/esq5505.cpp b/src/mame/drivers/esq5505.cpp
index a1703e291f3..59a44729f47 100644
--- a/src/mame/drivers/esq5505.cpp
+++ b/src/mame/drivers/esq5505.cpp
@@ -126,6 +126,7 @@
***************************************************************************/
+#include "emu.h"
#include <cstdio>
#include "bus/midi/midi.h"
diff --git a/src/mame/drivers/esqkt.cpp b/src/mame/drivers/esqkt.cpp
index 5540987f51d..dd08a9438a5 100644
--- a/src/mame/drivers/esqkt.cpp
+++ b/src/mame/drivers/esqkt.cpp
@@ -88,6 +88,7 @@
***************************************************************************/
+#include "emu.h"
#include "bus/midi/midi.h"
#include "cpu/m68000/m68000.h"
#include "cpu/es5510/es5510.h"
diff --git a/src/mame/drivers/eti660.cpp b/src/mame/drivers/eti660.cpp
index aabf6e6b055..ddf6610f8ed 100644
--- a/src/mame/drivers/eti660.cpp
+++ b/src/mame/drivers/eti660.cpp
@@ -36,6 +36,7 @@
**************************************************************************************************/
+#include "emu.h"
#include "includes/eti660.h"
/* Read/Write Handlers */
diff --git a/src/mame/drivers/exp85.cpp b/src/mame/drivers/exp85.cpp
index 82d2c679f98..56849f2d3c3 100644
--- a/src/mame/drivers/exp85.cpp
+++ b/src/mame/drivers/exp85.cpp
@@ -29,6 +29,7 @@
*/
+#include "emu.h"
#include "includes/exp85.h"
#include "cpu/i8085/i8085.h"
#include "machine/i8155.h"
diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp
index b7d10af30f3..63eeebcbef4 100644
--- a/src/mame/drivers/fidel6502.cpp
+++ b/src/mame/drivers/fidel6502.cpp
@@ -383,6 +383,7 @@ I/O is via TTL, very similar to Designer Display
******************************************************************************/
+#include "emu.h"
#include "includes/fidelbase.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/r65c02.h"
diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp
index d0eff017227..3269d6d0c10 100644
--- a/src/mame/drivers/fidel68k.cpp
+++ b/src/mame/drivers/fidel68k.cpp
@@ -153,6 +153,7 @@ B0000x-xxxxxx: see V7, -800000
******************************************************************************/
+#include "emu.h"
#include "includes/fidelbase.h"
#include "cpu/m68000/m68000.h"
#include "machine/ram.h"
diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp
index 6b15a1ee86d..ee2f479489d 100644
--- a/src/mame/drivers/fidelz80.cpp
+++ b/src/mame/drivers/fidelz80.cpp
@@ -489,6 +489,7 @@ expect that the software reads these once on startup only.
******************************************************************************/
+#include "emu.h"
#include "includes/fidelbase.h"
#include "cpu/z80/z80.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/drivers/flicker.cpp b/src/mame/drivers/flicker.cpp
index b054c810054..2d5747ed358 100644
--- a/src/mame/drivers/flicker.cpp
+++ b/src/mame/drivers/flicker.cpp
@@ -19,6 +19,7 @@
************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/i4004/i4004.h"
#include "flicker.lh"
diff --git a/src/mame/drivers/fmtowns.cpp b/src/mame/drivers/fmtowns.cpp
index e434afa7888..183199157f1 100644
--- a/src/mame/drivers/fmtowns.cpp
+++ b/src/mame/drivers/fmtowns.cpp
@@ -176,6 +176,7 @@ Notes:
*/
+#include "emu.h"
#include "includes/fmtowns.h"
#include "bus/scsi/scsi.h"
#include "bus/scsi/scsihd.h"
diff --git a/src/mame/drivers/g627.cpp b/src/mame/drivers/g627.cpp
index 7631bc5bbaf..27ae304b3b9 100644
--- a/src/mame/drivers/g627.cpp
+++ b/src/mame/drivers/g627.cpp
@@ -39,6 +39,7 @@ ToDo:
*******************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
#include "machine/i8155.h"
diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp
index bb81a8c1fcc..bca05374642 100644
--- a/src/mame/drivers/galaga.cpp
+++ b/src/mame/drivers/galaga.cpp
@@ -699,6 +699,7 @@ TODO:
***************************************************************************/
#include "emu.h"
+#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/mb88xx/mb88xx.h"
#include "machine/atari_vg.h"
diff --git a/src/mame/drivers/gamecom.cpp b/src/mame/drivers/gamecom.cpp
index 63187d1124b..5f0d2ef985b 100644
--- a/src/mame/drivers/gamecom.cpp
+++ b/src/mame/drivers/gamecom.cpp
@@ -23,6 +23,7 @@ Game Status:
***************************************************************************/
+#include "emu.h"
#include "includes/gamecom.h"
#include "sound/volt_reg.h"
#include "softlist.h"
diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp
index ece752481fd..dd482a398c2 100644
--- a/src/mame/drivers/gottlieb.cpp
+++ b/src/mame/drivers/gottlieb.cpp
@@ -196,6 +196,7 @@ VBlank duration: 1/VSYNC * (16/256) = 1017.6 us
***************************************************************************/
+#include "emu.h"
#include "includes/gottlieb.h"
#include "machine/nvram.h"
#include "machine/watchdog.h"
diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp
index cd67da0dd9e..061e70e2fe6 100644
--- a/src/mame/drivers/gp_1.cpp
+++ b/src/mame/drivers/gp_1.cpp
@@ -19,6 +19,7 @@ ToDo:
********************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/drivers/gp_2.cpp b/src/mame/drivers/gp_2.cpp
index 1b568fb10e5..1636b36a47a 100644
--- a/src/mame/drivers/gp_2.cpp
+++ b/src/mame/drivers/gp_2.cpp
@@ -33,6 +33,7 @@ ToDo:
******************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/drivers/gts1.cpp b/src/mame/drivers/gts1.cpp
index 1c41a60b6d0..561272aeec5 100644
--- a/src/mame/drivers/gts1.cpp
+++ b/src/mame/drivers/gts1.cpp
@@ -66,6 +66,7 @@ ToDo:
*****************************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "machine/ra17xx.h"
#include "machine/r10696.h"
diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp
index 8cd6912fafa..b9a32fe3365 100644
--- a/src/mame/drivers/gts3.cpp
+++ b/src/mame/drivers/gts3.cpp
@@ -30,6 +30,7 @@ ToDo:
*****************************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6502/m65c02.h"
#include "machine/6522via.h"
diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp
index d567ad00609..8dece23ecf8 100644
--- a/src/mame/drivers/gts3a.cpp
+++ b/src/mame/drivers/gts3a.cpp
@@ -18,6 +18,7 @@ ToDo:
*****************************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6502/m65c02.h"
#include "machine/6522via.h"
diff --git a/src/mame/drivers/gts80.cpp b/src/mame/drivers/gts80.cpp
index bf6ec22fbcf..22ad342b9a0 100644
--- a/src/mame/drivers/gts80.cpp
+++ b/src/mame/drivers/gts80.cpp
@@ -24,6 +24,7 @@ ToDO:
************************************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "audio/gottlieb.h"
#include "gts80.lh"
diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp
index ec1dbc032a9..0521c7986a3 100644
--- a/src/mame/drivers/gts80a.cpp
+++ b/src/mame/drivers/gts80a.cpp
@@ -11,6 +11,7 @@
*****************************************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "audio/gottlieb.h"
#include "cpu/i86/i86.h"
diff --git a/src/mame/drivers/gts80b.cpp b/src/mame/drivers/gts80b.cpp
index 516ceb7fbf9..d4fef36b9df 100644
--- a/src/mame/drivers/gts80b.cpp
+++ b/src/mame/drivers/gts80b.cpp
@@ -13,6 +13,7 @@
*****************************************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "audio/gottlieb.h"
#include "cpu/i86/i86.h"
diff --git a/src/mame/drivers/h89.cpp b/src/mame/drivers/h89.cpp
index 5b0aac8ce2d..6a97596b8e6 100644
--- a/src/mame/drivers/h89.cpp
+++ b/src/mame/drivers/h89.cpp
@@ -19,6 +19,7 @@
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
#include "machine/ins8250.h"
diff --git a/src/mame/drivers/hankin.cpp b/src/mame/drivers/hankin.cpp
index e19031b9898..bb33f715794 100644
--- a/src/mame/drivers/hankin.cpp
+++ b/src/mame/drivers/hankin.cpp
@@ -15,6 +15,7 @@ ToDo:
***********************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp
index b3ebab82e95..2dddee91c80 100644
--- a/src/mame/drivers/hh_tms1k.cpp
+++ b/src/mame/drivers/hh_tms1k.cpp
@@ -131,6 +131,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/hh_tms1k.h"
#include "machine/tms1024.h"
#include "video/hlcd0515.h"
diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp
index e3e23f3226b..f5e955eb68c 100644
--- a/src/mame/drivers/hh_ucom4.cpp
+++ b/src/mame/drivers/hh_ucom4.cpp
@@ -66,6 +66,7 @@ TODO:
***************************************************************************/
+#include "emu.h"
#include "includes/hh_ucom4.h"
#include "video/hlcd0515.h"
diff --git a/src/mame/drivers/horizon.cpp b/src/mame/drivers/horizon.cpp
index 01d9ba0fa0d..895b8150437 100644
--- a/src/mame/drivers/horizon.cpp
+++ b/src/mame/drivers/horizon.cpp
@@ -32,6 +32,7 @@
*/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "bus/s100/s100.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/ht68k.cpp b/src/mame/drivers/ht68k.cpp
index 637672a636a..0a810999b29 100644
--- a/src/mame/drivers/ht68k.cpp
+++ b/src/mame/drivers/ht68k.cpp
@@ -28,6 +28,7 @@ Lot of infos available at: http://www.classiccmp.org/cini/ht68k.htm
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
#include "machine/mc68681.h"
diff --git a/src/mame/drivers/huebler.cpp b/src/mame/drivers/huebler.cpp
index 24a2cde6605..fe64583f3fc 100644
--- a/src/mame/drivers/huebler.cpp
+++ b/src/mame/drivers/huebler.cpp
@@ -20,6 +20,7 @@
*/
+#include "emu.h"
#include "includes/huebler.h"
/* Keyboard */
diff --git a/src/mame/drivers/hx20.cpp b/src/mame/drivers/hx20.cpp
index 15b46fa578e..1b687435454 100644
--- a/src/mame/drivers/hx20.cpp
+++ b/src/mame/drivers/hx20.cpp
@@ -26,6 +26,7 @@
*/
+#include "emu.h"
#include "includes/hx20.h"
#include "softlist.h"
diff --git a/src/mame/drivers/idsa.cpp b/src/mame/drivers/idsa.cpp
index 3df6f9cd924..eb88a57cf5b 100644
--- a/src/mame/drivers/idsa.cpp
+++ b/src/mame/drivers/idsa.cpp
@@ -25,6 +25,7 @@ ToDO:
**********************************************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/imds2.cpp b/src/mame/drivers/imds2.cpp
index 46edcaa687b..d515f81da33 100644
--- a/src/mame/drivers/imds2.cpp
+++ b/src/mame/drivers/imds2.cpp
@@ -87,6 +87,7 @@
// prompt should appear. A command that could be tried is "DIR" that lists
// the content of floppy disk.
+#include "emu.h"
#include "includes/imds2.h"
// CPU oscillator of IPC board: 8 MHz
diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp
index 67c7bf014d2..186aa73e39f 100644
--- a/src/mame/drivers/inder.cpp
+++ b/src/mame/drivers/inder.cpp
@@ -28,6 +28,7 @@
********************************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
diff --git a/src/mame/drivers/inderp.cpp b/src/mame/drivers/inderp.cpp
index dde165fd30c..140b6c103c3 100644
--- a/src/mame/drivers/inderp.cpp
+++ b/src/mame/drivers/inderp.cpp
@@ -18,6 +18,7 @@ DISPLAY: 6-digit, both 9-segment & 7-segment panels with direct segment access
SOUND: simple tones, needs comparison with real machine
*/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/drivers/indiana.cpp b/src/mame/drivers/indiana.cpp
index 7852506df7a..944183ef999 100644
--- a/src/mame/drivers/indiana.cpp
+++ b/src/mame/drivers/indiana.cpp
@@ -14,6 +14,7 @@
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/keyboard.h"
#include "cpu/m68000/m68000.h"
#include "bus/isa/isa.h"
diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp
index 9cc9264f608..07207f62d94 100644
--- a/src/mame/drivers/interpro.cpp
+++ b/src/mame/drivers/interpro.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Patrick Mackinlay
+#include "emu.h"
#include "includes/interpro.h"
#include "debugger.h"
diff --git a/src/mame/drivers/isbc.cpp b/src/mame/drivers/isbc.cpp
index 23972996865..9e8d648e93d 100644
--- a/src/mame/drivers/isbc.cpp
+++ b/src/mame/drivers/isbc.cpp
@@ -16,6 +16,7 @@ able to deal with 256byte sectors so fails to load the irmx 512byte sector image
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/i86/i86.h"
#include "cpu/i86/i286.h"
diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp
index 9977c942037..c87ae070ac9 100644
--- a/src/mame/drivers/jeutel.cpp
+++ b/src/mame/drivers/jeutel.cpp
@@ -15,6 +15,7 @@ ToDo:
********************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
diff --git a/src/mame/drivers/jp.cpp b/src/mame/drivers/jp.cpp
index f2150c0f5f1..05544cc96d5 100644
--- a/src/mame/drivers/jp.cpp
+++ b/src/mame/drivers/jp.cpp
@@ -17,6 +17,7 @@ ToDo:
*******************************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp
index 1086bf0cf1b..005b1fbf314 100644
--- a/src/mame/drivers/kaypro.cpp
+++ b/src/mame/drivers/kaypro.cpp
@@ -41,6 +41,7 @@
**************************************************************************************************/
+#include "emu.h"
#include "includes/kaypro.h"
#include "machine/kay_kbd.h"
#include "formats/kaypro_dsk.h"
diff --git a/src/mame/drivers/kim1.cpp b/src/mame/drivers/kim1.cpp
index dec653838a9..23fa7bdf16a 100644
--- a/src/mame/drivers/kim1.cpp
+++ b/src/mame/drivers/kim1.cpp
@@ -58,6 +58,7 @@ TODO:
- add TTY support
******************************************************************************/
+#include "emu.h"
#include "includes/kim1.h"
#include "kim1.lh"
diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp
index 3db748fa0bb..442515fe917 100644
--- a/src/mame/drivers/ksys573.cpp
+++ b/src/mame/drivers/ksys573.cpp
@@ -344,6 +344,7 @@ G: gun mania only, drives air soft gun (this game uses real BB bullet)
*/
+#include "emu.h"
#include "cpu/psx/psx.h"
#include "machine/adc083x.h"
#include "machine/ataintf.h"
diff --git a/src/mame/drivers/kyocera.cpp b/src/mame/drivers/kyocera.cpp
index 59beb7683cb..c85d295cccc 100644
--- a/src/mame/drivers/kyocera.cpp
+++ b/src/mame/drivers/kyocera.cpp
@@ -66,6 +66,7 @@
*/
+#include "emu.h"
#include "includes/kyocera.h"
#include "softlist.h"
diff --git a/src/mame/drivers/lc80.cpp b/src/mame/drivers/lc80.cpp
index 34017c6c373..ec3f438297e 100644
--- a/src/mame/drivers/lc80.cpp
+++ b/src/mame/drivers/lc80.cpp
@@ -41,6 +41,7 @@
*/
+#include "emu.h"
#include "includes/lc80.h"
#include "lc80.lh"
diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp
index e2faf3bf50c..dd73108bab9 100644
--- a/src/mame/drivers/llc.cpp
+++ b/src/mame/drivers/llc.cpp
@@ -47,6 +47,7 @@
*******************************************************************************/
+#include "emu.h"
#include "machine/keyboard.h"
#include "includes/llc.h"
#include "llc1.lh"
diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp
index df1259f3ef3..a6fe6c1834d 100644
--- a/src/mame/drivers/ltd.cpp
+++ b/src/mame/drivers/ltd.cpp
@@ -40,6 +40,7 @@ ToDo:
********************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/macp.cpp b/src/mame/drivers/macp.cpp
index be5d72cc72d..2ac419edd5a 100644
--- a/src/mame/drivers/macp.cpp
+++ b/src/mame/drivers/macp.cpp
@@ -3,6 +3,7 @@
// PINBALL
// Skeleton driver for MAC S.A. and CICPlay pinballs. ROM definitions taken from PinMAME.
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
#include "machine/i8279.h"
diff --git a/src/mame/drivers/mbc55x.cpp b/src/mame/drivers/mbc55x.cpp
index 36e7a614399..836e408e91c 100644
--- a/src/mame/drivers/mbc55x.cpp
+++ b/src/mame/drivers/mbc55x.cpp
@@ -16,6 +16,7 @@ ToDo:
*/
+#include "emu.h"
#include "includes/mbc55x.h"
#include "softlist.h"
diff --git a/src/mame/drivers/mbee.cpp b/src/mame/drivers/mbee.cpp
index f884c943034..5ca412febef 100644
--- a/src/mame/drivers/mbee.cpp
+++ b/src/mame/drivers/mbee.cpp
@@ -123,6 +123,7 @@ from Brett Selwood and Andrew Davies.
*******************************************************************************/
+#include "emu.h"
#include "includes/mbee.h"
#include "formats/mbee_cas.h"
diff --git a/src/mame/drivers/mc80.cpp b/src/mame/drivers/mc80.cpp
index 987a598ca0c..967fc67f637 100644
--- a/src/mame/drivers/mc80.cpp
+++ b/src/mame/drivers/mc80.cpp
@@ -19,6 +19,7 @@ for various things, but none of that is working.
****************************************************************************/
+#include "emu.h"
#include "includes/mc80.h"
static ADDRESS_MAP_START(mc8020_mem, AS_PROGRAM, 8, mc80_state)
diff --git a/src/mame/drivers/meadows.cpp b/src/mame/drivers/meadows.cpp
index f3613b190f8..8fdc182ae61 100644
--- a/src/mame/drivers/meadows.cpp
+++ b/src/mame/drivers/meadows.cpp
@@ -118,6 +118,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/meadows.h"
#include "sound/volt_reg.h"
#include "deadeye.lh"
diff --git a/src/mame/drivers/micropin.cpp b/src/mame/drivers/micropin.cpp
index 476ba8b7ed1..91b55f3477d 100644
--- a/src/mame/drivers/micropin.cpp
+++ b/src/mame/drivers/micropin.cpp
@@ -21,6 +21,7 @@ ToDo:
**************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "cpu/i8085/i8085.h"
diff --git a/src/mame/drivers/mikromik.cpp b/src/mame/drivers/mikromik.cpp
index 2de2afac5e6..8cbeaed5fdf 100644
--- a/src/mame/drivers/mikromik.cpp
+++ b/src/mame/drivers/mikromik.cpp
@@ -52,6 +52,7 @@
*/
+#include "emu.h"
#include "includes/mikromik.h"
#include "softlist.h"
diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp
index f3049cc686c..378252a0563 100644
--- a/src/mame/drivers/mpf1.cpp
+++ b/src/mame/drivers/mpf1.cpp
@@ -48,6 +48,7 @@
*/
+#include "emu.h"
#include "includes/mpf1.h"
#include "mpf1.lh"
#include "mpf1b.lh"
diff --git a/src/mame/drivers/mpz80.cpp b/src/mame/drivers/mpz80.cpp
index e4310af2b8f..8e8277a16f0 100644
--- a/src/mame/drivers/mpz80.cpp
+++ b/src/mame/drivers/mpz80.cpp
@@ -41,6 +41,7 @@
*/
+#include "emu.h"
#include "includes/mpz80.h"
#include "softlist.h"
diff --git a/src/mame/drivers/msx.cpp b/src/mame/drivers/msx.cpp
index 1bde43002ba..392cb575a2f 100644
--- a/src/mame/drivers/msx.cpp
+++ b/src/mame/drivers/msx.cpp
@@ -526,6 +526,7 @@ PCB Layouts missing
*/
+#include "emu.h"
#include "includes/msx.h"
#include "formats/dsk_dsk.h"
#include "formats/dmk_dsk.h"
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index 9463e1188d6..b06bc7d9f41 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -181,6 +181,7 @@ below are simply made to the banking address to run on other boards.
+---+-----------------+---+---+------------------+---+
*/
+#include "emu.h"
#include "includes/multfish.h"
TILE_GET_INFO_MEMBER(igrosoft_gamble_state::get_igrosoft_gamble_tile_info)
diff --git a/src/mame/drivers/multfish_boot.cpp b/src/mame/drivers/multfish_boot.cpp
index 61f560bac8d..340fd09c9ca 100644
--- a/src/mame/drivers/multfish_boot.cpp
+++ b/src/mame/drivers/multfish_boot.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#include "emu.h"
#include "includes/multfish.h"
diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp
index f36ebfc55e5..861eb19f318 100644
--- a/src/mame/drivers/mx2178.cpp
+++ b/src/mame/drivers/mx2178.cpp
@@ -19,6 +19,7 @@
***************************************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
#include "video/mc6845.h"
diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp
index cbba39680b1..13f1eb7d50e 100644
--- a/src/mame/drivers/mz80.cpp
+++ b/src/mame/drivers/mz80.cpp
@@ -28,6 +28,7 @@ MZ80B
****************************************************************************/
+#include "emu.h"
#include "includes/mz80.h"
#include "formats/mz_cas.h"
diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp
index 8c1fe03c27c..80fb3dcc764 100644
--- a/src/mame/drivers/newbrain.cpp
+++ b/src/mame/drivers/newbrain.cpp
@@ -48,6 +48,7 @@
*/
+#include "emu.h"
#include "includes/newbrain.h"
#include "newbrain.lh"
#include "newbraina.lh"
diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp
index 7fff206f5c8..40d04fa363a 100644
--- a/src/mame/drivers/next.cpp
+++ b/src/mame/drivers/next.cpp
@@ -25,6 +25,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/next.h"
#include "formats/pc_dsk.h"
#include "formats/mfi_dsk.h"
diff --git a/src/mame/drivers/notetaker.cpp b/src/mame/drivers/notetaker.cpp
index 6697436548d..36ad2a4e6d7 100644
--- a/src/mame/drivers/notetaker.cpp
+++ b/src/mame/drivers/notetaker.cpp
@@ -75,6 +75,7 @@ DONE:
- both cpus boot, reset and system int controls are accessed at fffea from either cpu; emulatorcpu's 8k of ram lives at the beginning of its address space, but can be disabled in favor of mainram at the same addresses
*/
+#include "emu.h"
#include "cpu/i86/i86.h"
#include "machine/ay31015.h"
#include "machine/pic8259.h"
diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp
index 2d23998c0c8..019ac0d8595 100644
--- a/src/mame/drivers/novag6502.cpp
+++ b/src/mame/drivers/novag6502.cpp
@@ -52,6 +52,7 @@ instead of magnet sensors.
******************************************************************************/
+#include "emu.h"
#include "includes/novagbase.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/m65c02.h"
diff --git a/src/mame/drivers/novag68k.cpp b/src/mame/drivers/novag68k.cpp
index 7319344d262..af7c4efa693 100644
--- a/src/mame/drivers/novag68k.cpp
+++ b/src/mame/drivers/novag68k.cpp
@@ -24,6 +24,7 @@ Diablo 68000:
******************************************************************************/
+#include "emu.h"
#include "includes/novagbase.h"
#include "cpu/m68000/m68000.h"
#include "machine/mos6551.h"
diff --git a/src/mame/drivers/nsm.cpp b/src/mame/drivers/nsm.cpp
index e78733c82a1..cab7f8820ac 100644
--- a/src/mame/drivers/nsm.cpp
+++ b/src/mame/drivers/nsm.cpp
@@ -17,6 +17,7 @@ ToDo:
*********************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/tms9900/tms9995.h"
diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp
index 7f1909d61e8..876b9cfed00 100644
--- a/src/mame/drivers/nyny.cpp
+++ b/src/mame/drivers/nyny.cpp
@@ -64,6 +64,7 @@
***************************************************************************/
#include "emu.h"
+#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/ob68k1a.cpp b/src/mame/drivers/ob68k1a.cpp
index a5e41b89165..2379a3ea0ea 100644
--- a/src/mame/drivers/ob68k1a.cpp
+++ b/src/mame/drivers/ob68k1a.cpp
@@ -60,6 +60,7 @@ Notes:
*/
+#include "emu.h"
#include "includes/ob68k1a.h"
diff --git a/src/mame/drivers/osi.cpp b/src/mame/drivers/osi.cpp
index 8559f07867d..9117ee0dd57 100644
--- a/src/mame/drivers/osi.cpp
+++ b/src/mame/drivers/osi.cpp
@@ -216,6 +216,7 @@ PRINT FRE(0)
*/
+#include "emu.h"
#include "includes/osi.h"
#include "machine/clock.h"
diff --git a/src/mame/drivers/p2000t.cpp b/src/mame/drivers/p2000t.cpp
index 8d518f794aa..1e512cf4e95 100644
--- a/src/mame/drivers/p2000t.cpp
+++ b/src/mame/drivers/p2000t.cpp
@@ -28,6 +28,7 @@ Philips P2000 1 Memory map
************************************************************************/
+#include "emu.h"
#include "includes/p2000t.h"
diff --git a/src/mame/drivers/pc1512.cpp b/src/mame/drivers/pc1512.cpp
index 758ac61d1f1..535102971f7 100644
--- a/src/mame/drivers/pc1512.cpp
+++ b/src/mame/drivers/pc1512.cpp
@@ -92,6 +92,7 @@ PC1640-HD20: Amstrad 40095 (Alps DRMD20A12A), Tandon TM-262 [-chs 615,4,17 -ss 5
PC1640-HD30: Western Digital 95038 [-chs 615,6,17 -ss 512]
*/
+#include "emu.h"
#include "includes/pc1512.h"
#include "bus/rs232/rs232.h"
#include "bus/isa/ega.h"
diff --git a/src/mame/drivers/pc8001.cpp b/src/mame/drivers/pc8001.cpp
index b984d374d10..e48b6b4844a 100644
--- a/src/mame/drivers/pc8001.cpp
+++ b/src/mame/drivers/pc8001.cpp
@@ -23,6 +23,7 @@
*/
+#include "emu.h"
#include "includes/pc8001.h"
/* Read/Write Handlers */
diff --git a/src/mame/drivers/pc8401a.cpp b/src/mame/drivers/pc8401a.cpp
index bfc0dfcb7b4..d53e5c91fe0 100644
--- a/src/mame/drivers/pc8401a.cpp
+++ b/src/mame/drivers/pc8401a.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
+#include "emu.h"
#include "includes/pc8401a.h"
/*
diff --git a/src/mame/drivers/pcw16.cpp b/src/mame/drivers/pcw16.cpp
index bd8e60054d0..8e53b675631 100644
--- a/src/mame/drivers/pcw16.cpp
+++ b/src/mame/drivers/pcw16.cpp
@@ -89,6 +89,7 @@ TODO:
epp/ecp modes in parallel port not supported yet
so ui disabled */
+#include "emu.h"
#include "includes/pcw16.h"
#include "bus/rs232/rs232.h"
#include "bus/rs232/ser_mouse.h"
diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp
index 91f5fb46bf8..aeafb8576bc 100644
--- a/src/mame/drivers/peyper.cpp
+++ b/src/mame/drivers/peyper.cpp
@@ -33,6 +33,7 @@ ToDo:
*********************************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
#include "machine/i8279.h"
diff --git a/src/mame/drivers/phc25.cpp b/src/mame/drivers/phc25.cpp
index e1bbc6ccb83..a009bc99fc8 100644
--- a/src/mame/drivers/phc25.cpp
+++ b/src/mame/drivers/phc25.cpp
@@ -37,6 +37,7 @@ RUN
*****************************************************************************/
+#include "emu.h"
#include "includes/phc25.h"
/* Read/Write Handlers */
diff --git a/src/mame/drivers/pipbug.cpp b/src/mame/drivers/pipbug.cpp
index 8b754ccc075..295d04ee1c9 100644
--- a/src/mame/drivers/pipbug.cpp
+++ b/src/mame/drivers/pipbug.cpp
@@ -37,6 +37,7 @@
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/s2650/s2650.h"
#include "machine/terminal.h"
diff --git a/src/mame/drivers/play_1.cpp b/src/mame/drivers/play_1.cpp
index 1f8638cfb99..c5109c99bac 100644
--- a/src/mame/drivers/play_1.cpp
+++ b/src/mame/drivers/play_1.cpp
@@ -20,6 +20,7 @@ Others: When starting the game, hold down X, then release and hit Z, otherwise
**********************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/cosmac/cosmac.h"
#include "machine/clock.h"
diff --git a/src/mame/drivers/play_2.cpp b/src/mame/drivers/play_2.cpp
index c82e80a76cf..d5f294c9e24 100644
--- a/src/mame/drivers/play_2.cpp
+++ b/src/mame/drivers/play_2.cpp
@@ -31,6 +31,7 @@ Notes:
***********************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/cosmac/cosmac.h"
#include "cpu/cop400/cop400.h"
diff --git a/src/mame/drivers/play_3.cpp b/src/mame/drivers/play_3.cpp
index 1a6457dabf6..8f07acf7d1e 100644
--- a/src/mame/drivers/play_3.cpp
+++ b/src/mame/drivers/play_3.cpp
@@ -43,6 +43,7 @@ The manual is not that clear, there's a lot we don't know, this *seems* to work.
***********************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/cosmac/cosmac.h"
#include "machine/clock.h"
diff --git a/src/mame/drivers/poly880.cpp b/src/mame/drivers/poly880.cpp
index 0e2cb9b50b5..2716c8f9442 100644
--- a/src/mame/drivers/poly880.cpp
+++ b/src/mame/drivers/poly880.cpp
@@ -26,6 +26,7 @@ Test Paste:
****************************************************************************/
+#include "emu.h"
#include "includes/poly880.h"
#include "poly880.lh"
diff --git a/src/mame/drivers/pp01.cpp b/src/mame/drivers/pp01.cpp
index 3ebde2d08ce..2ef15721130 100644
--- a/src/mame/drivers/pp01.cpp
+++ b/src/mame/drivers/pp01.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/pp01.h"
diff --git a/src/mame/drivers/prof80.cpp b/src/mame/drivers/prof80.cpp
index 22efc3db53f..0b94343cdcd 100644
--- a/src/mame/drivers/prof80.cpp
+++ b/src/mame/drivers/prof80.cpp
@@ -25,6 +25,7 @@
*/
+#include "emu.h"
#include "includes/prof80.h"
#include "softlist.h"
diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp
index afa12781d97..4c8baad4221 100644
--- a/src/mame/drivers/psikyo4.cpp
+++ b/src/mame/drivers/psikyo4.cpp
@@ -129,6 +129,7 @@ ROMs -
----------------------------------------------------------------*/
+#include "emu.h"
#include "includes/psikyo4.h"
#include "rendlay.h"
diff --git a/src/mame/drivers/pulsar.cpp b/src/mame/drivers/pulsar.cpp
index 88af384dc52..1953c805e4b 100644
--- a/src/mame/drivers/pulsar.cpp
+++ b/src/mame/drivers/pulsar.cpp
@@ -35,6 +35,7 @@ X - Test off-board memory banks
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp
index c411c30298b..0a06a626736 100644
--- a/src/mame/drivers/px4.cpp
+++ b/src/mame/drivers/px4.cpp
@@ -9,6 +9,7 @@
***************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp
index d698c77818b..23f9e0ee79c 100644
--- a/src/mame/drivers/px8.cpp
+++ b/src/mame/drivers/px8.cpp
@@ -29,6 +29,7 @@
*/
+#include "emu.h"
#include "includes/px8.h"
#include "softlist.h"
#include "px8.lh"
diff --git a/src/mame/drivers/qx10.cpp b/src/mame/drivers/qx10.cpp
index 775889cefe8..ef973a9b4e9 100644
--- a/src/mame/drivers/qx10.cpp
+++ b/src/mame/drivers/qx10.cpp
@@ -31,6 +31,7 @@
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
#include "machine/pit8253.h"
diff --git a/src/mame/drivers/rm380z.cpp b/src/mame/drivers/rm380z.cpp
index 61528ba1065..b5b7405b5f9 100644
--- a/src/mame/drivers/rm380z.cpp
+++ b/src/mame/drivers/rm380z.cpp
@@ -165,6 +165,7 @@ Module timer tag static_vblank_timer name m_expire.seconds
*/
+#include "emu.h"
#include "includes/rm380z.h"
static ADDRESS_MAP_START(rm380z_mem, AS_PROGRAM, 8, rm380z_state)
diff --git a/src/mame/drivers/rmnimbus.cpp b/src/mame/drivers/rmnimbus.cpp
index 18c5ce61947..acad5d477d7 100644
--- a/src/mame/drivers/rmnimbus.cpp
+++ b/src/mame/drivers/rmnimbus.cpp
@@ -9,6 +9,7 @@
*/
+#include "emu.h"
#include "includes/rmnimbus.h"
#include "cpu/mcs51/mcs51.h"
#include "imagedev/flopdrv.h"
diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp
index cbcd3747391..e7b5091223c 100644
--- a/src/mame/drivers/s11.cpp
+++ b/src/mame/drivers/s11.cpp
@@ -17,6 +17,7 @@ ToDo:
*****************************************************************************************/
+#include "emu.h"
#include "includes/s11.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp
index ef6b13f95f1..05eab97c7c2 100644
--- a/src/mame/drivers/s11a.cpp
+++ b/src/mame/drivers/s11a.cpp
@@ -20,6 +20,7 @@ Note: To start a game, certain switches need to be activated. You must first pr
*****************************************************************************************/
+#include "emu.h"
#include "includes/s11a.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp
index a4eaae54046..05443b13153 100644
--- a/src/mame/drivers/s11b.cpp
+++ b/src/mame/drivers/s11b.cpp
@@ -20,6 +20,7 @@
- Cyclone: Nothing. The game doesn't bother to check if the ball is ready before allowing start. Insert 1 or more credits first, of course.
*/
+#include "emu.h"
#include "includes/s11b.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp
index b0dab8dd151..0e7f18e46a7 100644
--- a/src/mame/drivers/s11c.cpp
+++ b/src/mame/drivers/s11c.cpp
@@ -4,6 +4,7 @@
Williams System 11c
*/
+#include "emu.h"
#include "includes/s11c.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/drivers/sage2.cpp b/src/mame/drivers/sage2.cpp
index 808679974a3..1246d559bf6 100644
--- a/src/mame/drivers/sage2.cpp
+++ b/src/mame/drivers/sage2.cpp
@@ -23,6 +23,7 @@
*/
+#include "emu.h"
#include "includes/sage2.h"
#include "bus/rs232/rs232.h"
#include "softlist.h"
diff --git a/src/mame/drivers/sdk86.cpp b/src/mame/drivers/sdk86.cpp
index 939b0f680ce..4ab2cbea9d9 100644
--- a/src/mame/drivers/sdk86.cpp
+++ b/src/mame/drivers/sdk86.cpp
@@ -26,6 +26,7 @@ ToDo:
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/i86/i86.h"
#include "machine/clock.h"
diff --git a/src/mame/drivers/sg1000.cpp b/src/mame/drivers/sg1000.cpp
index 0b055c86a8b..e0e64fd58b9 100644
--- a/src/mame/drivers/sg1000.cpp
+++ b/src/mame/drivers/sg1000.cpp
@@ -64,6 +64,7 @@ Notes:
*/
+#include "emu.h"
#include "includes/sg1000.h"
#include "bus/rs232/rs232.h"
#include "softlist.h"
diff --git a/src/mame/drivers/softbox.cpp b/src/mame/drivers/softbox.cpp
index ac3fe9256d0..42c552d2050 100644
--- a/src/mame/drivers/softbox.cpp
+++ b/src/mame/drivers/softbox.cpp
@@ -93,6 +93,7 @@
*/
+#include "emu.h"
#include "includes/softbox.h"
#include "bus/rs232/rs232.h"
#include "softlist.h"
diff --git a/src/mame/drivers/sorcerer.cpp b/src/mame/drivers/sorcerer.cpp
index 864db24d264..d6a6f3554ed 100644
--- a/src/mame/drivers/sorcerer.cpp
+++ b/src/mame/drivers/sorcerer.cpp
@@ -161,6 +161,7 @@ NOTES (2016-06-06)
********************************************************************************/
+#include "emu.h"
#include "includes/sorcerer.h"
#include "softlist.h"
diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp
index dc3c07ba188..479cdbffcc1 100644
--- a/src/mame/drivers/special.cpp
+++ b/src/mame/drivers/special.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/special.h"
#include "sound/volt_reg.h"
#include "softlist.h"
diff --git a/src/mame/drivers/spectra.cpp b/src/mame/drivers/spectra.cpp
index ffdd4b932cc..aca18c8f8cc 100644
--- a/src/mame/drivers/spectra.cpp
+++ b/src/mame/drivers/spectra.cpp
@@ -33,6 +33,7 @@
*******************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6502/m6502.h"
#include "machine/6532riot.h"
diff --git a/src/mame/drivers/spinb.cpp b/src/mame/drivers/spinb.cpp
index 806c8e99f14..6ed8ae51f9b 100644
--- a/src/mame/drivers/spinb.cpp
+++ b/src/mame/drivers/spinb.cpp
@@ -30,6 +30,7 @@ ToDo:
****************************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
#include "cpu/mcs51/mcs51.h"
diff --git a/src/mame/drivers/st_mp100.cpp b/src/mame/drivers/st_mp100.cpp
index df8da4447e4..e32d85abb60 100644
--- a/src/mame/drivers/st_mp100.cpp
+++ b/src/mame/drivers/st_mp100.cpp
@@ -15,6 +15,7 @@ ToDo:
*********************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/st_mp200.cpp b/src/mame/drivers/st_mp200.cpp
index 7d286d4b755..022cb119e68 100644
--- a/src/mame/drivers/st_mp200.cpp
+++ b/src/mame/drivers/st_mp200.cpp
@@ -16,6 +16,7 @@ ToDo:
*********************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp
index 15a7303e212..2d93a6f3718 100644
--- a/src/mame/drivers/sun3x.cpp
+++ b/src/mame/drivers/sun3x.cpp
@@ -129,6 +129,7 @@
****************************************************************************/
#include "emu.h"
+#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/timekpr.h"
#include "machine/z80scc.h"
diff --git a/src/mame/drivers/super6.cpp b/src/mame/drivers/super6.cpp
index b76e3dc3d97..9359722cb3b 100644
--- a/src/mame/drivers/super6.cpp
+++ b/src/mame/drivers/super6.cpp
@@ -11,6 +11,7 @@
*/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "includes/super6.h"
#include "softlist.h"
diff --git a/src/mame/drivers/superslave.cpp b/src/mame/drivers/superslave.cpp
index f1bc7ed9d88..8d2ec5de24b 100644
--- a/src/mame/drivers/superslave.cpp
+++ b/src/mame/drivers/superslave.cpp
@@ -20,6 +20,7 @@ Oxx,yy = Out port
****************************************************************************/
+#include "emu.h"
#include "includes/superslave.h"
diff --git a/src/mame/drivers/tandy2k.cpp b/src/mame/drivers/tandy2k.cpp
index 19c5ffcc043..f99b575f520 100644
--- a/src/mame/drivers/tandy2k.cpp
+++ b/src/mame/drivers/tandy2k.cpp
@@ -22,6 +22,7 @@
*/
+#include "emu.h"
#include "includes/tandy2k.h"
#include "machine/pckeybrd.h"
#include "softlist.h"
diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp
index fa81b914216..e6198db3d6f 100644
--- a/src/mame/drivers/tavernie.cpp
+++ b/src/mame/drivers/tavernie.cpp
@@ -48,6 +48,7 @@ Z - more scan lines per row (cursor is bigger)
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
diff --git a/src/mame/drivers/tb303.cpp b/src/mame/drivers/tb303.cpp
index c15c61e1dab..ceafffa8c73 100644
--- a/src/mame/drivers/tb303.cpp
+++ b/src/mame/drivers/tb303.cpp
@@ -14,6 +14,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/hh_ucom4.h"
#include "tb303.lh"
diff --git a/src/mame/drivers/tdv2324.cpp b/src/mame/drivers/tdv2324.cpp
index fcb6f5f57c1..ef0756c4a34 100644
--- a/src/mame/drivers/tdv2324.cpp
+++ b/src/mame/drivers/tdv2324.cpp
@@ -100,6 +100,7 @@
+#include "emu.h"
#include "includes/tdv2324.h"
#include "softlist.h"
diff --git a/src/mame/drivers/techno.cpp b/src/mame/drivers/techno.cpp
index cf1c13c24e5..bff00d4321d 100644
--- a/src/mame/drivers/techno.cpp
+++ b/src/mame/drivers/techno.cpp
@@ -14,6 +14,7 @@ ToDo:
***********************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m68000/m68000.h"
#include "techno.lh"
diff --git a/src/mame/drivers/tek405x.cpp b/src/mame/drivers/tek405x.cpp
index baf8f85d0ba..2ce8c38351f 100644
--- a/src/mame/drivers/tek405x.cpp
+++ b/src/mame/drivers/tek405x.cpp
@@ -25,6 +25,7 @@
*/
+#include "emu.h"
#include "includes/tek405x.h"
#include "softlist.h"
diff --git a/src/mame/drivers/thomson.cpp b/src/mame/drivers/thomson.cpp
index 1fed3eb538a..d08ae214174 100644
--- a/src/mame/drivers/thomson.cpp
+++ b/src/mame/drivers/thomson.cpp
@@ -76,6 +76,7 @@
*/
+#include "emu.h"
#include "includes/thomson.h"
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/drivers/ticalc1x.cpp b/src/mame/drivers/ticalc1x.cpp
index 2eec28f1d22..40f27fce750 100644
--- a/src/mame/drivers/ticalc1x.cpp
+++ b/src/mame/drivers/ticalc1x.cpp
@@ -18,6 +18,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/hh_tms1k.h"
// internal artwork
diff --git a/src/mame/drivers/tiki100.cpp b/src/mame/drivers/tiki100.cpp
index a21e62853bf..6104269de12 100644
--- a/src/mame/drivers/tiki100.cpp
+++ b/src/mame/drivers/tiki100.cpp
@@ -22,6 +22,7 @@
*/
+#include "emu.h"
#include "includes/tiki100.h"
#include "softlist.h"
diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp
index e5fe4410109..ab986c29b12 100644
--- a/src/mame/drivers/tispeak.cpp
+++ b/src/mame/drivers/tispeak.cpp
@@ -398,6 +398,7 @@ K28 modules:
***************************************************************************/
+#include "emu.h"
#include "includes/hh_tms1k.h"
#include "sound/tms5110.h"
#include "machine/tms6100.h"
diff --git a/src/mame/drivers/tispellb.cpp b/src/mame/drivers/tispellb.cpp
index dfe0439207c..00a2f492878 100644
--- a/src/mame/drivers/tispellb.cpp
+++ b/src/mame/drivers/tispellb.cpp
@@ -56,6 +56,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/hh_tms1k.h"
#include "machine/tms6100.h"
diff --git a/src/mame/drivers/tmc1800.cpp b/src/mame/drivers/tmc1800.cpp
index e14ef133b13..432aadc2e86 100644
--- a/src/mame/drivers/tmc1800.cpp
+++ b/src/mame/drivers/tmc1800.cpp
@@ -113,6 +113,7 @@ Notes:
*/
+#include "emu.h"
#include "includes/tmc1800.h"
#include "sound/beep.h"
diff --git a/src/mame/drivers/tmc2000e.cpp b/src/mame/drivers/tmc2000e.cpp
index 8291efb580b..81185e93e83 100644
--- a/src/mame/drivers/tmc2000e.cpp
+++ b/src/mame/drivers/tmc2000e.cpp
@@ -31,6 +31,7 @@
*/
+#include "emu.h"
#include "includes/tmc2000e.h"
/* Read/Write Handlers */
diff --git a/src/mame/drivers/tmc600.cpp b/src/mame/drivers/tmc600.cpp
index 06b1c116118..a0f940a1006 100644
--- a/src/mame/drivers/tmc600.cpp
+++ b/src/mame/drivers/tmc600.cpp
@@ -81,6 +81,7 @@ Notes:
*/
+#include "emu.h"
#include "includes/tmc600.h"
/* Read/Write Handlers */
diff --git a/src/mame/drivers/tr606.cpp b/src/mame/drivers/tr606.cpp
index 4fd0e50141e..0b99d9992a3 100644
--- a/src/mame/drivers/tr606.cpp
+++ b/src/mame/drivers/tr606.cpp
@@ -14,6 +14,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/hh_ucom4.h"
#include "tr606.lh"
diff --git a/src/mame/drivers/tranz330.cpp b/src/mame/drivers/tranz330.cpp
index 07388863da5..a77efc57efe 100644
--- a/src/mame/drivers/tranz330.cpp
+++ b/src/mame/drivers/tranz330.cpp
@@ -20,6 +20,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/tranz330.h"
#include "tranz330.lh"
diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp
index b5800cae666..c62f0b23407 100644
--- a/src/mame/drivers/trs80.cpp
+++ b/src/mame/drivers/trs80.cpp
@@ -135,6 +135,7 @@ There don't seem to be any JV1 boot disks for Model III/4.
***************************************************************************/
+#include "emu.h"
#include "includes/trs80.h"
#include "formats/trs80_dsk.h"
#include "formats/dmk_dsk.h"
diff --git a/src/mame/drivers/trs80m2.cpp b/src/mame/drivers/trs80m2.cpp
index f8d7097aaad..11d41386006 100644
--- a/src/mame/drivers/trs80m2.cpp
+++ b/src/mame/drivers/trs80m2.cpp
@@ -21,6 +21,7 @@
*/
+#include "emu.h"
#include "includes/trs80m2.h"
#include "softlist.h"
diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp
index 3c66e2d6165..0a65815816a 100644
--- a/src/mame/drivers/ut88.cpp
+++ b/src/mame/drivers/ut88.cpp
@@ -22,6 +22,7 @@ Paste facility was tested but doesn't work, so all code remnants removed.
****************************************************************************/
+#include "emu.h"
#include "includes/ut88.h"
#include "formats/rk_cas.h"
#include "softlist.h"
diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp
index 945ea8895c7..53772cbbbd6 100644
--- a/src/mame/drivers/v1050.cpp
+++ b/src/mame/drivers/v1050.cpp
@@ -149,6 +149,7 @@ Notes:
*/
+#include "emu.h"
#include "includes/v1050.h"
#include "bus/rs232/rs232.h"
#include "softlist.h"
diff --git a/src/mame/drivers/vc4000.cpp b/src/mame/drivers/vc4000.cpp
index f188ab231b1..cbb93613e74 100644
--- a/src/mame/drivers/vc4000.cpp
+++ b/src/mame/drivers/vc4000.cpp
@@ -131,6 +131,7 @@ Q-0900^76203F0161063005080E492DCD4890597877103F020E75105A0A0C1E89F4101879
******************************************************************************/
+#include "emu.h"
#include "includes/vc4000.h"
#include "softlist.h"
diff --git a/src/mame/drivers/vcs80.cpp b/src/mame/drivers/vcs80.cpp
index 4fe93fc9196..eea5014f8bc 100644
--- a/src/mame/drivers/vcs80.cpp
+++ b/src/mame/drivers/vcs80.cpp
@@ -33,6 +33,7 @@ store new data and increment the address.
****************************************************************************/
+#include "emu.h"
#include "includes/vcs80.h"
#include "vcs80.lh"
diff --git a/src/mame/drivers/vd.cpp b/src/mame/drivers/vd.cpp
index 1c21b879cee..bec44471b92 100644
--- a/src/mame/drivers/vd.cpp
+++ b/src/mame/drivers/vd.cpp
@@ -15,6 +15,7 @@
***************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/z80/z80.h"
#include "sound/ay8910.h"
diff --git a/src/mame/drivers/vector06.cpp b/src/mame/drivers/vector06.cpp
index c80be681c88..8567fa3d3d6 100644
--- a/src/mame/drivers/vector06.cpp
+++ b/src/mame/drivers/vector06.cpp
@@ -23,6 +23,7 @@ TODO:
****************************************************************************/
+#include "emu.h"
#include "includes/vector06.h"
#include "formats/vector06_dsk.h"
#include "softlist.h"
diff --git a/src/mame/drivers/vidbrain.cpp b/src/mame/drivers/vidbrain.cpp
index ee8593f3693..59782424003 100644
--- a/src/mame/drivers/vidbrain.cpp
+++ b/src/mame/drivers/vidbrain.cpp
@@ -35,6 +35,7 @@
*/
+#include "emu.h"
#include "includes/vidbrain.h"
#include "machine/rescap.h"
#include "sound/volt_reg.h"
diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp
index 933d57527d0..8411fc750ef 100644
--- a/src/mame/drivers/vip.cpp
+++ b/src/mame/drivers/vip.cpp
@@ -219,6 +219,7 @@ Notes:
*/
+#include "emu.h"
#include "includes/vip.h"
#include "softlist.h"
diff --git a/src/mame/drivers/vixen.cpp b/src/mame/drivers/vixen.cpp
index 612ed90bace..43f2c5ebdc0 100644
--- a/src/mame/drivers/vixen.cpp
+++ b/src/mame/drivers/vixen.cpp
@@ -53,6 +53,7 @@ Notes:
*/
+#include "emu.h"
#include "includes/vixen.h"
#include "softlist.h"
diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp
index b51fa3b3eb0..19783e644d9 100644
--- a/src/mame/drivers/vk100.cpp
+++ b/src/mame/drivers/vk100.cpp
@@ -148,6 +148,7 @@ state machine and sees if the GO bit ever finishes and goes back to 0
// debug state dump for the vector generator
#undef DEBUG_VG_STATE
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/i8085/i8085.h"
#include "sound/beep.h"
diff --git a/src/mame/drivers/votrpss.cpp b/src/mame/drivers/votrpss.cpp
index 4dac46de306..680199a9142 100644
--- a/src/mame/drivers/votrpss.cpp
+++ b/src/mame/drivers/votrpss.cpp
@@ -68,6 +68,7 @@ Things to be looked at:
******************************************************************************/
/* Core includes */
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
//#include "votrpss.lh"
diff --git a/src/mame/drivers/votrtnt.cpp b/src/mame/drivers/votrtnt.cpp
index 7d7c007ee35..2d85211429e 100644
--- a/src/mame/drivers/votrtnt.cpp
+++ b/src/mame/drivers/votrtnt.cpp
@@ -32,6 +32,7 @@
******************************************************************************/
/* Core includes */
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/m6800/m6800.h"
#include "machine/6850acia.h"
diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp
index cec62a41be9..df93efa2564 100644
--- a/src/mame/drivers/vt100.cpp
+++ b/src/mame/drivers/vt100.cpp
@@ -19,6 +19,7 @@
http://bitsavers.org/pdf/dec/terminal/vt125/MP01053_VT125_Mar82.pdf
****************************************************************************/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/i8085/i8085.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp
index 41b82014385..cafa5dba988 100644
--- a/src/mame/drivers/wicat.cpp
+++ b/src/mame/drivers/wicat.cpp
@@ -16,6 +16,7 @@ Wicat - various systems.
*/
+#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z8000/z8000.h"
diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp
index 4c7663f0304..11842256358 100644
--- a/src/mame/drivers/wico.cpp
+++ b/src/mame/drivers/wico.cpp
@@ -36,6 +36,7 @@ ToDo:
***************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/m6809/m6809.h"
#include "sound/sn76496.h"
diff --git a/src/mame/drivers/wpc_dot.cpp b/src/mame/drivers/wpc_dot.cpp
index bb93c30936f..58eba16f1fd 100644
--- a/src/mame/drivers/wpc_dot.cpp
+++ b/src/mame/drivers/wpc_dot.cpp
@@ -3,6 +3,7 @@
/* Williams WPC Dot Matrix */
+#include "emu.h"
#include "includes/wpc_dot.h"
diff --git a/src/mame/drivers/wpc_flip1.cpp b/src/mame/drivers/wpc_flip1.cpp
index 1330ae18ead..2add74c0e4b 100644
--- a/src/mame/drivers/wpc_flip1.cpp
+++ b/src/mame/drivers/wpc_flip1.cpp
@@ -3,6 +3,7 @@
/* Williams WPC Fliptronics I */
+#include "emu.h"
#include "includes/wpc_flip1.h"
diff --git a/src/mame/drivers/wpc_flip2.cpp b/src/mame/drivers/wpc_flip2.cpp
index b2514c21971..7501047949f 100644
--- a/src/mame/drivers/wpc_flip2.cpp
+++ b/src/mame/drivers/wpc_flip2.cpp
@@ -3,6 +3,7 @@
/* Williams WPC Fliptronics II */
+#include "emu.h"
#include "includes/wpc_flip2.h"
diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp
index eefe1152eff..0dcaa416e0b 100644
--- a/src/mame/drivers/wswan.cpp
+++ b/src/mame/drivers/wswan.cpp
@@ -33,6 +33,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/wswan.h"
#include "softlist.h"
#include "wswan.lh"
diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp
index e39d049a4f1..d55c9e12625 100644
--- a/src/mame/drivers/x07.cpp
+++ b/src/mame/drivers/x07.cpp
@@ -28,6 +28,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/x07.h"
#include "softlist.h"
diff --git a/src/mame/drivers/x1.cpp b/src/mame/drivers/x1.cpp
index c2dec9dfb9e..e9f58f9ac8e 100644
--- a/src/mame/drivers/x1.cpp
+++ b/src/mame/drivers/x1.cpp
@@ -206,6 +206,7 @@
************************************************************************************************/
+#include "emu.h"
#include "includes/x1.h"
#include "formats/2d_dsk.h"
#include "softlist.h"
diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp
index d88cadb185f..9cb3158cb84 100644
--- a/src/mame/drivers/x1twin.cpp
+++ b/src/mame/drivers/x1twin.cpp
@@ -14,6 +14,7 @@
************************************************************************************************/
+#include "emu.h"
#include "includes/x1.h"
#include "includes/pce.h"
diff --git a/src/mame/drivers/xerox820.cpp b/src/mame/drivers/xerox820.cpp
index 770fe68cf51..278cb12f202 100644
--- a/src/mame/drivers/xerox820.cpp
+++ b/src/mame/drivers/xerox820.cpp
@@ -47,6 +47,7 @@
*/
+#include "emu.h"
#include "includes/xerox820.h"
#include "softlist.h"
/* Read/Write Handlers */
diff --git a/src/mame/drivers/xor100.cpp b/src/mame/drivers/xor100.cpp
index 8365b6a3b0c..60c307d302a 100644
--- a/src/mame/drivers/xor100.cpp
+++ b/src/mame/drivers/xor100.cpp
@@ -35,6 +35,7 @@
*/
+#include "emu.h"
#include "includes/xor100.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/drivers/z88.cpp b/src/mame/drivers/z88.cpp
index 1f0abf2c8d7..601af78ddba 100644
--- a/src/mame/drivers/z88.cpp
+++ b/src/mame/drivers/z88.cpp
@@ -17,6 +17,7 @@
*******************************************************************************/
+#include "emu.h"
#include "includes/z88.h"
diff --git a/src/mame/drivers/zac_1.cpp b/src/mame/drivers/zac_1.cpp
index 8625fc5b2fc..d0e9146b2ad 100644
--- a/src/mame/drivers/zac_1.cpp
+++ b/src/mame/drivers/zac_1.cpp
@@ -30,6 +30,7 @@ ToDo:
**************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/s2650/s2650.h"
#include "zac_1.lh"
diff --git a/src/mame/drivers/zac_2.cpp b/src/mame/drivers/zac_2.cpp
index aab15fc06ac..b8843aafc83 100644
--- a/src/mame/drivers/zac_2.cpp
+++ b/src/mame/drivers/zac_2.cpp
@@ -8,6 +8,7 @@
****************************************************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/s2650/s2650.h"
#include "zac_2.lh"
diff --git a/src/mame/drivers/zac_proto.cpp b/src/mame/drivers/zac_proto.cpp
index 093b5679e3b..2a34b478a14 100644
--- a/src/mame/drivers/zac_proto.cpp
+++ b/src/mame/drivers/zac_proto.cpp
@@ -20,6 +20,7 @@ ToDo:
**********************************************************************/
+#include "emu.h"
#include "machine/genpin.h"
#include "cpu/scmp/scmp.h"
#include "zac_proto.lh"
diff --git a/src/mame/drivers/zx.cpp b/src/mame/drivers/zx.cpp
index d78ec6d6a05..76c3d56f9c4 100644
--- a/src/mame/drivers/zx.cpp
+++ b/src/mame/drivers/zx.cpp
@@ -42,6 +42,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/zx.h"
/* Memory Maps */
diff --git a/src/mame/includes/adam.h b/src/mame/includes/adam.h
index 4d4e4643160..55bb08f829e 100644
--- a/src/mame/includes/adam.h
+++ b/src/mame/includes/adam.h
@@ -5,7 +5,6 @@
#ifndef ADAM_H_
#define ADAM_H_
-#include "emu.h"
#include "bus/adam/exp.h"
#include "bus/adamnet/adamnet.h"
#include "bus/coleco/ctrl.h"
diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h
index 98d91efdf65..4f44b57e066 100644
--- a/src/mame/includes/apollo.h
+++ b/src/mame/includes/apollo.h
@@ -13,7 +13,6 @@
#ifndef APOLLO_H_
#define APOLLO_H_
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "bus/rs232/rs232.h"
diff --git a/src/mame/includes/apple2.h b/src/mame/includes/apple2.h
index 0596bd91af2..2c3c64a573d 100644
--- a/src/mame/includes/apple2.h
+++ b/src/mame/includes/apple2.h
@@ -11,7 +11,6 @@
#ifndef APPLE2_H_
#define APPLE2_H_
-#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "cpu/m6502/m65c02.h"
#include "bus/a2bus/a2bus.h"
diff --git a/src/mame/includes/aquarius.h b/src/mame/includes/aquarius.h
index 25adea20e3b..e4304aff451 100644
--- a/src/mame/includes/aquarius.h
+++ b/src/mame/includes/aquarius.h
@@ -9,7 +9,6 @@
#ifndef __AQUARIUS__
#define __AQUARIUS__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "video/tea1002.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/arcadia.h b/src/mame/includes/arcadia.h
index 97e51c8b392..4e8904748ff 100644
--- a/src/mame/includes/arcadia.h
+++ b/src/mame/includes/arcadia.h
@@ -9,7 +9,6 @@
#ifndef ARCADIA_H_
#define ARCADIA_H_
-#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "audio/arcadia.h"
diff --git a/src/mame/includes/atom.h b/src/mame/includes/atom.h
index 28d85c967fc..450117ec53f 100644
--- a/src/mame/includes/atom.h
+++ b/src/mame/includes/atom.h
@@ -6,7 +6,6 @@
#define __ATOM__
-#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/cassette.h"
#include "imagedev/flopdrv.h"
diff --git a/src/mame/includes/aussiebyte.h b/src/mame/includes/aussiebyte.h
index 0ec8c3c1115..e3723bcb284 100644
--- a/src/mame/includes/aussiebyte.h
+++ b/src/mame/includes/aussiebyte.h
@@ -6,7 +6,6 @@
Includes
************************************************************/
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/includes/bebox.h b/src/mame/includes/bebox.h
index 65dfebd9895..61128f08717 100644
--- a/src/mame/includes/bebox.h
+++ b/src/mame/includes/bebox.h
@@ -11,7 +11,6 @@
#ifndef BEBOX_H_
#define BEBOX_H_
-#include "emu.h"
#include "machine/53c810.h"
#include "machine/am9517a.h"
#include "machine/idectrl.h"
diff --git a/src/mame/includes/bullet.h b/src/mame/includes/bullet.h
index 4b3c9b8f564..3b9ca19b9f4 100644
--- a/src/mame/includes/bullet.h
+++ b/src/mame/includes/bullet.h
@@ -5,7 +5,6 @@
#ifndef __BULLET__
#define __BULLET__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "bus/centronics/ctronics.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/bw12.h b/src/mame/includes/bw12.h
index 31a97242293..115748f796e 100644
--- a/src/mame/includes/bw12.h
+++ b/src/mame/includes/bw12.h
@@ -3,7 +3,6 @@
#ifndef __BW12__
#define __BW12__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
#include "formats/bw12_dsk.h"
diff --git a/src/mame/includes/bw2.h b/src/mame/includes/bw2.h
index 22e5876ce7e..067fe96a983 100644
--- a/src/mame/includes/bw2.h
+++ b/src/mame/includes/bw2.h
@@ -5,7 +5,6 @@
#ifndef __BW2__
#define __BW2__
-#include "emu.h"
#include "bus/bw2/exp.h"
#include "cpu/z80/z80.h"
#include "formats/bw2_dsk.h"
diff --git a/src/mame/includes/c80.h b/src/mame/includes/c80.h
index 0f96980fc8d..de52c65a364 100644
--- a/src/mame/includes/c80.h
+++ b/src/mame/includes/c80.h
@@ -4,7 +4,6 @@
#define __C80__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/cgc7900.h b/src/mame/includes/cgc7900.h
index 9d8b6420f2f..03a72078403 100644
--- a/src/mame/includes/cgc7900.h
+++ b/src/mame/includes/cgc7900.h
@@ -6,7 +6,6 @@
#define __CGC7900__
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/channelf.h b/src/mame/includes/channelf.h
index 5eef8bbb4e5..d9dc71da016 100644
--- a/src/mame/includes/channelf.h
+++ b/src/mame/includes/channelf.h
@@ -9,7 +9,6 @@
#ifndef CHANNELF_H_
#define CHANNELF_H_
-#include "emu.h"
#include "cpu/f8/f8.h"
#include "audio/channelf.h"
diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h
index a881c31ca75..4fecb52f077 100644
--- a/src/mame/includes/cidelsa.h
+++ b/src/mame/includes/cidelsa.h
@@ -6,7 +6,6 @@
#define __CIDELSA__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "cpu/cop400/cop400.h"
#include "sound/cdp1869.h"
diff --git a/src/mame/includes/coco.h b/src/mame/includes/coco.h
index 8853b3155eb..06920b09a10 100644
--- a/src/mame/includes/coco.h
+++ b/src/mame/includes/coco.h
@@ -14,7 +14,6 @@
#define __COCO__
-#include "emu.h"
#include "imagedev/cassette.h"
#include "bus/rs232/rs232.h"
#include "machine/6821pia.h"
diff --git a/src/mame/includes/coleco.h b/src/mame/includes/coleco.h
index 65117fc5660..63b519240fd 100644
--- a/src/mame/includes/coleco.h
+++ b/src/mame/includes/coleco.h
@@ -6,7 +6,6 @@
#define __COLECO__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/sn76496.h"
#include "video/tms9928a.h"
diff --git a/src/mame/includes/comx35.h b/src/mame/includes/comx35.h
index 3e80113f906..dad520607e0 100644
--- a/src/mame/includes/comx35.h
+++ b/src/mame/includes/comx35.h
@@ -5,7 +5,6 @@
#ifndef __COMX35__
#define __COMX35__
-#include "emu.h"
#include "bus/comx35/exp.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/coolpool.h b/src/mame/includes/coolpool.h
index 9b5f14f8545..2516afaf1c1 100644
--- a/src/mame/includes/coolpool.h
+++ b/src/mame/includes/coolpool.h
@@ -2,7 +2,6 @@
// copyright-holders:Aaron Giles,Nicola Salmoria
#define NVRAM_UNLOCK_SEQ_LEN 10
-#include "emu.h"
#include "cpu/tms34010/tms34010.h"
#include "video/tlc34076.h"
diff --git a/src/mame/includes/cosmicos.h b/src/mame/includes/cosmicos.h
index 6b7a8c5015d..ad558efc0f3 100644
--- a/src/mame/includes/cosmicos.h
+++ b/src/mame/includes/cosmicos.h
@@ -5,7 +5,6 @@
#ifndef __COSMICOS__
#define __COSMICOS__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/crvision.h b/src/mame/includes/crvision.h
index 342ef6d34e5..f1f3043128f 100644
--- a/src/mame/includes/crvision.h
+++ b/src/mame/includes/crvision.h
@@ -5,7 +5,6 @@
#define __CRVISION__
-#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/cassette.h"
#include "machine/6821pia.h"
diff --git a/src/mame/includes/cybiko.h b/src/mame/includes/cybiko.h
index f9558a42643..d1386f79233 100644
--- a/src/mame/includes/cybiko.h
+++ b/src/mame/includes/cybiko.h
@@ -18,7 +18,6 @@
#define CYBIKO_H_
/* Core includes */
-#include "emu.h"
#include "sound/speaker.h"
/* Components */
diff --git a/src/mame/includes/dm7000.h b/src/mame/includes/dm7000.h
index 97af2a1785a..b50ee550e78 100644
--- a/src/mame/includes/dm7000.h
+++ b/src/mame/includes/dm7000.h
@@ -3,7 +3,6 @@
#ifndef DM7000_H_
#define DM7000_H_
-#include "emu.h"
#include "cpu/powerpc/ppc.h"
#include "machine/terminal.h"
diff --git a/src/mame/includes/einstein.h b/src/mame/includes/einstein.h
index 437acdc689e..43b646f7eac 100644
--- a/src/mame/includes/einstein.h
+++ b/src/mame/includes/einstein.h
@@ -9,7 +9,6 @@
#ifndef EINSTEIN_H_
#define EINSTEIN_H_
-#include "emu.h"
#include "video/mc6845.h"
#include "cpu/z80/z80daisy.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/includes/elf.h b/src/mame/includes/elf.h
index b75626f4ea8..1f737576319 100644
--- a/src/mame/includes/elf.h
+++ b/src/mame/includes/elf.h
@@ -6,7 +6,6 @@
#define __INCLUDES_ELF__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
diff --git a/src/mame/includes/eti660.h b/src/mame/includes/eti660.h
index 06bf77dbd4c..034f75879e3 100644
--- a/src/mame/includes/eti660.h
+++ b/src/mame/includes/eti660.h
@@ -5,7 +5,6 @@
#ifndef __ETI660__
#define __ETI660__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
diff --git a/src/mame/includes/fidelbase.h b/src/mame/includes/fidelbase.h
index 1f36fdc490b..589d53157e1 100644
--- a/src/mame/includes/fidelbase.h
+++ b/src/mame/includes/fidelbase.h
@@ -6,7 +6,6 @@
*
******************************************************************************/
-#include "emu.h"
#include "sound/dac.h"
#include "sound/s14001a.h"
#include "bus/generic/slot.h"
diff --git a/src/mame/includes/fmtowns.h b/src/mame/includes/fmtowns.h
index e761dc2c4ee..cb85294f8a7 100644
--- a/src/mame/includes/fmtowns.h
+++ b/src/mame/includes/fmtowns.h
@@ -4,7 +4,6 @@
#define FMTOWNS_H_
-#include "emu.h"
#include "cpu/i386/i386.h"
#include "sound/2612intf.h"
#include "sound/rf5c68.h"
diff --git a/src/mame/includes/gamecom.h b/src/mame/includes/gamecom.h
index 430a76c33da..f3156b83132 100644
--- a/src/mame/includes/gamecom.h
+++ b/src/mame/includes/gamecom.h
@@ -13,7 +13,6 @@
#ifndef GAMECOM_H_
#define GAMECOM_H_
-#include "emu.h"
#include "cpu/sm8500/sm8500.h"
#include "sound/dac.h"
#include "bus/generic/slot.h"
diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h
index 22a3876b7ad..4e5c45eee2f 100644
--- a/src/mame/includes/goldstar.h
+++ b/src/mame/includes/goldstar.h
@@ -1,6 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood, Roberto Fresca, Vas Crabb
-#include "emu.h"
#include "machine/ds2401.h"
#include "machine/ticket.h"
diff --git a/src/mame/includes/gottlieb.h b/src/mame/includes/gottlieb.h
index 2dddb114062..efb49c910f6 100644
--- a/src/mame/includes/gottlieb.h
+++ b/src/mame/includes/gottlieb.h
@@ -6,7 +6,6 @@
***************************************************************************/
-#include "emu.h"
#include "audio/gottlieb.h"
#include "cpu/i86/i86.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/mame/includes/hh_tms1k.h b/src/mame/includes/hh_tms1k.h
index 35b27a579ab..a6b3093f169 100644
--- a/src/mame/includes/hh_tms1k.h
+++ b/src/mame/includes/hh_tms1k.h
@@ -9,7 +9,6 @@
#ifndef _HH_TMS1K_H_
#define _HH_TMS1K_H_
-#include "emu.h"
#include "cpu/tms1000/tms1000.h"
#include "cpu/tms1000/tms1100.h"
#include "cpu/tms1000/tms1400.h"
diff --git a/src/mame/includes/hh_ucom4.h b/src/mame/includes/hh_ucom4.h
index 8328809c09a..883e379685a 100644
--- a/src/mame/includes/hh_ucom4.h
+++ b/src/mame/includes/hh_ucom4.h
@@ -10,7 +10,6 @@
#define _HH_UCOM4_H_
-#include "emu.h"
#include "rendlay.h"
#include "cpu/ucom4/ucom4.h"
#include "sound/speaker.h"
diff --git a/src/mame/includes/hp9845.h b/src/mame/includes/hp9845.h
index d26fe8f0583..8dc44ca5f0c 100644
--- a/src/mame/includes/hp9845.h
+++ b/src/mame/includes/hp9845.h
@@ -6,7 +6,6 @@
#ifndef _HP9845_H_
#define _HP9845_H_
-#include "emu.h"
#include "cpu/hphybrid/hphybrid.h"
#include "machine/hp_taco.h"
#include "sound/beep.h"
diff --git a/src/mame/includes/huebler.h b/src/mame/includes/huebler.h
index a47ec0c30bc..4a6a452f379 100644
--- a/src/mame/includes/huebler.h
+++ b/src/mame/includes/huebler.h
@@ -10,7 +10,6 @@
#define Z80PIO1_TAG "z80pio1"
#define Z80PIO2_TAG "z80pio2"
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/imds2.h b/src/mame/includes/imds2.h
index 2fe530afee0..dc03bfbaeb8 100644
--- a/src/mame/includes/imds2.h
+++ b/src/mame/includes/imds2.h
@@ -5,7 +5,6 @@
#ifndef _IMDS2_H_
#define _IMDS2_H_
-#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/i8257.h"
diff --git a/src/mame/includes/interpro.h b/src/mame/includes/interpro.h
index 6ae135b552c..927d626f5a0 100644
--- a/src/mame/includes/interpro.h
+++ b/src/mame/includes/interpro.h
@@ -6,7 +6,6 @@
#ifndef INTERPRO_H_
#define INTERPRO_H_
-#include "emu.h"
#include "cpu/clipper/clipper.h"
#include "machine/cammu.h"
@@ -128,4 +127,4 @@ private:
uint16_t m_system_reg[4];
};
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/includes/kaypro.h b/src/mame/includes/kaypro.h
index 93aa0c05638..1d8a994d53d 100644
--- a/src/mame/includes/kaypro.h
+++ b/src/mame/includes/kaypro.h
@@ -1,6 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:Robbbert
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/kim1.h b/src/mame/includes/kim1.h
index 0f4d9b67a0e..1f951a92e31 100644
--- a/src/mame/includes/kim1.h
+++ b/src/mame/includes/kim1.h
@@ -11,7 +11,6 @@
#ifndef __KIM1__
#define __KIM1__
-#include "emu.h"
#include "softlist.h"
#include "cpu/m6502/m6502.h"
#include "machine/mos6530.h"
diff --git a/src/mame/includes/lc80.h b/src/mame/includes/lc80.h
index 6671e3717d2..730ce855aca 100644
--- a/src/mame/includes/lc80.h
+++ b/src/mame/includes/lc80.h
@@ -4,7 +4,6 @@
#define __LC80__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/lisa.h b/src/mame/includes/lisa.h
index ec6cea36036..2cdff88dc05 100644
--- a/src/mame/includes/lisa.h
+++ b/src/mame/includes/lisa.h
@@ -11,7 +11,6 @@
#ifndef LISA_H_
#define LISA_H_
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/6522via.h"
#include "machine/8530scc.h"
diff --git a/src/mame/includes/llc.h b/src/mame/includes/llc.h
index 56637c0b71d..02dd97d6fd1 100644
--- a/src/mame/includes/llc.h
+++ b/src/mame/includes/llc.h
@@ -9,7 +9,6 @@
#ifndef LLC_H_
#define LLC_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/mbc55x.h b/src/mame/includes/mbc55x.h
index 3948c7be120..9bd469f27fb 100644
--- a/src/mame/includes/mbc55x.h
+++ b/src/mame/includes/mbc55x.h
@@ -8,7 +8,6 @@
2011-01-29.
*/
-#include "emu.h"
#include "cpu/i86/i86.h"
#include "machine/ram.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h
index f23093fccca..a509cb2bdec 100644
--- a/src/mame/includes/mbee.h
+++ b/src/mame/includes/mbee.h
@@ -9,7 +9,6 @@
#ifndef MBEE_H_
#define MBEE_H_
-#include "emu.h"
#include "imagedev/snapquik.h"
#include "machine/z80pio.h"
#include "machine/8530scc.h"
diff --git a/src/mame/includes/mc80.h b/src/mame/includes/mc80.h
index 2ce4e7fef6b..a55db5e3aa9 100644
--- a/src/mame/includes/mc80.h
+++ b/src/mame/includes/mc80.h
@@ -9,7 +9,6 @@
#ifndef MC80_H_
#define MC80_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/z80ctc.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/meadows.h b/src/mame/includes/meadows.h
index 2425ac89a36..f5a583bc1c5 100644
--- a/src/mame/includes/meadows.h
+++ b/src/mame/includes/meadows.h
@@ -5,7 +5,6 @@
Meadows S2650 hardware
*************************************************************************/
-#include "emu.h"
#include "cpu/s2650/s2650.h"
#include "sound/dac.h"
#include "sound/samples.h"
diff --git a/src/mame/includes/mpf1.h b/src/mame/includes/mpf1.h
index 5db907ce6d8..71de176aab5 100644
--- a/src/mame/includes/mpf1.h
+++ b/src/mame/includes/mpf1.h
@@ -6,7 +6,6 @@
#define __MPF1__
-#include "emu.h"
#include "machine/spchrom.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/includes/mpz80.h b/src/mame/includes/mpz80.h
index 0d4c778d74b..ee39922b5d2 100644
--- a/src/mame/includes/mpz80.h
+++ b/src/mame/includes/mpz80.h
@@ -5,7 +5,6 @@
#ifndef __MPZ80__
#define __MPZ80__
-#include "emu.h"
#include "bus/s100/s100.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/msx.h b/src/mame/includes/msx.h
index f331cc25256..a0fa175eef5 100644
--- a/src/mame/includes/msx.h
+++ b/src/mame/includes/msx.h
@@ -9,7 +9,6 @@
#ifndef __MSX_H__
#define __MSX_H__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/rp5c01.h"
diff --git a/src/mame/includes/multfish.h b/src/mame/includes/multfish.h
index 101ebdf1fef..c6be80c49d7 100644
--- a/src/mame/includes/multfish.h
+++ b/src/mame/includes/multfish.h
@@ -3,7 +3,6 @@
/* Multifish */
-#include "emu.h"
#include "sound/ay8910.h"
#include "cpu/z80/z80.h"
#include "machine/timekpr.h"
diff --git a/src/mame/includes/mz80.h b/src/mame/includes/mz80.h
index 0ded0e5ac30..6c96fb94dbb 100644
--- a/src/mame/includes/mz80.h
+++ b/src/mame/includes/mz80.h
@@ -9,7 +9,6 @@
#ifndef MZ80_H_
#define MZ80_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/pit8253.h"
diff --git a/src/mame/includes/newbrain.h b/src/mame/includes/newbrain.h
index 979b3dc14b5..9b97f7028aa 100644
--- a/src/mame/includes/newbrain.h
+++ b/src/mame/includes/newbrain.h
@@ -6,7 +6,6 @@
#define __NEWBRAIN__
-#include "emu.h"
#include "bus/newbrain/exp.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/next.h b/src/mame/includes/next.h
index 2ec74741a0e..b50ed43d41a 100644
--- a/src/mame/includes/next.h
+++ b/src/mame/includes/next.h
@@ -5,7 +5,6 @@
#ifndef __NEXT__
#define __NEXT__
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/nscsi_bus.h"
#include "machine/mccs1850.h"
diff --git a/src/mame/includes/novagbase.h b/src/mame/includes/novagbase.h
index 6516525804e..b0e25131b5a 100644
--- a/src/mame/includes/novagbase.h
+++ b/src/mame/includes/novagbase.h
@@ -6,7 +6,6 @@
*
******************************************************************************/
-#include "emu.h"
#include "sound/beep.h"
#include "video/hd44780.h"
diff --git a/src/mame/includes/osi.h b/src/mame/includes/osi.h
index 783159cd634..9dafbf9a284 100644
--- a/src/mame/includes/osi.h
+++ b/src/mame/includes/osi.h
@@ -6,7 +6,6 @@
#define __OSI__
-#include "emu.h"
#include "cpu/m6502/m6502.h"
#include "formats/basicdsk.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/p2000t.h b/src/mame/includes/p2000t.h
index 7b8a895d343..7264b1087ee 100644
--- a/src/mame/includes/p2000t.h
+++ b/src/mame/includes/p2000t.h
@@ -9,7 +9,6 @@
#ifndef P2000T_H_
#define P2000T_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/speaker.h"
#include "video/saa5050.h"
diff --git a/src/mame/includes/pc1512.h b/src/mame/includes/pc1512.h
index dd8f5fcb213..9105325a790 100644
--- a/src/mame/includes/pc1512.h
+++ b/src/mame/includes/pc1512.h
@@ -5,7 +5,6 @@
#ifndef __PC1512__
#define __PC1512__
-#include "emu.h"
#include "bus/centronics/ctronics.h"
#include "bus/isa/isa.h"
#include "bus/isa/isa_cards.h"
diff --git a/src/mame/includes/pc8001.h b/src/mame/includes/pc8001.h
index 72a353381bf..c5c89011ab1 100644
--- a/src/mame/includes/pc8001.h
+++ b/src/mame/includes/pc8001.h
@@ -6,7 +6,6 @@
#define __PC8001__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "machine/buffer.h"
diff --git a/src/mame/includes/pc8401a.h b/src/mame/includes/pc8401a.h
index 2d3fd53dfd8..a1058e4d641 100644
--- a/src/mame/includes/pc8401a.h
+++ b/src/mame/includes/pc8401a.h
@@ -6,7 +6,6 @@
#define __PC8401A__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/i8255.h"
#include "machine/i8251.h"
diff --git a/src/mame/includes/pcw16.h b/src/mame/includes/pcw16.h
index ca70412feea..343fd86bf89 100644
--- a/src/mame/includes/pcw16.h
+++ b/src/mame/includes/pcw16.h
@@ -9,7 +9,6 @@
#ifndef PCW16_H_
#define PCW16_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/upd765.h" /* FDC superio */
#include "machine/pc_lpt.h" /* PC-Parallel Port */
diff --git a/src/mame/includes/phc25.h b/src/mame/includes/phc25.h
index a33d2c2d911..5b772545813 100644
--- a/src/mame/includes/phc25.h
+++ b/src/mame/includes/phc25.h
@@ -6,7 +6,6 @@
#define __PHC25__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "sound/wave.h"
diff --git a/src/mame/includes/poly880.h b/src/mame/includes/poly880.h
index 71b7f1bb60b..ceca63efc3f 100644
--- a/src/mame/includes/poly880.h
+++ b/src/mame/includes/poly880.h
@@ -6,7 +6,6 @@
#define __POLY880__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/pp01.h b/src/mame/includes/pp01.h
index 055f0b3bd0b..c7d0e44466d 100644
--- a/src/mame/includes/pp01.h
+++ b/src/mame/includes/pp01.h
@@ -9,7 +9,6 @@
#ifndef PP01_H_
#define PP01_H_
-#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "machine/ram.h"
#include "machine/i8251.h"
diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h
index 4ebf652ca96..2913b9560da 100644
--- a/src/mame/includes/psikyo4.h
+++ b/src/mame/includes/psikyo4.h
@@ -8,7 +8,6 @@
#define MASTER_CLOCK 57272700 // main oscillator frequency
-#include "emu.h"
#include "cpu/sh2/sh2.h"
#include "sound/ymf278b.h"
#include "machine/eepromser.h"
diff --git a/src/mame/includes/px8.h b/src/mame/includes/px8.h
index 9eeef2c41f9..dbda1fbc660 100644
--- a/src/mame/includes/px8.h
+++ b/src/mame/includes/px8.h
@@ -6,7 +6,6 @@
#define __PX8__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6800/m6800.h"
#include "imagedev/cassette.h"
diff --git a/src/mame/includes/rm380z.h b/src/mame/includes/rm380z.h
index 7448b710ad4..41532a64ec7 100644
--- a/src/mame/includes/rm380z.h
+++ b/src/mame/includes/rm380z.h
@@ -10,7 +10,6 @@ Research Machines RM 380Z
#ifndef RM380Z_H_
#define RM380Z_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/rmnimbus.h b/src/mame/includes/rmnimbus.h
index 79004424e7c..e5b4e479a49 100644
--- a/src/mame/includes/rmnimbus.h
+++ b/src/mame/includes/rmnimbus.h
@@ -7,7 +7,6 @@
Phill Harvey-Smith
2009-11-29.
*/
-#include "emu.h"
#include "cpu/i86/i186.h"
#include "machine/z80dart.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/includes/sage2.h b/src/mame/includes/sage2.h
index 6d3c2b25e8a..ee375c24748 100644
--- a/src/mame/includes/sage2.h
+++ b/src/mame/includes/sage2.h
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "bus/centronics/ctronics.h"
#include "machine/i8251.h"
diff --git a/src/mame/includes/sg1000.h b/src/mame/includes/sg1000.h
index efa24e6c683..169a298cf5d 100644
--- a/src/mame/includes/sg1000.h
+++ b/src/mame/includes/sg1000.h
@@ -3,7 +3,6 @@
#ifndef __SG1000__
#define __SG1000__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "formats/sf7000_dsk.h"
#include "imagedev/printer.h"
diff --git a/src/mame/includes/slapstic.h b/src/mame/includes/slapstic.h
index 58cae0cc752..f3fdbb9a48c 100644
--- a/src/mame/includes/slapstic.h
+++ b/src/mame/includes/slapstic.h
@@ -16,7 +16,6 @@
#ifndef __SLAPSTIC__
#define __SLAPSTIC__
-#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "cpu/m68000/m68000.h"
diff --git a/src/mame/includes/softbox.h b/src/mame/includes/softbox.h
index 1ebd857424c..8bce05cfd80 100644
--- a/src/mame/includes/softbox.h
+++ b/src/mame/includes/softbox.h
@@ -5,7 +5,6 @@
#ifndef __SOFTBOX__
#define __SOFTBOX__
-#include "emu.h"
#include "bus/ieee488/ieee488.h"
#include "bus/imi7000/imi7000.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/sorcerer.h b/src/mame/includes/sorcerer.h
index 825bc18802e..06d7c2c3bda 100644
--- a/src/mame/includes/sorcerer.h
+++ b/src/mame/includes/sorcerer.h
@@ -9,7 +9,6 @@
#ifndef SORCERER_H_
#define SORCERER_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/wave.h"
#include "machine/ay31015.h"
diff --git a/src/mame/includes/special.h b/src/mame/includes/special.h
index ed0dcb3b3d2..0e40d43dcdf 100644
--- a/src/mame/includes/special.h
+++ b/src/mame/includes/special.h
@@ -9,7 +9,6 @@
#ifndef SPECIAL_H_
#define SPECIAL_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
#include "audio/special.h"
diff --git a/src/mame/includes/super6.h b/src/mame/includes/super6.h
index 64f09aef418..0ec8fc2729c 100644
--- a/src/mame/includes/super6.h
+++ b/src/mame/includes/super6.h
@@ -5,7 +5,6 @@
#ifndef __SUPER6__
#define __SUPER6__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/com8116.h"
diff --git a/src/mame/includes/super80.h b/src/mame/includes/super80.h
index da9eead1427..797846c68f8 100644
--- a/src/mame/includes/super80.h
+++ b/src/mame/includes/super80.h
@@ -1,6 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:Robbbert
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "sound/wave.h"
diff --git a/src/mame/includes/swtpc09.h b/src/mame/includes/swtpc09.h
index f648223c73c..7e43cf2ea35 100644
--- a/src/mame/includes/swtpc09.h
+++ b/src/mame/includes/swtpc09.h
@@ -9,7 +9,6 @@
#ifndef swtpc09_H_
#define swtpc09_H_
-#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "video/generic.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/includes/tandy2k.h b/src/mame/includes/tandy2k.h
index 07be28a202d..25f480eaa20 100644
--- a/src/mame/includes/tandy2k.h
+++ b/src/mame/includes/tandy2k.h
@@ -3,7 +3,6 @@
#ifndef __TANDY2K__
#define __TANDY2K__
-#include "emu.h"
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
#include "cpu/i86/i186.h"
diff --git a/src/mame/includes/tdv2324.h b/src/mame/includes/tdv2324.h
index b1f5bdff5ab..3d360ee6b07 100644
--- a/src/mame/includes/tdv2324.h
+++ b/src/mame/includes/tdv2324.h
@@ -6,7 +6,6 @@
#define __TDV2324__
-#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "cpu/m6800/m6800.h"
#include "imagedev/harddriv.h"
diff --git a/src/mame/includes/tek405x.h b/src/mame/includes/tek405x.h
index d248d9734d4..175d2f090c5 100644
--- a/src/mame/includes/tek405x.h
+++ b/src/mame/includes/tek405x.h
@@ -5,7 +5,6 @@
#ifndef __TEK405X__
#define __TEK405X__
-#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "machine/ram.h"
#include "machine/6821pia.h"
diff --git a/src/mame/includes/thomson.h b/src/mame/includes/thomson.h
index a0c0745b7f9..72c95620e48 100644
--- a/src/mame/includes/thomson.h
+++ b/src/mame/includes/thomson.h
@@ -11,7 +11,6 @@
#ifndef _THOMSON_H_
#define _THOMSON_H_
-#include "emu.h"
#include "bus/rs232/rs232.h"
#include "cpu/m6809/m6809.h"
#include "machine/6821pia.h"
diff --git a/src/mame/includes/tiki100.h b/src/mame/includes/tiki100.h
index 0cd8c7b1ae5..3cd378c4140 100644
--- a/src/mame/includes/tiki100.h
+++ b/src/mame/includes/tiki100.h
@@ -5,7 +5,6 @@
#ifndef __TIKI100__
#define __TIKI100__
-#include "emu.h"
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
#include "bus/tiki100/exp.h"
diff --git a/src/mame/includes/tmc1800.h b/src/mame/includes/tmc1800.h
index 89d9dce03f0..9ac6ab12f91 100644
--- a/src/mame/includes/tmc1800.h
+++ b/src/mame/includes/tmc1800.h
@@ -6,7 +6,6 @@
#define __TMC1800__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
diff --git a/src/mame/includes/tmc2000e.h b/src/mame/includes/tmc2000e.h
index c79c16b2380..890813d5e99 100644
--- a/src/mame/includes/tmc2000e.h
+++ b/src/mame/includes/tmc2000e.h
@@ -6,7 +6,6 @@
#define __TMC2000E__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/tmc600.h b/src/mame/includes/tmc600.h
index 8d36e3c8b38..3519f210718 100644
--- a/src/mame/includes/tmc600.h
+++ b/src/mame/includes/tmc600.h
@@ -6,7 +6,6 @@
#define __TMC600__
-#include "emu.h"
#include "cpu/cosmac/cosmac.h"
#include "imagedev/cassette.h"
#include "imagedev/snapquik.h"
diff --git a/src/mame/includes/tranz330.h b/src/mame/includes/tranz330.h
index 2bcd7f35d87..8555b5a2237 100644
--- a/src/mame/includes/tranz330.h
+++ b/src/mame/includes/tranz330.h
@@ -6,7 +6,6 @@
#define VERIFONE_TRANZ330_H
// single-driver build must have emu.h here
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h
index 2ebbe72230e..e3dd0d739a5 100644
--- a/src/mame/includes/trs80.h
+++ b/src/mame/includes/trs80.h
@@ -9,7 +9,6 @@
#ifndef TRS80_H_
#define TRS80_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/speaker.h"
#include "sound/wave.h"
diff --git a/src/mame/includes/trs80m2.h b/src/mame/includes/trs80m2.h
index 55809a5f9ca..151b57b667c 100644
--- a/src/mame/includes/trs80m2.h
+++ b/src/mame/includes/trs80m2.h
@@ -6,7 +6,6 @@
#define __TRS80M2__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/includes/ut88.h b/src/mame/includes/ut88.h
index 112ab400fc0..e25128df05a 100644
--- a/src/mame/includes/ut88.h
+++ b/src/mame/includes/ut88.h
@@ -9,7 +9,6 @@
#ifndef UT88_H_
#define UT88_H_
-#include "emu.h"
#include "cpu/i8085/i8085.h"
#include "sound/dac.h"
#include "sound/wave.h"
diff --git a/src/mame/includes/v1050.h b/src/mame/includes/v1050.h
index 839a1afc80b..2c6ea33a5b1 100644
--- a/src/mame/includes/v1050.h
+++ b/src/mame/includes/v1050.h
@@ -5,7 +5,6 @@
#ifndef __V1050__
#define __V1050__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/m6502/m6502.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/mame/includes/vc4000.h b/src/mame/includes/vc4000.h
index e5d19193633..1c8605db3e0 100644
--- a/src/mame/includes/vc4000.h
+++ b/src/mame/includes/vc4000.h
@@ -10,7 +10,6 @@
#ifndef VC4000_H_
#define VC4000_H_
-#include "emu.h"
#include "audio/vc4000.h"
#include "cpu/s2650/s2650.h"
#include "imagedev/snapquik.h"
diff --git a/src/mame/includes/vcs80.h b/src/mame/includes/vcs80.h
index adb956251a2..c44d8014f2b 100644
--- a/src/mame/includes/vcs80.h
+++ b/src/mame/includes/vcs80.h
@@ -6,7 +6,6 @@
#define __VCS80__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80pio.h"
diff --git a/src/mame/includes/vector06.h b/src/mame/includes/vector06.h
index 423f1f4b519..dc0b320ac92 100644
--- a/src/mame/includes/vector06.h
+++ b/src/mame/includes/vector06.h
@@ -9,7 +9,6 @@
#ifndef VECTOR06_H_
#define VECTOR06_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/i8085/i8085.h"
#include "sound/speaker.h"
diff --git a/src/mame/includes/vidbrain.h b/src/mame/includes/vidbrain.h
index ba9b082bd7d..cc4aa98c00d 100644
--- a/src/mame/includes/vidbrain.h
+++ b/src/mame/includes/vidbrain.h
@@ -5,7 +5,6 @@
#ifndef __VIDBRAIN__
#define __VIDBRAIN__
-#include "emu.h"
#include "bus/vidbrain/exp.h"
#include "cpu/f8/f8.h"
#include "machine/f3853.h"
diff --git a/src/mame/includes/vip.h b/src/mame/includes/vip.h
index fe576620ee5..3e7ae9b67db 100644
--- a/src/mame/includes/vip.h
+++ b/src/mame/includes/vip.h
@@ -5,7 +5,6 @@
#ifndef __VIP__
#define __VIP__
-#include "emu.h"
#include "bus/vip/byteio.h"
#include "bus/vip/exp.h"
#include "cpu/cosmac/cosmac.h"
diff --git a/src/mame/includes/wpc_dot.h b/src/mame/includes/wpc_dot.h
index 54473262f12..92dd863d15c 100644
--- a/src/mame/includes/wpc_dot.h
+++ b/src/mame/includes/wpc_dot.h
@@ -10,7 +10,6 @@
#ifndef WPC_DOT_H_
#define WPC_DOT_H_
-#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "audio/wpcsnd.h"
#include "audio/dcs.h"
diff --git a/src/mame/includes/wswan.h b/src/mame/includes/wswan.h
index 0b37017b21b..f3945a2f3fe 100644
--- a/src/mame/includes/wswan.h
+++ b/src/mame/includes/wswan.h
@@ -14,7 +14,6 @@
#define INTERNAL_EEPROM_SIZE 1024
-#include "emu.h"
#include "cpu/v30mz/v30mz.h"
#include "machine/nvram.h"
#include "audio/wswan.h"
diff --git a/src/mame/includes/x07.h b/src/mame/includes/x07.h
index f7a50e012f8..89d20d835d7 100644
--- a/src/mame/includes/x07.h
+++ b/src/mame/includes/x07.h
@@ -6,7 +6,6 @@
*********************************************************************/
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/beep.h"
#include "machine/nvram.h"
diff --git a/src/mame/includes/x1.h b/src/mame/includes/x1.h
index 528a9657fc2..3329e1b883f 100644
--- a/src/mame/includes/x1.h
+++ b/src/mame/includes/x1.h
@@ -9,7 +9,6 @@
#ifndef X1_H_
#define X1_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
#include "machine/z80ctc.h"
diff --git a/src/mame/includes/xerox820.h b/src/mame/includes/xerox820.h
index 55f36d2d005..a34116816de 100644
--- a/src/mame/includes/xerox820.h
+++ b/src/mame/includes/xerox820.h
@@ -3,7 +3,6 @@
#ifndef __XEROX820__
#define __XEROX820__
-#include "emu.h"
#include "bus/scsi/sa1403d.h"
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/xor100.h b/src/mame/includes/xor100.h
index 8229a479044..63423cbf5fb 100644
--- a/src/mame/includes/xor100.h
+++ b/src/mame/includes/xor100.h
@@ -5,7 +5,6 @@
#ifndef __XOR100__
#define __XOR100__
-#include "emu.h"
#include "bus/s100/s100.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/z88.h b/src/mame/includes/z88.h
index c982b59181f..33333086f06 100644
--- a/src/mame/includes/z88.h
+++ b/src/mame/includes/z88.h
@@ -9,7 +9,6 @@
#ifndef Z88_H_
#define Z88_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/upd65031.h"
#include "machine/ram.h"
diff --git a/src/mame/includes/zaccaria.h b/src/mame/includes/zaccaria.h
index aa15339b8eb..c61ceebc22e 100644
--- a/src/mame/includes/zaccaria.h
+++ b/src/mame/includes/zaccaria.h
@@ -1,6 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#include "emu.h"
#include "audio/zaccaria.h"
class zaccaria_state : public driver_device
diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h
index 8935e86e9c7..bdebef88411 100644
--- a/src/mame/includes/zerozone.h
+++ b/src/mame/includes/zerozone.h
@@ -6,7 +6,6 @@
*************************************************************************/
-#include "emu.h"
#include "machine/gen_latch.h"
#include "cpu/z80/z80.h"
diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h
index 44552ba365a..33039a43200 100644
--- a/src/mame/includes/zodiack.h
+++ b/src/mame/includes/zodiack.h
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Zsolt Vasvari
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/gen_latch.h"
diff --git a/src/mame/includes/zx.h b/src/mame/includes/zx.h
index b695f82f9ab..4f88bf23f25 100644
--- a/src/mame/includes/zx.h
+++ b/src/mame/includes/zx.h
@@ -9,7 +9,6 @@
#ifndef ZX_H_
#define ZX_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/speaker.h"
#include "sound/wave.h"
diff --git a/src/mame/machine/315_5296.cpp b/src/mame/machine/315_5296.cpp
index 310a0bbd820..46464969d50 100644
--- a/src/mame/machine/315_5296.cpp
+++ b/src/mame/machine/315_5296.cpp
@@ -22,6 +22,7 @@
**********************************************************************/
+#include "emu.h"
#include "machine/315_5296.h"
diff --git a/src/mame/machine/315_5296.h b/src/mame/machine/315_5296.h
index 0e2c2229611..f66064895c0 100644
--- a/src/mame/machine/315_5296.h
+++ b/src/mame/machine/315_5296.h
@@ -11,7 +11,6 @@
#ifndef _SEGA_315_5296_H
#define _SEGA_315_5296_H
-#include "emu.h"
//**************************************************************************
diff --git a/src/mame/machine/6883sam.cpp b/src/mame/machine/6883sam.cpp
index ce07281231f..36de03974ec 100644
--- a/src/mame/machine/6883sam.cpp
+++ b/src/mame/machine/6883sam.cpp
@@ -49,6 +49,7 @@
***************************************************************************/
+#include "emu.h"
#include "machine/6883sam.h"
diff --git a/src/mame/machine/6883sam.h b/src/mame/machine/6883sam.h
index fc0258df3f9..02bfd0603ae 100644
--- a/src/mame/machine/6883sam.h
+++ b/src/mame/machine/6883sam.h
@@ -13,7 +13,6 @@
#ifndef __6883SAM__
#define __6883SAM__
-#include "emu.h"
#define MCFG_SAM6883_ADD(_tag, _clock, _cputag, _cpuspace) \
MCFG_DEVICE_ADD(_tag, SAM6883, _clock) \
diff --git a/src/mame/machine/abc1600mac.cpp b/src/mame/machine/abc1600mac.cpp
index 8a797394157..a7c220d01d9 100644
--- a/src/mame/machine/abc1600mac.cpp
+++ b/src/mame/machine/abc1600mac.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "abc1600mac.h"
diff --git a/src/mame/machine/abc1600mac.h b/src/mame/machine/abc1600mac.h
index 0cd3adfbdfe..a13a7bf40d0 100644
--- a/src/mame/machine/abc1600mac.h
+++ b/src/mame/machine/abc1600mac.h
@@ -11,7 +11,6 @@
#ifndef __ABC1600_MAC__
#define __ABC1600_MAC__
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "machine/watchdog.h"
diff --git a/src/mame/machine/abc80kb.cpp b/src/mame/machine/abc80kb.cpp
index 6c6c8509697..f57bfb8a31e 100644
--- a/src/mame/machine/abc80kb.cpp
+++ b/src/mame/machine/abc80kb.cpp
@@ -71,6 +71,7 @@ Notes:
*/
+#include "emu.h"
#include "abc80kb.h"
diff --git a/src/mame/machine/abc80kb.h b/src/mame/machine/abc80kb.h
index 6a2b17101ed..67beace62b3 100644
--- a/src/mame/machine/abc80kb.h
+++ b/src/mame/machine/abc80kb.h
@@ -11,7 +11,6 @@
#ifndef __ABC80_KEYBOARD__
#define __ABC80_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/machine/alpha8201.cpp b/src/mame/machine/alpha8201.cpp
index 1acaf966405..99d130e63c6 100644
--- a/src/mame/machine/alpha8201.cpp
+++ b/src/mame/machine/alpha8201.cpp
@@ -271,6 +271,7 @@ Notes:
***************************************************************************/
+#include "emu.h"
#include "cpu/hmcs40/hmcs40.h"
#include "alpha8201.h"
diff --git a/src/mame/machine/alpha8201.h b/src/mame/machine/alpha8201.h
index 9d13dba6d96..c116d2cbf92 100644
--- a/src/mame/machine/alpha8201.h
+++ b/src/mame/machine/alpha8201.h
@@ -9,7 +9,6 @@
#ifndef _ALPHA8201_H_
#define _ALPHA8201_H_
-#include "emu.h"
class alpha_8201_device : public device_t
{
diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp
index 79c81bf986f..01e3d7f91ee 100644
--- a/src/mame/machine/apollo.cpp
+++ b/src/mame/machine/apollo.cpp
@@ -28,6 +28,7 @@
*
*/
+#include "emu.h"
#include "includes/apollo.h"
#include "bus/isa/omti8621.h"
diff --git a/src/mame/machine/apollo_dbg.cpp b/src/mame/machine/apollo_dbg.cpp
index aad0ef62ee9..63b05d162c5 100644
--- a/src/mame/machine/apollo_dbg.cpp
+++ b/src/mame/machine/apollo_dbg.cpp
@@ -10,6 +10,7 @@
#define VERBOSE 1
+#include "emu.h"
#include "includes/apollo.h"
#include "cpu/m68000/m68kcpu.h"
diff --git a/src/mame/machine/apollo_dbg.h b/src/mame/machine/apollo_dbg.h
index 12227102e4e..3ce08a200f4 100644
--- a/src/mame/machine/apollo_dbg.h
+++ b/src/mame/machine/apollo_dbg.h
@@ -13,7 +13,6 @@
#ifndef __APOLLO_DBG_H__
#define __APOLLO_DBG_H__
-#include "emu.h"
int apollo_debug_instruction_hook(m68000_base_device *device, offs_t curpc);
diff --git a/src/mame/machine/apollo_kbd.cpp b/src/mame/machine/apollo_kbd.cpp
index e86c2465d65..cc1220d0667 100644
--- a/src/mame/machine/apollo_kbd.cpp
+++ b/src/mame/machine/apollo_kbd.cpp
@@ -12,6 +12,7 @@
#define VERBOSE 0
+#include "emu.h"
#include "machine/apollo_kbd.h"
#include "sound/beep.h"
diff --git a/src/mame/machine/apollo_kbd.h b/src/mame/machine/apollo_kbd.h
index 69921a444ad..369c3873095 100644
--- a/src/mame/machine/apollo_kbd.h
+++ b/src/mame/machine/apollo_kbd.h
@@ -13,7 +13,6 @@
#ifndef __APOLLO_KBD_H__
#define __APOLLO_KBD_H__
-#include "emu.h"
#include "sound/beep.h"
// BSD-derived systems get very sad when you party with system reserved names.
diff --git a/src/mame/machine/apricotkb.cpp b/src/mame/machine/apricotkb.cpp
index 2717e8cb397..21af9342dce 100644
--- a/src/mame/machine/apricotkb.cpp
+++ b/src/mame/machine/apricotkb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "apricotkb.h"
diff --git a/src/mame/machine/apricotkb.h b/src/mame/machine/apricotkb.h
index cc5da305b38..598155fd011 100644
--- a/src/mame/machine/apricotkb.h
+++ b/src/mame/machine/apricotkb.h
@@ -11,7 +11,6 @@
#ifndef __APRICOT_KEYBOARD__
#define __APRICOT_KEYBOARD__
-#include "emu.h"
diff --git a/src/mame/machine/at.cpp b/src/mame/machine/at.cpp
index 56d12935079..d79a9da0318 100644
--- a/src/mame/machine/at.cpp
+++ b/src/mame/machine/at.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "machine/at.h"
#include "cpu/i86/i286.h"
#include "cpu/i386/i386.h"
diff --git a/src/mame/machine/at.h b/src/mame/machine/at.h
index 12d6895197c..75f3f7cb703 100644
--- a/src/mame/machine/at.h
+++ b/src/mame/machine/at.h
@@ -3,7 +3,6 @@
#ifndef _AT_H_
#define _AT_H_
-#include "emu.h"
#include "machine/mc146818.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
diff --git a/src/mame/machine/cammu.cpp b/src/mame/machine/cammu.cpp
index 1ee7cdab38a..9c31e925611 100644
--- a/src/mame/machine/cammu.cpp
+++ b/src/mame/machine/cammu.cpp
@@ -20,6 +20,7 @@
* - bus errors
*/
+#include "emu.h"
#include "cammu.h"
#define VERBOSE 0
diff --git a/src/mame/machine/cammu.h b/src/mame/machine/cammu.h
index a00208efbb5..15d0d7a4c66 100644
--- a/src/mame/machine/cammu.h
+++ b/src/mame/machine/cammu.h
@@ -6,7 +6,6 @@
#ifndef CAMMU_H_
#define CAMMU_H_
-#include "emu.h"
// the following enables a very crude instruction cache - it has known (future)
// problems, but speeds up cpu execution quite noticeably in the short term by
@@ -88,4 +87,4 @@ extern const device_type CAMMU_C4T;
extern const device_type CAMMU_C4I;
extern const device_type CAMMU_C3;
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/machine/cat702.cpp b/src/mame/machine/cat702.cpp
index 69f57604ca1..a474c18be4b 100644
--- a/src/mame/machine/cat702.cpp
+++ b/src/mame/machine/cat702.cpp
@@ -84,6 +84,7 @@
= Shift(c[n-1, 6])^Shift(c[n-1, 7])
*/
+#include "emu.h"
#include "cat702.h"
const device_type CAT702 = &device_creator<cat702_device>;
diff --git a/src/mame/machine/cat702.h b/src/mame/machine/cat702.h
index bf7a2925a92..e6c63dea541 100644
--- a/src/mame/machine/cat702.h
+++ b/src/mame/machine/cat702.h
@@ -7,7 +7,6 @@
#ifndef __CAT702_H__
#define __CAT702_H__
-#include "emu.h"
extern const device_type CAT702;
diff --git a/src/mame/machine/cdi070.h b/src/mame/machine/cdi070.h
index 2d944e3609c..478297d27b6 100644
--- a/src/mame/machine/cdi070.h
+++ b/src/mame/machine/cdi070.h
@@ -24,7 +24,6 @@ TODO:
#ifndef _MACHINE_CDI68070_H_
#define _MACHINE_CDI68070_H_
-#include "emu.h"
#define ISR_MST 0x80 // Master
#define ISR_TRX 0x40 // Transmitter
diff --git a/src/mame/machine/cdicdic.h b/src/mame/machine/cdicdic.h
index 7663dd33fcf..881f6ab16da 100644
--- a/src/mame/machine/cdicdic.h
+++ b/src/mame/machine/cdicdic.h
@@ -26,7 +26,6 @@ TODO:
#ifndef __CDICDIC_H__
#define __CDICDIC_H__
-#include "emu.h"
#include "cdrom.h"
#include "sound/cdda.h"
diff --git a/src/mame/machine/cdislave.h b/src/mame/machine/cdislave.h
index 29e748f9528..7fee3e4561b 100644
--- a/src/mame/machine/cdislave.h
+++ b/src/mame/machine/cdislave.h
@@ -26,7 +26,6 @@ TODO:
#ifndef __CDISLAVE_H__
#define __CDISLAVE_H__
-#include "emu.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
diff --git a/src/mame/machine/coco.cpp b/src/mame/machine/coco.cpp
index 06d19615113..ddf0efaca74 100644
--- a/src/mame/machine/coco.cpp
+++ b/src/mame/machine/coco.cpp
@@ -57,6 +57,7 @@ DAC and bitbanger values written should be reflected in the read.
***************************************************************************/
+#include "emu.h"
#include "includes/coco.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/mame/machine/coco12.cpp b/src/mame/machine/coco12.cpp
index ac98b91468e..ffe2b0002de 100644
--- a/src/mame/machine/coco12.cpp
+++ b/src/mame/machine/coco12.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/coco12.h"
//-------------------------------------------------
diff --git a/src/mame/machine/coco3.cpp b/src/mame/machine/coco3.cpp
index dab68c0761e..c0d30584d7f 100644
--- a/src/mame/machine/coco3.cpp
+++ b/src/mame/machine/coco3.cpp
@@ -43,6 +43,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/coco3.h"
//-------------------------------------------------
diff --git a/src/mame/machine/compiskb.cpp b/src/mame/machine/compiskb.cpp
index 12262b17159..0343351ce51 100644
--- a/src/mame/machine/compiskb.cpp
+++ b/src/mame/machine/compiskb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "compiskb.h"
diff --git a/src/mame/machine/compiskb.h b/src/mame/machine/compiskb.h
index 4585e39241a..1d6c2f18d31 100644
--- a/src/mame/machine/compiskb.h
+++ b/src/mame/machine/compiskb.h
@@ -11,7 +11,6 @@
#ifndef __COMPIS_KEYBOARD__
#define __COMPIS_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/speaker.h"
diff --git a/src/mame/machine/cuda.h b/src/mame/machine/cuda.h
index 9d6786e9803..ecc77b127d2 100644
--- a/src/mame/machine/cuda.h
+++ b/src/mame/machine/cuda.h
@@ -5,7 +5,6 @@
#ifndef __CUDA_H__
#define __CUDA_H__
-#include "emu.h"
//**************************************************************************
// MACROS / CONSTANTS
diff --git a/src/mame/machine/cybiko.cpp b/src/mame/machine/cybiko.cpp
index 116d7676cdc..bbcdf9f8958 100644
--- a/src/mame/machine/cybiko.cpp
+++ b/src/mame/machine/cybiko.cpp
@@ -12,6 +12,7 @@
*/
+#include "emu.h"
#include "includes/cybiko.h"
#define LOG_LEVEL 1
diff --git a/src/mame/machine/dec_lk201.h b/src/mame/machine/dec_lk201.h
index 5db6a35219a..308d6a98052 100644
--- a/src/mame/machine/dec_lk201.h
+++ b/src/mame/machine/dec_lk201.h
@@ -5,7 +5,6 @@
#ifndef __LK201_H__
#define __LK201_H__
-#include "emu.h"
#include "sound/beep.h"
//**************************************************************************
diff --git a/src/mame/machine/deco222.cpp b/src/mame/machine/deco222.cpp
index 722a2f0e2ac..9207c164f07 100644
--- a/src/mame/machine/deco222.cpp
+++ b/src/mame/machine/deco222.cpp
@@ -5,6 +5,7 @@
also sometimes implemented as basic logic outside the CPU on early revs and bootlegs */
+#include "emu.h"
#include "deco222.h"
diff --git a/src/mame/machine/deco222.h b/src/mame/machine/deco222.h
index 3d765e5aee4..6281ba7a88c 100644
--- a/src/mame/machine/deco222.h
+++ b/src/mame/machine/deco222.h
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
-#include "emu.h"
#include "cpu/m6502/m6502.h"
class deco_222_device : public m6502_device {
diff --git a/src/mame/machine/decocpu6.cpp b/src/mame/machine/decocpu6.cpp
index 28cdac73105..5f5ab6e97b3 100644
--- a/src/mame/machine/decocpu6.cpp
+++ b/src/mame/machine/decocpu6.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "decocpu6.h"
deco_cpu6_device::deco_cpu6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/mame/machine/decocpu6.h b/src/mame/machine/decocpu6.h
index 0de17580c16..fc176bbcfcd 100644
--- a/src/mame/machine/decocpu6.h
+++ b/src/mame/machine/decocpu6.h
@@ -2,7 +2,6 @@
// copyright-holders:David Haywood
-#include "emu.h"
#include "cpu/m6502/m6502.h"
class deco_cpu6_device : public m6502_device {
diff --git a/src/mame/machine/decocpu7.cpp b/src/mame/machine/decocpu7.cpp
index 61b959d061b..7900cd3e866 100644
--- a/src/mame/machine/decocpu7.cpp
+++ b/src/mame/machine/decocpu7.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
+#include "emu.h"
#include "decocpu7.h"
deco_cpu7_device::deco_cpu7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/mame/machine/decocpu7.h b/src/mame/machine/decocpu7.h
index d03007efc04..229d97d6e30 100644
--- a/src/mame/machine/decocpu7.h
+++ b/src/mame/machine/decocpu7.h
@@ -1,7 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:David Haywood
-#include "emu.h"
#include "cpu/m6502/m6502.h"
class deco_cpu7_device : public m6502_device {
diff --git a/src/mame/machine/decopincpu.cpp b/src/mame/machine/decopincpu.cpp
index c0f7087e2f4..5166940d2ee 100644
--- a/src/mame/machine/decopincpu.cpp
+++ b/src/mame/machine/decopincpu.cpp
@@ -13,6 +13,7 @@
* - printer option (type 3b)
*/
+#include "emu.h"
#include "decopincpu.h"
const device_type DECOCPU1 = &device_creator<decocpu_type1_device>;
diff --git a/src/mame/machine/decopincpu.h b/src/mame/machine/decopincpu.h
index e4e5fffa304..73385b3ea99 100644
--- a/src/mame/machine/decopincpu.h
+++ b/src/mame/machine/decopincpu.h
@@ -9,7 +9,6 @@
#ifndef DECOPINCPU_H_
#define DECOPINCPU_H_
-#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
#include "machine/nvram.h"
diff --git a/src/mame/machine/dgnalpha.cpp b/src/mame/machine/dgnalpha.cpp
index 3523f97ecab..41ff87aeec7 100644
--- a/src/mame/machine/dgnalpha.cpp
+++ b/src/mame/machine/dgnalpha.cpp
@@ -66,6 +66,7 @@ keeping track of it in a variable in the driver.
***************************************************************************/
+#include "emu.h"
#include "includes/dgnalpha.h"
#include "sound/ay8910.h"
#include "imagedev/flopdrv.h"
diff --git a/src/mame/machine/dmv_keyb.cpp b/src/mame/machine/dmv_keyb.cpp
index 9d8e58134f0..a34993d1861 100644
--- a/src/mame/machine/dmv_keyb.cpp
+++ b/src/mame/machine/dmv_keyb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "dmv_keyb.h"
diff --git a/src/mame/machine/dmv_keyb.h b/src/mame/machine/dmv_keyb.h
index f0a2930210a..77317be417a 100644
--- a/src/mame/machine/dmv_keyb.h
+++ b/src/mame/machine/dmv_keyb.h
@@ -12,7 +12,6 @@
#define __DMV_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/machine/dragon.cpp b/src/mame/machine/dragon.cpp
index 0e5f9cb553e..dd3672d4f9d 100644
--- a/src/mame/machine/dragon.cpp
+++ b/src/mame/machine/dragon.cpp
@@ -37,6 +37,7 @@ easier to manage.
***************************************************************************/
+#include "emu.h"
#include "includes/dragon.h"
diff --git a/src/mame/machine/egret.h b/src/mame/machine/egret.h
index 8ab3b085cd7..04f461fa5f3 100644
--- a/src/mame/machine/egret.h
+++ b/src/mame/machine/egret.h
@@ -5,7 +5,6 @@
#ifndef __EGRET_H__
#define __EGRET_H__
-#include "emu.h"
diff --git a/src/mame/machine/esqlcd.cpp b/src/mame/machine/esqlcd.cpp
index f03cb36d2fb..273e52b1953 100644
--- a/src/mame/machine/esqlcd.cpp
+++ b/src/mame/machine/esqlcd.cpp
@@ -4,6 +4,7 @@
Ensoniq LCD dotmatrix Displays
derived by Parduz from the VFD Emulation by R. Belmont
*/
+#include "emu.h"
#include "esqlcd.h"
#include "esq2by16.lh"
diff --git a/src/mame/machine/esqlcd.h b/src/mame/machine/esqlcd.h
index eb5aaaa648c..cb474cd6b8f 100644
--- a/src/mame/machine/esqlcd.h
+++ b/src/mame/machine/esqlcd.h
@@ -3,7 +3,6 @@
#ifndef ESQLCD_H
#define ESQLCD_H
-#include "emu.h"
#include "esqvfd.h"
diff --git a/src/mame/machine/esqpanel.h b/src/mame/machine/esqpanel.h
index 64b8ee67b40..f92ad91d501 100644
--- a/src/mame/machine/esqpanel.h
+++ b/src/mame/machine/esqpanel.h
@@ -5,7 +5,6 @@
#ifndef __ESQPANEL_H__
#define __ESQPANEL_H__
-#include "emu.h"
#include "machine/esqvfd.h"
#include "machine/esqlcd.h"
diff --git a/src/mame/machine/esqvfd.cpp b/src/mame/machine/esqvfd.cpp
index 3c879a4451e..aa557cbed92 100644
--- a/src/mame/machine/esqvfd.cpp
+++ b/src/mame/machine/esqvfd.cpp
@@ -5,6 +5,7 @@
Emulation by R. Belmont
*/
+#include "emu.h"
#include "esqvfd.h"
#include "esq1by22.lh"
#include "esq2by40.lh"
diff --git a/src/mame/machine/esqvfd.h b/src/mame/machine/esqvfd.h
index c4043f35956..f804bc698b5 100644
--- a/src/mame/machine/esqvfd.h
+++ b/src/mame/machine/esqvfd.h
@@ -3,7 +3,6 @@
#ifndef ESQVFD_H
#define ESQVFD_H
-#include "emu.h"
#define MCFG_ESQ1x22_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, ESQ1x22, 60)
diff --git a/src/mame/machine/gamecom.cpp b/src/mame/machine/gamecom.cpp
index 1dcc1b8c2d2..2756dee4960 100644
--- a/src/mame/machine/gamecom.cpp
+++ b/src/mame/machine/gamecom.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol, Robbbert
+#include "emu.h"
#include "includes/gamecom.h"
diff --git a/src/mame/machine/gdrom.cpp b/src/mame/machine/gdrom.cpp
index abd310e565e..fd081b3f060 100644
--- a/src/mame/machine/gdrom.cpp
+++ b/src/mame/machine/gdrom.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "gdrom.h"
#define GDROM_BUSY_STATE 0x00
diff --git a/src/mame/machine/genpin.cpp b/src/mame/machine/genpin.cpp
index bac8743f5d2..5875bc787c8 100644
--- a/src/mame/machine/genpin.cpp
+++ b/src/mame/machine/genpin.cpp
@@ -8,6 +8,7 @@ This is for common pinball machine coding.
+#include "emu.h"
#include "genpin.h"
MACHINE_CONFIG_FRAGMENT( genpin_audio )
diff --git a/src/mame/machine/genpin.h b/src/mame/machine/genpin.h
index 5b72d09ff53..9c6bc50c6e0 100644
--- a/src/mame/machine/genpin.h
+++ b/src/mame/machine/genpin.h
@@ -4,7 +4,6 @@
#define GENPIN_H_
-#include "emu.h"
#include "sound/samples.h"
#include "machine/nvram.h"
diff --git a/src/mame/machine/hng64_net.cpp b/src/mame/machine/hng64_net.cpp
index 589d978d2d8..13f0628585d 100644
--- a/src/mame/machine/hng64_net.cpp
+++ b/src/mame/machine/hng64_net.cpp
@@ -12,6 +12,7 @@
*/
+#include "emu.h"
#include "includes/hng64.h"
#include "cpu/z80/kl5c80a12.h"
diff --git a/src/mame/machine/ibm6580_fdc.cpp b/src/mame/machine/ibm6580_fdc.cpp
index baa10e83f37..bf278444c11 100644
--- a/src/mame/machine/ibm6580_fdc.cpp
+++ b/src/mame/machine/ibm6580_fdc.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Sergey Svishchev
+#include "emu.h"
#include "ibm6580_fdc.h"
diff --git a/src/mame/machine/ibm6580_fdc.h b/src/mame/machine/ibm6580_fdc.h
index 611554ef02f..b63bbfbfc2b 100644
--- a/src/mame/machine/ibm6580_fdc.h
+++ b/src/mame/machine/ibm6580_fdc.h
@@ -3,7 +3,6 @@
#ifndef DWFDC_H_
#define DWFDC_H_
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/i8255.h"
#include "machine/upd765.h"
diff --git a/src/mame/machine/ibm6580_kbd.cpp b/src/mame/machine/ibm6580_kbd.cpp
index 1ae0e34fe9c..edc28843960 100644
--- a/src/mame/machine/ibm6580_kbd.cpp
+++ b/src/mame/machine/ibm6580_kbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Sergey Svishchev
+#include "emu.h"
#include "ibm6580_kbd.h"
#define VERBOSE_DBG 0 /* general debug messages */
diff --git a/src/mame/machine/ibm6580_kbd.h b/src/mame/machine/ibm6580_kbd.h
index cfbf0c44607..bd6e53935bf 100644
--- a/src/mame/machine/ibm6580_kbd.h
+++ b/src/mame/machine/ibm6580_kbd.h
@@ -3,7 +3,6 @@
#ifndef DWKBD_H_
#define DWKBD_H_
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#define MCFG_DW_KEYBOARD_OUT_DATA_HANDLER(_devcb) \
diff --git a/src/mame/machine/ie15_kbd.cpp b/src/mame/machine/ie15_kbd.cpp
index 414b302ed33..88fc6f2b134 100644
--- a/src/mame/machine/ie15_kbd.cpp
+++ b/src/mame/machine/ie15_kbd.cpp
@@ -7,6 +7,7 @@
***************************************************************************/
+#include "emu.h"
#include "machine/ie15_kbd.h"
/***************************************************************************
diff --git a/src/mame/machine/ie15_kbd.h b/src/mame/machine/ie15_kbd.h
index 7292dd1ff84..d2dbb3709a9 100644
--- a/src/mame/machine/ie15_kbd.h
+++ b/src/mame/machine/ie15_kbd.h
@@ -3,7 +3,6 @@
#ifndef __IE15_KEYBOARD_H__
#define __IE15_KEYBOARD_H__
-#include "emu.h"
#define IE_KB_ACK 1
diff --git a/src/mame/machine/igs036crypt.cpp b/src/mame/machine/igs036crypt.cpp
index 3f1785ff467..f57a996d9b2 100644
--- a/src/mame/machine/igs036crypt.cpp
+++ b/src/mame/machine/igs036crypt.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andreas Naive,David Haywood
+#include "emu.h"
#include "igs036crypt.h"
/****************************************************************************
diff --git a/src/mame/machine/igs036crypt.h b/src/mame/machine/igs036crypt.h
index c4d559f48d0..915c012dbb2 100644
--- a/src/mame/machine/igs036crypt.h
+++ b/src/mame/machine/igs036crypt.h
@@ -3,7 +3,6 @@
#ifndef _IGS036CRYPT_H_
#define _IGS036CRYPT_H_
-#include "emu.h"
class igs036_decryptor
{
diff --git a/src/mame/machine/interpro_ioga.cpp b/src/mame/machine/interpro_ioga.cpp
index 67a47f2cfd0..ab183493c77 100644
--- a/src/mame/machine/interpro_ioga.cpp
+++ b/src/mame/machine/interpro_ioga.cpp
@@ -15,6 +15,7 @@
* TODO
* - too long to list
*/
+#include "emu.h"
#include "interpro_ioga.h"
#define VERBOSE 0
diff --git a/src/mame/machine/interpro_ioga.h b/src/mame/machine/interpro_ioga.h
index 2809601d98e..64876303948 100644
--- a/src/mame/machine/interpro_ioga.h
+++ b/src/mame/machine/interpro_ioga.h
@@ -6,7 +6,6 @@
#ifndef INTERPRO_IOGA_H_
#define INTERPRO_IOGA_H_
-#include "emu.h"
#define MCFG_INTERPRO_IOGA_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, INTERPRO_IOGA, 0)
@@ -252,4 +251,4 @@ private:
// device type definition
extern const device_type INTERPRO_IOGA;
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/machine/interpro_mcga.cpp b/src/mame/machine/interpro_mcga.cpp
index d807f571bab..331910ddb10 100644
--- a/src/mame/machine/interpro_mcga.cpp
+++ b/src/mame/machine/interpro_mcga.cpp
@@ -11,6 +11,7 @@
* TODO
* - too long to list
*/
+#include "emu.h"
#include "interpro_mcga.h"
#define VERBOSE 0
@@ -86,4 +87,4 @@ READ16_MEMBER(interpro_mcga_device::read)
default:
return m_reg[offset];
}
-} \ No newline at end of file
+}
diff --git a/src/mame/machine/interpro_mcga.h b/src/mame/machine/interpro_mcga.h
index 4f3ecde78cc..35974888745 100644
--- a/src/mame/machine/interpro_mcga.h
+++ b/src/mame/machine/interpro_mcga.h
@@ -6,7 +6,6 @@
#ifndef INTERPRO_MCGA_H_
#define INTERPRO_MCGA_H_
-#include "emu.h"
// mcga control register
#define MCGA_CTRL_OPTMASK 0x00000003
@@ -42,4 +41,4 @@ private:
// device type definition
extern const device_type INTERPRO_MCGA;
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/machine/interpro_sga.cpp b/src/mame/machine/interpro_sga.cpp
index 102c58a2f0b..ee7b08905fe 100644
--- a/src/mame/machine/interpro_sga.cpp
+++ b/src/mame/machine/interpro_sga.cpp
@@ -11,6 +11,7 @@
* TODO
* - too long to list
*/
+#include "emu.h"
#include "interpro_sga.h"
#define VERBOSE 0
diff --git a/src/mame/machine/interpro_sga.h b/src/mame/machine/interpro_sga.h
index 06c2d1fba8f..b48dbe61829 100644
--- a/src/mame/machine/interpro_sga.h
+++ b/src/mame/machine/interpro_sga.h
@@ -6,7 +6,6 @@
#ifndef INTERPRO_SGA_H_
#define INTERPRO_SGA_H_
-#include "emu.h"
class interpro_sga_device : public device_t
{
@@ -68,4 +67,4 @@ private:
// device type definition
extern const device_type INTERPRO_SGA;
-#endif \ No newline at end of file
+#endif
diff --git a/src/mame/machine/isbc_208.cpp b/src/mame/machine/isbc_208.cpp
index e0aba484e01..6b0201b0e3c 100644
--- a/src/mame/machine/isbc_208.cpp
+++ b/src/mame/machine/isbc_208.cpp
@@ -3,6 +3,7 @@
// TODO: multibus
+#include "emu.h"
#include "isbc_208.h"
const device_type ISBC_208 = &device_creator<isbc_208_device>;
diff --git a/src/mame/machine/isbc_208.h b/src/mame/machine/isbc_208.h
index 43c08b9b98d..691266e0a67 100644
--- a/src/mame/machine/isbc_208.h
+++ b/src/mame/machine/isbc_208.h
@@ -4,7 +4,6 @@
#ifndef ISBC_208_H_
#define ISBC_208_H_
-#include "emu.h"
#include "formats/pc_dsk.h"
#include "machine/upd765.h"
#include "machine/am9517a.h"
diff --git a/src/mame/machine/isbc_215g.cpp b/src/mame/machine/isbc_215g.cpp
index e94622e9367..9408e05d223 100644
--- a/src/mame/machine/isbc_215g.cpp
+++ b/src/mame/machine/isbc_215g.cpp
@@ -6,6 +6,7 @@
// TODO: multibus
+#include "emu.h"
#include "isbc_215g.h"
const device_type ISBC_215G = &device_creator<isbc_215g_device>;
diff --git a/src/mame/machine/isbc_215g.h b/src/mame/machine/isbc_215g.h
index 0a71ae4c10a..3b13ee4326c 100644
--- a/src/mame/machine/isbc_215g.h
+++ b/src/mame/machine/isbc_215g.h
@@ -4,7 +4,6 @@
#ifndef ISBC_215G_H_
#define ISBC_215G_H_
-#include "emu.h"
#include "cpu/i8089/i8089.h"
#include "bus/isbx/isbx.h"
#include "imagedev/harddriv.h"
diff --git a/src/mame/machine/iteagle_fpga.cpp b/src/mame/machine/iteagle_fpga.cpp
index b36ed16b12d..561066b4164 100644
--- a/src/mame/machine/iteagle_fpga.cpp
+++ b/src/mame/machine/iteagle_fpga.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Ted Green
+#include "emu.h"
#include "iteagle_fpga.h"
#include "coreutil.h"
diff --git a/src/mame/machine/jvs13551.cpp b/src/mame/machine/jvs13551.cpp
index f08ee51d1fc..494ebad62fa 100644
--- a/src/mame/machine/jvs13551.cpp
+++ b/src/mame/machine/jvs13551.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "jvs13551.h"
const device_type SEGA_837_13551 = &device_creator<sega_837_13551>;
diff --git a/src/mame/machine/jvs13551.h b/src/mame/machine/jvs13551.h
index 59038a4c84b..7a55a29f0d3 100644
--- a/src/mame/machine/jvs13551.h
+++ b/src/mame/machine/jvs13551.h
@@ -3,7 +3,6 @@
#ifndef __JVS13551_H__
#define __JVS13551_H__
-#include "emu.h"
#include "machine/jvsdev.h"
#define MCFG_SEGA_837_13551_DEVICE_ADD(_tag, _host, tilt, d0, d1, a0, a1, a2, a3, a4, a5, a6, a7, out) \
diff --git a/src/mame/machine/k573cass.cpp b/src/mame/machine/k573cass.cpp
index db096c04800..5919920338c 100644
--- a/src/mame/machine/k573cass.cpp
+++ b/src/mame/machine/k573cass.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "k573cass.h"
// class konami573_cassette_interface
diff --git a/src/mame/machine/k573mcr.cpp b/src/mame/machine/k573mcr.cpp
index a18a25e1d0c..273a4737c56 100644
--- a/src/mame/machine/k573mcr.cpp
+++ b/src/mame/machine/k573mcr.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "k573mcr.h"
/*
diff --git a/src/mame/machine/k573mcr.h b/src/mame/machine/k573mcr.h
index 7980321be3a..720f027fc9c 100644
--- a/src/mame/machine/k573mcr.h
+++ b/src/mame/machine/k573mcr.h
@@ -10,7 +10,6 @@
#ifndef __K573MCR_H__
#define __K573MCR_H__
-#include "emu.h"
extern const device_type KONAMI_573_MEMORY_CARD_READER;
diff --git a/src/mame/machine/k573msu.cpp b/src/mame/machine/k573msu.cpp
index d691a909942..0ccdcf591ed 100644
--- a/src/mame/machine/k573msu.cpp
+++ b/src/mame/machine/k573msu.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "k573msu.h"
/*
diff --git a/src/mame/machine/k573msu.h b/src/mame/machine/k573msu.h
index 2a6bbef1cba..64623d5ca82 100644
--- a/src/mame/machine/k573msu.h
+++ b/src/mame/machine/k573msu.h
@@ -10,7 +10,6 @@
#ifndef __K573MSU_H__
#define __K573MSU_H__
-#include "emu.h"
extern const device_type KONAMI_573_MULTI_SESSION_UNIT;
diff --git a/src/mame/machine/k573npu.cpp b/src/mame/machine/k573npu.cpp
index e9b0853a0d7..3664ddb09b8 100644
--- a/src/mame/machine/k573npu.cpp
+++ b/src/mame/machine/k573npu.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "k573npu.h"
/*
diff --git a/src/mame/machine/k573npu.h b/src/mame/machine/k573npu.h
index ec2302c25b7..e1c9fa35842 100644
--- a/src/mame/machine/k573npu.h
+++ b/src/mame/machine/k573npu.h
@@ -10,7 +10,6 @@
#ifndef __K573NPU_H__
#define __K573NPU_H__
-#include "emu.h"
extern const device_type KONAMI_573_NETWORK_PCB_UNIT;
diff --git a/src/mame/machine/k7659kb.cpp b/src/mame/machine/k7659kb.cpp
index 343e7c0330b..7466a67ecb5 100644
--- a/src/mame/machine/k7659kb.cpp
+++ b/src/mame/machine/k7659kb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "k7659kb.h"
diff --git a/src/mame/machine/k7659kb.h b/src/mame/machine/k7659kb.h
index e84ce714b3a..d5ed7ab3ee4 100644
--- a/src/mame/machine/k7659kb.h
+++ b/src/mame/machine/k7659kb.h
@@ -12,7 +12,6 @@
#define __K7659_KEYBOARD__
-#include "emu.h"
diff --git a/src/mame/machine/kabuki.h b/src/mame/machine/kabuki.h
index ef7d375632e..5b2b01298f9 100644
--- a/src/mame/machine/kabuki.h
+++ b/src/mame/machine/kabuki.h
@@ -1,6 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
-#include "emu.h"
void mgakuen2_decode(uint8_t *src, uint8_t *dst, int size);
void pang_decode(uint8_t *src, uint8_t *dst, int size);
diff --git a/src/mame/machine/kaypro.cpp b/src/mame/machine/kaypro.cpp
index c4e1d8fcaa2..66a9a4bfb28 100644
--- a/src/mame/machine/kaypro.cpp
+++ b/src/mame/machine/kaypro.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Robbbert
+#include "emu.h"
#include "includes/kaypro.h"
diff --git a/src/mame/machine/km035.h b/src/mame/machine/km035.h
index a25f29bdfb6..bbc5afcdf1d 100644
--- a/src/mame/machine/km035.h
+++ b/src/mame/machine/km035.h
@@ -5,7 +5,6 @@
#ifndef __KM035_H__
#define __KM035_H__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/beep.h"
diff --git a/src/mame/machine/lisa.cpp b/src/mame/machine/lisa.cpp
index e3ab084b671..69d4503b6b5 100644
--- a/src/mame/machine/lisa.cpp
+++ b/src/mame/machine/lisa.cpp
@@ -38,6 +38,7 @@
Raphael Nabet, 2000-2003
*/
+#include "emu.h"
#include "includes/lisa.h"
diff --git a/src/mame/machine/llc.cpp b/src/mame/machine/llc.cpp
index a3778208b25..bf9beffe2ce 100644
--- a/src/mame/machine/llc.cpp
+++ b/src/mame/machine/llc.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/llc.h"
diff --git a/src/mame/machine/m20_8086.cpp b/src/mame/machine/m20_8086.cpp
index 58be78f198a..4fb0be656ec 100644
--- a/src/mame/machine/m20_8086.cpp
+++ b/src/mame/machine/m20_8086.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "m20_8086.h"
#include "machine/ram.h"
diff --git a/src/mame/machine/m20_8086.h b/src/mame/machine/m20_8086.h
index 67a715b7059..56f7a81e43a 100644
--- a/src/mame/machine/m20_8086.h
+++ b/src/mame/machine/m20_8086.h
@@ -3,7 +3,6 @@
#ifndef M20_8086_H_
#define M20_8086_H_
-#include "emu.h"
#include "cpu/i86/i86.h"
#include "machine/pic8259.h"
diff --git a/src/mame/machine/m20_kbd.cpp b/src/mame/machine/m20_kbd.cpp
index 00cfdd08a56..3d90493277f 100644
--- a/src/mame/machine/m20_kbd.cpp
+++ b/src/mame/machine/m20_kbd.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Carl,Vas Crabb
+#include "emu.h"
#include "machine/m20_kbd.h"
#include "machine/keyboard.ipp"
diff --git a/src/mame/machine/m24_kbd.cpp b/src/mame/machine/m24_kbd.cpp
index 2a3c7e7142f..b753ddbe532 100644
--- a/src/mame/machine/m24_kbd.cpp
+++ b/src/mame/machine/m24_kbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "m24_kbd.h"
const device_type M24_KEYBOARD = &device_creator<m24_keyboard_device>;
diff --git a/src/mame/machine/m24_kbd.h b/src/mame/machine/m24_kbd.h
index 70a3a8946b8..e8ce21b81cc 100644
--- a/src/mame/machine/m24_kbd.h
+++ b/src/mame/machine/m24_kbd.h
@@ -3,7 +3,6 @@
#ifndef M24KBD_H_
#define M24KBD_H_
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#define MCFG_M24_KEYBOARD_OUT_DATA_HANDLER(_devcb) \
diff --git a/src/mame/machine/m24_z8000.cpp b/src/mame/machine/m24_z8000.cpp
index 9019ab3b109..73204a21acb 100644
--- a/src/mame/machine/m24_z8000.cpp
+++ b/src/mame/machine/m24_z8000.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "m24_z8000.h"
const device_type M24_Z8000 = &device_creator<m24_z8000_device>;
diff --git a/src/mame/machine/m24_z8000.h b/src/mame/machine/m24_z8000.h
index aca70039736..e0eac4ef2ca 100644
--- a/src/mame/machine/m24_z8000.h
+++ b/src/mame/machine/m24_z8000.h
@@ -3,7 +3,6 @@
#ifndef M24_Z8000_H_
#define M24_Z8000_H_
-#include "emu.h"
#include "cpu/z8000/z8000.h"
#include "machine/i8251.h"
#include "machine/pit8253.h"
diff --git a/src/mame/machine/m2comm.h b/src/mame/machine/m2comm.h
index 0b9cc9731fb..5145b59d54b 100644
--- a/src/mame/machine/m2comm.h
+++ b/src/mame/machine/m2comm.h
@@ -7,7 +7,6 @@
#define __M2COMM_SIMULATION__
-#include "emu.h"
#define MCFG_M2COMM_ADD(_tag ) \
MCFG_DEVICE_ADD(_tag, M2COMM, 0)
diff --git a/src/mame/machine/mackbd.h b/src/mame/machine/mackbd.h
index 621d1143b26..e36acad7e33 100644
--- a/src/mame/machine/mackbd.h
+++ b/src/mame/machine/mackbd.h
@@ -5,7 +5,6 @@
#ifndef __MACKBD_H__
#define __MACKBD_H__
-#include "emu.h"
diff --git a/src/mame/machine/mbc55x.cpp b/src/mame/machine/mbc55x.cpp
index 99c6c6d2cd7..44586083a9b 100644
--- a/src/mame/machine/mbc55x.cpp
+++ b/src/mame/machine/mbc55x.cpp
@@ -9,6 +9,7 @@
2011-01-29.
*****************************************************************************/
+#include "emu.h"
#include <functional>
#include "includes/mbc55x.h"
diff --git a/src/mame/machine/mbee.cpp b/src/mame/machine/mbee.cpp
index 992066db3d0..0fd17f6c88e 100644
--- a/src/mame/machine/mbee.cpp
+++ b/src/mame/machine/mbee.cpp
@@ -11,6 +11,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/mbee.h"
#include "machine/z80bin.h"
diff --git a/src/mame/machine/mc80.cpp b/src/mame/machine/mc80.cpp
index 3be03fa4f98..2b6423ec25d 100644
--- a/src/mame/machine/mc80.cpp
+++ b/src/mame/machine/mc80.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/mc80.h"
/*****************************************************************************/
diff --git a/src/mame/machine/meters.h b/src/mame/machine/meters.h
index 3233789a481..f248d9295a9 100644
--- a/src/mame/machine/meters.h
+++ b/src/mame/machine/meters.h
@@ -14,7 +14,6 @@
#ifndef __METERS_H__
#define __METERS_H__
-#include "emu.h"
#define MCFG_METERS_NUMBER(_number) \
diff --git a/src/mame/machine/midikbd.cpp b/src/mame/machine/midikbd.cpp
index e0b8ce8478c..3b6ece1ce9d 100644
--- a/src/mame/machine/midikbd.cpp
+++ b/src/mame/machine/midikbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "machine/midikbd.h"
const device_type MIDI_KBD = &device_creator<midi_keyboard_device>;
diff --git a/src/mame/machine/midikbd.h b/src/mame/machine/midikbd.h
index e2862f8bd93..84c811c237d 100644
--- a/src/mame/machine/midikbd.h
+++ b/src/mame/machine/midikbd.h
@@ -3,7 +3,6 @@
#ifndef MIDIKBD_H_
#define MIDIKBD_H_
-#include "emu.h"
#define MCFG_MIDI_KBD_ADD(_tag, _devcb, _clock) \
MCFG_DEVICE_ADD(_tag, MIDI_KBD, _clock) \
diff --git a/src/mame/machine/mm1kb.cpp b/src/mame/machine/mm1kb.cpp
index 157c1558e15..dd620968e8a 100644
--- a/src/mame/machine/mm1kb.cpp
+++ b/src/mame/machine/mm1kb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "mm1kb.h"
diff --git a/src/mame/machine/mm1kb.h b/src/mame/machine/mm1kb.h
index c81bac4fa58..f5c19f7e74c 100644
--- a/src/mame/machine/mm1kb.h
+++ b/src/mame/machine/mm1kb.h
@@ -11,7 +11,6 @@
#ifndef __MM1_KEYBOARD__
#define __MM1_KEYBOARD__
-#include "emu.h"
#include "sound/samples.h"
diff --git a/src/mame/machine/ms7004.h b/src/mame/machine/ms7004.h
index 6453b9dfc90..4847e4b66e2 100644
--- a/src/mame/machine/ms7004.h
+++ b/src/mame/machine/ms7004.h
@@ -5,7 +5,6 @@
#ifndef __MS7004_H__
#define __MS7004_H__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/i8243.h"
#include "sound/beep.h"
diff --git a/src/mame/machine/msx.cpp b/src/mame/machine/msx.cpp
index d88b618aaf8..28daab967be 100644
--- a/src/mame/machine/msx.cpp
+++ b/src/mame/machine/msx.cpp
@@ -13,6 +13,7 @@
* - wd2793, nms8255
*/
+#include "emu.h"
#include "includes/msx.h"
#define VERBOSE 0
diff --git a/src/mame/machine/mz80.cpp b/src/mame/machine/mz80.cpp
index 9b2b1f09807..cf62ee5546d 100644
--- a/src/mame/machine/mz80.cpp
+++ b/src/mame/machine/mz80.cpp
@@ -8,6 +8,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/mz80.h"
diff --git a/src/mame/machine/nextkbd.cpp b/src/mame/machine/nextkbd.cpp
index f742dd2a43e..64c5df5ddc2 100644
--- a/src/mame/machine/nextkbd.cpp
+++ b/src/mame/machine/nextkbd.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "nextkbd.h"
const device_type NEXTKBD = &device_creator<nextkbd_device>;
diff --git a/src/mame/machine/nextkbd.h b/src/mame/machine/nextkbd.h
index 4d0ed219178..41b183a12ec 100644
--- a/src/mame/machine/nextkbd.h
+++ b/src/mame/machine/nextkbd.h
@@ -3,7 +3,6 @@
#ifndef __NEXTKBD_H__
#define __NEXTKBD_H__
-#include "emu.h"
#define MCFG_NEXTKBD_INT_CHANGE_CALLBACK(_write) \
devcb = &nextkbd_device::set_int_change_wr_callback(*device, DEVCB_##_write);
diff --git a/src/mame/machine/ngen_kb.cpp b/src/mame/machine/ngen_kb.cpp
index c42f2b72e64..30001eb6a21 100644
--- a/src/mame/machine/ngen_kb.cpp
+++ b/src/mame/machine/ngen_kb.cpp
@@ -8,6 +8,7 @@
the serial keyboard which may not be desirable.
*/
+#include "emu.h"
#include "ngen_kb.h"
ngen_keyboard_device::ngen_keyboard_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
diff --git a/src/mame/machine/ns11prot.cpp b/src/mame/machine/ns11prot.cpp
index c357b8d82eb..b323cbd2e7d 100644
--- a/src/mame/machine/ns11prot.cpp
+++ b/src/mame/machine/ns11prot.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "ns11prot.h"
ns11_keycus_device::ns11_keycus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source) :
diff --git a/src/mame/machine/ns11prot.h b/src/mame/machine/ns11prot.h
index b548fd19871..de9af03b7d6 100644
--- a/src/mame/machine/ns11prot.h
+++ b/src/mame/machine/ns11prot.h
@@ -5,7 +5,6 @@
*
*/
-#include "emu.h"
class ns11_keycus_device : public device_t
{
diff --git a/src/mame/machine/octo_kbd.cpp b/src/mame/machine/octo_kbd.cpp
index e0c50d035a8..7c12b1cfd90 100644
--- a/src/mame/machine/octo_kbd.cpp
+++ b/src/mame/machine/octo_kbd.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Barry Rodewald
+#include "emu.h"
#include "machine/octo_kbd.h"
#include "machine/keyboard.ipp"
diff --git a/src/mame/machine/p2000t.cpp b/src/mame/machine/p2000t.cpp
index 099a98be629..81b639c8814 100644
--- a/src/mame/machine/p2000t.cpp
+++ b/src/mame/machine/p2000t.cpp
@@ -9,6 +9,7 @@
**********************************************************************/
+#include "emu.h"
#include "includes/p2000t.h"
#define P2000M_101F_CASDAT 0x01
diff --git a/src/mame/machine/pc1512kb.cpp b/src/mame/machine/pc1512kb.cpp
index 4e0a4db6e20..dbd6a14e958 100644
--- a/src/mame/machine/pc1512kb.cpp
+++ b/src/mame/machine/pc1512kb.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "pc1512kb.h"
diff --git a/src/mame/machine/pc1512kb.h b/src/mame/machine/pc1512kb.h
index 9dccac573e3..8f9865d1771 100644
--- a/src/mame/machine/pc1512kb.h
+++ b/src/mame/machine/pc1512kb.h
@@ -12,7 +12,6 @@
#define __PC1512_KEYBOARD__
-#include "emu.h"
#include "bus/vcs_ctrl/ctrl.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/machine/pc9801_cbus.cpp b/src/mame/machine/pc9801_cbus.cpp
index 25e99e56742..065bbe19e47 100644
--- a/src/mame/machine/pc9801_cbus.cpp
+++ b/src/mame/machine/pc9801_cbus.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "pc9801_cbus.h"
diff --git a/src/mame/machine/pc9801_cbus.h b/src/mame/machine/pc9801_cbus.h
index 408fcd414ad..b3d8b85c142 100644
--- a/src/mame/machine/pc9801_cbus.h
+++ b/src/mame/machine/pc9801_cbus.h
@@ -10,7 +10,6 @@
#ifndef __PC9801_SLOTCBUS__
#define __PC9801_SLOTCBUS__
-#include "emu.h"
//**************************************************************************
diff --git a/src/mame/machine/pc9801_cd.cpp b/src/mame/machine/pc9801_cd.cpp
index a47c9103971..8e9216fc005 100644
--- a/src/mame/machine/pc9801_cd.cpp
+++ b/src/mame/machine/pc9801_cd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "pc9801_cd.h"
// device type definition
diff --git a/src/mame/machine/pcd_kbd.cpp b/src/mame/machine/pcd_kbd.cpp
index 704e71b5c58..b05eaa8ab1c 100644
--- a/src/mame/machine/pcd_kbd.cpp
+++ b/src/mame/machine/pcd_kbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "pcd_kbd.h"
const device_type PCD_KEYBOARD = &device_creator<pcd_keyboard_device>;
diff --git a/src/mame/machine/pcd_kbd.h b/src/mame/machine/pcd_kbd.h
index e44e38bbec9..6542ecdbc60 100644
--- a/src/mame/machine/pcd_kbd.h
+++ b/src/mame/machine/pcd_kbd.h
@@ -3,7 +3,6 @@
#ifndef PCD_KBD_H_
#define PCD_KBD_H_
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/speaker.h"
diff --git a/src/mame/machine/pp01.cpp b/src/mame/machine/pp01.cpp
index ade836c627a..186a5ac609e 100644
--- a/src/mame/machine/pp01.cpp
+++ b/src/mame/machine/pp01.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/pp01.h"
diff --git a/src/mame/machine/prof80mmu.cpp b/src/mame/machine/prof80mmu.cpp
index a981d08c3e9..cc8af9d6790 100644
--- a/src/mame/machine/prof80mmu.cpp
+++ b/src/mame/machine/prof80mmu.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "prof80mmu.h"
diff --git a/src/mame/machine/prof80mmu.h b/src/mame/machine/prof80mmu.h
index 5820b31ca66..f6694ac7a1f 100644
--- a/src/mame/machine/prof80mmu.h
+++ b/src/mame/machine/prof80mmu.h
@@ -11,7 +11,6 @@
#ifndef __PROF80_MMU__
#define __PROF80_MMU__
-#include "emu.h"
diff --git a/src/mame/machine/qimi.cpp b/src/mame/machine/qimi.cpp
index c49de90a854..7bbfbe903af 100644
--- a/src/mame/machine/qimi.cpp
+++ b/src/mame/machine/qimi.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "qimi.h"
diff --git a/src/mame/machine/qimi.h b/src/mame/machine/qimi.h
index 8ec534509ab..f35cbf1f749 100644
--- a/src/mame/machine/qimi.h
+++ b/src/mame/machine/qimi.h
@@ -11,7 +11,6 @@
#ifndef __QIMI__
#define __QIMI__
-#include "emu.h"
diff --git a/src/mame/machine/qx10kbd.cpp b/src/mame/machine/qx10kbd.cpp
index 59fac18aedc..14a91372c78 100644
--- a/src/mame/machine/qx10kbd.cpp
+++ b/src/mame/machine/qx10kbd.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Carl
// TODO: dump 8049 mcu; key repeat; LEDs
+#include "emu.h"
#include "machine/qx10kbd.h"
#include "machine/keyboard.ipp"
diff --git a/src/mame/machine/rm380z.cpp b/src/mame/machine/rm380z.cpp
index a6931c93677..158f26cf182 100644
--- a/src/mame/machine/rm380z.cpp
+++ b/src/mame/machine/rm380z.cpp
@@ -8,6 +8,7 @@ RM 380Z machine
*/
+#include "emu.h"
#include "includes/rm380z.h"
diff --git a/src/mame/machine/rmnimbus.cpp b/src/mame/machine/rmnimbus.cpp
index 2604d9c9072..d6db1e65580 100644
--- a/src/mame/machine/rmnimbus.cpp
+++ b/src/mame/machine/rmnimbus.cpp
@@ -59,6 +59,7 @@ chdman createhd -o ST125N.chd -chs 41921,1,1 -ss 512
*/
+#include "emu.h"
#include <functional>
#include "includes/rmnimbus.h"
diff --git a/src/mame/machine/rmnkbd.cpp b/src/mame/machine/rmnkbd.cpp
index f12f4aea91f..be3304ec472 100644
--- a/src/mame/machine/rmnkbd.cpp
+++ b/src/mame/machine/rmnkbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl,Vas Crabb
+#include "emu.h"
#include "machine/rmnkbd.h"
#include "machine/keyboard.ipp"
diff --git a/src/mame/machine/segabb.cpp b/src/mame/machine/segabb.cpp
index dc62f67f6e0..aa03b4e483e 100644
--- a/src/mame/machine/segabb.cpp
+++ b/src/mame/machine/segabb.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "segabb.h"
const device_type SEGA_LINDBERGH_BASEBOARD = &device_creator<sega_lindbergh_baseboard_device>;
diff --git a/src/mame/machine/segacrp2_device.h b/src/mame/machine/segacrp2_device.h
index 624252880bb..ddbe1cfb8d5 100644
--- a/src/mame/machine/segacrp2_device.h
+++ b/src/mame/machine/segacrp2_device.h
@@ -10,7 +10,6 @@
#define MCFG_SEGAZ80_SET_DECRYPTED_TAG(_tag) \
segacrp2_z80_device::set_decrypted_tag(*device, _tag);
-#include "emu.h"
#include "cpu/z80/z80.h"
// base class
diff --git a/src/mame/machine/segacrpt_device.h b/src/mame/machine/segacrpt_device.h
index 0e2a289f6fa..66395bf1e2c 100644
--- a/src/mame/machine/segacrpt_device.h
+++ b/src/mame/machine/segacrpt_device.h
@@ -23,7 +23,6 @@
segacrpt_z80_device::set_banksize(*device, _banksize);
-#include "emu.h"
#include "cpu/z80/z80.h"
// base class
diff --git a/src/mame/machine/slapstic.cpp b/src/mame/machine/slapstic.cpp
index 373bfdc5cd0..0361b53f4d7 100644
--- a/src/mame/machine/slapstic.cpp
+++ b/src/mame/machine/slapstic.cpp
@@ -181,6 +181,7 @@
*************************************************************************/
+#include "emu.h"
#include "includes/slapstic.h"
diff --git a/src/mame/machine/sorcerer.cpp b/src/mame/machine/sorcerer.cpp
index b140bf7094e..ecbae9c1836 100644
--- a/src/mame/machine/sorcerer.cpp
+++ b/src/mame/machine/sorcerer.cpp
@@ -6,6 +6,7 @@
*******************************************************************************/
+#include "emu.h"
#include "includes/sorcerer.h"
#include "machine/z80bin.h"
diff --git a/src/mame/machine/special.cpp b/src/mame/machine/special.cpp
index 9f1e23b3631..d13a8624b92 100644
--- a/src/mame/machine/special.cpp
+++ b/src/mame/machine/special.cpp
@@ -11,6 +11,7 @@
+#include "emu.h"
#include "includes/special.h"
diff --git a/src/mame/machine/st0016.cpp b/src/mame/machine/st0016.cpp
index 58ab23b9f4c..d39d6c1bc41 100644
--- a/src/mame/machine/st0016.cpp
+++ b/src/mame/machine/st0016.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Tomasz Slanina, David Haywood
/* ST0016 - CPU (z80) + Sound + Video */
+#include "emu.h"
#include "st0016.h"
const device_type ST0016_CPU = &device_creator<st0016_cpu_device>;
diff --git a/src/mame/machine/st0016.h b/src/mame/machine/st0016.h
index 75c61d4f68c..c82e4eacfdb 100644
--- a/src/mame/machine/st0016.h
+++ b/src/mame/machine/st0016.h
@@ -7,7 +7,6 @@
#ifndef __ST0016_CPU__
#define __ST0016_CPU__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "sound/st0016.h"
diff --git a/src/mame/machine/subsino.h b/src/mame/machine/subsino.h
index 23f97da0c4b..8b68bd1902a 100644
--- a/src/mame/machine/subsino.h
+++ b/src/mame/machine/subsino.h
@@ -3,7 +3,6 @@
#ifndef __MACHINE_SUBSINO__
#define __MACHINE_SUBSINO__
-#include "emu.h"
extern const uint8_t crsbingo_xors[8];
extern const uint8_t sharkpy_xors [8];
diff --git a/src/mame/machine/super80.cpp b/src/mame/machine/super80.cpp
index 1c481e2191b..8b23b1edfe4 100644
--- a/src/mame/machine/super80.cpp
+++ b/src/mame/machine/super80.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Robbbert
/* Super80.c written by Robbbert, 2005-2009. See driver source for documentation. */
+#include "emu.h"
#include "includes/super80.h"
#include "machine/z80bin.h"
diff --git a/src/mame/machine/swim.cpp b/src/mame/machine/swim.cpp
index df9beec8afa..cac2f6ed387 100644
--- a/src/mame/machine/swim.cpp
+++ b/src/mame/machine/swim.cpp
@@ -9,6 +9,7 @@
*********************************************************************/
+#include "emu.h"
#include "machine/swim.h"
diff --git a/src/mame/machine/tandy2kb.cpp b/src/mame/machine/tandy2kb.cpp
index fd975ed3a84..ff76291c1ff 100644
--- a/src/mame/machine/tandy2kb.cpp
+++ b/src/mame/machine/tandy2kb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "tandy2kb.h"
diff --git a/src/mame/machine/tandy2kb.h b/src/mame/machine/tandy2kb.h
index aa6befb3667..b2ad63a38f1 100644
--- a/src/mame/machine/tandy2kb.h
+++ b/src/mame/machine/tandy2kb.h
@@ -11,7 +11,6 @@
#ifndef __TANDY2K_KEYBOARD__
#define __TANDY2K_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/machine/teleprinter.cpp b/src/mame/machine/teleprinter.cpp
index 8ffc4144794..d93c498e371 100644
--- a/src/mame/machine/teleprinter.cpp
+++ b/src/mame/machine/teleprinter.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Miodrag Milanovic
+#include "emu.h"
#include "teleprinter.h"
static const uint8_t teleprinter_font[128*8] =
diff --git a/src/mame/machine/thomflop.cpp b/src/mame/machine/thomflop.cpp
index 864fd36c9c4..6bb7416c51f 100644
--- a/src/mame/machine/thomflop.cpp
+++ b/src/mame/machine/thomflop.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "includes/thomson.h"
#include "machine/wd_fdc.h"
diff --git a/src/mame/machine/trs80.cpp b/src/mame/machine/trs80.cpp
index 1d9a77d0e90..ce847330e1f 100644
--- a/src/mame/machine/trs80.cpp
+++ b/src/mame/machine/trs80.cpp
@@ -13,6 +13,7 @@ MAX_SECTORS 5 and granules of sectors
***************************************************************************/
+#include "emu.h"
#include "includes/trs80.h"
diff --git a/src/mame/machine/trs80m2kb.cpp b/src/mame/machine/trs80m2kb.cpp
index 761d6c5d35e..0fe207f1ab0 100644
--- a/src/mame/machine/trs80m2kb.cpp
+++ b/src/mame/machine/trs80m2kb.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "trs80m2kb.h"
diff --git a/src/mame/machine/trs80m2kb.h b/src/mame/machine/trs80m2kb.h
index f41a3f0a666..bf8a45f3606 100644
--- a/src/mame/machine/trs80m2kb.h
+++ b/src/mame/machine/trs80m2kb.h
@@ -11,7 +11,6 @@
#ifndef __TRS80M2_KEYBOARD__
#define __TRS80M2_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/discrete.h"
diff --git a/src/mame/machine/upd65031.cpp b/src/mame/machine/upd65031.cpp
index 0e54f374bac..6a98da0660c 100644
--- a/src/mame/machine/upd65031.cpp
+++ b/src/mame/machine/upd65031.cpp
@@ -22,6 +22,7 @@
*********************************************************************/
+#include "emu.h"
#include "upd65031.h"
diff --git a/src/mame/machine/upd65031.h b/src/mame/machine/upd65031.h
index ce13ad05942..aad871e80c6 100644
--- a/src/mame/machine/upd65031.h
+++ b/src/mame/machine/upd65031.h
@@ -11,7 +11,6 @@
#ifndef __UPD65031__
#define __UPD65031__
-#include "emu.h"
diff --git a/src/mame/machine/v1050kb.cpp b/src/mame/machine/v1050kb.cpp
index 977c85ba29a..05f7114e8c9 100644
--- a/src/mame/machine/v1050kb.cpp
+++ b/src/mame/machine/v1050kb.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "v1050kb.h"
diff --git a/src/mame/machine/v1050kb.h b/src/mame/machine/v1050kb.h
index 3fb1cb9da3d..052748b394b 100644
--- a/src/mame/machine/v1050kb.h
+++ b/src/mame/machine/v1050kb.h
@@ -11,7 +11,6 @@
#ifndef __V1050_KEYBOARD__
#define __V1050_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "sound/discrete.h"
diff --git a/src/mame/machine/vector06.cpp b/src/mame/machine/vector06.cpp
index 259dfed9127..efe3e81ff0d 100644
--- a/src/mame/machine/vector06.cpp
+++ b/src/mame/machine/vector06.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/vector06.h"
diff --git a/src/mame/machine/victor9k_fdc.cpp b/src/mame/machine/victor9k_fdc.cpp
index d0bd89baf2d..d23f62126a2 100644
--- a/src/mame/machine/victor9k_fdc.cpp
+++ b/src/mame/machine/victor9k_fdc.cpp
@@ -40,6 +40,7 @@
*/
+#include "emu.h"
#include "victor9k_fdc.h"
diff --git a/src/mame/machine/victor9k_fdc.h b/src/mame/machine/victor9k_fdc.h
index 98e1d491507..dcd82226fdd 100644
--- a/src/mame/machine/victor9k_fdc.h
+++ b/src/mame/machine/victor9k_fdc.h
@@ -11,7 +11,6 @@
#ifndef __VICTOR_9000_FDC__
#define __VICTOR_9000_FDC__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "formats/victor9k_dsk.h"
#include "imagedev/floppy.h"
diff --git a/src/mame/machine/victor9kb.cpp b/src/mame/machine/victor9kb.cpp
index a683a51295f..9fb6e882caf 100644
--- a/src/mame/machine/victor9kb.cpp
+++ b/src/mame/machine/victor9kb.cpp
@@ -334,6 +334,7 @@ Y11 104 103 102 101 100 99 98 97 kN/A k. k00 k0 RGHT LEFT PAUS
*/
+#include "emu.h"
#include "victor9kb.h"
diff --git a/src/mame/machine/victor9kb.h b/src/mame/machine/victor9kb.h
index 53e51b0d608..5cf750c59ae 100644
--- a/src/mame/machine/victor9kb.h
+++ b/src/mame/machine/victor9kb.h
@@ -12,7 +12,6 @@
#define __VICTOR9K_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/machine/wangpckb.cpp b/src/mame/machine/wangpckb.cpp
index 9f272fd2652..e502814d13e 100644
--- a/src/mame/machine/wangpckb.cpp
+++ b/src/mame/machine/wangpckb.cpp
@@ -49,6 +49,7 @@ Notes:
*/
+#include "emu.h"
#include "wangpckb.h"
diff --git a/src/mame/machine/wangpckb.h b/src/mame/machine/wangpckb.h
index 1b357341a61..a621d9e8f88 100644
--- a/src/mame/machine/wangpckb.h
+++ b/src/mame/machine/wangpckb.h
@@ -12,7 +12,6 @@
#define __WANGPC_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs51/mcs51.h"
#include "sound/sn76496.h"
diff --git a/src/mame/machine/wpc.cpp b/src/mame/machine/wpc.cpp
index f2e184bb060..346daf954a1 100644
--- a/src/mame/machine/wpc.cpp
+++ b/src/mame/machine/wpc.cpp
@@ -6,6 +6,7 @@
* Created on: 7/10/2013
*/
+#include "emu.h"
#include "wpc.h"
#define LOG_WPC (0)
diff --git a/src/mame/machine/wpc.h b/src/mame/machine/wpc.h
index f35aa1bf593..146c0f74754 100644
--- a/src/mame/machine/wpc.h
+++ b/src/mame/machine/wpc.h
@@ -9,7 +9,6 @@
#ifndef WPC_H_
#define WPC_H_
-#include "emu.h"
/* A = Alpha-numeric
* M = DMD
diff --git a/src/mame/machine/wswan.cpp b/src/mame/machine/wswan.cpp
index 65d88be4235..96d95c8d21d 100644
--- a/src/mame/machine/wswan.cpp
+++ b/src/mame/machine/wswan.cpp
@@ -17,6 +17,7 @@ TODO:
***************************************************************************/
+#include "emu.h"
#include "includes/wswan.h"
#include "render.h"
diff --git a/src/mame/machine/x1.cpp b/src/mame/machine/x1.cpp
index c50ed99e3ef..cb724cd326f 100644
--- a/src/mame/machine/x1.cpp
+++ b/src/mame/machine/x1.cpp
@@ -1,6 +1,7 @@
// license:LGPL-2.1+
// copyright-holders:Angelo Salese, Barry Rodewald
+#include "emu.h"
#include "includes/x1.h"
diff --git a/src/mame/machine/x68k_hdc.cpp b/src/mame/machine/x68k_hdc.cpp
index e6005313056..cb8400b18e5 100644
--- a/src/mame/machine/x68k_hdc.cpp
+++ b/src/mame/machine/x68k_hdc.cpp
@@ -17,6 +17,7 @@
*/
+#include "emu.h"
#include "x68k_hdc.h"
#include "imagedev/harddriv.h"
#include "image.h"
diff --git a/src/mame/machine/x68k_hdc.h b/src/mame/machine/x68k_hdc.h
index 3f5677790c8..0a4f5222531 100644
--- a/src/mame/machine/x68k_hdc.h
+++ b/src/mame/machine/x68k_hdc.h
@@ -6,7 +6,6 @@
*/
-#include "emu.h"
enum
{
diff --git a/src/mame/machine/x68k_kbd.cpp b/src/mame/machine/x68k_kbd.cpp
index 40ca743a6b5..94c49450f87 100644
--- a/src/mame/machine/x68k_kbd.cpp
+++ b/src/mame/machine/x68k_kbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Barry Rodewald,Vas Crabb
+#include "emu.h"
#include "machine/x68k_kbd.h"
#include "machine/keyboard.ipp"
diff --git a/src/mame/machine/x820kb.cpp b/src/mame/machine/x820kb.cpp
index aa235fc9b27..569ce6270bb 100644
--- a/src/mame/machine/x820kb.cpp
+++ b/src/mame/machine/x820kb.cpp
@@ -40,6 +40,7 @@ Notes:
*/
+#include "emu.h"
#include "x820kb.h"
diff --git a/src/mame/machine/x820kb.h b/src/mame/machine/x820kb.h
index cea0e009e9e..0edf355d032 100644
--- a/src/mame/machine/x820kb.h
+++ b/src/mame/machine/x820kb.h
@@ -11,7 +11,6 @@
#ifndef __XEROX_820_KEYBOARD__
#define __XEROX_820_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/machine/znmcu.cpp b/src/mame/machine/znmcu.cpp
index a61baa1ab14..3ef5f405388 100644
--- a/src/mame/machine/znmcu.cpp
+++ b/src/mame/machine/znmcu.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "znmcu.h"
const device_type ZNMCU = &device_creator<znmcu_device>;
diff --git a/src/mame/machine/znmcu.h b/src/mame/machine/znmcu.h
index d69c70197d4..b7c19c89331 100644
--- a/src/mame/machine/znmcu.h
+++ b/src/mame/machine/znmcu.h
@@ -5,7 +5,6 @@
#ifndef __ZNMCU_H__
#define __ZNMCU_H__
-#include "emu.h"
extern const device_type ZNMCU;
diff --git a/src/mame/machine/zs01.cpp b/src/mame/machine/zs01.cpp
index c112f208ab2..1c2d60343e4 100644
--- a/src/mame/machine/zs01.cpp
+++ b/src/mame/machine/zs01.cpp
@@ -9,6 +9,7 @@
*
*/
+#include "emu.h"
#include "machine/zs01.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/mame/machine/zx.cpp b/src/mame/machine/zx.cpp
index 3876cd5de4c..2850033fd79 100644
--- a/src/mame/machine/zx.cpp
+++ b/src/mame/machine/zx.cpp
@@ -8,6 +8,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/zx.h"
DRIVER_INIT_MEMBER(zx_state,zx)
diff --git a/src/mame/machine/zx8302.h b/src/mame/machine/zx8302.h
index 515e2dce2ef..679438cfa0e 100644
--- a/src/mame/machine/zx8302.h
+++ b/src/mame/machine/zx8302.h
@@ -34,7 +34,6 @@
#ifndef __ZX8302__
#define __ZX8302__
-#include "emu.h"
///*************************************************************************
diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp
index f506bbafe7f..2dc8e3782a0 100644
--- a/src/mame/video/abc1600.cpp
+++ b/src/mame/video/abc1600.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "includes/abc1600.h"
#include "abc1600.lh"
#include "render.h"
diff --git a/src/mame/video/abc1600.h b/src/mame/video/abc1600.h
index 128da856d93..eae56c6e1ab 100644
--- a/src/mame/video/abc1600.h
+++ b/src/mame/video/abc1600.h
@@ -11,7 +11,6 @@
#ifndef __ABC1600_MOVER__
#define __ABC1600_MOVER__
-#include "emu.h"
#include "video/mc6845.h"
diff --git a/src/mame/video/abc800.cpp b/src/mame/video/abc800.cpp
index 2ab0bc31b86..136fbf96866 100644
--- a/src/mame/video/abc800.cpp
+++ b/src/mame/video/abc800.cpp
@@ -6,6 +6,7 @@
*
****************************************************************************/
+#include "emu.h"
#include "includes/abc80x.h"
diff --git a/src/mame/video/abc802.cpp b/src/mame/video/abc802.cpp
index e8beb16d1ca..27e08da77a1 100644
--- a/src/mame/video/abc802.cpp
+++ b/src/mame/video/abc802.cpp
@@ -6,6 +6,7 @@
*
****************************************************************************/
+#include "emu.h"
#include "includes/abc80x.h"
diff --git a/src/mame/video/abc806.cpp b/src/mame/video/abc806.cpp
index 644941baf6e..a465072537b 100644
--- a/src/mame/video/abc806.cpp
+++ b/src/mame/video/abc806.cpp
@@ -6,6 +6,7 @@
*
****************************************************************************/
+#include "emu.h"
#include "includes/abc80x.h"
diff --git a/src/mame/video/antic.cpp b/src/mame/video/antic.cpp
index 9cf5ec3619e..a384aa4d7b1 100644
--- a/src/mame/video/antic.cpp
+++ b/src/mame/video/antic.cpp
@@ -8,6 +8,7 @@
Juergen Buchmueller, June 1998
******************************************************************************/
+#include "emu.h"
#include "antic.h"
#ifdef MAME_DEBUG
diff --git a/src/mame/video/antic.h b/src/mame/video/antic.h
index 6a38e1ade53..68915e19f55 100644
--- a/src/mame/video/antic.h
+++ b/src/mame/video/antic.h
@@ -13,7 +13,6 @@
#ifndef __ANTIC_H__
#define __ANTIC_H__
-#include "emu.h"
#include "video/gtia.h"
diff --git a/src/mame/video/apollo.cpp b/src/mame/video/apollo.cpp
index 733d7c47d10..8d5981f0ef7 100644
--- a/src/mame/video/apollo.cpp
+++ b/src/mame/video/apollo.cpp
@@ -15,6 +15,7 @@
#define VERBOSE 0
+#include "emu.h"
#include "includes/apollo.h"
#include "rendlay.h"
#include "apollo.lh"
diff --git a/src/mame/video/apple2.h b/src/mame/video/apple2.h
index a7edd40b08d..5f5a8c142d2 100644
--- a/src/mame/video/apple2.h
+++ b/src/mame/video/apple2.h
@@ -9,7 +9,6 @@
#ifndef __A2_VIDEO__
#define __A2_VIDEO__
-#include "emu.h"
class a2_video_device :
public device_t
diff --git a/src/mame/video/arcadia.cpp b/src/mame/video/arcadia.cpp
index 36e3c5cd6b3..e124f8a04eb 100644
--- a/src/mame/video/arcadia.cpp
+++ b/src/mame/video/arcadia.cpp
@@ -222,6 +222,7 @@ collisions, one is for sprite/sprite collisions.
*/
+#include "emu.h"
#include "includes/arcadia.h"
static const uint8_t chars[0x40][8]={
diff --git a/src/mame/video/aussiebyte.cpp b/src/mame/video/aussiebyte.cpp
index 0de8c58125f..495cfd41735 100644
--- a/src/mame/video/aussiebyte.cpp
+++ b/src/mame/video/aussiebyte.cpp
@@ -12,6 +12,7 @@
************************************************************/
+#include "emu.h"
#include "includes/aussiebyte.h"
/***********************************************************
diff --git a/src/mame/video/channelf.cpp b/src/mame/video/channelf.cpp
index c21486a116a..c9d716acaff 100644
--- a/src/mame/video/channelf.cpp
+++ b/src/mame/video/channelf.cpp
@@ -1,5 +1,6 @@
// license:GPL-2.0+
// copyright-holders:Juergen Buchmueller, Frank Palazzolo, Sean Riddle
+#include "emu.h"
#include "includes/channelf.h"
static const rgb_t channelf_palette[] =
diff --git a/src/mame/video/decodmd1.cpp b/src/mame/video/decodmd1.cpp
index 4a84d510380..d6c638a1203 100644
--- a/src/mame/video/decodmd1.cpp
+++ b/src/mame/video/decodmd1.cpp
@@ -7,6 +7,7 @@
* Z80 @ 4MHz
*/
+#include "emu.h"
#include "decodmd1.h"
#include "rendlay.h"
diff --git a/src/mame/video/decodmd1.h b/src/mame/video/decodmd1.h
index 0a7c3735ed2..3a5e605d58a 100644
--- a/src/mame/video/decodmd1.h
+++ b/src/mame/video/decodmd1.h
@@ -7,7 +7,6 @@
#ifndef DECODMD1_H_
#define DECODMD1_H_
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
diff --git a/src/mame/video/decodmd2.cpp b/src/mame/video/decodmd2.cpp
index 11ea21fb04d..4000863acd7 100644
--- a/src/mame/video/decodmd2.cpp
+++ b/src/mame/video/decodmd2.cpp
@@ -8,6 +8,7 @@
* 68B45 CRTC
*/
+#include "emu.h"
#include "decodmd2.h"
#include "rendlay.h"
diff --git a/src/mame/video/decodmd2.h b/src/mame/video/decodmd2.h
index 94762de046e..413653ea170 100644
--- a/src/mame/video/decodmd2.h
+++ b/src/mame/video/decodmd2.h
@@ -7,7 +7,6 @@
#ifndef DECODMD_H_
#define DECODMD_H_
-#include "emu.h"
#include "cpu/m6809/m6809.h"
#include "video/mc6845.h"
#include "machine/ram.h"
diff --git a/src/mame/video/decodmd3.cpp b/src/mame/video/decodmd3.cpp
index 15f1aab3b02..cc12153364a 100644
--- a/src/mame/video/decodmd3.cpp
+++ b/src/mame/video/decodmd3.cpp
@@ -8,6 +8,7 @@
* 68B45 CRTC
*/
+#include "emu.h"
#include "decodmd3.h"
#include "rendlay.h"
diff --git a/src/mame/video/decodmd3.h b/src/mame/video/decodmd3.h
index 035dad7d2de..7bcc898017c 100644
--- a/src/mame/video/decodmd3.h
+++ b/src/mame/video/decodmd3.h
@@ -7,7 +7,6 @@
#ifndef DECODMD3_H_
#define DECODMD3_H_
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "video/mc6845.h"
#include "machine/ram.h"
diff --git a/src/mame/video/gamecom.cpp b/src/mame/video/gamecom.cpp
index bf81cdf3a48..4aa8982b6de 100644
--- a/src/mame/video/gamecom.cpp
+++ b/src/mame/video/gamecom.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Wilbert Pol, Robbbert
+#include "emu.h"
#include "includes/gamecom.h"
#define Y_PIXELS 200
diff --git a/src/mame/video/gic.h b/src/mame/video/gic.h
index b6568f21f0d..35b2a675cb8 100644
--- a/src/mame/video/gic.h
+++ b/src/mame/video/gic.h
@@ -16,7 +16,6 @@
#ifndef __GIC_H__
#define __GIC_H__
-#include "emu.h"
/***************************************************************************
diff --git a/src/mame/video/gottlieb.cpp b/src/mame/video/gottlieb.cpp
index e7fa9c62acd..0186340942a 100644
--- a/src/mame/video/gottlieb.cpp
+++ b/src/mame/video/gottlieb.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/gottlieb.h"
#include "video/resnet.h"
diff --git a/src/mame/video/gtia.h b/src/mame/video/gtia.h
index f5d99a17303..6bb78f407ed 100644
--- a/src/mame/video/gtia.h
+++ b/src/mame/video/gtia.h
@@ -13,7 +13,6 @@
#ifndef __GTIA_H__
#define __GTIA_H__
-#include "emu.h"
/* reading registers */
diff --git a/src/mame/video/k053250.cpp b/src/mame/video/k053250.cpp
index 70def9e62ae..6c3f9281cc8 100644
--- a/src/mame/video/k053250.cpp
+++ b/src/mame/video/k053250.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "k053250.h"
const device_type K053250 = &device_creator<k053250_device>;
diff --git a/src/mame/video/k053250.h b/src/mame/video/k053250.h
index 3d8a4fef9cb..c4980bc058e 100644
--- a/src/mame/video/k053250.h
+++ b/src/mame/video/k053250.h
@@ -7,7 +7,6 @@
// Konami 053250 road generator
//
-#include "emu.h"
#define MCFG_K053250_ADD(_tag, _palette_tag, _screen_tag, offx, offy) \
MCFG_DEVICE_ADD(_tag, K053250, 0) \
diff --git a/src/mame/video/kaypro.cpp b/src/mame/video/kaypro.cpp
index 4f7d639de83..8aada1ac46f 100644
--- a/src/mame/video/kaypro.cpp
+++ b/src/mame/video/kaypro.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Robbbert
+#include "emu.h"
#include "includes/kaypro.h"
diff --git a/src/mame/video/kyocera.cpp b/src/mame/video/kyocera.cpp
index 5bb09d3b4e1..0a5d45da297 100644
--- a/src/mame/video/kyocera.cpp
+++ b/src/mame/video/kyocera.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
+#include "emu.h"
#include "includes/kyocera.h"
#include "rendlay.h"
diff --git a/src/mame/video/laserbat.cpp b/src/mame/video/laserbat.cpp
index fc14c42f9ff..eb99d555173 100644
--- a/src/mame/video/laserbat.cpp
+++ b/src/mame/video/laserbat.cpp
@@ -79,6 +79,7 @@
more detail
*/
+#include "emu.h"
#include "includes/laserbat.h"
diff --git a/src/mame/video/llc.cpp b/src/mame/video/llc.cpp
index c973e8bd6c6..961c3c052aa 100644
--- a/src/mame/video/llc.cpp
+++ b/src/mame/video/llc.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/llc.h"
diff --git a/src/mame/video/maria.h b/src/mame/video/maria.h
index ad30c228280..346414dfae3 100644
--- a/src/mame/video/maria.h
+++ b/src/mame/video/maria.h
@@ -3,7 +3,6 @@
#ifndef __ATARI_MARIA__
#define __ATARI_MARIA__
-#include "emu.h"
// ======================> atari_maria_device
diff --git a/src/mame/video/mbc55x.cpp b/src/mame/video/mbc55x.cpp
index abf420641bd..e085d8faef3 100644
--- a/src/mame/video/mbc55x.cpp
+++ b/src/mame/video/mbc55x.cpp
@@ -68,6 +68,7 @@ give the leftmost column of the rectangle, the next four give the next column, a
*************************************************************************************************************/
+#include "emu.h"
#include <functional>
#include "includes/mbc55x.h"
diff --git a/src/mame/video/mbee.cpp b/src/mame/video/mbee.cpp
index bc7734e5e3f..37c12ec5135 100644
--- a/src/mame/video/mbee.cpp
+++ b/src/mame/video/mbee.cpp
@@ -43,6 +43,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/mbee.h"
WRITE_LINE_MEMBER( mbee_state::crtc_vs )
diff --git a/src/mame/video/mc80.cpp b/src/mame/video/mc80.cpp
index 5fe0b40895b..e5ae4999e4e 100644
--- a/src/mame/video/mc80.cpp
+++ b/src/mame/video/mc80.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/mc80.h"
// This is not a content of U402 510
diff --git a/src/mame/video/mcd212.h b/src/mame/video/mcd212.h
index 696ffb8e33b..e902697c6cd 100644
--- a/src/mame/video/mcd212.h
+++ b/src/mame/video/mcd212.h
@@ -24,7 +24,6 @@ TODO:
#ifndef _VIDEO_MCD212_H_
#define _VIDEO_MCD212_H_
-#include "emu.h"
#define MCD212_CURCNT_COLOR 0x00000f // Cursor color
#define MCD212_CURCNT_CUW 0x008000 // Cursor width
diff --git a/src/mame/video/mikromik.cpp b/src/mame/video/mikromik.cpp
index 16642e68c07..bf3f318fe7c 100644
--- a/src/mame/video/mikromik.cpp
+++ b/src/mame/video/mikromik.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
+#include "emu.h"
#include "includes/mikromik.h"
#define HORIZONTAL_CHARACTER_PIXELS 10
diff --git a/src/mame/video/mz80.cpp b/src/mame/video/mz80.cpp
index 8734ee81dcb..399198fbefa 100644
--- a/src/mame/video/mz80.cpp
+++ b/src/mame/video/mz80.cpp
@@ -8,6 +8,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/mz80.h"
const gfx_layout mz80k_charlayout =
diff --git a/src/mame/video/n64.h b/src/mame/video/n64.h
index 20eeab81fe2..f40717f3df7 100644
--- a/src/mame/video/n64.h
+++ b/src/mame/video/n64.h
@@ -3,7 +3,6 @@
#ifndef _VIDEO_N64_H_
#define _VIDEO_N64_H_
-#include "emu.h"
#include "includes/n64.h"
#include "video/poly.h"
#include "pin64.h"
diff --git a/src/mame/video/newbrain.cpp b/src/mame/video/newbrain.cpp
index 817b0d162ce..6403ba6c5c1 100644
--- a/src/mame/video/newbrain.cpp
+++ b/src/mame/video/newbrain.cpp
@@ -8,6 +8,7 @@
*/
+#include "emu.h"
#include "includes/newbrain.h"
#include "rendlay.h"
diff --git a/src/mame/video/nick.cpp b/src/mame/video/nick.cpp
index 6b8cca790ea..40d6d4f81e7 100644
--- a/src/mame/video/nick.cpp
+++ b/src/mame/video/nick.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "nick.h"
diff --git a/src/mame/video/nick.h b/src/mame/video/nick.h
index 67078687f26..220bb521e1f 100644
--- a/src/mame/video/nick.h
+++ b/src/mame/video/nick.h
@@ -11,7 +11,6 @@
#ifndef __NICK__
#define __NICK__
-#include "emu.h"
#include "machine/rescap.h"
#include "video/resnet.h"
diff --git a/src/mame/video/osi.cpp b/src/mame/video/osi.cpp
index e19fa3c3547..b7d4a9b5366 100644
--- a/src/mame/video/osi.cpp
+++ b/src/mame/video/osi.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder, Robbbert, Wilbert Pol
+#include "emu.h"
#include "includes/osi.h"
/* Palette Initialization */
diff --git a/src/mame/video/p2000t.cpp b/src/mame/video/p2000t.cpp
index ee1f36324ee..5adbd6c9f71 100644
--- a/src/mame/video/p2000t.cpp
+++ b/src/mame/video/p2000t.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "includes/p2000t.h"
diff --git a/src/mame/video/pc1512.cpp b/src/mame/video/pc1512.cpp
index 602e5795320..fd2cb347f64 100644
--- a/src/mame/video/pc1512.cpp
+++ b/src/mame/video/pc1512.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
+#include "emu.h"
#include "includes/pc1512.h"
diff --git a/src/mame/video/pc8401a.cpp b/src/mame/video/pc8401a.cpp
index f7101dbe370..1e0cac81864 100644
--- a/src/mame/video/pc8401a.cpp
+++ b/src/mame/video/pc8401a.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
+#include "emu.h"
#include "includes/pc8401a.h"
#include "rendlay.h"
#include "pc8500.lh"
diff --git a/src/mame/video/pcd.cpp b/src/mame/video/pcd.cpp
index d3bbbc6fc83..b757764b53e 100644
--- a/src/mame/video/pcd.cpp
+++ b/src/mame/video/pcd.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "pcd.h"
#include "cpu/mcs51/mcs51.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/mame/video/pcd.h b/src/mame/video/pcd.h
index 4e3d54003f2..4cb355bea27 100644
--- a/src/mame/video/pcd.h
+++ b/src/mame/video/pcd.h
@@ -4,7 +4,6 @@
#ifndef _PCD_H_
#define _PCD_H_
-#include "emu.h"
#include "machine/pic8259.h"
#include "video/scn2674.h"
diff --git a/src/mame/video/pin64.cpp b/src/mame/video/pin64.cpp
index cbc9ad934dc..11b3bb9cedc 100644
--- a/src/mame/video/pin64.cpp
+++ b/src/mame/video/pin64.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Ryan Holtz
+#include "emu.h"
#include "pin64.h"
#define CAP_NAME "pin64_%d.cap"
diff --git a/src/mame/video/pin64.h b/src/mame/video/pin64.h
index d8e82395f25..daec1915299 100644
--- a/src/mame/video/pin64.h
+++ b/src/mame/video/pin64.h
@@ -11,7 +11,6 @@
#define PIN64_ENABLE_CAPTURE (0)
-#include "emu.h"
class pin64_fileutil_t {
public:
@@ -177,4 +176,4 @@ private:
static const uint8_t CAP_ID[8];
};
-#endif // PIN64_H \ No newline at end of file
+#endif // PIN64_H
diff --git a/src/mame/video/pp01.cpp b/src/mame/video/pp01.cpp
index 2db4d96cd01..7f82391f856 100644
--- a/src/mame/video/pp01.cpp
+++ b/src/mame/video/pp01.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/pp01.h"
void pp01_state::video_start()
diff --git a/src/mame/video/psikyo4.cpp b/src/mame/video/psikyo4.cpp
index 5a0141e12d3..e74dcda308a 100644
--- a/src/mame/video/psikyo4.cpp
+++ b/src/mame/video/psikyo4.cpp
@@ -28,6 +28,7 @@ HotGmck: 86010000 1f201918 a0000000 Large Screen
HgKairak: 86010000 1f201918 a0000000 Large Screen
*/
+#include "emu.h"
#include "includes/psikyo4.h"
diff --git a/src/mame/video/rdpblend.h b/src/mame/video/rdpblend.h
index c8c3d76a17f..b81e817e2b6 100644
--- a/src/mame/video/rdpblend.h
+++ b/src/mame/video/rdpblend.h
@@ -16,7 +16,6 @@
#ifndef _VIDEO_RDPBLEND_H_
#define _VIDEO_RDPBLEND_H_
-#include "emu.h"
#include "video/n64.h"
class n64_blender_t
diff --git a/src/mame/video/rdptpipe.h b/src/mame/video/rdptpipe.h
index 224d3257d96..b9c80e15353 100644
--- a/src/mame/video/rdptpipe.h
+++ b/src/mame/video/rdptpipe.h
@@ -16,7 +16,6 @@
#ifndef _VIDEO_RDPTEXPIPE_H_
#define _VIDEO_RDPTEXPIPE_H_
-#include "emu.h"
#include "video/n64types.h"
class n64_texture_pipe_t
diff --git a/src/mame/video/rm380z.cpp b/src/mame/video/rm380z.cpp
index 329dcd97ad5..9b39feff211 100644
--- a/src/mame/video/rm380z.cpp
+++ b/src/mame/video/rm380z.cpp
@@ -8,6 +8,7 @@ RM 380Z video code
*/
+#include "emu.h"
#include "includes/rm380z.h"
diff --git a/src/mame/video/special.cpp b/src/mame/video/special.cpp
index af450b01049..c343d7df3ca 100644
--- a/src/mame/video/special.cpp
+++ b/src/mame/video/special.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/special.h"
diff --git a/src/mame/video/super80.cpp b/src/mame/video/super80.cpp
index 2ca80b324bb..a1a704fb0a8 100644
--- a/src/mame/video/super80.cpp
+++ b/src/mame/video/super80.cpp
@@ -7,6 +7,7 @@
2. Undocumented cursor start and end-lines is not supported by MMD, so we do it here. */
+#include "emu.h"
#include "includes/super80.h"
diff --git a/src/mame/video/taito_helper.cpp b/src/mame/video/taito_helper.cpp
index 01d756c33bd..067bf9f80e5 100644
--- a/src/mame/video/taito_helper.cpp
+++ b/src/mame/video/taito_helper.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Nicola Salmoria
+#include "emu.h"
#include "taito_helper.h"
/* These scanline drawing routines, currently used by the pc080sn, tc0080vco, tc0150rod and tc0480scp devices, were lifted from Taito F3: optimise / merge ? */
diff --git a/src/mame/video/taito_helper.h b/src/mame/video/taito_helper.h
index ad2609adc6d..7bdafaffa31 100644
--- a/src/mame/video/taito_helper.h
+++ b/src/mame/video/taito_helper.h
@@ -2,7 +2,6 @@
// copyright-holders:Nicola Salmoria
#pragma once
-#include "emu.h"
#ifndef __TAITO_HELPER_H__
#define __TAITO_HELPER_H__
diff --git a/src/mame/video/thomson.cpp b/src/mame/video/thomson.cpp
index a183f56be73..26ba2d2189b 100644
--- a/src/mame/video/thomson.cpp
+++ b/src/mame/video/thomson.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include <math.h>
#include "includes/thomson.h"
diff --git a/src/mame/video/trs80.cpp b/src/mame/video/trs80.cpp
index ffc59fb16fb..a6a1701f5a5 100644
--- a/src/mame/video/trs80.cpp
+++ b/src/mame/video/trs80.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/trs80.h"
/* Bit assignment for "state->m_mode"
diff --git a/src/mame/video/ut88.cpp b/src/mame/video/ut88.cpp
index 4ed65b78658..f8c8bd7b4ba 100644
--- a/src/mame/video/ut88.cpp
+++ b/src/mame/video/ut88.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/ut88.h"
diff --git a/src/mame/video/uv201.cpp b/src/mame/video/uv201.cpp
index 82cf1647061..5cf21144d47 100644
--- a/src/mame/video/uv201.cpp
+++ b/src/mame/video/uv201.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "uv201.h"
diff --git a/src/mame/video/uv201.h b/src/mame/video/uv201.h
index 8aca9b35656..6cf1d0aa63a 100644
--- a/src/mame/video/uv201.h
+++ b/src/mame/video/uv201.h
@@ -56,7 +56,6 @@
#ifndef __UV201__
#define __UV201__
-#include "emu.h"
diff --git a/src/mame/video/v1050.cpp b/src/mame/video/v1050.cpp
index a995ae4c63b..f28abbc2c5a 100644
--- a/src/mame/video/v1050.cpp
+++ b/src/mame/video/v1050.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
+#include "emu.h"
#include "includes/v1050.h"
/*
diff --git a/src/mame/video/vc4000.cpp b/src/mame/video/vc4000.cpp
index a0af5563c58..46cbe5f4e8d 100644
--- a/src/mame/video/vc4000.cpp
+++ b/src/mame/video/vc4000.cpp
@@ -1,6 +1,7 @@
// license:GPL-2.0+
// copyright-holders:Peter Trauner, Manfred Schneider, Robbbert
// thanks-to:Manfred Schneider
+#include "emu.h"
#include "includes/vc4000.h"
diff --git a/src/mame/video/vector06.cpp b/src/mame/video/vector06.cpp
index 6b9b57071fc..df3e9fc47ae 100644
--- a/src/mame/video/vector06.cpp
+++ b/src/mame/video/vector06.cpp
@@ -9,6 +9,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/vector06.h"
diff --git a/src/mame/video/vtvideo.h b/src/mame/video/vtvideo.h
index 2e8b4b946ab..1293fdd6cc9 100644
--- a/src/mame/video/vtvideo.h
+++ b/src/mame/video/vtvideo.h
@@ -12,7 +12,6 @@ DEC VT Terminal video emulation
#ifndef __VT_VIDEO__
#define __VT_VIDEO__
-#include "emu.h"
class vt100_video_device : public device_t,
public device_video_interface
diff --git a/src/mame/video/wswan.cpp b/src/mame/video/wswan.cpp
index dc3fe04f795..edcd5c13682 100644
--- a/src/mame/video/wswan.cpp
+++ b/src/mame/video/wswan.cpp
@@ -13,6 +13,7 @@
***************************************************************************/
+#include "emu.h"
#include "wswan.h"
const device_type WSWAN_VIDEO = &device_creator<wswan_video_device>;
diff --git a/src/mame/video/wswan.h b/src/mame/video/wswan.h
index fbbccb00f69..8a6b550b3ca 100644
--- a/src/mame/video/wswan.h
+++ b/src/mame/video/wswan.h
@@ -14,7 +14,6 @@
#ifndef __WSWAN_VIDEO__
#define __WSWAN_VIDEO__
-#include "emu.h"
enum
{
diff --git a/src/mame/video/z88.cpp b/src/mame/video/z88.cpp
index 8dcfc70a28a..ede51b5ee1e 100644
--- a/src/mame/video/z88.cpp
+++ b/src/mame/video/z88.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "includes/z88.h"
diff --git a/src/mame/video/zx.cpp b/src/mame/video/zx.cpp
index 197e1cd0120..86bed03488e 100644
--- a/src/mame/video/zx.cpp
+++ b/src/mame/video/zx.cpp
@@ -18,6 +18,7 @@
****************************************************************************/
+#include "emu.h"
#include "includes/zx.h"
diff --git a/src/mame/video/zx8301.cpp b/src/mame/video/zx8301.cpp
index f23738a61f3..755839d35fe 100644
--- a/src/mame/video/zx8301.cpp
+++ b/src/mame/video/zx8301.cpp
@@ -16,6 +16,7 @@
*/
+#include "emu.h"
#include "zx8301.h"
diff --git a/src/mame/video/zx8301.h b/src/mame/video/zx8301.h
index c2732cdc33e..f3e1b8b252d 100644
--- a/src/mame/video/zx8301.h
+++ b/src/mame/video/zx8301.h
@@ -34,7 +34,6 @@
#ifndef __ZX8301__
#define __ZX8301__
-#include "emu.h"