summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2017-02-11 18:23:11 +0100
committer Olivier Galibert <galibert@pobox.com>2017-02-11 18:31:20 +0100
commita2557f1b02478c5aaa1fdfa00204ac2e219319a1 (patch)
tree6f1693d59aa53be8c76ffe3bcf7fbc72f8546453 /src/devices
parentc49b631153be9efc3a7e7b6172c17f5418843c0b (diff)
Remove emu.h from headers (nw)
Per Vas' request. If the compile fails for you (i'm thinking osx and windows native debuggers here in particular), add '#include "emu.h"' as first include of the cpp files that fail. Due to our use of precompilation and forced inclusion, emu.h must be included as the very first non-comment thing we do if we want to be sure msvc compiles are identical to gcc/clang ones. Doing it directly instead of through an include increases the correctness probability by a magnitude.
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/a1bus/a1bus.h1
-rw-r--r--src/devices/bus/a1bus/a1cassette.cpp1
-rw-r--r--src/devices/bus/a1bus/a1cffa.cpp1
-rw-r--r--src/devices/bus/a1bus/a1cffa.h1
-rw-r--r--src/devices/bus/a2bus/a2alfam2.cpp1
-rw-r--r--src/devices/bus/a2bus/a2alfam2.h1
-rw-r--r--src/devices/bus/a2bus/a2applicard.cpp1
-rw-r--r--src/devices/bus/a2bus/a2applicard.h1
-rw-r--r--src/devices/bus/a2bus/a2arcadebd.h1
-rw-r--r--src/devices/bus/a2bus/a2bus.h1
-rw-r--r--src/devices/bus/a2bus/a2cffa.cpp1
-rw-r--r--src/devices/bus/a2bus/a2cffa.h1
-rw-r--r--src/devices/bus/a2bus/a2corvus.cpp1
-rw-r--r--src/devices/bus/a2bus/a2corvus.h1
-rw-r--r--src/devices/bus/a2bus/a2diskii.h1
-rw-r--r--src/devices/bus/a2bus/a2diskiing.h1
-rw-r--r--src/devices/bus/a2bus/a2dx1.cpp1
-rw-r--r--src/devices/bus/a2bus/a2dx1.h1
-rw-r--r--src/devices/bus/a2bus/a2eauxslot.h1
-rw-r--r--src/devices/bus/a2bus/a2echoii.cpp1
-rw-r--r--src/devices/bus/a2bus/a2echoii.h1
-rw-r--r--src/devices/bus/a2bus/a2eext80col.h1
-rw-r--r--src/devices/bus/a2bus/a2eramworks3.h1
-rw-r--r--src/devices/bus/a2bus/a2estd80col.h1
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.cpp1
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.h1
-rw-r--r--src/devices/bus/a2bus/a2mcms.cpp1
-rw-r--r--src/devices/bus/a2bus/a2mcms.h1
-rw-r--r--src/devices/bus/a2bus/a2memexp.cpp1
-rw-r--r--src/devices/bus/a2bus/a2memexp.h1
-rw-r--r--src/devices/bus/a2bus/a2midi.cpp1
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.h1
-rw-r--r--src/devices/bus/a2bus/a2pic.cpp1
-rw-r--r--src/devices/bus/a2bus/a2sam.cpp1
-rw-r--r--src/devices/bus/a2bus/a2sam.h1
-rw-r--r--src/devices/bus/a2bus/a2scsi.cpp1
-rw-r--r--src/devices/bus/a2bus/a2scsi.h1
-rw-r--r--src/devices/bus/a2bus/a2softcard.cpp1
-rw-r--r--src/devices/bus/a2bus/a2softcard.h1
-rw-r--r--src/devices/bus/a2bus/a2ssc.cpp1
-rw-r--r--src/devices/bus/a2bus/a2swyft.h1
-rw-r--r--src/devices/bus/a2bus/a2themill.cpp1
-rw-r--r--src/devices/bus/a2bus/a2themill.h1
-rw-r--r--src/devices/bus/a2bus/a2thunderclock.cpp1
-rw-r--r--src/devices/bus/a2bus/a2thunderclock.h1
-rw-r--r--src/devices/bus/a2bus/a2ultraterm.cpp1
-rw-r--r--src/devices/bus/a2bus/a2ultraterm.h1
-rw-r--r--src/devices/bus/a2bus/a2videoterm.cpp1
-rw-r--r--src/devices/bus/a2bus/a2videoterm.h1
-rw-r--r--src/devices/bus/a2bus/a2vulcan.cpp1
-rw-r--r--src/devices/bus/a2bus/a2vulcan.h1
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.cpp1
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.h1
-rw-r--r--src/devices/bus/a2bus/corvfdc01.cpp1
-rw-r--r--src/devices/bus/a2bus/corvfdc01.h1
-rw-r--r--src/devices/bus/a2bus/corvfdc02.cpp1
-rw-r--r--src/devices/bus/a2bus/corvfdc02.h1
-rw-r--r--src/devices/bus/a2bus/ezcgi.h1
-rw-r--r--src/devices/bus/a2bus/laser128.cpp1
-rw-r--r--src/devices/bus/a2bus/laser128.h1
-rw-r--r--src/devices/bus/a2bus/mouse.cpp1
-rw-r--r--src/devices/bus/a2bus/mouse.h1
-rw-r--r--src/devices/bus/a2bus/pc_xporter.cpp1
-rw-r--r--src/devices/bus/a2bus/pc_xporter.h1
-rw-r--r--src/devices/bus/a2bus/ramcard128k.cpp1
-rw-r--r--src/devices/bus/a2bus/ramcard128k.h1
-rw-r--r--src/devices/bus/a2bus/ramcard16k.cpp1
-rw-r--r--src/devices/bus/a2bus/ramcard16k.h1
-rw-r--r--src/devices/bus/a2bus/timemasterho.cpp1
-rw-r--r--src/devices/bus/a2bus/timemasterho.h1
-rw-r--r--src/devices/bus/a7800/a78_carts.h1
-rw-r--r--src/devices/bus/a800/a800_carts.h1
-rw-r--r--src/devices/bus/abcbus/abc890.cpp1
-rw-r--r--src/devices/bus/abcbus/abc890.h1
-rw-r--r--src/devices/bus/abcbus/abcbus.cpp1
-rw-r--r--src/devices/bus/abcbus/abcbus.h1
-rw-r--r--src/devices/bus/abcbus/fd2.cpp1
-rw-r--r--src/devices/bus/abcbus/fd2.h1
-rw-r--r--src/devices/bus/abcbus/hdc.cpp1
-rw-r--r--src/devices/bus/abcbus/hdc.h1
-rw-r--r--src/devices/bus/abcbus/lux10828.cpp1
-rw-r--r--src/devices/bus/abcbus/lux10828.h1
-rw-r--r--src/devices/bus/abcbus/lux21046.cpp1
-rw-r--r--src/devices/bus/abcbus/lux21046.h1
-rw-r--r--src/devices/bus/abcbus/lux21056.cpp1
-rw-r--r--src/devices/bus/abcbus/lux21056.h1
-rw-r--r--src/devices/bus/abcbus/lux4105.cpp1
-rw-r--r--src/devices/bus/abcbus/lux4105.h1
-rw-r--r--src/devices/bus/abcbus/memcard.cpp1
-rw-r--r--src/devices/bus/abcbus/memcard.h1
-rw-r--r--src/devices/bus/abcbus/ram.cpp1
-rw-r--r--src/devices/bus/abcbus/ram.h1
-rw-r--r--src/devices/bus/abcbus/sio.cpp1
-rw-r--r--src/devices/bus/abcbus/sio.h1
-rw-r--r--src/devices/bus/abcbus/slutprov.cpp1
-rw-r--r--src/devices/bus/abcbus/slutprov.h1
-rw-r--r--src/devices/bus/abcbus/turbo.cpp1
-rw-r--r--src/devices/bus/abcbus/turbo.h1
-rw-r--r--src/devices/bus/abcbus/uni800.cpp1
-rw-r--r--src/devices/bus/abcbus/uni800.h1
-rw-r--r--src/devices/bus/abckb/abc77.cpp1
-rw-r--r--src/devices/bus/abckb/abc77.h1
-rw-r--r--src/devices/bus/abckb/abc800kb.cpp1
-rw-r--r--src/devices/bus/abckb/abc800kb.h1
-rw-r--r--src/devices/bus/abckb/abc99.cpp1
-rw-r--r--src/devices/bus/abckb/abc99.h1
-rw-r--r--src/devices/bus/abckb/abckb.cpp1
-rw-r--r--src/devices/bus/abckb/abckb.h1
-rw-r--r--src/devices/bus/adam/adamlink.cpp1
-rw-r--r--src/devices/bus/adam/adamlink.h1
-rw-r--r--src/devices/bus/adam/exp.cpp1
-rw-r--r--src/devices/bus/adam/exp.h1
-rw-r--r--src/devices/bus/adam/ide.cpp1
-rw-r--r--src/devices/bus/adam/ide.h1
-rw-r--r--src/devices/bus/adam/ram.cpp1
-rw-r--r--src/devices/bus/adam/ram.h1
-rw-r--r--src/devices/bus/adamnet/adamnet.cpp1
-rw-r--r--src/devices/bus/adamnet/adamnet.h1
-rw-r--r--src/devices/bus/adamnet/ddp.cpp1
-rw-r--r--src/devices/bus/adamnet/ddp.h1
-rw-r--r--src/devices/bus/adamnet/fdc.cpp1
-rw-r--r--src/devices/bus/adamnet/fdc.h1
-rw-r--r--src/devices/bus/adamnet/kb.cpp1
-rw-r--r--src/devices/bus/adamnet/kb.h1
-rw-r--r--src/devices/bus/adamnet/printer.cpp1
-rw-r--r--src/devices/bus/adamnet/printer.h1
-rw-r--r--src/devices/bus/adamnet/spi.cpp1
-rw-r--r--src/devices/bus/adamnet/spi.h1
-rw-r--r--src/devices/bus/amiga/keyboard/keyboard.cpp1
-rw-r--r--src/devices/bus/amiga/keyboard/keyboard.h1
-rw-r--r--src/devices/bus/amiga/zorro/a2052.cpp1
-rw-r--r--src/devices/bus/amiga/zorro/a2052.h1
-rw-r--r--src/devices/bus/amiga/zorro/a2232.cpp1
-rw-r--r--src/devices/bus/amiga/zorro/a2232.h1
-rw-r--r--src/devices/bus/amiga/zorro/a590.cpp1
-rw-r--r--src/devices/bus/amiga/zorro/a590.h1
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.cpp1
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.h1
-rw-r--r--src/devices/bus/amiga/zorro/buddha.cpp1
-rw-r--r--src/devices/bus/amiga/zorro/buddha.h1
-rw-r--r--src/devices/bus/amiga/zorro/cards.cpp1
-rw-r--r--src/devices/bus/amiga/zorro/cards.h1
-rw-r--r--src/devices/bus/amiga/zorro/zorro.cpp1
-rw-r--r--src/devices/bus/amiga/zorro/zorro.h1
-rw-r--r--src/devices/bus/apricot/expansion/cards.cpp1
-rw-r--r--src/devices/bus/apricot/expansion/cards.h1
-rw-r--r--src/devices/bus/apricot/expansion/expansion.cpp1
-rw-r--r--src/devices/bus/apricot/expansion/expansion.h1
-rw-r--r--src/devices/bus/apricot/expansion/ram.cpp1
-rw-r--r--src/devices/bus/apricot/expansion/ram.h1
-rw-r--r--src/devices/bus/apricot/keyboard/hle.cpp1
-rw-r--r--src/devices/bus/apricot/keyboard/hle.h1
-rw-r--r--src/devices/bus/apricot/keyboard/keyboard.cpp1
-rw-r--r--src/devices/bus/apricot/keyboard/keyboard.h1
-rw-r--r--src/devices/bus/bbc/1mhzbus/1mhzbus.cpp1
-rw-r--r--src/devices/bus/bbc/1mhzbus/1mhzbus.h1
-rw-r--r--src/devices/bus/bbc/1mhzbus/opus3.cpp1
-rw-r--r--src/devices/bus/bbc/1mhzbus/opus3.h1
-rw-r--r--src/devices/bus/bbc/analogue/analogue.cpp1
-rw-r--r--src/devices/bus/bbc/analogue/analogue.h1
-rw-r--r--src/devices/bus/bbc/analogue/joystick.cpp1
-rw-r--r--src/devices/bus/bbc/analogue/joystick.h1
-rw-r--r--src/devices/bus/bbc/fdc/acorn.cpp1
-rw-r--r--src/devices/bus/bbc/fdc/acorn.h1
-rw-r--r--src/devices/bus/bbc/fdc/cumana.cpp1
-rw-r--r--src/devices/bus/bbc/fdc/cumana.h1
-rw-r--r--src/devices/bus/bbc/fdc/fdc.cpp1
-rw-r--r--src/devices/bus/bbc/fdc/fdc.h1
-rw-r--r--src/devices/bus/bbc/fdc/opus.cpp1
-rw-r--r--src/devices/bus/bbc/fdc/opus.h1
-rw-r--r--src/devices/bus/bbc/fdc/watford.cpp1
-rw-r--r--src/devices/bus/bbc/fdc/watford.h1
-rw-r--r--src/devices/bus/bbc/joyport/joyport.cpp1
-rw-r--r--src/devices/bus/bbc/joyport/joyport.h1
-rw-r--r--src/devices/bus/bbc/joyport/joystick.cpp1
-rw-r--r--src/devices/bus/bbc/joyport/joystick.h1
-rw-r--r--src/devices/bus/bbc/tube/tube.cpp1
-rw-r--r--src/devices/bus/bbc/tube/tube.h1
-rw-r--r--src/devices/bus/bbc/userport/userport.cpp1
-rw-r--r--src/devices/bus/bbc/userport/userport.h1
-rw-r--r--src/devices/bus/bml3/bml3bus.h1
-rw-r--r--src/devices/bus/bml3/bml3kanji.h1
-rw-r--r--src/devices/bus/bml3/bml3mp1802.h1
-rw-r--r--src/devices/bus/bml3/bml3mp1805.h1
-rw-r--r--src/devices/bus/bw2/exp.cpp1
-rw-r--r--src/devices/bus/bw2/exp.h1
-rw-r--r--src/devices/bus/bw2/ramcard.cpp1
-rw-r--r--src/devices/bus/bw2/ramcard.h1
-rw-r--r--src/devices/bus/c64/16kb.cpp1
-rw-r--r--src/devices/bus/c64/16kb.h1
-rw-r--r--src/devices/bus/c64/4dxh.cpp1
-rw-r--r--src/devices/bus/c64/4dxh.h1
-rw-r--r--src/devices/bus/c64/4ksa.cpp1
-rw-r--r--src/devices/bus/c64/4ksa.h1
-rw-r--r--src/devices/bus/c64/4tba.cpp1
-rw-r--r--src/devices/bus/c64/4tba.h1
-rw-r--r--src/devices/bus/c64/bn1541.cpp1
-rw-r--r--src/devices/bus/c64/bn1541.h1
-rw-r--r--src/devices/bus/c64/c128_comal80.cpp1
-rw-r--r--src/devices/bus/c64/c128_comal80.h1
-rw-r--r--src/devices/bus/c64/c128_partner.cpp1
-rw-r--r--src/devices/bus/c64/c128_partner.h1
-rw-r--r--src/devices/bus/c64/comal80.cpp1
-rw-r--r--src/devices/bus/c64/comal80.h1
-rw-r--r--src/devices/bus/c64/cpm.cpp1
-rw-r--r--src/devices/bus/c64/cpm.h1
-rw-r--r--src/devices/bus/c64/currah_speech.cpp1
-rw-r--r--src/devices/bus/c64/currah_speech.h1
-rw-r--r--src/devices/bus/c64/dela_ep256.cpp1
-rw-r--r--src/devices/bus/c64/dela_ep256.h1
-rw-r--r--src/devices/bus/c64/dela_ep64.cpp1
-rw-r--r--src/devices/bus/c64/dela_ep64.h1
-rw-r--r--src/devices/bus/c64/dela_ep7x8.cpp1
-rw-r--r--src/devices/bus/c64/dela_ep7x8.h1
-rw-r--r--src/devices/bus/c64/dinamic.cpp1
-rw-r--r--src/devices/bus/c64/dinamic.h1
-rw-r--r--src/devices/bus/c64/dqbb.cpp1
-rw-r--r--src/devices/bus/c64/dqbb.h1
-rw-r--r--src/devices/bus/c64/easy_calc_result.cpp1
-rw-r--r--src/devices/bus/c64/easy_calc_result.h1
-rw-r--r--src/devices/bus/c64/easyflash.cpp1
-rw-r--r--src/devices/bus/c64/easyflash.h1
-rw-r--r--src/devices/bus/c64/epyx_fast_load.cpp1
-rw-r--r--src/devices/bus/c64/epyx_fast_load.h1
-rw-r--r--src/devices/bus/c64/exos.cpp1
-rw-r--r--src/devices/bus/c64/exos.h1
-rw-r--r--src/devices/bus/c64/exp.cpp1
-rw-r--r--src/devices/bus/c64/exp.h1
-rw-r--r--src/devices/bus/c64/fcc.cpp1
-rw-r--r--src/devices/bus/c64/fcc.h1
-rw-r--r--src/devices/bus/c64/final.cpp1
-rw-r--r--src/devices/bus/c64/final.h1
-rw-r--r--src/devices/bus/c64/final3.cpp1
-rw-r--r--src/devices/bus/c64/final3.h1
-rw-r--r--src/devices/bus/c64/fun_play.cpp1
-rw-r--r--src/devices/bus/c64/fun_play.h1
-rw-r--r--src/devices/bus/c64/geocable.cpp1
-rw-r--r--src/devices/bus/c64/geocable.h1
-rw-r--r--src/devices/bus/c64/georam.cpp1
-rw-r--r--src/devices/bus/c64/georam.h1
-rw-r--r--src/devices/bus/c64/ide64.cpp1
-rw-r--r--src/devices/bus/c64/ide64.h1
-rw-r--r--src/devices/bus/c64/ieee488.cpp1
-rw-r--r--src/devices/bus/c64/ieee488.h1
-rw-r--r--src/devices/bus/c64/kingsoft.cpp1
-rw-r--r--src/devices/bus/c64/kingsoft.h1
-rw-r--r--src/devices/bus/c64/mach5.cpp1
-rw-r--r--src/devices/bus/c64/mach5.h1
-rw-r--r--src/devices/bus/c64/magic_desk.cpp1
-rw-r--r--src/devices/bus/c64/magic_desk.h1
-rw-r--r--src/devices/bus/c64/magic_formel.cpp1
-rw-r--r--src/devices/bus/c64/magic_formel.h1
-rw-r--r--src/devices/bus/c64/magic_voice.cpp1
-rw-r--r--src/devices/bus/c64/magic_voice.h1
-rw-r--r--src/devices/bus/c64/midi_maplin.cpp1
-rw-r--r--src/devices/bus/c64/midi_namesoft.cpp1
-rw-r--r--src/devices/bus/c64/midi_passport.cpp1
-rw-r--r--src/devices/bus/c64/midi_sci.cpp1
-rw-r--r--src/devices/bus/c64/midi_siel.cpp1
-rw-r--r--src/devices/bus/c64/mikro_assembler.cpp1
-rw-r--r--src/devices/bus/c64/mikro_assembler.h1
-rw-r--r--src/devices/bus/c64/multiscreen.cpp1
-rw-r--r--src/devices/bus/c64/multiscreen.h1
-rw-r--r--src/devices/bus/c64/music64.cpp1
-rw-r--r--src/devices/bus/c64/music64.h1
-rw-r--r--src/devices/bus/c64/neoram.cpp1
-rw-r--r--src/devices/bus/c64/neoram.h1
-rw-r--r--src/devices/bus/c64/ocean.cpp1
-rw-r--r--src/devices/bus/c64/ocean.h1
-rw-r--r--src/devices/bus/c64/pagefox.cpp1
-rw-r--r--src/devices/bus/c64/pagefox.h1
-rw-r--r--src/devices/bus/c64/partner.cpp1
-rw-r--r--src/devices/bus/c64/partner.h1
-rw-r--r--src/devices/bus/c64/prophet64.cpp1
-rw-r--r--src/devices/bus/c64/prophet64.h1
-rw-r--r--src/devices/bus/c64/ps64.cpp1
-rw-r--r--src/devices/bus/c64/ps64.h1
-rw-r--r--src/devices/bus/c64/reu.cpp1
-rw-r--r--src/devices/bus/c64/reu.h1
-rw-r--r--src/devices/bus/c64/rex.cpp1
-rw-r--r--src/devices/bus/c64/rex.h1
-rw-r--r--src/devices/bus/c64/rex_ep256.cpp1
-rw-r--r--src/devices/bus/c64/rex_ep256.h1
-rw-r--r--src/devices/bus/c64/ross.cpp1
-rw-r--r--src/devices/bus/c64/ross.h1
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.cpp1
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.h1
-rw-r--r--src/devices/bus/c64/silverrock.cpp1
-rw-r--r--src/devices/bus/c64/silverrock.h1
-rw-r--r--src/devices/bus/c64/simons_basic.cpp1
-rw-r--r--src/devices/bus/c64/simons_basic.h1
-rw-r--r--src/devices/bus/c64/speakeasy.cpp1
-rw-r--r--src/devices/bus/c64/speakeasy.h1
-rw-r--r--src/devices/bus/c64/stardos.cpp1
-rw-r--r--src/devices/bus/c64/stardos.h1
-rw-r--r--src/devices/bus/c64/std.cpp1
-rw-r--r--src/devices/bus/c64/std.h1
-rw-r--r--src/devices/bus/c64/structured_basic.cpp1
-rw-r--r--src/devices/bus/c64/structured_basic.h1
-rw-r--r--src/devices/bus/c64/super_explode.cpp1
-rw-r--r--src/devices/bus/c64/super_explode.h1
-rw-r--r--src/devices/bus/c64/super_games.cpp1
-rw-r--r--src/devices/bus/c64/super_games.h1
-rw-r--r--src/devices/bus/c64/supercpu.cpp1
-rw-r--r--src/devices/bus/c64/supercpu.h1
-rw-r--r--src/devices/bus/c64/sw8k.cpp1
-rw-r--r--src/devices/bus/c64/sw8k.h1
-rw-r--r--src/devices/bus/c64/swiftlink.cpp1
-rw-r--r--src/devices/bus/c64/system3.cpp1
-rw-r--r--src/devices/bus/c64/system3.h1
-rw-r--r--src/devices/bus/c64/tdos.cpp1
-rw-r--r--src/devices/bus/c64/tdos.h1
-rw-r--r--src/devices/bus/c64/turbo232.cpp1
-rw-r--r--src/devices/bus/c64/user.cpp1
-rw-r--r--src/devices/bus/c64/vizastar.cpp1
-rw-r--r--src/devices/bus/c64/vizastar.h1
-rw-r--r--src/devices/bus/c64/vw64.cpp1
-rw-r--r--src/devices/bus/c64/vw64.h1
-rw-r--r--src/devices/bus/c64/warp_speed.cpp1
-rw-r--r--src/devices/bus/c64/warp_speed.h1
-rw-r--r--src/devices/bus/c64/westermann.cpp1
-rw-r--r--src/devices/bus/c64/westermann.h1
-rw-r--r--src/devices/bus/c64/xl80.cpp1
-rw-r--r--src/devices/bus/c64/xl80.h1
-rw-r--r--src/devices/bus/c64/zaxxon.cpp1
-rw-r--r--src/devices/bus/c64/zaxxon.h1
-rw-r--r--src/devices/bus/cbm2/24k.cpp1
-rw-r--r--src/devices/bus/cbm2/24k.h1
-rw-r--r--src/devices/bus/cbm2/exp.cpp1
-rw-r--r--src/devices/bus/cbm2/exp.h1
-rw-r--r--src/devices/bus/cbm2/hrg.cpp1
-rw-r--r--src/devices/bus/cbm2/hrg.h1
-rw-r--r--src/devices/bus/cbm2/std.cpp1
-rw-r--r--src/devices/bus/cbm2/std.h1
-rw-r--r--src/devices/bus/cbm2/user.cpp1
-rw-r--r--src/devices/bus/cbm2/user.h1
-rw-r--r--src/devices/bus/cbmiec/c1526.cpp1
-rw-r--r--src/devices/bus/cbmiec/c1526.h1
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp1
-rw-r--r--src/devices/bus/cbmiec/c1541.h1
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp1
-rw-r--r--src/devices/bus/cbmiec/c1571.h1
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp1
-rw-r--r--src/devices/bus/cbmiec/c1581.h1
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.cpp1
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.h1
-rw-r--r--src/devices/bus/cbmiec/cbmiec.cpp1
-rw-r--r--src/devices/bus/cbmiec/cbmiec.h1
-rw-r--r--src/devices/bus/cbmiec/cmdhd.cpp1
-rw-r--r--src/devices/bus/cbmiec/cmdhd.h1
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.cpp1
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.h1
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp1
-rw-r--r--src/devices/bus/cbmiec/fd2000.h1
-rw-r--r--src/devices/bus/cbmiec/interpod.cpp1
-rw-r--r--src/devices/bus/cbmiec/interpod.h1
-rw-r--r--src/devices/bus/cbmiec/serialbox.cpp1
-rw-r--r--src/devices/bus/cbmiec/serialbox.h1
-rw-r--r--src/devices/bus/cbmiec/vic1515.cpp1
-rw-r--r--src/devices/bus/cbmiec/vic1515.h1
-rw-r--r--src/devices/bus/cbmiec/vic1520.cpp1
-rw-r--r--src/devices/bus/cbmiec/vic1520.h1
-rw-r--r--src/devices/bus/centronics/comxpl80.cpp1
-rw-r--r--src/devices/bus/centronics/comxpl80.h1
-rw-r--r--src/devices/bus/centronics/ctronics.cpp1
-rw-r--r--src/devices/bus/centronics/ctronics.h1
-rw-r--r--src/devices/bus/centronics/dsjoy.cpp1
-rw-r--r--src/devices/bus/centronics/epson_ex800.cpp1
-rw-r--r--src/devices/bus/centronics/epson_ex800.h1
-rw-r--r--src/devices/bus/centronics/epson_lx800.cpp1
-rw-r--r--src/devices/bus/centronics/epson_lx800.h1
-rw-r--r--src/devices/bus/centronics/epson_lx810l.cpp1
-rw-r--r--src/devices/bus/centronics/epson_lx810l.h1
-rw-r--r--src/devices/bus/centronics/nec_p72.cpp1
-rw-r--r--src/devices/bus/centronics/nec_p72.h1
-rw-r--r--src/devices/bus/cgenie/expansion/carts.cpp1
-rw-r--r--src/devices/bus/cgenie/expansion/carts.h1
-rw-r--r--src/devices/bus/cgenie/expansion/expansion.cpp1
-rw-r--r--src/devices/bus/cgenie/expansion/expansion.h1
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.cpp1
-rw-r--r--src/devices/bus/cgenie/expansion/floppy.h1
-rw-r--r--src/devices/bus/cgenie/parallel/carts.cpp1
-rw-r--r--src/devices/bus/cgenie/parallel/carts.h1
-rw-r--r--src/devices/bus/cgenie/parallel/joystick.cpp1
-rw-r--r--src/devices/bus/cgenie/parallel/joystick.h1
-rw-r--r--src/devices/bus/cgenie/parallel/parallel.cpp1
-rw-r--r--src/devices/bus/cgenie/parallel/parallel.h1
-rw-r--r--src/devices/bus/cgenie/parallel/printer.cpp1
-rw-r--r--src/devices/bus/cgenie/parallel/printer.h1
-rw-r--r--src/devices/bus/coco/coco_232.h1
-rw-r--r--src/devices/bus/coco/coco_dwsock.h1
-rw-r--r--src/devices/bus/coco/coco_fdc.h1
-rw-r--r--src/devices/bus/coco/coco_multi.h1
-rw-r--r--src/devices/bus/coco/coco_orch90.h1
-rw-r--r--src/devices/bus/coco/coco_pak.h1
-rw-r--r--src/devices/bus/coco/coco_t4426.h1
-rw-r--r--src/devices/bus/coleco/ctrl.cpp1
-rw-r--r--src/devices/bus/coleco/ctrl.h1
-rw-r--r--src/devices/bus/coleco/exp.cpp1
-rw-r--r--src/devices/bus/coleco/exp.h1
-rw-r--r--src/devices/bus/coleco/hand.cpp1
-rw-r--r--src/devices/bus/coleco/hand.h1
-rw-r--r--src/devices/bus/coleco/sac.cpp1
-rw-r--r--src/devices/bus/coleco/sac.h1
-rw-r--r--src/devices/bus/coleco/std.cpp1
-rw-r--r--src/devices/bus/coleco/xin1.cpp1
-rw-r--r--src/devices/bus/compis/graphics.cpp1
-rw-r--r--src/devices/bus/compis/graphics.h1
-rw-r--r--src/devices/bus/compis/hrg.cpp1
-rw-r--r--src/devices/bus/compis/hrg.h1
-rw-r--r--src/devices/bus/compucolor/floppy.cpp1
-rw-r--r--src/devices/bus/comx35/clm.cpp1
-rw-r--r--src/devices/bus/comx35/clm.h1
-rw-r--r--src/devices/bus/comx35/eprom.cpp1
-rw-r--r--src/devices/bus/comx35/eprom.h1
-rw-r--r--src/devices/bus/comx35/exp.cpp1
-rw-r--r--src/devices/bus/comx35/exp.h1
-rw-r--r--src/devices/bus/comx35/expbox.cpp1
-rw-r--r--src/devices/bus/comx35/fdc.cpp1
-rw-r--r--src/devices/bus/comx35/fdc.h1
-rw-r--r--src/devices/bus/comx35/joycard.cpp1
-rw-r--r--src/devices/bus/comx35/joycard.h1
-rw-r--r--src/devices/bus/comx35/printer.cpp1
-rw-r--r--src/devices/bus/comx35/printer.h1
-rw-r--r--src/devices/bus/comx35/ram.cpp1
-rw-r--r--src/devices/bus/comx35/ram.h1
-rw-r--r--src/devices/bus/comx35/thermal.cpp1
-rw-r--r--src/devices/bus/comx35/thermal.h1
-rw-r--r--src/devices/bus/cpc/amdrum.h1
-rw-r--r--src/devices/bus/cpc/brunword4.cpp1
-rw-r--r--src/devices/bus/cpc/brunword4.h1
-rw-r--r--src/devices/bus/cpc/cpc_pds.h1
-rw-r--r--src/devices/bus/cpc/cpc_rom.h1
-rw-r--r--src/devices/bus/cpc/cpc_rs232.cpp1
-rw-r--r--src/devices/bus/cpc/cpc_rs232.h1
-rw-r--r--src/devices/bus/cpc/cpc_ssa1.h1
-rw-r--r--src/devices/bus/cpc/cpcexp.h1
-rw-r--r--src/devices/bus/cpc/ddi1.h1
-rw-r--r--src/devices/bus/cpc/doubler.cpp1
-rw-r--r--src/devices/bus/cpc/doubler.h1
-rw-r--r--src/devices/bus/cpc/hd20.h1
-rw-r--r--src/devices/bus/cpc/magicsound.h1
-rw-r--r--src/devices/bus/cpc/mface2.h1
-rw-r--r--src/devices/bus/cpc/playcity.cpp1
-rw-r--r--src/devices/bus/cpc/playcity.h1
-rw-r--r--src/devices/bus/cpc/smartwatch.h1
-rw-r--r--src/devices/bus/cpc/symbfac2.cpp1
-rw-r--r--src/devices/bus/cpc/symbfac2.h1
-rw-r--r--src/devices/bus/cpc/transtape.cpp1
-rw-r--r--src/devices/bus/cpc/transtape.h1
-rw-r--r--src/devices/bus/dmv/k210.h1
-rw-r--r--src/devices/bus/dmv/k220.h1
-rw-r--r--src/devices/bus/dmv/k230.h1
-rw-r--r--src/devices/bus/dmv/k233.h1
-rw-r--r--src/devices/bus/dmv/k801.h1
-rw-r--r--src/devices/bus/dmv/k803.h1
-rw-r--r--src/devices/bus/dmv/k806.h1
-rw-r--r--src/devices/bus/dmv/ram.h1
-rw-r--r--src/devices/bus/ecbbus/ecbbus.cpp1
-rw-r--r--src/devices/bus/ecbbus/ecbbus.h1
-rw-r--r--src/devices/bus/ecbbus/grip.cpp1
-rw-r--r--src/devices/bus/ecbbus/grip.h1
-rw-r--r--src/devices/bus/econet/e01.cpp1
-rw-r--r--src/devices/bus/econet/econet.cpp1
-rw-r--r--src/devices/bus/econet/econet.h1
-rw-r--r--src/devices/bus/electron/exp.cpp1
-rw-r--r--src/devices/bus/electron/exp.h1
-rw-r--r--src/devices/bus/electron/m2105.cpp1
-rw-r--r--src/devices/bus/electron/m2105.h1
-rw-r--r--src/devices/bus/electron/plus3.cpp1
-rw-r--r--src/devices/bus/electron/plus3.h1
-rw-r--r--src/devices/bus/ep64/exdos.cpp1
-rw-r--r--src/devices/bus/ep64/exdos.h1
-rw-r--r--src/devices/bus/ep64/exp.cpp1
-rw-r--r--src/devices/bus/ep64/exp.h1
-rw-r--r--src/devices/bus/epson_sio/epson_sio.cpp1
-rw-r--r--src/devices/bus/epson_sio/epson_sio.h1
-rw-r--r--src/devices/bus/epson_sio/pf10.cpp1
-rw-r--r--src/devices/bus/epson_sio/pf10.h1
-rw-r--r--src/devices/bus/epson_sio/tf20.cpp1
-rw-r--r--src/devices/bus/epson_sio/tf20.h1
-rw-r--r--src/devices/bus/gamegear/ggext.cpp1
-rw-r--r--src/devices/bus/gamegear/ggext.h1
-rw-r--r--src/devices/bus/gamegear/smsctrladp.cpp1
-rw-r--r--src/devices/bus/gamegear/smsctrladp.h1
-rw-r--r--src/devices/bus/generic/carts.cpp1
-rw-r--r--src/devices/bus/generic/carts.h1
-rw-r--r--src/devices/bus/hp9845_io/98034.cpp1
-rw-r--r--src/devices/bus/hp9845_io/98035.cpp1
-rw-r--r--src/devices/bus/hp9845_io/hp9845_io.cpp1
-rw-r--r--src/devices/bus/hp9845_io/hp9845_io.h1
-rw-r--r--src/devices/bus/hp_optroms/hp_optrom.cpp1
-rw-r--r--src/devices/bus/hp_optroms/hp_optrom.h1
-rw-r--r--src/devices/bus/ieee488/c2031.cpp1
-rw-r--r--src/devices/bus/ieee488/c2031.h1
-rw-r--r--src/devices/bus/ieee488/c2040.cpp1
-rw-r--r--src/devices/bus/ieee488/c2040.h1
-rw-r--r--src/devices/bus/ieee488/c2040fdc.cpp1
-rw-r--r--src/devices/bus/ieee488/c2040fdc.h1
-rw-r--r--src/devices/bus/ieee488/c8050.cpp1
-rw-r--r--src/devices/bus/ieee488/c8050.h1
-rw-r--r--src/devices/bus/ieee488/c8050fdc.cpp1
-rw-r--r--src/devices/bus/ieee488/c8050fdc.h1
-rw-r--r--src/devices/bus/ieee488/c8280.cpp1
-rw-r--r--src/devices/bus/ieee488/c8280.h1
-rw-r--r--src/devices/bus/ieee488/d9060.cpp1
-rw-r--r--src/devices/bus/ieee488/d9060.h1
-rw-r--r--src/devices/bus/ieee488/hardbox.cpp1
-rw-r--r--src/devices/bus/ieee488/hp9895.cpp1
-rw-r--r--src/devices/bus/ieee488/hp9895.h1
-rw-r--r--src/devices/bus/ieee488/ieee488.cpp1
-rw-r--r--src/devices/bus/ieee488/ieee488.h1
-rw-r--r--src/devices/bus/ieee488/shark.cpp1
-rw-r--r--src/devices/bus/ieee488/softbox.cpp1
-rw-r--r--src/devices/bus/imi7000/imi5000h.cpp1
-rw-r--r--src/devices/bus/imi7000/imi5000h.h1
-rw-r--r--src/devices/bus/imi7000/imi7000.cpp1
-rw-r--r--src/devices/bus/imi7000/imi7000.h1
-rw-r--r--src/devices/bus/intv_ctrl/ctrl.cpp1
-rw-r--r--src/devices/bus/intv_ctrl/ctrl.h1
-rw-r--r--src/devices/bus/intv_ctrl/ecs_ctrl.cpp1
-rw-r--r--src/devices/bus/intv_ctrl/ecs_ctrl.h1
-rw-r--r--src/devices/bus/intv_ctrl/handctrl.cpp1
-rw-r--r--src/devices/bus/intv_ctrl/handctrl.h1
-rw-r--r--src/devices/bus/iq151/disc2.h1
-rw-r--r--src/devices/bus/iq151/grafik.h1
-rw-r--r--src/devices/bus/iq151/minigraf.h1
-rw-r--r--src/devices/bus/iq151/ms151a.h1
-rw-r--r--src/devices/bus/iq151/rom.h1
-rw-r--r--src/devices/bus/iq151/staper.h1
-rw-r--r--src/devices/bus/iq151/video32.h1
-rw-r--r--src/devices/bus/iq151/video64.h1
-rw-r--r--src/devices/bus/isa/3c503.h1
-rw-r--r--src/devices/bus/isa/3c505.cpp1
-rw-r--r--src/devices/bus/isa/3c505.h1
-rw-r--r--src/devices/bus/isa/adlib.h1
-rw-r--r--src/devices/bus/isa/aga.cpp1
-rw-r--r--src/devices/bus/isa/aga.h1
-rw-r--r--src/devices/bus/isa/aha1542.cpp1
-rw-r--r--src/devices/bus/isa/aha1542.h1
-rw-r--r--src/devices/bus/isa/cga.h1
-rw-r--r--src/devices/bus/isa/com.cpp1
-rw-r--r--src/devices/bus/isa/com.h1
-rw-r--r--src/devices/bus/isa/dectalk.cpp1
-rw-r--r--src/devices/bus/isa/dectalk.h1
-rw-r--r--src/devices/bus/isa/ega.h1
-rw-r--r--src/devices/bus/isa/fdc.h1
-rw-r--r--src/devices/bus/isa/finalchs.h1
-rw-r--r--src/devices/bus/isa/gblaster.h1
-rw-r--r--src/devices/bus/isa/gus.cpp1
-rw-r--r--src/devices/bus/isa/gus.h1
-rw-r--r--src/devices/bus/isa/hdc.h1
-rw-r--r--src/devices/bus/isa/ibm_mfc.h1
-rw-r--r--src/devices/bus/isa/ide.h1
-rw-r--r--src/devices/bus/isa/isa.h1
-rw-r--r--src/devices/bus/isa/isa_cards.cpp1
-rw-r--r--src/devices/bus/isa/isa_cards.h1
-rw-r--r--src/devices/bus/isa/mach32.cpp1
-rw-r--r--src/devices/bus/isa/mach32.h1
-rw-r--r--src/devices/bus/isa/mc1502_fdc.cpp1
-rw-r--r--src/devices/bus/isa/mc1502_fdc.h1
-rw-r--r--src/devices/bus/isa/mc1502_rom.cpp1
-rw-r--r--src/devices/bus/isa/mc1502_rom.h1
-rw-r--r--src/devices/bus/isa/mcd.cpp1
-rw-r--r--src/devices/bus/isa/mcd.h1
-rw-r--r--src/devices/bus/isa/mda.h1
-rw-r--r--src/devices/bus/isa/mpu401.h1
-rw-r--r--src/devices/bus/isa/mufdc.cpp1
-rw-r--r--src/devices/bus/isa/mufdc.h1
-rw-r--r--src/devices/bus/isa/ne1000.h1
-rw-r--r--src/devices/bus/isa/ne2000.h1
-rw-r--r--src/devices/bus/isa/num9rev.h1
-rw-r--r--src/devices/bus/isa/omti8621.cpp1
-rw-r--r--src/devices/bus/isa/omti8621.h1
-rw-r--r--src/devices/bus/isa/p1_fdc.cpp1
-rw-r--r--src/devices/bus/isa/p1_fdc.h1
-rw-r--r--src/devices/bus/isa/p1_hdc.cpp1
-rw-r--r--src/devices/bus/isa/p1_hdc.h1
-rw-r--r--src/devices/bus/isa/p1_rom.cpp1
-rw-r--r--src/devices/bus/isa/p1_rom.h1
-rw-r--r--src/devices/bus/isa/p1_sound.cpp1
-rw-r--r--src/devices/bus/isa/p1_sound.h1
-rw-r--r--src/devices/bus/isa/pc1640_iga.cpp1
-rw-r--r--src/devices/bus/isa/pc1640_iga.h1
-rw-r--r--src/devices/bus/isa/pds.cpp1
-rw-r--r--src/devices/bus/isa/pds.h1
-rw-r--r--src/devices/bus/isa/pgc.h1
-rw-r--r--src/devices/bus/isa/s3virge.cpp1
-rw-r--r--src/devices/bus/isa/s3virge.h1
-rw-r--r--src/devices/bus/isa/sb16.cpp1
-rw-r--r--src/devices/bus/isa/sb16.h1
-rw-r--r--src/devices/bus/isa/sblaster.cpp1
-rw-r--r--src/devices/bus/isa/sc499.cpp1
-rw-r--r--src/devices/bus/isa/sc499.h1
-rw-r--r--src/devices/bus/isa/side116.cpp1
-rw-r--r--src/devices/bus/isa/side116.h1
-rw-r--r--src/devices/bus/isa/ssi2001.cpp1
-rw-r--r--src/devices/bus/isa/ssi2001.h1
-rw-r--r--src/devices/bus/isa/stereo_fx.cpp1
-rw-r--r--src/devices/bus/isa/stereo_fx.h1
-rw-r--r--src/devices/bus/isa/svga_cirrus.h1
-rw-r--r--src/devices/bus/isa/svga_s3.h1
-rw-r--r--src/devices/bus/isa/svga_trident.h1
-rw-r--r--src/devices/bus/isa/svga_tseng.h1
-rw-r--r--src/devices/bus/isa/vga.h1
-rw-r--r--src/devices/bus/isa/vga_ati.h1
-rw-r--r--src/devices/bus/isa/wd1002a_wx1.cpp1
-rw-r--r--src/devices/bus/isa/wd1002a_wx1.h1
-rw-r--r--src/devices/bus/isa/wdxt_gen.cpp1
-rw-r--r--src/devices/bus/isa/wdxt_gen.h1
-rw-r--r--src/devices/bus/isa/xsu_cards.cpp1
-rw-r--r--src/devices/bus/isa/xsu_cards.h1
-rw-r--r--src/devices/bus/isa/xtide.cpp1
-rw-r--r--src/devices/bus/isa/xtide.h1
-rw-r--r--src/devices/bus/isbx/compis_fdc.cpp1
-rw-r--r--src/devices/bus/isbx/compis_fdc.h1
-rw-r--r--src/devices/bus/isbx/isbc_218a.cpp1
-rw-r--r--src/devices/bus/isbx/isbc_218a.h1
-rw-r--r--src/devices/bus/isbx/isbx.cpp1
-rw-r--r--src/devices/bus/isbx/isbx.h1
-rw-r--r--src/devices/bus/kc/d002.h1
-rw-r--r--src/devices/bus/kc/d004.h1
-rw-r--r--src/devices/bus/kc/ram.h1
-rw-r--r--src/devices/bus/kc/rom.h1
-rw-r--r--src/devices/bus/lpci/northbridge.h1
-rw-r--r--src/devices/bus/lpci/southbridge.h1
-rw-r--r--src/devices/bus/macpds/macpds.h1
-rw-r--r--src/devices/bus/macpds/pds_tpdfpd.h1
-rw-r--r--src/devices/bus/megadrive/md_carts.cpp1
-rw-r--r--src/devices/bus/megadrive/md_carts.h1
-rw-r--r--src/devices/bus/midi/midi.cpp1
-rw-r--r--src/devices/bus/midi/midi.h1
-rw-r--r--src/devices/bus/midi/midiinport.cpp1
-rw-r--r--src/devices/bus/midi/midioutport.cpp1
-rw-r--r--src/devices/bus/nasbus/avc.cpp1
-rw-r--r--src/devices/bus/nasbus/avc.h1
-rw-r--r--src/devices/bus/nasbus/cards.cpp1
-rw-r--r--src/devices/bus/nasbus/cards.h1
-rw-r--r--src/devices/bus/nasbus/floppy.cpp1
-rw-r--r--src/devices/bus/nasbus/floppy.h1
-rw-r--r--src/devices/bus/nasbus/nasbus.cpp1
-rw-r--r--src/devices/bus/nasbus/nasbus.h1
-rw-r--r--src/devices/bus/neogeo/carts.cpp1
-rw-r--r--src/devices/bus/neogeo/carts.h1
-rw-r--r--src/devices/bus/neogeo/slot.cpp1
-rw-r--r--src/devices/bus/neogeo/slot.h1
-rw-r--r--src/devices/bus/neogeo_ctrl/ctrl.cpp1
-rw-r--r--src/devices/bus/neogeo_ctrl/ctrl.h1
-rw-r--r--src/devices/bus/neogeo_ctrl/dial.cpp1
-rw-r--r--src/devices/bus/neogeo_ctrl/dial.h1
-rw-r--r--src/devices/bus/neogeo_ctrl/irrmaze.cpp1
-rw-r--r--src/devices/bus/neogeo_ctrl/irrmaze.h1
-rw-r--r--src/devices/bus/neogeo_ctrl/joystick.cpp1
-rw-r--r--src/devices/bus/neogeo_ctrl/joystick.h1
-rw-r--r--src/devices/bus/neogeo_ctrl/kizuna4p.cpp1
-rw-r--r--src/devices/bus/neogeo_ctrl/kizuna4p.h1
-rw-r--r--src/devices/bus/neogeo_ctrl/mahjong.cpp1
-rw-r--r--src/devices/bus/neogeo_ctrl/mahjong.h1
-rw-r--r--src/devices/bus/nes/nes_carts.cpp1
-rw-r--r--src/devices/bus/nes/nes_carts.h1
-rw-r--r--src/devices/bus/nes_ctrl/4score.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/4score.h1
-rw-r--r--src/devices/bus/nes_ctrl/arkpaddle.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/arkpaddle.h1
-rw-r--r--src/devices/bus/nes_ctrl/bcbattle.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/bcbattle.h1
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/ctrl.h1
-rw-r--r--src/devices/bus/nes_ctrl/fckeybrd.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/fckeybrd.h1
-rw-r--r--src/devices/bus/nes_ctrl/ftrainer.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/ftrainer.h1
-rw-r--r--src/devices/bus/nes_ctrl/hori.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/hori.h1
-rw-r--r--src/devices/bus/nes_ctrl/joypad.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/joypad.h1
-rw-r--r--src/devices/bus/nes_ctrl/konamihs.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/konamihs.h1
-rw-r--r--src/devices/bus/nes_ctrl/miracle.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/miracle.h1
-rw-r--r--src/devices/bus/nes_ctrl/mjpanel.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/mjpanel.h1
-rw-r--r--src/devices/bus/nes_ctrl/pachinko.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/pachinko.h1
-rw-r--r--src/devices/bus/nes_ctrl/partytap.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/partytap.h1
-rw-r--r--src/devices/bus/nes_ctrl/powerpad.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/powerpad.h1
-rw-r--r--src/devices/bus/nes_ctrl/suborkey.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/suborkey.h1
-rw-r--r--src/devices/bus/nes_ctrl/zapper.cpp1
-rw-r--r--src/devices/bus/nes_ctrl/zapper.h1
-rw-r--r--src/devices/bus/newbrain/eim.cpp1
-rw-r--r--src/devices/bus/newbrain/eim.h1
-rw-r--r--src/devices/bus/newbrain/exp.cpp1
-rw-r--r--src/devices/bus/newbrain/exp.h1
-rw-r--r--src/devices/bus/newbrain/fdc.cpp1
-rw-r--r--src/devices/bus/newbrain/fdc.h1
-rw-r--r--src/devices/bus/nubus/nubus.h1
-rw-r--r--src/devices/bus/nubus/nubus_48gc.h1
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.h1
-rw-r--r--src/devices/bus/nubus/nubus_cb264.h1
-rw-r--r--src/devices/bus/nubus/nubus_image.h1
-rw-r--r--src/devices/bus/nubus/nubus_m2hires.h1
-rw-r--r--src/devices/bus/nubus/nubus_m2video.h1
-rw-r--r--src/devices/bus/nubus/nubus_radiustpd.h1
-rw-r--r--src/devices/bus/nubus/nubus_spec8.h1
-rw-r--r--src/devices/bus/nubus/nubus_specpdq.h1
-rw-r--r--src/devices/bus/nubus/nubus_vikbw.h1
-rw-r--r--src/devices/bus/nubus/nubus_wsportrait.h1
-rw-r--r--src/devices/bus/nubus/pds30_30hr.h1
-rw-r--r--src/devices/bus/nubus/pds30_cb264.h1
-rw-r--r--src/devices/bus/nubus/pds30_mc30.h1
-rw-r--r--src/devices/bus/nubus/pds30_procolor816.h1
-rw-r--r--src/devices/bus/nubus/pds30_sigmalview.h1
-rw-r--r--src/devices/bus/oricext/jasmin.cpp1
-rw-r--r--src/devices/bus/oricext/microdisc.cpp1
-rw-r--r--src/devices/bus/oricext/oricext.cpp1
-rw-r--r--src/devices/bus/oricext/oricext.h1
-rw-r--r--src/devices/bus/pc1512/mouse.h1
-rw-r--r--src/devices/bus/pc_joy/pc_joy.cpp1
-rw-r--r--src/devices/bus/pc_joy/pc_joy.h1
-rw-r--r--src/devices/bus/pc_joy/pc_joy_sw.cpp1
-rw-r--r--src/devices/bus/pc_kbd/ec1841.cpp1
-rw-r--r--src/devices/bus/pc_kbd/ec1841.h1
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.cpp1
-rw-r--r--src/devices/bus/pc_kbd/iskr1030.h1
-rw-r--r--src/devices/bus/pc_kbd/pc83.cpp1
-rw-r--r--src/devices/bus/pc_kbd/pc83.h1
-rw-r--r--src/devices/bus/pc_kbd/pc_kbdc.h1
-rw-r--r--src/devices/bus/pc_kbd/pcat84.cpp1
-rw-r--r--src/devices/bus/pc_kbd/pcat84.h1
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.cpp1
-rw-r--r--src/devices/bus/pc_kbd/pcxt83.h1
-rw-r--r--src/devices/bus/pet/2joysnd.cpp1
-rw-r--r--src/devices/bus/pet/2joysnd.h1
-rw-r--r--src/devices/bus/pet/64k.cpp1
-rw-r--r--src/devices/bus/pet/64k.h1
-rw-r--r--src/devices/bus/pet/c2n.cpp1
-rw-r--r--src/devices/bus/pet/c2n.h1
-rw-r--r--src/devices/bus/pet/cass.cpp1
-rw-r--r--src/devices/bus/pet/cass.h1
-rw-r--r--src/devices/bus/pet/cb2snd.cpp1
-rw-r--r--src/devices/bus/pet/cb2snd.h1
-rw-r--r--src/devices/bus/pet/diag.cpp1
-rw-r--r--src/devices/bus/pet/diag.h1
-rw-r--r--src/devices/bus/pet/diag264_lb_tape.cpp1
-rw-r--r--src/devices/bus/pet/diag264_lb_tape.h1
-rw-r--r--src/devices/bus/pet/exp.cpp1
-rw-r--r--src/devices/bus/pet/exp.h1
-rw-r--r--src/devices/bus/pet/hsg.cpp1
-rw-r--r--src/devices/bus/pet/hsg.h1
-rw-r--r--src/devices/bus/pet/petuja.cpp1
-rw-r--r--src/devices/bus/pet/petuja.h1
-rw-r--r--src/devices/bus/pet/superpet.cpp1
-rw-r--r--src/devices/bus/pet/user.cpp1
-rw-r--r--src/devices/bus/pet/user.h1
-rw-r--r--src/devices/bus/plus4/c1551.cpp1
-rw-r--r--src/devices/bus/plus4/c1551.h1
-rw-r--r--src/devices/bus/plus4/diag264_lb_user.cpp1
-rw-r--r--src/devices/bus/plus4/diag264_lb_user.h1
-rw-r--r--src/devices/bus/plus4/exp.cpp1
-rw-r--r--src/devices/bus/plus4/exp.h1
-rw-r--r--src/devices/bus/plus4/sid.cpp1
-rw-r--r--src/devices/bus/plus4/sid.h1
-rw-r--r--src/devices/bus/plus4/std.cpp1
-rw-r--r--src/devices/bus/plus4/std.h1
-rw-r--r--src/devices/bus/plus4/user.cpp1
-rw-r--r--src/devices/bus/pofo/ccm.cpp1
-rw-r--r--src/devices/bus/pofo/ccm.h1
-rw-r--r--src/devices/bus/pofo/exp.cpp1
-rw-r--r--src/devices/bus/pofo/exp.h1
-rw-r--r--src/devices/bus/pofo/hpc101.cpp1
-rw-r--r--src/devices/bus/pofo/hpc101.h1
-rw-r--r--src/devices/bus/pofo/hpc102.cpp1
-rw-r--r--src/devices/bus/pofo/hpc102.h1
-rw-r--r--src/devices/bus/pofo/hpc104.cpp1
-rw-r--r--src/devices/bus/pofo/hpc104.h1
-rw-r--r--src/devices/bus/pofo/ram.cpp1
-rw-r--r--src/devices/bus/pofo/ram.h1
-rw-r--r--src/devices/bus/pofo/rom.cpp1
-rw-r--r--src/devices/bus/pofo/rom.h1
-rw-r--r--src/devices/bus/psx/analogue.cpp1
-rw-r--r--src/devices/bus/psx/ctlrport.cpp1
-rw-r--r--src/devices/bus/psx/memcard.h1
-rw-r--r--src/devices/bus/psx/multitap.cpp1
-rw-r--r--src/devices/bus/ql/cst_q_plus4.cpp1
-rw-r--r--src/devices/bus/ql/cst_qdisc.cpp1
-rw-r--r--src/devices/bus/ql/cumana_fdi.cpp1
-rw-r--r--src/devices/bus/ql/exp.cpp1
-rw-r--r--src/devices/bus/ql/exp.h1
-rw-r--r--src/devices/bus/ql/kempston_di.cpp1
-rw-r--r--src/devices/bus/ql/miracle_gold_card.cpp1
-rw-r--r--src/devices/bus/ql/miracle_hd.cpp1
-rw-r--r--src/devices/bus/ql/mp_fdi.cpp1
-rw-r--r--src/devices/bus/ql/opd_basic_master.cpp1
-rw-r--r--src/devices/bus/ql/pcml_qdisk.cpp1
-rw-r--r--src/devices/bus/ql/qubide.cpp1
-rw-r--r--src/devices/bus/ql/rom.cpp1
-rw-r--r--src/devices/bus/ql/rom.h1
-rw-r--r--src/devices/bus/ql/sandy_superdisk.cpp1
-rw-r--r--src/devices/bus/ql/sandy_superqboard.cpp1
-rw-r--r--src/devices/bus/ql/std.cpp1
-rw-r--r--src/devices/bus/ql/trumpcard.cpp1
-rw-r--r--src/devices/bus/rs232/keyboard.cpp1
-rw-r--r--src/devices/bus/rs232/loopback.cpp1
-rw-r--r--src/devices/bus/rs232/null_modem.cpp1
-rw-r--r--src/devices/bus/rs232/printer.cpp1
-rw-r--r--src/devices/bus/rs232/pty.cpp1
-rw-r--r--src/devices/bus/rs232/rs232.cpp1
-rw-r--r--src/devices/bus/rs232/rs232.h1
-rw-r--r--src/devices/bus/rs232/ser_mouse.cpp1
-rw-r--r--src/devices/bus/rs232/sun_kbd.cpp1
-rw-r--r--src/devices/bus/rs232/terminal.cpp1
-rw-r--r--src/devices/bus/rs232/xvd701.cpp1
-rw-r--r--src/devices/bus/s100/dj2db.cpp1
-rw-r--r--src/devices/bus/s100/dj2db.h1
-rw-r--r--src/devices/bus/s100/djdma.cpp1
-rw-r--r--src/devices/bus/s100/djdma.h1
-rw-r--r--src/devices/bus/s100/mm65k16s.cpp1
-rw-r--r--src/devices/bus/s100/mm65k16s.h1
-rw-r--r--src/devices/bus/s100/nsmdsa.cpp1
-rw-r--r--src/devices/bus/s100/nsmdsa.h1
-rw-r--r--src/devices/bus/s100/nsmdsad.cpp1
-rw-r--r--src/devices/bus/s100/nsmdsad.h1
-rw-r--r--src/devices/bus/s100/s100.cpp1
-rw-r--r--src/devices/bus/s100/s100.h1
-rw-r--r--src/devices/bus/s100/wunderbus.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/analog.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/analog.h1
-rw-r--r--src/devices/bus/sat_ctrl/ctrl.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/ctrl.h1
-rw-r--r--src/devices/bus/sat_ctrl/joy.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/joy.h1
-rw-r--r--src/devices/bus/sat_ctrl/joy_md.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/joy_md.h1
-rw-r--r--src/devices/bus/sat_ctrl/keybd.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/keybd.h1
-rw-r--r--src/devices/bus/sat_ctrl/mouse.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/mouse.h1
-rw-r--r--src/devices/bus/sat_ctrl/multitap.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/multitap.h1
-rw-r--r--src/devices/bus/sat_ctrl/pointer.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/pointer.h1
-rw-r--r--src/devices/bus/sat_ctrl/racing.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/racing.h1
-rw-r--r--src/devices/bus/sat_ctrl/segatap.cpp1
-rw-r--r--src/devices/bus/sat_ctrl/segatap.h1
-rw-r--r--src/devices/bus/scsi/acb4070.cpp1
-rw-r--r--src/devices/bus/scsi/cdu76s.cpp1
-rw-r--r--src/devices/bus/scsi/d9060hd.cpp1
-rw-r--r--src/devices/bus/scsi/omti5100.cpp1
-rw-r--r--src/devices/bus/scsi/omti5100.h1
-rw-r--r--src/devices/bus/scsi/pc9801_sasi.cpp1
-rw-r--r--src/devices/bus/scsi/s1410.cpp1
-rw-r--r--src/devices/bus/scsi/sa1403d.cpp1
-rw-r--r--src/devices/bus/scsi/scsi.cpp1
-rw-r--r--src/devices/bus/scsi/scsi.h1
-rw-r--r--src/devices/bus/scsi/scsicd.cpp1
-rw-r--r--src/devices/bus/scsi/scsihd.cpp1
-rw-r--r--src/devices/bus/scsi/scsihle.cpp1
-rw-r--r--src/devices/bus/sg1000_exp/fm_unit.cpp1
-rw-r--r--src/devices/bus/sg1000_exp/fm_unit.h1
-rw-r--r--src/devices/bus/sg1000_exp/sg1000exp.cpp1
-rw-r--r--src/devices/bus/sg1000_exp/sg1000exp.h1
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.cpp1
-rw-r--r--src/devices/bus/sg1000_exp/sk1100.h1
-rw-r--r--src/devices/bus/sms_ctrl/graphic.cpp1
-rw-r--r--src/devices/bus/sms_ctrl/graphic.h1
-rw-r--r--src/devices/bus/sms_ctrl/joypad.cpp1
-rw-r--r--src/devices/bus/sms_ctrl/joypad.h1
-rw-r--r--src/devices/bus/sms_ctrl/lphaser.cpp1
-rw-r--r--src/devices/bus/sms_ctrl/lphaser.h1
-rw-r--r--src/devices/bus/sms_ctrl/multitap.cpp1
-rw-r--r--src/devices/bus/sms_ctrl/multitap.h1
-rw-r--r--src/devices/bus/sms_ctrl/paddle.cpp1
-rw-r--r--src/devices/bus/sms_ctrl/paddle.h1
-rw-r--r--src/devices/bus/sms_ctrl/rfu.cpp1
-rw-r--r--src/devices/bus/sms_ctrl/rfu.h1
-rw-r--r--src/devices/bus/sms_ctrl/smsctrl.cpp1
-rw-r--r--src/devices/bus/sms_ctrl/smsctrl.h1
-rw-r--r--src/devices/bus/sms_ctrl/sports.cpp1
-rw-r--r--src/devices/bus/sms_ctrl/sports.h1
-rw-r--r--src/devices/bus/sms_ctrl/sportsjp.cpp1
-rw-r--r--src/devices/bus/sms_ctrl/sportsjp.h1
-rw-r--r--src/devices/bus/sms_exp/gender.cpp1
-rw-r--r--src/devices/bus/sms_exp/gender.h1
-rw-r--r--src/devices/bus/sms_exp/smsexp.cpp1
-rw-r--r--src/devices/bus/sms_exp/smsexp.h1
-rw-r--r--src/devices/bus/snes/snes_carts.cpp1
-rw-r--r--src/devices/bus/snes/snes_carts.h1
-rw-r--r--src/devices/bus/snes_ctrl/bcbattle.cpp1
-rw-r--r--src/devices/bus/snes_ctrl/bcbattle.h1
-rw-r--r--src/devices/bus/snes_ctrl/ctrl.cpp1
-rw-r--r--src/devices/bus/snes_ctrl/ctrl.h1
-rw-r--r--src/devices/bus/snes_ctrl/joypad.cpp1
-rw-r--r--src/devices/bus/snes_ctrl/joypad.h1
-rw-r--r--src/devices/bus/snes_ctrl/miracle.cpp1
-rw-r--r--src/devices/bus/snes_ctrl/miracle.h1
-rw-r--r--src/devices/bus/snes_ctrl/mouse.cpp1
-rw-r--r--src/devices/bus/snes_ctrl/mouse.h1
-rw-r--r--src/devices/bus/snes_ctrl/multitap.cpp1
-rw-r--r--src/devices/bus/snes_ctrl/multitap.h1
-rw-r--r--src/devices/bus/snes_ctrl/pachinko.cpp1
-rw-r--r--src/devices/bus/snes_ctrl/pachinko.h1
-rw-r--r--src/devices/bus/snes_ctrl/sscope.cpp1
-rw-r--r--src/devices/bus/snes_ctrl/sscope.h1
-rw-r--r--src/devices/bus/snes_ctrl/twintap.cpp1
-rw-r--r--src/devices/bus/snes_ctrl/twintap.h1
-rw-r--r--src/devices/bus/sunkbd/hlekbd.cpp1
-rw-r--r--src/devices/bus/sunkbd/sunkbd.cpp1
-rw-r--r--src/devices/bus/sunkbd/sunkbd.h1
-rw-r--r--src/devices/bus/svi3x8/expander/expander.cpp1
-rw-r--r--src/devices/bus/svi3x8/expander/expander.h1
-rw-r--r--src/devices/bus/svi3x8/expander/modules.cpp1
-rw-r--r--src/devices/bus/svi3x8/expander/modules.h1
-rw-r--r--src/devices/bus/svi3x8/expander/sv601.cpp1
-rw-r--r--src/devices/bus/svi3x8/expander/sv601.h1
-rw-r--r--src/devices/bus/svi3x8/expander/sv602.cpp1
-rw-r--r--src/devices/bus/svi3x8/expander/sv602.h1
-rw-r--r--src/devices/bus/svi3x8/expander/sv603.cpp1
-rw-r--r--src/devices/bus/svi3x8/expander/sv603.h1
-rw-r--r--src/devices/bus/svi3x8/slot/cards.cpp1
-rw-r--r--src/devices/bus/svi3x8/slot/cards.h1
-rw-r--r--src/devices/bus/svi3x8/slot/slot.cpp1
-rw-r--r--src/devices/bus/svi3x8/slot/slot.h1
-rw-r--r--src/devices/bus/svi3x8/slot/sv801.cpp1
-rw-r--r--src/devices/bus/svi3x8/slot/sv801.h1
-rw-r--r--src/devices/bus/svi3x8/slot/sv802.cpp1
-rw-r--r--src/devices/bus/svi3x8/slot/sv802.h1
-rw-r--r--src/devices/bus/svi3x8/slot/sv803.cpp1
-rw-r--r--src/devices/bus/svi3x8/slot/sv803.h1
-rw-r--r--src/devices/bus/svi3x8/slot/sv805.cpp1
-rw-r--r--src/devices/bus/svi3x8/slot/sv805.h1
-rw-r--r--src/devices/bus/svi3x8/slot/sv806.cpp1
-rw-r--r--src/devices/bus/svi3x8/slot/sv806.h1
-rw-r--r--src/devices/bus/svi3x8/slot/sv807.cpp1
-rw-r--r--src/devices/bus/svi3x8/slot/sv807.h1
-rw-r--r--src/devices/bus/ti99_peb/evpc.cpp1
-rw-r--r--src/devices/bus/ti99_peb/evpc.h1
-rw-r--r--src/devices/bus/ti99_peb/horizon.cpp1
-rw-r--r--src/devices/bus/ti99_peb/horizon.h1
-rw-r--r--src/devices/bus/ti99_peb/hsgpl.cpp1
-rw-r--r--src/devices/bus/ti99_peb/hsgpl.h1
-rw-r--r--src/devices/bus/ti99_peb/memex.cpp1
-rw-r--r--src/devices/bus/ti99_peb/memex.h1
-rw-r--r--src/devices/bus/ti99_peb/myarcmem.cpp1
-rw-r--r--src/devices/bus/ti99_peb/myarcmem.h1
-rw-r--r--src/devices/bus/ti99_peb/pcode.cpp1
-rw-r--r--src/devices/bus/ti99_peb/pcode.h1
-rw-r--r--src/devices/bus/ti99_peb/samsmem.cpp1
-rw-r--r--src/devices/bus/ti99_peb/samsmem.h1
-rw-r--r--src/devices/bus/ti99_peb/spchsyn.cpp1
-rw-r--r--src/devices/bus/ti99_peb/spchsyn.h1
-rw-r--r--src/devices/bus/ti99_peb/ti_32kmem.h1
-rw-r--r--src/devices/bus/ti99_peb/ti_rs232.cpp1
-rw-r--r--src/devices/bus/ti99_peb/ti_rs232.h1
-rw-r--r--src/devices/bus/ti99_peb/tn_ide.h1
-rw-r--r--src/devices/bus/ti99_peb/tn_usbsm.cpp1
-rw-r--r--src/devices/bus/ti99_peb/tn_usbsm.h1
-rw-r--r--src/devices/bus/ti99x/998board.cpp1
-rw-r--r--src/devices/bus/ti99x/998board.h1
-rw-r--r--src/devices/bus/ti99x/genboard.cpp1
-rw-r--r--src/devices/bus/ti99x/genboard.h1
-rw-r--r--src/devices/bus/ti99x/gromport.cpp1
-rw-r--r--src/devices/bus/ti99x/gromport.h1
-rw-r--r--src/devices/bus/ti99x/handset.cpp1
-rw-r--r--src/devices/bus/ti99x/handset.h1
-rw-r--r--src/devices/bus/ti99x/joyport.cpp1
-rw-r--r--src/devices/bus/ti99x/joyport.h1
-rw-r--r--src/devices/bus/ti99x/mecmouse.cpp1
-rw-r--r--src/devices/bus/ti99x/mecmouse.h1
-rw-r--r--src/devices/bus/tiki100/8088.cpp1
-rw-r--r--src/devices/bus/tiki100/8088.h1
-rw-r--r--src/devices/bus/tiki100/exp.cpp1
-rw-r--r--src/devices/bus/tiki100/exp.h1
-rw-r--r--src/devices/bus/tiki100/hdc.cpp1
-rw-r--r--src/devices/bus/tiki100/hdc.h1
-rw-r--r--src/devices/bus/tvc/hbf.h1
-rw-r--r--src/devices/bus/vcs_ctrl/ctrl.cpp1
-rw-r--r--src/devices/bus/vcs_ctrl/ctrl.h1
-rw-r--r--src/devices/bus/vcs_ctrl/joybooster.cpp1
-rw-r--r--src/devices/bus/vcs_ctrl/joybooster.h1
-rw-r--r--src/devices/bus/vcs_ctrl/joystick.cpp1
-rw-r--r--src/devices/bus/vcs_ctrl/joystick.h1
-rw-r--r--src/devices/bus/vcs_ctrl/keypad.cpp1
-rw-r--r--src/devices/bus/vcs_ctrl/keypad.h1
-rw-r--r--src/devices/bus/vcs_ctrl/lightpen.cpp1
-rw-r--r--src/devices/bus/vcs_ctrl/lightpen.h1
-rw-r--r--src/devices/bus/vcs_ctrl/paddles.cpp1
-rw-r--r--src/devices/bus/vcs_ctrl/paddles.h1
-rw-r--r--src/devices/bus/vcs_ctrl/wheel.cpp1
-rw-r--r--src/devices/bus/vcs_ctrl/wheel.h1
-rw-r--r--src/devices/bus/vic10/exp.h1
-rw-r--r--src/devices/bus/vic10/std.cpp1
-rw-r--r--src/devices/bus/vic10/std.h1
-rw-r--r--src/devices/bus/vic20/4cga.cpp1
-rw-r--r--src/devices/bus/vic20/4cga.h1
-rw-r--r--src/devices/bus/vic20/exp.cpp1
-rw-r--r--src/devices/bus/vic20/exp.h1
-rw-r--r--src/devices/bus/vic20/fe3.cpp1
-rw-r--r--src/devices/bus/vic20/fe3.h1
-rw-r--r--src/devices/bus/vic20/megacart.cpp1
-rw-r--r--src/devices/bus/vic20/megacart.h1
-rw-r--r--src/devices/bus/vic20/speakeasy.cpp1
-rw-r--r--src/devices/bus/vic20/speakeasy.h1
-rw-r--r--src/devices/bus/vic20/std.cpp1
-rw-r--r--src/devices/bus/vic20/std.h1
-rw-r--r--src/devices/bus/vic20/user.cpp1
-rw-r--r--src/devices/bus/vic20/vic1010.cpp1
-rw-r--r--src/devices/bus/vic20/vic1010.h1
-rw-r--r--src/devices/bus/vic20/vic1011.cpp1
-rw-r--r--src/devices/bus/vic20/vic1110.cpp1
-rw-r--r--src/devices/bus/vic20/vic1110.h1
-rw-r--r--src/devices/bus/vic20/vic1111.cpp1
-rw-r--r--src/devices/bus/vic20/vic1111.h1
-rw-r--r--src/devices/bus/vic20/vic1112.cpp1
-rw-r--r--src/devices/bus/vic20/vic1112.h1
-rw-r--r--src/devices/bus/vic20/vic1210.cpp1
-rw-r--r--src/devices/bus/vic20/vic1210.h1
-rw-r--r--src/devices/bus/vic20/videopak.cpp1
-rw-r--r--src/devices/bus/vic20/videopak.h1
-rw-r--r--src/devices/bus/vidbrain/exp.cpp1
-rw-r--r--src/devices/bus/vidbrain/exp.h1
-rw-r--r--src/devices/bus/vidbrain/money_minder.cpp1
-rw-r--r--src/devices/bus/vidbrain/money_minder.h1
-rw-r--r--src/devices/bus/vidbrain/std.cpp1
-rw-r--r--src/devices/bus/vidbrain/std.h1
-rw-r--r--src/devices/bus/vidbrain/timeshare.cpp1
-rw-r--r--src/devices/bus/vidbrain/timeshare.h1
-rw-r--r--src/devices/bus/vip/byteio.cpp1
-rw-r--r--src/devices/bus/vip/byteio.h1
-rw-r--r--src/devices/bus/vip/exp.cpp1
-rw-r--r--src/devices/bus/vip/exp.h1
-rw-r--r--src/devices/bus/vip/vp550.cpp1
-rw-r--r--src/devices/bus/vip/vp550.h1
-rw-r--r--src/devices/bus/vip/vp570.cpp1
-rw-r--r--src/devices/bus/vip/vp570.h1
-rw-r--r--src/devices/bus/vip/vp575.cpp1
-rw-r--r--src/devices/bus/vip/vp575.h1
-rw-r--r--src/devices/bus/vip/vp585.cpp1
-rw-r--r--src/devices/bus/vip/vp585.h1
-rw-r--r--src/devices/bus/vip/vp590.cpp1
-rw-r--r--src/devices/bus/vip/vp590.h1
-rw-r--r--src/devices/bus/vip/vp595.cpp1
-rw-r--r--src/devices/bus/vip/vp595.h1
-rw-r--r--src/devices/bus/vip/vp620.cpp1
-rw-r--r--src/devices/bus/vip/vp620.h1
-rw-r--r--src/devices/bus/vip/vp700.cpp1
-rw-r--r--src/devices/bus/vip/vp700.h1
-rw-r--r--src/devices/bus/vme/vme.h1
-rw-r--r--src/devices/bus/vme/vme_fccpu20.h1
-rw-r--r--src/devices/bus/vtech/ioexp/carts.cpp1
-rw-r--r--src/devices/bus/vtech/ioexp/carts.h1
-rw-r--r--src/devices/bus/vtech/ioexp/ioexp.cpp1
-rw-r--r--src/devices/bus/vtech/ioexp/ioexp.h1
-rw-r--r--src/devices/bus/vtech/ioexp/joystick.cpp1
-rw-r--r--src/devices/bus/vtech/ioexp/joystick.h1
-rw-r--r--src/devices/bus/vtech/ioexp/printer.cpp1
-rw-r--r--src/devices/bus/vtech/ioexp/printer.h1
-rw-r--r--src/devices/bus/vtech/memexp/carts.cpp1
-rw-r--r--src/devices/bus/vtech/memexp/carts.h1
-rw-r--r--src/devices/bus/vtech/memexp/floppy.cpp1
-rw-r--r--src/devices/bus/vtech/memexp/floppy.h1
-rw-r--r--src/devices/bus/vtech/memexp/memexp.cpp1
-rw-r--r--src/devices/bus/vtech/memexp/memexp.h1
-rw-r--r--src/devices/bus/vtech/memexp/memory.cpp1
-rw-r--r--src/devices/bus/vtech/memexp/memory.h1
-rw-r--r--src/devices/bus/vtech/memexp/rs232.cpp1
-rw-r--r--src/devices/bus/vtech/memexp/rs232.h1
-rw-r--r--src/devices/bus/vtech/memexp/rtty.cpp1
-rw-r--r--src/devices/bus/vtech/memexp/rtty.h1
-rw-r--r--src/devices/bus/vtech/memexp/wordpro.cpp1
-rw-r--r--src/devices/bus/vtech/memexp/wordpro.h1
-rw-r--r--src/devices/bus/wangpc/emb.cpp1
-rw-r--r--src/devices/bus/wangpc/emb.h1
-rw-r--r--src/devices/bus/wangpc/lic.cpp1
-rw-r--r--src/devices/bus/wangpc/lic.h1
-rw-r--r--src/devices/bus/wangpc/lvc.cpp1
-rw-r--r--src/devices/bus/wangpc/lvc.h1
-rw-r--r--src/devices/bus/wangpc/mcc.cpp1
-rw-r--r--src/devices/bus/wangpc/mcc.h1
-rw-r--r--src/devices/bus/wangpc/mvc.cpp1
-rw-r--r--src/devices/bus/wangpc/mvc.h1
-rw-r--r--src/devices/bus/wangpc/rtc.cpp1
-rw-r--r--src/devices/bus/wangpc/rtc.h1
-rw-r--r--src/devices/bus/wangpc/tig.cpp1
-rw-r--r--src/devices/bus/wangpc/tig.h1
-rw-r--r--src/devices/bus/wangpc/wangpc.cpp1
-rw-r--r--src/devices/bus/wangpc/wangpc.h1
-rw-r--r--src/devices/bus/wangpc/wdc.cpp1
-rw-r--r--src/devices/bus/wangpc/wdc.h1
-rw-r--r--src/devices/bus/x68k/x68k_neptunex.h1
-rw-r--r--src/devices/bus/x68k/x68k_scsiext.h1
-rw-r--r--src/devices/bus/x68k/x68kexp.h1
-rw-r--r--src/devices/bus/z88/flash.h1
-rw-r--r--src/devices/bus/z88/ram.h1
-rw-r--r--src/devices/bus/z88/rom.h1
-rw-r--r--src/devices/cpu/8x300/8x300.cpp1
-rw-r--r--src/devices/cpu/8x300/8x300.h1
-rw-r--r--src/devices/cpu/alto2/a2curt.cpp1
-rw-r--r--src/devices/cpu/alto2/a2dht.cpp1
-rw-r--r--src/devices/cpu/alto2/a2disk.cpp1
-rw-r--r--src/devices/cpu/alto2/a2disp.cpp1
-rw-r--r--src/devices/cpu/alto2/a2dvt.cpp1
-rw-r--r--src/devices/cpu/alto2/a2dwt.cpp1
-rw-r--r--src/devices/cpu/alto2/a2emu.cpp1
-rw-r--r--src/devices/cpu/alto2/a2ether.cpp1
-rw-r--r--src/devices/cpu/alto2/a2hw.cpp1
-rw-r--r--src/devices/cpu/alto2/a2kbd.cpp1
-rw-r--r--src/devices/cpu/alto2/a2ksec.cpp1
-rw-r--r--src/devices/cpu/alto2/a2kwd.cpp1
-rw-r--r--src/devices/cpu/alto2/a2mem.cpp1
-rw-r--r--src/devices/cpu/alto2/a2mouse.cpp1
-rw-r--r--src/devices/cpu/alto2/a2mrt.cpp1
-rw-r--r--src/devices/cpu/alto2/a2part.cpp1
-rw-r--r--src/devices/cpu/alto2/a2ram.cpp1
-rw-r--r--src/devices/cpu/alto2/a2roms.cpp1
-rw-r--r--src/devices/cpu/alto2/a2roms.h1
-rw-r--r--src/devices/cpu/alto2/alto2cpu.cpp1
-rw-r--r--src/devices/cpu/alto2/alto2cpu.h1
-rw-r--r--src/devices/cpu/alto2/alto2dsm.cpp1
-rw-r--r--src/devices/cpu/amis2000/amis2000.cpp1
-rw-r--r--src/devices/cpu/amis2000/amis2000.h1
-rw-r--r--src/devices/cpu/amis2000/amis2000op.cpp1
-rw-r--r--src/devices/cpu/arm7/lpc210x.cpp1
-rw-r--r--src/devices/cpu/arm7/lpc210x.h1
-rw-r--r--src/devices/cpu/dsp56k/dsp56dsm.cpp1
-rw-r--r--src/devices/cpu/dsp56k/dsp56k.cpp1
-rw-r--r--src/devices/cpu/dsp56k/dsp56k.h1
-rw-r--r--src/devices/cpu/dsp56k/dsp56mem.cpp1
-rw-r--r--src/devices/cpu/dsp56k/dsp56pcu.cpp1
-rw-r--r--src/devices/cpu/dsp56k/inst.cpp1
-rw-r--r--src/devices/cpu/dsp56k/opcode.cpp1
-rw-r--r--src/devices/cpu/dsp56k/opcode.h1
-rw-r--r--src/devices/cpu/dsp56k/pmove.cpp1
-rw-r--r--src/devices/cpu/dsp56k/pmove.h1
-rw-r--r--src/devices/cpu/dsp56k/tables.cpp1
-rw-r--r--src/devices/cpu/dsp56k/tables.h1
-rw-r--r--src/devices/cpu/e0c6200/e0c6200.cpp1
-rw-r--r--src/devices/cpu/e0c6200/e0c6200.h1
-rw-r--r--src/devices/cpu/e0c6200/e0c6200op.cpp1
-rw-r--r--src/devices/cpu/e0c6200/e0c6s46.cpp1
-rw-r--r--src/devices/cpu/es5510/es5510.h1
-rw-r--r--src/devices/cpu/esrip/esrip.h1
-rw-r--r--src/devices/cpu/h6280/h6280.cpp1
-rw-r--r--src/devices/cpu/h6280/h6280.h1
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.cpp1
-rw-r--r--src/devices/cpu/hmcs40/hmcs40.h1
-rw-r--r--src/devices/cpu/hmcs40/hmcs40op.cpp1
-rw-r--r--src/devices/cpu/i8089/i8089.cpp1
-rw-r--r--src/devices/cpu/i8089/i8089.h1
-rw-r--r--src/devices/cpu/i8089/i8089_channel.h1
-rw-r--r--src/devices/cpu/i86/i186.cpp1
-rw-r--r--src/devices/cpu/i86/i186.h1
-rw-r--r--src/devices/cpu/i86/i286.cpp1
-rw-r--r--src/devices/cpu/i86/i86.h1
-rw-r--r--src/devices/cpu/melps4/m58846.cpp1
-rw-r--r--src/devices/cpu/melps4/melps4.cpp1
-rw-r--r--src/devices/cpu/melps4/melps4.h1
-rw-r--r--src/devices/cpu/melps4/melps4op.cpp1
-rw-r--r--src/devices/cpu/psx/dma.h1
-rw-r--r--src/devices/cpu/psx/gte.h1
-rw-r--r--src/devices/cpu/psx/irq.cpp1
-rw-r--r--src/devices/cpu/psx/irq.h1
-rw-r--r--src/devices/cpu/psx/mdec.h1
-rw-r--r--src/devices/cpu/psx/psx.h1
-rw-r--r--src/devices/cpu/psx/rcnt.cpp1
-rw-r--r--src/devices/cpu/psx/rcnt.h1
-rw-r--r--src/devices/cpu/psx/sio.cpp1
-rw-r--r--src/devices/cpu/psx/sio.h1
-rw-r--r--src/devices/cpu/rsp/rsp.h1
-rw-r--r--src/devices/cpu/sm510/kb1013vk1-2core.cpp1
-rw-r--r--src/devices/cpu/sm510/kb1013vk1-2op.cpp1
-rw-r--r--src/devices/cpu/sm510/sm500core.cpp1
-rw-r--r--src/devices/cpu/sm510/sm500op.cpp1
-rw-r--r--src/devices/cpu/sm510/sm510.cpp1
-rw-r--r--src/devices/cpu/sm510/sm510.h1
-rw-r--r--src/devices/cpu/sm510/sm510core.cpp1
-rw-r--r--src/devices/cpu/sm510/sm510op.cpp1
-rw-r--r--src/devices/cpu/sm510/sm511core.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms0270.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms0970.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms0980.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms1000.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms1100.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms1400.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms1k_base.cpp1
-rw-r--r--src/devices/cpu/tms1000/tms1k_base.h1
-rw-r--r--src/devices/cpu/tms1000/tp0320.cpp1
-rw-r--r--src/devices/cpu/tms7000/tms7000.cpp1
-rw-r--r--src/devices/cpu/tms7000/tms7000.h1
-rw-r--r--src/devices/cpu/tms7000/tms7000op.cpp1
-rw-r--r--src/devices/cpu/tms9900/ti990_10.cpp1
-rw-r--r--src/devices/cpu/tms9900/ti990_10.h1
-rw-r--r--src/devices/cpu/tms9900/tms9900.cpp1
-rw-r--r--src/devices/cpu/tms9900/tms9900.h1
-rw-r--r--src/devices/cpu/tms9900/tms9980a.cpp1
-rw-r--r--src/devices/cpu/tms9900/tms9980a.h1
-rw-r--r--src/devices/cpu/tms9900/tms9995.cpp1
-rw-r--r--src/devices/cpu/tms9900/tms9995.h1
-rw-r--r--src/devices/cpu/ucom4/ucom4.cpp1
-rw-r--r--src/devices/cpu/ucom4/ucom4.h1
-rw-r--r--src/devices/cpu/ucom4/ucom4op.cpp1
-rw-r--r--src/devices/cpu/z80/kl5c80a12.cpp1
-rw-r--r--src/devices/cpu/z80/kl5c80a12.h1
-rw-r--r--src/devices/cpu/z80/tmpz84c011.cpp1
-rw-r--r--src/devices/cpu/z80/tmpz84c011.h1
-rw-r--r--src/devices/cpu/z80/tmpz84c015.cpp1
-rw-r--r--src/devices/cpu/z80/tmpz84c015.h1
-rw-r--r--src/devices/imagedev/mfmhd.h1
-rw-r--r--src/devices/machine/40105.cpp1
-rw-r--r--src/devices/machine/40105.h1
-rw-r--r--src/devices/machine/64h156.cpp1
-rw-r--r--src/devices/machine/64h156.h1
-rw-r--r--src/devices/machine/6522via.h1
-rw-r--r--src/devices/machine/6532riot.h1
-rw-r--r--src/devices/machine/68153bim.h1
-rw-r--r--src/devices/machine/6821pia.h1
-rw-r--r--src/devices/machine/68230pit.cpp1
-rw-r--r--src/devices/machine/68230pit.h1
-rw-r--r--src/devices/machine/68307.cpp1
-rw-r--r--src/devices/machine/68307.h1
-rw-r--r--src/devices/machine/68340.cpp1
-rw-r--r--src/devices/machine/68340.h1
-rw-r--r--src/devices/machine/6840ptm.h1
-rw-r--r--src/devices/machine/6850acia.h1
-rw-r--r--src/devices/machine/68561mpcc.h1
-rw-r--r--src/devices/machine/7200fifo.cpp1
-rw-r--r--src/devices/machine/7200fifo.h1
-rw-r--r--src/devices/machine/7400.h1
-rw-r--r--src/devices/machine/7404.h1
-rw-r--r--src/devices/machine/74123.h1
-rw-r--r--src/devices/machine/74153.cpp1
-rw-r--r--src/devices/machine/74153.h1
-rw-r--r--src/devices/machine/74157.h1
-rw-r--r--src/devices/machine/74161.h1
-rw-r--r--src/devices/machine/74175.h1
-rw-r--r--src/devices/machine/74181.cpp1
-rw-r--r--src/devices/machine/74181.h1
-rw-r--r--src/devices/machine/7474.h1
-rw-r--r--src/devices/machine/8042kbdc.cpp1
-rw-r--r--src/devices/machine/8042kbdc.h1
-rw-r--r--src/devices/machine/82s129.h1
-rw-r--r--src/devices/machine/8364_paula.cpp1
-rw-r--r--src/devices/machine/8364_paula.h1
-rw-r--r--src/devices/machine/adc0808.h1
-rw-r--r--src/devices/machine/adc083x.h1
-rw-r--r--src/devices/machine/akiko.cpp1
-rw-r--r--src/devices/machine/akiko.h1
-rw-r--r--src/devices/machine/am2847.cpp1
-rw-r--r--src/devices/machine/am2847.h1
-rw-r--r--src/devices/machine/am9517a.cpp1
-rw-r--r--src/devices/machine/am9517a.h1
-rw-r--r--src/devices/machine/amigafdc.h1
-rw-r--r--src/devices/machine/appldriv.h1
-rw-r--r--src/devices/machine/applefdc.cpp1
-rw-r--r--src/devices/machine/applefdc.h1
-rw-r--r--src/devices/machine/at29x.cpp1
-rw-r--r--src/devices/machine/at29x.h1
-rw-r--r--src/devices/machine/at45dbxx.cpp1
-rw-r--r--src/devices/machine/at45dbxx.h1
-rw-r--r--src/devices/machine/at_keybc.h1
-rw-r--r--src/devices/machine/atadev.cpp1
-rw-r--r--src/devices/machine/atadev.h1
-rw-r--r--src/devices/machine/ataflash.cpp1
-rw-r--r--src/devices/machine/atahle.cpp1
-rw-r--r--src/devices/machine/atapicdr.cpp1
-rw-r--r--src/devices/machine/atapihle.cpp1
-rw-r--r--src/devices/machine/autoconfig.cpp1
-rw-r--r--src/devices/machine/autoconfig.h1
-rw-r--r--src/devices/machine/bankdev.cpp1
-rw-r--r--src/devices/machine/bankdev.h1
-rw-r--r--src/devices/machine/cdp1852.cpp1
-rw-r--r--src/devices/machine/cdp1852.h1
-rw-r--r--src/devices/machine/cdp1871.cpp1
-rw-r--r--src/devices/machine/cdp1871.h1
-rw-r--r--src/devices/machine/cdp1879.cpp1
-rw-r--r--src/devices/machine/cdp1879.h1
-rw-r--r--src/devices/machine/clock.cpp1
-rw-r--r--src/devices/machine/clock.h1
-rw-r--r--src/devices/machine/com8116.cpp1
-rw-r--r--src/devices/machine/com8116.h1
-rw-r--r--src/devices/machine/corvushd.h1
-rw-r--r--src/devices/machine/cr511b.cpp1
-rw-r--r--src/devices/machine/cr511b.h1
-rw-r--r--src/devices/machine/cr589.cpp1
-rw-r--r--src/devices/machine/cs4031.h1
-rw-r--r--src/devices/machine/cs8221.h1
-rw-r--r--src/devices/machine/diablo_hd.cpp1
-rw-r--r--src/devices/machine/diablo_hd.h1
-rw-r--r--src/devices/machine/dm9334.h1
-rw-r--r--src/devices/machine/dmac.cpp1
-rw-r--r--src/devices/machine/dmac.h1
-rw-r--r--src/devices/machine/dp8390.h1
-rw-r--r--src/devices/machine/ds1204.h1
-rw-r--r--src/devices/machine/ds128x.cpp1
-rw-r--r--src/devices/machine/ds1302.cpp1
-rw-r--r--src/devices/machine/ds1302.h1
-rw-r--r--src/devices/machine/ds1315.cpp1
-rw-r--r--src/devices/machine/ds1315.h1
-rw-r--r--src/devices/machine/ds1386.cpp1
-rw-r--r--src/devices/machine/ds1386.h1
-rw-r--r--src/devices/machine/ds2401.h1
-rw-r--r--src/devices/machine/ds2404.h1
-rw-r--r--src/devices/machine/ds75160a.cpp1
-rw-r--r--src/devices/machine/ds75160a.h1
-rw-r--r--src/devices/machine/ds75161a.cpp1
-rw-r--r--src/devices/machine/ds75161a.h1
-rw-r--r--src/devices/machine/f3853.h1
-rw-r--r--src/devices/machine/fdc37c665gt.cpp1
-rw-r--r--src/devices/machine/fdc_pll.cpp1
-rw-r--r--src/devices/machine/fdc_pll.h1
-rw-r--r--src/devices/machine/fga002.cpp1
-rw-r--r--src/devices/machine/fga002.h1
-rw-r--r--src/devices/machine/gayle.cpp1
-rw-r--r--src/devices/machine/gayle.h1
-rw-r--r--src/devices/machine/gen_latch.h1
-rw-r--r--src/devices/machine/gt64xxx.cpp1
-rw-r--r--src/devices/machine/hd63450.cpp1
-rw-r--r--src/devices/machine/hd63450.h1
-rw-r--r--src/devices/machine/hd64610.cpp1
-rw-r--r--src/devices/machine/hd64610.h1
-rw-r--r--src/devices/machine/hdc92x4.h1
-rw-r--r--src/devices/machine/i6300esb.cpp1
-rw-r--r--src/devices/machine/i80130.cpp1
-rw-r--r--src/devices/machine/i80130.h1
-rw-r--r--src/devices/machine/i8155.h1
-rw-r--r--src/devices/machine/i8212.h1
-rw-r--r--src/devices/machine/i8214.h1
-rw-r--r--src/devices/machine/i8243.h1
-rw-r--r--src/devices/machine/i82439hx.cpp1
-rw-r--r--src/devices/machine/i82439tx.cpp1
-rw-r--r--src/devices/machine/i82541.cpp1
-rw-r--r--src/devices/machine/i8255.cpp1
-rw-r--r--src/devices/machine/i8255.h1
-rw-r--r--src/devices/machine/i8257.cpp1
-rw-r--r--src/devices/machine/i8257.h1
-rw-r--r--src/devices/machine/i8271.cpp1
-rw-r--r--src/devices/machine/i8271.h1
-rw-r--r--src/devices/machine/i8279.cpp1
-rw-r--r--src/devices/machine/i8279.h1
-rw-r--r--src/devices/machine/i82875p.cpp1
-rw-r--r--src/devices/machine/i8355.h1
-rw-r--r--src/devices/machine/idectrl.cpp1
-rw-r--r--src/devices/machine/idehd.cpp1
-rw-r--r--src/devices/machine/im6402.cpp1
-rw-r--r--src/devices/machine/im6402.h1
-rw-r--r--src/devices/machine/input_merger.cpp1
-rw-r--r--src/devices/machine/input_merger.h1
-rw-r--r--src/devices/machine/ins8154.h1
-rw-r--r--src/devices/machine/ins8250.cpp1
-rw-r--r--src/devices/machine/ins8250.h1
-rw-r--r--src/devices/machine/jvsdev.cpp1
-rw-r--r--src/devices/machine/jvsdev.h1
-rw-r--r--src/devices/machine/jvshost.cpp1
-rw-r--r--src/devices/machine/jvshost.h1
-rw-r--r--src/devices/machine/k033906.h1
-rw-r--r--src/devices/machine/k056230.h1
-rw-r--r--src/devices/machine/kb3600.cpp1
-rw-r--r--src/devices/machine/kb3600.h1
-rw-r--r--src/devices/machine/keyboard.cpp1
-rw-r--r--src/devices/machine/keyboard.h1
-rw-r--r--src/devices/machine/legscsi.cpp1
-rw-r--r--src/devices/machine/lh5810.h1
-rw-r--r--src/devices/machine/linflash.cpp1
-rw-r--r--src/devices/machine/linflash.h1
-rw-r--r--src/devices/machine/lpc-acpi.cpp1
-rw-r--r--src/devices/machine/lpc-pit.cpp1
-rw-r--r--src/devices/machine/lpc-rtc.cpp1
-rw-r--r--src/devices/machine/lpc.cpp1
-rw-r--r--src/devices/machine/lpc.h1
-rw-r--r--src/devices/machine/mb8421.cpp1
-rw-r--r--src/devices/machine/mb8421.h1
-rw-r--r--src/devices/machine/mb89371.cpp1
-rw-r--r--src/devices/machine/mb89371.h1
-rw-r--r--src/devices/machine/mc146818.cpp1
-rw-r--r--src/devices/machine/mc146818.h1
-rw-r--r--src/devices/machine/mc2661.cpp1
-rw-r--r--src/devices/machine/mc2661.h1
-rw-r--r--src/devices/machine/mc6852.cpp1
-rw-r--r--src/devices/machine/mc6852.h1
-rw-r--r--src/devices/machine/mc68901.h1
-rw-r--r--src/devices/machine/mccs1850.cpp1
-rw-r--r--src/devices/machine/mccs1850.h1
-rw-r--r--src/devices/machine/mcf5206e.h1
-rw-r--r--src/devices/machine/microtch.cpp1
-rw-r--r--src/devices/machine/microtch.h1
-rw-r--r--src/devices/machine/mm58167.cpp1
-rw-r--r--src/devices/machine/mm58167.h1
-rw-r--r--src/devices/machine/mm74c922.cpp1
-rw-r--r--src/devices/machine/mm74c922.h1
-rw-r--r--src/devices/machine/mos6526.cpp1
-rw-r--r--src/devices/machine/mos6526.h1
-rw-r--r--src/devices/machine/mos6529.cpp1
-rw-r--r--src/devices/machine/mos6529.h1
-rw-r--r--src/devices/machine/mos6530n.cpp1
-rw-r--r--src/devices/machine/mos6530n.h1
-rw-r--r--src/devices/machine/mos6551.cpp1
-rw-r--r--src/devices/machine/mos6551.h1
-rw-r--r--src/devices/machine/mos6702.cpp1
-rw-r--r--src/devices/machine/mos6702.h1
-rw-r--r--src/devices/machine/mos8706.cpp1
-rw-r--r--src/devices/machine/mos8706.h1
-rw-r--r--src/devices/machine/mos8722.cpp1
-rw-r--r--src/devices/machine/mos8722.h1
-rw-r--r--src/devices/machine/mos8726.cpp1
-rw-r--r--src/devices/machine/mos8726.h1
-rw-r--r--src/devices/machine/mpu401.cpp1
-rw-r--r--src/devices/machine/mpu401.h1
-rw-r--r--src/devices/machine/msm5832.cpp1
-rw-r--r--src/devices/machine/msm5832.h1
-rw-r--r--src/devices/machine/msm58321.cpp1
-rw-r--r--src/devices/machine/msm58321.h1
-rw-r--r--src/devices/machine/msm6242.h1
-rw-r--r--src/devices/machine/netlist.h1
-rw-r--r--src/devices/machine/nmc9306.h1
-rw-r--r--src/devices/machine/nsc810.cpp1
-rw-r--r--src/devices/machine/nsc810.h1
-rw-r--r--src/devices/machine/nscsi_bus.cpp1
-rw-r--r--src/devices/machine/nscsi_bus.h1
-rw-r--r--src/devices/machine/nscsi_cb.cpp1
-rw-r--r--src/devices/machine/nscsi_cb.h1
-rw-r--r--src/devices/machine/nscsi_cd.cpp1
-rw-r--r--src/devices/machine/nscsi_hd.cpp1
-rw-r--r--src/devices/machine/nscsi_s1410.cpp1
-rw-r--r--src/devices/machine/pc_fdc.h1
-rw-r--r--src/devices/machine/pccard.cpp1
-rw-r--r--src/devices/machine/pccard.h1
-rw-r--r--src/devices/machine/pcf8593.cpp1
-rw-r--r--src/devices/machine/pcf8593.h1
-rw-r--r--src/devices/machine/pci-apic.cpp1
-rw-r--r--src/devices/machine/pci-ide.cpp1
-rw-r--r--src/devices/machine/pci-sata.cpp1
-rw-r--r--src/devices/machine/pci-smbus.cpp1
-rw-r--r--src/devices/machine/pci-usb.cpp1
-rw-r--r--src/devices/machine/pci.cpp1
-rw-r--r--src/devices/machine/pci.h1
-rw-r--r--src/devices/machine/pci9050.cpp1
-rw-r--r--src/devices/machine/pckeybrd.h1
-rw-r--r--src/devices/machine/pdc.cpp1
-rw-r--r--src/devices/machine/pdc.h1
-rw-r--r--src/devices/machine/pla.cpp1
-rw-r--r--src/devices/machine/pla.h1
-rw-r--r--src/devices/machine/rf5c296.cpp1
-rw-r--r--src/devices/machine/rp5c01.cpp1
-rw-r--r--src/devices/machine/rp5c01.h1
-rw-r--r--src/devices/machine/rp5c15.cpp1
-rw-r--r--src/devices/machine/rp5c15.h1
-rw-r--r--src/devices/machine/rtc4543.cpp1
-rw-r--r--src/devices/machine/rtc4543.h1
-rw-r--r--src/devices/machine/scnxx562.cpp1
-rw-r--r--src/devices/machine/scnxx562.h1
-rw-r--r--src/devices/machine/spchrom.h1
-rw-r--r--src/devices/machine/t10mmc.cpp1
-rw-r--r--src/devices/machine/t10sbc.cpp1
-rw-r--r--src/devices/machine/t10spc.cpp1
-rw-r--r--src/devices/machine/t10spc.h1
-rw-r--r--src/devices/machine/tc009xlvc.h1
-rw-r--r--src/devices/machine/terminal.cpp1
-rw-r--r--src/devices/machine/timekpr.h1
-rw-r--r--src/devices/machine/tms1024.cpp1
-rw-r--r--src/devices/machine/tms1024.h1
-rw-r--r--src/devices/machine/tms5501.cpp1
-rw-r--r--src/devices/machine/tms5501.h1
-rw-r--r--src/devices/machine/tms6100.cpp1
-rw-r--r--src/devices/machine/tms6100.h1
-rw-r--r--src/devices/machine/tms9901.h1
-rw-r--r--src/devices/machine/tms9902.cpp1
-rw-r--r--src/devices/machine/tms9902.h1
-rw-r--r--src/devices/machine/upd1990a.cpp1
-rw-r--r--src/devices/machine/upd1990a.h1
-rw-r--r--src/devices/machine/upd71071.h1
-rw-r--r--src/devices/machine/upd765.cpp1
-rw-r--r--src/devices/machine/upd765.h1
-rw-r--r--src/devices/machine/vrc4373.cpp1
-rw-r--r--src/devices/machine/vt82c496.cpp1
-rw-r--r--src/devices/machine/vt82c496.h1
-rw-r--r--src/devices/machine/vt83c461.cpp1
-rw-r--r--src/devices/machine/wd11c00_17.cpp1
-rw-r--r--src/devices/machine/wd11c00_17.h1
-rw-r--r--src/devices/machine/wd2010.cpp1
-rw-r--r--src/devices/machine/wd2010.h1
-rw-r--r--src/devices/machine/wd7600.cpp1
-rw-r--r--src/devices/machine/wd7600.h1
-rw-r--r--src/devices/machine/wd_fdc.cpp1
-rw-r--r--src/devices/machine/wd_fdc.h1
-rw-r--r--src/devices/machine/wozfdc.h1
-rw-r--r--src/devices/machine/x76f041.h1
-rw-r--r--src/devices/machine/x76f100.h1
-rw-r--r--src/devices/machine/z80dart.cpp1
-rw-r--r--src/devices/machine/z80dart.h1
-rw-r--r--src/devices/machine/z80scc.cpp1
-rw-r--r--src/devices/machine/z80scc.h1
-rw-r--r--src/devices/machine/z80sio.cpp1
-rw-r--r--src/devices/machine/z80sio.h1
-rw-r--r--src/devices/machine/z8536.h1
-rw-r--r--src/devices/sound/2203intf.cpp1
-rw-r--r--src/devices/sound/2203intf.h1
-rw-r--r--src/devices/sound/2608intf.cpp1
-rw-r--r--src/devices/sound/2608intf.h1
-rw-r--r--src/devices/sound/2610intf.cpp1
-rw-r--r--src/devices/sound/2610intf.h1
-rw-r--r--src/devices/sound/2612intf.cpp1
-rw-r--r--src/devices/sound/2612intf.h1
-rw-r--r--src/devices/sound/262intf.h1
-rw-r--r--src/devices/sound/3526intf.cpp1
-rw-r--r--src/devices/sound/3526intf.h1
-rw-r--r--src/devices/sound/3812intf.h1
-rw-r--r--src/devices/sound/8950intf.cpp1
-rw-r--r--src/devices/sound/8950intf.h1
-rw-r--r--src/devices/sound/ad1848.cpp1
-rw-r--r--src/devices/sound/ad1848.h1
-rw-r--r--src/devices/sound/ay8910.h1
-rw-r--r--src/devices/sound/cdp1863.cpp1
-rw-r--r--src/devices/sound/cdp1863.h1
-rw-r--r--src/devices/sound/cdp1864.cpp1
-rw-r--r--src/devices/sound/cdp1864.h1
-rw-r--r--src/devices/sound/cdp1869.h1
-rw-r--r--src/devices/sound/dac.cpp1
-rw-r--r--src/devices/sound/dac.h1
-rw-r--r--src/devices/sound/dac76.cpp1
-rw-r--r--src/devices/sound/dac76.h1
-rw-r--r--src/devices/sound/dave.cpp1
-rw-r--r--src/devices/sound/dave.h1
-rw-r--r--src/devices/sound/es1373.cpp1
-rw-r--r--src/devices/sound/esqpump.cpp1
-rw-r--r--src/devices/sound/esqpump.h1
-rw-r--r--src/devices/sound/lmc1992.cpp1
-rw-r--r--src/devices/sound/lmc1992.h1
-rw-r--r--src/devices/sound/mm5837.cpp1
-rw-r--r--src/devices/sound/mm5837.h1
-rw-r--r--src/devices/sound/mos6560.h1
-rw-r--r--src/devices/sound/mos6581.cpp1
-rw-r--r--src/devices/sound/mos6581.h1
-rw-r--r--src/devices/sound/mos7360.h1
-rw-r--r--src/devices/sound/pcd3311.cpp1
-rw-r--r--src/devices/sound/pcd3311.h1
-rw-r--r--src/devices/sound/pci-ac97.cpp1
-rw-r--r--src/devices/sound/sb0400.cpp1
-rw-r--r--src/devices/sound/t6721a.cpp1
-rw-r--r--src/devices/sound/t6721a.h1
-rw-r--r--src/devices/sound/tms5110.h1
-rw-r--r--src/devices/sound/tms5220.h1
-rw-r--r--src/devices/sound/upd1771.h1
-rw-r--r--src/devices/sound/volt_reg.cpp1
-rw-r--r--src/devices/sound/volt_reg.h1
-rw-r--r--src/devices/sound/ym2413.h1
-rw-r--r--src/devices/sound/ymf271.h1
-rw-r--r--src/devices/sound/ymf278b.h1
-rw-r--r--src/devices/sound/ymz280b.h1
-rw-r--r--src/devices/video/cdp1861.h1
-rw-r--r--src/devices/video/cdp1862.cpp1
-rw-r--r--src/devices/video/cdp1862.h1
-rw-r--r--src/devices/video/clgd542x.cpp1
-rw-r--r--src/devices/video/clgd542x.h1
-rw-r--r--src/devices/video/crt9007.h1
-rw-r--r--src/devices/video/crt9021.cpp1
-rw-r--r--src/devices/video/crt9021.h1
-rw-r--r--src/devices/video/crt9212.cpp1
-rw-r--r--src/devices/video/crt9212.h1
-rw-r--r--src/devices/video/crtc_ega.h1
-rw-r--r--src/devices/video/dm9368.cpp1
-rw-r--r--src/devices/video/dm9368.h1
-rw-r--r--src/devices/video/ef9340_1.cpp1
-rw-r--r--src/devices/video/ef9340_1.h1
-rw-r--r--src/devices/video/ef9369.cpp1
-rw-r--r--src/devices/video/ef9369.h1
-rw-r--r--src/devices/video/fixfreq.h1
-rw-r--r--src/devices/video/gb_lcd.h1
-rw-r--r--src/devices/video/gba_lcd.h1
-rw-r--r--src/devices/video/gf7600gs.cpp1
-rw-r--r--src/devices/video/hd44102.h1
-rw-r--r--src/devices/video/hd61830.cpp1
-rw-r--r--src/devices/video/hd61830.h1
-rw-r--r--src/devices/video/hd63484.h1
-rw-r--r--src/devices/video/hlcd0515.cpp1
-rw-r--r--src/devices/video/hlcd0515.h1
-rw-r--r--src/devices/video/huc6202.h1
-rw-r--r--src/devices/video/huc6260.h1
-rw-r--r--src/devices/video/huc6261.h1
-rw-r--r--src/devices/video/huc6270.h1
-rw-r--r--src/devices/video/i8244.h1
-rw-r--r--src/devices/video/i82730.cpp1
-rw-r--r--src/devices/video/i82730.h1
-rw-r--r--src/devices/video/i8275.cpp1
-rw-r--r--src/devices/video/i8275.h1
-rw-r--r--src/devices/video/mc6845.h1
-rw-r--r--src/devices/video/mga2064w.cpp1
-rw-r--r--src/devices/video/mos6566.cpp1
-rw-r--r--src/devices/video/mos6566.h1
-rw-r--r--src/devices/video/msm6255.cpp1
-rw-r--r--src/devices/video/msm6255.h1
-rw-r--r--src/devices/video/psx.h1
-rw-r--r--src/devices/video/ramdac.h1
-rw-r--r--src/devices/video/saa5050.cpp1
-rw-r--r--src/devices/video/saa5050.h1
-rw-r--r--src/devices/video/scn2674.cpp1
-rw-r--r--src/devices/video/scn2674.h1
-rw-r--r--src/devices/video/sed1330.h1
-rw-r--r--src/devices/video/tea1002.cpp1
-rw-r--r--src/devices/video/tea1002.h1
-rw-r--r--src/devices/video/tms9928a.h1
-rw-r--r--src/devices/video/upd3301.cpp1
-rw-r--r--src/devices/video/upd3301.h1
-rw-r--r--src/devices/video/upd7220.h1
-rw-r--r--src/devices/video/upd7227.h1
-rw-r--r--src/devices/video/voodoo_pci.cpp1
-rw-r--r--src/devices/video/zeus2.cpp1
-rw-r--r--src/devices/video/zeus2.h1
1610 files changed, 776 insertions, 834 deletions
diff --git a/src/devices/bus/a1bus/a1bus.h b/src/devices/bus/a1bus/a1bus.h
index f2d7763a879..38830940525 100644
--- a/src/devices/bus/a1bus/a1bus.h
+++ b/src/devices/bus/a1bus/a1bus.h
@@ -11,7 +11,6 @@
#ifndef __A1BUS_H__
#define __A1BUS_H__
-#include "emu.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
diff --git a/src/devices/bus/a1bus/a1cassette.cpp b/src/devices/bus/a1bus/a1cassette.cpp
index 2e322c688a1..f5802111084 100644
--- a/src/devices/bus/a1bus/a1cassette.cpp
+++ b/src/devices/bus/a1bus/a1cassette.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "a1cassette.h"
/***************************************************************************
diff --git a/src/devices/bus/a1bus/a1cffa.cpp b/src/devices/bus/a1bus/a1cffa.cpp
index c553d63a2af..ba6bc5935c1 100644
--- a/src/devices/bus/a1bus/a1cffa.cpp
+++ b/src/devices/bus/a1bus/a1cffa.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "a1cffa.h"
/***************************************************************************
diff --git a/src/devices/bus/a1bus/a1cffa.h b/src/devices/bus/a1bus/a1cffa.h
index 30b55fea2d9..1f7925df0f9 100644
--- a/src/devices/bus/a1bus/a1cffa.h
+++ b/src/devices/bus/a1bus/a1cffa.h
@@ -11,7 +11,6 @@
#ifndef __A1BUS_CFFA__
#define __A1BUS_CFFA__
-#include "emu.h"
#include "a1bus.h"
#include "machine/ataintf.h"
diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp
index d4decaeae92..fb392196652 100644
--- a/src/devices/bus/a2bus/a2alfam2.cpp
+++ b/src/devices/bus/a2bus/a2alfam2.cpp
@@ -9,6 +9,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2alfam2.h"
#include "sound/sn76496.h"
diff --git a/src/devices/bus/a2bus/a2alfam2.h b/src/devices/bus/a2bus/a2alfam2.h
index 7aa17be0263..b693ebb6a3f 100644
--- a/src/devices/bus/a2bus/a2alfam2.h
+++ b/src/devices/bus/a2bus/a2alfam2.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_ALFAM2__
#define __A2BUS_ALFAM2__
-#include "emu.h"
#include "a2bus.h"
#include "sound/sn76496.h"
diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp
index 9fe268dbabd..5aefeb35a4f 100644
--- a/src/devices/bus/a2bus/a2applicard.cpp
+++ b/src/devices/bus/a2bus/a2applicard.cpp
@@ -11,6 +11,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2applicard.h"
#include "cpu/z80/z80.h"
#include "machine/z80ctc.h"
diff --git a/src/devices/bus/a2bus/a2applicard.h b/src/devices/bus/a2bus/a2applicard.h
index 610353c71b2..89df1bf188e 100644
--- a/src/devices/bus/a2bus/a2applicard.h
+++ b/src/devices/bus/a2bus/a2applicard.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_APPLICARD__
#define __A2BUS_APPLICARD__
-#include "emu.h"
#include "a2bus.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2arcadebd.h b/src/devices/bus/a2bus/a2arcadebd.h
index 38fa21902a5..a57894e5830 100644
--- a/src/devices/bus/a2bus/a2arcadebd.h
+++ b/src/devices/bus/a2bus/a2arcadebd.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_ARCADEBOARD__
#define __A2BUS_ARCADEBOARD__
-#include "emu.h"
#include "a2bus.h"
#include "video/tms9928a.h"
#include "sound/ay8910.h"
diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h
index 19c70b091f8..16433f5b814 100644
--- a/src/devices/bus/a2bus/a2bus.h
+++ b/src/devices/bus/a2bus/a2bus.h
@@ -13,7 +13,6 @@
#ifndef __A2BUS_H__
#define __A2BUS_H__
-#include "emu.h"
// /INH special addresses
#define INH_START_INVALID 0xffff;
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp
index 79420fff9d3..e8f6cb5087d 100644
--- a/src/devices/bus/a2bus/a2cffa.cpp
+++ b/src/devices/bus/a2bus/a2cffa.cpp
@@ -11,6 +11,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2cffa.h"
#include "machine/ataintf.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/bus/a2bus/a2cffa.h b/src/devices/bus/a2bus/a2cffa.h
index d5713ff254f..0c7832bbb93 100644
--- a/src/devices/bus/a2bus/a2cffa.h
+++ b/src/devices/bus/a2bus/a2cffa.h
@@ -12,7 +12,6 @@
#ifndef __A2BUS_CFFA2__
#define __A2BUS_CFFA2__
-#include "emu.h"
#include "a2bus.h"
#include "machine/ataintf.h"
diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp
index 32d86cdc091..bcb4a554d02 100644
--- a/src/devices/bus/a2bus/a2corvus.cpp
+++ b/src/devices/bus/a2bus/a2corvus.cpp
@@ -40,6 +40,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2corvus.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/bus/a2bus/a2corvus.h b/src/devices/bus/a2bus/a2corvus.h
index 2d6a0042637..a221ef51d45 100644
--- a/src/devices/bus/a2bus/a2corvus.h
+++ b/src/devices/bus/a2bus/a2corvus.h
@@ -12,7 +12,6 @@
#ifndef __A2BUS_CORVUS__
#define __A2BUS_CORVUS__
-#include "emu.h"
#include "a2bus.h"
#include "machine/corvushd.h"
diff --git a/src/devices/bus/a2bus/a2diskii.h b/src/devices/bus/a2bus/a2diskii.h
index 622369e25fc..56b4c5dd1f5 100644
--- a/src/devices/bus/a2bus/a2diskii.h
+++ b/src/devices/bus/a2bus/a2diskii.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_DISKII__
#define __A2BUS_DISKII__
-#include "emu.h"
#include "a2bus.h"
#include "machine/applefdc.h"
diff --git a/src/devices/bus/a2bus/a2diskiing.h b/src/devices/bus/a2bus/a2diskiing.h
index 164476fe381..76e16818700 100644
--- a/src/devices/bus/a2bus/a2diskiing.h
+++ b/src/devices/bus/a2bus/a2diskiing.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_DISKIING__
#define __A2BUS_DISKIING__
-#include "emu.h"
#include "a2bus.h"
#include "imagedev/floppy.h"
#include "formats/flopimg.h"
diff --git a/src/devices/bus/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp
index 71eee7cea0b..76629c1b9f0 100644
--- a/src/devices/bus/a2bus/a2dx1.cpp
+++ b/src/devices/bus/a2bus/a2dx1.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2dx1.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/bus/a2bus/a2dx1.h b/src/devices/bus/a2bus/a2dx1.h
index 1f68489ce52..a5c60a19ffa 100644
--- a/src/devices/bus/a2bus/a2dx1.h
+++ b/src/devices/bus/a2bus/a2dx1.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_DX1__
#define __A2BUS_DX1__
-#include "emu.h"
#include "a2bus.h"
#include "sound/dac.h"
diff --git a/src/devices/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h
index f040ea56fa6..e697ae17844 100644
--- a/src/devices/bus/a2bus/a2eauxslot.h
+++ b/src/devices/bus/a2bus/a2eauxslot.h
@@ -13,7 +13,6 @@
#ifndef __A2EAUXSLOT_H__
#define __A2EAUXSLOT_H__
-#include "emu.h"
#include "a2bus.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp
index b309e265a07..698138dff84 100644
--- a/src/devices/bus/a2bus/a2echoii.cpp
+++ b/src/devices/bus/a2bus/a2echoii.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2echoii.h"
#include "sound/tms5220.h"
diff --git a/src/devices/bus/a2bus/a2echoii.h b/src/devices/bus/a2bus/a2echoii.h
index a148bded238..2dcdf849797 100644
--- a/src/devices/bus/a2bus/a2echoii.h
+++ b/src/devices/bus/a2bus/a2echoii.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_ECHOII__
#define __A2BUS_ECHOII__
-#include "emu.h"
#include "a2bus.h"
#include "sound/tms5220.h"
diff --git a/src/devices/bus/a2bus/a2eext80col.h b/src/devices/bus/a2bus/a2eext80col.h
index 2d6958c3639..09762dce2cc 100644
--- a/src/devices/bus/a2bus/a2eext80col.h
+++ b/src/devices/bus/a2bus/a2eext80col.h
@@ -11,7 +11,6 @@
#ifndef __A2EAUX_EXT80COL__
#define __A2EAUX_EXT80COL__
-#include "emu.h"
#include "a2eauxslot.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2eramworks3.h b/src/devices/bus/a2bus/a2eramworks3.h
index c5b2a7e04f1..75c8872d1cb 100644
--- a/src/devices/bus/a2bus/a2eramworks3.h
+++ b/src/devices/bus/a2bus/a2eramworks3.h
@@ -11,7 +11,6 @@
#ifndef __A2EAUX_RAMWORKS3__
#define __A2EAUX_RAMWORKS3__
-#include "emu.h"
#include "a2eauxslot.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2estd80col.h b/src/devices/bus/a2bus/a2estd80col.h
index 420b7334a4f..bd483863b1d 100644
--- a/src/devices/bus/a2bus/a2estd80col.h
+++ b/src/devices/bus/a2bus/a2estd80col.h
@@ -11,7 +11,6 @@
#ifndef __A2EAUX_STD80COL__
#define __A2EAUX_STD80COL__
-#include "emu.h"
#include "a2eauxslot.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp
index eb36d7cb8cb..166a436b1a1 100644
--- a/src/devices/bus/a2bus/a2hsscsi.cpp
+++ b/src/devices/bus/a2bus/a2hsscsi.cpp
@@ -38,6 +38,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2hsscsi.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
diff --git a/src/devices/bus/a2bus/a2hsscsi.h b/src/devices/bus/a2bus/a2hsscsi.h
index 4689c997c86..344253cd1ef 100644
--- a/src/devices/bus/a2bus/a2hsscsi.h
+++ b/src/devices/bus/a2bus/a2hsscsi.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_HSSCSI__
#define __A2BUS_HSSCSI__
-#include "emu.h"
#include "a2bus.h"
#include "machine/ncr5380n.h"
diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp
index 38b8ce36fa8..5eb27c226da 100644
--- a/src/devices/bus/a2bus/a2mcms.cpp
+++ b/src/devices/bus/a2bus/a2mcms.cpp
@@ -10,6 +10,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2mcms.h"
// the actual sound device (a slot device can't currently also be a sound device so we keep this private here)
diff --git a/src/devices/bus/a2bus/a2mcms.h b/src/devices/bus/a2bus/a2mcms.h
index ff40cd9cf0f..9877b8e945b 100644
--- a/src/devices/bus/a2bus/a2mcms.h
+++ b/src/devices/bus/a2bus/a2mcms.h
@@ -13,7 +13,6 @@
#ifndef __A2BUS_MCMS__
#define __A2BUS_MCMS__
-#include "emu.h"
#include "a2bus.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp
index be1d28cd1bc..32ac041e397 100644
--- a/src/devices/bus/a2bus/a2memexp.cpp
+++ b/src/devices/bus/a2bus/a2memexp.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2memexp.h"
diff --git a/src/devices/bus/a2bus/a2memexp.h b/src/devices/bus/a2bus/a2memexp.h
index dc6448323c5..554ff0c0c13 100644
--- a/src/devices/bus/a2bus/a2memexp.h
+++ b/src/devices/bus/a2bus/a2memexp.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_MEMEXP__
#define __A2BUS_MEMEXP__
-#include "emu.h"
#include "a2bus.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp
index ab72508b923..d4cd774255f 100644
--- a/src/devices/bus/a2bus/a2midi.cpp
+++ b/src/devices/bus/a2bus/a2midi.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2midi.h"
#include "machine/clock.h"
#include "bus/midi/midi.h"
diff --git a/src/devices/bus/a2bus/a2mockingboard.h b/src/devices/bus/a2bus/a2mockingboard.h
index 58fc7ac2d96..279f06c0110 100644
--- a/src/devices/bus/a2bus/a2mockingboard.h
+++ b/src/devices/bus/a2bus/a2mockingboard.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_MOCKINGBOARD__
#define __A2BUS_MOCKINGBOARD__
-#include "emu.h"
#include "a2bus.h"
#include "machine/6522via.h"
#include "sound/ay8910.h"
diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp
index 4a765febabc..0ae18d51d8f 100644
--- a/src/devices/bus/a2bus/a2pic.cpp
+++ b/src/devices/bus/a2bus/a2pic.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2pic.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp
index 3abc1820061..971a398ed8d 100644
--- a/src/devices/bus/a2bus/a2sam.cpp
+++ b/src/devices/bus/a2bus/a2sam.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2sam.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/bus/a2bus/a2sam.h b/src/devices/bus/a2bus/a2sam.h
index 2f0d898fb34..29777e42b60 100644
--- a/src/devices/bus/a2bus/a2sam.h
+++ b/src/devices/bus/a2bus/a2sam.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_SAM__
#define __A2BUS_SAM__
-#include "emu.h"
#include "a2bus.h"
#include "sound/dac.h"
diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp
index 3dba10aa849..1cc446936bb 100644
--- a/src/devices/bus/a2bus/a2scsi.cpp
+++ b/src/devices/bus/a2bus/a2scsi.cpp
@@ -31,6 +31,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2scsi.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
diff --git a/src/devices/bus/a2bus/a2scsi.h b/src/devices/bus/a2bus/a2scsi.h
index c506dfd94fa..4d5fac99a20 100644
--- a/src/devices/bus/a2bus/a2scsi.h
+++ b/src/devices/bus/a2bus/a2scsi.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_SCSI__
#define __A2BUS_SCSI__
-#include "emu.h"
#include "a2bus.h"
#include "machine/ncr5380n.h"
diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp
index 8ffb9ba88da..620d836587f 100644
--- a/src/devices/bus/a2bus/a2softcard.cpp
+++ b/src/devices/bus/a2bus/a2softcard.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2softcard.h"
#include "cpu/z80/z80.h"
diff --git a/src/devices/bus/a2bus/a2softcard.h b/src/devices/bus/a2bus/a2softcard.h
index 7df711601a4..f8545e1ae6a 100644
--- a/src/devices/bus/a2bus/a2softcard.h
+++ b/src/devices/bus/a2bus/a2softcard.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_SOFTCARD__
#define __A2BUS_SOFTCARD__
-#include "emu.h"
#include "a2bus.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp
index 59001032362..fe6557e9cf1 100644
--- a/src/devices/bus/a2bus/a2ssc.cpp
+++ b/src/devices/bus/a2bus/a2ssc.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2ssc.h"
#include "bus/rs232/rs232.h"
diff --git a/src/devices/bus/a2bus/a2swyft.h b/src/devices/bus/a2bus/a2swyft.h
index 7e297ffff8e..df646038aa9 100644
--- a/src/devices/bus/a2bus/a2swyft.h
+++ b/src/devices/bus/a2bus/a2swyft.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_SWYFT__
#define __A2BUS_SWYFT__
-#include "emu.h"
#include "a2bus.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp
index ecabb3e085f..9f28491d7e4 100644
--- a/src/devices/bus/a2bus/a2themill.cpp
+++ b/src/devices/bus/a2bus/a2themill.cpp
@@ -22,6 +22,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2themill.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/devices/bus/a2bus/a2themill.h b/src/devices/bus/a2bus/a2themill.h
index b37cbbbb25c..67f9bc43c7a 100644
--- a/src/devices/bus/a2bus/a2themill.h
+++ b/src/devices/bus/a2bus/a2themill.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_THEMILL__
#define __A2BUS_THEMILL__
-#include "emu.h"
#include "a2bus.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp
index a2fd9739748..8de8b73d67f 100644
--- a/src/devices/bus/a2bus/a2thunderclock.cpp
+++ b/src/devices/bus/a2bus/a2thunderclock.cpp
@@ -25,6 +25,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2thunderclock.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/a2thunderclock.h b/src/devices/bus/a2bus/a2thunderclock.h
index 2f06608534f..8188ede7380 100644
--- a/src/devices/bus/a2bus/a2thunderclock.h
+++ b/src/devices/bus/a2bus/a2thunderclock.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_THUNDERCLOCK__
#define __A2BUS_THUNDERCLOCK__
-#include "emu.h"
#include "a2bus.h"
#include "machine/upd1990a.h"
diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp
index 82a56021e02..763f816a756 100644
--- a/src/devices/bus/a2bus/a2ultraterm.cpp
+++ b/src/devices/bus/a2bus/a2ultraterm.cpp
@@ -27,6 +27,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2ultraterm.h"
diff --git a/src/devices/bus/a2bus/a2ultraterm.h b/src/devices/bus/a2bus/a2ultraterm.h
index 1f473526071..3d9c3a67a52 100644
--- a/src/devices/bus/a2bus/a2ultraterm.h
+++ b/src/devices/bus/a2bus/a2ultraterm.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_ULTRATERM__
#define __A2BUS_ULTRATERM__
-#include "emu.h"
#include "a2bus.h"
#include "video/mc6845.h"
diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp
index 03f1ba1f2f4..01850c1b4bb 100644
--- a/src/devices/bus/a2bus/a2videoterm.cpp
+++ b/src/devices/bus/a2bus/a2videoterm.cpp
@@ -23,6 +23,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2videoterm.h"
diff --git a/src/devices/bus/a2bus/a2videoterm.h b/src/devices/bus/a2bus/a2videoterm.h
index 751939cee9b..5f78b7fe91f 100644
--- a/src/devices/bus/a2bus/a2videoterm.h
+++ b/src/devices/bus/a2bus/a2videoterm.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_VIDEOTERM__
#define __A2BUS_VIDEOTERM__
-#include "emu.h"
#include "a2bus.h"
#include "video/mc6845.h"
diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp
index 6cb28536d94..b7f9aa896b9 100644
--- a/src/devices/bus/a2bus/a2vulcan.cpp
+++ b/src/devices/bus/a2bus/a2vulcan.cpp
@@ -53,6 +53,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2vulcan.h"
#include "machine/ataintf.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/bus/a2bus/a2vulcan.h b/src/devices/bus/a2bus/a2vulcan.h
index 1b0e0149833..bd2acab26b4 100644
--- a/src/devices/bus/a2bus/a2vulcan.h
+++ b/src/devices/bus/a2bus/a2vulcan.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_VULCAN__
#define __A2BUS_VULCAN__
-#include "emu.h"
#include "a2bus.h"
#include "machine/ataintf.h"
diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp
index 0e57cf691c1..cc95c8dd1d5 100644
--- a/src/devices/bus/a2bus/a2zipdrive.cpp
+++ b/src/devices/bus/a2bus/a2zipdrive.cpp
@@ -19,6 +19,7 @@
*********************************************************************/
+#include "emu.h"
#include "a2zipdrive.h"
#include "machine/ataintf.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/bus/a2bus/a2zipdrive.h b/src/devices/bus/a2bus/a2zipdrive.h
index 39f5f8bae19..3878c4b7bf0 100644
--- a/src/devices/bus/a2bus/a2zipdrive.h
+++ b/src/devices/bus/a2bus/a2zipdrive.h
@@ -13,7 +13,6 @@
#ifndef __A2BUS_ZIPDRIVE__
#define __A2BUS_ZIPDRIVE__
-#include "emu.h"
#include "a2bus.h"
#include "machine/ataintf.h"
diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp
index f9f2f05f945..2c1d7667a57 100644
--- a/src/devices/bus/a2bus/corvfdc01.cpp
+++ b/src/devices/bus/a2bus/corvfdc01.cpp
@@ -11,6 +11,7 @@
*********************************************************************/
+#include "emu.h"
#include "corvfdc01.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h
index c21f0839709..63953dd0acb 100644
--- a/src/devices/bus/a2bus/corvfdc01.h
+++ b/src/devices/bus/a2bus/corvfdc01.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_CORVFDC01__
#define __A2BUS_CORVFDC01__
-#include "emu.h"
#include "a2bus.h"
#include "machine/wd_fdc.h"
#include "formats/imd_dsk.h"
diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp
index 66375cc5580..bac61d8d249 100644
--- a/src/devices/bus/a2bus/corvfdc02.cpp
+++ b/src/devices/bus/a2bus/corvfdc02.cpp
@@ -12,6 +12,7 @@
*********************************************************************/
+#include "emu.h"
#include "corvfdc02.h"
#include "formats/concept_dsk.h"
diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h
index 5ff6402372e..f6d5d1885ef 100644
--- a/src/devices/bus/a2bus/corvfdc02.h
+++ b/src/devices/bus/a2bus/corvfdc02.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_CORVFDC02__
#define __A2BUS_CORVFDC02__
-#include "emu.h"
#include "a2bus.h"
#include "machine/upd765.h"
#include "formats/imd_dsk.h"
diff --git a/src/devices/bus/a2bus/ezcgi.h b/src/devices/bus/a2bus/ezcgi.h
index 8d01f3ac029..095c3da9beb 100644
--- a/src/devices/bus/a2bus/ezcgi.h
+++ b/src/devices/bus/a2bus/ezcgi.h
@@ -13,7 +13,6 @@
#ifndef __A2BUS_EZCGI__
#define __A2BUS_EZCGI__
-#include "emu.h"
#include "a2bus.h"
#include "video/tms9928a.h"
#include "video/v9938.h"
diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp
index c7dae25191d..781e55c76fd 100644
--- a/src/devices/bus/a2bus/laser128.cpp
+++ b/src/devices/bus/a2bus/laser128.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "laser128.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/laser128.h b/src/devices/bus/a2bus/laser128.h
index 2cd7def413b..22733ea94fa 100644
--- a/src/devices/bus/a2bus/laser128.h
+++ b/src/devices/bus/a2bus/laser128.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_LASER128__
#define __A2BUS_LASER128__
-#include "emu.h"
#include "a2bus.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp
index 9a4c7526ee6..003b783a6df 100644
--- a/src/devices/bus/a2bus/mouse.cpp
+++ b/src/devices/bus/a2bus/mouse.cpp
@@ -63,6 +63,7 @@
*********************************************************************/
+#include "emu.h"
#include "mouse.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/mouse.h b/src/devices/bus/a2bus/mouse.h
index b3148eaa7ff..97a9c00059b 100644
--- a/src/devices/bus/a2bus/mouse.h
+++ b/src/devices/bus/a2bus/mouse.h
@@ -11,7 +11,6 @@
#ifndef MAME_DEVICES_A2BUS_MOUSE_H
#define MAME_DEVICES_A2BUS_MOUSE_H
-#include "emu.h"
#include "a2bus.h"
#include "machine/6821pia.h"
#include "cpu/m6805/m68705.h"
diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp
index 08533d22f60..38927016f72 100644
--- a/src/devices/bus/a2bus/pc_xporter.cpp
+++ b/src/devices/bus/a2bus/pc_xporter.cpp
@@ -77,6 +77,7 @@
*********************************************************************/
+#include "emu.h"
#include "pc_xporter.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/pc_xporter.h b/src/devices/bus/a2bus/pc_xporter.h
index 048dd210de4..39932634d88 100644
--- a/src/devices/bus/a2bus/pc_xporter.h
+++ b/src/devices/bus/a2bus/pc_xporter.h
@@ -10,7 +10,6 @@
#pragma once
-#include "emu.h"
#include "a2bus.h"
#include "cpu/nec/nec.h"
#include "bus/pc_kbd/keyboards.h"
diff --git a/src/devices/bus/a2bus/ramcard128k.cpp b/src/devices/bus/a2bus/ramcard128k.cpp
index 27dc0e62b64..1fabbc1c51e 100644
--- a/src/devices/bus/a2bus/ramcard128k.cpp
+++ b/src/devices/bus/a2bus/ramcard128k.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "ramcard128k.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/ramcard128k.h b/src/devices/bus/a2bus/ramcard128k.h
index d8dbf33b5bf..922bebbb730 100644
--- a/src/devices/bus/a2bus/ramcard128k.h
+++ b/src/devices/bus/a2bus/ramcard128k.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_RAMCARD128K__
#define __A2BUS_RAMCARD128K__
-#include "emu.h"
#include "a2bus.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/ramcard16k.cpp b/src/devices/bus/a2bus/ramcard16k.cpp
index d0d682deeaa..ef2108ed14e 100644
--- a/src/devices/bus/a2bus/ramcard16k.cpp
+++ b/src/devices/bus/a2bus/ramcard16k.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "ramcard16k.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/ramcard16k.h b/src/devices/bus/a2bus/ramcard16k.h
index f01b6347d81..67676fe50b5 100644
--- a/src/devices/bus/a2bus/ramcard16k.h
+++ b/src/devices/bus/a2bus/ramcard16k.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_RAMCARD16K__
#define __A2BUS_RAMCARD16K__
-#include "emu.h"
#include "a2bus.h"
//**************************************************************************
diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp
index e83aa4f0999..7790744a2b0 100644
--- a/src/devices/bus/a2bus/timemasterho.cpp
+++ b/src/devices/bus/a2bus/timemasterho.cpp
@@ -35,6 +35,7 @@
*********************************************************************/
+#include "emu.h"
#include "timemasterho.h"
/***************************************************************************
diff --git a/src/devices/bus/a2bus/timemasterho.h b/src/devices/bus/a2bus/timemasterho.h
index f366ee838bc..c05d95571c7 100644
--- a/src/devices/bus/a2bus/timemasterho.h
+++ b/src/devices/bus/a2bus/timemasterho.h
@@ -11,7 +11,6 @@
#ifndef __A2BUS_TIMEMASTERHO__
#define __A2BUS_TIMEMASTERHO__
-#include "emu.h"
#include "a2bus.h"
#include "machine/6821pia.h"
#include "machine/msm5832.h"
diff --git a/src/devices/bus/a7800/a78_carts.h b/src/devices/bus/a7800/a78_carts.h
index e098f104572..c115d8f45d9 100644
--- a/src/devices/bus/a7800/a78_carts.h
+++ b/src/devices/bus/a7800/a78_carts.h
@@ -3,7 +3,6 @@
#ifndef __A78_CARTS_H
#define __A78_CARTS_H
-#include "emu.h"
#include "rom.h"
#include "xboard.h"
diff --git a/src/devices/bus/a800/a800_carts.h b/src/devices/bus/a800/a800_carts.h
index 720b5e7f4f8..c328fa61685 100644
--- a/src/devices/bus/a800/a800_carts.h
+++ b/src/devices/bus/a800/a800_carts.h
@@ -4,7 +4,6 @@
#define __A800_CARTS_H
-#include "emu.h"
#include "rom.h"
#include "oss.h"
diff --git a/src/devices/bus/abcbus/abc890.cpp b/src/devices/bus/abcbus/abc890.cpp
index 192b113e245..b4338853270 100644
--- a/src/devices/bus/abcbus/abc890.cpp
+++ b/src/devices/bus/abcbus/abc890.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "abc890.h"
diff --git a/src/devices/bus/abcbus/abc890.h b/src/devices/bus/abcbus/abc890.h
index 27481a6ca2c..0501e1aa44c 100644
--- a/src/devices/bus/abcbus/abc890.h
+++ b/src/devices/bus/abcbus/abc890.h
@@ -11,7 +11,6 @@
#ifndef __ABC890__
#define __ABC890__
-#include "emu.h"
#include "abcbus.h"
diff --git a/src/devices/bus/abcbus/abcbus.cpp b/src/devices/bus/abcbus/abcbus.cpp
index e0335d610f5..9487730474f 100644
--- a/src/devices/bus/abcbus/abcbus.cpp
+++ b/src/devices/bus/abcbus/abcbus.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "abcbus.h"
diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h
index 9fe542944c9..eb6379703e0 100644
--- a/src/devices/bus/abcbus/abcbus.h
+++ b/src/devices/bus/abcbus/abcbus.h
@@ -100,7 +100,6 @@
#ifndef __ABCBUS__
#define __ABCBUS__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp
index eef4ead003d..d57a1c1c53f 100644
--- a/src/devices/bus/abcbus/fd2.cpp
+++ b/src/devices/bus/abcbus/fd2.cpp
@@ -36,6 +36,7 @@ Notes:
*/
+#include "emu.h"
#include "fd2.h"
diff --git a/src/devices/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h
index 7ec28c10451..f82c0fb68d0 100644
--- a/src/devices/bus/abcbus/fd2.h
+++ b/src/devices/bus/abcbus/fd2.h
@@ -11,7 +11,6 @@
#ifndef __ABC_FD2__
#define __ABC_FD2__
-#include "emu.h"
#include "abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/devices/bus/abcbus/hdc.cpp b/src/devices/bus/abcbus/hdc.cpp
index 296948b59ab..7029c2b4a8e 100644
--- a/src/devices/bus/abcbus/hdc.cpp
+++ b/src/devices/bus/abcbus/hdc.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "hdc.h"
diff --git a/src/devices/bus/abcbus/hdc.h b/src/devices/bus/abcbus/hdc.h
index 668f19a5625..c0a1350d51e 100644
--- a/src/devices/bus/abcbus/hdc.h
+++ b/src/devices/bus/abcbus/hdc.h
@@ -11,7 +11,6 @@
#ifndef __ABC_HDC__
#define __ABC_HDC__
-#include "emu.h"
#include "abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp
index 69300ce8cf9..a48236e727b 100644
--- a/src/devices/bus/abcbus/lux10828.cpp
+++ b/src/devices/bus/abcbus/lux10828.cpp
@@ -120,6 +120,7 @@ Notes:
*/
+#include "emu.h"
#include "lux10828.h"
diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h
index fb90ef914c2..100e32f3f4f 100644
--- a/src/devices/bus/abcbus/lux10828.h
+++ b/src/devices/bus/abcbus/lux10828.h
@@ -11,7 +11,6 @@
#ifndef __LUXOR_55_10828__
#define __LUXOR_55_10828__
-#include "emu.h"
#include "abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp
index 6286f071487..7f7d468a5d7 100644
--- a/src/devices/bus/abcbus/lux21046.cpp
+++ b/src/devices/bus/abcbus/lux21046.cpp
@@ -74,6 +74,7 @@ Notes:
*/
+#include "emu.h"
#include "lux21046.h"
diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h
index aabd9cb5404..2e0162ebe91 100644
--- a/src/devices/bus/abcbus/lux21046.h
+++ b/src/devices/bus/abcbus/lux21046.h
@@ -11,7 +11,6 @@
#ifndef __LUXOR_55_21046__
#define __LUXOR_55_21046__
-#include "emu.h"
#include "abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp
index 7b05cbdfff8..9095f29332c 100644
--- a/src/devices/bus/abcbus/lux21056.cpp
+++ b/src/devices/bus/abcbus/lux21056.cpp
@@ -71,6 +71,7 @@
*/
+#include "emu.h"
#include "lux21056.h"
#include "bus/scsi/s1410.h"
diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h
index 0e1d04073b3..d87183e91d3 100644
--- a/src/devices/bus/abcbus/lux21056.h
+++ b/src/devices/bus/abcbus/lux21056.h
@@ -11,7 +11,6 @@
#ifndef __LUXOR_55_21056__
#define __LUXOR_55_21056__
-#include "emu.h"
#include "abcbus.h"
#include "bus/scsi/scsi.h"
#include "cpu/z80/z80.h"
diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp
index 8cc4ffb193d..2798607dfcc 100644
--- a/src/devices/bus/abcbus/lux4105.cpp
+++ b/src/devices/bus/abcbus/lux4105.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "lux4105.h"
#include "bus/scsi/scsihd.h"
#include "bus/scsi/s1410.h"
diff --git a/src/devices/bus/abcbus/lux4105.h b/src/devices/bus/abcbus/lux4105.h
index 657f756d74c..7c4e7881665 100644
--- a/src/devices/bus/abcbus/lux4105.h
+++ b/src/devices/bus/abcbus/lux4105.h
@@ -12,7 +12,6 @@
#define __LUXOR_4105__
-#include "emu.h"
#include "abcbus.h"
#include "bus/scsi/scsi.h"
diff --git a/src/devices/bus/abcbus/memcard.cpp b/src/devices/bus/abcbus/memcard.cpp
index 945dd5382c6..ba22a8e1a62 100644
--- a/src/devices/bus/abcbus/memcard.cpp
+++ b/src/devices/bus/abcbus/memcard.cpp
@@ -54,6 +54,7 @@ Notes:
*/
+#include "emu.h"
#include "memcard.h"
diff --git a/src/devices/bus/abcbus/memcard.h b/src/devices/bus/abcbus/memcard.h
index f94f484b350..63fc582a48a 100644
--- a/src/devices/bus/abcbus/memcard.h
+++ b/src/devices/bus/abcbus/memcard.h
@@ -11,7 +11,6 @@
#ifndef __ABC_MEMORY_CARD__
#define __ABC_MEMORY_CARD__
-#include "emu.h"
#include "abcbus.h"
diff --git a/src/devices/bus/abcbus/ram.cpp b/src/devices/bus/abcbus/ram.cpp
index 6ff3935b4f7..5df5c00bd5f 100644
--- a/src/devices/bus/abcbus/ram.cpp
+++ b/src/devices/bus/abcbus/ram.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "ram.h"
diff --git a/src/devices/bus/abcbus/ram.h b/src/devices/bus/abcbus/ram.h
index fa53f5e1e3e..eac0283dff0 100644
--- a/src/devices/bus/abcbus/ram.h
+++ b/src/devices/bus/abcbus/ram.h
@@ -11,7 +11,6 @@
#ifndef __ABC80_16KB_RAM_CARD__
#define __ABC80_16KB_RAM_CARD__
-#include "emu.h"
#include "abcbus.h"
diff --git a/src/devices/bus/abcbus/sio.cpp b/src/devices/bus/abcbus/sio.cpp
index 90f543b7e6a..8342283445f 100644
--- a/src/devices/bus/abcbus/sio.cpp
+++ b/src/devices/bus/abcbus/sio.cpp
@@ -30,6 +30,7 @@ Notes:
*/
+#include "emu.h"
#include "sio.h"
diff --git a/src/devices/bus/abcbus/sio.h b/src/devices/bus/abcbus/sio.h
index 52f18c4be73..3b2abb78157 100644
--- a/src/devices/bus/abcbus/sio.h
+++ b/src/devices/bus/abcbus/sio.h
@@ -5,7 +5,6 @@
#ifndef __ABC_SIO__
#define __ABC_SIO__
-#include "emu.h"
#include "abcbus.h"
#include "machine/z80ctc.h"
#include "machine/z80dart.h"
diff --git a/src/devices/bus/abcbus/slutprov.cpp b/src/devices/bus/abcbus/slutprov.cpp
index 4497c8827ff..b13dce4bcc9 100644
--- a/src/devices/bus/abcbus/slutprov.cpp
+++ b/src/devices/bus/abcbus/slutprov.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Curt Coder
+#include "emu.h"
#include "slutprov.h"
diff --git a/src/devices/bus/abcbus/slutprov.h b/src/devices/bus/abcbus/slutprov.h
index 710fc730f0c..e4600eb7059 100644
--- a/src/devices/bus/abcbus/slutprov.h
+++ b/src/devices/bus/abcbus/slutprov.h
@@ -5,7 +5,6 @@
#ifndef __ABC_SLUTPROV__
#define __ABC_SLUTPROV__
-#include "emu.h"
#include "abcbus.h"
diff --git a/src/devices/bus/abcbus/turbo.cpp b/src/devices/bus/abcbus/turbo.cpp
index 8377b8e9b04..760cdf6aaa4 100644
--- a/src/devices/bus/abcbus/turbo.cpp
+++ b/src/devices/bus/abcbus/turbo.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "turbo.h"
diff --git a/src/devices/bus/abcbus/turbo.h b/src/devices/bus/abcbus/turbo.h
index 192094ac0b9..b6f7a97721c 100644
--- a/src/devices/bus/abcbus/turbo.h
+++ b/src/devices/bus/abcbus/turbo.h
@@ -11,7 +11,6 @@
#ifndef __TURBO_KONTROLLER__
#define __TURBO_KONTROLLER__
-#include "emu.h"
#include "abcbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/devices/bus/abcbus/uni800.cpp b/src/devices/bus/abcbus/uni800.cpp
index 90dd6dfdb78..fc6e36b66e3 100644
--- a/src/devices/bus/abcbus/uni800.cpp
+++ b/src/devices/bus/abcbus/uni800.cpp
@@ -31,6 +31,7 @@ Notes:
*/
+#include "emu.h"
#include "uni800.h"
diff --git a/src/devices/bus/abcbus/uni800.h b/src/devices/bus/abcbus/uni800.h
index 1c4b0354f69..f8754b07aec 100644
--- a/src/devices/bus/abcbus/uni800.h
+++ b/src/devices/bus/abcbus/uni800.h
@@ -5,7 +5,6 @@
#ifndef __ABC_UNI800__
#define __ABC_UNI800__
-#include "emu.h"
#include "abcbus.h"
diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp
index bb02fb07f9c..7a29e4035bc 100644
--- a/src/devices/bus/abckb/abc77.cpp
+++ b/src/devices/bus/abckb/abc77.cpp
@@ -41,6 +41,7 @@ Notes:
*/
+#include "emu.h"
#include "abc77.h"
diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h
index 63d72fd382b..fc2972a7adf 100644
--- a/src/devices/bus/abckb/abc77.h
+++ b/src/devices/bus/abckb/abc77.h
@@ -11,7 +11,6 @@
#ifndef __ABC77__
#define __ABC77__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "machine/watchdog.h"
#include "abckb.h"
diff --git a/src/devices/bus/abckb/abc800kb.cpp b/src/devices/bus/abckb/abc800kb.cpp
index bf0c3aa4b78..f0b4a215c7e 100644
--- a/src/devices/bus/abckb/abc800kb.cpp
+++ b/src/devices/bus/abckb/abc800kb.cpp
@@ -68,6 +68,7 @@ XR22-050-3B Pinout
*/
+#include "emu.h"
#include "abc800kb.h"
diff --git a/src/devices/bus/abckb/abc800kb.h b/src/devices/bus/abckb/abc800kb.h
index b6290037e4d..d3427c8d53c 100644
--- a/src/devices/bus/abckb/abc800kb.h
+++ b/src/devices/bus/abckb/abc800kb.h
@@ -12,7 +12,6 @@
#define __ABC800_KEYBOARD__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "abckb.h"
#include "sound/discrete.h"
diff --git a/src/devices/bus/abckb/abc99.cpp b/src/devices/bus/abckb/abc99.cpp
index d932adce646..488194fd452 100644
--- a/src/devices/bus/abckb/abc99.cpp
+++ b/src/devices/bus/abckb/abc99.cpp
@@ -52,6 +52,7 @@ Notes:
*/
+#include "emu.h"
#include "abc99.h"
diff --git a/src/devices/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h
index d6eaf6a43b4..631194a83e7 100644
--- a/src/devices/bus/abckb/abc99.h
+++ b/src/devices/bus/abckb/abc99.h
@@ -11,7 +11,6 @@
#ifndef __ABC99__
#define __ABC99__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "abckb.h"
#include "sound/speaker.h"
diff --git a/src/devices/bus/abckb/abckb.cpp b/src/devices/bus/abckb/abckb.cpp
index c489206024a..4c03c430df2 100644
--- a/src/devices/bus/abckb/abckb.cpp
+++ b/src/devices/bus/abckb/abckb.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "abckb.h"
diff --git a/src/devices/bus/abckb/abckb.h b/src/devices/bus/abckb/abckb.h
index b45131da73d..e342bf1422f 100644
--- a/src/devices/bus/abckb/abckb.h
+++ b/src/devices/bus/abckb/abckb.h
@@ -11,7 +11,6 @@
#ifndef __ABC_KEYBOARD_PORT__
#define __ABC_KEYBOARD_PORT__
-#include "emu.h"
diff --git a/src/devices/bus/adam/adamlink.cpp b/src/devices/bus/adam/adamlink.cpp
index b6e0895a806..c9b810e2494 100644
--- a/src/devices/bus/adam/adamlink.cpp
+++ b/src/devices/bus/adam/adamlink.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "adamlink.h"
diff --git a/src/devices/bus/adam/adamlink.h b/src/devices/bus/adam/adamlink.h
index 978d68d0717..9897cd83dc1 100644
--- a/src/devices/bus/adam/adamlink.h
+++ b/src/devices/bus/adam/adamlink.h
@@ -11,7 +11,6 @@
#ifndef __ADAMLINK__
#define __ADAMLINK__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/adam/exp.cpp b/src/devices/bus/adam/exp.cpp
index 11879534b55..50469784009 100644
--- a/src/devices/bus/adam/exp.cpp
+++ b/src/devices/bus/adam/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/adam/exp.h b/src/devices/bus/adam/exp.h
index 63a17d2c23a..1331b15b027 100644
--- a/src/devices/bus/adam/exp.h
+++ b/src/devices/bus/adam/exp.h
@@ -11,7 +11,6 @@
#ifndef __ADAM_EXPANSION_SLOT__
#define __ADAM_EXPANSION_SLOT__
-#include "emu.h"
#include "softlist_dev.h"
diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp
index a20a7ec59bd..68d7477cc6d 100644
--- a/src/devices/bus/adam/ide.cpp
+++ b/src/devices/bus/adam/ide.cpp
@@ -16,6 +16,7 @@
*/
+#include "emu.h"
#include "ide.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/devices/bus/adam/ide.h b/src/devices/bus/adam/ide.h
index 53eb653380e..881129f6809 100644
--- a/src/devices/bus/adam/ide.h
+++ b/src/devices/bus/adam/ide.h
@@ -11,7 +11,6 @@
#ifndef __ADAM_IDE__
#define __ADAM_IDE__
-#include "emu.h"
#include "exp.h"
#include "machine/ataintf.h"
#include "machine/latch.h"
diff --git a/src/devices/bus/adam/ram.cpp b/src/devices/bus/adam/ram.cpp
index 544273ee737..8922b441a42 100644
--- a/src/devices/bus/adam/ram.cpp
+++ b/src/devices/bus/adam/ram.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ram.h"
diff --git a/src/devices/bus/adam/ram.h b/src/devices/bus/adam/ram.h
index 7f535ba80b4..9dbcba75c03 100644
--- a/src/devices/bus/adam/ram.h
+++ b/src/devices/bus/adam/ram.h
@@ -11,7 +11,6 @@
#ifndef __ADAM_RAM__
#define __ADAM_RAM__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/adamnet/adamnet.cpp b/src/devices/bus/adamnet/adamnet.cpp
index ac81e1ca614..c153a826f67 100644
--- a/src/devices/bus/adamnet/adamnet.cpp
+++ b/src/devices/bus/adamnet/adamnet.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "adamnet.h"
diff --git a/src/devices/bus/adamnet/adamnet.h b/src/devices/bus/adamnet/adamnet.h
index ae9e58abdb9..2fa5c724e22 100644
--- a/src/devices/bus/adamnet/adamnet.h
+++ b/src/devices/bus/adamnet/adamnet.h
@@ -11,7 +11,6 @@
#ifndef __ADAMNET__
#define __ADAMNET__
-#include "emu.h"
diff --git a/src/devices/bus/adamnet/ddp.cpp b/src/devices/bus/adamnet/ddp.cpp
index f4b2d84c743..27cb93de3e1 100644
--- a/src/devices/bus/adamnet/ddp.cpp
+++ b/src/devices/bus/adamnet/ddp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ddp.h"
diff --git a/src/devices/bus/adamnet/ddp.h b/src/devices/bus/adamnet/ddp.h
index 7528658f205..72fd3a5929c 100644
--- a/src/devices/bus/adamnet/ddp.h
+++ b/src/devices/bus/adamnet/ddp.h
@@ -11,7 +11,6 @@
#ifndef __ADAM_DDP__
#define __ADAM_DDP__
-#include "emu.h"
#include "adamnet.h"
#include "cpu/m6800/m6800.h"
#include "formats/adam_cas.h"
diff --git a/src/devices/bus/adamnet/fdc.cpp b/src/devices/bus/adamnet/fdc.cpp
index f04c7af3302..776e431a51e 100644
--- a/src/devices/bus/adamnet/fdc.cpp
+++ b/src/devices/bus/adamnet/fdc.cpp
@@ -16,6 +16,7 @@
*/
+#include "emu.h"
#include "fdc.h"
diff --git a/src/devices/bus/adamnet/fdc.h b/src/devices/bus/adamnet/fdc.h
index e380528ab08..48f17b29bb3 100644
--- a/src/devices/bus/adamnet/fdc.h
+++ b/src/devices/bus/adamnet/fdc.h
@@ -11,7 +11,6 @@
#ifndef __ADAM_FDC__
#define __ADAM_FDC__
-#include "emu.h"
#include "adamnet.h"
#include "cpu/m6800/m6800.h"
#include "formats/adam_dsk.h"
diff --git a/src/devices/bus/adamnet/kb.cpp b/src/devices/bus/adamnet/kb.cpp
index 5b39ae17352..867b68f6394 100644
--- a/src/devices/bus/adamnet/kb.cpp
+++ b/src/devices/bus/adamnet/kb.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "kb.h"
diff --git a/src/devices/bus/adamnet/kb.h b/src/devices/bus/adamnet/kb.h
index 418fdabdcbd..bec487fe260 100644
--- a/src/devices/bus/adamnet/kb.h
+++ b/src/devices/bus/adamnet/kb.h
@@ -11,7 +11,6 @@
#ifndef __ADAM_KB__
#define __ADAM_KB__
-#include "emu.h"
#include "adamnet.h"
#include "cpu/m6800/m6800.h"
diff --git a/src/devices/bus/adamnet/printer.cpp b/src/devices/bus/adamnet/printer.cpp
index 7a2c7578102..55ff7d8155e 100644
--- a/src/devices/bus/adamnet/printer.cpp
+++ b/src/devices/bus/adamnet/printer.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "printer.h"
diff --git a/src/devices/bus/adamnet/printer.h b/src/devices/bus/adamnet/printer.h
index 0b35091612f..7c320b5840a 100644
--- a/src/devices/bus/adamnet/printer.h
+++ b/src/devices/bus/adamnet/printer.h
@@ -11,7 +11,6 @@
#ifndef __ADAM_PRN__
#define __ADAM_PRN__
-#include "emu.h"
#include "adamnet.h"
#include "cpu/m6800/m6800.h"
diff --git a/src/devices/bus/adamnet/spi.cpp b/src/devices/bus/adamnet/spi.cpp
index 15d8a6157a5..d9b1278db6f 100644
--- a/src/devices/bus/adamnet/spi.cpp
+++ b/src/devices/bus/adamnet/spi.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "spi.h"
diff --git a/src/devices/bus/adamnet/spi.h b/src/devices/bus/adamnet/spi.h
index 185aeaf657a..fad035fb686 100644
--- a/src/devices/bus/adamnet/spi.h
+++ b/src/devices/bus/adamnet/spi.h
@@ -11,7 +11,6 @@
#ifndef __ADAM_SPI__
#define __ADAM_SPI__
-#include "emu.h"
#include "adamnet.h"
#include "bus/centronics/ctronics.h"
#include "bus/rs232/rs232.h"
diff --git a/src/devices/bus/amiga/keyboard/keyboard.cpp b/src/devices/bus/amiga/keyboard/keyboard.cpp
index 1e587e896cb..1c1d037e227 100644
--- a/src/devices/bus/amiga/keyboard/keyboard.cpp
+++ b/src/devices/bus/amiga/keyboard/keyboard.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "keyboard.h"
#include "a500.h"
#include "a1200.h"
diff --git a/src/devices/bus/amiga/keyboard/keyboard.h b/src/devices/bus/amiga/keyboard/keyboard.h
index deb2f79295a..39625228c3f 100644
--- a/src/devices/bus/amiga/keyboard/keyboard.h
+++ b/src/devices/bus/amiga/keyboard/keyboard.h
@@ -17,7 +17,6 @@
#ifndef DEVICES_BUS_AMIGA_KEYBOARD_H
#define DEVICES_BUS_AMIGA_KEYBOARD_H
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/amiga/zorro/a2052.cpp b/src/devices/bus/amiga/zorro/a2052.cpp
index ced832c9f3a..5a02f8e70dd 100644
--- a/src/devices/bus/amiga/zorro/a2052.cpp
+++ b/src/devices/bus/amiga/zorro/a2052.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "a2052.h"
diff --git a/src/devices/bus/amiga/zorro/a2052.h b/src/devices/bus/amiga/zorro/a2052.h
index 02af377bdf3..2928420996a 100644
--- a/src/devices/bus/amiga/zorro/a2052.h
+++ b/src/devices/bus/amiga/zorro/a2052.h
@@ -13,7 +13,6 @@
#ifndef __A2052_H__
#define __A2052_H__
-#include "emu.h"
#include "zorro.h"
#include "machine/autoconfig.h"
diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp
index f7a0d5f4312..2a70ed54d4d 100644
--- a/src/devices/bus/amiga/zorro/a2232.cpp
+++ b/src/devices/bus/amiga/zorro/a2232.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "a2232.h"
diff --git a/src/devices/bus/amiga/zorro/a2232.h b/src/devices/bus/amiga/zorro/a2232.h
index 4132ce5178d..2c1eb8c46ee 100644
--- a/src/devices/bus/amiga/zorro/a2232.h
+++ b/src/devices/bus/amiga/zorro/a2232.h
@@ -15,7 +15,6 @@
#ifndef __A2232_H__
#define __A2232_H__
-#include "emu.h"
#include "zorro.h"
#include "machine/autoconfig.h"
#include "cpu/m6502/m65ce02.h"
diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp
index 2a9eeb0c10d..81b6ae79e6e 100644
--- a/src/devices/bus/amiga/zorro/a590.cpp
+++ b/src/devices/bus/amiga/zorro/a590.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "a590.h"
#include "bus/scsi/scsi.h"
#include "bus/scsi/scsihd.h"
diff --git a/src/devices/bus/amiga/zorro/a590.h b/src/devices/bus/amiga/zorro/a590.h
index 591ca08063c..0e71423b8b7 100644
--- a/src/devices/bus/amiga/zorro/a590.h
+++ b/src/devices/bus/amiga/zorro/a590.h
@@ -13,7 +13,6 @@
#ifndef __A590_H__
#define __A590_H__
-#include "emu.h"
#include "zorro.h"
#include "machine/dmac.h"
#include "machine/wd33c93.h"
diff --git a/src/devices/bus/amiga/zorro/action_replay.cpp b/src/devices/bus/amiga/zorro/action_replay.cpp
index 423ce88f99c..708101014d9 100644
--- a/src/devices/bus/amiga/zorro/action_replay.cpp
+++ b/src/devices/bus/amiga/zorro/action_replay.cpp
@@ -14,6 +14,7 @@
***************************************************************************/
+#include "emu.h"
#include "action_replay.h"
diff --git a/src/devices/bus/amiga/zorro/action_replay.h b/src/devices/bus/amiga/zorro/action_replay.h
index 4bb5d6dd242..9931cdadaad 100644
--- a/src/devices/bus/amiga/zorro/action_replay.h
+++ b/src/devices/bus/amiga/zorro/action_replay.h
@@ -13,7 +13,6 @@
#ifndef __ACTION_REPLAY_H__
#define __ACTION_REPLAY_H__
-#include "emu.h"
#include "zorro.h"
diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp
index bbfe7adf82b..2162a2d914e 100644
--- a/src/devices/bus/amiga/zorro/buddha.cpp
+++ b/src/devices/bus/amiga/zorro/buddha.cpp
@@ -22,6 +22,7 @@
***************************************************************************/
+#include "emu.h"
#include "buddha.h"
//**************************************************************************
diff --git a/src/devices/bus/amiga/zorro/buddha.h b/src/devices/bus/amiga/zorro/buddha.h
index 14b6d1b2ea0..fd7fb794eaa 100644
--- a/src/devices/bus/amiga/zorro/buddha.h
+++ b/src/devices/bus/amiga/zorro/buddha.h
@@ -13,7 +13,6 @@
#ifndef __BUDDHA_H__
#define __BUDDHA_H__
-#include "emu.h"
#include "zorro.h"
#include "machine/autoconfig.h"
#include "machine/ataintf.h"
diff --git a/src/devices/bus/amiga/zorro/cards.cpp b/src/devices/bus/amiga/zorro/cards.cpp
index 5fc67353d17..4647afa9d0a 100644
--- a/src/devices/bus/amiga/zorro/cards.cpp
+++ b/src/devices/bus/amiga/zorro/cards.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "cards.h"
SLOT_INTERFACE_START( a1000_expansion_cards )
diff --git a/src/devices/bus/amiga/zorro/cards.h b/src/devices/bus/amiga/zorro/cards.h
index 919c2c3c899..5f025ab08fd 100644
--- a/src/devices/bus/amiga/zorro/cards.h
+++ b/src/devices/bus/amiga/zorro/cards.h
@@ -26,7 +26,6 @@
#ifndef __CARDS_H__
#define __CARDS_H__
-#include "emu.h"
#include "a2052.h"
#include "a2232.h"
diff --git a/src/devices/bus/amiga/zorro/zorro.cpp b/src/devices/bus/amiga/zorro/zorro.cpp
index 15c5fa770c3..f83ee8f194f 100644
--- a/src/devices/bus/amiga/zorro/zorro.cpp
+++ b/src/devices/bus/amiga/zorro/zorro.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "zorro.h"
diff --git a/src/devices/bus/amiga/zorro/zorro.h b/src/devices/bus/amiga/zorro/zorro.h
index 9d641d66cc9..482608d7949 100644
--- a/src/devices/bus/amiga/zorro/zorro.h
+++ b/src/devices/bus/amiga/zorro/zorro.h
@@ -143,7 +143,6 @@
#ifndef __ZORRO_H__
#define __ZORRO_H__
-#include "emu.h"
//**************************************************************************
// CONSTANTS / MACROS
diff --git a/src/devices/bus/apricot/expansion/cards.cpp b/src/devices/bus/apricot/expansion/cards.cpp
index 9a97adffca6..16804f896d8 100644
--- a/src/devices/bus/apricot/expansion/cards.cpp
+++ b/src/devices/bus/apricot/expansion/cards.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "cards.h"
SLOT_INTERFACE_START( apricot_expansion_cards )
diff --git a/src/devices/bus/apricot/expansion/cards.h b/src/devices/bus/apricot/expansion/cards.h
index 67766d51a8e..4d9b73b0b86 100644
--- a/src/devices/bus/apricot/expansion/cards.h
+++ b/src/devices/bus/apricot/expansion/cards.h
@@ -11,7 +11,6 @@
#ifndef __APRICOT_CARDS_H__
#define __APRICOT_CARDS_H__
-#include "emu.h"
#include "ram.h"
SLOT_INTERFACE_EXTERN( apricot_expansion_cards );
diff --git a/src/devices/bus/apricot/expansion/expansion.cpp b/src/devices/bus/apricot/expansion/expansion.cpp
index cf1152c7ac3..f35fefd7ff4 100644
--- a/src/devices/bus/apricot/expansion/expansion.cpp
+++ b/src/devices/bus/apricot/expansion/expansion.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "expansion.h"
diff --git a/src/devices/bus/apricot/expansion/expansion.h b/src/devices/bus/apricot/expansion/expansion.h
index 506a13d19b1..e87bcf355d4 100644
--- a/src/devices/bus/apricot/expansion/expansion.h
+++ b/src/devices/bus/apricot/expansion/expansion.h
@@ -46,7 +46,6 @@
#ifndef __APRICOT_EXPANSION_H__
#define __APRICOT_EXPANSION_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/apricot/expansion/ram.cpp b/src/devices/bus/apricot/expansion/ram.cpp
index 59711b127cd..04477437269 100644
--- a/src/devices/bus/apricot/expansion/ram.cpp
+++ b/src/devices/bus/apricot/expansion/ram.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "ram.h"
diff --git a/src/devices/bus/apricot/expansion/ram.h b/src/devices/bus/apricot/expansion/ram.h
index 719a51cbc4f..e9e837b660c 100644
--- a/src/devices/bus/apricot/expansion/ram.h
+++ b/src/devices/bus/apricot/expansion/ram.h
@@ -11,7 +11,6 @@
#ifndef __APRICOT_RAM__
#define __APRICOT_RAM__
-#include "emu.h"
#include "expansion.h"
diff --git a/src/devices/bus/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp
index ff2f9ffe28e..198d19f0e49 100644
--- a/src/devices/bus/apricot/keyboard/hle.cpp
+++ b/src/devices/bus/apricot/keyboard/hle.cpp
@@ -49,6 +49,7 @@
***************************************************************************/
+#include "emu.h"
#include "hle.h"
#include "machine/keyboard.ipp"
diff --git a/src/devices/bus/apricot/keyboard/hle.h b/src/devices/bus/apricot/keyboard/hle.h
index cc8369d19d0..9096c434f65 100644
--- a/src/devices/bus/apricot/keyboard/hle.h
+++ b/src/devices/bus/apricot/keyboard/hle.h
@@ -11,7 +11,6 @@
#ifndef __APRICOT_KEYBOARD_HLE_H__
#define __APRICOT_KEYBOARD_HLE_H__
-#include "emu.h"
#include "keyboard.h"
#include "machine/keyboard.h"
#include "machine/msm5832.h"
diff --git a/src/devices/bus/apricot/keyboard/keyboard.cpp b/src/devices/bus/apricot/keyboard/keyboard.cpp
index 8d53eac72b5..e2cf48601a3 100644
--- a/src/devices/bus/apricot/keyboard/keyboard.cpp
+++ b/src/devices/bus/apricot/keyboard/keyboard.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "keyboard.h"
#include "hle.h"
diff --git a/src/devices/bus/apricot/keyboard/keyboard.h b/src/devices/bus/apricot/keyboard/keyboard.h
index ae37e7d7897..8fa27f672ec 100644
--- a/src/devices/bus/apricot/keyboard/keyboard.h
+++ b/src/devices/bus/apricot/keyboard/keyboard.h
@@ -32,7 +32,6 @@
#ifndef __APRICOT_KEYBOARD_H__
#define __APRICOT_KEYBOARD_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp b/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
index 72fbe7f04c3..d791aeb9f87 100644
--- a/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
+++ b/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "1mhzbus.h"
diff --git a/src/devices/bus/bbc/1mhzbus/1mhzbus.h b/src/devices/bus/bbc/1mhzbus/1mhzbus.h
index e2f96580c1c..f8b5f4083f9 100644
--- a/src/devices/bus/bbc/1mhzbus/1mhzbus.h
+++ b/src/devices/bus/bbc/1mhzbus/1mhzbus.h
@@ -77,7 +77,6 @@
#ifndef __BBC_1MHZBUS_SLOT__
#define __BBC_1MHZBUS_SLOT__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/bbc/1mhzbus/opus3.cpp b/src/devices/bus/bbc/1mhzbus/opus3.cpp
index 6dc39151a08..406ce778fc8 100644
--- a/src/devices/bus/bbc/1mhzbus/opus3.cpp
+++ b/src/devices/bus/bbc/1mhzbus/opus3.cpp
@@ -37,6 +37,7 @@
**********************************************************************/
+#include "emu.h"
#include "opus3.h"
diff --git a/src/devices/bus/bbc/1mhzbus/opus3.h b/src/devices/bus/bbc/1mhzbus/opus3.h
index 0e08608d42e..b521aa87de2 100644
--- a/src/devices/bus/bbc/1mhzbus/opus3.h
+++ b/src/devices/bus/bbc/1mhzbus/opus3.h
@@ -10,7 +10,6 @@
#ifndef __BBC_OPUS3__
#define __BBC_OPUS3__
-#include "emu.h"
#include "1mhzbus.h"
#include "machine/ram.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/bbc/analogue/analogue.cpp b/src/devices/bus/bbc/analogue/analogue.cpp
index 2b8fcd110b4..1177fbd37a7 100644
--- a/src/devices/bus/bbc/analogue/analogue.cpp
+++ b/src/devices/bus/bbc/analogue/analogue.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "analogue.h"
diff --git a/src/devices/bus/bbc/analogue/analogue.h b/src/devices/bus/bbc/analogue/analogue.h
index 3558f20fdf1..d63ef808018 100644
--- a/src/devices/bus/bbc/analogue/analogue.h
+++ b/src/devices/bus/bbc/analogue/analogue.h
@@ -31,7 +31,6 @@
#ifndef __BBC_ANALOGUE_SLOT__
#define __BBC_ANALOGUE_SLOT__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/bbc/analogue/joystick.cpp b/src/devices/bus/bbc/analogue/joystick.cpp
index b72a46c5b60..4be67fd84a6 100644
--- a/src/devices/bus/bbc/analogue/joystick.cpp
+++ b/src/devices/bus/bbc/analogue/joystick.cpp
@@ -11,6 +11,7 @@
**********************************************************************/
+#include "emu.h"
#include "joystick.h"
//**************************************************************************
diff --git a/src/devices/bus/bbc/analogue/joystick.h b/src/devices/bus/bbc/analogue/joystick.h
index 3222c3f8565..bf2b906102a 100644
--- a/src/devices/bus/bbc/analogue/joystick.h
+++ b/src/devices/bus/bbc/analogue/joystick.h
@@ -12,7 +12,6 @@
#define __BBC_JOYSTICK__
-#include "emu.h"
#include "analogue.h"
//**************************************************************************
diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp
index 32448ff8c90..92840858374 100644
--- a/src/devices/bus/bbc/fdc/acorn.cpp
+++ b/src/devices/bus/bbc/fdc/acorn.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
+#include "emu.h"
#include "acorn.h"
diff --git a/src/devices/bus/bbc/fdc/acorn.h b/src/devices/bus/bbc/fdc/acorn.h
index 6d3cdcd5260..9e1ded12cfb 100644
--- a/src/devices/bus/bbc/fdc/acorn.h
+++ b/src/devices/bus/bbc/fdc/acorn.h
@@ -10,7 +10,6 @@
#ifndef __BBC_ACORN__
#define __BBC_ACORN__
-#include "emu.h"
#include "fdc.h"
#include "machine/i8271.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp
index 2d615ce9fb4..c5bd476e2c1 100644
--- a/src/devices/bus/bbc/fdc/cumana.cpp
+++ b/src/devices/bus/bbc/fdc/cumana.cpp
@@ -9,6 +9,7 @@
**********************************************************************/
+#include "emu.h"
#include "cumana.h"
diff --git a/src/devices/bus/bbc/fdc/cumana.h b/src/devices/bus/bbc/fdc/cumana.h
index c721966d670..5bae494f090 100644
--- a/src/devices/bus/bbc/fdc/cumana.h
+++ b/src/devices/bus/bbc/fdc/cumana.h
@@ -10,7 +10,6 @@
#ifndef __BBC_CUMANA__
#define __BBC_CUMANA__
-#include "emu.h"
#include "fdc.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/bbc/fdc/fdc.cpp b/src/devices/bus/bbc/fdc/fdc.cpp
index 7452047b148..cd262df345c 100644
--- a/src/devices/bus/bbc/fdc/fdc.cpp
+++ b/src/devices/bus/bbc/fdc/fdc.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "fdc.h"
diff --git a/src/devices/bus/bbc/fdc/fdc.h b/src/devices/bus/bbc/fdc/fdc.h
index 7a6006c6a74..186d6497b0e 100644
--- a/src/devices/bus/bbc/fdc/fdc.h
+++ b/src/devices/bus/bbc/fdc/fdc.h
@@ -11,7 +11,6 @@
#ifndef __BBC_FDC_SLOT__
#define __BBC_FDC_SLOT__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp
index 32edee27527..3e8f1bd9496 100644
--- a/src/devices/bus/bbc/fdc/opus.cpp
+++ b/src/devices/bus/bbc/fdc/opus.cpp
@@ -12,6 +12,7 @@
**********************************************************************/
+#include "emu.h"
#include "opus.h"
diff --git a/src/devices/bus/bbc/fdc/opus.h b/src/devices/bus/bbc/fdc/opus.h
index f134a649a6c..b59291bf205 100644
--- a/src/devices/bus/bbc/fdc/opus.h
+++ b/src/devices/bus/bbc/fdc/opus.h
@@ -10,7 +10,6 @@
#ifndef __BBC_OPUSFDC__
#define __BBC_OPUSFDC__
-#include "emu.h"
#include "fdc.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/bbc/fdc/watford.cpp b/src/devices/bus/bbc/fdc/watford.cpp
index 8a5a95551d7..38dc71049bf 100644
--- a/src/devices/bus/bbc/fdc/watford.cpp
+++ b/src/devices/bus/bbc/fdc/watford.cpp
@@ -11,6 +11,7 @@
**********************************************************************/
+#include "emu.h"
#include "watford.h"
diff --git a/src/devices/bus/bbc/fdc/watford.h b/src/devices/bus/bbc/fdc/watford.h
index aea965dca6d..9a29ee79777 100644
--- a/src/devices/bus/bbc/fdc/watford.h
+++ b/src/devices/bus/bbc/fdc/watford.h
@@ -10,7 +10,6 @@
#ifndef __BBC_WATFORD__
#define __BBC_WATFORD__
-#include "emu.h"
#include "fdc.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/bbc/joyport/joyport.cpp b/src/devices/bus/bbc/joyport/joyport.cpp
index 4c6f1aefe2f..5af727eb4f1 100644
--- a/src/devices/bus/bbc/joyport/joyport.cpp
+++ b/src/devices/bus/bbc/joyport/joyport.cpp
@@ -6,6 +6,7 @@
*****************************************************************************/
+#include "emu.h"
#include "joyport.h"
diff --git a/src/devices/bus/bbc/joyport/joyport.h b/src/devices/bus/bbc/joyport/joyport.h
index cd37d4b7937..158ce1433f7 100644
--- a/src/devices/bus/bbc/joyport/joyport.h
+++ b/src/devices/bus/bbc/joyport/joyport.h
@@ -31,7 +31,6 @@
#ifndef __COMPACT_JOYPORT__
#define __COMPACT_JOYPORT__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/bbc/joyport/joystick.cpp b/src/devices/bus/bbc/joyport/joystick.cpp
index 74eb3a67d29..e6c4b22b401 100644
--- a/src/devices/bus/bbc/joyport/joystick.cpp
+++ b/src/devices/bus/bbc/joyport/joystick.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "joystick.h"
//**************************************************************************
diff --git a/src/devices/bus/bbc/joyport/joystick.h b/src/devices/bus/bbc/joyport/joystick.h
index d5b1a163301..4f1c3dba611 100644
--- a/src/devices/bus/bbc/joyport/joystick.h
+++ b/src/devices/bus/bbc/joyport/joystick.h
@@ -12,7 +12,6 @@
#define __BBCMC_JOYSTICK__
-#include "emu.h"
#include "joyport.h"
//**************************************************************************
diff --git a/src/devices/bus/bbc/tube/tube.cpp b/src/devices/bus/bbc/tube/tube.cpp
index c67b8dd96e9..c242c5a8d69 100644
--- a/src/devices/bus/bbc/tube/tube.cpp
+++ b/src/devices/bus/bbc/tube/tube.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "tube.h"
diff --git a/src/devices/bus/bbc/tube/tube.h b/src/devices/bus/bbc/tube/tube.h
index 707bfba5fab..0828577de1d 100644
--- a/src/devices/bus/bbc/tube/tube.h
+++ b/src/devices/bus/bbc/tube/tube.h
@@ -36,7 +36,6 @@
#ifndef __BBC_TUBE_SLOT__
#define __BBC_TUBE_SLOT__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/bbc/userport/userport.cpp b/src/devices/bus/bbc/userport/userport.cpp
index 5a08fc836ed..f466c84a395 100644
--- a/src/devices/bus/bbc/userport/userport.cpp
+++ b/src/devices/bus/bbc/userport/userport.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "userport.h"
diff --git a/src/devices/bus/bbc/userport/userport.h b/src/devices/bus/bbc/userport/userport.h
index 89593d125f9..6258e57324c 100644
--- a/src/devices/bus/bbc/userport/userport.h
+++ b/src/devices/bus/bbc/userport/userport.h
@@ -30,7 +30,6 @@
#ifndef __BBC_USERPORT_SLOT__
#define __BBC_USERPORT_SLOT__
-#include "emu.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/bml3/bml3bus.h b/src/devices/bus/bml3/bml3bus.h
index c244b329539..3b90a25fd60 100644
--- a/src/devices/bus/bml3/bml3bus.h
+++ b/src/devices/bus/bml3/bml3bus.h
@@ -13,7 +13,6 @@
#ifndef __BML3BUS_H__
#define __BML3BUS_H__
-#include "emu.h"
#define BML3BUS_MAX_SLOTS 6
diff --git a/src/devices/bus/bml3/bml3kanji.h b/src/devices/bus/bml3/bml3kanji.h
index cf04c6a8fc2..1472f82d40b 100644
--- a/src/devices/bus/bml3/bml3kanji.h
+++ b/src/devices/bus/bml3/bml3kanji.h
@@ -11,7 +11,6 @@
#ifndef __BML3BUS_KANJI__
#define __BML3BUS_KANJI__
-#include "emu.h"
#include "bml3bus.h"
//**************************************************************************
diff --git a/src/devices/bus/bml3/bml3mp1802.h b/src/devices/bus/bml3/bml3mp1802.h
index 2047e3146d2..27e109fc67d 100644
--- a/src/devices/bus/bml3/bml3mp1802.h
+++ b/src/devices/bus/bml3/bml3mp1802.h
@@ -12,7 +12,6 @@
#ifndef __BML3BUS_MP1802__
#define __BML3BUS_MP1802__
-#include "emu.h"
#include "bml3bus.h"
#include "imagedev/flopdrv.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/bml3/bml3mp1805.h b/src/devices/bus/bml3/bml3mp1805.h
index 98b22f0c790..6ea64bc2956 100644
--- a/src/devices/bus/bml3/bml3mp1805.h
+++ b/src/devices/bus/bml3/bml3mp1805.h
@@ -12,7 +12,6 @@
#ifndef __BML3BUS_MP1805__
#define __BML3BUS_MP1805__
-#include "emu.h"
#include "bml3bus.h"
#include "imagedev/flopdrv.h"
#include "machine/mc6843.h"
diff --git a/src/devices/bus/bw2/exp.cpp b/src/devices/bus/bw2/exp.cpp
index 9ece8a6f071..826380110cb 100644
--- a/src/devices/bus/bw2/exp.cpp
+++ b/src/devices/bus/bw2/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/bw2/exp.h b/src/devices/bus/bw2/exp.h
index c91c828c6d2..1be10d400e7 100644
--- a/src/devices/bus/bw2/exp.h
+++ b/src/devices/bus/bw2/exp.h
@@ -39,7 +39,6 @@
#ifndef __BW2_EXPANSION_SLOT__
#define __BW2_EXPANSION_SLOT__
-#include "emu.h"
diff --git a/src/devices/bus/bw2/ramcard.cpp b/src/devices/bus/bw2/ramcard.cpp
index 17ed1397a4b..a40a238edbb 100644
--- a/src/devices/bus/bw2/ramcard.cpp
+++ b/src/devices/bus/bw2/ramcard.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ramcard.h"
diff --git a/src/devices/bus/bw2/ramcard.h b/src/devices/bus/bw2/ramcard.h
index 2e9707a69c6..260dc423e30 100644
--- a/src/devices/bus/bw2/ramcard.h
+++ b/src/devices/bus/bw2/ramcard.h
@@ -11,7 +11,6 @@
#ifndef __BW2_RAMCARD__
#define __BW2_RAMCARD__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/16kb.cpp b/src/devices/bus/c64/16kb.cpp
index b261b6bd2af..87c5580f56d 100644
--- a/src/devices/bus/c64/16kb.cpp
+++ b/src/devices/bus/c64/16kb.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "16kb.h"
diff --git a/src/devices/bus/c64/16kb.h b/src/devices/bus/c64/16kb.h
index 3b3a72db8d8..4b688b35a0d 100644
--- a/src/devices/bus/c64/16kb.h
+++ b/src/devices/bus/c64/16kb.h
@@ -12,7 +12,6 @@
#define __C64_16KB__
-#include "emu.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/4dxh.cpp b/src/devices/bus/c64/4dxh.cpp
index af86120b97f..9328f853637 100644
--- a/src/devices/bus/c64/4dxh.cpp
+++ b/src/devices/bus/c64/4dxh.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "4dxh.h"
diff --git a/src/devices/bus/c64/4dxh.h b/src/devices/bus/c64/4dxh.h
index 25558b6ac3c..2360307e26b 100644
--- a/src/devices/bus/c64/4dxh.h
+++ b/src/devices/bus/c64/4dxh.h
@@ -12,7 +12,6 @@
#define __C64_4DXH__
-#include "emu.h"
#include "user.h"
diff --git a/src/devices/bus/c64/4ksa.cpp b/src/devices/bus/c64/4ksa.cpp
index 78c98279fd0..a7ca6ac6f4c 100644
--- a/src/devices/bus/c64/4ksa.cpp
+++ b/src/devices/bus/c64/4ksa.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "4ksa.h"
diff --git a/src/devices/bus/c64/4ksa.h b/src/devices/bus/c64/4ksa.h
index 96ce1c1e704..7d9594cb4b3 100644
--- a/src/devices/bus/c64/4ksa.h
+++ b/src/devices/bus/c64/4ksa.h
@@ -12,7 +12,6 @@
#define __C64_4KSA__
-#include "emu.h"
#include "user.h"
diff --git a/src/devices/bus/c64/4tba.cpp b/src/devices/bus/c64/4tba.cpp
index b68672871d3..3d140deb696 100644
--- a/src/devices/bus/c64/4tba.cpp
+++ b/src/devices/bus/c64/4tba.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "4tba.h"
diff --git a/src/devices/bus/c64/4tba.h b/src/devices/bus/c64/4tba.h
index ec28657c06e..01b185248dd 100644
--- a/src/devices/bus/c64/4tba.h
+++ b/src/devices/bus/c64/4tba.h
@@ -12,7 +12,6 @@
#define __C64_4TBA__
-#include "emu.h"
#include "user.h"
diff --git a/src/devices/bus/c64/bn1541.cpp b/src/devices/bus/c64/bn1541.cpp
index 7b88d78f4f1..852e7d4860f 100644
--- a/src/devices/bus/c64/bn1541.cpp
+++ b/src/devices/bus/c64/bn1541.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "bn1541.h"
diff --git a/src/devices/bus/c64/bn1541.h b/src/devices/bus/c64/bn1541.h
index 7578145fc67..9859b272bd7 100644
--- a/src/devices/bus/c64/bn1541.h
+++ b/src/devices/bus/c64/bn1541.h
@@ -12,7 +12,6 @@
#define __C64_BN1541__
-#include "emu.h"
#include "user.h"
diff --git a/src/devices/bus/c64/c128_comal80.cpp b/src/devices/bus/c64/c128_comal80.cpp
index b092a996cbb..6085a6e9166 100644
--- a/src/devices/bus/c64/c128_comal80.cpp
+++ b/src/devices/bus/c64/c128_comal80.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "c128_comal80.h"
diff --git a/src/devices/bus/c64/c128_comal80.h b/src/devices/bus/c64/c128_comal80.h
index 42709121173..58d92837f11 100644
--- a/src/devices/bus/c64/c128_comal80.h
+++ b/src/devices/bus/c64/c128_comal80.h
@@ -12,7 +12,6 @@
#define __C128_COMAL80__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/c128_partner.cpp b/src/devices/bus/c64/c128_partner.cpp
index 3002a6e6edd..18fce1fbbaa 100644
--- a/src/devices/bus/c64/c128_partner.cpp
+++ b/src/devices/bus/c64/c128_partner.cpp
@@ -28,6 +28,7 @@
*/
+#include "emu.h"
#include "c128_partner.h"
diff --git a/src/devices/bus/c64/c128_partner.h b/src/devices/bus/c64/c128_partner.h
index cc70bc459fa..f38295f7231 100644
--- a/src/devices/bus/c64/c128_partner.h
+++ b/src/devices/bus/c64/c128_partner.h
@@ -11,7 +11,6 @@
#ifndef __C128_PARTNER__
#define __C128_PARTNER__
-#include "emu.h"
#include "bus/c64/exp.h"
#include "bus/vcs_ctrl/ctrl.h"
diff --git a/src/devices/bus/c64/comal80.cpp b/src/devices/bus/c64/comal80.cpp
index cab19fe118f..47647290949 100644
--- a/src/devices/bus/c64/comal80.cpp
+++ b/src/devices/bus/c64/comal80.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "comal80.h"
diff --git a/src/devices/bus/c64/comal80.h b/src/devices/bus/c64/comal80.h
index 3c38c774e1d..349911eb9bb 100644
--- a/src/devices/bus/c64/comal80.h
+++ b/src/devices/bus/c64/comal80.h
@@ -12,7 +12,6 @@
#define __COMAL80__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/cpm.cpp b/src/devices/bus/c64/cpm.cpp
index 926eda0a15e..0da1f1e2813 100644
--- a/src/devices/bus/c64/cpm.cpp
+++ b/src/devices/bus/c64/cpm.cpp
@@ -16,6 +16,7 @@
*/
+#include "emu.h"
#include "cpm.h"
diff --git a/src/devices/bus/c64/cpm.h b/src/devices/bus/c64/cpm.h
index 95ba8e9ea57..603465bae88 100644
--- a/src/devices/bus/c64/cpm.h
+++ b/src/devices/bus/c64/cpm.h
@@ -11,7 +11,6 @@
#ifndef __CPM__
#define __CPM__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp
index ffee35fc9c0..a92877bc196 100644
--- a/src/devices/bus/c64/currah_speech.cpp
+++ b/src/devices/bus/c64/currah_speech.cpp
@@ -67,6 +67,7 @@ Notes:
*/
+#include "emu.h"
#include "currah_speech.h"
diff --git a/src/devices/bus/c64/currah_speech.h b/src/devices/bus/c64/currah_speech.h
index 2dfd9d519eb..e11afc520fc 100644
--- a/src/devices/bus/c64/currah_speech.h
+++ b/src/devices/bus/c64/currah_speech.h
@@ -12,7 +12,6 @@
#define __CURRAH_SPEECH_64__
-#include "emu.h"
#include "exp.h"
#include "sound/sp0256.h"
diff --git a/src/devices/bus/c64/dela_ep256.cpp b/src/devices/bus/c64/dela_ep256.cpp
index 3706c16deff..a4ce5b8df79 100644
--- a/src/devices/bus/c64/dela_ep256.cpp
+++ b/src/devices/bus/c64/dela_ep256.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "dela_ep256.h"
diff --git a/src/devices/bus/c64/dela_ep256.h b/src/devices/bus/c64/dela_ep256.h
index d2822633000..5b7c4413f5d 100644
--- a/src/devices/bus/c64/dela_ep256.h
+++ b/src/devices/bus/c64/dela_ep256.h
@@ -12,7 +12,6 @@
#define __DELA_EP256__
-#include "emu.h"
#include "exp.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
diff --git a/src/devices/bus/c64/dela_ep64.cpp b/src/devices/bus/c64/dela_ep64.cpp
index 9acdf42969c..3a70145d609 100644
--- a/src/devices/bus/c64/dela_ep64.cpp
+++ b/src/devices/bus/c64/dela_ep64.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "dela_ep64.h"
diff --git a/src/devices/bus/c64/dela_ep64.h b/src/devices/bus/c64/dela_ep64.h
index edda0ad2824..88b1c91ad89 100644
--- a/src/devices/bus/c64/dela_ep64.h
+++ b/src/devices/bus/c64/dela_ep64.h
@@ -12,7 +12,6 @@
#define __DELA_EP64__
-#include "emu.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/dela_ep7x8.cpp b/src/devices/bus/c64/dela_ep7x8.cpp
index 3100d048436..3c6012b57af 100644
--- a/src/devices/bus/c64/dela_ep7x8.cpp
+++ b/src/devices/bus/c64/dela_ep7x8.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "dela_ep7x8.h"
diff --git a/src/devices/bus/c64/dela_ep7x8.h b/src/devices/bus/c64/dela_ep7x8.h
index 56b8e12f62c..a5f3fd5b4ab 100644
--- a/src/devices/bus/c64/dela_ep7x8.h
+++ b/src/devices/bus/c64/dela_ep7x8.h
@@ -12,7 +12,6 @@
#define __DELA_EP7X8__
-#include "emu.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/dinamic.cpp b/src/devices/bus/c64/dinamic.cpp
index 78aa8f2fbc7..3cebd073deb 100644
--- a/src/devices/bus/c64/dinamic.cpp
+++ b/src/devices/bus/c64/dinamic.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "dinamic.h"
diff --git a/src/devices/bus/c64/dinamic.h b/src/devices/bus/c64/dinamic.h
index c2f592c48ae..acab7b79563 100644
--- a/src/devices/bus/c64/dinamic.h
+++ b/src/devices/bus/c64/dinamic.h
@@ -12,7 +12,6 @@
#define __DINAMIC__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/dqbb.cpp b/src/devices/bus/c64/dqbb.cpp
index c145e8660ad..ab49e6106f2 100644
--- a/src/devices/bus/c64/dqbb.cpp
+++ b/src/devices/bus/c64/dqbb.cpp
@@ -15,6 +15,7 @@
*/
+#include "emu.h"
#include "dqbb.h"
diff --git a/src/devices/bus/c64/dqbb.h b/src/devices/bus/c64/dqbb.h
index 56fa57ccb4d..9a4233dc94e 100644
--- a/src/devices/bus/c64/dqbb.h
+++ b/src/devices/bus/c64/dqbb.h
@@ -12,7 +12,6 @@
#define __DQBB__
-#include "emu.h"
#include "exp.h"
#include "machine/nvram.h"
diff --git a/src/devices/bus/c64/easy_calc_result.cpp b/src/devices/bus/c64/easy_calc_result.cpp
index edb0510f1e9..ad197f6daff 100644
--- a/src/devices/bus/c64/easy_calc_result.cpp
+++ b/src/devices/bus/c64/easy_calc_result.cpp
@@ -27,6 +27,7 @@
*/
+#include "emu.h"
#include "easy_calc_result.h"
diff --git a/src/devices/bus/c64/easy_calc_result.h b/src/devices/bus/c64/easy_calc_result.h
index ab00c7fc874..51b5b053e64 100644
--- a/src/devices/bus/c64/easy_calc_result.h
+++ b/src/devices/bus/c64/easy_calc_result.h
@@ -12,7 +12,6 @@
#define __EASY_CALC_RESULT__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/easyflash.cpp b/src/devices/bus/c64/easyflash.cpp
index ee37e79e47e..7e247f9c4b3 100644
--- a/src/devices/bus/c64/easyflash.cpp
+++ b/src/devices/bus/c64/easyflash.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "easyflash.h"
diff --git a/src/devices/bus/c64/easyflash.h b/src/devices/bus/c64/easyflash.h
index e297f97695e..aa28f13d23d 100644
--- a/src/devices/bus/c64/easyflash.h
+++ b/src/devices/bus/c64/easyflash.h
@@ -12,7 +12,6 @@
#define __EASYFLASH__
-#include "emu.h"
#include "exp.h"
#include "machine/intelfsh.h"
diff --git a/src/devices/bus/c64/epyx_fast_load.cpp b/src/devices/bus/c64/epyx_fast_load.cpp
index 57ad6f45bf3..7bb627120ac 100644
--- a/src/devices/bus/c64/epyx_fast_load.cpp
+++ b/src/devices/bus/c64/epyx_fast_load.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "epyx_fast_load.h"
diff --git a/src/devices/bus/c64/epyx_fast_load.h b/src/devices/bus/c64/epyx_fast_load.h
index 6f12d0d6857..cede6124a40 100644
--- a/src/devices/bus/c64/epyx_fast_load.h
+++ b/src/devices/bus/c64/epyx_fast_load.h
@@ -12,7 +12,6 @@
#define __EPYX_FAST_LOAD__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/exos.cpp b/src/devices/bus/c64/exos.cpp
index 027259aebcf..b769f06a106 100644
--- a/src/devices/bus/c64/exos.cpp
+++ b/src/devices/bus/c64/exos.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exos.h"
diff --git a/src/devices/bus/c64/exos.h b/src/devices/bus/c64/exos.h
index 7aa210fa27b..76bb85e1a0b 100644
--- a/src/devices/bus/c64/exos.h
+++ b/src/devices/bus/c64/exos.h
@@ -12,7 +12,6 @@
#define __EXOS__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/exp.cpp b/src/devices/bus/c64/exp.cpp
index ab37fe19481..ad6f72535aa 100644
--- a/src/devices/bus/c64/exp.cpp
+++ b/src/devices/bus/c64/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/exp.h b/src/devices/bus/c64/exp.h
index 67cdd7bd235..060beb2dd69 100644
--- a/src/devices/bus/c64/exp.h
+++ b/src/devices/bus/c64/exp.h
@@ -36,7 +36,6 @@
#ifndef __C64_EXPANSION_SLOT__
#define __C64_EXPANSION_SLOT__
-#include "emu.h"
#include "softlist_dev.h"
#include "formats/cbm_crt.h"
diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp
index 7ee25067e60..890c2ecfd5f 100644
--- a/src/devices/bus/c64/fcc.cpp
+++ b/src/devices/bus/c64/fcc.cpp
@@ -21,6 +21,7 @@
*/
+#include "emu.h"
#include "fcc.h"
diff --git a/src/devices/bus/c64/fcc.h b/src/devices/bus/c64/fcc.h
index 5a6960bd8a8..53573a4ea40 100644
--- a/src/devices/bus/c64/fcc.h
+++ b/src/devices/bus/c64/fcc.h
@@ -11,7 +11,6 @@
#ifndef __FCC__
#define __FCC__
-#include "emu.h"
#include "exp.h"
#include "cpu/m6502/m65sc02.h"
diff --git a/src/devices/bus/c64/final.cpp b/src/devices/bus/c64/final.cpp
index a1d34e170aa..07c85db5b62 100644
--- a/src/devices/bus/c64/final.cpp
+++ b/src/devices/bus/c64/final.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "final.h"
diff --git a/src/devices/bus/c64/final.h b/src/devices/bus/c64/final.h
index 85deee27964..4bfe2e96d6d 100644
--- a/src/devices/bus/c64/final.h
+++ b/src/devices/bus/c64/final.h
@@ -12,7 +12,6 @@
#define __FINAL__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/final3.cpp b/src/devices/bus/c64/final3.cpp
index 7815ec1d5dc..12c68483d1b 100644
--- a/src/devices/bus/c64/final3.cpp
+++ b/src/devices/bus/c64/final3.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "final3.h"
diff --git a/src/devices/bus/c64/final3.h b/src/devices/bus/c64/final3.h
index 92c12da282a..759bba15514 100644
--- a/src/devices/bus/c64/final3.h
+++ b/src/devices/bus/c64/final3.h
@@ -12,7 +12,6 @@
#define __FINAL3__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/fun_play.cpp b/src/devices/bus/c64/fun_play.cpp
index e265bf05442..02abc5c909f 100644
--- a/src/devices/bus/c64/fun_play.cpp
+++ b/src/devices/bus/c64/fun_play.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "fun_play.h"
diff --git a/src/devices/bus/c64/fun_play.h b/src/devices/bus/c64/fun_play.h
index 3a7c5bee76f..7fcef385018 100644
--- a/src/devices/bus/c64/fun_play.h
+++ b/src/devices/bus/c64/fun_play.h
@@ -12,7 +12,6 @@
#define __FUN_PLAY__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/geocable.cpp b/src/devices/bus/c64/geocable.cpp
index 0c884418ce5..2827ecc3585 100644
--- a/src/devices/bus/c64/geocable.cpp
+++ b/src/devices/bus/c64/geocable.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "geocable.h"
diff --git a/src/devices/bus/c64/geocable.h b/src/devices/bus/c64/geocable.h
index e7faad2553c..5dd56ffa021 100644
--- a/src/devices/bus/c64/geocable.h
+++ b/src/devices/bus/c64/geocable.h
@@ -12,7 +12,6 @@
#define __C64_GEOCABLE__
-#include "emu.h"
#include "user.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/devices/bus/c64/georam.cpp b/src/devices/bus/c64/georam.cpp
index fe147565f79..e06ef40bcf3 100644
--- a/src/devices/bus/c64/georam.cpp
+++ b/src/devices/bus/c64/georam.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "georam.h"
diff --git a/src/devices/bus/c64/georam.h b/src/devices/bus/c64/georam.h
index 1d570f51e71..ed285ce5221 100644
--- a/src/devices/bus/c64/georam.h
+++ b/src/devices/bus/c64/georam.h
@@ -12,7 +12,6 @@
#define __GEORAM__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp
index f96b7885699..5139b0bf31f 100644
--- a/src/devices/bus/c64/ide64.cpp
+++ b/src/devices/bus/c64/ide64.cpp
@@ -19,6 +19,7 @@
*/
+#include "emu.h"
#include "ide64.h"
diff --git a/src/devices/bus/c64/ide64.h b/src/devices/bus/c64/ide64.h
index 2a7294066e7..ad7ad042ae9 100644
--- a/src/devices/bus/c64/ide64.h
+++ b/src/devices/bus/c64/ide64.h
@@ -12,7 +12,6 @@
#define __IDE64__
-#include "emu.h"
#include "exp.h"
#include "machine/ds1302.h"
#include "machine/ataintf.h"
diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp
index e1156336d39..547e3a8787a 100644
--- a/src/devices/bus/c64/ieee488.cpp
+++ b/src/devices/bus/c64/ieee488.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ieee488.h"
diff --git a/src/devices/bus/c64/ieee488.h b/src/devices/bus/c64/ieee488.h
index 6fac297f40b..037f493cb7a 100644
--- a/src/devices/bus/c64/ieee488.h
+++ b/src/devices/bus/c64/ieee488.h
@@ -11,7 +11,6 @@
#ifndef __C64_IEEE488__
#define __C64_IEEE488__
-#include "emu.h"
#include "bus/ieee488/ieee488.h"
#include "machine/6525tpi.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/kingsoft.cpp b/src/devices/bus/c64/kingsoft.cpp
index 4da97e0496b..4a6d001d384 100644
--- a/src/devices/bus/c64/kingsoft.cpp
+++ b/src/devices/bus/c64/kingsoft.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "kingsoft.h"
diff --git a/src/devices/bus/c64/kingsoft.h b/src/devices/bus/c64/kingsoft.h
index 30d828dff64..039bed77b09 100644
--- a/src/devices/bus/c64/kingsoft.h
+++ b/src/devices/bus/c64/kingsoft.h
@@ -12,7 +12,6 @@
#define __KINGSOFT__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/mach5.cpp b/src/devices/bus/c64/mach5.cpp
index e8ba7f2a094..b4069b1fa31 100644
--- a/src/devices/bus/c64/mach5.cpp
+++ b/src/devices/bus/c64/mach5.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mach5.h"
diff --git a/src/devices/bus/c64/mach5.h b/src/devices/bus/c64/mach5.h
index 128b7d232a0..f93d23dc51b 100644
--- a/src/devices/bus/c64/mach5.h
+++ b/src/devices/bus/c64/mach5.h
@@ -11,7 +11,6 @@
#ifndef __MACH5__
#define __MACH5__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/magic_desk.cpp b/src/devices/bus/c64/magic_desk.cpp
index 401f51956ee..3de61c7507c 100644
--- a/src/devices/bus/c64/magic_desk.cpp
+++ b/src/devices/bus/c64/magic_desk.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "magic_desk.h"
diff --git a/src/devices/bus/c64/magic_desk.h b/src/devices/bus/c64/magic_desk.h
index 645c3f043b2..fb45fde1161 100644
--- a/src/devices/bus/c64/magic_desk.h
+++ b/src/devices/bus/c64/magic_desk.h
@@ -12,7 +12,6 @@
#define __MAGIC_DESK__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp
index 826edc35241..9e22f899caf 100644
--- a/src/devices/bus/c64/magic_formel.cpp
+++ b/src/devices/bus/c64/magic_formel.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "magic_formel.h"
diff --git a/src/devices/bus/c64/magic_formel.h b/src/devices/bus/c64/magic_formel.h
index ffc90c1db0c..3068a62ec66 100644
--- a/src/devices/bus/c64/magic_formel.h
+++ b/src/devices/bus/c64/magic_formel.h
@@ -11,7 +11,6 @@
#ifndef __MAGIC_FORMEL__
#define __MAGIC_FORMEL__
-#include "emu.h"
#include "exp.h"
#include "machine/6821pia.h"
diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp
index a3a8353494e..8f46919561d 100644
--- a/src/devices/bus/c64/magic_voice.cpp
+++ b/src/devices/bus/c64/magic_voice.cpp
@@ -39,6 +39,7 @@ http://www.stefan-uhlmann.de/cbm/MVM/index.html
*/
+#include "emu.h"
#include "magic_voice.h"
diff --git a/src/devices/bus/c64/magic_voice.h b/src/devices/bus/c64/magic_voice.h
index c8b11a851aa..06bb5df632b 100644
--- a/src/devices/bus/c64/magic_voice.h
+++ b/src/devices/bus/c64/magic_voice.h
@@ -11,7 +11,6 @@
#ifndef __MAGIC_VOICE__
#define __MAGIC_VOICE__
-#include "emu.h"
#include "machine/40105.h"
#include "machine/6525tpi.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/midi_maplin.cpp b/src/devices/bus/c64/midi_maplin.cpp
index 2c389a259a9..84bd4b89b3c 100644
--- a/src/devices/bus/c64/midi_maplin.cpp
+++ b/src/devices/bus/c64/midi_maplin.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "midi_maplin.h"
#include "machine/clock.h"
#include "bus/midi/midi.h"
diff --git a/src/devices/bus/c64/midi_namesoft.cpp b/src/devices/bus/c64/midi_namesoft.cpp
index cefff6e8297..65863317a84 100644
--- a/src/devices/bus/c64/midi_namesoft.cpp
+++ b/src/devices/bus/c64/midi_namesoft.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "midi_namesoft.h"
#include "machine/clock.h"
#include "bus/midi/midi.h"
diff --git a/src/devices/bus/c64/midi_passport.cpp b/src/devices/bus/c64/midi_passport.cpp
index 9c09ab4184f..01cb4ce0e63 100644
--- a/src/devices/bus/c64/midi_passport.cpp
+++ b/src/devices/bus/c64/midi_passport.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "midi_passport.h"
#include "machine/clock.h"
#include "bus/midi/midi.h"
diff --git a/src/devices/bus/c64/midi_sci.cpp b/src/devices/bus/c64/midi_sci.cpp
index ae8caad26dd..33846c6d5b6 100644
--- a/src/devices/bus/c64/midi_sci.cpp
+++ b/src/devices/bus/c64/midi_sci.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "midi_sci.h"
#include "machine/clock.h"
#include "bus/midi/midi.h"
diff --git a/src/devices/bus/c64/midi_siel.cpp b/src/devices/bus/c64/midi_siel.cpp
index 913405cfb06..ff5bf42e0ad 100644
--- a/src/devices/bus/c64/midi_siel.cpp
+++ b/src/devices/bus/c64/midi_siel.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "midi_siel.h"
#include "machine/clock.h"
#include "bus/midi/midi.h"
diff --git a/src/devices/bus/c64/mikro_assembler.cpp b/src/devices/bus/c64/mikro_assembler.cpp
index 28f15a5efef..e5ac7c004fb 100644
--- a/src/devices/bus/c64/mikro_assembler.cpp
+++ b/src/devices/bus/c64/mikro_assembler.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mikro_assembler.h"
diff --git a/src/devices/bus/c64/mikro_assembler.h b/src/devices/bus/c64/mikro_assembler.h
index 7d6bfee782e..0ab466d5057 100644
--- a/src/devices/bus/c64/mikro_assembler.h
+++ b/src/devices/bus/c64/mikro_assembler.h
@@ -12,7 +12,6 @@
#define __MIKRO_ASSEMBLER__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp
index b1929b37943..7434dc425e2 100644
--- a/src/devices/bus/c64/multiscreen.cpp
+++ b/src/devices/bus/c64/multiscreen.cpp
@@ -56,6 +56,7 @@
*/
+#include "emu.h"
#include "multiscreen.h"
diff --git a/src/devices/bus/c64/multiscreen.h b/src/devices/bus/c64/multiscreen.h
index 7a457a53ba5..c2e79272853 100644
--- a/src/devices/bus/c64/multiscreen.h
+++ b/src/devices/bus/c64/multiscreen.h
@@ -12,7 +12,6 @@
#define __MULTISCREEN__
-#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/music64.cpp b/src/devices/bus/c64/music64.cpp
index 8f5de837cbf..98039ff46d7 100644
--- a/src/devices/bus/c64/music64.cpp
+++ b/src/devices/bus/c64/music64.cpp
@@ -28,6 +28,7 @@
170 RETURN
*/
+#include "emu.h"
#include "music64.h"
diff --git a/src/devices/bus/c64/music64.h b/src/devices/bus/c64/music64.h
index 34f102b99a9..9de8f992131 100644
--- a/src/devices/bus/c64/music64.h
+++ b/src/devices/bus/c64/music64.h
@@ -11,7 +11,6 @@
#ifndef __MUSIC64__
#define __MUSIC64__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/neoram.cpp b/src/devices/bus/c64/neoram.cpp
index 2e33ee69729..7ff3a4d182d 100644
--- a/src/devices/bus/c64/neoram.cpp
+++ b/src/devices/bus/c64/neoram.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "neoram.h"
diff --git a/src/devices/bus/c64/neoram.h b/src/devices/bus/c64/neoram.h
index 0bd98158776..3890fd6c21e 100644
--- a/src/devices/bus/c64/neoram.h
+++ b/src/devices/bus/c64/neoram.h
@@ -12,7 +12,6 @@
#define __NEORAM__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/ocean.cpp b/src/devices/bus/c64/ocean.cpp
index 7961111e606..8b792422283 100644
--- a/src/devices/bus/c64/ocean.cpp
+++ b/src/devices/bus/c64/ocean.cpp
@@ -28,6 +28,7 @@
*/
+#include "emu.h"
#include "ocean.h"
diff --git a/src/devices/bus/c64/ocean.h b/src/devices/bus/c64/ocean.h
index c5508a6c9ac..b871dfac89e 100644
--- a/src/devices/bus/c64/ocean.h
+++ b/src/devices/bus/c64/ocean.h
@@ -12,7 +12,6 @@
#define __OCEAN__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/pagefox.cpp b/src/devices/bus/c64/pagefox.cpp
index c1ee255b670..e3a890df6a1 100644
--- a/src/devices/bus/c64/pagefox.cpp
+++ b/src/devices/bus/c64/pagefox.cpp
@@ -28,6 +28,7 @@
*/
+#include "emu.h"
#include "pagefox.h"
diff --git a/src/devices/bus/c64/pagefox.h b/src/devices/bus/c64/pagefox.h
index 70dec864689..2a8702af60b 100644
--- a/src/devices/bus/c64/pagefox.h
+++ b/src/devices/bus/c64/pagefox.h
@@ -12,7 +12,6 @@
#define __PAGEFOX__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/partner.cpp b/src/devices/bus/c64/partner.cpp
index 3f33ae0aaa2..b7b9875a9ee 100644
--- a/src/devices/bus/c64/partner.cpp
+++ b/src/devices/bus/c64/partner.cpp
@@ -27,6 +27,7 @@
*/
+#include "emu.h"
#include "partner.h"
diff --git a/src/devices/bus/c64/partner.h b/src/devices/bus/c64/partner.h
index 28a1f7c59a4..9e44f0a1e6a 100644
--- a/src/devices/bus/c64/partner.h
+++ b/src/devices/bus/c64/partner.h
@@ -11,7 +11,6 @@
#ifndef __PARTNER__
#define __PARTNER__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/prophet64.cpp b/src/devices/bus/c64/prophet64.cpp
index 3cd575e93cb..bd9cf55b123 100644
--- a/src/devices/bus/c64/prophet64.cpp
+++ b/src/devices/bus/c64/prophet64.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "prophet64.h"
diff --git a/src/devices/bus/c64/prophet64.h b/src/devices/bus/c64/prophet64.h
index 8b39fbacfa7..9c755b1aa97 100644
--- a/src/devices/bus/c64/prophet64.h
+++ b/src/devices/bus/c64/prophet64.h
@@ -11,7 +11,6 @@
#ifndef __PROPHET64__
#define __PROPHET64__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/ps64.cpp b/src/devices/bus/c64/ps64.cpp
index 1f097c3c416..7fa0f361687 100644
--- a/src/devices/bus/c64/ps64.cpp
+++ b/src/devices/bus/c64/ps64.cpp
@@ -40,6 +40,7 @@
*/
+#include "emu.h"
#include "ps64.h"
diff --git a/src/devices/bus/c64/ps64.h b/src/devices/bus/c64/ps64.h
index 39397875508..f6f7be9ca12 100644
--- a/src/devices/bus/c64/ps64.h
+++ b/src/devices/bus/c64/ps64.h
@@ -12,7 +12,6 @@
#define __PS64__
-#include "emu.h"
#include "exp.h"
#include "sound/votrax.h"
diff --git a/src/devices/bus/c64/reu.cpp b/src/devices/bus/c64/reu.cpp
index f1f58c50bb5..777336aa030 100644
--- a/src/devices/bus/c64/reu.cpp
+++ b/src/devices/bus/c64/reu.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "reu.h"
diff --git a/src/devices/bus/c64/reu.h b/src/devices/bus/c64/reu.h
index adda61566ad..66888f87f0d 100644
--- a/src/devices/bus/c64/reu.h
+++ b/src/devices/bus/c64/reu.h
@@ -12,7 +12,6 @@
#define __REU__
-#include "emu.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/rex.cpp b/src/devices/bus/c64/rex.cpp
index 84b883c40c9..81612627e03 100644
--- a/src/devices/bus/c64/rex.cpp
+++ b/src/devices/bus/c64/rex.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "rex.h"
diff --git a/src/devices/bus/c64/rex.h b/src/devices/bus/c64/rex.h
index d12e771124e..65ea804e159 100644
--- a/src/devices/bus/c64/rex.h
+++ b/src/devices/bus/c64/rex.h
@@ -12,7 +12,6 @@
#define __REX__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/rex_ep256.cpp b/src/devices/bus/c64/rex_ep256.cpp
index 772840706c0..0ccfd9fb3c8 100644
--- a/src/devices/bus/c64/rex_ep256.cpp
+++ b/src/devices/bus/c64/rex_ep256.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "rex_ep256.h"
diff --git a/src/devices/bus/c64/rex_ep256.h b/src/devices/bus/c64/rex_ep256.h
index 6c12bb69922..05859b4fc3e 100644
--- a/src/devices/bus/c64/rex_ep256.h
+++ b/src/devices/bus/c64/rex_ep256.h
@@ -12,7 +12,6 @@
#define __REX_EP256__
-#include "emu.h"
#include "bus/generic/slot.h"
#include "bus/generic/carts.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/ross.cpp b/src/devices/bus/c64/ross.cpp
index 84e94c8e1ef..fb5bde6f5cc 100644
--- a/src/devices/bus/c64/ross.cpp
+++ b/src/devices/bus/c64/ross.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ross.h"
diff --git a/src/devices/bus/c64/ross.h b/src/devices/bus/c64/ross.h
index f644521fef9..e6096c1d9bd 100644
--- a/src/devices/bus/c64/ross.h
+++ b/src/devices/bus/c64/ross.h
@@ -12,7 +12,6 @@
#define __ROSS__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp
index 48d93789dcf..50b80fefd8f 100644
--- a/src/devices/bus/c64/sfx_sound_expander.cpp
+++ b/src/devices/bus/c64/sfx_sound_expander.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "sfx_sound_expander.h"
diff --git a/src/devices/bus/c64/sfx_sound_expander.h b/src/devices/bus/c64/sfx_sound_expander.h
index 7e8df5ce2dd..f0d0e132dd1 100644
--- a/src/devices/bus/c64/sfx_sound_expander.h
+++ b/src/devices/bus/c64/sfx_sound_expander.h
@@ -11,7 +11,6 @@
#ifndef __SFX_SOUND_EXPANDER__
#define __SFX_SOUND_EXPANDER__
-#include "emu.h"
#include "exp.h"
#include "sound/3526intf.h"
diff --git a/src/devices/bus/c64/silverrock.cpp b/src/devices/bus/c64/silverrock.cpp
index e9a7dcf11eb..8907aa2f9b5 100644
--- a/src/devices/bus/c64/silverrock.cpp
+++ b/src/devices/bus/c64/silverrock.cpp
@@ -27,6 +27,7 @@
*/
+#include "emu.h"
#include "silverrock.h"
diff --git a/src/devices/bus/c64/silverrock.h b/src/devices/bus/c64/silverrock.h
index f9bd9f1ae65..ed399f18698 100644
--- a/src/devices/bus/c64/silverrock.h
+++ b/src/devices/bus/c64/silverrock.h
@@ -12,7 +12,6 @@
#define __SILVERROCK__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/simons_basic.cpp b/src/devices/bus/c64/simons_basic.cpp
index f59945130fe..f7980d91221 100644
--- a/src/devices/bus/c64/simons_basic.cpp
+++ b/src/devices/bus/c64/simons_basic.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "simons_basic.h"
diff --git a/src/devices/bus/c64/simons_basic.h b/src/devices/bus/c64/simons_basic.h
index 3d79ea93810..d08686018f9 100644
--- a/src/devices/bus/c64/simons_basic.h
+++ b/src/devices/bus/c64/simons_basic.h
@@ -12,7 +12,6 @@
#define __SIMONS_BASIC__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/speakeasy.cpp b/src/devices/bus/c64/speakeasy.cpp
index 6c59b7a11a5..3a2d770eedd 100644
--- a/src/devices/bus/c64/speakeasy.cpp
+++ b/src/devices/bus/c64/speakeasy.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "speakeasy.h"
diff --git a/src/devices/bus/c64/speakeasy.h b/src/devices/bus/c64/speakeasy.h
index 136a565344f..0dee7203789 100644
--- a/src/devices/bus/c64/speakeasy.h
+++ b/src/devices/bus/c64/speakeasy.h
@@ -11,7 +11,6 @@
#ifndef __C64_SPEAKEASY__
#define __C64_SPEAKEASY__
-#include "emu.h"
#include "exp.h"
#include "sound/votrax.h"
diff --git a/src/devices/bus/c64/stardos.cpp b/src/devices/bus/c64/stardos.cpp
index 44cbdc0d6a0..9e258fdc73e 100644
--- a/src/devices/bus/c64/stardos.cpp
+++ b/src/devices/bus/c64/stardos.cpp
@@ -26,6 +26,7 @@
*/
+#include "emu.h"
#include "stardos.h"
diff --git a/src/devices/bus/c64/stardos.h b/src/devices/bus/c64/stardos.h
index ec1f366f5de..337101c8f7d 100644
--- a/src/devices/bus/c64/stardos.h
+++ b/src/devices/bus/c64/stardos.h
@@ -12,7 +12,6 @@
#define __STARDOS__
-#include "emu.h"
#include "exp.h"
#include "machine/6821pia.h"
diff --git a/src/devices/bus/c64/std.cpp b/src/devices/bus/c64/std.cpp
index 4e1c74a1abf..045f8909eec 100644
--- a/src/devices/bus/c64/std.cpp
+++ b/src/devices/bus/c64/std.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "std.h"
diff --git a/src/devices/bus/c64/std.h b/src/devices/bus/c64/std.h
index 43d640bfdf4..22c0d29e171 100644
--- a/src/devices/bus/c64/std.h
+++ b/src/devices/bus/c64/std.h
@@ -12,7 +12,6 @@
#define __C64_STANDARD_CARTRIDGE__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/structured_basic.cpp b/src/devices/bus/c64/structured_basic.cpp
index 8cc7a439561..7d7597a763f 100644
--- a/src/devices/bus/c64/structured_basic.cpp
+++ b/src/devices/bus/c64/structured_basic.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "structured_basic.h"
diff --git a/src/devices/bus/c64/structured_basic.h b/src/devices/bus/c64/structured_basic.h
index 07a0e6fa55f..21e44b42c8c 100644
--- a/src/devices/bus/c64/structured_basic.h
+++ b/src/devices/bus/c64/structured_basic.h
@@ -12,7 +12,6 @@
#define __STRUCTURED_BASIC__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/super_explode.cpp b/src/devices/bus/c64/super_explode.cpp
index 4a3ec8cc5b6..7dc5218b313 100644
--- a/src/devices/bus/c64/super_explode.cpp
+++ b/src/devices/bus/c64/super_explode.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "super_explode.h"
diff --git a/src/devices/bus/c64/super_explode.h b/src/devices/bus/c64/super_explode.h
index 92883aa77d5..c65ebab167d 100644
--- a/src/devices/bus/c64/super_explode.h
+++ b/src/devices/bus/c64/super_explode.h
@@ -12,7 +12,6 @@
#define __SUPER_EXPLODE__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/super_games.cpp b/src/devices/bus/c64/super_games.cpp
index a0e8bcb9fa0..3ffadee981f 100644
--- a/src/devices/bus/c64/super_games.cpp
+++ b/src/devices/bus/c64/super_games.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "super_games.h"
diff --git a/src/devices/bus/c64/super_games.h b/src/devices/bus/c64/super_games.h
index 5ed9b7d6a72..627eae89338 100644
--- a/src/devices/bus/c64/super_games.h
+++ b/src/devices/bus/c64/super_games.h
@@ -12,7 +12,6 @@
#define __SUPER_GAMES__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/supercpu.cpp b/src/devices/bus/c64/supercpu.cpp
index 1411fa5a648..80a2dea1bb3 100644
--- a/src/devices/bus/c64/supercpu.cpp
+++ b/src/devices/bus/c64/supercpu.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "supercpu.h"
diff --git a/src/devices/bus/c64/supercpu.h b/src/devices/bus/c64/supercpu.h
index 8843d55b5cd..3db47899c01 100644
--- a/src/devices/bus/c64/supercpu.h
+++ b/src/devices/bus/c64/supercpu.h
@@ -11,7 +11,6 @@
#ifndef __SUPERCPU__
#define __SUPERCPU__
-#include "emu.h"
#include "exp.h"
#include "cpu/g65816/g65816.h"
diff --git a/src/devices/bus/c64/sw8k.cpp b/src/devices/bus/c64/sw8k.cpp
index 9febecdf202..a8a57726e53 100644
--- a/src/devices/bus/c64/sw8k.cpp
+++ b/src/devices/bus/c64/sw8k.cpp
@@ -29,6 +29,7 @@
*/
+#include "emu.h"
#include "sw8k.h"
diff --git a/src/devices/bus/c64/sw8k.h b/src/devices/bus/c64/sw8k.h
index 9947010c5be..6217da60d70 100644
--- a/src/devices/bus/c64/sw8k.h
+++ b/src/devices/bus/c64/sw8k.h
@@ -12,7 +12,6 @@
#define __C64_SW8K__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp
index f2b118d7d5d..6a44246b6b0 100644
--- a/src/devices/bus/c64/swiftlink.cpp
+++ b/src/devices/bus/c64/swiftlink.cpp
@@ -12,6 +12,7 @@
*/
+#include "emu.h"
#include "swiftlink.h"
#include "bus/rs232/rs232.h"
diff --git a/src/devices/bus/c64/system3.cpp b/src/devices/bus/c64/system3.cpp
index 25463f1e9c1..b27e62c2f11 100644
--- a/src/devices/bus/c64/system3.cpp
+++ b/src/devices/bus/c64/system3.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "system3.h"
diff --git a/src/devices/bus/c64/system3.h b/src/devices/bus/c64/system3.h
index d2c3dd7f17e..4f348628222 100644
--- a/src/devices/bus/c64/system3.h
+++ b/src/devices/bus/c64/system3.h
@@ -12,7 +12,6 @@
#define __SYSTEM3__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/tdos.cpp b/src/devices/bus/c64/tdos.cpp
index 45c5d203e8c..0f53ad1e20e 100644
--- a/src/devices/bus/c64/tdos.cpp
+++ b/src/devices/bus/c64/tdos.cpp
@@ -129,6 +129,7 @@ BASIC commands (SYS 32768 to activate)
*/
+#include "emu.h"
#include "tdos.h"
diff --git a/src/devices/bus/c64/tdos.h b/src/devices/bus/c64/tdos.h
index e7c8b7945f6..79fcadd3537 100644
--- a/src/devices/bus/c64/tdos.h
+++ b/src/devices/bus/c64/tdos.h
@@ -11,7 +11,6 @@
#ifndef __TDOS__
#define __TDOS__
-#include "emu.h"
#include "exp.h"
#include "machine/mc6852.h"
diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp
index aac81a90584..a61c24044dc 100644
--- a/src/devices/bus/c64/turbo232.cpp
+++ b/src/devices/bus/c64/turbo232.cpp
@@ -12,6 +12,7 @@
*/
+#include "emu.h"
#include "turbo232.h"
diff --git a/src/devices/bus/c64/user.cpp b/src/devices/bus/c64/user.cpp
index 54e8bc560d2..543ee8bb13e 100644
--- a/src/devices/bus/c64/user.cpp
+++ b/src/devices/bus/c64/user.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "user.h"
//-------------------------------------------------
diff --git a/src/devices/bus/c64/vizastar.cpp b/src/devices/bus/c64/vizastar.cpp
index 6c589d2864f..e925760baad 100644
--- a/src/devices/bus/c64/vizastar.cpp
+++ b/src/devices/bus/c64/vizastar.cpp
@@ -26,6 +26,7 @@
*/
+#include "emu.h"
#include "vizastar.h"
diff --git a/src/devices/bus/c64/vizastar.h b/src/devices/bus/c64/vizastar.h
index 44606be0d21..dc541aec89e 100644
--- a/src/devices/bus/c64/vizastar.h
+++ b/src/devices/bus/c64/vizastar.h
@@ -12,7 +12,6 @@
#define __VIZASTAR__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/vw64.cpp b/src/devices/bus/c64/vw64.cpp
index 2a57b2b80cc..ceab25e531a 100644
--- a/src/devices/bus/c64/vw64.cpp
+++ b/src/devices/bus/c64/vw64.cpp
@@ -30,6 +30,7 @@
*/
+#include "emu.h"
#include "vw64.h"
diff --git a/src/devices/bus/c64/vw64.h b/src/devices/bus/c64/vw64.h
index e531ec1c260..a514931d58d 100644
--- a/src/devices/bus/c64/vw64.h
+++ b/src/devices/bus/c64/vw64.h
@@ -12,7 +12,6 @@
#define __VW64__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/warp_speed.cpp b/src/devices/bus/c64/warp_speed.cpp
index c1c0188e19f..8a56d562330 100644
--- a/src/devices/bus/c64/warp_speed.cpp
+++ b/src/devices/bus/c64/warp_speed.cpp
@@ -28,6 +28,7 @@
*/
+#include "emu.h"
#include "warp_speed.h"
diff --git a/src/devices/bus/c64/warp_speed.h b/src/devices/bus/c64/warp_speed.h
index d2ad01ae902..2a7f2db65c3 100644
--- a/src/devices/bus/c64/warp_speed.h
+++ b/src/devices/bus/c64/warp_speed.h
@@ -12,7 +12,6 @@
#define __WARP_SPEED__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/westermann.cpp b/src/devices/bus/c64/westermann.cpp
index 68f288c710f..5fdac6d6a5c 100644
--- a/src/devices/bus/c64/westermann.cpp
+++ b/src/devices/bus/c64/westermann.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "westermann.h"
diff --git a/src/devices/bus/c64/westermann.h b/src/devices/bus/c64/westermann.h
index d4f03fd3835..3e724a78f54 100644
--- a/src/devices/bus/c64/westermann.h
+++ b/src/devices/bus/c64/westermann.h
@@ -12,7 +12,6 @@
#define __WESTERMANN__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp
index 3fa53a3a3a9..f90823869bb 100644
--- a/src/devices/bus/c64/xl80.cpp
+++ b/src/devices/bus/c64/xl80.cpp
@@ -36,6 +36,7 @@ Notes:
*/
+#include "emu.h"
#include "xl80.h"
diff --git a/src/devices/bus/c64/xl80.h b/src/devices/bus/c64/xl80.h
index 9a80928718e..8da0a40a78f 100644
--- a/src/devices/bus/c64/xl80.h
+++ b/src/devices/bus/c64/xl80.h
@@ -12,7 +12,6 @@
#define __XL80__
-#include "emu.h"
#include "exp.h"
#include "video/mc6845.h"
diff --git a/src/devices/bus/c64/zaxxon.cpp b/src/devices/bus/c64/zaxxon.cpp
index af3be3f9daa..31005b9d73d 100644
--- a/src/devices/bus/c64/zaxxon.cpp
+++ b/src/devices/bus/c64/zaxxon.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "zaxxon.h"
diff --git a/src/devices/bus/c64/zaxxon.h b/src/devices/bus/c64/zaxxon.h
index 78bb7e8b0b6..b15b0b0b4a5 100644
--- a/src/devices/bus/c64/zaxxon.h
+++ b/src/devices/bus/c64/zaxxon.h
@@ -12,7 +12,6 @@
#define __ZAXXON__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/cbm2/24k.cpp b/src/devices/bus/cbm2/24k.cpp
index 586e24b8564..d250dd5d454 100644
--- a/src/devices/bus/cbm2/24k.cpp
+++ b/src/devices/bus/cbm2/24k.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "24k.h"
diff --git a/src/devices/bus/cbm2/24k.h b/src/devices/bus/cbm2/24k.h
index aef9190849e..52b75796402 100644
--- a/src/devices/bus/cbm2/24k.h
+++ b/src/devices/bus/cbm2/24k.h
@@ -11,7 +11,6 @@
#ifndef __CBM2_24K_CARTRIDGE__
#define __CBM2_24K_CARTRIDGE__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/cbm2/exp.cpp b/src/devices/bus/cbm2/exp.cpp
index aff76dee622..47d36ccc744 100644
--- a/src/devices/bus/cbm2/exp.cpp
+++ b/src/devices/bus/cbm2/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/cbm2/exp.h b/src/devices/bus/cbm2/exp.h
index acba3dcf25e..90120fe2930 100644
--- a/src/devices/bus/cbm2/exp.h
+++ b/src/devices/bus/cbm2/exp.h
@@ -29,7 +29,6 @@
#ifndef __CBM2_EXPANSION_SLOT__
#define __CBM2_EXPANSION_SLOT__
-#include "emu.h"
#include "softlist_dev.h"
diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp
index 2ac3bcf349b..85183f05e6e 100644
--- a/src/devices/bus/cbm2/hrg.cpp
+++ b/src/devices/bus/cbm2/hrg.cpp
@@ -18,6 +18,7 @@
*/
+#include "emu.h"
#include "hrg.h"
diff --git a/src/devices/bus/cbm2/hrg.h b/src/devices/bus/cbm2/hrg.h
index d7b181c1c81..72db8dc8564 100644
--- a/src/devices/bus/cbm2/hrg.h
+++ b/src/devices/bus/cbm2/hrg.h
@@ -11,7 +11,6 @@
#ifndef __CBM2_GRAPHIC__
#define __CBM2_GRAPHIC__
-#include "emu.h"
#include "exp.h"
#include "video/ef9365.h"
diff --git a/src/devices/bus/cbm2/std.cpp b/src/devices/bus/cbm2/std.cpp
index 4b1e74e8c27..b87d10851ce 100644
--- a/src/devices/bus/cbm2/std.cpp
+++ b/src/devices/bus/cbm2/std.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "std.h"
diff --git a/src/devices/bus/cbm2/std.h b/src/devices/bus/cbm2/std.h
index e5c8498d387..cbfc3f6f5db 100644
--- a/src/devices/bus/cbm2/std.h
+++ b/src/devices/bus/cbm2/std.h
@@ -11,7 +11,6 @@
#ifndef __CBM2_STANDARD_CARTRIDGE__
#define __CBM2_STANDARD_CARTRIDGE__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/cbm2/user.cpp b/src/devices/bus/cbm2/user.cpp
index c19adfce06a..b8a976b9fd5 100644
--- a/src/devices/bus/cbm2/user.cpp
+++ b/src/devices/bus/cbm2/user.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "user.h"
diff --git a/src/devices/bus/cbm2/user.h b/src/devices/bus/cbm2/user.h
index a6246c40fa1..02b7565b0e7 100644
--- a/src/devices/bus/cbm2/user.h
+++ b/src/devices/bus/cbm2/user.h
@@ -27,7 +27,6 @@
#ifndef __CBM2_USER_PORT__
#define __CBM2_USER_PORT__
-#include "emu.h"
diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp
index d33b9d026c2..003e1c0dec7 100644
--- a/src/devices/bus/cbmiec/c1526.cpp
+++ b/src/devices/bus/cbmiec/c1526.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "c1526.h"
diff --git a/src/devices/bus/cbmiec/c1526.h b/src/devices/bus/cbmiec/c1526.h
index c3a127c4580..ba528485ac8 100644
--- a/src/devices/bus/cbmiec/c1526.h
+++ b/src/devices/bus/cbmiec/c1526.h
@@ -11,7 +11,6 @@
#ifndef __C1526__
#define __C1526__
-#include "emu.h"
#include "cbmiec.h"
#include "bus/ieee488/ieee488.h"
#include "cpu/m6502/m6504.h"
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index c5c2aaa2741..03ca9e33bdf 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -136,6 +136,7 @@
*/
+#include "emu.h"
#include "c1541.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h
index a2ca5a9fed5..73ceb88eef8 100644
--- a/src/devices/bus/cbmiec/c1541.h
+++ b/src/devices/bus/cbmiec/c1541.h
@@ -11,7 +11,6 @@
#ifndef __C1541__
#define __C1541__
-#include "emu.h"
#include "cbmiec.h"
#include "bus/c64/bn1541.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index 432dc99e23f..edff95705c9 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -19,6 +19,7 @@
*/
+#include "emu.h"
#include "c1571.h"
diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h
index 64635542f4d..027ab98d242 100644
--- a/src/devices/bus/cbmiec/c1571.h
+++ b/src/devices/bus/cbmiec/c1571.h
@@ -11,7 +11,6 @@
#ifndef __C1571__
#define __C1571__
-#include "emu.h"
#include "cbmiec.h"
#include "bus/c64/bn1541.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp
index 005370fa3d8..9e5d0998a99 100644
--- a/src/devices/bus/cbmiec/c1581.cpp
+++ b/src/devices/bus/cbmiec/c1581.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "c1581.h"
diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h
index e09d0579ebf..5f4c9c47437 100644
--- a/src/devices/bus/cbmiec/c1581.h
+++ b/src/devices/bus/cbmiec/c1581.h
@@ -11,7 +11,6 @@
#ifndef __C1581__
#define __C1581__
-#include "emu.h"
#include "cbmiec.h"
#include "cpu/m6502/m6502.h"
#include "formats/d81_dsk.h"
diff --git a/src/devices/bus/cbmiec/c64_nl10.cpp b/src/devices/bus/cbmiec/c64_nl10.cpp
index 4b9e2afa033..4ff95426802 100644
--- a/src/devices/bus/cbmiec/c64_nl10.cpp
+++ b/src/devices/bus/cbmiec/c64_nl10.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "c64_nl10.h"
diff --git a/src/devices/bus/cbmiec/c64_nl10.h b/src/devices/bus/cbmiec/c64_nl10.h
index 556cb01d12d..3d6d1fae895 100644
--- a/src/devices/bus/cbmiec/c64_nl10.h
+++ b/src/devices/bus/cbmiec/c64_nl10.h
@@ -11,7 +11,6 @@
#ifndef __C64_NL10_INTERFACE__
#define __C64_NL10_INTERFACE__
-#include "emu.h"
#include "cbmiec.h"
diff --git a/src/devices/bus/cbmiec/cbmiec.cpp b/src/devices/bus/cbmiec/cbmiec.cpp
index a9f47da877f..be5295577a9 100644
--- a/src/devices/bus/cbmiec/cbmiec.cpp
+++ b/src/devices/bus/cbmiec/cbmiec.cpp
@@ -189,6 +189,7 @@ C64 SERIAL BUS
5) Tei minimum must be 80us for external device to be a listener.
*/
+#include "emu.h"
#include "cbmiec.h"
diff --git a/src/devices/bus/cbmiec/cbmiec.h b/src/devices/bus/cbmiec/cbmiec.h
index d9ee6605a93..20146a78590 100644
--- a/src/devices/bus/cbmiec/cbmiec.h
+++ b/src/devices/bus/cbmiec/cbmiec.h
@@ -11,7 +11,6 @@
#ifndef __CBM_IEC__
#define __CBM_IEC__
-#include "emu.h"
diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp
index 51ed4703613..2b47254d0ac 100644
--- a/src/devices/bus/cbmiec/cmdhd.cpp
+++ b/src/devices/bus/cbmiec/cmdhd.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "cmdhd.h"
#include "machine/msm6242.h"
diff --git a/src/devices/bus/cbmiec/cmdhd.h b/src/devices/bus/cbmiec/cmdhd.h
index 40a08021f12..fc38a89a2cb 100644
--- a/src/devices/bus/cbmiec/cmdhd.h
+++ b/src/devices/bus/cbmiec/cmdhd.h
@@ -11,7 +11,6 @@
#ifndef __CMD_HD__
#define __CMD_HD__
-#include "emu.h"
#include "cbmiec.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.cpp b/src/devices/bus/cbmiec/diag264_lb_iec.cpp
index 2fc5544dd7b..2dfb4430fd4 100644
--- a/src/devices/bus/cbmiec/diag264_lb_iec.cpp
+++ b/src/devices/bus/cbmiec/diag264_lb_iec.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "diag264_lb_iec.h"
diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.h b/src/devices/bus/cbmiec/diag264_lb_iec.h
index f58b15e23fb..a998cd6fe06 100644
--- a/src/devices/bus/cbmiec/diag264_lb_iec.h
+++ b/src/devices/bus/cbmiec/diag264_lb_iec.h
@@ -11,7 +11,6 @@
#ifndef __DIAG264_IEC_LOOPBACK__
#define __DIAG264_IEC_LOOPBACK__
-#include "emu.h"
#include "cbmiec.h"
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index 91d4e66b74d..6a3c0075f9a 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -17,6 +17,7 @@
*/
+#include "emu.h"
#include "fd2000.h"
diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h
index f5c0218ae62..d0cc4585dff 100644
--- a/src/devices/bus/cbmiec/fd2000.h
+++ b/src/devices/bus/cbmiec/fd2000.h
@@ -11,7 +11,6 @@
#ifndef __FD2000__
#define __FD2000__
-#include "emu.h"
#include "cbmiec.h"
#include "cpu/m6502/m65c02.h"
#include "formats/d81_dsk.h"
diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp
index b109773722b..6380622058d 100644
--- a/src/devices/bus/cbmiec/interpod.cpp
+++ b/src/devices/bus/cbmiec/interpod.cpp
@@ -57,6 +57,7 @@ Notes:
*/
+#include "emu.h"
#include "interpod.h"
diff --git a/src/devices/bus/cbmiec/interpod.h b/src/devices/bus/cbmiec/interpod.h
index 28fb987eac8..718479effc7 100644
--- a/src/devices/bus/cbmiec/interpod.h
+++ b/src/devices/bus/cbmiec/interpod.h
@@ -11,7 +11,6 @@
#ifndef __INTERPOD__
#define __INTERPOD__
-#include "emu.h"
#include "cbmiec.h"
#include "bus/ieee488/ieee488.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp
index 8642eb5dbd9..1d32117543b 100644
--- a/src/devices/bus/cbmiec/serialbox.cpp
+++ b/src/devices/bus/cbmiec/serialbox.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "serialbox.h"
diff --git a/src/devices/bus/cbmiec/serialbox.h b/src/devices/bus/cbmiec/serialbox.h
index 550a501a2a7..be7405a97d3 100644
--- a/src/devices/bus/cbmiec/serialbox.h
+++ b/src/devices/bus/cbmiec/serialbox.h
@@ -11,7 +11,6 @@
#ifndef __SERIAL_BOX__
#define __SERIAL_BOX__
-#include "emu.h"
#include "cpu/m6502/m65c02.h"
#include "bus/cbmiec/cbmiec.h"
diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp
index e831ad7f8c3..005ef7ff337 100644
--- a/src/devices/bus/cbmiec/vic1515.cpp
+++ b/src/devices/bus/cbmiec/vic1515.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vic1515.h"
diff --git a/src/devices/bus/cbmiec/vic1515.h b/src/devices/bus/cbmiec/vic1515.h
index 998bb1de4f4..2f511006ed4 100644
--- a/src/devices/bus/cbmiec/vic1515.h
+++ b/src/devices/bus/cbmiec/vic1515.h
@@ -11,7 +11,6 @@
#ifndef __VIC1515__
#define __VIC1515__
-#include "emu.h"
#include "cbmiec.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp
index 8122887bd5f..dc86dec9636 100644
--- a/src/devices/bus/cbmiec/vic1520.cpp
+++ b/src/devices/bus/cbmiec/vic1520.cpp
@@ -35,6 +35,7 @@ PD6 Y MOTOR COM C
PD7 Y MOTOR COM D
*/
+#include "emu.h"
#include "vic1520.h"
diff --git a/src/devices/bus/cbmiec/vic1520.h b/src/devices/bus/cbmiec/vic1520.h
index 4405f0da327..3f2ec228db1 100644
--- a/src/devices/bus/cbmiec/vic1520.h
+++ b/src/devices/bus/cbmiec/vic1520.h
@@ -11,7 +11,6 @@
#ifndef __VIC1520__
#define __VIC1520__
-#include "emu.h"
#include "cbmiec.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/devices/bus/centronics/comxpl80.cpp b/src/devices/bus/centronics/comxpl80.cpp
index 6192563759d..6525e30c686 100644
--- a/src/devices/bus/centronics/comxpl80.cpp
+++ b/src/devices/bus/centronics/comxpl80.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "comxpl80.h"
diff --git a/src/devices/bus/centronics/comxpl80.h b/src/devices/bus/centronics/comxpl80.h
index 094453a4c97..0f648902639 100644
--- a/src/devices/bus/centronics/comxpl80.h
+++ b/src/devices/bus/centronics/comxpl80.h
@@ -11,7 +11,6 @@
#ifndef __COMX_PL80__
#define __COMX_PL80__
-#include "emu.h"
#include "cpu/m6805/m6805.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/devices/bus/centronics/ctronics.cpp b/src/devices/bus/centronics/ctronics.cpp
index 852c789d22d..211d5e34654 100644
--- a/src/devices/bus/centronics/ctronics.cpp
+++ b/src/devices/bus/centronics/ctronics.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "ctronics.h"
// class centronics_device
diff --git a/src/devices/bus/centronics/ctronics.h b/src/devices/bus/centronics/ctronics.h
index 1cadbd0f992..514028f2c6e 100644
--- a/src/devices/bus/centronics/ctronics.h
+++ b/src/devices/bus/centronics/ctronics.h
@@ -11,7 +11,6 @@
#ifndef __CTRONICS_H__
#define __CTRONICS_H__
-#include "emu.h"
#include "machine/buffer.h"
#include "machine/latch.h"
diff --git a/src/devices/bus/centronics/dsjoy.cpp b/src/devices/bus/centronics/dsjoy.cpp
index 2f358ceae3a..b97125f48ed 100644
--- a/src/devices/bus/centronics/dsjoy.cpp
+++ b/src/devices/bus/centronics/dsjoy.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "dsjoy.h"
const device_type DEMPA_SHINBUNSHA_JOYSTICK = &device_creator<dempa_shinbunsha_joystick_device>;
diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp
index 42354324f9a..2f7055b6a34 100644
--- a/src/devices/bus/centronics/epson_ex800.cpp
+++ b/src/devices/bus/centronics/epson_ex800.cpp
@@ -127,6 +127,7 @@ TODO: - The UPD7810 core is missing analog port emulation
******************************************************************************/
+#include "emu.h"
#include "epson_ex800.h"
#include "ex800.lh"
diff --git a/src/devices/bus/centronics/epson_ex800.h b/src/devices/bus/centronics/epson_ex800.h
index b1892cc969b..133bdb39897 100644
--- a/src/devices/bus/centronics/epson_ex800.h
+++ b/src/devices/bus/centronics/epson_ex800.h
@@ -11,7 +11,6 @@
#ifndef __EPSON_EX800__
#define __EPSON_EX800__
-#include "emu.h"
#include "ctronics.h"
#include "cpu/upd7810/upd7810.h"
#include "sound/beep.h"
diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp
index b1495d083be..0d043b46f09 100644
--- a/src/devices/bus/centronics/epson_lx800.cpp
+++ b/src/devices/bus/centronics/epson_lx800.cpp
@@ -14,6 +14,7 @@
**********************************************************************/
+#include "emu.h"
#include "epson_lx800.h"
#include "lx800.lh"
diff --git a/src/devices/bus/centronics/epson_lx800.h b/src/devices/bus/centronics/epson_lx800.h
index f960d3f168f..740a9a248d1 100644
--- a/src/devices/bus/centronics/epson_lx800.h
+++ b/src/devices/bus/centronics/epson_lx800.h
@@ -11,7 +11,6 @@
#ifndef __EPSON_LX800__
#define __EPSON_LX800__
-#include "emu.h"
#include "ctronics.h"
#include "cpu/upd7810/upd7810.h"
#include "machine/e05a03.h"
diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp
index 3fc87dadd39..c4c00ebc8cf 100644
--- a/src/devices/bus/centronics/epson_lx810l.cpp
+++ b/src/devices/bus/centronics/epson_lx810l.cpp
@@ -25,6 +25,7 @@
* some test data. The Online LED will blink at each line.
*/
+#include "emu.h"
#include "epson_lx810l.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/bus/centronics/epson_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h
index 11da3cf8305..78d30fa0863 100644
--- a/src/devices/bus/centronics/epson_lx810l.h
+++ b/src/devices/bus/centronics/epson_lx810l.h
@@ -10,7 +10,6 @@
#ifndef __EPSON_LX810L__
#define __EPSON_LX810L__
-#include "emu.h"
#include "ctronics.h"
#include "cpu/upd7810/upd7810.h"
#include "machine/e05a30.h"
diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp
index 2e2533ccc06..0b06503bacd 100644
--- a/src/devices/bus/centronics/nec_p72.cpp
+++ b/src/devices/bus/centronics/nec_p72.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Ramiro Polla
+#include "emu.h"
#include "nec_p72.h"
diff --git a/src/devices/bus/centronics/nec_p72.h b/src/devices/bus/centronics/nec_p72.h
index 58c8f0a61f4..1957dfb40c4 100644
--- a/src/devices/bus/centronics/nec_p72.h
+++ b/src/devices/bus/centronics/nec_p72.h
@@ -6,7 +6,6 @@
#ifndef __NEC_P72__
#define __NEC_P72__
-#include "emu.h"
#include "ctronics.h"
#include "cpu/nec/nec.h"
diff --git a/src/devices/bus/cgenie/expansion/carts.cpp b/src/devices/bus/cgenie/expansion/carts.cpp
index f4b23a5cf9d..213d7dcdf5e 100644
--- a/src/devices/bus/cgenie/expansion/carts.cpp
+++ b/src/devices/bus/cgenie/expansion/carts.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "carts.h"
SLOT_INTERFACE_START( expansion_slot_carts )
diff --git a/src/devices/bus/cgenie/expansion/carts.h b/src/devices/bus/cgenie/expansion/carts.h
index 45bf66a4c90..2f26f0a37b1 100644
--- a/src/devices/bus/cgenie/expansion/carts.h
+++ b/src/devices/bus/cgenie/expansion/carts.h
@@ -11,7 +11,6 @@
#ifndef __CGENIE_EXPANSION_CARTS_H__
#define __CGENIE_EXPANSION_CARTS_H__
-#include "emu.h"
#include "floppy.h"
diff --git a/src/devices/bus/cgenie/expansion/expansion.cpp b/src/devices/bus/cgenie/expansion/expansion.cpp
index 085c8f73ca2..fe4e2357db7 100644
--- a/src/devices/bus/cgenie/expansion/expansion.cpp
+++ b/src/devices/bus/cgenie/expansion/expansion.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "expansion.h"
diff --git a/src/devices/bus/cgenie/expansion/expansion.h b/src/devices/bus/cgenie/expansion/expansion.h
index e73abe6cb5e..319f7c4878f 100644
--- a/src/devices/bus/cgenie/expansion/expansion.h
+++ b/src/devices/bus/cgenie/expansion/expansion.h
@@ -39,7 +39,6 @@
#ifndef __CGENIE_EXPANSION_H__
#define __CGENIE_EXPANSION_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp
index f82d38d3485..d8c2664a254 100644
--- a/src/devices/bus/cgenie/expansion/floppy.cpp
+++ b/src/devices/bus/cgenie/expansion/floppy.cpp
@@ -11,6 +11,7 @@
***************************************************************************/
+#include "emu.h"
#include "floppy.h"
#include "formats/cgenie_dsk.h"
#include "bus/generic/carts.h"
diff --git a/src/devices/bus/cgenie/expansion/floppy.h b/src/devices/bus/cgenie/expansion/floppy.h
index 218b8a94bd1..686c1eb3871 100644
--- a/src/devices/bus/cgenie/expansion/floppy.h
+++ b/src/devices/bus/cgenie/expansion/floppy.h
@@ -11,7 +11,6 @@
#ifndef __CGENIE_EXPANSION_FLOPPY_H__
#define __CGENIE_EXPANSION_FLOPPY_H__
-#include "emu.h"
#include "expansion.h"
#include "machine/wd_fdc.h"
#include "bus/generic/slot.h"
diff --git a/src/devices/bus/cgenie/parallel/carts.cpp b/src/devices/bus/cgenie/parallel/carts.cpp
index 61a6380117f..1de5c319105 100644
--- a/src/devices/bus/cgenie/parallel/carts.cpp
+++ b/src/devices/bus/cgenie/parallel/carts.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "carts.h"
SLOT_INTERFACE_START( parallel_slot_carts )
diff --git a/src/devices/bus/cgenie/parallel/carts.h b/src/devices/bus/cgenie/parallel/carts.h
index 29c092b9d0a..e654f5bf682 100644
--- a/src/devices/bus/cgenie/parallel/carts.h
+++ b/src/devices/bus/cgenie/parallel/carts.h
@@ -11,7 +11,6 @@
#ifndef __CGENIE_PARALLEL_CARTS_H__
#define __CGENIE_PARALLEL_CARTS_H__
-#include "emu.h"
#include "joystick.h"
#include "printer.h"
diff --git a/src/devices/bus/cgenie/parallel/joystick.cpp b/src/devices/bus/cgenie/parallel/joystick.cpp
index caeeee8cfe0..bc9c3be5a73 100644
--- a/src/devices/bus/cgenie/parallel/joystick.cpp
+++ b/src/devices/bus/cgenie/parallel/joystick.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "joystick.h"
diff --git a/src/devices/bus/cgenie/parallel/joystick.h b/src/devices/bus/cgenie/parallel/joystick.h
index 61ce928d673..6625af5bdff 100644
--- a/src/devices/bus/cgenie/parallel/joystick.h
+++ b/src/devices/bus/cgenie/parallel/joystick.h
@@ -11,7 +11,6 @@
#ifndef __CGENIE_PARALLEL_JOYSTICK_H__
#define __CGENIE_PARALLEL_JOYSTICK_H__
-#include "emu.h"
#include "parallel.h"
diff --git a/src/devices/bus/cgenie/parallel/parallel.cpp b/src/devices/bus/cgenie/parallel/parallel.cpp
index ca3681ec715..9237f976938 100644
--- a/src/devices/bus/cgenie/parallel/parallel.cpp
+++ b/src/devices/bus/cgenie/parallel/parallel.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "parallel.h"
diff --git a/src/devices/bus/cgenie/parallel/parallel.h b/src/devices/bus/cgenie/parallel/parallel.h
index b12a0c3709b..9f70f4b85ac 100644
--- a/src/devices/bus/cgenie/parallel/parallel.h
+++ b/src/devices/bus/cgenie/parallel/parallel.h
@@ -24,7 +24,6 @@
#ifndef __CGENIE_PARALLEL_H__
#define __CGENIE_PARALLEL_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/cgenie/parallel/printer.cpp b/src/devices/bus/cgenie/parallel/printer.cpp
index 7d2a0ac8978..ae26869a325 100644
--- a/src/devices/bus/cgenie/parallel/printer.cpp
+++ b/src/devices/bus/cgenie/parallel/printer.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "printer.h"
diff --git a/src/devices/bus/cgenie/parallel/printer.h b/src/devices/bus/cgenie/parallel/printer.h
index e4addaef23a..313e61d9542 100644
--- a/src/devices/bus/cgenie/parallel/printer.h
+++ b/src/devices/bus/cgenie/parallel/printer.h
@@ -11,7 +11,6 @@
#ifndef __CGENIE_PARALLEL_PRINTER_H__
#define __CGENIE_PARALLEL_PRINTER_H__
-#include "emu.h"
#include "parallel.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/devices/bus/coco/coco_232.h b/src/devices/bus/coco/coco_232.h
index 65bf44f6e61..3ff2107985f 100644
--- a/src/devices/bus/coco/coco_232.h
+++ b/src/devices/bus/coco/coco_232.h
@@ -5,7 +5,6 @@
#ifndef __COCO_232_H__
#define __COCO_232_H__
-#include "emu.h"
#include "cococart.h"
#include "machine/mos6551.h"
diff --git a/src/devices/bus/coco/coco_dwsock.h b/src/devices/bus/coco/coco_dwsock.h
index b8b2e1d3cc4..eca128aa9c4 100644
--- a/src/devices/bus/coco/coco_dwsock.h
+++ b/src/devices/bus/coco/coco_dwsock.h
@@ -3,7 +3,6 @@
#ifndef _DWSOCK_H_
#define _DWSOCK_H_
-#include "emu.h"
#include "osdcore.h"
//**************************************************************************
diff --git a/src/devices/bus/coco/coco_fdc.h b/src/devices/bus/coco/coco_fdc.h
index b6a3d7e0834..fb83695c8ce 100644
--- a/src/devices/bus/coco/coco_fdc.h
+++ b/src/devices/bus/coco/coco_fdc.h
@@ -11,7 +11,6 @@
#ifndef MAME_DEVICES_BUS_COCO_FDC_H
#define MAME_DEVICES_BUS_COCO_FDC_H
-#include "emu.h"
#include "cococart.h"
#include "imagedev/floppy.h"
diff --git a/src/devices/bus/coco/coco_multi.h b/src/devices/bus/coco/coco_multi.h
index d2bdb996f5a..19d34d315ed 100644
--- a/src/devices/bus/coco/coco_multi.h
+++ b/src/devices/bus/coco/coco_multi.h
@@ -13,7 +13,6 @@
#ifndef __COCO_MULTI_H__
#define __COCO_MULTI_H__
-#include "emu.h"
#include "cococart.h"
diff --git a/src/devices/bus/coco/coco_orch90.h b/src/devices/bus/coco/coco_orch90.h
index 387395777d0..8ef59729ceb 100644
--- a/src/devices/bus/coco/coco_orch90.h
+++ b/src/devices/bus/coco/coco_orch90.h
@@ -5,7 +5,6 @@
#ifndef __COCO_ORCH90_H__
#define __COCO_ORCH90_H__
-#include "emu.h"
#include "sound/dac.h"
#include "cococart.h"
diff --git a/src/devices/bus/coco/coco_pak.h b/src/devices/bus/coco/coco_pak.h
index 84f8e68f75f..f4fd2894681 100644
--- a/src/devices/bus/coco/coco_pak.h
+++ b/src/devices/bus/coco/coco_pak.h
@@ -5,7 +5,6 @@
#ifndef __COCO_PAK_H__
#define __COCO_PAK_H__
-#include "emu.h"
#include "cococart.h"
//**************************************************************************
diff --git a/src/devices/bus/coco/coco_t4426.h b/src/devices/bus/coco/coco_t4426.h
index 9fd446c21fb..92beb845fd2 100644
--- a/src/devices/bus/coco/coco_t4426.h
+++ b/src/devices/bus/coco/coco_t4426.h
@@ -5,7 +5,6 @@
#pragma once
-#include "emu.h"
#include "cococart.h"
#include "machine/6850acia.h"
#include "machine/6821pia.h"
diff --git a/src/devices/bus/coleco/ctrl.cpp b/src/devices/bus/coleco/ctrl.cpp
index 33359141805..f5df1198d57 100644
--- a/src/devices/bus/coleco/ctrl.cpp
+++ b/src/devices/bus/coleco/ctrl.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ctrl.h"
diff --git a/src/devices/bus/coleco/ctrl.h b/src/devices/bus/coleco/ctrl.h
index 6acabc2b8a1..3555e0299e6 100644
--- a/src/devices/bus/coleco/ctrl.h
+++ b/src/devices/bus/coleco/ctrl.h
@@ -14,7 +14,6 @@
#ifndef __COLECOVISION_CONTROL_PORT__
#define __COLECOVISION_CONTROL_PORT__
-#include "emu.h"
diff --git a/src/devices/bus/coleco/exp.cpp b/src/devices/bus/coleco/exp.cpp
index 3d93ae777b1..f02867ed3e3 100644
--- a/src/devices/bus/coleco/exp.cpp
+++ b/src/devices/bus/coleco/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/coleco/exp.h b/src/devices/bus/coleco/exp.h
index 58e75252dfd..0a6d1895970 100644
--- a/src/devices/bus/coleco/exp.h
+++ b/src/devices/bus/coleco/exp.h
@@ -30,7 +30,6 @@
#ifndef __COLECOVISION_CARTRIDGE_SLOT__
#define __COLECOVISION_CARTRIDGE_SLOT__
-#include "emu.h"
#include "softlist_dev.h"
diff --git a/src/devices/bus/coleco/hand.cpp b/src/devices/bus/coleco/hand.cpp
index ce53e4246c2..aa08ab18735 100644
--- a/src/devices/bus/coleco/hand.cpp
+++ b/src/devices/bus/coleco/hand.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "hand.h"
diff --git a/src/devices/bus/coleco/hand.h b/src/devices/bus/coleco/hand.h
index e51296ce499..01e4e928534 100644
--- a/src/devices/bus/coleco/hand.h
+++ b/src/devices/bus/coleco/hand.h
@@ -11,7 +11,6 @@
#ifndef __COLECO_HAND_CONTROLLER__
#define __COLECO_HAND_CONTROLLER__
-#include "emu.h"
#include "ctrl.h"
diff --git a/src/devices/bus/coleco/sac.cpp b/src/devices/bus/coleco/sac.cpp
index ba05d15683e..2c1725fd507 100644
--- a/src/devices/bus/coleco/sac.cpp
+++ b/src/devices/bus/coleco/sac.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "sac.h"
diff --git a/src/devices/bus/coleco/sac.h b/src/devices/bus/coleco/sac.h
index 4f90e225374..7b6a65b6440 100644
--- a/src/devices/bus/coleco/sac.h
+++ b/src/devices/bus/coleco/sac.h
@@ -11,7 +11,6 @@
#ifndef __COLECO_SUPER_ACTION_CONTROLLER__
#define __COLECO_SUPER_ACTION_CONTROLLER__
-#include "emu.h"
#include "ctrl.h"
diff --git a/src/devices/bus/coleco/std.cpp b/src/devices/bus/coleco/std.cpp
index f8842a4aa9e..e588a71f2ee 100644
--- a/src/devices/bus/coleco/std.cpp
+++ b/src/devices/bus/coleco/std.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "std.h"
diff --git a/src/devices/bus/coleco/xin1.cpp b/src/devices/bus/coleco/xin1.cpp
index 77e55098156..62000ebd5a1 100644
--- a/src/devices/bus/coleco/xin1.cpp
+++ b/src/devices/bus/coleco/xin1.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "xin1.h"
diff --git a/src/devices/bus/compis/graphics.cpp b/src/devices/bus/compis/graphics.cpp
index c426c943260..1c02e77e005 100644
--- a/src/devices/bus/compis/graphics.cpp
+++ b/src/devices/bus/compis/graphics.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "graphics.h"
diff --git a/src/devices/bus/compis/graphics.h b/src/devices/bus/compis/graphics.h
index aeef41ceac9..9985a41738d 100644
--- a/src/devices/bus/compis/graphics.h
+++ b/src/devices/bus/compis/graphics.h
@@ -13,7 +13,6 @@
#ifndef __COMPIS_GRAPHICS_SLOT__
#define __COMPIS_GRAPHICS_SLOT__
-#include "emu.h"
diff --git a/src/devices/bus/compis/hrg.cpp b/src/devices/bus/compis/hrg.cpp
index f5f8280c953..68afe3b0341 100644
--- a/src/devices/bus/compis/hrg.cpp
+++ b/src/devices/bus/compis/hrg.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "hrg.h"
diff --git a/src/devices/bus/compis/hrg.h b/src/devices/bus/compis/hrg.h
index ad2e8998570..96ea1db02cb 100644
--- a/src/devices/bus/compis/hrg.h
+++ b/src/devices/bus/compis/hrg.h
@@ -11,7 +11,6 @@
#ifndef __COMPIS_HRG__
#define __COMPIS_HRG__
-#include "emu.h"
#include "graphics.h"
#include "video/upd7220.h"
diff --git a/src/devices/bus/compucolor/floppy.cpp b/src/devices/bus/compucolor/floppy.cpp
index 6c817f6ef67..bd59a7b1027 100644
--- a/src/devices/bus/compucolor/floppy.cpp
+++ b/src/devices/bus/compucolor/floppy.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "floppy.h"
diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp
index 54bcf10255d..47e4f9bc93f 100644
--- a/src/devices/bus/comx35/clm.cpp
+++ b/src/devices/bus/comx35/clm.cpp
@@ -44,6 +44,7 @@ Notes:
*/
+#include "emu.h"
#include "clm.h"
diff --git a/src/devices/bus/comx35/clm.h b/src/devices/bus/comx35/clm.h
index 0890c307391..7230cece942 100644
--- a/src/devices/bus/comx35/clm.h
+++ b/src/devices/bus/comx35/clm.h
@@ -11,7 +11,6 @@
#ifndef __COMX_CLM__
#define __COMX_CLM__
-#include "emu.h"
#include "exp.h"
#include "video/mc6845.h"
diff --git a/src/devices/bus/comx35/eprom.cpp b/src/devices/bus/comx35/eprom.cpp
index 9261e27b970..9bd790e620e 100644
--- a/src/devices/bus/comx35/eprom.cpp
+++ b/src/devices/bus/comx35/eprom.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "eprom.h"
diff --git a/src/devices/bus/comx35/eprom.h b/src/devices/bus/comx35/eprom.h
index ae9b4ce474b..afd0e4e08d9 100644
--- a/src/devices/bus/comx35/eprom.h
+++ b/src/devices/bus/comx35/eprom.h
@@ -11,7 +11,6 @@
#ifndef __COMX_EPR__
#define __COMX_EPR__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/comx35/exp.cpp b/src/devices/bus/comx35/exp.cpp
index a8495681f21..1be1d2074e3 100644
--- a/src/devices/bus/comx35/exp.cpp
+++ b/src/devices/bus/comx35/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/comx35/exp.h b/src/devices/bus/comx35/exp.h
index ec1ccb673e9..c8bec33960c 100644
--- a/src/devices/bus/comx35/exp.h
+++ b/src/devices/bus/comx35/exp.h
@@ -36,7 +36,6 @@
#ifndef __COMX35_EXPANSION_SLOT__
#define __COMX35_EXPANSION_SLOT__
-#include "emu.h"
diff --git a/src/devices/bus/comx35/expbox.cpp b/src/devices/bus/comx35/expbox.cpp
index cc38f7f81a7..0ee42ff79db 100644
--- a/src/devices/bus/comx35/expbox.cpp
+++ b/src/devices/bus/comx35/expbox.cpp
@@ -46,6 +46,7 @@ Notes:
*/
+#include "emu.h"
#include "expbox.h"
diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp
index b5003e194fc..93f2b8452ef 100644
--- a/src/devices/bus/comx35/fdc.cpp
+++ b/src/devices/bus/comx35/fdc.cpp
@@ -41,6 +41,7 @@ Notes:
*/
+#include "emu.h"
#include "fdc.h"
diff --git a/src/devices/bus/comx35/fdc.h b/src/devices/bus/comx35/fdc.h
index 70ce499a2f3..ced4a012216 100644
--- a/src/devices/bus/comx35/fdc.h
+++ b/src/devices/bus/comx35/fdc.h
@@ -11,7 +11,6 @@
#ifndef __COMX_FD__
#define __COMX_FD__
-#include "emu.h"
#include "exp.h"
#include "formats/comx35_dsk.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/comx35/joycard.cpp b/src/devices/bus/comx35/joycard.cpp
index 243dccc2885..48bfe63ecfc 100644
--- a/src/devices/bus/comx35/joycard.cpp
+++ b/src/devices/bus/comx35/joycard.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "joycard.h"
diff --git a/src/devices/bus/comx35/joycard.h b/src/devices/bus/comx35/joycard.h
index b171890e70e..567d2434599 100644
--- a/src/devices/bus/comx35/joycard.h
+++ b/src/devices/bus/comx35/joycard.h
@@ -11,7 +11,6 @@
#ifndef __COMX_JOY__
#define __COMX_JOY__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/comx35/printer.cpp b/src/devices/bus/comx35/printer.cpp
index 1625c5b4580..0aeb8adb7b4 100644
--- a/src/devices/bus/comx35/printer.cpp
+++ b/src/devices/bus/comx35/printer.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "printer.h"
#include "bus/centronics/printer.h"
diff --git a/src/devices/bus/comx35/printer.h b/src/devices/bus/comx35/printer.h
index 63cd21f3ae5..887abaa13d6 100644
--- a/src/devices/bus/comx35/printer.h
+++ b/src/devices/bus/comx35/printer.h
@@ -11,7 +11,6 @@
#ifndef __COMX_PRN__
#define __COMX_PRN__
-#include "emu.h"
#include "exp.h"
#include "machine/buffer.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/devices/bus/comx35/ram.cpp b/src/devices/bus/comx35/ram.cpp
index 395dfb1e1c0..2b6ab934237 100644
--- a/src/devices/bus/comx35/ram.cpp
+++ b/src/devices/bus/comx35/ram.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ram.h"
diff --git a/src/devices/bus/comx35/ram.h b/src/devices/bus/comx35/ram.h
index 848b38ccfdf..fc6af702fa3 100644
--- a/src/devices/bus/comx35/ram.h
+++ b/src/devices/bus/comx35/ram.h
@@ -11,7 +11,6 @@
#ifndef __COMX_RAM__
#define __COMX_RAM__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/comx35/thermal.cpp b/src/devices/bus/comx35/thermal.cpp
index 82d4ab51fb2..a44a38bae96 100644
--- a/src/devices/bus/comx35/thermal.cpp
+++ b/src/devices/bus/comx35/thermal.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "thermal.h"
diff --git a/src/devices/bus/comx35/thermal.h b/src/devices/bus/comx35/thermal.h
index 111a6a64848..08b46ba6945 100644
--- a/src/devices/bus/comx35/thermal.h
+++ b/src/devices/bus/comx35/thermal.h
@@ -11,7 +11,6 @@
#ifndef __COMX_THM__
#define __COMX_THM__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/cpc/amdrum.h b/src/devices/bus/cpc/amdrum.h
index ce9643011fa..f9efb5ce411 100644
--- a/src/devices/bus/cpc/amdrum.h
+++ b/src/devices/bus/cpc/amdrum.h
@@ -15,7 +15,6 @@
#ifndef AMDRUM_H_
#define AMDRUM_H_
-#include "emu.h"
#include "cpcexp.h"
#include "sound/dac.h"
diff --git a/src/devices/bus/cpc/brunword4.cpp b/src/devices/bus/cpc/brunword4.cpp
index 134f3171460..45d90ccc96e 100644
--- a/src/devices/bus/cpc/brunword4.cpp
+++ b/src/devices/bus/cpc/brunword4.cpp
@@ -11,6 +11,7 @@
banks in the upper ROM area (0x80-0xff)
*/
+#include "emu.h"
#include "brunword4.h"
const device_type CPC_BRUNWORD_MK4 = &device_creator<cpc_brunword4_device>;
diff --git a/src/devices/bus/cpc/brunword4.h b/src/devices/bus/cpc/brunword4.h
index 995fc698f4e..31d8d38beb3 100644
--- a/src/devices/bus/cpc/brunword4.h
+++ b/src/devices/bus/cpc/brunword4.h
@@ -6,7 +6,6 @@
*/
-#include "emu.h"
#include "cpcexp.h"
class cpc_brunword4_device : public device_t,
diff --git a/src/devices/bus/cpc/cpc_pds.h b/src/devices/bus/cpc/cpc_pds.h
index 9111889cfcc..5bc1a87cabc 100644
--- a/src/devices/bus/cpc/cpc_pds.h
+++ b/src/devices/bus/cpc/cpc_pds.h
@@ -24,7 +24,6 @@
#ifndef CPC_PDS_H_
#define CPC_PDS_H_
-#include "emu.h"
#include "cpcexp.h"
#include "machine/z80pio.h"
diff --git a/src/devices/bus/cpc/cpc_rom.h b/src/devices/bus/cpc/cpc_rom.h
index f20cbd2dbb7..1b76acbc0db 100644
--- a/src/devices/bus/cpc/cpc_rom.h
+++ b/src/devices/bus/cpc/cpc_rom.h
@@ -9,7 +9,6 @@
#ifndef CPC_ROM_H_
#define CPC_ROM_H_
-#include "emu.h"
#include "cpcexp.h"
/*** ROM image device ***/
diff --git a/src/devices/bus/cpc/cpc_rs232.cpp b/src/devices/bus/cpc/cpc_rs232.cpp
index b00503584f0..585a87375ff 100644
--- a/src/devices/bus/cpc/cpc_rs232.cpp
+++ b/src/devices/bus/cpc/cpc_rs232.cpp
@@ -6,6 +6,7 @@
* Created on: 22/04/2014
*/
+#include "emu.h"
#include "cpc_rs232.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
diff --git a/src/devices/bus/cpc/cpc_rs232.h b/src/devices/bus/cpc/cpc_rs232.h
index 816e8315f0a..a55ca23fdf8 100644
--- a/src/devices/bus/cpc/cpc_rs232.h
+++ b/src/devices/bus/cpc/cpc_rs232.h
@@ -9,7 +9,6 @@
#ifndef CPC_RS232_H_
#define CPC_RS232_H_
-#include "emu.h"
#include "machine/z80dart.h"
#include "machine/pit8253.h"
#include "bus/rs232/rs232.h"
diff --git a/src/devices/bus/cpc/cpc_ssa1.h b/src/devices/bus/cpc/cpc_ssa1.h
index d437091006a..a8943ec4392 100644
--- a/src/devices/bus/cpc/cpc_ssa1.h
+++ b/src/devices/bus/cpc/cpc_ssa1.h
@@ -44,7 +44,6 @@
#define CPC_SSA1_H_
-#include "emu.h"
#include "cpcexp.h"
#include "sound/sp0256.h"
diff --git a/src/devices/bus/cpc/cpcexp.h b/src/devices/bus/cpc/cpcexp.h
index 7825dfefbca..9552a4ee803 100644
--- a/src/devices/bus/cpc/cpcexp.h
+++ b/src/devices/bus/cpc/cpcexp.h
@@ -48,7 +48,6 @@
#ifndef CPCEXP_H_
#define CPCEXP_H_
-#include "emu.h"
//**************************************************************************
// CONSTANTS
diff --git a/src/devices/bus/cpc/ddi1.h b/src/devices/bus/cpc/ddi1.h
index fbe6de3605e..8d900048b32 100644
--- a/src/devices/bus/cpc/ddi1.h
+++ b/src/devices/bus/cpc/ddi1.h
@@ -11,7 +11,6 @@
#ifndef CPC_DDI1_H_
#define CPC_DDI1_H_
-#include "emu.h"
#include "cpcexp.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/cpc/doubler.cpp b/src/devices/bus/cpc/doubler.cpp
index 5e5f6587404..6a48a653016 100644
--- a/src/devices/bus/cpc/doubler.cpp
+++ b/src/devices/bus/cpc/doubler.cpp
@@ -6,6 +6,7 @@
*
*/
+#include "emu.h"
#include "doubler.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
diff --git a/src/devices/bus/cpc/doubler.h b/src/devices/bus/cpc/doubler.h
index 6685698f4a6..673e592470e 100644
--- a/src/devices/bus/cpc/doubler.h
+++ b/src/devices/bus/cpc/doubler.h
@@ -11,7 +11,6 @@
#ifndef DOUBLER_H_
#define DOUBLER_H_
-#include "emu.h"
#include "cpcexp.h"
#include "imagedev/cassette.h"
#include "formats/tzx_cas.h"
diff --git a/src/devices/bus/cpc/hd20.h b/src/devices/bus/cpc/hd20.h
index 467a28646dc..2837a748b76 100644
--- a/src/devices/bus/cpc/hd20.h
+++ b/src/devices/bus/cpc/hd20.h
@@ -14,7 +14,6 @@
#ifndef HD20_H_
#define HD20_H_
-#include "emu.h"
#include "cpcexp.h"
#include "bus/isa/hdc.h"
diff --git a/src/devices/bus/cpc/magicsound.h b/src/devices/bus/cpc/magicsound.h
index 22ab6e2c055..c0d276e5a23 100644
--- a/src/devices/bus/cpc/magicsound.h
+++ b/src/devices/bus/cpc/magicsound.h
@@ -25,7 +25,6 @@
#ifndef MAGICSOUND_H_
#define MAGICSOUND_H_
-#include "emu.h"
#include "cpcexp.h"
#include "sound/dmadac.h"
#include "sound/dac.h"
diff --git a/src/devices/bus/cpc/mface2.h b/src/devices/bus/cpc/mface2.h
index 513af2ee3c5..61b9e3f939a 100644
--- a/src/devices/bus/cpc/mface2.h
+++ b/src/devices/bus/cpc/mface2.h
@@ -20,7 +20,6 @@
#ifndef MFACE2_H_
#define MFACE2_H_
-#include "emu.h"
#include "cpcexp.h"
/* stop button has been pressed */
diff --git a/src/devices/bus/cpc/playcity.cpp b/src/devices/bus/cpc/playcity.cpp
index 41896009037..6e4a7660527 100644
--- a/src/devices/bus/cpc/playcity.cpp
+++ b/src/devices/bus/cpc/playcity.cpp
@@ -10,6 +10,7 @@
IRQs aren't working currently, the Z80CTC core requires the daisy chain setup to acknowledge IRQs properly, and that can't be used in a slot device currently.
*/
+#include "emu.h"
#include "playcity.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
diff --git a/src/devices/bus/cpc/playcity.h b/src/devices/bus/cpc/playcity.h
index dbf4f9f09fa..27f9851bd6f 100644
--- a/src/devices/bus/cpc/playcity.h
+++ b/src/devices/bus/cpc/playcity.h
@@ -18,7 +18,6 @@
#define CPC_PLAYCITY_H_
-#include "emu.h"
#include "cpcexp.h"
#include "sound/ay8910.h"
#include "machine/z80ctc.h"
diff --git a/src/devices/bus/cpc/smartwatch.h b/src/devices/bus/cpc/smartwatch.h
index bf62d040c8a..b27b7b4df67 100644
--- a/src/devices/bus/cpc/smartwatch.h
+++ b/src/devices/bus/cpc/smartwatch.h
@@ -12,7 +12,6 @@
#ifndef SMARTWATCH_H_
#define SMARTWATCH_H_
-#include "emu.h"
#include "cpcexp.h"
#include "machine/ds1315.h"
diff --git a/src/devices/bus/cpc/symbfac2.cpp b/src/devices/bus/cpc/symbfac2.cpp
index 9d466f41a85..524d1ad228c 100644
--- a/src/devices/bus/cpc/symbfac2.cpp
+++ b/src/devices/bus/cpc/symbfac2.cpp
@@ -17,6 +17,7 @@
* - mouse controls still need some work
*/
+#include "emu.h"
#include "symbfac2.h"
diff --git a/src/devices/bus/cpc/symbfac2.h b/src/devices/bus/cpc/symbfac2.h
index fba811b40b2..a5a568b423f 100644
--- a/src/devices/bus/cpc/symbfac2.h
+++ b/src/devices/bus/cpc/symbfac2.h
@@ -9,7 +9,6 @@
#ifndef SYMBFAC2_H_
#define SYMBFAC2_H_
-#include "emu.h"
#include "machine/ataintf.h"
#include "machine/ds128x.h"
#include "machine/nvram.h"
diff --git a/src/devices/bus/cpc/transtape.cpp b/src/devices/bus/cpc/transtape.cpp
index df05e1e491a..2dbfcbb5dea 100644
--- a/src/devices/bus/cpc/transtape.cpp
+++ b/src/devices/bus/cpc/transtape.cpp
@@ -8,6 +8,7 @@
* Further info at - http://cpcwiki.eu/index.php/Transtape
*/
+#include "emu.h"
#include "transtape.h"
SLOT_INTERFACE_EXTERN(cpc_exp_cards);
diff --git a/src/devices/bus/cpc/transtape.h b/src/devices/bus/cpc/transtape.h
index bc73b843e96..b8ae9037266 100644
--- a/src/devices/bus/cpc/transtape.h
+++ b/src/devices/bus/cpc/transtape.h
@@ -10,7 +10,6 @@
#ifndef TRANSTAPE_H_
#define TRANSTAPE_H_
-#include "emu.h"
#include "cpcexp.h"
class cpc_transtape_device : public device_t,
diff --git a/src/devices/bus/dmv/k210.h b/src/devices/bus/dmv/k210.h
index d3aaf7e1863..4c31252218b 100644
--- a/src/devices/bus/dmv/k210.h
+++ b/src/devices/bus/dmv/k210.h
@@ -5,7 +5,6 @@
#ifndef __DMV_K210_H__
#define __DMV_K210_H__
-#include "emu.h"
#include "dmvbus.h"
#include "machine/i8255.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/devices/bus/dmv/k220.h b/src/devices/bus/dmv/k220.h
index 5977be0dd61..125f317170a 100644
--- a/src/devices/bus/dmv/k220.h
+++ b/src/devices/bus/dmv/k220.h
@@ -5,7 +5,6 @@
#ifndef __DMV_K220_H__
#define __DMV_K220_H__
-#include "emu.h"
#include "dmvbus.h"
#include "machine/i8255.h"
#include "machine/pit8253.h"
diff --git a/src/devices/bus/dmv/k230.h b/src/devices/bus/dmv/k230.h
index 27b2397986f..1f5da13a87f 100644
--- a/src/devices/bus/dmv/k230.h
+++ b/src/devices/bus/dmv/k230.h
@@ -5,7 +5,6 @@
#ifndef __DMV_K230_H__
#define __DMV_K230_H__
-#include "emu.h"
#include "dmvbus.h"
#include "cpu/i86/i86.h"
diff --git a/src/devices/bus/dmv/k233.h b/src/devices/bus/dmv/k233.h
index eb7411ec42c..6641f97bf08 100644
--- a/src/devices/bus/dmv/k233.h
+++ b/src/devices/bus/dmv/k233.h
@@ -5,7 +5,6 @@
#ifndef __DMV_K233_H__
#define __DMV_K233_H__
-#include "emu.h"
#include "dmvbus.h"
//**************************************************************************
diff --git a/src/devices/bus/dmv/k801.h b/src/devices/bus/dmv/k801.h
index 3d0732513e9..a569dc5efab 100644
--- a/src/devices/bus/dmv/k801.h
+++ b/src/devices/bus/dmv/k801.h
@@ -5,7 +5,6 @@
#ifndef __DMV_K801_H__
#define __DMV_K801_H__
-#include "emu.h"
#include "dmvbus.h"
#include "machine/mc2661.h"
#include "bus/rs232/rs232.h"
diff --git a/src/devices/bus/dmv/k803.h b/src/devices/bus/dmv/k803.h
index 820ec746455..714c08b1e45 100644
--- a/src/devices/bus/dmv/k803.h
+++ b/src/devices/bus/dmv/k803.h
@@ -5,7 +5,6 @@
#ifndef __DMV_K803_H__
#define __DMV_K803_H__
-#include "emu.h"
#include "dmvbus.h"
#include "machine/mm58167.h"
diff --git a/src/devices/bus/dmv/k806.h b/src/devices/bus/dmv/k806.h
index 9df9381fa70..3b5eb294a5b 100644
--- a/src/devices/bus/dmv/k806.h
+++ b/src/devices/bus/dmv/k806.h
@@ -5,7 +5,6 @@
#ifndef __DMV_K806_H__
#define __DMV_K806_H__
-#include "emu.h"
#include "dmvbus.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/devices/bus/dmv/ram.h b/src/devices/bus/dmv/ram.h
index ea8417fa720..783c7bacf42 100644
--- a/src/devices/bus/dmv/ram.h
+++ b/src/devices/bus/dmv/ram.h
@@ -5,7 +5,6 @@
#ifndef __DMV_RAM_H__
#define __DMV_RAM_H__
-#include "emu.h"
#include "dmvbus.h"
//**************************************************************************
diff --git a/src/devices/bus/ecbbus/ecbbus.cpp b/src/devices/bus/ecbbus/ecbbus.cpp
index 102309dcdcf..d9a5844a6c5 100644
--- a/src/devices/bus/ecbbus/ecbbus.cpp
+++ b/src/devices/bus/ecbbus/ecbbus.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ecbbus.h"
diff --git a/src/devices/bus/ecbbus/ecbbus.h b/src/devices/bus/ecbbus/ecbbus.h
index 6c6e09ec123..8fb7e51f893 100644
--- a/src/devices/bus/ecbbus/ecbbus.h
+++ b/src/devices/bus/ecbbus/ecbbus.h
@@ -47,7 +47,6 @@
#ifndef __ECBBUS__
#define __ECBBUS__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp
index e2928807399..c4da34f0e81 100644
--- a/src/devices/bus/ecbbus/grip.cpp
+++ b/src/devices/bus/ecbbus/grip.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "grip.h"
diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h
index 3f26f392b1f..c2aef7cda8b 100644
--- a/src/devices/bus/ecbbus/grip.h
+++ b/src/devices/bus/ecbbus/grip.h
@@ -11,7 +11,6 @@
#ifndef __GRIP__
#define __GRIP__
-#include "emu.h"
#include "ecbbus.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp
index 0b66a916299..3ef261e174a 100644
--- a/src/devices/bus/econet/e01.cpp
+++ b/src/devices/bus/econet/e01.cpp
@@ -51,6 +51,7 @@
*/
+#include "emu.h"
#include "e01.h"
#include "bus/scsi/scsihd.h"
#include "softlist.h"
diff --git a/src/devices/bus/econet/econet.cpp b/src/devices/bus/econet/econet.cpp
index acd22f218ab..56d1461124f 100644
--- a/src/devices/bus/econet/econet.cpp
+++ b/src/devices/bus/econet/econet.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "econet.h"
diff --git a/src/devices/bus/econet/econet.h b/src/devices/bus/econet/econet.h
index 55acd438994..e41b5dbf133 100644
--- a/src/devices/bus/econet/econet.h
+++ b/src/devices/bus/econet/econet.h
@@ -11,7 +11,6 @@
#ifndef __ECONET__
#define __ECONET__
-#include "emu.h"
diff --git a/src/devices/bus/electron/exp.cpp b/src/devices/bus/electron/exp.cpp
index bff51964e99..59df7604656 100644
--- a/src/devices/bus/electron/exp.cpp
+++ b/src/devices/bus/electron/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/electron/exp.h b/src/devices/bus/electron/exp.h
index e4cd4c96008..a87b1670fcc 100644
--- a/src/devices/bus/electron/exp.h
+++ b/src/devices/bus/electron/exp.h
@@ -88,7 +88,6 @@ AC RETURNS (pins 3,4) - adaptor. A total of 6W may be drawn from these lines as
#ifndef __ELECTRON_EXPANSION_SLOT__
#define __ELECTRON_EXPANSION_SLOT__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp
index 4228f02395f..bef3596db51 100644
--- a/src/devices/bus/electron/m2105.cpp
+++ b/src/devices/bus/electron/m2105.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
+#include "emu.h"
#include "m2105.h"
diff --git a/src/devices/bus/electron/m2105.h b/src/devices/bus/electron/m2105.h
index 511bbe766d4..d9d8d5b3aed 100644
--- a/src/devices/bus/electron/m2105.h
+++ b/src/devices/bus/electron/m2105.h
@@ -10,7 +10,6 @@
#ifndef __ELECTRON_M2105__
#define __ELECTRON_M2105__
-#include "emu.h"
#include "exp.h"
#include "machine/6522via.h"
#include "machine/mc68681.h"
diff --git a/src/devices/bus/electron/plus3.cpp b/src/devices/bus/electron/plus3.cpp
index 62f8e77f69a..ae56dbe98f3 100644
--- a/src/devices/bus/electron/plus3.cpp
+++ b/src/devices/bus/electron/plus3.cpp
@@ -15,6 +15,7 @@
**********************************************************************/
+#include "emu.h"
#include "plus3.h"
#include "softlist.h"
diff --git a/src/devices/bus/electron/plus3.h b/src/devices/bus/electron/plus3.h
index a16af3f370c..80aa3ec2320 100644
--- a/src/devices/bus/electron/plus3.h
+++ b/src/devices/bus/electron/plus3.h
@@ -10,7 +10,6 @@
#ifndef __ELECTRON_PLUS3__
#define __ELECTRON_PLUS3__
-#include "emu.h"
#include "exp.h"
#include "machine/wd_fdc.h"
#include "formats/acorn_dsk.h"
diff --git a/src/devices/bus/ep64/exdos.cpp b/src/devices/bus/ep64/exdos.cpp
index 2afb8f83312..2fceed2bece 100644
--- a/src/devices/bus/ep64/exdos.cpp
+++ b/src/devices/bus/ep64/exdos.cpp
@@ -45,6 +45,7 @@ This PCB plugs into the external expansion connector on the right side of the ma
*/
+#include "emu.h"
#include "exdos.h"
diff --git a/src/devices/bus/ep64/exdos.h b/src/devices/bus/ep64/exdos.h
index 6139d8a03de..a2417e0b1fa 100644
--- a/src/devices/bus/ep64/exdos.h
+++ b/src/devices/bus/ep64/exdos.h
@@ -11,7 +11,6 @@
#ifndef __EP64_EXDOS__
#define __EP64_EXDOS__
-#include "emu.h"
#include "exp.h"
#include "formats/ep64_dsk.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/ep64/exp.cpp b/src/devices/bus/ep64/exp.cpp
index 784d13fa63b..8179015100d 100644
--- a/src/devices/bus/ep64/exp.cpp
+++ b/src/devices/bus/ep64/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/ep64/exp.h b/src/devices/bus/ep64/exp.h
index cbba96f1efa..1dd01eb1e5f 100644
--- a/src/devices/bus/ep64/exp.h
+++ b/src/devices/bus/ep64/exp.h
@@ -47,7 +47,6 @@
#ifndef __EP64_EXPANSION_BUS__
#define __EP64_EXPANSION_BUS__
-#include "emu.h"
#include "sound/dave.h"
diff --git a/src/devices/bus/epson_sio/epson_sio.cpp b/src/devices/bus/epson_sio/epson_sio.cpp
index f70e15006d7..c77ba243810 100644
--- a/src/devices/bus/epson_sio/epson_sio.cpp
+++ b/src/devices/bus/epson_sio/epson_sio.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "epson_sio.h"
// supported devices
diff --git a/src/devices/bus/epson_sio/epson_sio.h b/src/devices/bus/epson_sio/epson_sio.h
index 616a407ae5c..cd853d950b9 100644
--- a/src/devices/bus/epson_sio/epson_sio.h
+++ b/src/devices/bus/epson_sio/epson_sio.h
@@ -11,7 +11,6 @@
#ifndef __EPSON_SIO_H__
#define __EPSON_SIO_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/epson_sio/pf10.cpp b/src/devices/bus/epson_sio/pf10.cpp
index 5e8463ef6a6..3dbe9de76c9 100644
--- a/src/devices/bus/epson_sio/pf10.cpp
+++ b/src/devices/bus/epson_sio/pf10.cpp
@@ -10,6 +10,7 @@
**********************************************************************/
+#include "emu.h"
#include "pf10.h"
diff --git a/src/devices/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h
index 16e1b1cb170..ab89b0fe01c 100644
--- a/src/devices/bus/epson_sio/pf10.h
+++ b/src/devices/bus/epson_sio/pf10.h
@@ -13,7 +13,6 @@
#ifndef __PF10_H__
#define __PF10_H__
-#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "machine/upd765.h"
#include "epson_sio.h"
diff --git a/src/devices/bus/epson_sio/tf20.cpp b/src/devices/bus/epson_sio/tf20.cpp
index c920d2324ee..066c11af870 100644
--- a/src/devices/bus/epson_sio/tf20.cpp
+++ b/src/devices/bus/epson_sio/tf20.cpp
@@ -12,6 +12,7 @@
**********************************************************************/
+#include "emu.h"
#include "tf20.h"
#define XTAL_CR1 XTAL_8MHz
diff --git a/src/devices/bus/epson_sio/tf20.h b/src/devices/bus/epson_sio/tf20.h
index 8fc66e2917f..a82f38ce9d3 100644
--- a/src/devices/bus/epson_sio/tf20.h
+++ b/src/devices/bus/epson_sio/tf20.h
@@ -13,7 +13,6 @@
#ifndef __TF20_H__
#define __TF20_H__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/ram.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/gamegear/ggext.cpp b/src/devices/bus/gamegear/ggext.cpp
index 5aad987a7a7..ff45b646acb 100644
--- a/src/devices/bus/gamegear/ggext.cpp
+++ b/src/devices/bus/gamegear/ggext.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
+#include "emu.h"
#include "ggext.h"
// slot devices
#include "smsctrladp.h"
diff --git a/src/devices/bus/gamegear/ggext.h b/src/devices/bus/gamegear/ggext.h
index 322de4812a4..cdcbcb0dc00 100644
--- a/src/devices/bus/gamegear/ggext.h
+++ b/src/devices/bus/gamegear/ggext.h
@@ -15,7 +15,6 @@
#ifndef __GG_EXT_PORT__
#define __GG_EXT_PORT__
-#include "emu.h"
diff --git a/src/devices/bus/gamegear/smsctrladp.cpp b/src/devices/bus/gamegear/smsctrladp.cpp
index 065c9d7ca24..a6212395d34 100644
--- a/src/devices/bus/gamegear/smsctrladp.cpp
+++ b/src/devices/bus/gamegear/smsctrladp.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
+#include "emu.h"
#include "smsctrladp.h"
diff --git a/src/devices/bus/gamegear/smsctrladp.h b/src/devices/bus/gamegear/smsctrladp.h
index a4e85b4d50c..4a4b9958ef5 100644
--- a/src/devices/bus/gamegear/smsctrladp.h
+++ b/src/devices/bus/gamegear/smsctrladp.h
@@ -13,7 +13,6 @@
#define __SMS_CTRL_ADAPTOR__
-#include "emu.h"
#include "ggext.h"
#include "bus/sms_ctrl/smsctrl.h"
diff --git a/src/devices/bus/generic/carts.cpp b/src/devices/bus/generic/carts.cpp
index 23a079289c9..b5a7dc7514a 100644
--- a/src/devices/bus/generic/carts.cpp
+++ b/src/devices/bus/generic/carts.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
+#include "emu.h"
#include "carts.h"
SLOT_INTERFACE_START(generic_plain_slot)
diff --git a/src/devices/bus/generic/carts.h b/src/devices/bus/generic/carts.h
index fdd354314ed..e7989272b32 100644
--- a/src/devices/bus/generic/carts.h
+++ b/src/devices/bus/generic/carts.h
@@ -11,7 +11,6 @@
#ifndef __GENERIC_CARTS_H__
#define __GENERIC_CARTS_H__
-#include "emu.h"
#include "rom.h"
#include "ram.h"
diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp
index ae2928e0f6b..74da49aebca 100644
--- a/src/devices/bus/hp9845_io/98034.cpp
+++ b/src/devices/bus/hp9845_io/98034.cpp
@@ -13,6 +13,7 @@
*********************************************************************/
+#include "emu.h"
#include "98034.h"
#include "coreutil.h"
diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp
index 20f5f306c1d..459641cf7a3 100644
--- a/src/devices/bus/hp9845_io/98035.cpp
+++ b/src/devices/bus/hp9845_io/98035.cpp
@@ -79,6 +79,7 @@
*********************************************************************/
+#include "emu.h"
#include "98035.h"
#include "coreutil.h"
diff --git a/src/devices/bus/hp9845_io/hp9845_io.cpp b/src/devices/bus/hp9845_io/hp9845_io.cpp
index 9cbfceaf289..16cdaa641d3 100644
--- a/src/devices/bus/hp9845_io/hp9845_io.cpp
+++ b/src/devices/bus/hp9845_io/hp9845_io.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "hp9845_io.h"
#include "includes/hp9845.h"
diff --git a/src/devices/bus/hp9845_io/hp9845_io.h b/src/devices/bus/hp9845_io/hp9845_io.h
index 36ef8025039..9ea23e9196d 100644
--- a/src/devices/bus/hp9845_io/hp9845_io.h
+++ b/src/devices/bus/hp9845_io/hp9845_io.h
@@ -13,7 +13,6 @@
#ifndef _HP9845_IO_H_
#define _HP9845_IO_H_
-#include "emu.h"
#define MCFG_HP9845_IO_SLOT_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, HP9845_IO_SLOT, 0) \
diff --git a/src/devices/bus/hp_optroms/hp_optrom.cpp b/src/devices/bus/hp_optroms/hp_optrom.cpp
index c741d8355d4..28eff4114af 100644
--- a/src/devices/bus/hp_optroms/hp_optrom.cpp
+++ b/src/devices/bus/hp_optroms/hp_optrom.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "hp_optrom.h"
#include "softlist.h"
#include "cpu/hphybrid/hphybrid.h"
diff --git a/src/devices/bus/hp_optroms/hp_optrom.h b/src/devices/bus/hp_optroms/hp_optrom.h
index 9d95ab76fe1..b36cf3d62da 100644
--- a/src/devices/bus/hp_optroms/hp_optrom.h
+++ b/src/devices/bus/hp_optroms/hp_optrom.h
@@ -13,7 +13,6 @@
#ifndef _HP_OPTROM_H_
#define _HP_OPTROM_H_
-#include "emu.h"
#include "softlist_dev.h"
diff --git a/src/devices/bus/ieee488/c2031.cpp b/src/devices/bus/ieee488/c2031.cpp
index 93b184cb7da..7966c596ac5 100644
--- a/src/devices/bus/ieee488/c2031.cpp
+++ b/src/devices/bus/ieee488/c2031.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "c2031.h"
diff --git a/src/devices/bus/ieee488/c2031.h b/src/devices/bus/ieee488/c2031.h
index 3d64c7c4485..1b7212e0581 100644
--- a/src/devices/bus/ieee488/c2031.h
+++ b/src/devices/bus/ieee488/c2031.h
@@ -11,7 +11,6 @@
#ifndef __C2031__
#define __C2031__
-#include "emu.h"
#include "ieee488.h"
#include "cpu/m6502/m6502.h"
#include "machine/64h156.h"
diff --git a/src/devices/bus/ieee488/c2040.cpp b/src/devices/bus/ieee488/c2040.cpp
index 717f8feba30..23367e51a53 100644
--- a/src/devices/bus/ieee488/c2040.cpp
+++ b/src/devices/bus/ieee488/c2040.cpp
@@ -47,6 +47,7 @@
*/
+#include "emu.h"
#include "c2040.h"
diff --git a/src/devices/bus/ieee488/c2040.h b/src/devices/bus/ieee488/c2040.h
index 252b0956906..d56da37ea9b 100644
--- a/src/devices/bus/ieee488/c2040.h
+++ b/src/devices/bus/ieee488/c2040.h
@@ -11,7 +11,6 @@
#ifndef __C2040__
#define __C2040__
-#include "emu.h"
#include "ieee488.h"
#include "c2040fdc.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/devices/bus/ieee488/c2040fdc.cpp b/src/devices/bus/ieee488/c2040fdc.cpp
index 3569a59f8b5..1d49dc6aec9 100644
--- a/src/devices/bus/ieee488/c2040fdc.cpp
+++ b/src/devices/bus/ieee488/c2040fdc.cpp
@@ -15,6 +15,7 @@
*/
+#include "emu.h"
#include "c2040fdc.h"
diff --git a/src/devices/bus/ieee488/c2040fdc.h b/src/devices/bus/ieee488/c2040fdc.h
index 348ff5e0469..74dcb750544 100644
--- a/src/devices/bus/ieee488/c2040fdc.h
+++ b/src/devices/bus/ieee488/c2040fdc.h
@@ -11,7 +11,6 @@
#ifndef __C2040_FLOPPY__
#define __C2040_FLOPPY__
-#include "emu.h"
#include "formats/c3040_dsk.h"
#include "formats/c4040_dsk.h"
#include "formats/d64_dsk.h"
diff --git a/src/devices/bus/ieee488/c8050.cpp b/src/devices/bus/ieee488/c8050.cpp
index 2532e90dcd3..f0709f3046e 100644
--- a/src/devices/bus/ieee488/c8050.cpp
+++ b/src/devices/bus/ieee488/c8050.cpp
@@ -22,6 +22,7 @@
*/
+#include "emu.h"
#include "c8050.h"
diff --git a/src/devices/bus/ieee488/c8050.h b/src/devices/bus/ieee488/c8050.h
index ab2c38c3b54..d1200326aae 100644
--- a/src/devices/bus/ieee488/c8050.h
+++ b/src/devices/bus/ieee488/c8050.h
@@ -11,7 +11,6 @@
#ifndef __C8050__
#define __C8050__
-#include "emu.h"
#include "ieee488.h"
#include "c8050fdc.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/devices/bus/ieee488/c8050fdc.cpp b/src/devices/bus/ieee488/c8050fdc.cpp
index 7bde9374b74..0821d6a1bf7 100644
--- a/src/devices/bus/ieee488/c8050fdc.cpp
+++ b/src/devices/bus/ieee488/c8050fdc.cpp
@@ -15,6 +15,7 @@
*/
+#include "emu.h"
#include "c8050fdc.h"
diff --git a/src/devices/bus/ieee488/c8050fdc.h b/src/devices/bus/ieee488/c8050fdc.h
index e77b92b17f5..12cdc0d7def 100644
--- a/src/devices/bus/ieee488/c8050fdc.h
+++ b/src/devices/bus/ieee488/c8050fdc.h
@@ -11,7 +11,6 @@
#ifndef __C8050_FLOPPY__
#define __C8050_FLOPPY__
-#include "emu.h"
#include "formats/d80_dsk.h"
#include "formats/d82_dsk.h"
#include "imagedev/floppy.h"
diff --git a/src/devices/bus/ieee488/c8280.cpp b/src/devices/bus/ieee488/c8280.cpp
index faac9c5efeb..ef1156c8a2c 100644
--- a/src/devices/bus/ieee488/c8280.cpp
+++ b/src/devices/bus/ieee488/c8280.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "c8280.h"
diff --git a/src/devices/bus/ieee488/c8280.h b/src/devices/bus/ieee488/c8280.h
index 1ca86cd8533..2a3c1a4f153 100644
--- a/src/devices/bus/ieee488/c8280.h
+++ b/src/devices/bus/ieee488/c8280.h
@@ -11,7 +11,6 @@
#ifndef __C8280__
#define __C8280__
-#include "emu.h"
#include "ieee488.h"
#include "cpu/m6502/m6502.h"
#include "formats/c8280_dsk.h"
diff --git a/src/devices/bus/ieee488/d9060.cpp b/src/devices/bus/ieee488/d9060.cpp
index 01a9961b3d4..f2a0ef398d0 100644
--- a/src/devices/bus/ieee488/d9060.cpp
+++ b/src/devices/bus/ieee488/d9060.cpp
@@ -27,6 +27,7 @@
*/
+#include "emu.h"
#include "d9060.h"
#include "bus/scsi/d9060hd.h"
diff --git a/src/devices/bus/ieee488/d9060.h b/src/devices/bus/ieee488/d9060.h
index 7dce8217344..9934c0e0cb0 100644
--- a/src/devices/bus/ieee488/d9060.h
+++ b/src/devices/bus/ieee488/d9060.h
@@ -11,7 +11,6 @@
#ifndef __D9060__
#define __D9060__
-#include "emu.h"
#include "ieee488.h"
#include "cpu/m6502/m6502.h"
#include "machine/6522via.h"
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index aa19fe840de..31490a63f3f 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -38,6 +38,7 @@
*/
+#include "emu.h"
#include "hardbox.h"
diff --git a/src/devices/bus/ieee488/hp9895.cpp b/src/devices/bus/ieee488/hp9895.cpp
index 6abe8bc773d..da78bc156a4 100644
--- a/src/devices/bus/ieee488/hp9895.cpp
+++ b/src/devices/bus/ieee488/hp9895.cpp
@@ -54,6 +54,7 @@
*********************************************************************/
+#include "emu.h"
#include "hp9895.h"
// Debugging
diff --git a/src/devices/bus/ieee488/hp9895.h b/src/devices/bus/ieee488/hp9895.h
index 5837792de82..1d3189d5bb2 100644
--- a/src/devices/bus/ieee488/hp9895.h
+++ b/src/devices/bus/ieee488/hp9895.h
@@ -13,7 +13,6 @@
#ifndef _HP9895_H_
#define _HP9895_H_
-#include "emu.h"
#include "ieee488.h"
#include "cpu/z80/z80.h"
#include "machine/phi.h"
diff --git a/src/devices/bus/ieee488/ieee488.cpp b/src/devices/bus/ieee488/ieee488.cpp
index 4dc7b69eeae..f31009c2981 100644
--- a/src/devices/bus/ieee488/ieee488.cpp
+++ b/src/devices/bus/ieee488/ieee488.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
+#include "emu.h"
#include "ieee488.h"
diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h
index 8c72f7eb155..681dbb8f1fe 100644
--- a/src/devices/bus/ieee488/ieee488.h
+++ b/src/devices/bus/ieee488/ieee488.h
@@ -12,7 +12,6 @@
#ifndef __IEEE488__
#define __IEEE488__
-#include "emu.h"
diff --git a/src/devices/bus/ieee488/shark.cpp b/src/devices/bus/ieee488/shark.cpp
index 7d6e81e6844..259a3336b31 100644
--- a/src/devices/bus/ieee488/shark.cpp
+++ b/src/devices/bus/ieee488/shark.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "shark.h"
#include "bus/rs232/rs232.h"
#include "cpu/i8085/i8085.h"
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp
index 7d586566e9a..922bc0f0897 100644
--- a/src/devices/bus/ieee488/softbox.cpp
+++ b/src/devices/bus/ieee488/softbox.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "softbox.h"
diff --git a/src/devices/bus/imi7000/imi5000h.cpp b/src/devices/bus/imi7000/imi5000h.cpp
index 73596f8505c..8e98b8414f5 100644
--- a/src/devices/bus/imi7000/imi5000h.cpp
+++ b/src/devices/bus/imi7000/imi5000h.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "imi5000h.h"
diff --git a/src/devices/bus/imi7000/imi5000h.h b/src/devices/bus/imi7000/imi5000h.h
index c8ac2492dc0..153ad678d37 100644
--- a/src/devices/bus/imi7000/imi5000h.h
+++ b/src/devices/bus/imi7000/imi5000h.h
@@ -13,7 +13,6 @@
#ifndef __IMI5000H__
#define __IMI5000H__
-#include "emu.h"
#include "imi7000.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/devices/bus/imi7000/imi7000.cpp b/src/devices/bus/imi7000/imi7000.cpp
index fa73e98b10b..e28a3df72d7 100644
--- a/src/devices/bus/imi7000/imi7000.cpp
+++ b/src/devices/bus/imi7000/imi7000.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "imi7000.h"
diff --git a/src/devices/bus/imi7000/imi7000.h b/src/devices/bus/imi7000/imi7000.h
index 314b86c4302..765f2ef5a3f 100644
--- a/src/devices/bus/imi7000/imi7000.h
+++ b/src/devices/bus/imi7000/imi7000.h
@@ -31,7 +31,6 @@
#ifndef __IMI7000_BUS__
#define __IMI7000_BUS__
-#include "emu.h"
diff --git a/src/devices/bus/intv_ctrl/ctrl.cpp b/src/devices/bus/intv_ctrl/ctrl.cpp
index 2c55e2093c0..d34a25baff0 100644
--- a/src/devices/bus/intv_ctrl/ctrl.cpp
+++ b/src/devices/bus/intv_ctrl/ctrl.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ctrl.h"
// slot devices
#include "handctrl.h"
diff --git a/src/devices/bus/intv_ctrl/ctrl.h b/src/devices/bus/intv_ctrl/ctrl.h
index d22be155f62..0507dbf062d 100644
--- a/src/devices/bus/intv_ctrl/ctrl.h
+++ b/src/devices/bus/intv_ctrl/ctrl.h
@@ -12,7 +12,6 @@
#ifndef __INTV_CONTROL_PORT__
#define __INTV_CONTROL_PORT__
-#include "emu.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
index 0aa50e20e89..18b2c328263 100644
--- a/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
+++ b/src/devices/bus/intv_ctrl/ecs_ctrl.cpp
@@ -22,6 +22,7 @@
**********************************************************************/
+#include "emu.h"
#include "ecs_ctrl.h"
diff --git a/src/devices/bus/intv_ctrl/ecs_ctrl.h b/src/devices/bus/intv_ctrl/ecs_ctrl.h
index 61c70a529bd..02dd10f8e02 100644
--- a/src/devices/bus/intv_ctrl/ecs_ctrl.h
+++ b/src/devices/bus/intv_ctrl/ecs_ctrl.h
@@ -12,7 +12,6 @@
#ifndef __INTVECS_CONTROL_PORT__
#define __INTVECS_CONTROL_PORT__
-#include "emu.h"
#include "bus/intv_ctrl/ctrl.h"
#include "bus/intv_ctrl/handctrl.h"
diff --git a/src/devices/bus/intv_ctrl/handctrl.cpp b/src/devices/bus/intv_ctrl/handctrl.cpp
index b1ccafdca4f..ae0e6910e6c 100644
--- a/src/devices/bus/intv_ctrl/handctrl.cpp
+++ b/src/devices/bus/intv_ctrl/handctrl.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "handctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/intv_ctrl/handctrl.h b/src/devices/bus/intv_ctrl/handctrl.h
index e19921acb85..bc15a8c28d3 100644
--- a/src/devices/bus/intv_ctrl/handctrl.h
+++ b/src/devices/bus/intv_ctrl/handctrl.h
@@ -12,7 +12,6 @@
#define __INTV_HANDCTRL__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/iq151/disc2.h b/src/devices/bus/iq151/disc2.h
index f5f97698571..fd2eabc4aa7 100644
--- a/src/devices/bus/iq151/disc2.h
+++ b/src/devices/bus/iq151/disc2.h
@@ -5,7 +5,6 @@
#ifndef __IQ151_DISC2_H__
#define __IQ151_DISC2_H__
-#include "emu.h"
#include "iq151.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/iq151/grafik.h b/src/devices/bus/iq151/grafik.h
index 7f1ab66a5ef..87e2e6d6d17 100644
--- a/src/devices/bus/iq151/grafik.h
+++ b/src/devices/bus/iq151/grafik.h
@@ -5,7 +5,6 @@
#ifndef __IQ151_GRAFIK_H__
#define __IQ151_GRAFIK_H__
-#include "emu.h"
#include "iq151.h"
#include "machine/i8255.h"
diff --git a/src/devices/bus/iq151/minigraf.h b/src/devices/bus/iq151/minigraf.h
index ab70a07ad3c..78ba888f4f6 100644
--- a/src/devices/bus/iq151/minigraf.h
+++ b/src/devices/bus/iq151/minigraf.h
@@ -5,7 +5,6 @@
#ifndef __IQ151_MINIGRAF_H__
#define __IQ151_MINIGRAF_H__
-#include "emu.h"
#include "iq151.h"
//**************************************************************************
diff --git a/src/devices/bus/iq151/ms151a.h b/src/devices/bus/iq151/ms151a.h
index 1b090f5c093..a00d541cee8 100644
--- a/src/devices/bus/iq151/ms151a.h
+++ b/src/devices/bus/iq151/ms151a.h
@@ -5,7 +5,6 @@
#ifndef __IQ151_MS151A_H__
#define __IQ151_MS151A_H__
-#include "emu.h"
#include "iq151.h"
//**************************************************************************
diff --git a/src/devices/bus/iq151/rom.h b/src/devices/bus/iq151/rom.h
index bb9aac2676c..bd17fc4e65e 100644
--- a/src/devices/bus/iq151/rom.h
+++ b/src/devices/bus/iq151/rom.h
@@ -5,7 +5,6 @@
#ifndef __IQ151_ROM_H__
#define __IQ151_ROM_H__
-#include "emu.h"
#include "iq151.h"
#include "machine/i8255.h"
diff --git a/src/devices/bus/iq151/staper.h b/src/devices/bus/iq151/staper.h
index 0579f075c3f..54bd6823088 100644
--- a/src/devices/bus/iq151/staper.h
+++ b/src/devices/bus/iq151/staper.h
@@ -5,7 +5,6 @@
#ifndef __IQ151_STAPER_H__
#define __IQ151_STAPER_H__
-#include "emu.h"
#include "iq151.h"
#include "machine/i8255.h"
#include "imagedev/printer.h"
diff --git a/src/devices/bus/iq151/video32.h b/src/devices/bus/iq151/video32.h
index 43b778c5f0e..8bdd46c671b 100644
--- a/src/devices/bus/iq151/video32.h
+++ b/src/devices/bus/iq151/video32.h
@@ -5,7 +5,6 @@
#ifndef __IQ151_VIDEO32_H__
#define __IQ151_VIDEO32_H__
-#include "emu.h"
#include "iq151.h"
//**************************************************************************
diff --git a/src/devices/bus/iq151/video64.h b/src/devices/bus/iq151/video64.h
index e9f0b2428ff..773f71cd7d6 100644
--- a/src/devices/bus/iq151/video64.h
+++ b/src/devices/bus/iq151/video64.h
@@ -5,7 +5,6 @@
#ifndef __IQ151_VIDEO64_H__
#define __IQ151_VIDEO64_H__
-#include "emu.h"
#include "iq151.h"
//**************************************************************************
diff --git a/src/devices/bus/isa/3c503.h b/src/devices/bus/isa/3c503.h
index 0db8d3da809..06efe90f168 100644
--- a/src/devices/bus/isa/3c503.h
+++ b/src/devices/bus/isa/3c503.h
@@ -5,7 +5,6 @@
#ifndef __3C503_H__
#define __3C503_H__
-#include "emu.h"
#include "isa.h"
#include "machine/dp8390.h"
diff --git a/src/devices/bus/isa/3c505.cpp b/src/devices/bus/isa/3c505.cpp
index b50b341d82d..9523a61ac61 100644
--- a/src/devices/bus/isa/3c505.cpp
+++ b/src/devices/bus/isa/3c505.cpp
@@ -16,6 +16,7 @@
*
*/
+#include "emu.h"
#include "3c505.h"
#define VERBOSE 0
diff --git a/src/devices/bus/isa/3c505.h b/src/devices/bus/isa/3c505.h
index 459db446bb5..13f784aba56 100644
--- a/src/devices/bus/isa/3c505.h
+++ b/src/devices/bus/isa/3c505.h
@@ -13,7 +13,6 @@
#ifndef THREECOM3C505_H_
#define THREECOM3C505_H_
-#include "emu.h"
#include "bus/isa/isa.h"
#define CMD_BUFFER_SIZE 100
diff --git a/src/devices/bus/isa/adlib.h b/src/devices/bus/isa/adlib.h
index 27549f4ae23..2c871235b76 100644
--- a/src/devices/bus/isa/adlib.h
+++ b/src/devices/bus/isa/adlib.h
@@ -5,7 +5,6 @@
#ifndef __ISA_ADLIB_H__
#define __ISA_ADLIB_H__
-#include "emu.h"
#include "isa.h"
#include "sound/3812intf.h"
diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp
index 38a1afbfae5..ff0c05c8e54 100644
--- a/src/devices/bus/isa/aga.cpp
+++ b/src/devices/bus/isa/aga.cpp
@@ -5,6 +5,7 @@
* aga.c
*
****************************************************************************/
+#include "emu.h"
#include "aga.h"
#include "video/cgapal.h"
diff --git a/src/devices/bus/isa/aga.h b/src/devices/bus/isa/aga.h
index 54871eee91d..371e185bc4c 100644
--- a/src/devices/bus/isa/aga.h
+++ b/src/devices/bus/isa/aga.h
@@ -22,7 +22,6 @@
#ifndef __ISA_AGA_H__
#define __ISA_AGA_H__
-#include "emu.h"
#include "isa.h"
#include "cga.h"
#include "video/mc6845.h"
diff --git a/src/devices/bus/isa/aha1542.cpp b/src/devices/bus/isa/aha1542.cpp
index 4ea36e2671e..9218b7cf08c 100644
--- a/src/devices/bus/isa/aha1542.cpp
+++ b/src/devices/bus/isa/aha1542.cpp
@@ -74,6 +74,7 @@
* source: http://download.adaptec.com/pdfs/installation_guides/1540cfig.pdf
*/
+#include "emu.h"
#include "aha1542.h"
#include "cpu/z80/z80.h"
diff --git a/src/devices/bus/isa/aha1542.h b/src/devices/bus/isa/aha1542.h
index 710ce36b6df..703bd48f28b 100644
--- a/src/devices/bus/isa/aha1542.h
+++ b/src/devices/bus/isa/aha1542.h
@@ -16,7 +16,6 @@
#define __AHA1542__
-#include "emu.h"
#include "isa.h"
//*********************************************************************
diff --git a/src/devices/bus/isa/cga.h b/src/devices/bus/isa/cga.h
index 54db66e4e10..5d253340a50 100644
--- a/src/devices/bus/isa/cga.h
+++ b/src/devices/bus/isa/cga.h
@@ -5,7 +5,6 @@
#ifndef __ISA_CGA_H__
#define __ISA_CGA_H__
-#include "emu.h"
#include "isa.h"
#include "video/mc6845.h"
diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp
index 6e346bcc13e..b3ebd9f7d41 100644
--- a/src/devices/bus/isa/com.cpp
+++ b/src/devices/bus/isa/com.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "com.h"
#include "bus/rs232/rs232.h"
#include "bus/rs232/ser_mouse.h"
diff --git a/src/devices/bus/isa/com.h b/src/devices/bus/isa/com.h
index 3574bac9cfb..ef503bd770d 100644
--- a/src/devices/bus/isa/com.h
+++ b/src/devices/bus/isa/com.h
@@ -5,7 +5,6 @@
#ifndef __ISA_COM_H__
#define __ISA_COM_H__
-#include "emu.h"
#include "isa.h"
diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp
index 36e8f78accd..958fb139920 100644
--- a/src/devices/bus/isa/dectalk.cpp
+++ b/src/devices/bus/isa/dectalk.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "dectalk.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/bus/isa/dectalk.h b/src/devices/bus/isa/dectalk.h
index 448124815fd..cace3a9d488 100644
--- a/src/devices/bus/isa/dectalk.h
+++ b/src/devices/bus/isa/dectalk.h
@@ -3,7 +3,6 @@
#ifndef ISA_DECTALK_H_
#define ISA_DECTALK_H_
-#include "emu.h"
#include "isa.h"
#include "sound/dac.h"
#include "cpu/i86/i186.h"
diff --git a/src/devices/bus/isa/ega.h b/src/devices/bus/isa/ega.h
index 9f40b1c577e..e292c5d5e4f 100644
--- a/src/devices/bus/isa/ega.h
+++ b/src/devices/bus/isa/ega.h
@@ -5,7 +5,6 @@
#ifndef __ISA_EGA_H__
#define __ISA_EGA_H__
-#include "emu.h"
#include "isa.h"
#include "video/crtc_ega.h"
diff --git a/src/devices/bus/isa/fdc.h b/src/devices/bus/isa/fdc.h
index bed6389036c..bdcebdce2bd 100644
--- a/src/devices/bus/isa/fdc.h
+++ b/src/devices/bus/isa/fdc.h
@@ -10,7 +10,6 @@
#ifndef ISA_FDC_H
#define ISA_FDC_H
-#include "emu.h"
#include "isa.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/isa/finalchs.h b/src/devices/bus/isa/finalchs.h
index a7dfa9b71d7..e105a8a0289 100644
--- a/src/devices/bus/isa/finalchs.h
+++ b/src/devices/bus/isa/finalchs.h
@@ -5,7 +5,6 @@
#ifndef __ISA_FINALCHS_H__
#define __ISA_FINALCHS_H__
-#include "emu.h"
#include "isa.h"
//**************************************************************************
diff --git a/src/devices/bus/isa/gblaster.h b/src/devices/bus/isa/gblaster.h
index 69a580fbdee..43aa55107b6 100644
--- a/src/devices/bus/isa/gblaster.h
+++ b/src/devices/bus/isa/gblaster.h
@@ -5,7 +5,6 @@
#ifndef __ISA_GAME_BLASTER_H__
#define __ISA_GAME_BLASTER_H__
-#include "emu.h"
#include "isa.h"
#include "sound/saa1099.h"
diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp
index d7cc2ccb89b..e956a11abc2 100644
--- a/src/devices/bus/isa/gus.cpp
+++ b/src/devices/bus/isa/gus.cpp
@@ -7,6 +7,7 @@
*/
+#include "emu.h"
#include "gus.h"
#include "bus/midi/midi.h"
#include "machine/clock.h"
diff --git a/src/devices/bus/isa/gus.h b/src/devices/bus/isa/gus.h
index cac3c7241a5..bf1d1cb852e 100644
--- a/src/devices/bus/isa/gus.h
+++ b/src/devices/bus/isa/gus.h
@@ -42,7 +42,6 @@
#ifndef __ISA_GUS_H__
#define __ISA_GUS_H__
-#include "emu.h"
#include "isa.h"
#include "machine/6850acia.h"
diff --git a/src/devices/bus/isa/hdc.h b/src/devices/bus/isa/hdc.h
index 94b84606a6f..52c190b3796 100644
--- a/src/devices/bus/isa/hdc.h
+++ b/src/devices/bus/isa/hdc.h
@@ -10,7 +10,6 @@
#ifndef ISA_HDC_H
#define ISA_HDC_H
-#include "emu.h"
#include "isa.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/bus/isa/ibm_mfc.h b/src/devices/bus/isa/ibm_mfc.h
index 192d14d5f3a..a315a55dc72 100644
--- a/src/devices/bus/isa/ibm_mfc.h
+++ b/src/devices/bus/isa/ibm_mfc.h
@@ -12,7 +12,6 @@
#define __ISA_IBM_MUSIC_FEATURE_CARD_H__
-#include "emu.h"
#include "isa.h"
#include "machine/i8255.h"
#include "machine/i8251.h"
diff --git a/src/devices/bus/isa/ide.h b/src/devices/bus/isa/ide.h
index 84088fd2783..4957890c0ba 100644
--- a/src/devices/bus/isa/ide.h
+++ b/src/devices/bus/isa/ide.h
@@ -5,7 +5,6 @@
#ifndef __ISA_IDE_H__
#define __ISA_IDE_H__
-#include "emu.h"
#include "isa.h"
#include "machine/idectrl.h"
diff --git a/src/devices/bus/isa/isa.h b/src/devices/bus/isa/isa.h
index 6e9c6f7e344..c66cf9f2595 100644
--- a/src/devices/bus/isa/isa.h
+++ b/src/devices/bus/isa/isa.h
@@ -67,7 +67,6 @@
#ifndef __ISA_H__
#define __ISA_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/isa/isa_cards.cpp b/src/devices/bus/isa/isa_cards.cpp
index c6bda65c273..53e61c5e72a 100644
--- a/src/devices/bus/isa/isa_cards.cpp
+++ b/src/devices/bus/isa/isa_cards.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "isa_cards.h"
SLOT_INTERFACE_START( pc_isa8_cards )
diff --git a/src/devices/bus/isa/isa_cards.h b/src/devices/bus/isa/isa_cards.h
index 838fc9623bb..9699ed4214f 100644
--- a/src/devices/bus/isa/isa_cards.h
+++ b/src/devices/bus/isa/isa_cards.h
@@ -11,7 +11,6 @@
#ifndef __ISA_CARDS_H__
#define __ISA_CARDS_H__
-#include "emu.h"
// video
#include "mda.h"
diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp
index 0ebcaac07ef..716abcade1f 100644
--- a/src/devices/bus/isa/mach32.cpp
+++ b/src/devices/bus/isa/mach32.cpp
@@ -9,6 +9,7 @@
* Created on: 16/05/2014
*/
+#include "emu.h"
#include "mach32.h"
const device_type ATIMACH32 = &device_creator<mach32_device>;
diff --git a/src/devices/bus/isa/mach32.h b/src/devices/bus/isa/mach32.h
index cc3e2ebdf3a..135d923fc57 100644
--- a/src/devices/bus/isa/mach32.h
+++ b/src/devices/bus/isa/mach32.h
@@ -9,7 +9,6 @@
#ifndef MACH32_H_
#define MACH32_H_
-#include "emu.h"
#include "video/pc_vga.h"
#include "machine/eepromser.h"
diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp
index 38217bb9978..7232cfb8236 100644
--- a/src/devices/bus/isa/mc1502_fdc.cpp
+++ b/src/devices/bus/isa/mc1502_fdc.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mc1502_fdc.h"
#include "cpu/i86/i86.h"
diff --git a/src/devices/bus/isa/mc1502_fdc.h b/src/devices/bus/isa/mc1502_fdc.h
index af53b9c8984..976bc8d4a3c 100644
--- a/src/devices/bus/isa/mc1502_fdc.h
+++ b/src/devices/bus/isa/mc1502_fdc.h
@@ -11,7 +11,6 @@
#ifndef __MC1502_FDC__
#define __MC1502_FDC__
-#include "emu.h"
#include "imagedev/flopdrv.h"
#include "isa.h"
diff --git a/src/devices/bus/isa/mc1502_rom.cpp b/src/devices/bus/isa/mc1502_rom.cpp
index 877fa1bb389..99aa8e5d84d 100644
--- a/src/devices/bus/isa/mc1502_rom.cpp
+++ b/src/devices/bus/isa/mc1502_rom.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mc1502_rom.h"
diff --git a/src/devices/bus/isa/mc1502_rom.h b/src/devices/bus/isa/mc1502_rom.h
index e4b4a89c2f8..193a9bf3274 100644
--- a/src/devices/bus/isa/mc1502_rom.h
+++ b/src/devices/bus/isa/mc1502_rom.h
@@ -11,7 +11,6 @@
#ifndef __MC1502_ROM__
#define __MC1502_ROM__
-#include "emu.h"
#include "isa.h"
//**************************************************************************
diff --git a/src/devices/bus/isa/mcd.cpp b/src/devices/bus/isa/mcd.cpp
index 1d268f23815..5cd0b6bf378 100644
--- a/src/devices/bus/isa/mcd.cpp
+++ b/src/devices/bus/isa/mcd.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "mcd.h"
#include "coreutil.h"
diff --git a/src/devices/bus/isa/mcd.h b/src/devices/bus/isa/mcd.h
index 127721b3065..e7a70b598df 100644
--- a/src/devices/bus/isa/mcd.h
+++ b/src/devices/bus/isa/mcd.h
@@ -5,7 +5,6 @@
#ifndef __MCD_H__
#define __MCD_H__
-#include "emu.h"
#include "isa.h"
#include "imagedev/chd_cd.h"
diff --git a/src/devices/bus/isa/mda.h b/src/devices/bus/isa/mda.h
index 0b214c8c496..4632b94dab7 100644
--- a/src/devices/bus/isa/mda.h
+++ b/src/devices/bus/isa/mda.h
@@ -5,7 +5,6 @@
#ifndef __ISA_MDA_H__
#define __ISA_MDA_H__
-#include "emu.h"
#include "isa.h"
#include "video/mc6845.h"
diff --git a/src/devices/bus/isa/mpu401.h b/src/devices/bus/isa/mpu401.h
index c5dca814718..d0d5c89b346 100644
--- a/src/devices/bus/isa/mpu401.h
+++ b/src/devices/bus/isa/mpu401.h
@@ -5,7 +5,6 @@
#ifndef __ISA_MPU401_H__
#define __ISA_MPU401_H__
-#include "emu.h"
#include "isa.h"
#include "machine/mpu401.h"
diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp
index e85ced13377..87f9e668968 100644
--- a/src/devices/bus/isa/mufdc.cpp
+++ b/src/devices/bus/isa/mufdc.cpp
@@ -14,6 +14,7 @@
***************************************************************************/
+#include "emu.h"
#include "mufdc.h"
#include "formats/naslite_dsk.h"
#include "formats/pc_dsk.h"
diff --git a/src/devices/bus/isa/mufdc.h b/src/devices/bus/isa/mufdc.h
index bd5040a3841..46f46cb5539 100644
--- a/src/devices/bus/isa/mufdc.h
+++ b/src/devices/bus/isa/mufdc.h
@@ -19,7 +19,6 @@
#ifndef __ISA_MUFDC_H__
#define __ISA_MUFDC_H__
-#include "emu.h"
#include "isa.h"
#include "imagedev/floppy.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/isa/ne1000.h b/src/devices/bus/isa/ne1000.h
index 8a609cac4ac..6aff2bef047 100644
--- a/src/devices/bus/isa/ne1000.h
+++ b/src/devices/bus/isa/ne1000.h
@@ -5,7 +5,6 @@
// NE1000 is 8bit has 8KB ram; NE2000 is 16bit has 16KB ram
-#include "emu.h"
#include "isa.h"
#include "machine/dp8390.h"
diff --git a/src/devices/bus/isa/ne2000.h b/src/devices/bus/isa/ne2000.h
index f0fbe2057bf..e99308749d7 100644
--- a/src/devices/bus/isa/ne2000.h
+++ b/src/devices/bus/isa/ne2000.h
@@ -3,7 +3,6 @@
#ifndef __NE2000_H__
#define __NE2000_H__
-#include "emu.h"
#include "isa.h"
#include "machine/dp8390.h"
diff --git a/src/devices/bus/isa/num9rev.h b/src/devices/bus/isa/num9rev.h
index 51f8efbd8f0..a7f4d5b39ac 100644
--- a/src/devices/bus/isa/num9rev.h
+++ b/src/devices/bus/isa/num9rev.h
@@ -5,7 +5,6 @@
#ifndef __NUM9REV_H__
#define __NUM9REV_H__
-#include "emu.h"
#include "isa.h"
#include "video/upd7220.h"
#include "machine/bankdev.h"
diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp
index 468b8d1fa85..096179a4d7e 100644
--- a/src/devices/bus/isa/omti8621.cpp
+++ b/src/devices/bus/isa/omti8621.cpp
@@ -16,6 +16,7 @@
static int verbose = VERBOSE;
+#include "emu.h"
#include "omti8621.h"
#include "image.h"
#include "formats/pc_dsk.h"
diff --git a/src/devices/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h
index 10f3bb6588b..6cbc55051ac 100644
--- a/src/devices/bus/isa/omti8621.h
+++ b/src/devices/bus/isa/omti8621.h
@@ -15,7 +15,6 @@
#ifndef ISA_OMTI8621_H_
#define ISA_OMTI8621_H_
-#include "emu.h"
#include "isa.h"
#include "machine/pc_fdc.h"
diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp
index 36961e7bf98..2c537923cdc 100644
--- a/src/devices/bus/isa/p1_fdc.cpp
+++ b/src/devices/bus/isa/p1_fdc.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "p1_fdc.h"
#include "cpu/i86/i86.h"
diff --git a/src/devices/bus/isa/p1_fdc.h b/src/devices/bus/isa/p1_fdc.h
index 19fd04e3163..ed6d4f809d4 100644
--- a/src/devices/bus/isa/p1_fdc.h
+++ b/src/devices/bus/isa/p1_fdc.h
@@ -11,7 +11,6 @@
#ifndef __P1_FDC__
#define __P1_FDC__
-#include "emu.h"
#include "imagedev/flopdrv.h"
#include "isa.h"
diff --git a/src/devices/bus/isa/p1_hdc.cpp b/src/devices/bus/isa/p1_hdc.cpp
index b0377ef37fa..963a8b14b78 100644
--- a/src/devices/bus/isa/p1_hdc.cpp
+++ b/src/devices/bus/isa/p1_hdc.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "p1_hdc.h"
diff --git a/src/devices/bus/isa/p1_hdc.h b/src/devices/bus/isa/p1_hdc.h
index ec8842e8062..6e809c17f6b 100644
--- a/src/devices/bus/isa/p1_hdc.h
+++ b/src/devices/bus/isa/p1_hdc.h
@@ -11,7 +11,6 @@
#ifndef __P1_HDC__
#define __P1_HDC__
-#include "emu.h"
#include "imagedev/harddriv.h"
#include "isa.h"
diff --git a/src/devices/bus/isa/p1_rom.cpp b/src/devices/bus/isa/p1_rom.cpp
index 8225b3586d2..80aefe011e7 100644
--- a/src/devices/bus/isa/p1_rom.cpp
+++ b/src/devices/bus/isa/p1_rom.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "p1_rom.h"
diff --git a/src/devices/bus/isa/p1_rom.h b/src/devices/bus/isa/p1_rom.h
index 3320628c1b7..fc88dd08222 100644
--- a/src/devices/bus/isa/p1_rom.h
+++ b/src/devices/bus/isa/p1_rom.h
@@ -11,7 +11,6 @@
#ifndef __P1_ROM__
#define __P1_ROM__
-#include "emu.h"
#include "isa.h"
//**************************************************************************
diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp
index fe7492d31e0..a1afa847a6b 100644
--- a/src/devices/bus/isa/p1_sound.cpp
+++ b/src/devices/bus/isa/p1_sound.cpp
@@ -11,6 +11,7 @@
**********************************************************************/
+#include "emu.h"
#include "p1_sound.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/bus/isa/p1_sound.h b/src/devices/bus/isa/p1_sound.h
index ae2965e203b..86dee02454a 100644
--- a/src/devices/bus/isa/p1_sound.h
+++ b/src/devices/bus/isa/p1_sound.h
@@ -14,7 +14,6 @@
#ifndef __P1_SOUND__
#define __P1_SOUND__
-#include "emu.h"
#include "bus/midi/midi.h"
#include "isa.h"
diff --git a/src/devices/bus/isa/pc1640_iga.cpp b/src/devices/bus/isa/pc1640_iga.cpp
index 3b423ed3a74..5511d21ca42 100644
--- a/src/devices/bus/isa/pc1640_iga.cpp
+++ b/src/devices/bus/isa/pc1640_iga.cpp
@@ -18,6 +18,7 @@
**********************************************************************/
+#include "emu.h"
#include "pc1640_iga.h"
diff --git a/src/devices/bus/isa/pc1640_iga.h b/src/devices/bus/isa/pc1640_iga.h
index 50db6388004..4e3bf60613d 100644
--- a/src/devices/bus/isa/pc1640_iga.h
+++ b/src/devices/bus/isa/pc1640_iga.h
@@ -11,7 +11,6 @@
#ifndef __ISA8_PC1640_IGA__
#define __ISA8_PC1640_IGA__
-#include "emu.h"
#include "isa.h"
#include "ega.h"
diff --git a/src/devices/bus/isa/pds.cpp b/src/devices/bus/isa/pds.cpp
index 39c9165f8c9..9b10e9c31b7 100644
--- a/src/devices/bus/isa/pds.cpp
+++ b/src/devices/bus/isa/pds.cpp
@@ -16,6 +16,7 @@
* Created on: 31/01/2014
*/
+#include "emu.h"
#include "pds.h"
const device_type ISA8_PDS = &device_creator<isa8_pds_device>;
diff --git a/src/devices/bus/isa/pds.h b/src/devices/bus/isa/pds.h
index 9a1f0314eae..1bbcf2007d5 100644
--- a/src/devices/bus/isa/pds.h
+++ b/src/devices/bus/isa/pds.h
@@ -9,7 +9,6 @@
#ifndef ISA_PDS_H_
#define ISA_PDS_H_
-#include "emu.h"
#include "isa.h"
#include "machine/i8255.h"
diff --git a/src/devices/bus/isa/pgc.h b/src/devices/bus/isa/pgc.h
index e59348a5bb6..37de1f6e260 100644
--- a/src/devices/bus/isa/pgc.h
+++ b/src/devices/bus/isa/pgc.h
@@ -6,7 +6,6 @@
#ifndef __ISA_PGC_H__
#define __ISA_PGC_H__
-#include "emu.h"
#include "cpu/i86/i86.h"
#include "isa.h"
diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp
index cf05045005e..7812b38db69 100644
--- a/src/devices/bus/isa/s3virge.cpp
+++ b/src/devices/bus/isa/s3virge.cpp
@@ -11,6 +11,7 @@
* - S3D is not implemented at all, so no 2D/3D acceleration yet.
*/
+#include "emu.h"
#include "s3virge.h"
#define CRTC_PORT_ADDR ((vga.miscellaneous_output&1)?0x3d0:0x3b0)
diff --git a/src/devices/bus/isa/s3virge.h b/src/devices/bus/isa/s3virge.h
index 5c33393f8c3..cadbcd8ef63 100644
--- a/src/devices/bus/isa/s3virge.h
+++ b/src/devices/bus/isa/s3virge.h
@@ -10,7 +10,6 @@
#ifndef S3VIRGE_H_
#define S3VIRGE_H_
-#include "emu.h"
#include "video/pc_vga.h"
// ======================> s3virge_vga_device
diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp
index b1ccd4cfd84..bcd4d635ec1 100644
--- a/src/devices/bus/isa/sb16.cpp
+++ b/src/devices/bus/isa/sb16.cpp
@@ -6,6 +6,7 @@
// The mcu does host communication and control of the dma-dac unit
// TODO: UART is connected to MIDI port, mixer, adc
+#include "emu.h"
#include "sb16.h"
const device_type ISA16_SB16 = &device_creator<sb16_lle_device>;
diff --git a/src/devices/bus/isa/sb16.h b/src/devices/bus/isa/sb16.h
index e1c51625bcb..a8de59fea45 100644
--- a/src/devices/bus/isa/sb16.h
+++ b/src/devices/bus/isa/sb16.h
@@ -4,7 +4,6 @@
#ifndef __SB16__
#define __SB16__
-#include "emu.h"
#include "isa.h"
#include "sound/dac.h"
#include "bus/pc_joy/pc_joy.h"
diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp
index 6c1cd476d76..7288f654e90 100644
--- a/src/devices/bus/isa/sblaster.cpp
+++ b/src/devices/bus/isa/sblaster.cpp
@@ -11,6 +11,7 @@
***************************************************************************/
+#include "emu.h"
#include "sblaster.h"
#include "machine/pic8259.h"
#include "sound/speaker.h"
diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp
index 0623733f65d..d443761ae2d 100644
--- a/src/devices/bus/isa/sc499.cpp
+++ b/src/devices/bus/isa/sc499.cpp
@@ -14,6 +14,7 @@
*
*/
+#include "emu.h"
#include "sc499.h"
#include "formats/ioprocs.h"
diff --git a/src/devices/bus/isa/sc499.h b/src/devices/bus/isa/sc499.h
index 5e28ffb54b0..727c8306cf9 100644
--- a/src/devices/bus/isa/sc499.h
+++ b/src/devices/bus/isa/sc499.h
@@ -13,7 +13,6 @@
#ifndef SC499_H_
#define SC499_H_
-#include "emu.h"
#include "bus/isa/isa.h"
#include "softlist_dev.h"
diff --git a/src/devices/bus/isa/side116.cpp b/src/devices/bus/isa/side116.cpp
index 5c120fe878b..463e882896b 100644
--- a/src/devices/bus/isa/side116.cpp
+++ b/src/devices/bus/isa/side116.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "side116.h"
diff --git a/src/devices/bus/isa/side116.h b/src/devices/bus/isa/side116.h
index a3b775abc09..993d2bef258 100644
--- a/src/devices/bus/isa/side116.h
+++ b/src/devices/bus/isa/side116.h
@@ -13,7 +13,6 @@
#ifndef __ISA_SIDE116_H__
#define __ISA_SIDE116_H__
-#include "emu.h"
#include "machine/ataintf.h"
#include "isa.h"
diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp
index 5643464b8a0..dd0ad8ad5b7 100644
--- a/src/devices/bus/isa/ssi2001.cpp
+++ b/src/devices/bus/isa/ssi2001.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Carl
// Innovation SSI-2001
+#include "emu.h"
#include "ssi2001.h"
const device_type ISA8_SSI2001 = &device_creator<ssi2001_device>;
diff --git a/src/devices/bus/isa/ssi2001.h b/src/devices/bus/isa/ssi2001.h
index afdfc1f5175..e141c891bc0 100644
--- a/src/devices/bus/isa/ssi2001.h
+++ b/src/devices/bus/isa/ssi2001.h
@@ -3,7 +3,6 @@
#ifndef __SSI2001__
#define __SSI2001__
-#include "emu.h"
#include "isa.h"
#include "sound/mos6581.h"
#include "bus/pc_joy/pc_joy.h"
diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp
index 8d239baa8f5..fe83c94cf73 100644
--- a/src/devices/bus/isa/stereo_fx.cpp
+++ b/src/devices/bus/isa/stereo_fx.cpp
@@ -4,6 +4,7 @@
//
// TODO: UART is connected to MIDI port
+#include "emu.h"
#include "stereo_fx.h"
#include "sound/dac.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/bus/isa/stereo_fx.h b/src/devices/bus/isa/stereo_fx.h
index 1be1fa0ddb0..5db2e1927c4 100644
--- a/src/devices/bus/isa/stereo_fx.h
+++ b/src/devices/bus/isa/stereo_fx.h
@@ -3,7 +3,6 @@
#ifndef __STEREO_FX__
#define __STEREO_FX__
-#include "emu.h"
#include "isa.h"
#include "bus/pc_joy/pc_joy.h"
#include "cpu/mcs51/mcs51.h"
diff --git a/src/devices/bus/isa/svga_cirrus.h b/src/devices/bus/isa/svga_cirrus.h
index 1f89bd1ed22..8207b24252a 100644
--- a/src/devices/bus/isa/svga_cirrus.h
+++ b/src/devices/bus/isa/svga_cirrus.h
@@ -5,7 +5,6 @@
#ifndef __ISA_SVGA_CIRRUS_H__
#define __ISA_SVGA_CIRRUS_H__
-#include "emu.h"
#include "isa.h"
#include "video/clgd542x.h"
diff --git a/src/devices/bus/isa/svga_s3.h b/src/devices/bus/isa/svga_s3.h
index 4b940dfb2d7..0bd4cfc48e3 100644
--- a/src/devices/bus/isa/svga_s3.h
+++ b/src/devices/bus/isa/svga_s3.h
@@ -5,7 +5,6 @@
#ifndef __ISA_SVGA_S3_H__
#define __ISA_SVGA_S3_H__
-#include "emu.h"
#include "isa.h"
#include "video/pc_vga.h"
#include "s3virge.h"
diff --git a/src/devices/bus/isa/svga_trident.h b/src/devices/bus/isa/svga_trident.h
index b50134af3a1..11885c0e048 100644
--- a/src/devices/bus/isa/svga_trident.h
+++ b/src/devices/bus/isa/svga_trident.h
@@ -9,7 +9,6 @@
#ifndef SVGA_TRIDENT_H_
#define SVGA_TRIDENT_H_
-#include "emu.h"
#include "isa.h"
#include "video/pc_vga.h"
#include "bus/isa/trident.h"
diff --git a/src/devices/bus/isa/svga_tseng.h b/src/devices/bus/isa/svga_tseng.h
index 7bba5348e71..8c39db16fdf 100644
--- a/src/devices/bus/isa/svga_tseng.h
+++ b/src/devices/bus/isa/svga_tseng.h
@@ -5,7 +5,6 @@
#ifndef __ISA_SVGA_ET4K_H__
#define __ISA_SVGA_ET4K_H__
-#include "emu.h"
#include "isa.h"
#include "video/pc_vga.h"
diff --git a/src/devices/bus/isa/vga.h b/src/devices/bus/isa/vga.h
index 6a9b785d5ec..8baf7e0d2fc 100644
--- a/src/devices/bus/isa/vga.h
+++ b/src/devices/bus/isa/vga.h
@@ -5,7 +5,6 @@
#ifndef __ISA_VGA_H__
#define __ISA_VGA_H__
-#include "emu.h"
#include "isa.h"
#include "video/pc_vga.h"
diff --git a/src/devices/bus/isa/vga_ati.h b/src/devices/bus/isa/vga_ati.h
index 45b2696b75a..1dee4d1e2d2 100644
--- a/src/devices/bus/isa/vga_ati.h
+++ b/src/devices/bus/isa/vga_ati.h
@@ -12,7 +12,6 @@
#ifndef ISA_VGA_ATI_H_
#define ISA_VGA_ATI_H_
-#include "emu.h"
#include "isa.h"
#include "video/pc_vga.h"
#include "mach32.h"
diff --git a/src/devices/bus/isa/wd1002a_wx1.cpp b/src/devices/bus/isa/wd1002a_wx1.cpp
index 53fc146898c..1c5cb2a8674 100644
--- a/src/devices/bus/isa/wd1002a_wx1.cpp
+++ b/src/devices/bus/isa/wd1002a_wx1.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "wd1002a_wx1.h"
diff --git a/src/devices/bus/isa/wd1002a_wx1.h b/src/devices/bus/isa/wd1002a_wx1.h
index e6ca7cbf438..a58f75178d7 100644
--- a/src/devices/bus/isa/wd1002a_wx1.h
+++ b/src/devices/bus/isa/wd1002a_wx1.h
@@ -11,7 +11,6 @@
#ifndef __ISA_WD1002A_WX1__
#define __ISA_WD1002A_WX1__
-#include "emu.h"
#include "isa.h"
diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp
index 9cc67d0d701..f6f5f788168 100644
--- a/src/devices/bus/isa/wdxt_gen.cpp
+++ b/src/devices/bus/isa/wdxt_gen.cpp
@@ -43,6 +43,7 @@ Notes:
*/
+#include "emu.h"
#include "wdxt_gen.h"
diff --git a/src/devices/bus/isa/wdxt_gen.h b/src/devices/bus/isa/wdxt_gen.h
index 9f3fcdeaa5d..de34bc861c1 100644
--- a/src/devices/bus/isa/wdxt_gen.h
+++ b/src/devices/bus/isa/wdxt_gen.h
@@ -19,7 +19,6 @@
#define __ISA8_WDXT_GEN__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "isa.h"
#include "machine/wd11c00_17.h"
diff --git a/src/devices/bus/isa/xsu_cards.cpp b/src/devices/bus/isa/xsu_cards.cpp
index acb49f1b965..9eae7b8fac0 100644
--- a/src/devices/bus/isa/xsu_cards.cpp
+++ b/src/devices/bus/isa/xsu_cards.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "isa_cards.h"
#include "xsu_cards.h"
diff --git a/src/devices/bus/isa/xsu_cards.h b/src/devices/bus/isa/xsu_cards.h
index e3a491a9e87..c2508c7108f 100644
--- a/src/devices/bus/isa/xsu_cards.h
+++ b/src/devices/bus/isa/xsu_cards.h
@@ -11,7 +11,6 @@
#ifndef __XSU_CARDS_H__
#define __XSU_CARDS_H__
-#include "emu.h"
#include "cga.h"
// storage
diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp
index f28b23e24b0..b6f1150531e 100644
--- a/src/devices/bus/isa/xtide.cpp
+++ b/src/devices/bus/isa/xtide.cpp
@@ -53,6 +53,7 @@ Device Control (out) 14 7
+#include "emu.h"
#include "xtide.h"
diff --git a/src/devices/bus/isa/xtide.h b/src/devices/bus/isa/xtide.h
index b8a05f25ae2..0fc61a0d4e2 100644
--- a/src/devices/bus/isa/xtide.h
+++ b/src/devices/bus/isa/xtide.h
@@ -5,7 +5,6 @@
#ifndef __XTIDE_H__
#define __XTIDE_H__
-#include "emu.h"
#include "machine/ataintf.h"
#include "machine/eeprompar.h"
#include "isa.h"
diff --git a/src/devices/bus/isbx/compis_fdc.cpp b/src/devices/bus/isbx/compis_fdc.cpp
index 2282734e2c3..0bd66ba6937 100644
--- a/src/devices/bus/isbx/compis_fdc.cpp
+++ b/src/devices/bus/isbx/compis_fdc.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "compis_fdc.h"
diff --git a/src/devices/bus/isbx/compis_fdc.h b/src/devices/bus/isbx/compis_fdc.h
index e36a342f864..0fccc9e9d80 100644
--- a/src/devices/bus/isbx/compis_fdc.h
+++ b/src/devices/bus/isbx/compis_fdc.h
@@ -11,7 +11,6 @@
#ifndef __COMPIS_FDC__
#define __COMPIS_FDC__
-#include "emu.h"
#include "isbx.h"
#include "formats/cpis_dsk.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/isbx/isbc_218a.cpp b/src/devices/bus/isbx/isbc_218a.cpp
index 32ca4abc781..1444d54bea7 100644
--- a/src/devices/bus/isbx/isbc_218a.cpp
+++ b/src/devices/bus/isbx/isbc_218a.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "isbc_218a.h"
diff --git a/src/devices/bus/isbx/isbc_218a.h b/src/devices/bus/isbx/isbc_218a.h
index 9dc0088fd80..aa12b81aa84 100644
--- a/src/devices/bus/isbx/isbc_218a.h
+++ b/src/devices/bus/isbx/isbc_218a.h
@@ -11,7 +11,6 @@
#ifndef __ISBC_218A__
#define __ISBC_218A__
-#include "emu.h"
#include "isbx.h"
#include "formats/pc_dsk.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/isbx/isbx.cpp b/src/devices/bus/isbx/isbx.cpp
index b6031278fb2..17d696317ce 100644
--- a/src/devices/bus/isbx/isbx.cpp
+++ b/src/devices/bus/isbx/isbx.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "isbx.h"
diff --git a/src/devices/bus/isbx/isbx.h b/src/devices/bus/isbx/isbx.h
index 6522eeb6617..69e80b1df52 100644
--- a/src/devices/bus/isbx/isbx.h
+++ b/src/devices/bus/isbx/isbx.h
@@ -36,7 +36,6 @@
#ifndef __ISBX_SLOT__
#define __ISBX_SLOT__
-#include "emu.h"
diff --git a/src/devices/bus/kc/d002.h b/src/devices/bus/kc/d002.h
index 22454791f36..3a93ee8564c 100644
--- a/src/devices/bus/kc/d002.h
+++ b/src/devices/bus/kc/d002.h
@@ -5,7 +5,6 @@
#ifndef __KC_D002_H__
#define __KC_D002_H__
-#include "emu.h"
#include "kc.h"
#include "ram.h"
#include "rom.h"
diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h
index cbdd5eb8426..521289a076d 100644
--- a/src/devices/bus/kc/d004.h
+++ b/src/devices/bus/kc/d004.h
@@ -5,7 +5,6 @@
#ifndef __KC_D004_H__
#define __KC_D004_H__
-#include "emu.h"
#include "kc.h"
#include "machine/z80ctc.h"
#include "cpu/z80/z80.h"
diff --git a/src/devices/bus/kc/ram.h b/src/devices/bus/kc/ram.h
index 856d26b8016..97e735e64d2 100644
--- a/src/devices/bus/kc/ram.h
+++ b/src/devices/bus/kc/ram.h
@@ -5,7 +5,6 @@
#ifndef __KC_RAM_H__
#define __KC_RAM_H__
-#include "emu.h"
#include "kc.h"
//**************************************************************************
diff --git a/src/devices/bus/kc/rom.h b/src/devices/bus/kc/rom.h
index 5e9e94473b6..9568bcdaea7 100644
--- a/src/devices/bus/kc/rom.h
+++ b/src/devices/bus/kc/rom.h
@@ -5,7 +5,6 @@
#ifndef __KC_ROM_H__
#define __KC_ROM_H__
-#include "emu.h"
#include "kc.h"
//**************************************************************************
diff --git a/src/devices/bus/lpci/northbridge.h b/src/devices/bus/lpci/northbridge.h
index 2d2ba918f2b..99bf8ad7922 100644
--- a/src/devices/bus/lpci/northbridge.h
+++ b/src/devices/bus/lpci/northbridge.h
@@ -5,7 +5,6 @@
#ifndef __NORTHBRIDGE_H__
#define __NORTHBRIDGE_H__
-#include "emu.h"
#include "machine/ram.h"
diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h
index 91cee4dca99..3ea83ef84af 100644
--- a/src/devices/bus/lpci/southbridge.h
+++ b/src/devices/bus/lpci/southbridge.h
@@ -5,7 +5,6 @@
#ifndef __SOUTHBRIDGE_H__
#define __SOUTHBRIDGE_H__
-#include "emu.h"
#include "machine/ins8250.h"
#include "machine/ds128x.h"
diff --git a/src/devices/bus/macpds/macpds.h b/src/devices/bus/macpds/macpds.h
index 0dcaa529a9b..848d5d726f5 100644
--- a/src/devices/bus/macpds/macpds.h
+++ b/src/devices/bus/macpds/macpds.h
@@ -13,7 +13,6 @@
#ifndef __MACPDS_H__
#define __MACPDS_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/macpds/pds_tpdfpd.h b/src/devices/bus/macpds/pds_tpdfpd.h
index c697305c845..0082df18349 100644
--- a/src/devices/bus/macpds/pds_tpdfpd.h
+++ b/src/devices/bus/macpds/pds_tpdfpd.h
@@ -5,7 +5,6 @@
#ifndef __PDS_SEDISPLAY_H__
#define __PDS_SEDISPLAY_H__
-#include "emu.h"
#include "macpds.h"
//**************************************************************************
diff --git a/src/devices/bus/megadrive/md_carts.cpp b/src/devices/bus/megadrive/md_carts.cpp
index 5a8e1902d09..8c1d5080e1d 100644
--- a/src/devices/bus/megadrive/md_carts.cpp
+++ b/src/devices/bus/megadrive/md_carts.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "md_carts.h"
SLOT_INTERFACE_START(md_cart)
diff --git a/src/devices/bus/megadrive/md_carts.h b/src/devices/bus/megadrive/md_carts.h
index b9ab25d146b..622c22f784c 100644
--- a/src/devices/bus/megadrive/md_carts.h
+++ b/src/devices/bus/megadrive/md_carts.h
@@ -11,7 +11,6 @@
#ifndef __MD_CARTS_H__
#define __MD_CARTS_H__
-#include "emu.h"
#include "rom.h"
#include "svp.h"
diff --git a/src/devices/bus/midi/midi.cpp b/src/devices/bus/midi/midi.cpp
index b636ecbcdc1..ea827d106d2 100644
--- a/src/devices/bus/midi/midi.cpp
+++ b/src/devices/bus/midi/midi.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:R. Belmont
+#include "emu.h"
#include "midi.h"
const device_type MIDI_PORT = &device_creator<midi_port_device>;
diff --git a/src/devices/bus/midi/midi.h b/src/devices/bus/midi/midi.h
index 350d6cac33e..2ce2afd1bd7 100644
--- a/src/devices/bus/midi/midi.h
+++ b/src/devices/bus/midi/midi.h
@@ -3,7 +3,6 @@
#ifndef __BUS_MIDI_H__
#define __BUS_MIDI_H__
-#include "emu.h"
#define MCFG_MIDI_PORT_ADD(_tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, MIDI_PORT, 0) \
diff --git a/src/devices/bus/midi/midiinport.cpp b/src/devices/bus/midi/midiinport.cpp
index bfb1b2b9ac9..745999faf79 100644
--- a/src/devices/bus/midi/midiinport.cpp
+++ b/src/devices/bus/midi/midiinport.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "midiinport.h"
const device_type MIDIIN_PORT = &device_creator<midiin_port_device>;
diff --git a/src/devices/bus/midi/midioutport.cpp b/src/devices/bus/midi/midioutport.cpp
index 1bf5a46200c..78646ce3394 100644
--- a/src/devices/bus/midi/midioutport.cpp
+++ b/src/devices/bus/midi/midioutport.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "midioutport.h"
const device_type MIDIOUT_PORT = &device_creator<midiout_port_device>;
diff --git a/src/devices/bus/nasbus/avc.cpp b/src/devices/bus/nasbus/avc.cpp
index 4ed0931150e..7203420fdf8 100644
--- a/src/devices/bus/nasbus/avc.cpp
+++ b/src/devices/bus/nasbus/avc.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "avc.h"
diff --git a/src/devices/bus/nasbus/avc.h b/src/devices/bus/nasbus/avc.h
index d576a6a6c1d..abe5d1e2da0 100644
--- a/src/devices/bus/nasbus/avc.h
+++ b/src/devices/bus/nasbus/avc.h
@@ -11,7 +11,6 @@
#ifndef __NASBUS_AVC_H__
#define __NASBUS_AVC_H__
-#include "emu.h"
#include "nasbus.h"
#include "video/mc6845.h"
diff --git a/src/devices/bus/nasbus/cards.cpp b/src/devices/bus/nasbus/cards.cpp
index 913c17d8759..9fcc3c3e70a 100644
--- a/src/devices/bus/nasbus/cards.cpp
+++ b/src/devices/bus/nasbus/cards.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "cards.h"
SLOT_INTERFACE_START( nasbus_slot_cards )
diff --git a/src/devices/bus/nasbus/cards.h b/src/devices/bus/nasbus/cards.h
index f0e5fac912b..a9fef5c96ab 100644
--- a/src/devices/bus/nasbus/cards.h
+++ b/src/devices/bus/nasbus/cards.h
@@ -11,7 +11,6 @@
#ifndef __NASBUS_CARDS_H__
#define __NASBUS_CARDS_H__
-#include "emu.h"
#include "avc.h"
#include "floppy.h"
diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp
index f61bc5a537f..2f832b27b3a 100644
--- a/src/devices/bus/nasbus/floppy.cpp
+++ b/src/devices/bus/nasbus/floppy.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "floppy.h"
#include "formats/nascom_dsk.h"
#include "softlist.h"
diff --git a/src/devices/bus/nasbus/floppy.h b/src/devices/bus/nasbus/floppy.h
index 2343ea3e41e..81526a53f88 100644
--- a/src/devices/bus/nasbus/floppy.h
+++ b/src/devices/bus/nasbus/floppy.h
@@ -11,7 +11,6 @@
#ifndef __NASBUS_FLOPPY_H__
#define __NASBUS_FLOPPY_H__
-#include "emu.h"
#include "nasbus.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/nasbus/nasbus.cpp b/src/devices/bus/nasbus/nasbus.cpp
index f0e30be6039..32fef766f81 100644
--- a/src/devices/bus/nasbus/nasbus.cpp
+++ b/src/devices/bus/nasbus/nasbus.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "nasbus.h"
diff --git a/src/devices/bus/nasbus/nasbus.h b/src/devices/bus/nasbus/nasbus.h
index 73c0a9e3a3a..7d6151d513e 100644
--- a/src/devices/bus/nasbus/nasbus.h
+++ b/src/devices/bus/nasbus/nasbus.h
@@ -92,7 +92,6 @@
#ifndef __NASBUS_H__
#define __NASBUS_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/neogeo/carts.cpp b/src/devices/bus/neogeo/carts.cpp
index 27dcbb9e4da..ad732e966b7 100644
--- a/src/devices/bus/neogeo/carts.cpp
+++ b/src/devices/bus/neogeo/carts.cpp
@@ -4,6 +4,7 @@
**********************************************************************/
+#include "emu.h"
#include "bus/neogeo/carts.h"
#include "bus/neogeo/rom.h"
#include "bus/neogeo/fatfury2.h"
diff --git a/src/devices/bus/neogeo/carts.h b/src/devices/bus/neogeo/carts.h
index 1f7beb291ed..abc0e0cabd5 100644
--- a/src/devices/bus/neogeo/carts.h
+++ b/src/devices/bus/neogeo/carts.h
@@ -9,7 +9,6 @@
#ifndef __NEOGEO_CARTS_H__
#define __NEOGEO_CARTS_H__
-#include "emu.h"
// supported devices
diff --git a/src/devices/bus/neogeo/slot.cpp b/src/devices/bus/neogeo/slot.cpp
index 6c1f1906039..a303f5a4d77 100644
--- a/src/devices/bus/neogeo/slot.cpp
+++ b/src/devices/bus/neogeo/slot.cpp
@@ -6,6 +6,7 @@
***********************************************************************************************************/
+#include "emu.h"
#include "slot.h"
//**************************************************************************
diff --git a/src/devices/bus/neogeo/slot.h b/src/devices/bus/neogeo/slot.h
index e11fa0fe066..1e970b78080 100644
--- a/src/devices/bus/neogeo/slot.h
+++ b/src/devices/bus/neogeo/slot.h
@@ -3,7 +3,6 @@
#ifndef __NEOGEO_SLOT_H
#define __NEOGEO_SLOT_H
-#include "emu.h"
#include "softlist_dev.h"
diff --git a/src/devices/bus/neogeo_ctrl/ctrl.cpp b/src/devices/bus/neogeo_ctrl/ctrl.cpp
index 6bca8e540b6..0ec1db0bfa7 100644
--- a/src/devices/bus/neogeo_ctrl/ctrl.cpp
+++ b/src/devices/bus/neogeo_ctrl/ctrl.cpp
@@ -16,6 +16,7 @@
**********************************************************************/
+#include "emu.h"
#include "ctrl.h"
// slot devices
#include "joystick.h"
diff --git a/src/devices/bus/neogeo_ctrl/ctrl.h b/src/devices/bus/neogeo_ctrl/ctrl.h
index 678e9871cfa..c4450d4a5ee 100644
--- a/src/devices/bus/neogeo_ctrl/ctrl.h
+++ b/src/devices/bus/neogeo_ctrl/ctrl.h
@@ -12,7 +12,6 @@
#ifndef __NEOGEO_CONTROL_PORT__
#define __NEOGEO_CONTROL_PORT__
-#include "emu.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/neogeo_ctrl/dial.cpp b/src/devices/bus/neogeo_ctrl/dial.cpp
index 2885d9beb55..95eaec1b5f2 100644
--- a/src/devices/bus/neogeo_ctrl/dial.cpp
+++ b/src/devices/bus/neogeo_ctrl/dial.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "dial.h"
//**************************************************************************
diff --git a/src/devices/bus/neogeo_ctrl/dial.h b/src/devices/bus/neogeo_ctrl/dial.h
index ff4d9d12dfe..9af531b2d6e 100644
--- a/src/devices/bus/neogeo_ctrl/dial.h
+++ b/src/devices/bus/neogeo_ctrl/dial.h
@@ -12,7 +12,6 @@
#define __NEOGEO_DIAL__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/neogeo_ctrl/irrmaze.cpp b/src/devices/bus/neogeo_ctrl/irrmaze.cpp
index 3ada54927c8..e612df7130b 100644
--- a/src/devices/bus/neogeo_ctrl/irrmaze.cpp
+++ b/src/devices/bus/neogeo_ctrl/irrmaze.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "irrmaze.h"
//**************************************************************************
diff --git a/src/devices/bus/neogeo_ctrl/irrmaze.h b/src/devices/bus/neogeo_ctrl/irrmaze.h
index 2ba9c17c13a..33beb1fe10d 100644
--- a/src/devices/bus/neogeo_ctrl/irrmaze.h
+++ b/src/devices/bus/neogeo_ctrl/irrmaze.h
@@ -12,7 +12,6 @@
#define __NEOGEO_IRRMAZE__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/neogeo_ctrl/joystick.cpp b/src/devices/bus/neogeo_ctrl/joystick.cpp
index 906a1cdc863..3441a522e34 100644
--- a/src/devices/bus/neogeo_ctrl/joystick.cpp
+++ b/src/devices/bus/neogeo_ctrl/joystick.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "joystick.h"
diff --git a/src/devices/bus/neogeo_ctrl/joystick.h b/src/devices/bus/neogeo_ctrl/joystick.h
index c7f571f6d36..a78734ab695 100644
--- a/src/devices/bus/neogeo_ctrl/joystick.h
+++ b/src/devices/bus/neogeo_ctrl/joystick.h
@@ -12,7 +12,6 @@
#define __NEOGEO_JOYSTICK__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/neogeo_ctrl/kizuna4p.cpp b/src/devices/bus/neogeo_ctrl/kizuna4p.cpp
index 6a18ed07a92..f4dc05779f7 100644
--- a/src/devices/bus/neogeo_ctrl/kizuna4p.cpp
+++ b/src/devices/bus/neogeo_ctrl/kizuna4p.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "kizuna4p.h"
//**************************************************************************
diff --git a/src/devices/bus/neogeo_ctrl/kizuna4p.h b/src/devices/bus/neogeo_ctrl/kizuna4p.h
index d35b7d15ca2..c690ce485c7 100644
--- a/src/devices/bus/neogeo_ctrl/kizuna4p.h
+++ b/src/devices/bus/neogeo_ctrl/kizuna4p.h
@@ -12,7 +12,6 @@
#define __NEOGEO_KIZ4P__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/neogeo_ctrl/mahjong.cpp b/src/devices/bus/neogeo_ctrl/mahjong.cpp
index d77403ed255..2eeb5b7586f 100644
--- a/src/devices/bus/neogeo_ctrl/mahjong.cpp
+++ b/src/devices/bus/neogeo_ctrl/mahjong.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mahjong.h"
//**************************************************************************
diff --git a/src/devices/bus/neogeo_ctrl/mahjong.h b/src/devices/bus/neogeo_ctrl/mahjong.h
index d92b974b213..48a160f1eec 100644
--- a/src/devices/bus/neogeo_ctrl/mahjong.h
+++ b/src/devices/bus/neogeo_ctrl/mahjong.h
@@ -12,7 +12,6 @@
#define __NEOGEO_MJCTRL__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/nes/nes_carts.cpp b/src/devices/bus/nes/nes_carts.cpp
index 5ff59c73339..c62398859ce 100644
--- a/src/devices/bus/nes/nes_carts.cpp
+++ b/src/devices/bus/nes/nes_carts.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "nes_carts.h"
SLOT_INTERFACE_START(nes_cart)
diff --git a/src/devices/bus/nes/nes_carts.h b/src/devices/bus/nes/nes_carts.h
index 144d7aa0a8e..a0e30694915 100644
--- a/src/devices/bus/nes/nes_carts.h
+++ b/src/devices/bus/nes/nes_carts.h
@@ -11,7 +11,6 @@
#ifndef __NES_CARTS_H__
#define __NES_CARTS_H__
-#include "emu.h"
// official PCBs
#include "nxrom.h"
diff --git a/src/devices/bus/nes_ctrl/4score.cpp b/src/devices/bus/nes_ctrl/4score.cpp
index f1d602090b6..d3fafdd15bf 100644
--- a/src/devices/bus/nes_ctrl/4score.cpp
+++ b/src/devices/bus/nes_ctrl/4score.cpp
@@ -30,6 +30,7 @@
**********************************************************************/
+#include "emu.h"
#include "4score.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/4score.h b/src/devices/bus/nes_ctrl/4score.h
index 543e9b85414..2e8fee5cc60 100644
--- a/src/devices/bus/nes_ctrl/4score.h
+++ b/src/devices/bus/nes_ctrl/4score.h
@@ -12,7 +12,6 @@
#define __NES_FOURSCORE__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/arkpaddle.cpp b/src/devices/bus/nes_ctrl/arkpaddle.cpp
index 7f47510d551..00baef8ff06 100644
--- a/src/devices/bus/nes_ctrl/arkpaddle.cpp
+++ b/src/devices/bus/nes_ctrl/arkpaddle.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
+#include "emu.h"
#include "arkpaddle.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/arkpaddle.h b/src/devices/bus/nes_ctrl/arkpaddle.h
index 13bd03f7e02..5a7eba03f02 100644
--- a/src/devices/bus/nes_ctrl/arkpaddle.h
+++ b/src/devices/bus/nes_ctrl/arkpaddle.h
@@ -13,7 +13,6 @@
#define __NES_ARKPADDLE__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/bcbattle.cpp b/src/devices/bus/nes_ctrl/bcbattle.cpp
index 04491e262c0..54a42b119c0 100644
--- a/src/devices/bus/nes_ctrl/bcbattle.cpp
+++ b/src/devices/bus/nes_ctrl/bcbattle.cpp
@@ -10,6 +10,7 @@
**********************************************************************/
+#include "emu.h"
#include "bcbattle.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/bcbattle.h b/src/devices/bus/nes_ctrl/bcbattle.h
index 3d4e8f0d467..db0299bd9ec 100644
--- a/src/devices/bus/nes_ctrl/bcbattle.h
+++ b/src/devices/bus/nes_ctrl/bcbattle.h
@@ -12,7 +12,6 @@
#define __NES_BCBATTLE__
-#include "emu.h"
#include "ctrl.h"
#include "machine/bcreader.h"
diff --git a/src/devices/bus/nes_ctrl/ctrl.cpp b/src/devices/bus/nes_ctrl/ctrl.cpp
index 66afea1e4bc..d3ff0e32659 100644
--- a/src/devices/bus/nes_ctrl/ctrl.cpp
+++ b/src/devices/bus/nes_ctrl/ctrl.cpp
@@ -40,6 +40,7 @@
**********************************************************************/
+#include "emu.h"
#include "ctrl.h"
// slot devices
#include "4score.h"
diff --git a/src/devices/bus/nes_ctrl/ctrl.h b/src/devices/bus/nes_ctrl/ctrl.h
index 51d478eed49..54faa60aa90 100644
--- a/src/devices/bus/nes_ctrl/ctrl.h
+++ b/src/devices/bus/nes_ctrl/ctrl.h
@@ -15,7 +15,6 @@
#ifndef __NES_CONTROL_PORT__
#define __NES_CONTROL_PORT__
-#include "emu.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/nes_ctrl/fckeybrd.cpp b/src/devices/bus/nes_ctrl/fckeybrd.cpp
index 1222b93f3e0..c7a465050d6 100644
--- a/src/devices/bus/nes_ctrl/fckeybrd.cpp
+++ b/src/devices/bus/nes_ctrl/fckeybrd.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "fckeybrd.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/fckeybrd.h b/src/devices/bus/nes_ctrl/fckeybrd.h
index 4f70f5762a8..73fc33cb980 100644
--- a/src/devices/bus/nes_ctrl/fckeybrd.h
+++ b/src/devices/bus/nes_ctrl/fckeybrd.h
@@ -12,7 +12,6 @@
#define __NES_FCKEYBRD__
-#include "emu.h"
#include "ctrl.h"
#include "imagedev/cassette.h"
diff --git a/src/devices/bus/nes_ctrl/ftrainer.cpp b/src/devices/bus/nes_ctrl/ftrainer.cpp
index 8a7a17d550d..3207102e4d5 100644
--- a/src/devices/bus/nes_ctrl/ftrainer.cpp
+++ b/src/devices/bus/nes_ctrl/ftrainer.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ftrainer.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/ftrainer.h b/src/devices/bus/nes_ctrl/ftrainer.h
index f984c901cf2..76999eea959 100644
--- a/src/devices/bus/nes_ctrl/ftrainer.h
+++ b/src/devices/bus/nes_ctrl/ftrainer.h
@@ -12,7 +12,6 @@
#define __NES_FTRAINER__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/hori.cpp b/src/devices/bus/nes_ctrl/hori.cpp
index 7281a61bf13..5c2d5517173 100644
--- a/src/devices/bus/nes_ctrl/hori.cpp
+++ b/src/devices/bus/nes_ctrl/hori.cpp
@@ -19,6 +19,7 @@
**********************************************************************/
+#include "emu.h"
#include "hori.h"
#include "joypad.h"
diff --git a/src/devices/bus/nes_ctrl/hori.h b/src/devices/bus/nes_ctrl/hori.h
index 1205b400025..e490f232365 100644
--- a/src/devices/bus/nes_ctrl/hori.h
+++ b/src/devices/bus/nes_ctrl/hori.h
@@ -12,7 +12,6 @@
#define __NES_HORI__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp
index 08652d408cf..d0ac74450d8 100644
--- a/src/devices/bus/nes_ctrl/joypad.cpp
+++ b/src/devices/bus/nes_ctrl/joypad.cpp
@@ -27,6 +27,7 @@
**********************************************************************/
+#include "emu.h"
#include "joypad.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/joypad.h b/src/devices/bus/nes_ctrl/joypad.h
index 5af6ed93bf2..c7accb6db8a 100644
--- a/src/devices/bus/nes_ctrl/joypad.h
+++ b/src/devices/bus/nes_ctrl/joypad.h
@@ -12,7 +12,6 @@
#define __NES_JOYPAD__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/konamihs.cpp b/src/devices/bus/nes_ctrl/konamihs.cpp
index c3e998bba7b..99be926197c 100644
--- a/src/devices/bus/nes_ctrl/konamihs.cpp
+++ b/src/devices/bus/nes_ctrl/konamihs.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "konamihs.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/konamihs.h b/src/devices/bus/nes_ctrl/konamihs.h
index 91070ba6e02..cc6156baa8b 100644
--- a/src/devices/bus/nes_ctrl/konamihs.h
+++ b/src/devices/bus/nes_ctrl/konamihs.h
@@ -12,7 +12,6 @@
#define __NES_KONAMIHS__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/miracle.cpp b/src/devices/bus/nes_ctrl/miracle.cpp
index 0d79645a018..2f0ee170aa9 100644
--- a/src/devices/bus/nes_ctrl/miracle.cpp
+++ b/src/devices/bus/nes_ctrl/miracle.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "miracle.h"
#define MIRACLE_MIDI_WAITING 0
diff --git a/src/devices/bus/nes_ctrl/miracle.h b/src/devices/bus/nes_ctrl/miracle.h
index fee12bca313..167f35b6118 100644
--- a/src/devices/bus/nes_ctrl/miracle.h
+++ b/src/devices/bus/nes_ctrl/miracle.h
@@ -12,7 +12,6 @@
#define __NES_MIRACLE__
-#include "emu.h"
#include "ctrl.h"
#include "bus/midi/midi.h"
diff --git a/src/devices/bus/nes_ctrl/mjpanel.cpp b/src/devices/bus/nes_ctrl/mjpanel.cpp
index 06cac0fd051..e807836fd0f 100644
--- a/src/devices/bus/nes_ctrl/mjpanel.cpp
+++ b/src/devices/bus/nes_ctrl/mjpanel.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mjpanel.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/mjpanel.h b/src/devices/bus/nes_ctrl/mjpanel.h
index 23f14f369ea..7580ef400b2 100644
--- a/src/devices/bus/nes_ctrl/mjpanel.h
+++ b/src/devices/bus/nes_ctrl/mjpanel.h
@@ -12,7 +12,6 @@
#define __NES_MJPANEL__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/pachinko.cpp b/src/devices/bus/nes_ctrl/pachinko.cpp
index 301647e7f15..8d2d0450324 100644
--- a/src/devices/bus/nes_ctrl/pachinko.cpp
+++ b/src/devices/bus/nes_ctrl/pachinko.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "pachinko.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/pachinko.h b/src/devices/bus/nes_ctrl/pachinko.h
index b11cdbab5d4..2f982108bb2 100644
--- a/src/devices/bus/nes_ctrl/pachinko.h
+++ b/src/devices/bus/nes_ctrl/pachinko.h
@@ -12,7 +12,6 @@
#define __NES_PACHINKO__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/partytap.cpp b/src/devices/bus/nes_ctrl/partytap.cpp
index dfa8683f73d..b69ba813681 100644
--- a/src/devices/bus/nes_ctrl/partytap.cpp
+++ b/src/devices/bus/nes_ctrl/partytap.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "partytap.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/partytap.h b/src/devices/bus/nes_ctrl/partytap.h
index 0b3f6db9cb3..f2f3257cf2a 100644
--- a/src/devices/bus/nes_ctrl/partytap.h
+++ b/src/devices/bus/nes_ctrl/partytap.h
@@ -12,7 +12,6 @@
#define __NES_PARTYTAP__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/powerpad.cpp b/src/devices/bus/nes_ctrl/powerpad.cpp
index 1f47ea5f99f..f6ce5dfb213 100644
--- a/src/devices/bus/nes_ctrl/powerpad.cpp
+++ b/src/devices/bus/nes_ctrl/powerpad.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "powerpad.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/powerpad.h b/src/devices/bus/nes_ctrl/powerpad.h
index abfbac02551..3204f8450fe 100644
--- a/src/devices/bus/nes_ctrl/powerpad.h
+++ b/src/devices/bus/nes_ctrl/powerpad.h
@@ -12,7 +12,6 @@
#define __NES_POWERPAD__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/suborkey.cpp b/src/devices/bus/nes_ctrl/suborkey.cpp
index d8fe8d6f8b0..63c33d1f008 100644
--- a/src/devices/bus/nes_ctrl/suborkey.cpp
+++ b/src/devices/bus/nes_ctrl/suborkey.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "suborkey.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/suborkey.h b/src/devices/bus/nes_ctrl/suborkey.h
index 8970b3b466f..c8150ddb512 100644
--- a/src/devices/bus/nes_ctrl/suborkey.h
+++ b/src/devices/bus/nes_ctrl/suborkey.h
@@ -12,7 +12,6 @@
#define __NES_SUBORKEY__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/zapper.cpp b/src/devices/bus/nes_ctrl/zapper.cpp
index 82821ee2ad9..3c5c4a4e7ce 100644
--- a/src/devices/bus/nes_ctrl/zapper.cpp
+++ b/src/devices/bus/nes_ctrl/zapper.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "zapper.h"
//**************************************************************************
diff --git a/src/devices/bus/nes_ctrl/zapper.h b/src/devices/bus/nes_ctrl/zapper.h
index 22d4cea0664..79826d69637 100644
--- a/src/devices/bus/nes_ctrl/zapper.h
+++ b/src/devices/bus/nes_ctrl/zapper.h
@@ -12,7 +12,6 @@
#define __NES_ZAPPER__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp
index 7be6e38d6cf..eae75ed16e3 100644
--- a/src/devices/bus/newbrain/eim.cpp
+++ b/src/devices/bus/newbrain/eim.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "eim.h"
diff --git a/src/devices/bus/newbrain/eim.h b/src/devices/bus/newbrain/eim.h
index 824de3daf69..58024f60cf4 100644
--- a/src/devices/bus/newbrain/eim.h
+++ b/src/devices/bus/newbrain/eim.h
@@ -11,7 +11,6 @@
#ifndef __NEWBRAIN_EIM__
#define __NEWBRAIN_EIM__
-#include "emu.h"
#include "exp.h"
#include "bus/rs232/rs232.h"
#include "machine/6850acia.h"
diff --git a/src/devices/bus/newbrain/exp.cpp b/src/devices/bus/newbrain/exp.cpp
index 85684823493..e83dd50266f 100644
--- a/src/devices/bus/newbrain/exp.cpp
+++ b/src/devices/bus/newbrain/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/newbrain/exp.h b/src/devices/bus/newbrain/exp.h
index a81194945df..0c07190bdf0 100644
--- a/src/devices/bus/newbrain/exp.h
+++ b/src/devices/bus/newbrain/exp.h
@@ -39,7 +39,6 @@
#ifndef __NEWBRAIN_EXPANSION_SLOT__
#define __NEWBRAIN_EXPANSION_SLOT__
-#include "emu.h"
diff --git a/src/devices/bus/newbrain/fdc.cpp b/src/devices/bus/newbrain/fdc.cpp
index f8965589fb5..aa422f999d5 100644
--- a/src/devices/bus/newbrain/fdc.cpp
+++ b/src/devices/bus/newbrain/fdc.cpp
@@ -15,6 +15,7 @@
*/
+#include "emu.h"
#include "fdc.h"
diff --git a/src/devices/bus/newbrain/fdc.h b/src/devices/bus/newbrain/fdc.h
index 2d2d2bc8576..b34e88441ee 100644
--- a/src/devices/bus/newbrain/fdc.h
+++ b/src/devices/bus/newbrain/fdc.h
@@ -11,7 +11,6 @@
#ifndef __NEWBRAIN_FDC__
#define __NEWBRAIN_FDC__
-#include "emu.h"
#include "exp.h"
#include "cpu/z80/z80.h"
#include "machine/upd765.h"
diff --git a/src/devices/bus/nubus/nubus.h b/src/devices/bus/nubus/nubus.h
index 5caaefb29fb..4697432e16e 100644
--- a/src/devices/bus/nubus/nubus.h
+++ b/src/devices/bus/nubus/nubus.h
@@ -13,7 +13,6 @@
#ifndef __NUBUS_H__
#define __NUBUS_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/nubus_48gc.h b/src/devices/bus/nubus/nubus_48gc.h
index 6a435f8c098..e2c86050731 100644
--- a/src/devices/bus/nubus/nubus_48gc.h
+++ b/src/devices/bus/nubus/nubus_48gc.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_48GC_H__
#define __NUBUS_48GC_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/nubus_asntmc3b.h b/src/devices/bus/nubus/nubus_asntmc3b.h
index 799f4c41470..3c66d884bb1 100644
--- a/src/devices/bus/nubus/nubus_asntmc3b.h
+++ b/src/devices/bus/nubus/nubus_asntmc3b.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_ASNTMC3B_H__
#define __NUBUS_ASNTMC3B_H__
-#include "emu.h"
#include "nubus.h"
#include "machine/dp8390.h"
diff --git a/src/devices/bus/nubus/nubus_cb264.h b/src/devices/bus/nubus/nubus_cb264.h
index 766adfd2e89..c5b2c2b02b8 100644
--- a/src/devices/bus/nubus/nubus_cb264.h
+++ b/src/devices/bus/nubus/nubus_cb264.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_CB264_H__
#define __NUBUS_CB264_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/nubus_image.h b/src/devices/bus/nubus/nubus_image.h
index a13de21c624..db0fcf835b8 100644
--- a/src/devices/bus/nubus/nubus_image.h
+++ b/src/devices/bus/nubus/nubus_image.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_IMAGE_H__
#define __NUBUS_IMAGE_H__
-#include "emu.h"
#include "nubus.h"
#include "osdcore.h"
diff --git a/src/devices/bus/nubus/nubus_m2hires.h b/src/devices/bus/nubus/nubus_m2hires.h
index 0caa4c249ff..cc766ae9d18 100644
--- a/src/devices/bus/nubus/nubus_m2hires.h
+++ b/src/devices/bus/nubus/nubus_m2hires.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_M2HIRES_H__
#define __NUBUS_M2HIRES_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/nubus_m2video.h b/src/devices/bus/nubus/nubus_m2video.h
index 949a10e3f9b..abf6056f5e2 100644
--- a/src/devices/bus/nubus/nubus_m2video.h
+++ b/src/devices/bus/nubus/nubus_m2video.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_M2VIDEO_H__
#define __NUBUS_M2VIDEO_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/nubus_radiustpd.h b/src/devices/bus/nubus/nubus_radiustpd.h
index 4643633a6a7..02f257c290e 100644
--- a/src/devices/bus/nubus/nubus_radiustpd.h
+++ b/src/devices/bus/nubus/nubus_radiustpd.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_RADIUSTPD_H__
#define __NUBUS_RADIUSTPD_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/nubus_spec8.h b/src/devices/bus/nubus/nubus_spec8.h
index 0259cd64140..6716115db05 100644
--- a/src/devices/bus/nubus/nubus_spec8.h
+++ b/src/devices/bus/nubus/nubus_spec8.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_SPEC8S3_H__
#define __NUBUS_SPEC8S3_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/nubus_specpdq.h b/src/devices/bus/nubus/nubus_specpdq.h
index 819eac4a2f8..a327ed51d3b 100644
--- a/src/devices/bus/nubus/nubus_specpdq.h
+++ b/src/devices/bus/nubus/nubus_specpdq.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_SPECPDQ_H__
#define __NUBUS_SPECPDQ_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/nubus_vikbw.h b/src/devices/bus/nubus/nubus_vikbw.h
index 11d431dd8f0..071c122025e 100644
--- a/src/devices/bus/nubus/nubus_vikbw.h
+++ b/src/devices/bus/nubus/nubus_vikbw.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_VIKBW_H__
#define __NUBUS_VIKBW_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/nubus_wsportrait.h b/src/devices/bus/nubus/nubus_wsportrait.h
index b6894211d82..09ae98f1db2 100644
--- a/src/devices/bus/nubus/nubus_wsportrait.h
+++ b/src/devices/bus/nubus/nubus_wsportrait.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_WSPORTRAIT_H__
#define __NUBUS_WSPORTRAIT_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/pds30_30hr.h b/src/devices/bus/nubus/pds30_30hr.h
index c90c3a8e6f3..eb038d791bf 100644
--- a/src/devices/bus/nubus/pds30_30hr.h
+++ b/src/devices/bus/nubus/pds30_30hr.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_XCEED30HR_H__
#define __NUBUS_XCEED30HR_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/pds30_cb264.h b/src/devices/bus/nubus/pds30_cb264.h
index 0e4d7f6a488..5038660d31e 100644
--- a/src/devices/bus/nubus/pds30_cb264.h
+++ b/src/devices/bus/nubus/pds30_cb264.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_CB264SE30_H__
#define __NUBUS_CB264SE30_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/pds30_mc30.h b/src/devices/bus/nubus/pds30_mc30.h
index b2560f6e604..834231ff7cb 100644
--- a/src/devices/bus/nubus/pds30_mc30.h
+++ b/src/devices/bus/nubus/pds30_mc30.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_XCEEDMC30_H__
#define __NUBUS_XCEEDMC30_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/pds30_procolor816.h b/src/devices/bus/nubus/pds30_procolor816.h
index bffe8969f33..84f34dc1ca4 100644
--- a/src/devices/bus/nubus/pds30_procolor816.h
+++ b/src/devices/bus/nubus/pds30_procolor816.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_PROCOLOR816_H__
#define __NUBUS_PROCOLOR816_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/nubus/pds30_sigmalview.h b/src/devices/bus/nubus/pds30_sigmalview.h
index a7b078d2ab5..918af8f4c68 100644
--- a/src/devices/bus/nubus/pds30_sigmalview.h
+++ b/src/devices/bus/nubus/pds30_sigmalview.h
@@ -5,7 +5,6 @@
#ifndef __NUBUS_LVIEW_H__
#define __NUBUS_LVIEW_H__
-#include "emu.h"
#include "nubus.h"
//**************************************************************************
diff --git a/src/devices/bus/oricext/jasmin.cpp b/src/devices/bus/oricext/jasmin.cpp
index e2e1bdb04a8..f254b676ef5 100644
--- a/src/devices/bus/oricext/jasmin.cpp
+++ b/src/devices/bus/oricext/jasmin.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "jasmin.h"
#include "formats/oric_dsk.h"
diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp
index 6268c1860f4..8e087db0bce 100644
--- a/src/devices/bus/oricext/microdisc.cpp
+++ b/src/devices/bus/oricext/microdisc.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "microdisc.h"
#include "formats/oric_dsk.h"
diff --git a/src/devices/bus/oricext/oricext.cpp b/src/devices/bus/oricext/oricext.cpp
index 1499bf8c544..73e780bdf3a 100644
--- a/src/devices/bus/oricext/oricext.cpp
+++ b/src/devices/bus/oricext/oricext.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "oricext.h"
#include "jasmin.h"
#include "microdisc.h"
diff --git a/src/devices/bus/oricext/oricext.h b/src/devices/bus/oricext/oricext.h
index bf423ad852c..608e631a33c 100644
--- a/src/devices/bus/oricext/oricext.h
+++ b/src/devices/bus/oricext/oricext.h
@@ -9,7 +9,6 @@
#ifndef __ORICEXT_H__
#define __ORICEXT_H__
-#include "emu.h"
#include "cpu/m6502/m6502.h"
#define MCFG_ORICEXT_ADD(_tag, _slot_intf, _def_slot, _cputag, _irq) \
diff --git a/src/devices/bus/pc1512/mouse.h b/src/devices/bus/pc1512/mouse.h
index 58e56459be5..dd89ae97277 100644
--- a/src/devices/bus/pc1512/mouse.h
+++ b/src/devices/bus/pc1512/mouse.h
@@ -23,7 +23,6 @@
#ifndef __PC1512_MOUSE_PORT__
#define __PC1512_MOUSE_PORT__
-#include "emu.h"
diff --git a/src/devices/bus/pc_joy/pc_joy.cpp b/src/devices/bus/pc_joy/pc_joy.cpp
index ecffaa88840..d90bee1e1cf 100644
--- a/src/devices/bus/pc_joy/pc_joy.cpp
+++ b/src/devices/bus/pc_joy/pc_joy.cpp
@@ -8,6 +8,7 @@
*
*************************************************************************/
+#include "emu.h"
#include "pc_joy.h"
#include "pc_joy_sw.h"
diff --git a/src/devices/bus/pc_joy/pc_joy.h b/src/devices/bus/pc_joy/pc_joy.h
index dbc0647ffc0..4b819ddcc09 100644
--- a/src/devices/bus/pc_joy/pc_joy.h
+++ b/src/devices/bus/pc_joy/pc_joy.h
@@ -11,7 +11,6 @@
#ifndef PC_JOY_H
#define PC_JOY_H
-#include "emu.h"
#define MCFG_PC_JOY_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, PC_JOY, 0) \
diff --git a/src/devices/bus/pc_joy/pc_joy_sw.cpp b/src/devices/bus/pc_joy/pc_joy_sw.cpp
index a21bba8bd93..f2dd8448a18 100644
--- a/src/devices/bus/pc_joy/pc_joy_sw.cpp
+++ b/src/devices/bus/pc_joy/pc_joy_sw.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Carl
//TODO: determine when to switch modes and add single bit mode
+#include "emu.h"
#include "pc_joy_sw.h"
const device_type PC_MSSW_PAD = &device_creator<pc_mssw_pad_device>;
diff --git a/src/devices/bus/pc_kbd/ec1841.cpp b/src/devices/bus/pc_kbd/ec1841.cpp
index b9a2db9ab39..007c8a15e85 100644
--- a/src/devices/bus/pc_kbd/ec1841.cpp
+++ b/src/devices/bus/pc_kbd/ec1841.cpp
@@ -11,6 +11,7 @@
*********************************************************************/
+#include "emu.h"
#include "ec1841.h"
#define VERBOSE_DBG 0 /* general debug messages */
diff --git a/src/devices/bus/pc_kbd/ec1841.h b/src/devices/bus/pc_kbd/ec1841.h
index b6ef745696b..0df1084a6aa 100644
--- a/src/devices/bus/pc_kbd/ec1841.h
+++ b/src/devices/bus/pc_kbd/ec1841.h
@@ -11,7 +11,6 @@
#ifndef __PC_KBD_EC_1841__
#define __PC_KBD_EC_1841__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "pc_kbdc.h"
diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp
index 1b8afeee9ec..06a84b964eb 100644
--- a/src/devices/bus/pc_kbd/iskr1030.cpp
+++ b/src/devices/bus/pc_kbd/iskr1030.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "iskr1030.h"
#define VERBOSE_DBG 1 /* general debug messages */
diff --git a/src/devices/bus/pc_kbd/iskr1030.h b/src/devices/bus/pc_kbd/iskr1030.h
index 4d7ce5e1826..3bc4412c895 100644
--- a/src/devices/bus/pc_kbd/iskr1030.h
+++ b/src/devices/bus/pc_kbd/iskr1030.h
@@ -11,7 +11,6 @@
#ifndef __PC_KBD_ISKR_1030__
#define __PC_KBD_ISKR_1030__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "pc_kbdc.h"
#include "machine/rescap.h"
diff --git a/src/devices/bus/pc_kbd/pc83.cpp b/src/devices/bus/pc_kbd/pc83.cpp
index 044d12d46d5..f2f795763cb 100644
--- a/src/devices/bus/pc_kbd/pc83.cpp
+++ b/src/devices/bus/pc_kbd/pc83.cpp
@@ -6,6 +6,7 @@
*********************************************************************/
+#include "emu.h"
#include "pc83.h"
diff --git a/src/devices/bus/pc_kbd/pc83.h b/src/devices/bus/pc_kbd/pc83.h
index 18c81dfc97e..147ae3153c4 100644
--- a/src/devices/bus/pc_kbd/pc83.h
+++ b/src/devices/bus/pc_kbd/pc83.h
@@ -11,7 +11,6 @@
#ifndef __PC_KBD_IBM_PC_83__
#define __PC_KBD_IBM_PC_83__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "pc_kbdc.h"
#include "machine/rescap.h"
diff --git a/src/devices/bus/pc_kbd/pc_kbdc.h b/src/devices/bus/pc_kbd/pc_kbdc.h
index a90164171c2..de8cadad147 100644
--- a/src/devices/bus/pc_kbd/pc_kbdc.h
+++ b/src/devices/bus/pc_kbd/pc_kbdc.h
@@ -15,7 +15,6 @@ set the data line and then set the clock line.
#ifndef __PC_KBDC_H__
#define __PC_KBDC_H__
-#include "emu.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
diff --git a/src/devices/bus/pc_kbd/pcat84.cpp b/src/devices/bus/pc_kbd/pcat84.cpp
index ec1ececa88a..d99e787f781 100644
--- a/src/devices/bus/pc_kbd/pcat84.cpp
+++ b/src/devices/bus/pc_kbd/pcat84.cpp
@@ -24,6 +24,7 @@
*/
+#include "emu.h"
#include "pcat84.h"
diff --git a/src/devices/bus/pc_kbd/pcat84.h b/src/devices/bus/pc_kbd/pcat84.h
index d3219ea41da..4fbf700521f 100644
--- a/src/devices/bus/pc_kbd/pcat84.h
+++ b/src/devices/bus/pc_kbd/pcat84.h
@@ -11,7 +11,6 @@
#ifndef __PC_KBD_IBM_PC_AT_84__
#define __PC_KBD_IBM_PC_AT_84__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "pc_kbdc.h"
#include "machine/rescap.h"
diff --git a/src/devices/bus/pc_kbd/pcxt83.cpp b/src/devices/bus/pc_kbd/pcxt83.cpp
index 22b1d7b3e52..56f432fbabc 100644
--- a/src/devices/bus/pc_kbd/pcxt83.cpp
+++ b/src/devices/bus/pc_kbd/pcxt83.cpp
@@ -16,6 +16,7 @@
*/
+#include "emu.h"
#include "pcxt83.h"
diff --git a/src/devices/bus/pc_kbd/pcxt83.h b/src/devices/bus/pc_kbd/pcxt83.h
index 672e67f406c..0c2e7242a6e 100644
--- a/src/devices/bus/pc_kbd/pcxt83.h
+++ b/src/devices/bus/pc_kbd/pcxt83.h
@@ -11,7 +11,6 @@
#ifndef __PC_KBD_IBM_PC_XT_83__
#define __PC_KBD_IBM_PC_XT_83__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
#include "pc_kbdc.h"
#include "machine/rescap.h"
diff --git a/src/devices/bus/pet/2joysnd.cpp b/src/devices/bus/pet/2joysnd.cpp
index 34d00aa7886..f7ce25d7b3d 100644
--- a/src/devices/bus/pet/2joysnd.cpp
+++ b/src/devices/bus/pet/2joysnd.cpp
@@ -46,6 +46,7 @@ Connections
*/
+#include "emu.h"
#include "2joysnd.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/bus/pet/2joysnd.h b/src/devices/bus/pet/2joysnd.h
index 64ba22438c0..715d426a1b2 100644
--- a/src/devices/bus/pet/2joysnd.h
+++ b/src/devices/bus/pet/2joysnd.h
@@ -12,7 +12,6 @@
#define __2JOYSND__
-#include "emu.h"
#include "user.h"
#include "sound/dac.h"
diff --git a/src/devices/bus/pet/64k.cpp b/src/devices/bus/pet/64k.cpp
index 7b27e8c3c13..ac51df8c377 100644
--- a/src/devices/bus/pet/64k.cpp
+++ b/src/devices/bus/pet/64k.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "64k.h"
diff --git a/src/devices/bus/pet/64k.h b/src/devices/bus/pet/64k.h
index fbaca888a58..ddb42f02d5c 100644
--- a/src/devices/bus/pet/64k.h
+++ b/src/devices/bus/pet/64k.h
@@ -11,7 +11,6 @@
#ifndef __PET_64K__
#define __PET_64K__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp
index 1e86ed6738b..c13223f965a 100644
--- a/src/devices/bus/pet/c2n.cpp
+++ b/src/devices/bus/pet/c2n.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "c2n.h"
diff --git a/src/devices/bus/pet/c2n.h b/src/devices/bus/pet/c2n.h
index e373d1ea4e8..4260ed8d64c 100644
--- a/src/devices/bus/pet/c2n.h
+++ b/src/devices/bus/pet/c2n.h
@@ -11,7 +11,6 @@
#ifndef __C2N__
#define __C2N__
-#include "emu.h"
#include "cass.h"
#include "formats/cbm_tap.h"
#include "imagedev/cassette.h"
diff --git a/src/devices/bus/pet/cass.cpp b/src/devices/bus/pet/cass.cpp
index 5147908f1d1..e06682f2c3e 100644
--- a/src/devices/bus/pet/cass.cpp
+++ b/src/devices/bus/pet/cass.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "cass.h"
diff --git a/src/devices/bus/pet/cass.h b/src/devices/bus/pet/cass.h
index ab3d4432903..78eb8fd7332 100644
--- a/src/devices/bus/pet/cass.h
+++ b/src/devices/bus/pet/cass.h
@@ -20,7 +20,6 @@
#ifndef __PET_DATASSETTE_PORT__
#define __PET_DATASSETTE_PORT__
-#include "emu.h"
diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp
index 0b277a869ec..63b227adec7 100644
--- a/src/devices/bus/pet/cb2snd.cpp
+++ b/src/devices/bus/pet/cb2snd.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "cb2snd.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/bus/pet/cb2snd.h b/src/devices/bus/pet/cb2snd.h
index 26c16ec6be4..9788431052c 100644
--- a/src/devices/bus/pet/cb2snd.h
+++ b/src/devices/bus/pet/cb2snd.h
@@ -11,7 +11,6 @@
#ifndef __PETUSER_CB2__
#define __PETUSER_CB2__
-#include "emu.h"
#include "user.h"
#include "sound/dac.h"
diff --git a/src/devices/bus/pet/diag.cpp b/src/devices/bus/pet/diag.cpp
index 3c7be726494..eef41f4f526 100644
--- a/src/devices/bus/pet/diag.cpp
+++ b/src/devices/bus/pet/diag.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "diag.h"
diff --git a/src/devices/bus/pet/diag.h b/src/devices/bus/pet/diag.h
index 150292b4256..cf2bea4d551 100644
--- a/src/devices/bus/pet/diag.h
+++ b/src/devices/bus/pet/diag.h
@@ -11,7 +11,6 @@
#ifndef __PET_USER_DIAG__
#define __PET_USER_DIAG__
-#include "emu.h"
#include "user.h"
diff --git a/src/devices/bus/pet/diag264_lb_tape.cpp b/src/devices/bus/pet/diag264_lb_tape.cpp
index a1123bdfaca..60183f51925 100644
--- a/src/devices/bus/pet/diag264_lb_tape.cpp
+++ b/src/devices/bus/pet/diag264_lb_tape.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "diag264_lb_tape.h"
diff --git a/src/devices/bus/pet/diag264_lb_tape.h b/src/devices/bus/pet/diag264_lb_tape.h
index 88f648451a3..218148a0a9e 100644
--- a/src/devices/bus/pet/diag264_lb_tape.h
+++ b/src/devices/bus/pet/diag264_lb_tape.h
@@ -11,7 +11,6 @@
#ifndef __DIAG264_CASSETTE_LOOPBACK__
#define __DIAG264_CASSETTE_LOOPBACK__
-#include "emu.h"
#include "cass.h"
diff --git a/src/devices/bus/pet/exp.cpp b/src/devices/bus/pet/exp.cpp
index b04b2d14f1f..c716791e558 100644
--- a/src/devices/bus/pet/exp.cpp
+++ b/src/devices/bus/pet/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/pet/exp.h b/src/devices/bus/pet/exp.h
index 5c461df589b..c94062b519f 100644
--- a/src/devices/bus/pet/exp.h
+++ b/src/devices/bus/pet/exp.h
@@ -13,7 +13,6 @@
#ifndef __PET_EXPANSION_SLOT__
#define __PET_EXPANSION_SLOT__
-#include "emu.h"
diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp
index 880f0c69745..eb3ab8caf3f 100644
--- a/src/devices/bus/pet/hsg.cpp
+++ b/src/devices/bus/pet/hsg.cpp
@@ -17,6 +17,7 @@
*/
+#include "emu.h"
#include "hsg.h"
diff --git a/src/devices/bus/pet/hsg.h b/src/devices/bus/pet/hsg.h
index ffb0b6cc385..e0809290a77 100644
--- a/src/devices/bus/pet/hsg.h
+++ b/src/devices/bus/pet/hsg.h
@@ -11,7 +11,6 @@
#ifndef __CBM8000_HSG__
#define __CBM8000_HSG__
-#include "emu.h"
#include "exp.h"
#include "video/ef9365.h"
diff --git a/src/devices/bus/pet/petuja.cpp b/src/devices/bus/pet/petuja.cpp
index 4e225712d2d..9bedbb7b051 100644
--- a/src/devices/bus/pet/petuja.cpp
+++ b/src/devices/bus/pet/petuja.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "petuja.h"
diff --git a/src/devices/bus/pet/petuja.h b/src/devices/bus/pet/petuja.h
index 0cb29c0c390..fc1670dc202 100644
--- a/src/devices/bus/pet/petuja.h
+++ b/src/devices/bus/pet/petuja.h
@@ -12,7 +12,6 @@
#define __PETUJA__
-#include "emu.h"
#include "user.h"
diff --git a/src/devices/bus/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp
index 7cefd6a1df3..3016b91739c 100644
--- a/src/devices/bus/pet/superpet.cpp
+++ b/src/devices/bus/pet/superpet.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "superpet.h"
#include "bus/rs232/rs232.h"
#include "cpu/m6809/m6809.h"
diff --git a/src/devices/bus/pet/user.cpp b/src/devices/bus/pet/user.cpp
index dc1bc4e84b1..f3e0f37b635 100644
--- a/src/devices/bus/pet/user.cpp
+++ b/src/devices/bus/pet/user.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "user.h"
// class pet_user_port_device
diff --git a/src/devices/bus/pet/user.h b/src/devices/bus/pet/user.h
index f85a3e876ad..f2889ec346d 100644
--- a/src/devices/bus/pet/user.h
+++ b/src/devices/bus/pet/user.h
@@ -26,7 +26,6 @@
#ifndef __PET_USER_PORT__
#define __PET_USER_PORT__
-#include "emu.h"
#define MCFG_PET_USER_PORT_ADD(_tag, _slot_intf, _def_slot) \
diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp
index 84792e28c79..e0d19426a47 100644
--- a/src/devices/bus/plus4/c1551.cpp
+++ b/src/devices/bus/plus4/c1551.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "c1551.h"
diff --git a/src/devices/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h
index 86631adc691..07f2e5596ee 100644
--- a/src/devices/bus/plus4/c1551.h
+++ b/src/devices/bus/plus4/c1551.h
@@ -11,7 +11,6 @@
#ifndef __C1551__
#define __C1551__
-#include "emu.h"
#include "exp.h"
#include "cpu/m6502/m6510t.h"
#include "machine/64h156.h"
diff --git a/src/devices/bus/plus4/diag264_lb_user.cpp b/src/devices/bus/plus4/diag264_lb_user.cpp
index fc47373a2e1..2dd645f6759 100644
--- a/src/devices/bus/plus4/diag264_lb_user.cpp
+++ b/src/devices/bus/plus4/diag264_lb_user.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "diag264_lb_user.h"
diff --git a/src/devices/bus/plus4/diag264_lb_user.h b/src/devices/bus/plus4/diag264_lb_user.h
index b575d36f1a0..acff6f4bd49 100644
--- a/src/devices/bus/plus4/diag264_lb_user.h
+++ b/src/devices/bus/plus4/diag264_lb_user.h
@@ -11,7 +11,6 @@
#ifndef __DIAG264_USER_PORT_LOOPBACK__
#define __DIAG264_USER_PORT_LOOPBACK__
-#include "emu.h"
#include "user.h"
diff --git a/src/devices/bus/plus4/exp.cpp b/src/devices/bus/plus4/exp.cpp
index ddfdb876d64..c3de43c3999 100644
--- a/src/devices/bus/plus4/exp.cpp
+++ b/src/devices/bus/plus4/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h
index ffd93be6974..680499fc87b 100644
--- a/src/devices/bus/plus4/exp.h
+++ b/src/devices/bus/plus4/exp.h
@@ -39,7 +39,6 @@
#ifndef __PLUS4_EXPANSION_SLOT__
#define __PLUS4_EXPANSION_SLOT__
-#include "emu.h"
#include "softlist_dev.h"
diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp
index 61ae71a66fe..4616588327c 100644
--- a/src/devices/bus/plus4/sid.cpp
+++ b/src/devices/bus/plus4/sid.cpp
@@ -17,6 +17,7 @@
*/
+#include "emu.h"
#include "sid.h"
diff --git a/src/devices/bus/plus4/sid.h b/src/devices/bus/plus4/sid.h
index c465b2be458..31fa52eaf83 100644
--- a/src/devices/bus/plus4/sid.h
+++ b/src/devices/bus/plus4/sid.h
@@ -11,7 +11,6 @@
#ifndef __PLUS4_SID_CARTRIDGE__
#define __PLUS4_SID_CARTRIDGE__
-#include "emu.h"
#include "exp.h"
#include "bus/vcs_ctrl/ctrl.h"
#include "sound/mos6581.h"
diff --git a/src/devices/bus/plus4/std.cpp b/src/devices/bus/plus4/std.cpp
index 3fdab218138..aa5c9efa4a0 100644
--- a/src/devices/bus/plus4/std.cpp
+++ b/src/devices/bus/plus4/std.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "std.h"
diff --git a/src/devices/bus/plus4/std.h b/src/devices/bus/plus4/std.h
index f4cde993c40..fb60a81b5eb 100644
--- a/src/devices/bus/plus4/std.h
+++ b/src/devices/bus/plus4/std.h
@@ -11,7 +11,6 @@
#ifndef __PLUS4_STANDARD_CARTRIDGE__
#define __PLUS4_STANDARD_CARTRIDGE__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/plus4/user.cpp b/src/devices/bus/plus4/user.cpp
index 7c9c6ed24b5..aa0e04d9452 100644
--- a/src/devices/bus/plus4/user.cpp
+++ b/src/devices/bus/plus4/user.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "user.h"
//-------------------------------------------------
diff --git a/src/devices/bus/pofo/ccm.cpp b/src/devices/bus/pofo/ccm.cpp
index 2b2a3a13a94..db60b8e978a 100644
--- a/src/devices/bus/pofo/ccm.cpp
+++ b/src/devices/bus/pofo/ccm.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ccm.h"
diff --git a/src/devices/bus/pofo/ccm.h b/src/devices/bus/pofo/ccm.h
index b950225b82d..3bd41d3ca3f 100644
--- a/src/devices/bus/pofo/ccm.h
+++ b/src/devices/bus/pofo/ccm.h
@@ -48,7 +48,6 @@
#ifndef __PORTFOLIO_MEMORY_CARD_SLOT__
#define __PORTFOLIO_MEMORY_CARD_SLOT__
-#include "emu.h"
#include "softlist_dev.h"
diff --git a/src/devices/bus/pofo/exp.cpp b/src/devices/bus/pofo/exp.cpp
index 0052fd41e3c..d9049daedbd 100644
--- a/src/devices/bus/pofo/exp.cpp
+++ b/src/devices/bus/pofo/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/pofo/exp.h b/src/devices/bus/pofo/exp.h
index 4c0f512dad5..51bb16c71f4 100644
--- a/src/devices/bus/pofo/exp.h
+++ b/src/devices/bus/pofo/exp.h
@@ -44,7 +44,6 @@
#ifndef __PORTFOLIO_EXPANSION_SLOT__
#define __PORTFOLIO_EXPANSION_SLOT__
-#include "emu.h"
diff --git a/src/devices/bus/pofo/hpc101.cpp b/src/devices/bus/pofo/hpc101.cpp
index 78f97aa3d53..40a36e95afe 100644
--- a/src/devices/bus/pofo/hpc101.cpp
+++ b/src/devices/bus/pofo/hpc101.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "hpc101.h"
diff --git a/src/devices/bus/pofo/hpc101.h b/src/devices/bus/pofo/hpc101.h
index 03a449d8112..9a700be92b9 100644
--- a/src/devices/bus/pofo/hpc101.h
+++ b/src/devices/bus/pofo/hpc101.h
@@ -11,7 +11,6 @@
#ifndef __HPC101__
#define __HPC101__
-#include "emu.h"
#include "exp.h"
#include "bus/centronics/ctronics.h"
#include "machine/i8255.h"
diff --git a/src/devices/bus/pofo/hpc102.cpp b/src/devices/bus/pofo/hpc102.cpp
index 5d9a13ce531..3324bc4b9f0 100644
--- a/src/devices/bus/pofo/hpc102.cpp
+++ b/src/devices/bus/pofo/hpc102.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "hpc102.h"
diff --git a/src/devices/bus/pofo/hpc102.h b/src/devices/bus/pofo/hpc102.h
index baef3f4ec7d..e492e6cdc38 100644
--- a/src/devices/bus/pofo/hpc102.h
+++ b/src/devices/bus/pofo/hpc102.h
@@ -11,7 +11,6 @@
#ifndef __HPC102__
#define __HPC102__
-#include "emu.h"
#include "exp.h"
#include "bus/rs232/rs232.h"
#include "machine/ins8250.h"
diff --git a/src/devices/bus/pofo/hpc104.cpp b/src/devices/bus/pofo/hpc104.cpp
index 8fb8f69c8e8..579f2ca90ac 100644
--- a/src/devices/bus/pofo/hpc104.cpp
+++ b/src/devices/bus/pofo/hpc104.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "hpc104.h"
diff --git a/src/devices/bus/pofo/hpc104.h b/src/devices/bus/pofo/hpc104.h
index 3d771653c35..38337f5ed35 100644
--- a/src/devices/bus/pofo/hpc104.h
+++ b/src/devices/bus/pofo/hpc104.h
@@ -11,7 +11,6 @@
#ifndef __HPC104__
#define __HPC104__
-#include "emu.h"
#include "exp.h"
#include "bus/pofo/ccm.h"
#include "machine/nvram.h"
diff --git a/src/devices/bus/pofo/ram.cpp b/src/devices/bus/pofo/ram.cpp
index b4f9cce087e..a8dedd23ffa 100644
--- a/src/devices/bus/pofo/ram.cpp
+++ b/src/devices/bus/pofo/ram.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ram.h"
diff --git a/src/devices/bus/pofo/ram.h b/src/devices/bus/pofo/ram.h
index 2b0cf2722ba..25ee7f837f9 100644
--- a/src/devices/bus/pofo/ram.h
+++ b/src/devices/bus/pofo/ram.h
@@ -11,7 +11,6 @@
#ifndef __PORTFOLIO_RAM_CARD__
#define __PORTFOLIO_RAM_CARD__
-#include "emu.h"
#include "ccm.h"
#include "machine/nvram.h"
diff --git a/src/devices/bus/pofo/rom.cpp b/src/devices/bus/pofo/rom.cpp
index 3b182f4eb32..43073479f09 100644
--- a/src/devices/bus/pofo/rom.cpp
+++ b/src/devices/bus/pofo/rom.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "rom.h"
diff --git a/src/devices/bus/pofo/rom.h b/src/devices/bus/pofo/rom.h
index 65f1c3e28d7..f8b7841f0cd 100644
--- a/src/devices/bus/pofo/rom.h
+++ b/src/devices/bus/pofo/rom.h
@@ -11,7 +11,6 @@
#ifndef __PORTFOLIO_ROM_CARD__
#define __PORTFOLIO_ROM_CARD__
-#include "emu.h"
#include "ccm.h"
diff --git a/src/devices/bus/psx/analogue.cpp b/src/devices/bus/psx/analogue.cpp
index aa4cb65e88f..012ebd87020 100644
--- a/src/devices/bus/psx/analogue.cpp
+++ b/src/devices/bus/psx/analogue.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "analogue.h"
const device_type PSX_ANALOG_JOYSTICK = &device_creator<psx_analog_joystick_device>;
diff --git a/src/devices/bus/psx/ctlrport.cpp b/src/devices/bus/psx/ctlrport.cpp
index 229d9fb8b61..9be4e6b4431 100644
--- a/src/devices/bus/psx/ctlrport.cpp
+++ b/src/devices/bus/psx/ctlrport.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Carl
/* PAD emulation */
+#include "emu.h"
#include "ctlrport.h"
#include "analogue.h"
#include "multitap.h"
diff --git a/src/devices/bus/psx/memcard.h b/src/devices/bus/psx/memcard.h
index 2a6f3d3e528..49131e8da01 100644
--- a/src/devices/bus/psx/memcard.h
+++ b/src/devices/bus/psx/memcard.h
@@ -5,7 +5,6 @@
#ifndef _PSXCARD_
#define _PSXCARD_
-#include "emu.h"
class psx_controller_port_device;
diff --git a/src/devices/bus/psx/multitap.cpp b/src/devices/bus/psx/multitap.cpp
index f783aa9ab94..c1c501043bd 100644
--- a/src/devices/bus/psx/multitap.cpp
+++ b/src/devices/bus/psx/multitap.cpp
@@ -2,6 +2,7 @@
// copyright-holders:Carl
// psx multitap emulation
+#include "emu.h"
#include "multitap.h"
const device_type PSX_MULTITAP = &device_creator<psx_multitap_device>;
diff --git a/src/devices/bus/ql/cst_q_plus4.cpp b/src/devices/bus/ql/cst_q_plus4.cpp
index d7a58306ef4..06112121975 100644
--- a/src/devices/bus/ql/cst_q_plus4.cpp
+++ b/src/devices/bus/ql/cst_q_plus4.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "cst_q_plus4.h"
diff --git a/src/devices/bus/ql/cst_qdisc.cpp b/src/devices/bus/ql/cst_qdisc.cpp
index 1667c3e4a8f..83297a3ff39 100644
--- a/src/devices/bus/ql/cst_qdisc.cpp
+++ b/src/devices/bus/ql/cst_qdisc.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "cst_qdisc.h"
diff --git a/src/devices/bus/ql/cumana_fdi.cpp b/src/devices/bus/ql/cumana_fdi.cpp
index bcc7e4b077e..400b969adec 100644
--- a/src/devices/bus/ql/cumana_fdi.cpp
+++ b/src/devices/bus/ql/cumana_fdi.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "cumana_fdi.h"
diff --git a/src/devices/bus/ql/exp.cpp b/src/devices/bus/ql/exp.cpp
index 8b40250ca07..d5d48e91099 100644
--- a/src/devices/bus/ql/exp.cpp
+++ b/src/devices/bus/ql/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/ql/exp.h b/src/devices/bus/ql/exp.h
index c65b84f0eff..76b628df406 100644
--- a/src/devices/bus/ql/exp.h
+++ b/src/devices/bus/ql/exp.h
@@ -47,7 +47,6 @@
#ifndef __QL_EXPANSION_SLOT__
#define __QL_EXPANSION_SLOT__
-#include "emu.h"
diff --git a/src/devices/bus/ql/kempston_di.cpp b/src/devices/bus/ql/kempston_di.cpp
index 70cfda102e9..676121d7461 100644
--- a/src/devices/bus/ql/kempston_di.cpp
+++ b/src/devices/bus/ql/kempston_di.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "kempston_di.h"
diff --git a/src/devices/bus/ql/miracle_gold_card.cpp b/src/devices/bus/ql/miracle_gold_card.cpp
index 87f711829d7..2f2c4fd4542 100644
--- a/src/devices/bus/ql/miracle_gold_card.cpp
+++ b/src/devices/bus/ql/miracle_gold_card.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "miracle_gold_card.h"
diff --git a/src/devices/bus/ql/miracle_hd.cpp b/src/devices/bus/ql/miracle_hd.cpp
index 82fe7a0835b..895aa7f768e 100644
--- a/src/devices/bus/ql/miracle_hd.cpp
+++ b/src/devices/bus/ql/miracle_hd.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "miracle_hd.h"
diff --git a/src/devices/bus/ql/mp_fdi.cpp b/src/devices/bus/ql/mp_fdi.cpp
index 7676f607d6f..8b422c912e1 100644
--- a/src/devices/bus/ql/mp_fdi.cpp
+++ b/src/devices/bus/ql/mp_fdi.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mp_fdi.h"
diff --git a/src/devices/bus/ql/opd_basic_master.cpp b/src/devices/bus/ql/opd_basic_master.cpp
index bf9cc893dce..ebe8f820dc8 100644
--- a/src/devices/bus/ql/opd_basic_master.cpp
+++ b/src/devices/bus/ql/opd_basic_master.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "opd_basic_master.h"
diff --git a/src/devices/bus/ql/pcml_qdisk.cpp b/src/devices/bus/ql/pcml_qdisk.cpp
index 1f505e9ddc3..85c6f776f58 100644
--- a/src/devices/bus/ql/pcml_qdisk.cpp
+++ b/src/devices/bus/ql/pcml_qdisk.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "pcml_qdisk.h"
diff --git a/src/devices/bus/ql/qubide.cpp b/src/devices/bus/ql/qubide.cpp
index 740a1188acf..c69e8953ff7 100644
--- a/src/devices/bus/ql/qubide.cpp
+++ b/src/devices/bus/ql/qubide.cpp
@@ -46,6 +46,7 @@
-------------------------------------------------------------------
*/
+#include "emu.h"
#include "qubide.h"
diff --git a/src/devices/bus/ql/rom.cpp b/src/devices/bus/ql/rom.cpp
index 4ad95a0febe..49f6224419d 100644
--- a/src/devices/bus/ql/rom.cpp
+++ b/src/devices/bus/ql/rom.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "rom.h"
diff --git a/src/devices/bus/ql/rom.h b/src/devices/bus/ql/rom.h
index ac128b72180..089e98c889e 100644
--- a/src/devices/bus/ql/rom.h
+++ b/src/devices/bus/ql/rom.h
@@ -30,7 +30,6 @@
#ifndef __QL_ROM_CARTRIDGE_SLOT__
#define __QL_ROM_CARTRIDGE_SLOT__
-#include "emu.h"
#include "softlist_dev.h"
diff --git a/src/devices/bus/ql/sandy_superdisk.cpp b/src/devices/bus/ql/sandy_superdisk.cpp
index 6cdd08e1c70..2e820e5b472 100644
--- a/src/devices/bus/ql/sandy_superdisk.cpp
+++ b/src/devices/bus/ql/sandy_superdisk.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "sandy_superdisk.h"
diff --git a/src/devices/bus/ql/sandy_superqboard.cpp b/src/devices/bus/ql/sandy_superqboard.cpp
index 3b9c7440dde..a79774cd7bb 100644
--- a/src/devices/bus/ql/sandy_superqboard.cpp
+++ b/src/devices/bus/ql/sandy_superqboard.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "sandy_superqboard.h"
diff --git a/src/devices/bus/ql/std.cpp b/src/devices/bus/ql/std.cpp
index 07f064d7b91..d267059f3ac 100644
--- a/src/devices/bus/ql/std.cpp
+++ b/src/devices/bus/ql/std.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "std.h"
diff --git a/src/devices/bus/ql/trumpcard.cpp b/src/devices/bus/ql/trumpcard.cpp
index a97ecdeb112..6af55227569 100644
--- a/src/devices/bus/ql/trumpcard.cpp
+++ b/src/devices/bus/ql/trumpcard.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "trumpcard.h"
diff --git a/src/devices/bus/rs232/keyboard.cpp b/src/devices/bus/rs232/keyboard.cpp
index 51ce4e9eb79..1f78880a9b2 100644
--- a/src/devices/bus/rs232/keyboard.cpp
+++ b/src/devices/bus/rs232/keyboard.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "keyboard.h"
namespace {
diff --git a/src/devices/bus/rs232/loopback.cpp b/src/devices/bus/rs232/loopback.cpp
index 83668f8c362..01ef229be4b 100644
--- a/src/devices/bus/rs232/loopback.cpp
+++ b/src/devices/bus/rs232/loopback.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "loopback.h"
const device_type RS232_LOOPBACK = &device_creator<rs232_loopback_device>;
diff --git a/src/devices/bus/rs232/null_modem.cpp b/src/devices/bus/rs232/null_modem.cpp
index 846292d7690..30b5732a72d 100644
--- a/src/devices/bus/rs232/null_modem.cpp
+++ b/src/devices/bus/rs232/null_modem.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf,Carl
+#include "emu.h"
#include "null_modem.h"
null_modem_device::null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/rs232/printer.cpp b/src/devices/bus/rs232/printer.cpp
index b75d028b81b..440cab877ec 100644
--- a/src/devices/bus/rs232/printer.cpp
+++ b/src/devices/bus/rs232/printer.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "printer.h"
serial_printer_device::serial_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/rs232/pty.cpp b/src/devices/bus/rs232/pty.cpp
index 297870d4e30..a7f343bec56 100644
--- a/src/devices/bus/rs232/pty.cpp
+++ b/src/devices/bus/rs232/pty.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:F. Ulivi
//
+#include "emu.h"
#include <stdio.h>
#include "pty.h"
diff --git a/src/devices/bus/rs232/rs232.cpp b/src/devices/bus/rs232/rs232.cpp
index 458f97ca865..44dfb5481bf 100644
--- a/src/devices/bus/rs232/rs232.cpp
+++ b/src/devices/bus/rs232/rs232.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "rs232.h"
const device_type RS232_PORT = &device_creator<rs232_port_device>;
diff --git a/src/devices/bus/rs232/rs232.h b/src/devices/bus/rs232/rs232.h
index a77e022f7dc..caaa0606b20 100644
--- a/src/devices/bus/rs232/rs232.h
+++ b/src/devices/bus/rs232/rs232.h
@@ -5,7 +5,6 @@
#pragma once
-#include "emu.h"
#define MCFG_RS232_PORT_ADD(_tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, RS232_PORT, 0) \
diff --git a/src/devices/bus/rs232/ser_mouse.cpp b/src/devices/bus/rs232/ser_mouse.cpp
index e4c322ed204..c7c316231a3 100644
--- a/src/devices/bus/rs232/ser_mouse.cpp
+++ b/src/devices/bus/rs232/ser_mouse.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "ser_mouse.h"
diff --git a/src/devices/bus/rs232/sun_kbd.cpp b/src/devices/bus/rs232/sun_kbd.cpp
index 169732db04b..cb1ac3290e4 100644
--- a/src/devices/bus/rs232/sun_kbd.cpp
+++ b/src/devices/bus/rs232/sun_kbd.cpp
@@ -1,3 +1,4 @@
+#include "emu.h"
#include "sun_kbd.h"
diff --git a/src/devices/bus/rs232/terminal.cpp b/src/devices/bus/rs232/terminal.cpp
index d4e0911825e..47fae4f6d66 100644
--- a/src/devices/bus/rs232/terminal.cpp
+++ b/src/devices/bus/rs232/terminal.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "terminal.h"
serial_terminal_device::serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/rs232/xvd701.cpp b/src/devices/bus/rs232/xvd701.cpp
index 0022f3cc135..a2693808213 100644
--- a/src/devices/bus/rs232/xvd701.cpp
+++ b/src/devices/bus/rs232/xvd701.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "xvd701.h"
jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/s100/dj2db.cpp b/src/devices/bus/s100/dj2db.cpp
index 48f58c4981f..1522f2d2243 100644
--- a/src/devices/bus/s100/dj2db.cpp
+++ b/src/devices/bus/s100/dj2db.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "dj2db.h"
diff --git a/src/devices/bus/s100/dj2db.h b/src/devices/bus/s100/dj2db.h
index 19de517522b..19f611a5f07 100644
--- a/src/devices/bus/s100/dj2db.h
+++ b/src/devices/bus/s100/dj2db.h
@@ -11,7 +11,6 @@
#ifndef __S100_DJ2DB__
#define __S100_DJ2DB__
-#include "emu.h"
#include "s100.h"
#include "machine/com8116.h"
#include "machine/wd_fdc.h"
diff --git a/src/devices/bus/s100/djdma.cpp b/src/devices/bus/s100/djdma.cpp
index 427c063ceef..feaa034d161 100644
--- a/src/devices/bus/s100/djdma.cpp
+++ b/src/devices/bus/s100/djdma.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "djdma.h"
diff --git a/src/devices/bus/s100/djdma.h b/src/devices/bus/s100/djdma.h
index ce60e368630..083b1a5b05b 100644
--- a/src/devices/bus/s100/djdma.h
+++ b/src/devices/bus/s100/djdma.h
@@ -11,7 +11,6 @@
#ifndef __S100_DJDMA__
#define __S100_DJDMA__
-#include "emu.h"
#include "s100.h"
#include "cpu/z80/z80.h"
diff --git a/src/devices/bus/s100/mm65k16s.cpp b/src/devices/bus/s100/mm65k16s.cpp
index 058731005e8..3a649c7bb5d 100644
--- a/src/devices/bus/s100/mm65k16s.cpp
+++ b/src/devices/bus/s100/mm65k16s.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mm65k16s.h"
diff --git a/src/devices/bus/s100/mm65k16s.h b/src/devices/bus/s100/mm65k16s.h
index d44d600ce7e..82028856c05 100644
--- a/src/devices/bus/s100/mm65k16s.h
+++ b/src/devices/bus/s100/mm65k16s.h
@@ -11,7 +11,6 @@
#ifndef __S100_MM65K16S__
#define __S100_MM65K16S__
-#include "emu.h"
#include "s100.h"
diff --git a/src/devices/bus/s100/nsmdsa.cpp b/src/devices/bus/s100/nsmdsa.cpp
index d39ef735ad5..2fb14315333 100644
--- a/src/devices/bus/s100/nsmdsa.cpp
+++ b/src/devices/bus/s100/nsmdsa.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "nsmdsa.h"
diff --git a/src/devices/bus/s100/nsmdsa.h b/src/devices/bus/s100/nsmdsa.h
index 96c0219dd5a..875b62b4ca0 100644
--- a/src/devices/bus/s100/nsmdsa.h
+++ b/src/devices/bus/s100/nsmdsa.h
@@ -11,7 +11,6 @@
#ifndef __S100_MDS_A__
#define __S100_MDS_A__
-#include "emu.h"
#include "s100.h"
#include "imagedev/floppy.h"
diff --git a/src/devices/bus/s100/nsmdsad.cpp b/src/devices/bus/s100/nsmdsad.cpp
index bd6b6b1f9d7..67a56ce37da 100644
--- a/src/devices/bus/s100/nsmdsad.cpp
+++ b/src/devices/bus/s100/nsmdsad.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "nsmdsad.h"
diff --git a/src/devices/bus/s100/nsmdsad.h b/src/devices/bus/s100/nsmdsad.h
index f8c124d00e5..54794e906c6 100644
--- a/src/devices/bus/s100/nsmdsad.h
+++ b/src/devices/bus/s100/nsmdsad.h
@@ -11,7 +11,6 @@
#ifndef __S100_MDS_AD__
#define __S100_MDS_AD__
-#include "emu.h"
#include "s100.h"
#include "imagedev/floppy.h"
diff --git a/src/devices/bus/s100/s100.cpp b/src/devices/bus/s100/s100.cpp
index 889c05b40f9..01a0cfbaffe 100644
--- a/src/devices/bus/s100/s100.cpp
+++ b/src/devices/bus/s100/s100.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "s100.h"
diff --git a/src/devices/bus/s100/s100.h b/src/devices/bus/s100/s100.h
index 9a740bd3dd5..44f2d642770 100644
--- a/src/devices/bus/s100/s100.h
+++ b/src/devices/bus/s100/s100.h
@@ -64,7 +64,6 @@
#ifndef __S100__
#define __S100__
-#include "emu.h"
diff --git a/src/devices/bus/s100/wunderbus.cpp b/src/devices/bus/s100/wunderbus.cpp
index b6e757217c9..d60dd01d727 100644
--- a/src/devices/bus/s100/wunderbus.cpp
+++ b/src/devices/bus/s100/wunderbus.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "wunderbus.h"
#include "bus/rs232/rs232.h"
diff --git a/src/devices/bus/sat_ctrl/analog.cpp b/src/devices/bus/sat_ctrl/analog.cpp
index fe47de25800..8f40c2133d3 100644
--- a/src/devices/bus/sat_ctrl/analog.cpp
+++ b/src/devices/bus/sat_ctrl/analog.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "analog.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/analog.h b/src/devices/bus/sat_ctrl/analog.h
index 670d2f09af1..ec3d211a059 100644
--- a/src/devices/bus/sat_ctrl/analog.h
+++ b/src/devices/bus/sat_ctrl/analog.h
@@ -12,7 +12,6 @@
#define __SATURN_ANALOG__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/ctrl.cpp b/src/devices/bus/sat_ctrl/ctrl.cpp
index 884dcd118d4..69268030ec9 100644
--- a/src/devices/bus/sat_ctrl/ctrl.cpp
+++ b/src/devices/bus/sat_ctrl/ctrl.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ctrl.h"
// slot devices
#include "analog.h"
diff --git a/src/devices/bus/sat_ctrl/ctrl.h b/src/devices/bus/sat_ctrl/ctrl.h
index 255a02a9399..3a03cd2234e 100644
--- a/src/devices/bus/sat_ctrl/ctrl.h
+++ b/src/devices/bus/sat_ctrl/ctrl.h
@@ -12,7 +12,6 @@
#ifndef __SATURN_CONTROL_PORT__
#define __SATURN_CONTROL_PORT__
-#include "emu.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/sat_ctrl/joy.cpp b/src/devices/bus/sat_ctrl/joy.cpp
index 9a4ef6fd378..5e405842b29 100644
--- a/src/devices/bus/sat_ctrl/joy.cpp
+++ b/src/devices/bus/sat_ctrl/joy.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "joy.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/joy.h b/src/devices/bus/sat_ctrl/joy.h
index b9a54f1afcd..6a9b4ca24f7 100644
--- a/src/devices/bus/sat_ctrl/joy.h
+++ b/src/devices/bus/sat_ctrl/joy.h
@@ -12,7 +12,6 @@
#define __SATURN_JOY__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/joy_md.cpp b/src/devices/bus/sat_ctrl/joy_md.cpp
index ae57cbb79a9..eafcb4e5d41 100644
--- a/src/devices/bus/sat_ctrl/joy_md.cpp
+++ b/src/devices/bus/sat_ctrl/joy_md.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "joy_md.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/joy_md.h b/src/devices/bus/sat_ctrl/joy_md.h
index a19596fcdab..5649e5579fc 100644
--- a/src/devices/bus/sat_ctrl/joy_md.h
+++ b/src/devices/bus/sat_ctrl/joy_md.h
@@ -12,7 +12,6 @@
#define __SATURN_MDJOY__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/keybd.cpp b/src/devices/bus/sat_ctrl/keybd.cpp
index b257ae2878c..ddab85a5c91 100644
--- a/src/devices/bus/sat_ctrl/keybd.cpp
+++ b/src/devices/bus/sat_ctrl/keybd.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "keybd.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/keybd.h b/src/devices/bus/sat_ctrl/keybd.h
index 18585c6d976..f3d6b5c6b48 100644
--- a/src/devices/bus/sat_ctrl/keybd.h
+++ b/src/devices/bus/sat_ctrl/keybd.h
@@ -12,7 +12,6 @@
#define __SATURN_KEYBD__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/mouse.cpp b/src/devices/bus/sat_ctrl/mouse.cpp
index 66618edccac..2ae29cabb20 100644
--- a/src/devices/bus/sat_ctrl/mouse.cpp
+++ b/src/devices/bus/sat_ctrl/mouse.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "mouse.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/mouse.h b/src/devices/bus/sat_ctrl/mouse.h
index 562602ad778..c30b011a6db 100644
--- a/src/devices/bus/sat_ctrl/mouse.h
+++ b/src/devices/bus/sat_ctrl/mouse.h
@@ -12,7 +12,6 @@
#define __SATURN_MOUSE__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/multitap.cpp b/src/devices/bus/sat_ctrl/multitap.cpp
index 94c2384e084..85798aedfc1 100644
--- a/src/devices/bus/sat_ctrl/multitap.cpp
+++ b/src/devices/bus/sat_ctrl/multitap.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "multitap.h"
diff --git a/src/devices/bus/sat_ctrl/multitap.h b/src/devices/bus/sat_ctrl/multitap.h
index 41715846c84..646a03478af 100644
--- a/src/devices/bus/sat_ctrl/multitap.h
+++ b/src/devices/bus/sat_ctrl/multitap.h
@@ -12,7 +12,6 @@
#define __SATURN_MULTITAP__
-#include "emu.h"
#include "ctrl.h"
diff --git a/src/devices/bus/sat_ctrl/pointer.cpp b/src/devices/bus/sat_ctrl/pointer.cpp
index efc39966085..77116d44b4d 100644
--- a/src/devices/bus/sat_ctrl/pointer.cpp
+++ b/src/devices/bus/sat_ctrl/pointer.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "pointer.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/pointer.h b/src/devices/bus/sat_ctrl/pointer.h
index e060ea07d43..f2ed9e47779 100644
--- a/src/devices/bus/sat_ctrl/pointer.h
+++ b/src/devices/bus/sat_ctrl/pointer.h
@@ -12,7 +12,6 @@
#define __SATURN_TRACK__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/racing.cpp b/src/devices/bus/sat_ctrl/racing.cpp
index 25f4653bd21..c01cf31cf02 100644
--- a/src/devices/bus/sat_ctrl/racing.cpp
+++ b/src/devices/bus/sat_ctrl/racing.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "racing.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/racing.h b/src/devices/bus/sat_ctrl/racing.h
index 14fc3f2e0c6..93186b797cf 100644
--- a/src/devices/bus/sat_ctrl/racing.h
+++ b/src/devices/bus/sat_ctrl/racing.h
@@ -12,7 +12,6 @@
#define __SATURN_RACING__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/sat_ctrl/segatap.cpp b/src/devices/bus/sat_ctrl/segatap.cpp
index 508f06d655f..42a4a32bd1d 100644
--- a/src/devices/bus/sat_ctrl/segatap.cpp
+++ b/src/devices/bus/sat_ctrl/segatap.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "segatap.h"
diff --git a/src/devices/bus/sat_ctrl/segatap.h b/src/devices/bus/sat_ctrl/segatap.h
index 744b7e45620..6508eb5d245 100644
--- a/src/devices/bus/sat_ctrl/segatap.h
+++ b/src/devices/bus/sat_ctrl/segatap.h
@@ -12,7 +12,6 @@
#define __SATURN_SEGATAP__
-#include "emu.h"
#include "ctrl.h"
diff --git a/src/devices/bus/scsi/acb4070.cpp b/src/devices/bus/scsi/acb4070.cpp
index 695b9527842..68604afce99 100644
--- a/src/devices/bus/scsi/acb4070.cpp
+++ b/src/devices/bus/scsi/acb4070.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "acb4070.h"
// device type definition
diff --git a/src/devices/bus/scsi/cdu76s.cpp b/src/devices/bus/scsi/cdu76s.cpp
index b9256135b87..74dd8b281ae 100644
--- a/src/devices/bus/scsi/cdu76s.cpp
+++ b/src/devices/bus/scsi/cdu76s.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "cdu76s.h"
void sony_cdu76s_device::ExecCommand()
diff --git a/src/devices/bus/scsi/d9060hd.cpp b/src/devices/bus/scsi/d9060hd.cpp
index 4ea264030eb..3ee1dc91365 100644
--- a/src/devices/bus/scsi/d9060hd.cpp
+++ b/src/devices/bus/scsi/d9060hd.cpp
@@ -5,6 +5,7 @@
*
*/
+#include "emu.h"
#include "d9060hd.h"
// device type definition
diff --git a/src/devices/bus/scsi/omti5100.cpp b/src/devices/bus/scsi/omti5100.cpp
index 614f48a11a2..274c66a1d3e 100644
--- a/src/devices/bus/scsi/omti5100.cpp
+++ b/src/devices/bus/scsi/omti5100.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "omti5100.h"
#define OMTI_STATUS_SEEK_FAIL 0x02
diff --git a/src/devices/bus/scsi/omti5100.h b/src/devices/bus/scsi/omti5100.h
index 6d13f0f9bad..24c1b74ddc3 100644
--- a/src/devices/bus/scsi/omti5100.h
+++ b/src/devices/bus/scsi/omti5100.h
@@ -3,7 +3,6 @@
#ifndef OMTI5100_H_
#define OMTI5100_H_
-#include "emu.h"
#include "scsi.h"
#include "scsihd.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/bus/scsi/pc9801_sasi.cpp b/src/devices/bus/scsi/pc9801_sasi.cpp
index 7fdbdd699c8..9558897ce83 100644
--- a/src/devices/bus/scsi/pc9801_sasi.cpp
+++ b/src/devices/bus/scsi/pc9801_sasi.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "pc9801_sasi.h"
#define SASI_CMD_SPECIFY 0xc2 // according to x68k_hdc.c
diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp
index d4d8ff84d29..8b80f4a0bfe 100644
--- a/src/devices/bus/scsi/s1410.cpp
+++ b/src/devices/bus/scsi/s1410.cpp
@@ -83,6 +83,7 @@ Notes:
*/
+#include "emu.h"
#include "s1410.h"
#include "cpu/z80/z80.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/bus/scsi/sa1403d.cpp b/src/devices/bus/scsi/sa1403d.cpp
index 21f086b4218..011fd7761e0 100644
--- a/src/devices/bus/scsi/sa1403d.cpp
+++ b/src/devices/bus/scsi/sa1403d.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "sa1403d.h"
diff --git a/src/devices/bus/scsi/scsi.cpp b/src/devices/bus/scsi/scsi.cpp
index 3df52a5d53d..3dda2983129 100644
--- a/src/devices/bus/scsi/scsi.cpp
+++ b/src/devices/bus/scsi/scsi.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "scsi.h"
SCSI_PORT_DEVICE::SCSI_PORT_DEVICE(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
diff --git a/src/devices/bus/scsi/scsi.h b/src/devices/bus/scsi/scsi.h
index 81dfea08959..af362522c2d 100644
--- a/src/devices/bus/scsi/scsi.h
+++ b/src/devices/bus/scsi/scsi.h
@@ -6,7 +6,6 @@
#ifndef _SCSI_H_
#define _SCSI_H_
-#include "emu.h"
#include "machine/buffer.h"
#include "machine/latch.h"
diff --git a/src/devices/bus/scsi/scsicd.cpp b/src/devices/bus/scsi/scsicd.cpp
index 2f0cccef1e5..1f1a197a0b2 100644
--- a/src/devices/bus/scsi/scsicd.cpp
+++ b/src/devices/bus/scsi/scsicd.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "scsicd.h"
// device type definition
diff --git a/src/devices/bus/scsi/scsihd.cpp b/src/devices/bus/scsi/scsihd.cpp
index a822327ca92..12345bb87f8 100644
--- a/src/devices/bus/scsi/scsihd.cpp
+++ b/src/devices/bus/scsi/scsihd.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "scsihd.h"
// device type definition
diff --git a/src/devices/bus/scsi/scsihle.cpp b/src/devices/bus/scsi/scsihle.cpp
index 5ebc39a4d30..27c1a567b62 100644
--- a/src/devices/bus/scsi/scsihle.cpp
+++ b/src/devices/bus/scsi/scsihle.cpp
@@ -8,6 +8,7 @@ Base class for HLE'd SCSI devices.
*/
+#include "emu.h"
#include "scsihle.h"
scsihle_device::scsihle_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/devices/bus/sg1000_exp/fm_unit.cpp b/src/devices/bus/sg1000_exp/fm_unit.cpp
index 1b2bc0e5674..ceca6077fe8 100644
--- a/src/devices/bus/sg1000_exp/fm_unit.cpp
+++ b/src/devices/bus/sg1000_exp/fm_unit.cpp
@@ -38,6 +38,7 @@ SMS version is not playing PSG sound on his Mark III with the FM unit.
**********************************************************************/
+#include "emu.h"
#include "fm_unit.h"
diff --git a/src/devices/bus/sg1000_exp/fm_unit.h b/src/devices/bus/sg1000_exp/fm_unit.h
index f5dcde16e1f..17dadf0d142 100644
--- a/src/devices/bus/sg1000_exp/fm_unit.h
+++ b/src/devices/bus/sg1000_exp/fm_unit.h
@@ -12,7 +12,6 @@
#define __SEGA_FM_UNIT__
-#include "emu.h"
#include "sound/ym2413.h"
#include "sound/sn76496.h"
#include "sg1000exp.h"
diff --git a/src/devices/bus/sg1000_exp/sg1000exp.cpp b/src/devices/bus/sg1000_exp/sg1000exp.cpp
index 9560905de41..7c1fa1eea32 100644
--- a/src/devices/bus/sg1000_exp/sg1000exp.cpp
+++ b/src/devices/bus/sg1000_exp/sg1000exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "sg1000exp.h"
// slot devices
#include "sk1100.h"
diff --git a/src/devices/bus/sg1000_exp/sg1000exp.h b/src/devices/bus/sg1000_exp/sg1000exp.h
index 12cecb1bc89..328f12e269c 100644
--- a/src/devices/bus/sg1000_exp/sg1000exp.h
+++ b/src/devices/bus/sg1000_exp/sg1000exp.h
@@ -14,7 +14,6 @@
#ifndef __SG1000_EXPANSION_SLOT__
#define __SG1000_EXPANSION_SLOT__
-#include "emu.h"
diff --git a/src/devices/bus/sg1000_exp/sk1100.cpp b/src/devices/bus/sg1000_exp/sk1100.cpp
index 275a73b67b8..b58757cbbc4 100644
--- a/src/devices/bus/sg1000_exp/sk1100.cpp
+++ b/src/devices/bus/sg1000_exp/sk1100.cpp
@@ -17,6 +17,7 @@ TODO:
**********************************************************************/
+#include "emu.h"
#include "sk1100.h"
#include "softlist.h"
diff --git a/src/devices/bus/sg1000_exp/sk1100.h b/src/devices/bus/sg1000_exp/sk1100.h
index 592ee0dd5b5..29aa91c3074 100644
--- a/src/devices/bus/sg1000_exp/sk1100.h
+++ b/src/devices/bus/sg1000_exp/sk1100.h
@@ -12,7 +12,6 @@
#define __SEGA_SK1100__
-#include "emu.h"
#include "sg1000exp.h"
#include "formats/sc3000_bit.h"
#include "imagedev/cassette.h"
diff --git a/src/devices/bus/sms_ctrl/graphic.cpp b/src/devices/bus/sms_ctrl/graphic.cpp
index 9cff60be1ac..db302cea668 100644
--- a/src/devices/bus/sms_ctrl/graphic.cpp
+++ b/src/devices/bus/sms_ctrl/graphic.cpp
@@ -32,6 +32,7 @@ THen 2 nibbles are read to form a byte containing the absolute Y coordiante.
**********************************************************************/
+#include "emu.h"
#include "graphic.h"
diff --git a/src/devices/bus/sms_ctrl/graphic.h b/src/devices/bus/sms_ctrl/graphic.h
index b6c364d4984..921e96b75d6 100644
--- a/src/devices/bus/sms_ctrl/graphic.h
+++ b/src/devices/bus/sms_ctrl/graphic.h
@@ -12,7 +12,6 @@
#define __SMS_GRAPHIC__
-#include "emu.h"
#include "smsctrl.h"
diff --git a/src/devices/bus/sms_ctrl/joypad.cpp b/src/devices/bus/sms_ctrl/joypad.cpp
index e750e2435ab..e9dba928346 100644
--- a/src/devices/bus/sms_ctrl/joypad.cpp
+++ b/src/devices/bus/sms_ctrl/joypad.cpp
@@ -21,6 +21,7 @@ Release data from the Sega Retro project:
**********************************************************************/
+#include "emu.h"
#include "joypad.h"
diff --git a/src/devices/bus/sms_ctrl/joypad.h b/src/devices/bus/sms_ctrl/joypad.h
index 56e076a6819..10bff08c5b0 100644
--- a/src/devices/bus/sms_ctrl/joypad.h
+++ b/src/devices/bus/sms_ctrl/joypad.h
@@ -12,7 +12,6 @@
#define __SMS_JOYPAD__
-#include "emu.h"
#include "smsctrl.h"
diff --git a/src/devices/bus/sms_ctrl/lphaser.cpp b/src/devices/bus/sms_ctrl/lphaser.cpp
index de7e0bafd79..ce5abe36515 100644
--- a/src/devices/bus/sms_ctrl/lphaser.cpp
+++ b/src/devices/bus/sms_ctrl/lphaser.cpp
@@ -18,6 +18,7 @@ Notes:
**********************************************************************/
+#include "emu.h"
#include "lphaser.h"
diff --git a/src/devices/bus/sms_ctrl/lphaser.h b/src/devices/bus/sms_ctrl/lphaser.h
index d3004e2de80..8d25f9fe34f 100644
--- a/src/devices/bus/sms_ctrl/lphaser.h
+++ b/src/devices/bus/sms_ctrl/lphaser.h
@@ -12,7 +12,6 @@
#define __SMS_LIGHT_PHASER__
-#include "emu.h"
#include "smsctrl.h"
diff --git a/src/devices/bus/sms_ctrl/multitap.cpp b/src/devices/bus/sms_ctrl/multitap.cpp
index 55101810647..9ea060fc491 100644
--- a/src/devices/bus/sms_ctrl/multitap.cpp
+++ b/src/devices/bus/sms_ctrl/multitap.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "multitap.h"
diff --git a/src/devices/bus/sms_ctrl/multitap.h b/src/devices/bus/sms_ctrl/multitap.h
index 93c71f8e215..534d2f7ccf9 100644
--- a/src/devices/bus/sms_ctrl/multitap.h
+++ b/src/devices/bus/sms_ctrl/multitap.h
@@ -12,7 +12,6 @@
#define __SMS_MULTITAP__
-#include "emu.h"
#include "smsctrl.h"
diff --git a/src/devices/bus/sms_ctrl/paddle.cpp b/src/devices/bus/sms_ctrl/paddle.cpp
index 88f6af4137a..a5707d7f4fb 100644
--- a/src/devices/bus/sms_ctrl/paddle.cpp
+++ b/src/devices/bus/sms_ctrl/paddle.cpp
@@ -23,6 +23,7 @@ Notes:
**********************************************************************/
+#include "emu.h"
#include "paddle.h"
diff --git a/src/devices/bus/sms_ctrl/paddle.h b/src/devices/bus/sms_ctrl/paddle.h
index c5da3741b04..12134943208 100644
--- a/src/devices/bus/sms_ctrl/paddle.h
+++ b/src/devices/bus/sms_ctrl/paddle.h
@@ -12,7 +12,6 @@
#define __SMS_PADDLE__
-#include "emu.h"
#include "smsctrl.h"
diff --git a/src/devices/bus/sms_ctrl/rfu.cpp b/src/devices/bus/sms_ctrl/rfu.cpp
index d2e376a6d80..fa356a5cac6 100644
--- a/src/devices/bus/sms_ctrl/rfu.cpp
+++ b/src/devices/bus/sms_ctrl/rfu.cpp
@@ -19,6 +19,7 @@ Notes:
**********************************************************************/
+#include "emu.h"
#include "rfu.h"
diff --git a/src/devices/bus/sms_ctrl/rfu.h b/src/devices/bus/sms_ctrl/rfu.h
index 6784b55c66d..32ae2d9b554 100644
--- a/src/devices/bus/sms_ctrl/rfu.h
+++ b/src/devices/bus/sms_ctrl/rfu.h
@@ -12,7 +12,6 @@
#define __SMS_RAPID_FIRE__
-#include "emu.h"
#include "smsctrl.h"
diff --git a/src/devices/bus/sms_ctrl/smsctrl.cpp b/src/devices/bus/sms_ctrl/smsctrl.cpp
index e99cce2c827..c8551fd385f 100644
--- a/src/devices/bus/sms_ctrl/smsctrl.cpp
+++ b/src/devices/bus/sms_ctrl/smsctrl.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "smsctrl.h"
// slot devices
#include "joypad.h"
diff --git a/src/devices/bus/sms_ctrl/smsctrl.h b/src/devices/bus/sms_ctrl/smsctrl.h
index b85b9d91954..457f758391b 100644
--- a/src/devices/bus/sms_ctrl/smsctrl.h
+++ b/src/devices/bus/sms_ctrl/smsctrl.h
@@ -14,7 +14,6 @@
#ifndef __SMS_CONTROL_PORT__
#define __SMS_CONTROL_PORT__
-#include "emu.h"
diff --git a/src/devices/bus/sms_ctrl/sports.cpp b/src/devices/bus/sms_ctrl/sports.cpp
index a85ca1e2709..d822d7be986 100644
--- a/src/devices/bus/sms_ctrl/sports.cpp
+++ b/src/devices/bus/sms_ctrl/sports.cpp
@@ -38,6 +38,7 @@ Notes:
**********************************************************************/
+#include "emu.h"
#include "sports.h"
diff --git a/src/devices/bus/sms_ctrl/sports.h b/src/devices/bus/sms_ctrl/sports.h
index 5e371372e3c..bad15dc1ec0 100644
--- a/src/devices/bus/sms_ctrl/sports.h
+++ b/src/devices/bus/sms_ctrl/sports.h
@@ -12,7 +12,6 @@
#define __SMS_SPORTS_PAD__
-#include "emu.h"
#include "smsctrl.h"
diff --git a/src/devices/bus/sms_ctrl/sportsjp.cpp b/src/devices/bus/sms_ctrl/sportsjp.cpp
index 398a3b7730e..3932e8645ff 100644
--- a/src/devices/bus/sms_ctrl/sportsjp.cpp
+++ b/src/devices/bus/sms_ctrl/sportsjp.cpp
@@ -41,6 +41,7 @@ Notes:
**********************************************************************/
+#include "emu.h"
#include "sportsjp.h"
diff --git a/src/devices/bus/sms_ctrl/sportsjp.h b/src/devices/bus/sms_ctrl/sportsjp.h
index 2679f685806..76b5697fbfc 100644
--- a/src/devices/bus/sms_ctrl/sportsjp.h
+++ b/src/devices/bus/sms_ctrl/sportsjp.h
@@ -12,7 +12,6 @@
#define __SMS_SPORTS_PAD_JP__
-#include "emu.h"
#include "smsctrl.h"
diff --git a/src/devices/bus/sms_exp/gender.cpp b/src/devices/bus/sms_exp/gender.cpp
index c021b9feef3..27b0f5f9863 100644
--- a/src/devices/bus/sms_exp/gender.cpp
+++ b/src/devices/bus/sms_exp/gender.cpp
@@ -13,6 +13,7 @@ real hardware, when run plugged-in to the SMS expansion slot.
**********************************************************************/
+#include "emu.h"
#include "gender.h"
diff --git a/src/devices/bus/sms_exp/gender.h b/src/devices/bus/sms_exp/gender.h
index d71f35c44bf..431b356a7d2 100644
--- a/src/devices/bus/sms_exp/gender.h
+++ b/src/devices/bus/sms_exp/gender.h
@@ -12,7 +12,6 @@
#define __SMS_GENDER_ADAPTER__
-#include "emu.h"
#include "smsexp.h"
#include "bus/sega8/sega8_slot.h"
diff --git a/src/devices/bus/sms_exp/smsexp.cpp b/src/devices/bus/sms_exp/smsexp.cpp
index 9cd787cabf5..2a1dd8673c8 100644
--- a/src/devices/bus/sms_exp/smsexp.cpp
+++ b/src/devices/bus/sms_exp/smsexp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "smsexp.h"
diff --git a/src/devices/bus/sms_exp/smsexp.h b/src/devices/bus/sms_exp/smsexp.h
index 9ef2a6ef852..6203380fc2f 100644
--- a/src/devices/bus/sms_exp/smsexp.h
+++ b/src/devices/bus/sms_exp/smsexp.h
@@ -14,7 +14,6 @@
#ifndef __SMS_EXPANSION_SLOT__
#define __SMS_EXPANSION_SLOT__
-#include "emu.h"
diff --git a/src/devices/bus/snes/snes_carts.cpp b/src/devices/bus/snes/snes_carts.cpp
index 840a441e9fe..32c7ad5f875 100644
--- a/src/devices/bus/snes/snes_carts.cpp
+++ b/src/devices/bus/snes/snes_carts.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "snes_carts.h"
SLOT_INTERFACE_START(snes_cart)
diff --git a/src/devices/bus/snes/snes_carts.h b/src/devices/bus/snes/snes_carts.h
index 11eab07a315..eb5460b3e22 100644
--- a/src/devices/bus/snes/snes_carts.h
+++ b/src/devices/bus/snes/snes_carts.h
@@ -11,7 +11,6 @@
#ifndef __SNES_CARTS_H__
#define __SNES_CARTS_H__
-#include "emu.h"
#include "rom.h"
#include "rom21.h"
diff --git a/src/devices/bus/snes_ctrl/bcbattle.cpp b/src/devices/bus/snes_ctrl/bcbattle.cpp
index 53f63236e31..faf63e91515 100644
--- a/src/devices/bus/snes_ctrl/bcbattle.cpp
+++ b/src/devices/bus/snes_ctrl/bcbattle.cpp
@@ -10,6 +10,7 @@
**********************************************************************/
+#include "emu.h"
#include "bcbattle.h"
//**************************************************************************
diff --git a/src/devices/bus/snes_ctrl/bcbattle.h b/src/devices/bus/snes_ctrl/bcbattle.h
index fffdeb1e3f3..7fde5b0e54b 100644
--- a/src/devices/bus/snes_ctrl/bcbattle.h
+++ b/src/devices/bus/snes_ctrl/bcbattle.h
@@ -12,7 +12,6 @@
#define __SNES_BCBATTLE__
-#include "emu.h"
#include "ctrl.h"
#include "machine/bcreader.h"
diff --git a/src/devices/bus/snes_ctrl/ctrl.cpp b/src/devices/bus/snes_ctrl/ctrl.cpp
index 33d342e3d7f..b098a7237ff 100644
--- a/src/devices/bus/snes_ctrl/ctrl.cpp
+++ b/src/devices/bus/snes_ctrl/ctrl.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ctrl.h"
// slot devices
#include "bcbattle.h"
diff --git a/src/devices/bus/snes_ctrl/ctrl.h b/src/devices/bus/snes_ctrl/ctrl.h
index 5777cc4bc04..86fb8229945 100644
--- a/src/devices/bus/snes_ctrl/ctrl.h
+++ b/src/devices/bus/snes_ctrl/ctrl.h
@@ -12,7 +12,6 @@
#ifndef __SNES_CONTROL_PORT__
#define __SNES_CONTROL_PORT__
-#include "emu.h"
//**************************************************************************
// TYPE DEFINITIONS
diff --git a/src/devices/bus/snes_ctrl/joypad.cpp b/src/devices/bus/snes_ctrl/joypad.cpp
index b9af5f32161..11b965bed77 100644
--- a/src/devices/bus/snes_ctrl/joypad.cpp
+++ b/src/devices/bus/snes_ctrl/joypad.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "joypad.h"
//**************************************************************************
diff --git a/src/devices/bus/snes_ctrl/joypad.h b/src/devices/bus/snes_ctrl/joypad.h
index b1b549c2106..e2ec9759c45 100644
--- a/src/devices/bus/snes_ctrl/joypad.h
+++ b/src/devices/bus/snes_ctrl/joypad.h
@@ -12,7 +12,6 @@
#define __SNES_JOYPAD__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/snes_ctrl/miracle.cpp b/src/devices/bus/snes_ctrl/miracle.cpp
index 3c5b01daa2b..36d6af3362b 100644
--- a/src/devices/bus/snes_ctrl/miracle.cpp
+++ b/src/devices/bus/snes_ctrl/miracle.cpp
@@ -9,6 +9,7 @@
**********************************************************************/
+#include "emu.h"
#include "miracle.h"
#define MIRACLE_MIDI_WAITING 0
diff --git a/src/devices/bus/snes_ctrl/miracle.h b/src/devices/bus/snes_ctrl/miracle.h
index 6155511eee3..2e9a4f1373e 100644
--- a/src/devices/bus/snes_ctrl/miracle.h
+++ b/src/devices/bus/snes_ctrl/miracle.h
@@ -12,7 +12,6 @@
#define __SNES_MIRACLE__
-#include "emu.h"
#include "ctrl.h"
#include "bus/midi/midi.h"
diff --git a/src/devices/bus/snes_ctrl/mouse.cpp b/src/devices/bus/snes_ctrl/mouse.cpp
index ad7e9ba3008..47806ea0845 100644
--- a/src/devices/bus/snes_ctrl/mouse.cpp
+++ b/src/devices/bus/snes_ctrl/mouse.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mouse.h"
//**************************************************************************
diff --git a/src/devices/bus/snes_ctrl/mouse.h b/src/devices/bus/snes_ctrl/mouse.h
index 94907fc6306..13d2b3e33d6 100644
--- a/src/devices/bus/snes_ctrl/mouse.h
+++ b/src/devices/bus/snes_ctrl/mouse.h
@@ -12,7 +12,6 @@
#define __SNES_MOUSE__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/snes_ctrl/multitap.cpp b/src/devices/bus/snes_ctrl/multitap.cpp
index d88f687f547..062486bbcf5 100644
--- a/src/devices/bus/snes_ctrl/multitap.cpp
+++ b/src/devices/bus/snes_ctrl/multitap.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "multitap.h"
#include "joypad.h"
#include "twintap.h"
diff --git a/src/devices/bus/snes_ctrl/multitap.h b/src/devices/bus/snes_ctrl/multitap.h
index e9256ba7dbd..f217f882aa5 100644
--- a/src/devices/bus/snes_ctrl/multitap.h
+++ b/src/devices/bus/snes_ctrl/multitap.h
@@ -12,7 +12,6 @@
#define __SNES_MULTITAP__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/snes_ctrl/pachinko.cpp b/src/devices/bus/snes_ctrl/pachinko.cpp
index 10ddda50d52..551176959aa 100644
--- a/src/devices/bus/snes_ctrl/pachinko.cpp
+++ b/src/devices/bus/snes_ctrl/pachinko.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "pachinko.h"
//**************************************************************************
diff --git a/src/devices/bus/snes_ctrl/pachinko.h b/src/devices/bus/snes_ctrl/pachinko.h
index ba41a168e25..1bd1e1fb185 100644
--- a/src/devices/bus/snes_ctrl/pachinko.h
+++ b/src/devices/bus/snes_ctrl/pachinko.h
@@ -12,7 +12,6 @@
#define __SNES_PACHINKO__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/snes_ctrl/sscope.cpp b/src/devices/bus/snes_ctrl/sscope.cpp
index 58243314935..fbdbb5a93c4 100644
--- a/src/devices/bus/snes_ctrl/sscope.cpp
+++ b/src/devices/bus/snes_ctrl/sscope.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "sscope.h"
//**************************************************************************
diff --git a/src/devices/bus/snes_ctrl/sscope.h b/src/devices/bus/snes_ctrl/sscope.h
index e060b228759..e073800b23f 100644
--- a/src/devices/bus/snes_ctrl/sscope.h
+++ b/src/devices/bus/snes_ctrl/sscope.h
@@ -12,7 +12,6 @@
#define __SNES_SUPERSCOPE__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/snes_ctrl/twintap.cpp b/src/devices/bus/snes_ctrl/twintap.cpp
index 5377ca8fb4f..81a9937e819 100644
--- a/src/devices/bus/snes_ctrl/twintap.cpp
+++ b/src/devices/bus/snes_ctrl/twintap.cpp
@@ -13,6 +13,7 @@
**********************************************************************/
+#include "emu.h"
#include "twintap.h"
//**************************************************************************
diff --git a/src/devices/bus/snes_ctrl/twintap.h b/src/devices/bus/snes_ctrl/twintap.h
index cf8934901bc..f45c46f2cbf 100644
--- a/src/devices/bus/snes_ctrl/twintap.h
+++ b/src/devices/bus/snes_ctrl/twintap.h
@@ -12,7 +12,6 @@
#define __SNES_TWINTAP__
-#include "emu.h"
#include "ctrl.h"
//**************************************************************************
diff --git a/src/devices/bus/sunkbd/hlekbd.cpp b/src/devices/bus/sunkbd/hlekbd.cpp
index e2a38d0f358..fe5f519d0b2 100644
--- a/src/devices/bus/sunkbd/hlekbd.cpp
+++ b/src/devices/bus/sunkbd/hlekbd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb
+#include "emu.h"
#include "hlekbd.h"
#include "machine/keyboard.ipp"
diff --git a/src/devices/bus/sunkbd/sunkbd.cpp b/src/devices/bus/sunkbd/sunkbd.cpp
index ed0225c2785..62d5680c397 100644
--- a/src/devices/bus/sunkbd/sunkbd.cpp
+++ b/src/devices/bus/sunkbd/sunkbd.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Vas Crabb
+#include "emu.h"
#include "sunkbd.h"
diff --git a/src/devices/bus/sunkbd/sunkbd.h b/src/devices/bus/sunkbd/sunkbd.h
index 9d840854029..3137cfb5559 100644
--- a/src/devices/bus/sunkbd/sunkbd.h
+++ b/src/devices/bus/sunkbd/sunkbd.h
@@ -5,7 +5,6 @@
#pragma once
-#include "emu.h"
#define MCFG_SUNKBD_PORT_ADD(tag, slot_intf, def_slot) \
diff --git a/src/devices/bus/svi3x8/expander/expander.cpp b/src/devices/bus/svi3x8/expander/expander.cpp
index 176b697a634..6ddb23e8bb9 100644
--- a/src/devices/bus/svi3x8/expander/expander.cpp
+++ b/src/devices/bus/svi3x8/expander/expander.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "expander.h"
diff --git a/src/devices/bus/svi3x8/expander/expander.h b/src/devices/bus/svi3x8/expander/expander.h
index 9dc4a76422b..853b2c1f50f 100644
--- a/src/devices/bus/svi3x8/expander/expander.h
+++ b/src/devices/bus/svi3x8/expander/expander.h
@@ -39,7 +39,6 @@
#ifndef __SVI3X8_EXPANDER_H__
#define __SVI3X8_EXPANDER_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/svi3x8/expander/modules.cpp b/src/devices/bus/svi3x8/expander/modules.cpp
index ec606d2b348..04ba3635d4f 100644
--- a/src/devices/bus/svi3x8/expander/modules.cpp
+++ b/src/devices/bus/svi3x8/expander/modules.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "modules.h"
SLOT_INTERFACE_START( svi_expander_modules )
diff --git a/src/devices/bus/svi3x8/expander/modules.h b/src/devices/bus/svi3x8/expander/modules.h
index 3f236724ed6..7391d55dc66 100644
--- a/src/devices/bus/svi3x8/expander/modules.h
+++ b/src/devices/bus/svi3x8/expander/modules.h
@@ -11,7 +11,6 @@
#ifndef __SVI_EXPANDER_MODULES_H__
#define __SVI_EXPANDER_MODULES_H__
-#include "emu.h"
#include "sv601.h"
#include "sv602.h"
#include "sv603.h"
diff --git a/src/devices/bus/svi3x8/expander/sv601.cpp b/src/devices/bus/svi3x8/expander/sv601.cpp
index 60b116e0a72..d97b114f1f5 100644
--- a/src/devices/bus/svi3x8/expander/sv601.cpp
+++ b/src/devices/bus/svi3x8/expander/sv601.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "sv601.h"
diff --git a/src/devices/bus/svi3x8/expander/sv601.h b/src/devices/bus/svi3x8/expander/sv601.h
index 3db3719b884..796b9da51b2 100644
--- a/src/devices/bus/svi3x8/expander/sv601.h
+++ b/src/devices/bus/svi3x8/expander/sv601.h
@@ -11,7 +11,6 @@
#ifndef __SVI3X8_EXPANDER_SV601_H__
#define __SVI3X8_EXPANDER_SV601_H__
-#include "emu.h"
#include "expander.h"
#include "bus/svi3x8/slot/slot.h"
diff --git a/src/devices/bus/svi3x8/expander/sv602.cpp b/src/devices/bus/svi3x8/expander/sv602.cpp
index 1a05777cb8e..1c5f4b6b93c 100644
--- a/src/devices/bus/svi3x8/expander/sv602.cpp
+++ b/src/devices/bus/svi3x8/expander/sv602.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "sv602.h"
diff --git a/src/devices/bus/svi3x8/expander/sv602.h b/src/devices/bus/svi3x8/expander/sv602.h
index 0abaccd6d4d..2855f11e991 100644
--- a/src/devices/bus/svi3x8/expander/sv602.h
+++ b/src/devices/bus/svi3x8/expander/sv602.h
@@ -11,7 +11,6 @@
#ifndef __SVI3X8_EXPANDER_SV602_H__
#define __SVI3X8_EXPANDER_SV602_H__
-#include "emu.h"
#include "expander.h"
#include "bus/svi3x8/slot/slot.h"
diff --git a/src/devices/bus/svi3x8/expander/sv603.cpp b/src/devices/bus/svi3x8/expander/sv603.cpp
index ba69250becd..af7bae0ee25 100644
--- a/src/devices/bus/svi3x8/expander/sv603.cpp
+++ b/src/devices/bus/svi3x8/expander/sv603.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "sv603.h"
#include "softlist.h"
diff --git a/src/devices/bus/svi3x8/expander/sv603.h b/src/devices/bus/svi3x8/expander/sv603.h
index aec93de11a0..584560ea5e3 100644
--- a/src/devices/bus/svi3x8/expander/sv603.h
+++ b/src/devices/bus/svi3x8/expander/sv603.h
@@ -11,7 +11,6 @@
#ifndef __SVI3X8_EXPANDER_SV603_H__
#define __SVI3X8_EXPANDER_SV603_H__
-#include "emu.h"
#include "expander.h"
#include "sound/sn76496.h"
#include "bus/generic/slot.h"
diff --git a/src/devices/bus/svi3x8/slot/cards.cpp b/src/devices/bus/svi3x8/slot/cards.cpp
index 095c2eeaa4e..6a51e28a8d1 100644
--- a/src/devices/bus/svi3x8/slot/cards.cpp
+++ b/src/devices/bus/svi3x8/slot/cards.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "cards.h"
SLOT_INTERFACE_START( svi_slot_cards )
diff --git a/src/devices/bus/svi3x8/slot/cards.h b/src/devices/bus/svi3x8/slot/cards.h
index d27469b08a1..9ceeccbd840 100644
--- a/src/devices/bus/svi3x8/slot/cards.h
+++ b/src/devices/bus/svi3x8/slot/cards.h
@@ -11,7 +11,6 @@
#ifndef __SVI3X8_SLOT_CARDS_H__
#define __SVI3X8_SLOT_CARDS_H__
-#include "emu.h"
#include "sv801.h"
#include "sv802.h"
#include "sv803.h"
diff --git a/src/devices/bus/svi3x8/slot/slot.cpp b/src/devices/bus/svi3x8/slot/slot.cpp
index 87564889d82..7dc9bb8be95 100644
--- a/src/devices/bus/svi3x8/slot/slot.cpp
+++ b/src/devices/bus/svi3x8/slot/slot.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "slot.h"
diff --git a/src/devices/bus/svi3x8/slot/slot.h b/src/devices/bus/svi3x8/slot/slot.h
index ba636d0e9cc..a76a514c2f1 100644
--- a/src/devices/bus/svi3x8/slot/slot.h
+++ b/src/devices/bus/svi3x8/slot/slot.h
@@ -39,7 +39,6 @@
#ifndef __SVI3X8_SLOT_H__
#define __SVI3X8_SLOT_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/svi3x8/slot/sv801.cpp b/src/devices/bus/svi3x8/slot/sv801.cpp
index 892d8047ad5..396d99ed56b 100644
--- a/src/devices/bus/svi3x8/slot/sv801.cpp
+++ b/src/devices/bus/svi3x8/slot/sv801.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "sv801.h"
#include "softlist.h"
#include "formats/svi_dsk.h"
diff --git a/src/devices/bus/svi3x8/slot/sv801.h b/src/devices/bus/svi3x8/slot/sv801.h
index e3354faeff6..229fb6995ab 100644
--- a/src/devices/bus/svi3x8/slot/sv801.h
+++ b/src/devices/bus/svi3x8/slot/sv801.h
@@ -11,7 +11,6 @@
#ifndef __SVI3X8_SLOT_SV801_H__
#define __SVI3X8_SLOT_SV801_H__
-#include "emu.h"
#include "slot.h"
#include "machine/wd_fdc.h"
#include "imagedev/floppy.h"
diff --git a/src/devices/bus/svi3x8/slot/sv802.cpp b/src/devices/bus/svi3x8/slot/sv802.cpp
index 710d17e4971..d0fe46f946e 100644
--- a/src/devices/bus/svi3x8/slot/sv802.cpp
+++ b/src/devices/bus/svi3x8/slot/sv802.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "sv802.h"
diff --git a/src/devices/bus/svi3x8/slot/sv802.h b/src/devices/bus/svi3x8/slot/sv802.h
index 3950ce05274..8d7bf241d24 100644
--- a/src/devices/bus/svi3x8/slot/sv802.h
+++ b/src/devices/bus/svi3x8/slot/sv802.h
@@ -11,7 +11,6 @@
#ifndef __SVI3X8_SLOT_SV802_H__
#define __SVI3X8_SLOT_SV802_H__
-#include "emu.h"
#include "slot.h"
#include "machine/buffer.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/devices/bus/svi3x8/slot/sv803.cpp b/src/devices/bus/svi3x8/slot/sv803.cpp
index a8665b04ab8..088e2ae5064 100644
--- a/src/devices/bus/svi3x8/slot/sv803.cpp
+++ b/src/devices/bus/svi3x8/slot/sv803.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "sv803.h"
diff --git a/src/devices/bus/svi3x8/slot/sv803.h b/src/devices/bus/svi3x8/slot/sv803.h
index b930e647cdc..d07da2ce404 100644
--- a/src/devices/bus/svi3x8/slot/sv803.h
+++ b/src/devices/bus/svi3x8/slot/sv803.h
@@ -11,7 +11,6 @@
#ifndef __SVI3X8_SLOT_SV803_H__
#define __SVI3X8_SLOT_SV803_H__
-#include "emu.h"
#include "slot.h"
diff --git a/src/devices/bus/svi3x8/slot/sv805.cpp b/src/devices/bus/svi3x8/slot/sv805.cpp
index 2eb1e217671..3ef1081c58c 100644
--- a/src/devices/bus/svi3x8/slot/sv805.cpp
+++ b/src/devices/bus/svi3x8/slot/sv805.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "sv805.h"
diff --git a/src/devices/bus/svi3x8/slot/sv805.h b/src/devices/bus/svi3x8/slot/sv805.h
index fda554f901c..8cc9008772d 100644
--- a/src/devices/bus/svi3x8/slot/sv805.h
+++ b/src/devices/bus/svi3x8/slot/sv805.h
@@ -11,7 +11,6 @@
#ifndef __SVI3X8_SLOT_SV805_H__
#define __SVI3X8_SLOT_SV805_H__
-#include "emu.h"
#include "slot.h"
#include "machine/ins8250.h"
#include "bus/rs232/rs232.h"
diff --git a/src/devices/bus/svi3x8/slot/sv806.cpp b/src/devices/bus/svi3x8/slot/sv806.cpp
index ec16d84c656..e1047e143a9 100644
--- a/src/devices/bus/svi3x8/slot/sv806.cpp
+++ b/src/devices/bus/svi3x8/slot/sv806.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "sv806.h"
diff --git a/src/devices/bus/svi3x8/slot/sv806.h b/src/devices/bus/svi3x8/slot/sv806.h
index 336a2ea99d7..f37ce5d75f8 100644
--- a/src/devices/bus/svi3x8/slot/sv806.h
+++ b/src/devices/bus/svi3x8/slot/sv806.h
@@ -11,7 +11,6 @@
#ifndef __SVI3X8_SLOT_SV806_H__
#define __SVI3X8_SLOT_SV806_H__
-#include "emu.h"
#include "slot.h"
#include "video/mc6845.h"
diff --git a/src/devices/bus/svi3x8/slot/sv807.cpp b/src/devices/bus/svi3x8/slot/sv807.cpp
index 17cd09f603f..99675199b93 100644
--- a/src/devices/bus/svi3x8/slot/sv807.cpp
+++ b/src/devices/bus/svi3x8/slot/sv807.cpp
@@ -9,6 +9,7 @@
***************************************************************************/
+#include "emu.h"
#include "sv807.h"
diff --git a/src/devices/bus/svi3x8/slot/sv807.h b/src/devices/bus/svi3x8/slot/sv807.h
index 1e2139372d5..8dee492b837 100644
--- a/src/devices/bus/svi3x8/slot/sv807.h
+++ b/src/devices/bus/svi3x8/slot/sv807.h
@@ -11,7 +11,6 @@
#ifndef __SVI3X8_SLOT_SV807_H__
#define __SVI3X8_SLOT_SV807_H__
-#include "emu.h"
#include "slot.h"
diff --git a/src/devices/bus/ti99_peb/evpc.cpp b/src/devices/bus/ti99_peb/evpc.cpp
index aedabb6e172..d8b3bc79934 100644
--- a/src/devices/bus/ti99_peb/evpc.cpp
+++ b/src/devices/bus/ti99_peb/evpc.cpp
@@ -35,6 +35,7 @@
*****************************************************************************/
+#include "emu.h"
#include "evpc.h"
#define EVPC_CRU_BASE 0x1400
diff --git a/src/devices/bus/ti99_peb/evpc.h b/src/devices/bus/ti99_peb/evpc.h
index 32ecaa5a7d6..3961a04525a 100644
--- a/src/devices/bus/ti99_peb/evpc.h
+++ b/src/devices/bus/ti99_peb/evpc.h
@@ -15,7 +15,6 @@
#ifndef __EVPC__
#define __EVPC__
-#include "emu.h"
#include "peribox.h"
#include "video/v9938.h"
#include "sound/sn76496.h"
diff --git a/src/devices/bus/ti99_peb/horizon.cpp b/src/devices/bus/ti99_peb/horizon.cpp
index 09117a905a7..0c3d92256dd 100644
--- a/src/devices/bus/ti99_peb/horizon.cpp
+++ b/src/devices/bus/ti99_peb/horizon.cpp
@@ -50,6 +50,7 @@
*****************************************************************************/
+#include "emu.h"
#include "horizon.h"
#define RAMREGION "ram32k"
diff --git a/src/devices/bus/ti99_peb/horizon.h b/src/devices/bus/ti99_peb/horizon.h
index 1469bca8c30..4cbc4d4a2fd 100644
--- a/src/devices/bus/ti99_peb/horizon.h
+++ b/src/devices/bus/ti99_peb/horizon.h
@@ -14,7 +14,6 @@
#ifndef __HORIZON__
#define __HORIZON__
-#include "emu.h"
#include "peribox.h"
#include "machine/ram.h"
diff --git a/src/devices/bus/ti99_peb/hsgpl.cpp b/src/devices/bus/ti99_peb/hsgpl.cpp
index 2602df19f36..2ab258132c2 100644
--- a/src/devices/bus/ti99_peb/hsgpl.cpp
+++ b/src/devices/bus/ti99_peb/hsgpl.cpp
@@ -118,6 +118,7 @@
*****************************************************************************/
+#include "emu.h"
#include "hsgpl.h"
#define CRU_BASE 0x1B00
diff --git a/src/devices/bus/ti99_peb/hsgpl.h b/src/devices/bus/ti99_peb/hsgpl.h
index 09e2e46ff7b..99bd56747cd 100644
--- a/src/devices/bus/ti99_peb/hsgpl.h
+++ b/src/devices/bus/ti99_peb/hsgpl.h
@@ -16,7 +16,6 @@
#ifndef __HSGPL__
#define __HSGPL__
-#include "emu.h"
#include "peribox.h"
#include "machine/at29x.h"
#include "machine/ram.h"
diff --git a/src/devices/bus/ti99_peb/memex.cpp b/src/devices/bus/ti99_peb/memex.cpp
index 2a9b596d0c8..1d1f4642189 100644
--- a/src/devices/bus/ti99_peb/memex.cpp
+++ b/src/devices/bus/ti99_peb/memex.cpp
@@ -12,6 +12,7 @@
****************************************************************************/
+#include "emu.h"
#include "memex.h"
#define RAMREGION "ram2meg"
diff --git a/src/devices/bus/ti99_peb/memex.h b/src/devices/bus/ti99_peb/memex.h
index f63f1b62044..63d21ab9c13 100644
--- a/src/devices/bus/ti99_peb/memex.h
+++ b/src/devices/bus/ti99_peb/memex.h
@@ -13,7 +13,6 @@
#ifndef __MEMEXMEM__
#define __MEMEXMEM__
-#include "emu.h"
#include "peribox.h"
#include "machine/ram.h"
diff --git a/src/devices/bus/ti99_peb/myarcmem.cpp b/src/devices/bus/ti99_peb/myarcmem.cpp
index 7d8c7be5fd3..7eda7188727 100644
--- a/src/devices/bus/ti99_peb/myarcmem.cpp
+++ b/src/devices/bus/ti99_peb/myarcmem.cpp
@@ -27,6 +27,7 @@
February 2012: rewritten as a class, adding DSR support
****************************************************************************/
+#include "emu.h"
#include "myarcmem.h"
/* This card has two CRU bases where it answers. */
diff --git a/src/devices/bus/ti99_peb/myarcmem.h b/src/devices/bus/ti99_peb/myarcmem.h
index 5a82bc83cac..227409aedfb 100644
--- a/src/devices/bus/ti99_peb/myarcmem.h
+++ b/src/devices/bus/ti99_peb/myarcmem.h
@@ -13,7 +13,6 @@
#ifndef __MYARCMEM__
#define __MYARCMEM__
-#include "emu.h"
#include "peribox.h"
#include "machine/ram.h"
diff --git a/src/devices/bus/ti99_peb/pcode.cpp b/src/devices/bus/ti99_peb/pcode.cpp
index 3b18f9a41b7..7165d7fb788 100644
--- a/src/devices/bus/ti99_peb/pcode.cpp
+++ b/src/devices/bus/ti99_peb/pcode.cpp
@@ -72,6 +72,7 @@
*****************************************************************************/
+#include "emu.h"
#include "pcode.h"
#define PCODE_GROM_TAG "pcode_grom"
diff --git a/src/devices/bus/ti99_peb/pcode.h b/src/devices/bus/ti99_peb/pcode.h
index 4b9662ebffa..744faa4acca 100644
--- a/src/devices/bus/ti99_peb/pcode.h
+++ b/src/devices/bus/ti99_peb/pcode.h
@@ -15,7 +15,6 @@
#ifndef __PCODE__
#define __PCODE__
-#include "emu.h"
#include "peribox.h"
#include "machine/tmc0430.h"
diff --git a/src/devices/bus/ti99_peb/samsmem.cpp b/src/devices/bus/ti99_peb/samsmem.cpp
index 9906e664b76..902db88675a 100644
--- a/src/devices/bus/ti99_peb/samsmem.cpp
+++ b/src/devices/bus/ti99_peb/samsmem.cpp
@@ -23,6 +23,7 @@
*****************************************************************************/
+#include "emu.h"
#include "samsmem.h"
#define SAMS_CRU_BASE 0x1e00
diff --git a/src/devices/bus/ti99_peb/samsmem.h b/src/devices/bus/ti99_peb/samsmem.h
index b7943270f4d..5dc0df51ab7 100644
--- a/src/devices/bus/ti99_peb/samsmem.h
+++ b/src/devices/bus/ti99_peb/samsmem.h
@@ -15,7 +15,6 @@
#ifndef __SAMSMEM__
#define __SAMSMEM__
-#include "emu.h"
#include "peribox.h"
#include "machine/ram.h"
diff --git a/src/devices/bus/ti99_peb/spchsyn.cpp b/src/devices/bus/ti99_peb/spchsyn.cpp
index 1ce0f3faeb8..99168e0eeb2 100644
--- a/src/devices/bus/ti99_peb/spchsyn.cpp
+++ b/src/devices/bus/ti99_peb/spchsyn.cpp
@@ -21,6 +21,7 @@
*****************************************************************************/
+#include "emu.h"
#include "spchsyn.h"
#include "sound/wave.h"
#include "machine/spchrom.h"
diff --git a/src/devices/bus/ti99_peb/spchsyn.h b/src/devices/bus/ti99_peb/spchsyn.h
index e6d0bd1ad02..77c89f7a0c4 100644
--- a/src/devices/bus/ti99_peb/spchsyn.h
+++ b/src/devices/bus/ti99_peb/spchsyn.h
@@ -13,7 +13,6 @@
#ifndef __TISPEECH__
#define __TISPEECH__
-#include "emu.h"
#include "peribox.h"
#include "sound/tms5220.h"
diff --git a/src/devices/bus/ti99_peb/ti_32kmem.h b/src/devices/bus/ti99_peb/ti_32kmem.h
index 791a1e01ef6..ff777c73d69 100644
--- a/src/devices/bus/ti99_peb/ti_32kmem.h
+++ b/src/devices/bus/ti99_peb/ti_32kmem.h
@@ -14,7 +14,6 @@
#ifndef __TI32K__
#define __TI32K__
-#include "emu.h"
#include "peribox.h"
#include "machine/ram.h"
diff --git a/src/devices/bus/ti99_peb/ti_rs232.cpp b/src/devices/bus/ti99_peb/ti_rs232.cpp
index d89d1dc354f..97eaef541ad 100644
--- a/src/devices/bus/ti99_peb/ti_rs232.cpp
+++ b/src/devices/bus/ti99_peb/ti_rs232.cpp
@@ -102,6 +102,7 @@
*****************************************************************************/
+#include "emu.h"
#include "ti_rs232.h"
#define SENILA_0_BIT 0x80
diff --git a/src/devices/bus/ti99_peb/ti_rs232.h b/src/devices/bus/ti99_peb/ti_rs232.h
index 255127c63ea..f4939889e25 100644
--- a/src/devices/bus/ti99_peb/ti_rs232.h
+++ b/src/devices/bus/ti99_peb/ti_rs232.h
@@ -13,7 +13,6 @@
#ifndef __TIRS232__
#define __TIRS232__
-#include "emu.h"
#include "peribox.h"
#include "machine/tms9902.h"
diff --git a/src/devices/bus/ti99_peb/tn_ide.h b/src/devices/bus/ti99_peb/tn_ide.h
index 08a1a20f609..923b4cde39b 100644
--- a/src/devices/bus/ti99_peb/tn_ide.h
+++ b/src/devices/bus/ti99_peb/tn_ide.h
@@ -14,7 +14,6 @@
#ifndef __TNIDE__
#define __TNIDE__
-#include "emu.h"
#include "machine/ataintf.h"
#include "machine/rtc65271.h"
#include "machine/ram.h"
diff --git a/src/devices/bus/ti99_peb/tn_usbsm.cpp b/src/devices/bus/ti99_peb/tn_usbsm.cpp
index 22978be8625..185acaeb0c3 100644
--- a/src/devices/bus/ti99_peb/tn_usbsm.cpp
+++ b/src/devices/bus/ti99_peb/tn_usbsm.cpp
@@ -39,6 +39,7 @@
*****************************************************************************/
+#include "emu.h"
#include "tn_usbsm.h"
#define STRATA_TAG "strata"
diff --git a/src/devices/bus/ti99_peb/tn_usbsm.h b/src/devices/bus/ti99_peb/tn_usbsm.h
index b974f08511e..f363cf34b5c 100644
--- a/src/devices/bus/ti99_peb/tn_usbsm.h
+++ b/src/devices/bus/ti99_peb/tn_usbsm.h
@@ -14,7 +14,6 @@
#ifndef __USBSMART__
#define __USBSMART__
-#include "emu.h"
#include "peribox.h"
#include "machine/smartmed.h"
#include "machine/strata.h"
diff --git a/src/devices/bus/ti99x/998board.cpp b/src/devices/bus/ti99x/998board.cpp
index c9db9fc34fd..681bacda9d8 100644
--- a/src/devices/bus/ti99x/998board.cpp
+++ b/src/devices/bus/ti99x/998board.cpp
@@ -103,6 +103,7 @@
***************************************************************************/
+#include "emu.h"
#include "998board.h"
#define TRACE_CRU 0
diff --git a/src/devices/bus/ti99x/998board.h b/src/devices/bus/ti99x/998board.h
index f8ca54e640c..73334dcbad1 100644
--- a/src/devices/bus/ti99x/998board.h
+++ b/src/devices/bus/ti99x/998board.h
@@ -16,7 +16,6 @@
#ifndef __MAPPER8__
#define __MAPPER8__
-#include "emu.h"
#include "ti99defs.h"
#include "machine/tmc0430.h"
#include "video/tms9928a.h"
diff --git a/src/devices/bus/ti99x/genboard.cpp b/src/devices/bus/ti99x/genboard.cpp
index 3878f95bd77..adf60667134 100644
--- a/src/devices/bus/ti99x/genboard.cpp
+++ b/src/devices/bus/ti99x/genboard.cpp
@@ -194,6 +194,7 @@
***************************************************************************/
+#include "emu.h"
#include "genboard.h"
#define TRACE_READ 0
diff --git a/src/devices/bus/ti99x/genboard.h b/src/devices/bus/ti99x/genboard.h
index a54d0d3337e..b754534d609 100644
--- a/src/devices/bus/ti99x/genboard.h
+++ b/src/devices/bus/ti99x/genboard.h
@@ -13,7 +13,6 @@
#ifndef __GENBOARD__
#define __GENBOARD__
-#include "emu.h"
#include "ti99defs.h"
#include "machine/mm58274c.h"
#include "video/v9938.h"
diff --git a/src/devices/bus/ti99x/gromport.cpp b/src/devices/bus/ti99x/gromport.cpp
index 468436a81e6..1a9f95b1d85 100644
--- a/src/devices/bus/ti99x/gromport.cpp
+++ b/src/devices/bus/ti99x/gromport.cpp
@@ -104,6 +104,7 @@
a customized OS.
***************************************************************************/
+#include "emu.h"
#include "gromport.h"
#include "emuopts.h"
#include "image.h"
diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h
index ff99585d447..9cf460271db 100644
--- a/src/devices/bus/ti99x/gromport.h
+++ b/src/devices/bus/ti99x/gromport.h
@@ -9,7 +9,6 @@
#ifndef __GROMPORT__
#define __GROMPORT__
-#include "emu.h"
#include "ti99defs.h"
#include "machine/tmc0430.h"
#include "softlist_dev.h"
diff --git a/src/devices/bus/ti99x/handset.cpp b/src/devices/bus/ti99x/handset.cpp
index ec40b68005c..38e9b8261a6 100644
--- a/src/devices/bus/ti99x/handset.cpp
+++ b/src/devices/bus/ti99x/handset.cpp
@@ -36,6 +36,7 @@
*****************************************************************************/
+#include "emu.h"
#include "handset.h"
#include "machine/tms9901.h"
diff --git a/src/devices/bus/ti99x/handset.h b/src/devices/bus/ti99x/handset.h
index 5b899813ed0..7156ddea6d4 100644
--- a/src/devices/bus/ti99x/handset.h
+++ b/src/devices/bus/ti99x/handset.h
@@ -17,7 +17,6 @@
#ifndef __HANDSET__
#define __HANDSET__
-#include "emu.h"
#include "joyport.h"
#define MAX_HANDSETS 4
diff --git a/src/devices/bus/ti99x/joyport.cpp b/src/devices/bus/ti99x/joyport.cpp
index d37dea4c48f..a098012ea21 100644
--- a/src/devices/bus/ti99x/joyport.cpp
+++ b/src/devices/bus/ti99x/joyport.cpp
@@ -35,6 +35,7 @@
*****************************************************************************/
+#include "emu.h"
#include "joyport.h"
#include "handset.h"
#include "mecmouse.h"
diff --git a/src/devices/bus/ti99x/joyport.h b/src/devices/bus/ti99x/joyport.h
index d50988c47c6..aebaeafb62f 100644
--- a/src/devices/bus/ti99x/joyport.h
+++ b/src/devices/bus/ti99x/joyport.h
@@ -20,7 +20,6 @@
#ifndef __JOYPORT__
#define __JOYPORT__
-#include "emu.h"
extern const device_type JOYPORT;
diff --git a/src/devices/bus/ti99x/mecmouse.cpp b/src/devices/bus/ti99x/mecmouse.cpp
index 9bd767484ec..207d89ef68b 100644
--- a/src/devices/bus/ti99x/mecmouse.cpp
+++ b/src/devices/bus/ti99x/mecmouse.cpp
@@ -48,6 +48,7 @@
*****************************************************************************/
+#include "emu.h"
#include "mecmouse.h"
#define POLL_TIMER 1
diff --git a/src/devices/bus/ti99x/mecmouse.h b/src/devices/bus/ti99x/mecmouse.h
index ba0e70b4629..db33baae305 100644
--- a/src/devices/bus/ti99x/mecmouse.h
+++ b/src/devices/bus/ti99x/mecmouse.h
@@ -14,7 +14,6 @@
#ifndef __MECMOUSE__
#define __MECMOUSE__
-#include "emu.h"
#include "joyport.h"
extern const device_type MECMOUSE;
diff --git a/src/devices/bus/tiki100/8088.cpp b/src/devices/bus/tiki100/8088.cpp
index 2c1fb9f7cbd..0a41728fbaf 100644
--- a/src/devices/bus/tiki100/8088.cpp
+++ b/src/devices/bus/tiki100/8088.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "8088.h"
diff --git a/src/devices/bus/tiki100/8088.h b/src/devices/bus/tiki100/8088.h
index 640feb1b3f0..e64945ce6e7 100644
--- a/src/devices/bus/tiki100/8088.h
+++ b/src/devices/bus/tiki100/8088.h
@@ -11,7 +11,6 @@
#ifndef __TIKI100_8088__
#define __TIKI100_8088__
-#include "emu.h"
#include "bus/tiki100/exp.h"
#include "cpu/i86/i86.h"
diff --git a/src/devices/bus/tiki100/exp.cpp b/src/devices/bus/tiki100/exp.cpp
index 8cc34faed90..88d9b4d7f3b 100644
--- a/src/devices/bus/tiki100/exp.cpp
+++ b/src/devices/bus/tiki100/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/tiki100/exp.h b/src/devices/bus/tiki100/exp.h
index 831694612f4..f97d46faee4 100644
--- a/src/devices/bus/tiki100/exp.h
+++ b/src/devices/bus/tiki100/exp.h
@@ -14,7 +14,6 @@
#ifndef __TIKI100_BUS__
#define __TIKI100_BUS__
-#include "emu.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/devices/bus/tiki100/hdc.cpp b/src/devices/bus/tiki100/hdc.cpp
index a79e51242b2..32e43d621ba 100644
--- a/src/devices/bus/tiki100/hdc.cpp
+++ b/src/devices/bus/tiki100/hdc.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "hdc.h"
diff --git a/src/devices/bus/tiki100/hdc.h b/src/devices/bus/tiki100/hdc.h
index b02cd79d3b0..c7f1ff7bfec 100644
--- a/src/devices/bus/tiki100/hdc.h
+++ b/src/devices/bus/tiki100/hdc.h
@@ -11,7 +11,6 @@
#ifndef __TIKI100_HDC__
#define __TIKI100_HDC__
-#include "emu.h"
#include "bus/tiki100/exp.h"
#include "imagedev/harddriv.h"
#include "machine/wd2010.h"
diff --git a/src/devices/bus/tvc/hbf.h b/src/devices/bus/tvc/hbf.h
index 2beb189391d..4c1858195b0 100644
--- a/src/devices/bus/tvc/hbf.h
+++ b/src/devices/bus/tvc/hbf.h
@@ -5,7 +5,6 @@
#ifndef __TVC_HBF_H__
#define __TVC_HBF_H__
-#include "emu.h"
#include "tvc.h"
#include "machine/wd_fdc.h"
#include "formats/tvc_dsk.h"
diff --git a/src/devices/bus/vcs_ctrl/ctrl.cpp b/src/devices/bus/vcs_ctrl/ctrl.cpp
index dbcbefb0aeb..8e0c349ad23 100644
--- a/src/devices/bus/vcs_ctrl/ctrl.cpp
+++ b/src/devices/bus/vcs_ctrl/ctrl.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ctrl.h"
diff --git a/src/devices/bus/vcs_ctrl/ctrl.h b/src/devices/bus/vcs_ctrl/ctrl.h
index 46c39d2ae85..4d0de4e3972 100644
--- a/src/devices/bus/vcs_ctrl/ctrl.h
+++ b/src/devices/bus/vcs_ctrl/ctrl.h
@@ -14,7 +14,6 @@
#ifndef __VCS_CONTROL_PORT__
#define __VCS_CONTROL_PORT__
-#include "emu.h"
diff --git a/src/devices/bus/vcs_ctrl/joybooster.cpp b/src/devices/bus/vcs_ctrl/joybooster.cpp
index af73a326e0f..5a19874902a 100644
--- a/src/devices/bus/vcs_ctrl/joybooster.cpp
+++ b/src/devices/bus/vcs_ctrl/joybooster.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
+#include "emu.h"
#include "joybooster.h"
diff --git a/src/devices/bus/vcs_ctrl/joybooster.h b/src/devices/bus/vcs_ctrl/joybooster.h
index 55455dcf92e..bc5ecbda1c2 100644
--- a/src/devices/bus/vcs_ctrl/joybooster.h
+++ b/src/devices/bus/vcs_ctrl/joybooster.h
@@ -12,7 +12,6 @@
#ifndef __VCS_JOYSTICKBOOSTER__
#define __VCS_JOYSTICKBOOSTER__
-#include "emu.h"
#include "ctrl.h"
diff --git a/src/devices/bus/vcs_ctrl/joystick.cpp b/src/devices/bus/vcs_ctrl/joystick.cpp
index 789d679a56c..333e632f98f 100644
--- a/src/devices/bus/vcs_ctrl/joystick.cpp
+++ b/src/devices/bus/vcs_ctrl/joystick.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "joystick.h"
diff --git a/src/devices/bus/vcs_ctrl/joystick.h b/src/devices/bus/vcs_ctrl/joystick.h
index 80dfeafb0f5..1f7663cd3b5 100644
--- a/src/devices/bus/vcs_ctrl/joystick.h
+++ b/src/devices/bus/vcs_ctrl/joystick.h
@@ -11,7 +11,6 @@
#ifndef __VCS_JOYSTICK__
#define __VCS_JOYSTICK__
-#include "emu.h"
#include "ctrl.h"
diff --git a/src/devices/bus/vcs_ctrl/keypad.cpp b/src/devices/bus/vcs_ctrl/keypad.cpp
index 9d16b5a8f2d..8054f40b4b8 100644
--- a/src/devices/bus/vcs_ctrl/keypad.cpp
+++ b/src/devices/bus/vcs_ctrl/keypad.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "keypad.h"
diff --git a/src/devices/bus/vcs_ctrl/keypad.h b/src/devices/bus/vcs_ctrl/keypad.h
index 272ca6fa626..71ad42999cc 100644
--- a/src/devices/bus/vcs_ctrl/keypad.h
+++ b/src/devices/bus/vcs_ctrl/keypad.h
@@ -11,7 +11,6 @@
#ifndef __VCS_KEYPAD__
#define __VCS_KEYPAD__
-#include "emu.h"
#include "ctrl.h"
diff --git a/src/devices/bus/vcs_ctrl/lightpen.cpp b/src/devices/bus/vcs_ctrl/lightpen.cpp
index 2a1ca665412..ab131678948 100644
--- a/src/devices/bus/vcs_ctrl/lightpen.cpp
+++ b/src/devices/bus/vcs_ctrl/lightpen.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "lightpen.h"
diff --git a/src/devices/bus/vcs_ctrl/lightpen.h b/src/devices/bus/vcs_ctrl/lightpen.h
index cc6bfe454ab..5c2a132ea4e 100644
--- a/src/devices/bus/vcs_ctrl/lightpen.h
+++ b/src/devices/bus/vcs_ctrl/lightpen.h
@@ -11,7 +11,6 @@
#ifndef __VCS_LIGHTPEN__
#define __VCS_LIGHTPEN__
-#include "emu.h"
#include "ctrl.h"
diff --git a/src/devices/bus/vcs_ctrl/paddles.cpp b/src/devices/bus/vcs_ctrl/paddles.cpp
index 0329853b0c8..d9eb99495ad 100644
--- a/src/devices/bus/vcs_ctrl/paddles.cpp
+++ b/src/devices/bus/vcs_ctrl/paddles.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "paddles.h"
diff --git a/src/devices/bus/vcs_ctrl/paddles.h b/src/devices/bus/vcs_ctrl/paddles.h
index 44c3f066a8e..c6b4b2db1ce 100644
--- a/src/devices/bus/vcs_ctrl/paddles.h
+++ b/src/devices/bus/vcs_ctrl/paddles.h
@@ -11,7 +11,6 @@
#ifndef __VCS_PADDLES__
#define __VCS_PADDLES__
-#include "emu.h"
#include "ctrl.h"
diff --git a/src/devices/bus/vcs_ctrl/wheel.cpp b/src/devices/bus/vcs_ctrl/wheel.cpp
index e9374c65ece..2b0041123bc 100644
--- a/src/devices/bus/vcs_ctrl/wheel.cpp
+++ b/src/devices/bus/vcs_ctrl/wheel.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "wheel.h"
diff --git a/src/devices/bus/vcs_ctrl/wheel.h b/src/devices/bus/vcs_ctrl/wheel.h
index 126ba65ebd9..91b0c836929 100644
--- a/src/devices/bus/vcs_ctrl/wheel.h
+++ b/src/devices/bus/vcs_ctrl/wheel.h
@@ -11,7 +11,6 @@
#ifndef __VCS_WHEEL__
#define __VCS_WHEEL__
-#include "emu.h"
#include "ctrl.h"
diff --git a/src/devices/bus/vic10/exp.h b/src/devices/bus/vic10/exp.h
index 7084727e84a..c041753c090 100644
--- a/src/devices/bus/vic10/exp.h
+++ b/src/devices/bus/vic10/exp.h
@@ -36,7 +36,6 @@
#ifndef __VIC10_EXPANSION_SLOT__
#define __VIC10_EXPANSION_SLOT__
-#include "emu.h"
#include "softlist_dev.h"
#include "formats/cbm_crt.h"
diff --git a/src/devices/bus/vic10/std.cpp b/src/devices/bus/vic10/std.cpp
index a9005056f31..22b7eddd59e 100644
--- a/src/devices/bus/vic10/std.cpp
+++ b/src/devices/bus/vic10/std.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "std.h"
diff --git a/src/devices/bus/vic10/std.h b/src/devices/bus/vic10/std.h
index cac02e275e3..b95391f8cb5 100644
--- a/src/devices/bus/vic10/std.h
+++ b/src/devices/bus/vic10/std.h
@@ -11,7 +11,6 @@
#ifndef __VIC10_STD__
#define __VIC10_STD__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vic20/4cga.cpp b/src/devices/bus/vic20/4cga.cpp
index 57627b2e88f..2e7ebe550e9 100644
--- a/src/devices/bus/vic20/4cga.cpp
+++ b/src/devices/bus/vic20/4cga.cpp
@@ -9,6 +9,7 @@
**********************************************************************/
+#include "emu.h"
#include "4cga.h"
diff --git a/src/devices/bus/vic20/4cga.h b/src/devices/bus/vic20/4cga.h
index 342201c2506..0e2cee4bec5 100644
--- a/src/devices/bus/vic20/4cga.h
+++ b/src/devices/bus/vic20/4cga.h
@@ -12,7 +12,6 @@
#define __C64_4CGA__
-#include "emu.h"
#include "user.h"
diff --git a/src/devices/bus/vic20/exp.cpp b/src/devices/bus/vic20/exp.cpp
index d465279c91e..d240517cf84 100644
--- a/src/devices/bus/vic20/exp.cpp
+++ b/src/devices/bus/vic20/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h
index 8c2d9fc0059..8f4de7bdd8c 100644
--- a/src/devices/bus/vic20/exp.h
+++ b/src/devices/bus/vic20/exp.h
@@ -36,7 +36,6 @@
#ifndef __VIC20_EXPANSION_SLOT__
#define __VIC20_EXPANSION_SLOT__
-#include "emu.h"
#include "softlist_dev.h"
diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp
index 4b338a49d08..3c67cd15643 100644
--- a/src/devices/bus/vic20/fe3.cpp
+++ b/src/devices/bus/vic20/fe3.cpp
@@ -16,6 +16,7 @@
*/
+#include "emu.h"
#include "fe3.h"
diff --git a/src/devices/bus/vic20/fe3.h b/src/devices/bus/vic20/fe3.h
index c4446b393d5..4e712b257af 100644
--- a/src/devices/bus/vic20/fe3.h
+++ b/src/devices/bus/vic20/fe3.h
@@ -11,7 +11,6 @@
#ifndef __VIC20_FE3__
#define __VIC20_FE3__
-#include "emu.h"
#include "exp.h"
#include "machine/intelfsh.h"
diff --git a/src/devices/bus/vic20/megacart.cpp b/src/devices/bus/vic20/megacart.cpp
index a6d178f72f2..ce7edf6e3b7 100644
--- a/src/devices/bus/vic20/megacart.cpp
+++ b/src/devices/bus/vic20/megacart.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "megacart.h"
diff --git a/src/devices/bus/vic20/megacart.h b/src/devices/bus/vic20/megacart.h
index a4bb4ff4231..8a35c468adb 100644
--- a/src/devices/bus/vic20/megacart.h
+++ b/src/devices/bus/vic20/megacart.h
@@ -11,7 +11,6 @@
#ifndef __VIC20_MEGACART__
#define __VIC20_MEGACART__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vic20/speakeasy.cpp b/src/devices/bus/vic20/speakeasy.cpp
index d13a1908c75..de443783f7d 100644
--- a/src/devices/bus/vic20/speakeasy.cpp
+++ b/src/devices/bus/vic20/speakeasy.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
+#include "emu.h"
#include "speakeasy.h"
diff --git a/src/devices/bus/vic20/speakeasy.h b/src/devices/bus/vic20/speakeasy.h
index dbd9ccf4e84..1db2180ecbd 100644
--- a/src/devices/bus/vic20/speakeasy.h
+++ b/src/devices/bus/vic20/speakeasy.h
@@ -12,7 +12,6 @@
#ifndef __VIC20_SPEAKEASY__
#define __VIC20_SPEAKEASY__
-#include "emu.h"
#include "exp.h"
#include "sound/votrax.h"
diff --git a/src/devices/bus/vic20/std.cpp b/src/devices/bus/vic20/std.cpp
index fb8b2bf90d1..0eb21db38a1 100644
--- a/src/devices/bus/vic20/std.cpp
+++ b/src/devices/bus/vic20/std.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "std.h"
diff --git a/src/devices/bus/vic20/std.h b/src/devices/bus/vic20/std.h
index 2e73ba0f037..fb006c62093 100644
--- a/src/devices/bus/vic20/std.h
+++ b/src/devices/bus/vic20/std.h
@@ -11,7 +11,6 @@
#ifndef __VIC20_STD__
#define __VIC20_STD__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vic20/user.cpp b/src/devices/bus/vic20/user.cpp
index f810cddc46e..cf8f1f3c817 100644
--- a/src/devices/bus/vic20/user.cpp
+++ b/src/devices/bus/vic20/user.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "user.h"
//-------------------------------------------------
diff --git a/src/devices/bus/vic20/vic1010.cpp b/src/devices/bus/vic20/vic1010.cpp
index cf112877b9f..1ef4711dab2 100644
--- a/src/devices/bus/vic20/vic1010.cpp
+++ b/src/devices/bus/vic20/vic1010.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vic1010.h"
diff --git a/src/devices/bus/vic20/vic1010.h b/src/devices/bus/vic20/vic1010.h
index 264c32a7734..3c02789b436 100644
--- a/src/devices/bus/vic20/vic1010.h
+++ b/src/devices/bus/vic20/vic1010.h
@@ -11,7 +11,6 @@
#ifndef __VIC1010__
#define __VIC1010__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vic20/vic1011.cpp b/src/devices/bus/vic20/vic1011.cpp
index 3c8bc3352a4..b0792a09a48 100644
--- a/src/devices/bus/vic20/vic1011.cpp
+++ b/src/devices/bus/vic20/vic1011.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vic1011.h"
diff --git a/src/devices/bus/vic20/vic1110.cpp b/src/devices/bus/vic20/vic1110.cpp
index 4144cb2b97d..cd384bbd143 100644
--- a/src/devices/bus/vic20/vic1110.cpp
+++ b/src/devices/bus/vic20/vic1110.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vic1110.h"
diff --git a/src/devices/bus/vic20/vic1110.h b/src/devices/bus/vic20/vic1110.h
index 05c99216849..66d9cca2b32 100644
--- a/src/devices/bus/vic20/vic1110.h
+++ b/src/devices/bus/vic20/vic1110.h
@@ -11,7 +11,6 @@
#ifndef __VIC1110__
#define __VIC1110__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vic20/vic1111.cpp b/src/devices/bus/vic20/vic1111.cpp
index 894b4075802..bf26f2fe479 100644
--- a/src/devices/bus/vic20/vic1111.cpp
+++ b/src/devices/bus/vic20/vic1111.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vic1111.h"
diff --git a/src/devices/bus/vic20/vic1111.h b/src/devices/bus/vic20/vic1111.h
index eebe166805a..e3be916a985 100644
--- a/src/devices/bus/vic20/vic1111.h
+++ b/src/devices/bus/vic20/vic1111.h
@@ -11,7 +11,6 @@
#ifndef __VIC1111__
#define __VIC1111__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp
index 063fab98d68..6006ecc0e21 100644
--- a/src/devices/bus/vic20/vic1112.cpp
+++ b/src/devices/bus/vic20/vic1112.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vic1112.h"
diff --git a/src/devices/bus/vic20/vic1112.h b/src/devices/bus/vic20/vic1112.h
index 84cb158f17b..fe8cea87b2c 100644
--- a/src/devices/bus/vic20/vic1112.h
+++ b/src/devices/bus/vic20/vic1112.h
@@ -13,7 +13,6 @@
#ifndef __VIC1112__
#define __VIC1112__
-#include "emu.h"
#include "exp.h"
#include "bus/ieee488/ieee488.h"
#include "cpu/m6502/m6502.h"
diff --git a/src/devices/bus/vic20/vic1210.cpp b/src/devices/bus/vic20/vic1210.cpp
index 026fba61c9b..039c5b25699 100644
--- a/src/devices/bus/vic20/vic1210.cpp
+++ b/src/devices/bus/vic20/vic1210.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
+#include "emu.h"
#include "vic1210.h"
diff --git a/src/devices/bus/vic20/vic1210.h b/src/devices/bus/vic20/vic1210.h
index dbdcffc3407..709712b1c31 100644
--- a/src/devices/bus/vic20/vic1210.h
+++ b/src/devices/bus/vic20/vic1210.h
@@ -12,7 +12,6 @@
#ifndef __VIC1210__
#define __VIC1210__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vic20/videopak.cpp b/src/devices/bus/vic20/videopak.cpp
index ecf3355bab8..1e2bde16af5 100644
--- a/src/devices/bus/vic20/videopak.cpp
+++ b/src/devices/bus/vic20/videopak.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
+#include "emu.h"
#include "videopak.h"
diff --git a/src/devices/bus/vic20/videopak.h b/src/devices/bus/vic20/videopak.h
index 5d1e46f2005..f11800f0f35 100644
--- a/src/devices/bus/vic20/videopak.h
+++ b/src/devices/bus/vic20/videopak.h
@@ -13,7 +13,6 @@
#define __VIC20_VIDEO_PAK__
-#include "emu.h"
#include "exp.h"
#include "video/mc6845.h"
diff --git a/src/devices/bus/vidbrain/exp.cpp b/src/devices/bus/vidbrain/exp.cpp
index 128a40d82c9..b58e981c66b 100644
--- a/src/devices/bus/vidbrain/exp.cpp
+++ b/src/devices/bus/vidbrain/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vidbrain/exp.h b/src/devices/bus/vidbrain/exp.h
index 4c00a34ff4f..e95b016b67b 100644
--- a/src/devices/bus/vidbrain/exp.h
+++ b/src/devices/bus/vidbrain/exp.h
@@ -39,7 +39,6 @@
#ifndef __VIDEOBRAIN_EXPANSION_SLOT__
#define __VIDEOBRAIN_EXPANSION_SLOT__
-#include "emu.h"
#include "softlist_dev.h"
diff --git a/src/devices/bus/vidbrain/money_minder.cpp b/src/devices/bus/vidbrain/money_minder.cpp
index 47c2589c335..6a78467a5b9 100644
--- a/src/devices/bus/vidbrain/money_minder.cpp
+++ b/src/devices/bus/vidbrain/money_minder.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "money_minder.h"
diff --git a/src/devices/bus/vidbrain/money_minder.h b/src/devices/bus/vidbrain/money_minder.h
index a9cf0263334..c7f435a1d65 100644
--- a/src/devices/bus/vidbrain/money_minder.h
+++ b/src/devices/bus/vidbrain/money_minder.h
@@ -11,7 +11,6 @@
#ifndef __VIDEOBRAIN_MONEY_MINDER_CARTRIDGE__
#define __VIDEOBRAIN_MONEY_MINDER_CARTRIDGE__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vidbrain/std.cpp b/src/devices/bus/vidbrain/std.cpp
index 93f2867098b..de08b2c1d90 100644
--- a/src/devices/bus/vidbrain/std.cpp
+++ b/src/devices/bus/vidbrain/std.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "std.h"
diff --git a/src/devices/bus/vidbrain/std.h b/src/devices/bus/vidbrain/std.h
index c1e93d0dc94..b54c2acd2d0 100644
--- a/src/devices/bus/vidbrain/std.h
+++ b/src/devices/bus/vidbrain/std.h
@@ -11,7 +11,6 @@
#ifndef __VIDEOBRAIN_STANDARD_CARTRIDGE__
#define __VIDEOBRAIN_STANDARD_CARTRIDGE__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vidbrain/timeshare.cpp b/src/devices/bus/vidbrain/timeshare.cpp
index 2b24c0e997e..243e8618573 100644
--- a/src/devices/bus/vidbrain/timeshare.cpp
+++ b/src/devices/bus/vidbrain/timeshare.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "timeshare.h"
diff --git a/src/devices/bus/vidbrain/timeshare.h b/src/devices/bus/vidbrain/timeshare.h
index 517cebe2b99..272cd8cdd05 100644
--- a/src/devices/bus/vidbrain/timeshare.h
+++ b/src/devices/bus/vidbrain/timeshare.h
@@ -11,7 +11,6 @@
#ifndef __VIDEOBRAIN_TIMESHARE_CARTRIDGE__
#define __VIDEOBRAIN_TIMESHARE_CARTRIDGE__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vip/byteio.cpp b/src/devices/bus/vip/byteio.cpp
index f4db30fd93d..387fcf96c0d 100644
--- a/src/devices/bus/vip/byteio.cpp
+++ b/src/devices/bus/vip/byteio.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "byteio.h"
diff --git a/src/devices/bus/vip/byteio.h b/src/devices/bus/vip/byteio.h
index ce196dc20fd..61ff58682b9 100644
--- a/src/devices/bus/vip/byteio.h
+++ b/src/devices/bus/vip/byteio.h
@@ -36,7 +36,6 @@
#ifndef __VIP_BYTEIO_PORT__
#define __VIP_BYTEIO_PORT__
-#include "emu.h"
diff --git a/src/devices/bus/vip/exp.cpp b/src/devices/bus/vip/exp.cpp
index a062ea14670..ca0ac0dca3f 100644
--- a/src/devices/bus/vip/exp.cpp
+++ b/src/devices/bus/vip/exp.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vip/exp.h b/src/devices/bus/vip/exp.h
index 6c9d65b5b12..6c7d18966fb 100644
--- a/src/devices/bus/vip/exp.h
+++ b/src/devices/bus/vip/exp.h
@@ -36,7 +36,6 @@
#ifndef __VIP_EXPANSION_SLOT__
#define __VIP_EXPANSION_SLOT__
-#include "emu.h"
diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp
index 3d31b268c38..a0bd16b97d8 100644
--- a/src/devices/bus/vip/vp550.cpp
+++ b/src/devices/bus/vip/vp550.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "vp550.h"
diff --git a/src/devices/bus/vip/vp550.h b/src/devices/bus/vip/vp550.h
index 9f3f5a74fc7..d849e4b1ad1 100644
--- a/src/devices/bus/vip/vp550.h
+++ b/src/devices/bus/vip/vp550.h
@@ -11,7 +11,6 @@
#ifndef __VP550__
#define __VP550__
-#include "emu.h"
#include "exp.h"
#include "sound/cdp1863.h"
diff --git a/src/devices/bus/vip/vp570.cpp b/src/devices/bus/vip/vp570.cpp
index 1b8852438e7..10f944f69ff 100644
--- a/src/devices/bus/vip/vp570.cpp
+++ b/src/devices/bus/vip/vp570.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vp570.h"
diff --git a/src/devices/bus/vip/vp570.h b/src/devices/bus/vip/vp570.h
index befde726eec..c08b350fd57 100644
--- a/src/devices/bus/vip/vp570.h
+++ b/src/devices/bus/vip/vp570.h
@@ -11,7 +11,6 @@
#ifndef __VP570__
#define __VP570__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp
index 6eaa17289f8..8e28192f128 100644
--- a/src/devices/bus/vip/vp575.cpp
+++ b/src/devices/bus/vip/vp575.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vp575.h"
diff --git a/src/devices/bus/vip/vp575.h b/src/devices/bus/vip/vp575.h
index 05671cda9f8..6680cf1600d 100644
--- a/src/devices/bus/vip/vp575.h
+++ b/src/devices/bus/vip/vp575.h
@@ -11,7 +11,6 @@
#ifndef __VP575__
#define __VP575__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vip/vp585.cpp b/src/devices/bus/vip/vp585.cpp
index d913c0ce497..234ff8f0ea9 100644
--- a/src/devices/bus/vip/vp585.cpp
+++ b/src/devices/bus/vip/vp585.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vp585.h"
diff --git a/src/devices/bus/vip/vp585.h b/src/devices/bus/vip/vp585.h
index 2390f2b3ab3..4d00d0ddb99 100644
--- a/src/devices/bus/vip/vp585.h
+++ b/src/devices/bus/vip/vp585.h
@@ -11,7 +11,6 @@
#ifndef __VP585__
#define __VP585__
-#include "emu.h"
#include "exp.h"
diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp
index 6f90c6d7473..b139a1456b2 100644
--- a/src/devices/bus/vip/vp590.cpp
+++ b/src/devices/bus/vip/vp590.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vp590.h"
diff --git a/src/devices/bus/vip/vp590.h b/src/devices/bus/vip/vp590.h
index d01630f3c59..418e240110f 100644
--- a/src/devices/bus/vip/vp590.h
+++ b/src/devices/bus/vip/vp590.h
@@ -11,7 +11,6 @@
#ifndef __VP590__
#define __VP590__
-#include "emu.h"
#include "machine/rescap.h"
#include "exp.h"
#include "video/cdp1862.h"
diff --git a/src/devices/bus/vip/vp595.cpp b/src/devices/bus/vip/vp595.cpp
index 4e947245dd8..535c533b1d5 100644
--- a/src/devices/bus/vip/vp595.cpp
+++ b/src/devices/bus/vip/vp595.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vp595.h"
diff --git a/src/devices/bus/vip/vp595.h b/src/devices/bus/vip/vp595.h
index af1fde36094..fa810084875 100644
--- a/src/devices/bus/vip/vp595.h
+++ b/src/devices/bus/vip/vp595.h
@@ -11,7 +11,6 @@
#ifndef __VP595__
#define __VP595__
-#include "emu.h"
#include "exp.h"
#include "sound/cdp1863.h"
diff --git a/src/devices/bus/vip/vp620.cpp b/src/devices/bus/vip/vp620.cpp
index 45353701f27..2eee62c326f 100644
--- a/src/devices/bus/vip/vp620.cpp
+++ b/src/devices/bus/vip/vp620.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vp620.h"
diff --git a/src/devices/bus/vip/vp620.h b/src/devices/bus/vip/vp620.h
index 6d87bccc55e..55bf8ab04f6 100644
--- a/src/devices/bus/vip/vp620.h
+++ b/src/devices/bus/vip/vp620.h
@@ -11,7 +11,6 @@
#ifndef __VP620__
#define __VP620__
-#include "emu.h"
#include "byteio.h"
#include "machine/keyboard.h"
diff --git a/src/devices/bus/vip/vp700.cpp b/src/devices/bus/vip/vp700.cpp
index 682913cfde4..7c6080a6a7c 100644
--- a/src/devices/bus/vip/vp700.cpp
+++ b/src/devices/bus/vip/vp700.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "vp700.h"
diff --git a/src/devices/bus/vip/vp700.h b/src/devices/bus/vip/vp700.h
index b305e27191d..88e5a99967c 100644
--- a/src/devices/bus/vip/vp700.h
+++ b/src/devices/bus/vip/vp700.h
@@ -11,7 +11,6 @@
#ifndef __VP700__
#define __VP700__
-#include "emu.h"
#include "exp.h"
#include "sound/cdp1863.h"
diff --git a/src/devices/bus/vme/vme.h b/src/devices/bus/vme/vme.h
index 24b7a94976b..9f075fb95c8 100644
--- a/src/devices/bus/vme/vme.h
+++ b/src/devices/bus/vme/vme.h
@@ -50,7 +50,6 @@
#pragma once
-#include "emu.h"
//**************************************************************************
// CONSTANTS
diff --git a/src/devices/bus/vme/vme_fccpu20.h b/src/devices/bus/vme/vme_fccpu20.h
index 067d11c01ff..577255b4470 100644
--- a/src/devices/bus/vme/vme_fccpu20.h
+++ b/src/devices/bus/vme/vme_fccpu20.h
@@ -4,7 +4,6 @@
#define VME_FCCPU20_H
#pragma once
-#include "emu.h"
#include "machine/68561mpcc.h"
#include "machine/68230pit.h"
diff --git a/src/devices/bus/vtech/ioexp/carts.cpp b/src/devices/bus/vtech/ioexp/carts.cpp
index 5bdd6aca63f..d9ddb4cb9ec 100644
--- a/src/devices/bus/vtech/ioexp/carts.cpp
+++ b/src/devices/bus/vtech/ioexp/carts.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "carts.h"
SLOT_INTERFACE_START( ioexp_slot_carts )
diff --git a/src/devices/bus/vtech/ioexp/carts.h b/src/devices/bus/vtech/ioexp/carts.h
index ef9125b5e7b..6bdd27b2ee8 100644
--- a/src/devices/bus/vtech/ioexp/carts.h
+++ b/src/devices/bus/vtech/ioexp/carts.h
@@ -11,7 +11,6 @@
#ifndef __VTECH_IOEXP_CARTS_H__
#define __VTECH_IOEXP_CARTS_H__
-#include "emu.h"
#include "joystick.h"
#include "printer.h"
diff --git a/src/devices/bus/vtech/ioexp/ioexp.cpp b/src/devices/bus/vtech/ioexp/ioexp.cpp
index 4967e305c31..17796071922 100644
--- a/src/devices/bus/vtech/ioexp/ioexp.cpp
+++ b/src/devices/bus/vtech/ioexp/ioexp.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "ioexp.h"
diff --git a/src/devices/bus/vtech/ioexp/ioexp.h b/src/devices/bus/vtech/ioexp/ioexp.h
index e00479761a0..6dec80c6c4a 100644
--- a/src/devices/bus/vtech/ioexp/ioexp.h
+++ b/src/devices/bus/vtech/ioexp/ioexp.h
@@ -29,7 +29,6 @@
#ifndef __VTECH_IOEXP_H__
#define __VTECH_IOEXP_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/vtech/ioexp/joystick.cpp b/src/devices/bus/vtech/ioexp/joystick.cpp
index c9084f7559c..c2de69f455f 100644
--- a/src/devices/bus/vtech/ioexp/joystick.cpp
+++ b/src/devices/bus/vtech/ioexp/joystick.cpp
@@ -9,6 +9,7 @@
***************************************************************************/
+#include "emu.h"
#include "joystick.h"
diff --git a/src/devices/bus/vtech/ioexp/joystick.h b/src/devices/bus/vtech/ioexp/joystick.h
index 30d1fdb4239..803e3bd5848 100644
--- a/src/devices/bus/vtech/ioexp/joystick.h
+++ b/src/devices/bus/vtech/ioexp/joystick.h
@@ -14,7 +14,6 @@
#ifndef __VTECH_IOEXP_JOYSTICK_H__
#define __VTECH_IOEXP_JOYSTICK_H__
-#include "emu.h"
#include "ioexp.h"
diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp
index a80ab27ebdc..dfc971bb914 100644
--- a/src/devices/bus/vtech/ioexp/printer.cpp
+++ b/src/devices/bus/vtech/ioexp/printer.cpp
@@ -9,6 +9,7 @@
***************************************************************************/
+#include "emu.h"
#include "printer.h"
diff --git a/src/devices/bus/vtech/ioexp/printer.h b/src/devices/bus/vtech/ioexp/printer.h
index 0b0e8dbe6e1..37a25a35fad 100644
--- a/src/devices/bus/vtech/ioexp/printer.h
+++ b/src/devices/bus/vtech/ioexp/printer.h
@@ -13,7 +13,6 @@
#ifndef __VTECH_IOEXP_PRINTER_H__
#define __VTECH_IOEXP_PRINTER_H__
-#include "emu.h"
#include "ioexp.h"
#include "bus/centronics/ctronics.h"
diff --git a/src/devices/bus/vtech/memexp/carts.cpp b/src/devices/bus/vtech/memexp/carts.cpp
index f46a15e4841..c4dddf1bbae 100644
--- a/src/devices/bus/vtech/memexp/carts.cpp
+++ b/src/devices/bus/vtech/memexp/carts.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "carts.h"
SLOT_INTERFACE_START( memexp_slot_carts )
diff --git a/src/devices/bus/vtech/memexp/carts.h b/src/devices/bus/vtech/memexp/carts.h
index 92dd90390ae..bfbe697b7aa 100644
--- a/src/devices/bus/vtech/memexp/carts.h
+++ b/src/devices/bus/vtech/memexp/carts.h
@@ -11,7 +11,6 @@
#ifndef __VTECH_MEMEXP_CARTS_H__
#define __VTECH_MEMEXP_CARTS_H__
-#include "emu.h"
#include "floppy.h"
#include "memory.h"
diff --git a/src/devices/bus/vtech/memexp/floppy.cpp b/src/devices/bus/vtech/memexp/floppy.cpp
index c5645606f52..0aca11479a0 100644
--- a/src/devices/bus/vtech/memexp/floppy.cpp
+++ b/src/devices/bus/vtech/memexp/floppy.cpp
@@ -9,6 +9,7 @@
***************************************************************************/
+#include "emu.h"
#include "floppy.h"
diff --git a/src/devices/bus/vtech/memexp/floppy.h b/src/devices/bus/vtech/memexp/floppy.h
index 9daa4fe2ee7..bc6046a7ec3 100644
--- a/src/devices/bus/vtech/memexp/floppy.h
+++ b/src/devices/bus/vtech/memexp/floppy.h
@@ -14,7 +14,6 @@
#ifndef __VTECH_MEMEXP_FLOPPY_H__
#define __VTECH_MEMEXP_FLOPPY_H__
-#include "emu.h"
#include "memexp.h"
#include "imagedev/floppy.h"
diff --git a/src/devices/bus/vtech/memexp/memexp.cpp b/src/devices/bus/vtech/memexp/memexp.cpp
index 9415ea68320..e568c3e5a02 100644
--- a/src/devices/bus/vtech/memexp/memexp.cpp
+++ b/src/devices/bus/vtech/memexp/memexp.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "memexp.h"
diff --git a/src/devices/bus/vtech/memexp/memexp.h b/src/devices/bus/vtech/memexp/memexp.h
index ca2d677c724..fab938ef488 100644
--- a/src/devices/bus/vtech/memexp/memexp.h
+++ b/src/devices/bus/vtech/memexp/memexp.h
@@ -36,7 +36,6 @@
#ifndef __VTECH_MEMEXP_H__
#define __VTECH_MEMEXP_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/bus/vtech/memexp/memory.cpp b/src/devices/bus/vtech/memexp/memory.cpp
index b294f4a8ff8..db5e07a3348 100644
--- a/src/devices/bus/vtech/memexp/memory.cpp
+++ b/src/devices/bus/vtech/memexp/memory.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "memory.h"
diff --git a/src/devices/bus/vtech/memexp/memory.h b/src/devices/bus/vtech/memexp/memory.h
index bfc727d652e..b330707cc14 100644
--- a/src/devices/bus/vtech/memexp/memory.h
+++ b/src/devices/bus/vtech/memexp/memory.h
@@ -11,7 +11,6 @@
#ifndef __VTECH_MEMEXP_MEMORY__
#define __VTECH_MEMEXP_MEMORY__
-#include "emu.h"
#include "memexp.h"
diff --git a/src/devices/bus/vtech/memexp/rs232.cpp b/src/devices/bus/vtech/memexp/rs232.cpp
index 1cac4d8212d..7dc5c5a5362 100644
--- a/src/devices/bus/vtech/memexp/rs232.cpp
+++ b/src/devices/bus/vtech/memexp/rs232.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "rs232.h"
diff --git a/src/devices/bus/vtech/memexp/rs232.h b/src/devices/bus/vtech/memexp/rs232.h
index f235670bb3d..4727066a913 100644
--- a/src/devices/bus/vtech/memexp/rs232.h
+++ b/src/devices/bus/vtech/memexp/rs232.h
@@ -11,7 +11,6 @@
#ifndef __VTECH_MEMEXP_RS232_H__
#define __VTECH_MEMEXP_RS232_H__
-#include "emu.h"
#include "memexp.h"
#include "bus/rs232/rs232.h"
diff --git a/src/devices/bus/vtech/memexp/rtty.cpp b/src/devices/bus/vtech/memexp/rtty.cpp
index b1416fbdad1..f96fc3e5ff3 100644
--- a/src/devices/bus/vtech/memexp/rtty.cpp
+++ b/src/devices/bus/vtech/memexp/rtty.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "rtty.h"
diff --git a/src/devices/bus/vtech/memexp/rtty.h b/src/devices/bus/vtech/memexp/rtty.h
index fb65ce1f513..5f16aa6d234 100644
--- a/src/devices/bus/vtech/memexp/rtty.h
+++ b/src/devices/bus/vtech/memexp/rtty.h
@@ -11,7 +11,6 @@
#ifndef __VTECH_MEMEXP_RTTY_H__
#define __VTECH_MEMEXP_RTTY_H__
-#include "emu.h"
#include "memexp.h"
diff --git a/src/devices/bus/vtech/memexp/wordpro.cpp b/src/devices/bus/vtech/memexp/wordpro.cpp
index 570fe3e431d..d3a1de653c2 100644
--- a/src/devices/bus/vtech/memexp/wordpro.cpp
+++ b/src/devices/bus/vtech/memexp/wordpro.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "wordpro.h"
diff --git a/src/devices/bus/vtech/memexp/wordpro.h b/src/devices/bus/vtech/memexp/wordpro.h
index 51e5b412ab1..0d12ae7a8d5 100644
--- a/src/devices/bus/vtech/memexp/wordpro.h
+++ b/src/devices/bus/vtech/memexp/wordpro.h
@@ -11,7 +11,6 @@
#ifndef __VTECH_MEMEXP_WORDPRO_H__
#define __VTECH_MEMEXP_WORDPRO_H__
-#include "emu.h"
#include "memexp.h"
diff --git a/src/devices/bus/wangpc/emb.cpp b/src/devices/bus/wangpc/emb.cpp
index 5dbc2627382..0e71cd2e3db 100644
--- a/src/devices/bus/wangpc/emb.cpp
+++ b/src/devices/bus/wangpc/emb.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "emb.h"
diff --git a/src/devices/bus/wangpc/emb.h b/src/devices/bus/wangpc/emb.h
index bf871947070..f80fa5322df 100644
--- a/src/devices/bus/wangpc/emb.h
+++ b/src/devices/bus/wangpc/emb.h
@@ -11,7 +11,6 @@
#ifndef __WANGPC_EMB__
#define __WANGPC_EMB__
-#include "emu.h"
#include "wangpc.h"
diff --git a/src/devices/bus/wangpc/lic.cpp b/src/devices/bus/wangpc/lic.cpp
index 171ab69bf04..72610644ffd 100644
--- a/src/devices/bus/wangpc/lic.cpp
+++ b/src/devices/bus/wangpc/lic.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "lic.h"
diff --git a/src/devices/bus/wangpc/lic.h b/src/devices/bus/wangpc/lic.h
index c5b49b6627d..146a851734d 100644
--- a/src/devices/bus/wangpc/lic.h
+++ b/src/devices/bus/wangpc/lic.h
@@ -11,7 +11,6 @@
#ifndef __WANGPC_LIC__
#define __WANGPC_LIC__
-#include "emu.h"
#include "wangpc.h"
diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp
index b1bc1cb1427..0700e7ebc70 100644
--- a/src/devices/bus/wangpc/lvc.cpp
+++ b/src/devices/bus/wangpc/lvc.cpp
@@ -16,6 +16,7 @@
*/
+#include "emu.h"
#include "lvc.h"
diff --git a/src/devices/bus/wangpc/lvc.h b/src/devices/bus/wangpc/lvc.h
index acd3f1e64cd..f21c8a4e3cf 100644
--- a/src/devices/bus/wangpc/lvc.h
+++ b/src/devices/bus/wangpc/lvc.h
@@ -11,7 +11,6 @@
#ifndef __WANGPC_LVC__
#define __WANGPC_LVC__
-#include "emu.h"
#include "wangpc.h"
#include "video/mc6845.h"
diff --git a/src/devices/bus/wangpc/mcc.cpp b/src/devices/bus/wangpc/mcc.cpp
index 3f4737e31ee..816c2921431 100644
--- a/src/devices/bus/wangpc/mcc.cpp
+++ b/src/devices/bus/wangpc/mcc.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "mcc.h"
diff --git a/src/devices/bus/wangpc/mcc.h b/src/devices/bus/wangpc/mcc.h
index 6e00086cc1d..e8675402a89 100644
--- a/src/devices/bus/wangpc/mcc.h
+++ b/src/devices/bus/wangpc/mcc.h
@@ -11,7 +11,6 @@
#ifndef __WANGPC_MCC__
#define __WANGPC_MCC__
-#include "emu.h"
#include "wangpc.h"
#include "machine/z80dart.h"
diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp
index 1ee859939e9..a76af5b62d4 100644
--- a/src/devices/bus/wangpc/mvc.cpp
+++ b/src/devices/bus/wangpc/mvc.cpp
@@ -15,6 +15,7 @@
*/
+#include "emu.h"
#include "mvc.h"
diff --git a/src/devices/bus/wangpc/mvc.h b/src/devices/bus/wangpc/mvc.h
index a71891028e6..98dd98edf6a 100644
--- a/src/devices/bus/wangpc/mvc.h
+++ b/src/devices/bus/wangpc/mvc.h
@@ -11,7 +11,6 @@
#ifndef __WANGPC_MVC__
#define __WANGPC_MVC__
-#include "emu.h"
#include "wangpc.h"
#include "video/mc6845.h"
diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp
index f22e71f4a93..925c15d67d7 100644
--- a/src/devices/bus/wangpc/rtc.cpp
+++ b/src/devices/bus/wangpc/rtc.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "rtc.h"
diff --git a/src/devices/bus/wangpc/rtc.h b/src/devices/bus/wangpc/rtc.h
index beb3841107a..cd6b9bbeb0c 100644
--- a/src/devices/bus/wangpc/rtc.h
+++ b/src/devices/bus/wangpc/rtc.h
@@ -11,7 +11,6 @@
#ifndef __WANGPC_RTC__
#define __WANGPC_RTC__
-#include "emu.h"
#include "wangpc.h"
#include "cpu/z80/z80.h"
#include "machine/am9517a.h"
diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp
index 9c9fa45487a..a672a1b8f84 100644
--- a/src/devices/bus/wangpc/tig.cpp
+++ b/src/devices/bus/wangpc/tig.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "tig.h"
diff --git a/src/devices/bus/wangpc/tig.h b/src/devices/bus/wangpc/tig.h
index 3a954c45ec2..5154abc5e20 100644
--- a/src/devices/bus/wangpc/tig.h
+++ b/src/devices/bus/wangpc/tig.h
@@ -11,7 +11,6 @@
#ifndef __WANGPC_TIG__
#define __WANGPC_TIG__
-#include "emu.h"
#include "wangpc.h"
#include "video/upd7220.h"
diff --git a/src/devices/bus/wangpc/wangpc.cpp b/src/devices/bus/wangpc/wangpc.cpp
index 846ce086756..87801b57823 100644
--- a/src/devices/bus/wangpc/wangpc.cpp
+++ b/src/devices/bus/wangpc/wangpc.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "wangpc.h"
diff --git a/src/devices/bus/wangpc/wangpc.h b/src/devices/bus/wangpc/wangpc.h
index ddcbe326b57..08cfa56c80d 100644
--- a/src/devices/bus/wangpc/wangpc.h
+++ b/src/devices/bus/wangpc/wangpc.h
@@ -14,7 +14,6 @@
#ifndef __WANGPC_BUS__
#define __WANGPC_BUS__
-#include "emu.h"
diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp
index 7bfb7337729..43d70269fea 100644
--- a/src/devices/bus/wangpc/wdc.cpp
+++ b/src/devices/bus/wangpc/wdc.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "wdc.h"
#include "bus/scsi/scsihd.h"
diff --git a/src/devices/bus/wangpc/wdc.h b/src/devices/bus/wangpc/wdc.h
index 5cf3dbc8092..4667e637c1d 100644
--- a/src/devices/bus/wangpc/wdc.h
+++ b/src/devices/bus/wangpc/wdc.h
@@ -11,7 +11,6 @@
#ifndef __WANGPC_WDC__
#define __WANGPC_WDC__
-#include "emu.h"
#include "wangpc.h"
#include "cpu/z80/z80.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/bus/x68k/x68k_neptunex.h b/src/devices/bus/x68k/x68k_neptunex.h
index 2f6c49bceaf..77ff9ab69e5 100644
--- a/src/devices/bus/x68k/x68k_neptunex.h
+++ b/src/devices/bus/x68k/x68k_neptunex.h
@@ -13,7 +13,6 @@
#ifndef X68K_NEPTUNEX_H_
#define X68K_NEPTUNEX_H_
-#include "emu.h"
#include "machine/dp8390.h"
#include "x68kexp.h"
diff --git a/src/devices/bus/x68k/x68k_scsiext.h b/src/devices/bus/x68k/x68k_scsiext.h
index e772ede4d86..54658840e8a 100644
--- a/src/devices/bus/x68k/x68k_scsiext.h
+++ b/src/devices/bus/x68k/x68k_scsiext.h
@@ -9,7 +9,6 @@
#ifndef X68K_SCSIEXT_H_
#define X68K_SCSIEXT_H_
-#include "emu.h"
#include "machine/mb89352.h"
#include "x68kexp.h"
diff --git a/src/devices/bus/x68k/x68kexp.h b/src/devices/bus/x68k/x68kexp.h
index 824a5868d42..c1bde3a2306 100644
--- a/src/devices/bus/x68k/x68kexp.h
+++ b/src/devices/bus/x68k/x68kexp.h
@@ -64,7 +64,6 @@
#ifndef X68KEXP_H_
#define X68KEXP_H_
-#include "emu.h"
//**************************************************************************
// CONSTANTS
diff --git a/src/devices/bus/z88/flash.h b/src/devices/bus/z88/flash.h
index 76dc4d18c76..4d79cb55afe 100644
--- a/src/devices/bus/z88/flash.h
+++ b/src/devices/bus/z88/flash.h
@@ -5,7 +5,6 @@
#ifndef __Z88_FLASH_H__
#define __Z88_FLASH_H__
-#include "emu.h"
#include "z88.h"
#include "machine/intelfsh.h"
diff --git a/src/devices/bus/z88/ram.h b/src/devices/bus/z88/ram.h
index d30be0a9968..d2e1646145d 100644
--- a/src/devices/bus/z88/ram.h
+++ b/src/devices/bus/z88/ram.h
@@ -5,7 +5,6 @@
#ifndef __Z88_RAM_H__
#define __Z88_RAM_H__
-#include "emu.h"
#include "z88.h"
//**************************************************************************
diff --git a/src/devices/bus/z88/rom.h b/src/devices/bus/z88/rom.h
index 5997bd47cee..41c63955d4f 100644
--- a/src/devices/bus/z88/rom.h
+++ b/src/devices/bus/z88/rom.h
@@ -5,7 +5,6 @@
#ifndef __Z88_ROM_H__
#define __Z88_ROM_H__
-#include "emu.h"
#include "z88.h"
//**************************************************************************
diff --git a/src/devices/cpu/8x300/8x300.cpp b/src/devices/cpu/8x300/8x300.cpp
index c9ec6839e9e..8d17550efa0 100644
--- a/src/devices/cpu/8x300/8x300.cpp
+++ b/src/devices/cpu/8x300/8x300.cpp
@@ -9,6 +9,7 @@
* Written by Barry Rodewald
*/
+#include "emu.h"
#include "8x300.h"
#include "debugger.h"
diff --git a/src/devices/cpu/8x300/8x300.h b/src/devices/cpu/8x300/8x300.h
index 45d3f71cd91..d26afc55748 100644
--- a/src/devices/cpu/8x300/8x300.h
+++ b/src/devices/cpu/8x300/8x300.h
@@ -10,7 +10,6 @@
#ifndef _8X300_H_
#define _8X300_H_
-#include "emu.h"
// Register enumeration
enum
diff --git a/src/devices/cpu/alto2/a2curt.cpp b/src/devices/cpu/alto2/a2curt.cpp
index cf334a287cf..c371ecb1c33 100644
--- a/src/devices/cpu/alto2/a2curt.cpp
+++ b/src/devices/cpu/alto2/a2curt.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII cursor task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
/**
diff --git a/src/devices/cpu/alto2/a2dht.cpp b/src/devices/cpu/alto2/a2dht.cpp
index 620a5491817..75144deb2c0 100644
--- a/src/devices/cpu/alto2/a2dht.cpp
+++ b/src/devices/cpu/alto2/a2dht.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII display horizontal task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
/*
diff --git a/src/devices/cpu/alto2/a2disk.cpp b/src/devices/cpu/alto2/a2disk.cpp
index 8a8d8f0d1d3..b9d44dacc9f 100644
--- a/src/devices/cpu/alto2/a2disk.cpp
+++ b/src/devices/cpu/alto2/a2disk.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII disk interface
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#define GET_KADDR_SECTOR(kaddr) X_RDBITS(kaddr,16, 0, 3) //!< get sector number from address register
diff --git a/src/devices/cpu/alto2/a2disp.cpp b/src/devices/cpu/alto2/a2disp.cpp
index 0102cd8a73f..ea850e6a82d 100644
--- a/src/devices/cpu/alto2/a2disp.cpp
+++ b/src/devices/cpu/alto2/a2disp.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII display interface
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#include "a2roms.h"
diff --git a/src/devices/cpu/alto2/a2dvt.cpp b/src/devices/cpu/alto2/a2dvt.cpp
index 157774931f8..df4786f4164 100644
--- a/src/devices/cpu/alto2/a2dvt.cpp
+++ b/src/devices/cpu/alto2/a2dvt.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII display vertical task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
/*
diff --git a/src/devices/cpu/alto2/a2dwt.cpp b/src/devices/cpu/alto2/a2dwt.cpp
index 752a1ab9660..6876dbc193d 100644
--- a/src/devices/cpu/alto2/a2dwt.cpp
+++ b/src/devices/cpu/alto2/a2dwt.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII display word task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
/*
diff --git a/src/devices/cpu/alto2/a2emu.cpp b/src/devices/cpu/alto2/a2emu.cpp
index bd0fb8d16f6..c5a4caccb76 100644
--- a/src/devices/cpu/alto2/a2emu.cpp
+++ b/src/devices/cpu/alto2/a2emu.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII emulator task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
/** @brief CTL2K_U3 address line for F2 function */
diff --git a/src/devices/cpu/alto2/a2ether.cpp b/src/devices/cpu/alto2/a2ether.cpp
index 97d2fe6399e..7af15ffbad0 100644
--- a/src/devices/cpu/alto2/a2ether.cpp
+++ b/src/devices/cpu/alto2/a2ether.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII ethernet task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#include "a2roms.h"
diff --git a/src/devices/cpu/alto2/a2hw.cpp b/src/devices/cpu/alto2/a2hw.cpp
index 43dc4709a38..c8faab079da 100644
--- a/src/devices/cpu/alto2/a2hw.cpp
+++ b/src/devices/cpu/alto2/a2hw.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII memory mapped I/O hardware
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#include "a2roms.h"
diff --git a/src/devices/cpu/alto2/a2kbd.cpp b/src/devices/cpu/alto2/a2kbd.cpp
index bb7105686fe..1939a852340 100644
--- a/src/devices/cpu/alto2/a2kbd.cpp
+++ b/src/devices/cpu/alto2/a2kbd.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII memory mapped I/O keyboard
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
/**
diff --git a/src/devices/cpu/alto2/a2ksec.cpp b/src/devices/cpu/alto2/a2ksec.cpp
index 6ba05395877..220a7591bb6 100644
--- a/src/devices/cpu/alto2/a2ksec.cpp
+++ b/src/devices/cpu/alto2/a2ksec.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII disk sector task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
//! f1_ksec_block early: block the disk sector task
diff --git a/src/devices/cpu/alto2/a2kwd.cpp b/src/devices/cpu/alto2/a2kwd.cpp
index e312debecf9..d235642e7c3 100644
--- a/src/devices/cpu/alto2/a2kwd.cpp
+++ b/src/devices/cpu/alto2/a2kwd.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII disk word task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
//! f1_kwd_block early: block the disk word task
diff --git a/src/devices/cpu/alto2/a2mem.cpp b/src/devices/cpu/alto2/a2mem.cpp
index 932acc1f729..216b9429be7 100644
--- a/src/devices/cpu/alto2/a2mem.cpp
+++ b/src/devices/cpu/alto2/a2mem.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII memory interface
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#define PUT_EVEN(dword,word) X_WRBITS(dword,32, 0,15,word)
diff --git a/src/devices/cpu/alto2/a2mouse.cpp b/src/devices/cpu/alto2/a2mouse.cpp
index 7f18e7b7280..4ee209e6c1d 100644
--- a/src/devices/cpu/alto2/a2mouse.cpp
+++ b/src/devices/cpu/alto2/a2mouse.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII mouse interface
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#include "a2roms.h"
diff --git a/src/devices/cpu/alto2/a2mrt.cpp b/src/devices/cpu/alto2/a2mrt.cpp
index c072a23129c..758688571c6 100644
--- a/src/devices/cpu/alto2/a2mrt.cpp
+++ b/src/devices/cpu/alto2/a2mrt.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII memory refresh task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
//! f1_mrt_block early: block the display word task
diff --git a/src/devices/cpu/alto2/a2part.cpp b/src/devices/cpu/alto2/a2part.cpp
index 7e28c2d1da7..f5feb4d8947 100644
--- a/src/devices/cpu/alto2/a2part.cpp
+++ b/src/devices/cpu/alto2/a2part.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII parity task
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
//! called by the CPU when the parity task becomes active
diff --git a/src/devices/cpu/alto2/a2ram.cpp b/src/devices/cpu/alto2/a2ram.cpp
index 83930364c8b..39996f98fa7 100644
--- a/src/devices/cpu/alto2/a2ram.cpp
+++ b/src/devices/cpu/alto2/a2ram.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII RAM related functions
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#define DEBUG_WRTRAM 0 //!< define to 1 to print CRAM writes
diff --git a/src/devices/cpu/alto2/a2roms.cpp b/src/devices/cpu/alto2/a2roms.cpp
index ec262d1be27..7eab1e34212 100644
--- a/src/devices/cpu/alto2/a2roms.cpp
+++ b/src/devices/cpu/alto2/a2roms.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII PROM loading and decoding
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#include "a2roms.h"
diff --git a/src/devices/cpu/alto2/a2roms.h b/src/devices/cpu/alto2/a2roms.h
index e320239fc86..1d1cc149660 100644
--- a/src/devices/cpu/alto2/a2roms.h
+++ b/src/devices/cpu/alto2/a2roms.h
@@ -8,7 +8,6 @@
#ifndef _CPU_A2ROMS_H_
#define _CPU_A2ROMS_H_
-#include "emu.h"
/**
* @brief structure to define a ROM's or PROM's loading options
diff --git a/src/devices/cpu/alto2/alto2cpu.cpp b/src/devices/cpu/alto2/alto2cpu.cpp
index f2f566b1dfe..ad88171abd2 100644
--- a/src/devices/cpu/alto2/alto2cpu.cpp
+++ b/src/devices/cpu/alto2/alto2cpu.cpp
@@ -5,6 +5,7 @@
* Xerox AltoII CPU core
*
*****************************************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#include "a2roms.h"
diff --git a/src/devices/cpu/alto2/alto2cpu.h b/src/devices/cpu/alto2/alto2cpu.h
index eb275154216..56133711001 100644
--- a/src/devices/cpu/alto2/alto2cpu.h
+++ b/src/devices/cpu/alto2/alto2cpu.h
@@ -10,7 +10,6 @@
#define ALTO2_TAG "alto2"
-#include "emu.h"
#include "debugger.h"
#include "sound/speaker.h"
#include "machine/diablo_hd.h"
diff --git a/src/devices/cpu/alto2/alto2dsm.cpp b/src/devices/cpu/alto2/alto2dsm.cpp
index 65c5d0b4acd..b70c35d182c 100644
--- a/src/devices/cpu/alto2/alto2dsm.cpp
+++ b/src/devices/cpu/alto2/alto2dsm.cpp
@@ -4,6 +4,7 @@
* Xerox AltoII disassembler
*
**********************************************************/
+#include "emu.h"
#include "alto2cpu.h"
#define loc_DASTART 0000420 // display list header
diff --git a/src/devices/cpu/amis2000/amis2000.cpp b/src/devices/cpu/amis2000/amis2000.cpp
index c79c858780c..0dde5fed2ee 100644
--- a/src/devices/cpu/amis2000/amis2000.cpp
+++ b/src/devices/cpu/amis2000/amis2000.cpp
@@ -18,6 +18,7 @@
*/
+#include "emu.h"
#include "amis2000.h"
#include "debugger.h"
diff --git a/src/devices/cpu/amis2000/amis2000.h b/src/devices/cpu/amis2000/amis2000.h
index f72e5a5322d..d411a1b5f60 100644
--- a/src/devices/cpu/amis2000/amis2000.h
+++ b/src/devices/cpu/amis2000/amis2000.h
@@ -9,7 +9,6 @@
#ifndef _AMIS2000_H_
#define _AMIS2000_H_
-#include "emu.h"
// generic input pins (4 bits each)
diff --git a/src/devices/cpu/amis2000/amis2000op.cpp b/src/devices/cpu/amis2000/amis2000op.cpp
index 685be166c3e..e67ee6d153b 100644
--- a/src/devices/cpu/amis2000/amis2000op.cpp
+++ b/src/devices/cpu/amis2000/amis2000op.cpp
@@ -3,6 +3,7 @@
// AMI S2000 opcode handlers
+#include "emu.h"
#include "amis2000.h"
diff --git a/src/devices/cpu/arm7/lpc210x.cpp b/src/devices/cpu/arm7/lpc210x.cpp
index 28205774f30..57b917ab235 100644
--- a/src/devices/cpu/arm7/lpc210x.cpp
+++ b/src/devices/cpu/arm7/lpc210x.cpp
@@ -12,6 +12,7 @@
***************************************************************************/
+#include "emu.h"
#include "lpc210x.h"
const device_type LPC2103 = &device_creator<lpc210x_device>;
diff --git a/src/devices/cpu/arm7/lpc210x.h b/src/devices/cpu/arm7/lpc210x.h
index 53f4e28a798..581560a3a62 100644
--- a/src/devices/cpu/arm7/lpc210x.h
+++ b/src/devices/cpu/arm7/lpc210x.h
@@ -6,7 +6,6 @@
#ifndef __LPC2103__
#define __LPC2103__
-#include "emu.h"
#include "arm7.h"
#include "arm7core.h"
diff --git a/src/devices/cpu/dsp56k/dsp56dsm.cpp b/src/devices/cpu/dsp56k/dsp56dsm.cpp
index 133cfc40509..5ca4aab30a0 100644
--- a/src/devices/cpu/dsp56k/dsp56dsm.cpp
+++ b/src/devices/cpu/dsp56k/dsp56dsm.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "opcode.h"
#include "emu.h"
diff --git a/src/devices/cpu/dsp56k/dsp56k.cpp b/src/devices/cpu/dsp56k/dsp56k.cpp
index a4ace1425a8..47d090c6ec0 100644
--- a/src/devices/cpu/dsp56k/dsp56k.cpp
+++ b/src/devices/cpu/dsp56k/dsp56k.cpp
@@ -31,6 +31,7 @@
- 1-21 Vectored exception requests on the Host Interface!
***************************************************************************/
+#include "emu.h"
#include "opcode.h"
#include "emu.h"
diff --git a/src/devices/cpu/dsp56k/dsp56k.h b/src/devices/cpu/dsp56k/dsp56k.h
index 443dd811508..6053aa0557a 100644
--- a/src/devices/cpu/dsp56k/dsp56k.h
+++ b/src/devices/cpu/dsp56k/dsp56k.h
@@ -14,7 +14,6 @@
#ifndef __DSP56K_H__
#define __DSP56K_H__
-#include "emu.h"
// IRQ Lines
diff --git a/src/devices/cpu/dsp56k/dsp56mem.cpp b/src/devices/cpu/dsp56k/dsp56mem.cpp
index ad8cfd6320e..31ed7503acb 100644
--- a/src/devices/cpu/dsp56k/dsp56mem.cpp
+++ b/src/devices/cpu/dsp56k/dsp56mem.cpp
@@ -3,6 +3,7 @@
// This file contains functions which handle the On-Chip peripheral Memory Map
// as well as the Host Interface and the SSI0/SSI1 Serial Interfaces.
+#include "emu.h"
#include "dsp56mem.h"
#include "dsp56pcu.h"
diff --git a/src/devices/cpu/dsp56k/dsp56pcu.cpp b/src/devices/cpu/dsp56k/dsp56pcu.cpp
index 2c7da64c1ed..245d83e7d87 100644
--- a/src/devices/cpu/dsp56k/dsp56pcu.cpp
+++ b/src/devices/cpu/dsp56k/dsp56pcu.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include "dsp56pcu.h"
#include "dsp56mem.h"
diff --git a/src/devices/cpu/dsp56k/inst.cpp b/src/devices/cpu/dsp56k/inst.cpp
index c07320fc5b3..d7c99777338 100644
--- a/src/devices/cpu/dsp56k/inst.cpp
+++ b/src/devices/cpu/dsp56k/inst.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include "inst.h"
#include "emu.h"
diff --git a/src/devices/cpu/dsp56k/opcode.cpp b/src/devices/cpu/dsp56k/opcode.cpp
index cdffaba030c..efd1ce6156e 100644
--- a/src/devices/cpu/dsp56k/opcode.cpp
+++ b/src/devices/cpu/dsp56k/opcode.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include <stdio.h>
#include "opcode.h"
diff --git a/src/devices/cpu/dsp56k/opcode.h b/src/devices/cpu/dsp56k/opcode.h
index 2fbc1a69d39..704602d17f3 100644
--- a/src/devices/cpu/dsp56k/opcode.h
+++ b/src/devices/cpu/dsp56k/opcode.h
@@ -3,7 +3,6 @@
#ifndef __DSP56K_OPCODE_H__
#define __DSP56K_OPCODE_H__
-#include "emu.h"
#include "inst.h"
#include "pmove.h"
diff --git a/src/devices/cpu/dsp56k/pmove.cpp b/src/devices/cpu/dsp56k/pmove.cpp
index b57a8850154..15a13eb9ecf 100644
--- a/src/devices/cpu/dsp56k/pmove.cpp
+++ b/src/devices/cpu/dsp56k/pmove.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include "pmove.h"
namespace DSP56K
diff --git a/src/devices/cpu/dsp56k/pmove.h b/src/devices/cpu/dsp56k/pmove.h
index 8e4ecaa5fde..86d0932cf2f 100644
--- a/src/devices/cpu/dsp56k/pmove.h
+++ b/src/devices/cpu/dsp56k/pmove.h
@@ -3,7 +3,6 @@
#ifndef __DSP56K_PARALLEL_MOVE_H__
#define __DSP56K_PARALLEL_MOVE_H__
-#include "emu.h"
#include "opcode.h"
#include "tables.h"
diff --git a/src/devices/cpu/dsp56k/tables.cpp b/src/devices/cpu/dsp56k/tables.cpp
index 72a46bfa0ee..fac697f8fa8 100644
--- a/src/devices/cpu/dsp56k/tables.cpp
+++ b/src/devices/cpu/dsp56k/tables.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Andrew Gardner
+#include "emu.h"
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/devices/cpu/dsp56k/tables.h b/src/devices/cpu/dsp56k/tables.h
index 2b590dc9027..05c11db908b 100644
--- a/src/devices/cpu/dsp56k/tables.h
+++ b/src/devices/cpu/dsp56k/tables.h
@@ -6,7 +6,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include "emu.h"
#include "dsp56k.h"
namespace DSP56K
diff --git a/src/devices/cpu/e0c6200/e0c6200.cpp b/src/devices/cpu/e0c6200/e0c6200.cpp
index e78351b19aa..ace906943a0 100644
--- a/src/devices/cpu/e0c6200/e0c6200.cpp
+++ b/src/devices/cpu/e0c6200/e0c6200.cpp
@@ -18,6 +18,7 @@
*/
+#include "emu.h"
#include "e0c6200.h"
#include "debugger.h"
diff --git a/src/devices/cpu/e0c6200/e0c6200.h b/src/devices/cpu/e0c6200/e0c6200.h
index 4a38ae8fbf8..5f250d4f444 100644
--- a/src/devices/cpu/e0c6200/e0c6200.h
+++ b/src/devices/cpu/e0c6200/e0c6200.h
@@ -9,7 +9,6 @@
#ifndef _E0C6200_H_
#define _E0C6200_H_
-#include "emu.h"
class e0c6200_cpu_device : public cpu_device
diff --git a/src/devices/cpu/e0c6200/e0c6200op.cpp b/src/devices/cpu/e0c6200/e0c6200op.cpp
index 94295e43889..93ab8011f7d 100644
--- a/src/devices/cpu/e0c6200/e0c6200op.cpp
+++ b/src/devices/cpu/e0c6200/e0c6200op.cpp
@@ -3,6 +3,7 @@
// E0C6200 opcode handlers
+#include "emu.h"
#include "e0c6200.h"
diff --git a/src/devices/cpu/e0c6200/e0c6s46.cpp b/src/devices/cpu/e0c6200/e0c6s46.cpp
index 49a754adf33..bc82ebd5c25 100644
--- a/src/devices/cpu/e0c6200/e0c6s46.cpp
+++ b/src/devices/cpu/e0c6200/e0c6s46.cpp
@@ -15,6 +15,7 @@
*/
+#include "emu.h"
#include "e0c6s46.h"
enum
diff --git a/src/devices/cpu/es5510/es5510.h b/src/devices/cpu/es5510/es5510.h
index 4d85cb87e5c..89da725c28e 100644
--- a/src/devices/cpu/es5510/es5510.h
+++ b/src/devices/cpu/es5510/es5510.h
@@ -12,7 +12,6 @@
#ifndef __ES5510_H__
#define __ES5510_H__
-#include "emu.h"
class es5510_device : public cpu_device {
public:
diff --git a/src/devices/cpu/esrip/esrip.h b/src/devices/cpu/esrip/esrip.h
index 42f397ca5b4..7af07d8f7c4 100644
--- a/src/devices/cpu/esrip/esrip.h
+++ b/src/devices/cpu/esrip/esrip.h
@@ -11,7 +11,6 @@
#ifndef _ESRIP_H
#define _ESRIP_H
-#include "emu.h"
/***************************************************************************
COMPILE-TIME DEFINITIONS
diff --git a/src/devices/cpu/h6280/h6280.cpp b/src/devices/cpu/h6280/h6280.cpp
index a3fae0075f5..8a4c7aa7bca 100644
--- a/src/devices/cpu/h6280/h6280.cpp
+++ b/src/devices/cpu/h6280/h6280.cpp
@@ -110,6 +110,7 @@
******************************************************************************/
+#include "emu.h"
#include "h6280.h"
#include "debugger.h"
diff --git a/src/devices/cpu/h6280/h6280.h b/src/devices/cpu/h6280/h6280.h
index 66b7386b399..7e4bf9cf9e8 100644
--- a/src/devices/cpu/h6280/h6280.h
+++ b/src/devices/cpu/h6280/h6280.h
@@ -17,7 +17,6 @@
#ifndef __H6280_H__
#define __H6280_H__
-#include "emu.h"
#define LAZY_FLAGS 0
diff --git a/src/devices/cpu/hmcs40/hmcs40.cpp b/src/devices/cpu/hmcs40/hmcs40.cpp
index fcc61b40fe7..0023956f8d4 100644
--- a/src/devices/cpu/hmcs40/hmcs40.cpp
+++ b/src/devices/cpu/hmcs40/hmcs40.cpp
@@ -14,6 +14,7 @@
#define IS_PMOS 0
#define IS_CMOS ~0
+#include "emu.h"
#include "hmcs40.h"
#include "debugger.h"
diff --git a/src/devices/cpu/hmcs40/hmcs40.h b/src/devices/cpu/hmcs40/hmcs40.h
index 1eaed0bab37..9bd2e3f82a5 100644
--- a/src/devices/cpu/hmcs40/hmcs40.h
+++ b/src/devices/cpu/hmcs40/hmcs40.h
@@ -9,7 +9,6 @@
#ifndef _HMCS40_H_
#define _HMCS40_H_
-#include "emu.h"
// I/O ports setup
diff --git a/src/devices/cpu/hmcs40/hmcs40op.cpp b/src/devices/cpu/hmcs40/hmcs40op.cpp
index da89ff44fe7..e554ec8ac45 100644
--- a/src/devices/cpu/hmcs40/hmcs40op.cpp
+++ b/src/devices/cpu/hmcs40/hmcs40op.cpp
@@ -3,6 +3,7 @@
// HMCS40 opcode handlers
+#include "emu.h"
#include "hmcs40.h"
diff --git a/src/devices/cpu/i8089/i8089.cpp b/src/devices/cpu/i8089/i8089.cpp
index 234e2e33503..a18d62b7f4a 100644
--- a/src/devices/cpu/i8089/i8089.cpp
+++ b/src/devices/cpu/i8089/i8089.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "i8089.h"
#include "i8089_channel.h"
diff --git a/src/devices/cpu/i8089/i8089.h b/src/devices/cpu/i8089/i8089.h
index 81c84089300..5f69c0b42e7 100644
--- a/src/devices/cpu/i8089/i8089.h
+++ b/src/devices/cpu/i8089/i8089.h
@@ -11,7 +11,6 @@
#ifndef __I8089_H__
#define __I8089_H__
-#include "emu.h"
#include "i8089_channel.h"
diff --git a/src/devices/cpu/i8089/i8089_channel.h b/src/devices/cpu/i8089/i8089_channel.h
index e95975c28c3..914ed70bfbe 100644
--- a/src/devices/cpu/i8089/i8089_channel.h
+++ b/src/devices/cpu/i8089/i8089_channel.h
@@ -13,7 +13,6 @@
#ifndef __I8089_CHANNEL_H__
#define __I8089_CHANNEL_H__
-#include "emu.h"
#include "i8089.h"
diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp
index cd280c3b3e0..da0359e649b 100644
--- a/src/devices/cpu/i86/i186.cpp
+++ b/src/devices/cpu/i86/i186.cpp
@@ -3,6 +3,7 @@
// Peripheral code from rmnimbus driver by Phill Harvey-Smith which is
// based on the Leland sound driver by Aaron Giles and Paul Leaman
+#include "emu.h"
#include "i186.h"
#include "debugger.h"
#include "i86inline.h"
diff --git a/src/devices/cpu/i86/i186.h b/src/devices/cpu/i86/i186.h
index bfc4f14cb07..58ff24d3ac2 100644
--- a/src/devices/cpu/i86/i186.h
+++ b/src/devices/cpu/i86/i186.h
@@ -3,7 +3,6 @@
#ifndef I186_H__
#define I186_H__
-#include "emu.h"
#include "i86.h"
extern const device_type I80186;
diff --git a/src/devices/cpu/i86/i286.cpp b/src/devices/cpu/i86/i286.cpp
index c399c302fe9..f28438853ea 100644
--- a/src/devices/cpu/i86/i286.cpp
+++ b/src/devices/cpu/i86/i286.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Carl
+#include "emu.h"
#include "i286.h"
#include "debugger.h"
#include "i86inline.h"
diff --git a/src/devices/cpu/i86/i86.h b/src/devices/cpu/i86/i86.h
index ecdf97ae2b2..70c4f3bcad9 100644
--- a/src/devices/cpu/i86/i86.h
+++ b/src/devices/cpu/i86/i86.h
@@ -3,7 +3,6 @@
#ifndef __I8086_H__
#define __I8086_H__
-#include "emu.h"
/////////////////////////////////////////////////////////////////
diff --git a/src/devices/cpu/melps4/m58846.cpp b/src/devices/cpu/melps4/m58846.cpp
index 261876c3eef..b581f689300 100644
--- a/src/devices/cpu/melps4/m58846.cpp
+++ b/src/devices/cpu/melps4/m58846.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "m58846.h"
diff --git a/src/devices/cpu/melps4/melps4.cpp b/src/devices/cpu/melps4/melps4.cpp
index d1cd36cda32..896966c5882 100644
--- a/src/devices/cpu/melps4/melps4.cpp
+++ b/src/devices/cpu/melps4/melps4.cpp
@@ -37,6 +37,7 @@
*/
+#include "emu.h"
#include "melps4.h"
#include "debugger.h"
diff --git a/src/devices/cpu/melps4/melps4.h b/src/devices/cpu/melps4/melps4.h
index 3605cd441f2..ba641efcd7f 100644
--- a/src/devices/cpu/melps4/melps4.h
+++ b/src/devices/cpu/melps4/melps4.h
@@ -9,7 +9,6 @@
#ifndef _MELPS4_H_
#define _MELPS4_H_
-#include "emu.h"
// I/O ports setup
diff --git a/src/devices/cpu/melps4/melps4op.cpp b/src/devices/cpu/melps4/melps4op.cpp
index 44d17ae2d4c..755d5a10ef1 100644
--- a/src/devices/cpu/melps4/melps4op.cpp
+++ b/src/devices/cpu/melps4/melps4op.cpp
@@ -3,6 +3,7 @@
// MELPS 4 opcode handlers
+#include "emu.h"
#include "melps4.h"
diff --git a/src/devices/cpu/psx/dma.h b/src/devices/cpu/psx/dma.h
index 6a39a29ca5e..eeb68ac0161 100644
--- a/src/devices/cpu/psx/dma.h
+++ b/src/devices/cpu/psx/dma.h
@@ -12,7 +12,6 @@
#ifndef __PSXDMA_H__
#define __PSXDMA_H__
-#include "emu.h"
extern const device_type PSX_DMA;
diff --git a/src/devices/cpu/psx/gte.h b/src/devices/cpu/psx/gte.h
index d6da63e1f5e..a577c317718 100644
--- a/src/devices/cpu/psx/gte.h
+++ b/src/devices/cpu/psx/gte.h
@@ -12,7 +12,6 @@
#ifndef __PSXGTE_H__
#define __PSXGTE_H__
-#include "emu.h"
#define GTE_SF( op ) ( ( op >> 19 ) & 1 )
#define GTE_MX( op ) ( ( op >> 17 ) & 3 )
diff --git a/src/devices/cpu/psx/irq.cpp b/src/devices/cpu/psx/irq.cpp
index 50ed189abc5..06f1d345ac3 100644
--- a/src/devices/cpu/psx/irq.cpp
+++ b/src/devices/cpu/psx/irq.cpp
@@ -7,6 +7,7 @@
*
*/
+#include "emu.h"
#include "psx.h"
#include "irq.h"
diff --git a/src/devices/cpu/psx/irq.h b/src/devices/cpu/psx/irq.h
index 7cc83e8cfb3..d90b0b1365c 100644
--- a/src/devices/cpu/psx/irq.h
+++ b/src/devices/cpu/psx/irq.h
@@ -12,7 +12,6 @@
#ifndef __PSXIRQ_H__
#define __PSXIRQ_H__
-#include "emu.h"
extern const device_type PSX_IRQ;
diff --git a/src/devices/cpu/psx/mdec.h b/src/devices/cpu/psx/mdec.h
index 7b237a51145..7dc2c20fb5d 100644
--- a/src/devices/cpu/psx/mdec.h
+++ b/src/devices/cpu/psx/mdec.h
@@ -12,7 +12,6 @@
#ifndef __PSXMDEC_H__
#define __PSXMDEC_H__
-#include "emu.h"
extern const device_type PSX_MDEC;
diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h
index 2c2d8cdd17b..fd210ae3220 100644
--- a/src/devices/cpu/psx/psx.h
+++ b/src/devices/cpu/psx/psx.h
@@ -12,7 +12,6 @@
#ifndef __PSXCPU_H__
#define __PSXCPU_H__
-#include "emu.h"
#include "machine/ram.h"
#include "dma.h"
#include "gte.h"
diff --git a/src/devices/cpu/psx/rcnt.cpp b/src/devices/cpu/psx/rcnt.cpp
index c54af348ade..aeaf90488f9 100644
--- a/src/devices/cpu/psx/rcnt.cpp
+++ b/src/devices/cpu/psx/rcnt.cpp
@@ -7,6 +7,7 @@
*
*/
+#include "emu.h"
#include "rcnt.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/devices/cpu/psx/rcnt.h b/src/devices/cpu/psx/rcnt.h
index 69af108c44d..d56b3a6531a 100644
--- a/src/devices/cpu/psx/rcnt.h
+++ b/src/devices/cpu/psx/rcnt.h
@@ -12,7 +12,6 @@
#ifndef __PSXRCNT_H__
#define __PSXRCNT_H__
-#include "emu.h"
extern const device_type PSX_RCNT;
diff --git a/src/devices/cpu/psx/sio.cpp b/src/devices/cpu/psx/sio.cpp
index e3fe2924ea5..270e44f2c2a 100644
--- a/src/devices/cpu/psx/sio.cpp
+++ b/src/devices/cpu/psx/sio.cpp
@@ -7,6 +7,7 @@
*
*/
+#include "emu.h"
#include "sio.h"
#define VERBOSE_LEVEL ( 0 )
diff --git a/src/devices/cpu/psx/sio.h b/src/devices/cpu/psx/sio.h
index d8516b799e2..4f2df7f912b 100644
--- a/src/devices/cpu/psx/sio.h
+++ b/src/devices/cpu/psx/sio.h
@@ -12,7 +12,6 @@
#ifndef __PSXSIO_H__
#define __PSXSIO_H__
-#include "emu.h"
extern const device_type PSX_SIO0;
extern const device_type PSX_SIO1;
diff --git a/src/devices/cpu/rsp/rsp.h b/src/devices/cpu/rsp/rsp.h
index cee8dfa2dde..578fd89b482 100644
--- a/src/devices/cpu/rsp/rsp.h
+++ b/src/devices/cpu/rsp/rsp.h
@@ -14,7 +14,6 @@
#ifndef __RSP_H__
#define __RSP_H__
-#include "emu.h"
#include "cpu/drcfe.h"
#include "cpu/drcuml.h"
diff --git a/src/devices/cpu/sm510/kb1013vk1-2core.cpp b/src/devices/cpu/sm510/kb1013vk1-2core.cpp
index a6848bb7696..85fd4b74a81 100644
--- a/src/devices/cpu/sm510/kb1013vk1-2core.cpp
+++ b/src/devices/cpu/sm510/kb1013vk1-2core.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "kb1013vk1-2.h"
#include "debugger.h"
diff --git a/src/devices/cpu/sm510/kb1013vk1-2op.cpp b/src/devices/cpu/sm510/kb1013vk1-2op.cpp
index 3c5fcc548e7..377739190be 100644
--- a/src/devices/cpu/sm510/kb1013vk1-2op.cpp
+++ b/src/devices/cpu/sm510/kb1013vk1-2op.cpp
@@ -3,6 +3,7 @@
// KB1013VK1-2 opcode handlers
+#include "emu.h"
#include "kb1013vk1-2.h"
diff --git a/src/devices/cpu/sm510/sm500core.cpp b/src/devices/cpu/sm510/sm500core.cpp
index 370a4c14ebd..5e6041831a2 100644
--- a/src/devices/cpu/sm510/sm500core.cpp
+++ b/src/devices/cpu/sm510/sm500core.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "sm500.h"
#include "debugger.h"
diff --git a/src/devices/cpu/sm510/sm500op.cpp b/src/devices/cpu/sm510/sm500op.cpp
index ee4571b4e76..2fd8089e39d 100644
--- a/src/devices/cpu/sm510/sm500op.cpp
+++ b/src/devices/cpu/sm510/sm500op.cpp
@@ -3,6 +3,7 @@
// SM500 opcode handlers
+#include "emu.h"
#include "sm500.h"
diff --git a/src/devices/cpu/sm510/sm510.cpp b/src/devices/cpu/sm510/sm510.cpp
index 6fcd0fe21b5..ab1b4cb0ebb 100644
--- a/src/devices/cpu/sm510/sm510.cpp
+++ b/src/devices/cpu/sm510/sm510.cpp
@@ -34,6 +34,7 @@
*/
+#include "emu.h"
#include "sm510.h"
#include "debugger.h"
diff --git a/src/devices/cpu/sm510/sm510.h b/src/devices/cpu/sm510/sm510.h
index fe9e01484d1..03b9147e66e 100644
--- a/src/devices/cpu/sm510/sm510.h
+++ b/src/devices/cpu/sm510/sm510.h
@@ -9,7 +9,6 @@
#ifndef _SM510_H_
#define _SM510_H_
-#include "emu.h"
// I/O ports setup
diff --git a/src/devices/cpu/sm510/sm510core.cpp b/src/devices/cpu/sm510/sm510core.cpp
index c886c178cfa..323d2eb84e4 100644
--- a/src/devices/cpu/sm510/sm510core.cpp
+++ b/src/devices/cpu/sm510/sm510core.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "sm510.h"
#include "debugger.h"
diff --git a/src/devices/cpu/sm510/sm510op.cpp b/src/devices/cpu/sm510/sm510op.cpp
index 01ab9eee9d9..b8cc68de21f 100644
--- a/src/devices/cpu/sm510/sm510op.cpp
+++ b/src/devices/cpu/sm510/sm510op.cpp
@@ -3,6 +3,7 @@
// shared opcode handlers
+#include "emu.h"
#include "sm510.h"
diff --git a/src/devices/cpu/sm510/sm511core.cpp b/src/devices/cpu/sm510/sm511core.cpp
index a241ef09b52..f71e93a968e 100644
--- a/src/devices/cpu/sm510/sm511core.cpp
+++ b/src/devices/cpu/sm510/sm511core.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "sm510.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms0270.cpp b/src/devices/cpu/tms1000/tms0270.cpp
index 8c09fa49bea..48d6aa516d0 100644
--- a/src/devices/cpu/tms1000/tms0270.cpp
+++ b/src/devices/cpu/tms1000/tms0270.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "tms0270.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms0970.cpp b/src/devices/cpu/tms1000/tms0970.cpp
index 0f67ffa4055..6bf398272e0 100644
--- a/src/devices/cpu/tms1000/tms0970.cpp
+++ b/src/devices/cpu/tms1000/tms0970.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "tms0970.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms0980.cpp b/src/devices/cpu/tms1000/tms0980.cpp
index cb4a00adbde..0057db927a2 100644
--- a/src/devices/cpu/tms1000/tms0980.cpp
+++ b/src/devices/cpu/tms1000/tms0980.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "tms0980.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms1000.cpp b/src/devices/cpu/tms1000/tms1000.cpp
index a971b3e01b8..2f97dedd360 100644
--- a/src/devices/cpu/tms1000/tms1000.cpp
+++ b/src/devices/cpu/tms1000/tms1000.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "tms1000.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms1100.cpp b/src/devices/cpu/tms1000/tms1100.cpp
index f896f60d9eb..a49469aa920 100644
--- a/src/devices/cpu/tms1000/tms1100.cpp
+++ b/src/devices/cpu/tms1000/tms1100.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "tms1100.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms1400.cpp b/src/devices/cpu/tms1000/tms1400.cpp
index d8f12700289..ece13f4968e 100644
--- a/src/devices/cpu/tms1000/tms1400.cpp
+++ b/src/devices/cpu/tms1000/tms1400.cpp
@@ -9,6 +9,7 @@
*/
+#include "emu.h"
#include "tms1400.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms1k_base.cpp b/src/devices/cpu/tms1000/tms1k_base.cpp
index 8caa62493c7..8ea2eedfec8 100644
--- a/src/devices/cpu/tms1000/tms1k_base.cpp
+++ b/src/devices/cpu/tms1000/tms1k_base.cpp
@@ -65,6 +65,7 @@ unknown cycle: CME, SSE, SSS
*/
+#include "emu.h"
#include "tms1k_base.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms1000/tms1k_base.h b/src/devices/cpu/tms1000/tms1k_base.h
index 2363bccabca..98f7e61ed2e 100644
--- a/src/devices/cpu/tms1000/tms1k_base.h
+++ b/src/devices/cpu/tms1000/tms1k_base.h
@@ -12,7 +12,6 @@
#ifndef _TMS1KBASE_H_
#define _TMS1KBASE_H_
-#include "emu.h"
#include "machine/pla.h"
diff --git a/src/devices/cpu/tms1000/tp0320.cpp b/src/devices/cpu/tms1000/tp0320.cpp
index 03c66c87e7f..f6b162ca728 100644
--- a/src/devices/cpu/tms1000/tp0320.cpp
+++ b/src/devices/cpu/tms1000/tp0320.cpp
@@ -9,6 +9,7 @@
*/
+#include "emu.h"
#include "tp0320.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms7000/tms7000.cpp b/src/devices/cpu/tms7000/tms7000.cpp
index 9e810a02407..a064d0fc9ad 100644
--- a/src/devices/cpu/tms7000/tms7000.cpp
+++ b/src/devices/cpu/tms7000/tms7000.cpp
@@ -17,6 +17,7 @@
*****************************************************************************/
+#include "emu.h"
#include "tms7000.h"
// TMS7000 is the most basic one, 128 bytes internal RAM and no internal ROM.
diff --git a/src/devices/cpu/tms7000/tms7000.h b/src/devices/cpu/tms7000/tms7000.h
index 84298d8fa05..91bc2faec93 100644
--- a/src/devices/cpu/tms7000/tms7000.h
+++ b/src/devices/cpu/tms7000/tms7000.h
@@ -11,7 +11,6 @@
#ifndef __TMS7000_H__
#define __TMS7000_H__
-#include "emu.h"
#include "debugger.h"
diff --git a/src/devices/cpu/tms7000/tms7000op.cpp b/src/devices/cpu/tms7000/tms7000op.cpp
index dcc2db25a44..d960b37ec6d 100644
--- a/src/devices/cpu/tms7000/tms7000op.cpp
+++ b/src/devices/cpu/tms7000/tms7000op.cpp
@@ -3,6 +3,7 @@
// TMS7000 opcode handlers
+#include "emu.h"
#include "tms7000.h"
// flag helpers
diff --git a/src/devices/cpu/tms9900/ti990_10.cpp b/src/devices/cpu/tms9900/ti990_10.cpp
index 8b0a1b5bed6..586f8bee8c9 100644
--- a/src/devices/cpu/tms9900/ti990_10.cpp
+++ b/src/devices/cpu/tms9900/ti990_10.cpp
@@ -23,6 +23,7 @@
**** This is WORK IN PROGRESS ****
*/
+#include "emu.h"
#include "ti990_10.h"
/*
diff --git a/src/devices/cpu/tms9900/ti990_10.h b/src/devices/cpu/tms9900/ti990_10.h
index 8b49abbff41..5e33d03435f 100644
--- a/src/devices/cpu/tms9900/ti990_10.h
+++ b/src/devices/cpu/tms9900/ti990_10.h
@@ -8,7 +8,6 @@
#ifndef __TI990_10_H__
#define __TI990_10_H__
-#include "emu.h"
#include "debugger.h"
#include "tms99com.h"
diff --git a/src/devices/cpu/tms9900/tms9900.cpp b/src/devices/cpu/tms9900/tms9900.cpp
index f5b95e4392f..5181d9cd1c7 100644
--- a/src/devices/cpu/tms9900/tms9900.cpp
+++ b/src/devices/cpu/tms9900/tms9900.cpp
@@ -108,6 +108,7 @@
Michael Zapf, June 2012
*/
+#include "emu.h"
#include "tms9900.h"
#define NOPRG -1
diff --git a/src/devices/cpu/tms9900/tms9900.h b/src/devices/cpu/tms9900/tms9900.h
index 0a110285637..2380e9e815f 100644
--- a/src/devices/cpu/tms9900/tms9900.h
+++ b/src/devices/cpu/tms9900/tms9900.h
@@ -11,7 +11,6 @@
#ifndef __TMS9900_H__
#define __TMS9900_H__
-#include "emu.h"
#include "debugger.h"
#include "tms99com.h"
diff --git a/src/devices/cpu/tms9900/tms9980a.cpp b/src/devices/cpu/tms9900/tms9980a.cpp
index b6466c52463..46c76797d81 100644
--- a/src/devices/cpu/tms9900/tms9980a.cpp
+++ b/src/devices/cpu/tms9900/tms9980a.cpp
@@ -51,6 +51,7 @@
Michael Zapf, 2012
*/
+#include "emu.h"
#include "tms9980a.h"
/*
diff --git a/src/devices/cpu/tms9900/tms9980a.h b/src/devices/cpu/tms9900/tms9980a.h
index 8a7a409f2b8..9ffbab84a58 100644
--- a/src/devices/cpu/tms9900/tms9980a.h
+++ b/src/devices/cpu/tms9900/tms9980a.h
@@ -8,7 +8,6 @@
#ifndef __TMS9980A_H__
#define __TMS9980A_H__
-#include "emu.h"
#include "debugger.h"
#include "tms9900.h"
diff --git a/src/devices/cpu/tms9900/tms9995.cpp b/src/devices/cpu/tms9900/tms9995.cpp
index 67665324a5a..ec12a230276 100644
--- a/src/devices/cpu/tms9900/tms9995.cpp
+++ b/src/devices/cpu/tms9900/tms9995.cpp
@@ -89,6 +89,7 @@
Michael Zapf, June 2012
*/
+#include "emu.h"
#include "tms9995.h"
#define NOPRG -1
diff --git a/src/devices/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h
index 57c92db775b..cbbaaa0c3ce 100644
--- a/src/devices/cpu/tms9900/tms9995.h
+++ b/src/devices/cpu/tms9900/tms9995.h
@@ -10,7 +10,6 @@
#ifndef __TMS9995_H__
#define __TMS9995_H__
-#include "emu.h"
#include "debugger.h"
#include "tms99com.h"
diff --git a/src/devices/cpu/ucom4/ucom4.cpp b/src/devices/cpu/ucom4/ucom4.cpp
index aca4996b5fa..3d2b164672f 100644
--- a/src/devices/cpu/ucom4/ucom4.cpp
+++ b/src/devices/cpu/ucom4/ucom4.cpp
@@ -20,6 +20,7 @@
*/
+#include "emu.h"
#include "ucom4.h"
#include "debugger.h"
diff --git a/src/devices/cpu/ucom4/ucom4.h b/src/devices/cpu/ucom4/ucom4.h
index 0dcd43df7f5..851ac4ad423 100644
--- a/src/devices/cpu/ucom4/ucom4.h
+++ b/src/devices/cpu/ucom4/ucom4.h
@@ -9,7 +9,6 @@
#ifndef _UCOM4_H_
#define _UCOM4_H_
-#include "emu.h"
// I/O ports setup
diff --git a/src/devices/cpu/ucom4/ucom4op.cpp b/src/devices/cpu/ucom4/ucom4op.cpp
index 67d12a95dad..4a988cc34e2 100644
--- a/src/devices/cpu/ucom4/ucom4op.cpp
+++ b/src/devices/cpu/ucom4/ucom4op.cpp
@@ -3,6 +3,7 @@
// uCOM-4 opcode handlers
+#include "emu.h"
#include "ucom4.h"
diff --git a/src/devices/cpu/z80/kl5c80a12.cpp b/src/devices/cpu/z80/kl5c80a12.cpp
index 954a6933aa9..fcf8f577a27 100644
--- a/src/devices/cpu/z80/kl5c80a12.cpp
+++ b/src/devices/cpu/z80/kl5c80a12.cpp
@@ -13,6 +13,7 @@
***************************************************************************/
+#include "emu.h"
#include "kl5c80a12.h"
const device_type KL5C80A12 = &device_creator<kl5c80a12_device>;
diff --git a/src/devices/cpu/z80/kl5c80a12.h b/src/devices/cpu/z80/kl5c80a12.h
index 534dbfa9e7f..a4e9fc66cea 100644
--- a/src/devices/cpu/z80/kl5c80a12.h
+++ b/src/devices/cpu/z80/kl5c80a12.h
@@ -18,7 +18,6 @@
#ifndef __KL5C80A12__
#define __KL5C80A12__
-#include "emu.h"
#include "z80.h"
#include "machine/z80ctc.h"
diff --git a/src/devices/cpu/z80/tmpz84c011.cpp b/src/devices/cpu/z80/tmpz84c011.cpp
index 970db6624bd..2ae617f502d 100644
--- a/src/devices/cpu/z80/tmpz84c011.cpp
+++ b/src/devices/cpu/z80/tmpz84c011.cpp
@@ -10,6 +10,7 @@
***************************************************************************/
+#include "emu.h"
#include "tmpz84c011.h"
const device_type TMPZ84C011 = &device_creator<tmpz84c011_device>;
diff --git a/src/devices/cpu/z80/tmpz84c011.h b/src/devices/cpu/z80/tmpz84c011.h
index bd9a77dca4e..9eaa3e2b0c3 100644
--- a/src/devices/cpu/z80/tmpz84c011.h
+++ b/src/devices/cpu/z80/tmpz84c011.h
@@ -12,7 +12,6 @@
#ifndef __TMPZ84C011__
#define __TMPZ84C011__
-#include "emu.h"
#include "z80.h"
#include "machine/z80ctc.h"
diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp
index 19a7279f31f..b00a7013b5d 100644
--- a/src/devices/cpu/z80/tmpz84c015.cpp
+++ b/src/devices/cpu/z80/tmpz84c015.cpp
@@ -12,6 +12,7 @@
***************************************************************************/
+#include "emu.h"
#include "tmpz84c015.h"
const device_type TMPZ84C015 = &device_creator<tmpz84c015_device>;
diff --git a/src/devices/cpu/z80/tmpz84c015.h b/src/devices/cpu/z80/tmpz84c015.h
index 4efab045f24..90ee3154530 100644
--- a/src/devices/cpu/z80/tmpz84c015.h
+++ b/src/devices/cpu/z80/tmpz84c015.h
@@ -12,7 +12,6 @@
#ifndef __TMPZ84C015__
#define __TMPZ84C015__
-#include "emu.h"
#include "z80.h"
#include "machine/z80dart.h"
#include "machine/z80ctc.h"
diff --git a/src/devices/imagedev/mfmhd.h b/src/devices/imagedev/mfmhd.h
index 6d76d5bff9d..e100a14f7d0 100644
--- a/src/devices/imagedev/mfmhd.h
+++ b/src/devices/imagedev/mfmhd.h
@@ -14,7 +14,6 @@
#ifndef __MFMHD__
#define __MFMHD__
-#include "emu.h"
#include "imagedev/harddriv.h"
#include "formats/mfm_hd.h"
diff --git a/src/devices/machine/40105.cpp b/src/devices/machine/40105.cpp
index 63db529d3bd..5eab87e1bf2 100644
--- a/src/devices/machine/40105.cpp
+++ b/src/devices/machine/40105.cpp
@@ -15,6 +15,7 @@
**********************************************************************/
+#include "emu.h"
#include "40105.h"
diff --git a/src/devices/machine/40105.h b/src/devices/machine/40105.h
index 04495bfa352..e65fb31f381 100644
--- a/src/devices/machine/40105.h
+++ b/src/devices/machine/40105.h
@@ -22,7 +22,6 @@
#ifndef __CMOS_40105__
#define __CMOS_40105__
-#include "emu.h"
#include <queue>
diff --git a/src/devices/machine/64h156.cpp b/src/devices/machine/64h156.cpp
index 849109f1b11..dfebc6dd0bd 100644
--- a/src/devices/machine/64h156.cpp
+++ b/src/devices/machine/64h156.cpp
@@ -24,6 +24,7 @@
*/
+#include "emu.h"
#include "64h156.h"
diff --git a/src/devices/machine/64h156.h b/src/devices/machine/64h156.h
index 08d68a994e4..01184663b95 100644
--- a/src/devices/machine/64h156.h
+++ b/src/devices/machine/64h156.h
@@ -59,7 +59,6 @@
#ifndef __C64H156__
#define __C64H156__
-#include "emu.h"
#include "imagedev/floppy.h"
#include "formats/d64_dsk.h"
#include "formats/g64_dsk.h"
diff --git a/src/devices/machine/6522via.h b/src/devices/machine/6522via.h
index 316606ea35c..0c06863494c 100644
--- a/src/devices/machine/6522via.h
+++ b/src/devices/machine/6522via.h
@@ -18,7 +18,6 @@
#ifndef __6522VIA_H__
#define __6522VIA_H__
-#include "emu.h"
diff --git a/src/devices/machine/6532riot.h b/src/devices/machine/6532riot.h
index 4ab030fe96d..b4d558cbcc6 100644
--- a/src/devices/machine/6532riot.h
+++ b/src/devices/machine/6532riot.h
@@ -11,7 +11,6 @@
#ifndef __RIOT6532_H__
#define __RIOT6532_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/68153bim.h b/src/devices/machine/68153bim.h
index f9df8a1b1e1..ab59c94c1c1 100644
--- a/src/devices/machine/68153bim.h
+++ b/src/devices/machine/68153bim.h
@@ -33,7 +33,6 @@
#ifndef MC68153BIM_H
#define MC68153BIM_H
-#include "emu.h"
//**************************************************************************
// DEVICE CONFIGURATION MACROS
diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h
index 41ce815d147..7eb3197d255 100644
--- a/src/devices/machine/6821pia.h
+++ b/src/devices/machine/6821pia.h
@@ -24,7 +24,6 @@
#ifndef __6821PIA_H__
#define __6821PIA_H__
-#include "emu.h"
diff --git a/src/devices/machine/68230pit.cpp b/src/devices/machine/68230pit.cpp
index 32b79ccc5a9..f7351c20217 100644
--- a/src/devices/machine/68230pit.cpp
+++ b/src/devices/machine/68230pit.cpp
@@ -21,6 +21,7 @@
* - Add appropriate buffering for each submode
**********************************************************************/
+#include "emu.h"
#include "68230pit.h"
#define LOG_GENERAL 0x01
diff --git a/src/devices/machine/68230pit.h b/src/devices/machine/68230pit.h
index 396ba854891..80614f926cb 100644
--- a/src/devices/machine/68230pit.h
+++ b/src/devices/machine/68230pit.h
@@ -37,7 +37,6 @@
#ifndef __68230PIT_H__
#define __68230PIT_H__
-#include "emu.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
diff --git a/src/devices/machine/68307.cpp b/src/devices/machine/68307.cpp
index 77f85cc22c2..58865272653 100644
--- a/src/devices/machine/68307.cpp
+++ b/src/devices/machine/68307.cpp
@@ -2,6 +2,7 @@
// copyright-holders:David Haywood
/* 68307 */
+#include "emu.h"
#include "68307.h"
/* 68307 SERIAL Module */
diff --git a/src/devices/machine/68307.h b/src/devices/machine/68307.h
index dba86a8f996..b3e2cd4b8fd 100644
--- a/src/devices/machine/68307.h
+++ b/src/devices/machine/68307.h
@@ -7,7 +7,6 @@
#ifndef __M68307_H__
#define __M68307_H__
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "68307sim.h"
diff --git a/src/devices/machine/68340.cpp b/src/devices/machine/68340.cpp
index 312139f528e..79b1e55331c 100644
--- a/src/devices/machine/68340.cpp
+++ b/src/devices/machine/68340.cpp
@@ -2,6 +2,7 @@
// copyright-holders:David Haywood
/* 68340 */
+#include "emu.h"
#include "68340.h"
diff --git a/src/devices/machine/68340.h b/src/devices/machine/68340.h
index b6883423193..c0c76f467e3 100644
--- a/src/devices/machine/68340.h
+++ b/src/devices/machine/68340.h
@@ -7,7 +7,6 @@
#ifndef __M68340_H__
#define __M68340_H__
-#include "emu.h"
#include "cpu/m68000/m68000.h"
#include "68340sim.h"
diff --git a/src/devices/machine/6840ptm.h b/src/devices/machine/6840ptm.h
index d07586aba76..0ee38b0be4f 100644
--- a/src/devices/machine/6840ptm.h
+++ b/src/devices/machine/6840ptm.h
@@ -13,7 +13,6 @@
#ifndef __6840PTM_H__
#define __6840PTM_H__
-#include "emu.h"
diff --git a/src/devices/machine/6850acia.h b/src/devices/machine/6850acia.h
index 4185bee00a2..ebf7594aeec 100644
--- a/src/devices/machine/6850acia.h
+++ b/src/devices/machine/6850acia.h
@@ -13,7 +13,6 @@
#ifndef __ACIA6850_H__
#define __ACIA6850_H__
-#include "emu.h"
#define MCFG_ACIA6850_TXD_HANDLER(_devcb) \
devcb = &acia6850_device::set_txd_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/machine/68561mpcc.h b/src/devices/machine/68561mpcc.h
index bc78e14df62..9f1f78be4d7 100644
--- a/src/devices/machine/68561mpcc.h
+++ b/src/devices/machine/68561mpcc.h
@@ -38,7 +38,6 @@
#ifndef MPCC68561_H
#define MPCC68561_H
-#include "emu.h"
/* Variant ADD macros - use the right one to enable the right feature set! */
#define MCFG_MPCC68560_ADD(_tag, _clock, _rx, _tx) \
diff --git a/src/devices/machine/7200fifo.cpp b/src/devices/machine/7200fifo.cpp
index d8bab32e758..6a08e548aa4 100644
--- a/src/devices/machine/7200fifo.cpp
+++ b/src/devices/machine/7200fifo.cpp
@@ -10,6 +10,7 @@
**********************************************************************/
+#include "emu.h"
#include "machine/7200fifo.h"
diff --git a/src/devices/machine/7200fifo.h b/src/devices/machine/7200fifo.h
index ea58ea0dfa7..c1ebf2d36e5 100644
--- a/src/devices/machine/7200fifo.h
+++ b/src/devices/machine/7200fifo.h
@@ -50,7 +50,6 @@ The following chips are functionally equivalent and pin-compatible.
#ifndef _7200FIFO_H
#define _7200FIFO_H
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/7400.h b/src/devices/machine/7400.h
index 9766e001d55..69ddaa2685a 100644
--- a/src/devices/machine/7400.h
+++ b/src/devices/machine/7400.h
@@ -33,7 +33,6 @@
#ifndef TTL7400_H
#define TTL7400_H
-#include "emu.h"
#define MCFG_7400_Y1_CB(_devcb) \
devcb = &ttl7400_device::set_y1_cb(*device, DEVCB_##_devcb);
diff --git a/src/devices/machine/7404.h b/src/devices/machine/7404.h
index c6516cd3b38..f7192b802e9 100644
--- a/src/devices/machine/7404.h
+++ b/src/devices/machine/7404.h
@@ -60,7 +60,6 @@
#ifndef TTL7404_H
#define TTL7404_H
-#include "emu.h"
#define MCFG_7404_Y1_CB(_devcb) \
devcb = &ttl7404_device::set_y1_cb(*device, DEVCB_##_devcb);
diff --git a/src/devices/machine/74123.h b/src/devices/machine/74123.h
index 0fd9ad6ad70..6019369e05a 100644
--- a/src/devices/machine/74123.h
+++ b/src/devices/machine/74123.h
@@ -50,7 +50,6 @@
#ifndef __TTL74123_H__
#define __TTL74123_H__
-#include "emu.h"
diff --git a/src/devices/machine/74153.cpp b/src/devices/machine/74153.cpp
index b6ec97da524..42d08d48eae 100644
--- a/src/devices/machine/74153.cpp
+++ b/src/devices/machine/74153.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include <algorithm>
#include "74153.h"
diff --git a/src/devices/machine/74153.h b/src/devices/machine/74153.h
index 464e030ba64..63ed5abcf2e 100644
--- a/src/devices/machine/74153.h
+++ b/src/devices/machine/74153.h
@@ -23,7 +23,6 @@
#ifndef MAME_DEVICES_MACHINE_74153_H
#define MAME_DEVICES_MACHINE_74153_H
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/74157.h b/src/devices/machine/74157.h
index 0a677e549dc..d88ca452133 100644
--- a/src/devices/machine/74157.h
+++ b/src/devices/machine/74157.h
@@ -23,7 +23,6 @@
#ifndef DEVICES_MACHINE_74157_H
#define DEVICES_MACHINE_74157_H
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/74161.h b/src/devices/machine/74161.h
index 5a646962531..da975c09205 100644
--- a/src/devices/machine/74161.h
+++ b/src/devices/machine/74161.h
@@ -57,7 +57,6 @@
#ifndef TTL74161_H
#define TTL74161_H
-#include "emu.h"
#define MCFG_7416x_QA_CB(_devcb) \
devcb = &ttl7416x_device::set_qa_cb(*device, DEVCB_##_devcb);
diff --git a/src/devices/machine/74175.h b/src/devices/machine/74175.h
index 381d3e5f6ef..c22aa05747f 100644
--- a/src/devices/machine/74175.h
+++ b/src/devices/machine/74175.h
@@ -47,7 +47,6 @@
#ifndef TTL74175_H
#define TTL74175_H
-#include "emu.h"
#define MCFG_74174_Q1_CB(_devcb) \
devcb = &ttl741745_device::set_q1_cb(*device, DEVCB_##_devcb);
diff --git a/src/devices/machine/74181.cpp b/src/devices/machine/74181.cpp
index ea92cb061d5..8a2802b63d2 100644
--- a/src/devices/machine/74181.cpp
+++ b/src/devices/machine/74181.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "74181.h"
diff --git a/src/devices/machine/74181.h b/src/devices/machine/74181.h
index d883b24995f..b6aed4bb0c2 100644
--- a/src/devices/machine/74181.h
+++ b/src/devices/machine/74181.h
@@ -13,7 +13,6 @@
#ifndef __74181_H__
#define __74181_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/7474.h b/src/devices/machine/7474.h
index 7cafd0563be..a58fc46c854 100644
--- a/src/devices/machine/7474.h
+++ b/src/devices/machine/7474.h
@@ -44,7 +44,6 @@
#ifndef __TTL7474_H__
#define __TTL7474_H__
-#include "emu.h"
diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp
index 6ab08b53386..ff0dc3b6727 100644
--- a/src/devices/machine/8042kbdc.cpp
+++ b/src/devices/machine/8042kbdc.cpp
@@ -175,6 +175,7 @@
*********************************************************************/
+#include "emu.h"
#include "machine/8042kbdc.h"
diff --git a/src/devices/machine/8042kbdc.h b/src/devices/machine/8042kbdc.h
index a08279f77fa..491672dd3e7 100644
--- a/src/devices/machine/8042kbdc.h
+++ b/src/devices/machine/8042kbdc.h
@@ -12,7 +12,6 @@
#ifndef KBDC8042_H
#define KBDC8042_H
-#include "emu.h"
#include "machine/pckeybrd.h"
enum kbdc8042_type_t
diff --git a/src/devices/machine/82s129.h b/src/devices/machine/82s129.h
index 3758d9f3dd9..604645b9c2d 100644
--- a/src/devices/machine/82s129.h
+++ b/src/devices/machine/82s129.h
@@ -45,7 +45,6 @@
#ifndef PROM82S129_H
#define PROM82S129_H
-#include "emu.h"
#define MCFG_82S126_OUTPUT_CB(_devcb) \
devcb = &prom82s129_base_device::set_out_cb(*device, DEVCB_##_devcb);
diff --git a/src/devices/machine/8364_paula.cpp b/src/devices/machine/8364_paula.cpp
index 561ca6738fa..496d78b916d 100644
--- a/src/devices/machine/8364_paula.cpp
+++ b/src/devices/machine/8364_paula.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "8364_paula.h"
diff --git a/src/devices/machine/8364_paula.h b/src/devices/machine/8364_paula.h
index df5bfb5832e..4dbd041c93f 100644
--- a/src/devices/machine/8364_paula.h
+++ b/src/devices/machine/8364_paula.h
@@ -42,7 +42,6 @@
#ifndef MAME_DEVICES_MACHINE_8364_PAULA_H
#define MAME_DEVICES_MACHINE_8364_PAULA_H
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/adc0808.h b/src/devices/machine/adc0808.h
index 3bb7aa1dff8..78aea540e05 100644
--- a/src/devices/machine/adc0808.h
+++ b/src/devices/machine/adc0808.h
@@ -28,7 +28,6 @@
#ifndef __ADC0808__
#define __ADC0808__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/adc083x.h b/src/devices/machine/adc083x.h
index b8fe1268591..dd26370bf3f 100644
--- a/src/devices/machine/adc083x.h
+++ b/src/devices/machine/adc083x.h
@@ -11,7 +11,6 @@
#ifndef __ADC083X_H__
#define __ADC083X_H__
-#include "emu.h"
/***************************************************************************
TYPE DEFINITIONS
diff --git a/src/devices/machine/akiko.cpp b/src/devices/machine/akiko.cpp
index 1a34009a7ce..50d2f67b6a1 100644
--- a/src/devices/machine/akiko.cpp
+++ b/src/devices/machine/akiko.cpp
@@ -13,6 +13,7 @@
***************************************************************************/
+#include "emu.h"
#include "akiko.h"
#include "imagedev/chd_cd.h"
#include "coreutil.h"
diff --git a/src/devices/machine/akiko.h b/src/devices/machine/akiko.h
index d2c11b9982c..23a33cd38c9 100644
--- a/src/devices/machine/akiko.h
+++ b/src/devices/machine/akiko.h
@@ -17,7 +17,6 @@
#ifndef __AKIKO_H__
#define __AKIKO_H__
-#include "emu.h"
#include "cdrom.h"
#include "sound/cdda.h"
diff --git a/src/devices/machine/am2847.cpp b/src/devices/machine/am2847.cpp
index ef8954c859e..574ddd81acc 100644
--- a/src/devices/machine/am2847.cpp
+++ b/src/devices/machine/am2847.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "am2847.h"
const device_type AM2847 = &device_creator<am2847_device>;
diff --git a/src/devices/machine/am2847.h b/src/devices/machine/am2847.h
index 86011f57e18..0e70d2bf37f 100644
--- a/src/devices/machine/am2847.h
+++ b/src/devices/machine/am2847.h
@@ -45,7 +45,6 @@
#ifndef AM2847_H
#define AM2847_H
-#include "emu.h"
#define MCFG_AM2847_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, AM2847, 0)
diff --git a/src/devices/machine/am9517a.cpp b/src/devices/machine/am9517a.cpp
index 5b370560847..a7b652a79ed 100644
--- a/src/devices/machine/am9517a.cpp
+++ b/src/devices/machine/am9517a.cpp
@@ -39,6 +39,7 @@
*/
+#include "emu.h"
#include "am9517a.h"
diff --git a/src/devices/machine/am9517a.h b/src/devices/machine/am9517a.h
index fd309c935e2..955467fbfba 100644
--- a/src/devices/machine/am9517a.h
+++ b/src/devices/machine/am9517a.h
@@ -34,7 +34,6 @@
#ifndef __AM9517A__
#define __AM9517A__
-#include "emu.h"
/***************************************************************************
diff --git a/src/devices/machine/amigafdc.h b/src/devices/machine/amigafdc.h
index 3a91a50ea15..0d3846301df 100644
--- a/src/devices/machine/amigafdc.h
+++ b/src/devices/machine/amigafdc.h
@@ -3,7 +3,6 @@
#ifndef AMIGAFDC_H
#define AMIGAFDC_H
-#include "emu.h"
#include "imagedev/floppy.h"
#define MCFG_AMIGA_FDC_INDEX_CALLBACK(_write) \
diff --git a/src/devices/machine/appldriv.h b/src/devices/machine/appldriv.h
index 1725c1a5814..acb85020189 100644
--- a/src/devices/machine/appldriv.h
+++ b/src/devices/machine/appldriv.h
@@ -11,7 +11,6 @@
#ifndef APPLDRIV_H
#define APPLDRIV_H
-#include "emu.h"
#include "imagedev/flopdrv.h"
#include "formats/ap2_dsk.h"
diff --git a/src/devices/machine/applefdc.cpp b/src/devices/machine/applefdc.cpp
index 56ea8288fe3..8b0f6ed4cd2 100644
--- a/src/devices/machine/applefdc.cpp
+++ b/src/devices/machine/applefdc.cpp
@@ -37,6 +37,7 @@
*********************************************************************/
+#include "emu.h"
#include "applefdc.h"
diff --git a/src/devices/machine/applefdc.h b/src/devices/machine/applefdc.h
index 872e69031ba..dd0e1279b08 100644
--- a/src/devices/machine/applefdc.h
+++ b/src/devices/machine/applefdc.h
@@ -17,7 +17,6 @@
#ifndef __APPLEFDC_H__
#define __APPLEFDC_H__
-#include "emu.h"
diff --git a/src/devices/machine/at29x.cpp b/src/devices/machine/at29x.cpp
index 0842a32a7dc..c6dcf109fe0 100644
--- a/src/devices/machine/at29x.cpp
+++ b/src/devices/machine/at29x.cpp
@@ -37,6 +37,7 @@
MZ, Aug 2015
*/
+#include "emu.h"
#include "at29x.h"
#define TRACE_PRG 0
diff --git a/src/devices/machine/at29x.h b/src/devices/machine/at29x.h
index ca37c31b0db..da9b1d8b3e1 100644
--- a/src/devices/machine/at29x.h
+++ b/src/devices/machine/at29x.h
@@ -10,7 +10,6 @@
#ifndef __AT29X__
#define __AT29X__
-#include "emu.h"
extern const device_type AT29C020;
extern const device_type AT29C040;
diff --git a/src/devices/machine/at45dbxx.cpp b/src/devices/machine/at45dbxx.cpp
index 13255b298e0..6788609cc56 100644
--- a/src/devices/machine/at45dbxx.cpp
+++ b/src/devices/machine/at45dbxx.cpp
@@ -12,6 +12,7 @@
*/
+#include "emu.h"
#include "at45dbxx.h"
#define LOG_LEVEL 1
diff --git a/src/devices/machine/at45dbxx.h b/src/devices/machine/at45dbxx.h
index 85425cd1ded..058672d457d 100644
--- a/src/devices/machine/at45dbxx.h
+++ b/src/devices/machine/at45dbxx.h
@@ -15,7 +15,6 @@
#ifndef _AT45DBXX_H_
#define _AT45DBXX_H_
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/at_keybc.h b/src/devices/machine/at_keybc.h
index 591b43f9d89..8a290234ef5 100644
--- a/src/devices/machine/at_keybc.h
+++ b/src/devices/machine/at_keybc.h
@@ -11,7 +11,6 @@
#ifndef __AT_KEYBC_H__
#define __AT_KEYBC_H__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/devices/machine/atadev.cpp b/src/devices/machine/atadev.cpp
index 691ffe7562f..f2f5686c690 100644
--- a/src/devices/machine/atadev.cpp
+++ b/src/devices/machine/atadev.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "atadev.h"
//-------------------------------------------------
diff --git a/src/devices/machine/atadev.h b/src/devices/machine/atadev.h
index d889bc8f346..8115a6e4dc1 100644
--- a/src/devices/machine/atadev.h
+++ b/src/devices/machine/atadev.h
@@ -13,7 +13,6 @@
#ifndef __ATADEV_H__
#define __ATADEV_H__
-#include "emu.h"
// ======================> ata_device_interface
diff --git a/src/devices/machine/ataflash.cpp b/src/devices/machine/ataflash.cpp
index 21c5289138d..c70f0d82a33 100644
--- a/src/devices/machine/ataflash.cpp
+++ b/src/devices/machine/ataflash.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "ataflash.h"
const device_type ATA_FLASH_PCCARD = &device_creator<ata_flash_pccard_device>;
diff --git a/src/devices/machine/atahle.cpp b/src/devices/machine/atahle.cpp
index 344b305771b..ad94f6a4f69 100644
--- a/src/devices/machine/atahle.cpp
+++ b/src/devices/machine/atahle.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "atahle.h"
#define VERBOSE 0
diff --git a/src/devices/machine/atapicdr.cpp b/src/devices/machine/atapicdr.cpp
index 268a5a71b4c..7bda20dc96e 100644
--- a/src/devices/machine/atapicdr.cpp
+++ b/src/devices/machine/atapicdr.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "atapicdr.h"
#define SCSI_SENSE_ASC_MEDIUM_NOT_PRESENT 0x3a
diff --git a/src/devices/machine/atapihle.cpp b/src/devices/machine/atapihle.cpp
index 010921e944f..24d2c901f74 100644
--- a/src/devices/machine/atapihle.cpp
+++ b/src/devices/machine/atapihle.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "atapihle.h"
atapi_hle_device::atapi_hle_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/devices/machine/autoconfig.cpp b/src/devices/machine/autoconfig.cpp
index e05d153be63..2a4a0a80aec 100644
--- a/src/devices/machine/autoconfig.cpp
+++ b/src/devices/machine/autoconfig.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "autoconfig.h"
diff --git a/src/devices/machine/autoconfig.h b/src/devices/machine/autoconfig.h
index f061f0d2e7e..a5c4279153e 100644
--- a/src/devices/machine/autoconfig.h
+++ b/src/devices/machine/autoconfig.h
@@ -11,7 +11,6 @@
#ifndef __AUTOCONFIG_H__
#define __AUTOCONFIG_H__
-#include "emu.h"
class amiga_autoconfig
{
diff --git a/src/devices/machine/bankdev.cpp b/src/devices/machine/bankdev.cpp
index be9bc47d63d..71557056253 100644
--- a/src/devices/machine/bankdev.cpp
+++ b/src/devices/machine/bankdev.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "bankdev.h"
// device type definition
diff --git a/src/devices/machine/bankdev.h b/src/devices/machine/bankdev.h
index 9b162780ea0..ce692c8b319 100644
--- a/src/devices/machine/bankdev.h
+++ b/src/devices/machine/bankdev.h
@@ -5,7 +5,6 @@
#ifndef __BANKDEV_H__
#define __BANKDEV_H__
-#include "emu.h"
#define MCFG_ADDRESS_MAP_BANK_ENDIANNESS(_endianness) \
address_map_bank_device::set_endianness(*device, _endianness);
diff --git a/src/devices/machine/cdp1852.cpp b/src/devices/machine/cdp1852.cpp
index 2bfae3f3a5a..5539da4c40e 100644
--- a/src/devices/machine/cdp1852.cpp
+++ b/src/devices/machine/cdp1852.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "cdp1852.h"
diff --git a/src/devices/machine/cdp1852.h b/src/devices/machine/cdp1852.h
index dafdf4147cf..61ab5092001 100644
--- a/src/devices/machine/cdp1852.h
+++ b/src/devices/machine/cdp1852.h
@@ -26,7 +26,6 @@
#ifndef __CDP1852__
#define __CDP1852__
-#include "emu.h"
diff --git a/src/devices/machine/cdp1871.cpp b/src/devices/machine/cdp1871.cpp
index 2a3e8444f3f..9e219c1e460 100644
--- a/src/devices/machine/cdp1871.cpp
+++ b/src/devices/machine/cdp1871.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "cdp1871.h"
diff --git a/src/devices/machine/cdp1871.h b/src/devices/machine/cdp1871.h
index e6759505403..eb939aa92e9 100644
--- a/src/devices/machine/cdp1871.h
+++ b/src/devices/machine/cdp1871.h
@@ -34,7 +34,6 @@
#ifndef __CDP1871__
#define __CDP1871__
-#include "emu.h"
diff --git a/src/devices/machine/cdp1879.cpp b/src/devices/machine/cdp1879.cpp
index 4d0b588dd0c..a4ed8e39a13 100644
--- a/src/devices/machine/cdp1879.cpp
+++ b/src/devices/machine/cdp1879.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "cdp1879.h"
#include "machine/timehelp.h"
diff --git a/src/devices/machine/cdp1879.h b/src/devices/machine/cdp1879.h
index ed45bd9972b..1a5a68389b7 100644
--- a/src/devices/machine/cdp1879.h
+++ b/src/devices/machine/cdp1879.h
@@ -11,7 +11,6 @@
#ifndef __CDP1879_H__
#define __CDP1879_H__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/clock.cpp b/src/devices/machine/clock.cpp
index e933f28ddda..ea3b686399e 100644
--- a/src/devices/machine/clock.cpp
+++ b/src/devices/machine/clock.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "clock.h"
const device_type CLOCK = &device_creator<clock_device>;
diff --git a/src/devices/machine/clock.h b/src/devices/machine/clock.h
index 5b7d9ed2e6a..0f11c6b1173 100644
--- a/src/devices/machine/clock.h
+++ b/src/devices/machine/clock.h
@@ -5,7 +5,6 @@
#pragma once
-#include "emu.h"
#define MCFG_CLOCK_ADD(_tag, _clock) \
MCFG_DEVICE_ADD(_tag, CLOCK, _clock)
diff --git a/src/devices/machine/com8116.cpp b/src/devices/machine/com8116.cpp
index 84d638c02a7..389ef52ac63 100644
--- a/src/devices/machine/com8116.cpp
+++ b/src/devices/machine/com8116.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "com8116.h"
diff --git a/src/devices/machine/com8116.h b/src/devices/machine/com8116.h
index 05e1c2acb89..4cd3feddb8f 100644
--- a/src/devices/machine/com8116.h
+++ b/src/devices/machine/com8116.h
@@ -26,7 +26,6 @@
#ifndef __COM8116__
#define __COM8116__
-#include "emu.h"
diff --git a/src/devices/machine/corvushd.h b/src/devices/machine/corvushd.h
index 1008e8eb9dc..129cbfcf3e9 100644
--- a/src/devices/machine/corvushd.h
+++ b/src/devices/machine/corvushd.h
@@ -15,7 +15,6 @@
#ifndef CORVUSHD_H_
#define CORVUSHD_H_
-#include "emu.h"
#include "imagedev/harddriv.h"
#include <ctype.h>
diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp
index e7678ac1537..2e268662f85 100644
--- a/src/devices/machine/cr511b.cpp
+++ b/src/devices/machine/cr511b.cpp
@@ -9,6 +9,7 @@
***************************************************************************/
+#include "emu.h"
#include "cr511b.h"
diff --git a/src/devices/machine/cr511b.h b/src/devices/machine/cr511b.h
index a5ab90d6bf6..90119d70b82 100644
--- a/src/devices/machine/cr511b.h
+++ b/src/devices/machine/cr511b.h
@@ -35,7 +35,6 @@
#ifndef __CR511B_H__
#define __CR511B_H__
-#include "emu.h"
#include "imagedev/chd_cd.h"
#include "sound/cdda.h"
diff --git a/src/devices/machine/cr589.cpp b/src/devices/machine/cr589.cpp
index 26ac49d1423..faf430c8ec7 100644
--- a/src/devices/machine/cr589.cpp
+++ b/src/devices/machine/cr589.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "cr589.h"
diff --git a/src/devices/machine/cs4031.h b/src/devices/machine/cs4031.h
index 9a128f67913..d57d14e0a0a 100644
--- a/src/devices/machine/cs4031.h
+++ b/src/devices/machine/cs4031.h
@@ -25,7 +25,6 @@
#ifndef __CS4031_H__
#define __CS4031_H__
-#include "emu.h"
#include "machine/am9517a.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
diff --git a/src/devices/machine/cs8221.h b/src/devices/machine/cs8221.h
index 6041ae76135..7ec94963eec 100644
--- a/src/devices/machine/cs8221.h
+++ b/src/devices/machine/cs8221.h
@@ -20,7 +20,6 @@
#ifndef __CS8221_H__
#define __CS8221_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/diablo_hd.cpp b/src/devices/machine/diablo_hd.cpp
index 6b32fd83495..4325a8ec941 100644
--- a/src/devices/machine/diablo_hd.cpp
+++ b/src/devices/machine/diablo_hd.cpp
@@ -3,6 +3,7 @@
/**********************************************************
* DIABLO31 and DIABLO44 hard drive support
**********************************************************/
+#include "emu.h"
#include "diablo_hd.h"
/**
diff --git a/src/devices/machine/diablo_hd.h b/src/devices/machine/diablo_hd.h
index 9601d69dc5d..4f2fc5da1b5 100644
--- a/src/devices/machine/diablo_hd.h
+++ b/src/devices/machine/diablo_hd.h
@@ -7,7 +7,6 @@
#if !defined(_DIABLO_HD_DEVICE_)
#define _DIABLO_HD_DEVICE_
-#include "emu.h"
#include "imagedev/diablo.h"
#ifndef DIABLO_DEBUG
diff --git a/src/devices/machine/dm9334.h b/src/devices/machine/dm9334.h
index fce85fac805..708aa89c782 100644
--- a/src/devices/machine/dm9334.h
+++ b/src/devices/machine/dm9334.h
@@ -70,7 +70,6 @@
#ifndef DM9334_H
#define DM9334_H
-#include "emu.h"
#define MCFG_DM9334_OUTPUT_CB(_devcb) \
devcb = &dm9334_device::set_out_cb(*device, DEVCB_##_devcb);
diff --git a/src/devices/machine/dmac.cpp b/src/devices/machine/dmac.cpp
index ae7fe93efba..e493eba7536 100644
--- a/src/devices/machine/dmac.cpp
+++ b/src/devices/machine/dmac.cpp
@@ -12,6 +12,7 @@ BOARDS:
***************************************************************************/
+#include "emu.h"
#include "dmac.h"
diff --git a/src/devices/machine/dmac.h b/src/devices/machine/dmac.h
index 6dcf201eb3b..464d7c37ed5 100644
--- a/src/devices/machine/dmac.h
+++ b/src/devices/machine/dmac.h
@@ -13,7 +13,6 @@
#ifndef __DMAC_H__
#define __DMAC_H__
-#include "emu.h"
#include "autoconfig.h"
diff --git a/src/devices/machine/dp8390.h b/src/devices/machine/dp8390.h
index 9f21cee9e75..04a4dcea137 100644
--- a/src/devices/machine/dp8390.h
+++ b/src/devices/machine/dp8390.h
@@ -3,7 +3,6 @@
#ifndef _DP8390_H_
#define _DP8390_H_
-#include "emu.h"
// device stuff
diff --git a/src/devices/machine/ds1204.h b/src/devices/machine/ds1204.h
index 20d80bad208..7c083ea0f39 100644
--- a/src/devices/machine/ds1204.h
+++ b/src/devices/machine/ds1204.h
@@ -12,7 +12,6 @@
#ifndef __DS1204_H__
#define __DS1204_H__
-#include "emu.h"
#define MCFG_DS1204_ADD( _tag ) \
MCFG_DEVICE_ADD( _tag, DS1204, 0 )
diff --git a/src/devices/machine/ds128x.cpp b/src/devices/machine/ds128x.cpp
index c39e239d6a7..a7068f59f31 100644
--- a/src/devices/machine/ds128x.cpp
+++ b/src/devices/machine/ds128x.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "ds128x.h"
/// TODO: Only DV2/DV1/DV0 == 0/1/0 is supported as the chip only has a 15 stage divider and not 22.
diff --git a/src/devices/machine/ds1302.cpp b/src/devices/machine/ds1302.cpp
index 1f5c1ad4718..a89bfed7c24 100644
--- a/src/devices/machine/ds1302.cpp
+++ b/src/devices/machine/ds1302.cpp
@@ -15,6 +15,7 @@
*/
+#include "emu.h"
#include "ds1302.h"
diff --git a/src/devices/machine/ds1302.h b/src/devices/machine/ds1302.h
index b3e318a86f0..9bc0f5c23b1 100644
--- a/src/devices/machine/ds1302.h
+++ b/src/devices/machine/ds1302.h
@@ -18,7 +18,6 @@
#ifndef __DS1302_H__
#define __DS1302_H__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/ds1315.cpp b/src/devices/machine/ds1315.cpp
index c6ab053ac4a..dbdc56b231e 100644
--- a/src/devices/machine/ds1315.cpp
+++ b/src/devices/machine/ds1315.cpp
@@ -21,6 +21,7 @@
of the magic 64 bit pattern (see read above).
**************************************************************************************/
+#include "emu.h"
#include "ds1315.h"
#include "coreutil.h"
diff --git a/src/devices/machine/ds1315.h b/src/devices/machine/ds1315.h
index 7a17f7bc085..6897bfc0091 100644
--- a/src/devices/machine/ds1315.h
+++ b/src/devices/machine/ds1315.h
@@ -13,7 +13,6 @@
#ifndef __DS1315_H__
#define __DS1315_H__
-#include "emu.h"
/***************************************************************************
diff --git a/src/devices/machine/ds1386.cpp b/src/devices/machine/ds1386.cpp
index 39b24c9dc90..5846f44ab32 100644
--- a/src/devices/machine/ds1386.cpp
+++ b/src/devices/machine/ds1386.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "ds1386.h"
#include "machine/timehelp.h"
diff --git a/src/devices/machine/ds1386.h b/src/devices/machine/ds1386.h
index d517a7c00b7..e7d0b6aaea6 100644
--- a/src/devices/machine/ds1386.h
+++ b/src/devices/machine/ds1386.h
@@ -56,7 +56,6 @@
#ifndef DS1386_H
#define DS1386_H
-#include "emu.h"
// handlers
diff --git a/src/devices/machine/ds2401.h b/src/devices/machine/ds2401.h
index bfeb5c2f6a4..d67c17221ac 100644
--- a/src/devices/machine/ds2401.h
+++ b/src/devices/machine/ds2401.h
@@ -14,7 +14,6 @@
#define MCFG_DS2401_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, DS2401, 0)
-#include "emu.h"
class ds2401_device : public device_t
{
diff --git a/src/devices/machine/ds2404.h b/src/devices/machine/ds2404.h
index 420f9f41207..237aeae176f 100644
--- a/src/devices/machine/ds2404.h
+++ b/src/devices/machine/ds2404.h
@@ -13,7 +13,6 @@
#ifndef __DS2404_H__
#define __DS2404_H__
-#include "emu.h"
diff --git a/src/devices/machine/ds75160a.cpp b/src/devices/machine/ds75160a.cpp
index 8cda22b6ad9..c7d1dfa544d 100644
--- a/src/devices/machine/ds75160a.cpp
+++ b/src/devices/machine/ds75160a.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ds75160a.h"
diff --git a/src/devices/machine/ds75160a.h b/src/devices/machine/ds75160a.h
index 877bb5a31f2..82caff1dd20 100644
--- a/src/devices/machine/ds75160a.h
+++ b/src/devices/machine/ds75160a.h
@@ -24,7 +24,6 @@
#ifndef __DS75160A__
#define __DS75160A__
-#include "emu.h"
diff --git a/src/devices/machine/ds75161a.cpp b/src/devices/machine/ds75161a.cpp
index fbb196c4c15..2e3fac35883 100644
--- a/src/devices/machine/ds75161a.cpp
+++ b/src/devices/machine/ds75161a.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "ds75161a.h"
diff --git a/src/devices/machine/ds75161a.h b/src/devices/machine/ds75161a.h
index 2330f200f16..1cbc8564694 100644
--- a/src/devices/machine/ds75161a.h
+++ b/src/devices/machine/ds75161a.h
@@ -24,7 +24,6 @@
#ifndef __DS75161A__
#define __DS75161A__
-#include "emu.h"
diff --git a/src/devices/machine/f3853.h b/src/devices/machine/f3853.h
index ee75fae052c..214ce7255fc 100644
--- a/src/devices/machine/f3853.h
+++ b/src/devices/machine/f3853.h
@@ -38,7 +38,6 @@
#ifndef __F3853_H__
#define __F3853_H__
-#include "emu.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp
index 4df67df6d39..8883bbb0b40 100644
--- a/src/devices/machine/fdc37c665gt.cpp
+++ b/src/devices/machine/fdc37c665gt.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "fdc37c665gt.h"
fdc37c665gt_device::fdc37c665gt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
diff --git a/src/devices/machine/fdc_pll.cpp b/src/devices/machine/fdc_pll.cpp
index ef93eda920d..c906aa4b28f 100644
--- a/src/devices/machine/fdc_pll.cpp
+++ b/src/devices/machine/fdc_pll.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "fdc_pll.h"
std::string fdc_pll_t::tts(attotime t)
diff --git a/src/devices/machine/fdc_pll.h b/src/devices/machine/fdc_pll.h
index 16de4c0458f..70a2e1913ef 100644
--- a/src/devices/machine/fdc_pll.h
+++ b/src/devices/machine/fdc_pll.h
@@ -7,7 +7,6 @@
* Generic pll class for floppy controllers with analog plls
*/
-#include "emu.h"
#include "imagedev/floppy.h"
class fdc_pll_t {
diff --git a/src/devices/machine/fga002.cpp b/src/devices/machine/fga002.cpp
index 5b885cb8d81..72e989153cc 100644
--- a/src/devices/machine/fga002.cpp
+++ b/src/devices/machine/fga002.cpp
@@ -42,6 +42,7 @@
//#define VERBOSE (LOG_GENERAL | LOG_SETUP)
//#define LOG_OUTPUT_FUNC printf
+#include "emu.h"
#include "logmacro.h"
#define LOGSETUP(...) LOGMASKED(LOG_SETUP, __VA_ARGS__)
diff --git a/src/devices/machine/fga002.h b/src/devices/machine/fga002.h
index b76908c765b..31e5b29371e 100644
--- a/src/devices/machine/fga002.h
+++ b/src/devices/machine/fga002.h
@@ -3,7 +3,6 @@
#ifndef __FGA002_H__
#define __FGA002_H__
-#include "emu.h"
#include "cpu/m68000/m68000.h" // The FGA002 is designed for the 68K interrupt PL0-PL2 signalling, however used on Sparc and x86 boards too
#define MCFG_FGA002_ADD(_tag, _clock) MCFG_DEVICE_ADD(_tag, FGA002, _clock)
diff --git a/src/devices/machine/gayle.cpp b/src/devices/machine/gayle.cpp
index 2127f41d87f..5e281c62511 100644
--- a/src/devices/machine/gayle.cpp
+++ b/src/devices/machine/gayle.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "gayle.h"
diff --git a/src/devices/machine/gayle.h b/src/devices/machine/gayle.h
index d59bf1c5d67..391477a0b89 100644
--- a/src/devices/machine/gayle.h
+++ b/src/devices/machine/gayle.h
@@ -13,7 +13,6 @@
#ifndef __GAYLE_H__
#define __GAYLE_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/gen_latch.h b/src/devices/machine/gen_latch.h
index a61a8e141ef..e1fc2dd57f6 100644
--- a/src/devices/machine/gen_latch.h
+++ b/src/devices/machine/gen_latch.h
@@ -11,7 +11,6 @@
#ifndef MAME_DEVICES_MACHINE_GEN_LATCH_H
#define MAME_DEVICES_MACHINE_GEN_LATCH_H
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/gt64xxx.cpp b/src/devices/machine/gt64xxx.cpp
index 8f692abd3a1..f433d68bdb1 100644
--- a/src/devices/machine/gt64xxx.cpp
+++ b/src/devices/machine/gt64xxx.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders: Aaron Giles, Ted Green
+#include "emu.h"
#include "gt64xxx.h"
/*************************************
diff --git a/src/devices/machine/hd63450.cpp b/src/devices/machine/hd63450.cpp
index 9ecbb673726..a0aa3e3b503 100644
--- a/src/devices/machine/hd63450.cpp
+++ b/src/devices/machine/hd63450.cpp
@@ -6,6 +6,7 @@
Largely based on documentation of the Sharp X68000
*/
+#include "emu.h"
#include "hd63450.h"
const device_type HD63450 = &device_creator<hd63450_device>;
diff --git a/src/devices/machine/hd63450.h b/src/devices/machine/hd63450.h
index 76e9da87b66..e620173836b 100644
--- a/src/devices/machine/hd63450.h
+++ b/src/devices/machine/hd63450.h
@@ -7,7 +7,6 @@
#define HD63450_H
#pragma once
-#include "emu.h"
#define MCFG_HD63450_DMA_END_CB(_devcb) \
diff --git a/src/devices/machine/hd64610.cpp b/src/devices/machine/hd64610.cpp
index c44cc072e61..80a08dd50e2 100644
--- a/src/devices/machine/hd64610.cpp
+++ b/src/devices/machine/hd64610.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "hd64610.h"
#include "coreutil.h"
diff --git a/src/devices/machine/hd64610.h b/src/devices/machine/hd64610.h
index 44357443d68..fd3fd4dec38 100644
--- a/src/devices/machine/hd64610.h
+++ b/src/devices/machine/hd64610.h
@@ -26,7 +26,6 @@
#ifndef __HD64610__
#define __HD64610__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/hdc92x4.h b/src/devices/machine/hdc92x4.h
index 30ab993ef49..2d70708ad0f 100644
--- a/src/devices/machine/hdc92x4.h
+++ b/src/devices/machine/hdc92x4.h
@@ -7,7 +7,6 @@
#ifndef __HDC92X4_H__
#define __HDC92X4_H__
-#include "emu.h"
#include "imagedev/floppy.h"
#include "imagedev/mfmhd.h"
#include "fdc_pll.h"
diff --git a/src/devices/machine/i6300esb.cpp b/src/devices/machine/i6300esb.cpp
index c79fb3c03f2..056725c69de 100644
--- a/src/devices/machine/i6300esb.cpp
+++ b/src/devices/machine/i6300esb.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "i6300esb.h"
const device_type I6300ESB_WATCHDOG = &device_creator<i6300esb_watchdog_device>;
diff --git a/src/devices/machine/i80130.cpp b/src/devices/machine/i80130.cpp
index 3d196195598..38990cbe508 100644
--- a/src/devices/machine/i80130.cpp
+++ b/src/devices/machine/i80130.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "i80130.h"
diff --git a/src/devices/machine/i80130.h b/src/devices/machine/i80130.h
index c7f035e67fc..f27bcf179ab 100644
--- a/src/devices/machine/i80130.h
+++ b/src/devices/machine/i80130.h
@@ -11,7 +11,6 @@
#ifndef __I80130__
#define __I80130__
-#include "emu.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
diff --git a/src/devices/machine/i8155.h b/src/devices/machine/i8155.h
index 5fe8cf41715..026f5cb9a81 100644
--- a/src/devices/machine/i8155.h
+++ b/src/devices/machine/i8155.h
@@ -35,7 +35,6 @@
#ifndef __I8155__
#define __I8155__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/i8212.h b/src/devices/machine/i8212.h
index 3ced6e05d6f..04de97b0cf5 100644
--- a/src/devices/machine/i8212.h
+++ b/src/devices/machine/i8212.h
@@ -26,7 +26,6 @@
#ifndef __I8212__
#define __I8212__
-#include "emu.h"
diff --git a/src/devices/machine/i8214.h b/src/devices/machine/i8214.h
index 782a5a98934..7b0be60bab1 100644
--- a/src/devices/machine/i8214.h
+++ b/src/devices/machine/i8214.h
@@ -26,7 +26,6 @@
#ifndef __I8214__
#define __I8214__
-#include "emu.h"
diff --git a/src/devices/machine/i8243.h b/src/devices/machine/i8243.h
index 9cae49d0333..669af4469a8 100644
--- a/src/devices/machine/i8243.h
+++ b/src/devices/machine/i8243.h
@@ -13,7 +13,6 @@
#ifndef __I8243_H__
#define __I8243_H__
-#include "emu.h"
#include "cpu/mcs48/mcs48.h"
diff --git a/src/devices/machine/i82439hx.cpp b/src/devices/machine/i82439hx.cpp
index ff3ff18c677..9ed288c3346 100644
--- a/src/devices/machine/i82439hx.cpp
+++ b/src/devices/machine/i82439hx.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "i82439hx.h"
const device_type I82439HX = &device_creator<i82439hx_host_device>;
diff --git a/src/devices/machine/i82439tx.cpp b/src/devices/machine/i82439tx.cpp
index c0e92a230dc..565dfe0c546 100644
--- a/src/devices/machine/i82439tx.cpp
+++ b/src/devices/machine/i82439tx.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "i82439tx.h"
const device_type I82439TX_NEW = &device_creator<i82439tx_host_device>;
diff --git a/src/devices/machine/i82541.cpp b/src/devices/machine/i82541.cpp
index bbec58fe55d..b319d7cce4f 100644
--- a/src/devices/machine/i82541.cpp
+++ b/src/devices/machine/i82541.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "i82541.h"
const device_type I82541 = &device_creator<i82541_device>;
diff --git a/src/devices/machine/i8255.cpp b/src/devices/machine/i8255.cpp
index ff78e63ab01..75023183392 100644
--- a/src/devices/machine/i8255.cpp
+++ b/src/devices/machine/i8255.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "i8255.h"
diff --git a/src/devices/machine/i8255.h b/src/devices/machine/i8255.h
index 21b53561e5c..2677a2f54a3 100644
--- a/src/devices/machine/i8255.h
+++ b/src/devices/machine/i8255.h
@@ -34,7 +34,6 @@
#ifndef __I8255__
#define __I8255__
-#include "emu.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
diff --git a/src/devices/machine/i8257.cpp b/src/devices/machine/i8257.cpp
index 7bac8ea817d..bc4be4bbb22 100644
--- a/src/devices/machine/i8257.cpp
+++ b/src/devices/machine/i8257.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "i8257.h"
diff --git a/src/devices/machine/i8257.h b/src/devices/machine/i8257.h
index 0c4fd5a2f4a..a060852c7a2 100644
--- a/src/devices/machine/i8257.h
+++ b/src/devices/machine/i8257.h
@@ -34,7 +34,6 @@
#ifndef __I8257__
#define __I8257__
-#include "emu.h"
diff --git a/src/devices/machine/i8271.cpp b/src/devices/machine/i8271.cpp
index de4fb7105f0..f4f0c08a55c 100644
--- a/src/devices/machine/i8271.cpp
+++ b/src/devices/machine/i8271.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Carl,Olivier Galibert
+#include "emu.h"
#include "i8271.h"
const device_type I8271 = &device_creator<i8271_device>;
diff --git a/src/devices/machine/i8271.h b/src/devices/machine/i8271.h
index 03f2bdb5a3c..077fb772d69 100644
--- a/src/devices/machine/i8271.h
+++ b/src/devices/machine/i8271.h
@@ -3,7 +3,6 @@
#ifndef I8271N_H_
#define I8271N_H_
-#include "emu.h"
#include "imagedev/floppy.h"
#include "fdc_pll.h"
diff --git a/src/devices/machine/i8279.cpp b/src/devices/machine/i8279.cpp
index a1d083cf623..59b78d73553 100644
--- a/src/devices/machine/i8279.cpp
+++ b/src/devices/machine/i8279.cpp
@@ -74,6 +74,7 @@ that uses this feature.
**********************************************************************/
+#include "emu.h"
#include "i8279.h"
#define LOG 0
diff --git a/src/devices/machine/i8279.h b/src/devices/machine/i8279.h
index 8fcb73286db..8528a81af15 100644
--- a/src/devices/machine/i8279.h
+++ b/src/devices/machine/i8279.h
@@ -35,7 +35,6 @@
#ifndef __I8279__
#define __I8279__
-#include "emu.h"
diff --git a/src/devices/machine/i82875p.cpp b/src/devices/machine/i82875p.cpp
index a1ab51f59e4..cc16a951610 100644
--- a/src/devices/machine/i82875p.cpp
+++ b/src/devices/machine/i82875p.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "i82875p.h"
const device_type I82875P_HOST = &device_creator<i82875p_host_device>;
diff --git a/src/devices/machine/i8355.h b/src/devices/machine/i8355.h
index 2acb4aff6a5..5583a7d16d9 100644
--- a/src/devices/machine/i8355.h
+++ b/src/devices/machine/i8355.h
@@ -34,7 +34,6 @@
#ifndef __I8355__
#define __I8355__
-#include "emu.h"
diff --git a/src/devices/machine/idectrl.cpp b/src/devices/machine/idectrl.cpp
index 54e05b55c2d..8a4729e490d 100644
--- a/src/devices/machine/idectrl.cpp
+++ b/src/devices/machine/idectrl.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "idectrl.h"
diff --git a/src/devices/machine/idehd.cpp b/src/devices/machine/idehd.cpp
index 59ca41e1e4c..4a5d59f9344 100644
--- a/src/devices/machine/idehd.cpp
+++ b/src/devices/machine/idehd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "idehd.h"
/***************************************************************************
diff --git a/src/devices/machine/im6402.cpp b/src/devices/machine/im6402.cpp
index 4cc898d8e52..6bb1729f647 100644
--- a/src/devices/machine/im6402.cpp
+++ b/src/devices/machine/im6402.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "im6402.h"
diff --git a/src/devices/machine/im6402.h b/src/devices/machine/im6402.h
index 24d45796d12..211ff99394c 100644
--- a/src/devices/machine/im6402.h
+++ b/src/devices/machine/im6402.h
@@ -41,7 +41,6 @@
#ifndef __IM6402__
#define __IM6402__
-#include "emu.h"
diff --git a/src/devices/machine/input_merger.cpp b/src/devices/machine/input_merger.cpp
index 8c45c5b8794..27c9c0b2dd3 100644
--- a/src/devices/machine/input_merger.cpp
+++ b/src/devices/machine/input_merger.cpp
@@ -9,6 +9,7 @@
***************************************************************************/
+#include "emu.h"
#include "input_merger.h"
#include <algorithm>
diff --git a/src/devices/machine/input_merger.h b/src/devices/machine/input_merger.h
index ad3aa66c918..325f1c77328 100644
--- a/src/devices/machine/input_merger.h
+++ b/src/devices/machine/input_merger.h
@@ -14,7 +14,6 @@
#ifndef __INPUT_MERGER_H__
#define __INPUT_MERGER_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/ins8154.h b/src/devices/machine/ins8154.h
index b49e5368ae6..41341dcf084 100644
--- a/src/devices/machine/ins8154.h
+++ b/src/devices/machine/ins8154.h
@@ -35,7 +35,6 @@
#ifndef __INS8154_H__
#define __INS8154_H__
-#include "emu.h"
diff --git a/src/devices/machine/ins8250.cpp b/src/devices/machine/ins8250.cpp
index 98a80adcb93..c0d55d6a12d 100644
--- a/src/devices/machine/ins8250.cpp
+++ b/src/devices/machine/ins8250.cpp
@@ -84,6 +84,7 @@ History:
**********************************************************************/
+#include "emu.h"
#include "machine/ins8250.h"
const device_type INS8250 = &device_creator<ins8250_device>;
diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h
index 4da3b0fb9af..4682412b19d 100644
--- a/src/devices/machine/ins8250.h
+++ b/src/devices/machine/ins8250.h
@@ -9,7 +9,6 @@
#ifndef __INS8250_H_
#define __INS8250_H_
-#include "emu.h"
/***************************************************************************
CLASS DEFINITIONS
diff --git a/src/devices/machine/jvsdev.cpp b/src/devices/machine/jvsdev.cpp
index 6fb4fd76b18..4aed4127180 100644
--- a/src/devices/machine/jvsdev.cpp
+++ b/src/devices/machine/jvsdev.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "jvsdev.h"
#include "jvshost.h"
diff --git a/src/devices/machine/jvsdev.h b/src/devices/machine/jvsdev.h
index 1cff880d8ea..bb5f7a92f7b 100644
--- a/src/devices/machine/jvsdev.h
+++ b/src/devices/machine/jvsdev.h
@@ -3,7 +3,6 @@
#ifndef __JVSDEV_H__
#define __JVSDEV_H__
-#include "emu.h"
#define MCFG_JVS_DEVICE_ADD(_tag, _type, _host) \
MCFG_DEVICE_ADD(_tag, _type, 0) \
diff --git a/src/devices/machine/jvshost.cpp b/src/devices/machine/jvshost.cpp
index fb8872751fb..96cf564c646 100644
--- a/src/devices/machine/jvshost.cpp
+++ b/src/devices/machine/jvshost.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "jvshost.h"
#include "jvsdev.h"
diff --git a/src/devices/machine/jvshost.h b/src/devices/machine/jvshost.h
index a003c28d732..b8a0c049ddd 100644
--- a/src/devices/machine/jvshost.h
+++ b/src/devices/machine/jvshost.h
@@ -3,7 +3,6 @@
#ifndef __JVSHOST_H__
#define __JVSHOST_H__
-#include "emu.h"
class jvs_device;
diff --git a/src/devices/machine/k033906.h b/src/devices/machine/k033906.h
index 20d4b076413..2b13ad77143 100644
--- a/src/devices/machine/k033906.h
+++ b/src/devices/machine/k033906.h
@@ -11,7 +11,6 @@
#ifndef __K033906_H__
#define __K033906_H__
-#include "emu.h"
#include "video/voodoo.h"
diff --git a/src/devices/machine/k056230.h b/src/devices/machine/k056230.h
index 1b34ef40c5a..b118c5abaae 100644
--- a/src/devices/machine/k056230.h
+++ b/src/devices/machine/k056230.h
@@ -11,7 +11,6 @@
#ifndef __K056230_H__
#define __K056230_H__
-#include "emu.h"
diff --git a/src/devices/machine/kb3600.cpp b/src/devices/machine/kb3600.cpp
index fdb5f2ec429..dc371ce8ef3 100644
--- a/src/devices/machine/kb3600.cpp
+++ b/src/devices/machine/kb3600.cpp
@@ -15,6 +15,7 @@
*/
+#include "emu.h"
#include "kb3600.h"
diff --git a/src/devices/machine/kb3600.h b/src/devices/machine/kb3600.h
index 7b58d172301..01033b9dfa7 100644
--- a/src/devices/machine/kb3600.h
+++ b/src/devices/machine/kb3600.h
@@ -56,7 +56,6 @@
#ifndef __AY3600__
#define __AY3600__
-#include "emu.h"
diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp
index 6347138c5f1..cd4f9b01bc0 100644
--- a/src/devices/machine/keyboard.cpp
+++ b/src/devices/machine/keyboard.cpp
@@ -24,6 +24,7 @@ WRITE8_MEMBER( xxx_state::kbd_put )
***************************************************************************/
+#include "emu.h"
#include "machine/keyboard.ipp"
diff --git a/src/devices/machine/keyboard.h b/src/devices/machine/keyboard.h
index 1d69996e564..42a2d964ad7 100644
--- a/src/devices/machine/keyboard.h
+++ b/src/devices/machine/keyboard.h
@@ -5,7 +5,6 @@
#pragma once
-#include "emu.h"
/***************************************************************************
DEVICE CONFIGURATION MACROS
diff --git a/src/devices/machine/legscsi.cpp b/src/devices/machine/legscsi.cpp
index 9b86bb0d111..03b73b09ec9 100644
--- a/src/devices/machine/legscsi.cpp
+++ b/src/devices/machine/legscsi.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "legscsi.h"
legacy_scsi_host_adapter::legacy_scsi_host_adapter(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/devices/machine/lh5810.h b/src/devices/machine/lh5810.h
index dcfbf58fb6d..ffb4fd4ccbe 100644
--- a/src/devices/machine/lh5810.h
+++ b/src/devices/machine/lh5810.h
@@ -11,7 +11,6 @@
#ifndef __LH5810__
#define __LH5810__
-#include "emu.h"
//*************************************************************************
// MACROS / CONSTANTS
diff --git a/src/devices/machine/linflash.cpp b/src/devices/machine/linflash.cpp
index 5c49d224612..416eb23102d 100644
--- a/src/devices/machine/linflash.cpp
+++ b/src/devices/machine/linflash.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "linflash.h"
linear_flash_pccard_device::linear_flash_pccard_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/devices/machine/linflash.h b/src/devices/machine/linflash.h
index 3d486b35c9f..10428bb7df5 100644
--- a/src/devices/machine/linflash.h
+++ b/src/devices/machine/linflash.h
@@ -5,7 +5,6 @@
#ifndef __LINFLASH_H__
#define __LINFLASH_H__
-#include "emu.h"
#include "intelfsh.h"
#include "machine/pccard.h"
diff --git a/src/devices/machine/lpc-acpi.cpp b/src/devices/machine/lpc-acpi.cpp
index 50f5774aacf..902a66701bc 100644
--- a/src/devices/machine/lpc-acpi.cpp
+++ b/src/devices/machine/lpc-acpi.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "lpc-acpi.h"
const device_type LPC_ACPI = &device_creator<lpc_acpi_device>;
diff --git a/src/devices/machine/lpc-pit.cpp b/src/devices/machine/lpc-pit.cpp
index 84c924263d0..b79b174e0bc 100644
--- a/src/devices/machine/lpc-pit.cpp
+++ b/src/devices/machine/lpc-pit.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "lpc-pit.h"
const device_type LPC_PIT = &device_creator<lpc_pit_device>;
diff --git a/src/devices/machine/lpc-rtc.cpp b/src/devices/machine/lpc-rtc.cpp
index 985be52dfc8..277d4b1f9cd 100644
--- a/src/devices/machine/lpc-rtc.cpp
+++ b/src/devices/machine/lpc-rtc.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "lpc-rtc.h"
const device_type LPC_RTC = &device_creator<lpc_rtc_device>;
diff --git a/src/devices/machine/lpc.cpp b/src/devices/machine/lpc.cpp
index c2b7f681d0f..b1903fb6cfc 100644
--- a/src/devices/machine/lpc.cpp
+++ b/src/devices/machine/lpc.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "lpc.h"
lpc_device::lpc_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/devices/machine/lpc.h b/src/devices/machine/lpc.h
index c135b616202..5f1c80ee8a2 100644
--- a/src/devices/machine/lpc.h
+++ b/src/devices/machine/lpc.h
@@ -3,7 +3,6 @@
#ifndef LPC_H
#define LPC_H
-#include "emu.h"
class lpc_device : public device_t {
public:
diff --git a/src/devices/machine/mb8421.cpp b/src/devices/machine/mb8421.cpp
index d50240db362..53eaa818f90 100644
--- a/src/devices/machine/mb8421.cpp
+++ b/src/devices/machine/mb8421.cpp
@@ -11,6 +11,7 @@
**********************************************************************/
+#include "emu.h"
#include "machine/mb8421.h"
diff --git a/src/devices/machine/mb8421.h b/src/devices/machine/mb8421.h
index a878eae6361..693d614cfe2 100644
--- a/src/devices/machine/mb8421.h
+++ b/src/devices/machine/mb8421.h
@@ -12,7 +12,6 @@
#ifndef _MB8421_H
#define _MB8421_H
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/mb89371.cpp b/src/devices/machine/mb89371.cpp
index 22a81d8dbd6..d9ec2f12e48 100644
--- a/src/devices/machine/mb89371.cpp
+++ b/src/devices/machine/mb89371.cpp
@@ -8,6 +8,7 @@
*
*/
+#include "emu.h"
#include "mb89371.h"
const device_type MB89371 = &device_creator<mb89371_device>;
diff --git a/src/devices/machine/mb89371.h b/src/devices/machine/mb89371.h
index dbdef609cdd..3093590d51b 100644
--- a/src/devices/machine/mb89371.h
+++ b/src/devices/machine/mb89371.h
@@ -11,7 +11,6 @@
#ifndef __MB89371_H__
#define __MB89371_H__
-#include "emu.h"
class mb89371_device : public device_t
{
diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp
index 103ebf17409..0b7b9d66d2b 100644
--- a/src/devices/machine/mc146818.cpp
+++ b/src/devices/machine/mc146818.cpp
@@ -11,6 +11,7 @@
*********************************************************************/
+#include "emu.h"
#include "coreutil.h"
#include "machine/mc146818.h"
diff --git a/src/devices/machine/mc146818.h b/src/devices/machine/mc146818.h
index 2c62086a4f4..70ff8c46e49 100644
--- a/src/devices/machine/mc146818.h
+++ b/src/devices/machine/mc146818.h
@@ -14,7 +14,6 @@
#ifndef __MC146818_H__
#define __MC146818_H__
-#include "emu.h"
//**************************************************************************
// INTERFACE CONFIGURATION MACROS
diff --git a/src/devices/machine/mc2661.cpp b/src/devices/machine/mc2661.cpp
index 625459361b3..2548fbb50e3 100644
--- a/src/devices/machine/mc2661.cpp
+++ b/src/devices/machine/mc2661.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include "mc2661.h"
diff --git a/src/devices/machine/mc2661.h b/src/devices/machine/mc2661.h
index f60baf9eea8..695dd4b0ef3 100644
--- a/src/devices/machine/mc2661.h
+++ b/src/devices/machine/mc2661.h
@@ -28,7 +28,6 @@
#ifndef __MC2661__
#define __MC2661__
-#include "emu.h"
diff --git a/src/devices/machine/mc6852.cpp b/src/devices/machine/mc6852.cpp
index fe0c25e86da..b07597b6417 100644
--- a/src/devices/machine/mc6852.cpp
+++ b/src/devices/machine/mc6852.cpp
@@ -21,6 +21,7 @@
*/
+#include "emu.h"
#include "mc6852.h"
diff --git a/src/devices/machine/mc6852.h b/src/devices/machine/mc6852.h
index 1e0bdeb00c4..86416b51b79 100644
--- a/src/devices/machine/mc6852.h
+++ b/src/devices/machine/mc6852.h
@@ -26,7 +26,6 @@
#ifndef __MC6852__
#define __MC6852__
-#include "emu.h"
#include <queue>
diff --git a/src/devices/machine/mc68901.h b/src/devices/machine/mc68901.h
index a99fa0fe62d..56dd83f27aa 100644
--- a/src/devices/machine/mc68901.h
+++ b/src/devices/machine/mc68901.h
@@ -38,7 +38,6 @@
#ifndef __MC68901__
#define __MC68901__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/mccs1850.cpp b/src/devices/machine/mccs1850.cpp
index 78f5eee020c..f7937780d47 100644
--- a/src/devices/machine/mccs1850.cpp
+++ b/src/devices/machine/mccs1850.cpp
@@ -15,6 +15,7 @@
*/
+#include "emu.h"
#include "mccs1850.h"
diff --git a/src/devices/machine/mccs1850.h b/src/devices/machine/mccs1850.h
index c90bcae0d83..ad960b52f4e 100644
--- a/src/devices/machine/mccs1850.h
+++ b/src/devices/machine/mccs1850.h
@@ -22,7 +22,6 @@
#ifndef __MCCS1850__
#define __MCCS1850__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/mcf5206e.h b/src/devices/machine/mcf5206e.h
index 0949fcd82ba..5906d07e81b 100644
--- a/src/devices/machine/mcf5206e.h
+++ b/src/devices/machine/mcf5206e.h
@@ -11,7 +11,6 @@
#ifndef __MCF5206E_PERIPHERAL_H__
#define __MCF5206E_PERIPHERAL_H__
-#include "emu.h"
diff --git a/src/devices/machine/microtch.cpp b/src/devices/machine/microtch.cpp
index 4f6d10c3cea..a9e309eb5d5 100644
--- a/src/devices/machine/microtch.cpp
+++ b/src/devices/machine/microtch.cpp
@@ -11,6 +11,7 @@
*/
+#include "emu.h"
#include "microtch.h"
#define LOG 0
diff --git a/src/devices/machine/microtch.h b/src/devices/machine/microtch.h
index 0ceb7dada6c..0c56c87379f 100644
--- a/src/devices/machine/microtch.h
+++ b/src/devices/machine/microtch.h
@@ -3,7 +3,6 @@
#ifndef _MICROTOUCH_H
#define _MICROTOUCH_H
-#include "emu.h"
class microtouch_device :
diff --git a/src/devices/machine/mm58167.cpp b/src/devices/machine/mm58167.cpp
index b9174c75344..0cf17b48ce9 100644
--- a/src/devices/machine/mm58167.cpp
+++ b/src/devices/machine/mm58167.cpp
@@ -8,6 +8,7 @@
**********************************************************************/
+#include "emu.h"
#include "mm58167.h"
#include "machine/timehelp.h"
diff --git a/src/devices/machine/mm58167.h b/src/devices/machine/mm58167.h
index 7b5976ef72d..4fd66b72b92 100644
--- a/src/devices/machine/mm58167.h
+++ b/src/devices/machine/mm58167.h
@@ -11,7 +11,6 @@
#ifndef __MM58167_H__
#define __MM58167_H__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/mm74c922.cpp b/src/devices/machine/mm74c922.cpp
index 7f9e3af798d..1b44783abc6 100644
--- a/src/devices/machine/mm74c922.cpp
+++ b/src/devices/machine/mm74c922.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mm74c922.h"
diff --git a/src/devices/machine/mm74c922.h b/src/devices/machine/mm74c922.h
index 38d23a78a94..6d56642ca2c 100644
--- a/src/devices/machine/mm74c922.h
+++ b/src/devices/machine/mm74c922.h
@@ -35,7 +35,6 @@
#ifndef __MM74C922__
#define __MM74C922__
-#include "emu.h"
diff --git a/src/devices/machine/mos6526.cpp b/src/devices/machine/mos6526.cpp
index 74b86246812..c5f08a68530 100644
--- a/src/devices/machine/mos6526.cpp
+++ b/src/devices/machine/mos6526.cpp
@@ -22,6 +22,7 @@
*/
+#include "emu.h"
#include "mos6526.h"
diff --git a/src/devices/machine/mos6526.h b/src/devices/machine/mos6526.h
index cf3e89e9fa1..f40911ac0ac 100644
--- a/src/devices/machine/mos6526.h
+++ b/src/devices/machine/mos6526.h
@@ -60,7 +60,6 @@
#ifndef __MOS6526__
#define __MOS6526__
-#include "emu.h"
diff --git a/src/devices/machine/mos6529.cpp b/src/devices/machine/mos6529.cpp
index 9c3a1c13b5b..297ab50ae1e 100644
--- a/src/devices/machine/mos6529.cpp
+++ b/src/devices/machine/mos6529.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mos6529.h"
diff --git a/src/devices/machine/mos6529.h b/src/devices/machine/mos6529.h
index 87763b0575a..c85ee075a15 100644
--- a/src/devices/machine/mos6529.h
+++ b/src/devices/machine/mos6529.h
@@ -24,7 +24,6 @@
#ifndef __MOS6529__
#define __MOS6529__
-#include "emu.h"
diff --git a/src/devices/machine/mos6530n.cpp b/src/devices/machine/mos6530n.cpp
index c28cf6a0d7d..e5b290e2cca 100644
--- a/src/devices/machine/mos6530n.cpp
+++ b/src/devices/machine/mos6530n.cpp
@@ -7,6 +7,7 @@
**********************************************************************/
+#include "emu.h"
#include "mos6530n.h"
diff --git a/src/devices/machine/mos6530n.h b/src/devices/machine/mos6530n.h
index 05269ae81e7..721ce0aeac3 100644
--- a/src/devices/machine/mos6530n.h
+++ b/src/devices/machine/mos6530n.h
@@ -57,7 +57,6 @@
#ifndef __MOS6530n__
#define __MOS6530n__
-#include "emu.h"
diff --git a/src/devices/machine/mos6551.cpp b/src/devices/machine/mos6551.cpp
index 43201fb1d2b..594c9ac35a7 100644
--- a/src/devices/machine/mos6551.cpp
+++ b/src/devices/machine/mos6551.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mos6551.h"
#define LOG 0
diff --git a/src/devices/machine/mos6551.h b/src/devices/machine/mos6551.h
index 8acc224bcf2..8ebed24e36f 100644
--- a/src/devices/machine/mos6551.h
+++ b/src/devices/machine/mos6551.h
@@ -28,7 +28,6 @@
#ifndef __MOS6551__
#define __MOS6551__
-#include "emu.h"
#include "machine/clock.h"
#define MCFG_MOS6551_XTAL(_xtal) \
diff --git a/src/devices/machine/mos6702.cpp b/src/devices/machine/mos6702.cpp
index 2f0e3d7a122..b1e54f894d5 100644
--- a/src/devices/machine/mos6702.cpp
+++ b/src/devices/machine/mos6702.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mos6702.h"
diff --git a/src/devices/machine/mos6702.h b/src/devices/machine/mos6702.h
index fa41e46e15d..61723e1213c 100644
--- a/src/devices/machine/mos6702.h
+++ b/src/devices/machine/mos6702.h
@@ -24,7 +24,6 @@
#ifndef __MOS6702__
#define __MOS6702__
-#include "emu.h"
diff --git a/src/devices/machine/mos8706.cpp b/src/devices/machine/mos8706.cpp
index a5cad813b97..d42be7a5c99 100644
--- a/src/devices/machine/mos8706.cpp
+++ b/src/devices/machine/mos8706.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mos8706.h"
diff --git a/src/devices/machine/mos8706.h b/src/devices/machine/mos8706.h
index 91e00d2b342..9628e130037 100644
--- a/src/devices/machine/mos8706.h
+++ b/src/devices/machine/mos8706.h
@@ -28,7 +28,6 @@
#ifndef __MOS8706__
#define __MOS8706__
-#include "emu.h"
diff --git a/src/devices/machine/mos8722.cpp b/src/devices/machine/mos8722.cpp
index 9f081e5c4c0..93e5c34c328 100644
--- a/src/devices/machine/mos8722.cpp
+++ b/src/devices/machine/mos8722.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mos8722.h"
diff --git a/src/devices/machine/mos8722.h b/src/devices/machine/mos8722.h
index a6991dad1d5..d396877ba02 100644
--- a/src/devices/machine/mos8722.h
+++ b/src/devices/machine/mos8722.h
@@ -38,7 +38,6 @@
#ifndef __MOS8722__
#define __MOS8722__
-#include "emu.h"
diff --git a/src/devices/machine/mos8726.cpp b/src/devices/machine/mos8726.cpp
index 621d4d4374f..b8e0f280ff4 100644
--- a/src/devices/machine/mos8726.cpp
+++ b/src/devices/machine/mos8726.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "mos8726.h"
diff --git a/src/devices/machine/mos8726.h b/src/devices/machine/mos8726.h
index d8edd76d54d..fbf771a4830 100644
--- a/src/devices/machine/mos8726.h
+++ b/src/devices/machine/mos8726.h
@@ -46,7 +46,6 @@
#ifndef __MOS8726__
#define __MOS8726__
-#include "emu.h"
diff --git a/src/devices/machine/mpu401.cpp b/src/devices/machine/mpu401.cpp
index 8562634db46..95a82ea029e 100644
--- a/src/devices/machine/mpu401.cpp
+++ b/src/devices/machine/mpu401.cpp
@@ -38,6 +38,7 @@
***************************************************************************/
+#include "emu.h"
#include "machine/mpu401.h"
#include "bus/midi/midi.h"
diff --git a/src/devices/machine/mpu401.h b/src/devices/machine/mpu401.h
index 3717477a43c..46f4ed474d0 100644
--- a/src/devices/machine/mpu401.h
+++ b/src/devices/machine/mpu401.h
@@ -5,7 +5,6 @@
#ifndef __MPU401_H__
#define __MPU401_H__
-#include "emu.h"
#include "cpu/m6800/m6800.h"
#define MCFG_MPU401_ADD(_tag, _irqf ) \
diff --git a/src/devices/machine/msm5832.cpp b/src/devices/machine/msm5832.cpp
index 079418409b3..361f9b7ba71 100644
--- a/src/devices/machine/msm5832.cpp
+++ b/src/devices/machine/msm5832.cpp
@@ -18,6 +18,7 @@
*/
+#include "emu.h"
#include "msm5832.h"
diff --git a/src/devices/machine/msm5832.h b/src/devices/machine/msm5832.h
index cadfa19053a..3b7627e00db 100644
--- a/src/devices/machine/msm5832.h
+++ b/src/devices/machine/msm5832.h
@@ -23,7 +23,6 @@
#ifndef __MSM5832__
#define __MSM5832__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/msm58321.cpp b/src/devices/machine/msm58321.cpp
index 3919146eaaa..c34f107fa9b 100644
--- a/src/devices/machine/msm58321.cpp
+++ b/src/devices/machine/msm58321.cpp
@@ -16,6 +16,7 @@
*/
+#include "emu.h"
#include "msm58321.h"
diff --git a/src/devices/machine/msm58321.h b/src/devices/machine/msm58321.h
index ee337955184..30a585be4c6 100644
--- a/src/devices/machine/msm58321.h
+++ b/src/devices/machine/msm58321.h
@@ -36,7 +36,6 @@
#ifndef __MSM58321__
#define __MSM58321__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/msm6242.h b/src/devices/machine/msm6242.h
index c5ef7246dea..89041c264fc 100644
--- a/src/devices/machine/msm6242.h
+++ b/src/devices/machine/msm6242.h
@@ -37,7 +37,6 @@
#ifndef __MSM6242DEV_H__
#define __MSM6242DEV_H__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h
index 7aab62b4de7..e23f50ed62c 100644
--- a/src/devices/machine/netlist.h
+++ b/src/devices/machine/netlist.h
@@ -11,7 +11,6 @@
#ifndef NETLIST_H
#define NETLIST_H
-#include "emu.h"
#include "netlist/nl_time.h"
diff --git a/src/devices/machine/nmc9306.h b/src/devices/machine/nmc9306.h
index 8812926189b..de929be42ff 100644
--- a/src/devices/machine/nmc9306.h
+++ b/src/devices/machine/nmc9306.h
@@ -18,7 +18,6 @@
#ifndef __NMC9306__
#define __NMC9306__
-#include "emu.h"
diff --git a/src/devices/machine/nsc810.cpp b/src/devices/machine/nsc810.cpp
index 24707067761..6f6753955c6 100644
--- a/src/devices/machine/nsc810.cpp
+++ b/src/devices/machine/nsc810.cpp
@@ -12,6 +12,7 @@
* - and lots of other stuff
*/
+#include "emu.h"
#include "nsc810.h"
//**************************************************************************
diff --git a/src/devices/machine/nsc810.h b/src/devices/machine/nsc810.h
index aa17014eab5..8d3c796ef14 100644
--- a/src/devices/machine/nsc810.h
+++ b/src/devices/machine/nsc810.h
@@ -9,7 +9,6 @@
#ifndef NSC810_H_
#define NSC810_H_
-#include "emu.h"
class nsc810_device : public device_t
{
diff --git a/src/devices/machine/nscsi_bus.cpp b/src/devices/machine/nscsi_bus.cpp
index 7edbee58253..b06e892f58d 100644
--- a/src/devices/machine/nscsi_bus.cpp
+++ b/src/devices/machine/nscsi_bus.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "nscsi_bus.h"
const device_type NSCSI_BUS = &device_creator<nscsi_bus_device>;
diff --git a/src/devices/machine/nscsi_bus.h b/src/devices/machine/nscsi_bus.h
index 1bd967568c8..d4e2faa0323 100644
--- a/src/devices/machine/nscsi_bus.h
+++ b/src/devices/machine/nscsi_bus.h
@@ -3,7 +3,6 @@
#ifndef __NSCSI_BUS_H__
#define __NSCSI_BUS_H__
-#include "emu.h"
#define MCFG_NSCSI_BUS_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, NSCSI_BUS, 0)
diff --git a/src/devices/machine/nscsi_cb.cpp b/src/devices/machine/nscsi_cb.cpp
index 23c71d45bff..aecf59d00b9 100644
--- a/src/devices/machine/nscsi_cb.cpp
+++ b/src/devices/machine/nscsi_cb.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "nscsi_cb.h"
const device_type NSCSI_CB = &device_creator<nscsi_callback_device>;
diff --git a/src/devices/machine/nscsi_cb.h b/src/devices/machine/nscsi_cb.h
index 1699de18f4b..9b193c6c876 100644
--- a/src/devices/machine/nscsi_cb.h
+++ b/src/devices/machine/nscsi_cb.h
@@ -3,7 +3,6 @@
#ifndef NSCSI_CB_H
#define NSCSI_CB_H
-#include "emu.h"
#include "machine/nscsi_bus.h"
#define MCFG_NSCSICB_RST_HANDLER(_line) \
diff --git a/src/devices/machine/nscsi_cd.cpp b/src/devices/machine/nscsi_cd.cpp
index 35e21a91ebf..d17e3f1e09b 100644
--- a/src/devices/machine/nscsi_cd.cpp
+++ b/src/devices/machine/nscsi_cd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "machine/nscsi_cd.h"
#include "imagedev/chd_cd.h"
diff --git a/src/devices/machine/nscsi_hd.cpp b/src/devices/machine/nscsi_hd.cpp
index a2179e34a77..3a493c08550 100644
--- a/src/devices/machine/nscsi_hd.cpp
+++ b/src/devices/machine/nscsi_hd.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "machine/nscsi_hd.h"
#include "imagedev/harddriv.h"
diff --git a/src/devices/machine/nscsi_s1410.cpp b/src/devices/machine/nscsi_s1410.cpp
index 4f54f1c0b4a..554ba24a11d 100644
--- a/src/devices/machine/nscsi_s1410.cpp
+++ b/src/devices/machine/nscsi_s1410.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "machine/nscsi_s1410.h"
const device_type NSCSI_S1410 = &device_creator<nscsi_s1410_device>;
diff --git a/src/devices/machine/pc_fdc.h b/src/devices/machine/pc_fdc.h
index 61785cda61a..5c41e5ea62c 100644
--- a/src/devices/machine/pc_fdc.h
+++ b/src/devices/machine/pc_fdc.h
@@ -9,7 +9,6 @@
#ifndef PC_FDC_H
#define PC_FDC_H
-#include "emu.h"
#include "machine/upd765.h"
#define MCFG_PC_FDC_XT_ADD(_tag) \
diff --git a/src/devices/machine/pccard.cpp b/src/devices/machine/pccard.cpp
index 6350e194590..a5ba5bd7235 100644
--- a/src/devices/machine/pccard.cpp
+++ b/src/devices/machine/pccard.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "pccard.h"
READ16_MEMBER( pccard_interface::read_memory )
diff --git a/src/devices/machine/pccard.h b/src/devices/machine/pccard.h
index 28f7da2f38d..4e100429bef 100644
--- a/src/devices/machine/pccard.h
+++ b/src/devices/machine/pccard.h
@@ -5,7 +5,6 @@
#ifndef __PCCARD_H__
#define __PCCARD_H__
-#include "emu.h"
class pccard_interface
{
diff --git a/src/devices/machine/pcf8593.cpp b/src/devices/machine/pcf8593.cpp
index 63016320b81..77527bf4621 100644
--- a/src/devices/machine/pcf8593.cpp
+++ b/src/devices/machine/pcf8593.cpp
@@ -8,6 +8,7 @@
*********************************************************************/
+#include "emu.h"
#include "pcf8593.h"
diff --git a/src/devices/machine/pcf8593.h b/src/devices/machine/pcf8593.h
index 9d3d9ce4ed7..1de8b0ddbe2 100644
--- a/src/devices/machine/pcf8593.h
+++ b/src/devices/machine/pcf8593.h
@@ -11,7 +11,6 @@
#ifndef __PCF8593_H__
#define __PCF8593_H__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/pci-apic.cpp b/src/devices/machine/pci-apic.cpp
index b0fc3885c7f..2595289d0d1 100644
--- a/src/devices/machine/pci-apic.cpp
+++ b/src/devices/machine/pci-apic.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "pci-apic.h"
const device_type APIC = &device_creator<apic_device>;
diff --git a/src/devices/machine/pci-ide.cpp b/src/devices/machine/pci-ide.cpp
index 0c29338bcfe..9c533e62655 100644
--- a/src/devices/machine/pci-ide.cpp
+++ b/src/devices/machine/pci-ide.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Ted Green
+#include "emu.h"
#include "pci-ide.h"
const device_type IDE_PCI = &device_creator<ide_pci_device>;
diff --git a/src/devices/machine/pci-sata.cpp b/src/devices/machine/pci-sata.cpp
index f8fdaf56db7..a77bd4ada49 100644
--- a/src/devices/machine/pci-sata.cpp
+++ b/src/devices/machine/pci-sata.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "pci-sata.h"
const device_type SATA = &device_creator<sata_device>;
diff --git a/src/devices/machine/pci-smbus.cpp b/src/devices/machine/pci-smbus.cpp
index fc6d589b64e..f1cc7a98976 100644
--- a/src/devices/machine/pci-smbus.cpp
+++ b/src/devices/machine/pci-smbus.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "pci-smbus.h"
const device_type SMBUS = &device_creator<smbus_device>;
diff --git a/src/devices/machine/pci-usb.cpp b/src/devices/machine/pci-usb.cpp
index 8772d6d7555..f44d2a6ce5b 100644
--- a/src/devices/machine/pci-usb.cpp
+++ b/src/devices/machine/pci-usb.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "pci-usb.h"
const device_type USB_UHCI = &device_creator<usb_uhci_device>;
diff --git a/src/devices/machine/pci.cpp b/src/devices/machine/pci.cpp
index 490cd43f4aa..caaef7bcdb2 100644
--- a/src/devices/machine/pci.cpp
+++ b/src/devices/machine/pci.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "pci.h"
const device_type PCI_ROOT = &device_creator<pci_root_device>;
diff --git a/src/devices/machine/pci.h b/src/devices/machine/pci.h
index a7cfd68c7de..a882f93b957 100644
--- a/src/devices/machine/pci.h
+++ b/src/devices/machine/pci.h
@@ -3,7 +3,6 @@
#ifndef PCI_H
#define PCI_H
-#include "emu.h"
#define MCFG_PCI_ROOT_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, PCI_ROOT, 0)
diff --git a/src/devices/machine/pci9050.cpp b/src/devices/machine/pci9050.cpp
index a67b5c80bb7..da70aab3a22 100644
--- a/src/devices/machine/pci9050.cpp
+++ b/src/devices/machine/pci9050.cpp
@@ -21,6 +21,7 @@
*********************************************************************/
+#include "emu.h"
#include "pci9050.h"
const device_type PCI9050 = &device_creator<pci9050_device>;
diff --git a/src/devices/machine/pckeybrd.h b/src/devices/machine/pckeybrd.h
index 5b493f858e1..f7681bba884 100644
--- a/src/devices/machine/pckeybrd.h
+++ b/src/devices/machine/pckeybrd.h
@@ -14,7 +14,6 @@
#ifndef PCKEYBRD_H
#define PCKEYBRD_H
-#include "emu.h"
class pc_keyboard_device : public device_t
{
diff --git a/src/devices/machine/pdc.cpp b/src/devices/machine/pdc.cpp
index 12dce85aa7f..e050c78e5eb 100644
--- a/src/devices/machine/pdc.cpp
+++ b/src/devices/machine/pdc.cpp
@@ -91,6 +91,7 @@
*/
+#include "emu.h"
#include "pdc.h"
diff --git a/src/devices/machine/pdc.h b/src/devices/machine/pdc.h
index d4271fbe06d..6d8354f08a9 100644
--- a/src/devices/machine/pdc.h
+++ b/src/devices/machine/pdc.h
@@ -11,7 +11,6 @@
#ifndef __R9751_PDC_H__
#define __R9751_PDC_H__
-#include "emu.h"
#include "cpu/z80/z80.h"
#include "machine/upd765.h"
#include "machine/am9517a.h"
diff --git a/src/devices/machine/pla.cpp b/src/devices/machine/pla.cpp
index 3ca6da06d6c..0686dd878fe 100644
--- a/src/devices/machine/pla.cpp
+++ b/src/devices/machine/pla.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "pla.h"
#include "jedparse.h"
#include "plaparse.h"
diff --git a/src/devices/machine/pla.h b/src/devices/machine/pla.h
index 91352752bd8..3187d200a00 100644
--- a/src/devices/machine/pla.h
+++ b/src/devices/machine/pla.h
@@ -11,7 +11,6 @@
#ifndef __PLA__
#define __PLA__
-#include "emu.h"
diff --git a/src/devices/machine/rf5c296.cpp b/src/devices/machine/rf5c296.cpp
index 80cd19d4a40..4c6ce622f3a 100644
--- a/src/devices/machine/rf5c296.cpp
+++ b/src/devices/machine/rf5c296.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "rf5c296.h"
// rf5c296 is very inaccurate at that point, it hardcodes the gnet config
diff --git a/src/devices/machine/rp5c01.cpp b/src/devices/machine/rp5c01.cpp
index 24095b763a5..c07b5353c3c 100644
--- a/src/devices/machine/rp5c01.cpp
+++ b/src/devices/machine/rp5c01.cpp
@@ -16,6 +16,7 @@
*/
+#include "emu.h"
#include "rp5c01.h"
diff --git a/src/devices/machine/rp5c01.h b/src/devices/machine/rp5c01.h
index 72b603cb2ad..c1e9ba5b808 100644
--- a/src/devices/machine/rp5c01.h
+++ b/src/devices/machine/rp5c01.h
@@ -23,7 +23,6 @@
#ifndef __RP5C01__
#define __RP5C01__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/rp5c15.cpp b/src/devices/machine/rp5c15.cpp
index 415ef887771..944d13302e9 100644
--- a/src/devices/machine/rp5c15.cpp
+++ b/src/devices/machine/rp5c15.cpp
@@ -16,6 +16,7 @@
*/
+#include "emu.h"
#include "rp5c15.h"
diff --git a/src/devices/machine/rp5c15.h b/src/devices/machine/rp5c15.h
index 2838c44aacb..32c7a7a74ed 100644
--- a/src/devices/machine/rp5c15.h
+++ b/src/devices/machine/rp5c15.h
@@ -23,7 +23,6 @@
#ifndef __RP5C15__
#define __RP5C15__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/rtc4543.cpp b/src/devices/machine/rtc4543.cpp
index ee9fb86e800..725329fb988 100644
--- a/src/devices/machine/rtc4543.cpp
+++ b/src/devices/machine/rtc4543.cpp
@@ -14,6 +14,7 @@
**********************************************************************/
+#include "emu.h"
#include "rtc4543.h"
//**************************************************************************
diff --git a/src/devices/machine/rtc4543.h b/src/devices/machine/rtc4543.h
index b8fda782cf2..1e29c9e7d57 100644
--- a/src/devices/machine/rtc4543.h
+++ b/src/devices/machine/rtc4543.h
@@ -12,7 +12,6 @@
#ifndef __RTC4543_H__
#define __RTC4543_H__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/scnxx562.cpp b/src/devices/machine/scnxx562.cpp
index 87655eeed02..c7ce9cbac0b 100644
--- a/src/devices/machine/scnxx562.cpp
+++ b/src/devices/machine/scnxx562.cpp
@@ -77,6 +77,7 @@ DONE (x) (p=partly) NMOS CMOS
x/p = Features that has been implemented n/a = features that will not
***************************************************************************/
+#include "emu.h"
#include "scnxx562.h"
//**************************************************************************
diff --git a/src/devices/machine/scnxx562.h b/src/devices/machine/scnxx562.h
index 58e2a57fe75..bae0b801594 100644
--- a/src/devices/machine/scnxx562.h
+++ b/src/devices/machine/scnxx562.h
@@ -39,7 +39,6 @@
#ifndef __SCNXX562_H__
#define __SCNXX562_H__
-#include "emu.h"
#include "cpu/z80/z80daisy.h"
//**************************************************************************
diff --git a/src/devices/machine/spchrom.h b/src/devices/machine/spchrom.h
index 14c9824c267..62a881ad523 100644
--- a/src/devices/machine/spchrom.h
+++ b/src/devices/machine/spchrom.h
@@ -8,7 +8,6 @@
#ifndef __SPCHROMS_H
#define __SPCHROMS_H
-#include "emu.h"
class speechrom_device : public device_t
{
diff --git a/src/devices/machine/t10mmc.cpp b/src/devices/machine/t10mmc.cpp
index ffa28c9676a..c940e8e7266 100644
--- a/src/devices/machine/t10mmc.cpp
+++ b/src/devices/machine/t10mmc.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "t10mmc.h"
static int to_msf(int frame)
diff --git a/src/devices/machine/t10sbc.cpp b/src/devices/machine/t10sbc.cpp
index 2ac7eb2fab3..036917bbbbe 100644
--- a/src/devices/machine/t10sbc.cpp
+++ b/src/devices/machine/t10sbc.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "t10sbc.h"
void t10sbc::t10_start(device_t &device)
diff --git a/src/devices/machine/t10spc.cpp b/src/devices/machine/t10spc.cpp
index 59547374f58..d77560c6965 100644
--- a/src/devices/machine/t10spc.cpp
+++ b/src/devices/machine/t10spc.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "t10spc.h"
void t10spc::t10_start(device_t &device)
diff --git a/src/devices/machine/t10spc.h b/src/devices/machine/t10spc.h
index 025d0a5361e..bc17b11b4f0 100644
--- a/src/devices/machine/t10spc.h
+++ b/src/devices/machine/t10spc.h
@@ -9,7 +9,6 @@ t10spc.h
#ifndef _T10SPC_H_
#define _T10SPC_H_
-#include "emu.h"
class t10spc
{
diff --git a/src/devices/machine/tc009xlvc.h b/src/devices/machine/tc009xlvc.h
index 0748c5fafa2..35c88edfbd5 100644
--- a/src/devices/machine/tc009xlvc.h
+++ b/src/devices/machine/tc009xlvc.h
@@ -11,7 +11,6 @@
#ifndef __ramdacDEV_H__
#define __ramdacDEV_H__
-#include "emu.h"
class tc0091lvc_device : public device_t,
public device_memory_interface
diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp
index 531293e8e2e..c5c291c21c9 100644
--- a/src/devices/machine/terminal.cpp
+++ b/src/devices/machine/terminal.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Miodrag Milanovic
+#include "emu.h"
#include "machine/terminal.h"
#define KEYBOARD_TAG "keyboard"
diff --git a/src/devices/machine/timekpr.h b/src/devices/machine/timekpr.h
index a9ecd6ae6b5..87fb03d1771 100644
--- a/src/devices/machine/timekpr.h
+++ b/src/devices/machine/timekpr.h
@@ -19,7 +19,6 @@
#ifndef __TIMEKPR_H__
#define __TIMEKPR_H__
-#include "emu.h"
diff --git a/src/devices/machine/tms1024.cpp b/src/devices/machine/tms1024.cpp
index a1d4cd551db..4dbd8019407 100644
--- a/src/devices/machine/tms1024.cpp
+++ b/src/devices/machine/tms1024.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "machine/tms1024.h"
diff --git a/src/devices/machine/tms1024.h b/src/devices/machine/tms1024.h
index 54524d27939..606098d90fb 100644
--- a/src/devices/machine/tms1024.h
+++ b/src/devices/machine/tms1024.h
@@ -9,7 +9,6 @@
#ifndef _TMS1024_H_
#define _TMS1024_H_
-#include "emu.h"
// ports setup
diff --git a/src/devices/machine/tms5501.cpp b/src/devices/machine/tms5501.cpp
index 404f3eaacd5..868ba213e1b 100644
--- a/src/devices/machine/tms5501.cpp
+++ b/src/devices/machine/tms5501.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "tms5501.h"
diff --git a/src/devices/machine/tms5501.h b/src/devices/machine/tms5501.h
index e015bc3a23b..746082f07a5 100644
--- a/src/devices/machine/tms5501.h
+++ b/src/devices/machine/tms5501.h
@@ -34,7 +34,6 @@
#ifndef __TMS5501__
#define __TMS5501__
-#include "emu.h"
diff --git a/src/devices/machine/tms6100.cpp b/src/devices/machine/tms6100.cpp
index 6068a5865aa..eade390ffee 100644
--- a/src/devices/machine/tms6100.cpp
+++ b/src/devices/machine/tms6100.cpp
@@ -20,6 +20,7 @@
***********************************************************************************************/
+#include "emu.h"
#include "tms6100.h"
diff --git a/src/devices/machine/tms6100.h b/src/devices/machine/tms6100.h
index e36cf12615e..6e9de083875 100644
--- a/src/devices/machine/tms6100.h
+++ b/src/devices/machine/tms6100.h
@@ -9,7 +9,6 @@
#ifndef __TMS6100_H__
#define __TMS6100_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/machine/tms9901.h b/src/devices/machine/tms9901.h
index c38bc9e5064..1ec5d3287c4 100644
--- a/src/devices/machine/tms9901.h
+++ b/src/devices/machine/tms9901.h
@@ -15,7 +15,6 @@
#ifndef __TMS9901_H__
#define __TMS9901_H__
-#include "emu.h"
extern const device_type TMS9901;
diff --git a/src/devices/machine/tms9902.cpp b/src/devices/machine/tms9902.cpp
index 4750bda6d0e..96f64376769 100644
--- a/src/devices/machine/tms9902.cpp
+++ b/src/devices/machine/tms9902.cpp
@@ -38,6 +38,7 @@
*****************************************************************************/
+#include "emu.h"
#include <math.h>
#include "tms9902.h"
diff --git a/src/devices/machine/tms9902.h b/src/devices/machine/tms9902.h
index ff6ac128aba..238f66bbca7 100644
--- a/src/devices/machine/tms9902.h
+++ b/src/devices/machine/tms9902.h
@@ -14,7 +14,6 @@
#ifndef __TMS9902_H__
#define __TMS9902_H__
-#include "emu.h"
// Serial control protocol values
#define TYPE_TMS9902 0x01
diff --git a/src/devices/machine/upd1990a.cpp b/src/devices/machine/upd1990a.cpp
index 58703942c05..c64f9f5a871 100644
--- a/src/devices/machine/upd1990a.cpp
+++ b/src/devices/machine/upd1990a.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "upd1990a.h"
diff --git a/src/devices/machine/upd1990a.h b/src/devices/machine/upd1990a.h
index 4f6d2900e40..af901ce798c 100644
--- a/src/devices/machine/upd1990a.h
+++ b/src/devices/machine/upd1990a.h
@@ -21,7 +21,6 @@
#ifndef __UPD1990A__
#define __UPD1990A__
-#include "emu.h"
#include "dirtc.h"
diff --git a/src/devices/machine/upd71071.h b/src/devices/machine/upd71071.h
index f1e223d353a..4a4b6d1c330 100644
--- a/src/devices/machine/upd71071.h
+++ b/src/devices/machine/upd71071.h
@@ -3,7 +3,6 @@
#ifndef __UPD71071_H__
#define __UPD71071_H__
-#include "emu.h"
struct upd71071_reg
diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp
index b736b170f4b..f287929ceb3 100644
--- a/src/devices/machine/upd765.cpp
+++ b/src/devices/machine/upd765.cpp
@@ -1,6 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "upd765.h"
#include "debugger.h"
diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h
index 4120754a599..458d832190c 100644
--- a/src/devices/machine/upd765.h
+++ b/src/devices/machine/upd765.h
@@ -3,7 +3,6 @@
#ifndef __UPD765_F_H__
#define __UPD765_F_H__
-#include "emu.h"
#include "imagedev/floppy.h"
#include "fdc_pll.h"
diff --git a/src/devices/machine/vrc4373.cpp b/src/devices/machine/vrc4373.cpp
index 1c1e3a0721e..d3ec703aaa8 100644
--- a/src/devices/machine/vrc4373.cpp
+++ b/src/devices/machine/vrc4373.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Ted Green
+#include "emu.h"
#include "vrc4373.h"
#define LOG_NILE (0)
diff --git a/src/devices/machine/vt82c496.cpp b/src/devices/machine/vt82c496.cpp
index ecb8113d645..5449b91a8e4 100644
--- a/src/devices/machine/vt82c496.cpp
+++ b/src/devices/machine/vt82c496.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "vt82c496.h"
/***************************************************************************
diff --git a/src/devices/machine/vt82c496.h b/src/devices/machine/vt82c496.h
index c33bf241fb3..027647acfa4 100644
--- a/src/devices/machine/vt82c496.h
+++ b/src/devices/machine/vt82c496.h
@@ -9,7 +9,6 @@
#ifndef __VT82C496_H__
#define __VT82C496_H__
-#include "emu.h"
#include "ram.h"
#define MCFG_VT82C496_ADD(_tag) \
diff --git a/src/devices/machine/vt83c461.cpp b/src/devices/machine/vt83c461.cpp
index b6df812ec7e..d93e98c08e9 100644
--- a/src/devices/machine/vt83c461.cpp
+++ b/src/devices/machine/vt83c461.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:smf
+#include "emu.h"
#include "vt83c461.h"
/***************************************************************************
diff --git a/src/devices/machine/wd11c00_17.cpp b/src/devices/machine/wd11c00_17.cpp
index 089d8dcbcdf..694dab86c2b 100644
--- a/src/devices/machine/wd11c00_17.cpp
+++ b/src/devices/machine/wd11c00_17.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "machine/wd11c00_17.h"
diff --git a/src/devices/machine/wd11c00_17.h b/src/devices/machine/wd11c00_17.h
index 9bfcead7943..593f24f0c75 100644
--- a/src/devices/machine/wd11c00_17.h
+++ b/src/devices/machine/wd11c00_17.h
@@ -12,7 +12,6 @@
#define __WD11C00_17__
-#include "emu.h"
diff --git a/src/devices/machine/wd2010.cpp b/src/devices/machine/wd2010.cpp
index 5a65cffbd0e..6bd76a488e7 100644
--- a/src/devices/machine/wd2010.cpp
+++ b/src/devices/machine/wd2010.cpp
@@ -48,6 +48,7 @@ Implements WD2010 / WD1010 controller basics.
// --------------------------------------------------------
+#include "emu.h"
#include "machine/wd2010.h"
//**************************************************************************
diff --git a/src/devices/machine/wd2010.h b/src/devices/machine/wd2010.h
index ea9faa8a7f1..0c8817b1276 100644
--- a/src/devices/machine/wd2010.h
+++ b/src/devices/machine/wd2010.h
@@ -12,7 +12,6 @@
#define __WD2010__
-#include "emu.h"
diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp
index 2b2ee4d847c..8fbdb4f469a 100644
--- a/src/devices/machine/wd7600.cpp
+++ b/src/devices/machine/wd7600.cpp
@@ -12,6 +12,7 @@
* TODO: pretty much everything
*/
+#include "emu.h"
#include "machine/wd7600.h"
const device_type WD7600 = &device_creator<wd7600_device>;
diff --git a/src/devices/machine/wd7600.h b/src/devices/machine/wd7600.h
index fa3a4323e0d..84e97e2d975 100644
--- a/src/devices/machine/wd7600.h
+++ b/src/devices/machine/wd7600.h
@@ -9,7 +9,6 @@
#ifndef WD7600_H_
#define WD7600_H_
-#include "emu.h"
#include "machine/am9517a.h"
#include "machine/pic8259.h"
#include "machine/pit8253.h"
diff --git a/src/devices/machine/wd_fdc.cpp b/src/devices/machine/wd_fdc.cpp
index a8e49bde845..2c3366400a0 100644
--- a/src/devices/machine/wd_fdc.cpp
+++ b/src/devices/machine/wd_fdc.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "wd_fdc.h"
#include "debugger.h"
diff --git a/src/devices/machine/wd_fdc.h b/src/devices/machine/wd_fdc.h
index ed8225535ab..beafbce6622 100644
--- a/src/devices/machine/wd_fdc.h
+++ b/src/devices/machine/wd_fdc.h
@@ -3,7 +3,6 @@
#ifndef WD_FDC_H
#define WD_FDC_H
-#include "emu.h"
#include "imagedev/floppy.h"
#include "fdc_pll.h"
diff --git a/src/devices/machine/wozfdc.h b/src/devices/machine/wozfdc.h
index cdf0b502de3..639cccb8ba7 100644
--- a/src/devices/machine/wozfdc.h
+++ b/src/devices/machine/wozfdc.h
@@ -13,7 +13,6 @@
#ifndef __WOZFDC_H__
#define __WOZFDC_H__
-#include "emu.h"
#include "imagedev/floppy.h"
#include "formats/flopimg.h"
diff --git a/src/devices/machine/x76f041.h b/src/devices/machine/x76f041.h
index c0ca2ed4019..33bf5b45f9b 100644
--- a/src/devices/machine/x76f041.h
+++ b/src/devices/machine/x76f041.h
@@ -12,7 +12,6 @@
#ifndef __X76F041_H__
#define __X76F041_H__
-#include "emu.h"
#define MCFG_X76F041_ADD( _tag ) \
MCFG_DEVICE_ADD( _tag, X76F041, 0 )
diff --git a/src/devices/machine/x76f100.h b/src/devices/machine/x76f100.h
index d338b1482ac..995b59510e0 100644
--- a/src/devices/machine/x76f100.h
+++ b/src/devices/machine/x76f100.h
@@ -12,7 +12,6 @@
#ifndef __X76F100_H__
#define __X76F100_H__
-#include "emu.h"
#define MCFG_X76F100_ADD( _tag ) \
MCFG_DEVICE_ADD( _tag, X76F100, 0 )
diff --git a/src/devices/machine/z80dart.cpp b/src/devices/machine/z80dart.cpp
index a5ff95a4793..20c6ef31008 100644
--- a/src/devices/machine/z80dart.cpp
+++ b/src/devices/machine/z80dart.cpp
@@ -29,6 +29,7 @@
*/
+#include "emu.h"
#include "z80dart.h"
//**************************************************************************
diff --git a/src/devices/machine/z80dart.h b/src/devices/machine/z80dart.h
index a70bd0fac33..74dde60a269 100644
--- a/src/devices/machine/z80dart.h
+++ b/src/devices/machine/z80dart.h
@@ -145,7 +145,6 @@
#ifndef __Z80DART_H__
#define __Z80DART_H__
-#include "emu.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/devices/machine/z80scc.cpp b/src/devices/machine/z80scc.cpp
index e2d4291b467..fc50eb65024 100644
--- a/src/devices/machine/z80scc.cpp
+++ b/src/devices/machine/z80scc.cpp
@@ -71,6 +71,7 @@ DONE (x) (p=partly) NMOS CMOS ESCC EMSCC
x/p = Features that has been implemented n/a = features that will not
***************************************************************************/
+#include "emu.h"
#include "z80scc.h"
diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h
index ce9fa3074f3..d2561ee395a 100644
--- a/src/devices/machine/z80scc.h
+++ b/src/devices/machine/z80scc.h
@@ -33,7 +33,6 @@
#ifndef __Z80SCC_H__
#define __Z80SCC_H__
-#include "emu.h"
#include "cpu/z80/z80daisy.h"
//**************************************************************************
diff --git a/src/devices/machine/z80sio.cpp b/src/devices/machine/z80sio.cpp
index 097891e5991..3d7d262c7fc 100644
--- a/src/devices/machine/z80sio.cpp
+++ b/src/devices/machine/z80sio.cpp
@@ -47,6 +47,7 @@
* = Features that has been implemented n/a = features that will not
***************************************************************************/
+#include "emu.h"
#include "z80sio.h"
//**************************************************************************
diff --git a/src/devices/machine/z80sio.h b/src/devices/machine/z80sio.h
index e9dcd4bcb4f..d9169c1285d 100644
--- a/src/devices/machine/z80sio.h
+++ b/src/devices/machine/z80sio.h
@@ -55,7 +55,6 @@
#ifndef __Z80SIO_H__
#define __Z80SIO_H__
-#include "emu.h"
#include "cpu/z80/z80daisy.h"
//**************************************************************************
diff --git a/src/devices/machine/z8536.h b/src/devices/machine/z8536.h
index 2110bdc87a2..e000196a97a 100644
--- a/src/devices/machine/z8536.h
+++ b/src/devices/machine/z8536.h
@@ -34,7 +34,6 @@
#ifndef __Z8536__
#define __Z8536__
-#include "emu.h"
#include "cpu/z80/z80daisy.h"
diff --git a/src/devices/sound/2203intf.cpp b/src/devices/sound/2203intf.cpp
index fc47564ac21..04bdd980c6e 100644
--- a/src/devices/sound/2203intf.cpp
+++ b/src/devices/sound/2203intf.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Ernesto Corvi
+#include "emu.h"
#include "2203intf.h"
#include "fm.h"
diff --git a/src/devices/sound/2203intf.h b/src/devices/sound/2203intf.h
index 24ffa5d3f9c..20c63887a04 100644
--- a/src/devices/sound/2203intf.h
+++ b/src/devices/sound/2203intf.h
@@ -5,7 +5,6 @@
#ifndef __2203INTF_H__
#define __2203INTF_H__
-#include "emu.h"
#include "ay8910.h"
void ym2203_update_request(void *param);
diff --git a/src/devices/sound/2608intf.cpp b/src/devices/sound/2608intf.cpp
index dd5b3ee6359..fd409f77cd3 100644
--- a/src/devices/sound/2608intf.cpp
+++ b/src/devices/sound/2608intf.cpp
@@ -13,6 +13,7 @@
***************************************************************************/
+#include "emu.h"
#include "2608intf.h"
#include "fm.h"
diff --git a/src/devices/sound/2608intf.h b/src/devices/sound/2608intf.h
index 8d1cd9442fd..25551a01227 100644
--- a/src/devices/sound/2608intf.h
+++ b/src/devices/sound/2608intf.h
@@ -5,7 +5,6 @@
#ifndef __2608INTF_H__
#define __2608INTF_H__
-#include "emu.h"
#include "ay8910.h"
void ym2608_update_request(void *param);
diff --git a/src/devices/sound/2610intf.cpp b/src/devices/sound/2610intf.cpp
index 4a2e3efe3bc..813079d6cb2 100644
--- a/src/devices/sound/2610intf.cpp
+++ b/src/devices/sound/2610intf.cpp
@@ -13,6 +13,7 @@
***************************************************************************/
+#include "emu.h"
#include "2610intf.h"
#include "fm.h"
diff --git a/src/devices/sound/2610intf.h b/src/devices/sound/2610intf.h
index 94376220586..4eff12cb54b 100644
--- a/src/devices/sound/2610intf.h
+++ b/src/devices/sound/2610intf.h
@@ -5,7 +5,6 @@
#ifndef __2610INTF_H__
#define __2610INTF_H__
-#include "emu.h"
#include "ay8910.h"
void ym2610_update_request(void *param);
diff --git a/src/devices/sound/2612intf.cpp b/src/devices/sound/2612intf.cpp
index cfcfed9d8fb..650c9a35041 100644
--- a/src/devices/sound/2612intf.cpp
+++ b/src/devices/sound/2612intf.cpp
@@ -13,6 +13,7 @@
***************************************************************************/
+#include "emu.h"
#include "2612intf.h"
#include "fm.h"
diff --git a/src/devices/sound/2612intf.h b/src/devices/sound/2612intf.h
index 51b774f0034..0695893f548 100644
--- a/src/devices/sound/2612intf.h
+++ b/src/devices/sound/2612intf.h
@@ -5,7 +5,6 @@
#ifndef __2612INTF_H__
#define __2612INTF_H__
-#include "emu.h"
void ym2612_update_request(void *param);
diff --git a/src/devices/sound/262intf.h b/src/devices/sound/262intf.h
index 63f4c8743cb..16f00e225d7 100644
--- a/src/devices/sound/262intf.h
+++ b/src/devices/sound/262intf.h
@@ -5,7 +5,6 @@
#ifndef __262INTF_H__
#define __262INTF_H__
-#include "emu.h"
#define MCFG_YMF262_IRQ_HANDLER(_devcb) \
devcb = &ymf262_device::set_irq_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/sound/3526intf.cpp b/src/devices/sound/3526intf.cpp
index 685d0be50b5..dc967d21e80 100644
--- a/src/devices/sound/3526intf.cpp
+++ b/src/devices/sound/3526intf.cpp
@@ -18,6 +18,7 @@
* NOTES
*
******************************************************************************/
+#include "emu.h"
#include "3526intf.h"
#include "fmopl.h"
diff --git a/src/devices/sound/3526intf.h b/src/devices/sound/3526intf.h
index c6139d17e48..2c448c526ad 100644
--- a/src/devices/sound/3526intf.h
+++ b/src/devices/sound/3526intf.h
@@ -5,7 +5,6 @@
#ifndef __3526INTF_H__
#define __3526INTF_H__
-#include "emu.h"
#define MCFG_YM3526_IRQ_HANDLER(_devcb) \
devcb = &ym3526_device::set_irq_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/sound/3812intf.h b/src/devices/sound/3812intf.h
index 10ae11ecaa7..d76a633d55b 100644
--- a/src/devices/sound/3812intf.h
+++ b/src/devices/sound/3812intf.h
@@ -5,7 +5,6 @@
#ifndef __3812INTF_H__
#define __3812INTF_H__
-#include "emu.h"
#define MCFG_YM3812_IRQ_HANDLER(_devcb) \
devcb = &ym3812_device::set_irq_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/sound/8950intf.cpp b/src/devices/sound/8950intf.cpp
index bcb4364a3db..7aecbd64b04 100644
--- a/src/devices/sound/8950intf.cpp
+++ b/src/devices/sound/8950intf.cpp
@@ -18,6 +18,7 @@
* NOTES
*
******************************************************************************/
+#include "emu.h"
#include "8950intf.h"
#include "fmopl.h"
diff --git a/src/devices/sound/8950intf.h b/src/devices/sound/8950intf.h
index 0c109e5712c..3e6e0497f08 100644
--- a/src/devices/sound/8950intf.h
+++ b/src/devices/sound/8950intf.h
@@ -5,7 +5,6 @@
#ifndef __8950INTF_H__
#define __8950INTF_H__
-#include "emu.h"
#define MCFG_Y8950_IRQ_HANDLER(_devcb) \
devcb = &y8950_device::set_irq_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/sound/ad1848.cpp b/src/devices/sound/ad1848.cpp
index ab8eb093e67..79ba429c619 100644
--- a/src/devices/sound/ad1848.cpp
+++ b/src/devices/sound/ad1848.cpp
@@ -3,6 +3,7 @@
// Analog Devices AD1848, main codec in Windows Sound System adapters
+#include "emu.h"
#include "sound/ad1848.h"
#include "sound/volt_reg.h"
diff --git a/src/devices/sound/ad1848.h b/src/devices/sound/ad1848.h
index e6305ea19a6..2c064f4eb68 100644
--- a/src/devices/sound/ad1848.h
+++ b/src/devices/sound/ad1848.h
@@ -3,7 +3,6 @@
#ifndef _AD1848_H_
#define _AD1848_H_
-#include "emu.h"
#include "sound/dac.h"
#define MCFG_AD1848_IRQ_CALLBACK(_cb) \
diff --git a/src/devices/sound/ay8910.h b/src/devices/sound/ay8910.h
index 6dfa3356508..a46bef62ffc 100644
--- a/src/devices/sound/ay8910.h
+++ b/src/devices/sound/ay8910.h
@@ -5,7 +5,6 @@
#ifndef __AY8910_H__
#define __AY8910_H__
-#include "emu.h"
/*
AY-3-8910A: 2 I/O ports
diff --git a/src/devices/sound/cdp1863.cpp b/src/devices/sound/cdp1863.cpp
index c85a55ee4a5..51a52ca286d 100644
--- a/src/devices/sound/cdp1863.cpp
+++ b/src/devices/sound/cdp1863.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "cdp1863.h"
diff --git a/src/devices/sound/cdp1863.h b/src/devices/sound/cdp1863.h
index 6890490fe53..d1f1b438d83 100644
--- a/src/devices/sound/cdp1863.h
+++ b/src/devices/sound/cdp1863.h
@@ -22,7 +22,6 @@
#ifndef __CDP1863__
#define __CDP1863__
-#include "emu.h"
diff --git a/src/devices/sound/cdp1864.cpp b/src/devices/sound/cdp1864.cpp
index f5996591cc3..78e3fbfbd7d 100644
--- a/src/devices/sound/cdp1864.cpp
+++ b/src/devices/sound/cdp1864.cpp
@@ -21,6 +21,7 @@
*/
+#include "emu.h"
#include "cdp1864.h"
diff --git a/src/devices/sound/cdp1864.h b/src/devices/sound/cdp1864.h
index f90e6005d2b..34f1c0be117 100644
--- a/src/devices/sound/cdp1864.h
+++ b/src/devices/sound/cdp1864.h
@@ -37,7 +37,6 @@
#ifndef __CDP1864__
#define __CDP1864__
-#include "emu.h"
#include "machine/rescap.h"
#include "video/resnet.h"
diff --git a/src/devices/sound/cdp1869.h b/src/devices/sound/cdp1869.h
index 212476f670e..035631e12e3 100644
--- a/src/devices/sound/cdp1869.h
+++ b/src/devices/sound/cdp1869.h
@@ -78,7 +78,6 @@
#ifndef __CDP1869__
#define __CDP1869__
-#include "emu.h"
diff --git a/src/devices/sound/dac.cpp b/src/devices/sound/dac.cpp
index 10694f731b9..fc413390107 100644
--- a/src/devices/sound/dac.cpp
+++ b/src/devices/sound/dac.cpp
@@ -15,4 +15,5 @@
#define DAC_GENERATOR_EPILOG(_dac_type, _dac_class) \
const device_type _dac_type = &device_creator<_dac_class>;
+#include "emu.h"
#include "dac.h"
diff --git a/src/devices/sound/dac.h b/src/devices/sound/dac.h
index 1e961798ee3..07156bdf777 100644
--- a/src/devices/sound/dac.h
+++ b/src/devices/sound/dac.h
@@ -15,7 +15,6 @@
#ifndef __DAC_H__
#define __DAC_H__
-#include "emu.h"
#define DAC_VREF_POS_INPUT (0)
#define DAC_VREF_NEG_INPUT (1)
diff --git a/src/devices/sound/dac76.cpp b/src/devices/sound/dac76.cpp
index 67fc452b260..0aa8dc93798 100644
--- a/src/devices/sound/dac76.cpp
+++ b/src/devices/sound/dac76.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "dac76.h"
diff --git a/src/devices/sound/dac76.h b/src/devices/sound/dac76.h
index b0086b2885f..ee0a4225e47 100644
--- a/src/devices/sound/dac76.h
+++ b/src/devices/sound/dac76.h
@@ -24,7 +24,6 @@
#ifndef __DAC76_H__
#define __DAC76_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/sound/dave.cpp b/src/devices/sound/dave.cpp
index 69a7f2aec6f..573bc010e99 100644
--- a/src/devices/sound/dave.cpp
+++ b/src/devices/sound/dave.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "dave.h"
diff --git a/src/devices/sound/dave.h b/src/devices/sound/dave.h
index 95bcf38fe92..1c22369a62e 100644
--- a/src/devices/sound/dave.h
+++ b/src/devices/sound/dave.h
@@ -11,7 +11,6 @@
#ifndef __DAVE__
#define __DAVE__
-#include "emu.h"
diff --git a/src/devices/sound/es1373.cpp b/src/devices/sound/es1373.cpp
index be6f46bbbd6..5f6a14e63c5 100644
--- a/src/devices/sound/es1373.cpp
+++ b/src/devices/sound/es1373.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Ted Green
+#include "emu.h"
#include "es1373.h"
#define LOG_ES (0)
diff --git a/src/devices/sound/esqpump.cpp b/src/devices/sound/esqpump.cpp
index 86c69195f4b..988aaa7f9d5 100644
--- a/src/devices/sound/esqpump.cpp
+++ b/src/devices/sound/esqpump.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "sound/esqpump.h"
const device_type ESQ_5505_5510_PUMP = &device_creator<esq_5505_5510_pump>;
diff --git a/src/devices/sound/esqpump.h b/src/devices/sound/esqpump.h
index 0752b8aa397..b904a023c3c 100644
--- a/src/devices/sound/esqpump.h
+++ b/src/devices/sound/esqpump.h
@@ -5,7 +5,6 @@
#ifndef _ESQPUMP_H_
#define _ESQPUMP_H_
-#include "emu.h"
#include "sound/es5506.h"
#include "cpu/es5510/es5510.h"
diff --git a/src/devices/sound/lmc1992.cpp b/src/devices/sound/lmc1992.cpp
index a55b26075ce..96cb91b094d 100644
--- a/src/devices/sound/lmc1992.cpp
+++ b/src/devices/sound/lmc1992.cpp
@@ -20,6 +20,7 @@
*/
+#include "emu.h"
#include "lmc1992.h"
diff --git a/src/devices/sound/lmc1992.h b/src/devices/sound/lmc1992.h
index d38003de183..d672bfc15a6 100644
--- a/src/devices/sound/lmc1992.h
+++ b/src/devices/sound/lmc1992.h
@@ -29,7 +29,6 @@
#ifndef __LMC1992__
#define __LMC1992__
-#include "emu.h"
diff --git a/src/devices/sound/mm5837.cpp b/src/devices/sound/mm5837.cpp
index fc700cdd55b..9ab3dd70141 100644
--- a/src/devices/sound/mm5837.cpp
+++ b/src/devices/sound/mm5837.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "mm5837.h"
diff --git a/src/devices/sound/mm5837.h b/src/devices/sound/mm5837.h
index f7d7b18b509..cd312c1a572 100644
--- a/src/devices/sound/mm5837.h
+++ b/src/devices/sound/mm5837.h
@@ -19,7 +19,6 @@
#ifndef __MM5837_H__
#define __MM5837_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/sound/mos6560.h b/src/devices/sound/mos6560.h
index c004a6252a4..849ff00d87d 100644
--- a/src/devices/sound/mos6560.h
+++ b/src/devices/sound/mos6560.h
@@ -34,7 +34,6 @@
#ifndef __MOS6560__
#define __MOS6560__
-#include "emu.h"
diff --git a/src/devices/sound/mos6581.cpp b/src/devices/sound/mos6581.cpp
index 47ec1909467..7854021a72d 100644
--- a/src/devices/sound/mos6581.cpp
+++ b/src/devices/sound/mos6581.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "mos6581.h"
#include "sid.h"
diff --git a/src/devices/sound/mos6581.h b/src/devices/sound/mos6581.h
index d0a0e611e17..a441adb82dc 100644
--- a/src/devices/sound/mos6581.h
+++ b/src/devices/sound/mos6581.h
@@ -28,7 +28,6 @@
#ifndef __MOS6581__
#define __MOS6581__
-#include "emu.h"
diff --git a/src/devices/sound/mos7360.h b/src/devices/sound/mos7360.h
index fc80ff14b8b..102110bc83e 100644
--- a/src/devices/sound/mos7360.h
+++ b/src/devices/sound/mos7360.h
@@ -34,7 +34,6 @@
#ifndef __MOS7360__
#define __MOS7360__
-#include "emu.h"
diff --git a/src/devices/sound/pcd3311.cpp b/src/devices/sound/pcd3311.cpp
index 96c7c122cf4..50a017da863 100644
--- a/src/devices/sound/pcd3311.cpp
+++ b/src/devices/sound/pcd3311.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "pcd3311.h"
diff --git a/src/devices/sound/pcd3311.h b/src/devices/sound/pcd3311.h
index 81c8fa7e089..00e2fdc8eb9 100644
--- a/src/devices/sound/pcd3311.h
+++ b/src/devices/sound/pcd3311.h
@@ -22,7 +22,6 @@
#ifndef __PCD3311__
#define __PCD3311__
-#include "emu.h"
diff --git a/src/devices/sound/pci-ac97.cpp b/src/devices/sound/pci-ac97.cpp
index 21c9f108aee..8f6afc300bd 100644
--- a/src/devices/sound/pci-ac97.cpp
+++ b/src/devices/sound/pci-ac97.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "pci-ac97.h"
const device_type AC97 = &device_creator<ac97_device>;
diff --git a/src/devices/sound/sb0400.cpp b/src/devices/sound/sb0400.cpp
index 43aff7dc9b3..20bdac1331e 100644
--- a/src/devices/sound/sb0400.cpp
+++ b/src/devices/sound/sb0400.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "sb0400.h"
const device_type SB0400 = &device_creator<sb0400_device>;
diff --git a/src/devices/sound/t6721a.cpp b/src/devices/sound/t6721a.cpp
index 2ad0f4f7e76..2eb5cd313d3 100644
--- a/src/devices/sound/t6721a.cpp
+++ b/src/devices/sound/t6721a.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "t6721a.h"
diff --git a/src/devices/sound/t6721a.h b/src/devices/sound/t6721a.h
index 8da6737c9ea..f9d45ffb2d4 100644
--- a/src/devices/sound/t6721a.h
+++ b/src/devices/sound/t6721a.h
@@ -35,7 +35,6 @@
#ifndef __T6721__
#define __T6721__
-#include "emu.h"
diff --git a/src/devices/sound/tms5110.h b/src/devices/sound/tms5110.h
index 569b943a575..deb461342d8 100644
--- a/src/devices/sound/tms5110.h
+++ b/src/devices/sound/tms5110.h
@@ -5,7 +5,6 @@
#ifndef __TMS5110_H__
#define __TMS5110_H__
-#include "emu.h"
/* HACK: if defined, uses impossibly perfect 'straight line' interpolation */
#undef PERFECT_INTERPOLATION_HACK
diff --git a/src/devices/sound/tms5220.h b/src/devices/sound/tms5220.h
index a71ada3a0b2..4a345052836 100644
--- a/src/devices/sound/tms5220.h
+++ b/src/devices/sound/tms5220.h
@@ -5,7 +5,6 @@
#ifndef __TMS5220_H__
#define __TMS5220_H__
-#include "emu.h"
#include "machine/spchrom.h"
enum
diff --git a/src/devices/sound/upd1771.h b/src/devices/sound/upd1771.h
index 2cf8b7ce6c6..77c5eed3ea9 100644
--- a/src/devices/sound/upd1771.h
+++ b/src/devices/sound/upd1771.h
@@ -9,7 +9,6 @@
#ifndef __UPD1771_H__
#define __UPD1771_H__
-#include "emu.h"
#define MAX_PACKET_SIZE 0x8000
diff --git a/src/devices/sound/volt_reg.cpp b/src/devices/sound/volt_reg.cpp
index 42a20d53950..82065a72568 100644
--- a/src/devices/sound/volt_reg.cpp
+++ b/src/devices/sound/volt_reg.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "volt_reg.h"
const device_type VOLTAGE_REGULATOR = &device_creator<voltage_regulator_device>;
diff --git a/src/devices/sound/volt_reg.h b/src/devices/sound/volt_reg.h
index 968a996dd93..18adb8264c6 100644
--- a/src/devices/sound/volt_reg.h
+++ b/src/devices/sound/volt_reg.h
@@ -11,7 +11,6 @@
#ifndef __VOLTAGE_REGULATOR_H__
#define __VOLTAGE_REGULATOR_H__
-#include "emu.h"
#define MCFG_VOLTAGE_REGULATOR_OUTPUT(_output) \
voltage_regulator_device::set_output(*device, _output);
diff --git a/src/devices/sound/ym2413.h b/src/devices/sound/ym2413.h
index aac803e46bc..21494ed00f5 100644
--- a/src/devices/sound/ym2413.h
+++ b/src/devices/sound/ym2413.h
@@ -5,7 +5,6 @@
#ifndef __YM2413_H__
#define __YM2413_H__
-#include "emu.h"
class ym2413_device : public device_t,
public device_sound_interface
diff --git a/src/devices/sound/ymf271.h b/src/devices/sound/ymf271.h
index 743b796d1ee..5c8598b54e6 100644
--- a/src/devices/sound/ymf271.h
+++ b/src/devices/sound/ymf271.h
@@ -5,7 +5,6 @@
#ifndef __YMF271_H__
#define __YMF271_H__
-#include "emu.h"
#define MCFG_YMF271_IRQ_HANDLER(_devcb) \
devcb = &ymf271_device::set_irq_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/sound/ymf278b.h b/src/devices/sound/ymf278b.h
index bca1113ae4f..1d1388630e8 100644
--- a/src/devices/sound/ymf278b.h
+++ b/src/devices/sound/ymf278b.h
@@ -5,7 +5,6 @@
#ifndef __YMF278B_H__
#define __YMF278B_H__
-#include "emu.h"
#define YMF278B_STD_CLOCK (33868800) /* standard clock for OPL4 */
diff --git a/src/devices/sound/ymz280b.h b/src/devices/sound/ymz280b.h
index 74dcd6bc0e4..267a9b570b6 100644
--- a/src/devices/sound/ymz280b.h
+++ b/src/devices/sound/ymz280b.h
@@ -12,7 +12,6 @@
#ifndef __YMZ280B_H__
#define __YMZ280B_H__
-#include "emu.h"
#define MAKE_WAVS 0
diff --git a/src/devices/video/cdp1861.h b/src/devices/video/cdp1861.h
index ba85da6311c..b72b47a3042 100644
--- a/src/devices/video/cdp1861.h
+++ b/src/devices/video/cdp1861.h
@@ -26,7 +26,6 @@
#ifndef __CDP1861__
#define __CDP1861__
-#include "emu.h"
diff --git a/src/devices/video/cdp1862.cpp b/src/devices/video/cdp1862.cpp
index ed471a4da8e..ab79e3998dd 100644
--- a/src/devices/video/cdp1862.cpp
+++ b/src/devices/video/cdp1862.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "cdp1862.h"
diff --git a/src/devices/video/cdp1862.h b/src/devices/video/cdp1862.h
index 11f1ed35d20..c93cf05c2c5 100644
--- a/src/devices/video/cdp1862.h
+++ b/src/devices/video/cdp1862.h
@@ -26,7 +26,6 @@
#ifndef __CDP1862__
#define __CDP1862__
-#include "emu.h"
diff --git a/src/devices/video/clgd542x.cpp b/src/devices/video/clgd542x.cpp
index 163c80ccccf..f03e418e8e7 100644
--- a/src/devices/video/clgd542x.cpp
+++ b/src/devices/video/clgd542x.cpp
@@ -6,6 +6,7 @@
*/
+#include "emu.h"
#include "clgd542x.h"
#define LOG_REG 0
diff --git a/src/devices/video/clgd542x.h b/src/devices/video/clgd542x.h
index 685233773b7..1579c2a0c0b 100644
--- a/src/devices/video/clgd542x.h
+++ b/src/devices/video/clgd542x.h
@@ -6,7 +6,6 @@
*/
-#include "emu.h"
#include "video/pc_vga.h"
MACHINE_CONFIG_EXTERN( pcvideo_cirrus_gd5428 );
diff --git a/src/devices/video/crt9007.h b/src/devices/video/crt9007.h
index 67d43d6ce40..dbfbc7986fb 100644
--- a/src/devices/video/crt9007.h
+++ b/src/devices/video/crt9007.h
@@ -34,7 +34,6 @@
#ifndef __CRT9007__
#define __CRT9007__
-#include "emu.h"
diff --git a/src/devices/video/crt9021.cpp b/src/devices/video/crt9021.cpp
index 66fc916aeaa..17f379d560c 100644
--- a/src/devices/video/crt9021.cpp
+++ b/src/devices/video/crt9021.cpp
@@ -33,6 +33,7 @@
*/
+#include "emu.h"
#include "crt9021.h"
diff --git a/src/devices/video/crt9021.h b/src/devices/video/crt9021.h
index 049c96013b5..36639d3b498 100644
--- a/src/devices/video/crt9021.h
+++ b/src/devices/video/crt9021.h
@@ -28,7 +28,6 @@
#ifndef __CRT9021__
#define __CRT9021__
-#include "emu.h"
diff --git a/src/devices/video/crt9212.cpp b/src/devices/video/crt9212.cpp
index 79bed06d43f..09c8cbb68aa 100644
--- a/src/devices/video/crt9212.cpp
+++ b/src/devices/video/crt9212.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "crt9212.h"
diff --git a/src/devices/video/crt9212.h b/src/devices/video/crt9212.h
index 4972c607e20..699594b98e0 100644
--- a/src/devices/video/crt9212.h
+++ b/src/devices/video/crt9212.h
@@ -28,7 +28,6 @@
#ifndef __CRT9212__
#define __CRT9212__
-#include "emu.h"
diff --git a/src/devices/video/crtc_ega.h b/src/devices/video/crtc_ega.h
index f65e949d0f6..587cb7e90b9 100644
--- a/src/devices/video/crtc_ega.h
+++ b/src/devices/video/crtc_ega.h
@@ -9,7 +9,6 @@
#ifndef __CRTC_EGA__
#define __CRTC_EGA__
-#include "emu.h"
/* callback definitions */
typedef device_delegate<void (bitmap_ind16 &bitmap, const rectangle &cliprect)> crtc_ega_begin_update_delegate;
diff --git a/src/devices/video/dm9368.cpp b/src/devices/video/dm9368.cpp
index 2b6502782bd..4b27a12da7d 100644
--- a/src/devices/video/dm9368.cpp
+++ b/src/devices/video/dm9368.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "dm9368.h"
diff --git a/src/devices/video/dm9368.h b/src/devices/video/dm9368.h
index 35364054124..2c6c1ca908c 100644
--- a/src/devices/video/dm9368.h
+++ b/src/devices/video/dm9368.h
@@ -22,7 +22,6 @@
#ifndef __DM9368__
#define __DM9368__
-#include "emu.h"
diff --git a/src/devices/video/ef9340_1.cpp b/src/devices/video/ef9340_1.cpp
index 204646654e4..c252e85aa46 100644
--- a/src/devices/video/ef9340_1.cpp
+++ b/src/devices/video/ef9340_1.cpp
@@ -9,6 +9,7 @@
***************************************************************************/
+#include "emu.h"
#include "ef9340_1.h"
#include "ef9341_chargen.h"
diff --git a/src/devices/video/ef9340_1.h b/src/devices/video/ef9340_1.h
index 9e0a4dc69b3..6a7246ae42a 100644
--- a/src/devices/video/ef9340_1.h
+++ b/src/devices/video/ef9340_1.h
@@ -14,7 +14,6 @@
#ifndef __EF9340_1_H__
#define __EF9340_1_H__
-#include "emu.h"
#define MCFG_EF9340_1_ADD(_tag, _clock, _screen_tag) \
diff --git a/src/devices/video/ef9369.cpp b/src/devices/video/ef9369.cpp
index 7d97888b845..f6012ffe0f4 100644
--- a/src/devices/video/ef9369.cpp
+++ b/src/devices/video/ef9369.cpp
@@ -6,6 +6,7 @@
***************************************************************************/
+#include "emu.h"
#include <algorithm>
#include "ef9369.h"
diff --git a/src/devices/video/ef9369.h b/src/devices/video/ef9369.h
index 3689e8c6f00..63b28d2cac7 100644
--- a/src/devices/video/ef9369.h
+++ b/src/devices/video/ef9369.h
@@ -29,7 +29,6 @@
#ifndef __EF9369_H__
#define __EF9369_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/video/fixfreq.h b/src/devices/video/fixfreq.h
index fa39a0b9de6..ed009275cae 100644
--- a/src/devices/video/fixfreq.h
+++ b/src/devices/video/fixfreq.h
@@ -14,7 +14,6 @@
#ifndef FIXFREQ_H
#define FIXFREQ_H
-#include "emu.h"
#include "machine/netlist.h"
#define FIXFREQ_INTERFACE(name) \
diff --git a/src/devices/video/gb_lcd.h b/src/devices/video/gb_lcd.h
index 351178bf006..6e3587439d9 100644
--- a/src/devices/video/gb_lcd.h
+++ b/src/devices/video/gb_lcd.h
@@ -9,7 +9,6 @@
#ifndef __GB_LCD_H__
#define __GB_LCD_H__
-#include "emu.h"
#include "cpu/lr35902/lr35902.h"
diff --git a/src/devices/video/gba_lcd.h b/src/devices/video/gba_lcd.h
index 9632cc4d25c..3df855b4535 100644
--- a/src/devices/video/gba_lcd.h
+++ b/src/devices/video/gba_lcd.h
@@ -15,7 +15,6 @@
#ifndef __GBA_LCD_H__
#define __GBA_LCD_H__
-#include "emu.h"
diff --git a/src/devices/video/gf7600gs.cpp b/src/devices/video/gf7600gs.cpp
index 8c79865d490..dfb16de1a1e 100644
--- a/src/devices/video/gf7600gs.cpp
+++ b/src/devices/video/gf7600gs.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "gf7600gs.h"
const device_type GEFORCE_7600GS = &device_creator<geforce_7600gs_device>;
diff --git a/src/devices/video/hd44102.h b/src/devices/video/hd44102.h
index 848515c2274..7aa19f2a8ea 100644
--- a/src/devices/video/hd44102.h
+++ b/src/devices/video/hd44102.h
@@ -11,7 +11,6 @@
#ifndef __HD44102__
#define __HD44102__
-#include "emu.h"
diff --git a/src/devices/video/hd61830.cpp b/src/devices/video/hd61830.cpp
index 51a5ae3ab35..de9c58b0928 100644
--- a/src/devices/video/hd61830.cpp
+++ b/src/devices/video/hd61830.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "hd61830.h"
diff --git a/src/devices/video/hd61830.h b/src/devices/video/hd61830.h
index 443aede5b9d..05f2ac1b3a2 100644
--- a/src/devices/video/hd61830.h
+++ b/src/devices/video/hd61830.h
@@ -11,7 +11,6 @@
#ifndef __HD61830__
#define __HD61830__
-#include "emu.h"
diff --git a/src/devices/video/hd63484.h b/src/devices/video/hd63484.h
index b30df47ba3c..83e2bbcb232 100644
--- a/src/devices/video/hd63484.h
+++ b/src/devices/video/hd63484.h
@@ -13,7 +13,6 @@
#define __HD63484__
-#include "emu.h"
typedef device_delegate<void (bitmap_ind16 &bitmap, const rectangle &cliprect, int y, int x, uint16_t data)> hd63484_display_delegate;
diff --git a/src/devices/video/hlcd0515.cpp b/src/devices/video/hlcd0515.cpp
index eb9f6271c07..c0697993466 100644
--- a/src/devices/video/hlcd0515.cpp
+++ b/src/devices/video/hlcd0515.cpp
@@ -13,6 +13,7 @@
*/
+#include "emu.h"
#include "video/hlcd0515.h"
diff --git a/src/devices/video/hlcd0515.h b/src/devices/video/hlcd0515.h
index a09af404b55..c551ef2e1fc 100644
--- a/src/devices/video/hlcd0515.h
+++ b/src/devices/video/hlcd0515.h
@@ -9,7 +9,6 @@
#ifndef _HLCD0515_H_
#define _HLCD0515_H_
-#include "emu.h"
// COL/ROW pins (offset for ROW)
diff --git a/src/devices/video/huc6202.h b/src/devices/video/huc6202.h
index 57d28adae25..5ad529a3e35 100644
--- a/src/devices/video/huc6202.h
+++ b/src/devices/video/huc6202.h
@@ -9,7 +9,6 @@
#ifndef __HUC6202_H_
#define __HUC6202_H_
-#include "emu.h"
#define MCFG_HUC6202_NEXT_PIXEL_0_CB(_devcb) \
diff --git a/src/devices/video/huc6260.h b/src/devices/video/huc6260.h
index 7c1cb117f39..f90a7946e20 100644
--- a/src/devices/video/huc6260.h
+++ b/src/devices/video/huc6260.h
@@ -10,7 +10,6 @@
#ifndef __HUC6260_H_
#define __HUC6260_H_
-#include "emu.h"
#define HUC6260_PALETTE_SIZE 1024
diff --git a/src/devices/video/huc6261.h b/src/devices/video/huc6261.h
index f1101397744..1e49f35dd9c 100644
--- a/src/devices/video/huc6261.h
+++ b/src/devices/video/huc6261.h
@@ -10,7 +10,6 @@
#ifndef __HUC6261_H_
#define __HUC6261_H_
-#include "emu.h"
#include "video/huc6270.h"
#include "video/huc6272.h"
diff --git a/src/devices/video/huc6270.h b/src/devices/video/huc6270.h
index fb80aaa08a4..a66dc703a34 100644
--- a/src/devices/video/huc6270.h
+++ b/src/devices/video/huc6270.h
@@ -9,7 +9,6 @@
#ifndef __HUC6270_H_
#define __HUC6270_H_
-#include "emu.h"
#define MCFG_HUC6270_VRAM_SIZE(_size) \
huc6270_device::set_vram_size(*device, _size);
diff --git a/src/devices/video/i8244.h b/src/devices/video/i8244.h
index 4827a3c278e..c3e3dcfd5ee 100644
--- a/src/devices/video/i8244.h
+++ b/src/devices/video/i8244.h
@@ -13,7 +13,6 @@
#ifndef __I8244_H__
#define __I8244_H__
-#include "emu.h"
/***************************************************************************
diff --git a/src/devices/video/i82730.cpp b/src/devices/video/i82730.cpp
index bad69058f31..1e2db782a01 100644
--- a/src/devices/video/i82730.cpp
+++ b/src/devices/video/i82730.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "i82730.h"
diff --git a/src/devices/video/i82730.h b/src/devices/video/i82730.h
index 3b78eb64ac4..2e459803d93 100644
--- a/src/devices/video/i82730.h
+++ b/src/devices/video/i82730.h
@@ -13,7 +13,6 @@
#ifndef __I82730_H__
#define __I82730_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/video/i8275.cpp b/src/devices/video/i8275.cpp
index dfdb5982318..0836fe74ea7 100644
--- a/src/devices/video/i8275.cpp
+++ b/src/devices/video/i8275.cpp
@@ -14,6 +14,7 @@
*/
+#include "emu.h"
#include "i8275.h"
diff --git a/src/devices/video/i8275.h b/src/devices/video/i8275.h
index 859647ef725..affc47e1f64 100644
--- a/src/devices/video/i8275.h
+++ b/src/devices/video/i8275.h
@@ -34,7 +34,6 @@
#ifndef __I8275x__
#define __I8275x__
-#include "emu.h"
diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h
index ddae73483b3..52fbad4711a 100644
--- a/src/devices/video/mc6845.h
+++ b/src/devices/video/mc6845.h
@@ -9,7 +9,6 @@
#ifndef __MC6845__
#define __MC6845__
-#include "emu.h"
#define MCFG_MC6845_ADD(_tag, _variant, _screen_tag, _clock) \
diff --git a/src/devices/video/mga2064w.cpp b/src/devices/video/mga2064w.cpp
index e3d054f8b75..50e1709594e 100644
--- a/src/devices/video/mga2064w.cpp
+++ b/src/devices/video/mga2064w.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
+#include "emu.h"
#include "mga2064w.h"
const device_type MGA2064W = &device_creator<mga2064w_device>;
diff --git a/src/devices/video/mos6566.cpp b/src/devices/video/mos6566.cpp
index ab34a1894d6..abfbaf808e3 100644
--- a/src/devices/video/mos6566.cpp
+++ b/src/devices/video/mos6566.cpp
@@ -18,6 +18,7 @@
*/
+#include "emu.h"
#include "mos6566.h"
diff --git a/src/devices/video/mos6566.h b/src/devices/video/mos6566.h
index 2b8c5ecd820..eedd627d6f9 100644
--- a/src/devices/video/mos6566.h
+++ b/src/devices/video/mos6566.h
@@ -82,7 +82,6 @@
#ifndef __MOS6566__
#define __MOS6566__
-#include "emu.h"
diff --git a/src/devices/video/msm6255.cpp b/src/devices/video/msm6255.cpp
index 50f0e1da71f..10a5eb6e368 100644
--- a/src/devices/video/msm6255.cpp
+++ b/src/devices/video/msm6255.cpp
@@ -6,6 +6,7 @@
**********************************************************************/
+#include "emu.h"
#include "msm6255.h"
diff --git a/src/devices/video/msm6255.h b/src/devices/video/msm6255.h
index b4b73d633a4..45e43d24b20 100644
--- a/src/devices/video/msm6255.h
+++ b/src/devices/video/msm6255.h
@@ -11,7 +11,6 @@
#ifndef __MSM6255__
#define __MSM6255__
-#include "emu.h"
diff --git a/src/devices/video/psx.h b/src/devices/video/psx.h
index e798122c697..d3b56642222 100644
--- a/src/devices/video/psx.h
+++ b/src/devices/video/psx.h
@@ -12,7 +12,6 @@
#ifndef __PSXGPU_H__
#define __PSXGPU_H__
-#include "emu.h"
#define MCFG_PSX_GPU_VBLANK_HANDLER(_devcb) \
devcb = &psxgpu_device::set_vblank_handler(*device, DEVCB_##_devcb);
diff --git a/src/devices/video/ramdac.h b/src/devices/video/ramdac.h
index 08bfa2cab92..9ae4ce030d2 100644
--- a/src/devices/video/ramdac.h
+++ b/src/devices/video/ramdac.h
@@ -11,7 +11,6 @@
#ifndef __ramdacDEV_H__
#define __ramdacDEV_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/video/saa5050.cpp b/src/devices/video/saa5050.cpp
index 5953e1a0d24..e4eb44768a3 100644
--- a/src/devices/video/saa5050.cpp
+++ b/src/devices/video/saa5050.cpp
@@ -18,6 +18,7 @@
*/
+#include "emu.h"
#include "saa5050.h"
diff --git a/src/devices/video/saa5050.h b/src/devices/video/saa5050.h
index aa854dbee18..c88d840227c 100644
--- a/src/devices/video/saa5050.h
+++ b/src/devices/video/saa5050.h
@@ -28,7 +28,6 @@
#ifndef __SAA5050__
#define __SAA5050__
-#include "emu.h"
diff --git a/src/devices/video/scn2674.cpp b/src/devices/video/scn2674.cpp
index 40aa2fc4c31..970a3a4e7f4 100644
--- a/src/devices/video/scn2674.cpp
+++ b/src/devices/video/scn2674.cpp
@@ -4,6 +4,7 @@
SCN2674 - Advanced Video Display Controller (AVDC) (Video Chip)
*/
+#include "emu.h"
#include "scn2674.h"
#define S674VERBOSE 0
diff --git a/src/devices/video/scn2674.h b/src/devices/video/scn2674.h
index 9d2617050fe..2353a84cbcb 100644
--- a/src/devices/video/scn2674.h
+++ b/src/devices/video/scn2674.h
@@ -3,7 +3,6 @@
#ifndef SCN2674_H
#define SCN2674_H
-#include "emu.h"
#define MCFG_SCN2674_VIDEO_ADD(_tag, _clock, _irq) \
MCFG_DEVICE_ADD(_tag, SCN2674_VIDEO, _clock) \
diff --git a/src/devices/video/sed1330.h b/src/devices/video/sed1330.h
index 5f4ceba6a0c..a71e35e0e83 100644
--- a/src/devices/video/sed1330.h
+++ b/src/devices/video/sed1330.h
@@ -11,7 +11,6 @@
#ifndef __SED1330__
#define __SED1330__
-#include "emu.h"
diff --git a/src/devices/video/tea1002.cpp b/src/devices/video/tea1002.cpp
index b42d7d7a8f3..f41520ddd17 100644
--- a/src/devices/video/tea1002.cpp
+++ b/src/devices/video/tea1002.cpp
@@ -8,6 +8,7 @@
***************************************************************************/
+#include "emu.h"
#include "tea1002.h"
diff --git a/src/devices/video/tea1002.h b/src/devices/video/tea1002.h
index d5107beec93..d0f4b38f876 100644
--- a/src/devices/video/tea1002.h
+++ b/src/devices/video/tea1002.h
@@ -24,7 +24,6 @@
#ifndef __TEA1002_H__
#define __TEA1002_H__
-#include "emu.h"
//**************************************************************************
diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h
index 37103e47c41..36dc2655928 100644
--- a/src/devices/video/tms9928a.h
+++ b/src/devices/video/tms9928a.h
@@ -26,7 +26,6 @@
#ifndef __TMS9928A_H__
#define __TMS9928A_H__
-#include "emu.h"
#define TMS9928A_PALETTE_SIZE 16
diff --git a/src/devices/video/upd3301.cpp b/src/devices/video/upd3301.cpp
index 46a544839b8..e84ad8436e6 100644
--- a/src/devices/video/upd3301.cpp
+++ b/src/devices/video/upd3301.cpp
@@ -19,6 +19,7 @@
*/
+#include "emu.h"
#include "upd3301.h"
diff --git a/src/devices/video/upd3301.h b/src/devices/video/upd3301.h
index ddb08116ae4..5d1c03c7ed1 100644
--- a/src/devices/video/upd3301.h
+++ b/src/devices/video/upd3301.h
@@ -34,7 +34,6 @@
#ifndef __UPD3301__
#define __UPD3301__
-#include "emu.h"
diff --git a/src/devices/video/upd7220.h b/src/devices/video/upd7220.h
index 97251e4f0f9..e55a1892241 100644
--- a/src/devices/video/upd7220.h
+++ b/src/devices/video/upd7220.h
@@ -34,7 +34,6 @@
#ifndef __UPD7220__
#define __UPD7220__
-#include "emu.h"
diff --git a/src/devices/video/upd7227.h b/src/devices/video/upd7227.h
index 2b39e1c0d22..c38b2fa10e2 100644
--- a/src/devices/video/upd7227.h
+++ b/src/devices/video/upd7227.h
@@ -11,7 +11,6 @@
#ifndef __UPD7227__
#define __UPD7227__
-#include "emu.h"
diff --git a/src/devices/video/voodoo_pci.cpp b/src/devices/video/voodoo_pci.cpp
index 0fe6811eefa..9221b051b16 100644
--- a/src/devices/video/voodoo_pci.cpp
+++ b/src/devices/video/voodoo_pci.cpp
@@ -1,5 +1,6 @@
// license:BSD-3-Clause
// copyright-holders:Ted Green
+#include "emu.h"
#include "voodoo_pci.h"
int voodoo_pci_device::m_type = 0;
diff --git a/src/devices/video/zeus2.cpp b/src/devices/video/zeus2.cpp
index f77412c5846..f40789b86ff 100644
--- a/src/devices/video/zeus2.cpp
+++ b/src/devices/video/zeus2.cpp
@@ -5,6 +5,7 @@
Midway Zeus2 Video
**************************************************************************/
+#include "emu.h"
#include "zeus2.h"
#define LOG_REGS 1
diff --git a/src/devices/video/zeus2.h b/src/devices/video/zeus2.h
index 35bb4f02f21..ed2ae71ba4d 100644
--- a/src/devices/video/zeus2.h
+++ b/src/devices/video/zeus2.h
@@ -8,7 +8,6 @@
#ifndef __ZEUS2_H__
#define __ZEUS2_H__
-#include "emu.h"
#include "video/poly.h"
#include "video/rgbutil.h"
#include "cpu/tms32031/tms32031.h"