summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Curt Coder <curtcoder@mail.com>2013-10-20 17:49:46 +0000
committer Curt Coder <curtcoder@mail.com>2013-10-20 17:49:46 +0000
commit1359d642c9656987b6d988e8aafb628841fcc97f (patch)
tree80aba2eeaa4d3b1687ad54d5e83d225e5b32ed7f
parent9cd179295e4783237b05a0c1369b46254da7c04a (diff)
(MESS) c64: Moved expansion and user ports under emu/bus. (nw)
-rw-r--r--.gitattributes296
-rw-r--r--src/emu/bus/bus.mak83
-rw-r--r--src/emu/bus/c64/16kb.c (renamed from src/mess/machine/c64/16kb.c)0
-rw-r--r--src/emu/bus/c64/16kb.h (renamed from src/mess/machine/c64/16kb.h)2
-rw-r--r--src/emu/bus/c64/4cga.c (renamed from src/mess/machine/c64/4cga.c)0
-rw-r--r--src/emu/bus/c64/4cga.h (renamed from src/mess/machine/c64/4cga.h)2
-rw-r--r--src/emu/bus/c64/4dxh.c (renamed from src/mess/machine/c64/4dxh.c)0
-rw-r--r--src/emu/bus/c64/4dxh.h (renamed from src/mess/machine/c64/4dxh.h)2
-rw-r--r--src/emu/bus/c64/4ksa.c (renamed from src/mess/machine/c64/4ksa.c)0
-rw-r--r--src/emu/bus/c64/4ksa.h (renamed from src/mess/machine/c64/4ksa.h)2
-rw-r--r--src/emu/bus/c64/4tba.c (renamed from src/mess/machine/c64/4tba.c)0
-rw-r--r--src/emu/bus/c64/4tba.h (renamed from src/mess/machine/c64/4tba.h)2
-rw-r--r--src/emu/bus/c64/bn1541.c (renamed from src/mess/machine/c64/bn1541.c)0
-rw-r--r--src/emu/bus/c64/bn1541.h (renamed from src/mess/machine/c64/bn1541.h)2
-rw-r--r--src/emu/bus/c64/c128_comal80.c (renamed from src/mess/machine/c128_comal80.c)0
-rw-r--r--src/emu/bus/c64/c128_comal80.h (renamed from src/mess/machine/c128_comal80.h)2
-rw-r--r--src/emu/bus/c64/comal80.c (renamed from src/mess/machine/c64/comal80.c)0
-rw-r--r--src/emu/bus/c64/comal80.h (renamed from src/mess/machine/c64/comal80.h)2
-rw-r--r--src/emu/bus/c64/cpm.c (renamed from src/mess/machine/c64/cpm.c)0
-rw-r--r--src/emu/bus/c64/cpm.h (renamed from src/mess/machine/c64/cpm.h)2
-rw-r--r--src/emu/bus/c64/currah_speech.c (renamed from src/mess/machine/c64/currah_speech.c)0
-rw-r--r--src/emu/bus/c64/currah_speech.h (renamed from src/mess/machine/c64/currah_speech.h)2
-rw-r--r--src/emu/bus/c64/dela_ep256.c (renamed from src/mess/machine/c64/dela_ep256.c)0
-rw-r--r--src/emu/bus/c64/dela_ep256.h (renamed from src/mess/machine/c64/dela_ep256.h)2
-rw-r--r--src/emu/bus/c64/dela_ep64.c (renamed from src/mess/machine/c64/dela_ep64.c)0
-rw-r--r--src/emu/bus/c64/dela_ep64.h (renamed from src/mess/machine/c64/dela_ep64.h)2
-rw-r--r--src/emu/bus/c64/dela_ep7x8.c (renamed from src/mess/machine/c64/dela_ep7x8.c)0
-rw-r--r--src/emu/bus/c64/dela_ep7x8.h (renamed from src/mess/machine/c64/dela_ep7x8.h)2
-rw-r--r--src/emu/bus/c64/dinamic.c (renamed from src/mess/machine/c64/dinamic.c)0
-rw-r--r--src/emu/bus/c64/dinamic.h (renamed from src/mess/machine/c64/dinamic.h)2
-rw-r--r--src/emu/bus/c64/dqbb.c (renamed from src/mess/machine/c64/dqbb.c)0
-rw-r--r--src/emu/bus/c64/dqbb.h (renamed from src/mess/machine/c64/dqbb.h)2
-rw-r--r--src/emu/bus/c64/easy_calc_result.c (renamed from src/mess/machine/c64/easy_calc_result.c)0
-rw-r--r--src/emu/bus/c64/easy_calc_result.h (renamed from src/mess/machine/c64/easy_calc_result.h)2
-rw-r--r--src/emu/bus/c64/easyflash.c (renamed from src/mess/machine/c64/easyflash.c)0
-rw-r--r--src/emu/bus/c64/easyflash.h (renamed from src/mess/machine/c64/easyflash.h)2
-rw-r--r--src/emu/bus/c64/epyx_fast_load.c (renamed from src/mess/machine/c64/epyx_fast_load.c)0
-rw-r--r--src/emu/bus/c64/epyx_fast_load.h (renamed from src/mess/machine/c64/epyx_fast_load.h)2
-rw-r--r--src/emu/bus/c64/exos.c (renamed from src/mess/machine/c64/exos.c)0
-rw-r--r--src/emu/bus/c64/exos.h (renamed from src/mess/machine/c64/exos.h)2
-rw-r--r--src/emu/bus/c64/exp.c (renamed from src/mess/machine/c64/exp.c)2
-rw-r--r--src/emu/bus/c64/exp.h (renamed from src/mess/machine/c64/exp.h)128
-rw-r--r--src/emu/bus/c64/fcc.c (renamed from src/mess/machine/c64/fcc.c)0
-rw-r--r--src/emu/bus/c64/fcc.h (renamed from src/mess/machine/c64/fcc.h)2
-rw-r--r--src/emu/bus/c64/final.c (renamed from src/mess/machine/c64/final.c)0
-rw-r--r--src/emu/bus/c64/final.h (renamed from src/mess/machine/c64/final.h)2
-rw-r--r--src/emu/bus/c64/final3.c (renamed from src/mess/machine/c64/final3.c)0
-rw-r--r--src/emu/bus/c64/final3.h (renamed from src/mess/machine/c64/final3.h)2
-rw-r--r--src/emu/bus/c64/fun_play.c (renamed from src/mess/machine/c64/fun_play.c)0
-rw-r--r--src/emu/bus/c64/fun_play.h (renamed from src/mess/machine/c64/fun_play.h)2
-rw-r--r--src/emu/bus/c64/geocable.c (renamed from src/mess/machine/c64/geocable.c)0
-rw-r--r--src/emu/bus/c64/geocable.h (renamed from src/mess/machine/c64/geocable.h)2
-rw-r--r--src/emu/bus/c64/georam.c (renamed from src/mess/machine/c64/georam.c)0
-rw-r--r--src/emu/bus/c64/georam.h (renamed from src/mess/machine/c64/georam.h)2
-rw-r--r--src/emu/bus/c64/ide64.c (renamed from src/mess/machine/c64/ide64.c)0
-rw-r--r--src/emu/bus/c64/ide64.h (renamed from src/mess/machine/c64/ide64.h)2
-rw-r--r--src/emu/bus/c64/ieee488.c (renamed from src/mess/machine/c64/ieee488.c)0
-rw-r--r--src/emu/bus/c64/ieee488.h (renamed from src/mess/machine/c64/ieee488.h)2
-rw-r--r--src/emu/bus/c64/kingsoft.c (renamed from src/mess/machine/c64/kingsoft.c)0
-rw-r--r--src/emu/bus/c64/kingsoft.h (renamed from src/mess/machine/c64/kingsoft.h)2
-rw-r--r--src/emu/bus/c64/mach5.c (renamed from src/mess/machine/c64/mach5.c)0
-rw-r--r--src/emu/bus/c64/mach5.h (renamed from src/mess/machine/c64/mach5.h)2
-rw-r--r--src/emu/bus/c64/magic_desk.c (renamed from src/mess/machine/c64/magic_desk.c)0
-rw-r--r--src/emu/bus/c64/magic_desk.h (renamed from src/mess/machine/c64/magic_desk.h)2
-rw-r--r--src/emu/bus/c64/magic_formel.c (renamed from src/mess/machine/c64/magic_formel.c)0
-rw-r--r--src/emu/bus/c64/magic_formel.h (renamed from src/mess/machine/c64/magic_formel.h)2
-rw-r--r--src/emu/bus/c64/magic_voice.c (renamed from src/mess/machine/c64/magic_voice.c)0
-rw-r--r--src/emu/bus/c64/magic_voice.h (renamed from src/mess/machine/c64/magic_voice.h)2
-rw-r--r--src/emu/bus/c64/midi_maplin.c (renamed from src/mess/machine/c64/midi_maplin.c)0
-rw-r--r--src/emu/bus/c64/midi_maplin.h (renamed from src/mess/machine/c64/midi_maplin.h)2
-rw-r--r--src/emu/bus/c64/midi_namesoft.c (renamed from src/mess/machine/c64/midi_namesoft.c)0
-rw-r--r--src/emu/bus/c64/midi_namesoft.h (renamed from src/mess/machine/c64/midi_namesoft.h)2
-rw-r--r--src/emu/bus/c64/midi_passport.c (renamed from src/mess/machine/c64/midi_passport.c)0
-rw-r--r--src/emu/bus/c64/midi_passport.h (renamed from src/mess/machine/c64/midi_passport.h)2
-rw-r--r--src/emu/bus/c64/midi_sci.c (renamed from src/mess/machine/c64/midi_sci.c)0
-rw-r--r--src/emu/bus/c64/midi_sci.h (renamed from src/mess/machine/c64/midi_sci.h)2
-rw-r--r--src/emu/bus/c64/midi_siel.c (renamed from src/mess/machine/c64/midi_siel.c)0
-rw-r--r--src/emu/bus/c64/midi_siel.h (renamed from src/mess/machine/c64/midi_siel.h)2
-rw-r--r--src/emu/bus/c64/mikro_assembler.c (renamed from src/mess/machine/c64/mikro_assembler.c)0
-rw-r--r--src/emu/bus/c64/mikro_assembler.h (renamed from src/mess/machine/c64/mikro_assembler.h)2
-rw-r--r--src/emu/bus/c64/multiscreen.c (renamed from src/mess/machine/c64/multiscreen.c)0
-rw-r--r--src/emu/bus/c64/multiscreen.h (renamed from src/mess/machine/c64/multiscreen.h)2
-rw-r--r--src/emu/bus/c64/music64.c (renamed from src/mess/machine/c64/music64.c)0
-rw-r--r--src/emu/bus/c64/music64.h (renamed from src/mess/machine/c64/music64.h)2
-rw-r--r--src/emu/bus/c64/neoram.c (renamed from src/mess/machine/c64/neoram.c)0
-rw-r--r--src/emu/bus/c64/neoram.h (renamed from src/mess/machine/c64/neoram.h)2
-rw-r--r--src/emu/bus/c64/ocean.c (renamed from src/mess/machine/c64/ocean.c)0
-rw-r--r--src/emu/bus/c64/ocean.h (renamed from src/mess/machine/c64/ocean.h)2
-rw-r--r--src/emu/bus/c64/pagefox.c (renamed from src/mess/machine/c64/pagefox.c)0
-rw-r--r--src/emu/bus/c64/pagefox.h (renamed from src/mess/machine/c64/pagefox.h)2
-rw-r--r--src/emu/bus/c64/partner.c (renamed from src/mess/machine/c64/partner.c)0
-rw-r--r--src/emu/bus/c64/partner.h (renamed from src/mess/machine/c64/partner.h)2
-rw-r--r--src/emu/bus/c64/prophet64.c (renamed from src/mess/machine/c64/prophet64.c)0
-rw-r--r--src/emu/bus/c64/prophet64.h (renamed from src/mess/machine/c64/prophet64.h)2
-rw-r--r--src/emu/bus/c64/ps64.c (renamed from src/mess/machine/c64/ps64.c)0
-rw-r--r--src/emu/bus/c64/ps64.h (renamed from src/mess/machine/c64/ps64.h)2
-rw-r--r--src/emu/bus/c64/reu.c (renamed from src/mess/machine/c64/reu.c)0
-rw-r--r--src/emu/bus/c64/reu.h (renamed from src/mess/machine/c64/reu.h)2
-rw-r--r--src/emu/bus/c64/rex.c (renamed from src/mess/machine/c64/rex.c)0
-rw-r--r--src/emu/bus/c64/rex.h (renamed from src/mess/machine/c64/rex.h)2
-rw-r--r--src/emu/bus/c64/rex_ep256.c (renamed from src/mess/machine/c64/rex_ep256.c)0
-rw-r--r--src/emu/bus/c64/rex_ep256.h (renamed from src/mess/machine/c64/rex_ep256.h)2
-rw-r--r--src/emu/bus/c64/ross.c (renamed from src/mess/machine/c64/ross.c)0
-rw-r--r--src/emu/bus/c64/ross.h (renamed from src/mess/machine/c64/ross.h)2
-rw-r--r--src/emu/bus/c64/sfx_sound_expander.c (renamed from src/mess/machine/c64/sfx_sound_expander.c)0
-rw-r--r--src/emu/bus/c64/sfx_sound_expander.h (renamed from src/mess/machine/c64/sfx_sound_expander.h)2
-rw-r--r--src/emu/bus/c64/silverrock.c (renamed from src/mess/machine/c64/silverrock.c)0
-rw-r--r--src/emu/bus/c64/silverrock.h (renamed from src/mess/machine/c64/silverrock.h)2
-rw-r--r--src/emu/bus/c64/simons_basic.c (renamed from src/mess/machine/c64/simons_basic.c)0
-rw-r--r--src/emu/bus/c64/simons_basic.h (renamed from src/mess/machine/c64/simons_basic.h)2
-rw-r--r--src/emu/bus/c64/stardos.c (renamed from src/mess/machine/c64/stardos.c)0
-rw-r--r--src/emu/bus/c64/stardos.h (renamed from src/mess/machine/c64/stardos.h)2
-rw-r--r--src/emu/bus/c64/std.c (renamed from src/mess/machine/c64/std.c)0
-rw-r--r--src/emu/bus/c64/std.h (renamed from src/mess/machine/c64/std.h)2
-rw-r--r--src/emu/bus/c64/structured_basic.c (renamed from src/mess/machine/c64/structured_basic.c)0
-rw-r--r--src/emu/bus/c64/structured_basic.h (renamed from src/mess/machine/c64/structured_basic.h)2
-rw-r--r--src/emu/bus/c64/super_explode.c (renamed from src/mess/machine/c64/super_explode.c)0
-rw-r--r--src/emu/bus/c64/super_explode.h (renamed from src/mess/machine/c64/super_explode.h)2
-rw-r--r--src/emu/bus/c64/super_games.c (renamed from src/mess/machine/c64/super_games.c)0
-rw-r--r--src/emu/bus/c64/super_games.h (renamed from src/mess/machine/c64/super_games.h)2
-rw-r--r--src/emu/bus/c64/supercpu.c (renamed from src/mess/machine/c64/supercpu.c)0
-rw-r--r--src/emu/bus/c64/supercpu.h (renamed from src/mess/machine/c64/supercpu.h)2
-rw-r--r--src/emu/bus/c64/sw8k.c (renamed from src/mess/machine/c64/sw8k.c)0
-rw-r--r--src/emu/bus/c64/sw8k.h (renamed from src/mess/machine/c64/sw8k.h)2
-rw-r--r--src/emu/bus/c64/swiftlink.c (renamed from src/mess/machine/c64/swiftlink.c)0
-rw-r--r--src/emu/bus/c64/swiftlink.h (renamed from src/mess/machine/c64/swiftlink.h)2
-rw-r--r--src/emu/bus/c64/system3.c (renamed from src/mess/machine/c64/system3.c)0
-rw-r--r--src/emu/bus/c64/system3.h (renamed from src/mess/machine/c64/system3.h)2
-rw-r--r--src/emu/bus/c64/tdos.c (renamed from src/mess/machine/c64/tdos.c)0
-rw-r--r--src/emu/bus/c64/tdos.h (renamed from src/mess/machine/c64/tdos.h)2
-rw-r--r--src/emu/bus/c64/turbo232.c (renamed from src/mess/machine/c64/turbo232.c)0
-rw-r--r--src/emu/bus/c64/turbo232.h (renamed from src/mess/machine/c64/turbo232.h)2
-rw-r--r--src/emu/bus/c64/user.c (renamed from src/mess/machine/c64/user.c)2
-rw-r--r--src/emu/bus/c64/user.h (renamed from src/mess/machine/c64/user.h)14
-rw-r--r--src/emu/bus/c64/vic1011.c (renamed from src/mess/machine/c64/vic1011.c)0
-rw-r--r--src/emu/bus/c64/vic1011.h (renamed from src/mess/machine/c64/vic1011.h)2
-rw-r--r--src/emu/bus/c64/vizastar.c (renamed from src/mess/machine/c64/vizastar.c)0
-rw-r--r--src/emu/bus/c64/vizastar.h (renamed from src/mess/machine/c64/vizastar.h)2
-rw-r--r--src/emu/bus/c64/vw64.c (renamed from src/mess/machine/c64/vw64.c)0
-rw-r--r--src/emu/bus/c64/vw64.h (renamed from src/mess/machine/c64/vw64.h)2
-rw-r--r--src/emu/bus/c64/warp_speed.c (renamed from src/mess/machine/c64/warp_speed.c)0
-rw-r--r--src/emu/bus/c64/warp_speed.h (renamed from src/mess/machine/c64/warp_speed.h)2
-rw-r--r--src/emu/bus/c64/westermann.c (renamed from src/mess/machine/c64/westermann.c)0
-rw-r--r--src/emu/bus/c64/westermann.h (renamed from src/mess/machine/c64/westermann.h)2
-rw-r--r--src/emu/bus/c64/xl80.c (renamed from src/mess/machine/c64/xl80.c)0
-rw-r--r--src/emu/bus/c64/xl80.h (renamed from src/mess/machine/c64/xl80.h)2
-rw-r--r--src/emu/bus/c64/zaxxon.c (renamed from src/mess/machine/c64/zaxxon.c)0
-rw-r--r--src/emu/bus/c64/zaxxon.h (renamed from src/mess/machine/c64/zaxxon.h)2
-rw-r--r--src/emu/bus/cbmiec/c1541.h2
-rw-r--r--src/emu/bus/cbmiec/c1571.h2
-rw-r--r--src/emu/emu.mak1
-rw-r--r--src/emu/machine/machine.mak9
-rw-r--r--src/emu/machine/mos8726.c (renamed from src/mess/machine/mos8726.c)0
-rw-r--r--src/emu/machine/mos8726.h (renamed from src/mess/machine/mos8726.h)0
-rw-r--r--src/mess/includes/c128.h6
-rw-r--r--src/mess/includes/c64.h6
-rw-r--r--src/mess/includes/vic20.h5
-rw-r--r--src/mess/mess.mak76
158 files changed, 397 insertions, 377 deletions
diff --git a/.gitattributes b/.gitattributes
index 85a9bc9030a..b7836c1a09d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -369,6 +369,152 @@ src/emu/bus/adamnet/printer.h svneol=native#text/plain
src/emu/bus/adamnet/spi.c svneol=native#text/plain
src/emu/bus/adamnet/spi.h svneol=native#text/plain
src/emu/bus/bus.mak svneol=native#text/plain
+src/emu/bus/c64/16kb.c svneol=native#text/plain
+src/emu/bus/c64/16kb.h svneol=native#text/plain
+src/emu/bus/c64/4cga.c svneol=native#text/plain
+src/emu/bus/c64/4cga.h svneol=native#text/plain
+src/emu/bus/c64/4dxh.c svneol=native#text/plain
+src/emu/bus/c64/4dxh.h svneol=native#text/plain
+src/emu/bus/c64/4ksa.c svneol=native#text/plain
+src/emu/bus/c64/4ksa.h svneol=native#text/plain
+src/emu/bus/c64/4tba.c svneol=native#text/plain
+src/emu/bus/c64/4tba.h svneol=native#text/plain
+src/emu/bus/c64/bn1541.c svneol=native#text/plain
+src/emu/bus/c64/bn1541.h svneol=native#text/plain
+src/emu/bus/c64/c128_comal80.c svneol=native#text/plain
+src/emu/bus/c64/c128_comal80.h svneol=native#text/plain
+src/emu/bus/c64/comal80.c svneol=native#text/plain
+src/emu/bus/c64/comal80.h svneol=native#text/plain
+src/emu/bus/c64/cpm.c svneol=native#text/plain
+src/emu/bus/c64/cpm.h svneol=native#text/plain
+src/emu/bus/c64/currah_speech.c svneol=native#text/plain
+src/emu/bus/c64/currah_speech.h svneol=native#text/plain
+src/emu/bus/c64/dela_ep256.c svneol=native#text/plain
+src/emu/bus/c64/dela_ep256.h svneol=native#text/plain
+src/emu/bus/c64/dela_ep64.c svneol=native#text/plain
+src/emu/bus/c64/dela_ep64.h svneol=native#text/plain
+src/emu/bus/c64/dela_ep7x8.c svneol=native#text/plain
+src/emu/bus/c64/dela_ep7x8.h svneol=native#text/plain
+src/emu/bus/c64/dinamic.c svneol=native#text/plain
+src/emu/bus/c64/dinamic.h svneol=native#text/plain
+src/emu/bus/c64/dqbb.c svneol=native#text/plain
+src/emu/bus/c64/dqbb.h svneol=native#text/plain
+src/emu/bus/c64/easy_calc_result.c svneol=native#text/plain
+src/emu/bus/c64/easy_calc_result.h svneol=native#text/plain
+src/emu/bus/c64/easyflash.c svneol=native#text/plain
+src/emu/bus/c64/easyflash.h svneol=native#text/plain
+src/emu/bus/c64/epyx_fast_load.c svneol=native#text/plain
+src/emu/bus/c64/epyx_fast_load.h svneol=native#text/plain
+src/emu/bus/c64/exos.c svneol=native#text/plain
+src/emu/bus/c64/exos.h svneol=native#text/plain
+src/emu/bus/c64/exp.c svneol=native#text/plain
+src/emu/bus/c64/exp.h svneol=native#text/plain
+src/emu/bus/c64/fcc.c svneol=native#text/plain
+src/emu/bus/c64/fcc.h svneol=native#text/plain
+src/emu/bus/c64/final.c svneol=native#text/plain
+src/emu/bus/c64/final.h svneol=native#text/plain
+src/emu/bus/c64/final3.c svneol=native#text/plain
+src/emu/bus/c64/final3.h svneol=native#text/plain
+src/emu/bus/c64/fun_play.c svneol=native#text/plain
+src/emu/bus/c64/fun_play.h svneol=native#text/plain
+src/emu/bus/c64/geocable.c svneol=native#text/plain
+src/emu/bus/c64/geocable.h svneol=native#text/plain
+src/emu/bus/c64/georam.c svneol=native#text/plain
+src/emu/bus/c64/georam.h svneol=native#text/plain
+src/emu/bus/c64/ide64.c svneol=native#text/plain
+src/emu/bus/c64/ide64.h svneol=native#text/plain
+src/emu/bus/c64/ieee488.c svneol=native#text/plain
+src/emu/bus/c64/ieee488.h svneol=native#text/plain
+src/emu/bus/c64/kingsoft.c svneol=native#text/plain
+src/emu/bus/c64/kingsoft.h svneol=native#text/plain
+src/emu/bus/c64/mach5.c svneol=native#text/plain
+src/emu/bus/c64/mach5.h svneol=native#text/plain
+src/emu/bus/c64/magic_desk.c svneol=native#text/plain
+src/emu/bus/c64/magic_desk.h svneol=native#text/plain
+src/emu/bus/c64/magic_formel.c svneol=native#text/plain
+src/emu/bus/c64/magic_formel.h svneol=native#text/plain
+src/emu/bus/c64/magic_voice.c svneol=native#text/plain
+src/emu/bus/c64/magic_voice.h svneol=native#text/plain
+src/emu/bus/c64/midi_maplin.c svneol=native#text/plain
+src/emu/bus/c64/midi_maplin.h svneol=native#text/plain
+src/emu/bus/c64/midi_namesoft.c svneol=native#text/plain
+src/emu/bus/c64/midi_namesoft.h svneol=native#text/plain
+src/emu/bus/c64/midi_passport.c svneol=native#text/plain
+src/emu/bus/c64/midi_passport.h svneol=native#text/plain
+src/emu/bus/c64/midi_sci.c svneol=native#text/plain
+src/emu/bus/c64/midi_sci.h svneol=native#text/plain
+src/emu/bus/c64/midi_siel.c svneol=native#text/plain
+src/emu/bus/c64/midi_siel.h svneol=native#text/plain
+src/emu/bus/c64/mikro_assembler.c svneol=native#text/plain
+src/emu/bus/c64/mikro_assembler.h svneol=native#text/plain
+src/emu/bus/c64/multiscreen.c svneol=native#text/plain
+src/emu/bus/c64/multiscreen.h svneol=native#text/plain
+src/emu/bus/c64/music64.c svneol=native#text/plain
+src/emu/bus/c64/music64.h svneol=native#text/plain
+src/emu/bus/c64/neoram.c svneol=native#text/plain
+src/emu/bus/c64/neoram.h svneol=native#text/plain
+src/emu/bus/c64/ocean.c svneol=native#text/plain
+src/emu/bus/c64/ocean.h svneol=native#text/plain
+src/emu/bus/c64/pagefox.c svneol=native#text/plain
+src/emu/bus/c64/pagefox.h svneol=native#text/plain
+src/emu/bus/c64/partner.c svneol=native#text/plain
+src/emu/bus/c64/partner.h svneol=native#text/plain
+src/emu/bus/c64/prophet64.c svneol=native#text/plain
+src/emu/bus/c64/prophet64.h svneol=native#text/plain
+src/emu/bus/c64/ps64.c svneol=native#text/plain
+src/emu/bus/c64/ps64.h svneol=native#text/plain
+src/emu/bus/c64/reu.c svneol=native#text/plain
+src/emu/bus/c64/reu.h svneol=native#text/plain
+src/emu/bus/c64/rex.c svneol=native#text/plain
+src/emu/bus/c64/rex.h svneol=native#text/plain
+src/emu/bus/c64/rex_ep256.c svneol=native#text/plain
+src/emu/bus/c64/rex_ep256.h svneol=native#text/plain
+src/emu/bus/c64/ross.c svneol=native#text/plain
+src/emu/bus/c64/ross.h svneol=native#text/plain
+src/emu/bus/c64/sfx_sound_expander.c svneol=native#text/plain
+src/emu/bus/c64/sfx_sound_expander.h svneol=native#text/plain
+src/emu/bus/c64/silverrock.c svneol=native#text/plain
+src/emu/bus/c64/silverrock.h svneol=native#text/plain
+src/emu/bus/c64/simons_basic.c svneol=native#text/plain
+src/emu/bus/c64/simons_basic.h svneol=native#text/plain
+src/emu/bus/c64/stardos.c svneol=native#text/plain
+src/emu/bus/c64/stardos.h svneol=native#text/plain
+src/emu/bus/c64/std.c svneol=native#text/plain
+src/emu/bus/c64/std.h svneol=native#text/plain
+src/emu/bus/c64/structured_basic.c svneol=native#text/plain
+src/emu/bus/c64/structured_basic.h svneol=native#text/plain
+src/emu/bus/c64/super_explode.c svneol=native#text/plain
+src/emu/bus/c64/super_explode.h svneol=native#text/plain
+src/emu/bus/c64/super_games.c svneol=native#text/plain
+src/emu/bus/c64/super_games.h svneol=native#text/plain
+src/emu/bus/c64/supercpu.c svneol=native#text/plain
+src/emu/bus/c64/supercpu.h svneol=native#text/plain
+src/emu/bus/c64/sw8k.c svneol=native#text/plain
+src/emu/bus/c64/sw8k.h svneol=native#text/plain
+src/emu/bus/c64/swiftlink.c svneol=native#text/plain
+src/emu/bus/c64/swiftlink.h svneol=native#text/plain
+src/emu/bus/c64/system3.c svneol=native#text/plain
+src/emu/bus/c64/system3.h svneol=native#text/plain
+src/emu/bus/c64/tdos.c svneol=native#text/plain
+src/emu/bus/c64/tdos.h svneol=native#text/plain
+src/emu/bus/c64/turbo232.c svneol=native#text/plain
+src/emu/bus/c64/turbo232.h svneol=native#text/plain
+src/emu/bus/c64/user.c svneol=native#text/plain
+src/emu/bus/c64/user.h svneol=native#text/plain
+src/emu/bus/c64/vic1011.c svneol=native#text/plain
+src/emu/bus/c64/vic1011.h svneol=native#text/plain
+src/emu/bus/c64/vizastar.c svneol=native#text/plain
+src/emu/bus/c64/vizastar.h svneol=native#text/plain
+src/emu/bus/c64/vw64.c svneol=native#text/plain
+src/emu/bus/c64/vw64.h svneol=native#text/plain
+src/emu/bus/c64/warp_speed.c svneol=native#text/plain
+src/emu/bus/c64/warp_speed.h svneol=native#text/plain
+src/emu/bus/c64/westermann.c svneol=native#text/plain
+src/emu/bus/c64/westermann.h svneol=native#text/plain
+src/emu/bus/c64/xl80.c svneol=native#text/plain
+src/emu/bus/c64/xl80.h svneol=native#text/plain
+src/emu/bus/c64/zaxxon.c svneol=native#text/plain
+src/emu/bus/c64/zaxxon.h svneol=native#text/plain
src/emu/bus/cbmiec/c1541.c svneol=native#text/plain
src/emu/bus/cbmiec/c1541.h svneol=native#text/plain
src/emu/bus/cbmiec/c1571.c svneol=native#text/plain
@@ -1473,6 +1619,8 @@ src/emu/machine/mos6530.c svneol=native#text/plain
src/emu/machine/mos6530.h svneol=native#text/plain
src/emu/machine/mos6551.c svneol=native#text/plain
src/emu/machine/mos6551.h svneol=native#text/plain
+src/emu/machine/mos8726.c svneol=native#text/plain
+src/emu/machine/mos8726.h svneol=native#text/plain
src/emu/machine/msm5832.c svneol=native#text/plain
src/emu/machine/msm5832.h svneol=native#text/plain
src/emu/machine/msm58321.c svneol=native#text/plain
@@ -7296,156 +7444,10 @@ src/mess/machine/bw2_ramcard.c svneol=native#text/plain
src/mess/machine/bw2_ramcard.h svneol=native#text/plain
src/mess/machine/bw2exp.c svneol=native#text/plain
src/mess/machine/bw2exp.h svneol=native#text/plain
-src/mess/machine/c128_comal80.c svneol=native#text/plain
-src/mess/machine/c128_comal80.h svneol=native#text/plain
src/mess/machine/c1551.c svneol=native#text/plain
src/mess/machine/c1551.h svneol=native#text/plain
src/mess/machine/c2n.c svneol=native#text/plain
src/mess/machine/c2n.h svneol=native#text/plain
-src/mess/machine/c64/16kb.c svneol=native#text/plain
-src/mess/machine/c64/16kb.h svneol=native#text/plain
-src/mess/machine/c64/4cga.c svneol=native#text/plain
-src/mess/machine/c64/4cga.h svneol=native#text/plain
-src/mess/machine/c64/4dxh.c svneol=native#text/plain
-src/mess/machine/c64/4dxh.h svneol=native#text/plain
-src/mess/machine/c64/4ksa.c svneol=native#text/plain
-src/mess/machine/c64/4ksa.h svneol=native#text/plain
-src/mess/machine/c64/4tba.c svneol=native#text/plain
-src/mess/machine/c64/4tba.h svneol=native#text/plain
-src/mess/machine/c64/bn1541.c svneol=native#text/plain
-src/mess/machine/c64/bn1541.h svneol=native#text/plain
-src/mess/machine/c64/comal80.c svneol=native#text/plain
-src/mess/machine/c64/comal80.h svneol=native#text/plain
-src/mess/machine/c64/cpm.c svneol=native#text/plain
-src/mess/machine/c64/cpm.h svneol=native#text/plain
-src/mess/machine/c64/currah_speech.c svneol=native#text/plain
-src/mess/machine/c64/currah_speech.h svneol=native#text/plain
-src/mess/machine/c64/dela_ep256.c svneol=native#text/plain
-src/mess/machine/c64/dela_ep256.h svneol=native#text/plain
-src/mess/machine/c64/dela_ep64.c svneol=native#text/plain
-src/mess/machine/c64/dela_ep64.h svneol=native#text/plain
-src/mess/machine/c64/dela_ep7x8.c svneol=native#text/plain
-src/mess/machine/c64/dela_ep7x8.h svneol=native#text/plain
-src/mess/machine/c64/dinamic.c svneol=native#text/plain
-src/mess/machine/c64/dinamic.h svneol=native#text/plain
-src/mess/machine/c64/dqbb.c svneol=native#text/plain
-src/mess/machine/c64/dqbb.h svneol=native#text/plain
-src/mess/machine/c64/easy_calc_result.c svneol=native#text/plain
-src/mess/machine/c64/easy_calc_result.h svneol=native#text/plain
-src/mess/machine/c64/easyflash.c svneol=native#text/plain
-src/mess/machine/c64/easyflash.h svneol=native#text/plain
-src/mess/machine/c64/epyx_fast_load.c svneol=native#text/plain
-src/mess/machine/c64/epyx_fast_load.h svneol=native#text/plain
-src/mess/machine/c64/exos.c svneol=native#text/plain
-src/mess/machine/c64/exos.h svneol=native#text/plain
-src/mess/machine/c64/exp.c svneol=native#text/plain
-src/mess/machine/c64/exp.h svneol=native#text/plain
-src/mess/machine/c64/fcc.c svneol=native#text/plain
-src/mess/machine/c64/fcc.h svneol=native#text/plain
-src/mess/machine/c64/final.c svneol=native#text/plain
-src/mess/machine/c64/final.h svneol=native#text/plain
-src/mess/machine/c64/final3.c svneol=native#text/plain
-src/mess/machine/c64/final3.h svneol=native#text/plain
-src/mess/machine/c64/fun_play.c svneol=native#text/plain
-src/mess/machine/c64/fun_play.h svneol=native#text/plain
-src/mess/machine/c64/geocable.c svneol=native#text/plain
-src/mess/machine/c64/geocable.h svneol=native#text/plain
-src/mess/machine/c64/georam.c svneol=native#text/plain
-src/mess/machine/c64/georam.h svneol=native#text/plain
-src/mess/machine/c64/ide64.c svneol=native#text/plain
-src/mess/machine/c64/ide64.h svneol=native#text/plain
-src/mess/machine/c64/ieee488.c svneol=native#text/plain
-src/mess/machine/c64/ieee488.h svneol=native#text/plain
-src/mess/machine/c64/kingsoft.c svneol=native#text/plain
-src/mess/machine/c64/kingsoft.h svneol=native#text/plain
-src/mess/machine/c64/mach5.c svneol=native#text/plain
-src/mess/machine/c64/mach5.h svneol=native#text/plain
-src/mess/machine/c64/magic_desk.c svneol=native#text/plain
-src/mess/machine/c64/magic_desk.h svneol=native#text/plain
-src/mess/machine/c64/magic_formel.c svneol=native#text/plain
-src/mess/machine/c64/magic_formel.h svneol=native#text/plain
-src/mess/machine/c64/magic_voice.c svneol=native#text/plain
-src/mess/machine/c64/magic_voice.h svneol=native#text/plain
-src/mess/machine/c64/midi_maplin.c svneol=native#text/plain
-src/mess/machine/c64/midi_maplin.h svneol=native#text/plain
-src/mess/machine/c64/midi_namesoft.c svneol=native#text/plain
-src/mess/machine/c64/midi_namesoft.h svneol=native#text/plain
-src/mess/machine/c64/midi_passport.c svneol=native#text/plain
-src/mess/machine/c64/midi_passport.h svneol=native#text/plain
-src/mess/machine/c64/midi_sci.c svneol=native#text/plain
-src/mess/machine/c64/midi_sci.h svneol=native#text/plain
-src/mess/machine/c64/midi_siel.c svneol=native#text/plain
-src/mess/machine/c64/midi_siel.h svneol=native#text/plain
-src/mess/machine/c64/mikro_assembler.c svneol=native#text/plain
-src/mess/machine/c64/mikro_assembler.h svneol=native#text/plain
-src/mess/machine/c64/multiscreen.c svneol=native#text/plain
-src/mess/machine/c64/multiscreen.h svneol=native#text/plain
-src/mess/machine/c64/music64.c svneol=native#text/plain
-src/mess/machine/c64/music64.h svneol=native#text/plain
-src/mess/machine/c64/neoram.c svneol=native#text/plain
-src/mess/machine/c64/neoram.h svneol=native#text/plain
-src/mess/machine/c64/ocean.c svneol=native#text/plain
-src/mess/machine/c64/ocean.h svneol=native#text/plain
-src/mess/machine/c64/pagefox.c svneol=native#text/plain
-src/mess/machine/c64/pagefox.h svneol=native#text/plain
-src/mess/machine/c64/partner.c svneol=native#text/plain
-src/mess/machine/c64/partner.h svneol=native#text/plain
-src/mess/machine/c64/prophet64.c svneol=native#text/plain
-src/mess/machine/c64/prophet64.h svneol=native#text/plain
-src/mess/machine/c64/ps64.c svneol=native#text/plain
-src/mess/machine/c64/ps64.h svneol=native#text/plain
-src/mess/machine/c64/reu.c svneol=native#text/plain
-src/mess/machine/c64/reu.h svneol=native#text/plain
-src/mess/machine/c64/rex.c svneol=native#text/plain
-src/mess/machine/c64/rex.h svneol=native#text/plain
-src/mess/machine/c64/rex_ep256.c svneol=native#text/plain
-src/mess/machine/c64/rex_ep256.h svneol=native#text/plain
-src/mess/machine/c64/ross.c svneol=native#text/plain
-src/mess/machine/c64/ross.h svneol=native#text/plain
-src/mess/machine/c64/sfx_sound_expander.c svneol=native#text/plain
-src/mess/machine/c64/sfx_sound_expander.h svneol=native#text/plain
-src/mess/machine/c64/silverrock.c svneol=native#text/plain
-src/mess/machine/c64/silverrock.h svneol=native#text/plain
-src/mess/machine/c64/simons_basic.c svneol=native#text/plain
-src/mess/machine/c64/simons_basic.h svneol=native#text/plain
-src/mess/machine/c64/stardos.c svneol=native#text/plain
-src/mess/machine/c64/stardos.h svneol=native#text/plain
-src/mess/machine/c64/std.c svneol=native#text/plain
-src/mess/machine/c64/std.h svneol=native#text/plain
-src/mess/machine/c64/structured_basic.c svneol=native#text/plain
-src/mess/machine/c64/structured_basic.h svneol=native#text/plain
-src/mess/machine/c64/super_explode.c svneol=native#text/plain
-src/mess/machine/c64/super_explode.h svneol=native#text/plain
-src/mess/machine/c64/super_games.c svneol=native#text/plain
-src/mess/machine/c64/super_games.h svneol=native#text/plain
-src/mess/machine/c64/supercpu.c svneol=native#text/plain
-src/mess/machine/c64/supercpu.h svneol=native#text/plain
-src/mess/machine/c64/sw8k.c svneol=native#text/plain
-src/mess/machine/c64/sw8k.h svneol=native#text/plain
-src/mess/machine/c64/swiftlink.c svneol=native#text/plain
-src/mess/machine/c64/swiftlink.h svneol=native#text/plain
-src/mess/machine/c64/system3.c svneol=native#text/plain
-src/mess/machine/c64/system3.h svneol=native#text/plain
-src/mess/machine/c64/tdos.c svneol=native#text/plain
-src/mess/machine/c64/tdos.h svneol=native#text/plain
-src/mess/machine/c64/turbo232.c svneol=native#text/plain
-src/mess/machine/c64/turbo232.h svneol=native#text/plain
-src/mess/machine/c64/user.c svneol=native#text/plain
-src/mess/machine/c64/user.h svneol=native#text/plain
-src/mess/machine/c64/vic1011.c svneol=native#text/plain
-src/mess/machine/c64/vic1011.h svneol=native#text/plain
-src/mess/machine/c64/vizastar.c svneol=native#text/plain
-src/mess/machine/c64/vizastar.h svneol=native#text/plain
-src/mess/machine/c64/vw64.c svneol=native#text/plain
-src/mess/machine/c64/vw64.h svneol=native#text/plain
-src/mess/machine/c64/warp_speed.c svneol=native#text/plain
-src/mess/machine/c64/warp_speed.h svneol=native#text/plain
-src/mess/machine/c64/westermann.c svneol=native#text/plain
-src/mess/machine/c64/westermann.h svneol=native#text/plain
-src/mess/machine/c64/xl80.c svneol=native#text/plain
-src/mess/machine/c64/xl80.h svneol=native#text/plain
-src/mess/machine/c64/zaxxon.c svneol=native#text/plain
-src/mess/machine/c64/zaxxon.h svneol=native#text/plain
src/mess/machine/c65.c svneol=native#text/plain
src/mess/machine/cbm2_24k.c svneol=native#text/plain
src/mess/machine/cbm2_24k.h svneol=native#text/plain
@@ -7758,8 +7760,6 @@ src/mess/machine/mos8706.c svneol=native#text/plain
src/mess/machine/mos8706.h svneol=native#text/plain
src/mess/machine/mos8722.c svneol=native#text/plain
src/mess/machine/mos8722.h svneol=native#text/plain
-src/mess/machine/mos8726.c svneol=native#text/plain
-src/mess/machine/mos8726.h svneol=native#text/plain
src/mess/machine/mpc105.c svneol=native#text/plain
src/mess/machine/mpc105.h svneol=native#text/plain
src/mess/machine/mpu401.c svneol=native#text/plain
diff --git a/src/emu/bus/bus.mak b/src/emu/bus/bus.mak
index c17e238cc5b..d826fb65dd7 100644
--- a/src/emu/bus/bus.mak
+++ b/src/emu/bus/bus.mak
@@ -31,6 +31,89 @@ endif
#-------------------------------------------------
#
+#@src/emu/bus/c64/exp.h,BUSES += C64
+#@src/emu/bus/c64/user.h,BUSES += C64
+#-------------------------------------------------
+
+ifneq ($(filter C64,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/c64/exp.o
+BUSOBJS += $(BUSOBJ)/c64/c128_comal80.o
+BUSOBJS += $(BUSOBJ)/c64/comal80.o
+BUSOBJS += $(BUSOBJ)/c64/cpm.o
+BUSOBJS += $(BUSOBJ)/c64/currah_speech.o
+BUSOBJS += $(BUSOBJ)/c64/dela_ep256.o
+BUSOBJS += $(BUSOBJ)/c64/dela_ep64.o
+BUSOBJS += $(BUSOBJ)/c64/dela_ep7x8.o
+BUSOBJS += $(BUSOBJ)/c64/dinamic.o
+BUSOBJS += $(BUSOBJ)/c64/dqbb.o
+BUSOBJS += $(BUSOBJ)/c64/easy_calc_result.o
+BUSOBJS += $(BUSOBJ)/c64/easyflash.o
+BUSOBJS += $(BUSOBJ)/c64/epyx_fast_load.o
+BUSOBJS += $(BUSOBJ)/c64/exos.o
+BUSOBJS += $(BUSOBJ)/c64/fcc.o
+BUSOBJS += $(BUSOBJ)/c64/final.o
+BUSOBJS += $(BUSOBJ)/c64/final3.o
+BUSOBJS += $(BUSOBJ)/c64/fun_play.o
+BUSOBJS += $(BUSOBJ)/c64/georam.o
+BUSOBJS += $(BUSOBJ)/c64/ide64.o
+BUSOBJS += $(BUSOBJ)/c64/ieee488.o
+BUSOBJS += $(BUSOBJ)/c64/kingsoft.o
+BUSOBJS += $(BUSOBJ)/c64/mach5.o
+BUSOBJS += $(BUSOBJ)/c64/magic_desk.o
+BUSOBJS += $(BUSOBJ)/c64/magic_formel.o
+BUSOBJS += $(BUSOBJ)/c64/magic_voice.o
+BUSOBJS += $(BUSOBJ)/c64/midi_maplin.o
+BUSOBJS += $(BUSOBJ)/c64/midi_namesoft.o
+BUSOBJS += $(BUSOBJ)/c64/midi_passport.o
+BUSOBJS += $(BUSOBJ)/c64/midi_sci.o
+BUSOBJS += $(BUSOBJ)/c64/midi_siel.o
+BUSOBJS += $(BUSOBJ)/c64/mikro_assembler.o
+BUSOBJS += $(BUSOBJ)/c64/multiscreen.o
+BUSOBJS += $(BUSOBJ)/c64/music64.o
+BUSOBJS += $(BUSOBJ)/c64/neoram.o
+BUSOBJS += $(BUSOBJ)/c64/ocean.o
+BUSOBJS += $(BUSOBJ)/c64/pagefox.o
+BUSOBJS += $(BUSOBJ)/c64/partner.o
+BUSOBJS += $(BUSOBJ)/c64/prophet64.o
+BUSOBJS += $(BUSOBJ)/c64/ps64.o
+BUSOBJS += $(BUSOBJ)/c64/reu.o
+BUSOBJS += $(BUSOBJ)/c64/rex.o
+BUSOBJS += $(BUSOBJ)/c64/rex_ep256.o
+BUSOBJS += $(BUSOBJ)/c64/ross.o
+BUSOBJS += $(BUSOBJ)/c64/sfx_sound_expander.o
+BUSOBJS += $(BUSOBJ)/c64/silverrock.o
+BUSOBJS += $(BUSOBJ)/c64/simons_basic.o
+BUSOBJS += $(BUSOBJ)/c64/stardos.o
+BUSOBJS += $(BUSOBJ)/c64/std.o
+BUSOBJS += $(BUSOBJ)/c64/structured_basic.o
+BUSOBJS += $(BUSOBJ)/c64/super_explode.o
+BUSOBJS += $(BUSOBJ)/c64/super_games.o
+BUSOBJS += $(BUSOBJ)/c64/supercpu.o
+BUSOBJS += $(BUSOBJ)/c64/sw8k.o
+BUSOBJS += $(BUSOBJ)/c64/swiftlink.o
+BUSOBJS += $(BUSOBJ)/c64/system3.o
+BUSOBJS += $(BUSOBJ)/c64/tdos.o
+BUSOBJS += $(BUSOBJ)/c64/turbo232.o
+BUSOBJS += $(BUSOBJ)/c64/vizastar.o
+BUSOBJS += $(BUSOBJ)/c64/vw64.o
+BUSOBJS += $(BUSOBJ)/c64/warp_speed.o
+BUSOBJS += $(BUSOBJ)/c64/westermann.o
+BUSOBJS += $(BUSOBJ)/c64/xl80.o
+BUSOBJS += $(BUSOBJ)/c64/zaxxon.o
+BUSOBJS += $(BUSOBJ)/c64/user.o
+BUSOBJS += $(BUSOBJ)/c64/4cga.o
+BUSOBJS += $(BUSOBJ)/c64/4dxh.o
+BUSOBJS += $(BUSOBJ)/c64/4ksa.o
+BUSOBJS += $(BUSOBJ)/c64/4tba.o
+BUSOBJS += $(BUSOBJ)/c64/16kb.o
+BUSOBJS += $(BUSOBJ)/c64/bn1541.o
+BUSOBJS += $(BUSOBJ)/c64/geocable.o
+BUSOBJS += $(BUSOBJ)/c64/vic1011.o
+endif
+
+
+#-------------------------------------------------
+#
#@src/emu/bus/cbmiec/cbmiec.h,BUSES += CBMIEC
#-------------------------------------------------
diff --git a/src/mess/machine/c64/16kb.c b/src/emu/bus/c64/16kb.c
index e92eff8704f..e92eff8704f 100644
--- a/src/mess/machine/c64/16kb.c
+++ b/src/emu/bus/c64/16kb.c
diff --git a/src/mess/machine/c64/16kb.h b/src/emu/bus/c64/16kb.h
index 989198845a6..ddfdad85b25 100644
--- a/src/mess/machine/c64/16kb.h
+++ b/src/emu/bus/c64/16kb.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/4cga.c b/src/emu/bus/c64/4cga.c
index f1b28bee4d7..f1b28bee4d7 100644
--- a/src/mess/machine/c64/4cga.c
+++ b/src/emu/bus/c64/4cga.c
diff --git a/src/mess/machine/c64/4cga.h b/src/emu/bus/c64/4cga.h
index 9f8c762f529..6a1b13ca329 100644
--- a/src/mess/machine/c64/4cga.h
+++ b/src/emu/bus/c64/4cga.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
diff --git a/src/mess/machine/c64/4dxh.c b/src/emu/bus/c64/4dxh.c
index 7089f4a1dbb..7089f4a1dbb 100644
--- a/src/mess/machine/c64/4dxh.c
+++ b/src/emu/bus/c64/4dxh.c
diff --git a/src/mess/machine/c64/4dxh.h b/src/emu/bus/c64/4dxh.h
index 6d4fcc3dd80..916d166f167 100644
--- a/src/mess/machine/c64/4dxh.h
+++ b/src/emu/bus/c64/4dxh.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
diff --git a/src/mess/machine/c64/4ksa.c b/src/emu/bus/c64/4ksa.c
index a06249b3c8b..a06249b3c8b 100644
--- a/src/mess/machine/c64/4ksa.c
+++ b/src/emu/bus/c64/4ksa.c
diff --git a/src/mess/machine/c64/4ksa.h b/src/emu/bus/c64/4ksa.h
index 1e8359f8457..a951b9c8156 100644
--- a/src/mess/machine/c64/4ksa.h
+++ b/src/emu/bus/c64/4ksa.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
diff --git a/src/mess/machine/c64/4tba.c b/src/emu/bus/c64/4tba.c
index 24ca8365782..24ca8365782 100644
--- a/src/mess/machine/c64/4tba.c
+++ b/src/emu/bus/c64/4tba.c
diff --git a/src/mess/machine/c64/4tba.h b/src/emu/bus/c64/4tba.h
index da1f5ec2b4c..de2ba62d558 100644
--- a/src/mess/machine/c64/4tba.h
+++ b/src/emu/bus/c64/4tba.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
diff --git a/src/mess/machine/c64/bn1541.c b/src/emu/bus/c64/bn1541.c
index 8b4ada74f1a..8b4ada74f1a 100644
--- a/src/mess/machine/c64/bn1541.c
+++ b/src/emu/bus/c64/bn1541.c
diff --git a/src/mess/machine/c64/bn1541.h b/src/emu/bus/c64/bn1541.h
index e6358282e92..3d1816cf7ac 100644
--- a/src/mess/machine/c64/bn1541.h
+++ b/src/emu/bus/c64/bn1541.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
diff --git a/src/mess/machine/c128_comal80.c b/src/emu/bus/c64/c128_comal80.c
index 2b6caeb55ab..2b6caeb55ab 100644
--- a/src/mess/machine/c128_comal80.c
+++ b/src/emu/bus/c64/c128_comal80.c
diff --git a/src/mess/machine/c128_comal80.h b/src/emu/bus/c64/c128_comal80.h
index 621bad5f363..a206816554e 100644
--- a/src/mess/machine/c128_comal80.h
+++ b/src/emu/bus/c64/c128_comal80.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/comal80.c b/src/emu/bus/c64/comal80.c
index f21030420cc..f21030420cc 100644
--- a/src/mess/machine/c64/comal80.c
+++ b/src/emu/bus/c64/comal80.c
diff --git a/src/mess/machine/c64/comal80.h b/src/emu/bus/c64/comal80.h
index 1c412b261b7..c2273ecdd73 100644
--- a/src/mess/machine/c64/comal80.h
+++ b/src/emu/bus/c64/comal80.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/cpm.c b/src/emu/bus/c64/cpm.c
index 5336b55d11e..5336b55d11e 100644
--- a/src/mess/machine/c64/cpm.c
+++ b/src/emu/bus/c64/cpm.c
diff --git a/src/mess/machine/c64/cpm.h b/src/emu/bus/c64/cpm.h
index bb35086f90f..b9dd3df34bd 100644
--- a/src/mess/machine/c64/cpm.h
+++ b/src/emu/bus/c64/cpm.h
@@ -18,7 +18,7 @@
#include "emu.h"
#include "cpu/z80/z80.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/currah_speech.c b/src/emu/bus/c64/currah_speech.c
index e4a02030dfb..e4a02030dfb 100644
--- a/src/mess/machine/c64/currah_speech.c
+++ b/src/emu/bus/c64/currah_speech.c
diff --git a/src/mess/machine/c64/currah_speech.h b/src/emu/bus/c64/currah_speech.h
index 77533446106..4b115c5a92e 100644
--- a/src/mess/machine/c64/currah_speech.h
+++ b/src/emu/bus/c64/currah_speech.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "sound/sp0256.h"
diff --git a/src/mess/machine/c64/dela_ep256.c b/src/emu/bus/c64/dela_ep256.c
index 0020806afdb..0020806afdb 100644
--- a/src/mess/machine/c64/dela_ep256.c
+++ b/src/emu/bus/c64/dela_ep256.c
diff --git a/src/mess/machine/c64/dela_ep256.h b/src/emu/bus/c64/dela_ep256.h
index 42b58147eb8..bba52a07ab2 100644
--- a/src/mess/machine/c64/dela_ep256.h
+++ b/src/emu/bus/c64/dela_ep256.h
@@ -16,8 +16,8 @@
#include "emu.h"
+#include "exp.h"
#include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
diff --git a/src/mess/machine/c64/dela_ep64.c b/src/emu/bus/c64/dela_ep64.c
index cdc2a86a4d4..cdc2a86a4d4 100644
--- a/src/mess/machine/c64/dela_ep64.c
+++ b/src/emu/bus/c64/dela_ep64.c
diff --git a/src/mess/machine/c64/dela_ep64.h b/src/emu/bus/c64/dela_ep64.h
index 19bee01ac94..b3d82b5aed7 100644
--- a/src/mess/machine/c64/dela_ep64.h
+++ b/src/emu/bus/c64/dela_ep64.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/dela_ep7x8.c b/src/emu/bus/c64/dela_ep7x8.c
index 3e9802db0f4..3e9802db0f4 100644
--- a/src/mess/machine/c64/dela_ep7x8.c
+++ b/src/emu/bus/c64/dela_ep7x8.c
diff --git a/src/mess/machine/c64/dela_ep7x8.h b/src/emu/bus/c64/dela_ep7x8.h
index 2c262ac99ce..ebf48e2e221 100644
--- a/src/mess/machine/c64/dela_ep7x8.h
+++ b/src/emu/bus/c64/dela_ep7x8.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/dinamic.c b/src/emu/bus/c64/dinamic.c
index 1ad849f5861..1ad849f5861 100644
--- a/src/mess/machine/c64/dinamic.c
+++ b/src/emu/bus/c64/dinamic.c
diff --git a/src/mess/machine/c64/dinamic.h b/src/emu/bus/c64/dinamic.h
index 146bc695220..9c105b596db 100644
--- a/src/mess/machine/c64/dinamic.h
+++ b/src/emu/bus/c64/dinamic.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/dqbb.c b/src/emu/bus/c64/dqbb.c
index f7b4b2a504a..f7b4b2a504a 100644
--- a/src/mess/machine/c64/dqbb.c
+++ b/src/emu/bus/c64/dqbb.c
diff --git a/src/mess/machine/c64/dqbb.h b/src/emu/bus/c64/dqbb.h
index 5d732198c2c..46ffd277fca 100644
--- a/src/mess/machine/c64/dqbb.h
+++ b/src/emu/bus/c64/dqbb.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/nvram.h"
diff --git a/src/mess/machine/c64/easy_calc_result.c b/src/emu/bus/c64/easy_calc_result.c
index 44722503067..44722503067 100644
--- a/src/mess/machine/c64/easy_calc_result.c
+++ b/src/emu/bus/c64/easy_calc_result.c
diff --git a/src/mess/machine/c64/easy_calc_result.h b/src/emu/bus/c64/easy_calc_result.h
index 15e9d5ef65c..fc92fede243 100644
--- a/src/mess/machine/c64/easy_calc_result.h
+++ b/src/emu/bus/c64/easy_calc_result.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/easyflash.c b/src/emu/bus/c64/easyflash.c
index cc50bc2d5a4..cc50bc2d5a4 100644
--- a/src/mess/machine/c64/easyflash.c
+++ b/src/emu/bus/c64/easyflash.c
diff --git a/src/mess/machine/c64/easyflash.h b/src/emu/bus/c64/easyflash.h
index 6315cb20236..14a6a2472b8 100644
--- a/src/mess/machine/c64/easyflash.h
+++ b/src/emu/bus/c64/easyflash.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/intelfsh.h"
diff --git a/src/mess/machine/c64/epyx_fast_load.c b/src/emu/bus/c64/epyx_fast_load.c
index 8fd22d77873..8fd22d77873 100644
--- a/src/mess/machine/c64/epyx_fast_load.c
+++ b/src/emu/bus/c64/epyx_fast_load.c
diff --git a/src/mess/machine/c64/epyx_fast_load.h b/src/emu/bus/c64/epyx_fast_load.h
index 0991ab0771f..50a4304ec73 100644
--- a/src/mess/machine/c64/epyx_fast_load.h
+++ b/src/emu/bus/c64/epyx_fast_load.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/exos.c b/src/emu/bus/c64/exos.c
index 84cffac62a9..84cffac62a9 100644
--- a/src/mess/machine/c64/exos.c
+++ b/src/emu/bus/c64/exos.c
diff --git a/src/mess/machine/c64/exos.h b/src/emu/bus/c64/exos.h
index 295874ee578..124ff297da0 100644
--- a/src/mess/machine/c64/exos.h
+++ b/src/emu/bus/c64/exos.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/exp.c b/src/emu/bus/c64/exp.c
index b35b5549481..8d0ef2ee017 100644
--- a/src/mess/machine/c64/exp.c
+++ b/src/emu/bus/c64/exp.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/exp.h b/src/emu/bus/c64/exp.h
index 35ed11f2e7e..551dab97fb7 100644
--- a/src/mess/machine/c64/exp.h
+++ b/src/emu/bus/c64/exp.h
@@ -204,70 +204,70 @@ extern const device_type C64_EXPANSION_SLOT;
// slot devices
-#include "machine/c64/16kb.h"
-#include "machine/c64/comal80.h"
-#include "machine/c64/cpm.h"
-#include "machine/c64/currah_speech.h"
-#include "machine/c64/dela_ep256.h"
-#include "machine/c64/dela_ep64.h"
-#include "machine/c64/dela_ep7x8.h"
-#include "machine/c64/dinamic.h"
-#include "machine/c64/dqbb.h"
-#include "machine/c64/easy_calc_result.h"
-#include "machine/c64/easyflash.h"
-#include "machine/c64/epyx_fast_load.h"
-#include "machine/c64/exos.h"
-#include "machine/c64/fcc.h"
-#include "machine/c64/final.h"
-#include "machine/c64/final3.h"
-#include "machine/c64/fun_play.h"
-#include "machine/c64/georam.h"
-#include "machine/c64/ide64.h"
-#include "machine/c64/ieee488.h"
-#include "machine/c64/kingsoft.h"
-#include "machine/c64/mach5.h"
-#include "machine/c64/magic_desk.h"
-#include "machine/c64/magic_formel.h"
-#include "machine/c64/magic_voice.h"
-#include "machine/c64/midi_maplin.h"
-#include "machine/c64/midi_namesoft.h"
-#include "machine/c64/midi_passport.h"
-#include "machine/c64/midi_sci.h"
-#include "machine/c64/midi_siel.h"
-#include "machine/c64/mikro_assembler.h"
-#include "machine/c64/multiscreen.h"
-#include "machine/c64/music64.h"
-#include "machine/c64/neoram.h"
-#include "machine/c64/ocean.h"
-#include "machine/c64/pagefox.h"
-#include "machine/c64/partner.h"
-#include "machine/c64/prophet64.h"
-#include "machine/c64/ps64.h"
-#include "machine/c64/reu.h"
-#include "machine/c64/rex.h"
-#include "machine/c64/rex_ep256.h"
-#include "machine/c64/ross.h"
-#include "machine/c64/sfx_sound_expander.h"
-#include "machine/c64/silverrock.h"
-#include "machine/c64/simons_basic.h"
-#include "machine/c64/stardos.h"
-#include "machine/c64/std.h"
-#include "machine/c64/structured_basic.h"
-#include "machine/c64/super_explode.h"
-#include "machine/c64/super_games.h"
-#include "machine/c64/supercpu.h"
-#include "machine/c64/sw8k.h"
-#include "machine/c64/swiftlink.h"
-#include "machine/c64/system3.h"
-#include "machine/c64/tdos.h"
-#include "machine/c64/turbo232.h"
-#include "machine/c64/vizastar.h"
-#include "machine/c64/vw64.h"
-#include "machine/c64/warp_speed.h"
-#include "machine/c64/westermann.h"
-#include "machine/c64/xl80.h"
-#include "machine/c64/zaxxon.h"
-#include "machine/c128_comal80.h"
+#include "16kb.h"
+#include "c128_comal80.h"
+#include "comal80.h"
+#include "cpm.h"
+#include "currah_speech.h"
+#include "dela_ep256.h"
+#include "dela_ep64.h"
+#include "dela_ep7x8.h"
+#include "dinamic.h"
+#include "dqbb.h"
+#include "easy_calc_result.h"
+#include "easyflash.h"
+#include "epyx_fast_load.h"
+#include "exos.h"
+#include "fcc.h"
+#include "final.h"
+#include "final3.h"
+#include "fun_play.h"
+#include "georam.h"
+#include "ide64.h"
+#include "ieee488.h"
+#include "kingsoft.h"
+#include "mach5.h"
+#include "magic_desk.h"
+#include "magic_formel.h"
+#include "magic_voice.h"
+#include "midi_maplin.h"
+#include "midi_namesoft.h"
+#include "midi_passport.h"
+#include "midi_sci.h"
+#include "midi_siel.h"
+#include "mikro_assembler.h"
+#include "multiscreen.h"
+#include "music64.h"
+#include "neoram.h"
+#include "ocean.h"
+#include "pagefox.h"
+#include "partner.h"
+#include "prophet64.h"
+#include "ps64.h"
+#include "reu.h"
+#include "rex.h"
+#include "rex_ep256.h"
+#include "ross.h"
+#include "sfx_sound_expander.h"
+#include "silverrock.h"
+#include "simons_basic.h"
+#include "stardos.h"
+#include "std.h"
+#include "structured_basic.h"
+#include "super_explode.h"
+#include "super_games.h"
+#include "supercpu.h"
+#include "sw8k.h"
+#include "swiftlink.h"
+#include "system3.h"
+#include "tdos.h"
+#include "turbo232.h"
+#include "vizastar.h"
+#include "vw64.h"
+#include "warp_speed.h"
+#include "westermann.h"
+#include "xl80.h"
+#include "zaxxon.h"
SLOT_INTERFACE_EXTERN( c64_expansion_cards );
diff --git a/src/mess/machine/c64/fcc.c b/src/emu/bus/c64/fcc.c
index 3f2ceb36fef..3f2ceb36fef 100644
--- a/src/mess/machine/c64/fcc.c
+++ b/src/emu/bus/c64/fcc.c
diff --git a/src/mess/machine/c64/fcc.h b/src/emu/bus/c64/fcc.h
index 3653c2406cd..0bca67fda03 100644
--- a/src/mess/machine/c64/fcc.h
+++ b/src/emu/bus/c64/fcc.h
@@ -15,7 +15,7 @@
#define __FCC__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "cpu/m6502/m65sc02.h"
diff --git a/src/mess/machine/c64/final.c b/src/emu/bus/c64/final.c
index 19b1fba3195..19b1fba3195 100644
--- a/src/mess/machine/c64/final.c
+++ b/src/emu/bus/c64/final.c
diff --git a/src/mess/machine/c64/final.h b/src/emu/bus/c64/final.h
index 7d29d9e879c..d9f193b8352 100644
--- a/src/mess/machine/c64/final.h
+++ b/src/emu/bus/c64/final.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/final3.c b/src/emu/bus/c64/final3.c
index a65318b3178..a65318b3178 100644
--- a/src/mess/machine/c64/final3.c
+++ b/src/emu/bus/c64/final3.c
diff --git a/src/mess/machine/c64/final3.h b/src/emu/bus/c64/final3.h
index 8004fec43e9..e411d26488f 100644
--- a/src/mess/machine/c64/final3.h
+++ b/src/emu/bus/c64/final3.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/fun_play.c b/src/emu/bus/c64/fun_play.c
index a96de06d4e9..a96de06d4e9 100644
--- a/src/mess/machine/c64/fun_play.c
+++ b/src/emu/bus/c64/fun_play.c
diff --git a/src/mess/machine/c64/fun_play.h b/src/emu/bus/c64/fun_play.h
index 772bd31c82f..945fff9c320 100644
--- a/src/mess/machine/c64/fun_play.h
+++ b/src/emu/bus/c64/fun_play.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/geocable.c b/src/emu/bus/c64/geocable.c
index b6404c79a31..b6404c79a31 100644
--- a/src/mess/machine/c64/geocable.c
+++ b/src/emu/bus/c64/geocable.c
diff --git a/src/mess/machine/c64/geocable.h b/src/emu/bus/c64/geocable.h
index 8ee7285bd15..240e267bc78 100644
--- a/src/mess/machine/c64/geocable.h
+++ b/src/emu/bus/c64/geocable.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
#include "machine/ctronics.h"
diff --git a/src/mess/machine/c64/georam.c b/src/emu/bus/c64/georam.c
index ef0938150c7..ef0938150c7 100644
--- a/src/mess/machine/c64/georam.c
+++ b/src/emu/bus/c64/georam.c
diff --git a/src/mess/machine/c64/georam.h b/src/emu/bus/c64/georam.h
index fa75a08aadb..53b94775b23 100644
--- a/src/mess/machine/c64/georam.h
+++ b/src/emu/bus/c64/georam.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/ide64.c b/src/emu/bus/c64/ide64.c
index e6e80103948..e6e80103948 100644
--- a/src/mess/machine/c64/ide64.c
+++ b/src/emu/bus/c64/ide64.c
diff --git a/src/mess/machine/c64/ide64.h b/src/emu/bus/c64/ide64.h
index 41ffec60211..fb2a69ea7e0 100644
--- a/src/mess/machine/c64/ide64.h
+++ b/src/emu/bus/c64/ide64.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/ds1302.h"
#include "machine/ataintf.h"
#include "machine/intelfsh.h"
diff --git a/src/mess/machine/c64/ieee488.c b/src/emu/bus/c64/ieee488.c
index 4906d49fefc..4906d49fefc 100644
--- a/src/mess/machine/c64/ieee488.c
+++ b/src/emu/bus/c64/ieee488.c
diff --git a/src/mess/machine/c64/ieee488.h b/src/emu/bus/c64/ieee488.h
index f8d0a0d2f04..15e64ab8be8 100644
--- a/src/mess/machine/c64/ieee488.h
+++ b/src/emu/bus/c64/ieee488.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "bus/ieee488/ieee488.h"
#include "machine/6525tpi.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/kingsoft.c b/src/emu/bus/c64/kingsoft.c
index dd262dca553..dd262dca553 100644
--- a/src/mess/machine/c64/kingsoft.c
+++ b/src/emu/bus/c64/kingsoft.c
diff --git a/src/mess/machine/c64/kingsoft.h b/src/emu/bus/c64/kingsoft.h
index 4dfe31e1cca..5d76e1007cb 100644
--- a/src/mess/machine/c64/kingsoft.h
+++ b/src/emu/bus/c64/kingsoft.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/mach5.c b/src/emu/bus/c64/mach5.c
index 10edb846bef..10edb846bef 100644
--- a/src/mess/machine/c64/mach5.c
+++ b/src/emu/bus/c64/mach5.c
diff --git a/src/mess/machine/c64/mach5.h b/src/emu/bus/c64/mach5.h
index d475bb77220..2316735e725 100644
--- a/src/mess/machine/c64/mach5.h
+++ b/src/emu/bus/c64/mach5.h
@@ -15,7 +15,7 @@
#define __MACH5__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/magic_desk.c b/src/emu/bus/c64/magic_desk.c
index c47a23b5ea8..c47a23b5ea8 100644
--- a/src/mess/machine/c64/magic_desk.c
+++ b/src/emu/bus/c64/magic_desk.c
diff --git a/src/mess/machine/c64/magic_desk.h b/src/emu/bus/c64/magic_desk.h
index 8507ec325c4..def4f53eb14 100644
--- a/src/mess/machine/c64/magic_desk.h
+++ b/src/emu/bus/c64/magic_desk.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/magic_formel.c b/src/emu/bus/c64/magic_formel.c
index 8258e6dd3ed..8258e6dd3ed 100644
--- a/src/mess/machine/c64/magic_formel.c
+++ b/src/emu/bus/c64/magic_formel.c
diff --git a/src/mess/machine/c64/magic_formel.h b/src/emu/bus/c64/magic_formel.h
index b5be4c3427e..79955b6c6ba 100644
--- a/src/mess/machine/c64/magic_formel.h
+++ b/src/emu/bus/c64/magic_formel.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/6821pia.h"
diff --git a/src/mess/machine/c64/magic_voice.c b/src/emu/bus/c64/magic_voice.c
index 8f1f5c8616e..8f1f5c8616e 100644
--- a/src/mess/machine/c64/magic_voice.c
+++ b/src/emu/bus/c64/magic_voice.c
diff --git a/src/mess/machine/c64/magic_voice.h b/src/emu/bus/c64/magic_voice.h
index b669ba41106..1985cf11fdb 100644
--- a/src/mess/machine/c64/magic_voice.h
+++ b/src/emu/bus/c64/magic_voice.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "machine/40105.h"
#include "machine/6525tpi.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "sound/t6721a.h"
diff --git a/src/mess/machine/c64/midi_maplin.c b/src/emu/bus/c64/midi_maplin.c
index a68325e32be..a68325e32be 100644
--- a/src/mess/machine/c64/midi_maplin.c
+++ b/src/emu/bus/c64/midi_maplin.c
diff --git a/src/mess/machine/c64/midi_maplin.h b/src/emu/bus/c64/midi_maplin.h
index 2e5a4100aed..a7fa955e957 100644
--- a/src/mess/machine/c64/midi_maplin.h
+++ b/src/emu/bus/c64/midi_maplin.h
@@ -15,7 +15,7 @@
#define __C64_MIDI_MAPLIN__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/6850acia.h"
#include "machine/serial.h"
#include "machine/midiinport.h"
diff --git a/src/mess/machine/c64/midi_namesoft.c b/src/emu/bus/c64/midi_namesoft.c
index c6c67053d12..c6c67053d12 100644
--- a/src/mess/machine/c64/midi_namesoft.c
+++ b/src/emu/bus/c64/midi_namesoft.c
diff --git a/src/mess/machine/c64/midi_namesoft.h b/src/emu/bus/c64/midi_namesoft.h
index 52c53c7495c..8a22d84c39d 100644
--- a/src/mess/machine/c64/midi_namesoft.h
+++ b/src/emu/bus/c64/midi_namesoft.h
@@ -15,7 +15,7 @@
#define __C64_MIDI_NAMESOFT__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/6850acia.h"
#include "machine/serial.h"
#include "machine/midiinport.h"
diff --git a/src/mess/machine/c64/midi_passport.c b/src/emu/bus/c64/midi_passport.c
index d977bfa3aa4..d977bfa3aa4 100644
--- a/src/mess/machine/c64/midi_passport.c
+++ b/src/emu/bus/c64/midi_passport.c
diff --git a/src/mess/machine/c64/midi_passport.h b/src/emu/bus/c64/midi_passport.h
index 9785b4f6475..2ca08538506 100644
--- a/src/mess/machine/c64/midi_passport.h
+++ b/src/emu/bus/c64/midi_passport.h
@@ -15,7 +15,7 @@
#define __C64_MIDI_PASSPORT__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/6840ptm.h"
#include "machine/6850acia.h"
#include "machine/serial.h"
diff --git a/src/mess/machine/c64/midi_sci.c b/src/emu/bus/c64/midi_sci.c
index aeb912a4879..aeb912a4879 100644
--- a/src/mess/machine/c64/midi_sci.c
+++ b/src/emu/bus/c64/midi_sci.c
diff --git a/src/mess/machine/c64/midi_sci.h b/src/emu/bus/c64/midi_sci.h
index f3a411f8fc6..2ad263e5efc 100644
--- a/src/mess/machine/c64/midi_sci.h
+++ b/src/emu/bus/c64/midi_sci.h
@@ -15,7 +15,7 @@
#define __C64_MIDI_SCI__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/6850acia.h"
#include "machine/serial.h"
#include "machine/midiinport.h"
diff --git a/src/mess/machine/c64/midi_siel.c b/src/emu/bus/c64/midi_siel.c
index 3447b58cab1..3447b58cab1 100644
--- a/src/mess/machine/c64/midi_siel.c
+++ b/src/emu/bus/c64/midi_siel.c
diff --git a/src/mess/machine/c64/midi_siel.h b/src/emu/bus/c64/midi_siel.h
index e05123dd073..deb5ee01a6b 100644
--- a/src/mess/machine/c64/midi_siel.h
+++ b/src/emu/bus/c64/midi_siel.h
@@ -15,7 +15,7 @@
#define __C64_MIDI_SIEL__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/6850acia.h"
#include "machine/serial.h"
#include "machine/midiinport.h"
diff --git a/src/mess/machine/c64/mikro_assembler.c b/src/emu/bus/c64/mikro_assembler.c
index c6bcd4530f1..c6bcd4530f1 100644
--- a/src/mess/machine/c64/mikro_assembler.c
+++ b/src/emu/bus/c64/mikro_assembler.c
diff --git a/src/mess/machine/c64/mikro_assembler.h b/src/emu/bus/c64/mikro_assembler.h
index 0262f2893f6..5f08ac3c09e 100644
--- a/src/mess/machine/c64/mikro_assembler.h
+++ b/src/emu/bus/c64/mikro_assembler.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/multiscreen.c b/src/emu/bus/c64/multiscreen.c
index bc3010b9403..bc3010b9403 100644
--- a/src/mess/machine/c64/multiscreen.c
+++ b/src/emu/bus/c64/multiscreen.c
diff --git a/src/mess/machine/c64/multiscreen.h b/src/emu/bus/c64/multiscreen.h
index ec9a428e630..edd9bce4fdb 100644
--- a/src/mess/machine/c64/multiscreen.h
+++ b/src/emu/bus/c64/multiscreen.h
@@ -18,7 +18,7 @@
#include "emu.h"
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/music64.c b/src/emu/bus/c64/music64.c
index c071e6a9e96..c071e6a9e96 100644
--- a/src/mess/machine/c64/music64.c
+++ b/src/emu/bus/c64/music64.c
diff --git a/src/mess/machine/c64/music64.h b/src/emu/bus/c64/music64.h
index 397ab78039f..cee59d9e590 100644
--- a/src/mess/machine/c64/music64.h
+++ b/src/emu/bus/c64/music64.h
@@ -15,7 +15,7 @@
#define __MUSIC64__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/neoram.c b/src/emu/bus/c64/neoram.c
index 33a0f16b0de..33a0f16b0de 100644
--- a/src/mess/machine/c64/neoram.c
+++ b/src/emu/bus/c64/neoram.c
diff --git a/src/mess/machine/c64/neoram.h b/src/emu/bus/c64/neoram.h
index d2c213b7082..ea42810f5c6 100644
--- a/src/mess/machine/c64/neoram.h
+++ b/src/emu/bus/c64/neoram.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/ocean.c b/src/emu/bus/c64/ocean.c
index 261662dafa8..261662dafa8 100644
--- a/src/mess/machine/c64/ocean.c
+++ b/src/emu/bus/c64/ocean.c
diff --git a/src/mess/machine/c64/ocean.h b/src/emu/bus/c64/ocean.h
index e60c4edbab6..e3d7605d7a4 100644
--- a/src/mess/machine/c64/ocean.h
+++ b/src/emu/bus/c64/ocean.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/pagefox.c b/src/emu/bus/c64/pagefox.c
index 4f5033814e0..4f5033814e0 100644
--- a/src/mess/machine/c64/pagefox.c
+++ b/src/emu/bus/c64/pagefox.c
diff --git a/src/mess/machine/c64/pagefox.h b/src/emu/bus/c64/pagefox.h
index 569e3a1c8f1..79d7030d497 100644
--- a/src/mess/machine/c64/pagefox.h
+++ b/src/emu/bus/c64/pagefox.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/partner.c b/src/emu/bus/c64/partner.c
index 52f005a329f..52f005a329f 100644
--- a/src/mess/machine/c64/partner.c
+++ b/src/emu/bus/c64/partner.c
diff --git a/src/mess/machine/c64/partner.h b/src/emu/bus/c64/partner.h
index 9a9b096ec9b..fcd3f177468 100644
--- a/src/mess/machine/c64/partner.h
+++ b/src/emu/bus/c64/partner.h
@@ -15,7 +15,7 @@
#define __PARTNER__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/prophet64.c b/src/emu/bus/c64/prophet64.c
index c42a6ab3e3d..c42a6ab3e3d 100644
--- a/src/mess/machine/c64/prophet64.c
+++ b/src/emu/bus/c64/prophet64.c
diff --git a/src/mess/machine/c64/prophet64.h b/src/emu/bus/c64/prophet64.h
index 0205edc8b8f..c7dda625c6b 100644
--- a/src/mess/machine/c64/prophet64.h
+++ b/src/emu/bus/c64/prophet64.h
@@ -15,7 +15,7 @@
#define __PROPHET64__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/ps64.c b/src/emu/bus/c64/ps64.c
index 48bdbd28add..48bdbd28add 100644
--- a/src/mess/machine/c64/ps64.c
+++ b/src/emu/bus/c64/ps64.c
diff --git a/src/mess/machine/c64/ps64.h b/src/emu/bus/c64/ps64.h
index 1816f85cf6c..ce81078286f 100644
--- a/src/mess/machine/c64/ps64.h
+++ b/src/emu/bus/c64/ps64.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "sound/votrax.h"
diff --git a/src/mess/machine/c64/reu.c b/src/emu/bus/c64/reu.c
index 28f2e8e45b2..28f2e8e45b2 100644
--- a/src/mess/machine/c64/reu.c
+++ b/src/emu/bus/c64/reu.c
diff --git a/src/mess/machine/c64/reu.h b/src/emu/bus/c64/reu.h
index add758b308a..29a8c6775e0 100644
--- a/src/mess/machine/c64/reu.h
+++ b/src/emu/bus/c64/reu.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/mos8726.h"
diff --git a/src/mess/machine/c64/rex.c b/src/emu/bus/c64/rex.c
index ad9e9de45ea..ad9e9de45ea 100644
--- a/src/mess/machine/c64/rex.c
+++ b/src/emu/bus/c64/rex.c
diff --git a/src/mess/machine/c64/rex.h b/src/emu/bus/c64/rex.h
index 1e269ae2d27..393463fc24c 100644
--- a/src/mess/machine/c64/rex.h
+++ b/src/emu/bus/c64/rex.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/rex_ep256.c b/src/emu/bus/c64/rex_ep256.c
index 829d491b40b..829d491b40b 100644
--- a/src/mess/machine/c64/rex_ep256.c
+++ b/src/emu/bus/c64/rex_ep256.c
diff --git a/src/mess/machine/c64/rex_ep256.h b/src/emu/bus/c64/rex_ep256.h
index 09d56177699..f60d0f19518 100644
--- a/src/mess/machine/c64/rex_ep256.h
+++ b/src/emu/bus/c64/rex_ep256.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/ross.c b/src/emu/bus/c64/ross.c
index 150a096b037..150a096b037 100644
--- a/src/mess/machine/c64/ross.c
+++ b/src/emu/bus/c64/ross.c
diff --git a/src/mess/machine/c64/ross.h b/src/emu/bus/c64/ross.h
index 771ee4778e2..5d95cc2396f 100644
--- a/src/mess/machine/c64/ross.h
+++ b/src/emu/bus/c64/ross.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/sfx_sound_expander.c b/src/emu/bus/c64/sfx_sound_expander.c
index c9671f32c1b..c9671f32c1b 100644
--- a/src/mess/machine/c64/sfx_sound_expander.c
+++ b/src/emu/bus/c64/sfx_sound_expander.c
diff --git a/src/mess/machine/c64/sfx_sound_expander.h b/src/emu/bus/c64/sfx_sound_expander.h
index a37eeeeaf73..af685523905 100644
--- a/src/mess/machine/c64/sfx_sound_expander.h
+++ b/src/emu/bus/c64/sfx_sound_expander.h
@@ -15,7 +15,7 @@
#define __SFX_SOUND_EXPANDER__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "sound/3526intf.h"
diff --git a/src/mess/machine/c64/silverrock.c b/src/emu/bus/c64/silverrock.c
index 36585ca41b4..36585ca41b4 100644
--- a/src/mess/machine/c64/silverrock.c
+++ b/src/emu/bus/c64/silverrock.c
diff --git a/src/mess/machine/c64/silverrock.h b/src/emu/bus/c64/silverrock.h
index bd696b85fb5..f597a4223b2 100644
--- a/src/mess/machine/c64/silverrock.h
+++ b/src/emu/bus/c64/silverrock.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/simons_basic.c b/src/emu/bus/c64/simons_basic.c
index 571a408bf16..571a408bf16 100644
--- a/src/mess/machine/c64/simons_basic.c
+++ b/src/emu/bus/c64/simons_basic.c
diff --git a/src/mess/machine/c64/simons_basic.h b/src/emu/bus/c64/simons_basic.h
index ee5dc9159b4..9cec90878e1 100644
--- a/src/mess/machine/c64/simons_basic.h
+++ b/src/emu/bus/c64/simons_basic.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/stardos.c b/src/emu/bus/c64/stardos.c
index 42d18ad3d15..42d18ad3d15 100644
--- a/src/mess/machine/c64/stardos.c
+++ b/src/emu/bus/c64/stardos.c
diff --git a/src/mess/machine/c64/stardos.h b/src/emu/bus/c64/stardos.h
index a160b381454..3222e3c6899 100644
--- a/src/mess/machine/c64/stardos.h
+++ b/src/emu/bus/c64/stardos.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/6821pia.h"
diff --git a/src/mess/machine/c64/std.c b/src/emu/bus/c64/std.c
index 066188da5e3..066188da5e3 100644
--- a/src/mess/machine/c64/std.c
+++ b/src/emu/bus/c64/std.c
diff --git a/src/mess/machine/c64/std.h b/src/emu/bus/c64/std.h
index b3846705e80..70c0e37f3b4 100644
--- a/src/mess/machine/c64/std.h
+++ b/src/emu/bus/c64/std.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/structured_basic.c b/src/emu/bus/c64/structured_basic.c
index 829a2481643..829a2481643 100644
--- a/src/mess/machine/c64/structured_basic.c
+++ b/src/emu/bus/c64/structured_basic.c
diff --git a/src/mess/machine/c64/structured_basic.h b/src/emu/bus/c64/structured_basic.h
index d6d81f16c80..089298b7980 100644
--- a/src/mess/machine/c64/structured_basic.h
+++ b/src/emu/bus/c64/structured_basic.h
@@ -17,7 +17,7 @@
#include "emu.h"
#include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/super_explode.c b/src/emu/bus/c64/super_explode.c
index 9822b3d6eaf..9822b3d6eaf 100644
--- a/src/mess/machine/c64/super_explode.c
+++ b/src/emu/bus/c64/super_explode.c
diff --git a/src/mess/machine/c64/super_explode.h b/src/emu/bus/c64/super_explode.h
index 7e2c514d45d..681aeae409a 100644
--- a/src/mess/machine/c64/super_explode.h
+++ b/src/emu/bus/c64/super_explode.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/super_games.c b/src/emu/bus/c64/super_games.c
index 050b6398515..050b6398515 100644
--- a/src/mess/machine/c64/super_games.c
+++ b/src/emu/bus/c64/super_games.c
diff --git a/src/mess/machine/c64/super_games.h b/src/emu/bus/c64/super_games.h
index e4a5e2150c1..faca7f0be60 100644
--- a/src/mess/machine/c64/super_games.h
+++ b/src/emu/bus/c64/super_games.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/supercpu.c b/src/emu/bus/c64/supercpu.c
index 6eae6a52225..6eae6a52225 100644
--- a/src/mess/machine/c64/supercpu.c
+++ b/src/emu/bus/c64/supercpu.c
diff --git a/src/mess/machine/c64/supercpu.h b/src/emu/bus/c64/supercpu.h
index 3f7350278ee..82902a1c38a 100644
--- a/src/mess/machine/c64/supercpu.h
+++ b/src/emu/bus/c64/supercpu.h
@@ -15,7 +15,7 @@
#define __SUPERCPU__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "cpu/g65816/g65816.h"
diff --git a/src/mess/machine/c64/sw8k.c b/src/emu/bus/c64/sw8k.c
index 13d8e8364fa..13d8e8364fa 100644
--- a/src/mess/machine/c64/sw8k.c
+++ b/src/emu/bus/c64/sw8k.c
diff --git a/src/mess/machine/c64/sw8k.h b/src/emu/bus/c64/sw8k.h
index 790e5986e0c..9ae1be357b6 100644
--- a/src/mess/machine/c64/sw8k.h
+++ b/src/emu/bus/c64/sw8k.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/swiftlink.c b/src/emu/bus/c64/swiftlink.c
index d4522da0845..d4522da0845 100644
--- a/src/mess/machine/c64/swiftlink.c
+++ b/src/emu/bus/c64/swiftlink.c
diff --git a/src/mess/machine/c64/swiftlink.h b/src/emu/bus/c64/swiftlink.h
index 2ecbc6ea899..d4aec28f962 100644
--- a/src/mess/machine/c64/swiftlink.h
+++ b/src/emu/bus/c64/swiftlink.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/mos6551.h"
#include "machine/serial.h"
diff --git a/src/mess/machine/c64/system3.c b/src/emu/bus/c64/system3.c
index 4aeb6c8b459..4aeb6c8b459 100644
--- a/src/mess/machine/c64/system3.c
+++ b/src/emu/bus/c64/system3.c
diff --git a/src/mess/machine/c64/system3.h b/src/emu/bus/c64/system3.h
index 01086e04361..f11ff7e44ae 100644
--- a/src/mess/machine/c64/system3.h
+++ b/src/emu/bus/c64/system3.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/tdos.c b/src/emu/bus/c64/tdos.c
index 8916416afd7..8916416afd7 100644
--- a/src/mess/machine/c64/tdos.c
+++ b/src/emu/bus/c64/tdos.c
diff --git a/src/mess/machine/c64/tdos.h b/src/emu/bus/c64/tdos.h
index 381b97f3728..0619c085d66 100644
--- a/src/mess/machine/c64/tdos.h
+++ b/src/emu/bus/c64/tdos.h
@@ -15,7 +15,7 @@
#define __TDOS__
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/mc6852.h"
diff --git a/src/mess/machine/c64/turbo232.c b/src/emu/bus/c64/turbo232.c
index 42489fce417..42489fce417 100644
--- a/src/mess/machine/c64/turbo232.c
+++ b/src/emu/bus/c64/turbo232.c
diff --git a/src/mess/machine/c64/turbo232.h b/src/emu/bus/c64/turbo232.h
index 2f35e718345..4686bfa4626 100644
--- a/src/mess/machine/c64/turbo232.h
+++ b/src/emu/bus/c64/turbo232.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "machine/mos6551.h"
#include "machine/null_modem.h"
#include "machine/serial.h"
diff --git a/src/mess/machine/c64/user.c b/src/emu/bus/c64/user.c
index bd45e295d78..1fdb0243c4d 100644
--- a/src/mess/machine/c64/user.c
+++ b/src/emu/bus/c64/user.c
@@ -9,7 +9,7 @@
**********************************************************************/
-#include "machine/c64/user.h"
+#include "user.h"
diff --git a/src/mess/machine/c64/user.h b/src/emu/bus/c64/user.h
index 36369fcbd7c..6c19869b3a6 100644
--- a/src/mess/machine/c64/user.h
+++ b/src/emu/bus/c64/user.h
@@ -155,13 +155,13 @@ extern const device_type C64_USER_PORT;
// slot devices
-#include "machine/c64/4cga.h"
-#include "machine/c64/4dxh.h"
-#include "machine/c64/4ksa.h"
-#include "machine/c64/4tba.h"
-#include "machine/c64/bn1541.h"
-#include "machine/c64/geocable.h"
-#include "machine/c64/vic1011.h"
+#include "4cga.h"
+#include "4dxh.h"
+#include "4ksa.h"
+#include "4tba.h"
+#include "bn1541.h"
+#include "geocable.h"
+#include "vic1011.h"
SLOT_INTERFACE_EXTERN( c64_user_port_cards );
diff --git a/src/mess/machine/c64/vic1011.c b/src/emu/bus/c64/vic1011.c
index fc579bf3678..fc579bf3678 100644
--- a/src/mess/machine/c64/vic1011.c
+++ b/src/emu/bus/c64/vic1011.c
diff --git a/src/mess/machine/c64/vic1011.h b/src/emu/bus/c64/vic1011.h
index e8760d12249..1356fdb0a64 100644
--- a/src/mess/machine/c64/vic1011.h
+++ b/src/emu/bus/c64/vic1011.h
@@ -15,7 +15,7 @@
#define __C64_VIC1011__
#include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
#include "machine/serial.h"
diff --git a/src/mess/machine/c64/vizastar.c b/src/emu/bus/c64/vizastar.c
index c4175aaecc9..c4175aaecc9 100644
--- a/src/mess/machine/c64/vizastar.c
+++ b/src/emu/bus/c64/vizastar.c
diff --git a/src/mess/machine/c64/vizastar.h b/src/emu/bus/c64/vizastar.h
index 27cdaea43fa..ce4630f9788 100644
--- a/src/mess/machine/c64/vizastar.h
+++ b/src/emu/bus/c64/vizastar.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/vw64.c b/src/emu/bus/c64/vw64.c
index c613c2908f9..c613c2908f9 100644
--- a/src/mess/machine/c64/vw64.c
+++ b/src/emu/bus/c64/vw64.c
diff --git a/src/mess/machine/c64/vw64.h b/src/emu/bus/c64/vw64.h
index 75410b8575d..2e0b24e7aaa 100644
--- a/src/mess/machine/c64/vw64.h
+++ b/src/emu/bus/c64/vw64.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/warp_speed.c b/src/emu/bus/c64/warp_speed.c
index 3a89476332a..3a89476332a 100644
--- a/src/mess/machine/c64/warp_speed.c
+++ b/src/emu/bus/c64/warp_speed.c
diff --git a/src/mess/machine/c64/warp_speed.h b/src/emu/bus/c64/warp_speed.h
index 7606d632669..1f80c30509f 100644
--- a/src/mess/machine/c64/warp_speed.h
+++ b/src/emu/bus/c64/warp_speed.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/westermann.c b/src/emu/bus/c64/westermann.c
index 369b77c437c..369b77c437c 100644
--- a/src/mess/machine/c64/westermann.c
+++ b/src/emu/bus/c64/westermann.c
diff --git a/src/mess/machine/c64/westermann.h b/src/emu/bus/c64/westermann.h
index 4cff9c56e05..9a9ee7dc4ae 100644
--- a/src/mess/machine/c64/westermann.h
+++ b/src/emu/bus/c64/westermann.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/mess/machine/c64/xl80.c b/src/emu/bus/c64/xl80.c
index a0956eaa115..a0956eaa115 100644
--- a/src/mess/machine/c64/xl80.c
+++ b/src/emu/bus/c64/xl80.c
diff --git a/src/mess/machine/c64/xl80.h b/src/emu/bus/c64/xl80.h
index ea208b1e240..30896134fe9 100644
--- a/src/mess/machine/c64/xl80.h
+++ b/src/emu/bus/c64/xl80.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
#include "video/mc6845.h"
diff --git a/src/mess/machine/c64/zaxxon.c b/src/emu/bus/c64/zaxxon.c
index c4540bfb530..c4540bfb530 100644
--- a/src/mess/machine/c64/zaxxon.c
+++ b/src/emu/bus/c64/zaxxon.c
diff --git a/src/mess/machine/c64/zaxxon.h b/src/emu/bus/c64/zaxxon.h
index 2ba4eb3e03f..9c7d9bf354a 100644
--- a/src/mess/machine/c64/zaxxon.h
+++ b/src/emu/bus/c64/zaxxon.h
@@ -16,7 +16,7 @@
#include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
diff --git a/src/emu/bus/cbmiec/c1541.h b/src/emu/bus/cbmiec/c1541.h
index 39317fa2fd9..bd526ab39f2 100644
--- a/src/emu/bus/cbmiec/c1541.h
+++ b/src/emu/bus/cbmiec/c1541.h
@@ -16,6 +16,7 @@
#include "emu.h"
#include "cbmiec.h"
+#include "bus/c64/bn1541.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/flopdrv.h"
#include "formats/d64_dsk.h"
@@ -23,7 +24,6 @@
#include "machine/64h156.h"
#include "machine/6522via.h"
#include "machine/6821pia.h"
-#include "machine/c64/bn1541.h"
#include "machine/ctronics.h"
diff --git a/src/emu/bus/cbmiec/c1571.h b/src/emu/bus/cbmiec/c1571.h
index 66a87701be2..9268a8389fc 100644
--- a/src/emu/bus/cbmiec/c1571.h
+++ b/src/emu/bus/cbmiec/c1571.h
@@ -16,13 +16,13 @@
#include "emu.h"
#include "cbmiec.h"
+#include "bus/c64/bn1541.h"
#include "cpu/m6502/m6502.h"
#include "imagedev/flopdrv.h"
#include "formats/d64_dsk.h"
#include "formats/g64_dsk.h"
#include "machine/64h156.h"
#include "machine/6522via.h"
-#include "machine/c64/bn1541.h"
#include "machine/isa.h"
#include "machine/mos6526.h"
#include "machine/wd_fdc.h"
diff --git a/src/emu/emu.mak b/src/emu/emu.mak
index 53cfe212e89..cd0bf36e915 100644
--- a/src/emu/emu.mak
+++ b/src/emu/emu.mak
@@ -29,6 +29,7 @@ OBJDIRS += \
$(EMUOBJ)/audio \
$(EMUOBJ)/bus \
$(EMUOBJ)/bus/adamnet \
+ $(EMUOBJ)/bus/c64 \
$(EMUOBJ)/bus/cbmiec \
$(EMUOBJ)/bus/ieee488 \
$(EMUOBJ)/bus/isbx \
diff --git a/src/emu/machine/machine.mak b/src/emu/machine/machine.mak
index 27fd4cb492c..94e1ffb9fab 100644
--- a/src/emu/machine/machine.mak
+++ b/src/emu/machine/machine.mak
@@ -921,6 +921,15 @@ endif
#-------------------------------------------------
#
+#@src/emu/machine/mos8726.h,MACHINES += MOS8726
+#-------------------------------------------------
+
+ifneq ($(filter MOS8726,$(MACHINES)),)
+MACHINEOBJS += $(MACHINEOBJ)/mos8726.o
+endif
+
+#-------------------------------------------------
+#
#@src/emu/machine/mos6530.h,MACHINES += MIOT6530
#-------------------------------------------------
diff --git a/src/mess/machine/mos8726.c b/src/emu/machine/mos8726.c
index 1927e009ba1..1927e009ba1 100644
--- a/src/mess/machine/mos8726.c
+++ b/src/emu/machine/mos8726.c
diff --git a/src/mess/machine/mos8726.h b/src/emu/machine/mos8726.h
index 5d306ba3ab2..5d306ba3ab2 100644
--- a/src/mess/machine/mos8726.h
+++ b/src/emu/machine/mos8726.h
diff --git a/src/mess/includes/c128.h b/src/mess/includes/c128.h
index 811c974a7e5..f0c775e3382 100644
--- a/src/mess/includes/c128.h
+++ b/src/mess/includes/c128.h
@@ -6,11 +6,11 @@
#define __C128__
#include "emu.h"
+#include "bus/cbmiec/cbmiec.h"
+#include "bus/c64/exp.h"
+#include "bus/c64/user.h"
#include "machine/cbm_snqk.h"
#include "cpu/m6502/m8502.h"
-#include "machine/c64/exp.h"
-#include "machine/c64/user.h"
-#include "bus/cbmiec/cbmiec.h"
#include "machine/mos6526.h"
#include "machine/mos8722.h"
#include "machine/petcass.h"
diff --git a/src/mess/includes/c64.h b/src/mess/includes/c64.h
index e5bde578f43..dcf8dafd197 100644
--- a/src/mess/includes/c64.h
+++ b/src/mess/includes/c64.h
@@ -6,11 +6,11 @@
#define __C64__
#include "emu.h"
+#include "bus/cbmiec/cbmiec.h"
+#include "bus/c64/exp.h"
+#include "bus/c64/user.h"
#include "cpu/m6502/m6510.h"
#include "machine/cbm_snqk.h"
-#include "machine/c64/exp.h"
-#include "machine/c64/user.h"
-#include "bus/cbmiec/cbmiec.h"
#include "machine/mos6526.h"
#include "machine/petcass.h"
#include "machine/pla.h"
diff --git a/src/mess/includes/vic20.h b/src/mess/includes/vic20.h
index b7a950dd47f..eefb334eb87 100644
--- a/src/mess/includes/vic20.h
+++ b/src/mess/includes/vic20.h
@@ -5,13 +5,12 @@
#ifndef __VIC20__
#define __VIC20__
-
#include "emu.h"
-#include "machine/cbm_snqk.h"
+#include "bus/cbmiec/cbmiec.h"
#include "cpu/m6502/m6510.h"
#include "imagedev/cartslot.h"
#include "machine/6522via.h"
-#include "bus/cbmiec/cbmiec.h"
+#include "machine/cbm_snqk.h"
#include "machine/petcass.h"
#include "machine/ram.h"
#include "machine/vcsctrl.h"
diff --git a/src/mess/mess.mak b/src/mess/mess.mak
index aac9bbf182b..33f2cc9b6ae 100644
--- a/src/mess/mess.mak
+++ b/src/mess/mess.mak
@@ -471,12 +471,14 @@ MACHINES += Z80STI
MACHINES += Z8536
MACHINES += SECFLASH
MACHINES += PCCARD
+MACHINES += MOS8726
#-------------------------------------------------
# specify available bus cores
#-------------------------------------------------
BUSES += ADAMNET
+BUSES += C64
BUSES += CBMIEC
BUSES += IEEE488
BUSES += ISBX
@@ -1087,78 +1089,6 @@ $(MESSOBJ)/cbm.a: \
$(MESS_MACHINE)/mos6702.o \
$(MESS_DRIVERS)/c64.o \
$(MESS_DRIVERS)/c64dtv.o \
- $(MESS_MACHINE)/c64/exp.o \
- $(MESS_MACHINE)/c64/user.o \
- $(MESS_MACHINE)/c64/4cga.o \
- $(MESS_MACHINE)/c64/4dxh.o \
- $(MESS_MACHINE)/c64/4ksa.o \
- $(MESS_MACHINE)/c64/4tba.o \
- $(MESS_MACHINE)/c64/16kb.o \
- $(MESS_MACHINE)/c64/bn1541.o\
- $(MESS_MACHINE)/c64/comal80.o \
- $(MESS_MACHINE)/c64/cpm.o \
- $(MESS_MACHINE)/c64/currah_speech.o \
- $(MESS_MACHINE)/c64/dela_ep256.o \
- $(MESS_MACHINE)/c64/dela_ep64.o \
- $(MESS_MACHINE)/c64/dela_ep7x8.o \
- $(MESS_MACHINE)/c64/dinamic.o \
- $(MESS_MACHINE)/c64/dqbb.o \
- $(MESS_MACHINE)/c64/easy_calc_result.o \
- $(MESS_MACHINE)/c64/easyflash.o \
- $(MESS_MACHINE)/c64/epyx_fast_load.o \
- $(MESS_MACHINE)/c64/exos.o \
- $(MESS_MACHINE)/c64/fcc.o \
- $(MESS_MACHINE)/c64/final.o \
- $(MESS_MACHINE)/c64/final3.o\
- $(MESS_MACHINE)/c64/fun_play.o \
- $(MESS_MACHINE)/c64/geocable.o \
- $(MESS_MACHINE)/c64/georam.o \
- $(MESS_MACHINE)/c64/ide64.o \
- $(MESS_MACHINE)/c64/ieee488.o \
- $(MESS_MACHINE)/c64/kingsoft.o \
- $(MESS_MACHINE)/c64/mach5.o \
- $(MESS_MACHINE)/c64/magic_desk.o \
- $(MESS_MACHINE)/c64/magic_formel.o \
- $(MESS_MACHINE)/c64/magic_voice.o \
- $(MESS_MACHINE)/c64/midi_maplin.o \
- $(MESS_MACHINE)/c64/midi_namesoft.o \
- $(MESS_MACHINE)/c64/midi_passport.o \
- $(MESS_MACHINE)/c64/midi_sci.o \
- $(MESS_MACHINE)/c64/midi_siel.o \
- $(MESS_MACHINE)/c64/mikro_assembler.o \
- $(MESS_MACHINE)/c64/multiscreen.o \
- $(MESS_MACHINE)/c64/music64.o \
- $(MESS_MACHINE)/c64/neoram.o\
- $(MESS_MACHINE)/c64/ocean.o \
- $(MESS_MACHINE)/c64/pagefox.o \
- $(MESS_MACHINE)/c64/partner.o \
- $(MESS_MACHINE)/c64/prophet64.o \
- $(MESS_MACHINE)/c64/ps64.o \
- $(MESS_MACHINE)/c64/reu.o \
- $(MESS_MACHINE)/c64/rex.o \
- $(MESS_MACHINE)/c64/rex_ep256.o \
- $(MESS_MACHINE)/c64/ross.o \
- $(MESS_MACHINE)/c64/sfx_sound_expander.o \
- $(MESS_MACHINE)/c64/silverrock.o \
- $(MESS_MACHINE)/c64/simons_basic.o \
- $(MESS_MACHINE)/c64/stardos.o \
- $(MESS_MACHINE)/c64/std.o \
- $(MESS_MACHINE)/c64/structured_basic.o \
- $(MESS_MACHINE)/c64/super_explode.o \
- $(MESS_MACHINE)/c64/super_games.o \
- $(MESS_MACHINE)/c64/supercpu.o \
- $(MESS_MACHINE)/c64/sw8k.o \
- $(MESS_MACHINE)/c64/swiftlink.o \
- $(MESS_MACHINE)/c64/system3.o \
- $(MESS_MACHINE)/c64/tdos.o \
- $(MESS_MACHINE)/c64/turbo232.o \
- $(MESS_MACHINE)/c64/vic1011.o \
- $(MESS_MACHINE)/c64/vizastar.o \
- $(MESS_MACHINE)/c64/vw64.o \
- $(MESS_MACHINE)/c64/warp_speed.o \
- $(MESS_MACHINE)/c64/westermann.o \
- $(MESS_MACHINE)/c64/xl80.o \
- $(MESS_MACHINE)/c64/zaxxon.o\
$(MESS_DRIVERS)/vic10.o \
$(MESS_MACHINE)/vic10exp.o \
$(MESS_MACHINE)/vic10std.o \
@@ -1190,12 +1120,10 @@ $(MESSOBJ)/cbm.a: \
$(MESS_DRIVERS)/c65.o \
$(MESS_MACHINE)/c65.o \
$(MESS_DRIVERS)/c128.o \
- $(MESS_MACHINE)/c128_comal80.o \
$(MESS_MACHINE)/c1551.o \
$(MESS_DRIVERS)/clcd.o \
$(MESS_MACHINE)/64h156.o \
$(MESS_MACHINE)/mos8722.o \
- $(MESS_MACHINE)/mos8726.o \
$(MESS_MACHINE)/c2n.o \
$(MESS_VIDEO)/vic4567.o \
$(MESS_VIDEO)/mos6566.o \