diff --git a/scripts/genie.lua b/scripts/genie.lua
index 8ec86054678..f279dc36041 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -529,7 +529,7 @@ if (_OPTIONS["SOURCES"] == nil) then
 else
 	OUT_STR = os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " target " .. _OPTIONS["subtarget"])
 	load(OUT_STR)()
-	os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " drivers " .. _OPTIONS["subtarget"] .. " > ".. GEN_DIR  .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"].."/drivlist.c")
+	os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " drivers " .. _OPTIONS["subtarget"] .. " > ".. GEN_DIR  .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"].."/drivlist.cpp")
 end
 configuration { "gmake" }
 	flags {
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index ce5f166c71e..2e967e2d638 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -16,16 +16,16 @@
 
 if (BUSES["A7800"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/a7800/a78_slot.c",
+		MAME_DIR .. "src/devices/bus/a7800/a78_slot.cpp",
 		MAME_DIR .. "src/devices/bus/a7800/a78_slot.h",
 		MAME_DIR .. "src/devices/bus/a7800/a78_carts.h",
-		MAME_DIR .. "src/devices/bus/a7800/rom.c",
+		MAME_DIR .. "src/devices/bus/a7800/rom.cpp",
 		MAME_DIR .. "src/devices/bus/a7800/rom.h",
-		MAME_DIR .. "src/devices/bus/a7800/hiscore.c",
+		MAME_DIR .. "src/devices/bus/a7800/hiscore.cpp",
 		MAME_DIR .. "src/devices/bus/a7800/hiscore.h",
-		MAME_DIR .. "src/devices/bus/a7800/xboard.c",
+		MAME_DIR .. "src/devices/bus/a7800/xboard.cpp",
 		MAME_DIR .. "src/devices/bus/a7800/xboard.h",
-		MAME_DIR .. "src/devices/bus/a7800/cpuwiz.c",
+		MAME_DIR .. "src/devices/bus/a7800/cpuwiz.cpp",
 		MAME_DIR .. "src/devices/bus/a7800/cpuwiz.h",
 	}
 end
@@ -38,18 +38,18 @@ end
 
 if (BUSES["A800"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/a800/a8sio.c",
+		MAME_DIR .. "src/devices/bus/a800/a8sio.cpp",
 		MAME_DIR .. "src/devices/bus/a800/a8sio.h",
-		MAME_DIR .. "src/devices/bus/a800/cassette.c",
+		MAME_DIR .. "src/devices/bus/a800/cassette.cpp",
 		MAME_DIR .. "src/devices/bus/a800/cassette.h",
-		MAME_DIR .. "src/devices/bus/a800/a800_slot.c",
+		MAME_DIR .. "src/devices/bus/a800/a800_slot.cpp",
 		MAME_DIR .. "src/devices/bus/a800/a800_slot.h",
 		MAME_DIR .. "src/devices/bus/a800/a800_carts.h",
-		MAME_DIR .. "src/devices/bus/a800/rom.c",
+		MAME_DIR .. "src/devices/bus/a800/rom.cpp",
 		MAME_DIR .. "src/devices/bus/a800/rom.h",
-		MAME_DIR .. "src/devices/bus/a800/oss.c",
+		MAME_DIR .. "src/devices/bus/a800/oss.cpp",
 		MAME_DIR .. "src/devices/bus/a800/oss.h",
-		MAME_DIR .. "src/devices/bus/a800/sparta.c",
+		MAME_DIR .. "src/devices/bus/a800/sparta.cpp",
 		MAME_DIR .. "src/devices/bus/a800/sparta.h",
 	}
 end
@@ -62,33 +62,33 @@ end
 
 if (BUSES["ABCBUS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/abcbus/abcbus.c",
+		MAME_DIR .. "src/devices/bus/abcbus/abcbus.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/abcbus.h",
-		MAME_DIR .. "src/devices/bus/abcbus/abc890.c",
+		MAME_DIR .. "src/devices/bus/abcbus/abc890.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/abc890.h",
-		MAME_DIR .. "src/devices/bus/abcbus/fd2.c",
+		MAME_DIR .. "src/devices/bus/abcbus/fd2.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/fd2.h",
-		MAME_DIR .. "src/devices/bus/abcbus/hdc.c",
+		MAME_DIR .. "src/devices/bus/abcbus/hdc.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/hdc.h",
-		MAME_DIR .. "src/devices/bus/abcbus/lux10828.c",
+		MAME_DIR .. "src/devices/bus/abcbus/lux10828.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/lux10828.h",
-		MAME_DIR .. "src/devices/bus/abcbus/lux21046.c",
+		MAME_DIR .. "src/devices/bus/abcbus/lux21046.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/lux21046.h",
-		MAME_DIR .. "src/devices/bus/abcbus/lux21056.c",
+		MAME_DIR .. "src/devices/bus/abcbus/lux21056.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/lux21056.h",
-		MAME_DIR .. "src/devices/bus/abcbus/lux4105.c",
+		MAME_DIR .. "src/devices/bus/abcbus/lux4105.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/lux4105.h",
-		MAME_DIR .. "src/devices/bus/abcbus/memcard.c",
+		MAME_DIR .. "src/devices/bus/abcbus/memcard.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/memcard.h",
-		MAME_DIR .. "src/devices/bus/abcbus/ram.c",
+		MAME_DIR .. "src/devices/bus/abcbus/ram.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/ram.h",
-		MAME_DIR .. "src/devices/bus/abcbus/sio.c",
+		MAME_DIR .. "src/devices/bus/abcbus/sio.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/sio.h",
-		MAME_DIR .. "src/devices/bus/abcbus/slutprov.c",
+		MAME_DIR .. "src/devices/bus/abcbus/slutprov.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/slutprov.h",
-		MAME_DIR .. "src/devices/bus/abcbus/turbo.c",
+		MAME_DIR .. "src/devices/bus/abcbus/turbo.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/turbo.h",
-		MAME_DIR .. "src/devices/bus/abcbus/uni800.c",
+		MAME_DIR .. "src/devices/bus/abcbus/uni800.cpp",
 		MAME_DIR .. "src/devices/bus/abcbus/uni800.h",
 	}
 end
@@ -101,13 +101,13 @@ end
 
 if (BUSES["ADAM"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/adam/exp.c",
+		MAME_DIR .. "src/devices/bus/adam/exp.cpp",
 		MAME_DIR .. "src/devices/bus/adam/exp.h",
-		MAME_DIR .. "src/devices/bus/adam/adamlink.c",
+		MAME_DIR .. "src/devices/bus/adam/adamlink.cpp",
 		MAME_DIR .. "src/devices/bus/adam/adamlink.h",
-		MAME_DIR .. "src/devices/bus/adam/ide.c",
+		MAME_DIR .. "src/devices/bus/adam/ide.cpp",
 		MAME_DIR .. "src/devices/bus/adam/ide.h",
-		MAME_DIR .. "src/devices/bus/adam/ram.c",
+		MAME_DIR .. "src/devices/bus/adam/ram.cpp",
 		MAME_DIR .. "src/devices/bus/adam/ram.h",
 	}
 end
@@ -120,17 +120,17 @@ end
 
 if (BUSES["ADAMNET"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/adamnet/adamnet.c",
+		MAME_DIR .. "src/devices/bus/adamnet/adamnet.cpp",
 		MAME_DIR .. "src/devices/bus/adamnet/adamnet.h",
-		MAME_DIR .. "src/devices/bus/adamnet/ddp.c",
+		MAME_DIR .. "src/devices/bus/adamnet/ddp.cpp",
 		MAME_DIR .. "src/devices/bus/adamnet/ddp.h",
-		MAME_DIR .. "src/devices/bus/adamnet/fdc.c",
+		MAME_DIR .. "src/devices/bus/adamnet/fdc.cpp",
 		MAME_DIR .. "src/devices/bus/adamnet/fdc.h",
-		MAME_DIR .. "src/devices/bus/adamnet/kb.c",
+		MAME_DIR .. "src/devices/bus/adamnet/kb.cpp",
 		MAME_DIR .. "src/devices/bus/adamnet/kb.h",
-		MAME_DIR .. "src/devices/bus/adamnet/printer.c",
+		MAME_DIR .. "src/devices/bus/adamnet/printer.cpp",
 		MAME_DIR .. "src/devices/bus/adamnet/printer.h",
-		MAME_DIR .. "src/devices/bus/adamnet/spi.c",
+		MAME_DIR .. "src/devices/bus/adamnet/spi.cpp",
 		MAME_DIR .. "src/devices/bus/adamnet/spi.h",
 	}
 end
@@ -143,9 +143,9 @@ end
 
 if (BUSES["APF"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/apf/slot.c",
+		MAME_DIR .. "src/devices/bus/apf/slot.cpp",
 		MAME_DIR .. "src/devices/bus/apf/slot.h",
-		MAME_DIR .. "src/devices/bus/apf/rom.c",
+		MAME_DIR .. "src/devices/bus/apf/rom.cpp",
 		MAME_DIR .. "src/devices/bus/apf/rom.h",
 	}
 end
@@ -158,11 +158,11 @@ end
 
 if (BUSES["APRICOT_EXPANSION"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/apricot/expansion.c",
+		MAME_DIR .. "src/devices/bus/apricot/expansion.cpp",
 		MAME_DIR .. "src/devices/bus/apricot/expansion.h",
-		MAME_DIR .. "src/devices/bus/apricot/cards.c",
+		MAME_DIR .. "src/devices/bus/apricot/cards.cpp",
 		MAME_DIR .. "src/devices/bus/apricot/cards.h",
-		MAME_DIR .. "src/devices/bus/apricot/ram.c",
+		MAME_DIR .. "src/devices/bus/apricot/ram.cpp",
 		MAME_DIR .. "src/devices/bus/apricot/ram.h",
 	}
 end
@@ -175,9 +175,9 @@ end
 
 if (BUSES["ARCADIA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/arcadia/slot.c",
+		MAME_DIR .. "src/devices/bus/arcadia/slot.cpp",
 		MAME_DIR .. "src/devices/bus/arcadia/slot.h",
-		MAME_DIR .. "src/devices/bus/arcadia/rom.c",
+		MAME_DIR .. "src/devices/bus/arcadia/rom.cpp",
 		MAME_DIR .. "src/devices/bus/arcadia/rom.h",
 	}
 end
@@ -190,13 +190,13 @@ end
 
 if (BUSES["ASTROCADE"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/astrocde/slot.c",
+		MAME_DIR .. "src/devices/bus/astrocde/slot.cpp",
 		MAME_DIR .. "src/devices/bus/astrocde/slot.h",
-		MAME_DIR .. "src/devices/bus/astrocde/rom.c",
+		MAME_DIR .. "src/devices/bus/astrocde/rom.cpp",
 		MAME_DIR .. "src/devices/bus/astrocde/rom.h",
-		MAME_DIR .. "src/devices/bus/astrocde/exp.c",
+		MAME_DIR .. "src/devices/bus/astrocde/exp.cpp",
 		MAME_DIR .. "src/devices/bus/astrocde/exp.h",
-		MAME_DIR .. "src/devices/bus/astrocde/ram.c",
+		MAME_DIR .. "src/devices/bus/astrocde/ram.cpp",
 		MAME_DIR .. "src/devices/bus/astrocde/ram.h",
 	}
 end
@@ -209,9 +209,9 @@ end
 
 if (BUSES["BW2"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/bw2/exp.c",
+		MAME_DIR .. "src/devices/bus/bw2/exp.cpp",
 		MAME_DIR .. "src/devices/bus/bw2/exp.h",
-		MAME_DIR .. "src/devices/bus/bw2/ramcard.c",
+		MAME_DIR .. "src/devices/bus/bw2/ramcard.cpp",
 		MAME_DIR .. "src/devices/bus/bw2/ramcard.h",
 	}
 end
@@ -225,149 +225,149 @@ end
 
 if (BUSES["C64"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/c64/exp.c",
+		MAME_DIR .. "src/devices/bus/c64/exp.cpp",
 		MAME_DIR .. "src/devices/bus/c64/exp.h",
-		MAME_DIR .. "src/devices/bus/c64/c128_comal80.c",
+		MAME_DIR .. "src/devices/bus/c64/c128_comal80.cpp",
 		MAME_DIR .. "src/devices/bus/c64/c128_comal80.h",
-		MAME_DIR .. "src/devices/bus/c64/c128_partner.c",
+		MAME_DIR .. "src/devices/bus/c64/c128_partner.cpp",
 		MAME_DIR .. "src/devices/bus/c64/c128_partner.h",
-		MAME_DIR .. "src/devices/bus/c64/comal80.c",
+		MAME_DIR .. "src/devices/bus/c64/comal80.cpp",
 		MAME_DIR .. "src/devices/bus/c64/comal80.h",
-		MAME_DIR .. "src/devices/bus/c64/cpm.c",
+		MAME_DIR .. "src/devices/bus/c64/cpm.cpp",
 		MAME_DIR .. "src/devices/bus/c64/cpm.h",
-		MAME_DIR .. "src/devices/bus/c64/currah_speech.c",
+		MAME_DIR .. "src/devices/bus/c64/currah_speech.cpp",
 		MAME_DIR .. "src/devices/bus/c64/currah_speech.h",
-		MAME_DIR .. "src/devices/bus/c64/dela_ep256.c",
+		MAME_DIR .. "src/devices/bus/c64/dela_ep256.cpp",
 		MAME_DIR .. "src/devices/bus/c64/dela_ep256.h",
-		MAME_DIR .. "src/devices/bus/c64/dela_ep64.c",
+		MAME_DIR .. "src/devices/bus/c64/dela_ep64.cpp",
 		MAME_DIR .. "src/devices/bus/c64/dela_ep64.h",
-		MAME_DIR .. "src/devices/bus/c64/dela_ep7x8.c",
+		MAME_DIR .. "src/devices/bus/c64/dela_ep7x8.cpp",
 		MAME_DIR .. "src/devices/bus/c64/dela_ep7x8.h",
-		MAME_DIR .. "src/devices/bus/c64/dinamic.c",
+		MAME_DIR .. "src/devices/bus/c64/dinamic.cpp",
 		MAME_DIR .. "src/devices/bus/c64/dinamic.h",
-		MAME_DIR .. "src/devices/bus/c64/dqbb.c",
+		MAME_DIR .. "src/devices/bus/c64/dqbb.cpp",
 		MAME_DIR .. "src/devices/bus/c64/dqbb.h",
-		MAME_DIR .. "src/devices/bus/c64/easy_calc_result.c",
+		MAME_DIR .. "src/devices/bus/c64/easy_calc_result.cpp",
 		MAME_DIR .. "src/devices/bus/c64/easy_calc_result.h",
-		MAME_DIR .. "src/devices/bus/c64/easyflash.c",
+		MAME_DIR .. "src/devices/bus/c64/easyflash.cpp",
 		MAME_DIR .. "src/devices/bus/c64/easyflash.h",
-		MAME_DIR .. "src/devices/bus/c64/epyx_fast_load.c",
+		MAME_DIR .. "src/devices/bus/c64/epyx_fast_load.cpp",
 		MAME_DIR .. "src/devices/bus/c64/epyx_fast_load.h",
-		MAME_DIR .. "src/devices/bus/c64/exos.c",
+		MAME_DIR .. "src/devices/bus/c64/exos.cpp",
 		MAME_DIR .. "src/devices/bus/c64/exos.h",
-		MAME_DIR .. "src/devices/bus/c64/fcc.c",
+		MAME_DIR .. "src/devices/bus/c64/fcc.cpp",
 		MAME_DIR .. "src/devices/bus/c64/fcc.h",
-		MAME_DIR .. "src/devices/bus/c64/final.c",
+		MAME_DIR .. "src/devices/bus/c64/final.cpp",
 		MAME_DIR .. "src/devices/bus/c64/final.h",
-		MAME_DIR .. "src/devices/bus/c64/final3.c",
+		MAME_DIR .. "src/devices/bus/c64/final3.cpp",
 		MAME_DIR .. "src/devices/bus/c64/final3.h",
-		MAME_DIR .. "src/devices/bus/c64/fun_play.c",
+		MAME_DIR .. "src/devices/bus/c64/fun_play.cpp",
 		MAME_DIR .. "src/devices/bus/c64/fun_play.h",
-		MAME_DIR .. "src/devices/bus/c64/georam.c",
+		MAME_DIR .. "src/devices/bus/c64/georam.cpp",
 		MAME_DIR .. "src/devices/bus/c64/georam.h",
-		MAME_DIR .. "src/devices/bus/c64/ide64.c",
+		MAME_DIR .. "src/devices/bus/c64/ide64.cpp",
 		MAME_DIR .. "src/devices/bus/c64/ide64.h",
-		MAME_DIR .. "src/devices/bus/c64/ieee488.c",
+		MAME_DIR .. "src/devices/bus/c64/ieee488.cpp",
 		MAME_DIR .. "src/devices/bus/c64/ieee488.h",
-		MAME_DIR .. "src/devices/bus/c64/kingsoft.c",
+		MAME_DIR .. "src/devices/bus/c64/kingsoft.cpp",
 		MAME_DIR .. "src/devices/bus/c64/kingsoft.h",
-		MAME_DIR .. "src/devices/bus/c64/mach5.c",
+		MAME_DIR .. "src/devices/bus/c64/mach5.cpp",
 		MAME_DIR .. "src/devices/bus/c64/mach5.h",
-		MAME_DIR .. "src/devices/bus/c64/magic_desk.c",
+		MAME_DIR .. "src/devices/bus/c64/magic_desk.cpp",
 		MAME_DIR .. "src/devices/bus/c64/magic_desk.h",
-		MAME_DIR .. "src/devices/bus/c64/magic_formel.c",
+		MAME_DIR .. "src/devices/bus/c64/magic_formel.cpp",
 		MAME_DIR .. "src/devices/bus/c64/magic_formel.h",
-		MAME_DIR .. "src/devices/bus/c64/magic_voice.c",
+		MAME_DIR .. "src/devices/bus/c64/magic_voice.cpp",
 		MAME_DIR .. "src/devices/bus/c64/magic_voice.h",
-		MAME_DIR .. "src/devices/bus/c64/midi_maplin.c",
+		MAME_DIR .. "src/devices/bus/c64/midi_maplin.cpp",
 		MAME_DIR .. "src/devices/bus/c64/midi_maplin.h",
-		MAME_DIR .. "src/devices/bus/c64/midi_namesoft.c",
+		MAME_DIR .. "src/devices/bus/c64/midi_namesoft.cpp",
 		MAME_DIR .. "src/devices/bus/c64/midi_namesoft.h",
-		MAME_DIR .. "src/devices/bus/c64/midi_passport.c",
+		MAME_DIR .. "src/devices/bus/c64/midi_passport.cpp",
 		MAME_DIR .. "src/devices/bus/c64/midi_passport.h",
-		MAME_DIR .. "src/devices/bus/c64/midi_sci.c",
+		MAME_DIR .. "src/devices/bus/c64/midi_sci.cpp",
 		MAME_DIR .. "src/devices/bus/c64/midi_sci.h",
-		MAME_DIR .. "src/devices/bus/c64/midi_siel.c",
+		MAME_DIR .. "src/devices/bus/c64/midi_siel.cpp",
 		MAME_DIR .. "src/devices/bus/c64/midi_siel.h",
-		MAME_DIR .. "src/devices/bus/c64/mikro_assembler.c",
+		MAME_DIR .. "src/devices/bus/c64/mikro_assembler.cpp",
 		MAME_DIR .. "src/devices/bus/c64/mikro_assembler.h",
-		MAME_DIR .. "src/devices/bus/c64/multiscreen.c",
+		MAME_DIR .. "src/devices/bus/c64/multiscreen.cpp",
 		MAME_DIR .. "src/devices/bus/c64/multiscreen.h",
-		MAME_DIR .. "src/devices/bus/c64/music64.c",
+		MAME_DIR .. "src/devices/bus/c64/music64.cpp",
 		MAME_DIR .. "src/devices/bus/c64/music64.h",
-		MAME_DIR .. "src/devices/bus/c64/neoram.c",
+		MAME_DIR .. "src/devices/bus/c64/neoram.cpp",
 		MAME_DIR .. "src/devices/bus/c64/neoram.h",
-		MAME_DIR .. "src/devices/bus/c64/ocean.c",
+		MAME_DIR .. "src/devices/bus/c64/ocean.cpp",
 		MAME_DIR .. "src/devices/bus/c64/ocean.h",
-		MAME_DIR .. "src/devices/bus/c64/pagefox.c",
+		MAME_DIR .. "src/devices/bus/c64/pagefox.cpp",
 		MAME_DIR .. "src/devices/bus/c64/pagefox.h",
-		MAME_DIR .. "src/devices/bus/c64/partner.c",
+		MAME_DIR .. "src/devices/bus/c64/partner.cpp",
 		MAME_DIR .. "src/devices/bus/c64/partner.h",
-		MAME_DIR .. "src/devices/bus/c64/prophet64.c",
+		MAME_DIR .. "src/devices/bus/c64/prophet64.cpp",
 		MAME_DIR .. "src/devices/bus/c64/prophet64.h",
-		MAME_DIR .. "src/devices/bus/c64/ps64.c",
+		MAME_DIR .. "src/devices/bus/c64/ps64.cpp",
 		MAME_DIR .. "src/devices/bus/c64/ps64.h",
-		MAME_DIR .. "src/devices/bus/c64/reu.c",
+		MAME_DIR .. "src/devices/bus/c64/reu.cpp",
 		MAME_DIR .. "src/devices/bus/c64/reu.h",
-		MAME_DIR .. "src/devices/bus/c64/rex.c",
+		MAME_DIR .. "src/devices/bus/c64/rex.cpp",
 		MAME_DIR .. "src/devices/bus/c64/rex.h",
-		MAME_DIR .. "src/devices/bus/c64/rex_ep256.c",
+		MAME_DIR .. "src/devices/bus/c64/rex_ep256.cpp",
 		MAME_DIR .. "src/devices/bus/c64/rex_ep256.h",
-		MAME_DIR .. "src/devices/bus/c64/ross.c",
+		MAME_DIR .. "src/devices/bus/c64/ross.cpp",
 		MAME_DIR .. "src/devices/bus/c64/ross.h",
-		MAME_DIR .. "src/devices/bus/c64/sfx_sound_expander.c",
+		MAME_DIR .. "src/devices/bus/c64/sfx_sound_expander.cpp",
 		MAME_DIR .. "src/devices/bus/c64/sfx_sound_expander.h",
-		MAME_DIR .. "src/devices/bus/c64/silverrock.c",
+		MAME_DIR .. "src/devices/bus/c64/silverrock.cpp",
 		MAME_DIR .. "src/devices/bus/c64/silverrock.h",
-		MAME_DIR .. "src/devices/bus/c64/simons_basic.c",
+		MAME_DIR .. "src/devices/bus/c64/simons_basic.cpp",
 		MAME_DIR .. "src/devices/bus/c64/simons_basic.h",
-		MAME_DIR .. "src/devices/bus/c64/stardos.c",
+		MAME_DIR .. "src/devices/bus/c64/stardos.cpp",
 		MAME_DIR .. "src/devices/bus/c64/stardos.h",
-		MAME_DIR .. "src/devices/bus/c64/std.c",
+		MAME_DIR .. "src/devices/bus/c64/std.cpp",
 		MAME_DIR .. "src/devices/bus/c64/std.h",
-		MAME_DIR .. "src/devices/bus/c64/structured_basic.c",
+		MAME_DIR .. "src/devices/bus/c64/structured_basic.cpp",
 		MAME_DIR .. "src/devices/bus/c64/structured_basic.h",
-		MAME_DIR .. "src/devices/bus/c64/super_explode.c",
+		MAME_DIR .. "src/devices/bus/c64/super_explode.cpp",
 		MAME_DIR .. "src/devices/bus/c64/super_explode.h",
-		MAME_DIR .. "src/devices/bus/c64/super_games.c",
+		MAME_DIR .. "src/devices/bus/c64/super_games.cpp",
 		MAME_DIR .. "src/devices/bus/c64/super_games.h",
-		MAME_DIR .. "src/devices/bus/c64/supercpu.c",
+		MAME_DIR .. "src/devices/bus/c64/supercpu.cpp",
 		MAME_DIR .. "src/devices/bus/c64/supercpu.h",
-		MAME_DIR .. "src/devices/bus/c64/sw8k.c",
+		MAME_DIR .. "src/devices/bus/c64/sw8k.cpp",
 		MAME_DIR .. "src/devices/bus/c64/sw8k.h",
-		MAME_DIR .. "src/devices/bus/c64/swiftlink.c",
+		MAME_DIR .. "src/devices/bus/c64/swiftlink.cpp",
 		MAME_DIR .. "src/devices/bus/c64/swiftlink.h",
-		MAME_DIR .. "src/devices/bus/c64/system3.c",
+		MAME_DIR .. "src/devices/bus/c64/system3.cpp",
 		MAME_DIR .. "src/devices/bus/c64/system3.h",
-		MAME_DIR .. "src/devices/bus/c64/tdos.c",
+		MAME_DIR .. "src/devices/bus/c64/tdos.cpp",
 		MAME_DIR .. "src/devices/bus/c64/tdos.h",
-		MAME_DIR .. "src/devices/bus/c64/turbo232.c",
+		MAME_DIR .. "src/devices/bus/c64/turbo232.cpp",
 		MAME_DIR .. "src/devices/bus/c64/turbo232.h",
-		MAME_DIR .. "src/devices/bus/c64/vizastar.c",
+		MAME_DIR .. "src/devices/bus/c64/vizastar.cpp",
 		MAME_DIR .. "src/devices/bus/c64/vizastar.h",
-		MAME_DIR .. "src/devices/bus/c64/vw64.c",
+		MAME_DIR .. "src/devices/bus/c64/vw64.cpp",
 		MAME_DIR .. "src/devices/bus/c64/vw64.h",
-		MAME_DIR .. "src/devices/bus/c64/warp_speed.c",
+		MAME_DIR .. "src/devices/bus/c64/warp_speed.cpp",
 		MAME_DIR .. "src/devices/bus/c64/warp_speed.h",
-		MAME_DIR .. "src/devices/bus/c64/westermann.c",
+		MAME_DIR .. "src/devices/bus/c64/westermann.cpp",
 		MAME_DIR .. "src/devices/bus/c64/westermann.h",
-		MAME_DIR .. "src/devices/bus/c64/xl80.c",
+		MAME_DIR .. "src/devices/bus/c64/xl80.cpp",
 		MAME_DIR .. "src/devices/bus/c64/xl80.h",
-		MAME_DIR .. "src/devices/bus/c64/zaxxon.c",
+		MAME_DIR .. "src/devices/bus/c64/zaxxon.cpp",
 		MAME_DIR .. "src/devices/bus/c64/zaxxon.h",
-		MAME_DIR .. "src/devices/bus/c64/user.c",
+		MAME_DIR .. "src/devices/bus/c64/user.cpp",
 		MAME_DIR .. "src/devices/bus/c64/user.h",
-		MAME_DIR .. "src/devices/bus/c64/4dxh.c",
+		MAME_DIR .. "src/devices/bus/c64/4dxh.cpp",
 		MAME_DIR .. "src/devices/bus/c64/4dxh.h",
-		MAME_DIR .. "src/devices/bus/c64/4ksa.c",
+		MAME_DIR .. "src/devices/bus/c64/4ksa.cpp",
 		MAME_DIR .. "src/devices/bus/c64/4ksa.h",
-		MAME_DIR .. "src/devices/bus/c64/4tba.c",
+		MAME_DIR .. "src/devices/bus/c64/4tba.cpp",
 		MAME_DIR .. "src/devices/bus/c64/4tba.h",
-		MAME_DIR .. "src/devices/bus/c64/16kb.c",
+		MAME_DIR .. "src/devices/bus/c64/16kb.cpp",
 		MAME_DIR .. "src/devices/bus/c64/16kb.h",
-		MAME_DIR .. "src/devices/bus/c64/bn1541.c",
+		MAME_DIR .. "src/devices/bus/c64/bn1541.cpp",
 		MAME_DIR .. "src/devices/bus/c64/bn1541.h",
-		MAME_DIR .. "src/devices/bus/c64/geocable.c",
+		MAME_DIR .. "src/devices/bus/c64/geocable.cpp",
 		MAME_DIR .. "src/devices/bus/c64/geocable.h",
 	}
 end
@@ -381,15 +381,15 @@ end
 
 if (BUSES["CBM2"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/cbm2/exp.c",
+		MAME_DIR .. "src/devices/bus/cbm2/exp.cpp",
 		MAME_DIR .. "src/devices/bus/cbm2/exp.h",
-		MAME_DIR .. "src/devices/bus/cbm2/24k.c",
+		MAME_DIR .. "src/devices/bus/cbm2/24k.cpp",
 		MAME_DIR .. "src/devices/bus/cbm2/24k.h",
-		MAME_DIR .. "src/devices/bus/cbm2/hrg.c",
+		MAME_DIR .. "src/devices/bus/cbm2/hrg.cpp",
 		MAME_DIR .. "src/devices/bus/cbm2/hrg.h",
-		MAME_DIR .. "src/devices/bus/cbm2/std.c",
+		MAME_DIR .. "src/devices/bus/cbm2/std.cpp",
 		MAME_DIR .. "src/devices/bus/cbm2/std.h",
-		MAME_DIR .. "src/devices/bus/cbm2/user.c",
+		MAME_DIR .. "src/devices/bus/cbm2/user.cpp",
 		MAME_DIR .. "src/devices/bus/cbm2/user.h",
 	}
 end
@@ -402,31 +402,31 @@ end
 
 if (BUSES["CBMIEC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/cbmiec/cbmiec.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/cbmiec.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/cbmiec.h",
-		MAME_DIR .. "src/devices/bus/cbmiec/c1541.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/c1541.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/c1541.h",
-		MAME_DIR .. "src/devices/bus/cbmiec/c1571.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/c1571.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/c1571.h",
-		MAME_DIR .. "src/devices/bus/cbmiec/c1581.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/c1581.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/c1581.h",
-		MAME_DIR .. "src/devices/bus/cbmiec/c64_nl10.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/c64_nl10.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/c64_nl10.h",
-		MAME_DIR .. "src/devices/bus/cbmiec/cmdhd.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/cmdhd.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/cmdhd.h",
-		MAME_DIR .. "src/devices/bus/cbmiec/diag264_lb_iec.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/diag264_lb_iec.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/diag264_lb_iec.h",
-		MAME_DIR .. "src/devices/bus/cbmiec/fd2000.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/fd2000.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/fd2000.h",
-		MAME_DIR .. "src/devices/bus/cbmiec/interpod.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/interpod.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/interpod.h",
-		MAME_DIR .. "src/devices/bus/cbmiec/serialbox.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/serialbox.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/serialbox.h",
-		MAME_DIR .. "src/devices/bus/cbmiec/vic1515.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/vic1515.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/vic1515.h",
-		MAME_DIR .. "src/devices/bus/cbmiec/vic1520.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/vic1520.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/vic1520.h",
-		MAME_DIR .. "src/devices/bus/cbmiec/c1526.c",
+		MAME_DIR .. "src/devices/bus/cbmiec/c1526.cpp",
 		MAME_DIR .. "src/devices/bus/cbmiec/c1526.h",
 	}
 end
@@ -439,9 +439,9 @@ end
 
 if (BUSES["CHANNELF"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/chanf/slot.c",
+		MAME_DIR .. "src/devices/bus/chanf/slot.cpp",
 		MAME_DIR .. "src/devices/bus/chanf/slot.h",
-		MAME_DIR .. "src/devices/bus/chanf/rom.c",
+		MAME_DIR .. "src/devices/bus/chanf/rom.cpp",
 		MAME_DIR .. "src/devices/bus/chanf/rom.h",
 	}
 end
@@ -454,23 +454,23 @@ end
 
 if (BUSES["COMX35"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/comx35/exp.c",
+		MAME_DIR .. "src/devices/bus/comx35/exp.cpp",
 		MAME_DIR .. "src/devices/bus/comx35/exp.h",
-		MAME_DIR .. "src/devices/bus/comx35/clm.c",
+		MAME_DIR .. "src/devices/bus/comx35/clm.cpp",
 		MAME_DIR .. "src/devices/bus/comx35/clm.h",
-		MAME_DIR .. "src/devices/bus/comx35/expbox.c",
+		MAME_DIR .. "src/devices/bus/comx35/expbox.cpp",
 		MAME_DIR .. "src/devices/bus/comx35/expbox.h",
-		MAME_DIR .. "src/devices/bus/comx35/eprom.c",
+		MAME_DIR .. "src/devices/bus/comx35/eprom.cpp",
 		MAME_DIR .. "src/devices/bus/comx35/eprom.h",
-		MAME_DIR .. "src/devices/bus/comx35/fdc.c",
+		MAME_DIR .. "src/devices/bus/comx35/fdc.cpp",
 		MAME_DIR .. "src/devices/bus/comx35/fdc.h",
-		MAME_DIR .. "src/devices/bus/comx35/joycard.c",
+		MAME_DIR .. "src/devices/bus/comx35/joycard.cpp",
 		MAME_DIR .. "src/devices/bus/comx35/joycard.h",
-		MAME_DIR .. "src/devices/bus/comx35/printer.c",
+		MAME_DIR .. "src/devices/bus/comx35/printer.cpp",
 		MAME_DIR .. "src/devices/bus/comx35/printer.h",
-		MAME_DIR .. "src/devices/bus/comx35/ram.c",
+		MAME_DIR .. "src/devices/bus/comx35/ram.cpp",
 		MAME_DIR .. "src/devices/bus/comx35/ram.h",
-		MAME_DIR .. "src/devices/bus/comx35/thermal.c",
+		MAME_DIR .. "src/devices/bus/comx35/thermal.cpp",
 		MAME_DIR .. "src/devices/bus/comx35/thermal.h",
 	}
 end
@@ -483,18 +483,18 @@ end
 
 if (BUSES["COLECO"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/coleco/ctrl.c",
+		MAME_DIR .. "src/devices/bus/coleco/ctrl.cpp",
 		MAME_DIR .. "src/devices/bus/coleco/ctrl.h",
-		MAME_DIR .. "src/devices/bus/coleco/hand.c",
+		MAME_DIR .. "src/devices/bus/coleco/hand.cpp",
 		MAME_DIR .. "src/devices/bus/coleco/hand.h",
-		MAME_DIR .. "src/devices/bus/coleco/sac.c",
+		MAME_DIR .. "src/devices/bus/coleco/sac.cpp",
 		MAME_DIR .. "src/devices/bus/coleco/sac.h",
-		MAME_DIR .. "src/devices/bus/coleco/exp.c",
+		MAME_DIR .. "src/devices/bus/coleco/exp.cpp",
 		MAME_DIR .. "src/devices/bus/coleco/exp.h",
-		MAME_DIR .. "src/devices/bus/coleco/std.c",
+		MAME_DIR .. "src/devices/bus/coleco/std.cpp",
 		MAME_DIR .. "src/devices/bus/coleco/std.h",
 		MAME_DIR .. "src/devices/bus/coleco/xin1.h",
-		MAME_DIR .. "src/devices/bus/coleco/xin1.c",
+		MAME_DIR .. "src/devices/bus/coleco/xin1.cpp",
 	}
 end
 
@@ -506,9 +506,9 @@ end
 
 if (BUSES["CRVISION"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/crvision/slot.c",
+		MAME_DIR .. "src/devices/bus/crvision/slot.cpp",
 		MAME_DIR .. "src/devices/bus/crvision/slot.h",
-		MAME_DIR .. "src/devices/bus/crvision/rom.c",
+		MAME_DIR .. "src/devices/bus/crvision/rom.cpp",
 		MAME_DIR .. "src/devices/bus/crvision/rom.h",
 	}
 end
@@ -521,23 +521,23 @@ end
 
 if (BUSES["DMV"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/dmv/dmvbus.c",
+		MAME_DIR .. "src/devices/bus/dmv/dmvbus.cpp",
 		MAME_DIR .. "src/devices/bus/dmv/dmvbus.h",
-		MAME_DIR .. "src/devices/bus/dmv/k210.c",
+		MAME_DIR .. "src/devices/bus/dmv/k210.cpp",
 		MAME_DIR .. "src/devices/bus/dmv/k210.h",
-		MAME_DIR .. "src/devices/bus/dmv/k220.c",
+		MAME_DIR .. "src/devices/bus/dmv/k220.cpp",
 		MAME_DIR .. "src/devices/bus/dmv/k220.h",
-		MAME_DIR .. "src/devices/bus/dmv/k230.c",
+		MAME_DIR .. "src/devices/bus/dmv/k230.cpp",
 		MAME_DIR .. "src/devices/bus/dmv/k230.h",
-		MAME_DIR .. "src/devices/bus/dmv/k233.c",
+		MAME_DIR .. "src/devices/bus/dmv/k233.cpp",
 		MAME_DIR .. "src/devices/bus/dmv/k233.h",
-		MAME_DIR .. "src/devices/bus/dmv/k801.c",
+		MAME_DIR .. "src/devices/bus/dmv/k801.cpp",
 		MAME_DIR .. "src/devices/bus/dmv/k801.h",
-		MAME_DIR .. "src/devices/bus/dmv/k803.c",
+		MAME_DIR .. "src/devices/bus/dmv/k803.cpp",
 		MAME_DIR .. "src/devices/bus/dmv/k803.h",
-		MAME_DIR .. "src/devices/bus/dmv/k806.c",
+		MAME_DIR .. "src/devices/bus/dmv/k806.cpp",
 		MAME_DIR .. "src/devices/bus/dmv/k806.h",
-		MAME_DIR .. "src/devices/bus/dmv/ram.c",
+		MAME_DIR .. "src/devices/bus/dmv/ram.cpp",
 		MAME_DIR .. "src/devices/bus/dmv/ram.h",
 	}
 end
@@ -550,9 +550,9 @@ end
 
 if (BUSES["ECBBUS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/ecbbus/ecbbus.c",
+		MAME_DIR .. "src/devices/bus/ecbbus/ecbbus.cpp",
 		MAME_DIR .. "src/devices/bus/ecbbus/ecbbus.h",
-		MAME_DIR .. "src/devices/bus/ecbbus/grip.c",
+		MAME_DIR .. "src/devices/bus/ecbbus/grip.cpp",
 		MAME_DIR .. "src/devices/bus/ecbbus/grip.h",
 	}
 end
@@ -565,9 +565,9 @@ end
 
 if (BUSES["ECONET"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/econet/econet.c",
+		MAME_DIR .. "src/devices/bus/econet/econet.cpp",
 		MAME_DIR .. "src/devices/bus/econet/econet.h",
-		MAME_DIR .. "src/devices/bus/econet/e01.c",
+		MAME_DIR .. "src/devices/bus/econet/e01.cpp",
 		MAME_DIR .. "src/devices/bus/econet/e01.h",
 	}
 end
@@ -580,9 +580,9 @@ end
 
 if (BUSES["EP64"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/ep64/exp.c",
+		MAME_DIR .. "src/devices/bus/ep64/exp.cpp",
 		MAME_DIR .. "src/devices/bus/ep64/exp.h",
-		MAME_DIR .. "src/devices/bus/ep64/exdos.c",
+		MAME_DIR .. "src/devices/bus/ep64/exdos.cpp",
 		MAME_DIR .. "src/devices/bus/ep64/exdos.h",
 	}
 end
@@ -595,13 +595,13 @@ end
 
 if (BUSES["GENERIC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/generic/slot.c",
+		MAME_DIR .. "src/devices/bus/generic/slot.cpp",
 		MAME_DIR .. "src/devices/bus/generic/slot.h",
-		MAME_DIR .. "src/devices/bus/generic/carts.c",
+		MAME_DIR .. "src/devices/bus/generic/carts.cpp",
 		MAME_DIR .. "src/devices/bus/generic/carts.h",
-		MAME_DIR .. "src/devices/bus/generic/ram.c",
+		MAME_DIR .. "src/devices/bus/generic/ram.cpp",
 		MAME_DIR .. "src/devices/bus/generic/ram.h",
-		MAME_DIR .. "src/devices/bus/generic/rom.c",
+		MAME_DIR .. "src/devices/bus/generic/rom.cpp",
 		MAME_DIR .. "src/devices/bus/generic/rom.h",
 	}
 end
@@ -614,27 +614,27 @@ end
 
 if (BUSES["IEEE488"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/ieee488/ieee488.c",
+		MAME_DIR .. "src/devices/bus/ieee488/ieee488.cpp",
 		MAME_DIR .. "src/devices/bus/ieee488/ieee488.h",
-		MAME_DIR .. "src/devices/bus/ieee488/c2031.c",
+		MAME_DIR .. "src/devices/bus/ieee488/c2031.cpp",
 		MAME_DIR .. "src/devices/bus/ieee488/c2031.h",
-		MAME_DIR .. "src/devices/bus/ieee488/c2040.c",
+		MAME_DIR .. "src/devices/bus/ieee488/c2040.cpp",
 		MAME_DIR .. "src/devices/bus/ieee488/c2040.h",
-		MAME_DIR .. "src/devices/bus/ieee488/c2040fdc.c",
+		MAME_DIR .. "src/devices/bus/ieee488/c2040fdc.cpp",
 		MAME_DIR .. "src/devices/bus/ieee488/c2040fdc.h",
-		MAME_DIR .. "src/devices/bus/ieee488/c8050.c",
+		MAME_DIR .. "src/devices/bus/ieee488/c8050.cpp",
 		MAME_DIR .. "src/devices/bus/ieee488/c8050.h",
-		MAME_DIR .. "src/devices/bus/ieee488/c8050fdc.c",
+		MAME_DIR .. "src/devices/bus/ieee488/c8050fdc.cpp",
 		MAME_DIR .. "src/devices/bus/ieee488/c8050fdc.h",
-		MAME_DIR .. "src/devices/bus/ieee488/c8280.c",
+		MAME_DIR .. "src/devices/bus/ieee488/c8280.cpp",
 		MAME_DIR .. "src/devices/bus/ieee488/c8280.h",
-		MAME_DIR .. "src/devices/bus/ieee488/d9060.c",
+		MAME_DIR .. "src/devices/bus/ieee488/d9060.cpp",
 		MAME_DIR .. "src/devices/bus/ieee488/d9060.h",
-		MAME_DIR .. "src/devices/bus/ieee488/softbox.c",
+		MAME_DIR .. "src/devices/bus/ieee488/softbox.cpp",
 		MAME_DIR .. "src/devices/bus/ieee488/softbox.h",
-		MAME_DIR .. "src/devices/bus/ieee488/hardbox.c",
+		MAME_DIR .. "src/devices/bus/ieee488/hardbox.cpp",
 		MAME_DIR .. "src/devices/bus/ieee488/hardbox.h",
-		MAME_DIR .. "src/devices/bus/ieee488/shark.c",
+		MAME_DIR .. "src/devices/bus/ieee488/shark.cpp",
 		MAME_DIR .. "src/devices/bus/ieee488/shark.h",
 	}
 end
@@ -647,23 +647,23 @@ end
 
 if (BUSES["IQ151"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/iq151/iq151.c",
+		MAME_DIR .. "src/devices/bus/iq151/iq151.cpp",
 		MAME_DIR .. "src/devices/bus/iq151/iq151.h",
-		MAME_DIR .. "src/devices/bus/iq151/disc2.c",
+		MAME_DIR .. "src/devices/bus/iq151/disc2.cpp",
 		MAME_DIR .. "src/devices/bus/iq151/disc2.h",
-		MAME_DIR .. "src/devices/bus/iq151/grafik.c",
+		MAME_DIR .. "src/devices/bus/iq151/grafik.cpp",
 		MAME_DIR .. "src/devices/bus/iq151/grafik.h",
-		MAME_DIR .. "src/devices/bus/iq151/minigraf.c",
+		MAME_DIR .. "src/devices/bus/iq151/minigraf.cpp",
 		MAME_DIR .. "src/devices/bus/iq151/minigraf.h",
-		MAME_DIR .. "src/devices/bus/iq151/ms151a.c",
+		MAME_DIR .. "src/devices/bus/iq151/ms151a.cpp",
 		MAME_DIR .. "src/devices/bus/iq151/ms151a.h",
-		MAME_DIR .. "src/devices/bus/iq151/rom.c",
+		MAME_DIR .. "src/devices/bus/iq151/rom.cpp",
 		MAME_DIR .. "src/devices/bus/iq151/rom.h",
-		MAME_DIR .. "src/devices/bus/iq151/staper.c",
+		MAME_DIR .. "src/devices/bus/iq151/staper.cpp",
 		MAME_DIR .. "src/devices/bus/iq151/staper.h",
-		MAME_DIR .. "src/devices/bus/iq151/video32.c",
+		MAME_DIR .. "src/devices/bus/iq151/video32.cpp",
 		MAME_DIR .. "src/devices/bus/iq151/video32.h",
-		MAME_DIR .. "src/devices/bus/iq151/video64.c",
+		MAME_DIR .. "src/devices/bus/iq151/video64.cpp",
 		MAME_DIR .. "src/devices/bus/iq151/video64.h",
 	}
 end
@@ -676,9 +676,9 @@ end
 
 if (BUSES["IMI7000"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/imi7000/imi7000.c",
+		MAME_DIR .. "src/devices/bus/imi7000/imi7000.cpp",
 		MAME_DIR .. "src/devices/bus/imi7000/imi7000.h",
-		MAME_DIR .. "src/devices/bus/imi7000/imi5000h.c",
+		MAME_DIR .. "src/devices/bus/imi7000/imi5000h.cpp",
 		MAME_DIR .. "src/devices/bus/imi7000/imi5000h.h",
 	}
 end
@@ -691,13 +691,13 @@ end
 
 if (BUSES["INTV"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/intv/slot.c",
+		MAME_DIR .. "src/devices/bus/intv/slot.cpp",
 		MAME_DIR .. "src/devices/bus/intv/slot.h",
-		MAME_DIR .. "src/devices/bus/intv/rom.c",
+		MAME_DIR .. "src/devices/bus/intv/rom.cpp",
 		MAME_DIR .. "src/devices/bus/intv/rom.h",
-		MAME_DIR .. "src/devices/bus/intv/voice.c",
+		MAME_DIR .. "src/devices/bus/intv/voice.cpp",
 		MAME_DIR .. "src/devices/bus/intv/voice.h",
-		MAME_DIR .. "src/devices/bus/intv/ecs.c",
+		MAME_DIR .. "src/devices/bus/intv/ecs.cpp",
 		MAME_DIR .. "src/devices/bus/intv/ecs.h",
 	}
 end
@@ -710,109 +710,109 @@ end
 
 if (BUSES["ISA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/isa/isa.c",
+		MAME_DIR .. "src/devices/bus/isa/isa.cpp",
 		MAME_DIR .. "src/devices/bus/isa/isa.h",
-		MAME_DIR .. "src/devices/bus/isa/isa_cards.c",
+		MAME_DIR .. "src/devices/bus/isa/isa_cards.cpp",
 		MAME_DIR .. "src/devices/bus/isa/isa_cards.h",
-		MAME_DIR .. "src/devices/bus/isa/mda.c",
+		MAME_DIR .. "src/devices/bus/isa/mda.cpp",
 		MAME_DIR .. "src/devices/bus/isa/mda.h",
-		MAME_DIR .. "src/devices/bus/isa/wdxt_gen.c",
+		MAME_DIR .. "src/devices/bus/isa/wdxt_gen.cpp",
 		MAME_DIR .. "src/devices/bus/isa/wdxt_gen.h",
-		MAME_DIR .. "src/devices/bus/isa/adlib.c",
+		MAME_DIR .. "src/devices/bus/isa/adlib.cpp",
 		MAME_DIR .. "src/devices/bus/isa/adlib.h",
-		MAME_DIR .. "src/devices/bus/isa/com.c",
+		MAME_DIR .. "src/devices/bus/isa/com.cpp",
 		MAME_DIR .. "src/devices/bus/isa/com.h",
-		MAME_DIR .. "src/devices/bus/isa/fdc.c",
+		MAME_DIR .. "src/devices/bus/isa/fdc.cpp",
 		MAME_DIR .. "src/devices/bus/isa/fdc.h",
-		MAME_DIR .. "src/devices/bus/isa/mufdc.c",
+		MAME_DIR .. "src/devices/bus/isa/mufdc.cpp",
 		MAME_DIR .. "src/devices/bus/isa/mufdc.h",
-		MAME_DIR .. "src/devices/bus/isa/finalchs.c",
+		MAME_DIR .. "src/devices/bus/isa/finalchs.cpp",
 		MAME_DIR .. "src/devices/bus/isa/finalchs.h",
-		MAME_DIR .. "src/devices/bus/isa/gblaster.c",
+		MAME_DIR .. "src/devices/bus/isa/gblaster.cpp",
 		MAME_DIR .. "src/devices/bus/isa/gblaster.h",
-		MAME_DIR .. "src/devices/bus/isa/gus.c",
+		MAME_DIR .. "src/devices/bus/isa/gus.cpp",
 		MAME_DIR .. "src/devices/bus/isa/gus.h",
-		MAME_DIR .. "src/devices/bus/isa/sb16.c",
+		MAME_DIR .. "src/devices/bus/isa/sb16.cpp",
 		MAME_DIR .. "src/devices/bus/isa/sb16.h",
-		MAME_DIR .. "src/devices/bus/isa/hdc.c",
+		MAME_DIR .. "src/devices/bus/isa/hdc.cpp",
 		MAME_DIR .. "src/devices/bus/isa/hdc.h",
-		MAME_DIR .. "src/devices/bus/isa/ibm_mfc.c",
+		MAME_DIR .. "src/devices/bus/isa/ibm_mfc.cpp",
 		MAME_DIR .. "src/devices/bus/isa/ibm_mfc.h",
-		MAME_DIR .. "src/devices/bus/isa/mpu401.c",
+		MAME_DIR .. "src/devices/bus/isa/mpu401.cpp",
 		MAME_DIR .. "src/devices/bus/isa/mpu401.h",
-		MAME_DIR .. "src/devices/bus/isa/sblaster.c",
+		MAME_DIR .. "src/devices/bus/isa/sblaster.cpp",
 		MAME_DIR .. "src/devices/bus/isa/sblaster.h",
-		MAME_DIR .. "src/devices/bus/isa/stereo_fx.c",
+		MAME_DIR .. "src/devices/bus/isa/stereo_fx.cpp",
 		MAME_DIR .. "src/devices/bus/isa/stereo_fx.h",
-		MAME_DIR .. "src/devices/bus/isa/ssi2001.c",
+		MAME_DIR .. "src/devices/bus/isa/ssi2001.cpp",
 		MAME_DIR .. "src/devices/bus/isa/ssi2001.h",
-		MAME_DIR .. "src/devices/bus/isa/ide.c",
+		MAME_DIR .. "src/devices/bus/isa/ide.cpp",
 		MAME_DIR .. "src/devices/bus/isa/ide.h",
-		MAME_DIR .. "src/devices/bus/isa/xtide.c",
+		MAME_DIR .. "src/devices/bus/isa/xtide.cpp",
 		MAME_DIR .. "src/devices/bus/isa/xtide.h",
-		MAME_DIR .. "src/devices/bus/isa/side116.c",
+		MAME_DIR .. "src/devices/bus/isa/side116.cpp",
 		MAME_DIR .. "src/devices/bus/isa/side116.h",
-		MAME_DIR .. "src/devices/bus/isa/aha1542.c",
+		MAME_DIR .. "src/devices/bus/isa/aha1542.cpp",
 		MAME_DIR .. "src/devices/bus/isa/aha1542.h",
-		MAME_DIR .. "src/devices/bus/isa/wd1002a_wx1.c",
+		MAME_DIR .. "src/devices/bus/isa/wd1002a_wx1.cpp",
 		MAME_DIR .. "src/devices/bus/isa/wd1002a_wx1.h",
-		MAME_DIR .. "src/devices/bus/isa/dectalk.c",
+		MAME_DIR .. "src/devices/bus/isa/dectalk.cpp",
 		MAME_DIR .. "src/devices/bus/isa/dectalk.h",
-		MAME_DIR .. "src/devices/bus/isa/pds.c",
+		MAME_DIR .. "src/devices/bus/isa/pds.cpp",
 		MAME_DIR .. "src/devices/bus/isa/pds.h",
-		MAME_DIR .. "src/devices/bus/isa/omti8621.c",
+		MAME_DIR .. "src/devices/bus/isa/omti8621.cpp",
 		MAME_DIR .. "src/devices/bus/isa/omti8621.h",
-		MAME_DIR .. "src/devices/bus/isa/cga.c",
+		MAME_DIR .. "src/devices/bus/isa/cga.cpp",
 		MAME_DIR .. "src/devices/bus/isa/cga.h",
-		MAME_DIR .. "src/devices/bus/isa/svga_cirrus.c",
+		MAME_DIR .. "src/devices/bus/isa/svga_cirrus.cpp",
 		MAME_DIR .. "src/devices/bus/isa/svga_cirrus.h",
-		MAME_DIR .. "src/devices/bus/isa/ega.c",
+		MAME_DIR .. "src/devices/bus/isa/ega.cpp",
 		MAME_DIR .. "src/devices/bus/isa/ega.h",
-		MAME_DIR .. "src/devices/bus/isa/pgc.c",
+		MAME_DIR .. "src/devices/bus/isa/pgc.cpp",
 		MAME_DIR .. "src/devices/bus/isa/pgc.h",
-		MAME_DIR .. "src/devices/bus/isa/vga.c",
+		MAME_DIR .. "src/devices/bus/isa/vga.cpp",
 		MAME_DIR .. "src/devices/bus/isa/vga.h",
-		MAME_DIR .. "src/devices/bus/isa/vga_ati.c",
+		MAME_DIR .. "src/devices/bus/isa/vga_ati.cpp",
 		MAME_DIR .. "src/devices/bus/isa/vga_ati.h",
-		MAME_DIR .. "src/devices/bus/isa/mach32.c",
+		MAME_DIR .. "src/devices/bus/isa/mach32.cpp",
 		MAME_DIR .. "src/devices/bus/isa/mach32.h",
-		MAME_DIR .. "src/devices/bus/isa/svga_tseng.c",
+		MAME_DIR .. "src/devices/bus/isa/svga_tseng.cpp",
 		MAME_DIR .. "src/devices/bus/isa/svga_tseng.h",
-		MAME_DIR .. "src/devices/bus/isa/svga_s3.c",
+		MAME_DIR .. "src/devices/bus/isa/svga_s3.cpp",
 		MAME_DIR .. "src/devices/bus/isa/svga_s3.h",
-		MAME_DIR .. "src/devices/bus/isa/s3virge.c",
+		MAME_DIR .. "src/devices/bus/isa/s3virge.cpp",
 		MAME_DIR .. "src/devices/bus/isa/s3virge.h",
-		MAME_DIR .. "src/devices/bus/isa/pc1640_iga.c",
+		MAME_DIR .. "src/devices/bus/isa/pc1640_iga.cpp",
 		MAME_DIR .. "src/devices/bus/isa/pc1640_iga.h",
-		MAME_DIR .. "src/devices/bus/isa/3c503.c",
+		MAME_DIR .. "src/devices/bus/isa/3c503.cpp",
 		MAME_DIR .. "src/devices/bus/isa/3c503.h",
-		MAME_DIR .. "src/devices/bus/isa/ne1000.c",
+		MAME_DIR .. "src/devices/bus/isa/ne1000.cpp",
 		MAME_DIR .. "src/devices/bus/isa/ne1000.h",
-		MAME_DIR .. "src/devices/bus/isa/ne2000.c",
+		MAME_DIR .. "src/devices/bus/isa/ne2000.cpp",
 		MAME_DIR .. "src/devices/bus/isa/ne2000.h",
-		MAME_DIR .. "src/devices/bus/isa/3c505.c",
+		MAME_DIR .. "src/devices/bus/isa/3c505.cpp",
 		MAME_DIR .. "src/devices/bus/isa/3c505.h",
-		MAME_DIR .. "src/devices/bus/isa/lpt.c",
+		MAME_DIR .. "src/devices/bus/isa/lpt.cpp",
 		MAME_DIR .. "src/devices/bus/isa/lpt.h",
-		MAME_DIR .. "src/devices/bus/isa/p1_fdc.c",
+		MAME_DIR .. "src/devices/bus/isa/p1_fdc.cpp",
 		MAME_DIR .. "src/devices/bus/isa/p1_fdc.h",
-		MAME_DIR .. "src/devices/bus/isa/p1_hdc.c",
+		MAME_DIR .. "src/devices/bus/isa/p1_hdc.cpp",
 		MAME_DIR .. "src/devices/bus/isa/p1_hdc.h",
-		MAME_DIR .. "src/devices/bus/isa/p1_rom.c",
+		MAME_DIR .. "src/devices/bus/isa/p1_rom.cpp",
 		MAME_DIR .. "src/devices/bus/isa/p1_rom.h",
-		MAME_DIR .. "src/devices/bus/isa/mc1502_fdc.c",
+		MAME_DIR .. "src/devices/bus/isa/mc1502_fdc.cpp",
 		MAME_DIR .. "src/devices/bus/isa/mc1502_fdc.h",
-		MAME_DIR .. "src/devices/bus/isa/mc1502_rom.c",
+		MAME_DIR .. "src/devices/bus/isa/mc1502_rom.cpp",
 		MAME_DIR .. "src/devices/bus/isa/mc1502_rom.h",
-		MAME_DIR .. "src/devices/bus/isa/xsu_cards.c",
+		MAME_DIR .. "src/devices/bus/isa/xsu_cards.cpp",
 		MAME_DIR .. "src/devices/bus/isa/xsu_cards.h",
-		MAME_DIR .. "src/devices/bus/isa/sc499.c",
+		MAME_DIR .. "src/devices/bus/isa/sc499.cpp",
 		MAME_DIR .. "src/devices/bus/isa/sc499.h",
-		MAME_DIR .. "src/devices/bus/isa/aga.c",
+		MAME_DIR .. "src/devices/bus/isa/aga.cpp",
 		MAME_DIR .. "src/devices/bus/isa/aga.h",
-		MAME_DIR .. "src/devices/bus/isa/svga_trident.c",
+		MAME_DIR .. "src/devices/bus/isa/svga_trident.cpp",
 		MAME_DIR .. "src/devices/bus/isa/svga_trident.h",
-		MAME_DIR .. "src/devices/bus/isa/num9rev.c",
+		MAME_DIR .. "src/devices/bus/isa/num9rev.cpp",
 		MAME_DIR .. "src/devices/bus/isa/num9rev.h",
 	}
 end
@@ -824,11 +824,11 @@ end
 
 if (BUSES["ISBX"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/isbx/isbx.c",
+		MAME_DIR .. "src/devices/bus/isbx/isbx.cpp",
 		MAME_DIR .. "src/devices/bus/isbx/isbx.h",
-		MAME_DIR .. "src/devices/bus/isbx/compis_fdc.c",
+		MAME_DIR .. "src/devices/bus/isbx/compis_fdc.cpp",
 		MAME_DIR .. "src/devices/bus/isbx/compis_fdc.h",
-		MAME_DIR .. "src/devices/bus/isbx/isbc_218a.c",
+		MAME_DIR .. "src/devices/bus/isbx/isbc_218a.cpp",
 		MAME_DIR .. "src/devices/bus/isbx/isbc_218a.h",
 	}
 end
@@ -841,75 +841,75 @@ end
 
 if (BUSES["MSX_SLOT"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/msx_slot/bunsetsu.c",
+		MAME_DIR .. "src/devices/bus/msx_slot/bunsetsu.cpp",
 		MAME_DIR .. "src/devices/bus/msx_slot/bunsetsu.h",
-		MAME_DIR .. "src/devices/bus/msx_slot/cartridge.c",
+		MAME_DIR .. "src/devices/bus/msx_slot/cartridge.cpp",
 		MAME_DIR .. "src/devices/bus/msx_slot/cartridge.h",
-		MAME_DIR .. "src/devices/bus/msx_slot/disk.c",
+		MAME_DIR .. "src/devices/bus/msx_slot/disk.cpp",
 		MAME_DIR .. "src/devices/bus/msx_slot/disk.h",
-		MAME_DIR .. "src/devices/bus/msx_slot/fs4600.c",
+		MAME_DIR .. "src/devices/bus/msx_slot/fs4600.cpp",
 		MAME_DIR .. "src/devices/bus/msx_slot/fs4600.h",
-		MAME_DIR .. "src/devices/bus/msx_slot/music.c",
+		MAME_DIR .. "src/devices/bus/msx_slot/music.cpp",
 		MAME_DIR .. "src/devices/bus/msx_slot/music.h",
-		MAME_DIR .. "src/devices/bus/msx_slot/panasonic08.c",
+		MAME_DIR .. "src/devices/bus/msx_slot/panasonic08.cpp",
 		MAME_DIR .. "src/devices/bus/msx_slot/panasonic08.h",
-		MAME_DIR .. "src/devices/bus/msx_slot/rom.c",
+		MAME_DIR .. "src/devices/bus/msx_slot/rom.cpp",
 		MAME_DIR .. "src/devices/bus/msx_slot/rom.h",
-		MAME_DIR .. "src/devices/bus/msx_slot/ram.c",
+		MAME_DIR .. "src/devices/bus/msx_slot/ram.cpp",
 		MAME_DIR .. "src/devices/bus/msx_slot/ram.h",
-		MAME_DIR .. "src/devices/bus/msx_slot/ram_mm.c",
+		MAME_DIR .. "src/devices/bus/msx_slot/ram_mm.cpp",
 		MAME_DIR .. "src/devices/bus/msx_slot/ram_mm.h",
-		MAME_DIR .. "src/devices/bus/msx_slot/slot.c",
+		MAME_DIR .. "src/devices/bus/msx_slot/slot.cpp",
 		MAME_DIR .. "src/devices/bus/msx_slot/slot.h",
-		MAME_DIR .. "src/devices/bus/msx_slot/sony08.c",
+		MAME_DIR .. "src/devices/bus/msx_slot/sony08.cpp",
 		MAME_DIR .. "src/devices/bus/msx_slot/sony08.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/arc.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/arc.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/arc.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/ascii.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/ascii.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/ascii.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/bm_012.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/bm_012.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/bm_012.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/cartridge.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/cartridge.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/cartridge.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/crossblaim.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/crossblaim.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/crossblaim.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/disk.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/disk.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/disk.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/dooly.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/dooly.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/dooly.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/fmpac.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/fmpac.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/fmpac.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/fs_sr022.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/fs_sr022.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/fs_sr022.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/halnote.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/halnote.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/halnote.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/hfox.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/hfox.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/hfox.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/holy_quran.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/holy_quran.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/holy_quran.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/konami.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/konami.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/konami.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/korean.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/korean.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/korean.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/majutsushi.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/majutsushi.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/majutsushi.h",
 		MAME_DIR .. "src/devices/bus/msx_cart/moonsound.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/moonsound.c",
-		MAME_DIR .. "src/devices/bus/msx_cart/msx_audio.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/moonsound.cpp",
+		MAME_DIR .. "src/devices/bus/msx_cart/msx_audio.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/msx_audio.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/msx_audio_kb.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/msx_audio_kb.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/msx_audio_kb.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/msxdos2.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/msxdos2.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/msxdos2.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/nomapper.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/nomapper.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/nomapper.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/rtype.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/rtype.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/rtype.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/superloderunner.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/superloderunner.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/superloderunner.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/super_swangi.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/super_swangi.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/super_swangi.h",
-		MAME_DIR .. "src/devices/bus/msx_cart/yamaha.c",
+		MAME_DIR .. "src/devices/bus/msx_cart/yamaha.cpp",
 		MAME_DIR .. "src/devices/bus/msx_cart/yamaha.h",
 	}
 end
@@ -922,15 +922,15 @@ end
 
 if (BUSES["KC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/kc/kc.c",
+		MAME_DIR .. "src/devices/bus/kc/kc.cpp",
 		MAME_DIR .. "src/devices/bus/kc/kc.h",
-		MAME_DIR .. "src/devices/bus/kc/d002.c",
+		MAME_DIR .. "src/devices/bus/kc/d002.cpp",
 		MAME_DIR .. "src/devices/bus/kc/d002.h",
-		MAME_DIR .. "src/devices/bus/kc/d004.c",
+		MAME_DIR .. "src/devices/bus/kc/d004.cpp",
 		MAME_DIR .. "src/devices/bus/kc/d004.h",
-		MAME_DIR .. "src/devices/bus/kc/ram.c",
+		MAME_DIR .. "src/devices/bus/kc/ram.cpp",
 		MAME_DIR .. "src/devices/bus/kc/ram.h",
-		MAME_DIR .. "src/devices/bus/kc/rom.c",
+		MAME_DIR .. "src/devices/bus/kc/rom.cpp",
 		MAME_DIR .. "src/devices/bus/kc/rom.h",
 	}
 end
@@ -942,13 +942,13 @@ end
 
 if (BUSES["O2"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/odyssey2/slot.c",
+		MAME_DIR .. "src/devices/bus/odyssey2/slot.cpp",
 		MAME_DIR .. "src/devices/bus/odyssey2/slot.h",
-		MAME_DIR .. "src/devices/bus/odyssey2/rom.c",
+		MAME_DIR .. "src/devices/bus/odyssey2/rom.cpp",
 		MAME_DIR .. "src/devices/bus/odyssey2/rom.h",
-		MAME_DIR .. "src/devices/bus/odyssey2/chess.c",
+		MAME_DIR .. "src/devices/bus/odyssey2/chess.cpp",
 		MAME_DIR .. "src/devices/bus/odyssey2/chess.h",
-		MAME_DIR .. "src/devices/bus/odyssey2/voice.c",
+		MAME_DIR .. "src/devices/bus/odyssey2/voice.cpp",
 		MAME_DIR .. "src/devices/bus/odyssey2/voice.h",
 	}
 end
@@ -961,9 +961,9 @@ end
 
 if (BUSES["PC_JOY"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/pc_joy/pc_joy.c",
+		MAME_DIR .. "src/devices/bus/pc_joy/pc_joy.cpp",
 		MAME_DIR .. "src/devices/bus/pc_joy/pc_joy.h",
-		MAME_DIR .. "src/devices/bus/pc_joy/pc_joy_sw.c",
+		MAME_DIR .. "src/devices/bus/pc_joy/pc_joy_sw.cpp",
 		MAME_DIR .. "src/devices/bus/pc_joy/pc_joy_sw.h",
 	}
 end
@@ -976,23 +976,23 @@ end
 
 if (BUSES["PC_KBD"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/pc_kbd/pc_kbdc.c",
+		MAME_DIR .. "src/devices/bus/pc_kbd/pc_kbdc.cpp",
 		MAME_DIR .. "src/devices/bus/pc_kbd/pc_kbdc.h",
-		MAME_DIR .. "src/devices/bus/pc_kbd/keyboards.c",
+		MAME_DIR .. "src/devices/bus/pc_kbd/keyboards.cpp",
 		MAME_DIR .. "src/devices/bus/pc_kbd/keyboards.h",
-		MAME_DIR .. "src/devices/bus/pc_kbd/ec1841.c",
+		MAME_DIR .. "src/devices/bus/pc_kbd/ec1841.cpp",
 		MAME_DIR .. "src/devices/bus/pc_kbd/ec1841.h",
-		MAME_DIR .. "src/devices/bus/pc_kbd/iskr1030.c",
+		MAME_DIR .. "src/devices/bus/pc_kbd/iskr1030.cpp",
 		MAME_DIR .. "src/devices/bus/pc_kbd/iskr1030.h",
-		MAME_DIR .. "src/devices/bus/pc_kbd/keytro.c",
+		MAME_DIR .. "src/devices/bus/pc_kbd/keytro.cpp",
 		MAME_DIR .. "src/devices/bus/pc_kbd/keytro.h",
-		MAME_DIR .. "src/devices/bus/pc_kbd/msnat.c",
+		MAME_DIR .. "src/devices/bus/pc_kbd/msnat.cpp",
 		MAME_DIR .. "src/devices/bus/pc_kbd/msnat.h",
-		MAME_DIR .. "src/devices/bus/pc_kbd/pc83.c",
+		MAME_DIR .. "src/devices/bus/pc_kbd/pc83.cpp",
 		MAME_DIR .. "src/devices/bus/pc_kbd/pc83.h",
-		MAME_DIR .. "src/devices/bus/pc_kbd/pcat84.c",
+		MAME_DIR .. "src/devices/bus/pc_kbd/pcat84.cpp",
 		MAME_DIR .. "src/devices/bus/pc_kbd/pcat84.h",
-		MAME_DIR .. "src/devices/bus/pc_kbd/pcxt83.c",
+		MAME_DIR .. "src/devices/bus/pc_kbd/pcxt83.cpp",
 		MAME_DIR .. "src/devices/bus/pc_kbd/pcxt83.h",
 	}
 end
@@ -1007,27 +1007,27 @@ end
 
 if (BUSES["PET"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/pet/cass.c",
+		MAME_DIR .. "src/devices/bus/pet/cass.cpp",
 		MAME_DIR .. "src/devices/bus/pet/cass.h",
-		MAME_DIR .. "src/devices/bus/pet/c2n.c",
+		MAME_DIR .. "src/devices/bus/pet/c2n.cpp",
 		MAME_DIR .. "src/devices/bus/pet/c2n.h",
-		MAME_DIR .. "src/devices/bus/pet/diag264_lb_tape.c",
+		MAME_DIR .. "src/devices/bus/pet/diag264_lb_tape.cpp",
 		MAME_DIR .. "src/devices/bus/pet/diag264_lb_tape.h",
-		MAME_DIR .. "src/devices/bus/pet/exp.c",
+		MAME_DIR .. "src/devices/bus/pet/exp.cpp",
 		MAME_DIR .. "src/devices/bus/pet/exp.h",
-		MAME_DIR .. "src/devices/bus/pet/64k.c",
+		MAME_DIR .. "src/devices/bus/pet/64k.cpp",
 		MAME_DIR .. "src/devices/bus/pet/64k.h",
-		MAME_DIR .. "src/devices/bus/pet/hsg.c",
+		MAME_DIR .. "src/devices/bus/pet/hsg.cpp",
 		MAME_DIR .. "src/devices/bus/pet/hsg.h",
-		MAME_DIR .. "src/devices/bus/pet/superpet.c",
+		MAME_DIR .. "src/devices/bus/pet/superpet.cpp",
 		MAME_DIR .. "src/devices/bus/pet/superpet.h",
-		MAME_DIR .. "src/devices/bus/pet/user.c",
+		MAME_DIR .. "src/devices/bus/pet/user.cpp",
 		MAME_DIR .. "src/devices/bus/pet/user.h",
-		MAME_DIR .. "src/devices/bus/pet/diag.c",
+		MAME_DIR .. "src/devices/bus/pet/diag.cpp",
 		MAME_DIR .. "src/devices/bus/pet/diag.h",
-		MAME_DIR .. "src/devices/bus/pet/petuja.c",
+		MAME_DIR .. "src/devices/bus/pet/petuja.cpp",
 		MAME_DIR .. "src/devices/bus/pet/petuja.h",
-		MAME_DIR .. "src/devices/bus/pet/cb2snd.c",
+		MAME_DIR .. "src/devices/bus/pet/cb2snd.cpp",
 		MAME_DIR .. "src/devices/bus/pet/cb2snd.h",
 	}
 end
@@ -1041,17 +1041,17 @@ end
 
 if (BUSES["PLUS4"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/plus4/exp.c",
+		MAME_DIR .. "src/devices/bus/plus4/exp.cpp",
 		MAME_DIR .. "src/devices/bus/plus4/exp.h",
-		MAME_DIR .. "src/devices/bus/plus4/c1551.c",
+		MAME_DIR .. "src/devices/bus/plus4/c1551.cpp",
 		MAME_DIR .. "src/devices/bus/plus4/c1551.h",
-		MAME_DIR .. "src/devices/bus/plus4/sid.c",
+		MAME_DIR .. "src/devices/bus/plus4/sid.cpp",
 		MAME_DIR .. "src/devices/bus/plus4/sid.h",
-		MAME_DIR .. "src/devices/bus/plus4/std.c",
+		MAME_DIR .. "src/devices/bus/plus4/std.cpp",
 		MAME_DIR .. "src/devices/bus/plus4/std.h",
-		MAME_DIR .. "src/devices/bus/plus4/user.c",
+		MAME_DIR .. "src/devices/bus/plus4/user.cpp",
 		MAME_DIR .. "src/devices/bus/plus4/user.h",
-		MAME_DIR .. "src/devices/bus/plus4/diag264_lb_user.c",
+		MAME_DIR .. "src/devices/bus/plus4/diag264_lb_user.cpp",
 		MAME_DIR .. "src/devices/bus/plus4/diag264_lb_user.h",
 	}
 end
@@ -1064,19 +1064,19 @@ end
 
 if (BUSES["S100"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/s100/s100.c",
+		MAME_DIR .. "src/devices/bus/s100/s100.cpp",
 		MAME_DIR .. "src/devices/bus/s100/s100.h",
-		MAME_DIR .. "src/devices/bus/s100/dj2db.c",
+		MAME_DIR .. "src/devices/bus/s100/dj2db.cpp",
 		MAME_DIR .. "src/devices/bus/s100/dj2db.h",
-		MAME_DIR .. "src/devices/bus/s100/djdma.c",
+		MAME_DIR .. "src/devices/bus/s100/djdma.cpp",
 		MAME_DIR .. "src/devices/bus/s100/djdma.h",
-		MAME_DIR .. "src/devices/bus/s100/mm65k16s.c",
+		MAME_DIR .. "src/devices/bus/s100/mm65k16s.cpp",
 		MAME_DIR .. "src/devices/bus/s100/mm65k16s.h",
-		MAME_DIR .. "src/devices/bus/s100/nsmdsa.c",
+		MAME_DIR .. "src/devices/bus/s100/nsmdsa.cpp",
 		MAME_DIR .. "src/devices/bus/s100/nsmdsa.h",
-		MAME_DIR .. "src/devices/bus/s100/nsmdsad.c",
+		MAME_DIR .. "src/devices/bus/s100/nsmdsad.cpp",
 		MAME_DIR .. "src/devices/bus/s100/nsmdsad.h",
-		MAME_DIR .. "src/devices/bus/s100/wunderbus.c",
+		MAME_DIR .. "src/devices/bus/s100/wunderbus.cpp",
 		MAME_DIR .. "src/devices/bus/s100/wunderbus.h",
 	}
 end
@@ -1089,11 +1089,11 @@ end
 
 if (BUSES["SPC1000"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/spc1000/exp.c",
+		MAME_DIR .. "src/devices/bus/spc1000/exp.cpp",
 		MAME_DIR .. "src/devices/bus/spc1000/exp.h",
-		MAME_DIR .. "src/devices/bus/spc1000/fdd.c",
+		MAME_DIR .. "src/devices/bus/spc1000/fdd.cpp",
 		MAME_DIR .. "src/devices/bus/spc1000/fdd.h",
-		MAME_DIR .. "src/devices/bus/spc1000/vdp.c",
+		MAME_DIR .. "src/devices/bus/spc1000/vdp.cpp",
 		MAME_DIR .. "src/devices/bus/spc1000/vdp.h",
 	}
 end
@@ -1106,11 +1106,11 @@ end
 
 if (BUSES["TIKI100"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/tiki100/exp.c",
+		MAME_DIR .. "src/devices/bus/tiki100/exp.cpp",
 		MAME_DIR .. "src/devices/bus/tiki100/exp.h",
-		MAME_DIR .. "src/devices/bus/tiki100/8088.c",
+		MAME_DIR .. "src/devices/bus/tiki100/8088.cpp",
 		MAME_DIR .. "src/devices/bus/tiki100/8088.h",
-		MAME_DIR .. "src/devices/bus/tiki100/hdc.c",
+		MAME_DIR .. "src/devices/bus/tiki100/hdc.cpp",
 		MAME_DIR .. "src/devices/bus/tiki100/hdc.h",
 	}
 end
@@ -1123,9 +1123,9 @@ end
 
 if (BUSES["TVC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/tvc/tvc.c",
+		MAME_DIR .. "src/devices/bus/tvc/tvc.cpp",
 		MAME_DIR .. "src/devices/bus/tvc/tvc.h",
-		MAME_DIR .. "src/devices/bus/tvc/hbf.c",
+		MAME_DIR .. "src/devices/bus/tvc/hbf.cpp",
 		MAME_DIR .. "src/devices/bus/tvc/hbf.h",
 	}
 end
@@ -1138,9 +1138,9 @@ end
 
 if (BUSES["VC4000"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/vc4000/slot.c",
+		MAME_DIR .. "src/devices/bus/vc4000/slot.cpp",
 		MAME_DIR .. "src/devices/bus/vc4000/slot.h",
-		MAME_DIR .. "src/devices/bus/vc4000/rom.c",
+		MAME_DIR .. "src/devices/bus/vc4000/rom.cpp",
 		MAME_DIR .. "src/devices/bus/vc4000/rom.h",
 	}
 end
@@ -1153,17 +1153,17 @@ end
 
 if (BUSES["VCS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/vcs/vcs_slot.c",
+		MAME_DIR .. "src/devices/bus/vcs/vcs_slot.cpp",
 		MAME_DIR .. "src/devices/bus/vcs/vcs_slot.h",
-		MAME_DIR .. "src/devices/bus/vcs/rom.c",
+		MAME_DIR .. "src/devices/bus/vcs/rom.cpp",
 		MAME_DIR .. "src/devices/bus/vcs/rom.h",
-		MAME_DIR .. "src/devices/bus/vcs/compumat.c",
+		MAME_DIR .. "src/devices/bus/vcs/compumat.cpp",
 		MAME_DIR .. "src/devices/bus/vcs/compumat.h",
-		MAME_DIR .. "src/devices/bus/vcs/dpc.c",
+		MAME_DIR .. "src/devices/bus/vcs/dpc.cpp",
 		MAME_DIR .. "src/devices/bus/vcs/dpc.h",
-		MAME_DIR .. "src/devices/bus/vcs/harmony_melody.c",
+		MAME_DIR .. "src/devices/bus/vcs/harmony_melody.cpp",
 		MAME_DIR .. "src/devices/bus/vcs/harmony_melody.h",
-		MAME_DIR .. "src/devices/bus/vcs/scharger.c",
+		MAME_DIR .. "src/devices/bus/vcs/scharger.cpp",
 		MAME_DIR .. "src/devices/bus/vcs/scharger.h",
 	}
 end
@@ -1176,19 +1176,19 @@ end
 
 if (BUSES["VCS_CTRL"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/vcs_ctrl/ctrl.c",
+		MAME_DIR .. "src/devices/bus/vcs_ctrl/ctrl.cpp",
 		MAME_DIR .. "src/devices/bus/vcs_ctrl/ctrl.h",
-		MAME_DIR .. "src/devices/bus/vcs_ctrl/joystick.c",
+		MAME_DIR .. "src/devices/bus/vcs_ctrl/joystick.cpp",
 		MAME_DIR .. "src/devices/bus/vcs_ctrl/joystick.h",
-		MAME_DIR .. "src/devices/bus/vcs_ctrl/joybooster.c",
+		MAME_DIR .. "src/devices/bus/vcs_ctrl/joybooster.cpp",
 		MAME_DIR .. "src/devices/bus/vcs_ctrl/joybooster.h",
-		MAME_DIR .. "src/devices/bus/vcs_ctrl/keypad.c",
+		MAME_DIR .. "src/devices/bus/vcs_ctrl/keypad.cpp",
 		MAME_DIR .. "src/devices/bus/vcs_ctrl/keypad.h",
-		MAME_DIR .. "src/devices/bus/vcs_ctrl/lightpen.c",
+		MAME_DIR .. "src/devices/bus/vcs_ctrl/lightpen.cpp",
 		MAME_DIR .. "src/devices/bus/vcs_ctrl/lightpen.h",
-		MAME_DIR .. "src/devices/bus/vcs_ctrl/paddles.c",
+		MAME_DIR .. "src/devices/bus/vcs_ctrl/paddles.cpp",
 		MAME_DIR .. "src/devices/bus/vcs_ctrl/paddles.h",
-		MAME_DIR .. "src/devices/bus/vcs_ctrl/wheel.c",
+		MAME_DIR .. "src/devices/bus/vcs_ctrl/wheel.cpp",
 		MAME_DIR .. "src/devices/bus/vcs_ctrl/wheel.h",
 	}
 end
@@ -1201,9 +1201,9 @@ end
 
 if (BUSES["VECTREX"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/vectrex/slot.c",
+		MAME_DIR .. "src/devices/bus/vectrex/slot.cpp",
 		MAME_DIR .. "src/devices/bus/vectrex/slot.h",
-		MAME_DIR .. "src/devices/bus/vectrex/rom.c",
+		MAME_DIR .. "src/devices/bus/vectrex/rom.cpp",
 		MAME_DIR .. "src/devices/bus/vectrex/rom.h",
 	}
 end
@@ -1216,9 +1216,9 @@ end
 
 if (BUSES["VIC10"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/vic10/exp.c",
+		MAME_DIR .. "src/devices/bus/vic10/exp.cpp",
 		MAME_DIR .. "src/devices/bus/vic10/exp.h",
-		MAME_DIR .. "src/devices/bus/vic10/std.c",
+		MAME_DIR .. "src/devices/bus/vic10/std.cpp",
 		MAME_DIR .. "src/devices/bus/vic10/std.h",
 	}
 end
@@ -1232,29 +1232,29 @@ end
 
 if (BUSES["VIC20"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/vic20/exp.c",
+		MAME_DIR .. "src/devices/bus/vic20/exp.cpp",
 		MAME_DIR .. "src/devices/bus/vic20/exp.h",
-		MAME_DIR .. "src/devices/bus/vic20/fe3.c",
+		MAME_DIR .. "src/devices/bus/vic20/fe3.cpp",
 		MAME_DIR .. "src/devices/bus/vic20/fe3.h",
-		MAME_DIR .. "src/devices/bus/vic20/megacart.c",
+		MAME_DIR .. "src/devices/bus/vic20/megacart.cpp",
 		MAME_DIR .. "src/devices/bus/vic20/megacart.h",
-		MAME_DIR .. "src/devices/bus/vic20/std.c",
+		MAME_DIR .. "src/devices/bus/vic20/std.cpp",
 		MAME_DIR .. "src/devices/bus/vic20/std.h",
-		MAME_DIR .. "src/devices/bus/vic20/vic1010.c",
+		MAME_DIR .. "src/devices/bus/vic20/vic1010.cpp",
 		MAME_DIR .. "src/devices/bus/vic20/vic1010.h",
-		MAME_DIR .. "src/devices/bus/vic20/vic1110.c",
+		MAME_DIR .. "src/devices/bus/vic20/vic1110.cpp",
 		MAME_DIR .. "src/devices/bus/vic20/vic1110.h",
-		MAME_DIR .. "src/devices/bus/vic20/vic1111.c",
+		MAME_DIR .. "src/devices/bus/vic20/vic1111.cpp",
 		MAME_DIR .. "src/devices/bus/vic20/vic1111.h",
-		MAME_DIR .. "src/devices/bus/vic20/vic1112.c",
+		MAME_DIR .. "src/devices/bus/vic20/vic1112.cpp",
 		MAME_DIR .. "src/devices/bus/vic20/vic1112.h",
-		MAME_DIR .. "src/devices/bus/vic20/vic1210.c",
+		MAME_DIR .. "src/devices/bus/vic20/vic1210.cpp",
 		MAME_DIR .. "src/devices/bus/vic20/vic1210.h",
-		MAME_DIR .. "src/devices/bus/vic20/user.c",
+		MAME_DIR .. "src/devices/bus/vic20/user.cpp",
 		MAME_DIR .. "src/devices/bus/vic20/user.h",
-		MAME_DIR .. "src/devices/bus/vic20/4cga.c",
+		MAME_DIR .. "src/devices/bus/vic20/4cga.cpp",
 		MAME_DIR .. "src/devices/bus/vic20/4cga.h",
-		MAME_DIR .. "src/devices/bus/vic20/vic1011.c",
+		MAME_DIR .. "src/devices/bus/vic20/vic1011.cpp",
 		MAME_DIR .. "src/devices/bus/vic20/vic1011.h",
 	}
 end
@@ -1267,13 +1267,13 @@ end
 
 if (BUSES["VIDBRAIN"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/vidbrain/exp.c",
+		MAME_DIR .. "src/devices/bus/vidbrain/exp.cpp",
 		MAME_DIR .. "src/devices/bus/vidbrain/exp.h",
-		MAME_DIR .. "src/devices/bus/vidbrain/std.c",
+		MAME_DIR .. "src/devices/bus/vidbrain/std.cpp",
 		MAME_DIR .. "src/devices/bus/vidbrain/std.h",
-		MAME_DIR .. "src/devices/bus/vidbrain/money_minder.c",
+		MAME_DIR .. "src/devices/bus/vidbrain/money_minder.cpp",
 		MAME_DIR .. "src/devices/bus/vidbrain/money_minder.h",
-		MAME_DIR .. "src/devices/bus/vidbrain/timeshare.c",
+		MAME_DIR .. "src/devices/bus/vidbrain/timeshare.cpp",
 		MAME_DIR .. "src/devices/bus/vidbrain/timeshare.h",
 	}
 end
@@ -1287,25 +1287,25 @@ end
 
 if (BUSES["VIP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/vip/byteio.c",
+		MAME_DIR .. "src/devices/bus/vip/byteio.cpp",
 		MAME_DIR .. "src/devices/bus/vip/byteio.h",
-		MAME_DIR .. "src/devices/bus/vip/vp620.c",
+		MAME_DIR .. "src/devices/bus/vip/vp620.cpp",
 		MAME_DIR .. "src/devices/bus/vip/vp620.h",
-		MAME_DIR .. "src/devices/bus/vip/exp.c",
+		MAME_DIR .. "src/devices/bus/vip/exp.cpp",
 		MAME_DIR .. "src/devices/bus/vip/exp.h",
-		MAME_DIR .. "src/devices/bus/vip/vp550.c",
+		MAME_DIR .. "src/devices/bus/vip/vp550.cpp",
 		MAME_DIR .. "src/devices/bus/vip/vp550.h",
-		MAME_DIR .. "src/devices/bus/vip/vp570.c",
+		MAME_DIR .. "src/devices/bus/vip/vp570.cpp",
 		MAME_DIR .. "src/devices/bus/vip/vp570.h",
-		MAME_DIR .. "src/devices/bus/vip/vp575.c",
+		MAME_DIR .. "src/devices/bus/vip/vp575.cpp",
 		MAME_DIR .. "src/devices/bus/vip/vp575.h",
-		MAME_DIR .. "src/devices/bus/vip/vp585.c",
+		MAME_DIR .. "src/devices/bus/vip/vp585.cpp",
 		MAME_DIR .. "src/devices/bus/vip/vp585.h",
-		MAME_DIR .. "src/devices/bus/vip/vp590.c",
+		MAME_DIR .. "src/devices/bus/vip/vp590.cpp",
 		MAME_DIR .. "src/devices/bus/vip/vp590.h",
-		MAME_DIR .. "src/devices/bus/vip/vp595.c",
+		MAME_DIR .. "src/devices/bus/vip/vp595.cpp",
 		MAME_DIR .. "src/devices/bus/vip/vp595.h",
-		MAME_DIR .. "src/devices/bus/vip/vp700.c",
+		MAME_DIR .. "src/devices/bus/vip/vp700.cpp",
 		MAME_DIR .. "src/devices/bus/vip/vp700.h",
 	}
 end
@@ -1318,23 +1318,23 @@ end
 
 if (BUSES["WANGPC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/wangpc/wangpc.c",
+		MAME_DIR .. "src/devices/bus/wangpc/wangpc.cpp",
 		MAME_DIR .. "src/devices/bus/wangpc/wangpc.h",
-		MAME_DIR .. "src/devices/bus/wangpc/emb.c",
+		MAME_DIR .. "src/devices/bus/wangpc/emb.cpp",
 		MAME_DIR .. "src/devices/bus/wangpc/emb.h",
-		MAME_DIR .. "src/devices/bus/wangpc/lic.c",
+		MAME_DIR .. "src/devices/bus/wangpc/lic.cpp",
 		MAME_DIR .. "src/devices/bus/wangpc/lic.h",
-		MAME_DIR .. "src/devices/bus/wangpc/lvc.c",
+		MAME_DIR .. "src/devices/bus/wangpc/lvc.cpp",
 		MAME_DIR .. "src/devices/bus/wangpc/lvc.h",
-		MAME_DIR .. "src/devices/bus/wangpc/mcc.c",
+		MAME_DIR .. "src/devices/bus/wangpc/mcc.cpp",
 		MAME_DIR .. "src/devices/bus/wangpc/mcc.h",
-		MAME_DIR .. "src/devices/bus/wangpc/mvc.c",
+		MAME_DIR .. "src/devices/bus/wangpc/mvc.cpp",
 		MAME_DIR .. "src/devices/bus/wangpc/mvc.h",
-		MAME_DIR .. "src/devices/bus/wangpc/rtc.c",
+		MAME_DIR .. "src/devices/bus/wangpc/rtc.cpp",
 		MAME_DIR .. "src/devices/bus/wangpc/rtc.h",
-		MAME_DIR .. "src/devices/bus/wangpc/tig.c",
+		MAME_DIR .. "src/devices/bus/wangpc/tig.cpp",
 		MAME_DIR .. "src/devices/bus/wangpc/tig.h",
-		MAME_DIR .. "src/devices/bus/wangpc/wdc.c",
+		MAME_DIR .. "src/devices/bus/wangpc/wdc.cpp",
 		MAME_DIR .. "src/devices/bus/wangpc/wdc.h",
 	}
 end
@@ -1347,13 +1347,13 @@ end
 
 if (BUSES["Z88"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/z88/z88.c",
+		MAME_DIR .. "src/devices/bus/z88/z88.cpp",
 		MAME_DIR .. "src/devices/bus/z88/z88.h",
-		MAME_DIR .. "src/devices/bus/z88/flash.c",
+		MAME_DIR .. "src/devices/bus/z88/flash.cpp",
 		MAME_DIR .. "src/devices/bus/z88/flash.h",
-		MAME_DIR .. "src/devices/bus/z88/ram.c",
+		MAME_DIR .. "src/devices/bus/z88/ram.cpp",
 		MAME_DIR .. "src/devices/bus/z88/ram.h",
-		MAME_DIR .. "src/devices/bus/z88/rom.c",
+		MAME_DIR .. "src/devices/bus/z88/rom.cpp",
 		MAME_DIR .. "src/devices/bus/z88/rom.h",
 	}
 end
@@ -1365,85 +1365,85 @@ end
 
 if (BUSES["A2BUS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/a2bus/a2bus.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2bus.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2bus.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2lang.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2lang.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2lang.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2diskii.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2diskii.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2diskii.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2mockingboard.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2mockingboard.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2mockingboard.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2cffa.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2cffa.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2cffa.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2memexp.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2memexp.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2memexp.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2scsi.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2scsi.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2scsi.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2thunderclock.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2thunderclock.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2thunderclock.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2softcard.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2softcard.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2softcard.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2videoterm.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2videoterm.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2videoterm.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2ssc.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2ssc.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2ssc.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2swyft.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2swyft.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2swyft.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2eauxslot.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2eauxslot.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2eauxslot.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2themill.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2themill.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2themill.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2sam.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2sam.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2sam.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2alfam2.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2alfam2.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2alfam2.h",
-		MAME_DIR .. "src/devices/bus/a2bus/laser128.c",
+		MAME_DIR .. "src/devices/bus/a2bus/laser128.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/laser128.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2echoii.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2echoii.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2echoii.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2arcadebd.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2arcadebd.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2arcadebd.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2midi.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2midi.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2midi.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2vulcan.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2vulcan.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2vulcan.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2zipdrive.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2zipdrive.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2zipdrive.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2applicard.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2applicard.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2applicard.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2hsscsi.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2hsscsi.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2hsscsi.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2ultraterm.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2ultraterm.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2ultraterm.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2pic.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2pic.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2pic.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2estd80col.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2estd80col.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2estd80col.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2eext80col.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2eext80col.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2eext80col.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2eramworks3.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2eramworks3.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2eramworks3.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2corvus.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2corvus.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2corvus.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2diskiing.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2diskiing.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2diskiing.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2mcms.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2mcms.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2mcms.h",
-		MAME_DIR .. "src/devices/bus/a2bus/a2dx1.c",
+		MAME_DIR .. "src/devices/bus/a2bus/a2dx1.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/a2dx1.h",
-		MAME_DIR .. "src/devices/bus/a2bus/timemasterho.c",
+		MAME_DIR .. "src/devices/bus/a2bus/timemasterho.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/timemasterho.h",
-		MAME_DIR .. "src/devices/bus/a2bus/mouse.c",
+		MAME_DIR .. "src/devices/bus/a2bus/mouse.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/mouse.h",
-		MAME_DIR .. "src/devices/bus/a2bus/corvfdc01.c",
+		MAME_DIR .. "src/devices/bus/a2bus/corvfdc01.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/corvfdc01.h",
-		MAME_DIR .. "src/devices/bus/a2bus/corvfdc02.c",
+		MAME_DIR .. "src/devices/bus/a2bus/corvfdc02.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/corvfdc02.h",
-		MAME_DIR .. "src/devices/bus/a2bus/ramcard16k.c",
+		MAME_DIR .. "src/devices/bus/a2bus/ramcard16k.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/ramcard16k.h",
-		MAME_DIR .. "src/devices/bus/a2bus/ramcard128k.c",
+		MAME_DIR .. "src/devices/bus/a2bus/ramcard128k.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/ramcard128k.h",
-		MAME_DIR .. "src/devices/bus/a2bus/ezcgi.c",
+		MAME_DIR .. "src/devices/bus/a2bus/ezcgi.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/ezcgi.h",
 	}
 end
@@ -1455,39 +1455,39 @@ end
 
 if (BUSES["NUBUS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/nubus/nubus.c",
+		MAME_DIR .. "src/devices/bus/nubus/nubus.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/nubus.h",
-		MAME_DIR .. "src/devices/bus/nubus/nubus_48gc.c",
+		MAME_DIR .. "src/devices/bus/nubus/nubus_48gc.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/nubus_48gc.h",
-		MAME_DIR .. "src/devices/bus/nubus/nubus_cb264.c",
+		MAME_DIR .. "src/devices/bus/nubus/nubus_cb264.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/nubus_cb264.h",
-		MAME_DIR .. "src/devices/bus/nubus/nubus_vikbw.c",
+		MAME_DIR .. "src/devices/bus/nubus/nubus_vikbw.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/nubus_vikbw.h",
-		MAME_DIR .. "src/devices/bus/nubus/nubus_specpdq.c",
+		MAME_DIR .. "src/devices/bus/nubus/nubus_specpdq.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/nubus_specpdq.h",
-		MAME_DIR .. "src/devices/bus/nubus/nubus_m2hires.c",
+		MAME_DIR .. "src/devices/bus/nubus/nubus_m2hires.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/nubus_m2hires.h",
-		MAME_DIR .. "src/devices/bus/nubus/nubus_spec8.c",
+		MAME_DIR .. "src/devices/bus/nubus/nubus_spec8.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/nubus_spec8.h",
-		MAME_DIR .. "src/devices/bus/nubus/nubus_radiustpd.c",
+		MAME_DIR .. "src/devices/bus/nubus/nubus_radiustpd.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/nubus_radiustpd.h",
-		MAME_DIR .. "src/devices/bus/nubus/nubus_m2video.c",
+		MAME_DIR .. "src/devices/bus/nubus/nubus_m2video.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/nubus_m2video.h",
-		MAME_DIR .. "src/devices/bus/nubus/nubus_asntmc3b.c",
+		MAME_DIR .. "src/devices/bus/nubus/nubus_asntmc3b.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/nubus_asntmc3b.h",
-		MAME_DIR .. "src/devices/bus/nubus/nubus_image.c",
+		MAME_DIR .. "src/devices/bus/nubus/nubus_image.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/nubus_image.h",
-		MAME_DIR .. "src/devices/bus/nubus/nubus_wsportrait.c",
+		MAME_DIR .. "src/devices/bus/nubus/nubus_wsportrait.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/nubus_wsportrait.h",
-		MAME_DIR .. "src/devices/bus/nubus/pds30_cb264.c",
+		MAME_DIR .. "src/devices/bus/nubus/pds30_cb264.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/pds30_cb264.h",
-		MAME_DIR .. "src/devices/bus/nubus/pds30_procolor816.c",
+		MAME_DIR .. "src/devices/bus/nubus/pds30_procolor816.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/pds30_procolor816.h",
-		MAME_DIR .. "src/devices/bus/nubus/pds30_sigmalview.c",
+		MAME_DIR .. "src/devices/bus/nubus/pds30_sigmalview.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/pds30_sigmalview.h",
-		MAME_DIR .. "src/devices/bus/nubus/pds30_30hr.c",
+		MAME_DIR .. "src/devices/bus/nubus/pds30_30hr.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/pds30_30hr.h",
-		MAME_DIR .. "src/devices/bus/nubus/pds30_mc30.c",
+		MAME_DIR .. "src/devices/bus/nubus/pds30_mc30.cpp",
 		MAME_DIR .. "src/devices/bus/nubus/pds30_mc30.h",
 	}
 end
@@ -1499,32 +1499,32 @@ end
 
 if (BUSES["CENTRONICS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/centronics/ctronics.c",
+		MAME_DIR .. "src/devices/bus/centronics/ctronics.cpp",
 		MAME_DIR .. "src/devices/bus/centronics/ctronics.h",
-		MAME_DIR .. "src/devices/bus/centronics/comxpl80.c",
+		MAME_DIR .. "src/devices/bus/centronics/comxpl80.cpp",
 		MAME_DIR .. "src/devices/bus/centronics/comxpl80.h",
-		MAME_DIR .. "src/devices/bus/centronics/covox.c",
+		MAME_DIR .. "src/devices/bus/centronics/covox.cpp",
 		MAME_DIR .. "src/devices/bus/centronics/covox.h",
-		MAME_DIR .. "src/devices/bus/centronics/dsjoy.c",
+		MAME_DIR .. "src/devices/bus/centronics/dsjoy.cpp",
 		MAME_DIR .. "src/devices/bus/centronics/dsjoy.h",
-		MAME_DIR .. "src/devices/bus/centronics/epson_ex800.c",
+		MAME_DIR .. "src/devices/bus/centronics/epson_ex800.cpp",
 		MAME_DIR .. "src/devices/bus/centronics/epson_ex800.h",
-		MAME_DIR .. "src/devices/bus/centronics/epson_lx800.c",
+		MAME_DIR .. "src/devices/bus/centronics/epson_lx800.cpp",
 		MAME_DIR .. "src/devices/bus/centronics/epson_lx800.h",
-		MAME_DIR .. "src/devices/bus/centronics/epson_lx810l.c",
+		MAME_DIR .. "src/devices/bus/centronics/epson_lx810l.cpp",
 		MAME_DIR .. "src/devices/bus/centronics/epson_lx810l.h",
-		MAME_DIR .. "src/devices/bus/centronics/nec_p72.c",
+		MAME_DIR .. "src/devices/bus/centronics/nec_p72.cpp",
 		MAME_DIR .. "src/devices/bus/centronics/nec_p72.h",
-		MAME_DIR .. "src/devices/bus/centronics/printer.c",
+		MAME_DIR .. "src/devices/bus/centronics/printer.cpp",
 		MAME_DIR .. "src/devices/bus/centronics/printer.h",
-		MAME_DIR .. "src/devices/bus/centronics/digiblst.c",
+		MAME_DIR .. "src/devices/bus/centronics/digiblst.cpp",
 		MAME_DIR .. "src/devices/bus/centronics/digiblst.h",
 	}
 
 	dependency {
-		{ MAME_DIR .. "src/devices/bus/centronics/epson_ex800.c",  GEN_DIR .. "emu/layout/ex800.lh" },
-		{ MAME_DIR .. "src/devices/bus/centronics/epson_lx800.c",  GEN_DIR .. "emu/layout/lx800.lh" },
-		{ MAME_DIR .. "src/devices/bus/centronics/epson_lx810l.c", GEN_DIR .. "emu/layout/lx800.lh" },
+		{ MAME_DIR .. "src/devices/bus/centronics/epson_ex800.cpp",  GEN_DIR .. "emu/layout/ex800.lh" },
+		{ MAME_DIR .. "src/devices/bus/centronics/epson_lx800.cpp",  GEN_DIR .. "emu/layout/lx800.lh" },
+		{ MAME_DIR .. "src/devices/bus/centronics/epson_lx810l.cpp", GEN_DIR .. "emu/layout/lx800.lh" },
 	}
 
 	custombuildtask {
@@ -1540,23 +1540,23 @@ end
 
 if (BUSES["RS232"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/rs232/keyboard.c",
+		MAME_DIR .. "src/devices/bus/rs232/keyboard.cpp",
 		MAME_DIR .. "src/devices/bus/rs232/keyboard.h",
-		MAME_DIR .. "src/devices/bus/rs232/loopback.c",
+		MAME_DIR .. "src/devices/bus/rs232/loopback.cpp",
 		MAME_DIR .. "src/devices/bus/rs232/loopback.h",
-		MAME_DIR .. "src/devices/bus/rs232/null_modem.c",
+		MAME_DIR .. "src/devices/bus/rs232/null_modem.cpp",
 		MAME_DIR .. "src/devices/bus/rs232/null_modem.h",
-		MAME_DIR .. "src/devices/bus/rs232/printer.c",
+		MAME_DIR .. "src/devices/bus/rs232/printer.cpp",
 		MAME_DIR .. "src/devices/bus/rs232/printer.h",
-		MAME_DIR .. "src/devices/bus/rs232/rs232.c",
+		MAME_DIR .. "src/devices/bus/rs232/rs232.cpp",
 		MAME_DIR .. "src/devices/bus/rs232/rs232.h",
-		MAME_DIR .. "src/devices/bus/rs232/pty.c",
+		MAME_DIR .. "src/devices/bus/rs232/pty.cpp",
 		MAME_DIR .. "src/devices/bus/rs232/pty.h",
-		MAME_DIR .. "src/devices/bus/rs232/ser_mouse.c",
+		MAME_DIR .. "src/devices/bus/rs232/ser_mouse.cpp",
 		MAME_DIR .. "src/devices/bus/rs232/ser_mouse.h",
-		MAME_DIR .. "src/devices/bus/rs232/terminal.c",
+		MAME_DIR .. "src/devices/bus/rs232/terminal.cpp",
 		MAME_DIR .. "src/devices/bus/rs232/terminal.h",
-		MAME_DIR .. "src/devices/bus/rs232/xvd701.c",
+		MAME_DIR .. "src/devices/bus/rs232/xvd701.cpp",
 		MAME_DIR .. "src/devices/bus/rs232/xvd701.h",
 	}
 end
@@ -1568,11 +1568,11 @@ end
 
 if (BUSES["MIDI"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/midi/midi.c",
+		MAME_DIR .. "src/devices/bus/midi/midi.cpp",
 		MAME_DIR .. "src/devices/bus/midi/midi.h",
-		MAME_DIR .. "src/devices/bus/midi/midiinport.c",
+		MAME_DIR .. "src/devices/bus/midi/midiinport.cpp",
 		MAME_DIR .. "src/devices/bus/midi/midiinport.h",
-		MAME_DIR .. "src/devices/bus/midi/midioutport.c",
+		MAME_DIR .. "src/devices/bus/midi/midioutport.cpp",
 		MAME_DIR .. "src/devices/bus/midi/midioutport.h",
 	}
 end
@@ -1584,23 +1584,23 @@ end
 
 if (BUSES["LPCI"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/lpci/pci.c",
+		MAME_DIR .. "src/devices/bus/lpci/pci.cpp",
 		MAME_DIR .. "src/devices/bus/lpci/pci.h",
-		MAME_DIR .. "src/devices/bus/lpci/cirrus.c",
+		MAME_DIR .. "src/devices/bus/lpci/cirrus.cpp",
 		MAME_DIR .. "src/devices/bus/lpci/cirrus.h",
-		MAME_DIR .. "src/devices/bus/lpci/i82371ab.c",
+		MAME_DIR .. "src/devices/bus/lpci/i82371ab.cpp",
 		MAME_DIR .. "src/devices/bus/lpci/i82371ab.h",
-		MAME_DIR .. "src/devices/bus/lpci/i82371sb.c",
+		MAME_DIR .. "src/devices/bus/lpci/i82371sb.cpp",
 		MAME_DIR .. "src/devices/bus/lpci/i82371sb.h",
-		MAME_DIR .. "src/devices/bus/lpci/i82439tx.c",
+		MAME_DIR .. "src/devices/bus/lpci/i82439tx.cpp",
 		MAME_DIR .. "src/devices/bus/lpci/i82439tx.h",
-		MAME_DIR .. "src/devices/bus/lpci/northbridge.c",
+		MAME_DIR .. "src/devices/bus/lpci/northbridge.cpp",
 		MAME_DIR .. "src/devices/bus/lpci/northbridge.h",
-		MAME_DIR .. "src/devices/bus/lpci/southbridge.c",
+		MAME_DIR .. "src/devices/bus/lpci/southbridge.cpp",
 		MAME_DIR .. "src/devices/bus/lpci/southbridge.h",
-		MAME_DIR .. "src/devices/bus/lpci/mpc105.c",
+		MAME_DIR .. "src/devices/bus/lpci/mpc105.cpp",
 		MAME_DIR .. "src/devices/bus/lpci/mpc105.h",
-		MAME_DIR .. "src/devices/bus/lpci/vt82c505.c",
+		MAME_DIR .. "src/devices/bus/lpci/vt82c505.cpp",
 		MAME_DIR .. "src/devices/bus/lpci/vt82c505.h",
 	}
 end
@@ -1612,108 +1612,108 @@ end
 
 if (BUSES["NES"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/nes/nes_slot.c",
+		MAME_DIR .. "src/devices/bus/nes/nes_slot.cpp",
 		MAME_DIR .. "src/devices/bus/nes/nes_slot.h",
 		MAME_DIR .. "src/devices/bus/nes/nes_ines.inc",
 		MAME_DIR .. "src/devices/bus/nes/nes_pcb.inc",
 		MAME_DIR .. "src/devices/bus/nes/nes_unif.inc",
-		MAME_DIR .. "src/devices/bus/nes/nes_carts.c",
+		MAME_DIR .. "src/devices/bus/nes/nes_carts.cpp",
 		MAME_DIR .. "src/devices/bus/nes/nes_carts.h",
-		MAME_DIR .. "src/devices/bus/nes/2a03pur.c",
+		MAME_DIR .. "src/devices/bus/nes/2a03pur.cpp",
 		MAME_DIR .. "src/devices/bus/nes/2a03pur.h",
-		MAME_DIR .. "src/devices/bus/nes/act53.c",
+		MAME_DIR .. "src/devices/bus/nes/act53.cpp",
 		MAME_DIR .. "src/devices/bus/nes/act53.h",
-		MAME_DIR .. "src/devices/bus/nes/aladdin.c",
+		MAME_DIR .. "src/devices/bus/nes/aladdin.cpp",
 		MAME_DIR .. "src/devices/bus/nes/aladdin.h",
-		MAME_DIR .. "src/devices/bus/nes/ave.c",
+		MAME_DIR .. "src/devices/bus/nes/ave.cpp",
 		MAME_DIR .. "src/devices/bus/nes/ave.h",
-		MAME_DIR .. "src/devices/bus/nes/bandai.c",
+		MAME_DIR .. "src/devices/bus/nes/bandai.cpp",
 		MAME_DIR .. "src/devices/bus/nes/bandai.h",
-		MAME_DIR .. "src/devices/bus/nes/benshieng.c",
+		MAME_DIR .. "src/devices/bus/nes/benshieng.cpp",
 		MAME_DIR .. "src/devices/bus/nes/benshieng.h",
-		MAME_DIR .. "src/devices/bus/nes/bootleg.c",
+		MAME_DIR .. "src/devices/bus/nes/bootleg.cpp",
 		MAME_DIR .. "src/devices/bus/nes/bootleg.h",
-		MAME_DIR .. "src/devices/bus/nes/camerica.c",
+		MAME_DIR .. "src/devices/bus/nes/camerica.cpp",
 		MAME_DIR .. "src/devices/bus/nes/camerica.h",
-		MAME_DIR .. "src/devices/bus/nes/cne.c",
+		MAME_DIR .. "src/devices/bus/nes/cne.cpp",
 		MAME_DIR .. "src/devices/bus/nes/cne.h",
-		MAME_DIR .. "src/devices/bus/nes/cony.c",
+		MAME_DIR .. "src/devices/bus/nes/cony.cpp",
 		MAME_DIR .. "src/devices/bus/nes/cony.h",
-		MAME_DIR .. "src/devices/bus/nes/datach.c",
+		MAME_DIR .. "src/devices/bus/nes/datach.cpp",
 		MAME_DIR .. "src/devices/bus/nes/datach.h",
-		MAME_DIR .. "src/devices/bus/nes/discrete.c",
+		MAME_DIR .. "src/devices/bus/nes/discrete.cpp",
 		MAME_DIR .. "src/devices/bus/nes/discrete.h",
-		MAME_DIR .. "src/devices/bus/nes/disksys.c",
+		MAME_DIR .. "src/devices/bus/nes/disksys.cpp",
 		MAME_DIR .. "src/devices/bus/nes/disksys.h",
-		MAME_DIR .. "src/devices/bus/nes/event.c",
+		MAME_DIR .. "src/devices/bus/nes/event.cpp",
 		MAME_DIR .. "src/devices/bus/nes/event.h",
-		MAME_DIR .. "src/devices/bus/nes/ggenie.c",
+		MAME_DIR .. "src/devices/bus/nes/ggenie.cpp",
 		MAME_DIR .. "src/devices/bus/nes/ggenie.h",
-		MAME_DIR .. "src/devices/bus/nes/henggedianzi.c",
+		MAME_DIR .. "src/devices/bus/nes/henggedianzi.cpp",
 		MAME_DIR .. "src/devices/bus/nes/henggedianzi.h",
-		MAME_DIR .. "src/devices/bus/nes/hes.c",
+		MAME_DIR .. "src/devices/bus/nes/hes.cpp",
 		MAME_DIR .. "src/devices/bus/nes/hes.h",
-		MAME_DIR .. "src/devices/bus/nes/hosenkan.c",
+		MAME_DIR .. "src/devices/bus/nes/hosenkan.cpp",
 		MAME_DIR .. "src/devices/bus/nes/hosenkan.h",
-		MAME_DIR .. "src/devices/bus/nes/irem.c",
+		MAME_DIR .. "src/devices/bus/nes/irem.cpp",
 		MAME_DIR .. "src/devices/bus/nes/irem.h",
-		MAME_DIR .. "src/devices/bus/nes/jaleco.c",
+		MAME_DIR .. "src/devices/bus/nes/jaleco.cpp",
 		MAME_DIR .. "src/devices/bus/nes/jaleco.h",
-		MAME_DIR .. "src/devices/bus/nes/jy.c",
+		MAME_DIR .. "src/devices/bus/nes/jy.cpp",
 		MAME_DIR .. "src/devices/bus/nes/jy.h",
-		MAME_DIR .. "src/devices/bus/nes/kaiser.c",
+		MAME_DIR .. "src/devices/bus/nes/kaiser.cpp",
 		MAME_DIR .. "src/devices/bus/nes/kaiser.h",
-		MAME_DIR .. "src/devices/bus/nes/karastudio.c",
+		MAME_DIR .. "src/devices/bus/nes/karastudio.cpp",
 		MAME_DIR .. "src/devices/bus/nes/karastudio.h",
-		MAME_DIR .. "src/devices/bus/nes/konami.c",
+		MAME_DIR .. "src/devices/bus/nes/konami.cpp",
 		MAME_DIR .. "src/devices/bus/nes/konami.h",
-		MAME_DIR .. "src/devices/bus/nes/legacy.c",
+		MAME_DIR .. "src/devices/bus/nes/legacy.cpp",
 		MAME_DIR .. "src/devices/bus/nes/legacy.h",
-		MAME_DIR .. "src/devices/bus/nes/mmc1.c",
+		MAME_DIR .. "src/devices/bus/nes/mmc1.cpp",
 		MAME_DIR .. "src/devices/bus/nes/mmc1.h",
-		MAME_DIR .. "src/devices/bus/nes/mmc2.c",
+		MAME_DIR .. "src/devices/bus/nes/mmc2.cpp",
 		MAME_DIR .. "src/devices/bus/nes/mmc2.h",
-		MAME_DIR .. "src/devices/bus/nes/mmc3.c",
+		MAME_DIR .. "src/devices/bus/nes/mmc3.cpp",
 		MAME_DIR .. "src/devices/bus/nes/mmc3.h",
-		MAME_DIR .. "src/devices/bus/nes/mmc3_clones.c",
+		MAME_DIR .. "src/devices/bus/nes/mmc3_clones.cpp",
 		MAME_DIR .. "src/devices/bus/nes/mmc3_clones.h",
-		MAME_DIR .. "src/devices/bus/nes/mmc5.c",
+		MAME_DIR .. "src/devices/bus/nes/mmc5.cpp",
 		MAME_DIR .. "src/devices/bus/nes/mmc5.h",
-		MAME_DIR .. "src/devices/bus/nes/multigame.c",
+		MAME_DIR .. "src/devices/bus/nes/multigame.cpp",
 		MAME_DIR .. "src/devices/bus/nes/multigame.h",
-		MAME_DIR .. "src/devices/bus/nes/namcot.c",
+		MAME_DIR .. "src/devices/bus/nes/namcot.cpp",
 		MAME_DIR .. "src/devices/bus/nes/namcot.h",
-		MAME_DIR .. "src/devices/bus/nes/nanjing.c",
+		MAME_DIR .. "src/devices/bus/nes/nanjing.cpp",
 		MAME_DIR .. "src/devices/bus/nes/nanjing.h",
-		MAME_DIR .. "src/devices/bus/nes/ntdec.c",
+		MAME_DIR .. "src/devices/bus/nes/ntdec.cpp",
 		MAME_DIR .. "src/devices/bus/nes/ntdec.h",
-		MAME_DIR .. "src/devices/bus/nes/nxrom.c",
+		MAME_DIR .. "src/devices/bus/nes/nxrom.cpp",
 		MAME_DIR .. "src/devices/bus/nes/nxrom.h",
-		MAME_DIR .. "src/devices/bus/nes/pirate.c",
+		MAME_DIR .. "src/devices/bus/nes/pirate.cpp",
 		MAME_DIR .. "src/devices/bus/nes/pirate.h",
-		MAME_DIR .. "src/devices/bus/nes/pt554.c",
+		MAME_DIR .. "src/devices/bus/nes/pt554.cpp",
 		MAME_DIR .. "src/devices/bus/nes/pt554.h",
-		MAME_DIR .. "src/devices/bus/nes/racermate.c",
+		MAME_DIR .. "src/devices/bus/nes/racermate.cpp",
 		MAME_DIR .. "src/devices/bus/nes/racermate.h",
-		MAME_DIR .. "src/devices/bus/nes/rcm.c",
+		MAME_DIR .. "src/devices/bus/nes/rcm.cpp",
 		MAME_DIR .. "src/devices/bus/nes/rcm.h",
-		MAME_DIR .. "src/devices/bus/nes/rexsoft.c",
+		MAME_DIR .. "src/devices/bus/nes/rexsoft.cpp",
 		MAME_DIR .. "src/devices/bus/nes/rexsoft.h",
-		MAME_DIR .. "src/devices/bus/nes/sachen.c",
+		MAME_DIR .. "src/devices/bus/nes/sachen.cpp",
 		MAME_DIR .. "src/devices/bus/nes/sachen.h",
-		MAME_DIR .. "src/devices/bus/nes/somari.c",
+		MAME_DIR .. "src/devices/bus/nes/somari.cpp",
 		MAME_DIR .. "src/devices/bus/nes/somari.h",
-		MAME_DIR .. "src/devices/bus/nes/sunsoft.c",
+		MAME_DIR .. "src/devices/bus/nes/sunsoft.cpp",
 		MAME_DIR .. "src/devices/bus/nes/sunsoft.h",
-		MAME_DIR .. "src/devices/bus/nes/sunsoft_dcs.c",
+		MAME_DIR .. "src/devices/bus/nes/sunsoft_dcs.cpp",
 		MAME_DIR .. "src/devices/bus/nes/sunsoft_dcs.h",
-		MAME_DIR .. "src/devices/bus/nes/taito.c",
+		MAME_DIR .. "src/devices/bus/nes/taito.cpp",
 		MAME_DIR .. "src/devices/bus/nes/taito.h",
-		MAME_DIR .. "src/devices/bus/nes/tengen.c",
+		MAME_DIR .. "src/devices/bus/nes/tengen.cpp",
 		MAME_DIR .. "src/devices/bus/nes/tengen.h",
-		MAME_DIR .. "src/devices/bus/nes/txc.c",
+		MAME_DIR .. "src/devices/bus/nes/txc.cpp",
 		MAME_DIR .. "src/devices/bus/nes/txc.h",
-		MAME_DIR .. "src/devices/bus/nes/waixing.c",
+		MAME_DIR .. "src/devices/bus/nes/waixing.cpp",
 		MAME_DIR .. "src/devices/bus/nes/waixing.h",
 	}
 end
@@ -1725,37 +1725,37 @@ end
 
 if (BUSES["NES_CTRL"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/nes_ctrl/ctrl.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/ctrl.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/ctrl.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/joypad.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/joypad.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/joypad.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/4score.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/4score.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/4score.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/arkpaddle.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/arkpaddle.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/arkpaddle.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/bcbattle.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/bcbattle.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/bcbattle.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/ftrainer.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/ftrainer.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/ftrainer.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/fckeybrd.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/fckeybrd.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/fckeybrd.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/hori.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/hori.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/hori.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/konamihs.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/konamihs.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/konamihs.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/miracle.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/miracle.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/miracle.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/mjpanel.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/mjpanel.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/mjpanel.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/pachinko.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/pachinko.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/pachinko.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/partytap.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/partytap.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/partytap.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/powerpad.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/powerpad.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/powerpad.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/suborkey.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/suborkey.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/suborkey.h",
-		MAME_DIR .. "src/devices/bus/nes_ctrl/zapper.c",
+		MAME_DIR .. "src/devices/bus/nes_ctrl/zapper.cpp",
 		MAME_DIR .. "src/devices/bus/nes_ctrl/zapper.h",
 	}
 end
@@ -1767,31 +1767,31 @@ end
 
 if (BUSES["SNES"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/snes/snes_slot.c",
+		MAME_DIR .. "src/devices/bus/snes/snes_slot.cpp",
 		MAME_DIR .. "src/devices/bus/snes/snes_slot.h",
-		MAME_DIR .. "src/devices/bus/snes/snes_carts.c",
+		MAME_DIR .. "src/devices/bus/snes/snes_carts.cpp",
 		MAME_DIR .. "src/devices/bus/snes/snes_carts.h",
-		MAME_DIR .. "src/devices/bus/snes/bsx.c",
+		MAME_DIR .. "src/devices/bus/snes/bsx.cpp",
 		MAME_DIR .. "src/devices/bus/snes/bsx.h",
-		MAME_DIR .. "src/devices/bus/snes/event.c",
+		MAME_DIR .. "src/devices/bus/snes/event.cpp",
 		MAME_DIR .. "src/devices/bus/snes/event.h",
-		MAME_DIR .. "src/devices/bus/snes/rom.c",
+		MAME_DIR .. "src/devices/bus/snes/rom.cpp",
 		MAME_DIR .. "src/devices/bus/snes/rom.h",
-		MAME_DIR .. "src/devices/bus/snes/rom21.c",
+		MAME_DIR .. "src/devices/bus/snes/rom21.cpp",
 		MAME_DIR .. "src/devices/bus/snes/rom21.h",
-		MAME_DIR .. "src/devices/bus/snes/sa1.c",
+		MAME_DIR .. "src/devices/bus/snes/sa1.cpp",
 		MAME_DIR .. "src/devices/bus/snes/sa1.h",
-		MAME_DIR .. "src/devices/bus/snes/sdd1.c",
+		MAME_DIR .. "src/devices/bus/snes/sdd1.cpp",
 		MAME_DIR .. "src/devices/bus/snes/sdd1.h",
-		MAME_DIR .. "src/devices/bus/snes/sfx.c",
+		MAME_DIR .. "src/devices/bus/snes/sfx.cpp",
 		MAME_DIR .. "src/devices/bus/snes/sfx.h",
-		MAME_DIR .. "src/devices/bus/snes/sgb.c",
+		MAME_DIR .. "src/devices/bus/snes/sgb.cpp",
 		MAME_DIR .. "src/devices/bus/snes/sgb.h",
-		MAME_DIR .. "src/devices/bus/snes/spc7110.c",
+		MAME_DIR .. "src/devices/bus/snes/spc7110.cpp",
 		MAME_DIR .. "src/devices/bus/snes/spc7110.h",
-		MAME_DIR .. "src/devices/bus/snes/sufami.c",
+		MAME_DIR .. "src/devices/bus/snes/sufami.cpp",
 		MAME_DIR .. "src/devices/bus/snes/sufami.h",
-		MAME_DIR .. "src/devices/bus/snes/upd.c",
+		MAME_DIR .. "src/devices/bus/snes/upd.cpp",
 		MAME_DIR .. "src/devices/bus/snes/upd.h",
 	}
 end
@@ -1803,23 +1803,23 @@ end
 
 if (BUSES["SNES_CTRL"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/snes_ctrl/ctrl.c",
+		MAME_DIR .. "src/devices/bus/snes_ctrl/ctrl.cpp",
 		MAME_DIR .. "src/devices/bus/snes_ctrl/ctrl.h",
-		MAME_DIR .. "src/devices/bus/snes_ctrl/bcbattle.c",
+		MAME_DIR .. "src/devices/bus/snes_ctrl/bcbattle.cpp",
 		MAME_DIR .. "src/devices/bus/snes_ctrl/bcbattle.h",
-		MAME_DIR .. "src/devices/bus/snes_ctrl/joypad.c",
+		MAME_DIR .. "src/devices/bus/snes_ctrl/joypad.cpp",
 		MAME_DIR .. "src/devices/bus/snes_ctrl/joypad.h",
-		MAME_DIR .. "src/devices/bus/snes_ctrl/miracle.c",
+		MAME_DIR .. "src/devices/bus/snes_ctrl/miracle.cpp",
 		MAME_DIR .. "src/devices/bus/snes_ctrl/miracle.h",
-		MAME_DIR .. "src/devices/bus/snes_ctrl/mouse.c",
+		MAME_DIR .. "src/devices/bus/snes_ctrl/mouse.cpp",
 		MAME_DIR .. "src/devices/bus/snes_ctrl/mouse.h",
-		MAME_DIR .. "src/devices/bus/snes_ctrl/multitap.c",
+		MAME_DIR .. "src/devices/bus/snes_ctrl/multitap.cpp",
 		MAME_DIR .. "src/devices/bus/snes_ctrl/multitap.h",
-		MAME_DIR .. "src/devices/bus/snes_ctrl/pachinko.c",
+		MAME_DIR .. "src/devices/bus/snes_ctrl/pachinko.cpp",
 		MAME_DIR .. "src/devices/bus/snes_ctrl/pachinko.h",
-		MAME_DIR .. "src/devices/bus/snes_ctrl/sscope.c",
+		MAME_DIR .. "src/devices/bus/snes_ctrl/sscope.cpp",
 		MAME_DIR .. "src/devices/bus/snes_ctrl/sscope.h",
-		MAME_DIR .. "src/devices/bus/snes_ctrl/twintap.c",
+		MAME_DIR .. "src/devices/bus/snes_ctrl/twintap.cpp",
 		MAME_DIR .. "src/devices/bus/snes_ctrl/twintap.h",
 	}
 end
@@ -1830,9 +1830,9 @@ end
 ---------------------------------------------------
 if (BUSES["VBOY"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/vboy/slot.c",
+		MAME_DIR .. "src/devices/bus/vboy/slot.cpp",
 		MAME_DIR .. "src/devices/bus/vboy/slot.h",
-		MAME_DIR .. "src/devices/bus/vboy/rom.c",
+		MAME_DIR .. "src/devices/bus/vboy/rom.cpp",
 		MAME_DIR .. "src/devices/bus/vboy/rom.h",
 	}
 end
@@ -1844,23 +1844,23 @@ end
 
 if (BUSES["MEGADRIVE"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/megadrive/md_slot.c",
+		MAME_DIR .. "src/devices/bus/megadrive/md_slot.cpp",
 		MAME_DIR .. "src/devices/bus/megadrive/md_slot.h",
-		MAME_DIR .. "src/devices/bus/megadrive/md_carts.c",
+		MAME_DIR .. "src/devices/bus/megadrive/md_carts.cpp",
 		MAME_DIR .. "src/devices/bus/megadrive/md_carts.h",
-		MAME_DIR .. "src/devices/bus/megadrive/eeprom.c",
+		MAME_DIR .. "src/devices/bus/megadrive/eeprom.cpp",
 		MAME_DIR .. "src/devices/bus/megadrive/eeprom.h",
-		MAME_DIR .. "src/devices/bus/megadrive/ggenie.c",
+		MAME_DIR .. "src/devices/bus/megadrive/ggenie.cpp",
 		MAME_DIR .. "src/devices/bus/megadrive/ggenie.h",
-		MAME_DIR .. "src/devices/bus/megadrive/jcart.c",
+		MAME_DIR .. "src/devices/bus/megadrive/jcart.cpp",
 		MAME_DIR .. "src/devices/bus/megadrive/jcart.h",
-		MAME_DIR .. "src/devices/bus/megadrive/rom.c",
+		MAME_DIR .. "src/devices/bus/megadrive/rom.cpp",
 		MAME_DIR .. "src/devices/bus/megadrive/rom.h",
-		MAME_DIR .. "src/devices/bus/megadrive/sk.c",
+		MAME_DIR .. "src/devices/bus/megadrive/sk.cpp",
 		MAME_DIR .. "src/devices/bus/megadrive/sk.h",
-		MAME_DIR .. "src/devices/bus/megadrive/stm95.c",
+		MAME_DIR .. "src/devices/bus/megadrive/stm95.cpp",
 		MAME_DIR .. "src/devices/bus/megadrive/stm95.h",
-		MAME_DIR .. "src/devices/bus/megadrive/svp.c",
+		MAME_DIR .. "src/devices/bus/megadrive/svp.cpp",
 		MAME_DIR .. "src/devices/bus/megadrive/svp.h",
 	}
 end
@@ -1872,59 +1872,59 @@ end
 
 if (BUSES["NEOGEO"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/neogeo/neogeo_slot.c",
+		MAME_DIR .. "src/devices/bus/neogeo/neogeo_slot.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/neogeo_slot.h",
-		MAME_DIR .. "src/devices/bus/neogeo/neogeo_intf.c",
+		MAME_DIR .. "src/devices/bus/neogeo/neogeo_intf.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/neogeo_intf.h",
-		MAME_DIR .. "src/devices/bus/neogeo/neogeo_carts.c",
+		MAME_DIR .. "src/devices/bus/neogeo/neogeo_carts.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/neogeo_carts.h",
-		MAME_DIR .. "src/devices/bus/neogeo/neogeo_helper.c",
+		MAME_DIR .. "src/devices/bus/neogeo/neogeo_helper.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/neogeo_helper.h",
-		MAME_DIR .. "src/devices/bus/neogeo/banked_cart.c",
+		MAME_DIR .. "src/devices/bus/neogeo/banked_cart.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/banked_cart.h",
-		MAME_DIR .. "src/devices/bus/neogeo/mslugx_prot.c",
+		MAME_DIR .. "src/devices/bus/neogeo/mslugx_prot.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/mslugx_prot.h",
-		MAME_DIR .. "src/devices/bus/neogeo/mslugx_cart.c",
+		MAME_DIR .. "src/devices/bus/neogeo/mslugx_cart.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/mslugx_cart.h",
-		MAME_DIR .. "src/devices/bus/neogeo/sma_prot.c",
+		MAME_DIR .. "src/devices/bus/neogeo/sma_prot.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/sma_prot.h",
-		MAME_DIR .. "src/devices/bus/neogeo/sma_cart.c",
+		MAME_DIR .. "src/devices/bus/neogeo/sma_cart.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/sma_cart.h",
-		MAME_DIR .. "src/devices/bus/neogeo/cmc_prot.c",
+		MAME_DIR .. "src/devices/bus/neogeo/cmc_prot.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/cmc_prot.h",
-		MAME_DIR .. "src/devices/bus/neogeo/cmc_cart.c",
+		MAME_DIR .. "src/devices/bus/neogeo/cmc_cart.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/cmc_cart.h",
-		MAME_DIR .. "src/devices/bus/neogeo/pcm2_prot.c",
+		MAME_DIR .. "src/devices/bus/neogeo/pcm2_prot.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/pcm2_prot.h",
-		MAME_DIR .. "src/devices/bus/neogeo/pcm2_cart.c",
+		MAME_DIR .. "src/devices/bus/neogeo/pcm2_cart.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/pcm2_cart.h",
-		MAME_DIR .. "src/devices/bus/neogeo/kof2002_prot.c",
+		MAME_DIR .. "src/devices/bus/neogeo/kof2002_prot.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/kof2002_prot.h",
-		MAME_DIR .. "src/devices/bus/neogeo/kof2002_cart.c",
+		MAME_DIR .. "src/devices/bus/neogeo/kof2002_cart.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/kof2002_cart.h",
-		MAME_DIR .. "src/devices/bus/neogeo/pvc_prot.c",
+		MAME_DIR .. "src/devices/bus/neogeo/pvc_prot.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/pvc_prot.h",
-		MAME_DIR .. "src/devices/bus/neogeo/pvc_cart.c",
+		MAME_DIR .. "src/devices/bus/neogeo/pvc_cart.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/pvc_cart.h",
-		MAME_DIR .. "src/devices/bus/neogeo/fatfury2_prot.c",
+		MAME_DIR .. "src/devices/bus/neogeo/fatfury2_prot.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/fatfury2_prot.h",
-		MAME_DIR .. "src/devices/bus/neogeo/fatfury2_cart.c",
+		MAME_DIR .. "src/devices/bus/neogeo/fatfury2_cart.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/fatfury2_cart.h",
-		MAME_DIR .. "src/devices/bus/neogeo/kof98_prot.c",
+		MAME_DIR .. "src/devices/bus/neogeo/kof98_prot.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/kof98_prot.h",
-		MAME_DIR .. "src/devices/bus/neogeo/kof98_cart.c",
+		MAME_DIR .. "src/devices/bus/neogeo/kof98_cart.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/kof98_cart.h",
-		MAME_DIR .. "src/devices/bus/neogeo/bootleg_prot.c",
+		MAME_DIR .. "src/devices/bus/neogeo/bootleg_prot.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/bootleg_prot.h",
-		MAME_DIR .. "src/devices/bus/neogeo/bootleg_cart.c",
+		MAME_DIR .. "src/devices/bus/neogeo/bootleg_cart.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/bootleg_cart.h",
-		MAME_DIR .. "src/devices/bus/neogeo/bootleg_hybrid_cart.c",
+		MAME_DIR .. "src/devices/bus/neogeo/bootleg_hybrid_cart.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/bootleg_hybrid_cart.h",
-		MAME_DIR .. "src/devices/bus/neogeo/sbp_prot.c",
+		MAME_DIR .. "src/devices/bus/neogeo/sbp_prot.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/sbp_prot.h",
-		MAME_DIR .. "src/devices/bus/neogeo/kog_prot.c",
+		MAME_DIR .. "src/devices/bus/neogeo/kog_prot.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/kog_prot.h",
-		MAME_DIR .. "src/devices/bus/neogeo/rom.c",
+		MAME_DIR .. "src/devices/bus/neogeo/rom.cpp",
 		MAME_DIR .. "src/devices/bus/neogeo/rom.h",
 	}
 end
@@ -1937,13 +1937,13 @@ end
 
 if (BUSES["SATURN"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/saturn/sat_slot.c",
+		MAME_DIR .. "src/devices/bus/saturn/sat_slot.cpp",
 		MAME_DIR .. "src/devices/bus/saturn/sat_slot.h",
-		MAME_DIR .. "src/devices/bus/saturn/bram.c",
+		MAME_DIR .. "src/devices/bus/saturn/bram.cpp",
 		MAME_DIR .. "src/devices/bus/saturn/bram.h",
-		MAME_DIR .. "src/devices/bus/saturn/dram.c",
+		MAME_DIR .. "src/devices/bus/saturn/dram.cpp",
 		MAME_DIR .. "src/devices/bus/saturn/dram.h",
-		MAME_DIR .. "src/devices/bus/saturn/rom.c",
+		MAME_DIR .. "src/devices/bus/saturn/rom.cpp",
 		MAME_DIR .. "src/devices/bus/saturn/rom.h",
 	}
 end
@@ -1955,13 +1955,13 @@ end
 
 if (BUSES["SEGA8"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/sega8/sega8_slot.c",
+		MAME_DIR .. "src/devices/bus/sega8/sega8_slot.cpp",
 		MAME_DIR .. "src/devices/bus/sega8/sega8_slot.h",
-		MAME_DIR .. "src/devices/bus/sega8/rom.c",
+		MAME_DIR .. "src/devices/bus/sega8/rom.cpp",
 		MAME_DIR .. "src/devices/bus/sega8/rom.h",
-		MAME_DIR .. "src/devices/bus/sega8/ccatch.c",
+		MAME_DIR .. "src/devices/bus/sega8/ccatch.cpp",
 		MAME_DIR .. "src/devices/bus/sega8/ccatch.h",
-		MAME_DIR .. "src/devices/bus/sega8/mgear.c",
+		MAME_DIR .. "src/devices/bus/sega8/mgear.cpp",
 		MAME_DIR .. "src/devices/bus/sega8/mgear.h",
 	}
 end
@@ -1973,23 +1973,23 @@ end
 
 if (BUSES["SMS_CTRL"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/sms_ctrl/smsctrl.c",
+		MAME_DIR .. "src/devices/bus/sms_ctrl/smsctrl.cpp",
 		MAME_DIR .. "src/devices/bus/sms_ctrl/smsctrl.h",
-		MAME_DIR .. "src/devices/bus/sms_ctrl/joypad.c",
+		MAME_DIR .. "src/devices/bus/sms_ctrl/joypad.cpp",
 		MAME_DIR .. "src/devices/bus/sms_ctrl/joypad.h",
-		MAME_DIR .. "src/devices/bus/sms_ctrl/lphaser.c",
+		MAME_DIR .. "src/devices/bus/sms_ctrl/lphaser.cpp",
 		MAME_DIR .. "src/devices/bus/sms_ctrl/lphaser.h",
-		MAME_DIR .. "src/devices/bus/sms_ctrl/paddle.c",
+		MAME_DIR .. "src/devices/bus/sms_ctrl/paddle.cpp",
 		MAME_DIR .. "src/devices/bus/sms_ctrl/paddle.h",
-		MAME_DIR .. "src/devices/bus/sms_ctrl/rfu.c",
+		MAME_DIR .. "src/devices/bus/sms_ctrl/rfu.cpp",
 		MAME_DIR .. "src/devices/bus/sms_ctrl/rfu.h",
-		MAME_DIR .. "src/devices/bus/sms_ctrl/sports.c",
+		MAME_DIR .. "src/devices/bus/sms_ctrl/sports.cpp",
 		MAME_DIR .. "src/devices/bus/sms_ctrl/sports.h",
-		MAME_DIR .. "src/devices/bus/sms_ctrl/sportsjp.c",
+		MAME_DIR .. "src/devices/bus/sms_ctrl/sportsjp.cpp",
 		MAME_DIR .. "src/devices/bus/sms_ctrl/sportsjp.h",
-		MAME_DIR .. "src/devices/bus/sms_ctrl/multitap.c",
+		MAME_DIR .. "src/devices/bus/sms_ctrl/multitap.cpp",
 		MAME_DIR .. "src/devices/bus/sms_ctrl/multitap.h",
-		MAME_DIR .. "src/devices/bus/sms_ctrl/graphic.c",
+		MAME_DIR .. "src/devices/bus/sms_ctrl/graphic.cpp",
 		MAME_DIR .. "src/devices/bus/sms_ctrl/graphic.h",
 	}
 end
@@ -2001,9 +2001,9 @@ end
 
 if (BUSES["SMS_EXP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/sms_exp/smsexp.c",
+		MAME_DIR .. "src/devices/bus/sms_exp/smsexp.cpp",
 		MAME_DIR .. "src/devices/bus/sms_exp/smsexp.h",
-		MAME_DIR .. "src/devices/bus/sms_exp/gender.c",
+		MAME_DIR .. "src/devices/bus/sms_exp/gender.cpp",
 		MAME_DIR .. "src/devices/bus/sms_exp/gender.h",
 	}
 end
@@ -2015,30 +2015,30 @@ end
 
 if (BUSES["TI99X"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/ti99x/990_dk.c",
+		MAME_DIR .. "src/devices/bus/ti99x/990_dk.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/990_dk.h",
-		MAME_DIR .. "src/devices/bus/ti99x/990_hd.c",
+		MAME_DIR .. "src/devices/bus/ti99x/990_hd.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/990_hd.h",
-		MAME_DIR .. "src/devices/bus/ti99x/990_tap.c",
+		MAME_DIR .. "src/devices/bus/ti99x/990_tap.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/990_tap.h",
-		MAME_DIR .. "src/devices/bus/ti99x/998board.c",
+		MAME_DIR .. "src/devices/bus/ti99x/998board.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/998board.h",
-		MAME_DIR .. "src/devices/bus/ti99x/datamux.c",
+		MAME_DIR .. "src/devices/bus/ti99x/datamux.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/datamux.h",
-		MAME_DIR .. "src/devices/bus/ti99x/genboard.c",
+		MAME_DIR .. "src/devices/bus/ti99x/genboard.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/genboard.h",
-		MAME_DIR .. "src/devices/bus/ti99x/grom.c",
+		MAME_DIR .. "src/devices/bus/ti99x/grom.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/grom.h",
-		MAME_DIR .. "src/devices/bus/ti99x/gromport.c",
+		MAME_DIR .. "src/devices/bus/ti99x/gromport.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/gromport.h",
-		MAME_DIR .. "src/devices/bus/ti99x/handset.c",
+		MAME_DIR .. "src/devices/bus/ti99x/handset.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/handset.h",
-		MAME_DIR .. "src/devices/bus/ti99x/joyport.c",
+		MAME_DIR .. "src/devices/bus/ti99x/joyport.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/joyport.h",
-		MAME_DIR .. "src/devices/bus/ti99x/mecmouse.c",
+		MAME_DIR .. "src/devices/bus/ti99x/mecmouse.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/mecmouse.h",
 		MAME_DIR .. "src/devices/bus/ti99x/ti99defs.h",
-		MAME_DIR .. "src/devices/bus/ti99x/videowrp.c",
+		MAME_DIR .. "src/devices/bus/ti99x/videowrp.cpp",
 		MAME_DIR .. "src/devices/bus/ti99x/videowrp.h",
 	}
 end
@@ -2050,37 +2050,37 @@ end
 
 if (BUSES["TI99PEB"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/ti99_peb/peribox.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/peribox.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/peribox.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/bwg.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/bwg.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/bwg.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/evpc.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/evpc.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/evpc.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/hfdc.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/hfdc.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/hfdc.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/horizon.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/horizon.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/horizon.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/hsgpl.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/hsgpl.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/hsgpl.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/memex.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/memex.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/memex.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/myarcmem.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/myarcmem.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/myarcmem.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/pcode.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/pcode.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/pcode.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/samsmem.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/samsmem.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/samsmem.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/spchsyn.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/spchsyn.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/spchsyn.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/ti_32kmem.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/ti_32kmem.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/ti_32kmem.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/ti_fdc.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/ti_fdc.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/ti_fdc.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/ti_rs232.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/ti_rs232.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/ti_rs232.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/tn_ide.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/tn_ide.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/tn_ide.h",
-		MAME_DIR .. "src/devices/bus/ti99_peb/tn_usbsm.c",
+		MAME_DIR .. "src/devices/bus/ti99_peb/tn_usbsm.cpp",
 		MAME_DIR .. "src/devices/bus/ti99_peb/tn_usbsm.h",
 	}
 end
@@ -2092,11 +2092,11 @@ end
 
 if (BUSES["GAMEBOY"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/gameboy/gb_slot.c",
+		MAME_DIR .. "src/devices/bus/gameboy/gb_slot.cpp",
 		MAME_DIR .. "src/devices/bus/gameboy/gb_slot.h",
-		MAME_DIR .. "src/devices/bus/gameboy/rom.c",
+		MAME_DIR .. "src/devices/bus/gameboy/rom.cpp",
 		MAME_DIR .. "src/devices/bus/gameboy/rom.h",
-		MAME_DIR .. "src/devices/bus/gameboy/mbc.c",
+		MAME_DIR .. "src/devices/bus/gameboy/mbc.cpp",
 		MAME_DIR .. "src/devices/bus/gameboy/mbc.h",
 	}
 end
@@ -2108,9 +2108,9 @@ end
 
 if (BUSES["GAMEGEAR"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/gamegear/ggext.c",
+		MAME_DIR .. "src/devices/bus/gamegear/ggext.cpp",
 		MAME_DIR .. "src/devices/bus/gamegear/ggext.h",
-		MAME_DIR .. "src/devices/bus/gamegear/smsctrladp.c",
+		MAME_DIR .. "src/devices/bus/gamegear/smsctrladp.cpp",
 		MAME_DIR .. "src/devices/bus/gamegear/smsctrladp.h",
 	}
 end
@@ -2122,9 +2122,9 @@ end
 
 if (BUSES["GBA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/gba/gba_slot.c",
+		MAME_DIR .. "src/devices/bus/gba/gba_slot.cpp",
 		MAME_DIR .. "src/devices/bus/gba/gba_slot.h",
-		MAME_DIR .. "src/devices/bus/gba/rom.c",
+		MAME_DIR .. "src/devices/bus/gba/rom.cpp",
 		MAME_DIR .. "src/devices/bus/gba/rom.h",
 	}
 end
@@ -2135,13 +2135,13 @@ end
 ---------------------------------------------------
 if (BUSES["BML3"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/bml3/bml3bus.c",
+		MAME_DIR .. "src/devices/bus/bml3/bml3bus.cpp",
 		MAME_DIR .. "src/devices/bus/bml3/bml3bus.h",
-		MAME_DIR .. "src/devices/bus/bml3/bml3mp1802.c",
+		MAME_DIR .. "src/devices/bus/bml3/bml3mp1802.cpp",
 		MAME_DIR .. "src/devices/bus/bml3/bml3mp1802.h",
-		MAME_DIR .. "src/devices/bus/bml3/bml3mp1805.c",
+		MAME_DIR .. "src/devices/bus/bml3/bml3mp1805.cpp",
 		MAME_DIR .. "src/devices/bus/bml3/bml3mp1805.h",
-		MAME_DIR .. "src/devices/bus/bml3/bml3kanji.c",
+		MAME_DIR .. "src/devices/bus/bml3/bml3kanji.cpp",
 		MAME_DIR .. "src/devices/bus/bml3/bml3kanji.h",
 	}
 end
@@ -2152,19 +2152,19 @@ end
 ---------------------------------------------------
 if (BUSES["COCO"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/coco/cococart.c",
+		MAME_DIR .. "src/devices/bus/coco/cococart.cpp",
 		MAME_DIR .. "src/devices/bus/coco/cococart.h",
-		MAME_DIR .. "src/devices/bus/coco/coco_232.c",
+		MAME_DIR .. "src/devices/bus/coco/coco_232.cpp",
 		MAME_DIR .. "src/devices/bus/coco/coco_232.h",
-		MAME_DIR .. "src/devices/bus/coco/coco_orch90.c",
+		MAME_DIR .. "src/devices/bus/coco/coco_orch90.cpp",
 		MAME_DIR .. "src/devices/bus/coco/coco_orch90.h",
-		MAME_DIR .. "src/devices/bus/coco/coco_pak.c",
+		MAME_DIR .. "src/devices/bus/coco/coco_pak.cpp",
 		MAME_DIR .. "src/devices/bus/coco/coco_pak.h",
-		MAME_DIR .. "src/devices/bus/coco/coco_fdc.c",
+		MAME_DIR .. "src/devices/bus/coco/coco_fdc.cpp",
 		MAME_DIR .. "src/devices/bus/coco/coco_fdc.h",
-		MAME_DIR .. "src/devices/bus/coco/coco_multi.c",
+		MAME_DIR .. "src/devices/bus/coco/coco_multi.cpp",
 		MAME_DIR .. "src/devices/bus/coco/coco_multi.h",
-		MAME_DIR .. "src/devices/bus/coco/coco_dwsock.c",
+		MAME_DIR .. "src/devices/bus/coco/coco_dwsock.cpp",
 		MAME_DIR .. "src/devices/bus/coco/coco_dwsock.h",
 	}
 end
@@ -2175,35 +2175,35 @@ end
 ---------------------------------------------------
 if (BUSES["CPC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/cpc/cpcexp.c",
+		MAME_DIR .. "src/devices/bus/cpc/cpcexp.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/cpcexp.h",
-		MAME_DIR .. "src/devices/bus/cpc/cpc_ssa1.c",
+		MAME_DIR .. "src/devices/bus/cpc/cpc_ssa1.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/cpc_ssa1.h",
-		MAME_DIR .. "src/devices/bus/cpc/cpc_rom.c",
+		MAME_DIR .. "src/devices/bus/cpc/cpc_rom.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/cpc_rom.h",
-		MAME_DIR .. "src/devices/bus/cpc/cpc_pds.c",
+		MAME_DIR .. "src/devices/bus/cpc/cpc_pds.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/cpc_pds.h",
-		MAME_DIR .. "src/devices/bus/cpc/cpc_rs232.c",
+		MAME_DIR .. "src/devices/bus/cpc/cpc_rs232.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/cpc_rs232.h",
-		MAME_DIR .. "src/devices/bus/cpc/mface2.c",
+		MAME_DIR .. "src/devices/bus/cpc/mface2.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/mface2.h",
-		MAME_DIR .. "src/devices/bus/cpc/symbfac2.c",
+		MAME_DIR .. "src/devices/bus/cpc/symbfac2.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/symbfac2.h",
-		MAME_DIR .. "src/devices/bus/cpc/amdrum.c",
+		MAME_DIR .. "src/devices/bus/cpc/amdrum.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/amdrum.h",
-		MAME_DIR .. "src/devices/bus/cpc/playcity.c",
+		MAME_DIR .. "src/devices/bus/cpc/playcity.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/playcity.h",
-		MAME_DIR .. "src/devices/bus/cpc/smartwatch.c",
+		MAME_DIR .. "src/devices/bus/cpc/smartwatch.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/smartwatch.h",
-		MAME_DIR .. "src/devices/bus/cpc/brunword4.c",
+		MAME_DIR .. "src/devices/bus/cpc/brunword4.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/brunword4.h",
-		MAME_DIR .. "src/devices/bus/cpc/hd20.c",
+		MAME_DIR .. "src/devices/bus/cpc/hd20.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/hd20.h",
-		MAME_DIR .. "src/devices/bus/cpc/ddi1.c",
+		MAME_DIR .. "src/devices/bus/cpc/ddi1.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/ddi1.h",
-		MAME_DIR .. "src/devices/bus/cpc/magicsound.c",
+		MAME_DIR .. "src/devices/bus/cpc/magicsound.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/magicsound.h",
-		MAME_DIR .. "src/devices/bus/cpc/doubler.c",
+		MAME_DIR .. "src/devices/bus/cpc/doubler.cpp",
 		MAME_DIR .. "src/devices/bus/cpc/doubler.h",
 	}
 end
@@ -2214,11 +2214,11 @@ end
 ---------------------------------------------------
 if (BUSES["EPSON_SIO"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/epson_sio/epson_sio.c",
+		MAME_DIR .. "src/devices/bus/epson_sio/epson_sio.cpp",
 		MAME_DIR .. "src/devices/bus/epson_sio/epson_sio.h",
-		MAME_DIR .. "src/devices/bus/epson_sio/pf10.c",
+		MAME_DIR .. "src/devices/bus/epson_sio/pf10.cpp",
 		MAME_DIR .. "src/devices/bus/epson_sio/pf10.h",
-		MAME_DIR .. "src/devices/bus/epson_sio/tf20.c",
+		MAME_DIR .. "src/devices/bus/epson_sio/tf20.cpp",
 		MAME_DIR .. "src/devices/bus/epson_sio/tf20.h",
 	}
 end
@@ -2229,9 +2229,9 @@ end
 ---------------------------------------------------
 if (BUSES["PCE"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/pce/pce_slot.c",
+		MAME_DIR .. "src/devices/bus/pce/pce_slot.cpp",
 		MAME_DIR .. "src/devices/bus/pce/pce_slot.h",
-		MAME_DIR .. "src/devices/bus/pce/pce_rom.c",
+		MAME_DIR .. "src/devices/bus/pce/pce_rom.cpp",
 		MAME_DIR .. "src/devices/bus/pce/pce_rom.h",
 	}
 end
@@ -2242,9 +2242,9 @@ end
 ---------------------------------------------------
 if (BUSES["SCV"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/scv/slot.c",
+		MAME_DIR .. "src/devices/bus/scv/slot.cpp",
 		MAME_DIR .. "src/devices/bus/scv/slot.h",
-		MAME_DIR .. "src/devices/bus/scv/rom.c",
+		MAME_DIR .. "src/devices/bus/scv/rom.cpp",
 		MAME_DIR .. "src/devices/bus/scv/rom.h",
 	}
 end
@@ -2255,11 +2255,11 @@ end
 ---------------------------------------------------
 if (BUSES["X68K"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/x68k/x68kexp.c",
+		MAME_DIR .. "src/devices/bus/x68k/x68kexp.cpp",
 		MAME_DIR .. "src/devices/bus/x68k/x68kexp.h",
-		MAME_DIR .. "src/devices/bus/x68k/x68k_neptunex.c",
+		MAME_DIR .. "src/devices/bus/x68k/x68k_neptunex.cpp",
 		MAME_DIR .. "src/devices/bus/x68k/x68k_neptunex.h",
-		MAME_DIR .. "src/devices/bus/x68k/x68k_scsiext.c",
+		MAME_DIR .. "src/devices/bus/x68k/x68k_scsiext.cpp",
 		MAME_DIR .. "src/devices/bus/x68k/x68k_scsiext.h",
 	}
 end
@@ -2270,13 +2270,13 @@ end
 ---------------------------------------------------
 if (BUSES["ABCKB"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/abckb/abckb.c",
+		MAME_DIR .. "src/devices/bus/abckb/abckb.cpp",
 		MAME_DIR .. "src/devices/bus/abckb/abckb.h",
-		MAME_DIR .. "src/devices/bus/abckb/abc77.c",
+		MAME_DIR .. "src/devices/bus/abckb/abc77.cpp",
 		MAME_DIR .. "src/devices/bus/abckb/abc77.h",
-		MAME_DIR .. "src/devices/bus/abckb/abc99.c",
+		MAME_DIR .. "src/devices/bus/abckb/abc99.cpp",
 		MAME_DIR .. "src/devices/bus/abckb/abc99.h",
-		MAME_DIR .. "src/devices/bus/abckb/abc800kb.c",
+		MAME_DIR .. "src/devices/bus/abckb/abc800kb.cpp",
 		MAME_DIR .. "src/devices/bus/abckb/abc800kb.h",
 	}
 end
@@ -2287,7 +2287,7 @@ end
 ---------------------------------------------------
 if (BUSES["COMPUCOLOR"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/compucolor/floppy.c",
+		MAME_DIR .. "src/devices/bus/compucolor/floppy.cpp",
 		MAME_DIR .. "src/devices/bus/compucolor/floppy.h",
 	}
 end
@@ -2298,27 +2298,27 @@ end
 ---------------------------------------------------
 if (BUSES["SCSI"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/scsi/scsi.c",
+		MAME_DIR .. "src/devices/bus/scsi/scsi.cpp",
 		MAME_DIR .. "src/devices/bus/scsi/scsi.h",
-		MAME_DIR .. "src/devices/bus/scsi/scsicd.c",
+		MAME_DIR .. "src/devices/bus/scsi/scsicd.cpp",
 		MAME_DIR .. "src/devices/bus/scsi/scsicd.h",
-		MAME_DIR .. "src/devices/bus/scsi/scsihd.c",
+		MAME_DIR .. "src/devices/bus/scsi/scsihd.cpp",
 		MAME_DIR .. "src/devices/bus/scsi/scsihd.h",
-		MAME_DIR .. "src/devices/bus/scsi/scsihle.c",
+		MAME_DIR .. "src/devices/bus/scsi/scsihle.cpp",
 		MAME_DIR .. "src/devices/bus/scsi/scsihle.h",
-		MAME_DIR .. "src/devices/bus/scsi/cdu76s.c",
+		MAME_DIR .. "src/devices/bus/scsi/cdu76s.cpp",
 		MAME_DIR .. "src/devices/bus/scsi/cdu76s.h",
-		MAME_DIR .. "src/devices/bus/scsi/acb4070.c",
+		MAME_DIR .. "src/devices/bus/scsi/acb4070.cpp",
 		MAME_DIR .. "src/devices/bus/scsi/acb4070.h",
-		MAME_DIR .. "src/devices/bus/scsi/d9060hd.c",
+		MAME_DIR .. "src/devices/bus/scsi/d9060hd.cpp",
 		MAME_DIR .. "src/devices/bus/scsi/d9060hd.h",
-		MAME_DIR .. "src/devices/bus/scsi/sa1403d.c",
+		MAME_DIR .. "src/devices/bus/scsi/sa1403d.cpp",
 		MAME_DIR .. "src/devices/bus/scsi/sa1403d.h",
-		MAME_DIR .. "src/devices/bus/scsi/s1410.c",
+		MAME_DIR .. "src/devices/bus/scsi/s1410.cpp",
 		MAME_DIR .. "src/devices/bus/scsi/s1410.h",
-		MAME_DIR .. "src/devices/bus/scsi/pc9801_sasi.c",
+		MAME_DIR .. "src/devices/bus/scsi/pc9801_sasi.cpp",
 		MAME_DIR .. "src/devices/bus/scsi/pc9801_sasi.h",
-		MAME_DIR .. "src/devices/bus/scsi/omti5100.c",
+		MAME_DIR .. "src/devices/bus/scsi/omti5100.cpp",
 		MAME_DIR .. "src/devices/bus/scsi/omti5100.h",
 	}
 end
@@ -2329,9 +2329,9 @@ end
 ---------------------------------------------------
 if (BUSES["MACPDS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/macpds/macpds.c",
+		MAME_DIR .. "src/devices/bus/macpds/macpds.cpp",
 		MAME_DIR .. "src/devices/bus/macpds/macpds.h",
-		MAME_DIR .. "src/devices/bus/macpds/pds_tpdfpd.c",
+		MAME_DIR .. "src/devices/bus/macpds/pds_tpdfpd.cpp",
 		MAME_DIR .. "src/devices/bus/macpds/pds_tpdfpd.h",
 	}
 end
@@ -2342,11 +2342,11 @@ end
 ---------------------------------------------------
 if (BUSES["ORICEXT"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/oricext/oricext.c",
+		MAME_DIR .. "src/devices/bus/oricext/oricext.cpp",
 		MAME_DIR .. "src/devices/bus/oricext/oricext.h",
-		MAME_DIR .. "src/devices/bus/oricext/jasmin.c",
+		MAME_DIR .. "src/devices/bus/oricext/jasmin.cpp",
 		MAME_DIR .. "src/devices/bus/oricext/jasmin.h",
-		MAME_DIR .. "src/devices/bus/oricext/microdisc.c",
+		MAME_DIR .. "src/devices/bus/oricext/microdisc.cpp",
 		MAME_DIR .. "src/devices/bus/oricext/microdisc.h",
 	}
 end
@@ -2358,11 +2358,11 @@ end
 
 if (BUSES["A1BUS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/a1bus/a1bus.c",
+		MAME_DIR .. "src/devices/bus/a1bus/a1bus.cpp",
 		MAME_DIR .. "src/devices/bus/a1bus/a1bus.h",
-		MAME_DIR .. "src/devices/bus/a1bus/a1cassette.c",
+		MAME_DIR .. "src/devices/bus/a1bus/a1cassette.cpp",
 		MAME_DIR .. "src/devices/bus/a1bus/a1cassette.h",
-		MAME_DIR .. "src/devices/bus/a1bus/a1cffa.c",
+		MAME_DIR .. "src/devices/bus/a1bus/a1cffa.cpp",
 		MAME_DIR .. "src/devices/bus/a1bus/a1cffa.h",
 	}
 end
@@ -2374,19 +2374,19 @@ end
 
 if (BUSES["ZORRO"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/amiga/zorro/zorro.c",
+		MAME_DIR .. "src/devices/bus/amiga/zorro/zorro.cpp",
 		MAME_DIR .. "src/devices/bus/amiga/zorro/zorro.h",
-		MAME_DIR .. "src/devices/bus/amiga/zorro/cards.c",
+		MAME_DIR .. "src/devices/bus/amiga/zorro/cards.cpp",
 		MAME_DIR .. "src/devices/bus/amiga/zorro/cards.h",
-		MAME_DIR .. "src/devices/bus/amiga/zorro/a2052.c",
+		MAME_DIR .. "src/devices/bus/amiga/zorro/a2052.cpp",
 		MAME_DIR .. "src/devices/bus/amiga/zorro/a2052.h",
-		MAME_DIR .. "src/devices/bus/amiga/zorro/a2232.c",
+		MAME_DIR .. "src/devices/bus/amiga/zorro/a2232.cpp",
 		MAME_DIR .. "src/devices/bus/amiga/zorro/a2232.h",
-		MAME_DIR .. "src/devices/bus/amiga/zorro/a590.c",
+		MAME_DIR .. "src/devices/bus/amiga/zorro/a590.cpp",
 		MAME_DIR .. "src/devices/bus/amiga/zorro/a590.h",
-		MAME_DIR .. "src/devices/bus/amiga/zorro/action_replay.c",
+		MAME_DIR .. "src/devices/bus/amiga/zorro/action_replay.cpp",
 		MAME_DIR .. "src/devices/bus/amiga/zorro/action_replay.h",
-		MAME_DIR .. "src/devices/bus/amiga/zorro/buddha.c",
+		MAME_DIR .. "src/devices/bus/amiga/zorro/buddha.cpp",
 		MAME_DIR .. "src/devices/bus/amiga/zorro/buddha.h",
 	}
 end
@@ -2398,37 +2398,37 @@ end
 
 if (BUSES["QL"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/ql/exp.c",
+		MAME_DIR .. "src/devices/bus/ql/exp.cpp",
 		MAME_DIR .. "src/devices/bus/ql/exp.h",
-		MAME_DIR .. "src/devices/bus/ql/cst_qdisc.c",
+		MAME_DIR .. "src/devices/bus/ql/cst_qdisc.cpp",
 		MAME_DIR .. "src/devices/bus/ql/cst_qdisc.h",
-		MAME_DIR .. "src/devices/bus/ql/cst_q_plus4.c",
+		MAME_DIR .. "src/devices/bus/ql/cst_q_plus4.cpp",
 		MAME_DIR .. "src/devices/bus/ql/cst_q_plus4.h",
-		MAME_DIR .. "src/devices/bus/ql/cumana_fdi.c",
+		MAME_DIR .. "src/devices/bus/ql/cumana_fdi.cpp",
 		MAME_DIR .. "src/devices/bus/ql/cumana_fdi.h",
-		MAME_DIR .. "src/devices/bus/ql/kempston_di.c",
+		MAME_DIR .. "src/devices/bus/ql/kempston_di.cpp",
 		MAME_DIR .. "src/devices/bus/ql/kempston_di.h",
-		MAME_DIR .. "src/devices/bus/ql/miracle_gold_card.c",
+		MAME_DIR .. "src/devices/bus/ql/miracle_gold_card.cpp",
 		MAME_DIR .. "src/devices/bus/ql/miracle_gold_card.h",
-		MAME_DIR .. "src/devices/bus/ql/mp_fdi.c",
+		MAME_DIR .. "src/devices/bus/ql/mp_fdi.cpp",
 		MAME_DIR .. "src/devices/bus/ql/mp_fdi.h",
-		MAME_DIR .. "src/devices/bus/ql/opd_basic_master.c",
+		MAME_DIR .. "src/devices/bus/ql/opd_basic_master.cpp",
 		MAME_DIR .. "src/devices/bus/ql/opd_basic_master.h",
-		MAME_DIR .. "src/devices/bus/ql/pcml_qdisk.c",
+		MAME_DIR .. "src/devices/bus/ql/pcml_qdisk.cpp",
 		MAME_DIR .. "src/devices/bus/ql/pcml_qdisk.h",
-		MAME_DIR .. "src/devices/bus/ql/qubide.c",
+		MAME_DIR .. "src/devices/bus/ql/qubide.cpp",
 		MAME_DIR .. "src/devices/bus/ql/qubide.h",
-		MAME_DIR .. "src/devices/bus/ql/sandy_superdisk.c",
+		MAME_DIR .. "src/devices/bus/ql/sandy_superdisk.cpp",
 		MAME_DIR .. "src/devices/bus/ql/sandy_superdisk.h",
-		MAME_DIR .. "src/devices/bus/ql/sandy_superqboard.c",
+		MAME_DIR .. "src/devices/bus/ql/sandy_superqboard.cpp",
 		MAME_DIR .. "src/devices/bus/ql/sandy_superqboard.h",
-		MAME_DIR .. "src/devices/bus/ql/trumpcard.c",
+		MAME_DIR .. "src/devices/bus/ql/trumpcard.cpp",
 		MAME_DIR .. "src/devices/bus/ql/trumpcard.h",
-		MAME_DIR .. "src/devices/bus/ql/rom.c",
+		MAME_DIR .. "src/devices/bus/ql/rom.cpp",
 		MAME_DIR .. "src/devices/bus/ql/rom.h",
-		MAME_DIR .. "src/devices/bus/ql/miracle_hd.c",
+		MAME_DIR .. "src/devices/bus/ql/miracle_hd.cpp",
 		MAME_DIR .. "src/devices/bus/ql/miracle_hd.h",
-		MAME_DIR .. "src/devices/bus/ql/std.c",
+		MAME_DIR .. "src/devices/bus/ql/std.cpp",
 		MAME_DIR .. "src/devices/bus/ql/std.h",
 	}
 end
@@ -2440,17 +2440,17 @@ end
 
 if (BUSES["VTECH_MEMEXP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/vtech/memexp/memexp.c",
+		MAME_DIR .. "src/devices/bus/vtech/memexp/memexp.cpp",
 		MAME_DIR .. "src/devices/bus/vtech/memexp/memexp.h",
-		MAME_DIR .. "src/devices/bus/vtech/memexp/carts.c",
+		MAME_DIR .. "src/devices/bus/vtech/memexp/carts.cpp",
 		MAME_DIR .. "src/devices/bus/vtech/memexp/carts.h",
-		MAME_DIR .. "src/devices/bus/vtech/memexp/floppy.c",
+		MAME_DIR .. "src/devices/bus/vtech/memexp/floppy.cpp",
 		MAME_DIR .. "src/devices/bus/vtech/memexp/floppy.h",
-		MAME_DIR .. "src/devices/bus/vtech/memexp/memory.c",
+		MAME_DIR .. "src/devices/bus/vtech/memexp/memory.cpp",
 		MAME_DIR .. "src/devices/bus/vtech/memexp/memory.h",
-		MAME_DIR .. "src/devices/bus/vtech/memexp/rs232.c",
+		MAME_DIR .. "src/devices/bus/vtech/memexp/rs232.cpp",
 		MAME_DIR .. "src/devices/bus/vtech/memexp/rs232.h",
-		MAME_DIR .. "src/devices/bus/vtech/memexp/wordpro.c",
+		MAME_DIR .. "src/devices/bus/vtech/memexp/wordpro.cpp",
 		MAME_DIR .. "src/devices/bus/vtech/memexp/wordpro.h",
 	}
 end
@@ -2462,13 +2462,13 @@ end
 
 if (BUSES["VTECH_IOEXP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/vtech/ioexp/ioexp.c",
+		MAME_DIR .. "src/devices/bus/vtech/ioexp/ioexp.cpp",
 		MAME_DIR .. "src/devices/bus/vtech/ioexp/ioexp.h",
-		MAME_DIR .. "src/devices/bus/vtech/ioexp/carts.c",
+		MAME_DIR .. "src/devices/bus/vtech/ioexp/carts.cpp",
 		MAME_DIR .. "src/devices/bus/vtech/ioexp/carts.h",
-		MAME_DIR .. "src/devices/bus/vtech/ioexp/joystick.c",
+		MAME_DIR .. "src/devices/bus/vtech/ioexp/joystick.cpp",
 		MAME_DIR .. "src/devices/bus/vtech/ioexp/joystick.h",
-		MAME_DIR .. "src/devices/bus/vtech/ioexp/printer.c",
+		MAME_DIR .. "src/devices/bus/vtech/ioexp/printer.cpp",
 		MAME_DIR .. "src/devices/bus/vtech/ioexp/printer.h",
 	}
 end
@@ -2480,9 +2480,9 @@ end
 
 if (BUSES["WSWAN"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/wswan/slot.c",
+		MAME_DIR .. "src/devices/bus/wswan/slot.cpp",
 		MAME_DIR .. "src/devices/bus/wswan/slot.h",
-		MAME_DIR .. "src/devices/bus/wswan/rom.c",
+		MAME_DIR .. "src/devices/bus/wswan/rom.cpp",
 		MAME_DIR .. "src/devices/bus/wswan/rom.h",
 	}
 end
@@ -2494,13 +2494,13 @@ end
 
 if (BUSES["PSX_CONTROLLER"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/psx/ctlrport.c",
+		MAME_DIR .. "src/devices/bus/psx/ctlrport.cpp",
 		MAME_DIR .. "src/devices/bus/psx/ctlrport.h",
-		MAME_DIR .. "src/devices/bus/psx/analogue.c",
+		MAME_DIR .. "src/devices/bus/psx/analogue.cpp",
 		MAME_DIR .. "src/devices/bus/psx/analogue.h",
-		MAME_DIR .. "src/devices/bus/psx/multitap.c",
+		MAME_DIR .. "src/devices/bus/psx/multitap.cpp",
 		MAME_DIR .. "src/devices/bus/psx/multitap.h",
-		MAME_DIR .. "src/devices/bus/psx/memcard.c",
+		MAME_DIR .. "src/devices/bus/psx/memcard.cpp",
 		MAME_DIR .. "src/devices/bus/psx/memcard.h",
 	}
 end
@@ -2512,13 +2512,13 @@ end
 
 if (BUSES["NASBUS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/nasbus/nasbus.c",
+		MAME_DIR .. "src/devices/bus/nasbus/nasbus.cpp",
 		MAME_DIR .. "src/devices/bus/nasbus/nasbus.h",
-		MAME_DIR .. "src/devices/bus/nasbus/cards.c",
+		MAME_DIR .. "src/devices/bus/nasbus/cards.cpp",
 		MAME_DIR .. "src/devices/bus/nasbus/cards.h",
-		MAME_DIR .. "src/devices/bus/nasbus/avc.c",
+		MAME_DIR .. "src/devices/bus/nasbus/avc.cpp",
 		MAME_DIR .. "src/devices/bus/nasbus/avc.h",
-		MAME_DIR .. "src/devices/bus/nasbus/floppy.c",
+		MAME_DIR .. "src/devices/bus/nasbus/floppy.cpp",
 		MAME_DIR .. "src/devices/bus/nasbus/floppy.h",
 	}
 end
@@ -2530,11 +2530,11 @@ end
 
 if (BUSES["CGENIE_EXPANSION"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/cgenie/expansion/expansion.c",
+		MAME_DIR .. "src/devices/bus/cgenie/expansion/expansion.cpp",
 		MAME_DIR .. "src/devices/bus/cgenie/expansion/expansion.h",
-		MAME_DIR .. "src/devices/bus/cgenie/expansion/carts.c",
+		MAME_DIR .. "src/devices/bus/cgenie/expansion/carts.cpp",
 		MAME_DIR .. "src/devices/bus/cgenie/expansion/carts.h",
-		MAME_DIR .. "src/devices/bus/cgenie/expansion/floppy.c",
+		MAME_DIR .. "src/devices/bus/cgenie/expansion/floppy.cpp",
 		MAME_DIR .. "src/devices/bus/cgenie/expansion/floppy.h",
 	}
 end
@@ -2546,13 +2546,13 @@ end
 
 if (BUSES["CGENIE_PARALLEL"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/bus/cgenie/parallel/parallel.c",
+		MAME_DIR .. "src/devices/bus/cgenie/parallel/parallel.cpp",
 		MAME_DIR .. "src/devices/bus/cgenie/parallel/parallel.h",
-		MAME_DIR .. "src/devices/bus/cgenie/parallel/carts.c",
+		MAME_DIR .. "src/devices/bus/cgenie/parallel/carts.cpp",
 		MAME_DIR .. "src/devices/bus/cgenie/parallel/carts.h",
-		MAME_DIR .. "src/devices/bus/cgenie/parallel/joystick.c",
+		MAME_DIR .. "src/devices/bus/cgenie/parallel/joystick.cpp",
 		MAME_DIR .. "src/devices/bus/cgenie/parallel/joystick.h",
-		MAME_DIR .. "src/devices/bus/cgenie/parallel/printer.c",
+		MAME_DIR .. "src/devices/bus/cgenie/parallel/printer.cpp",
 		MAME_DIR .. "src/devices/bus/cgenie/parallel/printer.h",
 	}
 end
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 159a1090519..1090b63bbc2 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -14,7 +14,7 @@
 --------------------------------------------------
 
 files {
-	MAME_DIR .. "src/devices/cpu/vtlb.c",
+	MAME_DIR .. "src/devices/cpu/vtlb.cpp",
 }
 
 --------------------------------------------------
@@ -23,24 +23,24 @@ files {
 
 if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/drcbec.c",
+		MAME_DIR .. "src/devices/cpu/drcbec.cpp",
 		MAME_DIR .. "src/devices/cpu/drcbec.h",
-		MAME_DIR .. "src/devices/cpu/drcbeut.c",
+		MAME_DIR .. "src/devices/cpu/drcbeut.cpp",
 		MAME_DIR .. "src/devices/cpu/drcbeut.h",
-		MAME_DIR .. "src/devices/cpu/drccache.c",
+		MAME_DIR .. "src/devices/cpu/drccache.cpp",
 		MAME_DIR .. "src/devices/cpu/drccache.h",
-		MAME_DIR .. "src/devices/cpu/drcfe.c",
+		MAME_DIR .. "src/devices/cpu/drcfe.cpp",
 		MAME_DIR .. "src/devices/cpu/drcfe.h",
-		MAME_DIR .. "src/devices/cpu/drcuml.c",
+		MAME_DIR .. "src/devices/cpu/drcuml.cpp",
 		MAME_DIR .. "src/devices/cpu/drcuml.h",
-		MAME_DIR .. "src/devices/cpu/uml.c",
+		MAME_DIR .. "src/devices/cpu/uml.cpp",
 		MAME_DIR .. "src/devices/cpu/uml.h",
-		MAME_DIR .. "src/devices/cpu/i386/i386dasm.c",
-		MAME_DIR .. "src/devices/cpu/x86log.c",
+		MAME_DIR .. "src/devices/cpu/i386/i386dasm.cpp",
+		MAME_DIR .. "src/devices/cpu/x86log.cpp",
 		MAME_DIR .. "src/devices/cpu/x86log.h",
-		MAME_DIR .. "src/devices/cpu/drcbex86.c",
+		MAME_DIR .. "src/devices/cpu/drcbex86.cpp",
 		MAME_DIR .. "src/devices/cpu/drcbex86.h",
-		MAME_DIR .. "src/devices/cpu/drcbex64.c",
+		MAME_DIR .. "src/devices/cpu/drcbex64.cpp",
 		MAME_DIR .. "src/devices/cpu/drcbex64.h",
 		MAME_DIR .. "src/devices/cpu/drcumlsh.h",
 		MAME_DIR .. "src/devices/cpu/vtlb.h",
@@ -55,13 +55,13 @@ end
 
 if (CPUS["8X300"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/8x300/8x300.c",
+		MAME_DIR .. "src/devices/cpu/8x300/8x300.cpp",
 		MAME_DIR .. "src/devices/cpu/8x300/8x300.h",
 	}
 end
 
 if (CPUS["8X300"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/8x300/8x300dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/8x300/8x300dasm.cpp")
 end
 
 --------------------------------------------------
@@ -71,13 +71,13 @@ end
 
 if (CPUS["ARC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/arc/arc.c",
+		MAME_DIR .. "src/devices/cpu/arc/arc.cpp",
 		MAME_DIR .. "src/devices/cpu/arc/arc.h",
 	}
 end
 
 if (CPUS["ARC"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arc/arcdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arc/arcdasm.cpp")
 end
 
 --------------------------------------------------
@@ -87,13 +87,13 @@ end
 
 if (CPUS["ARCOMPACT"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/arcompact/arcompact.c",
+		MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp",
 		MAME_DIR .. "src/devices/cpu/arcompact/arcompact.h",
-		MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.c",
+		MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.cpp",
 	}
 	dependency {
-		{ MAME_DIR .. "src/devices/cpu/arcompact/arcompact.c",  	   GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
-		{ MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.c", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
+		{ MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp",  	   GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
+		{ MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
 	}
 
 	custombuildtask {
@@ -102,10 +102,10 @@ if (CPUS["ARCOMPACT"]~=null) then
 end
 
 if (CPUS["ARCOMPACT"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arcompact/arcompactdasm.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arcompact/arcompactdasm_dispatch.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arcompact/arcompactdasm_ops.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arcompact/arcompact_common.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arcompact/arcompactdasm.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arcompact/arcompactdasm_dispatch.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arcompact/arcompactdasm_ops.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arcompact/arcompact_common.cpp")
 end
 
 --------------------------------------------------
@@ -117,28 +117,28 @@ end
 
 if (CPUS["ARM"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/arm/arm.c",
+		MAME_DIR .. "src/devices/cpu/arm/arm.cpp",
 		MAME_DIR .. "src/devices/cpu/arm/arm.h",
 	}
 end
 
 if (CPUS["ARM"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arm/armdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arm/armdasm.cpp")
 end
 
 if (CPUS["ARM7"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/arm7/arm7.c",
+		MAME_DIR .. "src/devices/cpu/arm7/arm7.cpp",
 		MAME_DIR .. "src/devices/cpu/arm7/arm7.h",
-		MAME_DIR .. "src/devices/cpu/arm7/arm7thmb.c",
-		MAME_DIR .. "src/devices/cpu/arm7/arm7ops.c",
-		MAME_DIR .. "src/devices/cpu/arm7/lpc210x.c",
+		MAME_DIR .. "src/devices/cpu/arm7/arm7thmb.cpp",
+		MAME_DIR .. "src/devices/cpu/arm7/arm7ops.cpp",
+		MAME_DIR .. "src/devices/cpu/arm7/lpc210x.cpp",
 		MAME_DIR .. "src/devices/cpu/arm7/lpc210x.h",
 	}
 end
 
 if (CPUS["ARM7"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arm7/arm7dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/arm7/arm7dasm.cpp")
 end
 
 --------------------------------------------------
@@ -148,13 +148,13 @@ end
 
 if (CPUS["SE3208"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/se3208/se3208.c",
+		MAME_DIR .. "src/devices/cpu/se3208/se3208.cpp",
 		MAME_DIR .. "src/devices/cpu/se3208/se3208.h",
 	}
 end
 
 if (CPUS["SE3208"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/se3208/se3208dis.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/se3208/se3208dis.cpp")
 end
 
 --------------------------------------------------
@@ -164,14 +164,14 @@ end
 
 if (CPUS["AMIS2000"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/amis2000/amis2000.c",
+		MAME_DIR .. "src/devices/cpu/amis2000/amis2000.cpp",
 		MAME_DIR .. "src/devices/cpu/amis2000/amis2000.h",
-		MAME_DIR .. "src/devices/cpu/amis2000/amis2000op.c",
+		MAME_DIR .. "src/devices/cpu/amis2000/amis2000op.cpp",
 	}
 end
 
 if (CPUS["AMIS2000"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/amis2000/amis2000d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/amis2000/amis2000d.cpp")
 end
 
 --------------------------------------------------
@@ -181,13 +181,13 @@ end
 
 if (CPUS["ALPHA8201"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/alph8201/alph8201.c",
+		MAME_DIR .. "src/devices/cpu/alph8201/alph8201.cpp",
 		MAME_DIR .. "src/devices/cpu/alph8201/alph8201.h",
 	}
 end
 
 if (CPUS["ALPHA8201"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/alph8201/8201dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/alph8201/8201dasm.cpp")
 end
 
 --------------------------------------------------
@@ -197,13 +197,13 @@ end
 
 if (CPUS["ADSP21XX"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/adsp2100/adsp2100.c",
+		MAME_DIR .. "src/devices/cpu/adsp2100/adsp2100.cpp",
 		MAME_DIR .. "src/devices/cpu/adsp2100/adsp2100.h",
 	}
 end
 
 if (CPUS["ADSP21XX"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/adsp2100/2100dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/adsp2100/2100dasm.cpp")
 end
 
 --------------------------------------------------
@@ -213,13 +213,13 @@ end
 
 if (CPUS["ADSP21062"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/sharc/sharc.c",
+		MAME_DIR .. "src/devices/cpu/sharc/sharc.cpp",
 		MAME_DIR .. "src/devices/cpu/sharc/sharc.h",
 	}
 end
 
 if (CPUS["ADSP21062"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sharc/sharcdsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sharc/sharcdsm.cpp")
 end
 
 --------------------------------------------------
@@ -229,13 +229,13 @@ end
 
 if (CPUS["APEXC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/apexc/apexc.c",
+		MAME_DIR .. "src/devices/cpu/apexc/apexc.cpp",
 		MAME_DIR .. "src/devices/cpu/apexc/apexc.h",
 	}
 end
 
 if (CPUS["APEXC"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/apexc/apexcdsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/apexc/apexcdsm.cpp")
 end
 
 --------------------------------------------------
@@ -245,13 +245,13 @@ end
 
 if (CPUS["DSP16A"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/dsp16/dsp16.c",
+		MAME_DIR .. "src/devices/cpu/dsp16/dsp16.cpp",
 		MAME_DIR .. "src/devices/cpu/dsp16/dsp16.h",
 	}
 end
 
 if (CPUS["DSP16A"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp16/dsp16dis.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp16/dsp16dis.cpp")
 end
 
 --------------------------------------------------
@@ -261,13 +261,13 @@ end
 
 if (CPUS["DSP32C"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/dsp32/dsp32.c",
+		MAME_DIR .. "src/devices/cpu/dsp32/dsp32.cpp",
 		MAME_DIR .. "src/devices/cpu/dsp32/dsp32.h",
 	}
 end
 
 if (CPUS["DSP32C"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp32/dsp32dis.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp32/dsp32dis.cpp")
 end
 
 --------------------------------------------------
@@ -277,13 +277,13 @@ end
 
 if (CPUS["ASAP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/asap/asap.c",
+		MAME_DIR .. "src/devices/cpu/asap/asap.cpp",
 		MAME_DIR .. "src/devices/cpu/asap/asap.h",
 	}
 end
 
 if (CPUS["ASAP"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/asap/asapdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/asap/asapdasm.cpp")
 end
 
 --------------------------------------------------
@@ -293,13 +293,13 @@ end
 
 if (CPUS["AM29000"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/am29000/am29000.c",
+		MAME_DIR .. "src/devices/cpu/am29000/am29000.cpp",
 		MAME_DIR .. "src/devices/cpu/am29000/am29000.h",
 	}
 end
 
 if (CPUS["AM29000"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/am29000/am29dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/am29000/am29dasm.cpp")
 end
 
 --------------------------------------------------
@@ -309,13 +309,13 @@ end
 
 if (CPUS["JAGUAR"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/jaguar/jaguar.c",
+		MAME_DIR .. "src/devices/cpu/jaguar/jaguar.cpp",
 		MAME_DIR .. "src/devices/cpu/jaguar/jaguar.h",
 	}
 end
 
 if (CPUS["JAGUAR"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/jaguar/jagdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/jaguar/jagdasm.cpp")
 end
 
 --------------------------------------------------
@@ -325,13 +325,13 @@ end
 
 if (CPUS["CUBEQCPU"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/cubeqcpu/cubeqcpu.c",
+		MAME_DIR .. "src/devices/cpu/cubeqcpu/cubeqcpu.cpp",
 		MAME_DIR .. "src/devices/cpu/cubeqcpu/cubeqcpu.h",
 	}
 end
 
 if (CPUS["CUBEQCPU"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cubeqcpu/cubedasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cubeqcpu/cubedasm.cpp")
 end
 
 --------------------------------------------------
@@ -341,7 +341,7 @@ end
 
 if (CPUS["ES5510"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/es5510/es5510.c",
+		MAME_DIR .. "src/devices/cpu/es5510/es5510.cpp",
 		MAME_DIR .. "src/devices/cpu/es5510/es5510.h",
 	}
 end
@@ -353,13 +353,13 @@ end
 
 if (CPUS["ESRIP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/esrip/esrip.c",
+		MAME_DIR .. "src/devices/cpu/esrip/esrip.cpp",
 		MAME_DIR .. "src/devices/cpu/esrip/esrip.h",
 	}
 end
 
 if (CPUS["ESRIP"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/esrip/esripdsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/esrip/esripdsm.cpp")
 end
 
 --------------------------------------------------
@@ -369,15 +369,15 @@ end
 
 if (CPUS["E0C6200"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200.c",
+		MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200.cpp",
 		MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200.h",
-		MAME_DIR .. "src/devices/cpu/e0c6200/e0c6s46.c",
+		MAME_DIR .. "src/devices/cpu/e0c6200/e0c6s46.cpp",
 		MAME_DIR .. "src/devices/cpu/e0c6200/e0c6s46.h",
 	}
 end
 
 if (CPUS["E0C6200"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200d.cpp")
 end
 
 --------------------------------------------------
@@ -387,13 +387,13 @@ end
 
 if (CPUS["COSMAC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/cosmac/cosmac.c",
+		MAME_DIR .. "src/devices/cpu/cosmac/cosmac.cpp",
 		MAME_DIR .. "src/devices/cpu/cosmac/cosmac.h",
 	}
 end
 
 if (CPUS["COSMAC"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cosmac/cosdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cosmac/cosdasm.cpp")
 end
 
 --------------------------------------------------
@@ -403,15 +403,15 @@ end
 
 if (CPUS["COP400"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/cop400/cop400.c",
+		MAME_DIR .. "src/devices/cpu/cop400/cop400.cpp",
 		MAME_DIR .. "src/devices/cpu/cop400/cop400.h",
 	}
 end
 
 if (CPUS["COP400"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop410ds.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop420ds.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop440ds.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop410ds.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop420ds.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cop400/cop440ds.cpp")
 end
 
 --------------------------------------------------
@@ -421,13 +421,13 @@ end
 
 if (CPUS["CP1610"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/cp1610/cp1610.c",
+		MAME_DIR .. "src/devices/cpu/cp1610/cp1610.cpp",
 		MAME_DIR .. "src/devices/cpu/cp1610/cp1610.h",
 	}
 end
 
 if (CPUS["CP1610"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cp1610/1610dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/cp1610/1610dasm.cpp")
 end
 
 --------------------------------------------------
@@ -437,13 +437,13 @@ end
 
 if (CPUS["CCPU"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/ccpu/ccpu.c",
+		MAME_DIR .. "src/devices/cpu/ccpu/ccpu.cpp",
 		MAME_DIR .. "src/devices/cpu/ccpu/ccpu.h",
 	}
 end
 
 if (CPUS["CCPU"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ccpu/ccpudasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ccpu/ccpudasm.cpp")
 end
 
 --------------------------------------------------
@@ -453,13 +453,13 @@ end
 
 if (CPUS["T11"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/t11/t11.c",
+		MAME_DIR .. "src/devices/cpu/t11/t11.cpp",
 		MAME_DIR .. "src/devices/cpu/t11/t11.h",
 	}
 end
 
 if (CPUS["T11"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/t11/t11dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/t11/t11dasm.cpp")
 end
 
 --------------------------------------------------
@@ -469,13 +469,13 @@ end
 
 if (CPUS["PDP8"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/pdp8/pdp8.c",
+		MAME_DIR .. "src/devices/cpu/pdp8/pdp8.cpp",
 		MAME_DIR .. "src/devices/cpu/pdp8/pdp8.h",
 	}
 end
 
 if (CPUS["PDP8"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pdp8/pdp8dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pdp8/pdp8dasm.cpp")
 end
 
 --------------------------------------------------
@@ -485,13 +485,13 @@ end
 
 if (CPUS["F8"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/f8/f8.c",
+		MAME_DIR .. "src/devices/cpu/f8/f8.cpp",
 		MAME_DIR .. "src/devices/cpu/f8/f8.h",
 	}
 end
 
 if (CPUS["F8"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/f8/f8dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/f8/f8dasm.cpp")
 end
 
 --------------------------------------------------
@@ -501,18 +501,18 @@ end
 
 if (CPUS["G65816"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/g65816/g65816.c",
+		MAME_DIR .. "src/devices/cpu/g65816/g65816.cpp",
 		MAME_DIR .. "src/devices/cpu/g65816/g65816.h",
-		MAME_DIR .. "src/devices/cpu/g65816/g65816o0.c",
-		MAME_DIR .. "src/devices/cpu/g65816/g65816o1.c",
-		MAME_DIR .. "src/devices/cpu/g65816/g65816o2.c",
-		MAME_DIR .. "src/devices/cpu/g65816/g65816o3.c",
-		MAME_DIR .. "src/devices/cpu/g65816/g65816o4.c",
+		MAME_DIR .. "src/devices/cpu/g65816/g65816o0.cpp",
+		MAME_DIR .. "src/devices/cpu/g65816/g65816o1.cpp",
+		MAME_DIR .. "src/devices/cpu/g65816/g65816o2.cpp",
+		MAME_DIR .. "src/devices/cpu/g65816/g65816o3.cpp",
+		MAME_DIR .. "src/devices/cpu/g65816/g65816o4.cpp",
 	}
 end
 
 if (CPUS["G65816"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/g65816/g65816ds.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/g65816/g65816ds.cpp")
 end
 
 --------------------------------------------------
@@ -522,51 +522,51 @@ end
 
 if (CPUS["H8"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/h8/h8.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8h.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8h.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8h.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8s2000.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8s2000.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8s2000.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8s2600.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8s2600.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8s2600.h",
-		MAME_DIR .. "src/devices/cpu/h8/h83337.c",
+		MAME_DIR .. "src/devices/cpu/h8/h83337.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h83337.h",
-		MAME_DIR .. "src/devices/cpu/h8/h83002.c",
+		MAME_DIR .. "src/devices/cpu/h8/h83002.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h83002.h",
-		MAME_DIR .. "src/devices/cpu/h8/h83006.c",
+		MAME_DIR .. "src/devices/cpu/h8/h83006.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h83006.h",
-		MAME_DIR .. "src/devices/cpu/h8/h83008.c",
+		MAME_DIR .. "src/devices/cpu/h8/h83008.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h83008.h",
-		MAME_DIR .. "src/devices/cpu/h8/h83048.c",
+		MAME_DIR .. "src/devices/cpu/h8/h83048.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h83048.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8s2245.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8s2245.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8s2245.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8s2320.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8s2320.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8s2320.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8s2357.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8s2357.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8s2357.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8s2655.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8s2655.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8s2655.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8_adc.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8_adc.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8_adc.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8_port.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8_port.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8_port.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8_intc.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8_intc.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8_intc.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8_timer8.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8_timer8.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8_timer8.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8_timer16.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8_timer16.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8_timer16.h",
-		MAME_DIR .. "src/devices/cpu/h8/h8_sci.c",
+		MAME_DIR .. "src/devices/cpu/h8/h8_sci.cpp",
 		MAME_DIR .. "src/devices/cpu/h8/h8_sci.h",
 	}
 	
 	dependency {
-		{ MAME_DIR .. "src/devices/cpu/h8/h8.c",       GEN_DIR .. "emu/cpu/h8/h8.inc" },
-		{ MAME_DIR .. "src/devices/cpu/h8/h8h.c",      GEN_DIR .. "emu/cpu/h8/h8h.inc" },
-		{ MAME_DIR .. "src/devices/cpu/h8/h8s2000.c",  GEN_DIR .. "emu/cpu/h8/h8s2000.inc" },
-		{ MAME_DIR .. "src/devices/cpu/h8/h8s2600.c",  GEN_DIR .. "emu/cpu/h8/h8s2600.inc" },
+		{ MAME_DIR .. "src/devices/cpu/h8/h8.cpp",       GEN_DIR .. "emu/cpu/h8/h8.inc" },
+		{ MAME_DIR .. "src/devices/cpu/h8/h8h.cpp",      GEN_DIR .. "emu/cpu/h8/h8h.inc" },
+		{ MAME_DIR .. "src/devices/cpu/h8/h8s2000.cpp",  GEN_DIR .. "emu/cpu/h8/h8s2000.inc" },
+		{ MAME_DIR .. "src/devices/cpu/h8/h8s2600.cpp",  GEN_DIR .. "emu/cpu/h8/h8s2600.inc" },
 	}
 
 	custombuildtask {
@@ -584,13 +584,13 @@ end
 
 if (CPUS["HCD62121"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121.c",
+		MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121.cpp",
 		MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121.h",
 	}
 end
 
 if (CPUS["HCD62121"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hcd62121/hcd62121d.cpp")
 end
 
 --------------------------------------------------
@@ -600,14 +600,14 @@ end
 
 if (CPUS["HMCS40"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/hmcs40/hmcs40.c",
+		MAME_DIR .. "src/devices/cpu/hmcs40/hmcs40.cpp",
 		MAME_DIR .. "src/devices/cpu/hmcs40/hmcs40.h",
-		MAME_DIR .. "src/devices/cpu/hmcs40/hmcs40op.c",
+		MAME_DIR .. "src/devices/cpu/hmcs40/hmcs40op.cpp",
 	}
 end
 
 if (CPUS["HMCS40"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hmcs40/hmcs40d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hmcs40/hmcs40d.cpp")
 end
 
 --------------------------------------------------
@@ -617,14 +617,14 @@ end
 
 if (CPUS["SH2"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/sh2/sh2.c",
+		MAME_DIR .. "src/devices/cpu/sh2/sh2.cpp",
 		MAME_DIR .. "src/devices/cpu/sh2/sh2.h",
-		MAME_DIR .. "src/devices/cpu/sh2/sh2fe.c",
+		MAME_DIR .. "src/devices/cpu/sh2/sh2fe.cpp",
 	}
 end
 
 if (CPUS["SH2"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sh2/sh2dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sh2/sh2dasm.cpp")
 end
 
 --------------------------------------------------
@@ -634,21 +634,21 @@ end
 
 if (CPUS["SH4"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/sh4/sh4.c",
+		MAME_DIR .. "src/devices/cpu/sh4/sh4.cpp",
 		MAME_DIR .. "src/devices/cpu/sh4/sh4.h",
-		MAME_DIR .. "src/devices/cpu/sh4/sh4comn.c",
+		MAME_DIR .. "src/devices/cpu/sh4/sh4comn.cpp",
 		MAME_DIR .. "src/devices/cpu/sh4/sh4comn.h",
-		MAME_DIR .. "src/devices/cpu/sh4/sh3comn.c",
+		MAME_DIR .. "src/devices/cpu/sh4/sh3comn.cpp",
 		MAME_DIR .. "src/devices/cpu/sh4/sh3comn.h",
-		MAME_DIR .. "src/devices/cpu/sh4/sh4tmu.c",
+		MAME_DIR .. "src/devices/cpu/sh4/sh4tmu.cpp",
 		MAME_DIR .. "src/devices/cpu/sh4/sh4tmu.h",
-		MAME_DIR .. "src/devices/cpu/sh4/sh4dmac.c",
+		MAME_DIR .. "src/devices/cpu/sh4/sh4dmac.cpp",
 		MAME_DIR .. "src/devices/cpu/sh4/sh4dmac.h",
 	}
 end
 
 if (CPUS["SH4"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sh4/sh4dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sh4/sh4dasm.cpp")
 end
 
 --------------------------------------------------
@@ -658,13 +658,13 @@ end
 
 if (CPUS["HPHYBRID"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/hphybrid/hphybrid.c",
+		MAME_DIR .. "src/devices/cpu/hphybrid/hphybrid.cpp",
 		MAME_DIR .. "src/devices/cpu/hphybrid/hphybrid.h",
 	}
 end
 
 if (CPUS["HPHYBRID"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hphybrid/hphybrid_dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hphybrid/hphybrid_dasm.cpp")
 end
 
 --------------------------------------------------
@@ -674,13 +674,13 @@ end
 
 if (CPUS["H6280"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/h6280/h6280.c",
+		MAME_DIR .. "src/devices/cpu/h6280/h6280.cpp",
 		MAME_DIR .. "src/devices/cpu/h6280/h6280.h",
 	}
 end
 
 if (CPUS["H6280"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/h6280/6280dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/h6280/6280dasm.cpp")
 end
 
 --------------------------------------------------
@@ -690,13 +690,13 @@ end
 
 if (CPUS["E1"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/e132xs/e132xs.c",
+		MAME_DIR .. "src/devices/cpu/e132xs/e132xs.cpp",
 		MAME_DIR .. "src/devices/cpu/e132xs/e132xs.h",
 	}
 end
 
 if (CPUS["E1"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/e132xs/32xsdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/e132xs/32xsdasm.cpp")
 end
 
 --------------------------------------------------
@@ -706,13 +706,13 @@ end
 
 if (CPUS["IE15"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/ie15/ie15.c",
+		MAME_DIR .. "src/devices/cpu/ie15/ie15.cpp",
 		MAME_DIR .. "src/devices/cpu/ie15/ie15.h",
 	}
 end
 
 if (CPUS["IE15"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ie15/ie15dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ie15/ie15dasm.cpp")
 end
 
 --------------------------------------------------
@@ -722,13 +722,13 @@ end
 
 if (CPUS["I4004"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/i4004/i4004.c",
+		MAME_DIR .. "src/devices/cpu/i4004/i4004.cpp",
 		MAME_DIR .. "src/devices/cpu/i4004/i4004.h",
 	}
 end
 
 if (CPUS["I4004"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i4004/4004dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i4004/4004dasm.cpp")
 end
 
 --------------------------------------------------
@@ -738,13 +738,13 @@ end
 
 if (CPUS["I8008"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/i8008/i8008.c",
+		MAME_DIR .. "src/devices/cpu/i8008/i8008.cpp",
 		MAME_DIR .. "src/devices/cpu/i8008/i8008.h",
 	}
 end
 
 if (CPUS["I8008"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i8008/8008dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i8008/8008dasm.cpp")
 end
 
 --------------------------------------------------
@@ -754,13 +754,13 @@ end
 
 if (CPUS["SCMP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/scmp/scmp.c",
+		MAME_DIR .. "src/devices/cpu/scmp/scmp.cpp",
 		MAME_DIR .. "src/devices/cpu/scmp/scmp.h",
 	}
 end
 
 if (CPUS["SCMP"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/scmp/scmpdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/scmp/scmpdasm.cpp")
 end
 
 --------------------------------------------------
@@ -770,13 +770,13 @@ end
 
 if (CPUS["I8085"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/i8085/i8085.c",
+		MAME_DIR .. "src/devices/cpu/i8085/i8085.cpp",
 		MAME_DIR .. "src/devices/cpu/i8085/i8085.h",
 	}
 end
 
 if (CPUS["I8085"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i8085/8085dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i8085/8085dasm.cpp")
 end
 
 --------------------------------------------------
@@ -786,16 +786,16 @@ end
 
 if (CPUS["I8089"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/i8089/i8089.c",
+		MAME_DIR .. "src/devices/cpu/i8089/i8089.cpp",
 		MAME_DIR .. "src/devices/cpu/i8089/i8089.h",
-		MAME_DIR .. "src/devices/cpu/i8089/i8089_channel.c",
+		MAME_DIR .. "src/devices/cpu/i8089/i8089_channel.cpp",
 		MAME_DIR .. "src/devices/cpu/i8089/i8089_channel.h",
-		MAME_DIR .. "src/devices/cpu/i8089/i8089_ops.c",
+		MAME_DIR .. "src/devices/cpu/i8089/i8089_ops.cpp",
 	}
 end
 
 if (CPUS["I8089"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i8089/i8089_dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i8089/i8089_dasm.cpp")
 end
 
 --------------------------------------------------
@@ -805,13 +805,13 @@ end
 
 if (CPUS["MCS48"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/mcs48/mcs48.c",
+		MAME_DIR .. "src/devices/cpu/mcs48/mcs48.cpp",
 		MAME_DIR .. "src/devices/cpu/mcs48/mcs48.h",
 	}
 end
 
 if (CPUS["MCS48"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs48/mcs48dsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs48/mcs48dsm.cpp")
 end
 
 --------------------------------------------------
@@ -821,13 +821,13 @@ end
 
 if (CPUS["MCS51"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/mcs51/mcs51.c",
+		MAME_DIR .. "src/devices/cpu/mcs51/mcs51.cpp",
 		MAME_DIR .. "src/devices/cpu/mcs51/mcs51.h",
 	}
 end
 
 if (CPUS["MCS51"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/mcs51dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mcs51/mcs51dasm.cpp")
 end
 
 --------------------------------------------------
@@ -837,17 +837,17 @@ end
 
 if (CPUS["MCS96"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/mcs96/mcs96.c",
+		MAME_DIR .. "src/devices/cpu/mcs96/mcs96.cpp",
 		MAME_DIR .. "src/devices/cpu/mcs96/mcs96.h",
-		MAME_DIR .. "src/devices/cpu/mcs96/i8x9x.c",
+		MAME_DIR .. "src/devices/cpu/mcs96/i8x9x.cpp",
 		MAME_DIR .. "src/devices/cpu/mcs96/i8x9x.h",
-		MAME_DIR .. "src/devices/cpu/mcs96/i8xc196.c",
+		MAME_DIR .. "src/devices/cpu/mcs96/i8xc196.cpp",
 		MAME_DIR .. "src/devices/cpu/mcs96/i8xc196.h",
 	}
 	dependency {
-		{ MAME_DIR .. "src/devices/cpu/mcs96/mcs96.c",   GEN_DIR .. "emu/cpu/mcs96/mcs96.inc" },
-		{ MAME_DIR .. "src/devices/cpu/mcs96/i8x9x.c",   GEN_DIR .. "emu/cpu/mcs96/i8x9x.inc" },
-		{ MAME_DIR .. "src/devices/cpu/mcs96/i8xc196.c", GEN_DIR .. "emu/cpu/mcs96/i8xc196.inc" },
+		{ MAME_DIR .. "src/devices/cpu/mcs96/mcs96.cpp",   GEN_DIR .. "emu/cpu/mcs96/mcs96.inc" },
+		{ MAME_DIR .. "src/devices/cpu/mcs96/i8x9x.cpp",   GEN_DIR .. "emu/cpu/mcs96/i8x9x.inc" },
+		{ MAME_DIR .. "src/devices/cpu/mcs96/i8xc196.cpp", GEN_DIR .. "emu/cpu/mcs96/i8xc196.inc" },
 	}
 
 	custombuildtask {
@@ -866,28 +866,28 @@ end
 
 if (CPUS["I86"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/i86/i86.c",
+		MAME_DIR .. "src/devices/cpu/i86/i86.cpp",
 		MAME_DIR .. "src/devices/cpu/i86/i86.h",
-		MAME_DIR .. "src/devices/cpu/i86/i186.c",
+		MAME_DIR .. "src/devices/cpu/i86/i186.cpp",
 		MAME_DIR .. "src/devices/cpu/i86/i186.h",
-		MAME_DIR .. "src/devices/cpu/i86/i286.c",
+		MAME_DIR .. "src/devices/cpu/i86/i286.cpp",
 		MAME_DIR .. "src/devices/cpu/i86/i286.h",
 	}
 end
 
 if (CPUS["I86"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.cpp")
 end
 
 if (CPUS["I386"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/i386/i386.c",
+		MAME_DIR .. "src/devices/cpu/i386/i386.cpp",
 		MAME_DIR .. "src/devices/cpu/i386/i386.h",
 	}
 end
 
 if (CPUS["I386"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.cpp")
 end
 
 --------------------------------------------------
@@ -897,13 +897,13 @@ end
 
 if (CPUS["I860"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/i860/i860.c",
+		MAME_DIR .. "src/devices/cpu/i860/i860.cpp",
 		MAME_DIR .. "src/devices/cpu/i860/i860.h",
 	}
 end
 
 if (CPUS["I860"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i860/i860dis.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i860/i860dis.cpp")
 end
 
 --------------------------------------------------
@@ -913,13 +913,13 @@ end
 
 if (CPUS["I960"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/i960/i960.c",
+		MAME_DIR .. "src/devices/cpu/i960/i960.cpp",
 		MAME_DIR .. "src/devices/cpu/i960/i960.h",
 	}
 end
 
 if (CPUS["I960"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i960/i960dis.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i960/i960dis.cpp")
 end
 
 --------------------------------------------------
@@ -929,13 +929,13 @@ end
 
 if (CPUS["LH5801"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/lh5801/lh5801.c",
+		MAME_DIR .. "src/devices/cpu/lh5801/lh5801.cpp",
 		MAME_DIR .. "src/devices/cpu/lh5801/lh5801.h",
 	}
 end
 
 if (CPUS["LH5801"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/lh5801/5801dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/lh5801/5801dasm.cpp")
 end
 --------
 ------------------------------------------
@@ -945,13 +945,13 @@ end
 
 if (CPUS["SSEM"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/ssem/ssem.c",
+		MAME_DIR .. "src/devices/cpu/ssem/ssem.cpp",
 		MAME_DIR .. "src/devices/cpu/ssem/ssem.h",
 	}
 end
 
 if (CPUS["SSEM"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ssem/ssemdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ssem/ssemdasm.cpp")
 end
 
 --------------------------------------------------
@@ -961,13 +961,13 @@ end
 
 if (CPUS["MB88XX"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/mb88xx/mb88xx.c",
+		MAME_DIR .. "src/devices/cpu/mb88xx/mb88xx.cpp",
 		MAME_DIR .. "src/devices/cpu/mb88xx/mb88xx.h",
 	}
 end
 
 if (CPUS["MB88XX"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mb88xx/mb88dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mb88xx/mb88dasm.cpp")
 end
 
 --------------------------------------------------
@@ -977,13 +977,13 @@ end
 
 if (CPUS["MB86233"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/mb86233/mb86233.c",
+		MAME_DIR .. "src/devices/cpu/mb86233/mb86233.cpp",
 		MAME_DIR .. "src/devices/cpu/mb86233/mb86233.h",
 	}
 end
 
 if (CPUS["MB86233"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mb86233/mb86233d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mb86233/mb86233d.cpp")
 end
 
 --------------------------------------------------
@@ -993,13 +993,13 @@ end
 
 if (CPUS["MB86235"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/mb86235/mb86235.c",
+		MAME_DIR .. "src/devices/cpu/mb86235/mb86235.cpp",
 		MAME_DIR .. "src/devices/cpu/mb86235/mb86235.h",
 	}
 end
 
 if (CPUS["MB86235"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mb86235/mb86235d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mb86235/mb86235d.cpp")
 end
 
 --------------------------------------------------
@@ -1009,13 +1009,13 @@ end
 
 if (CPUS["PIC16C5X"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/pic16c5x/pic16c5x.c",
+		MAME_DIR .. "src/devices/cpu/pic16c5x/pic16c5x.cpp",
 		MAME_DIR .. "src/devices/cpu/pic16c5x/pic16c5x.h",
 	}
 end
 
 if (CPUS["PIC16C5X"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pic16c5x/16c5xdsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pic16c5x/16c5xdsm.cpp")
 end
 
 --------------------------------------------------
@@ -1025,13 +1025,13 @@ end
 
 if (CPUS["PIC16C62X"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/pic16c62x/pic16c62x.c",
+		MAME_DIR .. "src/devices/cpu/pic16c62x/pic16c62x.cpp",
 		MAME_DIR .. "src/devices/cpu/pic16c62x/pic16c62x.h",
 	}
 end
 
 if (CPUS["PIC16C62X"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pic16c62x/16c62xdsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pic16c62x/16c62xdsm.cpp")
 end
 
 --------------------------------------------------
@@ -1042,21 +1042,21 @@ end
 
 if (CPUS["MIPS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/mips/r3000.c",
+		MAME_DIR .. "src/devices/cpu/mips/r3000.cpp",
 		MAME_DIR .. "src/devices/cpu/mips/r3000.h",
-		MAME_DIR .. "src/devices/cpu/mips/mips3com.c",
+		MAME_DIR .. "src/devices/cpu/mips/mips3com.cpp",
 		MAME_DIR .. "src/devices/cpu/mips/mips3com.h",
-		MAME_DIR .. "src/devices/cpu/mips/mips3.c",
+		MAME_DIR .. "src/devices/cpu/mips/mips3.cpp",
 		MAME_DIR .. "src/devices/cpu/mips/mips3.h",
-		MAME_DIR .. "src/devices/cpu/mips/mips3fe.c",
+		MAME_DIR .. "src/devices/cpu/mips/mips3fe.cpp",
 		MAME_DIR .. "src/devices/cpu/mips/mips3fe.h",
-		MAME_DIR .. "src/devices/cpu/mips/mips3drc.c",
+		MAME_DIR .. "src/devices/cpu/mips/mips3drc.cpp",
 	}
 end
 
 if (CPUS["MIPS"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/r3kdasm.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/mips3dsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/r3kdasm.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mips/mips3dsm.cpp")
 end
 
 --------------------------------------------------
@@ -1066,25 +1066,25 @@ end
 
 if (CPUS["PSX"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/psx/psx.c",
+		MAME_DIR .. "src/devices/cpu/psx/psx.cpp",
 		MAME_DIR .. "src/devices/cpu/psx/psx.h",
-		MAME_DIR .. "src/devices/cpu/psx/gte.c",
+		MAME_DIR .. "src/devices/cpu/psx/gte.cpp",
 		MAME_DIR .. "src/devices/cpu/psx/gte.h",
-		MAME_DIR .. "src/devices/cpu/psx/dma.c",
+		MAME_DIR .. "src/devices/cpu/psx/dma.cpp",
 		MAME_DIR .. "src/devices/cpu/psx/dma.h",
-		MAME_DIR .. "src/devices/cpu/psx/irq.c",
+		MAME_DIR .. "src/devices/cpu/psx/irq.cpp",
 		MAME_DIR .. "src/devices/cpu/psx/irq.h",
-		MAME_DIR .. "src/devices/cpu/psx/mdec.c",
+		MAME_DIR .. "src/devices/cpu/psx/mdec.cpp",
 		MAME_DIR .. "src/devices/cpu/psx/mdec.h",
-		MAME_DIR .. "src/devices/cpu/psx/rcnt.c",
+		MAME_DIR .. "src/devices/cpu/psx/rcnt.cpp",
 		MAME_DIR .. "src/devices/cpu/psx/rcnt.h",
-		MAME_DIR .. "src/devices/cpu/psx/sio.c",
+		MAME_DIR .. "src/devices/cpu/psx/sio.cpp",
 		MAME_DIR .. "src/devices/cpu/psx/sio.h",
 	}
 end
 
 if (CPUS["PSX"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/psx/psxdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/psx/psxdasm.cpp")
 end
 
 --------------------------------------------------
@@ -1094,16 +1094,16 @@ end
 
 if (CPUS["MELPS4"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/melps4/melps4.c",
+		MAME_DIR .. "src/devices/cpu/melps4/melps4.cpp",
 		MAME_DIR .. "src/devices/cpu/melps4/melps4.h",
-		MAME_DIR .. "src/devices/cpu/melps4/melps4op.c",
-		MAME_DIR .. "src/devices/cpu/melps4/m58846.c",
+		MAME_DIR .. "src/devices/cpu/melps4/melps4op.cpp",
+		MAME_DIR .. "src/devices/cpu/melps4/m58846.cpp",
 		MAME_DIR .. "src/devices/cpu/melps4/m58846.h",
 	}
 end
 
 if (CPUS["MELPS4"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/melps4/melps4d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/melps4/melps4d.cpp")
 end
 
 --------------------------------------------------
@@ -1113,17 +1113,17 @@ end
 
 if (CPUS["M37710"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/m37710/m37710.c",
+		MAME_DIR .. "src/devices/cpu/m37710/m37710.cpp",
 		MAME_DIR .. "src/devices/cpu/m37710/m37710.h",
-		MAME_DIR .. "src/devices/cpu/m37710/m37710o0.c",
-		MAME_DIR .. "src/devices/cpu/m37710/m37710o1.c",
-		MAME_DIR .. "src/devices/cpu/m37710/m37710o2.c",
-		MAME_DIR .. "src/devices/cpu/m37710/m37710o3.c",
+		MAME_DIR .. "src/devices/cpu/m37710/m37710o0.cpp",
+		MAME_DIR .. "src/devices/cpu/m37710/m37710o1.cpp",
+		MAME_DIR .. "src/devices/cpu/m37710/m37710o2.cpp",
+		MAME_DIR .. "src/devices/cpu/m37710/m37710o3.cpp",
 	}
 end
 
 if (CPUS["M37710"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m37710/m7700ds.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m37710/m7700ds.cpp")
 end
 
 --------------------------------------------------
@@ -1151,55 +1151,55 @@ end
 
 if (CPUS["M6502"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/m6502/deco16.c",
+		MAME_DIR .. "src/devices/cpu/m6502/deco16.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/deco16.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m4510.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m4510.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m4510.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m6502.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m6502.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m6502.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m65c02.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m65c02.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m65c02.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m65ce02.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m65ce02.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m65ce02.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m65sc02.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m65sc02.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m65sc02.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m6504.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m6504.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m6504.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m6507.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m6507.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m6507.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m6509.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m6509.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m6509.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m6510.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m6510.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m6510.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m6510t.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m6510t.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m6510t.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m7501.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m7501.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m7501.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m8502.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m8502.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m8502.h",
-		MAME_DIR .. "src/devices/cpu/m6502/n2a03.c",
+		MAME_DIR .. "src/devices/cpu/m6502/n2a03.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/n2a03.h",
-		MAME_DIR .. "src/devices/cpu/m6502/r65c02.c",
+		MAME_DIR .. "src/devices/cpu/m6502/r65c02.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/r65c02.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m740.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m740.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m740.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m3745x.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m3745x.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m3745x.h",
-		MAME_DIR .. "src/devices/cpu/m6502/m5074x.c",
+		MAME_DIR .. "src/devices/cpu/m6502/m5074x.cpp",
 		MAME_DIR .. "src/devices/cpu/m6502/m5074x.h",
 	}
 	
 	dependency {
-		{ MAME_DIR .. "src/devices/cpu/m6502/deco16.c",   GEN_DIR .. "emu/cpu/m6502/deco16.inc" },
-		{ MAME_DIR .. "src/devices/cpu/m6502/m4510.c",    GEN_DIR .. "emu/cpu/m6502/m4510.inc" },
-		{ MAME_DIR .. "src/devices/cpu/m6502/m6502.c",    GEN_DIR .. "emu/cpu/m6502/m6502.inc" },
-		{ MAME_DIR .. "src/devices/cpu/m6502/m65c02.c",   GEN_DIR .. "emu/cpu/m6502/m65c02.inc" },
-		{ MAME_DIR .. "src/devices/cpu/m6502/m65ce02.c",  GEN_DIR .. "emu/cpu/m6502/m65ce02.inc" },
-		{ MAME_DIR .. "src/devices/cpu/m6502/m6509.c",    GEN_DIR .. "emu/cpu/m6502/m6509.inc" },
-		{ MAME_DIR .. "src/devices/cpu/m6502/m6510.c",    GEN_DIR .. "emu/cpu/m6502/m6510.inc" },
-		{ MAME_DIR .. "src/devices/cpu/m6502/n2a03.c",    GEN_DIR .. "emu/cpu/m6502/n2a03.inc" },
-		{ MAME_DIR .. "src/devices/cpu/m6502/r65c02.c",   GEN_DIR .. "emu/cpu/m6502/r65c02.inc" },
-		{ MAME_DIR .. "src/devices/cpu/m6502/m740.c",     GEN_DIR .. "emu/cpu/m6502/m740.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6502/deco16.cpp",   GEN_DIR .. "emu/cpu/m6502/deco16.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6502/m4510.cpp",    GEN_DIR .. "emu/cpu/m6502/m4510.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6502/m6502.cpp",    GEN_DIR .. "emu/cpu/m6502/m6502.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6502/m65c02.cpp",   GEN_DIR .. "emu/cpu/m6502/m65c02.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6502/m65ce02.cpp",  GEN_DIR .. "emu/cpu/m6502/m65ce02.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6502/m6509.cpp",    GEN_DIR .. "emu/cpu/m6502/m6509.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6502/m6510.cpp",    GEN_DIR .. "emu/cpu/m6502/m6510.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6502/n2a03.cpp",    GEN_DIR .. "emu/cpu/m6502/n2a03.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6502/r65c02.cpp",   GEN_DIR .. "emu/cpu/m6502/r65c02.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6502/m740.cpp",     GEN_DIR .. "emu/cpu/m6502/m740.inc" },
 	}
 
 	custombuildtask {
@@ -1224,13 +1224,13 @@ end
 
 if (CPUS["M6800"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/m6800/m6800.c",
+		MAME_DIR .. "src/devices/cpu/m6800/m6800.cpp",
 		MAME_DIR .. "src/devices/cpu/m6800/m6800.h",
 	}
 end
 
 if (CPUS["M6800"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6800/6800dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6800/6800dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1240,13 +1240,13 @@ end
 
 if (CPUS["M6805"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/m6805/m6805.c",
+		MAME_DIR .. "src/devices/cpu/m6805/m6805.cpp",
 		MAME_DIR .. "src/devices/cpu/m6805/m6805.h",
 	}
 end
 
 if (CPUS["M6805"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6805/6805dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6805/6805dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1258,18 +1258,18 @@ end
 
 if (CPUS["M6809"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/m6809/m6809.c",
+		MAME_DIR .. "src/devices/cpu/m6809/m6809.cpp",
 		MAME_DIR .. "src/devices/cpu/m6809/m6809.h",
-		MAME_DIR .. "src/devices/cpu/m6809/hd6309.c",
+		MAME_DIR .. "src/devices/cpu/m6809/hd6309.cpp",
 		MAME_DIR .. "src/devices/cpu/m6809/hd6309.h",
-		MAME_DIR .. "src/devices/cpu/m6809/konami.c",
+		MAME_DIR .. "src/devices/cpu/m6809/konami.cpp",
 		MAME_DIR .. "src/devices/cpu/m6809/konami.h",
 	}
 
 	dependency {
-		{ MAME_DIR .. "src/devices/cpu/m6809/m6809.c",   GEN_DIR .. "emu/cpu/m6809/m6809.inc" },
-		{ MAME_DIR .. "src/devices/cpu/m6809/hd6309.c",  GEN_DIR .. "emu/cpu/m6809/hd6309.inc" },
-		{ MAME_DIR .. "src/devices/cpu/m6809/konami.c",  GEN_DIR .. "emu/cpu/m6809/konami.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6809/m6809.cpp",   GEN_DIR .. "emu/cpu/m6809/m6809.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6809/hd6309.cpp",  GEN_DIR .. "emu/cpu/m6809/hd6309.inc" },
+		{ MAME_DIR .. "src/devices/cpu/m6809/konami.cpp",  GEN_DIR .. "emu/cpu/m6809/konami.inc" },
 	}
 
 	custombuildtask {
@@ -1280,9 +1280,9 @@ if (CPUS["M6809"]~=null) then
 end
 
 if (CPUS["M6809"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6809/6809dasm.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6809/6309dasm.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6809/knmidasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6809/6809dasm.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6809/6309dasm.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m6809/knmidasm.cpp")
 end
 
 --------------------------------------------------
@@ -1292,13 +1292,13 @@ end
 
 if (CPUS["MC68HC11"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/mc68hc11/mc68hc11.c",
+		MAME_DIR .. "src/devices/cpu/mc68hc11/mc68hc11.cpp",
 		MAME_DIR .. "src/devices/cpu/mc68hc11/mc68hc11.h",
 	}
 end
 
 if (CPUS["MC68HC11"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mc68hc11/hc11dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mc68hc11/hc11dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1308,15 +1308,15 @@ end
 
 if (CPUS["M680X0"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/m68000/m68kcpu.c",
+		MAME_DIR .. "src/devices/cpu/m68000/m68kcpu.cpp",
 		MAME_DIR .. "src/devices/cpu/m68000/m68kcpu.h",
-		MAME_DIR .. "src/devices/cpu/m68000/m68kops.c",
+		MAME_DIR .. "src/devices/cpu/m68000/m68kops.cpp",
 		MAME_DIR .. "src/devices/cpu/m68000/m68kops.h",
 	}
 end
 
 if (CPUS["M680X0"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m68000/m68kdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m68000/m68kdasm.cpp")
 end
 
 --------------------------------------------------
@@ -1326,21 +1326,21 @@ end
 
 if (CPUS["DSP56156"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56k.c",
+		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56k.cpp",
 		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56k.h",
-		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56mem.c",
+		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56mem.cpp",
 		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56mem.h",
-		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56pcu.c",
+		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56pcu.cpp",
 		MAME_DIR .. "src/devices/cpu/dsp56k/dsp56pcu.h",
 	}
 end
 
 if (CPUS["DSP56156"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp56k/dsp56dsm.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp56k/opcode.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp56k/inst.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp56k/pmove.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp56k/tables.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp56k/dsp56dsm.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp56k/opcode.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp56k/inst.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp56k/pmove.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/dsp56k/tables.cpp")
 end
 
 --------------------------------------------------
@@ -1352,16 +1352,16 @@ end
 
 if (CPUS["PDP1"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/pdp1/pdp1.c",
+		MAME_DIR .. "src/devices/cpu/pdp1/pdp1.cpp",
 		MAME_DIR .. "src/devices/cpu/pdp1/pdp1.h",
-		MAME_DIR .. "src/devices/cpu/pdp1/tx0.c",
+		MAME_DIR .. "src/devices/cpu/pdp1/tx0.cpp",
 		MAME_DIR .. "src/devices/cpu/pdp1/tx0.h",
 	}
 end
 
 if (CPUS["PDP1"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pdp1/pdp1dasm.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pdp1/tx0dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pdp1/pdp1dasm.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pdp1/tx0dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1371,16 +1371,16 @@ end
 
 if (CPUS["POWERPC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/powerpc/ppccom.c",
+		MAME_DIR .. "src/devices/cpu/powerpc/ppccom.cpp",
 		MAME_DIR .. "src/devices/cpu/powerpc/ppccom.h",
-		MAME_DIR .. "src/devices/cpu/powerpc/ppcfe.c",
+		MAME_DIR .. "src/devices/cpu/powerpc/ppcfe.cpp",
 		MAME_DIR .. "src/devices/cpu/powerpc/ppcfe.h",
-		MAME_DIR .. "src/devices/cpu/powerpc/ppcdrc.c",
+		MAME_DIR .. "src/devices/cpu/powerpc/ppcdrc.cpp",
 	}
 end
 
 if (CPUS["POWERPC"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/powerpc/ppc_dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/powerpc/ppc_dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1391,29 +1391,29 @@ end
 
 if (CPUS["NEC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/nec/nec.c",
+		MAME_DIR .. "src/devices/cpu/nec/nec.cpp",
 		MAME_DIR .. "src/devices/cpu/nec/nec.h",
-		MAME_DIR .. "src/devices/cpu/nec/v25.c",
+		MAME_DIR .. "src/devices/cpu/nec/v25.cpp",
 		MAME_DIR .. "src/devices/cpu/nec/v25.h",
-		MAME_DIR .. "src/devices/cpu/nec/v25sfr.c",
-		MAME_DIR .. "src/devices/cpu/nec/v53.c",
+		MAME_DIR .. "src/devices/cpu/nec/v25sfr.cpp",
+		MAME_DIR .. "src/devices/cpu/nec/v53.cpp",
 		MAME_DIR .. "src/devices/cpu/nec/v53.h",
 	}
 end
 
 if (CPUS["NEC"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nec/necdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nec/necdasm.cpp")
 end
 
 if (CPUS["V30MZ"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/v30mz/v30mz.c",
+		MAME_DIR .. "src/devices/cpu/v30mz/v30mz.cpp",
 		MAME_DIR .. "src/devices/cpu/v30mz/v30mz.h",
 	}
 end
 
 if (CPUS["V30MZ"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nec/necdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/nec/necdasm.cpp")
 end
 
 --------------------------------------------------
@@ -1423,13 +1423,13 @@ end
 
 if (CPUS["V60"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/v60/v60.c",
+		MAME_DIR .. "src/devices/cpu/v60/v60.cpp",
 		MAME_DIR .. "src/devices/cpu/v60/v60.h",
 	}
 end
 
 if (CPUS["V60"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/v60/v60d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/v60/v60d.cpp")
 end
 
 --------------------------------------------------
@@ -1439,13 +1439,13 @@ end
 
 if (CPUS["V810"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/v810/v810.c",
+		MAME_DIR .. "src/devices/cpu/v810/v810.cpp",
 		MAME_DIR .. "src/devices/cpu/v810/v810.h",
 	}
 end
 
 if (CPUS["V810"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/v810/v810dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/v810/v810dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1455,13 +1455,13 @@ end
 
 if (CPUS["UPD7725"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/upd7725/upd7725.c",
+		MAME_DIR .. "src/devices/cpu/upd7725/upd7725.cpp",
 		MAME_DIR .. "src/devices/cpu/upd7725/upd7725.h",
 	}
 end
 
 if (CPUS["UPD7725"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd7725/dasm7725.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd7725/dasm7725.cpp")
 end
 
 --------------------------------------------------
@@ -1471,15 +1471,15 @@ end
 
 if (CPUS["UPD7810"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/upd7810/upd7810.c",
+		MAME_DIR .. "src/devices/cpu/upd7810/upd7810.cpp",
 		MAME_DIR .. "src/devices/cpu/upd7810/upd7810.h",
-		MAME_DIR .. "src/devices/cpu/upd7810/upd7810_opcodes.c",
-		MAME_DIR .. "src/devices/cpu/upd7810/upd7810_table.c",
+		MAME_DIR .. "src/devices/cpu/upd7810/upd7810_opcodes.cpp",
+		MAME_DIR .. "src/devices/cpu/upd7810/upd7810_table.cpp",
 	}
 end
 
 if (CPUS["UPD7810"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd7810/upd7810_dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/upd7810/upd7810_dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1489,14 +1489,14 @@ end
 
 if (CPUS["UCOM4"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/ucom4/ucom4.c",
+		MAME_DIR .. "src/devices/cpu/ucom4/ucom4.cpp",
 		MAME_DIR .. "src/devices/cpu/ucom4/ucom4.h",
-		MAME_DIR .. "src/devices/cpu/ucom4/ucom4op.c",
+		MAME_DIR .. "src/devices/cpu/ucom4/ucom4op.cpp",
 	}
 end
 
 if (CPUS["UCOM4"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ucom4/ucom4d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ucom4/ucom4d.cpp")
 end
 
 --------------------------------------------------
@@ -1506,13 +1506,13 @@ end
 
 if (CPUS["MINX"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/minx/minx.c",
+		MAME_DIR .. "src/devices/cpu/minx/minx.cpp",
 		MAME_DIR .. "src/devices/cpu/minx/minx.h",
 	}
 end
 
 if (CPUS["MINX"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/minx/minxd.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/minx/minxd.cpp")
 end
 
 --------------------------------------------------
@@ -1522,14 +1522,14 @@ end
 
 if (CPUS["RSP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/rsp/rsp.c",
+		MAME_DIR .. "src/devices/cpu/rsp/rsp.cpp",
 		MAME_DIR .. "src/devices/cpu/rsp/rsp.h",
-		MAME_DIR .. "src/devices/cpu/rsp/rspdrc.c",
-		MAME_DIR .. "src/devices/cpu/rsp/rspfe.c",
+		MAME_DIR .. "src/devices/cpu/rsp/rspdrc.cpp",
+		MAME_DIR .. "src/devices/cpu/rsp/rspfe.cpp",
 		MAME_DIR .. "src/devices/cpu/rsp/rspfe.h",
-		MAME_DIR .. "src/devices/cpu/rsp/rspcp2.c",
+		MAME_DIR .. "src/devices/cpu/rsp/rspcp2.cpp",
 		MAME_DIR .. "src/devices/cpu/rsp/rspcp2.h",
-		MAME_DIR .. "src/devices/cpu/rsp/rspcp2d.c",
+		MAME_DIR .. "src/devices/cpu/rsp/rspcp2d.cpp",
 		MAME_DIR .. "src/devices/cpu/rsp/rspcp2d.h",
 		MAME_DIR .. "src/devices/cpu/rsp/clamp.h",
 		MAME_DIR .. "src/devices/cpu/rsp/vabs.h",
@@ -1561,7 +1561,7 @@ if (CPUS["RSP"]~=null) then
 end
 
 if (CPUS["RSP"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/rsp/rsp_dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/rsp/rsp_dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1571,13 +1571,13 @@ end
 
 if (CPUS["MN10200"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/mn10200/mn10200.c",
+		MAME_DIR .. "src/devices/cpu/mn10200/mn10200.cpp",
 		MAME_DIR .. "src/devices/cpu/mn10200/mn10200.h",
 	}
 end
 
 if (CPUS["MN10200"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mn10200/mn102dis.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mn10200/mn102dis.cpp")
 end
 
 --------------------------------------------------
@@ -1587,13 +1587,13 @@ end
 
 if (CPUS["SATURN"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/saturn/saturn.c",
+		MAME_DIR .. "src/devices/cpu/saturn/saturn.cpp",
 		MAME_DIR .. "src/devices/cpu/saturn/saturn.h",
 	}
 end
 
 if (CPUS["SATURN"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/saturn/saturnds.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/saturn/saturnds.cpp")
 end
 
 --------------------------------------------------
@@ -1603,16 +1603,16 @@ end
 
 if (CPUS["SM510"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/sm510/sm510.c",
+		MAME_DIR .. "src/devices/cpu/sm510/sm510.cpp",
 		MAME_DIR .. "src/devices/cpu/sm510/sm510.h",
-		MAME_DIR .. "src/devices/cpu/sm510/sm510op.c",
-		MAME_DIR .. "src/devices/cpu/sm510/sm510core.c",
-		MAME_DIR .. "src/devices/cpu/sm510/sm511core.c",
+		MAME_DIR .. "src/devices/cpu/sm510/sm510op.cpp",
+		MAME_DIR .. "src/devices/cpu/sm510/sm510core.cpp",
+		MAME_DIR .. "src/devices/cpu/sm510/sm511core.cpp",
 	}
 end
 
 if (CPUS["SM510"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sm510/sm510d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sm510/sm510d.cpp")
 end
 
 --------------------------------------------------
@@ -1622,13 +1622,13 @@ end
 
 if (CPUS["SM8500"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/sm8500/sm8500.c",
+		MAME_DIR .. "src/devices/cpu/sm8500/sm8500.cpp",
 		MAME_DIR .. "src/devices/cpu/sm8500/sm8500.h",
 	}
 end
 
 if (CPUS["SM8500"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sm8500/sm8500d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sm8500/sm8500d.cpp")
 end
 
 --------------------------------------------------
@@ -1638,13 +1638,13 @@ end
 
 if (CPUS["S2650"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/s2650/s2650.c",
+		MAME_DIR .. "src/devices/cpu/s2650/s2650.cpp",
 		MAME_DIR .. "src/devices/cpu/s2650/s2650.h",
 	}
 end
 
 if (CPUS["S2650"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/s2650/2650dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/s2650/2650dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1654,13 +1654,13 @@ end
 
 if (CPUS["SC61860"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/sc61860/sc61860.c",
+		MAME_DIR .. "src/devices/cpu/sc61860/sc61860.cpp",
 		MAME_DIR .. "src/devices/cpu/sc61860/sc61860.h",
 	}
 end
 
 if (CPUS["SC61860"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sc61860/scdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/sc61860/scdasm.cpp")
 end
 
 --------------------------------------------------
@@ -1670,13 +1670,13 @@ end
 
 if (CPUS["SPC700"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/spc700/spc700.c",
+		MAME_DIR .. "src/devices/cpu/spc700/spc700.cpp",
 		MAME_DIR .. "src/devices/cpu/spc700/spc700.h",
 	}
 end
 
 if (CPUS["SPC700"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/spc700/spc700ds.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/spc700/spc700ds.cpp")
 end
 
 --------------------------------------------------
@@ -1686,13 +1686,13 @@ end
 
 if (CPUS["SSP1601"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/ssp1601/ssp1601.c",
+		MAME_DIR .. "src/devices/cpu/ssp1601/ssp1601.cpp",
 		MAME_DIR .. "src/devices/cpu/ssp1601/ssp1601.h",
 	}
 end
 
 if (CPUS["SSP1601"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ssp1601/ssp1601d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/ssp1601/ssp1601d.cpp")
 end
 
 --------------------------------------------------
@@ -1702,13 +1702,13 @@ end
 
 if (CPUS["UNSP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/unsp/unsp.c",
+		MAME_DIR .. "src/devices/cpu/unsp/unsp.cpp",
 		MAME_DIR .. "src/devices/cpu/unsp/unsp.h",
 	}
 end
 
 if (CPUS["UNSP"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/unsp/unspdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/unsp/unspdasm.cpp")
 end
 
 --------------------------------------------------
@@ -1718,13 +1718,13 @@ end
 
 if (CPUS["AVR8"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/avr8/avr8.c",
+		MAME_DIR .. "src/devices/cpu/avr8/avr8.cpp",
 		MAME_DIR .. "src/devices/cpu/avr8/avr8.h",
 	}
 end
 
 if (CPUS["AVR8"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/avr8/avr8dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/avr8/avr8dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1734,13 +1734,13 @@ end
 
 if (CPUS["TMS0980"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/tms0980/tms0980.c",
+		MAME_DIR .. "src/devices/cpu/tms0980/tms0980.cpp",
 		MAME_DIR .. "src/devices/cpu/tms0980/tms0980.h",
 	}
 end
 
 if (CPUS["TMS0980"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms0980/tms0980d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms0980/tms0980d.cpp")
 end
 
 --------------------------------------------------
@@ -1750,13 +1750,13 @@ end
 
 if (CPUS["TMS7000"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/tms7000/tms7000.c",
+		MAME_DIR .. "src/devices/cpu/tms7000/tms7000.cpp",
 		MAME_DIR .. "src/devices/cpu/tms7000/tms7000.h",
 	}
 end
 
 if (CPUS["TMS7000"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms7000/7000dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms7000/7000dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1769,19 +1769,19 @@ end
 
 if (CPUS["TMS9900"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/tms9900/tms9900.c",
+		MAME_DIR .. "src/devices/cpu/tms9900/tms9900.cpp",
 		MAME_DIR .. "src/devices/cpu/tms9900/tms9900.h",
-		MAME_DIR .. "src/devices/cpu/tms9900/tms9980a.c",
+		MAME_DIR .. "src/devices/cpu/tms9900/tms9980a.cpp",
 		MAME_DIR .. "src/devices/cpu/tms9900/tms9980a.h",
-		MAME_DIR .. "src/devices/cpu/tms9900/tms9995.c",
+		MAME_DIR .. "src/devices/cpu/tms9900/tms9995.cpp",
 		MAME_DIR .. "src/devices/cpu/tms9900/tms9995.h",
-		MAME_DIR .. "src/devices/cpu/tms9900/ti990_10.c",
+		MAME_DIR .. "src/devices/cpu/tms9900/ti990_10.cpp",
 		MAME_DIR .. "src/devices/cpu/tms9900/ti990_10.h",
 	}
 end
 
 if (CPUS["TMS9900"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms9900/9900dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms9900/9900dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1791,13 +1791,13 @@ end
 
 if (CPUS["TMS340X0"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/tms34010/tms34010.c",
+		MAME_DIR .. "src/devices/cpu/tms34010/tms34010.cpp",
 		MAME_DIR .. "src/devices/cpu/tms34010/tms34010.h",
 	}
 end
 
 if (CPUS["TMS340X0"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms34010/34010dsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms34010/34010dsm.cpp")
 end
 
 --------------------------------------------------
@@ -1807,13 +1807,13 @@ end
 
 if (CPUS["TMS32010"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/tms32010/tms32010.c",
+		MAME_DIR .. "src/devices/cpu/tms32010/tms32010.cpp",
 		MAME_DIR .. "src/devices/cpu/tms32010/tms32010.h",
 	}
 end
 
 if (CPUS["TMS32010"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms32010/32010dsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms32010/32010dsm.cpp")
 end
 
 --------------------------------------------------
@@ -1823,13 +1823,13 @@ end
 
 if (CPUS["TMS32025"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/tms32025/tms32025.c",
+		MAME_DIR .. "src/devices/cpu/tms32025/tms32025.cpp",
 		MAME_DIR .. "src/devices/cpu/tms32025/tms32025.h",
 	}
 end
 
 if (CPUS["TMS32025"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms32025/32025dsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms32025/32025dsm.cpp")
 end
 
 --------------------------------------------------
@@ -1839,13 +1839,13 @@ end
 
 if (CPUS["TMS32031"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/tms32031/tms32031.c",
+		MAME_DIR .. "src/devices/cpu/tms32031/tms32031.cpp",
 		MAME_DIR .. "src/devices/cpu/tms32031/tms32031.h",
 	}
 end
 
 if (CPUS["TMS32031"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms32031/dis32031.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms32031/dis32031.cpp")
 end
 
 --------------------------------------------------
@@ -1855,13 +1855,13 @@ end
 
 if (CPUS["TMS32051"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/tms32051/tms32051.c",
+		MAME_DIR .. "src/devices/cpu/tms32051/tms32051.cpp",
 		MAME_DIR .. "src/devices/cpu/tms32051/tms32051.h",
 	}
 end
 
 if (CPUS["TMS32051"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms32051/dis32051.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms32051/dis32051.cpp")
 end
 
 --------------------------------------------------
@@ -1871,15 +1871,15 @@ end
 
 if (CPUS["TMS32082"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/tms32082/tms32082.c",
+		MAME_DIR .. "src/devices/cpu/tms32082/tms32082.cpp",
 		MAME_DIR .. "src/devices/cpu/tms32082/tms32082.h",
-		MAME_DIR .. "src/devices/cpu/tms32082/mp_ops.c",
+		MAME_DIR .. "src/devices/cpu/tms32082/mp_ops.cpp",
 	}
 end
 
 if (CPUS["TMS32082"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms32082/dis_mp.c")
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms32082/dis_pp.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms32082/dis_mp.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms32082/dis_pp.cpp")
 end
 
 --------------------------------------------------
@@ -1889,13 +1889,13 @@ end
 
 if (CPUS["TMS57002"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/tms57002/tms57002.c",
+		MAME_DIR .. "src/devices/cpu/tms57002/tms57002.cpp",
 		MAME_DIR .. "src/devices/cpu/tms57002/tms57002.h",
-		MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.c",
+		MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp",
 	}
 	dependency {
-		{ MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.c", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" },
-		{ MAME_DIR .. "src/devices/cpu/tms57002/tms57002.c",  GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" },
+		{ MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" },
+		{ MAME_DIR .. "src/devices/cpu/tms57002/tms57002.cpp",  GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" },
 	}
 	custombuildtask { 	
 		{ MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc",   { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" } }
@@ -1903,8 +1903,8 @@ if (CPUS["TMS57002"]~=null) then
 end
 
 if (CPUS["TMS57002"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms57002/57002dsm.c")
-	table.insert(disasm_dependency , { MAME_DIR .. "src/devices/cpu/tms57002/57002dsm.c",  GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" } )
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms57002/57002dsm.cpp")
+	table.insert(disasm_dependency , { MAME_DIR .. "src/devices/cpu/tms57002/57002dsm.cpp",  GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" } )
 	table.insert(disasm_custombuildtask , { MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc",   { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" }})
 end
 
@@ -1915,7 +1915,7 @@ end
 
 if (CPUS["TLCS90"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/tlcs90/tlcs90.c",
+		MAME_DIR .. "src/devices/cpu/tlcs90/tlcs90.cpp",
 		MAME_DIR .. "src/devices/cpu/tlcs90/tlcs90.h",
 	}
 end
@@ -1927,13 +1927,13 @@ end
 
 if (CPUS["TLCS900"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/tlcs900/tlcs900.c",
+		MAME_DIR .. "src/devices/cpu/tlcs900/tlcs900.cpp",
 		MAME_DIR .. "src/devices/cpu/tlcs900/tlcs900.h",
 	}
 end
 
 if (CPUS["TLCS900"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tlcs900/dasm900.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tlcs900/dasm900.cpp")
 end
 
 --------------------------------------------------
@@ -1944,21 +1944,21 @@ end
 
 if (CPUS["Z80"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/z80/z80.c",
+		MAME_DIR .. "src/devices/cpu/z80/z80.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/z80.h",
-		MAME_DIR .. "src/devices/cpu/z80/z80daisy.c",
+		MAME_DIR .. "src/devices/cpu/z80/z80daisy.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/z80daisy.h",
-		MAME_DIR .. "src/devices/cpu/z80/tmpz84c011.c",
+		MAME_DIR .. "src/devices/cpu/z80/tmpz84c011.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/tmpz84c011.h",
-		MAME_DIR .. "src/devices/cpu/z80/tmpz84c015.c",
+		MAME_DIR .. "src/devices/cpu/z80/tmpz84c015.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/tmpz84c015.h",
-		MAME_DIR .. "src/devices/cpu/z80/kl5c80a12.c",
+		MAME_DIR .. "src/devices/cpu/z80/kl5c80a12.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/kl5c80a12.h",
 	}
 end
 
 if (CPUS["Z80"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z80/z80dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z80/z80dasm.cpp")
 end
 
 --------------------------------------------------
@@ -1968,13 +1968,13 @@ end
 
 if (CPUS["LR35902"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/lr35902/lr35902.c",
+		MAME_DIR .. "src/devices/cpu/lr35902/lr35902.cpp",
 		MAME_DIR .. "src/devices/cpu/lr35902/lr35902.h",
 	}
 end
 
 if (CPUS["LR35902"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/lr35902/lr35902d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/lr35902/lr35902d.cpp")
 end
 
 --------------------------------------------------
@@ -1984,15 +1984,15 @@ end
 
 if (CPUS["Z180"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/z180/z180.c",
+		MAME_DIR .. "src/devices/cpu/z180/z180.cpp",
 		MAME_DIR .. "src/devices/cpu/z180/z180.h",
-		MAME_DIR .. "src/devices/cpu/z80/z80daisy.c",
+		MAME_DIR .. "src/devices/cpu/z80/z80daisy.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/z80daisy.h",
 	}
 end
 
 if (CPUS["Z180"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z180/z180dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z180/z180dasm.cpp")
 end
 
 --------------------------------------------------
@@ -2002,13 +2002,13 @@ end
 
 if (CPUS["Z8000"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/z8000/z8000.c",
+		MAME_DIR .. "src/devices/cpu/z8000/z8000.cpp",
 		MAME_DIR .. "src/devices/cpu/z8000/z8000.h",
 	}
 end
 
 if (CPUS["Z8000"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z8000/8000dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z8000/8000dasm.cpp")
 end
 
 --------------------------------------------------
@@ -2018,13 +2018,13 @@ end
 
 if (CPUS["Z8"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/z8/z8.c",
+		MAME_DIR .. "src/devices/cpu/z8/z8.cpp",
 		MAME_DIR .. "src/devices/cpu/z8/z8.h",
 	}
 end
 
 if (CPUS["Z8"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z8/z8dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/z8/z8dasm.cpp")
 end
 
 --------------------------------------------------
@@ -2034,13 +2034,13 @@ end
 
 if (CPUS["SUPERFX"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/superfx/superfx.c",
+		MAME_DIR .. "src/devices/cpu/superfx/superfx.cpp",
 		MAME_DIR .. "src/devices/cpu/superfx/superfx.h",
 	}
 end
 
 if (CPUS["SUPERFX"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/superfx/sfx_dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/superfx/sfx_dasm.cpp")
 end
 
 --------------------------------------------------
@@ -2050,13 +2050,13 @@ end
 
 if (CPUS["PPS4"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/pps4/pps4.c",
+		MAME_DIR .. "src/devices/cpu/pps4/pps4.cpp",
 		MAME_DIR .. "src/devices/cpu/pps4/pps4.h",
 	}
 end
 
 if (CPUS["PPS4"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pps4/pps4dasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/pps4/pps4dasm.cpp")
 end
 
 --------------------------------------------------
@@ -2066,13 +2066,13 @@ end
 
 if (CPUS["HD61700"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/hd61700/hd61700.c",
+		MAME_DIR .. "src/devices/cpu/hd61700/hd61700.cpp",
 		MAME_DIR .. "src/devices/cpu/hd61700/hd61700.h",
 	}
 end
 
 if (CPUS["HD61700"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hd61700/hd61700d.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/hd61700/hd61700d.cpp")
 end
 
 --------------------------------------------------
@@ -2082,13 +2082,13 @@ end
 
 if (CPUS["LC8670"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/lc8670/lc8670.c",
+		MAME_DIR .. "src/devices/cpu/lc8670/lc8670.cpp",
 		MAME_DIR .. "src/devices/cpu/lc8670/lc8670.h",
 	}
 end
 
 if (CPUS["LC8670"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/lc8670/lc8670dsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/lc8670/lc8670dsm.cpp")
 end
 
 --------------------------------------------------
@@ -2098,13 +2098,13 @@ end
 
 if (CPUS["SCUDSP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/scudsp/scudsp.c",
+		MAME_DIR .. "src/devices/cpu/scudsp/scudsp.cpp",
 		MAME_DIR .. "src/devices/cpu/scudsp/scudsp.h",
 	}
 end
 
 if (CPUS["SCUDSP"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/scudsp/scudspdasm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/scudsp/scudspdasm.cpp")
 end
 
 --------------------------------------------------
@@ -2114,13 +2114,13 @@ end
 
 if (CPUS["SCORE"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/score/score.c",
+		MAME_DIR .. "src/devices/cpu/score/score.cpp",
 		MAME_DIR .. "src/devices/cpu/score/score.h",
 	}
 end
 
 if (CPUS["SCORE"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/score/scoredsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/score/scoredsm.cpp")
 end
 
 --------------------------------------------------
@@ -2130,48 +2130,48 @@ end
 
 if (CPUS["ALTO2"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/cpu/alto2/alto2cpu.c",
+		MAME_DIR .. "src/devices/cpu/alto2/alto2cpu.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/alto2cpu.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2disk.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2disk.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2disk.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2disp.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2disp.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2disp.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2curt.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2curt.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2curt.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2dht.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2dht.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2dht.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2dvt.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2dvt.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2dvt.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2dwt.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2dwt.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2dwt.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2emu.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2emu.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2emu.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2ether.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2ether.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2ether.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2hw.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2hw.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2hw.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2kbd.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2kbd.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2kbd.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2ksec.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2ksec.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2ksec.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2kwd.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2kwd.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2kwd.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2mem.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2mem.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2mem.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2mouse.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2mouse.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2mouse.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2mrt.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2mrt.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2mrt.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2part.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2part.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2part.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2ram.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2ram.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2ram.h",
-		MAME_DIR .. "src/devices/cpu/alto2/a2roms.c",
+		MAME_DIR .. "src/devices/cpu/alto2/a2roms.cpp",
 		MAME_DIR .. "src/devices/cpu/alto2/a2roms.h",
 	}
 end
 
 if (CPUS["ALTO2"]~=null or _OPTIONS["with-tools"]) then
-	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/alto2/alto2dsm.c")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/alto2/alto2dsm.cpp")
 end
 
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index de4197c84d7..fe22234b18e 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -33,289 +33,289 @@ end
 files {
 	MAME_DIR .. "src/emu/emu.h",
 	MAME_DIR .. "src/emu/gamedrv.h",
-	MAME_DIR .. "src/emu/hashfile.c",
+	MAME_DIR .. "src/emu/hashfile.cpp",
 	MAME_DIR .. "src/emu/hashfile.h",
-	MAME_DIR .. "src/emu/addrmap.c",
+	MAME_DIR .. "src/emu/addrmap.cpp",
 	MAME_DIR .. "src/emu/addrmap.h",
-	MAME_DIR .. "src/emu/attotime.c",
+	MAME_DIR .. "src/emu/attotime.cpp",
 	MAME_DIR .. "src/emu/attotime.h",
-	MAME_DIR .. "src/emu/audit.c",
+	MAME_DIR .. "src/emu/audit.cpp",
 	MAME_DIR .. "src/emu/audit.h",
-	MAME_DIR .. "src/emu/cheat.c",
+	MAME_DIR .. "src/emu/cheat.cpp",
 	MAME_DIR .. "src/emu/cheat.h",
-	MAME_DIR .. "src/emu/clifront.c",
+	MAME_DIR .. "src/emu/clifront.cpp",
 	MAME_DIR .. "src/emu/clifront.h",
-	MAME_DIR .. "src/emu/cliopts.c",
+	MAME_DIR .. "src/emu/cliopts.cpp",
 	MAME_DIR .. "src/emu/cliopts.h",
-	MAME_DIR .. "src/emu/config.c",
+	MAME_DIR .. "src/emu/config.cpp",
 	MAME_DIR .. "src/emu/config.h",
-	MAME_DIR .. "src/emu/crsshair.c",
+	MAME_DIR .. "src/emu/crsshair.cpp",
 	MAME_DIR .. "src/emu/crsshair.h",
-	MAME_DIR .. "src/emu/debugger.c",
+	MAME_DIR .. "src/emu/debugger.cpp",
 	MAME_DIR .. "src/emu/debugger.h",
-	MAME_DIR .. "src/emu/devdelegate.c",
+	MAME_DIR .. "src/emu/devdelegate.cpp",
 	MAME_DIR .. "src/emu/devdelegate.h",
-	MAME_DIR .. "src/emu/devcb.c",
+	MAME_DIR .. "src/emu/devcb.cpp",
 	MAME_DIR .. "src/emu/devcb.h",
-	MAME_DIR .. "src/emu/devcpu.c",
+	MAME_DIR .. "src/emu/devcpu.cpp",
 	MAME_DIR .. "src/emu/devcpu.h",
-	MAME_DIR .. "src/emu/devfind.c",
+	MAME_DIR .. "src/emu/devfind.cpp",
 	MAME_DIR .. "src/emu/devfind.h",
-	MAME_DIR .. "src/emu/device.c",
+	MAME_DIR .. "src/emu/device.cpp",
 	MAME_DIR .. "src/emu/device.h",
-	MAME_DIR .. "src/emu/didisasm.c",
+	MAME_DIR .. "src/emu/didisasm.cpp",
 	MAME_DIR .. "src/emu/didisasm.h",
-	MAME_DIR .. "src/emu/diexec.c",
+	MAME_DIR .. "src/emu/diexec.cpp",
 	MAME_DIR .. "src/emu/diexec.h",
-	MAME_DIR .. "src/emu/digfx.c",
+	MAME_DIR .. "src/emu/digfx.cpp",
 	MAME_DIR .. "src/emu/digfx.h",
-	MAME_DIR .. "src/emu/diimage.c",
+	MAME_DIR .. "src/emu/diimage.cpp",
 	MAME_DIR .. "src/emu/diimage.h",
-	MAME_DIR .. "src/emu/dimemory.c",
+	MAME_DIR .. "src/emu/dimemory.cpp",
 	MAME_DIR .. "src/emu/dimemory.h",
-	MAME_DIR .. "src/emu/dinetwork.c",
+	MAME_DIR .. "src/emu/dinetwork.cpp",
 	MAME_DIR .. "src/emu/dinetwork.h",
-	MAME_DIR .. "src/emu/dinvram.c",
+	MAME_DIR .. "src/emu/dinvram.cpp",
 	MAME_DIR .. "src/emu/dinvram.h",
-	MAME_DIR .. "src/emu/dioutput.c",
+	MAME_DIR .. "src/emu/dioutput.cpp",
 	MAME_DIR .. "src/emu/dioutput.h",
-	MAME_DIR .. "src/emu/dipty.c",
+	MAME_DIR .. "src/emu/dipty.cpp",
 	MAME_DIR .. "src/emu/dipty.h",
-	MAME_DIR .. "src/emu/dirtc.c",
+	MAME_DIR .. "src/emu/dirtc.cpp",
 	MAME_DIR .. "src/emu/dirtc.h",
-	MAME_DIR .. "src/emu/diserial.c",
+	MAME_DIR .. "src/emu/diserial.cpp",
 	MAME_DIR .. "src/emu/diserial.h",
-	MAME_DIR .. "src/emu/dislot.c",
+	MAME_DIR .. "src/emu/dislot.cpp",
 	MAME_DIR .. "src/emu/dislot.h",
-	MAME_DIR .. "src/emu/disound.c",
+	MAME_DIR .. "src/emu/disound.cpp",
 	MAME_DIR .. "src/emu/disound.h",
-	MAME_DIR .. "src/emu/dispatch.c",
+	MAME_DIR .. "src/emu/dispatch.cpp",
 	MAME_DIR .. "src/emu/dispatch.h",
-	MAME_DIR .. "src/emu/distate.c",
+	MAME_DIR .. "src/emu/distate.cpp",
 	MAME_DIR .. "src/emu/distate.h",
-	MAME_DIR .. "src/emu/divideo.c",
+	MAME_DIR .. "src/emu/divideo.cpp",
 	MAME_DIR .. "src/emu/divideo.h",
-	MAME_DIR .. "src/emu/drawgfx.c",
+	MAME_DIR .. "src/emu/drawgfx.cpp",
 	MAME_DIR .. "src/emu/drawgfx.h",
 	MAME_DIR .. "src/emu/drawgfxm.h",
-	MAME_DIR .. "src/emu/driver.c",
+	MAME_DIR .. "src/emu/driver.cpp",
 	MAME_DIR .. "src/emu/driver.h",
-	MAME_DIR .. "src/emu/drivenum.c",
+	MAME_DIR .. "src/emu/drivenum.cpp",
 	MAME_DIR .. "src/emu/drivenum.h",
-	MAME_DIR .. "src/emu/emualloc.c",
+	MAME_DIR .. "src/emu/emualloc.cpp",
 	MAME_DIR .. "src/emu/emualloc.h",
-	MAME_DIR .. "src/emu/emucore.c",
+	MAME_DIR .. "src/emu/emucore.cpp",
 	MAME_DIR .. "src/emu/emucore.h",
-	MAME_DIR .. "src/emu/emuopts.c",
+	MAME_DIR .. "src/emu/emuopts.cpp",
 	MAME_DIR .. "src/emu/emuopts.h",
-	MAME_DIR .. "src/emu/emupal.c",
+	MAME_DIR .. "src/emu/emupal.cpp",
 	MAME_DIR .. "src/emu/emupal.h",
-	MAME_DIR .. "src/emu/fileio.c",
+	MAME_DIR .. "src/emu/fileio.cpp",
 	MAME_DIR .. "src/emu/fileio.h",
-	MAME_DIR .. "src/emu/hash.c",
+	MAME_DIR .. "src/emu/hash.cpp",
 	MAME_DIR .. "src/emu/hash.h",
-	MAME_DIR .. "src/emu/image.c",
+	MAME_DIR .. "src/emu/image.cpp",
 	MAME_DIR .. "src/emu/image.h",
-	MAME_DIR .. "src/emu/info.c",
+	MAME_DIR .. "src/emu/info.cpp",
 	MAME_DIR .. "src/emu/info.h",
-	MAME_DIR .. "src/emu/input.c",
+	MAME_DIR .. "src/emu/input.cpp",
 	MAME_DIR .. "src/emu/input.h",
-	MAME_DIR .. "src/emu/ioport.c",
+	MAME_DIR .. "src/emu/ioport.cpp",
 	MAME_DIR .. "src/emu/ioport.h",
 	MAME_DIR .. "src/emu/inpttype.h",
-	MAME_DIR .. "src/emu/luaengine.c",
+	MAME_DIR .. "src/emu/luaengine.cpp",
 	MAME_DIR .. "src/emu/luaengine.h",
-	MAME_DIR .. "src/emu/mame.c",
+	MAME_DIR .. "src/emu/mame.cpp",
 	MAME_DIR .. "src/emu/mame.h",
-	MAME_DIR .. "src/emu/machine.c",
+	MAME_DIR .. "src/emu/machine.cpp",
 	MAME_DIR .. "src/emu/machine.h",
-	MAME_DIR .. "src/emu/mconfig.c",
+	MAME_DIR .. "src/emu/mconfig.cpp",
 	MAME_DIR .. "src/emu/mconfig.h",
-	MAME_DIR .. "src/emu/memarray.c",
+	MAME_DIR .. "src/emu/memarray.cpp",
 	MAME_DIR .. "src/emu/memarray.h",
-	MAME_DIR .. "src/emu/memory.c",
+	MAME_DIR .. "src/emu/memory.cpp",
 	MAME_DIR .. "src/emu/memory.h",
-	MAME_DIR .. "src/emu/network.c",
+	MAME_DIR .. "src/emu/network.cpp",
 	MAME_DIR .. "src/emu/network.h",
-	MAME_DIR .. "src/emu/parameters.c",
+	MAME_DIR .. "src/emu/parameters.cpp",
 	MAME_DIR .. "src/emu/parameters.h",
-	MAME_DIR .. "src/emu/output.c",
+	MAME_DIR .. "src/emu/output.cpp",
 	MAME_DIR .. "src/emu/output.h",
-	MAME_DIR .. "src/emu/render.c",
+	MAME_DIR .. "src/emu/render.cpp",
 	MAME_DIR .. "src/emu/render.h",
-	MAME_DIR .. "src/emu/rendfont.c",
+	MAME_DIR .. "src/emu/rendfont.cpp",
 	MAME_DIR .. "src/emu/rendfont.h",
-	MAME_DIR .. "src/emu/rendlay.c",
+	MAME_DIR .. "src/emu/rendlay.cpp",
 	MAME_DIR .. "src/emu/rendlay.h",
-	MAME_DIR .. "src/emu/rendutil.c",
+	MAME_DIR .. "src/emu/rendutil.cpp",
 	MAME_DIR .. "src/emu/rendutil.h",
-	MAME_DIR .. "src/emu/romload.c",
+	MAME_DIR .. "src/emu/romload.cpp",
 	MAME_DIR .. "src/emu/romload.h",
-	MAME_DIR .. "src/emu/save.c",
+	MAME_DIR .. "src/emu/save.cpp",
 	MAME_DIR .. "src/emu/save.h",
-	MAME_DIR .. "src/emu/schedule.c",
+	MAME_DIR .. "src/emu/schedule.cpp",
 	MAME_DIR .. "src/emu/schedule.h",
-	MAME_DIR .. "src/emu/screen.c",
+	MAME_DIR .. "src/emu/screen.cpp",
 	MAME_DIR .. "src/emu/screen.h",
-	MAME_DIR .. "src/emu/softlist.c",
+	MAME_DIR .. "src/emu/softlist.cpp",
 	MAME_DIR .. "src/emu/softlist.h",
-	MAME_DIR .. "src/emu/sound.c",
+	MAME_DIR .. "src/emu/sound.cpp",
 	MAME_DIR .. "src/emu/sound.h",
-	MAME_DIR .. "src/emu/speaker.c",
+	MAME_DIR .. "src/emu/speaker.cpp",
 	MAME_DIR .. "src/emu/speaker.h",
-	MAME_DIR .. "src/emu/sprite.c",
+	MAME_DIR .. "src/emu/sprite.cpp",
 	MAME_DIR .. "src/emu/sprite.h",
-	MAME_DIR .. "src/emu/tilemap.c",
+	MAME_DIR .. "src/emu/tilemap.cpp",
 	MAME_DIR .. "src/emu/tilemap.h",
-	MAME_DIR .. "src/emu/timer.c",
+	MAME_DIR .. "src/emu/timer.cpp",
 	MAME_DIR .. "src/emu/timer.h",
-	MAME_DIR .. "src/emu/uiinput.c",
+	MAME_DIR .. "src/emu/uiinput.cpp",
 	MAME_DIR .. "src/emu/uiinput.h",
-	MAME_DIR .. "src/emu/ui/ui.c",
+	MAME_DIR .. "src/emu/ui/ui.cpp",
 	MAME_DIR .. "src/emu/ui/ui.h",
 	MAME_DIR .. "src/emu/ui/devctrl.h",
-	MAME_DIR .. "src/emu/ui/menu.c",
+	MAME_DIR .. "src/emu/ui/menu.cpp",
 	MAME_DIR .. "src/emu/ui/menu.h",
-	MAME_DIR .. "src/emu/ui/mainmenu.c",
+	MAME_DIR .. "src/emu/ui/mainmenu.cpp",
 	MAME_DIR .. "src/emu/ui/mainmenu.h",
-	MAME_DIR .. "src/emu/ui/miscmenu.c",
+	MAME_DIR .. "src/emu/ui/miscmenu.cpp",
 	MAME_DIR .. "src/emu/ui/miscmenu.h",
-	MAME_DIR .. "src/emu/ui/barcode.c",
+	MAME_DIR .. "src/emu/ui/barcode.cpp",
 	MAME_DIR .. "src/emu/ui/barcode.h",
-	MAME_DIR .. "src/emu/ui/cheatopt.c",
+	MAME_DIR .. "src/emu/ui/cheatopt.cpp",
 	MAME_DIR .. "src/emu/ui/cheatopt.h",
-	MAME_DIR .. "src/emu/ui/devopt.c",
+	MAME_DIR .. "src/emu/ui/devopt.cpp",
 	MAME_DIR .. "src/emu/ui/devopt.h",
-	MAME_DIR .. "src/emu/ui/filemngr.c",
+	MAME_DIR .. "src/emu/ui/filemngr.cpp",
 	MAME_DIR .. "src/emu/ui/filemngr.h",
-	MAME_DIR .. "src/emu/ui/filesel.c",
+	MAME_DIR .. "src/emu/ui/filesel.cpp",
 	MAME_DIR .. "src/emu/ui/filesel.h",
-	MAME_DIR .. "src/emu/ui/imgcntrl.c",
+	MAME_DIR .. "src/emu/ui/imgcntrl.cpp",
 	MAME_DIR .. "src/emu/ui/imgcntrl.h",
-	MAME_DIR .. "src/emu/ui/info.c",
+	MAME_DIR .. "src/emu/ui/info.cpp",
 	MAME_DIR .. "src/emu/ui/info.h",
-	MAME_DIR .. "src/emu/ui/info_pty.c",
+	MAME_DIR .. "src/emu/ui/info_pty.cpp",
 	MAME_DIR .. "src/emu/ui/info_pty.h",
-	MAME_DIR .. "src/emu/ui/inputmap.c",
+	MAME_DIR .. "src/emu/ui/inputmap.cpp",
 	MAME_DIR .. "src/emu/ui/inputmap.h",
-	MAME_DIR .. "src/emu/ui/selgame.c",
+	MAME_DIR .. "src/emu/ui/selgame.cpp",
 	MAME_DIR .. "src/emu/ui/selgame.h",
-	MAME_DIR .. "src/emu/ui/sliders.c",
+	MAME_DIR .. "src/emu/ui/sliders.cpp",
 	MAME_DIR .. "src/emu/ui/sliders.h",
-	MAME_DIR .. "src/emu/ui/slotopt.c",
+	MAME_DIR .. "src/emu/ui/slotopt.cpp",
 	MAME_DIR .. "src/emu/ui/slotopt.h",
-	MAME_DIR .. "src/emu/ui/swlist.c",
+	MAME_DIR .. "src/emu/ui/swlist.cpp",
 	MAME_DIR .. "src/emu/ui/swlist.h",
-	MAME_DIR .. "src/emu/ui/tapectrl.c",
+	MAME_DIR .. "src/emu/ui/tapectrl.cpp",
 	MAME_DIR .. "src/emu/ui/tapectrl.h",
-	MAME_DIR .. "src/emu/ui/videoopt.c",
+	MAME_DIR .. "src/emu/ui/videoopt.cpp",
 	MAME_DIR .. "src/emu/ui/videoopt.h",
-	MAME_DIR .. "src/emu/ui/viewgfx.c",
+	MAME_DIR .. "src/emu/ui/viewgfx.cpp",
 	MAME_DIR .. "src/emu/ui/viewgfx.h",
-	MAME_DIR .. "src/emu/validity.c",
+	MAME_DIR .. "src/emu/validity.cpp",
 	MAME_DIR .. "src/emu/validity.h",
-	MAME_DIR .. "src/emu/video.c",
+	MAME_DIR .. "src/emu/video.cpp",
 	MAME_DIR .. "src/emu/video.h",
 	MAME_DIR .. "src/emu/rendersw.inc",
-	MAME_DIR .. "src/emu/debug/debugcmd.c",
+	MAME_DIR .. "src/emu/debug/debugcmd.cpp",
 	MAME_DIR .. "src/emu/debug/debugcmd.h",
-	MAME_DIR .. "src/emu/debug/debugcon.c",
+	MAME_DIR .. "src/emu/debug/debugcon.cpp",
 	MAME_DIR .. "src/emu/debug/debugcon.h",
-	MAME_DIR .. "src/emu/debug/debugcpu.c",
+	MAME_DIR .. "src/emu/debug/debugcpu.cpp",
 	MAME_DIR .. "src/emu/debug/debugcpu.h",
-	MAME_DIR .. "src/emu/debug/debughlp.c",
+	MAME_DIR .. "src/emu/debug/debughlp.cpp",
 	MAME_DIR .. "src/emu/debug/debughlp.h",
-	MAME_DIR .. "src/emu/debug/debugvw.c",
+	MAME_DIR .. "src/emu/debug/debugvw.cpp",
 	MAME_DIR .. "src/emu/debug/debugvw.h",
-	MAME_DIR .. "src/emu/debug/dvdisasm.c",
+	MAME_DIR .. "src/emu/debug/dvdisasm.cpp",
 	MAME_DIR .. "src/emu/debug/dvdisasm.h",
-	MAME_DIR .. "src/emu/debug/dvmemory.c",
+	MAME_DIR .. "src/emu/debug/dvmemory.cpp",
 	MAME_DIR .. "src/emu/debug/dvmemory.h",
-	MAME_DIR .. "src/emu/debug/dvbpoints.c",
+	MAME_DIR .. "src/emu/debug/dvbpoints.cpp",
 	MAME_DIR .. "src/emu/debug/dvbpoints.h",
-	MAME_DIR .. "src/emu/debug/dvwpoints.c",
+	MAME_DIR .. "src/emu/debug/dvwpoints.cpp",
 	MAME_DIR .. "src/emu/debug/dvwpoints.h",
-	MAME_DIR .. "src/emu/debug/dvstate.c",
+	MAME_DIR .. "src/emu/debug/dvstate.cpp",
 	MAME_DIR .. "src/emu/debug/dvstate.h",
-	MAME_DIR .. "src/emu/debug/dvtext.c",
+	MAME_DIR .. "src/emu/debug/dvtext.cpp",
 	MAME_DIR .. "src/emu/debug/dvtext.h",
-	MAME_DIR .. "src/emu/debug/express.c",
+	MAME_DIR .. "src/emu/debug/express.cpp",
 	MAME_DIR .. "src/emu/debug/express.h",
-	MAME_DIR .. "src/emu/debug/textbuf.c",
+	MAME_DIR .. "src/emu/debug/textbuf.cpp",
 	MAME_DIR .. "src/emu/debug/textbuf.h",
-	MAME_DIR .. "src/emu/profiler.c",
+	MAME_DIR .. "src/emu/profiler.cpp",
 	MAME_DIR .. "src/emu/profiler.h",
-	MAME_DIR .. "src/emu/sound/filter.c",
+	MAME_DIR .. "src/emu/sound/filter.cpp",
 	MAME_DIR .. "src/emu/sound/filter.h",
-	MAME_DIR .. "src/devices/sound/flt_vol.c",
+	MAME_DIR .. "src/devices/sound/flt_vol.cpp",
 	MAME_DIR .. "src/devices/sound/flt_vol.h",
-	MAME_DIR .. "src/devices/sound/flt_rc.c",
+	MAME_DIR .. "src/devices/sound/flt_rc.cpp",
 	MAME_DIR .. "src/devices/sound/flt_rc.h",
-	MAME_DIR .. "src/emu/sound/wavwrite.c",
+	MAME_DIR .. "src/emu/sound/wavwrite.cpp",
 	MAME_DIR .. "src/emu/sound/wavwrite.h",
-	MAME_DIR .. "src/devices/sound/samples.c",
+	MAME_DIR .. "src/devices/sound/samples.cpp",
 	MAME_DIR .. "src/devices/sound/samples.h",
-	MAME_DIR .. "src/emu/drivers/empty.c",
-	MAME_DIR .. "src/emu/drivers/testcpu.c",
+	MAME_DIR .. "src/emu/drivers/empty.cpp",
+	MAME_DIR .. "src/emu/drivers/testcpu.cpp",
 	MAME_DIR .. "src/emu/drivers/xtal.h",
-	MAME_DIR .. "src/devices/machine/bcreader.c",
+	MAME_DIR .. "src/devices/machine/bcreader.cpp",
 	MAME_DIR .. "src/devices/machine/bcreader.h",
-	MAME_DIR .. "src/devices/machine/buffer.c",
+	MAME_DIR .. "src/devices/machine/buffer.cpp",
 	MAME_DIR .. "src/devices/machine/buffer.h",
-	MAME_DIR .. "src/devices/machine/clock.c",
+	MAME_DIR .. "src/devices/machine/clock.cpp",
 	MAME_DIR .. "src/devices/machine/clock.h",
-	MAME_DIR .. "src/emu/machine/generic.c",
+	MAME_DIR .. "src/emu/machine/generic.cpp",
 	MAME_DIR .. "src/emu/machine/generic.h",
-	MAME_DIR .. "src/devices/machine/keyboard.c",
+	MAME_DIR .. "src/devices/machine/keyboard.cpp",
 	MAME_DIR .. "src/devices/machine/keyboard.h",
-	MAME_DIR .. "src/devices/machine/laserdsc.c",
+	MAME_DIR .. "src/devices/machine/laserdsc.cpp",
 	MAME_DIR .. "src/devices/machine/laserdsc.h",
-	MAME_DIR .. "src/devices/machine/latch.c",
+	MAME_DIR .. "src/devices/machine/latch.cpp",
 	MAME_DIR .. "src/devices/machine/latch.h",
-	MAME_DIR .. "src/devices/machine/nvram.c",
+	MAME_DIR .. "src/devices/machine/nvram.cpp",
 	MAME_DIR .. "src/devices/machine/nvram.h",
-	MAME_DIR .. "src/devices/machine/ram.c",
+	MAME_DIR .. "src/devices/machine/ram.cpp",
 	MAME_DIR .. "src/devices/machine/ram.h",
-	MAME_DIR .. "src/devices/machine/legscsi.c",
+	MAME_DIR .. "src/devices/machine/legscsi.cpp",
 	MAME_DIR .. "src/devices/machine/legscsi.h",
-	MAME_DIR .. "src/devices/machine/terminal.c",
+	MAME_DIR .. "src/devices/machine/terminal.cpp",
 	MAME_DIR .. "src/devices/machine/terminal.h",
-	MAME_DIR .. "src/devices/imagedev/bitbngr.c",
+	MAME_DIR .. "src/devices/imagedev/bitbngr.cpp",
 	MAME_DIR .. "src/devices/imagedev/bitbngr.h",
-	MAME_DIR .. "src/devices/imagedev/cassette.c",
+	MAME_DIR .. "src/devices/imagedev/cassette.cpp",
 	MAME_DIR .. "src/devices/imagedev/cassette.h",
-	MAME_DIR .. "src/devices/imagedev/chd_cd.c",
+	MAME_DIR .. "src/devices/imagedev/chd_cd.cpp",
 	MAME_DIR .. "src/devices/imagedev/chd_cd.h",
-	MAME_DIR .. "src/devices/imagedev/diablo.c",
+	MAME_DIR .. "src/devices/imagedev/diablo.cpp",
 	MAME_DIR .. "src/devices/imagedev/diablo.h",
-	MAME_DIR .. "src/devices/imagedev/flopdrv.c",
+	MAME_DIR .. "src/devices/imagedev/flopdrv.cpp",
 	MAME_DIR .. "src/devices/imagedev/flopdrv.h",
-	MAME_DIR .. "src/devices/imagedev/floppy.c",
+	MAME_DIR .. "src/devices/imagedev/floppy.cpp",
 	MAME_DIR .. "src/devices/imagedev/floppy.h",
-	MAME_DIR .. "src/devices/imagedev/harddriv.c",
+	MAME_DIR .. "src/devices/imagedev/harddriv.cpp",
 	MAME_DIR .. "src/devices/imagedev/harddriv.h",
-	MAME_DIR .. "src/devices/imagedev/mfmhd.c",
+	MAME_DIR .. "src/devices/imagedev/mfmhd.cpp",
 	MAME_DIR .. "src/devices/imagedev/mfmhd.h",
-	MAME_DIR .. "src/devices/imagedev/midiin.c",
+	MAME_DIR .. "src/devices/imagedev/midiin.cpp",
 	MAME_DIR .. "src/devices/imagedev/midiin.h",
-	MAME_DIR .. "src/devices/imagedev/midiout.c",
+	MAME_DIR .. "src/devices/imagedev/midiout.cpp",
 	MAME_DIR .. "src/devices/imagedev/midiout.h",
-	MAME_DIR .. "src/devices/imagedev/printer.c",
+	MAME_DIR .. "src/devices/imagedev/printer.cpp",
 	MAME_DIR .. "src/devices/imagedev/printer.h",
-	MAME_DIR .. "src/devices/imagedev/snapquik.c",
+	MAME_DIR .. "src/devices/imagedev/snapquik.cpp",
 	MAME_DIR .. "src/devices/imagedev/snapquik.h",
-	MAME_DIR .. "src/emu/video/generic.c",
+	MAME_DIR .. "src/emu/video/generic.cpp",
 	MAME_DIR .. "src/emu/video/generic.h",
-	MAME_DIR .. "src/emu/video/resnet.c",
+	MAME_DIR .. "src/emu/video/resnet.cpp",
 	MAME_DIR .. "src/emu/video/resnet.h",
 	MAME_DIR .. "src/emu/video/rgbutil.h",
-	MAME_DIR .. "src/emu/video/rgbgen.c",
+	MAME_DIR .. "src/emu/video/rgbgen.cpp",
 	MAME_DIR .. "src/emu/video/rgbgen.h",
-	MAME_DIR .. "src/emu/video/rgbsse.c",
+	MAME_DIR .. "src/emu/video/rgbsse.cpp",
 	MAME_DIR .. "src/emu/video/rgbsse.h",
-	MAME_DIR .. "src/emu/video/rgbvmx.c",
+	MAME_DIR .. "src/emu/video/rgbvmx.cpp",
 	MAME_DIR .. "src/emu/video/rgbvmx.h",
-	MAME_DIR .. "src/emu/video/vector.c",
+	MAME_DIR .. "src/emu/video/vector.cpp",
 	MAME_DIR .. "src/emu/video/vector.h",
 	MAME_DIR .. "src/devices/video/poly.h",
 }
@@ -324,22 +324,22 @@ dependency {
 	--------------------------------------------------
 	-- additional dependencies
 	--------------------------------------------------
-	{ MAME_DIR .. "src/emu/rendfont.c", GEN_DIR .. "emu/uismall.fh" },
+	{ MAME_DIR .. "src/emu/rendfont.cpp", GEN_DIR .. "emu/uismall.fh" },
 	-------------------------------------------------
 	-- core layouts
 	--------------------------------------------------
-	{ MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/dualhovu.lh" },
-	{ MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/dualhsxs.lh" },
-	{ MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/dualhuov.lh" },
-	{ MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/horizont.lh" },
-	{ MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/triphsxs.lh" },
-	{ MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/quadhsxs.lh" },
-	{ MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/vertical.lh" },
-	{ MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/lcd.lh" },
-	{ MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/lcd_rot.lh" },
-	{ MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/noscreens.lh" },
+	{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/dualhovu.lh" },
+	{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/dualhsxs.lh" },
+	{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/dualhuov.lh" },
+	{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/horizont.lh" },
+	{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/triphsxs.lh" },
+	{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/quadhsxs.lh" },
+	{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/vertical.lh" },
+	{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/lcd.lh" },
+	{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/lcd_rot.lh" },
+	{ MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/noscreens.lh" },
 
-	{ MAME_DIR .. "src/emu/video.c",   GEN_DIR .. "emu/layout/snap.lh" },
+	{ MAME_DIR .. "src/emu/video.cpp",   GEN_DIR .. "emu/layout/snap.lh" },
 
 }
 
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index c8b2057d187..f4739324d72 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -28,71 +28,71 @@ project "utils"
 	files {
 		MAME_DIR .. "src/lib/util/bitstream.h",
 		MAME_DIR .. "src/lib/util/coretmpl.h",
-		MAME_DIR .. "src/lib/util/avhuff.c",
+		MAME_DIR .. "src/lib/util/avhuff.cpp",
 		MAME_DIR .. "src/lib/util/avhuff.h",
-		MAME_DIR .. "src/lib/util/aviio.c",
+		MAME_DIR .. "src/lib/util/aviio.cpp",
 		MAME_DIR .. "src/lib/util/aviio.h",
-		MAME_DIR .. "src/lib/util/bitmap.c",
+		MAME_DIR .. "src/lib/util/bitmap.cpp",
 		MAME_DIR .. "src/lib/util/bitmap.h",
-		MAME_DIR .. "src/lib/util/cdrom.c",
+		MAME_DIR .. "src/lib/util/cdrom.cpp",
 		MAME_DIR .. "src/lib/util/cdrom.h",
-		MAME_DIR .. "src/lib/util/chd.c",
+		MAME_DIR .. "src/lib/util/chd.cpp",
 		MAME_DIR .. "src/lib/util/chd.h",
-		MAME_DIR .. "src/lib/util/chdcd.c",
+		MAME_DIR .. "src/lib/util/chdcd.cpp",
 		MAME_DIR .. "src/lib/util/chdcd.h",
-		MAME_DIR .. "src/lib/util/chdcodec.c",
+		MAME_DIR .. "src/lib/util/chdcodec.cpp",
 		MAME_DIR .. "src/lib/util/chdcodec.h",
-		MAME_DIR .. "src/lib/util/corealloc.c",
+		MAME_DIR .. "src/lib/util/corealloc.cpp",
 		MAME_DIR .. "src/lib/util/corealloc.h",
-		MAME_DIR .. "src/lib/util/corefile.c",
+		MAME_DIR .. "src/lib/util/corefile.cpp",
 		MAME_DIR .. "src/lib/util/corefile.h",
-		MAME_DIR .. "src/lib/util/corestr.c",
+		MAME_DIR .. "src/lib/util/corestr.cpp",
 		MAME_DIR .. "src/lib/util/corestr.h",
-		MAME_DIR .. "src/lib/util/coreutil.c",
+		MAME_DIR .. "src/lib/util/coreutil.cpp",
 		MAME_DIR .. "src/lib/util/coreutil.h",
-		MAME_DIR .. "src/lib/util/cstrpool.c",
+		MAME_DIR .. "src/lib/util/cstrpool.cpp",
 		MAME_DIR .. "src/lib/util/cstrpool.h",
-		MAME_DIR .. "src/lib/util/delegate.c",
+		MAME_DIR .. "src/lib/util/delegate.cpp",
 		MAME_DIR .. "src/lib/util/delegate.h",
-		MAME_DIR .. "src/lib/util/flac.c",
+		MAME_DIR .. "src/lib/util/flac.cpp",
 		MAME_DIR .. "src/lib/util/flac.h",
-		MAME_DIR .. "src/lib/util/harddisk.c",
+		MAME_DIR .. "src/lib/util/harddisk.cpp",
 		MAME_DIR .. "src/lib/util/harddisk.h",
-		MAME_DIR .. "src/lib/util/hashing.c",
+		MAME_DIR .. "src/lib/util/hashing.cpp",
 		MAME_DIR .. "src/lib/util/hashing.h",
-		MAME_DIR .. "src/lib/util/huffman.c",
+		MAME_DIR .. "src/lib/util/huffman.cpp",
 		MAME_DIR .. "src/lib/util/huffman.h",
-		MAME_DIR .. "src/lib/util/jedparse.c",
+		MAME_DIR .. "src/lib/util/jedparse.cpp",
 		MAME_DIR .. "src/lib/util/jedparse.h",
-		MAME_DIR .. "src/lib/util/md5.c",
+		MAME_DIR .. "src/lib/util/md5.cpp",
 		MAME_DIR .. "src/lib/util/md5.h",
-		MAME_DIR .. "src/lib/util/opresolv.c",
+		MAME_DIR .. "src/lib/util/opresolv.cpp",
 		MAME_DIR .. "src/lib/util/opresolv.h",
-		MAME_DIR .. "src/lib/util/options.c",
+		MAME_DIR .. "src/lib/util/options.cpp",
 		MAME_DIR .. "src/lib/util/options.h",
-		MAME_DIR .. "src/lib/util/palette.c",
+		MAME_DIR .. "src/lib/util/palette.cpp",
 		MAME_DIR .. "src/lib/util/palette.h",
-		MAME_DIR .. "src/lib/util/plaparse.c",
+		MAME_DIR .. "src/lib/util/plaparse.cpp",
 		MAME_DIR .. "src/lib/util/plaparse.h",
-		MAME_DIR .. "src/lib/util/png.c",
+		MAME_DIR .. "src/lib/util/png.cpp",
 		MAME_DIR .. "src/lib/util/png.h",
-		MAME_DIR .. "src/lib/util/pool.c",
+		MAME_DIR .. "src/lib/util/pool.cpp",
 		MAME_DIR .. "src/lib/util/pool.h",
-		MAME_DIR .. "src/lib/util/sha1.c",
+		MAME_DIR .. "src/lib/util/sha1.cpp",
 		MAME_DIR .. "src/lib/util/sha1.h",
-		MAME_DIR .. "src/lib/util/tagmap.c",
+		MAME_DIR .. "src/lib/util/tagmap.cpp",
 		MAME_DIR .. "src/lib/util/tagmap.h",
-		MAME_DIR .. "src/lib/util/unicode.c",
+		MAME_DIR .. "src/lib/util/unicode.cpp",
 		MAME_DIR .. "src/lib/util/unicode.h",
-		MAME_DIR .. "src/lib/util/unzip.c",
+		MAME_DIR .. "src/lib/util/unzip.cpp",
 		MAME_DIR .. "src/lib/util/unzip.h",
-		MAME_DIR .. "src/lib/util/un7z.c",
+		MAME_DIR .. "src/lib/util/un7z.cpp",
 		MAME_DIR .. "src/lib/util/un7z.h",
-		MAME_DIR .. "src/lib/util/vbiparse.c",
+		MAME_DIR .. "src/lib/util/vbiparse.cpp",
 		MAME_DIR .. "src/lib/util/vbiparse.h",
-		MAME_DIR .. "src/lib/util/xmlfile.c",
+		MAME_DIR .. "src/lib/util/xmlfile.cpp",
 		MAME_DIR .. "src/lib/util/xmlfile.h",
-		MAME_DIR .. "src/lib/util/zippath.c",
+		MAME_DIR .. "src/lib/util/zippath.cpp",
 		MAME_DIR .. "src/lib/util/zippath.h",
 	}
 
@@ -121,304 +121,304 @@ project "formats"
 	end
 
 	files {
-		MAME_DIR .. "src/lib/formats/2d_dsk.c",
+		MAME_DIR .. "src/lib/formats/2d_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/2d_dsk.h",
-		MAME_DIR .. "src/lib/formats/cassimg.c",
+		MAME_DIR .. "src/lib/formats/cassimg.cpp",
 		MAME_DIR .. "src/lib/formats/cassimg.h",
-		MAME_DIR .. "src/lib/formats/flopimg.c",
+		MAME_DIR .. "src/lib/formats/flopimg.cpp",
 		MAME_DIR .. "src/lib/formats/flopimg.h",
-		MAME_DIR .. "src/lib/formats/imageutl.c",
+		MAME_DIR .. "src/lib/formats/imageutl.cpp",
 		MAME_DIR .. "src/lib/formats/imageutl.h",
-		MAME_DIR .. "src/lib/formats/ioprocs.c",
+		MAME_DIR .. "src/lib/formats/ioprocs.cpp",
 		MAME_DIR .. "src/lib/formats/ioprocs.h",
-		MAME_DIR .. "src/lib/formats/basicdsk.c",
+		MAME_DIR .. "src/lib/formats/basicdsk.cpp",
 		MAME_DIR .. "src/lib/formats/basicdsk.h",
-		MAME_DIR .. "src/lib/formats/a26_cas.c",
+		MAME_DIR .. "src/lib/formats/a26_cas.cpp",
 		MAME_DIR .. "src/lib/formats/a26_cas.h",
-		MAME_DIR .. "src/lib/formats/a5105_dsk.c",
+		MAME_DIR .. "src/lib/formats/a5105_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/a5105_dsk.h",
-		MAME_DIR .. "src/lib/formats/abc800_dsk.c",
+		MAME_DIR .. "src/lib/formats/abc800_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/abc800_dsk.h",
-		MAME_DIR .. "src/lib/formats/abcfd2_dsk.c",
+		MAME_DIR .. "src/lib/formats/abcfd2_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/abcfd2_dsk.h",
-		MAME_DIR .. "src/lib/formats/ace_tap.c",
+		MAME_DIR .. "src/lib/formats/ace_tap.cpp",
 		MAME_DIR .. "src/lib/formats/ace_tap.h",
-		MAME_DIR .. "src/lib/formats/adam_cas.c",
+		MAME_DIR .. "src/lib/formats/adam_cas.cpp",
 		MAME_DIR .. "src/lib/formats/adam_cas.h",
-		MAME_DIR .. "src/lib/formats/adam_dsk.c",
+		MAME_DIR .. "src/lib/formats/adam_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/adam_dsk.h",
-		MAME_DIR .. "src/lib/formats/ami_dsk.c",
+		MAME_DIR .. "src/lib/formats/ami_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/ami_dsk.h",
-		MAME_DIR .. "src/lib/formats/ap2_dsk.c",
+		MAME_DIR .. "src/lib/formats/ap2_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/ap2_dsk.h",
-		MAME_DIR .. "src/lib/formats/apf_apt.c",
+		MAME_DIR .. "src/lib/formats/apf_apt.cpp",
 		MAME_DIR .. "src/lib/formats/apf_apt.h",
-		MAME_DIR .. "src/lib/formats/apridisk.c",
+		MAME_DIR .. "src/lib/formats/apridisk.cpp",
 		MAME_DIR .. "src/lib/formats/apridisk.h",
-		MAME_DIR .. "src/lib/formats/apollo_dsk.c",
+		MAME_DIR .. "src/lib/formats/apollo_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/apollo_dsk.h",
-		MAME_DIR .. "src/lib/formats/ap_dsk35.c",
+		MAME_DIR .. "src/lib/formats/ap_dsk35.cpp",
 		MAME_DIR .. "src/lib/formats/ap_dsk35.h",
-		MAME_DIR .. "src/lib/formats/applix_dsk.c",
+		MAME_DIR .. "src/lib/formats/applix_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/applix_dsk.h",
-		MAME_DIR .. "src/lib/formats/asst128_dsk.c",
+		MAME_DIR .. "src/lib/formats/asst128_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/asst128_dsk.h",
-		MAME_DIR .. "src/lib/formats/atari_dsk.c",
+		MAME_DIR .. "src/lib/formats/atari_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/atari_dsk.h",
-		MAME_DIR .. "src/lib/formats/atom_dsk.c",
+		MAME_DIR .. "src/lib/formats/atom_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/atom_dsk.h",
-		MAME_DIR .. "src/lib/formats/atom_tap.c",
+		MAME_DIR .. "src/lib/formats/atom_tap.cpp",
 		MAME_DIR .. "src/lib/formats/atom_tap.h",
-		MAME_DIR .. "src/lib/formats/bbc_dsk.c",
+		MAME_DIR .. "src/lib/formats/bbc_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/bbc_dsk.h",
-		MAME_DIR .. "src/lib/formats/bw2_dsk.c",
+		MAME_DIR .. "src/lib/formats/bw2_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/bw2_dsk.h",
-		MAME_DIR .. "src/lib/formats/bw12_dsk.c",
+		MAME_DIR .. "src/lib/formats/bw12_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/bw12_dsk.h",
-		MAME_DIR .. "src/lib/formats/c3040_dsk.c",
+		MAME_DIR .. "src/lib/formats/c3040_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/c3040_dsk.h",
-		MAME_DIR .. "src/lib/formats/c4040_dsk.c",
+		MAME_DIR .. "src/lib/formats/c4040_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/c4040_dsk.h",
-		MAME_DIR .. "src/lib/formats/c8280_dsk.c",
+		MAME_DIR .. "src/lib/formats/c8280_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/c8280_dsk.h",
-		MAME_DIR .. "src/lib/formats/camplynx_cas.c",
+		MAME_DIR .. "src/lib/formats/camplynx_cas.cpp",
 		MAME_DIR .. "src/lib/formats/camplynx_cas.h",
-		MAME_DIR .. "src/lib/formats/cbm_crt.c",
+		MAME_DIR .. "src/lib/formats/cbm_crt.cpp",
 		MAME_DIR .. "src/lib/formats/cbm_crt.h",
-		MAME_DIR .. "src/lib/formats/cbm_tap.c",
+		MAME_DIR .. "src/lib/formats/cbm_tap.cpp",
 		MAME_DIR .. "src/lib/formats/cbm_tap.h",
-		MAME_DIR .. "src/lib/formats/ccvf_dsk.c",
+		MAME_DIR .. "src/lib/formats/ccvf_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/ccvf_dsk.h",
-		MAME_DIR .. "src/lib/formats/cd90_640_dsk.c",
+		MAME_DIR .. "src/lib/formats/cd90_640_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/cd90_640_dsk.h",
-		MAME_DIR .. "src/lib/formats/cgen_cas.c",
+		MAME_DIR .. "src/lib/formats/cgen_cas.cpp",
 		MAME_DIR .. "src/lib/formats/cgen_cas.h",
-		MAME_DIR .. "src/lib/formats/cgenie_dsk.c",
+		MAME_DIR .. "src/lib/formats/cgenie_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/cgenie_dsk.h",
-		MAME_DIR .. "src/lib/formats/coco_cas.c",
+		MAME_DIR .. "src/lib/formats/coco_cas.cpp",
 		MAME_DIR .. "src/lib/formats/coco_cas.h",
-		MAME_DIR .. "src/lib/formats/comx35_dsk.c",
+		MAME_DIR .. "src/lib/formats/comx35_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/comx35_dsk.h",
-		MAME_DIR .. "src/lib/formats/concept_dsk.c",
+		MAME_DIR .. "src/lib/formats/concept_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/concept_dsk.h",
-		MAME_DIR .. "src/lib/formats/coupedsk.c",
+		MAME_DIR .. "src/lib/formats/coupedsk.cpp",
 		MAME_DIR .. "src/lib/formats/coupedsk.h",
-		MAME_DIR .. "src/lib/formats/cpis_dsk.c",
+		MAME_DIR .. "src/lib/formats/cpis_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/cpis_dsk.h",
-		MAME_DIR .. "src/lib/formats/cqm_dsk.c",
+		MAME_DIR .. "src/lib/formats/cqm_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/cqm_dsk.h",
-		MAME_DIR .. "src/lib/formats/csw_cas.c",
+		MAME_DIR .. "src/lib/formats/csw_cas.cpp",
 		MAME_DIR .. "src/lib/formats/csw_cas.h",
-		MAME_DIR .. "src/lib/formats/d64_dsk.c",
+		MAME_DIR .. "src/lib/formats/d64_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/d64_dsk.h",
-		MAME_DIR .. "src/lib/formats/d71_dsk.c",
+		MAME_DIR .. "src/lib/formats/d71_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/d71_dsk.h",
-		MAME_DIR .. "src/lib/formats/d80_dsk.c",
+		MAME_DIR .. "src/lib/formats/d80_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/d80_dsk.h",
-		MAME_DIR .. "src/lib/formats/d81_dsk.c",
+		MAME_DIR .. "src/lib/formats/d81_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/d81_dsk.h",
-		MAME_DIR .. "src/lib/formats/d82_dsk.c",
+		MAME_DIR .. "src/lib/formats/d82_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/d82_dsk.h",
-		MAME_DIR .. "src/lib/formats/d88_dsk.c",
+		MAME_DIR .. "src/lib/formats/d88_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/d88_dsk.h",
-		MAME_DIR .. "src/lib/formats/dcp_dsk.c",
+		MAME_DIR .. "src/lib/formats/dcp_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/dcp_dsk.h",
-		MAME_DIR .. "src/lib/formats/dfi_dsk.c",
+		MAME_DIR .. "src/lib/formats/dfi_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/dfi_dsk.h",
-		MAME_DIR .. "src/lib/formats/dim_dsk.c",
+		MAME_DIR .. "src/lib/formats/dim_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/dim_dsk.h",
-		MAME_DIR .. "src/lib/formats/dip_dsk.c",
+		MAME_DIR .. "src/lib/formats/dip_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/dip_dsk.h",
-		MAME_DIR .. "src/lib/formats/dmk_dsk.c",
+		MAME_DIR .. "src/lib/formats/dmk_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/dmk_dsk.h",
-		MAME_DIR .. "src/lib/formats/dmv_dsk.c",
+		MAME_DIR .. "src/lib/formats/dmv_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/dmv_dsk.h",
-		MAME_DIR .. "src/lib/formats/dsk_dsk.c",
+		MAME_DIR .. "src/lib/formats/dsk_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/dsk_dsk.h",
-		MAME_DIR .. "src/lib/formats/ep64_dsk.c",
+		MAME_DIR .. "src/lib/formats/ep64_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/ep64_dsk.h",
-		MAME_DIR .. "src/lib/formats/esq8_dsk.c",
+		MAME_DIR .. "src/lib/formats/esq8_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/esq8_dsk.h",
-		MAME_DIR .. "src/lib/formats/esq16_dsk.c",
+		MAME_DIR .. "src/lib/formats/esq16_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/esq16_dsk.h",
-		MAME_DIR .. "src/lib/formats/excali64_dsk.c",
+		MAME_DIR .. "src/lib/formats/excali64_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/excali64_dsk.h",
-		MAME_DIR .. "src/lib/formats/fc100_cas.c",
+		MAME_DIR .. "src/lib/formats/fc100_cas.cpp",
 		MAME_DIR .. "src/lib/formats/fc100_cas.h",
-		MAME_DIR .. "src/lib/formats/fdi_dsk.c",
-		MAME_DIR .. "src/lib/formats/fdd_dsk.c",
+		MAME_DIR .. "src/lib/formats/fdi_dsk.cpp",
+		MAME_DIR .. "src/lib/formats/fdd_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/fdd_dsk.h",
-		MAME_DIR .. "src/lib/formats/flex_dsk.c",
+		MAME_DIR .. "src/lib/formats/flex_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/flex_dsk.h",
-		MAME_DIR .. "src/lib/formats/fm7_cas.c",
+		MAME_DIR .. "src/lib/formats/fm7_cas.cpp",
 		MAME_DIR .. "src/lib/formats/fm7_cas.h",
-		MAME_DIR .. "src/lib/formats/fmsx_cas.c",
+		MAME_DIR .. "src/lib/formats/fmsx_cas.cpp",
 		MAME_DIR .. "src/lib/formats/fmsx_cas.h",
-		MAME_DIR .. "src/lib/formats/fmtowns_dsk.c",
+		MAME_DIR .. "src/lib/formats/fmtowns_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/fmtowns_dsk.h",
-		MAME_DIR .. "src/lib/formats/g64_dsk.c",
+		MAME_DIR .. "src/lib/formats/g64_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/g64_dsk.h",
-		MAME_DIR .. "src/lib/formats/gtp_cas.c",
+		MAME_DIR .. "src/lib/formats/gtp_cas.cpp",
 		MAME_DIR .. "src/lib/formats/gtp_cas.h",
-		MAME_DIR .. "src/lib/formats/guab_dsk.c",
+		MAME_DIR .. "src/lib/formats/guab_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/guab_dsk.h",
-		MAME_DIR .. "src/lib/formats/hect_dsk.c",
+		MAME_DIR .. "src/lib/formats/hect_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/hect_dsk.h",
-		MAME_DIR .. "src/lib/formats/hect_tap.c",
+		MAME_DIR .. "src/lib/formats/hect_tap.cpp",
 		MAME_DIR .. "src/lib/formats/hect_tap.h",
-		MAME_DIR .. "src/lib/formats/hector_minidisc.c",
+		MAME_DIR .. "src/lib/formats/hector_minidisc.cpp",
 		MAME_DIR .. "src/lib/formats/hector_minidisc.h",
-		MAME_DIR .. "src/lib/formats/iq151_dsk.c",
+		MAME_DIR .. "src/lib/formats/iq151_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/iq151_dsk.h",
-		MAME_DIR .. "src/lib/formats/imd_dsk.c",
+		MAME_DIR .. "src/lib/formats/imd_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/imd_dsk.h",
-		MAME_DIR .. "src/lib/formats/ipf_dsk.c",
+		MAME_DIR .. "src/lib/formats/ipf_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/ipf_dsk.h",
-		MAME_DIR .. "src/lib/formats/jvc_dsk.c",
+		MAME_DIR .. "src/lib/formats/jvc_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/jvc_dsk.h",
-		MAME_DIR .. "src/lib/formats/kaypro_dsk.c",
+		MAME_DIR .. "src/lib/formats/kaypro_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/kaypro_dsk.h",
-		MAME_DIR .. "src/lib/formats/kc_cas.c",
+		MAME_DIR .. "src/lib/formats/kc_cas.cpp",
 		MAME_DIR .. "src/lib/formats/kc_cas.h",
-		MAME_DIR .. "src/lib/formats/kc85_dsk.c",
+		MAME_DIR .. "src/lib/formats/kc85_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/kc85_dsk.h",
-		MAME_DIR .. "src/lib/formats/kim1_cas.c",
+		MAME_DIR .. "src/lib/formats/kim1_cas.cpp",
 		MAME_DIR .. "src/lib/formats/kim1_cas.h",
-		MAME_DIR .. "src/lib/formats/lviv_lvt.c",
+		MAME_DIR .. "src/lib/formats/lviv_lvt.cpp",
 		MAME_DIR .. "src/lib/formats/lviv_lvt.h",
-		MAME_DIR .. "src/lib/formats/m20_dsk.c",
+		MAME_DIR .. "src/lib/formats/m20_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/m20_dsk.h",
-		MAME_DIR .. "src/lib/formats/m5_dsk.c",
+		MAME_DIR .. "src/lib/formats/m5_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/m5_dsk.h",
-		MAME_DIR .. "src/lib/formats/mbee_cas.c",
+		MAME_DIR .. "src/lib/formats/mbee_cas.cpp",
 		MAME_DIR .. "src/lib/formats/mbee_cas.h",
-		MAME_DIR .. "src/lib/formats/mm_dsk.c",
+		MAME_DIR .. "src/lib/formats/mm_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/mm_dsk.h",
-		MAME_DIR .. "src/lib/formats/msx_dsk.c",
+		MAME_DIR .. "src/lib/formats/msx_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/msx_dsk.h",
-		MAME_DIR .. "src/lib/formats/mfi_dsk.c",
+		MAME_DIR .. "src/lib/formats/mfi_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/mfi_dsk.h",
-		MAME_DIR .. "src/lib/formats/mfm_hd.c",
+		MAME_DIR .. "src/lib/formats/mfm_hd.cpp",
 		MAME_DIR .. "src/lib/formats/mfm_hd.h",
-		MAME_DIR .. "src/lib/formats/mz_cas.c",
+		MAME_DIR .. "src/lib/formats/mz_cas.cpp",
 		MAME_DIR .. "src/lib/formats/mz_cas.h",
-		MAME_DIR .. "src/lib/formats/nanos_dsk.c",
+		MAME_DIR .. "src/lib/formats/nanos_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/nanos_dsk.h",
-		MAME_DIR .. "src/lib/formats/nascom_dsk.c",
+		MAME_DIR .. "src/lib/formats/nascom_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/nascom_dsk.h",
-		MAME_DIR .. "src/lib/formats/naslite_dsk.c",
+		MAME_DIR .. "src/lib/formats/naslite_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/naslite_dsk.h",
-		MAME_DIR .. "src/lib/formats/nes_dsk.c",
+		MAME_DIR .. "src/lib/formats/nes_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/nes_dsk.h",
-		MAME_DIR .. "src/lib/formats/nfd_dsk.c",
+		MAME_DIR .. "src/lib/formats/nfd_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/nfd_dsk.h",
-		MAME_DIR .. "src/lib/formats/orao_cas.c",
+		MAME_DIR .. "src/lib/formats/orao_cas.cpp",
 		MAME_DIR .. "src/lib/formats/orao_cas.h",
-		MAME_DIR .. "src/lib/formats/oric_dsk.c",
+		MAME_DIR .. "src/lib/formats/oric_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/oric_dsk.h",
-		MAME_DIR .. "src/lib/formats/oric_tap.c",
+		MAME_DIR .. "src/lib/formats/oric_tap.cpp",
 		MAME_DIR .. "src/lib/formats/oric_tap.h",
-		MAME_DIR .. "src/lib/formats/p6001_cas.c",
+		MAME_DIR .. "src/lib/formats/p6001_cas.cpp",
 		MAME_DIR .. "src/lib/formats/p6001_cas.h",
-		MAME_DIR .. "src/lib/formats/pasti_dsk.c",
+		MAME_DIR .. "src/lib/formats/pasti_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/pasti_dsk.h",
-		MAME_DIR .. "src/lib/formats/pc_dsk.c",
+		MAME_DIR .. "src/lib/formats/pc_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/pc_dsk.h",
-		MAME_DIR .. "src/lib/formats/pc98_dsk.c",
+		MAME_DIR .. "src/lib/formats/pc98_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/pc98_dsk.h",
-		MAME_DIR .. "src/lib/formats/pc98fdi_dsk.c",
+		MAME_DIR .. "src/lib/formats/pc98fdi_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/pc98fdi_dsk.h",
-		MAME_DIR .. "src/lib/formats/phc25_cas.c",
+		MAME_DIR .. "src/lib/formats/phc25_cas.cpp",
 		MAME_DIR .. "src/lib/formats/phc25_cas.h",
-		MAME_DIR .. "src/lib/formats/pk8020_dsk.c",
+		MAME_DIR .. "src/lib/formats/pk8020_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/pk8020_dsk.h",
-		MAME_DIR .. "src/lib/formats/pmd_cas.c",
+		MAME_DIR .. "src/lib/formats/pmd_cas.cpp",
 		MAME_DIR .. "src/lib/formats/pmd_cas.h",
-		MAME_DIR .. "src/lib/formats/primoptp.c",
+		MAME_DIR .. "src/lib/formats/primoptp.cpp",
 		MAME_DIR .. "src/lib/formats/primoptp.h",
-		MAME_DIR .. "src/lib/formats/pyldin_dsk.c",
+		MAME_DIR .. "src/lib/formats/pyldin_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/pyldin_dsk.h",
-		MAME_DIR .. "src/lib/formats/ql_dsk.c",
+		MAME_DIR .. "src/lib/formats/ql_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/ql_dsk.h",
-		MAME_DIR .. "src/lib/formats/rk_cas.c",
+		MAME_DIR .. "src/lib/formats/rk_cas.cpp",
 		MAME_DIR .. "src/lib/formats/rk_cas.h",
-		MAME_DIR .. "src/lib/formats/rx50_dsk.c",
+		MAME_DIR .. "src/lib/formats/rx50_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/rx50_dsk.h",
-		MAME_DIR .. "src/lib/formats/sc3000_bit.c",
+		MAME_DIR .. "src/lib/formats/sc3000_bit.cpp",
 		MAME_DIR .. "src/lib/formats/sc3000_bit.h",
-		MAME_DIR .. "src/lib/formats/sf7000_dsk.c",
+		MAME_DIR .. "src/lib/formats/sf7000_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/sf7000_dsk.h",
-		MAME_DIR .. "src/lib/formats/smx_dsk.c",
+		MAME_DIR .. "src/lib/formats/smx_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/smx_dsk.h",
-		MAME_DIR .. "src/lib/formats/sol_cas.c",
+		MAME_DIR .. "src/lib/formats/sol_cas.cpp",
 		MAME_DIR .. "src/lib/formats/sol_cas.h",
-		MAME_DIR .. "src/lib/formats/sorc_dsk.c",
+		MAME_DIR .. "src/lib/formats/sorc_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/sorc_dsk.h",
-		MAME_DIR .. "src/lib/formats/sorc_cas.c",
+		MAME_DIR .. "src/lib/formats/sorc_cas.cpp",
 		MAME_DIR .. "src/lib/formats/sorc_cas.h",
-		MAME_DIR .. "src/lib/formats/sord_cas.c",
+		MAME_DIR .. "src/lib/formats/sord_cas.cpp",
 		MAME_DIR .. "src/lib/formats/sord_cas.h",
-		MAME_DIR .. "src/lib/formats/spc1000_cas.c",
+		MAME_DIR .. "src/lib/formats/spc1000_cas.cpp",
 		MAME_DIR .. "src/lib/formats/spc1000_cas.h",
-		MAME_DIR .. "src/lib/formats/st_dsk.c",
+		MAME_DIR .. "src/lib/formats/st_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/st_dsk.h",
-		MAME_DIR .. "src/lib/formats/svi_cas.c",
+		MAME_DIR .. "src/lib/formats/svi_cas.cpp",
 		MAME_DIR .. "src/lib/formats/svi_cas.h",
-		MAME_DIR .. "src/lib/formats/svi_dsk.c",
+		MAME_DIR .. "src/lib/formats/svi_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/svi_dsk.h",
-		MAME_DIR .. "src/lib/formats/tandy2k_dsk.c",
+		MAME_DIR .. "src/lib/formats/tandy2k_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/tandy2k_dsk.h",
-		MAME_DIR .. "src/lib/formats/td0_dsk.c",
+		MAME_DIR .. "src/lib/formats/td0_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/td0_dsk.h",
-		MAME_DIR .. "src/lib/formats/thom_cas.c",
+		MAME_DIR .. "src/lib/formats/thom_cas.cpp",
 		MAME_DIR .. "src/lib/formats/thom_cas.h",
-		MAME_DIR .. "src/lib/formats/thom_dsk.c",
+		MAME_DIR .. "src/lib/formats/thom_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/thom_dsk.h",
-		MAME_DIR .. "src/lib/formats/ti99_dsk.c",
+		MAME_DIR .. "src/lib/formats/ti99_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/ti99_dsk.h",
-		MAME_DIR .. "src/lib/formats/tiki100_dsk.c",
+		MAME_DIR .. "src/lib/formats/tiki100_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/tiki100_dsk.h",
-		MAME_DIR .. "src/lib/formats/trd_dsk.c",
+		MAME_DIR .. "src/lib/formats/trd_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/trd_dsk.h",
-		MAME_DIR .. "src/lib/formats/trs_cas.c",
+		MAME_DIR .. "src/lib/formats/trs_cas.cpp",
 		MAME_DIR .. "src/lib/formats/trs_cas.h",
-		MAME_DIR .. "src/lib/formats/trs80_dsk.c",
+		MAME_DIR .. "src/lib/formats/trs80_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/trs80_dsk.h",
-		MAME_DIR .. "src/lib/formats/tvc_cas.c",
+		MAME_DIR .. "src/lib/formats/tvc_cas.cpp",
 		MAME_DIR .. "src/lib/formats/tvc_cas.h",
-		MAME_DIR .. "src/lib/formats/tvc_dsk.c",
+		MAME_DIR .. "src/lib/formats/tvc_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/tvc_dsk.h",
-		MAME_DIR .. "src/lib/formats/tzx_cas.c",
+		MAME_DIR .. "src/lib/formats/tzx_cas.cpp",
 		MAME_DIR .. "src/lib/formats/tzx_cas.h",
-		MAME_DIR .. "src/lib/formats/uef_cas.c",
+		MAME_DIR .. "src/lib/formats/uef_cas.cpp",
 		MAME_DIR .. "src/lib/formats/uef_cas.h",
-		MAME_DIR .. "src/lib/formats/upd765_dsk.c",
+		MAME_DIR .. "src/lib/formats/upd765_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/upd765_dsk.h",
-		MAME_DIR .. "src/lib/formats/vdk_dsk.c",
+		MAME_DIR .. "src/lib/formats/vdk_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/vdk_dsk.h",
-		MAME_DIR .. "src/lib/formats/vector06_dsk.c",
+		MAME_DIR .. "src/lib/formats/vector06_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/vector06_dsk.h",
-		MAME_DIR .. "src/lib/formats/victor9k_dsk.c",
+		MAME_DIR .. "src/lib/formats/victor9k_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/victor9k_dsk.h",
-		MAME_DIR .. "src/lib/formats/vg5k_cas.c",
+		MAME_DIR .. "src/lib/formats/vg5k_cas.cpp",
 		MAME_DIR .. "src/lib/formats/vg5k_cas.h",
-		MAME_DIR .. "src/lib/formats/vt_cas.c",
+		MAME_DIR .. "src/lib/formats/vt_cas.cpp",
 		MAME_DIR .. "src/lib/formats/vt_cas.h",
-		MAME_DIR .. "src/lib/formats/wavfile.c",
+		MAME_DIR .. "src/lib/formats/wavfile.cpp",
 		MAME_DIR .. "src/lib/formats/wavfile.h",
-		MAME_DIR .. "src/lib/formats/wd177x_dsk.c",
+		MAME_DIR .. "src/lib/formats/wd177x_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/wd177x_dsk.h",
-		MAME_DIR .. "src/lib/formats/x07_cas.c",
+		MAME_DIR .. "src/lib/formats/x07_cas.cpp",
 		MAME_DIR .. "src/lib/formats/x07_cas.h",
-		MAME_DIR .. "src/lib/formats/x1_tap.c",
+		MAME_DIR .. "src/lib/formats/x1_tap.cpp",
 		MAME_DIR .. "src/lib/formats/x1_tap.h",
-		MAME_DIR .. "src/lib/formats/xdf_dsk.c",
+		MAME_DIR .. "src/lib/formats/xdf_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/xdf_dsk.h",
-		MAME_DIR .. "src/lib/formats/zx81_p.c",
+		MAME_DIR .. "src/lib/formats/zx81_p.cpp",
 		MAME_DIR .. "src/lib/formats/zx81_p.h",
-		MAME_DIR .. "src/lib/formats/hxcmfm_dsk.c",
+		MAME_DIR .. "src/lib/formats/hxcmfm_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/hxcmfm_dsk.h",
-		MAME_DIR .. "src/lib/formats/itt3030_dsk.c",
+		MAME_DIR .. "src/lib/formats/itt3030_dsk.cpp",
 		MAME_DIR .. "src/lib/formats/itt3030_dsk.h",
 	}
 
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 846f813161d..c048884cf4f 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -17,7 +17,7 @@
 
 if (MACHINES["AKIKO"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/akiko.c",
+		MAME_DIR .. "src/devices/machine/akiko.cpp",
 		MAME_DIR .. "src/devices/machine/akiko.h",
 	}
 end
@@ -30,7 +30,7 @@ end
 
 if (MACHINES["AUTOCONFIG"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/autoconfig.c",
+		MAME_DIR .. "src/devices/machine/autoconfig.cpp",
 		MAME_DIR .. "src/devices/machine/autoconfig.h",
 	}
 end
@@ -43,7 +43,7 @@ end
 
 if (MACHINES["CR511B"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/cr511b.c",
+		MAME_DIR .. "src/devices/machine/cr511b.cpp",
 		MAME_DIR .. "src/devices/machine/cr511b.h",
 	}
 end
@@ -56,7 +56,7 @@ end
 
 if (MACHINES["DMAC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/dmac.c",
+		MAME_DIR .. "src/devices/machine/dmac.cpp",
 		MAME_DIR .. "src/devices/machine/dmac.h",
 	}
 end
@@ -69,7 +69,7 @@ end
 
 if (MACHINES["GAYLE"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/gayle.c",
+		MAME_DIR .. "src/devices/machine/gayle.cpp",
 		MAME_DIR .. "src/devices/machine/gayle.h",
 	}
 end
@@ -82,7 +82,7 @@ end
 
 if (MACHINES["CMOS40105"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/40105.c",
+		MAME_DIR .. "src/devices/machine/40105.cpp",
 		MAME_DIR .. "src/devices/machine/40105.h",
 	}
 end
@@ -96,7 +96,7 @@ end
 if (MACHINES["NCR53C7XX"]~=null) then
 	MACHINES["NSCSI"] = true
 	files {
-		MAME_DIR .. "src/devices/machine/53c7xx.c",
+		MAME_DIR .. "src/devices/machine/53c7xx.cpp",
 		MAME_DIR .. "src/devices/machine/53c7xx.h",
 	}
 end
@@ -109,7 +109,7 @@ end
 if (MACHINES["LSI53C810"]~=null) then
 	MACHINES["SCSI"] = true
 	files {
-		MAME_DIR .. "src/devices/machine/53c810.c",
+		MAME_DIR .. "src/devices/machine/53c810.cpp",
 		MAME_DIR .. "src/devices/machine/53c810.h",
 	}
 end
@@ -121,7 +121,7 @@ end
 
 if (MACHINES["6522VIA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/6522via.c",
+		MAME_DIR .. "src/devices/machine/6522via.cpp",
 		MAME_DIR .. "src/devices/machine/6522via.h",
 	}
 end
@@ -133,7 +133,7 @@ end
 
 if (MACHINES["TPI6525"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/6525tpi.c",
+		MAME_DIR .. "src/devices/machine/6525tpi.cpp",
 		MAME_DIR .. "src/devices/machine/6525tpi.h",
 	}
 end
@@ -145,7 +145,7 @@ end
 
 if (MACHINES["RIOT6532"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/6532riot.c",
+		MAME_DIR .. "src/devices/machine/6532riot.cpp",
 		MAME_DIR .. "src/devices/machine/6532riot.h",
 	}
 end
@@ -157,7 +157,7 @@ end
 
 if (MACHINES["6821PIA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/6821pia.c",
+		MAME_DIR .. "src/devices/machine/6821pia.cpp",
 		MAME_DIR .. "src/devices/machine/6821pia.h",
 	}
 end
@@ -169,7 +169,7 @@ end
 
 if (MACHINES["6840PTM"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/6840ptm.c",
+		MAME_DIR .. "src/devices/machine/6840ptm.cpp",
 		MAME_DIR .. "src/devices/machine/6840ptm.h",
 	}
 end
@@ -181,7 +181,7 @@ end
 
 if (MACHINES["ACIA6850"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/6850acia.c",
+		MAME_DIR .. "src/devices/machine/6850acia.cpp",
 		MAME_DIR .. "src/devices/machine/6850acia.h",
 	}
 end
@@ -193,7 +193,7 @@ end
 
 if (MACHINES["PIT68230"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/68230pit.c",
+		MAME_DIR .. "src/devices/machine/68230pit.cpp",
 		MAME_DIR .. "src/devices/machine/68230pit.h",
 	}
 end
@@ -205,7 +205,7 @@ end
 
 if (MACHINES["68561MPCC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/68561mpcc.c",
+		MAME_DIR .. "src/devices/machine/68561mpcc.cpp",
 		MAME_DIR .. "src/devices/machine/68561mpcc.h",
 	}
 end
@@ -217,7 +217,7 @@ end
 
 if (MACHINES["68681"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mc68681.c",
+		MAME_DIR .. "src/devices/machine/mc68681.cpp",
 		MAME_DIR .. "src/devices/machine/mc68681.h",
 	}
 end
@@ -229,7 +229,7 @@ end
 
 if (MACHINES["7200FIFO"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/7200fifo.c",
+		MAME_DIR .. "src/devices/machine/7200fifo.cpp",
 		MAME_DIR .. "src/devices/machine/7200fifo.h",
 	}
 end
@@ -241,7 +241,7 @@ end
 
 if (MACHINES["TTL74123"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/74123.c",
+		MAME_DIR .. "src/devices/machine/74123.cpp",
 		MAME_DIR .. "src/devices/machine/74123.h",
 		MAME_DIR .. "src/devices/machine/rescap.h",
 	}
@@ -254,7 +254,7 @@ end
 
 if (MACHINES["TTL74145"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/74145.c",
+		MAME_DIR .. "src/devices/machine/74145.cpp",
 		MAME_DIR .. "src/devices/machine/74145.h",
 	}
 end
@@ -266,7 +266,7 @@ end
 
 if (MACHINES["TTL74148"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/74148.c",
+		MAME_DIR .. "src/devices/machine/74148.cpp",
 		MAME_DIR .. "src/devices/machine/74148.h",
 	}
 end
@@ -278,7 +278,7 @@ end
 
 if (MACHINES["TTL74153"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/74153.c",
+		MAME_DIR .. "src/devices/machine/74153.cpp",
 		MAME_DIR .. "src/devices/machine/74153.h",
 	}
 end
@@ -290,7 +290,7 @@ end
 
 if (MACHINES["TTL74181"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/74181.c",
+		MAME_DIR .. "src/devices/machine/74181.cpp",
 		MAME_DIR .. "src/devices/machine/74181.h",
 	}
 end
@@ -302,7 +302,7 @@ end
 
 if (MACHINES["TTL7474"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/7474.c",
+		MAME_DIR .. "src/devices/machine/7474.cpp",
 		MAME_DIR .. "src/devices/machine/7474.h",
 	}
 end
@@ -314,7 +314,7 @@ end
 
 if (MACHINES["KBDC8042"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/8042kbdc.c",
+		MAME_DIR .. "src/devices/machine/8042kbdc.cpp",
 		MAME_DIR .. "src/devices/machine/8042kbdc.h",
 	}
 end
@@ -326,7 +326,7 @@ end
 
 if (MACHINES["8530SCC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/8530scc.c",
+		MAME_DIR .. "src/devices/machine/8530scc.cpp",
 		MAME_DIR .. "src/devices/machine/8530scc.h",
 	}
 end
@@ -338,7 +338,7 @@ end
 
 if (MACHINES["AAKARTDEV"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/aakart.c",
+		MAME_DIR .. "src/devices/machine/aakart.cpp",
 		MAME_DIR .. "src/devices/machine/aakart.h",
 	}
 end
@@ -350,7 +350,7 @@ end
 
 if (MACHINES["ADC0808"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/adc0808.c",
+		MAME_DIR .. "src/devices/machine/adc0808.cpp",
 		MAME_DIR .. "src/devices/machine/adc0808.h",
 	}
 end
@@ -362,7 +362,7 @@ end
 
 if (MACHINES["ADC083X"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/adc083x.c",
+		MAME_DIR .. "src/devices/machine/adc083x.cpp",
 		MAME_DIR .. "src/devices/machine/adc083x.h",
 	}
 end
@@ -374,7 +374,7 @@ end
 
 if (MACHINES["ADC1038"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/adc1038.c",
+		MAME_DIR .. "src/devices/machine/adc1038.cpp",
 		MAME_DIR .. "src/devices/machine/adc1038.h",
 	}
 end
@@ -386,7 +386,7 @@ end
 
 if (MACHINES["ADC1213X"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/adc1213x.c",
+		MAME_DIR .. "src/devices/machine/adc1213x.cpp",
 		MAME_DIR .. "src/devices/machine/adc1213x.h",
 	}
 end
@@ -398,7 +398,7 @@ end
 
 if (MACHINES["AICARTC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/aicartc.c",
+		MAME_DIR .. "src/devices/machine/aicartc.cpp",
 		MAME_DIR .. "src/devices/machine/aicartc.h",
 	}
 end
@@ -410,7 +410,7 @@ end
 
 if (MACHINES["AM53CF96"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/am53cf96.c",
+		MAME_DIR .. "src/devices/machine/am53cf96.cpp",
 		MAME_DIR .. "src/devices/machine/am53cf96.h",
 	}
 end
@@ -422,7 +422,7 @@ end
 
 if (MACHINES["AM9517A"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/am9517a.c",
+		MAME_DIR .. "src/devices/machine/am9517a.cpp",
 		MAME_DIR .. "src/devices/machine/am9517a.h",
 	}
 end
@@ -434,7 +434,7 @@ end
 
 if (MACHINES["AMIGAFDC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/amigafdc.c",
+		MAME_DIR .. "src/devices/machine/amigafdc.cpp",
 		MAME_DIR .. "src/devices/machine/amigafdc.h",
 	}
 end
@@ -446,7 +446,7 @@ end
 
 if (MACHINES["AT28C16"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/at28c16.c",
+		MAME_DIR .. "src/devices/machine/at28c16.cpp",
 		MAME_DIR .. "src/devices/machine/at28c16.h",
 	}
 end
@@ -458,7 +458,7 @@ end
 
 if (MACHINES["AT29X"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/at29x.c",
+		MAME_DIR .. "src/devices/machine/at29x.cpp",
 		MAME_DIR .. "src/devices/machine/at29x.h",
 	}
 end
@@ -470,7 +470,7 @@ end
 
 if (MACHINES["AT45DBXX"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/at45dbxx.c",
+		MAME_DIR .. "src/devices/machine/at45dbxx.cpp",
 		MAME_DIR .. "src/devices/machine/at45dbxx.h",
 	}
 end
@@ -484,7 +484,7 @@ if (MACHINES["ATAFLASH"]~=null) then
 	MACHINES["IDE"] = true
 	MACHINES["PCCARD"] = true
 	files {
-		MAME_DIR .. "src/devices/machine/ataflash.c",
+		MAME_DIR .. "src/devices/machine/ataflash.cpp",
 		MAME_DIR .. "src/devices/machine/ataflash.h",
 	}
 end
@@ -496,7 +496,7 @@ end
 
 if (MACHINES["AY31015"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ay31015.c",
+		MAME_DIR .. "src/devices/machine/ay31015.cpp",
 		MAME_DIR .. "src/devices/machine/ay31015.h",
 	}
 end
@@ -508,7 +508,7 @@ end
 
 if (MACHINES["BANKDEV"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/bankdev.c",
+		MAME_DIR .. "src/devices/machine/bankdev.cpp",
 		MAME_DIR .. "src/devices/machine/bankdev.h",
 	}
 end
@@ -520,7 +520,7 @@ end
 
 if (MACHINES["CDP1852"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/cdp1852.c",
+		MAME_DIR .. "src/devices/machine/cdp1852.cpp",
 		MAME_DIR .. "src/devices/machine/cdp1852.h",
 	}
 end
@@ -532,7 +532,7 @@ end
 
 if (MACHINES["CDP1871"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/cdp1871.c",
+		MAME_DIR .. "src/devices/machine/cdp1871.cpp",
 		MAME_DIR .. "src/devices/machine/cdp1871.h",
 	}
 end
@@ -544,7 +544,7 @@ end
 
 if (MACHINES["COM8116"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/com8116.c",
+		MAME_DIR .. "src/devices/machine/com8116.cpp",
 		MAME_DIR .. "src/devices/machine/com8116.h",
 	}
 end
@@ -556,7 +556,7 @@ end
 
 if (MACHINES["CR589"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/cr589.c",
+		MAME_DIR .. "src/devices/machine/cr589.cpp",
 		MAME_DIR .. "src/devices/machine/cr589.h",
 	}
 end
@@ -568,7 +568,7 @@ end
 
 if (MACHINES["CS4031"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/cs4031.c",
+		MAME_DIR .. "src/devices/machine/cs4031.cpp",
 		MAME_DIR .. "src/devices/machine/cs4031.h",
 	}
 end
@@ -580,7 +580,7 @@ end
 
 if (MACHINES["CS8221"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/cs8221.c",
+		MAME_DIR .. "src/devices/machine/cs8221.cpp",
 		MAME_DIR .. "src/devices/machine/cs8221.h",
 	}
 end
@@ -592,7 +592,7 @@ end
 
 if (MACHINES["DS1204"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ds1204.c",
+		MAME_DIR .. "src/devices/machine/ds1204.cpp",
 		MAME_DIR .. "src/devices/machine/ds1204.h",
 	}
 end
@@ -604,7 +604,7 @@ end
 
 if (MACHINES["DS1302"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ds1302.c",
+		MAME_DIR .. "src/devices/machine/ds1302.cpp",
 		MAME_DIR .. "src/devices/machine/ds1302.h",
 	}
 end
@@ -616,7 +616,7 @@ end
 
 if (MACHINES["DS1315"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ds1315.c",
+		MAME_DIR .. "src/devices/machine/ds1315.cpp",
 		MAME_DIR .. "src/devices/machine/ds1315.h",
 	}
 end
@@ -628,7 +628,7 @@ end
 
 if (MACHINES["DS2401"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ds2401.c",
+		MAME_DIR .. "src/devices/machine/ds2401.cpp",
 		MAME_DIR .. "src/devices/machine/ds2401.h",
 	}
 end
@@ -640,7 +640,7 @@ end
 
 if (MACHINES["DS2404"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ds2404.c",
+		MAME_DIR .. "src/devices/machine/ds2404.cpp",
 		MAME_DIR .. "src/devices/machine/ds2404.h",
 	}
 end
@@ -652,7 +652,7 @@ end
 
 if (MACHINES["DS75160A"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ds75160a.c",
+		MAME_DIR .. "src/devices/machine/ds75160a.cpp",
 		MAME_DIR .. "src/devices/machine/ds75160a.h",
 	}
 end
@@ -664,7 +664,7 @@ end
 
 if (MACHINES["DS75161A"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ds75161a.c",
+		MAME_DIR .. "src/devices/machine/ds75161a.cpp",
 		MAME_DIR .. "src/devices/machine/ds75161a.h",
 	}
 end
@@ -676,7 +676,7 @@ end
 
 if (MACHINES["E0516"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/e0516.c",
+		MAME_DIR .. "src/devices/machine/e0516.cpp",
 		MAME_DIR .. "src/devices/machine/e0516.h",
 	}
 end
@@ -688,7 +688,7 @@ end
 
 if (MACHINES["E05A03"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/e05a03.c",
+		MAME_DIR .. "src/devices/machine/e05a03.cpp",
 		MAME_DIR .. "src/devices/machine/e05a03.h",
 	}
 end
@@ -700,7 +700,7 @@ end
 
 if (MACHINES["E05A30"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/e05a30.c",
+		MAME_DIR .. "src/devices/machine/e05a30.cpp",
 		MAME_DIR .. "src/devices/machine/e05a30.h",
 	}
 end
@@ -714,11 +714,11 @@ end
 
 if (MACHINES["EEPROMDEV"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/eeprom.c",
+		MAME_DIR .. "src/devices/machine/eeprom.cpp",
 		MAME_DIR .. "src/devices/machine/eeprom.h",
-		MAME_DIR .. "src/devices/machine/eepromser.c",
+		MAME_DIR .. "src/devices/machine/eepromser.cpp",
 		MAME_DIR .. "src/devices/machine/eepromser.h",
-		MAME_DIR .. "src/devices/machine/eeprompar.c",
+		MAME_DIR .. "src/devices/machine/eeprompar.cpp",
 		MAME_DIR .. "src/devices/machine/eeprompar.h",
 	}
 end
@@ -730,7 +730,7 @@ end
 
 if (MACHINES["ER2055"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/er2055.c",
+		MAME_DIR .. "src/devices/machine/er2055.cpp",
 		MAME_DIR .. "src/devices/machine/er2055.h",
 	}
 end
@@ -742,7 +742,7 @@ end
 
 if (MACHINES["F3853"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/f3853.c",
+		MAME_DIR .. "src/devices/machine/f3853.cpp",
 		MAME_DIR .. "src/devices/machine/f3853.h",
 	}
 end
@@ -754,7 +754,7 @@ end
 
 if (MACHINES["HD63450"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/hd63450.c",
+		MAME_DIR .. "src/devices/machine/hd63450.cpp",
 		MAME_DIR .. "src/devices/machine/hd63450.h",
 	}
 end
@@ -766,7 +766,7 @@ end
 
 if (MACHINES["HD64610"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/hd64610.c",
+		MAME_DIR .. "src/devices/machine/hd64610.cpp",
 		MAME_DIR .. "src/devices/machine/hd64610.h",
 	}
 end
@@ -778,7 +778,7 @@ end
 
 if (MACHINES["I2CMEM"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/i2cmem.c",
+		MAME_DIR .. "src/devices/machine/i2cmem.cpp",
 		MAME_DIR .. "src/devices/machine/i2cmem.h",
 	}
 end
@@ -790,7 +790,7 @@ end
 
 if (MACHINES["I8155"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/i8155.c",
+		MAME_DIR .. "src/devices/machine/i8155.cpp",
 		MAME_DIR .. "src/devices/machine/i8155.h",
 	}
 end
@@ -802,7 +802,7 @@ end
 
 if (MACHINES["I8212"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/i8212.c",
+		MAME_DIR .. "src/devices/machine/i8212.cpp",
 		MAME_DIR .. "src/devices/machine/i8212.h",
 	}
 end
@@ -814,7 +814,7 @@ end
 
 if (MACHINES["I8214"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/i8214.c",
+		MAME_DIR .. "src/devices/machine/i8214.cpp",
 		MAME_DIR .. "src/devices/machine/i8214.h",
 	}
 end
@@ -826,7 +826,7 @@ end
 
 if (MACHINES["I8243"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/i8243.c",
+		MAME_DIR .. "src/devices/machine/i8243.cpp",
 		MAME_DIR .. "src/devices/machine/i8243.h",
 	}
 end
@@ -838,7 +838,7 @@ end
 
 if (MACHINES["I8251"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/i8251.c",
+		MAME_DIR .. "src/devices/machine/i8251.cpp",
 		MAME_DIR .. "src/devices/machine/i8251.h",
 	}
 end
@@ -850,7 +850,7 @@ end
 
 if (MACHINES["I8257"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/i8257.c",
+		MAME_DIR .. "src/devices/machine/i8257.cpp",
 		MAME_DIR .. "src/devices/machine/i8257.h",
 	}
 end
@@ -863,7 +863,7 @@ end
 
 if (MACHINES["I8271"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/i8271.c",
+		MAME_DIR .. "src/devices/machine/i8271.cpp",
 		MAME_DIR .. "src/devices/machine/i8271.h",
 	}
 end
@@ -875,7 +875,7 @@ end
 
 if (MACHINES["I8279"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/i8279.c",
+		MAME_DIR .. "src/devices/machine/i8279.cpp",
 		MAME_DIR .. "src/devices/machine/i8279.h",
 	}
 end
@@ -887,7 +887,7 @@ end
 
 if (MACHINES["I8355"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/i8355.c",
+		MAME_DIR .. "src/devices/machine/i8355.cpp",
 		MAME_DIR .. "src/devices/machine/i8355.h",
 	}
 end
@@ -899,7 +899,7 @@ end
 
 if (MACHINES["I80130"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/i80130.c",
+		MAME_DIR .. "src/devices/machine/i80130.cpp",
 		MAME_DIR .. "src/devices/machine/i80130.h",
 	}
 end
@@ -913,21 +913,21 @@ end
 if (MACHINES["IDE"]~=null) then
 	MACHINES["T10"] = true
 	files {
-		MAME_DIR .. "src/devices/machine/atadev.c",
+		MAME_DIR .. "src/devices/machine/atadev.cpp",
 		MAME_DIR .. "src/devices/machine/atadev.h",
-		MAME_DIR .. "src/devices/machine/atahle.c",
+		MAME_DIR .. "src/devices/machine/atahle.cpp",
 		MAME_DIR .. "src/devices/machine/atahle.h",
-		MAME_DIR .. "src/devices/machine/ataintf.c",
+		MAME_DIR .. "src/devices/machine/ataintf.cpp",
 		MAME_DIR .. "src/devices/machine/ataintf.h",
-		MAME_DIR .. "src/devices/machine/atapicdr.c",
+		MAME_DIR .. "src/devices/machine/atapicdr.cpp",
 		MAME_DIR .. "src/devices/machine/atapicdr.h",
-		MAME_DIR .. "src/devices/machine/atapihle.c",
+		MAME_DIR .. "src/devices/machine/atapihle.cpp",
 		MAME_DIR .. "src/devices/machine/atapihle.h",
-		MAME_DIR .. "src/devices/machine/idectrl.c",
+		MAME_DIR .. "src/devices/machine/idectrl.cpp",
 		MAME_DIR .. "src/devices/machine/idectrl.h",
-		MAME_DIR .. "src/devices/machine/idehd.c",
+		MAME_DIR .. "src/devices/machine/idehd.cpp",
 		MAME_DIR .. "src/devices/machine/idehd.h",
-		MAME_DIR .. "src/devices/machine/vt83c461.c",
+		MAME_DIR .. "src/devices/machine/vt83c461.cpp",
 		MAME_DIR .. "src/devices/machine/vt83c461.h",
 	}
 end
@@ -939,7 +939,7 @@ end
 
 if (MACHINES["IM6402"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/im6402.c",
+		MAME_DIR .. "src/devices/machine/im6402.cpp",
 		MAME_DIR .. "src/devices/machine/im6402.h",
 	}
 end
@@ -951,7 +951,7 @@ end
 
 if (MACHINES["INS8154"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ins8154.c",
+		MAME_DIR .. "src/devices/machine/ins8154.cpp",
 		MAME_DIR .. "src/devices/machine/ins8154.h",
 	}
 end
@@ -963,7 +963,7 @@ end
 
 if (MACHINES["INS8250"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ins8250.c",
+		MAME_DIR .. "src/devices/machine/ins8250.cpp",
 		MAME_DIR .. "src/devices/machine/ins8250.h",
 	}
 end
@@ -975,7 +975,7 @@ end
 
 if (MACHINES["INTELFLASH"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/intelfsh.c",
+		MAME_DIR .. "src/devices/machine/intelfsh.cpp",
 		MAME_DIR .. "src/devices/machine/intelfsh.h",
 	}
 end
@@ -988,9 +988,9 @@ end
 
 if (MACHINES["JVS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/jvsdev.c",
+		MAME_DIR .. "src/devices/machine/jvsdev.cpp",
 		MAME_DIR .. "src/devices/machine/jvsdev.h",
-		MAME_DIR .. "src/devices/machine/jvshost.c",
+		MAME_DIR .. "src/devices/machine/jvshost.cpp",
 		MAME_DIR .. "src/devices/machine/jvshost.h",
 	}
 end
@@ -1002,7 +1002,7 @@ end
 
 if (MACHINES["K033906"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/k033906.c",
+		MAME_DIR .. "src/devices/machine/k033906.cpp",
 		MAME_DIR .. "src/devices/machine/k033906.h",
 	}
 end
@@ -1014,7 +1014,7 @@ end
 
 if (MACHINES["K053252"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/k053252.c",
+		MAME_DIR .. "src/devices/machine/k053252.cpp",
 		MAME_DIR .. "src/devices/machine/k053252.h",
 	}
 end
@@ -1026,7 +1026,7 @@ end
 
 if (MACHINES["K056230"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/k056230.c",
+		MAME_DIR .. "src/devices/machine/k056230.cpp",
 		MAME_DIR .. "src/devices/machine/k056230.h",
 	}
 end
@@ -1038,7 +1038,7 @@ end
 
 if (MACHINES["KB3600"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/kb3600.c",
+		MAME_DIR .. "src/devices/machine/kb3600.cpp",
 		MAME_DIR .. "src/devices/machine/kb3600.h",
 	}
 end
@@ -1050,7 +1050,7 @@ end
 
 if (MACHINES["KR2376"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/kr2376.c",
+		MAME_DIR .. "src/devices/machine/kr2376.cpp",
 		MAME_DIR .. "src/devices/machine/kr2376.h",
 	}
 end
@@ -1062,7 +1062,7 @@ end
 
 if (MACHINES["LATCH8"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/latch8.c",
+		MAME_DIR .. "src/devices/machine/latch8.cpp",
 		MAME_DIR .. "src/devices/machine/latch8.h",
 	}
 end
@@ -1074,7 +1074,7 @@ end
 
 if (MACHINES["LC89510"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/lc89510.c",
+		MAME_DIR .. "src/devices/machine/lc89510.cpp",
 		MAME_DIR .. "src/devices/machine/lc89510.h",
 	}
 end
@@ -1086,7 +1086,7 @@ end
 
 if (MACHINES["LDPR8210"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ldpr8210.c",
+		MAME_DIR .. "src/devices/machine/ldpr8210.cpp",
 		MAME_DIR .. "src/devices/machine/ldpr8210.h",
 	}
 end
@@ -1098,7 +1098,7 @@ end
 
 if (MACHINES["LDSTUB"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ldstub.c",
+		MAME_DIR .. "src/devices/machine/ldstub.cpp",
 		MAME_DIR .. "src/devices/machine/ldstub.h",
 	}
 end
@@ -1112,7 +1112,7 @@ if (MACHINES["LDV1000"]~=null) then
 	MACHINES["Z80CTC"] = true
 	MACHINES["I8255"] = true
 	files {
-		MAME_DIR .. "src/devices/machine/ldv1000.c",
+		MAME_DIR .. "src/devices/machine/ldv1000.cpp",
 		MAME_DIR .. "src/devices/machine/ldv1000.h",
 	}
 end
@@ -1124,7 +1124,7 @@ end
 
 if (MACHINES["LDVP931"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ldvp931.c",
+		MAME_DIR .. "src/devices/machine/ldvp931.cpp",
 		MAME_DIR .. "src/devices/machine/ldvp931.h",
 	}
 end
@@ -1136,7 +1136,7 @@ end
 
 if (MACHINES["LH5810"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/lh5810.c",
+		MAME_DIR .. "src/devices/machine/lh5810.cpp",
 		MAME_DIR .. "src/devices/machine/lh5810.h",
 	}
 end
@@ -1148,7 +1148,7 @@ end
 
 if (MACHINES["LINFLASH"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/linflash.c",
+		MAME_DIR .. "src/devices/machine/linflash.cpp",
 		MAME_DIR .. "src/devices/machine/linflash.h",
 	}
 end
@@ -1160,7 +1160,7 @@ end
 
 if (MACHINES["M6M80011AP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/m6m80011ap.c",
+		MAME_DIR .. "src/devices/machine/m6m80011ap.cpp",
 		MAME_DIR .. "src/devices/machine/m6m80011ap.h",
 	}
 end
@@ -1172,7 +1172,7 @@ end
 
 if (MACHINES["MATSUCD"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/matsucd.c",
+		MAME_DIR .. "src/devices/machine/matsucd.cpp",
 		MAME_DIR .. "src/devices/machine/matsucd.h",
 	}
 end
@@ -1184,7 +1184,7 @@ end
 
 if (MACHINES["MB14241"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mb14241.c",
+		MAME_DIR .. "src/devices/machine/mb14241.cpp",
 		MAME_DIR .. "src/devices/machine/mb14241.h",
 	}
 end
@@ -1196,7 +1196,7 @@ end
 
 if (MACHINES["MB3773"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mb3773.c",
+		MAME_DIR .. "src/devices/machine/mb3773.cpp",
 		MAME_DIR .. "src/devices/machine/mb3773.h",
 	}
 end
@@ -1208,7 +1208,7 @@ end
 
 if (MACHINES["MB8421"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mb8421.c",
+		MAME_DIR .. "src/devices/machine/mb8421.cpp",
 		MAME_DIR .. "src/devices/machine/mb8421.h",
 	}
 end
@@ -1220,7 +1220,7 @@ end
 
 if (MACHINES["MB87078"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mb87078.c",
+		MAME_DIR .. "src/devices/machine/mb87078.cpp",
 		MAME_DIR .. "src/devices/machine/mb87078.h",
 	}
 end
@@ -1232,7 +1232,7 @@ end
 
 if (MACHINES["MB8795"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mb8795.c",
+		MAME_DIR .. "src/devices/machine/mb8795.cpp",
 		MAME_DIR .. "src/devices/machine/mb8795.h",
 	}
 end
@@ -1244,7 +1244,7 @@ end
 
 if (MACHINES["MB89352"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mb89352.c",
+		MAME_DIR .. "src/devices/machine/mb89352.cpp",
 		MAME_DIR .. "src/devices/machine/mb89352.h",
 	}
 end
@@ -1256,7 +1256,7 @@ end
 
 if (MACHINES["MB89371"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mb89371.c",
+		MAME_DIR .. "src/devices/machine/mb89371.cpp",
 		MAME_DIR .. "src/devices/machine/mb89371.h",
 	}
 end
@@ -1268,9 +1268,9 @@ end
 
 if (MACHINES["MC146818"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mc146818.c",
+		MAME_DIR .. "src/devices/machine/mc146818.cpp",
 		MAME_DIR .. "src/devices/machine/mc146818.h",
-		MAME_DIR .. "src/devices/machine/ds128x.c",
+		MAME_DIR .. "src/devices/machine/ds128x.cpp",
 		MAME_DIR .. "src/devices/machine/ds128x.h",
 	}
 end
@@ -1282,7 +1282,7 @@ end
 
 if (MACHINES["MC2661"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mc2661.c",
+		MAME_DIR .. "src/devices/machine/mc2661.cpp",
 		MAME_DIR .. "src/devices/machine/mc2661.h",
 	}
 end
@@ -1294,7 +1294,7 @@ end
 
 if (MACHINES["MC6843"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mc6843.c",
+		MAME_DIR .. "src/devices/machine/mc6843.cpp",
 		MAME_DIR .. "src/devices/machine/mc6843.h",
 	}
 end
@@ -1306,7 +1306,7 @@ end
 
 if (MACHINES["MC6846"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mc6846.c",
+		MAME_DIR .. "src/devices/machine/mc6846.cpp",
 		MAME_DIR .. "src/devices/machine/mc6846.h",
 	}
 end
@@ -1318,7 +1318,7 @@ end
 
 if (MACHINES["MC6852"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mc6852.c",
+		MAME_DIR .. "src/devices/machine/mc6852.cpp",
 		MAME_DIR .. "src/devices/machine/mc6852.h",
 	}
 end
@@ -1330,7 +1330,7 @@ end
 
 if (MACHINES["MC6854"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mc6854.c",
+		MAME_DIR .. "src/devices/machine/mc6854.cpp",
 		MAME_DIR .. "src/devices/machine/mc6854.h",
 	}
 end
@@ -1342,7 +1342,7 @@ end
 
 if (MACHINES["MC68328"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mc68328.c",
+		MAME_DIR .. "src/devices/machine/mc68328.cpp",
 		MAME_DIR .. "src/devices/machine/mc68328.h",
 	}
 end
@@ -1354,7 +1354,7 @@ end
 
 if (MACHINES["MC68901"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mc68901.c",
+		MAME_DIR .. "src/devices/machine/mc68901.cpp",
 		MAME_DIR .. "src/devices/machine/mc68901.h",
 	}
 end
@@ -1366,7 +1366,7 @@ end
 
 if (MACHINES["MCCS1850"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mccs1850.c",
+		MAME_DIR .. "src/devices/machine/mccs1850.cpp",
 		MAME_DIR .. "src/devices/machine/mccs1850.h",
 	}
 end
@@ -1378,13 +1378,13 @@ end
 
 if (MACHINES["M68307"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/68307.c",
+		MAME_DIR .. "src/devices/machine/68307.cpp",
 		MAME_DIR .. "src/devices/machine/68307.h",
-		MAME_DIR .. "src/devices/machine/68307sim.c",
+		MAME_DIR .. "src/devices/machine/68307sim.cpp",
 		MAME_DIR .. "src/devices/machine/68307sim.h",
-		MAME_DIR .. "src/devices/machine/68307bus.c",
+		MAME_DIR .. "src/devices/machine/68307bus.cpp",
 		MAME_DIR .. "src/devices/machine/68307bus.h",
-		MAME_DIR .. "src/devices/machine/68307tmu.c",
+		MAME_DIR .. "src/devices/machine/68307tmu.cpp",
 		MAME_DIR .. "src/devices/machine/68307tmu.h",
 	}
 end
@@ -1396,15 +1396,15 @@ end
 
 if (MACHINES["M68340"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/68340.c",
+		MAME_DIR .. "src/devices/machine/68340.cpp",
 		MAME_DIR .. "src/devices/machine/68340.h",
-		MAME_DIR .. "src/devices/machine/68340sim.c",
+		MAME_DIR .. "src/devices/machine/68340sim.cpp",
 		MAME_DIR .. "src/devices/machine/68340sim.h",
-		MAME_DIR .. "src/devices/machine/68340dma.c",
+		MAME_DIR .. "src/devices/machine/68340dma.cpp",
 		MAME_DIR .. "src/devices/machine/68340dma.h",
-		MAME_DIR .. "src/devices/machine/68340ser.c",
+		MAME_DIR .. "src/devices/machine/68340ser.cpp",
 		MAME_DIR .. "src/devices/machine/68340ser.h",
-		MAME_DIR .. "src/devices/machine/68340tmu.c",
+		MAME_DIR .. "src/devices/machine/68340tmu.cpp",
 		MAME_DIR .. "src/devices/machine/68340tmu.h",
 	}
 end
@@ -1416,7 +1416,7 @@ end
 
 if (MACHINES["MCF5206E"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mcf5206e.c",
+		MAME_DIR .. "src/devices/machine/mcf5206e.cpp",
 		MAME_DIR .. "src/devices/machine/mcf5206e.h",
 	}
 end
@@ -1428,7 +1428,7 @@ end
 
 if (MACHINES["MICROTOUCH"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/microtch.c",
+		MAME_DIR .. "src/devices/machine/microtch.cpp",
 		MAME_DIR .. "src/devices/machine/microtch.h",
 	}
 end
@@ -1440,7 +1440,7 @@ end
 
 if (MACHINES["MM58274C"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mm58274c.c",
+		MAME_DIR .. "src/devices/machine/mm58274c.cpp",
 		MAME_DIR .. "src/devices/machine/mm58274c.h",
 	}
 end
@@ -1452,7 +1452,7 @@ end
 
 if (MACHINES["MM74C922"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mm74c922.c",
+		MAME_DIR .. "src/devices/machine/mm74c922.cpp",
 		MAME_DIR .. "src/devices/machine/mm74c922.h",
 	}
 end
@@ -1464,7 +1464,7 @@ end
 
 if (MACHINES["MOS6526"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mos6526.c",
+		MAME_DIR .. "src/devices/machine/mos6526.cpp",
 		MAME_DIR .. "src/devices/machine/mos6526.h",
 	}
 end
@@ -1476,7 +1476,7 @@ end
 
 if (MACHINES["MOS6529"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mos6529.c",
+		MAME_DIR .. "src/devices/machine/mos6529.cpp",
 		MAME_DIR .. "src/devices/machine/mos6529.h",
 	}
 end
@@ -1488,7 +1488,7 @@ end
 
 if (MACHINES["MOS6702"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mos6702.c",
+		MAME_DIR .. "src/devices/machine/mos6702.cpp",
 		MAME_DIR .. "src/devices/machine/mos6702.h",
 	}
 end
@@ -1500,7 +1500,7 @@ end
 
 if (MACHINES["MOS8706"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mos8706.c",
+		MAME_DIR .. "src/devices/machine/mos8706.cpp",
 		MAME_DIR .. "src/devices/machine/mos8706.h",
 	}
 end
@@ -1512,7 +1512,7 @@ end
 
 if (MACHINES["MOS8722"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mos8722.c",
+		MAME_DIR .. "src/devices/machine/mos8722.cpp",
 		MAME_DIR .. "src/devices/machine/mos8722.h",
 	}
 end
@@ -1524,7 +1524,7 @@ end
 
 if (MACHINES["MOS8726"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mos8726.c",
+		MAME_DIR .. "src/devices/machine/mos8726.cpp",
 		MAME_DIR .. "src/devices/machine/mos8726.h",
 	}
 end
@@ -1536,9 +1536,9 @@ end
 
 if (MACHINES["MIOT6530"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mos6530.c",
+		MAME_DIR .. "src/devices/machine/mos6530.cpp",
 		MAME_DIR .. "src/devices/machine/mos6530.h",
-		MAME_DIR .. "src/devices/machine/mos6530n.c",
+		MAME_DIR .. "src/devices/machine/mos6530n.cpp",
 		MAME_DIR .. "src/devices/machine/mos6530n.h",
 	}
 end
@@ -1550,7 +1550,7 @@ end
 
 if (MACHINES["MOS6551"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mos6551.c",
+		MAME_DIR .. "src/devices/machine/mos6551.cpp",
 		MAME_DIR .. "src/devices/machine/mos6551.h",
 	}
 end
@@ -1562,7 +1562,7 @@ end
 
 if (MACHINES["MSM5832"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/msm5832.c",
+		MAME_DIR .. "src/devices/machine/msm5832.cpp",
 		MAME_DIR .. "src/devices/machine/msm5832.h",
 	}
 end
@@ -1574,7 +1574,7 @@ end
 
 if (MACHINES["MSM58321"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/msm58321.c",
+		MAME_DIR .. "src/devices/machine/msm58321.cpp",
 		MAME_DIR .. "src/devices/machine/msm58321.h",
 	}
 end
@@ -1586,7 +1586,7 @@ end
 
 if (MACHINES["MSM6242"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/msm6242.c",
+		MAME_DIR .. "src/devices/machine/msm6242.cpp",
 		MAME_DIR .. "src/devices/machine/msm6242.h",
 	}
 end
@@ -1599,7 +1599,7 @@ end
 if (MACHINES["NCR539x"]~=null) then
 	MACHINES["SCSI"] = true
 	files {
-		MAME_DIR .. "src/devices/machine/ncr539x.c",
+		MAME_DIR .. "src/devices/machine/ncr539x.cpp",
 		MAME_DIR .. "src/devices/machine/ncr539x.h",
 	}
 end
@@ -1611,7 +1611,7 @@ end
 
 if (MACHINES["NMC9306"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/nmc9306.c",
+		MAME_DIR .. "src/devices/machine/nmc9306.cpp",
 		MAME_DIR .. "src/devices/machine/nmc9306.h",
 	}
 end
@@ -1627,15 +1627,15 @@ end
 
 if (MACHINES["NSCSI"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/nscsi_bus.c",
+		MAME_DIR .. "src/devices/machine/nscsi_bus.cpp",
 		MAME_DIR .. "src/devices/machine/nscsi_bus.h",
-		MAME_DIR .. "src/devices/machine/nscsi_cb.c",
+		MAME_DIR .. "src/devices/machine/nscsi_cb.cpp",
 		MAME_DIR .. "src/devices/machine/nscsi_cb.h",
-		MAME_DIR .. "src/devices/machine/nscsi_cd.c",
+		MAME_DIR .. "src/devices/machine/nscsi_cd.cpp",
 		MAME_DIR .. "src/devices/machine/nscsi_cd.h",
-		MAME_DIR .. "src/devices/machine/nscsi_hd.c",
+		MAME_DIR .. "src/devices/machine/nscsi_hd.cpp",
 		MAME_DIR .. "src/devices/machine/nscsi_hd.h",
-		MAME_DIR .. "src/devices/machine/nscsi_s1410.c",
+		MAME_DIR .. "src/devices/machine/nscsi_s1410.cpp",
 		MAME_DIR .. "src/devices/machine/nscsi_s1410.h",
 	}
 end
@@ -1647,7 +1647,7 @@ end
 
 if (MACHINES["PCF8593"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/pcf8593.c",
+		MAME_DIR .. "src/devices/machine/pcf8593.cpp",
 		MAME_DIR .. "src/devices/machine/pcf8593.h",
 	}
 end
@@ -1659,7 +1659,7 @@ end
 
 if (MACHINES["LPCI"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/lpci.c",
+		MAME_DIR .. "src/devices/machine/lpci.cpp",
 		MAME_DIR .. "src/devices/machine/lpci.h",
 	}
 end
@@ -1671,31 +1671,31 @@ end
 
 if (MACHINES["PCI"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/pci.c",
+		MAME_DIR .. "src/devices/machine/pci.cpp",
 		MAME_DIR .. "src/devices/machine/pci.h",
-		MAME_DIR .. "src/devices/machine/pci-usb.c",
+		MAME_DIR .. "src/devices/machine/pci-usb.cpp",
 		MAME_DIR .. "src/devices/machine/pci-usb.h",
-		MAME_DIR .. "src/devices/machine/pci-sata.c",
+		MAME_DIR .. "src/devices/machine/pci-sata.cpp",
 		MAME_DIR .. "src/devices/machine/pci-sata.h",
-		MAME_DIR .. "src/devices/machine/pci-apic.c",
+		MAME_DIR .. "src/devices/machine/pci-apic.cpp",
 		MAME_DIR .. "src/devices/machine/pci-apic.h",
-		MAME_DIR .. "src/devices/machine/pci-smbus.c",
+		MAME_DIR .. "src/devices/machine/pci-smbus.cpp",
 		MAME_DIR .. "src/devices/machine/pci-smbus.h",
-		MAME_DIR .. "src/devices/machine/i82541.c",
+		MAME_DIR .. "src/devices/machine/i82541.cpp",
 		MAME_DIR .. "src/devices/machine/i82541.h",
-		MAME_DIR .. "src/devices/machine/i82875p.c",
+		MAME_DIR .. "src/devices/machine/i82875p.cpp",
 		MAME_DIR .. "src/devices/machine/i82875p.h",
-		MAME_DIR .. "src/devices/machine/i6300esb.c",
+		MAME_DIR .. "src/devices/machine/i6300esb.cpp",
 		MAME_DIR .. "src/devices/machine/i6300esb.h",
-		MAME_DIR .. "src/devices/machine/lpc.c",
+		MAME_DIR .. "src/devices/machine/lpc.cpp",
 		MAME_DIR .. "src/devices/machine/lpc.h",
-		MAME_DIR .. "src/devices/machine/lpc-acpi.c",
+		MAME_DIR .. "src/devices/machine/lpc-acpi.cpp",
 		MAME_DIR .. "src/devices/machine/lpc-acpi.h",
-		MAME_DIR .. "src/devices/machine/lpc-rtc.c",
+		MAME_DIR .. "src/devices/machine/lpc-rtc.cpp",
 		MAME_DIR .. "src/devices/machine/lpc-rtc.h",
-		MAME_DIR .. "src/devices/machine/lpc-pit.c",
+		MAME_DIR .. "src/devices/machine/lpc-pit.cpp",
 		MAME_DIR .. "src/devices/machine/lpc-pit.h",
-		MAME_DIR .. "src/devices/machine/vrc4373.c",
+		MAME_DIR .. "src/devices/machine/vrc4373.cpp",
 		MAME_DIR .. "src/devices/machine/vrc4373.h",
 	}
 end
@@ -1707,7 +1707,7 @@ end
 
 if (MACHINES["PCKEYBRD"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/pckeybrd.c",
+		MAME_DIR .. "src/devices/machine/pckeybrd.cpp",
 		MAME_DIR .. "src/devices/machine/pckeybrd.h",
 	}
 end
@@ -1719,7 +1719,7 @@ end
 
 if (MACHINES["PIC8259"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/pic8259.c",
+		MAME_DIR .. "src/devices/machine/pic8259.cpp",
 		MAME_DIR .. "src/devices/machine/pic8259.h",
 	}
 end
@@ -1731,7 +1731,7 @@ end
 
 if (MACHINES["PIT8253"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/pit8253.c",
+		MAME_DIR .. "src/devices/machine/pit8253.cpp",
 		MAME_DIR .. "src/devices/machine/pit8253.h",
 	}
 end
@@ -1743,7 +1743,7 @@ end
 
 if (MACHINES["PLA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/pla.c",
+		MAME_DIR .. "src/devices/machine/pla.cpp",
 		MAME_DIR .. "src/devices/machine/pla.h",
 	}
 end
@@ -1755,7 +1755,7 @@ end
 
 if (MACHINES["R10696"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/r10696.c",
+		MAME_DIR .. "src/devices/machine/r10696.cpp",
 		MAME_DIR .. "src/devices/machine/r10696.h",
 	}
 end
@@ -1767,7 +1767,7 @@ end
 
 if (MACHINES["R10788"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/r10788.c",
+		MAME_DIR .. "src/devices/machine/r10788.cpp",
 		MAME_DIR .. "src/devices/machine/r10788.h",
 	}
 end
@@ -1779,7 +1779,7 @@ end
 
 if (MACHINES["RA17XX"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ra17xx.c",
+		MAME_DIR .. "src/devices/machine/ra17xx.cpp",
 		MAME_DIR .. "src/devices/machine/ra17xx.h",
 	}
 end
@@ -1792,7 +1792,7 @@ end
 if (MACHINES["RF5C296"]~=null) then
 	MACHINES["PCCARD"] = true
 	files {
-		MAME_DIR .. "src/devices/machine/rf5c296.c",
+		MAME_DIR .. "src/devices/machine/rf5c296.cpp",
 		MAME_DIR .. "src/devices/machine/rf5c296.h",
 	}
 end
@@ -1804,7 +1804,7 @@ end
 
 if (MACHINES["ROC10937"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/roc10937.c",
+		MAME_DIR .. "src/devices/machine/roc10937.cpp",
 		MAME_DIR .. "src/devices/machine/roc10937.h",
 	}
 end
@@ -1816,7 +1816,7 @@ end
 
 if (MACHINES["RP5C01"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/rp5c01.c",
+		MAME_DIR .. "src/devices/machine/rp5c01.cpp",
 		MAME_DIR .. "src/devices/machine/rp5c01.h",
 	}
 end
@@ -1828,7 +1828,7 @@ end
 
 if (MACHINES["RP5C15"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/rp5c15.c",
+		MAME_DIR .. "src/devices/machine/rp5c15.cpp",
 		MAME_DIR .. "src/devices/machine/rp5c15.h",
 	}
 end
@@ -1840,7 +1840,7 @@ end
 
 if (MACHINES["RP5H01"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/rp5h01.c",
+		MAME_DIR .. "src/devices/machine/rp5h01.cpp",
 		MAME_DIR .. "src/devices/machine/rp5h01.h",
 	}
 end
@@ -1852,7 +1852,7 @@ end
 
 if (MACHINES["R64H156"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/64h156.c",
+		MAME_DIR .. "src/devices/machine/64h156.cpp",
 		MAME_DIR .. "src/devices/machine/64h156.h",
 	}
 end
@@ -1864,7 +1864,7 @@ end
 
 if (MACHINES["RTC4543"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/rtc4543.c",
+		MAME_DIR .. "src/devices/machine/rtc4543.cpp",
 		MAME_DIR .. "src/devices/machine/rtc4543.h",
 	}
 end
@@ -1876,7 +1876,7 @@ end
 
 if (MACHINES["RTC65271"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/rtc65271.c",
+		MAME_DIR .. "src/devices/machine/rtc65271.cpp",
 		MAME_DIR .. "src/devices/machine/rtc65271.h",
 	}
 end
@@ -1888,7 +1888,7 @@ end
 
 if (MACHINES["RTC9701"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/rtc9701.c",
+		MAME_DIR .. "src/devices/machine/rtc9701.cpp",
 		MAME_DIR .. "src/devices/machine/rtc9701.h",
 	}
 end
@@ -1900,7 +1900,7 @@ end
 
 if (MACHINES["S2636"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/s2636.c",
+		MAME_DIR .. "src/devices/machine/s2636.cpp",
 		MAME_DIR .. "src/devices/machine/s2636.h",
 	}
 end
@@ -1912,7 +1912,7 @@ end
 
 if (MACHINES["S3520CF"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/s3520cf.c",
+		MAME_DIR .. "src/devices/machine/s3520cf.cpp",
 		MAME_DIR .. "src/devices/machine/s3520cf.h",
 	}
 end
@@ -1924,7 +1924,7 @@ end
 
 if (MACHINES["S3C2400"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/s3c2400.c",
+		MAME_DIR .. "src/devices/machine/s3c2400.cpp",
 		MAME_DIR .. "src/devices/machine/s3c2400.h",
 		MAME_DIR .. "src/devices/machine/s3c24xx.inc",
 	}
@@ -1937,7 +1937,7 @@ end
 
 if (MACHINES["S3C2410"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/s3c2410.c",
+		MAME_DIR .. "src/devices/machine/s3c2410.cpp",
 		MAME_DIR .. "src/devices/machine/s3c2410.h",
 		MAME_DIR .. "src/devices/machine/s3c24xx.inc",
 	}
@@ -1950,7 +1950,7 @@ end
 
 if (MACHINES["S3C44B0"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/s3c44b0.c",
+		MAME_DIR .. "src/devices/machine/s3c44b0.cpp",
 		MAME_DIR .. "src/devices/machine/s3c44b0.h",
 	}
 end
@@ -1962,7 +1962,7 @@ end
 
 if (MACHINES["S3C2440"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/s3c2440.c",
+		MAME_DIR .. "src/devices/machine/s3c2440.cpp",
 		MAME_DIR .. "src/devices/machine/s3c2440.h",
 		MAME_DIR .. "src/devices/machine/s3c24xx.inc",
 	}
@@ -1975,7 +1975,7 @@ end
 
 if (MACHINES["SATURN"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/saturn.c",
+		MAME_DIR .. "src/devices/machine/saturn.cpp",
 	}
 end
 
@@ -1986,7 +1986,7 @@ end
 
 if (MACHINES["SERFLASH"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/serflash.c",
+		MAME_DIR .. "src/devices/machine/serflash.cpp",
 		MAME_DIR .. "src/devices/machine/serflash.h",
 	}
 end
@@ -1998,7 +1998,7 @@ end
 
 if (MACHINES["SMC91C9X"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/smc91c9x.c",
+		MAME_DIR .. "src/devices/machine/smc91c9x.cpp",
 		MAME_DIR .. "src/devices/machine/smc91c9x.h",
 	}
 end
@@ -2010,7 +2010,7 @@ end
 
 if (MACHINES["SMPC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/smpc.c",
+		MAME_DIR .. "src/devices/machine/smpc.cpp",
 		MAME_DIR .. "src/devices/machine/smpc.h",
 	}
 end
@@ -2022,7 +2022,7 @@ end
 
 if (MACHINES["STVCD"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/stvcd.c",
+		MAME_DIR .. "src/devices/machine/stvcd.cpp",
 	}
 end
 
@@ -2037,11 +2037,11 @@ end
 
 if (MACHINES["T10"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/t10mmc.c",
+		MAME_DIR .. "src/devices/machine/t10mmc.cpp",
 		MAME_DIR .. "src/devices/machine/t10mmc.h",
-		MAME_DIR .. "src/devices/machine/t10sbc.c",
+		MAME_DIR .. "src/devices/machine/t10sbc.cpp",
 		MAME_DIR .. "src/devices/machine/t10sbc.h",
-		MAME_DIR .. "src/devices/machine/t10spc.c",
+		MAME_DIR .. "src/devices/machine/t10spc.cpp",
 		MAME_DIR .. "src/devices/machine/t10spc.h",
 	}
 end
@@ -2053,7 +2053,7 @@ end
 
 if (MACHINES["TC0091LVC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/tc009xlvc.c",
+		MAME_DIR .. "src/devices/machine/tc009xlvc.cpp",
 		MAME_DIR .. "src/devices/machine/tc009xlvc.h",
 	}
 end
@@ -2065,7 +2065,7 @@ end
 
 if (MACHINES["TIMEKPR"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/timekpr.c",
+		MAME_DIR .. "src/devices/machine/timekpr.cpp",
 		MAME_DIR .. "src/devices/machine/timekpr.h",
 	}
 end
@@ -2077,7 +2077,7 @@ end
 
 if (MACHINES["TMP68301"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/tmp68301.c",
+		MAME_DIR .. "src/devices/machine/tmp68301.cpp",
 		MAME_DIR .. "src/devices/machine/tmp68301.h",
 	}
 end
@@ -2089,7 +2089,7 @@ end
 
 if (MACHINES["TMS1024"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/tms1024.c",
+		MAME_DIR .. "src/devices/machine/tms1024.cpp",
 		MAME_DIR .. "src/devices/machine/tms1024.h",
 	}
 end
@@ -2101,7 +2101,7 @@ end
 
 if (MACHINES["TMS5501"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/tms5501.c",
+		MAME_DIR .. "src/devices/machine/tms5501.cpp",
 		MAME_DIR .. "src/devices/machine/tms5501.h",
 	}
 end
@@ -2113,7 +2113,7 @@ end
 
 if (MACHINES["TMS6100"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/tms6100.c",
+		MAME_DIR .. "src/devices/machine/tms6100.cpp",
 		MAME_DIR .. "src/devices/machine/tms6100.h",
 	}
 end
@@ -2125,7 +2125,7 @@ end
 
 if (MACHINES["TMS9901"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/tms9901.c",
+		MAME_DIR .. "src/devices/machine/tms9901.cpp",
 		MAME_DIR .. "src/devices/machine/tms9901.h",
 	}
 end
@@ -2137,7 +2137,7 @@ end
 
 if (MACHINES["TMS9902"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/tms9902.c",
+		MAME_DIR .. "src/devices/machine/tms9902.cpp",
 		MAME_DIR .. "src/devices/machine/tms9902.h",
 	}
 end
@@ -2149,7 +2149,7 @@ end
 
 if (MACHINES["UPD1990A"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/upd1990a.c",
+		MAME_DIR .. "src/devices/machine/upd1990a.cpp",
 		MAME_DIR .. "src/devices/machine/upd1990a.h",
 	}
 end
@@ -2161,7 +2161,7 @@ end
 
 if (MACHINES["UPD4992"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/upd4992.c",
+		MAME_DIR .. "src/devices/machine/upd4992.cpp",
 		MAME_DIR .. "src/devices/machine/upd4992.h",
 	}
 end
@@ -2174,7 +2174,7 @@ end
 
 if (MACHINES["UPD4701"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/upd4701.c",
+		MAME_DIR .. "src/devices/machine/upd4701.cpp",
 		MAME_DIR .. "src/devices/machine/upd4701.h",
 	}
 end
@@ -2186,7 +2186,7 @@ end
 
 if (MACHINES["UPD7002"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/upd7002.c",
+		MAME_DIR .. "src/devices/machine/upd7002.cpp",
 		MAME_DIR .. "src/devices/machine/upd7002.h",
 	}
 end
@@ -2198,7 +2198,7 @@ end
 
 if (MACHINES["UPD71071"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/upd71071.c",
+		MAME_DIR .. "src/devices/machine/upd71071.cpp",
 		MAME_DIR .. "src/devices/machine/upd71071.h",
 	}
 end
@@ -2210,9 +2210,9 @@ end
 
 if (MACHINES["UPD765"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/upd765.c",
+		MAME_DIR .. "src/devices/machine/upd765.cpp",
 		MAME_DIR .. "src/devices/machine/upd765.h",
-		MAME_DIR .. "src/devices/machine/fdc_pll.c",
+		MAME_DIR .. "src/devices/machine/fdc_pll.cpp",
 		MAME_DIR .. "src/devices/machine/fdc_pll.h",
 	}
 end
@@ -2224,7 +2224,7 @@ end
 
 if (MACHINES["V3021"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/v3021.c",
+		MAME_DIR .. "src/devices/machine/v3021.cpp",
 		MAME_DIR .. "src/devices/machine/v3021.h",
 	}
 end
@@ -2236,9 +2236,9 @@ end
 
 if (MACHINES["WD_FDC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/wd_fdc.c",
+		MAME_DIR .. "src/devices/machine/wd_fdc.cpp",
 		MAME_DIR .. "src/devices/machine/wd_fdc.h",
-		MAME_DIR .. "src/devices/machine/fdc_pll.c",
+		MAME_DIR .. "src/devices/machine/fdc_pll.cpp",
 		MAME_DIR .. "src/devices/machine/fdc_pll.h",
 	}
 end
@@ -2250,7 +2250,7 @@ end
 
 if (MACHINES["WD11C00_17"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/wd11c00_17.c",
+		MAME_DIR .. "src/devices/machine/wd11c00_17.cpp",
 		MAME_DIR .. "src/devices/machine/wd11c00_17.h",
 	}
 end
@@ -2262,7 +2262,7 @@ end
 
 if (MACHINES["WD2010"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/wd2010.c",
+		MAME_DIR .. "src/devices/machine/wd2010.cpp",
 		MAME_DIR .. "src/devices/machine/wd2010.h",
 	}
 end
@@ -2275,7 +2275,7 @@ end
 if (MACHINES["WD33C93"]~=null) then
 	MACHINES["SCSI"] = true
 	files {
-		MAME_DIR .. "src/devices/machine/wd33c93.c",
+		MAME_DIR .. "src/devices/machine/wd33c93.cpp",
 		MAME_DIR .. "src/devices/machine/wd33c93.h",
 	}
 end
@@ -2287,7 +2287,7 @@ end
 
 if (MACHINES["WD7600"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/wd7600.c",
+		MAME_DIR .. "src/devices/machine/wd7600.cpp",
 		MAME_DIR .. "src/devices/machine/wd7600.h",
 	}
 end
@@ -2299,7 +2299,7 @@ end
 
 if (MACHINES["X2212"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/x2212.c",
+		MAME_DIR .. "src/devices/machine/x2212.cpp",
 		MAME_DIR .. "src/devices/machine/x2212.h",
 	}
 end
@@ -2311,7 +2311,7 @@ end
 
 if (MACHINES["X76F041"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/x76f041.c",
+		MAME_DIR .. "src/devices/machine/x76f041.cpp",
 		MAME_DIR .. "src/devices/machine/x76f041.h",
 	}
 end
@@ -2323,7 +2323,7 @@ end
 
 if (MACHINES["X76F100"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/x76f100.c",
+		MAME_DIR .. "src/devices/machine/x76f100.cpp",
 		MAME_DIR .. "src/devices/machine/x76f100.h",
 	}
 end
@@ -2335,7 +2335,7 @@ end
 
 if (MACHINES["YM2148"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ym2148.c",
+		MAME_DIR .. "src/devices/machine/ym2148.cpp",
 		MAME_DIR .. "src/devices/machine/ym2148.h",
 	}
 end
@@ -2347,7 +2347,7 @@ end
 
 if (MACHINES["Z80CTC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/z80ctc.c",
+		MAME_DIR .. "src/devices/machine/z80ctc.cpp",
 		MAME_DIR .. "src/devices/machine/z80ctc.h",
 	}
 end
@@ -2359,7 +2359,7 @@ end
 
 if (MACHINES["Z80DART"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/z80dart.c",
+		MAME_DIR .. "src/devices/machine/z80dart.cpp",
 		MAME_DIR .. "src/devices/machine/z80dart.h",
 	}
 end
@@ -2371,7 +2371,7 @@ end
 
 if (MACHINES["Z80SIO"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/z80sio.c",
+		MAME_DIR .. "src/devices/machine/z80sio.cpp",
 		MAME_DIR .. "src/devices/machine/z80sio.h",
 	}
 end
@@ -2383,7 +2383,7 @@ end
 
 if (MACHINES["Z80SCC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/z80scc.c",
+		MAME_DIR .. "src/devices/machine/z80scc.cpp",
 		MAME_DIR .. "src/devices/machine/z80scc.h",
 	}
 end
@@ -2395,7 +2395,7 @@ end
 
 if (MACHINES["Z80DMA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/z80dma.c",
+		MAME_DIR .. "src/devices/machine/z80dma.cpp",
 		MAME_DIR .. "src/devices/machine/z80dma.h",
 	}
 end
@@ -2407,7 +2407,7 @@ end
 
 if (MACHINES["Z80PIO"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/z80pio.c",
+		MAME_DIR .. "src/devices/machine/z80pio.cpp",
 		MAME_DIR .. "src/devices/machine/z80pio.h",
 	}
 end
@@ -2419,7 +2419,7 @@ end
 
 if (MACHINES["Z80STI"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/z80sti.c",
+		MAME_DIR .. "src/devices/machine/z80sti.cpp",
 		MAME_DIR .. "src/devices/machine/z80sti.h",
 	}
 end
@@ -2431,7 +2431,7 @@ end
 
 if (MACHINES["Z8536"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/z8536.c",
+		MAME_DIR .. "src/devices/machine/z8536.cpp",
 		MAME_DIR .. "src/devices/machine/z8536.h",
 	}
 end
@@ -2443,7 +2443,7 @@ end
 
 if (MACHINES["PCCARD"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/pccard.c",
+		MAME_DIR .. "src/devices/machine/pccard.cpp",
 		MAME_DIR .. "src/devices/machine/pccard.h",
 	}
 end
@@ -2455,9 +2455,9 @@ end
 
 if (MACHINES["I8255"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/i8255.c",
+		MAME_DIR .. "src/devices/machine/i8255.cpp",
 		MAME_DIR .. "src/devices/machine/i8255.h",
-		MAME_DIR .. "src/devices/machine/mb89363b.c",
+		MAME_DIR .. "src/devices/machine/mb89363b.cpp",
 		MAME_DIR .. "src/devices/machine/mb89363b.h",
 	}
 end
@@ -2469,7 +2469,7 @@ end
 
 if (MACHINES["NCR5380"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ncr5380.c",
+		MAME_DIR .. "src/devices/machine/ncr5380.cpp",
 		MAME_DIR .. "src/devices/machine/ncr5380.h",
 	}
 end
@@ -2481,7 +2481,7 @@ end
 
 if (MACHINES["NCR5380N"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ncr5380n.c",
+		MAME_DIR .. "src/devices/machine/ncr5380n.cpp",
 		MAME_DIR .. "src/devices/machine/ncr5380n.h",
 	}
 end
@@ -2493,7 +2493,7 @@ end
 
 if (MACHINES["NCR5390"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/ncr5390.c",
+		MAME_DIR .. "src/devices/machine/ncr5390.cpp",
 		MAME_DIR .. "src/devices/machine/ncr5390.h",
 	}
 end
@@ -2505,7 +2505,7 @@ end
 
 if (MACHINES["MM58167"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mm58167.c",
+		MAME_DIR .. "src/devices/machine/mm58167.cpp",
 		MAME_DIR .. "src/devices/machine/mm58167.h",
 	}
 end
@@ -2518,7 +2518,7 @@ end
 
 if (MACHINES["DP8390"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/dp8390.c",
+		MAME_DIR .. "src/devices/machine/dp8390.cpp",
 		MAME_DIR .. "src/devices/machine/dp8390.h",
 	}
 end
@@ -2530,7 +2530,7 @@ end
 
 if (MACHINES["PC_LPT"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/pc_lpt.c",
+		MAME_DIR .. "src/devices/machine/pc_lpt.cpp",
 		MAME_DIR .. "src/devices/machine/pc_lpt.h",
 	}
 end
@@ -2542,7 +2542,7 @@ end
 
 if (MACHINES["PC_FDC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/pc_fdc.c",
+		MAME_DIR .. "src/devices/machine/pc_fdc.cpp",
 		MAME_DIR .. "src/devices/machine/pc_fdc.h",
 	}
 end
@@ -2554,7 +2554,7 @@ end
 
 if (MACHINES["MPU401"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/mpu401.c",
+		MAME_DIR .. "src/devices/machine/mpu401.cpp",
 		MAME_DIR .. "src/devices/machine/mpu401.h",
 	}
 end
@@ -2566,7 +2566,7 @@ end
 
 if (MACHINES["AT_KEYBC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/at_keybc.c",
+		MAME_DIR .. "src/devices/machine/at_keybc.cpp",
 		MAME_DIR .. "src/devices/machine/at_keybc.h",
 	}
 end
@@ -2579,7 +2579,7 @@ end
 
 if (MACHINES["HDC9234"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/hdc92x4.c",
+		MAME_DIR .. "src/devices/machine/hdc92x4.cpp",
 		MAME_DIR .. "src/devices/machine/hdc92x4.h",
 	}
 end
@@ -2591,7 +2591,7 @@ end
 
 if (MACHINES["STRATA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/strata.c",
+		MAME_DIR .. "src/devices/machine/strata.cpp",
 		MAME_DIR .. "src/devices/machine/strata.h",
 	}
 end
@@ -2603,7 +2603,7 @@ end
 
 if (MACHINES["STEPPERS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/steppers.c",
+		MAME_DIR .. "src/devices/machine/steppers.cpp",
 		MAME_DIR .. "src/devices/machine/steppers.h",
 	}
 end
@@ -2614,7 +2614,7 @@ end
 ---------------------------------------------------
 if (MACHINES["CORVUSHD"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/corvushd.c",
+		MAME_DIR .. "src/devices/machine/corvushd.cpp",
 		MAME_DIR .. "src/devices/machine/corvushd.h",
 	}
 end
@@ -2625,7 +2625,7 @@ end
 ---------------------------------------------------
 if (MACHINES["WOZFDC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/wozfdc.c",
+		MAME_DIR .. "src/devices/machine/wozfdc.cpp",
 		MAME_DIR .. "src/devices/machine/wozfdc.h",
 	}
 end
@@ -2636,7 +2636,7 @@ end
 ---------------------------------------------------
 if (MACHINES["DIABLO_HD"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/diablo_hd.c",
+		MAME_DIR .. "src/devices/machine/diablo_hd.cpp",
 		MAME_DIR .. "src/devices/machine/diablo_hd.h",
 	}
 end
@@ -2648,7 +2648,7 @@ end
 
 if (MACHINES["FDC37C665GT"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/fdc37c665gt.c",
+		MAME_DIR .. "src/devices/machine/fdc37c665gt.cpp",
 		MAME_DIR .. "src/devices/machine/fdc37c665gt.h",
 	}
 end
@@ -2660,7 +2660,7 @@ end
 
 if (MACHINES["PCI9050"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/pci9050.c",
+		MAME_DIR .. "src/devices/machine/pci9050.cpp",
 		MAME_DIR .. "src/devices/machine/pci9050.h",
 	}
 end
@@ -2672,7 +2672,7 @@ end
 
 if (MACHINES["NETLIST"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/netlist.c",
+		MAME_DIR .. "src/devices/machine/netlist.cpp",
 		MAME_DIR .. "src/devices/machine/netlist.h",
 	}
 end
@@ -2684,7 +2684,7 @@ end
 
 if (MACHINES["NSC810"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/nsc810.c",
+		MAME_DIR .. "src/devices/machine/nsc810.cpp",
 		MAME_DIR .. "src/devices/machine/nsc810.h",
 	}
 end
@@ -2696,7 +2696,7 @@ end
 
 if (MACHINES["VT82C496"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/machine/vt82c496.c",
+		MAME_DIR .. "src/devices/machine/vt82c496.cpp",
 		MAME_DIR .. "src/devices/machine/vt82c496.h",
 	}
 end
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 20a3e5b6038..e3c7052183c 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -189,7 +189,7 @@ end
 			"-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _subtarget .. "-Info.plist"
 		}
 		custombuildtask {
-			{ MAME_DIR .. "src/version.c" ,  GEN_DIR  .. "/resource/" .. _subtarget .. "-Info.plist",    {  MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "-Info.plist" .. "...",    PYTHON .. " $(1)  -p -b " .. _subtarget .. " $(<) > $(@)" }},
+			{ MAME_DIR .. "src/version.cpp" ,  GEN_DIR  .. "/resource/" .. _subtarget .. "-Info.plist",    {  MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "-Info.plist" .. "...",    PYTHON .. " $(1)  -p -b " .. _subtarget .. " $(<) > $(@)" }},
 		}
 		dependency {
 			{ "$(TARGET)" ,  GEN_DIR  .. "/resource/" .. _subtarget .. "-Info.plist", true  },
@@ -221,23 +221,23 @@ end
 		end	
 	end
 
-	local mainfile = MAME_DIR .. "src/".._target .."/" .. _subtarget ..".c"
+	local mainfile = MAME_DIR .. "src/".._target .."/" .. _subtarget ..".cpp"
 	if not os.isfile(mainfile) then
-		mainfile = MAME_DIR .. "src/".._target .."/" .. _target ..".c"
+		mainfile = MAME_DIR .. "src/".._target .."/" .. _target ..".cpp"
 	end
 	files {
 		mainfile,
-		MAME_DIR .. "src/version.c",
-		GEN_DIR  .. _target .. "/" .. _subtarget .."/drivlist.c",
+		MAME_DIR .. "src/version.cpp",
+		GEN_DIR  .. _target .. "/" .. _subtarget .."/drivlist.cpp",
 	}
 	
 if (_OPTIONS["SOURCES"] == nil) then 	
 	dependency {
-		{ "../../../../generated/mame/mame/drivlist.c",  MAME_DIR .. "src/mame/mess.lst", true },
-		{ "../../../../generated/mame/mame/drivlist.c" , MAME_DIR .. "src/mame/arcade.lst", true},
+		{ "../../../../generated/mame/mame/drivlist.cpp",  MAME_DIR .. "src/mame/mess.lst", true },
+		{ "../../../../generated/mame/mame/drivlist.cpp" , MAME_DIR .. "src/mame/arcade.lst", true},
 	}
 	custombuildtask {
-		{ MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" ,  GEN_DIR  .. _target .. "/" .. _subtarget .."/drivlist.c",    {  MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...",    PYTHON .. " $(1) $(<) > $(@)" }},
+		{ MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" ,  GEN_DIR  .. _target .. "/" .. _subtarget .."/drivlist.cpp",    {  MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...",    PYTHON .. " $(1) $(<) > $(@)" }},
 	}
 end	
 
@@ -250,14 +250,14 @@ if _OPTIONS["FORCE_VERSION_COMPILE"]=="1" then
 end
 	configuration { "mingw*" }
 		custombuildtask {	
-			{ MAME_DIR .. "src/version.c" ,  GEN_DIR  .. "/resource/" .. rctarget .. "vers.rc",    {  MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...",    PYTHON .. " $(1)  -r -b " .. rctarget .. " $(<) > $(@)" }},
+			{ MAME_DIR .. "src/version.cpp" ,  GEN_DIR  .. "/resource/" .. rctarget .. "vers.rc",    {  MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...",    PYTHON .. " $(1)  -r -b " .. rctarget .. " $(<) > $(@)" }},
 		}	
 	
 	configuration { "vs*" }
 		prebuildcommands {	
 			"mkdir " .. path.translate(GEN_DIR  .. "/resource/","\\") .. " 2>NUL",
 			"@echo Emitting ".. rctarget .. "vers.rc...",
-			PYTHON .. " " .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR  .. "/resource/" .. rctarget .. "vers.rc", "\\") ,
+			PYTHON .. " " .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.cpp","\\") .. " > " .. path.translate(GEN_DIR  .. "/resource/" .. rctarget .. "vers.rc", "\\") ,
 		}	
 	
 	 
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 593115ee425..346aea46e18 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -27,45 +27,45 @@ project "netlist"
 		MAME_DIR .. "src/lib/netlist/nl_lists.h",
 		MAME_DIR .. "src/lib/netlist/nl_time.h",
 		MAME_DIR .. "src/lib/netlist/nl_util.h",
-		MAME_DIR .. "src/lib/netlist/nl_base.c",
+		MAME_DIR .. "src/lib/netlist/nl_base.cpp",
 		MAME_DIR .. "src/lib/netlist/nl_base.h",
-		MAME_DIR .. "src/lib/netlist/nl_parser.c",
+		MAME_DIR .. "src/lib/netlist/nl_parser.cpp",
 		MAME_DIR .. "src/lib/netlist/nl_parser.h",
-		MAME_DIR .. "src/lib/netlist/nl_setup.c",
+		MAME_DIR .. "src/lib/netlist/nl_setup.cpp",
 		MAME_DIR .. "src/lib/netlist/nl_setup.h",
-		MAME_DIR .. "src/lib/netlist/nl_factory.c",
+		MAME_DIR .. "src/lib/netlist/nl_factory.cpp",
 		MAME_DIR .. "src/lib/netlist/nl_factory.h",
 		MAME_DIR .. "src/lib/netlist/plib/pconfig.h",
-		MAME_DIR .. "src/lib/netlist/plib/palloc.c",
+		MAME_DIR .. "src/lib/netlist/plib/palloc.cpp",
 		MAME_DIR .. "src/lib/netlist/plib/palloc.h",
-    MAME_DIR .. "src/lib/netlist/plib/pfmtlog.c",
+    MAME_DIR .. "src/lib/netlist/plib/pfmtlog.cpp",
     MAME_DIR .. "src/lib/netlist/plib/pfmtlog.h",
 		MAME_DIR .. "src/lib/netlist/plib/plists.h",
 		MAME_DIR .. "src/lib/netlist/plib/poptions.h",
-		MAME_DIR .. "src/lib/netlist/plib/pparser.c",
+		MAME_DIR .. "src/lib/netlist/plib/pparser.cpp",
 		MAME_DIR .. "src/lib/netlist/plib/pparser.h",
-		MAME_DIR .. "src/lib/netlist/plib/pstate.c",
+		MAME_DIR .. "src/lib/netlist/plib/pstate.cpp",
 		MAME_DIR .. "src/lib/netlist/plib/pstate.h",
-		MAME_DIR .. "src/lib/netlist/plib/pstring.c",
+		MAME_DIR .. "src/lib/netlist/plib/pstring.cpp",
 		MAME_DIR .. "src/lib/netlist/plib/pstring.h",
-		MAME_DIR .. "src/lib/netlist/plib/pstring.c",
+		MAME_DIR .. "src/lib/netlist/plib/pstring.cpp",
 		MAME_DIR .. "src/lib/netlist/plib/pstring.h",
-		MAME_DIR .. "src/lib/netlist/plib/pstream.c",
+		MAME_DIR .. "src/lib/netlist/plib/pstream.cpp",
 		MAME_DIR .. "src/lib/netlist/plib/pstream.h",
     MAME_DIR .. "src/lib/netlist/plib/ptypes.h",
-		MAME_DIR .. "src/lib/netlist/tools/nl_convert.c",
+		MAME_DIR .. "src/lib/netlist/tools/nl_convert.cpp",
 		MAME_DIR .. "src/lib/netlist/tools/nl_convert.h",
-		MAME_DIR .. "src/lib/netlist/analog/nld_bjt.c",
+		MAME_DIR .. "src/lib/netlist/analog/nld_bjt.cpp",
 		MAME_DIR .. "src/lib/netlist/analog/nld_bjt.h",
-		MAME_DIR .. "src/lib/netlist/analog/nld_fourterm.c",
+		MAME_DIR .. "src/lib/netlist/analog/nld_fourterm.cpp",
 		MAME_DIR .. "src/lib/netlist/analog/nld_fourterm.h",
-		MAME_DIR .. "src/lib/netlist/analog/nld_switches.c",
+		MAME_DIR .. "src/lib/netlist/analog/nld_switches.cpp",
 		MAME_DIR .. "src/lib/netlist/analog/nld_switches.h",
-		MAME_DIR .. "src/lib/netlist/analog/nld_twoterm.c",
+		MAME_DIR .. "src/lib/netlist/analog/nld_twoterm.cpp",
 		MAME_DIR .. "src/lib/netlist/analog/nld_twoterm.h",
-		MAME_DIR .. "src/lib/netlist/analog/nld_opamps.c",
+		MAME_DIR .. "src/lib/netlist/analog/nld_opamps.cpp",
 		MAME_DIR .. "src/lib/netlist/analog/nld_opamps.h",
-		MAME_DIR .. "src/lib/netlist/solver/nld_solver.c",
+		MAME_DIR .. "src/lib/netlist/solver/nld_solver.cpp",
 		MAME_DIR .. "src/lib/netlist/solver/nld_solver.h",
 		MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h",
 		MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h",
@@ -73,96 +73,96 @@ project "netlist"
 		MAME_DIR .. "src/lib/netlist/solver/nld_ms_sor.h",
 		MAME_DIR .. "src/lib/netlist/solver/nld_ms_sor_mat.h",
 		MAME_DIR .. "src/lib/netlist/solver/nld_ms_gmres.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_4020.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_4020.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_4066.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_4066.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7400.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7400.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7400.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7402.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7402.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7402.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7404.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7404.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7404.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7408.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7408.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7408.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7410.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7410.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7410.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7411.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7411.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7411.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7420.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7420.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7420.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7425.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7425.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7425.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7427.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7427.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7427.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7430.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7430.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7430.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7432.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7432.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7432.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7437.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7437.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7437.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7448.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7448.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7448.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7450.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7450.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7450.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7474.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7474.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7474.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7483.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7483.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7483.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7486.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7486.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7486.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7490.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7490.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7490.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7493.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_7493.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7493.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_74107.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_74107.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74107.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_74123.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_74123.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74123.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_74153.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_74153.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74153.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_74175.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_74175.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74175.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_74192.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_74192.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74192.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_74193.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_74193.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74193.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_74279.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_74279.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74279.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_74ls629.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_74ls629.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74ls629.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_82S16.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_82S16.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_82S16.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_9310.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_9310.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_9310.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_9312.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_9312.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_9312.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_9316.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_9316.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_9316.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_ne555.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_ne555.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_ne555.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_mm5837.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_mm5837.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_mm5837.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_r2r_dac.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_r2r_dac.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_r2r_dac.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_legacy.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_legacy.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_legacy.h",
-		MAME_DIR .. "src/lib/netlist/devices/net_lib.c",
+		MAME_DIR .. "src/lib/netlist/devices/net_lib.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/net_lib.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_log.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_log.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_log.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_system.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_system.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_system.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_cmos.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_signal.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.c",
+		MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_truthtable.h",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.c",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.cpp",
 		MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.h",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx.c",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx.cpp",
 		MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx.h",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.c",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.cpp",
 		MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.h",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_other.c",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_other.cpp",
 		MAME_DIR .. "src/lib/netlist/macro/nlm_other.h",
 }
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index bf6897a2585..658b80d681c 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -38,26 +38,26 @@ function osdmodulesbuild()
 	}
 
 	files {
-		MAME_DIR .. "src/osd/osdnet.c",
-		MAME_DIR .. "src/osd/modules/lib/osdobj_common.c",
-		MAME_DIR .. "src/osd/modules/debugger/none.c",
-		MAME_DIR .. "src/osd/modules/debugger/debugint.c",
-		MAME_DIR .. "src/osd/modules/debugger/debugwin.c",
-		MAME_DIR .. "src/osd/modules/debugger/debugqt.c",
-		MAME_DIR .. "src/osd/modules/font/font_sdl.c",
-		MAME_DIR .. "src/osd/modules/font/font_windows.c",
-		MAME_DIR .. "src/osd/modules/font/font_osx.c",
-		MAME_DIR .. "src/osd/modules/font/font_none.c",
-		MAME_DIR .. "src/osd/modules/netdev/taptun.c",
-		MAME_DIR .. "src/osd/modules/netdev/pcap.c",
-		MAME_DIR .. "src/osd/modules/netdev/none.c",
-		MAME_DIR .. "src/osd/modules/midi/portmidi.c",
-		MAME_DIR .. "src/osd/modules/midi/none.c",
-		MAME_DIR .. "src/osd/modules/sound/js_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/direct_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/sdl_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/none.c",
+		MAME_DIR .. "src/osd/osdnet.cpp",
+		MAME_DIR .. "src/osd/modules/lib/osdobj_common.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/none.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/debugint.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/debugqt.cpp",
+		MAME_DIR .. "src/osd/modules/font/font_sdl.cpp",
+		MAME_DIR .. "src/osd/modules/font/font_windows.cpp",
+		MAME_DIR .. "src/osd/modules/font/font_osx.cpp",
+		MAME_DIR .. "src/osd/modules/font/font_none.cpp",
+		MAME_DIR .. "src/osd/modules/netdev/taptun.cpp",
+		MAME_DIR .. "src/osd/modules/netdev/pcap.cpp",
+		MAME_DIR .. "src/osd/modules/netdev/none.cpp",
+		MAME_DIR .. "src/osd/modules/midi/portmidi.cpp",
+		MAME_DIR .. "src/osd/modules/midi/none.cpp",
+		MAME_DIR .. "src/osd/modules/sound/js_sound.cpp",
+		MAME_DIR .. "src/osd/modules/sound/direct_sound.cpp",
+		MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp",
+		MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp",
+		MAME_DIR .. "src/osd/modules/sound/none.cpp",
 	}
 
 	if _OPTIONS["targetos"]=="windows" then
@@ -72,9 +72,9 @@ function osdmodulesbuild()
 		}
 	else
 		files {
-			MAME_DIR .. "src/osd/modules/render/drawogl.c",
-			MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.c",
-			MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.c",
+			MAME_DIR .. "src/osd/modules/render/drawogl.cpp",
+			MAME_DIR .. "src/osd/modules/opengl/gl_shader_tool.cpp",
+			MAME_DIR .. "src/osd/modules/opengl/gl_shader_mgr.cpp",
 		}
 		defines {
 			"USE_OPENGL=1",
@@ -88,7 +88,7 @@ function osdmodulesbuild()
 
 	if USE_BGFX == 1 then
 		files {
-			MAME_DIR .. "src/osd/modules/render/drawbgfx.c",
+			MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp",
 		}
 		defines {
 			"USE_BGFX"
@@ -107,24 +107,24 @@ function osdmodulesbuild()
 
 	if _OPTIONS["USE_QTDEBUG"]=="1" then
 		files {
-			MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.c",
-			MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.c",
-			GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.c",
-			GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.c",
-			GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.c",
-			GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.c",
-			GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.c",
-			GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.c",
-			GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.c",
-			GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.c",
-			GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.c",
+			MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.cpp",
+			MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.cpp",
+			GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp",
+			GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp",
+			GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp",
+			GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp",
+			GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp",
+			GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp",
+			GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp",
+			GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp",
+			GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.cpp",
 		}
 		defines {
 			"USE_QTDEBUG=1",
@@ -156,15 +156,15 @@ function osdmodulesbuild()
 		
 		
 		custombuildtask {
-			{ MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", 			GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.c", { },			{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
-			{ MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", 				GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.c", { }, 				{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
-			{ MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", 				GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.c", { }, 				{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
-			{ MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", 				GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.c", { }, 			{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
-			{ MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", 				GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.c", { }, 			{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
-			{ MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h",				GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.c", { }, 			{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
-			{ MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h",		GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.c", { }, 		{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
-			{ MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", 			GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.c", { }, 			{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
-			{ MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.h",  GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.c", { },{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+			{ MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", 			GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { },			{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+			{ MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", 				GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, 				{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+			{ MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", 				GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, 				{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+			{ MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", 				GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, 			{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+			{ MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", 				GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, 			{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+			{ MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h",				GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, 			{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+			{ MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h",		GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, 		{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+			{ MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", 			GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, 			{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
+			{ MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.h",  GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.cpp", { },{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }},
 			
 		}
 		
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
index b4afaaa6532..b0c250eac1d 100644
--- a/scripts/src/osd/osdmini.lua
+++ b/scripts/src/osd/osdmini.lua
@@ -33,23 +33,23 @@ project ("osd_" .. _OPTIONS["osd"])
 	}
 
 	files {
-		MAME_DIR .. "src/osd/osdnet.c",
-		MAME_DIR .. "src/osd/osdmini/minimain.c",
-		MAME_DIR .. "src/osd/modules/lib/osdobj_common.c",
-		MAME_DIR .. "src/osd/modules/font/font_sdl.c",
-		MAME_DIR .. "src/osd/modules/font/font_windows.c",
-		MAME_DIR .. "src/osd/modules/font/font_osx.c",
-		MAME_DIR .. "src/osd/modules/font/font_none.c",
-		MAME_DIR .. "src/osd/modules/netdev/taptun.c",
-		MAME_DIR .. "src/osd/modules/netdev/pcap.c",
-		MAME_DIR .. "src/osd/modules/netdev/none.c",
-		MAME_DIR .. "src/osd/modules/midi/portmidi.c",
-		MAME_DIR .. "src/osd/modules/midi/none.c",
-		MAME_DIR .. "src/osd/modules/sound/js_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/direct_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.c",		
-		MAME_DIR .. "src/osd/modules/sound/sdl_sound.c",
-		MAME_DIR .. "src/osd/modules/sound/none.c",
+		MAME_DIR .. "src/osd/osdnet.cpp",
+		MAME_DIR .. "src/osd/osdmini/minimain.cpp",
+		MAME_DIR .. "src/osd/modules/lib/osdobj_common.cpp",
+		MAME_DIR .. "src/osd/modules/font/font_sdl.cpp",
+		MAME_DIR .. "src/osd/modules/font/font_windows.cpp",
+		MAME_DIR .. "src/osd/modules/font/font_osx.cpp",
+		MAME_DIR .. "src/osd/modules/font/font_none.cpp",
+		MAME_DIR .. "src/osd/modules/netdev/taptun.cpp",
+		MAME_DIR .. "src/osd/modules/netdev/pcap.cpp",
+		MAME_DIR .. "src/osd/modules/netdev/none.cpp",
+		MAME_DIR .. "src/osd/modules/midi/portmidi.cpp",
+		MAME_DIR .. "src/osd/modules/midi/none.cpp",
+		MAME_DIR .. "src/osd/modules/sound/js_sound.cpp",
+		MAME_DIR .. "src/osd/modules/sound/direct_sound.cpp",
+		MAME_DIR .. "src/osd/modules/sound/coreaudio_sound.cpp",		
+		MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp",
+		MAME_DIR .. "src/osd/modules/sound/none.cpp",
 	}
 	
 project ("ocore_" .. _OPTIONS["osd"])
@@ -92,12 +92,12 @@ project ("ocore_" .. _OPTIONS["osd"])
 	end
 
 	files {
-		MAME_DIR .. "src/osd/osdcore.c",
-		MAME_DIR .. "src/osd/modules/osdmodule.c",
-		MAME_DIR .. "src/osd/osdmini/minidir.c",
-		MAME_DIR .. "src/osd/osdmini/minifile.c",
-		MAME_DIR .. "src/osd/osdmini/minimisc.c",
-		MAME_DIR .. "src/osd/osdmini/minisync.c",
-		MAME_DIR .. "src/osd/osdmini/minitime.c",
-		MAME_DIR .. "src/osd/modules/sync/work_mini.c",
+		MAME_DIR .. "src/osd/osdcore.cpp",
+		MAME_DIR .. "src/osd/modules/osdmodule.cpp",
+		MAME_DIR .. "src/osd/osdmini/minidir.cpp",
+		MAME_DIR .. "src/osd/osdmini/minifile.cpp",
+		MAME_DIR .. "src/osd/osdmini/minimisc.cpp",
+		MAME_DIR .. "src/osd/osdmini/minisync.cpp",
+		MAME_DIR .. "src/osd/osdmini/minitime.cpp",
+		MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
 	}
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index c46b25f5589..c903579426e 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -321,7 +321,7 @@ project ("osd_" .. _OPTIONS["osd"])
 
 	if _OPTIONS["targetos"]=="windows" then
 		files {
-			MAME_DIR .. "src/osd/sdl/main.c",
+			MAME_DIR .. "src/osd/sdl/main.cpp",
 		}
 	end
 
@@ -355,17 +355,17 @@ project ("osd_" .. _OPTIONS["osd"])
 	end
 
 	files {
-		MAME_DIR .. "src/osd/sdl/sdlmain.c",
-		MAME_DIR .. "src/osd/sdl/input.c",
-		MAME_DIR .. "src/osd/sdl/video.c",
-		MAME_DIR .. "src/osd/sdl/window.c",
-		MAME_DIR .. "src/osd/sdl/output.c",
-		MAME_DIR .. "src/osd/sdl/watchdog.c",
-		MAME_DIR .. "src/osd/modules/render/drawsdl.c",
+		MAME_DIR .. "src/osd/sdl/sdlmain.cpp",
+		MAME_DIR .. "src/osd/sdl/input.cpp",
+		MAME_DIR .. "src/osd/sdl/video.cpp",
+		MAME_DIR .. "src/osd/sdl/window.cpp",
+		MAME_DIR .. "src/osd/sdl/output.cpp",
+		MAME_DIR .. "src/osd/sdl/watchdog.cpp",
+		MAME_DIR .. "src/osd/modules/render/drawsdl.cpp",
 	}
 	if _OPTIONS["SDL_LIBVER"]=="sdl2" then
 		files {
-			MAME_DIR .. "src/osd/modules/render/draw13.c",
+			MAME_DIR .. "src/osd/modules/render/draw13.cpp",
 		}
 	end
 
@@ -394,25 +394,25 @@ project ("ocore_" .. _OPTIONS["osd"])
 	}
 
 	files {
-		MAME_DIR .. "src/osd/osdcore.c",
-		MAME_DIR .. "src/osd/strconv.c",
-		MAME_DIR .. "src/osd/sdl/sdldir.c",
-		MAME_DIR .. "src/osd/sdl/sdlfile.c",
-		MAME_DIR .. "src/osd/sdl/sdlptty_" .. BASE_TARGETOS ..".c",
-		MAME_DIR .. "src/osd/sdl/sdlsocket.c",
-		MAME_DIR .. "src/osd/sdl/sdlos_" .. SDLOS_TARGETOS .. ".c",
-		MAME_DIR .. "src/osd/modules/osdmodule.c",
-		MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".c",
-		MAME_DIR .. "src/osd/modules/sync/sync_" .. SYNC_IMPLEMENTATION .. ".c",
+		MAME_DIR .. "src/osd/osdcore.cpp",
+		MAME_DIR .. "src/osd/strconv.cpp",
+		MAME_DIR .. "src/osd/sdl/sdldir.cpp",
+		MAME_DIR .. "src/osd/sdl/sdlfile.cpp",
+		MAME_DIR .. "src/osd/sdl/sdlptty_" .. BASE_TARGETOS ..".cpp",
+		MAME_DIR .. "src/osd/sdl/sdlsocket.cpp",
+		MAME_DIR .. "src/osd/sdl/sdlos_" .. SDLOS_TARGETOS .. ".cpp",
+		MAME_DIR .. "src/osd/modules/osdmodule.cpp",
+		MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp",
+		MAME_DIR .. "src/osd/modules/sync/sync_" .. SYNC_IMPLEMENTATION .. ".cpp",
 	}
 
 	if _OPTIONS["NOASM"]=="1" then
 		files {
-			MAME_DIR .. "src/osd/modules/sync/work_mini.c",
+			MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
 		}
 	else
 		files {
-			MAME_DIR .. "src/osd/modules/sync/work_osd.c",
+			MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
 		}
 	end
 
@@ -457,7 +457,7 @@ if _OPTIONS["with-tools"] then
 		}
 
 		files {
-			MAME_DIR .. "src/osd/sdl/testkeys.c",
+			MAME_DIR .. "src/osd/sdl/testkeys.cpp",
 		}
 
 		if _OPTIONS["targetos"] == "windows" then
@@ -477,7 +477,7 @@ if _OPTIONS["with-tools"] then
 				"-municode",
 			}
 			files {
-				MAME_DIR .. "src/osd/sdl/main.c",
+				MAME_DIR .. "src/osd/sdl/main.cpp",
 			}
 		elseif _OPTIONS["targetos"] == "macosx" and _OPTIONS["SDL_LIBVER"] == "sdl" then
 			-- SDLMain_tmpl isn't necessary for SDL2
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index f10fec5ab38..c822be8c2d1 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -128,31 +128,31 @@ project ("osd_" .. _OPTIONS["osd"])
 	}
 
 	files {
-		MAME_DIR .. "src/osd/modules/render/drawd3d.c",
-		MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.c",
-		MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.c",
-		MAME_DIR .. "src/osd/modules/render/drawdd.c",
-		MAME_DIR .. "src/osd/modules/render/drawgdi.c",
-		MAME_DIR .. "src/osd/modules/render/drawnone.c",
-		MAME_DIR .. "src/osd/windows/input.c",
-		MAME_DIR .. "src/osd/windows/output.c",
-		MAME_DIR .. "src/osd/windows/video.c",
-		MAME_DIR .. "src/osd/windows/window.c",
-		MAME_DIR .. "src/osd/windows/winmenu.c",
-		MAME_DIR .. "src/osd/windows/winmain.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.c",
-		MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.c",
+		MAME_DIR .. "src/osd/modules/render/drawd3d.cpp",
+		MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp",
+		MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp",
+		MAME_DIR .. "src/osd/modules/render/drawdd.cpp",
+		MAME_DIR .. "src/osd/modules/render/drawgdi.cpp",
+		MAME_DIR .. "src/osd/modules/render/drawnone.cpp",
+		MAME_DIR .. "src/osd/windows/input.cpp",
+		MAME_DIR .. "src/osd/windows/output.cpp",
+		MAME_DIR .. "src/osd/windows/video.cpp",
+		MAME_DIR .. "src/osd/windows/window.cpp",
+		MAME_DIR .. "src/osd/windows/winmenu.cpp",
+		MAME_DIR .. "src/osd/windows/winmain.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.cpp",
+		MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.cpp",
 	}
 
 
@@ -186,28 +186,28 @@ project ("ocore_" .. _OPTIONS["osd"])
 	}
 
 	files {
-		MAME_DIR .. "src/osd/osdcore.c",
-		MAME_DIR .. "src/osd/strconv.c",
-		MAME_DIR .. "src/osd/windows/main.c",
-		MAME_DIR .. "src/osd/windows/windir.c",
-		MAME_DIR .. "src/osd/windows/winfile.c",
-		MAME_DIR .. "src/osd/modules/sync/sync_windows.c",
-		MAME_DIR .. "src/osd/windows/winutf8.c",
-		MAME_DIR .. "src/osd/windows/winutil.c",
-		MAME_DIR .. "src/osd/windows/winclip.c",
-		MAME_DIR .. "src/osd/windows/winsocket.c",
-		MAME_DIR .. "src/osd/windows/winptty.c",
-		MAME_DIR .. "src/osd/modules/osdmodule.c",
-		MAME_DIR .. "src/osd/modules/lib/osdlib_win32.c",
+		MAME_DIR .. "src/osd/osdcore.cpp",
+		MAME_DIR .. "src/osd/strconv.cpp",
+		MAME_DIR .. "src/osd/windows/main.cpp",
+		MAME_DIR .. "src/osd/windows/windir.cpp",
+		MAME_DIR .. "src/osd/windows/winfile.cpp",
+		MAME_DIR .. "src/osd/modules/sync/sync_windows.cpp",
+		MAME_DIR .. "src/osd/windows/winutf8.cpp",
+		MAME_DIR .. "src/osd/windows/winutil.cpp",
+		MAME_DIR .. "src/osd/windows/winclip.cpp",
+		MAME_DIR .. "src/osd/windows/winsocket.cpp",
+		MAME_DIR .. "src/osd/windows/winptty.cpp",
+		MAME_DIR .. "src/osd/modules/osdmodule.cpp",
+		MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp",
 	}
 
 	if _OPTIONS["NOASM"] == "1" then
 		files {
-			MAME_DIR .. "src/osd/modules/sync/work_mini.c",
+			MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
 		}
 	else
 		files {
-			MAME_DIR .. "src/osd/modules/sync/work_osd.c",
+			MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
 		}
 	end
 
@@ -242,6 +242,6 @@ if _OPTIONS["with-tools"] then
 		}
 		
 		files {
-			MAME_DIR .. "src/osd/windows/ledutil.c",
+			MAME_DIR .. "src/osd/windows/ledutil.cpp",
 		}
 end
diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
index 8071a6ade72..4ba380deefb 100644
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@@ -20,28 +20,28 @@
 
 if (SOUNDS["DAC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/dac.c",
+		MAME_DIR .. "src/devices/sound/dac.cpp",
 		MAME_DIR .. "src/devices/sound/dac.h",
 	}
 end
 
 if (SOUNDS["DMADAC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/dmadac.c",
+		MAME_DIR .. "src/devices/sound/dmadac.cpp",
 		MAME_DIR .. "src/devices/sound/dmadac.h",
 	}
 end
 
 if (SOUNDS["SPEAKER"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/speaker.c",
+		MAME_DIR .. "src/devices/sound/speaker.cpp",
 		MAME_DIR .. "src/devices/sound/speaker.h",
 	}
 end
 
 if (SOUNDS["BEEP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/beep.c",
+		MAME_DIR .. "src/devices/sound/beep.cpp",
 		MAME_DIR .. "src/devices/sound/beep.h",
 	}
 end
@@ -55,7 +55,7 @@ end
 
 if (SOUNDS["CDDA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/cdda.c",
+		MAME_DIR .. "src/devices/sound/cdda.cpp",
 		MAME_DIR .. "src/devices/sound/cdda.h",
 	}
 end
@@ -69,7 +69,7 @@ end
 
 if (SOUNDS["DISCRETE"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/discrete.c",
+		MAME_DIR .. "src/devices/sound/discrete.cpp",
 		MAME_DIR .. "src/devices/sound/discrete.h",
 		MAME_DIR .. "src/devices/sound/disc_cls.h",
 		MAME_DIR .. "src/devices/sound/disc_dev.h",
@@ -92,7 +92,7 @@ end
 
 if (SOUNDS["AC97"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/pci-ac97.c",
+		MAME_DIR .. "src/devices/sound/pci-ac97.cpp",
 		MAME_DIR .. "src/devices/sound/pci-ac97.h",
 	}
 end
@@ -107,14 +107,14 @@ end
 
 if (SOUNDS["ASC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/asc.c",
+		MAME_DIR .. "src/devices/sound/asc.cpp",
 		MAME_DIR .. "src/devices/sound/asc.h",
 	}
 end
 
 if (SOUNDS["AWACS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/awacs.c",
+		MAME_DIR .. "src/devices/sound/awacs.cpp",
 		MAME_DIR .. "src/devices/sound/awacs.h",
 	}
 end
@@ -128,16 +128,16 @@ end
 
 if (SOUNDS["POKEY"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/pokey.c",
+		MAME_DIR .. "src/devices/sound/pokey.cpp",
 		MAME_DIR .. "src/devices/sound/pokey.h",
 	}
 end
 
 if (SOUNDS["TIA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/tiasound.c", 
+		MAME_DIR .. "src/devices/sound/tiasound.cpp", 
 		MAME_DIR .. "src/devices/sound/tiasound.h", 
-		MAME_DIR .. "src/devices/sound/tiaintf.c",
+		MAME_DIR .. "src/devices/sound/tiaintf.cpp",
 		MAME_DIR .. "src/devices/sound/tiaintf.h",
 	}
 end
@@ -151,7 +151,7 @@ end
 
 if (SOUNDS["AMIGA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/amiga.c",
+		MAME_DIR .. "src/devices/sound/amiga.cpp",
 		MAME_DIR .. "src/devices/sound/amiga.h",
 	}
 end
@@ -165,7 +165,7 @@ end
 
 if (SOUNDS["ASTROCADE"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/astrocde.c",
+		MAME_DIR .. "src/devices/sound/astrocde.cpp",
 		MAME_DIR .. "src/devices/sound/astrocde.h",
 	}
 end
@@ -180,7 +180,7 @@ end
 
 if (SOUNDS["AC97"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/pci-ac97.c",
+		MAME_DIR .. "src/devices/sound/pci-ac97.cpp",
 		MAME_DIR .. "src/devices/sound/pci-ac97.h",
 	}
 end
@@ -190,7 +190,7 @@ end
 
 if (SOUNDS["CEM3394"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/cem3394.c",
+		MAME_DIR .. "src/devices/sound/cem3394.cpp",
 		MAME_DIR .. "src/devices/sound/cem3394.h",
 	}
 end
@@ -204,7 +204,7 @@ end
 
 if (SOUNDS["SB0400"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/sb0400.c",
+		MAME_DIR .. "src/devices/sound/sb0400.cpp",
 		MAME_DIR .. "src/devices/sound/sb0400.h",
 	}
 end
@@ -217,7 +217,7 @@ end
 
 if (SOUNDS["ES1373"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/es1373.c",
+		MAME_DIR .. "src/devices/sound/es1373.cpp",
 		MAME_DIR .. "src/devices/sound/es1373.h",
 	}
 end
@@ -229,7 +229,7 @@ end
 
 if (SOUNDS["BSMT2000"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/bsmt2000.c",
+		MAME_DIR .. "src/devices/sound/bsmt2000.cpp",
 		MAME_DIR .. "src/devices/sound/bsmt2000.h",
 	}
 end
@@ -243,7 +243,7 @@ end
 
 if (SOUNDS["ES5503"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/es5503.c",
+		MAME_DIR .. "src/devices/sound/es5503.cpp",
 		MAME_DIR .. "src/devices/sound/es5503.h",
 	}
 end
@@ -257,7 +257,7 @@ end
 
 if (SOUNDS["ES5505"]~=null or SOUNDS["ES5506"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/es5506.c",
+		MAME_DIR .. "src/devices/sound/es5506.cpp",
 		MAME_DIR .. "src/devices/sound/es5506.h",
 	}
 end
@@ -270,7 +270,7 @@ end
 
 if (SOUNDS["ESQPUMP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/esqpump.c",
+		MAME_DIR .. "src/devices/sound/esqpump.cpp",
 		MAME_DIR .. "src/devices/sound/esqpump.h",
 	}
 end
@@ -283,7 +283,7 @@ end
 
 if (SOUNDS["ES8712"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/es8712.c",
+		MAME_DIR .. "src/devices/sound/es8712.cpp",
 		MAME_DIR .. "src/devices/sound/es8712.h",
 	}
 end
@@ -297,7 +297,7 @@ end
 
 if (SOUNDS["GAELCO_CG1V"]~=null or SOUNDS["GAELCO_GAE1"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/gaelco.c",
+		MAME_DIR .. "src/devices/sound/gaelco.cpp",
 		MAME_DIR .. "src/devices/sound/gaelco.h",
 	}
 end
@@ -310,7 +310,7 @@ end
 
 if (SOUNDS["CDP1863"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/cdp1863.c",
+		MAME_DIR .. "src/devices/sound/cdp1863.cpp",
 		MAME_DIR .. "src/devices/sound/cdp1863.h",
 	}
 end
@@ -324,7 +324,7 @@ end
 
 if (SOUNDS["CDP1864"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/cdp1864.c",
+		MAME_DIR .. "src/devices/sound/cdp1864.cpp",
 		MAME_DIR .. "src/devices/sound/cdp1864.h",
 	}
 end
@@ -338,7 +338,7 @@ end
 
 if (SOUNDS["CDP1869"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/cdp1869.c",
+		MAME_DIR .. "src/devices/sound/cdp1869.cpp",
 		MAME_DIR .. "src/devices/sound/cdp1869.h",
 	}
 end
@@ -352,7 +352,7 @@ end
 
 if (SOUNDS["AY8910"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/ay8910.c",
+		MAME_DIR .. "src/devices/sound/ay8910.cpp",
 		MAME_DIR .. "src/devices/sound/ay8910.h",
 	}
 end
@@ -366,7 +366,7 @@ end
 
 if (SOUNDS["HC55516"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/hc55516.c",
+		MAME_DIR .. "src/devices/sound/hc55516.cpp",
 		MAME_DIR .. "src/devices/sound/hc55516.h",
 	}
 end
@@ -380,7 +380,7 @@ end
 
 if (SOUNDS["C6280"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/c6280.c",
+		MAME_DIR .. "src/devices/sound/c6280.cpp",
 		MAME_DIR .. "src/devices/sound/c6280.h",
 	}
 end
@@ -394,7 +394,7 @@ end
 
 if (SOUNDS["ICS2115"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/ics2115.c",
+		MAME_DIR .. "src/devices/sound/ics2115.cpp",
 		MAME_DIR .. "src/devices/sound/ics2115.h",
 	}
 end
@@ -408,7 +408,7 @@ end
 
 if (SOUNDS["I5000_SND"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/i5000.c",
+		MAME_DIR .. "src/devices/sound/i5000.cpp",
 		MAME_DIR .. "src/devices/sound/i5000.h",
 	}
 end
@@ -422,7 +422,7 @@ end
 
 if (SOUNDS["IREMGA20"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/iremga20.c",
+		MAME_DIR .. "src/devices/sound/iremga20.cpp",
 		MAME_DIR .. "src/devices/sound/iremga20.h",
 	}
 end
@@ -441,42 +441,42 @@ end
 
 if (SOUNDS["K005289"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/k005289.c",
+		MAME_DIR .. "src/devices/sound/k005289.cpp",
 		MAME_DIR .. "src/devices/sound/k005289.h",
 	}
 end
 
 if (SOUNDS["K007232"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/k007232.c",
+		MAME_DIR .. "src/devices/sound/k007232.cpp",
 		MAME_DIR .. "src/devices/sound/k007232.h",
 	}
 end
 
 if (SOUNDS["K051649"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/k051649.c",
+		MAME_DIR .. "src/devices/sound/k051649.cpp",
 		MAME_DIR .. "src/devices/sound/k051649.h",
 	}
 end
 
 if (SOUNDS["K053260"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/k053260.c",
+		MAME_DIR .. "src/devices/sound/k053260.cpp",
 		MAME_DIR .. "src/devices/sound/k053260.h",
 	}
 end
 
 if (SOUNDS["K054539"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/k054539.c",
+		MAME_DIR .. "src/devices/sound/k054539.cpp",
 		MAME_DIR .. "src/devices/sound/k054539.h",
 	}
 end
 
 if (SOUNDS["K056800"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/k056800.c",
+		MAME_DIR .. "src/devices/sound/k056800.cpp",
 		MAME_DIR .. "src/devices/sound/k056800.h",
 	}
 end
@@ -489,7 +489,7 @@ end
 
 if (SOUNDS["L7A1045"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/l7a1045_l6028_dsp_a.c",
+		MAME_DIR .. "src/devices/sound/l7a1045_l6028_dsp_a.cpp",
 		MAME_DIR .. "src/devices/sound/l7a1045_l6028_dsp_a.h",
 	}
 end
@@ -502,7 +502,7 @@ end
 
 if (SOUNDS["LMC1992"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/lmc1992.c",
+		MAME_DIR .. "src/devices/sound/lmc1992.cpp",
 		MAME_DIR .. "src/devices/sound/lmc1992.h",
 	}
 end
@@ -516,7 +516,7 @@ end
 
 if (SOUNDS["MAS3507D"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/mas3507d.c",
+		MAME_DIR .. "src/devices/sound/mas3507d.cpp",
 		MAME_DIR .. "src/devices/sound/mas3507d.h",
 	}
 end
@@ -530,7 +530,7 @@ end
 
 if (SOUNDS["MOS656X"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/mos6560.c",
+		MAME_DIR .. "src/devices/sound/mos6560.cpp",
 		MAME_DIR .. "src/devices/sound/mos6560.h",
 	}
 end
@@ -544,7 +544,7 @@ end
 
 if (SOUNDS["MOS7360"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/mos7360.c",
+		MAME_DIR .. "src/devices/sound/mos7360.cpp",
 		MAME_DIR .. "src/devices/sound/mos7360.h",
 	}
 end
@@ -561,28 +561,28 @@ end
 
 if (SOUNDS["NAMCO"]~=null or SOUNDS["NAMCO_15XX"]~=null or SOUNDS["NAMCO_CUS30"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/namco.c",
+		MAME_DIR .. "src/devices/sound/namco.cpp",
 		MAME_DIR .. "src/devices/sound/namco.h",
 	}
 end
 
 if (SOUNDS["NAMCO_63701X"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/n63701x.c",
+		MAME_DIR .. "src/devices/sound/n63701x.cpp",
 		MAME_DIR .. "src/devices/sound/n63701x.h",
 	}
 end
 
 if (SOUNDS["C140"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/c140.c",
+		MAME_DIR .. "src/devices/sound/c140.cpp",
 		MAME_DIR .. "src/devices/sound/c140.h",
 	}
 end
 
 if (SOUNDS["C352"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/c352.c",
+		MAME_DIR .. "src/devices/sound/c352.cpp",
 		MAME_DIR .. "src/devices/sound/c352.h",
 	}
 end
@@ -596,7 +596,7 @@ end
 
 if (SOUNDS["DIGITALKER"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/digitalk.c",
+		MAME_DIR .. "src/devices/sound/digitalk.cpp",
 		MAME_DIR .. "src/devices/sound/digitalk.h",
 	}
 end
@@ -610,7 +610,7 @@ end
 
 if (SOUNDS["NES_APU"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/nes_apu.c",
+		MAME_DIR .. "src/devices/sound/nes_apu.cpp",
 		MAME_DIR .. "src/devices/sound/nes_apu.h",
 		MAME_DIR .. "src/devices/sound/nes_defs.h",
 	}
@@ -625,9 +625,9 @@ end
 
 if (SOUNDS["UPD7759"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/upd7759.c",
+		MAME_DIR .. "src/devices/sound/upd7759.cpp",
 		MAME_DIR .. "src/devices/sound/upd7759.h",
-		MAME_DIR .. "src/devices/sound/315-5641.c",
+		MAME_DIR .. "src/devices/sound/315-5641.cpp",
 		MAME_DIR .. "src/devices/sound/315-5641.h",
 	}
 end
@@ -646,49 +646,49 @@ end
 
 if (SOUNDS["OKIM6258"]~=null or SOUNDS["OKIM6295"]~=null or SOUNDS["OKIM9810"]~=null or SOUNDS["I5000_SND"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/okiadpcm.c",
+		MAME_DIR .. "src/devices/sound/okiadpcm.cpp",
 		MAME_DIR .. "src/devices/sound/okiadpcm.h",
 	}
 end
 
 if (SOUNDS["MSM5205"]~=null or SOUNDS["MSM6585"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/msm5205.c",
+		MAME_DIR .. "src/devices/sound/msm5205.cpp",
 		MAME_DIR .. "src/devices/sound/msm5205.h",
 	}
 end
 
 if (SOUNDS["MSM5232"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/msm5232.c",
+		MAME_DIR .. "src/devices/sound/msm5232.cpp",
 		MAME_DIR .. "src/devices/sound/msm5232.h",
 	}
 end
 
 if (SOUNDS["OKIM6376"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/okim6376.c",
+		MAME_DIR .. "src/devices/sound/okim6376.cpp",
 		MAME_DIR .. "src/devices/sound/okim6376.h",
 	}
 end
 
 if (SOUNDS["OKIM6295"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/okim6295.c",
+		MAME_DIR .. "src/devices/sound/okim6295.cpp",
 		MAME_DIR .. "src/devices/sound/okim6295.h",
 	}
 end
 
 if (SOUNDS["OKIM6258"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/okim6258.c",
+		MAME_DIR .. "src/devices/sound/okim6258.cpp",
 		MAME_DIR .. "src/devices/sound/okim6258.h",
 	}
 end
 
 if (SOUNDS["OKIM9810"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/okim9810.c",
+		MAME_DIR .. "src/devices/sound/okim9810.cpp",
 		MAME_DIR .. "src/devices/sound/okim9810.h",
 	}
 end
@@ -702,7 +702,7 @@ end
 
 if (SOUNDS["SAA1099"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/saa1099.c",
+		MAME_DIR .. "src/devices/sound/saa1099.cpp",
 		MAME_DIR .. "src/devices/sound/saa1099.h",
 	}
 end
@@ -716,7 +716,7 @@ end
 
 if (SOUNDS["QS1000"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/qs1000.c",
+		MAME_DIR .. "src/devices/sound/qs1000.cpp",
 		MAME_DIR .. "src/devices/sound/qs1000.h",
 	}
 end
@@ -730,11 +730,11 @@ end
 
 if (SOUNDS["QSOUND"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/qsound.c", 
+		MAME_DIR .. "src/devices/sound/qsound.cpp", 
 		MAME_DIR .. "src/devices/sound/qsound.h", 
-		MAME_DIR .. "src/devices/cpu/dsp16/dsp16.c",
+		MAME_DIR .. "src/devices/cpu/dsp16/dsp16.cpp",
 		MAME_DIR .. "src/devices/cpu/dsp16/dsp16.h",
-		MAME_DIR .. "src/devices/cpu/dsp16/dsp16dis.c",
+		MAME_DIR .. "src/devices/cpu/dsp16/dsp16dis.cpp",
 	}
 end
 
@@ -748,14 +748,14 @@ end
 
 if (SOUNDS["RF5C68"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/rf5c68.c",
+		MAME_DIR .. "src/devices/sound/rf5c68.cpp",
 		MAME_DIR .. "src/devices/sound/rf5c68.h",
 	}
 end
 
 if (SOUNDS["RF5C400"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/rf5c400.c",
+		MAME_DIR .. "src/devices/sound/rf5c400.cpp",
 		MAME_DIR .. "src/devices/sound/rf5c400.h",
 	}
 end
@@ -772,32 +772,32 @@ end
 
 if (SOUNDS["SEGAPCM"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/segapcm.c",
+		MAME_DIR .. "src/devices/sound/segapcm.cpp",
 		MAME_DIR .. "src/devices/sound/segapcm.h",
 	}
 end
 
 if (SOUNDS["MULTIPCM"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/multipcm.c",
+		MAME_DIR .. "src/devices/sound/multipcm.cpp",
 		MAME_DIR .. "src/devices/sound/multipcm.h",
 	}
 end
 
 if (SOUNDS["SCSP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/scsp.c",
+		MAME_DIR .. "src/devices/sound/scsp.cpp",
 		MAME_DIR .. "src/devices/sound/scsp.h",
-		MAME_DIR .. "src/devices/sound/scspdsp.c",
+		MAME_DIR .. "src/devices/sound/scspdsp.cpp",
 		MAME_DIR .. "src/devices/sound/scspdsp.h",
 	}
 end
 
 if (SOUNDS["AICA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/aica.c",
+		MAME_DIR .. "src/devices/sound/aica.cpp",
 		MAME_DIR .. "src/devices/sound/aica.h",
-		MAME_DIR .. "src/devices/sound/aicadsp.c",
+		MAME_DIR .. "src/devices/sound/aicadsp.cpp",
 		MAME_DIR .. "src/devices/sound/aicadsp.h",
 	}
 end
@@ -811,21 +811,21 @@ end
 
 if (SOUNDS["ST0016"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/st0016.c",
+		MAME_DIR .. "src/devices/sound/st0016.cpp",
 		MAME_DIR .. "src/devices/sound/st0016.h",
 	}
 end
 
 if (SOUNDS["NILE"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/nile.c",
+		MAME_DIR .. "src/devices/sound/nile.cpp",
 		MAME_DIR .. "src/devices/sound/nile.h",
 	}
 end
 
 if (SOUNDS["X1_010"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/x1_010.c",
+		MAME_DIR .. "src/devices/sound/x1_010.cpp",
 		MAME_DIR .. "src/devices/sound/x1_010.h",
 	}
 end
@@ -839,13 +839,13 @@ end
 
 if (SOUNDS["SID6581"]~=null or SOUNDS["SID8580"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/mos6581.c",
+		MAME_DIR .. "src/devices/sound/mos6581.cpp",
 		MAME_DIR .. "src/devices/sound/mos6581.h",
-		MAME_DIR .. "src/devices/sound/sid.c",
+		MAME_DIR .. "src/devices/sound/sid.cpp",
 		MAME_DIR .. "src/devices/sound/sid.h",
-		MAME_DIR .. "src/devices/sound/sidenvel.c",
+		MAME_DIR .. "src/devices/sound/sidenvel.cpp",
 		MAME_DIR .. "src/devices/sound/sidenvel.h",
-		MAME_DIR .. "src/devices/sound/sidvoice.c",
+		MAME_DIR .. "src/devices/sound/sidvoice.cpp",
 		MAME_DIR .. "src/devices/sound/sidvoice.h",
 		MAME_DIR .. "src/devices/sound/side6581.h",
 		MAME_DIR .. "src/devices/sound/sidw6581.h",
@@ -861,7 +861,7 @@ end
 
 if (SOUNDS["T6W28"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/t6w28.c",
+		MAME_DIR .. "src/devices/sound/t6w28.cpp",
 		MAME_DIR .. "src/devices/sound/t6w28.h",
 	}
 end
@@ -875,7 +875,7 @@ end
 
 if (SOUNDS["SNKWAVE"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/snkwave.c",
+		MAME_DIR .. "src/devices/sound/snkwave.cpp",
 		MAME_DIR .. "src/devices/sound/snkwave.h",
 	}
 end
@@ -889,10 +889,10 @@ end
 
 if (SOUNDS["SPU"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/spu.c",
+		MAME_DIR .. "src/devices/sound/spu.cpp",
 		MAME_DIR .. "src/devices/sound/spu.h",
-		MAME_DIR .. "src/devices/sound/spu_tables.c",
-		MAME_DIR .. "src/devices/sound/spureverb.c",
+		MAME_DIR .. "src/devices/sound/spu_tables.cpp",
+		MAME_DIR .. "src/devices/sound/spureverb.cpp",
 		MAME_DIR .. "src/devices/sound/spureverb.h",
 	}
 end
@@ -905,7 +905,7 @@ end
 
 if (SOUNDS["SP0256"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/sp0256.c",
+		MAME_DIR .. "src/devices/sound/sp0256.cpp",
 		MAME_DIR .. "src/devices/sound/sp0256.h",
 	}
 end
@@ -919,7 +919,7 @@ end
 
 if (SOUNDS["SP0250"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/sp0250.c",
+		MAME_DIR .. "src/devices/sound/sp0250.cpp",
 		MAME_DIR .. "src/devices/sound/sp0250.h",
 	}
 end
@@ -932,7 +932,7 @@ end
 
 if (SOUNDS["S14001A"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/s14001a.c",
+		MAME_DIR .. "src/devices/sound/s14001a.cpp",
 		MAME_DIR .. "src/devices/sound/s14001a.h",
 	}
 end
@@ -946,7 +946,7 @@ end
 
 if (SOUNDS["SN76477"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/sn76477.c",
+		MAME_DIR .. "src/devices/sound/sn76477.cpp",
 		MAME_DIR .. "src/devices/sound/sn76477.h",
 	}
 end
@@ -960,7 +960,7 @@ end
 
 if (SOUNDS["SN76496"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/sn76496.c",
+		MAME_DIR .. "src/devices/sound/sn76496.cpp",
 		MAME_DIR .. "src/devices/sound/sn76496.h",
 	}
 end
@@ -974,7 +974,7 @@ end
 
 if (SOUNDS["TMS36XX"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/tms36xx.c",
+		MAME_DIR .. "src/devices/sound/tms36xx.cpp",
 		MAME_DIR .. "src/devices/sound/tms36xx.h",
 	}
 end
@@ -988,7 +988,7 @@ end
 
 if (SOUNDS["TMS3615"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/tms3615.c",
+		MAME_DIR .. "src/devices/sound/tms3615.cpp",
 		MAME_DIR .. "src/devices/sound/tms3615.h",
 	}
 end
@@ -1002,7 +1002,7 @@ end
 
 if (SOUNDS["TMS5110"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/tms5110.c",
+		MAME_DIR .. "src/devices/sound/tms5110.cpp",
 		MAME_DIR .. "src/devices/sound/tms5110.h",
 		MAME_DIR .. "src/devices/sound/tms5110r.inc",
 	}
@@ -1014,10 +1014,10 @@ end
 ---------------------------------------------------
 if (SOUNDS["TMS5220"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/tms5220.c",
+		MAME_DIR .. "src/devices/sound/tms5220.cpp",
 		MAME_DIR .. "src/devices/sound/tms5220.h",
 		MAME_DIR .. "src/devices/sound/tms5110r.inc",
-		MAME_DIR .. "src/devices/machine/spchrom.c",
+		MAME_DIR .. "src/devices/machine/spchrom.cpp",
 		MAME_DIR .. "src/devices/machine/spchrom.h",
 	}
 end
@@ -1030,7 +1030,7 @@ end
 
 if (SOUNDS["T6721A"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/t6721a.c",
+		MAME_DIR .. "src/devices/sound/t6721a.cpp",
 		MAME_DIR .. "src/devices/sound/t6721a.h",
 	}
 end
@@ -1044,7 +1044,7 @@ end
 
 if (SOUNDS["TC8830F"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/tc8830f.c",
+		MAME_DIR .. "src/devices/sound/tc8830f.cpp",
 		MAME_DIR .. "src/devices/sound/tc8830f.h",
 	}
 end
@@ -1057,7 +1057,7 @@ end
 
 if (SOUNDS["UPD7752"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/upd7752.c",
+		MAME_DIR .. "src/devices/sound/upd7752.cpp",
 		MAME_DIR .. "src/devices/sound/upd7752.h",
 	}
 end
@@ -1070,7 +1070,7 @@ end
 
 if (SOUNDS["VLM5030"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/vlm5030.c",
+		MAME_DIR .. "src/devices/sound/vlm5030.cpp",
 		MAME_DIR .. "src/devices/sound/vlm5030.h",
 		MAME_DIR .. "src/devices/sound/tms5110r.inc",
 	}
@@ -1083,7 +1083,7 @@ end
 
 if (SOUNDS["VOTRAX"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/votrax.c",
+		MAME_DIR .. "src/devices/sound/votrax.cpp",
 		MAME_DIR .. "src/devices/sound/votrax.h",
 	}
 end
@@ -1097,7 +1097,7 @@ end
 
 if (SOUNDS["VRENDER0"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/vrender0.c",
+		MAME_DIR .. "src/devices/sound/vrender0.cpp",
 		MAME_DIR .. "src/devices/sound/vrender0.h",
 	}
 end
@@ -1111,7 +1111,7 @@ end
 
 if (SOUNDS["WAVE"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/wave.c",
+		MAME_DIR .. "src/devices/sound/wave.cpp",
 		MAME_DIR .. "src/devices/sound/wave.h",
 	}
 end
@@ -1137,18 +1137,18 @@ end
 
 if (SOUNDS["YM2151"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/2151intf.c",
+		MAME_DIR .. "src/devices/sound/2151intf.cpp",
 		MAME_DIR .. "src/devices/sound/2151intf.h",
-		MAME_DIR .. "src/devices/sound/ym2151.c",
+		MAME_DIR .. "src/devices/sound/ym2151.cpp",
 		MAME_DIR .. "src/devices/sound/ym2151.h",
 	}
 end
 
 if (SOUNDS["YM2413"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/2413intf.c",
+		MAME_DIR .. "src/devices/sound/2413intf.cpp",
 		MAME_DIR .. "src/devices/sound/2413intf.h",
-		MAME_DIR .. "src/devices/sound/ym2413.c",
+		MAME_DIR .. "src/devices/sound/ym2413.cpp",
 		MAME_DIR .. "src/devices/sound/ym2413.h",
 	}
 end
@@ -1156,11 +1156,11 @@ end
 if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then	
 --if (SOUNDS["YM2203"]~=null) then	
 	files {
-		MAME_DIR .. "src/devices/sound/2203intf.c",
+		MAME_DIR .. "src/devices/sound/2203intf.cpp",
 		MAME_DIR .. "src/devices/sound/2203intf.h",
-		MAME_DIR .. "src/devices/sound/ay8910.c",
+		MAME_DIR .. "src/devices/sound/ay8910.cpp",
 		MAME_DIR .. "src/devices/sound/ay8910.h",
-		MAME_DIR .. "src/devices/sound/fm.c",
+		MAME_DIR .. "src/devices/sound/fm.cpp",
 		MAME_DIR .. "src/devices/sound/fm.h",
 	}
 --end
@@ -1168,37 +1168,37 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o
 
 --if (SOUNDS["YM2608"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/2608intf.c", 
+		MAME_DIR .. "src/devices/sound/2608intf.cpp", 
 		MAME_DIR .. "src/devices/sound/2608intf.h", 
-		MAME_DIR .. "src/devices/sound/ay8910.c", 
+		MAME_DIR .. "src/devices/sound/ay8910.cpp", 
 		MAME_DIR .. "src/devices/sound/ay8910.h", 
-		MAME_DIR .. "src/devices/sound/fm.c", 
+		MAME_DIR .. "src/devices/sound/fm.cpp", 
 		MAME_DIR .. "src/devices/sound/fm.h", 
-		MAME_DIR .. "src/devices/sound/ymdeltat.c",
+		MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
 		MAME_DIR .. "src/devices/sound/ymdeltat.h",
 	}
 --end
 
 --if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/2610intf.c", 
+		MAME_DIR .. "src/devices/sound/2610intf.cpp", 
 		MAME_DIR .. "src/devices/sound/2610intf.h", 
-		MAME_DIR .. "src/devices/sound/ay8910.c", 
+		MAME_DIR .. "src/devices/sound/ay8910.cpp", 
 		MAME_DIR .. "src/devices/sound/ay8910.h", 
-		MAME_DIR .. "src/devices/sound/fm.c", 
+		MAME_DIR .. "src/devices/sound/fm.cpp", 
 		MAME_DIR .. "src/devices/sound/fm.h", 
-		MAME_DIR .. "src/devices/sound/ymdeltat.c",
+		MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
 		MAME_DIR .. "src/devices/sound/ymdeltat.h",
 	}
 --end
 
 --if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/2612intf.c", 
+		MAME_DIR .. "src/devices/sound/2612intf.cpp", 
 		MAME_DIR .. "src/devices/sound/2612intf.h", 
-		MAME_DIR .. "src/devices/sound/ay8910.c", 
+		MAME_DIR .. "src/devices/sound/ay8910.cpp", 
 		MAME_DIR .. "src/devices/sound/ay8910.h", 
-		MAME_DIR .. "src/devices/sound/fm2612.c",
+		MAME_DIR .. "src/devices/sound/fm2612.cpp",
 	}
 --end
 end
@@ -1206,33 +1206,33 @@ end
 if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) then
 --if (SOUNDS["YM3812"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/3812intf.c", 
+		MAME_DIR .. "src/devices/sound/3812intf.cpp", 
 		MAME_DIR .. "src/devices/sound/3812intf.h", 
-		MAME_DIR .. "src/devices/sound/fmopl.c", 
+		MAME_DIR .. "src/devices/sound/fmopl.cpp", 
 		MAME_DIR .. "src/devices/sound/fmopl.h", 
-		MAME_DIR .. "src/devices/sound/ymdeltat.c",
+		MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
 		MAME_DIR .. "src/devices/sound/ymdeltat.h",
 	}
 --end
 
 --if (SOUNDS["YM3526"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/3526intf.c", 
+		MAME_DIR .. "src/devices/sound/3526intf.cpp", 
 		MAME_DIR .. "src/devices/sound/3526intf.h", 
-		MAME_DIR .. "src/devices/sound/fmopl.c", 
+		MAME_DIR .. "src/devices/sound/fmopl.cpp", 
 		MAME_DIR .. "src/devices/sound/fmopl.h", 
-		MAME_DIR .. "src/devices/sound/ymdeltat.c",
+		MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
 		MAME_DIR .. "src/devices/sound/ymdeltat.h",
 	}
 --end
 
 --if (SOUNDS["Y8950"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/8950intf.c", 
+		MAME_DIR .. "src/devices/sound/8950intf.cpp", 
 		MAME_DIR .. "src/devices/sound/8950intf.h", 
-		MAME_DIR .. "src/devices/sound/fmopl.c", 
+		MAME_DIR .. "src/devices/sound/fmopl.cpp", 
 		MAME_DIR .. "src/devices/sound/fmopl.h", 
-		MAME_DIR .. "src/devices/sound/ymdeltat.c",
+		MAME_DIR .. "src/devices/sound/ymdeltat.cpp",
 		MAME_DIR .. "src/devices/sound/ymdeltat.h",
 	}
 --end
@@ -1240,23 +1240,23 @@ end
 
 if (SOUNDS["YMF262"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/ymf262.c", 
+		MAME_DIR .. "src/devices/sound/ymf262.cpp", 
 		MAME_DIR .. "src/devices/sound/ymf262.h", 
-		MAME_DIR .. "src/devices/sound/262intf.c",
+		MAME_DIR .. "src/devices/sound/262intf.cpp",
 		MAME_DIR .. "src/devices/sound/262intf.h",
 	}
 end
 
 if (SOUNDS["YMF271"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/ymf271.c",
+		MAME_DIR .. "src/devices/sound/ymf271.cpp",
 		MAME_DIR .. "src/devices/sound/ymf271.h",
 	}
 end
 
 if (SOUNDS["YMF278B"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/ymf278b.c",
+		MAME_DIR .. "src/devices/sound/ymf278b.cpp",
 		MAME_DIR .. "src/devices/sound/ymf278b.h",
 	}
 end
@@ -1270,7 +1270,7 @@ end
 
 if (SOUNDS["YMZ280B"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/ymz280b.c",
+		MAME_DIR .. "src/devices/sound/ymz280b.cpp",
 		MAME_DIR .. "src/devices/sound/ymz280b.h",
 	}
 end
@@ -1282,9 +1282,9 @@ end
 
 if (SOUNDS["YMZ770"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/ymz770.c", 
+		MAME_DIR .. "src/devices/sound/ymz770.cpp", 
 		MAME_DIR .. "src/devices/sound/ymz770.h", 
-		MAME_DIR .. "src/devices/sound/mpeg_audio.c",
+		MAME_DIR .. "src/devices/sound/mpeg_audio.cpp",
 		MAME_DIR .. "src/devices/sound/mpeg_audio.h",
 	}
 end
@@ -1296,7 +1296,7 @@ end
 
 if (SOUNDS["ZSG2"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/zsg2.c",
+		MAME_DIR .. "src/devices/sound/zsg2.cpp",
 		MAME_DIR .. "src/devices/sound/zsg2.h",
 	}
 end
@@ -1308,7 +1308,7 @@ end
 
 if (SOUNDS["VRC6"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/sound/vrc6.c",
+		MAME_DIR .. "src/devices/sound/vrc6.cpp",
 		MAME_DIR .. "src/devices/sound/vrc6.h",
 	}
 end
diff --git a/scripts/src/tests.lua b/scripts/src/tests.lua
index 2b6eb397848..4dab11a4c10 100644
--- a/scripts/src/tests.lua
+++ b/scripts/src/tests.lua
@@ -43,7 +43,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "tests/main.c",
-	MAME_DIR .. "tests/lib/util/corestr.c",
+	MAME_DIR .. "tests/main.cpp",
+	MAME_DIR .. "tests/lib/util/corestr.cpp",
 }
 
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 416084375a1..6fe29e1ca89 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -43,7 +43,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/romcmp.c",
+	MAME_DIR .. "src/tools/romcmp.cpp",
 }
 
 --------------------------------------------------
@@ -100,8 +100,8 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/chdman.c",
-	MAME_DIR .. "src/version.c",
+	MAME_DIR .. "src/tools/chdman.cpp",
+	MAME_DIR .. "src/version.cpp",
 }
 
 --------------------------------------------------
@@ -146,7 +146,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/jedutil.c",
+	MAME_DIR .. "src/tools/jedutil.cpp",
 }
 
 --------------------------------------------------
@@ -205,8 +205,8 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/unidasm.c",
-	MAME_DIR .. "src/emu/emucore.c",
+	MAME_DIR .. "src/tools/unidasm.cpp",
+	MAME_DIR .. "src/emu/emucore.cpp",
 }
 
 
@@ -264,7 +264,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/ldresample.c",
+	MAME_DIR .. "src/tools/ldresample.cpp",
 }
 
 --------------------------------------------------
@@ -321,7 +321,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/ldverify.c",
+	MAME_DIR .. "src/tools/ldverify.cpp",
 }
 
 --------------------------------------------------
@@ -366,7 +366,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/regrep.c",
+	MAME_DIR .. "src/tools/regrep.cpp",
 }
 
 --------------------------------------------------
@@ -411,7 +411,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/srcclean.c",
+	MAME_DIR .. "src/tools/srcclean.cpp",
 }
 
 --------------------------------------------------
@@ -456,7 +456,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/src2html.c",
+	MAME_DIR .. "src/tools/src2html.cpp",
 }
 
 --------------------------------------------------
@@ -512,7 +512,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/split.c",
+	MAME_DIR .. "src/tools/split.cpp",
 }
 
 --------------------------------------------------
@@ -557,7 +557,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/pngcmp.c",
+	MAME_DIR .. "src/tools/pngcmp.cpp",
 }
 
 --------------------------------------------------
@@ -615,7 +615,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/lib/netlist/prg/nltool.c",
+	MAME_DIR .. "src/lib/netlist/prg/nltool.cpp",
 }
 
 --------------------------------------------------
@@ -651,7 +651,7 @@ includedirs {
 }
 
 files {
-  MAME_DIR .. "src/lib/netlist/prg/nlwav.c",
+  MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp",
 }
 
 --------------------------------------------------
@@ -709,7 +709,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/castool.c",
+	MAME_DIR .. "src/tools/castool.cpp",
 }
 
 --------------------------------------------------
@@ -768,7 +768,7 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/floptool.c",
+	MAME_DIR .. "src/tools/floptool.cpp",
 }
 
 --------------------------------------------------
@@ -829,40 +829,40 @@ includedirs {
 }
 
 files {
-	MAME_DIR .. "src/tools/imgtool/main.c",
-	MAME_DIR .. "src/tools/imgtool/stream.c",
-	MAME_DIR .. "src/tools/imgtool/library.c",
-	MAME_DIR .. "src/tools/imgtool/modules.c",
-	MAME_DIR .. "src/tools/imgtool/iflopimg.c",
-	MAME_DIR .. "src/tools/imgtool/filter.c",
-	MAME_DIR .. "src/tools/imgtool/filteoln.c",
-	MAME_DIR .. "src/tools/imgtool/filtbas.c",
-	MAME_DIR .. "src/tools/imgtool/imgtool.c",
-	MAME_DIR .. "src/tools/imgtool/imgterrs.c",
-	MAME_DIR .. "src/tools/imgtool/imghd.c", 
-	MAME_DIR .. "src/tools/imgtool/charconv.c",
-	MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.c",
+	MAME_DIR .. "src/tools/imgtool/main.cpp",
+	MAME_DIR .. "src/tools/imgtool/stream.cpp",
+	MAME_DIR .. "src/tools/imgtool/library.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules.cpp",
+	MAME_DIR .. "src/tools/imgtool/iflopimg.cpp",
+	MAME_DIR .. "src/tools/imgtool/filter.cpp",
+	MAME_DIR .. "src/tools/imgtool/filteoln.cpp",
+	MAME_DIR .. "src/tools/imgtool/filtbas.cpp",
+	MAME_DIR .. "src/tools/imgtool/imgtool.cpp",
+	MAME_DIR .. "src/tools/imgtool/imgterrs.cpp",
+	MAME_DIR .. "src/tools/imgtool/imghd.cpp", 
+	MAME_DIR .. "src/tools/imgtool/charconv.cpp",
+	MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.cpp",
 	MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h",
-	MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.c",
+	MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.cpp",
 	MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h",	
-	MAME_DIR .. "src/tools/imgtool/modules/amiga.c",
-	MAME_DIR .. "src/tools/imgtool/modules/macbin.c",
-	MAME_DIR .. "src/tools/imgtool/modules/rsdos.c",
-	MAME_DIR .. "src/tools/imgtool/modules/os9.c",
-	MAME_DIR .. "src/tools/imgtool/modules/mac.c",
-	MAME_DIR .. "src/tools/imgtool/modules/ti99.c", 
-	MAME_DIR .. "src/tools/imgtool/modules/ti990hd.c",
-	MAME_DIR .. "src/tools/imgtool/modules/concept.c",
-	MAME_DIR .. "src/tools/imgtool/modules/fat.c",
-	MAME_DIR .. "src/tools/imgtool/modules/pc_flop.c",
-	MAME_DIR .. "src/tools/imgtool/modules/pc_hard.c",
-	MAME_DIR .. "src/tools/imgtool/modules/prodos.c",
-	MAME_DIR .. "src/tools/imgtool/modules/vzdos.c",
-	MAME_DIR .. "src/tools/imgtool/modules/thomson.c",
-	MAME_DIR .. "src/tools/imgtool/modules/macutil.c",
-	MAME_DIR .. "src/tools/imgtool/modules/cybiko.c",
-	MAME_DIR .. "src/tools/imgtool/modules/cybikoxt.c",
-	MAME_DIR .. "src/tools/imgtool/modules/psion.c",
-	MAME_DIR .. "src/tools/imgtool/modules/bml3.c",
-	MAME_DIR .. "src/tools/imgtool/modules/hp48.c",
+	MAME_DIR .. "src/tools/imgtool/modules/amiga.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/macbin.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/rsdos.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/os9.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/mac.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/ti99.cpp", 
+	MAME_DIR .. "src/tools/imgtool/modules/ti990hd.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/concept.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/fat.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/pc_flop.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/pc_hard.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/prodos.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/vzdos.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/thomson.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/macutil.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/cybiko.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/cybikoxt.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/psion.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/bml3.cpp",
+	MAME_DIR .. "src/tools/imgtool/modules/hp48.cpp",
 }
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index c506389731a..8f1367b0f68 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -16,7 +16,7 @@
 
 if (VIDEOS["SEGA315_5124"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/315_5124.c",
+		MAME_DIR .. "src/devices/video/315_5124.cpp",
 		MAME_DIR .. "src/devices/video/315_5124.h",
 	}
 end
@@ -28,7 +28,7 @@ end
 
 if (VIDEOS["SEGA315_5313"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/315_5313.c",
+		MAME_DIR .. "src/devices/video/315_5313.cpp",
 		MAME_DIR .. "src/devices/video/315_5313.h",
 	}
 end
@@ -40,7 +40,7 @@ end
 
 if (VIDEOS["BUFSPRITE"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/bufsprite.c",
+		MAME_DIR .. "src/devices/video/bufsprite.cpp",
 		MAME_DIR .. "src/devices/video/bufsprite.h",
 	}
 end
@@ -52,7 +52,7 @@ end
 
 if (VIDEOS["CDP1861"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/cdp1861.c",
+		MAME_DIR .. "src/devices/video/cdp1861.cpp",
 		MAME_DIR .. "src/devices/video/cdp1861.h",
 	}
 end
@@ -64,7 +64,7 @@ end
 
 if (VIDEOS["CDP1862"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/cdp1862.c",
+		MAME_DIR .. "src/devices/video/cdp1862.cpp",
 		MAME_DIR .. "src/devices/video/cdp1862.h",
 	}
 end
@@ -76,7 +76,7 @@ end
 
 if (VIDEOS["CRT9007"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/crt9007.c",
+		MAME_DIR .. "src/devices/video/crt9007.cpp",
 		MAME_DIR .. "src/devices/video/crt9007.h",
 	}
 end
@@ -88,7 +88,7 @@ end
 
 if (VIDEOS["CRT9021"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/crt9021.c",
+		MAME_DIR .. "src/devices/video/crt9021.cpp",
 		MAME_DIR .. "src/devices/video/crt9021.h",
 	}
 end
@@ -100,7 +100,7 @@ end
 
 if (VIDEOS["CRT9212"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/crt9212.c",
+		MAME_DIR .. "src/devices/video/crt9212.cpp",
 		MAME_DIR .. "src/devices/video/crt9212.h",
 	}
 end
@@ -112,7 +112,7 @@ end
 
 if (VIDEOS["DL1416"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/dl1416.c",
+		MAME_DIR .. "src/devices/video/dl1416.cpp",
 		MAME_DIR .. "src/devices/video/dl1416.h",
 	}
 end
@@ -124,7 +124,7 @@ end
 
 if (VIDEOS["DM9368"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/dm9368.c",
+		MAME_DIR .. "src/devices/video/dm9368.cpp",
 		MAME_DIR .. "src/devices/video/dm9368.h",
 	}
 end
@@ -136,7 +136,7 @@ end
 
 if (VIDEOS["EF9340_1"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/ef9340_1.c",
+		MAME_DIR .. "src/devices/video/ef9340_1.cpp",
 		MAME_DIR .. "src/devices/video/ef9340_1.h",
 		MAME_DIR .. "src/devices/video/ef9341_chargen.h",
 	}
@@ -149,7 +149,7 @@ end
 
 if (VIDEOS["EF9345"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/ef9345.c",
+		MAME_DIR .. "src/devices/video/ef9345.cpp",
 		MAME_DIR .. "src/devices/video/ef9345.h",
 	}
 end
@@ -160,17 +160,17 @@ end
 
 if (VIDEOS["EPIC12"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/epic12.c",
+		MAME_DIR .. "src/devices/video/epic12.cpp",
 		MAME_DIR .. "src/devices/video/epic12.h",
-		MAME_DIR .. "src/devices/video/epic12_blit0.c",
-		MAME_DIR .. "src/devices/video/epic12_blit1.c",
-		MAME_DIR .. "src/devices/video/epic12_blit2.c",
-		MAME_DIR .. "src/devices/video/epic12_blit3.c",
-		MAME_DIR .. "src/devices/video/epic12_blit4.c",
-		MAME_DIR .. "src/devices/video/epic12_blit5.c",
-		MAME_DIR .. "src/devices/video/epic12_blit6.c",
-		MAME_DIR .. "src/devices/video/epic12_blit7.c",
-		MAME_DIR .. "src/devices/video/epic12_blit8.c",
+		MAME_DIR .. "src/devices/video/epic12_blit0.cpp",
+		MAME_DIR .. "src/devices/video/epic12_blit1.cpp",
+		MAME_DIR .. "src/devices/video/epic12_blit2.cpp",
+		MAME_DIR .. "src/devices/video/epic12_blit3.cpp",
+		MAME_DIR .. "src/devices/video/epic12_blit4.cpp",
+		MAME_DIR .. "src/devices/video/epic12_blit5.cpp",
+		MAME_DIR .. "src/devices/video/epic12_blit6.cpp",
+		MAME_DIR .. "src/devices/video/epic12_blit7.cpp",
+		MAME_DIR .. "src/devices/video/epic12_blit8.cpp",
 		MAME_DIR .. "src/devices/video/epic12in.inc",
 		MAME_DIR .. "src/devices/video/epic12pixel.inc",
 	}
@@ -183,7 +183,7 @@ end
 
 if (VIDEOS["FIXFREQ"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/fixfreq.c",
+		MAME_DIR .. "src/devices/video/fixfreq.cpp",
 		MAME_DIR .. "src/devices/video/fixfreq.h",
 	}
 end
@@ -195,7 +195,7 @@ end
 
 if (VIDEOS["GF4500"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/gf4500.c",
+		MAME_DIR .. "src/devices/video/gf4500.cpp",
 		MAME_DIR .. "src/devices/video/gf4500.h",
 	}
 end
@@ -207,7 +207,7 @@ end
 
 if (VIDEOS["GF7600GS"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/gf7600gs.c",
+		MAME_DIR .. "src/devices/video/gf7600gs.cpp",
 		MAME_DIR .. "src/devices/video/gf7600gs.h",
 	}
 end
@@ -219,7 +219,7 @@ end
 
 if (VIDEOS["H63484"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/h63484.c",
+		MAME_DIR .. "src/devices/video/h63484.cpp",
 		MAME_DIR .. "src/devices/video/h63484.h",
 	}
 end
@@ -231,7 +231,7 @@ end
 
 if (VIDEOS["HD44102"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/hd44102.c",
+		MAME_DIR .. "src/devices/video/hd44102.cpp",
 		MAME_DIR .. "src/devices/video/hd44102.h",
 	}
 end
@@ -243,7 +243,7 @@ end
 
 if (VIDEOS["HD44352"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/hd44352.c",
+		MAME_DIR .. "src/devices/video/hd44352.cpp",
 		MAME_DIR .. "src/devices/video/hd44352.h",
 	}
 end
@@ -255,7 +255,7 @@ end
 
 if (VIDEOS["HD44780"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/hd44780.c",
+		MAME_DIR .. "src/devices/video/hd44780.cpp",
 		MAME_DIR .. "src/devices/video/hd44780.h",
 	}
 end
@@ -267,7 +267,7 @@ end
 
 if (VIDEOS["HD61830"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/hd61830.c",
+		MAME_DIR .. "src/devices/video/hd61830.cpp",
 		MAME_DIR .. "src/devices/video/hd61830.h",
 	}
 end
@@ -279,7 +279,7 @@ end
 
 if (VIDEOS["HD63484"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/hd63484.c",
+		MAME_DIR .. "src/devices/video/hd63484.cpp",
 		MAME_DIR .. "src/devices/video/hd63484.h",
 	}
 end
@@ -291,7 +291,7 @@ end
 
 if (VIDEOS["HD66421"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/hd66421.c",
+		MAME_DIR .. "src/devices/video/hd66421.cpp",
 		MAME_DIR .. "src/devices/video/hd66421.h",
 	}
 end
@@ -303,7 +303,7 @@ end
 
 if (VIDEOS["HUC6202"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/huc6202.c",
+		MAME_DIR .. "src/devices/video/huc6202.cpp",
 		MAME_DIR .. "src/devices/video/huc6202.h",
 	}
 end
@@ -315,7 +315,7 @@ end
 
 if (VIDEOS["HUC6260"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/huc6260.c",
+		MAME_DIR .. "src/devices/video/huc6260.cpp",
 		MAME_DIR .. "src/devices/video/huc6260.h",
 	}
 end
@@ -327,7 +327,7 @@ end
 
 if (VIDEOS["HUC6261"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/huc6261.c",
+		MAME_DIR .. "src/devices/video/huc6261.cpp",
 		MAME_DIR .. "src/devices/video/huc6261.h",
 	}
 end
@@ -339,7 +339,7 @@ end
 
 if (VIDEOS["HUC6270"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/huc6270.c",
+		MAME_DIR .. "src/devices/video/huc6270.cpp",
 		MAME_DIR .. "src/devices/video/huc6270.h",
 	}
 end
@@ -351,7 +351,7 @@ end
 
 if (VIDEOS["HUC6272"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/huc6272.c",
+		MAME_DIR .. "src/devices/video/huc6272.cpp",
 		MAME_DIR .. "src/devices/video/huc6272.h",
 	}
 end
@@ -363,7 +363,7 @@ end
 
 if (VIDEOS["I8244"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/i8244.c",
+		MAME_DIR .. "src/devices/video/i8244.cpp",
 		MAME_DIR .. "src/devices/video/i8244.h",
 	}
 end
@@ -375,7 +375,7 @@ end
 
 if (VIDEOS["I82730"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/i82730.c",
+		MAME_DIR .. "src/devices/video/i82730.cpp",
 		MAME_DIR .. "src/devices/video/i82730.h",
 	}
 end
@@ -387,7 +387,7 @@ end
 
 if (VIDEOS["I8275"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/i8275.c",
+		MAME_DIR .. "src/devices/video/i8275.cpp",
 		MAME_DIR .. "src/devices/video/i8275.h",
 	}
 end
@@ -399,7 +399,7 @@ end
 
 if (VIDEOS["M50458"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/m50458.c",
+		MAME_DIR .. "src/devices/video/m50458.cpp",
 		MAME_DIR .. "src/devices/video/m50458.h",
 	}
 end
@@ -411,7 +411,7 @@ end
 
 if (VIDEOS["MB90082"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/mb90082.c",
+		MAME_DIR .. "src/devices/video/mb90082.cpp",
 		MAME_DIR .. "src/devices/video/mb90082.h",
 	}
 end
@@ -423,7 +423,7 @@ end
 
 if (VIDEOS["MB_VCU"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/mb_vcu.c",
+		MAME_DIR .. "src/devices/video/mb_vcu.cpp",
 		MAME_DIR .. "src/devices/video/mb_vcu.h",
 	}
 end
@@ -435,7 +435,7 @@ end
 
 if (VIDEOS["MC6845"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/mc6845.c",
+		MAME_DIR .. "src/devices/video/mc6845.cpp",
 		MAME_DIR .. "src/devices/video/mc6845.h",
 	}
 end
@@ -447,7 +447,7 @@ end
 
 if (VIDEOS["MC6847"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/mc6847.c",
+		MAME_DIR .. "src/devices/video/mc6847.cpp",
 		MAME_DIR .. "src/devices/video/mc6847.h",
 	}
 end
@@ -459,7 +459,7 @@ end
 
 if (VIDEOS["MSM6222B"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/msm6222b.c",
+		MAME_DIR .. "src/devices/video/msm6222b.cpp",
 		MAME_DIR .. "src/devices/video/msm6222b.h",
 	}
 end
@@ -471,7 +471,7 @@ end
 
 if (VIDEOS["MSM6255"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/msm6255.c",
+		MAME_DIR .. "src/devices/video/msm6255.cpp",
 		MAME_DIR .. "src/devices/video/msm6255.h",
 	}
 end
@@ -483,14 +483,14 @@ end
 
 if (VIDEOS["MOS6566"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/mos6566.c",
+		MAME_DIR .. "src/devices/video/mos6566.cpp",
 		MAME_DIR .. "src/devices/video/mos6566.h",
 	}
 end
 
 
 files {	
-	MAME_DIR .. "src/devices/video/cgapal.c",
+	MAME_DIR .. "src/devices/video/cgapal.cpp",
 	MAME_DIR .. "src/devices/video/cgapal.h",	
 }
 
@@ -501,11 +501,11 @@ files {
 
 if (VIDEOS["PC_VGA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/pc_vga.c",
+		MAME_DIR .. "src/devices/video/pc_vga.cpp",
 		MAME_DIR .. "src/devices/video/pc_vga.h",
-		MAME_DIR .. "src/devices/bus/isa/trident.c",
+		MAME_DIR .. "src/devices/bus/isa/trident.cpp",
 		MAME_DIR .. "src/devices/bus/isa/trident.h",
-		MAME_DIR .. "src/devices/video/clgd542x.c",
+		MAME_DIR .. "src/devices/video/clgd542x.cpp",
 		MAME_DIR .. "src/devices/video/blgd542x.h",
 	}
 end
@@ -517,7 +517,7 @@ end
 
 if (VIDEOS["POLY"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/polylgcy.c",
+		MAME_DIR .. "src/devices/video/polylgcy.cpp",
 		MAME_DIR .. "src/devices/video/polylgcy.h",
 	}
 end
@@ -529,7 +529,7 @@ end
 
 if (VIDEOS["PSX"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/psx.c",
+		MAME_DIR .. "src/devices/video/psx.cpp",
 		MAME_DIR .. "src/devices/video/psx.h",
 	}
 end
@@ -541,7 +541,7 @@ end
 
 if (VIDEOS["RAMDAC"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/ramdac.c",
+		MAME_DIR .. "src/devices/video/ramdac.cpp",
 		MAME_DIR .. "src/devices/video/ramdac.h",
 	}
 end
@@ -553,7 +553,7 @@ end
 
 if (VIDEOS["SAA5050"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/saa5050.c",
+		MAME_DIR .. "src/devices/video/saa5050.cpp",
 		MAME_DIR .. "src/devices/video/saa5050.h",
 	}
 end
@@ -564,7 +564,7 @@ end
 --------------------------------------------------
 if (VIDEOS["SED1200"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/sed1200.c",
+		MAME_DIR .. "src/devices/video/sed1200.cpp",
 		MAME_DIR .. "src/devices/video/sed1200.h",
 	}
 end
@@ -575,7 +575,7 @@ end
 --------------------------------------------------
 if (VIDEOS["SED1330"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/sed1330.c",
+		MAME_DIR .. "src/devices/video/sed1330.cpp",
 		MAME_DIR .. "src/devices/video/sed1330.h",
 	}
 end
@@ -586,7 +586,7 @@ end
 --------------------------------------------------
 if (VIDEOS["SED1520"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/sed1520.c",
+		MAME_DIR .. "src/devices/video/sed1520.cpp",
 		MAME_DIR .. "src/devices/video/sed1520.h",
 	}
 end
@@ -597,7 +597,7 @@ end
 --------------------------------------------------
 if (VIDEOS["SCN2674"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/scn2674.c",
+		MAME_DIR .. "src/devices/video/scn2674.cpp",
 		MAME_DIR .. "src/devices/video/scn2674.h",
 	}
 end
@@ -608,7 +608,7 @@ end
 --------------------------------------------------
 if (VIDEOS["SNES_PPU"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/snes_ppu.c",
+		MAME_DIR .. "src/devices/video/snes_ppu.cpp",
 		MAME_DIR .. "src/devices/video/snes_ppu.h",
 	}
 end
@@ -621,8 +621,8 @@ end
 
 if (VIDEOS["STVVDP"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/stvvdp1.c",
-		MAME_DIR .. "src/devices/video/stvvdp2.c",
+		MAME_DIR .. "src/devices/video/stvvdp1.cpp",
+		MAME_DIR .. "src/devices/video/stvvdp2.cpp",
 	}
 end
 
@@ -633,7 +633,7 @@ end
 
 if (VIDEOS["T6A04"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/t6a04.c",
+		MAME_DIR .. "src/devices/video/t6a04.cpp",
 		MAME_DIR .. "src/devices/video/t6a04.h",
 	}
 end
@@ -645,7 +645,7 @@ end
 
 if (VIDEOS["TEA1002"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/tea1002.c",
+		MAME_DIR .. "src/devices/video/tea1002.cpp",
 		MAME_DIR .. "src/devices/video/tea1002.h",
 	}
 end
@@ -657,7 +657,7 @@ end
 
 if (VIDEOS["TLC34076"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/tlc34076.c",
+		MAME_DIR .. "src/devices/video/tlc34076.cpp",
 		MAME_DIR .. "src/devices/video/tlc34076.h",
 	}
 end
@@ -669,7 +669,7 @@ end
 
 if (VIDEOS["TMS34061"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/tms34061.c",
+		MAME_DIR .. "src/devices/video/tms34061.cpp",
 		MAME_DIR .. "src/devices/video/tms34061.h",
 	}
 end
@@ -681,7 +681,7 @@ end
 
 if (VIDEOS["TMS3556"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/tms3556.c",
+		MAME_DIR .. "src/devices/video/tms3556.cpp",
 		MAME_DIR .. "src/devices/video/tms3556.h",
 	}
 end
@@ -693,7 +693,7 @@ end
 
 if (VIDEOS["TMS9927"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/tms9927.c",
+		MAME_DIR .. "src/devices/video/tms9927.cpp",
 		MAME_DIR .. "src/devices/video/tms9927.h",
 	}
 end
@@ -705,7 +705,7 @@ end
 
 if (VIDEOS["TMS9928A"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/tms9928a.c",
+		MAME_DIR .. "src/devices/video/tms9928a.cpp",
 		MAME_DIR .. "src/devices/video/tms9928a.h",
 	}
 end
@@ -717,7 +717,7 @@ end
 
 if (VIDEOS["UPD3301"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/upd3301.c",
+		MAME_DIR .. "src/devices/video/upd3301.cpp",
 		MAME_DIR .. "src/devices/video/upd3301.h",
 	}
 end
@@ -729,7 +729,7 @@ end
 
 if (VIDEOS["UPD7220"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/upd7220.c",
+		MAME_DIR .. "src/devices/video/upd7220.cpp",
 		MAME_DIR .. "src/devices/video/upd7220.h",
 	}
 end
@@ -741,7 +741,7 @@ end
 
 if (VIDEOS["UPD7227"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/upd7227.c",
+		MAME_DIR .. "src/devices/video/upd7227.cpp",
 		MAME_DIR .. "src/devices/video/upd7227.h",
 	}
 end
@@ -753,7 +753,7 @@ end
 
 if (VIDEOS["VIC4567"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/vic4567.c",
+		MAME_DIR .. "src/devices/video/vic4567.cpp",
 		MAME_DIR .. "src/devices/video/vic4567.h",
 	}
 end
@@ -765,7 +765,7 @@ end
 
 if (VIDEOS["V9938"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/v9938.c",
+		MAME_DIR .. "src/devices/video/v9938.cpp",
 		MAME_DIR .. "src/devices/video/v9938.h",
 	}
 end
@@ -777,7 +777,7 @@ end
 
 if (VIDEOS["VOODOO"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/voodoo.c",
+		MAME_DIR .. "src/devices/video/voodoo.cpp",
 		MAME_DIR .. "src/devices/video/voodoo.h",
 		MAME_DIR .. "src/devices/video/vooddefs.h",
 	}
@@ -790,7 +790,7 @@ end
 
 if (VIDEOS["VOODOO_PCI"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/voodoo_pci.c",
+		MAME_DIR .. "src/devices/video/voodoo_pci.cpp",
 		MAME_DIR .. "src/devices/video/voodoo_pci.h",
 	}
 end
@@ -802,7 +802,7 @@ end
 
 if (VIDEOS["CRTC_EGA"]~=null) then
 	files {
-		MAME_DIR .. "src/devices/video/crtc_ega.c",
+		MAME_DIR .. "src/devices/video/crtc_ega.cpp",
 		MAME_DIR .. "src/devices/video/crtc_ega.h",
 	}
 end
diff --git a/scripts/target/ldplayer/ldplayer.lua b/scripts/target/ldplayer/ldplayer.lua
index d868c0778bf..c4649576c3b 100644
--- a/scripts/target/ldplayer/ldplayer.lua
+++ b/scripts/target/ldplayer/ldplayer.lua
@@ -73,11 +73,11 @@ function createProjects_ldplayer_ldplayer(_target, _subtarget)
 	}
 
 	files{
-		MAME_DIR .. "src/emu/drivers/emudummy.c",
+		MAME_DIR .. "src/emu/drivers/emudummy.cpp",
 	}
 
 	dependency {
-		{ MAME_DIR .. "src/emu/drivers/emudummy.c", GEN_DIR .. "ldplayer/layout/pr8210.lh" },
+		{ MAME_DIR .. "src/emu/drivers/emudummy.cpp", GEN_DIR .. "ldplayer/layout/pr8210.lh" },
 	}
 
 	custombuildtask {
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index b1c1652310a..f1efb799c8e 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -790,15 +790,15 @@ function createProjects_mame_arcade(_target, _subtarget)
 
 createMAMEProjects(_target, _subtarget, "shared")
 files {
-	MAME_DIR .. "src/mame/machine/nmk112.c",
-	MAME_DIR .. "src/mame/machine/pcshare.c",
-	MAME_DIR .. "src/mame/machine/segacrpt.c",
-	MAME_DIR .. "src/mame/machine/segacrp2.c",
-	MAME_DIR .. "src/mame/machine/ticket.c",
-	MAME_DIR .. "src/mame/video/avgdvg.c",
-	MAME_DIR .. "src/mame/audio/dcs.c",
-	MAME_DIR .. "src/mame/audio/decobsmt.c",
-	MAME_DIR .. "src/mame/audio/segam1audio.c",
+	MAME_DIR .. "src/mame/machine/nmk112.cpp",
+	MAME_DIR .. "src/mame/machine/pcshare.cpp",
+	MAME_DIR .. "src/mame/machine/segacrpt.cpp",
+	MAME_DIR .. "src/mame/machine/segacrp2.cpp",
+	MAME_DIR .. "src/mame/machine/ticket.cpp",
+	MAME_DIR .. "src/mame/video/avgdvg.cpp",
+	MAME_DIR .. "src/mame/audio/dcs.cpp",
+	MAME_DIR .. "src/mame/audio/decobsmt.cpp",
+	MAME_DIR .. "src/mame/audio/segam1audio.cpp",
 }
 
 --------------------------------------------------
@@ -807,2366 +807,2366 @@ files {
 
 createMAMEProjects(_target, _subtarget, "acorn")
 files {
-	MAME_DIR .. "src/mame/drivers/ertictac.c",
-	MAME_DIR .. "src/mame/drivers/ssfindo.c",
-	MAME_DIR .. "src/mame/drivers/aristmk5.c",
-	MAME_DIR .. "src/mame/machine/archimds.c",
-	MAME_DIR .. "src/mame/video/archimds.c",
+	MAME_DIR .. "src/mame/drivers/ertictac.cpp",
+	MAME_DIR .. "src/mame/drivers/ssfindo.cpp",
+	MAME_DIR .. "src/mame/drivers/aristmk5.cpp",
+	MAME_DIR .. "src/mame/machine/archimds.cpp",
+	MAME_DIR .. "src/mame/video/archimds.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "alba")
 files {
-	MAME_DIR .. "src/mame/drivers/albazc.c",
-	MAME_DIR .. "src/mame/drivers/albazg.c",
-	MAME_DIR .. "src/mame/drivers/rmhaihai.c",
+	MAME_DIR .. "src/mame/drivers/albazc.cpp",
+	MAME_DIR .. "src/mame/drivers/albazg.cpp",
+	MAME_DIR .. "src/mame/drivers/rmhaihai.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "alliedl")
 files {
-	MAME_DIR .. "src/mame/drivers/ace.c",
-	MAME_DIR .. "src/mame/drivers/aleisttl.c",
-	MAME_DIR .. "src/mame/drivers/clayshoo.c",
+	MAME_DIR .. "src/mame/drivers/ace.cpp",
+	MAME_DIR .. "src/mame/drivers/aleisttl.cpp",
+	MAME_DIR .. "src/mame/drivers/clayshoo.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "alpha")
 files {
-	MAME_DIR .. "src/mame/drivers/alpha68k.c",
-	MAME_DIR .. "src/mame/video/alpha68k.c",
-	MAME_DIR .. "src/mame/drivers/champbas.c",
-	MAME_DIR .. "src/mame/video/champbas.c",
-	MAME_DIR .. "src/mame/drivers/equites.c",
-	MAME_DIR .. "src/mame/video/equites.c",
-	MAME_DIR .. "src/mame/drivers/meijinsn.c",
-	MAME_DIR .. "src/mame/drivers/shougi.c",
-	MAME_DIR .. "src/mame/machine/alpha8201.c",
+	MAME_DIR .. "src/mame/drivers/alpha68k.cpp",
+	MAME_DIR .. "src/mame/video/alpha68k.cpp",
+	MAME_DIR .. "src/mame/drivers/champbas.cpp",
+	MAME_DIR .. "src/mame/video/champbas.cpp",
+	MAME_DIR .. "src/mame/drivers/equites.cpp",
+	MAME_DIR .. "src/mame/video/equites.cpp",
+	MAME_DIR .. "src/mame/drivers/meijinsn.cpp",
+	MAME_DIR .. "src/mame/drivers/shougi.cpp",
+	MAME_DIR .. "src/mame/machine/alpha8201.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "amiga")
 files {
-	MAME_DIR .. "src/mame/drivers/alg.c",
-	MAME_DIR .. "src/mame/machine/amiga.c",
-	MAME_DIR .. "src/mame/video/amiga.c",
-	MAME_DIR .. "src/mame/video/amigaaga.c",
-	MAME_DIR .. "src/mame/drivers/arsystems.c",
-	MAME_DIR .. "src/mame/drivers/cubo.c",
-	MAME_DIR .. "src/mame/drivers/mquake.c",
-	MAME_DIR .. "src/mame/drivers/upscope.c",
+	MAME_DIR .. "src/mame/drivers/alg.cpp",
+	MAME_DIR .. "src/mame/machine/amiga.cpp",
+	MAME_DIR .. "src/mame/video/amiga.cpp",
+	MAME_DIR .. "src/mame/video/amigaaga.cpp",
+	MAME_DIR .. "src/mame/drivers/arsystems.cpp",
+	MAME_DIR .. "src/mame/drivers/cubo.cpp",
+	MAME_DIR .. "src/mame/drivers/mquake.cpp",
+	MAME_DIR .. "src/mame/drivers/upscope.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "aristocr")
 files {
-	MAME_DIR .. "src/mame/drivers/aristmk4.c",
-	MAME_DIR .. "src/mame/drivers/aristmk6.c",
-	MAME_DIR .. "src/mame/drivers/caswin.c",
+	MAME_DIR .. "src/mame/drivers/aristmk4.cpp",
+	MAME_DIR .. "src/mame/drivers/aristmk6.cpp",
+	MAME_DIR .. "src/mame/drivers/caswin.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "ascii")
 files {
-	MAME_DIR .. "src/mame/drivers/big10.c",
-	MAME_DIR .. "src/mame/drivers/forte2.c",
-	MAME_DIR .. "src/mame/drivers/pengadvb.c",
-	MAME_DIR .. "src/mame/drivers/sangho.c",
-	MAME_DIR .. "src/mame/drivers/sfkick.c",
+	MAME_DIR .. "src/mame/drivers/big10.cpp",
+	MAME_DIR .. "src/mame/drivers/forte2.cpp",
+	MAME_DIR .. "src/mame/drivers/pengadvb.cpp",
+	MAME_DIR .. "src/mame/drivers/sangho.cpp",
+	MAME_DIR .. "src/mame/drivers/sfkick.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "atari")
 files {
-	MAME_DIR .. "src/mame/drivers/arcadecl.c",
-	MAME_DIR .. "src/mame/video/arcadecl.c",
-	MAME_DIR .. "src/mame/drivers/asteroid.c",
-	MAME_DIR .. "src/mame/machine/asteroid.c",
-	MAME_DIR .. "src/mame/audio/asteroid.c",
-	MAME_DIR .. "src/mame/audio/llander.c",
-	MAME_DIR .. "src/mame/drivers/atarifb.c",
-	MAME_DIR .. "src/mame/machine/atarifb.c",
-	MAME_DIR .. "src/mame/audio/atarifb.c",
-	MAME_DIR .. "src/mame/video/atarifb.c",
-	MAME_DIR .. "src/mame/drivers/atarig1.c",
-	MAME_DIR .. "src/mame/video/atarig1.c",
-	MAME_DIR .. "src/mame/drivers/atarig42.c",
-	MAME_DIR .. "src/mame/video/atarig42.c",
-	MAME_DIR .. "src/mame/drivers/atarigt.c",
-	MAME_DIR .. "src/mame/video/atarigt.c",
-	MAME_DIR .. "src/mame/drivers/atarigx2.c",
-	MAME_DIR .. "src/mame/video/atarigx2.c",
-	MAME_DIR .. "src/mame/drivers/atarisy1.c",
-	MAME_DIR .. "src/mame/video/atarisy1.c",
-	MAME_DIR .. "src/mame/drivers/atarisy2.c",
-	MAME_DIR .. "src/mame/video/atarisy2.c",
-	MAME_DIR .. "src/mame/drivers/atarisy4.c",
-	MAME_DIR .. "src/mame/drivers/atarittl.c",
-	MAME_DIR .. "src/mame/drivers/atetris.c",
-	MAME_DIR .. "src/mame/video/atetris.c",
-	MAME_DIR .. "src/mame/drivers/avalnche.c",
-	MAME_DIR .. "src/mame/audio/avalnche.c",
-	MAME_DIR .. "src/mame/drivers/badlands.c",
-	MAME_DIR .. "src/mame/video/badlands.c",
-	MAME_DIR .. "src/mame/drivers/bartop52.c",
-	MAME_DIR .. "src/mame/drivers/batman.c",
-	MAME_DIR .. "src/mame/video/batman.c",
-	MAME_DIR .. "src/mame/drivers/beathead.c",
-	MAME_DIR .. "src/mame/video/beathead.c",
-	MAME_DIR .. "src/mame/drivers/blstroid.c",
-	MAME_DIR .. "src/mame/video/blstroid.c",
-	MAME_DIR .. "src/mame/drivers/boxer.c",
-	MAME_DIR .. "src/mame/drivers/bsktball.c",
-	MAME_DIR .. "src/mame/machine/bsktball.c",
-	MAME_DIR .. "src/mame/audio/bsktball.c",
-	MAME_DIR .. "src/mame/video/bsktball.c",
-	MAME_DIR .. "src/mame/drivers/bwidow.c",
-	MAME_DIR .. "src/mame/audio/bwidow.c",
-	MAME_DIR .. "src/mame/drivers/bzone.c",
-	MAME_DIR .. "src/mame/audio/bzone.c",
-	MAME_DIR .. "src/mame/drivers/canyon.c",
-	MAME_DIR .. "src/mame/audio/canyon.c",
-	MAME_DIR .. "src/mame/video/canyon.c",
-	MAME_DIR .. "src/mame/drivers/cball.c",
-	MAME_DIR .. "src/mame/drivers/ccastles.c",
-	MAME_DIR .. "src/mame/video/ccastles.c",
-	MAME_DIR .. "src/mame/drivers/centiped.c",
-	MAME_DIR .. "src/mame/video/centiped.c",
-	MAME_DIR .. "src/mame/drivers/cloak.c",
-	MAME_DIR .. "src/mame/video/cloak.c",
-	MAME_DIR .. "src/mame/drivers/cloud9.c",
-	MAME_DIR .. "src/mame/video/cloud9.c",
-	MAME_DIR .. "src/mame/drivers/cmmb.c",
-	MAME_DIR .. "src/mame/drivers/cops.c",
-	MAME_DIR .. "src/mame/drivers/copsnrob.c",
-	MAME_DIR .. "src/mame/audio/copsnrob.c",
-	MAME_DIR .. "src/mame/video/copsnrob.c",
-	MAME_DIR .. "src/mame/drivers/cyberbal.c",
-	MAME_DIR .. "src/mame/audio/cyberbal.c",
-	MAME_DIR .. "src/mame/video/cyberbal.c",
-	MAME_DIR .. "src/mame/drivers/destroyr.c",
-	MAME_DIR .. "src/mame/drivers/dragrace.c",
-	MAME_DIR .. "src/mame/audio/dragrace.c",
-	MAME_DIR .. "src/mame/video/dragrace.c",
-	MAME_DIR .. "src/mame/drivers/eprom.c",
-	MAME_DIR .. "src/mame/video/eprom.c",
-	MAME_DIR .. "src/mame/drivers/firefox.c",
-	MAME_DIR .. "src/mame/drivers/firetrk.c",
-	MAME_DIR .. "src/mame/audio/firetrk.c",
-	MAME_DIR .. "src/mame/video/firetrk.c",
-	MAME_DIR .. "src/mame/drivers/flyball.c",
-	MAME_DIR .. "src/mame/drivers/foodf.c",
-	MAME_DIR .. "src/mame/video/foodf.c",
-	MAME_DIR .. "src/mame/drivers/gauntlet.c",
-	MAME_DIR .. "src/mame/video/gauntlet.c",
-	MAME_DIR .. "src/mame/drivers/harddriv.c",
-	MAME_DIR .. "src/mame/machine/harddriv.c",
-	MAME_DIR .. "src/mame/audio/harddriv.c",
-	MAME_DIR .. "src/mame/video/harddriv.c",
-	MAME_DIR .. "src/mame/drivers/irobot.c",
-	MAME_DIR .. "src/mame/machine/irobot.c",
-	MAME_DIR .. "src/mame/video/irobot.c",
-	MAME_DIR .. "src/mame/drivers/jaguar.c",
-	MAME_DIR .. "src/mame/audio/jaguar.c",
-	MAME_DIR .. "src/mame/video/jaguar.c",
-	MAME_DIR .. "src/mame/drivers/jedi.c",
-	MAME_DIR .. "src/mame/audio/jedi.c",
-	MAME_DIR .. "src/mame/video/jedi.c",
-	MAME_DIR .. "src/mame/drivers/klax.c",
-	MAME_DIR .. "src/mame/video/klax.c",
-	MAME_DIR .. "src/mame/drivers/liberatr.c",
-	MAME_DIR .. "src/mame/video/liberatr.c",
-	MAME_DIR .. "src/mame/drivers/mediagx.c",
-	MAME_DIR .. "src/mame/drivers/metalmx.c",
-	MAME_DIR .. "src/mame/drivers/mgolf.c",
-	MAME_DIR .. "src/mame/drivers/mhavoc.c",
-	MAME_DIR .. "src/mame/machine/mhavoc.c",
-	MAME_DIR .. "src/mame/drivers/missile.c",
-	MAME_DIR .. "src/mame/drivers/nitedrvr.c",
-	MAME_DIR .. "src/mame/machine/nitedrvr.c",
-	MAME_DIR .. "src/mame/audio/nitedrvr.c",
-	MAME_DIR .. "src/mame/video/nitedrvr.c",
-	MAME_DIR .. "src/mame/drivers/offtwall.c",
-	MAME_DIR .. "src/mame/video/offtwall.c",
-	MAME_DIR .. "src/mame/drivers/orbit.c",
-	MAME_DIR .. "src/mame/audio/orbit.c",
-	MAME_DIR .. "src/mame/video/orbit.c",
-	MAME_DIR .. "src/mame/drivers/pong.c",
-	MAME_DIR .. "src/mame/drivers/nl_pong.c",
-	MAME_DIR .. "src/mame/drivers/nl_pongd.c",
-	MAME_DIR .. "src/mame/drivers/nl_breakout.c",
-	MAME_DIR .. "src/mame/drivers/poolshrk.c",
-	MAME_DIR .. "src/mame/audio/poolshrk.c",
-	MAME_DIR .. "src/mame/video/poolshrk.c",
-	MAME_DIR .. "src/mame/drivers/quantum.c",
-	MAME_DIR .. "src/mame/drivers/quizshow.c",
-	MAME_DIR .. "src/mame/drivers/rampart.c",
-	MAME_DIR .. "src/mame/video/rampart.c",
-	MAME_DIR .. "src/mame/drivers/relief.c",
-	MAME_DIR .. "src/mame/video/relief.c",
-	MAME_DIR .. "src/mame/drivers/runaway.c",
-	MAME_DIR .. "src/mame/video/runaway.c",
-	MAME_DIR .. "src/mame/drivers/sbrkout.c",
-	MAME_DIR .. "src/mame/drivers/shuuz.c",
-	MAME_DIR .. "src/mame/video/shuuz.c",
-	MAME_DIR .. "src/mame/drivers/skullxbo.c",
-	MAME_DIR .. "src/mame/video/skullxbo.c",
-	MAME_DIR .. "src/mame/drivers/skydiver.c",
-	MAME_DIR .. "src/mame/audio/skydiver.c",
-	MAME_DIR .. "src/mame/video/skydiver.c",
-	MAME_DIR .. "src/mame/drivers/skyraid.c",
-	MAME_DIR .. "src/mame/audio/skyraid.c",
-	MAME_DIR .. "src/mame/video/skyraid.c",
-	MAME_DIR .. "src/mame/drivers/sprint2.c",
-	MAME_DIR .. "src/mame/audio/sprint2.c",
-	MAME_DIR .. "src/mame/video/sprint2.c",
-	MAME_DIR .. "src/mame/drivers/sprint4.c",
-	MAME_DIR .. "src/mame/video/sprint4.c",
-	MAME_DIR .. "src/mame/audio/sprint4.c",
-	MAME_DIR .. "src/mame/drivers/sprint8.c",
-	MAME_DIR .. "src/mame/audio/sprint8.c",
-	MAME_DIR .. "src/mame/video/sprint8.c",
-	MAME_DIR .. "src/mame/drivers/starshp1.c",
-	MAME_DIR .. "src/mame/audio/starshp1.c",
-	MAME_DIR .. "src/mame/video/starshp1.c",
-	MAME_DIR .. "src/mame/drivers/starwars.c",
-	MAME_DIR .. "src/mame/machine/starwars.c",
-	MAME_DIR .. "src/mame/audio/starwars.c",
-	MAME_DIR .. "src/mame/drivers/subs.c",
-	MAME_DIR .. "src/mame/machine/subs.c",
-	MAME_DIR .. "src/mame/audio/subs.c",
-	MAME_DIR .. "src/mame/video/subs.c",
-	MAME_DIR .. "src/mame/drivers/tank8.c",
-	MAME_DIR .. "src/mame/audio/tank8.c",
-	MAME_DIR .. "src/mame/video/tank8.c",
-	MAME_DIR .. "src/mame/drivers/tempest.c",
-	MAME_DIR .. "src/mame/drivers/thunderj.c",
-	MAME_DIR .. "src/mame/video/thunderj.c",
-	MAME_DIR .. "src/mame/drivers/tomcat.c",
-	MAME_DIR .. "src/mame/drivers/toobin.c",
-	MAME_DIR .. "src/mame/video/toobin.c",
-	MAME_DIR .. "src/mame/drivers/tourtabl.c",
-	MAME_DIR .. "src/mame/video/tia.c",
-	MAME_DIR .. "src/mame/drivers/triplhnt.c",
-	MAME_DIR .. "src/mame/audio/triplhnt.c",
-	MAME_DIR .. "src/mame/video/triplhnt.c",
-	MAME_DIR .. "src/mame/drivers/tunhunt.c",
-	MAME_DIR .. "src/mame/video/tunhunt.c",
-	MAME_DIR .. "src/mame/drivers/ultratnk.c",
-	MAME_DIR .. "src/mame/video/ultratnk.c",
-	MAME_DIR .. "src/mame/drivers/videopin.c",
-	MAME_DIR .. "src/mame/audio/videopin.c",
-	MAME_DIR .. "src/mame/video/videopin.c",
-	MAME_DIR .. "src/mame/drivers/vindictr.c",
-	MAME_DIR .. "src/mame/video/vindictr.c",
-	MAME_DIR .. "src/mame/drivers/wolfpack.c",
-	MAME_DIR .. "src/mame/video/wolfpack.c",
-	MAME_DIR .. "src/mame/drivers/xybots.c",
-	MAME_DIR .. "src/mame/video/xybots.c",
-	MAME_DIR .. "src/mame/machine/asic65.c",
-	MAME_DIR .. "src/mame/machine/atari_vg.c",
-	MAME_DIR .. "src/mame/machine/atarigen.c",
-	MAME_DIR .. "src/mame/machine/mathbox.c",
-	MAME_DIR .. "src/mame/machine/slapstic.c",
-	MAME_DIR .. "src/mame/audio/atarijsa.c",
-	MAME_DIR .. "src/mame/audio/cage.c",
-	MAME_DIR .. "src/mame/audio/redbaron.c",
-	MAME_DIR .. "src/mame/video/atarimo.c",
-	MAME_DIR .. "src/mame/video/atarirle.c",
+	MAME_DIR .. "src/mame/drivers/arcadecl.cpp",
+	MAME_DIR .. "src/mame/video/arcadecl.cpp",
+	MAME_DIR .. "src/mame/drivers/asteroid.cpp",
+	MAME_DIR .. "src/mame/machine/asteroid.cpp",
+	MAME_DIR .. "src/mame/audio/asteroid.cpp",
+	MAME_DIR .. "src/mame/audio/llander.cpp",
+	MAME_DIR .. "src/mame/drivers/atarifb.cpp",
+	MAME_DIR .. "src/mame/machine/atarifb.cpp",
+	MAME_DIR .. "src/mame/audio/atarifb.cpp",
+	MAME_DIR .. "src/mame/video/atarifb.cpp",
+	MAME_DIR .. "src/mame/drivers/atarig1.cpp",
+	MAME_DIR .. "src/mame/video/atarig1.cpp",
+	MAME_DIR .. "src/mame/drivers/atarig42.cpp",
+	MAME_DIR .. "src/mame/video/atarig42.cpp",
+	MAME_DIR .. "src/mame/drivers/atarigt.cpp",
+	MAME_DIR .. "src/mame/video/atarigt.cpp",
+	MAME_DIR .. "src/mame/drivers/atarigx2.cpp",
+	MAME_DIR .. "src/mame/video/atarigx2.cpp",
+	MAME_DIR .. "src/mame/drivers/atarisy1.cpp",
+	MAME_DIR .. "src/mame/video/atarisy1.cpp",
+	MAME_DIR .. "src/mame/drivers/atarisy2.cpp",
+	MAME_DIR .. "src/mame/video/atarisy2.cpp",
+	MAME_DIR .. "src/mame/drivers/atarisy4.cpp",
+	MAME_DIR .. "src/mame/drivers/atarittl.cpp",
+	MAME_DIR .. "src/mame/drivers/atetris.cpp",
+	MAME_DIR .. "src/mame/video/atetris.cpp",
+	MAME_DIR .. "src/mame/drivers/avalnche.cpp",
+	MAME_DIR .. "src/mame/audio/avalnche.cpp",
+	MAME_DIR .. "src/mame/drivers/badlands.cpp",
+	MAME_DIR .. "src/mame/video/badlands.cpp",
+	MAME_DIR .. "src/mame/drivers/bartop52.cpp",
+	MAME_DIR .. "src/mame/drivers/batman.cpp",
+	MAME_DIR .. "src/mame/video/batman.cpp",
+	MAME_DIR .. "src/mame/drivers/beathead.cpp",
+	MAME_DIR .. "src/mame/video/beathead.cpp",
+	MAME_DIR .. "src/mame/drivers/blstroid.cpp",
+	MAME_DIR .. "src/mame/video/blstroid.cpp",
+	MAME_DIR .. "src/mame/drivers/boxer.cpp",
+	MAME_DIR .. "src/mame/drivers/bsktball.cpp",
+	MAME_DIR .. "src/mame/machine/bsktball.cpp",
+	MAME_DIR .. "src/mame/audio/bsktball.cpp",
+	MAME_DIR .. "src/mame/video/bsktball.cpp",
+	MAME_DIR .. "src/mame/drivers/bwidow.cpp",
+	MAME_DIR .. "src/mame/audio/bwidow.cpp",
+	MAME_DIR .. "src/mame/drivers/bzone.cpp",
+	MAME_DIR .. "src/mame/audio/bzone.cpp",
+	MAME_DIR .. "src/mame/drivers/canyon.cpp",
+	MAME_DIR .. "src/mame/audio/canyon.cpp",
+	MAME_DIR .. "src/mame/video/canyon.cpp",
+	MAME_DIR .. "src/mame/drivers/cball.cpp",
+	MAME_DIR .. "src/mame/drivers/ccastles.cpp",
+	MAME_DIR .. "src/mame/video/ccastles.cpp",
+	MAME_DIR .. "src/mame/drivers/centiped.cpp",
+	MAME_DIR .. "src/mame/video/centiped.cpp",
+	MAME_DIR .. "src/mame/drivers/cloak.cpp",
+	MAME_DIR .. "src/mame/video/cloak.cpp",
+	MAME_DIR .. "src/mame/drivers/cloud9.cpp",
+	MAME_DIR .. "src/mame/video/cloud9.cpp",
+	MAME_DIR .. "src/mame/drivers/cmmb.cpp",
+	MAME_DIR .. "src/mame/drivers/cops.cpp",
+	MAME_DIR .. "src/mame/drivers/copsnrob.cpp",
+	MAME_DIR .. "src/mame/audio/copsnrob.cpp",
+	MAME_DIR .. "src/mame/video/copsnrob.cpp",
+	MAME_DIR .. "src/mame/drivers/cyberbal.cpp",
+	MAME_DIR .. "src/mame/audio/cyberbal.cpp",
+	MAME_DIR .. "src/mame/video/cyberbal.cpp",
+	MAME_DIR .. "src/mame/drivers/destroyr.cpp",
+	MAME_DIR .. "src/mame/drivers/dragrace.cpp",
+	MAME_DIR .. "src/mame/audio/dragrace.cpp",
+	MAME_DIR .. "src/mame/video/dragrace.cpp",
+	MAME_DIR .. "src/mame/drivers/eprom.cpp",
+	MAME_DIR .. "src/mame/video/eprom.cpp",
+	MAME_DIR .. "src/mame/drivers/firefox.cpp",
+	MAME_DIR .. "src/mame/drivers/firetrk.cpp",
+	MAME_DIR .. "src/mame/audio/firetrk.cpp",
+	MAME_DIR .. "src/mame/video/firetrk.cpp",
+	MAME_DIR .. "src/mame/drivers/flyball.cpp",
+	MAME_DIR .. "src/mame/drivers/foodf.cpp",
+	MAME_DIR .. "src/mame/video/foodf.cpp",
+	MAME_DIR .. "src/mame/drivers/gauntlet.cpp",
+	MAME_DIR .. "src/mame/video/gauntlet.cpp",
+	MAME_DIR .. "src/mame/drivers/harddriv.cpp",
+	MAME_DIR .. "src/mame/machine/harddriv.cpp",
+	MAME_DIR .. "src/mame/audio/harddriv.cpp",
+	MAME_DIR .. "src/mame/video/harddriv.cpp",
+	MAME_DIR .. "src/mame/drivers/irobot.cpp",
+	MAME_DIR .. "src/mame/machine/irobot.cpp",
+	MAME_DIR .. "src/mame/video/irobot.cpp",
+	MAME_DIR .. "src/mame/drivers/jaguar.cpp",
+	MAME_DIR .. "src/mame/audio/jaguar.cpp",
+	MAME_DIR .. "src/mame/video/jaguar.cpp",
+	MAME_DIR .. "src/mame/drivers/jedi.cpp",
+	MAME_DIR .. "src/mame/audio/jedi.cpp",
+	MAME_DIR .. "src/mame/video/jedi.cpp",
+	MAME_DIR .. "src/mame/drivers/klax.cpp",
+	MAME_DIR .. "src/mame/video/klax.cpp",
+	MAME_DIR .. "src/mame/drivers/liberatr.cpp",
+	MAME_DIR .. "src/mame/video/liberatr.cpp",
+	MAME_DIR .. "src/mame/drivers/mediagx.cpp",
+	MAME_DIR .. "src/mame/drivers/metalmx.cpp",
+	MAME_DIR .. "src/mame/drivers/mgolf.cpp",
+	MAME_DIR .. "src/mame/drivers/mhavoc.cpp",
+	MAME_DIR .. "src/mame/machine/mhavoc.cpp",
+	MAME_DIR .. "src/mame/drivers/missile.cpp",
+	MAME_DIR .. "src/mame/drivers/nitedrvr.cpp",
+	MAME_DIR .. "src/mame/machine/nitedrvr.cpp",
+	MAME_DIR .. "src/mame/audio/nitedrvr.cpp",
+	MAME_DIR .. "src/mame/video/nitedrvr.cpp",
+	MAME_DIR .. "src/mame/drivers/offtwall.cpp",
+	MAME_DIR .. "src/mame/video/offtwall.cpp",
+	MAME_DIR .. "src/mame/drivers/orbit.cpp",
+	MAME_DIR .. "src/mame/audio/orbit.cpp",
+	MAME_DIR .. "src/mame/video/orbit.cpp",
+	MAME_DIR .. "src/mame/drivers/pong.cpp",
+	MAME_DIR .. "src/mame/drivers/nl_pong.cpp",
+	MAME_DIR .. "src/mame/drivers/nl_pongd.cpp",
+	MAME_DIR .. "src/mame/drivers/nl_breakout.cpp",
+	MAME_DIR .. "src/mame/drivers/poolshrk.cpp",
+	MAME_DIR .. "src/mame/audio/poolshrk.cpp",
+	MAME_DIR .. "src/mame/video/poolshrk.cpp",
+	MAME_DIR .. "src/mame/drivers/quantum.cpp",
+	MAME_DIR .. "src/mame/drivers/quizshow.cpp",
+	MAME_DIR .. "src/mame/drivers/rampart.cpp",
+	MAME_DIR .. "src/mame/video/rampart.cpp",
+	MAME_DIR .. "src/mame/drivers/relief.cpp",
+	MAME_DIR .. "src/mame/video/relief.cpp",
+	MAME_DIR .. "src/mame/drivers/runaway.cpp",
+	MAME_DIR .. "src/mame/video/runaway.cpp",
+	MAME_DIR .. "src/mame/drivers/sbrkout.cpp",
+	MAME_DIR .. "src/mame/drivers/shuuz.cpp",
+	MAME_DIR .. "src/mame/video/shuuz.cpp",
+	MAME_DIR .. "src/mame/drivers/skullxbo.cpp",
+	MAME_DIR .. "src/mame/video/skullxbo.cpp",
+	MAME_DIR .. "src/mame/drivers/skydiver.cpp",
+	MAME_DIR .. "src/mame/audio/skydiver.cpp",
+	MAME_DIR .. "src/mame/video/skydiver.cpp",
+	MAME_DIR .. "src/mame/drivers/skyraid.cpp",
+	MAME_DIR .. "src/mame/audio/skyraid.cpp",
+	MAME_DIR .. "src/mame/video/skyraid.cpp",
+	MAME_DIR .. "src/mame/drivers/sprint2.cpp",
+	MAME_DIR .. "src/mame/audio/sprint2.cpp",
+	MAME_DIR .. "src/mame/video/sprint2.cpp",
+	MAME_DIR .. "src/mame/drivers/sprint4.cpp",
+	MAME_DIR .. "src/mame/video/sprint4.cpp",
+	MAME_DIR .. "src/mame/audio/sprint4.cpp",
+	MAME_DIR .. "src/mame/drivers/sprint8.cpp",
+	MAME_DIR .. "src/mame/audio/sprint8.cpp",
+	MAME_DIR .. "src/mame/video/sprint8.cpp",
+	MAME_DIR .. "src/mame/drivers/starshp1.cpp",
+	MAME_DIR .. "src/mame/audio/starshp1.cpp",
+	MAME_DIR .. "src/mame/video/starshp1.cpp",
+	MAME_DIR .. "src/mame/drivers/starwars.cpp",
+	MAME_DIR .. "src/mame/machine/starwars.cpp",
+	MAME_DIR .. "src/mame/audio/starwars.cpp",
+	MAME_DIR .. "src/mame/drivers/subs.cpp",
+	MAME_DIR .. "src/mame/machine/subs.cpp",
+	MAME_DIR .. "src/mame/audio/subs.cpp",
+	MAME_DIR .. "src/mame/video/subs.cpp",
+	MAME_DIR .. "src/mame/drivers/tank8.cpp",
+	MAME_DIR .. "src/mame/audio/tank8.cpp",
+	MAME_DIR .. "src/mame/video/tank8.cpp",
+	MAME_DIR .. "src/mame/drivers/tempest.cpp",
+	MAME_DIR .. "src/mame/drivers/thunderj.cpp",
+	MAME_DIR .. "src/mame/video/thunderj.cpp",
+	MAME_DIR .. "src/mame/drivers/tomcat.cpp",
+	MAME_DIR .. "src/mame/drivers/toobin.cpp",
+	MAME_DIR .. "src/mame/video/toobin.cpp",
+	MAME_DIR .. "src/mame/drivers/tourtabl.cpp",
+	MAME_DIR .. "src/mame/video/tia.cpp",
+	MAME_DIR .. "src/mame/drivers/triplhnt.cpp",
+	MAME_DIR .. "src/mame/audio/triplhnt.cpp",
+	MAME_DIR .. "src/mame/video/triplhnt.cpp",
+	MAME_DIR .. "src/mame/drivers/tunhunt.cpp",
+	MAME_DIR .. "src/mame/video/tunhunt.cpp",
+	MAME_DIR .. "src/mame/drivers/ultratnk.cpp",
+	MAME_DIR .. "src/mame/video/ultratnk.cpp",
+	MAME_DIR .. "src/mame/drivers/videopin.cpp",
+	MAME_DIR .. "src/mame/audio/videopin.cpp",
+	MAME_DIR .. "src/mame/video/videopin.cpp",
+	MAME_DIR .. "src/mame/drivers/vindictr.cpp",
+	MAME_DIR .. "src/mame/video/vindictr.cpp",
+	MAME_DIR .. "src/mame/drivers/wolfpack.cpp",
+	MAME_DIR .. "src/mame/video/wolfpack.cpp",
+	MAME_DIR .. "src/mame/drivers/xybots.cpp",
+	MAME_DIR .. "src/mame/video/xybots.cpp",
+	MAME_DIR .. "src/mame/machine/asic65.cpp",
+	MAME_DIR .. "src/mame/machine/atari_vg.cpp",
+	MAME_DIR .. "src/mame/machine/atarigen.cpp",
+	MAME_DIR .. "src/mame/machine/mathbox.cpp",
+	MAME_DIR .. "src/mame/machine/slapstic.cpp",
+	MAME_DIR .. "src/mame/audio/atarijsa.cpp",
+	MAME_DIR .. "src/mame/audio/cage.cpp",
+	MAME_DIR .. "src/mame/audio/redbaron.cpp",
+	MAME_DIR .. "src/mame/video/atarimo.cpp",
+	MAME_DIR .. "src/mame/video/atarirle.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "atlus")
 files {
-	MAME_DIR .. "src/mame/drivers/blmbycar.c",
-	MAME_DIR .. "src/mame/video/blmbycar.c",
-	MAME_DIR .. "src/mame/drivers/ohmygod.c",
-	MAME_DIR .. "src/mame/video/ohmygod.c",
-	MAME_DIR .. "src/mame/drivers/powerins.c",
-	MAME_DIR .. "src/mame/video/powerins.c",
-	MAME_DIR .. "src/mame/drivers/bowltry.c",
+	MAME_DIR .. "src/mame/drivers/blmbycar.cpp",
+	MAME_DIR .. "src/mame/video/blmbycar.cpp",
+	MAME_DIR .. "src/mame/drivers/ohmygod.cpp",
+	MAME_DIR .. "src/mame/video/ohmygod.cpp",
+	MAME_DIR .. "src/mame/drivers/powerins.cpp",
+	MAME_DIR .. "src/mame/video/powerins.cpp",
+	MAME_DIR .. "src/mame/drivers/bowltry.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "barcrest")
 files {
-	MAME_DIR .. "src/mame/drivers/mpu2.c",
-	MAME_DIR .. "src/mame/drivers/mpu3.c",
-	MAME_DIR .. "src/mame/drivers/mpu4hw.c",
-	MAME_DIR .. "src/mame/drivers/mpu4sw.c",
-	MAME_DIR .. "src/mame/drivers/mpu4.c",
-	MAME_DIR .. "src/mame/drivers/mpu4mod2sw.c",
-	MAME_DIR .. "src/mame/drivers/mpu4mod4yam.c",
-	MAME_DIR .. "src/mame/drivers/mpu4plasma.c",
-	MAME_DIR .. "src/mame/drivers/mpu4dealem.c",
-	MAME_DIR .. "src/mame/drivers/mpu4vid.c",
-	MAME_DIR .. "src/mame/drivers/mpu4avan.c",
-	MAME_DIR .. "src/mame/drivers/mpu4union.c",
-	MAME_DIR .. "src/mame/drivers/mpu4concept.c",
-	MAME_DIR .. "src/mame/drivers/mpu4empire.c",
-	MAME_DIR .. "src/mame/drivers/mpu4mdm.c",
-	MAME_DIR .. "src/mame/drivers/mpu4crystal.c",
-	MAME_DIR .. "src/mame/drivers/mpu4bwb.c",
-	MAME_DIR .. "src/mame/drivers/mpu4misc.c",
-	MAME_DIR .. "src/mame/drivers/mpu5hw.c",
-	MAME_DIR .. "src/mame/drivers/mpu5.c",
-	MAME_DIR .. "src/mame/video/awpvid.c",
-	MAME_DIR .. "src/mame/machine/meters.c",
+	MAME_DIR .. "src/mame/drivers/mpu2.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu3.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4hw.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4sw.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4mod2sw.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4mod4yam.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4plasma.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4dealem.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4vid.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4avan.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4union.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4concept.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4empire.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4mdm.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4crystal.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4bwb.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu4misc.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu5hw.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu5.cpp",
+	MAME_DIR .. "src/mame/video/awpvid.cpp",
+	MAME_DIR .. "src/mame/machine/meters.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "bfm")
 files {
-	MAME_DIR .. "src/mame/drivers/bfcobra.c",
-	MAME_DIR .. "src/mame/machine/bfm_comn.c",
-	MAME_DIR .. "src/mame/drivers/bfm_sc1.c",
-	MAME_DIR .. "src/mame/drivers/bfm_sc2.c",
-	MAME_DIR .. "src/mame/video/bfm_adr2.c",
-	MAME_DIR .. "src/mame/drivers/bfm_sc4.c",
-	MAME_DIR .. "src/mame/drivers/bfm_sc4h.c",
-	MAME_DIR .. "src/mame/drivers/bfm_sc5.c",
-	MAME_DIR .. "src/mame/drivers/bfm_sc5sw.c",
-	MAME_DIR .. "src/mame/drivers/bfm_ad5.c",
-	MAME_DIR .. "src/mame/drivers/bfm_ad5sw.c",
-	MAME_DIR .. "src/mame/drivers/bfm_sc45_helper.c",
-	MAME_DIR .. "src/mame/drivers/bfm_swp.c",
-	MAME_DIR .. "src/mame/drivers/bfmsys83.c",
-	MAME_DIR .. "src/mame/drivers/bfmsys85.c",
-	MAME_DIR .. "src/mame/machine/sec.c",
-	MAME_DIR .. "src/mame/machine/bfm_bd1.c",
-	MAME_DIR .. "src/mame/machine/bfm_bda.c",
-	MAME_DIR .. "src/mame/video/bfm_dm01.c",
-	MAME_DIR .. "src/mame/drivers/rastersp.c",
+	MAME_DIR .. "src/mame/drivers/bfcobra.cpp",
+	MAME_DIR .. "src/mame/machine/bfm_comn.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_sc1.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_sc2.cpp",
+	MAME_DIR .. "src/mame/video/bfm_adr2.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_sc4.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_sc4h.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_sc5.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_sc5sw.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_ad5.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_ad5sw.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_sc45_helper.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_swp.cpp",
+	MAME_DIR .. "src/mame/drivers/bfmsys83.cpp",
+	MAME_DIR .. "src/mame/drivers/bfmsys85.cpp",
+	MAME_DIR .. "src/mame/machine/sec.cpp",
+	MAME_DIR .. "src/mame/machine/bfm_bd1.cpp",
+	MAME_DIR .. "src/mame/machine/bfm_bda.cpp",
+	MAME_DIR .. "src/mame/video/bfm_dm01.cpp",
+	MAME_DIR .. "src/mame/drivers/rastersp.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "bmc")
 files {
-	MAME_DIR .. "src/mame/drivers/bmcbowl.c",
-	MAME_DIR .. "src/mame/drivers/koftball.c",
-	MAME_DIR .. "src/mame/drivers/popobear.c",
-	MAME_DIR .. "src/mame/drivers/bmcpokr.c",
+	MAME_DIR .. "src/mame/drivers/bmcbowl.cpp",
+	MAME_DIR .. "src/mame/drivers/koftball.cpp",
+	MAME_DIR .. "src/mame/drivers/popobear.cpp",
+	MAME_DIR .. "src/mame/drivers/bmcpokr.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "capcom")
 files {
-	MAME_DIR .. "src/mame/drivers/1942.c",
-	MAME_DIR .. "src/mame/video/1942.c",
-	MAME_DIR .. "src/mame/drivers/1943.c",
-	MAME_DIR .. "src/mame/video/1943.c",
-	MAME_DIR .. "src/mame/drivers/alien.c",
-	MAME_DIR .. "src/mame/drivers/bionicc.c",
-	MAME_DIR .. "src/mame/video/bionicc.c",
-	MAME_DIR .. "src/mame/drivers/supduck.c",
-	MAME_DIR .. "src/mame/video/tigeroad_spr.c",
-	MAME_DIR .. "src/mame/drivers/blktiger.c",
-	MAME_DIR .. "src/mame/video/blktiger.c",
-	MAME_DIR .. "src/mame/drivers/cbasebal.c",
-	MAME_DIR .. "src/mame/video/cbasebal.c",
-	MAME_DIR .. "src/mame/drivers/commando.c",
-	MAME_DIR .. "src/mame/video/commando.c",
-	MAME_DIR .. "src/mame/drivers/cps1.c",
-	MAME_DIR .. "src/mame/video/cps1.c",
-	MAME_DIR .. "src/mame/drivers/kenseim.c",
-	MAME_DIR .. "src/mame/drivers/cps2.c",
-	MAME_DIR .. "src/mame/machine/cps2crpt.c",
-	MAME_DIR .. "src/mame/drivers/cps3.c",
-	MAME_DIR .. "src/mame/audio/cps3.c",
-	MAME_DIR .. "src/mame/drivers/egghunt.c",
-	MAME_DIR .. "src/mame/drivers/exedexes.c",
-	MAME_DIR .. "src/mame/video/exedexes.c",
-	MAME_DIR .. "src/mame/drivers/fcrash.c",
-	MAME_DIR .. "src/mame/drivers/gng.c",
-	MAME_DIR .. "src/mame/video/gng.c",
-	MAME_DIR .. "src/mame/drivers/gunsmoke.c",
-	MAME_DIR .. "src/mame/video/gunsmoke.c",
-	MAME_DIR .. "src/mame/drivers/higemaru.c",
-	MAME_DIR .. "src/mame/video/higemaru.c",
-	MAME_DIR .. "src/mame/drivers/lastduel.c",
-	MAME_DIR .. "src/mame/video/lastduel.c",
-	MAME_DIR .. "src/mame/drivers/lwings.c",
-	MAME_DIR .. "src/mame/video/lwings.c",
-	MAME_DIR .. "src/mame/drivers/mitchell.c",
-	MAME_DIR .. "src/mame/video/mitchell.c",
-	MAME_DIR .. "src/mame/drivers/sf.c",
-	MAME_DIR .. "src/mame/video/sf.c",
-	MAME_DIR .. "src/mame/drivers/sidearms.c",
-	MAME_DIR .. "src/mame/video/sidearms.c",
-	MAME_DIR .. "src/mame/drivers/sonson.c",
-	MAME_DIR .. "src/mame/video/sonson.c",
-	MAME_DIR .. "src/mame/drivers/srumbler.c",
-	MAME_DIR .. "src/mame/video/srumbler.c",
-	MAME_DIR .. "src/mame/drivers/tigeroad.c",
-	MAME_DIR .. "src/mame/video/tigeroad.c",
-	MAME_DIR .. "src/mame/machine/tigeroad.c",
-	MAME_DIR .. "src/mame/drivers/vulgus.c",
-	MAME_DIR .. "src/mame/video/vulgus.c",
-	MAME_DIR .. "src/mame/machine/kabuki.c",
+	MAME_DIR .. "src/mame/drivers/1942.cpp",
+	MAME_DIR .. "src/mame/video/1942.cpp",
+	MAME_DIR .. "src/mame/drivers/1943.cpp",
+	MAME_DIR .. "src/mame/video/1943.cpp",
+	MAME_DIR .. "src/mame/drivers/alien.cpp",
+	MAME_DIR .. "src/mame/drivers/bionicc.cpp",
+	MAME_DIR .. "src/mame/video/bionicc.cpp",
+	MAME_DIR .. "src/mame/drivers/supduck.cpp",
+	MAME_DIR .. "src/mame/video/tigeroad_spr.cpp",
+	MAME_DIR .. "src/mame/drivers/blktiger.cpp",
+	MAME_DIR .. "src/mame/video/blktiger.cpp",
+	MAME_DIR .. "src/mame/drivers/cbasebal.cpp",
+	MAME_DIR .. "src/mame/video/cbasebal.cpp",
+	MAME_DIR .. "src/mame/drivers/commando.cpp",
+	MAME_DIR .. "src/mame/video/commando.cpp",
+	MAME_DIR .. "src/mame/drivers/cps1.cpp",
+	MAME_DIR .. "src/mame/video/cps1.cpp",
+	MAME_DIR .. "src/mame/drivers/kenseim.cpp",
+	MAME_DIR .. "src/mame/drivers/cps2.cpp",
+	MAME_DIR .. "src/mame/machine/cps2crpt.cpp",
+	MAME_DIR .. "src/mame/drivers/cps3.cpp",
+	MAME_DIR .. "src/mame/audio/cps3.cpp",
+	MAME_DIR .. "src/mame/drivers/egghunt.cpp",
+	MAME_DIR .. "src/mame/drivers/exedexes.cpp",
+	MAME_DIR .. "src/mame/video/exedexes.cpp",
+	MAME_DIR .. "src/mame/drivers/fcrash.cpp",
+	MAME_DIR .. "src/mame/drivers/gng.cpp",
+	MAME_DIR .. "src/mame/video/gng.cpp",
+	MAME_DIR .. "src/mame/drivers/gunsmoke.cpp",
+	MAME_DIR .. "src/mame/video/gunsmoke.cpp",
+	MAME_DIR .. "src/mame/drivers/higemaru.cpp",
+	MAME_DIR .. "src/mame/video/higemaru.cpp",
+	MAME_DIR .. "src/mame/drivers/lastduel.cpp",
+	MAME_DIR .. "src/mame/video/lastduel.cpp",
+	MAME_DIR .. "src/mame/drivers/lwings.cpp",
+	MAME_DIR .. "src/mame/video/lwings.cpp",
+	MAME_DIR .. "src/mame/drivers/mitchell.cpp",
+	MAME_DIR .. "src/mame/video/mitchell.cpp",
+	MAME_DIR .. "src/mame/drivers/sf.cpp",
+	MAME_DIR .. "src/mame/video/sf.cpp",
+	MAME_DIR .. "src/mame/drivers/sidearms.cpp",
+	MAME_DIR .. "src/mame/video/sidearms.cpp",
+	MAME_DIR .. "src/mame/drivers/sonson.cpp",
+	MAME_DIR .. "src/mame/video/sonson.cpp",
+	MAME_DIR .. "src/mame/drivers/srumbler.cpp",
+	MAME_DIR .. "src/mame/video/srumbler.cpp",
+	MAME_DIR .. "src/mame/drivers/tigeroad.cpp",
+	MAME_DIR .. "src/mame/video/tigeroad.cpp",
+	MAME_DIR .. "src/mame/machine/tigeroad.cpp",
+	MAME_DIR .. "src/mame/drivers/vulgus.cpp",
+	MAME_DIR .. "src/mame/video/vulgus.cpp",
+	MAME_DIR .. "src/mame/machine/kabuki.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "cinemat")
 files {
-	MAME_DIR .. "src/mame/drivers/ataxx.c",
-	MAME_DIR .. "src/mame/drivers/cinemat.c",
-	MAME_DIR .. "src/mame/audio/cinemat.c",
-	MAME_DIR .. "src/mame/video/cinemat.c",
-	MAME_DIR .. "src/mame/drivers/cchasm.c",
-	MAME_DIR .. "src/mame/machine/cchasm.c",
-	MAME_DIR .. "src/mame/audio/cchasm.c",
-	MAME_DIR .. "src/mame/video/cchasm.c",
-	MAME_DIR .. "src/mame/drivers/dlair.c",
-	MAME_DIR .. "src/mame/drivers/dlair2.c",
-	MAME_DIR .. "src/mame/drivers/embargo.c",
-	MAME_DIR .. "src/mame/drivers/jack.c",
-	MAME_DIR .. "src/mame/video/jack.c",
-	MAME_DIR .. "src/mame/drivers/leland.c",
-	MAME_DIR .. "src/mame/machine/leland.c",
-	MAME_DIR .. "src/mame/audio/leland.c",
-	MAME_DIR .. "src/mame/video/leland.c",
+	MAME_DIR .. "src/mame/drivers/ataxx.cpp",
+	MAME_DIR .. "src/mame/drivers/cinemat.cpp",
+	MAME_DIR .. "src/mame/audio/cinemat.cpp",
+	MAME_DIR .. "src/mame/video/cinemat.cpp",
+	MAME_DIR .. "src/mame/drivers/cchasm.cpp",
+	MAME_DIR .. "src/mame/machine/cchasm.cpp",
+	MAME_DIR .. "src/mame/audio/cchasm.cpp",
+	MAME_DIR .. "src/mame/video/cchasm.cpp",
+	MAME_DIR .. "src/mame/drivers/dlair.cpp",
+	MAME_DIR .. "src/mame/drivers/dlair2.cpp",
+	MAME_DIR .. "src/mame/drivers/embargo.cpp",
+	MAME_DIR .. "src/mame/drivers/jack.cpp",
+	MAME_DIR .. "src/mame/video/jack.cpp",
+	MAME_DIR .. "src/mame/drivers/leland.cpp",
+	MAME_DIR .. "src/mame/machine/leland.cpp",
+	MAME_DIR .. "src/mame/audio/leland.cpp",
+	MAME_DIR .. "src/mame/video/leland.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "comad")
 files {
-	MAME_DIR .. "src/mame/drivers/funybubl.c",
-	MAME_DIR .. "src/mame/video/funybubl.c",
-	MAME_DIR .. "src/mame/drivers/galspnbl.c",
-	MAME_DIR .. "src/mame/video/galspnbl.c",
-	MAME_DIR .. "src/mame/drivers/zerozone.c",
-	MAME_DIR .. "src/mame/video/zerozone.c",
+	MAME_DIR .. "src/mame/drivers/funybubl.cpp",
+	MAME_DIR .. "src/mame/video/funybubl.cpp",
+	MAME_DIR .. "src/mame/drivers/galspnbl.cpp",
+	MAME_DIR .. "src/mame/video/galspnbl.cpp",
+	MAME_DIR .. "src/mame/drivers/zerozone.cpp",
+	MAME_DIR .. "src/mame/video/zerozone.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "cvs")
 files {
-	MAME_DIR .. "src/mame/drivers/cvs.c",
-	MAME_DIR .. "src/mame/video/cvs.c",
-	MAME_DIR .. "src/mame/drivers/galaxia.c",
-	MAME_DIR .. "src/mame/video/galaxia.c",
-	MAME_DIR .. "src/mame/drivers/quasar.c",
-	MAME_DIR .. "src/mame/video/quasar.c",
+	MAME_DIR .. "src/mame/drivers/cvs.cpp",
+	MAME_DIR .. "src/mame/video/cvs.cpp",
+	MAME_DIR .. "src/mame/drivers/galaxia.cpp",
+	MAME_DIR .. "src/mame/video/galaxia.cpp",
+	MAME_DIR .. "src/mame/drivers/quasar.cpp",
+	MAME_DIR .. "src/mame/video/quasar.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "dataeast")
 files {
-	MAME_DIR .. "src/mame/drivers/actfancr.c",
-	MAME_DIR .. "src/mame/video/actfancr.c",
-	MAME_DIR .. "src/mame/drivers/astrof.c",
-	MAME_DIR .. "src/mame/audio/astrof.c",
-	MAME_DIR .. "src/mame/drivers/backfire.c",
-	MAME_DIR .. "src/mame/drivers/battlera.c",
-	MAME_DIR .. "src/mame/drivers/boogwing.c",
-	MAME_DIR .. "src/mame/video/boogwing.c",
-	MAME_DIR .. "src/mame/drivers/brkthru.c",
-	MAME_DIR .. "src/mame/video/brkthru.c",
-	MAME_DIR .. "src/mame/drivers/btime.c",
-	MAME_DIR .. "src/mame/machine/btime.c",
-	MAME_DIR .. "src/mame/video/btime.c",
-	MAME_DIR .. "src/mame/drivers/bwing.c",
-	MAME_DIR .. "src/mame/video/bwing.c",
-	MAME_DIR .. "src/mame/drivers/cbuster.c",
-	MAME_DIR .. "src/mame/video/cbuster.c",
-	MAME_DIR .. "src/mame/drivers/chanbara.c",
-	MAME_DIR .. "src/mame/drivers/cninja.c",
-	MAME_DIR .. "src/mame/video/cninja.c",
-	MAME_DIR .. "src/mame/drivers/cntsteer.c",
-	MAME_DIR .. "src/mame/drivers/compgolf.c",
-	MAME_DIR .. "src/mame/video/compgolf.c",
-	MAME_DIR .. "src/mame/drivers/darkseal.c",
-	MAME_DIR .. "src/mame/video/darkseal.c",
-	MAME_DIR .. "src/mame/drivers/dassault.c",
-	MAME_DIR .. "src/mame/video/dassault.c",
-	MAME_DIR .. "src/mame/drivers/dblewing.c",
-	MAME_DIR .. "src/mame/drivers/dec0.c",
-	MAME_DIR .. "src/mame/machine/dec0.c",
-	MAME_DIR .. "src/mame/video/dec0.c",
-	MAME_DIR .. "src/mame/drivers/dec8.c",
-	MAME_DIR .. "src/mame/video/dec8.c",
-	MAME_DIR .. "src/mame/machine/deco222.c",
-	MAME_DIR .. "src/mame/machine/decocpu7.c",
-	MAME_DIR .. "src/mame/machine/decocpu6.c",
-	MAME_DIR .. "src/mame/drivers/deco_ld.c",
-	MAME_DIR .. "src/mame/drivers/deco_mlc.c",
-	MAME_DIR .. "src/mame/video/deco_mlc.c",
-	MAME_DIR .. "src/mame/drivers/deco156.c",
-	MAME_DIR .. "src/mame/machine/deco156.c",
-	MAME_DIR .. "src/mame/drivers/deco32.c",
-	MAME_DIR .. "src/mame/video/deco32.c",
-	MAME_DIR .. "src/mame/video/dvi.c",
-	MAME_DIR .. "src/mame/video/deco_zoomspr.c",
-	MAME_DIR .. "src/mame/drivers/decocass.c",
-	MAME_DIR .. "src/mame/machine/decocass.c",
-	MAME_DIR .. "src/mame/machine/decocass_tape.c",
-	MAME_DIR .. "src/mame/video/decocass.c",
-	MAME_DIR .. "src/mame/drivers/deshoros.c",
-	MAME_DIR .. "src/mame/drivers/dietgo.c",
-	MAME_DIR .. "src/mame/video/dietgo.c",
-	MAME_DIR .. "src/mame/drivers/dreambal.c",
-	MAME_DIR .. "src/mame/drivers/exprraid.c",
-	MAME_DIR .. "src/mame/video/exprraid.c",
-	MAME_DIR .. "src/mame/drivers/firetrap.c",
-	MAME_DIR .. "src/mame/video/firetrap.c",
-	MAME_DIR .. "src/mame/drivers/funkyjet.c",
-	MAME_DIR .. "src/mame/video/funkyjet.c",
-	MAME_DIR .. "src/mame/drivers/karnov.c",
-	MAME_DIR .. "src/mame/video/karnov.c",
-	MAME_DIR .. "src/mame/drivers/kchamp.c",
-	MAME_DIR .. "src/mame/video/kchamp.c",
-	MAME_DIR .. "src/mame/drivers/kingobox.c",
-	MAME_DIR .. "src/mame/video/kingobox.c",
-	MAME_DIR .. "src/mame/drivers/lemmings.c",
-	MAME_DIR .. "src/mame/video/lemmings.c",
-	MAME_DIR .. "src/mame/drivers/liberate.c",
-	MAME_DIR .. "src/mame/video/liberate.c",
-	MAME_DIR .. "src/mame/drivers/madalien.c",
-	MAME_DIR .. "src/mame/audio/madalien.c",
-	MAME_DIR .. "src/mame/video/madalien.c",
-	MAME_DIR .. "src/mame/drivers/madmotor.c",
-	MAME_DIR .. "src/mame/video/madmotor.c",
-	MAME_DIR .. "src/mame/drivers/metlclsh.c",
-	MAME_DIR .. "src/mame/video/metlclsh.c",
-	MAME_DIR .. "src/mame/drivers/mirage.c",
-	MAME_DIR .. "src/mame/drivers/pcktgal.c",
-	MAME_DIR .. "src/mame/video/pcktgal.c",
-	MAME_DIR .. "src/mame/drivers/pktgaldx.c",
-	MAME_DIR .. "src/mame/video/pktgaldx.c",
-	MAME_DIR .. "src/mame/drivers/progolf.c",
-	MAME_DIR .. "src/mame/drivers/rohga.c",
-	MAME_DIR .. "src/mame/video/rohga.c",
-	MAME_DIR .. "src/mame/drivers/shootout.c",
-	MAME_DIR .. "src/mame/video/shootout.c",
-	MAME_DIR .. "src/mame/drivers/sidepckt.c",
-	MAME_DIR .. "src/mame/video/sidepckt.c",
-	MAME_DIR .. "src/mame/drivers/simpl156.c",
-	MAME_DIR .. "src/mame/video/simpl156.c",
-	MAME_DIR .. "src/mame/drivers/sshangha.c",
-	MAME_DIR .. "src/mame/video/sshangha.c",
-	MAME_DIR .. "src/mame/drivers/stadhero.c",
-	MAME_DIR .. "src/mame/video/stadhero.c",
-	MAME_DIR .. "src/mame/drivers/supbtime.c",
-	MAME_DIR .. "src/mame/video/supbtime.c",
-	MAME_DIR .. "src/mame/drivers/tryout.c",
-	MAME_DIR .. "src/mame/video/tryout.c",
-	MAME_DIR .. "src/mame/drivers/tumbleb.c",
-	MAME_DIR .. "src/mame/video/tumbleb.c",
-	MAME_DIR .. "src/mame/drivers/tumblep.c",
-	MAME_DIR .. "src/mame/video/tumblep.c",
-	MAME_DIR .. "src/mame/drivers/vaportra.c",
-	MAME_DIR .. "src/mame/video/vaportra.c",
-	MAME_DIR .. "src/mame/machine/deco102.c",
-	MAME_DIR .. "src/mame/machine/decocrpt.c",
-	MAME_DIR .. "src/mame/machine/deco104.c",
-	MAME_DIR .. "src/mame/machine/deco146.c",
-	MAME_DIR .. "src/mame/video/decbac06.c",
-	MAME_DIR .. "src/mame/video/deco16ic.c",
-	MAME_DIR .. "src/mame/video/decocomn.c",
-	MAME_DIR .. "src/mame/video/decospr.c",
-	MAME_DIR .. "src/mame/video/decmxc06.c",
-	MAME_DIR .. "src/mame/video/deckarn.c",
+	MAME_DIR .. "src/mame/drivers/actfancr.cpp",
+	MAME_DIR .. "src/mame/video/actfancr.cpp",
+	MAME_DIR .. "src/mame/drivers/astrof.cpp",
+	MAME_DIR .. "src/mame/audio/astrof.cpp",
+	MAME_DIR .. "src/mame/drivers/backfire.cpp",
+	MAME_DIR .. "src/mame/drivers/battlera.cpp",
+	MAME_DIR .. "src/mame/drivers/boogwing.cpp",
+	MAME_DIR .. "src/mame/video/boogwing.cpp",
+	MAME_DIR .. "src/mame/drivers/brkthru.cpp",
+	MAME_DIR .. "src/mame/video/brkthru.cpp",
+	MAME_DIR .. "src/mame/drivers/btime.cpp",
+	MAME_DIR .. "src/mame/machine/btime.cpp",
+	MAME_DIR .. "src/mame/video/btime.cpp",
+	MAME_DIR .. "src/mame/drivers/bwing.cpp",
+	MAME_DIR .. "src/mame/video/bwing.cpp",
+	MAME_DIR .. "src/mame/drivers/cbuster.cpp",
+	MAME_DIR .. "src/mame/video/cbuster.cpp",
+	MAME_DIR .. "src/mame/drivers/chanbara.cpp",
+	MAME_DIR .. "src/mame/drivers/cninja.cpp",
+	MAME_DIR .. "src/mame/video/cninja.cpp",
+	MAME_DIR .. "src/mame/drivers/cntsteer.cpp",
+	MAME_DIR .. "src/mame/drivers/compgolf.cpp",
+	MAME_DIR .. "src/mame/video/compgolf.cpp",
+	MAME_DIR .. "src/mame/drivers/darkseal.cpp",
+	MAME_DIR .. "src/mame/video/darkseal.cpp",
+	MAME_DIR .. "src/mame/drivers/dassault.cpp",
+	MAME_DIR .. "src/mame/video/dassault.cpp",
+	MAME_DIR .. "src/mame/drivers/dblewing.cpp",
+	MAME_DIR .. "src/mame/drivers/dec0.cpp",
+	MAME_DIR .. "src/mame/machine/dec0.cpp",
+	MAME_DIR .. "src/mame/video/dec0.cpp",
+	MAME_DIR .. "src/mame/drivers/dec8.cpp",
+	MAME_DIR .. "src/mame/video/dec8.cpp",
+	MAME_DIR .. "src/mame/machine/deco222.cpp",
+	MAME_DIR .. "src/mame/machine/decocpu7.cpp",
+	MAME_DIR .. "src/mame/machine/decocpu6.cpp",
+	MAME_DIR .. "src/mame/drivers/deco_ld.cpp",
+	MAME_DIR .. "src/mame/drivers/deco_mlc.cpp",
+	MAME_DIR .. "src/mame/video/deco_mlc.cpp",
+	MAME_DIR .. "src/mame/drivers/deco156.cpp",
+	MAME_DIR .. "src/mame/machine/deco156.cpp",
+	MAME_DIR .. "src/mame/drivers/deco32.cpp",
+	MAME_DIR .. "src/mame/video/deco32.cpp",
+	MAME_DIR .. "src/mame/video/dvi.cpp",
+	MAME_DIR .. "src/mame/video/deco_zoomspr.cpp",
+	MAME_DIR .. "src/mame/drivers/decocass.cpp",
+	MAME_DIR .. "src/mame/machine/decocass.cpp",
+	MAME_DIR .. "src/mame/machine/decocass_tape.cpp",
+	MAME_DIR .. "src/mame/video/decocass.cpp",
+	MAME_DIR .. "src/mame/drivers/deshoros.cpp",
+	MAME_DIR .. "src/mame/drivers/dietgo.cpp",
+	MAME_DIR .. "src/mame/video/dietgo.cpp",
+	MAME_DIR .. "src/mame/drivers/dreambal.cpp",
+	MAME_DIR .. "src/mame/drivers/exprraid.cpp",
+	MAME_DIR .. "src/mame/video/exprraid.cpp",
+	MAME_DIR .. "src/mame/drivers/firetrap.cpp",
+	MAME_DIR .. "src/mame/video/firetrap.cpp",
+	MAME_DIR .. "src/mame/drivers/funkyjet.cpp",
+	MAME_DIR .. "src/mame/video/funkyjet.cpp",
+	MAME_DIR .. "src/mame/drivers/karnov.cpp",
+	MAME_DIR .. "src/mame/video/karnov.cpp",
+	MAME_DIR .. "src/mame/drivers/kchamp.cpp",
+	MAME_DIR .. "src/mame/video/kchamp.cpp",
+	MAME_DIR .. "src/mame/drivers/kingobox.cpp",
+	MAME_DIR .. "src/mame/video/kingobox.cpp",
+	MAME_DIR .. "src/mame/drivers/lemmings.cpp",
+	MAME_DIR .. "src/mame/video/lemmings.cpp",
+	MAME_DIR .. "src/mame/drivers/liberate.cpp",
+	MAME_DIR .. "src/mame/video/liberate.cpp",
+	MAME_DIR .. "src/mame/drivers/madalien.cpp",
+	MAME_DIR .. "src/mame/audio/madalien.cpp",
+	MAME_DIR .. "src/mame/video/madalien.cpp",
+	MAME_DIR .. "src/mame/drivers/madmotor.cpp",
+	MAME_DIR .. "src/mame/video/madmotor.cpp",
+	MAME_DIR .. "src/mame/drivers/metlclsh.cpp",
+	MAME_DIR .. "src/mame/video/metlclsh.cpp",
+	MAME_DIR .. "src/mame/drivers/mirage.cpp",
+	MAME_DIR .. "src/mame/drivers/pcktgal.cpp",
+	MAME_DIR .. "src/mame/video/pcktgal.cpp",
+	MAME_DIR .. "src/mame/drivers/pktgaldx.cpp",
+	MAME_DIR .. "src/mame/video/pktgaldx.cpp",
+	MAME_DIR .. "src/mame/drivers/progolf.cpp",
+	MAME_DIR .. "src/mame/drivers/rohga.cpp",
+	MAME_DIR .. "src/mame/video/rohga.cpp",
+	MAME_DIR .. "src/mame/drivers/shootout.cpp",
+	MAME_DIR .. "src/mame/video/shootout.cpp",
+	MAME_DIR .. "src/mame/drivers/sidepckt.cpp",
+	MAME_DIR .. "src/mame/video/sidepckt.cpp",
+	MAME_DIR .. "src/mame/drivers/simpl156.cpp",
+	MAME_DIR .. "src/mame/video/simpl156.cpp",
+	MAME_DIR .. "src/mame/drivers/sshangha.cpp",
+	MAME_DIR .. "src/mame/video/sshangha.cpp",
+	MAME_DIR .. "src/mame/drivers/stadhero.cpp",
+	MAME_DIR .. "src/mame/video/stadhero.cpp",
+	MAME_DIR .. "src/mame/drivers/supbtime.cpp",
+	MAME_DIR .. "src/mame/video/supbtime.cpp",
+	MAME_DIR .. "src/mame/drivers/tryout.cpp",
+	MAME_DIR .. "src/mame/video/tryout.cpp",
+	MAME_DIR .. "src/mame/drivers/tumbleb.cpp",
+	MAME_DIR .. "src/mame/video/tumbleb.cpp",
+	MAME_DIR .. "src/mame/drivers/tumblep.cpp",
+	MAME_DIR .. "src/mame/video/tumblep.cpp",
+	MAME_DIR .. "src/mame/drivers/vaportra.cpp",
+	MAME_DIR .. "src/mame/video/vaportra.cpp",
+	MAME_DIR .. "src/mame/machine/deco102.cpp",
+	MAME_DIR .. "src/mame/machine/decocrpt.cpp",
+	MAME_DIR .. "src/mame/machine/deco104.cpp",
+	MAME_DIR .. "src/mame/machine/deco146.cpp",
+	MAME_DIR .. "src/mame/video/decbac06.cpp",
+	MAME_DIR .. "src/mame/video/deco16ic.cpp",
+	MAME_DIR .. "src/mame/video/decocomn.cpp",
+	MAME_DIR .. "src/mame/video/decospr.cpp",
+	MAME_DIR .. "src/mame/video/decmxc06.cpp",
+	MAME_DIR .. "src/mame/video/deckarn.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "dgrm")
 files {
-	MAME_DIR .. "src/mame/drivers/blackt96.c",
-	MAME_DIR .. "src/mame/drivers/pokechmp.c",
-	MAME_DIR .. "src/mame/video/pokechmp.c",
+	MAME_DIR .. "src/mame/drivers/blackt96.cpp",
+	MAME_DIR .. "src/mame/drivers/pokechmp.cpp",
+	MAME_DIR .. "src/mame/video/pokechmp.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "dooyong")
 files {
-	MAME_DIR .. "src/mame/drivers/dooyong.c",
-	MAME_DIR .. "src/mame/video/dooyong.c",
-	MAME_DIR .. "src/mame/drivers/gundealr.c",
-	MAME_DIR .. "src/mame/video/gundealr.c",
+	MAME_DIR .. "src/mame/drivers/dooyong.cpp",
+	MAME_DIR .. "src/mame/video/dooyong.cpp",
+	MAME_DIR .. "src/mame/drivers/gundealr.cpp",
+	MAME_DIR .. "src/mame/video/gundealr.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "dynax")
 files {
-	MAME_DIR .. "src/mame/drivers/ddenlovr.c",
-	MAME_DIR .. "src/mame/drivers/dynax.c",
-	MAME_DIR .. "src/mame/video/dynax.c",
-	MAME_DIR .. "src/mame/drivers/hnayayoi.c",
-	MAME_DIR .. "src/mame/video/hnayayoi.c",
-	MAME_DIR .. "src/mame/drivers/realbrk.c",
-	MAME_DIR .. "src/mame/video/realbrk.c",
-	MAME_DIR .. "src/mame/drivers/royalmah.c",
+	MAME_DIR .. "src/mame/drivers/ddenlovr.cpp",
+	MAME_DIR .. "src/mame/drivers/dynax.cpp",
+	MAME_DIR .. "src/mame/video/dynax.cpp",
+	MAME_DIR .. "src/mame/drivers/hnayayoi.cpp",
+	MAME_DIR .. "src/mame/video/hnayayoi.cpp",
+	MAME_DIR .. "src/mame/drivers/realbrk.cpp",
+	MAME_DIR .. "src/mame/video/realbrk.cpp",
+	MAME_DIR .. "src/mame/drivers/royalmah.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "edevices")
 files {
-	MAME_DIR .. "src/mame/drivers/diverboy.c",
-	MAME_DIR .. "src/mame/drivers/fantland.c",
-	MAME_DIR .. "src/mame/video/fantland.c",
-	MAME_DIR .. "src/mame/drivers/mwarr.c",
-	MAME_DIR .. "src/mame/drivers/mugsmash.c",
-	MAME_DIR .. "src/mame/video/mugsmash.c",
-	MAME_DIR .. "src/mame/drivers/ppmast93.c",
-	MAME_DIR .. "src/mame/drivers/pzletime.c",
-	MAME_DIR .. "src/mame/drivers/stlforce.c",
-	MAME_DIR .. "src/mame/video/stlforce.c",
-	MAME_DIR .. "src/mame/drivers/twins.c",
+	MAME_DIR .. "src/mame/drivers/diverboy.cpp",
+	MAME_DIR .. "src/mame/drivers/fantland.cpp",
+	MAME_DIR .. "src/mame/video/fantland.cpp",
+	MAME_DIR .. "src/mame/drivers/mwarr.cpp",
+	MAME_DIR .. "src/mame/drivers/mugsmash.cpp",
+	MAME_DIR .. "src/mame/video/mugsmash.cpp",
+	MAME_DIR .. "src/mame/drivers/ppmast93.cpp",
+	MAME_DIR .. "src/mame/drivers/pzletime.cpp",
+	MAME_DIR .. "src/mame/drivers/stlforce.cpp",
+	MAME_DIR .. "src/mame/video/stlforce.cpp",
+	MAME_DIR .. "src/mame/drivers/twins.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "eolith")
 files {
-	MAME_DIR .. "src/mame/drivers/eolith.c",
-	MAME_DIR .. "src/mame/video/eolith.c",
-	MAME_DIR .. "src/mame/drivers/eolith16.c",
-	MAME_DIR .. "src/mame/drivers/eolithsp.c",
-	MAME_DIR .. "src/mame/drivers/ghosteo.c",
-	MAME_DIR .. "src/mame/drivers/vegaeo.c",
+	MAME_DIR .. "src/mame/drivers/eolith.cpp",
+	MAME_DIR .. "src/mame/video/eolith.cpp",
+	MAME_DIR .. "src/mame/drivers/eolith16.cpp",
+	MAME_DIR .. "src/mame/drivers/eolithsp.cpp",
+	MAME_DIR .. "src/mame/drivers/ghosteo.cpp",
+	MAME_DIR .. "src/mame/drivers/vegaeo.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "excelent")
 files {
-	MAME_DIR .. "src/mame/drivers/aquarium.c",
-	MAME_DIR .. "src/mame/video/aquarium.c",
-	MAME_DIR .. "src/mame/drivers/d9final.c",
-	MAME_DIR .. "src/mame/drivers/dblcrown.c",
-	MAME_DIR .. "src/mame/drivers/gcpinbal.c",
-	MAME_DIR .. "src/mame/video/gcpinbal.c",
-	MAME_DIR .. "src/mame/video/excellent_spr.c",
-	MAME_DIR .. "src/mame/drivers/lastbank.c",
+	MAME_DIR .. "src/mame/drivers/aquarium.cpp",
+	MAME_DIR .. "src/mame/video/aquarium.cpp",
+	MAME_DIR .. "src/mame/drivers/d9final.cpp",
+	MAME_DIR .. "src/mame/drivers/dblcrown.cpp",
+	MAME_DIR .. "src/mame/drivers/gcpinbal.cpp",
+	MAME_DIR .. "src/mame/video/gcpinbal.cpp",
+	MAME_DIR .. "src/mame/video/excellent_spr.cpp",
+	MAME_DIR .. "src/mame/drivers/lastbank.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "exidy")
 files {
-	MAME_DIR .. "src/mame/drivers/carpolo.c",
-	MAME_DIR .. "src/mame/machine/carpolo.c",
-	MAME_DIR .. "src/mame/video/carpolo.c",
-	MAME_DIR .. "src/mame/drivers/circus.c",
-	MAME_DIR .. "src/mame/audio/circus.c",
-	MAME_DIR .. "src/mame/video/circus.c",
-	MAME_DIR .. "src/mame/drivers/exidy.c",
-	MAME_DIR .. "src/mame/audio/exidy.c",
-	MAME_DIR .. "src/mame/video/exidy.c",
-	MAME_DIR .. "src/mame/audio/targ.c",
-	MAME_DIR .. "src/mame/drivers/exidy440.c",
-	MAME_DIR .. "src/mame/audio/exidy440.c",
-	MAME_DIR .. "src/mame/video/exidy440.c",
-	MAME_DIR .. "src/mame/drivers/exidyttl.c",
-	MAME_DIR .. "src/mame/drivers/maxaflex.c",
-	MAME_DIR .. "src/mame/machine/atari.c",
-	MAME_DIR .. "src/mame/video/atari.c",
-	MAME_DIR .. "src/mame/video/antic.c",
-	MAME_DIR .. "src/mame/video/gtia.c",
-	MAME_DIR .. "src/mame/drivers/starfire.c",
-	MAME_DIR .. "src/mame/video/starfire.c",
-	MAME_DIR .. "src/mame/drivers/vertigo.c",
-	MAME_DIR .. "src/mame/machine/vertigo.c",
-	MAME_DIR .. "src/mame/video/vertigo.c",
-	MAME_DIR .. "src/mame/drivers/victory.c",
-	MAME_DIR .. "src/mame/video/victory.c",
+	MAME_DIR .. "src/mame/drivers/carpolo.cpp",
+	MAME_DIR .. "src/mame/machine/carpolo.cpp",
+	MAME_DIR .. "src/mame/video/carpolo.cpp",
+	MAME_DIR .. "src/mame/drivers/circus.cpp",
+	MAME_DIR .. "src/mame/audio/circus.cpp",
+	MAME_DIR .. "src/mame/video/circus.cpp",
+	MAME_DIR .. "src/mame/drivers/exidy.cpp",
+	MAME_DIR .. "src/mame/audio/exidy.cpp",
+	MAME_DIR .. "src/mame/video/exidy.cpp",
+	MAME_DIR .. "src/mame/audio/targ.cpp",
+	MAME_DIR .. "src/mame/drivers/exidy440.cpp",
+	MAME_DIR .. "src/mame/audio/exidy440.cpp",
+	MAME_DIR .. "src/mame/video/exidy440.cpp",
+	MAME_DIR .. "src/mame/drivers/exidyttl.cpp",
+	MAME_DIR .. "src/mame/drivers/maxaflex.cpp",
+	MAME_DIR .. "src/mame/machine/atari.cpp",
+	MAME_DIR .. "src/mame/video/atari.cpp",
+	MAME_DIR .. "src/mame/video/antic.cpp",
+	MAME_DIR .. "src/mame/video/gtia.cpp",
+	MAME_DIR .. "src/mame/drivers/starfire.cpp",
+	MAME_DIR .. "src/mame/video/starfire.cpp",
+	MAME_DIR .. "src/mame/drivers/vertigo.cpp",
+	MAME_DIR .. "src/mame/machine/vertigo.cpp",
+	MAME_DIR .. "src/mame/video/vertigo.cpp",
+	MAME_DIR .. "src/mame/drivers/victory.cpp",
+	MAME_DIR .. "src/mame/video/victory.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "f32")
 files {
-	MAME_DIR .. "src/mame/drivers/crospang.c",
-	MAME_DIR .. "src/mame/video/crospang.c",
-	MAME_DIR .. "src/mame/drivers/silvmil.c",
-	MAME_DIR .. "src/mame/drivers/f-32.c",
+	MAME_DIR .. "src/mame/drivers/crospang.cpp",
+	MAME_DIR .. "src/mame/video/crospang.cpp",
+	MAME_DIR .. "src/mame/drivers/silvmil.cpp",
+	MAME_DIR .. "src/mame/drivers/f-32.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "funworld")
 files {
-	MAME_DIR .. "src/mame/drivers/4roses.c",
-	MAME_DIR .. "src/mame/drivers/funworld.c",
-	MAME_DIR .. "src/mame/video/funworld.c",
-	MAME_DIR .. "src/mame/drivers/snookr10.c",
-	MAME_DIR .. "src/mame/video/snookr10.c",
+	MAME_DIR .. "src/mame/drivers/4roses.cpp",
+	MAME_DIR .. "src/mame/drivers/funworld.cpp",
+	MAME_DIR .. "src/mame/video/funworld.cpp",
+	MAME_DIR .. "src/mame/drivers/snookr10.cpp",
+	MAME_DIR .. "src/mame/video/snookr10.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "fuuki")
 files {
-	MAME_DIR .. "src/mame/drivers/fuukifg2.c",
-	MAME_DIR .. "src/mame/video/fuukifg2.c",
-	MAME_DIR .. "src/mame/drivers/fuukifg3.c",
-	MAME_DIR .. "src/mame/video/fuukifg3.c",
-	MAME_DIR .. "src/mame/video/fuukifg.c",
+	MAME_DIR .. "src/mame/drivers/fuukifg2.cpp",
+	MAME_DIR .. "src/mame/video/fuukifg2.cpp",
+	MAME_DIR .. "src/mame/drivers/fuukifg3.cpp",
+	MAME_DIR .. "src/mame/video/fuukifg3.cpp",
+	MAME_DIR .. "src/mame/video/fuukifg.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "gaelco")
 files {
-	MAME_DIR .. "src/mame/drivers/atvtrack.c",
-	MAME_DIR .. "src/mame/drivers/gaelco.c",
-	MAME_DIR .. "src/mame/video/gaelco.c",
-	MAME_DIR .. "src/mame/machine/gaelcrpt.c",
-	MAME_DIR .. "src/mame/drivers/gaelco2.c",
-	MAME_DIR .. "src/mame/machine/gaelco2.c",
-	MAME_DIR .. "src/mame/video/gaelco2.c",
-	MAME_DIR .. "src/mame/drivers/gaelco3d.c",
-	MAME_DIR .. "src/mame/video/gaelco3d.c",
-	MAME_DIR .. "src/mame/machine/gaelco3d.c",
-	MAME_DIR .. "src/mame/drivers/glass.c",
-	MAME_DIR .. "src/mame/video/glass.c",
-	MAME_DIR .. "src/mame/drivers/mastboy.c",
-	MAME_DIR .. "src/mame/drivers/rollext.c",
-	MAME_DIR .. "src/mame/drivers/splash.c",
-	MAME_DIR .. "src/mame/video/splash.c",
-	MAME_DIR .. "src/mame/drivers/targeth.c",
-	MAME_DIR .. "src/mame/video/targeth.c",
-	MAME_DIR .. "src/mame/drivers/thoop2.c",
-	MAME_DIR .. "src/mame/video/thoop2.c",
-	MAME_DIR .. "src/mame/drivers/tokyocop.c",
-	MAME_DIR .. "src/mame/drivers/wrally.c",
-	MAME_DIR .. "src/mame/machine/wrally.c",
-	MAME_DIR .. "src/mame/video/wrally.c",
-	MAME_DIR .. "src/mame/drivers/xorworld.c",
-	MAME_DIR .. "src/mame/video/xorworld.c",
+	MAME_DIR .. "src/mame/drivers/atvtrack.cpp",
+	MAME_DIR .. "src/mame/drivers/gaelco.cpp",
+	MAME_DIR .. "src/mame/video/gaelco.cpp",
+	MAME_DIR .. "src/mame/machine/gaelcrpt.cpp",
+	MAME_DIR .. "src/mame/drivers/gaelco2.cpp",
+	MAME_DIR .. "src/mame/machine/gaelco2.cpp",
+	MAME_DIR .. "src/mame/video/gaelco2.cpp",
+	MAME_DIR .. "src/mame/drivers/gaelco3d.cpp",
+	MAME_DIR .. "src/mame/video/gaelco3d.cpp",
+	MAME_DIR .. "src/mame/machine/gaelco3d.cpp",
+	MAME_DIR .. "src/mame/drivers/glass.cpp",
+	MAME_DIR .. "src/mame/video/glass.cpp",
+	MAME_DIR .. "src/mame/drivers/mastboy.cpp",
+	MAME_DIR .. "src/mame/drivers/rollext.cpp",
+	MAME_DIR .. "src/mame/drivers/splash.cpp",
+	MAME_DIR .. "src/mame/video/splash.cpp",
+	MAME_DIR .. "src/mame/drivers/targeth.cpp",
+	MAME_DIR .. "src/mame/video/targeth.cpp",
+	MAME_DIR .. "src/mame/drivers/thoop2.cpp",
+	MAME_DIR .. "src/mame/video/thoop2.cpp",
+	MAME_DIR .. "src/mame/drivers/tokyocop.cpp",
+	MAME_DIR .. "src/mame/drivers/wrally.cpp",
+	MAME_DIR .. "src/mame/machine/wrally.cpp",
+	MAME_DIR .. "src/mame/video/wrally.cpp",
+	MAME_DIR .. "src/mame/drivers/xorworld.cpp",
+	MAME_DIR .. "src/mame/video/xorworld.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "gameplan")
 files {
-	MAME_DIR .. "src/mame/drivers/enigma2.c",
-	MAME_DIR .. "src/mame/drivers/gameplan.c",
-	MAME_DIR .. "src/mame/video/gameplan.c",
-	MAME_DIR .. "src/mame/drivers/toratora.c",
+	MAME_DIR .. "src/mame/drivers/enigma2.cpp",
+	MAME_DIR .. "src/mame/drivers/gameplan.cpp",
+	MAME_DIR .. "src/mame/video/gameplan.cpp",
+	MAME_DIR .. "src/mame/drivers/toratora.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "gametron")
 files {
-	MAME_DIR .. "src/mame/drivers/gatron.c",
-	MAME_DIR .. "src/mame/video/gatron.c",
-	MAME_DIR .. "src/mame/drivers/gotya.c",
-	MAME_DIR .. "src/mame/audio/gotya.c",
-	MAME_DIR .. "src/mame/video/gotya.c",
-	MAME_DIR .. "src/mame/drivers/sbugger.c",
-	MAME_DIR .. "src/mame/video/sbugger.c",
+	MAME_DIR .. "src/mame/drivers/gatron.cpp",
+	MAME_DIR .. "src/mame/video/gatron.cpp",
+	MAME_DIR .. "src/mame/drivers/gotya.cpp",
+	MAME_DIR .. "src/mame/audio/gotya.cpp",
+	MAME_DIR .. "src/mame/video/gotya.cpp",
+	MAME_DIR .. "src/mame/drivers/sbugger.cpp",
+	MAME_DIR .. "src/mame/video/sbugger.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "gottlieb")
 files {
-	MAME_DIR .. "src/mame/drivers/exterm.c",
-	MAME_DIR .. "src/mame/video/exterm.c",
-	MAME_DIR .. "src/mame/drivers/gottlieb.c",
-	MAME_DIR .. "src/mame/audio/gottlieb.c",
-	MAME_DIR .. "src/mame/video/gottlieb.c",
+	MAME_DIR .. "src/mame/drivers/exterm.cpp",
+	MAME_DIR .. "src/mame/video/exterm.cpp",
+	MAME_DIR .. "src/mame/drivers/gottlieb.cpp",
+	MAME_DIR .. "src/mame/audio/gottlieb.cpp",
+	MAME_DIR .. "src/mame/video/gottlieb.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "ibmpc")
 files {
-	MAME_DIR .. "src/mame/drivers/calchase.c",
-	MAME_DIR .. "src/mame/drivers/fruitpc.c",
-	MAME_DIR .. "src/mame/drivers/pangofun.c",
-	MAME_DIR .. "src/mame/drivers/pcat_dyn.c",
-	MAME_DIR .. "src/mame/drivers/pcat_nit.c",
-	MAME_DIR .. "src/mame/drivers/pcxt.c",
-	MAME_DIR .. "src/mame/drivers/quakeat.c",
-	MAME_DIR .. "src/mame/drivers/queen.c",
-	MAME_DIR .. "src/mame/drivers/igspc.c",
+	MAME_DIR .. "src/mame/drivers/calchase.cpp",
+	MAME_DIR .. "src/mame/drivers/fruitpc.cpp",
+	MAME_DIR .. "src/mame/drivers/pangofun.cpp",
+	MAME_DIR .. "src/mame/drivers/pcat_dyn.cpp",
+	MAME_DIR .. "src/mame/drivers/pcat_nit.cpp",
+	MAME_DIR .. "src/mame/drivers/pcxt.cpp",
+	MAME_DIR .. "src/mame/drivers/quakeat.cpp",
+	MAME_DIR .. "src/mame/drivers/queen.cpp",
+	MAME_DIR .. "src/mame/drivers/igspc.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "igs")
 files {
-	MAME_DIR .. "src/mame/drivers/cabaret.c",
-	MAME_DIR .. "src/mame/drivers/ddz.c",
-	MAME_DIR .. "src/mame/drivers/dunhuang.c",
-	MAME_DIR .. "src/mame/drivers/goldstar.c",
-	MAME_DIR .. "src/mame/video/goldstar.c",
-	MAME_DIR .. "src/mame/drivers/jackie.c",
-	MAME_DIR .. "src/mame/drivers/igspoker.c",
-	MAME_DIR .. "src/mame/drivers/igs009.c",
-	MAME_DIR .. "src/mame/drivers/igs011.c",
-	MAME_DIR .. "src/mame/drivers/igs017.c",
-	MAME_DIR .. "src/mame/video/igs017_igs031.c",
-	MAME_DIR .. "src/mame/drivers/igs_fear.c",
-	MAME_DIR .. "src/mame/drivers/igs_m027.c",
-	MAME_DIR .. "src/mame/drivers/igs_m036.c",
-	MAME_DIR .. "src/mame/drivers/iqblock.c",
-	MAME_DIR .. "src/mame/video/iqblock.c",
-	MAME_DIR .. "src/mame/drivers/lordgun.c",
-	MAME_DIR .. "src/mame/video/lordgun.c",
-	MAME_DIR .. "src/mame/drivers/pgm.c",
-	MAME_DIR .. "src/mame/video/pgm.c",
-	MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type1.c",
-	MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type2.c",
-	MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type3.c",
-	MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs012.c",
-	MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs022.c",
-	MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs028.c",
-	MAME_DIR .. "src/mame/machine/pgmprot_orlegend.c",
-	MAME_DIR .. "src/mame/drivers/pgm2.c",
-	MAME_DIR .. "src/mame/drivers/spoker.c",
-	MAME_DIR .. "src/mame/machine/igs036crypt.c",
-	MAME_DIR .. "src/mame/machine/pgmcrypt.c",
-	MAME_DIR .. "src/mame/machine/igs025.c",
-	MAME_DIR .. "src/mame/machine/igs022.c",
-	MAME_DIR .. "src/mame/machine/igs028.c",
+	MAME_DIR .. "src/mame/drivers/cabaret.cpp",
+	MAME_DIR .. "src/mame/drivers/ddz.cpp",
+	MAME_DIR .. "src/mame/drivers/dunhuang.cpp",
+	MAME_DIR .. "src/mame/drivers/goldstar.cpp",
+	MAME_DIR .. "src/mame/video/goldstar.cpp",
+	MAME_DIR .. "src/mame/drivers/jackie.cpp",
+	MAME_DIR .. "src/mame/drivers/igspoker.cpp",
+	MAME_DIR .. "src/mame/drivers/igs009.cpp",
+	MAME_DIR .. "src/mame/drivers/igs011.cpp",
+	MAME_DIR .. "src/mame/drivers/igs017.cpp",
+	MAME_DIR .. "src/mame/video/igs017_igs031.cpp",
+	MAME_DIR .. "src/mame/drivers/igs_fear.cpp",
+	MAME_DIR .. "src/mame/drivers/igs_m027.cpp",
+	MAME_DIR .. "src/mame/drivers/igs_m036.cpp",
+	MAME_DIR .. "src/mame/drivers/iqblock.cpp",
+	MAME_DIR .. "src/mame/video/iqblock.cpp",
+	MAME_DIR .. "src/mame/drivers/lordgun.cpp",
+	MAME_DIR .. "src/mame/video/lordgun.cpp",
+	MAME_DIR .. "src/mame/drivers/pgm.cpp",
+	MAME_DIR .. "src/mame/video/pgm.cpp",
+	MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type1.cpp",
+	MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type2.cpp",
+	MAME_DIR .. "src/mame/machine/pgmprot_igs027a_type3.cpp",
+	MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs012.cpp",
+	MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs022.cpp",
+	MAME_DIR .. "src/mame/machine/pgmprot_igs025_igs028.cpp",
+	MAME_DIR .. "src/mame/machine/pgmprot_orlegend.cpp",
+	MAME_DIR .. "src/mame/drivers/pgm2.cpp",
+	MAME_DIR .. "src/mame/drivers/spoker.cpp",
+	MAME_DIR .. "src/mame/machine/igs036crypt.cpp",
+	MAME_DIR .. "src/mame/machine/pgmcrypt.cpp",
+	MAME_DIR .. "src/mame/machine/igs025.cpp",
+	MAME_DIR .. "src/mame/machine/igs022.cpp",
+	MAME_DIR .. "src/mame/machine/igs028.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "irem")
 files {
-	MAME_DIR .. "src/mame/drivers/m10.c",
-	MAME_DIR .. "src/mame/video/m10.c",
-	MAME_DIR .. "src/mame/drivers/m14.c",
-	MAME_DIR .. "src/mame/drivers/m52.c",
-	MAME_DIR .. "src/mame/video/m52.c",
-	MAME_DIR .. "src/mame/drivers/m57.c",
-	MAME_DIR .. "src/mame/video/m57.c",
-	MAME_DIR .. "src/mame/drivers/m58.c",
-	MAME_DIR .. "src/mame/video/m58.c",
-	MAME_DIR .. "src/mame/drivers/m62.c",
-	MAME_DIR .. "src/mame/video/m62.c",
-	MAME_DIR .. "src/mame/drivers/m63.c",
-	MAME_DIR .. "src/mame/drivers/m72.c",
-	MAME_DIR .. "src/mame/audio/m72.c",
-	MAME_DIR .. "src/mame/video/m72.c",
-	MAME_DIR .. "src/mame/drivers/m90.c",
-	MAME_DIR .. "src/mame/video/m90.c",
-	MAME_DIR .. "src/mame/drivers/m92.c",
-	MAME_DIR .. "src/mame/video/m92.c",
-	MAME_DIR .. "src/mame/drivers/m107.c",
-	MAME_DIR .. "src/mame/video/m107.c",
-	MAME_DIR .. "src/mame/drivers/olibochu.c",
-	MAME_DIR .. "src/mame/drivers/redalert.c",
-	MAME_DIR .. "src/mame/audio/redalert.c",
-	MAME_DIR .. "src/mame/video/redalert.c",
-	MAME_DIR .. "src/mame/drivers/shisen.c",
-	MAME_DIR .. "src/mame/video/shisen.c",
-	MAME_DIR .. "src/mame/drivers/travrusa.c",
-	MAME_DIR .. "src/mame/video/travrusa.c",
-	MAME_DIR .. "src/mame/drivers/vigilant.c",
-	MAME_DIR .. "src/mame/video/vigilant.c",
-	MAME_DIR .. "src/mame/machine/irem_cpu.c",
-	MAME_DIR .. "src/mame/audio/irem.c",
+	MAME_DIR .. "src/mame/drivers/m10.cpp",
+	MAME_DIR .. "src/mame/video/m10.cpp",
+	MAME_DIR .. "src/mame/drivers/m14.cpp",
+	MAME_DIR .. "src/mame/drivers/m52.cpp",
+	MAME_DIR .. "src/mame/video/m52.cpp",
+	MAME_DIR .. "src/mame/drivers/m57.cpp",
+	MAME_DIR .. "src/mame/video/m57.cpp",
+	MAME_DIR .. "src/mame/drivers/m58.cpp",
+	MAME_DIR .. "src/mame/video/m58.cpp",
+	MAME_DIR .. "src/mame/drivers/m62.cpp",
+	MAME_DIR .. "src/mame/video/m62.cpp",
+	MAME_DIR .. "src/mame/drivers/m63.cpp",
+	MAME_DIR .. "src/mame/drivers/m72.cpp",
+	MAME_DIR .. "src/mame/audio/m72.cpp",
+	MAME_DIR .. "src/mame/video/m72.cpp",
+	MAME_DIR .. "src/mame/drivers/m90.cpp",
+	MAME_DIR .. "src/mame/video/m90.cpp",
+	MAME_DIR .. "src/mame/drivers/m92.cpp",
+	MAME_DIR .. "src/mame/video/m92.cpp",
+	MAME_DIR .. "src/mame/drivers/m107.cpp",
+	MAME_DIR .. "src/mame/video/m107.cpp",
+	MAME_DIR .. "src/mame/drivers/olibochu.cpp",
+	MAME_DIR .. "src/mame/drivers/redalert.cpp",
+	MAME_DIR .. "src/mame/audio/redalert.cpp",
+	MAME_DIR .. "src/mame/video/redalert.cpp",
+	MAME_DIR .. "src/mame/drivers/shisen.cpp",
+	MAME_DIR .. "src/mame/video/shisen.cpp",
+	MAME_DIR .. "src/mame/drivers/travrusa.cpp",
+	MAME_DIR .. "src/mame/video/travrusa.cpp",
+	MAME_DIR .. "src/mame/drivers/vigilant.cpp",
+	MAME_DIR .. "src/mame/video/vigilant.cpp",
+	MAME_DIR .. "src/mame/machine/irem_cpu.cpp",
+	MAME_DIR .. "src/mame/audio/irem.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "itech")
 files {
-	MAME_DIR .. "src/mame/drivers/capbowl.c",
-	MAME_DIR .. "src/mame/video/capbowl.c",
-	MAME_DIR .. "src/mame/drivers/itech8.c",
-	MAME_DIR .. "src/mame/machine/slikshot.c",
-	MAME_DIR .. "src/mame/video/itech8.c",
-	MAME_DIR .. "src/mame/drivers/itech32.c",
-	MAME_DIR .. "src/mame/video/itech32.c",
-	MAME_DIR .. "src/mame/drivers/iteagle.c",
-	MAME_DIR .. "src/mame/machine/iteagle_fpga.c",
+	MAME_DIR .. "src/mame/drivers/capbowl.cpp",
+	MAME_DIR .. "src/mame/video/capbowl.cpp",
+	MAME_DIR .. "src/mame/drivers/itech8.cpp",
+	MAME_DIR .. "src/mame/machine/slikshot.cpp",
+	MAME_DIR .. "src/mame/video/itech8.cpp",
+	MAME_DIR .. "src/mame/drivers/itech32.cpp",
+	MAME_DIR .. "src/mame/video/itech32.cpp",
+	MAME_DIR .. "src/mame/drivers/iteagle.cpp",
+	MAME_DIR .. "src/mame/machine/iteagle_fpga.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "jaleco")
 files {
-	MAME_DIR .. "src/mame/drivers/aeroboto.c",
-	MAME_DIR .. "src/mame/video/aeroboto.c",
-	MAME_DIR .. "src/mame/drivers/argus.c",
-	MAME_DIR .. "src/mame/video/argus.c",
-	MAME_DIR .. "src/mame/drivers/bestleag.c",
-	MAME_DIR .. "src/mame/drivers/bigstrkb.c",
-	MAME_DIR .. "src/mame/video/bigstrkb.c",
-	MAME_DIR .. "src/mame/drivers/blueprnt.c",
-	MAME_DIR .. "src/mame/video/blueprnt.c",
-	MAME_DIR .. "src/mame/drivers/bnstars.c",
-	MAME_DIR .. "src/mame/drivers/cischeat.c",
-	MAME_DIR .. "src/mame/video/cischeat.c",
-	MAME_DIR .. "src/mame/drivers/citycon.c",
-	MAME_DIR .. "src/mame/video/citycon.c",
-	MAME_DIR .. "src/mame/drivers/ddayjlc.c",
-	MAME_DIR .. "src/mame/drivers/exerion.c",
-	MAME_DIR .. "src/mame/video/exerion.c",
-	MAME_DIR .. "src/mame/drivers/fcombat.c",
-	MAME_DIR .. "src/mame/video/fcombat.c",
-	MAME_DIR .. "src/mame/drivers/ginganin.c",
-	MAME_DIR .. "src/mame/video/ginganin.c",
-	MAME_DIR .. "src/mame/drivers/homerun.c",
-	MAME_DIR .. "src/mame/video/homerun.c",
-	MAME_DIR .. "src/mame/drivers/megasys1.c",
-	MAME_DIR .. "src/mame/video/megasys1.c",
-	MAME_DIR .. "src/mame/drivers/momoko.c",
-	MAME_DIR .. "src/mame/video/momoko.c",
-	MAME_DIR .. "src/mame/drivers/ms32.c",
-	MAME_DIR .. "src/mame/video/ms32.c",
-	MAME_DIR .. "src/mame/drivers/psychic5.c",
-	MAME_DIR .. "src/mame/video/psychic5.c",
-	MAME_DIR .. "src/mame/drivers/pturn.c",
-	MAME_DIR .. "src/mame/drivers/skyfox.c",
-	MAME_DIR .. "src/mame/video/skyfox.c",
-	MAME_DIR .. "src/mame/drivers/tetrisp2.c",
-	MAME_DIR .. "src/mame/video/tetrisp2.c",
-	MAME_DIR .. "src/mame/machine/jalcrpt.c",
-	MAME_DIR .. "src/mame/video/jalblend.c",
+	MAME_DIR .. "src/mame/drivers/aeroboto.cpp",
+	MAME_DIR .. "src/mame/video/aeroboto.cpp",
+	MAME_DIR .. "src/mame/drivers/argus.cpp",
+	MAME_DIR .. "src/mame/video/argus.cpp",
+	MAME_DIR .. "src/mame/drivers/bestleag.cpp",
+	MAME_DIR .. "src/mame/drivers/bigstrkb.cpp",
+	MAME_DIR .. "src/mame/video/bigstrkb.cpp",
+	MAME_DIR .. "src/mame/drivers/blueprnt.cpp",
+	MAME_DIR .. "src/mame/video/blueprnt.cpp",
+	MAME_DIR .. "src/mame/drivers/bnstars.cpp",
+	MAME_DIR .. "src/mame/drivers/cischeat.cpp",
+	MAME_DIR .. "src/mame/video/cischeat.cpp",
+	MAME_DIR .. "src/mame/drivers/citycon.cpp",
+	MAME_DIR .. "src/mame/video/citycon.cpp",
+	MAME_DIR .. "src/mame/drivers/ddayjlc.cpp",
+	MAME_DIR .. "src/mame/drivers/exerion.cpp",
+	MAME_DIR .. "src/mame/video/exerion.cpp",
+	MAME_DIR .. "src/mame/drivers/fcombat.cpp",
+	MAME_DIR .. "src/mame/video/fcombat.cpp",
+	MAME_DIR .. "src/mame/drivers/ginganin.cpp",
+	MAME_DIR .. "src/mame/video/ginganin.cpp",
+	MAME_DIR .. "src/mame/drivers/homerun.cpp",
+	MAME_DIR .. "src/mame/video/homerun.cpp",
+	MAME_DIR .. "src/mame/drivers/megasys1.cpp",
+	MAME_DIR .. "src/mame/video/megasys1.cpp",
+	MAME_DIR .. "src/mame/drivers/momoko.cpp",
+	MAME_DIR .. "src/mame/video/momoko.cpp",
+	MAME_DIR .. "src/mame/drivers/ms32.cpp",
+	MAME_DIR .. "src/mame/video/ms32.cpp",
+	MAME_DIR .. "src/mame/drivers/psychic5.cpp",
+	MAME_DIR .. "src/mame/video/psychic5.cpp",
+	MAME_DIR .. "src/mame/drivers/pturn.cpp",
+	MAME_DIR .. "src/mame/drivers/skyfox.cpp",
+	MAME_DIR .. "src/mame/video/skyfox.cpp",
+	MAME_DIR .. "src/mame/drivers/tetrisp2.cpp",
+	MAME_DIR .. "src/mame/video/tetrisp2.cpp",
+	MAME_DIR .. "src/mame/machine/jalcrpt.cpp",
+	MAME_DIR .. "src/mame/video/jalblend.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "jpm")
 files {
-	MAME_DIR .. "src/mame/drivers/guab.c",
-	MAME_DIR .. "src/mame/drivers/jpmsys5.c",
-	MAME_DIR .. "src/mame/drivers/jpmsys5sw.c",
-	MAME_DIR .. "src/mame/drivers/jpmmps.c",
-	MAME_DIR .. "src/mame/drivers/jpms80.c",
-	MAME_DIR .. "src/mame/drivers/jpmsru.c",
-	MAME_DIR .. "src/mame/drivers/jpmimpct.c",
-	MAME_DIR .. "src/mame/video/jpmimpct.c",
-	MAME_DIR .. "src/mame/drivers/jpmimpctsw.c",
-	MAME_DIR .. "src/mame/drivers/pluto5.c",
-	MAME_DIR .. "src/mame/drivers/jpmsys7.c",
-	MAME_DIR .. "src/mame/video/awpvid.c",
-	MAME_DIR .. "src/mame/machine/meters.c",
+	MAME_DIR .. "src/mame/drivers/guab.cpp",
+	MAME_DIR .. "src/mame/drivers/jpmsys5.cpp",
+	MAME_DIR .. "src/mame/drivers/jpmsys5sw.cpp",
+	MAME_DIR .. "src/mame/drivers/jpmmps.cpp",
+	MAME_DIR .. "src/mame/drivers/jpms80.cpp",
+	MAME_DIR .. "src/mame/drivers/jpmsru.cpp",
+	MAME_DIR .. "src/mame/drivers/jpmimpct.cpp",
+	MAME_DIR .. "src/mame/video/jpmimpct.cpp",
+	MAME_DIR .. "src/mame/drivers/jpmimpctsw.cpp",
+	MAME_DIR .. "src/mame/drivers/pluto5.cpp",
+	MAME_DIR .. "src/mame/drivers/jpmsys7.cpp",
+	MAME_DIR .. "src/mame/video/awpvid.cpp",
+	MAME_DIR .. "src/mame/machine/meters.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "kaneko")
 files {
-	MAME_DIR .. "src/mame/drivers/airbustr.c",
-	MAME_DIR .. "src/mame/video/airbustr.c",
-	MAME_DIR .. "src/mame/drivers/djboy.c",
-	MAME_DIR .. "src/mame/video/djboy.c",
-	MAME_DIR .. "src/mame/drivers/expro02.c",
-	MAME_DIR .. "src/mame/drivers/galpanic.c",
-	MAME_DIR .. "src/mame/video/galpanic.c",
-	MAME_DIR .. "src/mame/drivers/galpani2.c",
-	MAME_DIR .. "src/mame/video/galpani2.c",
-	MAME_DIR .. "src/mame/drivers/galpani3.c",
-	MAME_DIR .. "src/mame/video/kaneko_grap2.c",
-	MAME_DIR .. "src/mame/drivers/hvyunit.c",
-	MAME_DIR .. "src/mame/drivers/jchan.c",
-	MAME_DIR .. "src/mame/drivers/kaneko16.c",
-	MAME_DIR .. "src/mame/video/kaneko16.c",
-	MAME_DIR .. "src/mame/video/kaneko_tmap.c",
-	MAME_DIR .. "src/mame/video/kaneko_spr.c",
-	MAME_DIR .. "src/mame/machine/kaneko_hit.c",
-	MAME_DIR .. "src/mame/machine/kaneko_calc3.c",
-	MAME_DIR .. "src/mame/machine/kaneko_toybox.c",
-	MAME_DIR .. "src/mame/drivers/sandscrp.c",
-	MAME_DIR .. "src/mame/drivers/suprnova.c",
-	MAME_DIR .. "src/mame/video/suprnova.c",
-	MAME_DIR .. "src/mame/video/sknsspr.c",
+	MAME_DIR .. "src/mame/drivers/airbustr.cpp",
+	MAME_DIR .. "src/mame/video/airbustr.cpp",
+	MAME_DIR .. "src/mame/drivers/djboy.cpp",
+	MAME_DIR .. "src/mame/video/djboy.cpp",
+	MAME_DIR .. "src/mame/drivers/expro02.cpp",
+	MAME_DIR .. "src/mame/drivers/galpanic.cpp",
+	MAME_DIR .. "src/mame/video/galpanic.cpp",
+	MAME_DIR .. "src/mame/drivers/galpani2.cpp",
+	MAME_DIR .. "src/mame/video/galpani2.cpp",
+	MAME_DIR .. "src/mame/drivers/galpani3.cpp",
+	MAME_DIR .. "src/mame/video/kaneko_grap2.cpp",
+	MAME_DIR .. "src/mame/drivers/hvyunit.cpp",
+	MAME_DIR .. "src/mame/drivers/jchan.cpp",
+	MAME_DIR .. "src/mame/drivers/kaneko16.cpp",
+	MAME_DIR .. "src/mame/video/kaneko16.cpp",
+	MAME_DIR .. "src/mame/video/kaneko_tmap.cpp",
+	MAME_DIR .. "src/mame/video/kaneko_spr.cpp",
+	MAME_DIR .. "src/mame/machine/kaneko_hit.cpp",
+	MAME_DIR .. "src/mame/machine/kaneko_calc3.cpp",
+	MAME_DIR .. "src/mame/machine/kaneko_toybox.cpp",
+	MAME_DIR .. "src/mame/drivers/sandscrp.cpp",
+	MAME_DIR .. "src/mame/drivers/suprnova.cpp",
+	MAME_DIR .. "src/mame/video/suprnova.cpp",
+	MAME_DIR .. "src/mame/video/sknsspr.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "konami")
 files {
-	MAME_DIR .. "src/mame/drivers/88games.c",
-	MAME_DIR .. "src/mame/video/88games.c",
-	MAME_DIR .. "src/mame/drivers/ajax.c",
-	MAME_DIR .. "src/mame/machine/ajax.c",
-	MAME_DIR .. "src/mame/video/ajax.c",
-	MAME_DIR .. "src/mame/drivers/aliens.c",
-	MAME_DIR .. "src/mame/video/aliens.c",
-	MAME_DIR .. "src/mame/drivers/asterix.c",
-	MAME_DIR .. "src/mame/video/asterix.c",
-	MAME_DIR .. "src/mame/drivers/battlnts.c",
-	MAME_DIR .. "src/mame/video/battlnts.c",
-	MAME_DIR .. "src/mame/drivers/bishi.c",
-	MAME_DIR .. "src/mame/video/bishi.c",
-	MAME_DIR .. "src/mame/drivers/bladestl.c",
-	MAME_DIR .. "src/mame/video/bladestl.c",
-	MAME_DIR .. "src/mame/drivers/blockhl.c",
-	MAME_DIR .. "src/mame/drivers/bottom9.c",
-	MAME_DIR .. "src/mame/video/bottom9.c",
-	MAME_DIR .. "src/mame/drivers/chqflag.c",
-	MAME_DIR .. "src/mame/video/chqflag.c",
-	MAME_DIR .. "src/mame/drivers/circusc.c",
-	MAME_DIR .. "src/mame/video/circusc.c",
-	MAME_DIR .. "src/mame/drivers/cobra.c",
-	MAME_DIR .. "src/mame/drivers/combatsc.c",
-	MAME_DIR .. "src/mame/video/combatsc.c",
-	MAME_DIR .. "src/mame/drivers/contra.c",
-	MAME_DIR .. "src/mame/video/contra.c",
-	MAME_DIR .. "src/mame/drivers/crimfght.c",
-	MAME_DIR .. "src/mame/video/crimfght.c",
-	MAME_DIR .. "src/mame/drivers/dbz.c",
-	MAME_DIR .. "src/mame/video/dbz.c",
-	MAME_DIR .. "src/mame/drivers/ddribble.c",
-	MAME_DIR .. "src/mame/video/ddribble.c",
-	MAME_DIR .. "src/mame/drivers/djmain.c",
-	MAME_DIR .. "src/mame/video/djmain.c",
-	MAME_DIR .. "src/mame/drivers/fastfred.c",
-	MAME_DIR .. "src/mame/video/fastfred.c",
-	MAME_DIR .. "src/mame/drivers/fastlane.c",
-	MAME_DIR .. "src/mame/video/fastlane.c",
-	MAME_DIR .. "src/mame/drivers/finalizr.c",
-	MAME_DIR .. "src/mame/video/finalizr.c",
-	MAME_DIR .. "src/mame/drivers/firebeat.c",
-	MAME_DIR .. "src/mame/machine/midikbd.c",
-	MAME_DIR .. "src/mame/drivers/flkatck.c",
-	MAME_DIR .. "src/mame/video/flkatck.c",
-	MAME_DIR .. "src/mame/drivers/gberet.c",
-	MAME_DIR .. "src/mame/video/gberet.c",
-	MAME_DIR .. "src/mame/drivers/gijoe.c",
-	MAME_DIR .. "src/mame/video/gijoe.c",
-	MAME_DIR .. "src/mame/drivers/gradius3.c",
-	MAME_DIR .. "src/mame/video/gradius3.c",
-	MAME_DIR .. "src/mame/drivers/gticlub.c",
-	MAME_DIR .. "src/mame/drivers/gyruss.c",
-	MAME_DIR .. "src/mame/video/gyruss.c",
-	MAME_DIR .. "src/mame/drivers/hcastle.c",
-	MAME_DIR .. "src/mame/video/hcastle.c",
-	MAME_DIR .. "src/mame/drivers/hexion.c",
-	MAME_DIR .. "src/mame/video/hexion.c",
-	MAME_DIR .. "src/mame/drivers/hornet.c",
-	MAME_DIR .. "src/mame/machine/konppc.c",
-	MAME_DIR .. "src/mame/drivers/hyperspt.c",
-	MAME_DIR .. "src/mame/audio/hyprolyb.c",
-	MAME_DIR .. "src/mame/video/hyperspt.c",
-	MAME_DIR .. "src/mame/drivers/ironhors.c",
-	MAME_DIR .. "src/mame/video/ironhors.c",
-	MAME_DIR .. "src/mame/drivers/jackal.c",
-	MAME_DIR .. "src/mame/video/jackal.c",
-	MAME_DIR .. "src/mame/drivers/jailbrek.c",
-	MAME_DIR .. "src/mame/video/jailbrek.c",
-	MAME_DIR .. "src/mame/drivers/junofrst.c",
-	MAME_DIR .. "src/mame/drivers/konamigq.c",
-	MAME_DIR .. "src/mame/drivers/konamigv.c",
-	MAME_DIR .. "src/mame/drivers/konamigx.c",
-	MAME_DIR .. "src/mame/machine/konamigx.c",
-	MAME_DIR .. "src/mame/video/konamigx.c",
-	MAME_DIR .. "src/mame/drivers/konamim2.c",
-	MAME_DIR .. "src/mame/drivers/kontest.c",
-	MAME_DIR .. "src/mame/drivers/konendev.c",
-	MAME_DIR .. "src/mame/drivers/ksys573.c",
-	MAME_DIR .. "src/mame/machine/k573cass.c",
-	MAME_DIR .. "src/mame/machine/k573dio.c",
-	MAME_DIR .. "src/mame/machine/k573mcr.c",
-	MAME_DIR .. "src/mame/machine/k573msu.c",
-	MAME_DIR .. "src/mame/machine/k573npu.c",
-	MAME_DIR .. "src/mame/machine/zs01.c",
-	MAME_DIR .. "src/mame/drivers/labyrunr.c",
-	MAME_DIR .. "src/mame/video/labyrunr.c",
-	MAME_DIR .. "src/mame/drivers/lethal.c",
-	MAME_DIR .. "src/mame/video/lethal.c",
-	MAME_DIR .. "src/mame/drivers/mainevt.c",
-	MAME_DIR .. "src/mame/video/mainevt.c",
-	MAME_DIR .. "src/mame/drivers/megazone.c",
-	MAME_DIR .. "src/mame/video/megazone.c",
-	MAME_DIR .. "src/mame/drivers/mikie.c",
-	MAME_DIR .. "src/mame/video/mikie.c",
-	MAME_DIR .. "src/mame/drivers/mogura.c",
-	MAME_DIR .. "src/mame/drivers/moo.c",
-	MAME_DIR .. "src/mame/video/moo.c",
-	MAME_DIR .. "src/mame/drivers/mystwarr.c",
-	MAME_DIR .. "src/mame/video/mystwarr.c",
-	MAME_DIR .. "src/mame/drivers/nemesis.c",
-	MAME_DIR .. "src/mame/video/nemesis.c",
-	MAME_DIR .. "src/mame/drivers/nwk-tr.c",
-	MAME_DIR .. "src/mame/drivers/overdriv.c",
-	MAME_DIR .. "src/mame/video/overdriv.c",
-	MAME_DIR .. "src/mame/drivers/pandoras.c",
-	MAME_DIR .. "src/mame/video/pandoras.c",
-	MAME_DIR .. "src/mame/drivers/parodius.c",
-	MAME_DIR .. "src/mame/video/parodius.c",
-	MAME_DIR .. "src/mame/drivers/pingpong.c",
-	MAME_DIR .. "src/mame/video/pingpong.c",
-	MAME_DIR .. "src/mame/drivers/plygonet.c",
-	MAME_DIR .. "src/mame/video/plygonet.c",
-	MAME_DIR .. "src/mame/drivers/pooyan.c",
-	MAME_DIR .. "src/mame/video/pooyan.c",
-	MAME_DIR .. "src/mame/drivers/pyson.c",
-	MAME_DIR .. "src/mame/drivers/qdrmfgp.c",
-	MAME_DIR .. "src/mame/video/qdrmfgp.c",
-	MAME_DIR .. "src/mame/drivers/rockrage.c",
-	MAME_DIR .. "src/mame/video/rockrage.c",
-	MAME_DIR .. "src/mame/drivers/rocnrope.c",
-	MAME_DIR .. "src/mame/video/rocnrope.c",
-	MAME_DIR .. "src/mame/drivers/rollerg.c",
-	MAME_DIR .. "src/mame/video/rollerg.c",
-	MAME_DIR .. "src/mame/drivers/rungun.c",
-	MAME_DIR .. "src/mame/video/rungun.c",
-	MAME_DIR .. "src/mame/drivers/sbasketb.c",
-	MAME_DIR .. "src/mame/video/sbasketb.c",
-	MAME_DIR .. "src/mame/drivers/scobra.c",
-	MAME_DIR .. "src/mame/drivers/scotrsht.c",
-	MAME_DIR .. "src/mame/video/scotrsht.c",
-	MAME_DIR .. "src/mame/drivers/scramble.c",
-	MAME_DIR .. "src/mame/machine/scramble.c",
-	MAME_DIR .. "src/mame/audio/scramble.c",
-	MAME_DIR .. "src/mame/drivers/shaolins.c",
-	MAME_DIR .. "src/mame/video/shaolins.c",
-	MAME_DIR .. "src/mame/drivers/simpsons.c",
-	MAME_DIR .. "src/mame/machine/simpsons.c",
-	MAME_DIR .. "src/mame/video/simpsons.c",
-	MAME_DIR .. "src/mame/drivers/spy.c",
-	MAME_DIR .. "src/mame/video/spy.c",
-	MAME_DIR .. "src/mame/drivers/surpratk.c",
-	MAME_DIR .. "src/mame/video/surpratk.c",
-	MAME_DIR .. "src/mame/drivers/tasman.c",
-	MAME_DIR .. "src/mame/drivers/tgtpanic.c",
-	MAME_DIR .. "src/mame/drivers/thunderx.c",
-	MAME_DIR .. "src/mame/video/thunderx.c",
-	MAME_DIR .. "src/mame/drivers/timeplt.c",
-	MAME_DIR .. "src/mame/audio/timeplt.c",
-	MAME_DIR .. "src/mame/video/timeplt.c",
-	MAME_DIR .. "src/mame/drivers/tmnt.c",
-	MAME_DIR .. "src/mame/video/tmnt.c",
-	MAME_DIR .. "src/mame/drivers/tp84.c",
-	MAME_DIR .. "src/mame/video/tp84.c",
-	MAME_DIR .. "src/mame/drivers/trackfld.c",
-	MAME_DIR .. "src/mame/machine/konami1.c",
-	MAME_DIR .. "src/mame/audio/trackfld.c",
-	MAME_DIR .. "src/mame/video/trackfld.c",
-	MAME_DIR .. "src/mame/drivers/tutankhm.c",
-	MAME_DIR .. "src/mame/video/tutankhm.c",
-	MAME_DIR .. "src/mame/drivers/twin16.c",
-	MAME_DIR .. "src/mame/video/twin16.c",
-	MAME_DIR .. "src/mame/drivers/twinkle.c",
-	MAME_DIR .. "src/mame/drivers/ultrsprt.c",
-	MAME_DIR .. "src/mame/drivers/ultraman.c",
-	MAME_DIR .. "src/mame/video/ultraman.c",
-	MAME_DIR .. "src/mame/drivers/vendetta.c",
-	MAME_DIR .. "src/mame/video/vendetta.c",
-	MAME_DIR .. "src/mame/drivers/viper.c",
-	MAME_DIR .. "src/mame/drivers/wecleman.c",
-	MAME_DIR .. "src/mame/video/wecleman.c",
-	MAME_DIR .. "src/mame/drivers/xexex.c",
-	MAME_DIR .. "src/mame/video/xexex.c",
-	MAME_DIR .. "src/mame/drivers/xmen.c",
-	MAME_DIR .. "src/mame/video/xmen.c",
-	MAME_DIR .. "src/mame/drivers/yiear.c",
-	MAME_DIR .. "src/mame/video/yiear.c",
-	MAME_DIR .. "src/mame/drivers/zr107.c",
-	MAME_DIR .. "src/mame/video/konami_helper.c",
-	MAME_DIR .. "src/mame/video/k007121.c",
-	MAME_DIR .. "src/mame/video/k007342.c",
-	MAME_DIR .. "src/mame/video/k007420.c",
-	MAME_DIR .. "src/mame/video/k037122.c",
-	MAME_DIR .. "src/mame/video/k051316.c",
-	MAME_DIR .. "src/mame/video/k051733.c",
-	MAME_DIR .. "src/mame/video/k051960.c",
-	MAME_DIR .. "src/mame/video/k052109.c",
-	MAME_DIR .. "src/mame/video/k053250.c",
-	MAME_DIR .. "src/mame/video/k053251.c",
-	MAME_DIR .. "src/mame/video/k054156_k054157_k056832.c",
-	MAME_DIR .. "src/mame/video/k053244_k053245.c",
-	MAME_DIR .. "src/mame/video/k053246_k053247_k055673.c",
-	MAME_DIR .. "src/mame/video/k055555.c",
-	MAME_DIR .. "src/mame/video/k054000.c",
-	MAME_DIR .. "src/mame/video/k054338.c",
-	MAME_DIR .. "src/mame/video/k053936.c",
-	MAME_DIR .. "src/mame/video/k001006.c",
-	MAME_DIR .. "src/mame/video/k001005.c",
-	MAME_DIR .. "src/mame/video/k001604.c",
-	MAME_DIR .. "src/mame/video/k057714.c",
+	MAME_DIR .. "src/mame/drivers/88games.cpp",
+	MAME_DIR .. "src/mame/video/88games.cpp",
+	MAME_DIR .. "src/mame/drivers/ajax.cpp",
+	MAME_DIR .. "src/mame/machine/ajax.cpp",
+	MAME_DIR .. "src/mame/video/ajax.cpp",
+	MAME_DIR .. "src/mame/drivers/aliens.cpp",
+	MAME_DIR .. "src/mame/video/aliens.cpp",
+	MAME_DIR .. "src/mame/drivers/asterix.cpp",
+	MAME_DIR .. "src/mame/video/asterix.cpp",
+	MAME_DIR .. "src/mame/drivers/battlnts.cpp",
+	MAME_DIR .. "src/mame/video/battlnts.cpp",
+	MAME_DIR .. "src/mame/drivers/bishi.cpp",
+	MAME_DIR .. "src/mame/video/bishi.cpp",
+	MAME_DIR .. "src/mame/drivers/bladestl.cpp",
+	MAME_DIR .. "src/mame/video/bladestl.cpp",
+	MAME_DIR .. "src/mame/drivers/blockhl.cpp",
+	MAME_DIR .. "src/mame/drivers/bottom9.cpp",
+	MAME_DIR .. "src/mame/video/bottom9.cpp",
+	MAME_DIR .. "src/mame/drivers/chqflag.cpp",
+	MAME_DIR .. "src/mame/video/chqflag.cpp",
+	MAME_DIR .. "src/mame/drivers/circusc.cpp",
+	MAME_DIR .. "src/mame/video/circusc.cpp",
+	MAME_DIR .. "src/mame/drivers/cobra.cpp",
+	MAME_DIR .. "src/mame/drivers/combatsc.cpp",
+	MAME_DIR .. "src/mame/video/combatsc.cpp",
+	MAME_DIR .. "src/mame/drivers/contra.cpp",
+	MAME_DIR .. "src/mame/video/contra.cpp",
+	MAME_DIR .. "src/mame/drivers/crimfght.cpp",
+	MAME_DIR .. "src/mame/video/crimfght.cpp",
+	MAME_DIR .. "src/mame/drivers/dbz.cpp",
+	MAME_DIR .. "src/mame/video/dbz.cpp",
+	MAME_DIR .. "src/mame/drivers/ddribble.cpp",
+	MAME_DIR .. "src/mame/video/ddribble.cpp",
+	MAME_DIR .. "src/mame/drivers/djmain.cpp",
+	MAME_DIR .. "src/mame/video/djmain.cpp",
+	MAME_DIR .. "src/mame/drivers/fastfred.cpp",
+	MAME_DIR .. "src/mame/video/fastfred.cpp",
+	MAME_DIR .. "src/mame/drivers/fastlane.cpp",
+	MAME_DIR .. "src/mame/video/fastlane.cpp",
+	MAME_DIR .. "src/mame/drivers/finalizr.cpp",
+	MAME_DIR .. "src/mame/video/finalizr.cpp",
+	MAME_DIR .. "src/mame/drivers/firebeat.cpp",
+	MAME_DIR .. "src/mame/machine/midikbd.cpp",
+	MAME_DIR .. "src/mame/drivers/flkatck.cpp",
+	MAME_DIR .. "src/mame/video/flkatck.cpp",
+	MAME_DIR .. "src/mame/drivers/gberet.cpp",
+	MAME_DIR .. "src/mame/video/gberet.cpp",
+	MAME_DIR .. "src/mame/drivers/gijoe.cpp",
+	MAME_DIR .. "src/mame/video/gijoe.cpp",
+	MAME_DIR .. "src/mame/drivers/gradius3.cpp",
+	MAME_DIR .. "src/mame/video/gradius3.cpp",
+	MAME_DIR .. "src/mame/drivers/gticlub.cpp",
+	MAME_DIR .. "src/mame/drivers/gyruss.cpp",
+	MAME_DIR .. "src/mame/video/gyruss.cpp",
+	MAME_DIR .. "src/mame/drivers/hcastle.cpp",
+	MAME_DIR .. "src/mame/video/hcastle.cpp",
+	MAME_DIR .. "src/mame/drivers/hexion.cpp",
+	MAME_DIR .. "src/mame/video/hexion.cpp",
+	MAME_DIR .. "src/mame/drivers/hornet.cpp",
+	MAME_DIR .. "src/mame/machine/konppc.cpp",
+	MAME_DIR .. "src/mame/drivers/hyperspt.cpp",
+	MAME_DIR .. "src/mame/audio/hyprolyb.cpp",
+	MAME_DIR .. "src/mame/video/hyperspt.cpp",
+	MAME_DIR .. "src/mame/drivers/ironhors.cpp",
+	MAME_DIR .. "src/mame/video/ironhors.cpp",
+	MAME_DIR .. "src/mame/drivers/jackal.cpp",
+	MAME_DIR .. "src/mame/video/jackal.cpp",
+	MAME_DIR .. "src/mame/drivers/jailbrek.cpp",
+	MAME_DIR .. "src/mame/video/jailbrek.cpp",
+	MAME_DIR .. "src/mame/drivers/junofrst.cpp",
+	MAME_DIR .. "src/mame/drivers/konamigq.cpp",
+	MAME_DIR .. "src/mame/drivers/konamigv.cpp",
+	MAME_DIR .. "src/mame/drivers/konamigx.cpp",
+	MAME_DIR .. "src/mame/machine/konamigx.cpp",
+	MAME_DIR .. "src/mame/video/konamigx.cpp",
+	MAME_DIR .. "src/mame/drivers/konamim2.cpp",
+	MAME_DIR .. "src/mame/drivers/kontest.cpp",
+	MAME_DIR .. "src/mame/drivers/konendev.cpp",
+	MAME_DIR .. "src/mame/drivers/ksys573.cpp",
+	MAME_DIR .. "src/mame/machine/k573cass.cpp",
+	MAME_DIR .. "src/mame/machine/k573dio.cpp",
+	MAME_DIR .. "src/mame/machine/k573mcr.cpp",
+	MAME_DIR .. "src/mame/machine/k573msu.cpp",
+	MAME_DIR .. "src/mame/machine/k573npu.cpp",
+	MAME_DIR .. "src/mame/machine/zs01.cpp",
+	MAME_DIR .. "src/mame/drivers/labyrunr.cpp",
+	MAME_DIR .. "src/mame/video/labyrunr.cpp",
+	MAME_DIR .. "src/mame/drivers/lethal.cpp",
+	MAME_DIR .. "src/mame/video/lethal.cpp",
+	MAME_DIR .. "src/mame/drivers/mainevt.cpp",
+	MAME_DIR .. "src/mame/video/mainevt.cpp",
+	MAME_DIR .. "src/mame/drivers/megazone.cpp",
+	MAME_DIR .. "src/mame/video/megazone.cpp",
+	MAME_DIR .. "src/mame/drivers/mikie.cpp",
+	MAME_DIR .. "src/mame/video/mikie.cpp",
+	MAME_DIR .. "src/mame/drivers/mogura.cpp",
+	MAME_DIR .. "src/mame/drivers/moo.cpp",
+	MAME_DIR .. "src/mame/video/moo.cpp",
+	MAME_DIR .. "src/mame/drivers/mystwarr.cpp",
+	MAME_DIR .. "src/mame/video/mystwarr.cpp",
+	MAME_DIR .. "src/mame/drivers/nemesis.cpp",
+	MAME_DIR .. "src/mame/video/nemesis.cpp",
+	MAME_DIR .. "src/mame/drivers/nwk-tr.cpp",
+	MAME_DIR .. "src/mame/drivers/overdriv.cpp",
+	MAME_DIR .. "src/mame/video/overdriv.cpp",
+	MAME_DIR .. "src/mame/drivers/pandoras.cpp",
+	MAME_DIR .. "src/mame/video/pandoras.cpp",
+	MAME_DIR .. "src/mame/drivers/parodius.cpp",
+	MAME_DIR .. "src/mame/video/parodius.cpp",
+	MAME_DIR .. "src/mame/drivers/pingpong.cpp",
+	MAME_DIR .. "src/mame/video/pingpong.cpp",
+	MAME_DIR .. "src/mame/drivers/plygonet.cpp",
+	MAME_DIR .. "src/mame/video/plygonet.cpp",
+	MAME_DIR .. "src/mame/drivers/pooyan.cpp",
+	MAME_DIR .. "src/mame/video/pooyan.cpp",
+	MAME_DIR .. "src/mame/drivers/pyson.cpp",
+	MAME_DIR .. "src/mame/drivers/qdrmfgp.cpp",
+	MAME_DIR .. "src/mame/video/qdrmfgp.cpp",
+	MAME_DIR .. "src/mame/drivers/rockrage.cpp",
+	MAME_DIR .. "src/mame/video/rockrage.cpp",
+	MAME_DIR .. "src/mame/drivers/rocnrope.cpp",
+	MAME_DIR .. "src/mame/video/rocnrope.cpp",
+	MAME_DIR .. "src/mame/drivers/rollerg.cpp",
+	MAME_DIR .. "src/mame/video/rollerg.cpp",
+	MAME_DIR .. "src/mame/drivers/rungun.cpp",
+	MAME_DIR .. "src/mame/video/rungun.cpp",
+	MAME_DIR .. "src/mame/drivers/sbasketb.cpp",
+	MAME_DIR .. "src/mame/video/sbasketb.cpp",
+	MAME_DIR .. "src/mame/drivers/scobra.cpp",
+	MAME_DIR .. "src/mame/drivers/scotrsht.cpp",
+	MAME_DIR .. "src/mame/video/scotrsht.cpp",
+	MAME_DIR .. "src/mame/drivers/scramble.cpp",
+	MAME_DIR .. "src/mame/machine/scramble.cpp",
+	MAME_DIR .. "src/mame/audio/scramble.cpp",
+	MAME_DIR .. "src/mame/drivers/shaolins.cpp",
+	MAME_DIR .. "src/mame/video/shaolins.cpp",
+	MAME_DIR .. "src/mame/drivers/simpsons.cpp",
+	MAME_DIR .. "src/mame/machine/simpsons.cpp",
+	MAME_DIR .. "src/mame/video/simpsons.cpp",
+	MAME_DIR .. "src/mame/drivers/spy.cpp",
+	MAME_DIR .. "src/mame/video/spy.cpp",
+	MAME_DIR .. "src/mame/drivers/surpratk.cpp",
+	MAME_DIR .. "src/mame/video/surpratk.cpp",
+	MAME_DIR .. "src/mame/drivers/tasman.cpp",
+	MAME_DIR .. "src/mame/drivers/tgtpanic.cpp",
+	MAME_DIR .. "src/mame/drivers/thunderx.cpp",
+	MAME_DIR .. "src/mame/video/thunderx.cpp",
+	MAME_DIR .. "src/mame/drivers/timeplt.cpp",
+	MAME_DIR .. "src/mame/audio/timeplt.cpp",
+	MAME_DIR .. "src/mame/video/timeplt.cpp",
+	MAME_DIR .. "src/mame/drivers/tmnt.cpp",
+	MAME_DIR .. "src/mame/video/tmnt.cpp",
+	MAME_DIR .. "src/mame/drivers/tp84.cpp",
+	MAME_DIR .. "src/mame/video/tp84.cpp",
+	MAME_DIR .. "src/mame/drivers/trackfld.cpp",
+	MAME_DIR .. "src/mame/machine/konami1.cpp",
+	MAME_DIR .. "src/mame/audio/trackfld.cpp",
+	MAME_DIR .. "src/mame/video/trackfld.cpp",
+	MAME_DIR .. "src/mame/drivers/tutankhm.cpp",
+	MAME_DIR .. "src/mame/video/tutankhm.cpp",
+	MAME_DIR .. "src/mame/drivers/twin16.cpp",
+	MAME_DIR .. "src/mame/video/twin16.cpp",
+	MAME_DIR .. "src/mame/drivers/twinkle.cpp",
+	MAME_DIR .. "src/mame/drivers/ultrsprt.cpp",
+	MAME_DIR .. "src/mame/drivers/ultraman.cpp",
+	MAME_DIR .. "src/mame/video/ultraman.cpp",
+	MAME_DIR .. "src/mame/drivers/vendetta.cpp",
+	MAME_DIR .. "src/mame/video/vendetta.cpp",
+	MAME_DIR .. "src/mame/drivers/viper.cpp",
+	MAME_DIR .. "src/mame/drivers/wecleman.cpp",
+	MAME_DIR .. "src/mame/video/wecleman.cpp",
+	MAME_DIR .. "src/mame/drivers/xexex.cpp",
+	MAME_DIR .. "src/mame/video/xexex.cpp",
+	MAME_DIR .. "src/mame/drivers/xmen.cpp",
+	MAME_DIR .. "src/mame/video/xmen.cpp",
+	MAME_DIR .. "src/mame/drivers/yiear.cpp",
+	MAME_DIR .. "src/mame/video/yiear.cpp",
+	MAME_DIR .. "src/mame/drivers/zr107.cpp",
+	MAME_DIR .. "src/mame/video/konami_helper.cpp",
+	MAME_DIR .. "src/mame/video/k007121.cpp",
+	MAME_DIR .. "src/mame/video/k007342.cpp",
+	MAME_DIR .. "src/mame/video/k007420.cpp",
+	MAME_DIR .. "src/mame/video/k037122.cpp",
+	MAME_DIR .. "src/mame/video/k051316.cpp",
+	MAME_DIR .. "src/mame/video/k051733.cpp",
+	MAME_DIR .. "src/mame/video/k051960.cpp",
+	MAME_DIR .. "src/mame/video/k052109.cpp",
+	MAME_DIR .. "src/mame/video/k053250.cpp",
+	MAME_DIR .. "src/mame/video/k053251.cpp",
+	MAME_DIR .. "src/mame/video/k054156_k054157_k056832.cpp",
+	MAME_DIR .. "src/mame/video/k053244_k053245.cpp",
+	MAME_DIR .. "src/mame/video/k053246_k053247_k055673.cpp",
+	MAME_DIR .. "src/mame/video/k055555.cpp",
+	MAME_DIR .. "src/mame/video/k054000.cpp",
+	MAME_DIR .. "src/mame/video/k054338.cpp",
+	MAME_DIR .. "src/mame/video/k053936.cpp",
+	MAME_DIR .. "src/mame/video/k001006.cpp",
+	MAME_DIR .. "src/mame/video/k001005.cpp",
+	MAME_DIR .. "src/mame/video/k001604.cpp",
+	MAME_DIR .. "src/mame/video/k057714.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "matic")
 files {
-	MAME_DIR .. "src/mame/drivers/barata.c",
+	MAME_DIR .. "src/mame/drivers/barata.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "maygay")
 files {
-	MAME_DIR .. "src/mame/drivers/maygay1b.c",
-	MAME_DIR .. "src/mame/drivers/maygay1bsw.c",
-	MAME_DIR .. "src/mame/drivers/maygayv1.c",
-	MAME_DIR .. "src/mame/drivers/maygayep.c",
-	MAME_DIR .. "src/mame/drivers/maygaysw.c",
-	MAME_DIR .. "src/mame/drivers/mmm.c",
+	MAME_DIR .. "src/mame/drivers/maygay1b.cpp",
+	MAME_DIR .. "src/mame/drivers/maygay1bsw.cpp",
+	MAME_DIR .. "src/mame/drivers/maygayv1.cpp",
+	MAME_DIR .. "src/mame/drivers/maygayep.cpp",
+	MAME_DIR .. "src/mame/drivers/maygaysw.cpp",
+	MAME_DIR .. "src/mame/drivers/mmm.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "meadows")
 files {
-	MAME_DIR .. "src/mame/drivers/lazercmd.c",
-	MAME_DIR .. "src/mame/video/lazercmd.c",
-	MAME_DIR .. "src/mame/drivers/meadwttl.c",
-	MAME_DIR .. "src/mame/drivers/meadows.c",
-	MAME_DIR .. "src/mame/audio/meadows.c",
-	MAME_DIR .. "src/mame/video/meadows.c",
-	MAME_DIR .. "src/mame/drivers/warpsped.c",
+	MAME_DIR .. "src/mame/drivers/lazercmd.cpp",
+	MAME_DIR .. "src/mame/video/lazercmd.cpp",
+	MAME_DIR .. "src/mame/drivers/meadwttl.cpp",
+	MAME_DIR .. "src/mame/drivers/meadows.cpp",
+	MAME_DIR .. "src/mame/audio/meadows.cpp",
+	MAME_DIR .. "src/mame/video/meadows.cpp",
+	MAME_DIR .. "src/mame/drivers/warpsped.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "merit")
 files {
-	MAME_DIR .. "src/mame/drivers/mgames.c",
-	MAME_DIR .. "src/mame/drivers/merit.c",
-	MAME_DIR .. "src/mame/drivers/meritm.c",
+	MAME_DIR .. "src/mame/drivers/mgames.cpp",
+	MAME_DIR .. "src/mame/drivers/merit.cpp",
+	MAME_DIR .. "src/mame/drivers/meritm.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "metro")
 files {
-	MAME_DIR .. "src/mame/drivers/hyprduel.c",
-	MAME_DIR .. "src/mame/video/hyprduel.c",
-	MAME_DIR .. "src/mame/drivers/metro.c",
-	MAME_DIR .. "src/mame/video/metro.c",
-	MAME_DIR .. "src/mame/drivers/rabbit.c",
-	MAME_DIR .. "src/mame/drivers/tmmjprd.c",
+	MAME_DIR .. "src/mame/drivers/hyprduel.cpp",
+	MAME_DIR .. "src/mame/video/hyprduel.cpp",
+	MAME_DIR .. "src/mame/drivers/metro.cpp",
+	MAME_DIR .. "src/mame/video/metro.cpp",
+	MAME_DIR .. "src/mame/drivers/rabbit.cpp",
+	MAME_DIR .. "src/mame/drivers/tmmjprd.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "midcoin")
 files {
-	MAME_DIR .. "src/mame/drivers/wallc.c",
-	MAME_DIR .. "src/mame/drivers/wink.c",
-	MAME_DIR .. "src/mame/drivers/24cdjuke.c",
+	MAME_DIR .. "src/mame/drivers/wallc.cpp",
+	MAME_DIR .. "src/mame/drivers/wink.cpp",
+	MAME_DIR .. "src/mame/drivers/24cdjuke.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "midw8080")
 files {
-	MAME_DIR .. "src/mame/drivers/8080bw.c",
-	MAME_DIR .. "src/mame/audio/8080bw.c",
-	MAME_DIR .. "src/mame/video/8080bw.c",
-	MAME_DIR .. "src/mame/drivers/m79amb.c",
-	MAME_DIR .. "src/mame/audio/m79amb.c",
-	MAME_DIR .. "src/mame/drivers/mw8080bw.c",
-	MAME_DIR .. "src/mame/machine/mw8080bw.c",
-	MAME_DIR .. "src/mame/audio/mw8080bw.c",
-	MAME_DIR .. "src/mame/video/mw8080bw.c",
-	MAME_DIR .. "src/mame/drivers/rotaryf.c",
+	MAME_DIR .. "src/mame/drivers/8080bw.cpp",
+	MAME_DIR .. "src/mame/audio/8080bw.cpp",
+	MAME_DIR .. "src/mame/video/8080bw.cpp",
+	MAME_DIR .. "src/mame/drivers/m79amb.cpp",
+	MAME_DIR .. "src/mame/audio/m79amb.cpp",
+	MAME_DIR .. "src/mame/drivers/mw8080bw.cpp",
+	MAME_DIR .. "src/mame/machine/mw8080bw.cpp",
+	MAME_DIR .. "src/mame/audio/mw8080bw.cpp",
+	MAME_DIR .. "src/mame/video/mw8080bw.cpp",
+	MAME_DIR .. "src/mame/drivers/rotaryf.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "midway")
 files {
-	MAME_DIR .. "src/mame/drivers/astrocde.c",
-	MAME_DIR .. "src/mame/video/astrocde.c",
-	MAME_DIR .. "src/mame/audio/gorf.c",
-	MAME_DIR .. "src/mame/audio/wow.c",
-	MAME_DIR .. "src/mame/drivers/atlantis.c",
-	MAME_DIR .. "src/mame/drivers/balsente.c",
-	MAME_DIR .. "src/mame/machine/balsente.c",
-	MAME_DIR .. "src/mame/video/balsente.c",
-	MAME_DIR .. "src/mame/drivers/gridlee.c",
-	MAME_DIR .. "src/mame/audio/gridlee.c",
-	MAME_DIR .. "src/mame/video/gridlee.c",
-	MAME_DIR .. "src/mame/drivers/mcr.c",
-	MAME_DIR .. "src/mame/machine/mcr.c",
-	MAME_DIR .. "src/mame/video/mcr.c",
-	MAME_DIR .. "src/mame/drivers/mcr3.c",
-	MAME_DIR .. "src/mame/video/mcr3.c",
-	MAME_DIR .. "src/mame/drivers/mcr68.c",
-	MAME_DIR .. "src/mame/machine/mcr68.c",
-	MAME_DIR .. "src/mame/video/mcr68.c",
-	MAME_DIR .. "src/mame/drivers/midqslvr.c",
-	MAME_DIR .. "src/mame/drivers/midtunit.c",
-	MAME_DIR .. "src/mame/machine/midtunit.c",
-	MAME_DIR .. "src/mame/video/midtunit.c",
-	MAME_DIR .. "src/mame/drivers/midvunit.c",
-	MAME_DIR .. "src/mame/video/midvunit.c",
-	MAME_DIR .. "src/mame/drivers/midwunit.c",
-	MAME_DIR .. "src/mame/machine/midwunit.c",
-	MAME_DIR .. "src/mame/drivers/midxunit.c",
-	MAME_DIR .. "src/mame/machine/midxunit.c",
-	MAME_DIR .. "src/mame/drivers/midyunit.c",
-	MAME_DIR .. "src/mame/machine/midyunit.c",
-	MAME_DIR .. "src/mame/video/midyunit.c",
-	MAME_DIR .. "src/mame/drivers/midzeus.c",
-	MAME_DIR .. "src/mame/video/midzeus.c",
-	MAME_DIR .. "src/mame/video/midzeus2.c",
-	MAME_DIR .. "src/mame/drivers/mw18w.c",
-	MAME_DIR .. "src/mame/drivers/mwsub.c",
-	MAME_DIR .. "src/mame/drivers/omegrace.c",
-	MAME_DIR .. "src/mame/drivers/pinball2k.c",
-	MAME_DIR .. "src/mame/drivers/seattle.c",
-	MAME_DIR .. "src/mame/drivers/sspeedr.c",
-	MAME_DIR .. "src/mame/video/sspeedr.c",
-	MAME_DIR .. "src/mame/drivers/tmaster.c",
-	MAME_DIR .. "src/mame/drivers/vegas.c",
-	MAME_DIR .. "src/mame/drivers/wmg.c",
-	MAME_DIR .. "src/mame/drivers/williams.c",
-	MAME_DIR .. "src/mame/machine/williams.c",
-	MAME_DIR .. "src/mame/audio/williams.c",
-	MAME_DIR .. "src/mame/video/williams.c",
-	MAME_DIR .. "src/mame/machine/midwayic.c",
-	MAME_DIR .. "src/mame/audio/midway.c",
+	MAME_DIR .. "src/mame/drivers/astrocde.cpp",
+	MAME_DIR .. "src/mame/video/astrocde.cpp",
+	MAME_DIR .. "src/mame/audio/gorf.cpp",
+	MAME_DIR .. "src/mame/audio/wow.cpp",
+	MAME_DIR .. "src/mame/drivers/atlantis.cpp",
+	MAME_DIR .. "src/mame/drivers/balsente.cpp",
+	MAME_DIR .. "src/mame/machine/balsente.cpp",
+	MAME_DIR .. "src/mame/video/balsente.cpp",
+	MAME_DIR .. "src/mame/drivers/gridlee.cpp",
+	MAME_DIR .. "src/mame/audio/gridlee.cpp",
+	MAME_DIR .. "src/mame/video/gridlee.cpp",
+	MAME_DIR .. "src/mame/drivers/mcr.cpp",
+	MAME_DIR .. "src/mame/machine/mcr.cpp",
+	MAME_DIR .. "src/mame/video/mcr.cpp",
+	MAME_DIR .. "src/mame/drivers/mcr3.cpp",
+	MAME_DIR .. "src/mame/video/mcr3.cpp",
+	MAME_DIR .. "src/mame/drivers/mcr68.cpp",
+	MAME_DIR .. "src/mame/machine/mcr68.cpp",
+	MAME_DIR .. "src/mame/video/mcr68.cpp",
+	MAME_DIR .. "src/mame/drivers/midqslvr.cpp",
+	MAME_DIR .. "src/mame/drivers/midtunit.cpp",
+	MAME_DIR .. "src/mame/machine/midtunit.cpp",
+	MAME_DIR .. "src/mame/video/midtunit.cpp",
+	MAME_DIR .. "src/mame/drivers/midvunit.cpp",
+	MAME_DIR .. "src/mame/video/midvunit.cpp",
+	MAME_DIR .. "src/mame/drivers/midwunit.cpp",
+	MAME_DIR .. "src/mame/machine/midwunit.cpp",
+	MAME_DIR .. "src/mame/drivers/midxunit.cpp",
+	MAME_DIR .. "src/mame/machine/midxunit.cpp",
+	MAME_DIR .. "src/mame/drivers/midyunit.cpp",
+	MAME_DIR .. "src/mame/machine/midyunit.cpp",
+	MAME_DIR .. "src/mame/video/midyunit.cpp",
+	MAME_DIR .. "src/mame/drivers/midzeus.cpp",
+	MAME_DIR .. "src/mame/video/midzeus.cpp",
+	MAME_DIR .. "src/mame/video/midzeus2.cpp",
+	MAME_DIR .. "src/mame/drivers/mw18w.cpp",
+	MAME_DIR .. "src/mame/drivers/mwsub.cpp",
+	MAME_DIR .. "src/mame/drivers/omegrace.cpp",
+	MAME_DIR .. "src/mame/drivers/pinball2k.cpp",
+	MAME_DIR .. "src/mame/drivers/seattle.cpp",
+	MAME_DIR .. "src/mame/drivers/sspeedr.cpp",
+	MAME_DIR .. "src/mame/video/sspeedr.cpp",
+	MAME_DIR .. "src/mame/drivers/tmaster.cpp",
+	MAME_DIR .. "src/mame/drivers/vegas.cpp",
+	MAME_DIR .. "src/mame/drivers/wmg.cpp",
+	MAME_DIR .. "src/mame/drivers/williams.cpp",
+	MAME_DIR .. "src/mame/machine/williams.cpp",
+	MAME_DIR .. "src/mame/audio/williams.cpp",
+	MAME_DIR .. "src/mame/video/williams.cpp",
+	MAME_DIR .. "src/mame/machine/midwayic.cpp",
+	MAME_DIR .. "src/mame/audio/midway.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "namco")
 files {
-	MAME_DIR .. "src/mame/drivers/20pacgal.c",
-	MAME_DIR .. "src/mame/video/20pacgal.c",
-	MAME_DIR .. "src/mame/drivers/30test.c",
-	MAME_DIR .. "src/mame/drivers/baraduke.c",
-	MAME_DIR .. "src/mame/video/baraduke.c",
-	MAME_DIR .. "src/mame/drivers/cswat.c",
-	MAME_DIR .. "src/mame/drivers/dambustr.c",
-	MAME_DIR .. "src/mame/drivers/gal3.c",
-	MAME_DIR .. "src/mame/drivers/galaga.c",
-	MAME_DIR .. "src/mame/audio/galaga.c",
-	MAME_DIR .. "src/mame/video/galaga.c",
-	MAME_DIR .. "src/mame/video/bosco.c",
-	MAME_DIR .. "src/mame/video/digdug.c",
-	MAME_DIR .. "src/mame/machine/xevious.c",
-	MAME_DIR .. "src/mame/video/xevious.c",
-	MAME_DIR .. "src/mame/drivers/galaxian.c",
-	MAME_DIR .. "src/mame/audio/galaxian.c",
-	MAME_DIR .. "src/mame/video/galaxian.c",
-	MAME_DIR .. "src/mame/drivers/galaxold.c",
-	MAME_DIR .. "src/mame/machine/galaxold.c",
-	MAME_DIR .. "src/mame/video/galaxold.c",
-	MAME_DIR .. "src/mame/drivers/gaplus.c",
-	MAME_DIR .. "src/mame/machine/gaplus.c",
-	MAME_DIR .. "src/mame/video/gaplus.c",
-	MAME_DIR .. "src/mame/drivers/kungfur.c",
-	MAME_DIR .. "src/mame/drivers/mappy.c",
-	MAME_DIR .. "src/mame/video/mappy.c",
-	MAME_DIR .. "src/mame/drivers/namcofl.c",
-	MAME_DIR .. "src/mame/video/namcofl.c",
-	MAME_DIR .. "src/mame/drivers/namcoic.c",
-	MAME_DIR .. "src/mame/drivers/namcona1.c",
-	MAME_DIR .. "src/mame/video/namcona1.c",
-	MAME_DIR .. "src/mame/drivers/namconb1.c",
-	MAME_DIR .. "src/mame/video/namconb1.c",
-	MAME_DIR .. "src/mame/drivers/namcond1.c",
-	MAME_DIR .. "src/mame/machine/namcond1.c",
-	MAME_DIR .. "src/mame/video/ygv608.c",
-	MAME_DIR .. "src/mame/drivers/namcops2.c",
-	MAME_DIR .. "src/mame/drivers/namcos1.c",
-	MAME_DIR .. "src/mame/machine/namcos1.c",
-	MAME_DIR .. "src/mame/video/namcos1.c",
-	MAME_DIR .. "src/mame/drivers/namcos10.c",
-	MAME_DIR .. "src/mame/machine/ns10crypt.c",
-	MAME_DIR .. "src/mame/drivers/namcos11.c",
-	MAME_DIR .. "src/mame/machine/ns11prot.c",
-	MAME_DIR .. "src/mame/drivers/namcos12.c",
-	MAME_DIR .. "src/mame/machine/namco_settings.c",
-	MAME_DIR .. "src/mame/drivers/namcos2.c",
-	MAME_DIR .. "src/mame/machine/namcos2.c",
-	MAME_DIR .. "src/mame/video/namcos2.c",
-	MAME_DIR .. "src/mame/drivers/namcos21.c",
-	MAME_DIR .. "src/mame/video/namcos21.c",
-	MAME_DIR .. "src/mame/drivers/namcos22.c",
-	MAME_DIR .. "src/mame/video/namcos22.c",
-	MAME_DIR .. "src/mame/drivers/namcos23.c",
-	MAME_DIR .. "src/mame/drivers/namcos86.c",
-	MAME_DIR .. "src/mame/video/namcos86.c",
-	MAME_DIR .. "src/mame/drivers/pacland.c",
-	MAME_DIR .. "src/mame/video/pacland.c",
-	MAME_DIR .. "src/mame/drivers/polepos.c",
-	MAME_DIR .. "src/mame/audio/polepos.c",
-	MAME_DIR .. "src/mame/video/polepos.c",
-	MAME_DIR .. "src/mame/drivers/rallyx.c",
-	MAME_DIR .. "src/mame/video/rallyx.c",
-	MAME_DIR .. "src/mame/drivers/skykid.c",
-	MAME_DIR .. "src/mame/video/skykid.c",
-	MAME_DIR .. "src/mame/drivers/tankbatt.c",
-	MAME_DIR .. "src/mame/video/tankbatt.c",
-	MAME_DIR .. "src/mame/drivers/tceptor.c",
-	MAME_DIR .. "src/mame/video/tceptor.c",
-	MAME_DIR .. "src/mame/drivers/toypop.c",
-	MAME_DIR .. "src/mame/video/toypop.c",
-	MAME_DIR .. "src/mame/drivers/turrett.c",
-	MAME_DIR .. "src/mame/audio/turrett.c",
-	MAME_DIR .. "src/mame/video/turrett.c",
-	MAME_DIR .. "src/mame/drivers/warpwarp.c",
-	MAME_DIR .. "src/mame/audio/geebee.c",
-	MAME_DIR .. "src/mame/audio/warpwarp.c",
-	MAME_DIR .. "src/mame/video/warpwarp.c",
-	MAME_DIR .. "src/mame/machine/c117.c",
-	MAME_DIR .. "src/mame/machine/namcoio.c",
-	MAME_DIR .. "src/mame/machine/namco06.c",
-	MAME_DIR .. "src/mame/machine/namco50.c",
-	MAME_DIR .. "src/mame/machine/namco51.c",
-	MAME_DIR .. "src/mame/machine/namco53.c",
-	MAME_DIR .. "src/mame/machine/namco62.c",
-	MAME_DIR .. "src/mame/machine/namcomcu.c",
-	MAME_DIR .. "src/mame/audio/namco52.c",
-	MAME_DIR .. "src/mame/audio/namco54.c",
-	MAME_DIR .. "src/mame/video/c116.c",
-	MAME_DIR .. "src/mame/video/c45.c",
+	MAME_DIR .. "src/mame/drivers/20pacgal.cpp",
+	MAME_DIR .. "src/mame/video/20pacgal.cpp",
+	MAME_DIR .. "src/mame/drivers/30test.cpp",
+	MAME_DIR .. "src/mame/drivers/baraduke.cpp",
+	MAME_DIR .. "src/mame/video/baraduke.cpp",
+	MAME_DIR .. "src/mame/drivers/cswat.cpp",
+	MAME_DIR .. "src/mame/drivers/dambustr.cpp",
+	MAME_DIR .. "src/mame/drivers/gal3.cpp",
+	MAME_DIR .. "src/mame/drivers/galaga.cpp",
+	MAME_DIR .. "src/mame/audio/galaga.cpp",
+	MAME_DIR .. "src/mame/video/galaga.cpp",
+	MAME_DIR .. "src/mame/video/bosco.cpp",
+	MAME_DIR .. "src/mame/video/digdug.cpp",
+	MAME_DIR .. "src/mame/machine/xevious.cpp",
+	MAME_DIR .. "src/mame/video/xevious.cpp",
+	MAME_DIR .. "src/mame/drivers/galaxian.cpp",
+	MAME_DIR .. "src/mame/audio/galaxian.cpp",
+	MAME_DIR .. "src/mame/video/galaxian.cpp",
+	MAME_DIR .. "src/mame/drivers/galaxold.cpp",
+	MAME_DIR .. "src/mame/machine/galaxold.cpp",
+	MAME_DIR .. "src/mame/video/galaxold.cpp",
+	MAME_DIR .. "src/mame/drivers/gaplus.cpp",
+	MAME_DIR .. "src/mame/machine/gaplus.cpp",
+	MAME_DIR .. "src/mame/video/gaplus.cpp",
+	MAME_DIR .. "src/mame/drivers/kungfur.cpp",
+	MAME_DIR .. "src/mame/drivers/mappy.cpp",
+	MAME_DIR .. "src/mame/video/mappy.cpp",
+	MAME_DIR .. "src/mame/drivers/namcofl.cpp",
+	MAME_DIR .. "src/mame/video/namcofl.cpp",
+	MAME_DIR .. "src/mame/drivers/namcoic.cpp",
+	MAME_DIR .. "src/mame/drivers/namcona1.cpp",
+	MAME_DIR .. "src/mame/video/namcona1.cpp",
+	MAME_DIR .. "src/mame/drivers/namconb1.cpp",
+	MAME_DIR .. "src/mame/video/namconb1.cpp",
+	MAME_DIR .. "src/mame/drivers/namcond1.cpp",
+	MAME_DIR .. "src/mame/machine/namcond1.cpp",
+	MAME_DIR .. "src/mame/video/ygv608.cpp",
+	MAME_DIR .. "src/mame/drivers/namcops2.cpp",
+	MAME_DIR .. "src/mame/drivers/namcos1.cpp",
+	MAME_DIR .. "src/mame/machine/namcos1.cpp",
+	MAME_DIR .. "src/mame/video/namcos1.cpp",
+	MAME_DIR .. "src/mame/drivers/namcos10.cpp",
+	MAME_DIR .. "src/mame/machine/ns10crypt.cpp",
+	MAME_DIR .. "src/mame/drivers/namcos11.cpp",
+	MAME_DIR .. "src/mame/machine/ns11prot.cpp",
+	MAME_DIR .. "src/mame/drivers/namcos12.cpp",
+	MAME_DIR .. "src/mame/machine/namco_settings.cpp",
+	MAME_DIR .. "src/mame/drivers/namcos2.cpp",
+	MAME_DIR .. "src/mame/machine/namcos2.cpp",
+	MAME_DIR .. "src/mame/video/namcos2.cpp",
+	MAME_DIR .. "src/mame/drivers/namcos21.cpp",
+	MAME_DIR .. "src/mame/video/namcos21.cpp",
+	MAME_DIR .. "src/mame/drivers/namcos22.cpp",
+	MAME_DIR .. "src/mame/video/namcos22.cpp",
+	MAME_DIR .. "src/mame/drivers/namcos23.cpp",
+	MAME_DIR .. "src/mame/drivers/namcos86.cpp",
+	MAME_DIR .. "src/mame/video/namcos86.cpp",
+	MAME_DIR .. "src/mame/drivers/pacland.cpp",
+	MAME_DIR .. "src/mame/video/pacland.cpp",
+	MAME_DIR .. "src/mame/drivers/polepos.cpp",
+	MAME_DIR .. "src/mame/audio/polepos.cpp",
+	MAME_DIR .. "src/mame/video/polepos.cpp",
+	MAME_DIR .. "src/mame/drivers/rallyx.cpp",
+	MAME_DIR .. "src/mame/video/rallyx.cpp",
+	MAME_DIR .. "src/mame/drivers/skykid.cpp",
+	MAME_DIR .. "src/mame/video/skykid.cpp",
+	MAME_DIR .. "src/mame/drivers/tankbatt.cpp",
+	MAME_DIR .. "src/mame/video/tankbatt.cpp",
+	MAME_DIR .. "src/mame/drivers/tceptor.cpp",
+	MAME_DIR .. "src/mame/video/tceptor.cpp",
+	MAME_DIR .. "src/mame/drivers/toypop.cpp",
+	MAME_DIR .. "src/mame/video/toypop.cpp",
+	MAME_DIR .. "src/mame/drivers/turrett.cpp",
+	MAME_DIR .. "src/mame/audio/turrett.cpp",
+	MAME_DIR .. "src/mame/video/turrett.cpp",
+	MAME_DIR .. "src/mame/drivers/warpwarp.cpp",
+	MAME_DIR .. "src/mame/audio/geebee.cpp",
+	MAME_DIR .. "src/mame/audio/warpwarp.cpp",
+	MAME_DIR .. "src/mame/video/warpwarp.cpp",
+	MAME_DIR .. "src/mame/machine/c117.cpp",
+	MAME_DIR .. "src/mame/machine/namcoio.cpp",
+	MAME_DIR .. "src/mame/machine/namco06.cpp",
+	MAME_DIR .. "src/mame/machine/namco50.cpp",
+	MAME_DIR .. "src/mame/machine/namco51.cpp",
+	MAME_DIR .. "src/mame/machine/namco53.cpp",
+	MAME_DIR .. "src/mame/machine/namco62.cpp",
+	MAME_DIR .. "src/mame/machine/namcomcu.cpp",
+	MAME_DIR .. "src/mame/audio/namco52.cpp",
+	MAME_DIR .. "src/mame/audio/namco54.cpp",
+	MAME_DIR .. "src/mame/video/c116.cpp",
+	MAME_DIR .. "src/mame/video/c45.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "nasco")
 files {
-	MAME_DIR .. "src/mame/drivers/crgolf.c",
-	MAME_DIR .. "src/mame/video/crgolf.c",
-	MAME_DIR .. "src/mame/drivers/suprgolf.c",
+	MAME_DIR .. "src/mame/drivers/crgolf.cpp",
+	MAME_DIR .. "src/mame/video/crgolf.cpp",
+	MAME_DIR .. "src/mame/drivers/suprgolf.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "neogeo")
 files {
-	MAME_DIR .. "src/mame/drivers/neogeo.c",
-	MAME_DIR .. "src/mame/video/neogeo.c",
-	MAME_DIR .. "src/mame/drivers/neogeo_noslot.c",
-	MAME_DIR .. "src/mame/video/neogeo_spr.c",
-	MAME_DIR .. "src/mame/machine/neocrypt.c",
-	MAME_DIR .. "src/mame/machine/ng_memcard.c",
+	MAME_DIR .. "src/mame/drivers/neogeo.cpp",
+	MAME_DIR .. "src/mame/video/neogeo.cpp",
+	MAME_DIR .. "src/mame/drivers/neogeo_noslot.cpp",
+	MAME_DIR .. "src/mame/video/neogeo_spr.cpp",
+	MAME_DIR .. "src/mame/machine/neocrypt.cpp",
+	MAME_DIR .. "src/mame/machine/ng_memcard.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "nichibut")
 files {
-	MAME_DIR .. "src/mame/drivers/armedf.c",
-	MAME_DIR .. "src/mame/video/armedf.c",
-	MAME_DIR .. "src/mame/drivers/cclimber.c",
-	MAME_DIR .. "src/mame/machine/cclimber.c",
-	MAME_DIR .. "src/mame/audio/cclimber.c",
-	MAME_DIR .. "src/mame/video/cclimber.c",
-	MAME_DIR .. "src/mame/drivers/clshroad.c",
-	MAME_DIR .. "src/mame/video/clshroad.c",
-	MAME_DIR .. "src/mame/drivers/csplayh5.c",
-	MAME_DIR .. "src/mame/drivers/cop01.c",
-	MAME_DIR .. "src/mame/video/cop01.c",
-	MAME_DIR .. "src/mame/drivers/dacholer.c",
-	MAME_DIR .. "src/mame/drivers/galivan.c",
-	MAME_DIR .. "src/mame/video/galivan.c",
-	MAME_DIR .. "src/mame/drivers/gomoku.c",
-	MAME_DIR .. "src/mame/audio/gomoku.c",
-	MAME_DIR .. "src/mame/video/gomoku.c",
-	MAME_DIR .. "src/mame/drivers/hyhoo.c",
-	MAME_DIR .. "src/mame/video/hyhoo.c",
-	MAME_DIR .. "src/mame/drivers/jangou.c",
-	MAME_DIR .. "src/mame/drivers/magmax.c",
-	MAME_DIR .. "src/mame/video/magmax.c",
-	MAME_DIR .. "src/mame/drivers/nbmj8688.c",
-	MAME_DIR .. "src/mame/video/nbmj8688.c",
-	MAME_DIR .. "src/mame/drivers/nbmj8891.c",
-	MAME_DIR .. "src/mame/video/nbmj8891.c",
-	MAME_DIR .. "src/mame/drivers/nbmj8900.c",
-	MAME_DIR .. "src/mame/video/nbmj8900.c",
-	MAME_DIR .. "src/mame/drivers/nbmj8991.c",
-	MAME_DIR .. "src/mame/video/nbmj8991.c",
-	MAME_DIR .. "src/mame/drivers/nbmj9195.c",
-	MAME_DIR .. "src/mame/video/nbmj9195.c",
-	MAME_DIR .. "src/mame/drivers/nightgal.c",
-	MAME_DIR .. "src/mame/drivers/niyanpai.c",
-	MAME_DIR .. "src/mame/video/niyanpai.c",
-	MAME_DIR .. "src/mame/drivers/pastelg.c",
-	MAME_DIR .. "src/mame/video/pastelg.c",
-	MAME_DIR .. "src/mame/drivers/seicross.c",
-	MAME_DIR .. "src/mame/video/seicross.c",
-	MAME_DIR .. "src/mame/drivers/terracre.c",
-	MAME_DIR .. "src/mame/video/terracre.c",
-	MAME_DIR .. "src/mame/drivers/tubep.c",
-	MAME_DIR .. "src/mame/video/tubep.c",
-	MAME_DIR .. "src/mame/drivers/wiping.c",
-	MAME_DIR .. "src/mame/audio/wiping.c",
-	MAME_DIR .. "src/mame/video/wiping.c",
-	MAME_DIR .. "src/mame/machine/nb1413m3.c",
-	MAME_DIR .. "src/mame/machine/nb1414m4.c",
+	MAME_DIR .. "src/mame/drivers/armedf.cpp",
+	MAME_DIR .. "src/mame/video/armedf.cpp",
+	MAME_DIR .. "src/mame/drivers/cclimber.cpp",
+	MAME_DIR .. "src/mame/machine/cclimber.cpp",
+	MAME_DIR .. "src/mame/audio/cclimber.cpp",
+	MAME_DIR .. "src/mame/video/cclimber.cpp",
+	MAME_DIR .. "src/mame/drivers/clshroad.cpp",
+	MAME_DIR .. "src/mame/video/clshroad.cpp",
+	MAME_DIR .. "src/mame/drivers/csplayh5.cpp",
+	MAME_DIR .. "src/mame/drivers/cop01.cpp",
+	MAME_DIR .. "src/mame/video/cop01.cpp",
+	MAME_DIR .. "src/mame/drivers/dacholer.cpp",
+	MAME_DIR .. "src/mame/drivers/galivan.cpp",
+	MAME_DIR .. "src/mame/video/galivan.cpp",
+	MAME_DIR .. "src/mame/drivers/gomoku.cpp",
+	MAME_DIR .. "src/mame/audio/gomoku.cpp",
+	MAME_DIR .. "src/mame/video/gomoku.cpp",
+	MAME_DIR .. "src/mame/drivers/hyhoo.cpp",
+	MAME_DIR .. "src/mame/video/hyhoo.cpp",
+	MAME_DIR .. "src/mame/drivers/jangou.cpp",
+	MAME_DIR .. "src/mame/drivers/magmax.cpp",
+	MAME_DIR .. "src/mame/video/magmax.cpp",
+	MAME_DIR .. "src/mame/drivers/nbmj8688.cpp",
+	MAME_DIR .. "src/mame/video/nbmj8688.cpp",
+	MAME_DIR .. "src/mame/drivers/nbmj8891.cpp",
+	MAME_DIR .. "src/mame/video/nbmj8891.cpp",
+	MAME_DIR .. "src/mame/drivers/nbmj8900.cpp",
+	MAME_DIR .. "src/mame/video/nbmj8900.cpp",
+	MAME_DIR .. "src/mame/drivers/nbmj8991.cpp",
+	MAME_DIR .. "src/mame/video/nbmj8991.cpp",
+	MAME_DIR .. "src/mame/drivers/nbmj9195.cpp",
+	MAME_DIR .. "src/mame/video/nbmj9195.cpp",
+	MAME_DIR .. "src/mame/drivers/nightgal.cpp",
+	MAME_DIR .. "src/mame/drivers/niyanpai.cpp",
+	MAME_DIR .. "src/mame/video/niyanpai.cpp",
+	MAME_DIR .. "src/mame/drivers/pastelg.cpp",
+	MAME_DIR .. "src/mame/video/pastelg.cpp",
+	MAME_DIR .. "src/mame/drivers/seicross.cpp",
+	MAME_DIR .. "src/mame/video/seicross.cpp",
+	MAME_DIR .. "src/mame/drivers/terracre.cpp",
+	MAME_DIR .. "src/mame/video/terracre.cpp",
+	MAME_DIR .. "src/mame/drivers/tubep.cpp",
+	MAME_DIR .. "src/mame/video/tubep.cpp",
+	MAME_DIR .. "src/mame/drivers/wiping.cpp",
+	MAME_DIR .. "src/mame/audio/wiping.cpp",
+	MAME_DIR .. "src/mame/video/wiping.cpp",
+	MAME_DIR .. "src/mame/machine/nb1413m3.cpp",
+	MAME_DIR .. "src/mame/machine/nb1414m4.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "nintendo")
 files {
-	MAME_DIR .. "src/mame/drivers/cham24.c",
-	MAME_DIR .. "src/mame/drivers/dkong.c",
-	MAME_DIR .. "src/mame/audio/dkong.c",
-	MAME_DIR .. "src/mame/video/dkong.c",
-	MAME_DIR .. "src/mame/drivers/mario.c",
-	MAME_DIR .. "src/mame/audio/mario.c",
-	MAME_DIR .. "src/mame/video/mario.c",
-	MAME_DIR .. "src/mame/drivers/mmagic.c",
-	MAME_DIR .. "src/mame/drivers/multigam.c",
-	MAME_DIR .. "src/mame/drivers/n8080.c",
-	MAME_DIR .. "src/mame/audio/n8080.c",
-	MAME_DIR .. "src/mame/video/n8080.c",
-	MAME_DIR .. "src/mame/drivers/nss.c",
-	MAME_DIR .. "src/mame/machine/snes.c",
-	MAME_DIR .. "src/mame/audio/snes_snd.c",
-	MAME_DIR .. "src/mame/drivers/playch10.c",
-	MAME_DIR .. "src/mame/machine/playch10.c",
-	MAME_DIR .. "src/mame/video/playch10.c",
-	MAME_DIR .. "src/mame/drivers/popeye.c",
-	MAME_DIR .. "src/mame/video/popeye.c",
-	MAME_DIR .. "src/mame/drivers/punchout.c",
-	MAME_DIR .. "src/mame/video/punchout.c",
-	MAME_DIR .. "src/mame/drivers/famibox.c",
-	MAME_DIR .. "src/mame/drivers/sfcbox.c",
-	MAME_DIR .. "src/mame/drivers/snesb.c",
-	MAME_DIR .. "src/mame/drivers/spacefb.c",
-	MAME_DIR .. "src/mame/audio/spacefb.c",
-	MAME_DIR .. "src/mame/video/spacefb.c",
-	MAME_DIR .. "src/mame/drivers/vsnes.c",
-	MAME_DIR .. "src/mame/machine/vsnes.c",
-	MAME_DIR .. "src/mame/video/vsnes.c",
-	MAME_DIR .. "src/mame/video/ppu2c0x.c",
+	MAME_DIR .. "src/mame/drivers/cham24.cpp",
+	MAME_DIR .. "src/mame/drivers/dkong.cpp",
+	MAME_DIR .. "src/mame/audio/dkong.cpp",
+	MAME_DIR .. "src/mame/video/dkong.cpp",
+	MAME_DIR .. "src/mame/drivers/mario.cpp",
+	MAME_DIR .. "src/mame/audio/mario.cpp",
+	MAME_DIR .. "src/mame/video/mario.cpp",
+	MAME_DIR .. "src/mame/drivers/mmagic.cpp",
+	MAME_DIR .. "src/mame/drivers/multigam.cpp",
+	MAME_DIR .. "src/mame/drivers/n8080.cpp",
+	MAME_DIR .. "src/mame/audio/n8080.cpp",
+	MAME_DIR .. "src/mame/video/n8080.cpp",
+	MAME_DIR .. "src/mame/drivers/nss.cpp",
+	MAME_DIR .. "src/mame/machine/snes.cpp",
+	MAME_DIR .. "src/mame/audio/snes_snd.cpp",
+	MAME_DIR .. "src/mame/drivers/playch10.cpp",
+	MAME_DIR .. "src/mame/machine/playch10.cpp",
+	MAME_DIR .. "src/mame/video/playch10.cpp",
+	MAME_DIR .. "src/mame/drivers/popeye.cpp",
+	MAME_DIR .. "src/mame/video/popeye.cpp",
+	MAME_DIR .. "src/mame/drivers/punchout.cpp",
+	MAME_DIR .. "src/mame/video/punchout.cpp",
+	MAME_DIR .. "src/mame/drivers/famibox.cpp",
+	MAME_DIR .. "src/mame/drivers/sfcbox.cpp",
+	MAME_DIR .. "src/mame/drivers/snesb.cpp",
+	MAME_DIR .. "src/mame/drivers/spacefb.cpp",
+	MAME_DIR .. "src/mame/audio/spacefb.cpp",
+	MAME_DIR .. "src/mame/video/spacefb.cpp",
+	MAME_DIR .. "src/mame/drivers/vsnes.cpp",
+	MAME_DIR .. "src/mame/machine/vsnes.cpp",
+	MAME_DIR .. "src/mame/video/vsnes.cpp",
+	MAME_DIR .. "src/mame/video/ppu2c0x.cpp",
 
 
 }
 
 createMAMEProjects(_target, _subtarget, "nix")
 files {
-	MAME_DIR .. "src/mame/drivers/fitfight.c",
-	MAME_DIR .. "src/mame/video/fitfight.c",
-	MAME_DIR .. "src/mame/drivers/pirates.c",
-	MAME_DIR .. "src/mame/video/pirates.c",
+	MAME_DIR .. "src/mame/drivers/fitfight.cpp",
+	MAME_DIR .. "src/mame/video/fitfight.cpp",
+	MAME_DIR .. "src/mame/drivers/pirates.cpp",
+	MAME_DIR .. "src/mame/video/pirates.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "nmk")
 files {
-	MAME_DIR .. "src/mame/drivers/acommand.c",
-	MAME_DIR .. "src/mame/drivers/cultures.c",
-	MAME_DIR .. "src/mame/drivers/ddealer.c",
-	MAME_DIR .. "src/mame/drivers/jalmah.c",
-	MAME_DIR .. "src/mame/drivers/macrossp.c",
-	MAME_DIR .. "src/mame/video/macrossp.c",
-	MAME_DIR .. "src/mame/drivers/nmk16.c",
-	MAME_DIR .. "src/mame/machine/nmk004.c",
-	MAME_DIR .. "src/mame/video/nmk16.c",
-	MAME_DIR .. "src/mame/drivers/quizdna.c",
-	MAME_DIR .. "src/mame/video/quizdna.c",
-	MAME_DIR .. "src/mame/drivers/quizpani.c",
-	MAME_DIR .. "src/mame/video/quizpani.c",
+	MAME_DIR .. "src/mame/drivers/acommand.cpp",
+	MAME_DIR .. "src/mame/drivers/cultures.cpp",
+	MAME_DIR .. "src/mame/drivers/ddealer.cpp",
+	MAME_DIR .. "src/mame/drivers/jalmah.cpp",
+	MAME_DIR .. "src/mame/drivers/macrossp.cpp",
+	MAME_DIR .. "src/mame/video/macrossp.cpp",
+	MAME_DIR .. "src/mame/drivers/nmk16.cpp",
+	MAME_DIR .. "src/mame/machine/nmk004.cpp",
+	MAME_DIR .. "src/mame/video/nmk16.cpp",
+	MAME_DIR .. "src/mame/drivers/quizdna.cpp",
+	MAME_DIR .. "src/mame/video/quizdna.cpp",
+	MAME_DIR .. "src/mame/drivers/quizpani.cpp",
+	MAME_DIR .. "src/mame/video/quizpani.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "olympia")
 files {
-	MAME_DIR .. "src/mame/drivers/dday.c",
-	MAME_DIR .. "src/mame/video/dday.c",
-	MAME_DIR .. "src/mame/drivers/lbeach.c",
-	MAME_DIR .. "src/mame/drivers/monzagp.c",
-	MAME_DIR .. "src/mame/drivers/portrait.c",
-	MAME_DIR .. "src/mame/video/portrait.c",
-	MAME_DIR .. "src/mame/drivers/vega.c",
+	MAME_DIR .. "src/mame/drivers/dday.cpp",
+	MAME_DIR .. "src/mame/video/dday.cpp",
+	MAME_DIR .. "src/mame/drivers/lbeach.cpp",
+	MAME_DIR .. "src/mame/drivers/monzagp.cpp",
+	MAME_DIR .. "src/mame/drivers/portrait.cpp",
+	MAME_DIR .. "src/mame/video/portrait.cpp",
+	MAME_DIR .. "src/mame/drivers/vega.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "omori")
 files {
-	MAME_DIR .. "src/mame/drivers/battlex.c",
-	MAME_DIR .. "src/mame/video/battlex.c",
-	MAME_DIR .. "src/mame/drivers/carjmbre.c",
-	MAME_DIR .. "src/mame/video/carjmbre.c",
-	MAME_DIR .. "src/mame/drivers/popper.c",
-	MAME_DIR .. "src/mame/video/popper.c",
-	MAME_DIR .. "src/mame/drivers/spaceg.c",
+	MAME_DIR .. "src/mame/drivers/battlex.cpp",
+	MAME_DIR .. "src/mame/video/battlex.cpp",
+	MAME_DIR .. "src/mame/drivers/carjmbre.cpp",
+	MAME_DIR .. "src/mame/video/carjmbre.cpp",
+	MAME_DIR .. "src/mame/drivers/popper.cpp",
+	MAME_DIR .. "src/mame/video/popper.cpp",
+	MAME_DIR .. "src/mame/drivers/spaceg.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "orca")
 files {
-	MAME_DIR .. "src/mame/drivers/espial.c",
-	MAME_DIR .. "src/mame/video/espial.c",
-	MAME_DIR .. "src/mame/drivers/funkybee.c",
-	MAME_DIR .. "src/mame/video/funkybee.c",
-	MAME_DIR .. "src/mame/drivers/marineb.c",
-	MAME_DIR .. "src/mame/video/marineb.c",
-	MAME_DIR .. "src/mame/drivers/vastar.c",
-	MAME_DIR .. "src/mame/video/vastar.c",
-	MAME_DIR .. "src/mame/drivers/zodiack.c",
-	MAME_DIR .. "src/mame/video/zodiack.c",
+	MAME_DIR .. "src/mame/drivers/espial.cpp",
+	MAME_DIR .. "src/mame/video/espial.cpp",
+	MAME_DIR .. "src/mame/drivers/funkybee.cpp",
+	MAME_DIR .. "src/mame/video/funkybee.cpp",
+	MAME_DIR .. "src/mame/drivers/marineb.cpp",
+	MAME_DIR .. "src/mame/video/marineb.cpp",
+	MAME_DIR .. "src/mame/drivers/vastar.cpp",
+	MAME_DIR .. "src/mame/video/vastar.cpp",
+	MAME_DIR .. "src/mame/drivers/zodiack.cpp",
+	MAME_DIR .. "src/mame/video/zodiack.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "pacific")
 files {
-	MAME_DIR .. "src/mame/drivers/mrflea.c",
-	MAME_DIR .. "src/mame/video/mrflea.c",
-	MAME_DIR .. "src/mame/drivers/thief.c",
-	MAME_DIR .. "src/mame/video/thief.c",
+	MAME_DIR .. "src/mame/drivers/mrflea.cpp",
+	MAME_DIR .. "src/mame/video/mrflea.cpp",
+	MAME_DIR .. "src/mame/drivers/thief.cpp",
+	MAME_DIR .. "src/mame/video/thief.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "pacman")
 files {
-	MAME_DIR .. "src/mame/drivers/jrpacman.c",
-	MAME_DIR .. "src/mame/drivers/pacman.c",
-	MAME_DIR .. "src/mame/video/pacman.c",
-	MAME_DIR .. "src/mame/machine/acitya.c",
-	MAME_DIR .. "src/mame/machine/jumpshot.c",
-	MAME_DIR .. "src/mame/machine/pacplus.c",
-	MAME_DIR .. "src/mame/machine/theglobp.c",
-	MAME_DIR .. "src/mame/drivers/pengo.c",
+	MAME_DIR .. "src/mame/drivers/jrpacman.cpp",
+	MAME_DIR .. "src/mame/drivers/pacman.cpp",
+	MAME_DIR .. "src/mame/video/pacman.cpp",
+	MAME_DIR .. "src/mame/machine/acitya.cpp",
+	MAME_DIR .. "src/mame/machine/jumpshot.cpp",
+	MAME_DIR .. "src/mame/machine/pacplus.cpp",
+	MAME_DIR .. "src/mame/machine/theglobp.cpp",
+	MAME_DIR .. "src/mame/drivers/pengo.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "pce")
 files {
-	MAME_DIR .. "src/mame/drivers/ggconnie.c",
-	MAME_DIR .. "src/mame/drivers/paranoia.c",
-	MAME_DIR .. "src/mame/drivers/tourvis.c",
-	MAME_DIR .. "src/mame/drivers/uapce.c",
-	MAME_DIR .. "src/mame/machine/pcecommn.c",
+	MAME_DIR .. "src/mame/drivers/ggconnie.cpp",
+	MAME_DIR .. "src/mame/drivers/paranoia.cpp",
+	MAME_DIR .. "src/mame/drivers/tourvis.cpp",
+	MAME_DIR .. "src/mame/drivers/uapce.cpp",
+	MAME_DIR .. "src/mame/machine/pcecommn.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "phoenix")
 files {
-	MAME_DIR .. "src/mame/drivers/naughtyb.c",
-	MAME_DIR .. "src/mame/video/naughtyb.c",
-	MAME_DIR .. "src/mame/drivers/phoenix.c",
-	MAME_DIR .. "src/mame/audio/phoenix.c",
-	MAME_DIR .. "src/mame/video/phoenix.c",
-	MAME_DIR .. "src/mame/drivers/safarir.c",
-	MAME_DIR .. "src/mame/audio/pleiads.c",
+	MAME_DIR .. "src/mame/drivers/naughtyb.cpp",
+	MAME_DIR .. "src/mame/video/naughtyb.cpp",
+	MAME_DIR .. "src/mame/drivers/phoenix.cpp",
+	MAME_DIR .. "src/mame/audio/phoenix.cpp",
+	MAME_DIR .. "src/mame/video/phoenix.cpp",
+	MAME_DIR .. "src/mame/drivers/safarir.cpp",
+	MAME_DIR .. "src/mame/audio/pleiads.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "playmark")
 files {
-	MAME_DIR .. "src/mame/drivers/drtomy.c",
-	MAME_DIR .. "src/mame/drivers/playmark.c",
-	MAME_DIR .. "src/mame/video/playmark.c",
-	MAME_DIR .. "src/mame/drivers/powerbal.c",
-	MAME_DIR .. "src/mame/drivers/sderby.c",
-	MAME_DIR .. "src/mame/video/sderby.c",
-	MAME_DIR .. "src/mame/drivers/sslam.c",
-	MAME_DIR .. "src/mame/video/sslam.c",
+	MAME_DIR .. "src/mame/drivers/drtomy.cpp",
+	MAME_DIR .. "src/mame/drivers/playmark.cpp",
+	MAME_DIR .. "src/mame/video/playmark.cpp",
+	MAME_DIR .. "src/mame/drivers/powerbal.cpp",
+	MAME_DIR .. "src/mame/drivers/sderby.cpp",
+	MAME_DIR .. "src/mame/video/sderby.cpp",
+	MAME_DIR .. "src/mame/drivers/sslam.cpp",
+	MAME_DIR .. "src/mame/video/sslam.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "psikyo")
 files {
-	MAME_DIR .. "src/mame/drivers/psikyo.c",
-	MAME_DIR .. "src/mame/video/psikyo.c",
-	MAME_DIR .. "src/mame/drivers/psikyo4.c",
-	MAME_DIR .. "src/mame/video/psikyo4.c",
-	MAME_DIR .. "src/mame/drivers/psikyosh.c",
-	MAME_DIR .. "src/mame/video/psikyosh.c",
+	MAME_DIR .. "src/mame/drivers/psikyo.cpp",
+	MAME_DIR .. "src/mame/video/psikyo.cpp",
+	MAME_DIR .. "src/mame/drivers/psikyo4.cpp",
+	MAME_DIR .. "src/mame/video/psikyo4.cpp",
+	MAME_DIR .. "src/mame/drivers/psikyosh.cpp",
+	MAME_DIR .. "src/mame/video/psikyosh.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "ramtek")
 files {
-	MAME_DIR .. "src/mame/drivers/hitme.c",
-	MAME_DIR .. "src/mame/audio/hitme.c",
-	MAME_DIR .. "src/mame/drivers/ramtek.c",
-	MAME_DIR .. "src/mame/drivers/starcrus.c",
-	MAME_DIR .. "src/mame/video/starcrus.c",
+	MAME_DIR .. "src/mame/drivers/hitme.cpp",
+	MAME_DIR .. "src/mame/audio/hitme.cpp",
+	MAME_DIR .. "src/mame/drivers/ramtek.cpp",
+	MAME_DIR .. "src/mame/drivers/starcrus.cpp",
+	MAME_DIR .. "src/mame/video/starcrus.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "rare")
 files {
-	MAME_DIR .. "src/mame/drivers/btoads.c",
-	MAME_DIR .. "src/mame/video/btoads.c",
-	MAME_DIR .. "src/mame/drivers/kinst.c",
-	MAME_DIR .. "src/mame/drivers/xtheball.c",
+	MAME_DIR .. "src/mame/drivers/btoads.cpp",
+	MAME_DIR .. "src/mame/video/btoads.cpp",
+	MAME_DIR .. "src/mame/drivers/kinst.cpp",
+	MAME_DIR .. "src/mame/drivers/xtheball.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "sanritsu")
 files {
-	MAME_DIR .. "src/mame/drivers/appoooh.c",
-	MAME_DIR .. "src/mame/video/appoooh.c",
-	MAME_DIR .. "src/mame/drivers/bankp.c",
-	MAME_DIR .. "src/mame/video/bankp.c",
-	MAME_DIR .. "src/mame/drivers/chinsan.c",
-	MAME_DIR .. "src/mame/drivers/drmicro.c",
-	MAME_DIR .. "src/mame/video/drmicro.c",
-	MAME_DIR .. "src/mame/drivers/jantotsu.c",
-	MAME_DIR .. "src/mame/drivers/mayumi.c",
-	MAME_DIR .. "src/mame/drivers/mermaid.c",
-	MAME_DIR .. "src/mame/video/mermaid.c",
-	MAME_DIR .. "src/mame/drivers/mjkjidai.c",
-	MAME_DIR .. "src/mame/video/mjkjidai.c",
+	MAME_DIR .. "src/mame/drivers/appoooh.cpp",
+	MAME_DIR .. "src/mame/video/appoooh.cpp",
+	MAME_DIR .. "src/mame/drivers/bankp.cpp",
+	MAME_DIR .. "src/mame/video/bankp.cpp",
+	MAME_DIR .. "src/mame/drivers/chinsan.cpp",
+	MAME_DIR .. "src/mame/drivers/drmicro.cpp",
+	MAME_DIR .. "src/mame/video/drmicro.cpp",
+	MAME_DIR .. "src/mame/drivers/jantotsu.cpp",
+	MAME_DIR .. "src/mame/drivers/mayumi.cpp",
+	MAME_DIR .. "src/mame/drivers/mermaid.cpp",
+	MAME_DIR .. "src/mame/video/mermaid.cpp",
+	MAME_DIR .. "src/mame/drivers/mjkjidai.cpp",
+	MAME_DIR .. "src/mame/video/mjkjidai.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "sega")
 files {
-	MAME_DIR .. "src/mame/drivers/angelkds.c",
-	MAME_DIR .. "src/mame/video/angelkds.c",
-	MAME_DIR .. "src/mame/drivers/bingoc.c",
-	MAME_DIR .. "src/mame/drivers/blockade.c",
-	MAME_DIR .. "src/mame/audio/blockade.c",
-	MAME_DIR .. "src/mame/video/blockade.c",
-	MAME_DIR .. "src/mame/drivers/calorie.c",
-	MAME_DIR .. "src/mame/drivers/chihiro.c",
-	MAME_DIR .. "src/mame/video/chihiro.c",
-	MAME_DIR .. "src/mame/drivers/coolridr.c",
-	MAME_DIR .. "src/mame/drivers/deniam.c",
-	MAME_DIR .. "src/mame/video/deniam.c",
-	MAME_DIR .. "src/mame/drivers/dotrikun.c",
-	MAME_DIR .. "src/mame/drivers/gpworld.c",
-	MAME_DIR .. "src/mame/drivers/hikaru.c",
-	MAME_DIR .. "src/mame/drivers/hshavoc.c",
-	MAME_DIR .. "src/mame/drivers/kopunch.c",
-	MAME_DIR .. "src/mame/video/kopunch.c",
-	MAME_DIR .. "src/mame/drivers/lindbergh.c",
-	MAME_DIR .. "src/mame/machine/segabb.c",
-	MAME_DIR .. "src/mame/machine/megadriv.c",
-	MAME_DIR .. "src/mame/drivers/megadrvb.c",
-	MAME_DIR .. "src/mame/drivers/megaplay.c",
-	MAME_DIR .. "src/mame/drivers/megatech.c",
-	MAME_DIR .. "src/mame/drivers/model1.c",
-	MAME_DIR .. "src/mame/machine/model1.c",
-	MAME_DIR .. "src/mame/video/model1.c",
-	MAME_DIR .. "src/mame/machine/s32comm.c",
-	MAME_DIR .. "src/mame/machine/m1comm.c",
-	MAME_DIR .. "src/mame/audio/dsbz80.c",
-	MAME_DIR .. "src/mame/drivers/model2.c",
-	MAME_DIR .. "src/mame/video/model2.c",
-	MAME_DIR .. "src/mame/drivers/model3.c",
-	MAME_DIR .. "src/mame/video/model3.c",
-	MAME_DIR .. "src/mame/machine/model3.c",
-	MAME_DIR .. "src/mame/drivers/monacogp.c",
-	MAME_DIR .. "src/mame/drivers/naomi.c",
-	MAME_DIR .. "src/mame/drivers/segasp.c",
-	MAME_DIR .. "src/mame/machine/dc.c",
-	MAME_DIR .. "src/mame/video/powervr2.c",
-	MAME_DIR .. "src/mame/machine/naomi.c",
-	MAME_DIR .. "src/mame/machine/naomig1.c",
-	MAME_DIR .. "src/mame/machine/naomibd.c",
-	MAME_DIR .. "src/mame/machine/naomirom.c",
-	MAME_DIR .. "src/mame/machine/naomigd.c",
-	MAME_DIR .. "src/mame/machine/naomim1.c",
-	MAME_DIR .. "src/mame/machine/naomim2.c",
-	MAME_DIR .. "src/mame/machine/naomim4.c",
-	MAME_DIR .. "src/mame/machine/315-5881_crypt.c",
-	MAME_DIR .. "src/mame/machine/awboard.c",
-	MAME_DIR .. "src/mame/machine/mie.c",
-	MAME_DIR .. "src/mame/machine/maple-dc.c",
-	MAME_DIR .. "src/mame/machine/mapledev.c",
-	MAME_DIR .. "src/mame/machine/dc-ctrl.c",
-	MAME_DIR .. "src/mame/machine/jvs13551.c",
-	MAME_DIR .. "src/mame/drivers/triforce.c",
-	MAME_DIR .. "src/mame/drivers/puckpkmn.c",
-	MAME_DIR .. "src/mame/drivers/segac2.c",
-	MAME_DIR .. "src/mame/drivers/segae.c",
-	MAME_DIR .. "src/mame/drivers/shtzone.c",
-	MAME_DIR .. "src/mame/drivers/segacoin.c",
-	MAME_DIR .. "src/mame/drivers/segag80r.c",
-	MAME_DIR .. "src/mame/machine/segag80.c",
-	MAME_DIR .. "src/mame/audio/segag80r.c",
-	MAME_DIR .. "src/mame/video/segag80r.c",
-	MAME_DIR .. "src/mame/drivers/segag80v.c",
-	MAME_DIR .. "src/mame/audio/segag80v.c",
-	MAME_DIR .. "src/mame/video/segag80v.c",
-	MAME_DIR .. "src/mame/drivers/segahang.c",
-	MAME_DIR .. "src/mame/video/segahang.c",
-	MAME_DIR .. "src/mame/drivers/segajw.c",
-	MAME_DIR .. "src/mame/drivers/segald.c",
-	MAME_DIR .. "src/mame/drivers/segaorun.c",
-	MAME_DIR .. "src/mame/video/segaorun.c",
-	MAME_DIR .. "src/mame/drivers/segas16a.c",
-	MAME_DIR .. "src/mame/video/segas16a.c",
-	MAME_DIR .. "src/mame/drivers/segas16b.c",
-	MAME_DIR .. "src/mame/video/segas16b.c",
-	MAME_DIR .. "src/mame/drivers/segas18.c",
-	MAME_DIR .. "src/mame/video/segas18.c",
-	MAME_DIR .. "src/mame/drivers/segas24.c",
-	MAME_DIR .. "src/mame/video/segas24.c",
-	MAME_DIR .. "src/mame/drivers/segam1.c",
-	MAME_DIR .. "src/mame/drivers/segas32.c",
-	MAME_DIR .. "src/mame/machine/segas32.c",
-	MAME_DIR .. "src/mame/video/segas32.c",
-	MAME_DIR .. "src/mame/drivers/segaufo.c",
-	MAME_DIR .. "src/mame/drivers/segaxbd.c",
-	MAME_DIR .. "src/mame/video/segaxbd.c",
-	MAME_DIR .. "src/mame/drivers/segaybd.c",
-	MAME_DIR .. "src/mame/video/segaybd.c",
-	MAME_DIR .. "src/mame/drivers/sg1000a.c",
-	MAME_DIR .. "src/mame/drivers/stactics.c",
-	MAME_DIR .. "src/mame/video/stactics.c",
-	MAME_DIR .. "src/mame/drivers/stv.c",
-	MAME_DIR .. "src/mame/machine/stvprot.c",
-	MAME_DIR .. "src/mame/machine/315-5838_317-0229_comp.c",
-	MAME_DIR .. "src/mame/drivers/suprloco.c",
-	MAME_DIR .. "src/mame/video/suprloco.c",
-	MAME_DIR .. "src/mame/drivers/system1.c",
-	MAME_DIR .. "src/mame/video/system1.c",
-	MAME_DIR .. "src/mame/drivers/system16.c",
-	MAME_DIR .. "src/mame/video/system16.c",
-	MAME_DIR .. "src/mame/drivers/timetrv.c",
-	MAME_DIR .. "src/mame/drivers/turbo.c",
-	MAME_DIR .. "src/mame/audio/turbo.c",
-	MAME_DIR .. "src/mame/video/turbo.c",
-	MAME_DIR .. "src/mame/drivers/vicdual.c",
-	MAME_DIR .. "src/mame/audio/vicdual.c",
-	MAME_DIR .. "src/mame/video/vicdual.c",
-	MAME_DIR .. "src/mame/audio/carnival.c",
-	MAME_DIR .. "src/mame/audio/depthch.c",
-	MAME_DIR .. "src/mame/audio/invinco.c",
-	MAME_DIR .. "src/mame/audio/pulsar.c",
-	MAME_DIR .. "src/mame/drivers/zaxxon.c",
-	MAME_DIR .. "src/mame/audio/zaxxon.c",
-	MAME_DIR .. "src/mame/video/zaxxon.c",
-	MAME_DIR .. "src/mame/machine/315_5296.c",
-	MAME_DIR .. "src/mame/machine/fd1089.c",
-	MAME_DIR .. "src/mame/machine/fd1094.c",
-	MAME_DIR .. "src/mame/machine/fddebug.c",
-	MAME_DIR .. "src/mame/machine/mc8123.c",
-	MAME_DIR .. "src/mame/machine/segaic16.c",
-	MAME_DIR .. "src/mame/audio/segasnd.c",
-	MAME_DIR .. "src/mame/video/segaic16.c",
-	MAME_DIR .. "src/mame/video/segaic16_road.c",
-	MAME_DIR .. "src/mame/video/sega16sp.c",
-	MAME_DIR .. "src/mame/video/segaic24.c",
-	MAME_DIR .. "src/mame/machine/gdrom.c",
-	MAME_DIR .. "src/mame/machine/xbox.c",
+	MAME_DIR .. "src/mame/drivers/angelkds.cpp",
+	MAME_DIR .. "src/mame/video/angelkds.cpp",
+	MAME_DIR .. "src/mame/drivers/bingoc.cpp",
+	MAME_DIR .. "src/mame/drivers/blockade.cpp",
+	MAME_DIR .. "src/mame/audio/blockade.cpp",
+	MAME_DIR .. "src/mame/video/blockade.cpp",
+	MAME_DIR .. "src/mame/drivers/calorie.cpp",
+	MAME_DIR .. "src/mame/drivers/chihiro.cpp",
+	MAME_DIR .. "src/mame/video/chihiro.cpp",
+	MAME_DIR .. "src/mame/drivers/coolridr.cpp",
+	MAME_DIR .. "src/mame/drivers/deniam.cpp",
+	MAME_DIR .. "src/mame/video/deniam.cpp",
+	MAME_DIR .. "src/mame/drivers/dotrikun.cpp",
+	MAME_DIR .. "src/mame/drivers/gpworld.cpp",
+	MAME_DIR .. "src/mame/drivers/hikaru.cpp",
+	MAME_DIR .. "src/mame/drivers/hshavoc.cpp",
+	MAME_DIR .. "src/mame/drivers/kopunch.cpp",
+	MAME_DIR .. "src/mame/video/kopunch.cpp",
+	MAME_DIR .. "src/mame/drivers/lindbergh.cpp",
+	MAME_DIR .. "src/mame/machine/segabb.cpp",
+	MAME_DIR .. "src/mame/machine/megadriv.cpp",
+	MAME_DIR .. "src/mame/drivers/megadrvb.cpp",
+	MAME_DIR .. "src/mame/drivers/megaplay.cpp",
+	MAME_DIR .. "src/mame/drivers/megatech.cpp",
+	MAME_DIR .. "src/mame/drivers/model1.cpp",
+	MAME_DIR .. "src/mame/machine/model1.cpp",
+	MAME_DIR .. "src/mame/video/model1.cpp",
+	MAME_DIR .. "src/mame/machine/s32comm.cpp",
+	MAME_DIR .. "src/mame/machine/m1comm.cpp",
+	MAME_DIR .. "src/mame/audio/dsbz80.cpp",
+	MAME_DIR .. "src/mame/drivers/model2.cpp",
+	MAME_DIR .. "src/mame/video/model2.cpp",
+	MAME_DIR .. "src/mame/drivers/model3.cpp",
+	MAME_DIR .. "src/mame/video/model3.cpp",
+	MAME_DIR .. "src/mame/machine/model3.cpp",
+	MAME_DIR .. "src/mame/drivers/monacogp.cpp",
+	MAME_DIR .. "src/mame/drivers/naomi.cpp",
+	MAME_DIR .. "src/mame/drivers/segasp.cpp",
+	MAME_DIR .. "src/mame/machine/dc.cpp",
+	MAME_DIR .. "src/mame/video/powervr2.cpp",
+	MAME_DIR .. "src/mame/machine/naomi.cpp",
+	MAME_DIR .. "src/mame/machine/naomig1.cpp",
+	MAME_DIR .. "src/mame/machine/naomibd.cpp",
+	MAME_DIR .. "src/mame/machine/naomirom.cpp",
+	MAME_DIR .. "src/mame/machine/naomigd.cpp",
+	MAME_DIR .. "src/mame/machine/naomim1.cpp",
+	MAME_DIR .. "src/mame/machine/naomim2.cpp",
+	MAME_DIR .. "src/mame/machine/naomim4.cpp",
+	MAME_DIR .. "src/mame/machine/315-5881_crypt.cpp",
+	MAME_DIR .. "src/mame/machine/awboard.cpp",
+	MAME_DIR .. "src/mame/machine/mie.cpp",
+	MAME_DIR .. "src/mame/machine/maple-dc.cpp",
+	MAME_DIR .. "src/mame/machine/mapledev.cpp",
+	MAME_DIR .. "src/mame/machine/dc-ctrl.cpp",
+	MAME_DIR .. "src/mame/machine/jvs13551.cpp",
+	MAME_DIR .. "src/mame/drivers/triforce.cpp",
+	MAME_DIR .. "src/mame/drivers/puckpkmn.cpp",
+	MAME_DIR .. "src/mame/drivers/segac2.cpp",
+	MAME_DIR .. "src/mame/drivers/segae.cpp",
+	MAME_DIR .. "src/mame/drivers/shtzone.cpp",
+	MAME_DIR .. "src/mame/drivers/segacoin.cpp",
+	MAME_DIR .. "src/mame/drivers/segag80r.cpp",
+	MAME_DIR .. "src/mame/machine/segag80.cpp",
+	MAME_DIR .. "src/mame/audio/segag80r.cpp",
+	MAME_DIR .. "src/mame/video/segag80r.cpp",
+	MAME_DIR .. "src/mame/drivers/segag80v.cpp",
+	MAME_DIR .. "src/mame/audio/segag80v.cpp",
+	MAME_DIR .. "src/mame/video/segag80v.cpp",
+	MAME_DIR .. "src/mame/drivers/segahang.cpp",
+	MAME_DIR .. "src/mame/video/segahang.cpp",
+	MAME_DIR .. "src/mame/drivers/segajw.cpp",
+	MAME_DIR .. "src/mame/drivers/segald.cpp",
+	MAME_DIR .. "src/mame/drivers/segaorun.cpp",
+	MAME_DIR .. "src/mame/video/segaorun.cpp",
+	MAME_DIR .. "src/mame/drivers/segas16a.cpp",
+	MAME_DIR .. "src/mame/video/segas16a.cpp",
+	MAME_DIR .. "src/mame/drivers/segas16b.cpp",
+	MAME_DIR .. "src/mame/video/segas16b.cpp",
+	MAME_DIR .. "src/mame/drivers/segas18.cpp",
+	MAME_DIR .. "src/mame/video/segas18.cpp",
+	MAME_DIR .. "src/mame/drivers/segas24.cpp",
+	MAME_DIR .. "src/mame/video/segas24.cpp",
+	MAME_DIR .. "src/mame/drivers/segam1.cpp",
+	MAME_DIR .. "src/mame/drivers/segas32.cpp",
+	MAME_DIR .. "src/mame/machine/segas32.cpp",
+	MAME_DIR .. "src/mame/video/segas32.cpp",
+	MAME_DIR .. "src/mame/drivers/segaufo.cpp",
+	MAME_DIR .. "src/mame/drivers/segaxbd.cpp",
+	MAME_DIR .. "src/mame/video/segaxbd.cpp",
+	MAME_DIR .. "src/mame/drivers/segaybd.cpp",
+	MAME_DIR .. "src/mame/video/segaybd.cpp",
+	MAME_DIR .. "src/mame/drivers/sg1000a.cpp",
+	MAME_DIR .. "src/mame/drivers/stactics.cpp",
+	MAME_DIR .. "src/mame/video/stactics.cpp",
+	MAME_DIR .. "src/mame/drivers/stv.cpp",
+	MAME_DIR .. "src/mame/machine/stvprot.cpp",
+	MAME_DIR .. "src/mame/machine/315-5838_317-0229_comp.cpp",
+	MAME_DIR .. "src/mame/drivers/suprloco.cpp",
+	MAME_DIR .. "src/mame/video/suprloco.cpp",
+	MAME_DIR .. "src/mame/drivers/system1.cpp",
+	MAME_DIR .. "src/mame/video/system1.cpp",
+	MAME_DIR .. "src/mame/drivers/system16.cpp",
+	MAME_DIR .. "src/mame/video/system16.cpp",
+	MAME_DIR .. "src/mame/drivers/timetrv.cpp",
+	MAME_DIR .. "src/mame/drivers/turbo.cpp",
+	MAME_DIR .. "src/mame/audio/turbo.cpp",
+	MAME_DIR .. "src/mame/video/turbo.cpp",
+	MAME_DIR .. "src/mame/drivers/vicdual.cpp",
+	MAME_DIR .. "src/mame/audio/vicdual.cpp",
+	MAME_DIR .. "src/mame/video/vicdual.cpp",
+	MAME_DIR .. "src/mame/audio/carnival.cpp",
+	MAME_DIR .. "src/mame/audio/depthch.cpp",
+	MAME_DIR .. "src/mame/audio/invinco.cpp",
+	MAME_DIR .. "src/mame/audio/pulsar.cpp",
+	MAME_DIR .. "src/mame/drivers/zaxxon.cpp",
+	MAME_DIR .. "src/mame/audio/zaxxon.cpp",
+	MAME_DIR .. "src/mame/video/zaxxon.cpp",
+	MAME_DIR .. "src/mame/machine/315_5296.cpp",
+	MAME_DIR .. "src/mame/machine/fd1089.cpp",
+	MAME_DIR .. "src/mame/machine/fd1094.cpp",
+	MAME_DIR .. "src/mame/machine/fddebug.cpp",
+	MAME_DIR .. "src/mame/machine/mc8123.cpp",
+	MAME_DIR .. "src/mame/machine/segaic16.cpp",
+	MAME_DIR .. "src/mame/audio/segasnd.cpp",
+	MAME_DIR .. "src/mame/video/segaic16.cpp",
+	MAME_DIR .. "src/mame/video/segaic16_road.cpp",
+	MAME_DIR .. "src/mame/video/sega16sp.cpp",
+	MAME_DIR .. "src/mame/video/segaic24.cpp",
+	MAME_DIR .. "src/mame/machine/gdrom.cpp",
+	MAME_DIR .. "src/mame/machine/xbox.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "seibu")
 files {
-	MAME_DIR .. "src/mame/drivers/bloodbro.c",
-	MAME_DIR .. "src/mame/video/bloodbro.c",
-	MAME_DIR .. "src/mame/drivers/cabal.c",
-	MAME_DIR .. "src/mame/video/cabal.c",
-	MAME_DIR .. "src/mame/drivers/cshooter.c",
-	MAME_DIR .. "src/mame/drivers/dcon.c",
-	MAME_DIR .. "src/mame/video/dcon.c",
-	MAME_DIR .. "src/mame/drivers/deadang.c",
-	MAME_DIR .. "src/mame/video/deadang.c",
-	MAME_DIR .. "src/mame/drivers/dynduke.c",
-	MAME_DIR .. "src/mame/video/dynduke.c",
-	MAME_DIR .. "src/mame/drivers/feversoc.c",
-	MAME_DIR .. "src/mame/drivers/goal92.c",
-	MAME_DIR .. "src/mame/video/goal92.c",
-	MAME_DIR .. "src/mame/drivers/goodejan.c",
-	MAME_DIR .. "src/mame/drivers/kncljoe.c",
-	MAME_DIR .. "src/mame/video/kncljoe.c",
-	MAME_DIR .. "src/mame/drivers/legionna.c",
-	MAME_DIR .. "src/mame/video/legionna.c",
-	MAME_DIR .. "src/mame/drivers/mustache.c",
-	MAME_DIR .. "src/mame/video/mustache.c",
-	MAME_DIR .. "src/mame/drivers/panicr.c",
-	MAME_DIR .. "src/mame/drivers/raiden.c",
-	MAME_DIR .. "src/mame/video/raiden.c",
-	MAME_DIR .. "src/mame/drivers/raiden2.c",
-	MAME_DIR .. "src/mame/machine/r2crypt.c",
-	MAME_DIR .. "src/mame/machine/raiden2cop.c",
-	MAME_DIR .. "src/mame/drivers/r2dx_v33.c",
-	MAME_DIR .. "src/mame/drivers/seibuspi.c",
-	MAME_DIR .. "src/mame/machine/seibuspi.c",
-	MAME_DIR .. "src/mame/video/seibuspi.c",
-	MAME_DIR .. "src/mame/drivers/sengokmj.c",
-	MAME_DIR .. "src/mame/drivers/stfight.c",
-	MAME_DIR .. "src/mame/machine/stfight.c",
-	MAME_DIR .. "src/mame/video/stfight.c",
-	MAME_DIR .. "src/mame/drivers/toki.c",
-	MAME_DIR .. "src/mame/video/toki.c",
-	MAME_DIR .. "src/mame/drivers/wiz.c",
-	MAME_DIR .. "src/mame/video/wiz.c",
-	MAME_DIR .. "src/mame/machine/seicop.c",
-	MAME_DIR .. "src/mame/machine/spisprit.c",
-	MAME_DIR .. "src/mame/audio/seibu.c",
-	MAME_DIR .. "src/mame/video/seibu_crtc.c",
+	MAME_DIR .. "src/mame/drivers/bloodbro.cpp",
+	MAME_DIR .. "src/mame/video/bloodbro.cpp",
+	MAME_DIR .. "src/mame/drivers/cabal.cpp",
+	MAME_DIR .. "src/mame/video/cabal.cpp",
+	MAME_DIR .. "src/mame/drivers/cshooter.cpp",
+	MAME_DIR .. "src/mame/drivers/dcon.cpp",
+	MAME_DIR .. "src/mame/video/dcon.cpp",
+	MAME_DIR .. "src/mame/drivers/deadang.cpp",
+	MAME_DIR .. "src/mame/video/deadang.cpp",
+	MAME_DIR .. "src/mame/drivers/dynduke.cpp",
+	MAME_DIR .. "src/mame/video/dynduke.cpp",
+	MAME_DIR .. "src/mame/drivers/feversoc.cpp",
+	MAME_DIR .. "src/mame/drivers/goal92.cpp",
+	MAME_DIR .. "src/mame/video/goal92.cpp",
+	MAME_DIR .. "src/mame/drivers/goodejan.cpp",
+	MAME_DIR .. "src/mame/drivers/kncljoe.cpp",
+	MAME_DIR .. "src/mame/video/kncljoe.cpp",
+	MAME_DIR .. "src/mame/drivers/legionna.cpp",
+	MAME_DIR .. "src/mame/video/legionna.cpp",
+	MAME_DIR .. "src/mame/drivers/mustache.cpp",
+	MAME_DIR .. "src/mame/video/mustache.cpp",
+	MAME_DIR .. "src/mame/drivers/panicr.cpp",
+	MAME_DIR .. "src/mame/drivers/raiden.cpp",
+	MAME_DIR .. "src/mame/video/raiden.cpp",
+	MAME_DIR .. "src/mame/drivers/raiden2.cpp",
+	MAME_DIR .. "src/mame/machine/r2crypt.cpp",
+	MAME_DIR .. "src/mame/machine/raiden2cop.cpp",
+	MAME_DIR .. "src/mame/drivers/r2dx_v33.cpp",
+	MAME_DIR .. "src/mame/drivers/seibuspi.cpp",
+	MAME_DIR .. "src/mame/machine/seibuspi.cpp",
+	MAME_DIR .. "src/mame/video/seibuspi.cpp",
+	MAME_DIR .. "src/mame/drivers/sengokmj.cpp",
+	MAME_DIR .. "src/mame/drivers/stfight.cpp",
+	MAME_DIR .. "src/mame/machine/stfight.cpp",
+	MAME_DIR .. "src/mame/video/stfight.cpp",
+	MAME_DIR .. "src/mame/drivers/toki.cpp",
+	MAME_DIR .. "src/mame/video/toki.cpp",
+	MAME_DIR .. "src/mame/drivers/wiz.cpp",
+	MAME_DIR .. "src/mame/video/wiz.cpp",
+	MAME_DIR .. "src/mame/machine/seicop.cpp",
+	MAME_DIR .. "src/mame/machine/spisprit.cpp",
+	MAME_DIR .. "src/mame/audio/seibu.cpp",
+	MAME_DIR .. "src/mame/video/seibu_crtc.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "seta")
 files {
-	MAME_DIR .. "src/mame/drivers/aleck64.c",
-	MAME_DIR .. "src/mame/machine/n64.c",
-	MAME_DIR .. "src/mame/video/n64.c",
-	MAME_DIR .. "src/mame/video/rdpblend.c",
-	MAME_DIR .. "src/mame/video/rdptpipe.c",
-	MAME_DIR .. "src/mame/drivers/hanaawas.c",
-	MAME_DIR .. "src/mame/video/hanaawas.c",
-	MAME_DIR .. "src/mame/drivers/jclub2.c",
-	MAME_DIR .. "src/mame/drivers/macs.c",
-	MAME_DIR .. "src/mame/drivers/seta.c",
-	MAME_DIR .. "src/mame/video/seta.c",
-	MAME_DIR .. "src/mame/drivers/seta2.c",
-	MAME_DIR .. "src/mame/video/seta2.c",
-	MAME_DIR .. "src/mame/drivers/speedatk.c",
-	MAME_DIR .. "src/mame/video/speedatk.c",
-	MAME_DIR .. "src/mame/drivers/speglsht.c",
-	MAME_DIR .. "src/mame/drivers/srmp2.c",
-	MAME_DIR .. "src/mame/video/srmp2.c",
-	MAME_DIR .. "src/mame/drivers/srmp5.c",
-	MAME_DIR .. "src/mame/drivers/srmp6.c",
-	MAME_DIR .. "src/mame/drivers/ssv.c",
-	MAME_DIR .. "src/mame/video/ssv.c",
-	MAME_DIR .. "src/mame/video/st0020.c",
-	MAME_DIR .. "src/mame/machine/st0016.c",
-	MAME_DIR .. "src/mame/drivers/simple_st0016.c",
-	MAME_DIR .. "src/mame/video/seta001.c",
-	MAME_DIR .. "src/mame/drivers/thedealr.c",
+	MAME_DIR .. "src/mame/drivers/aleck64.cpp",
+	MAME_DIR .. "src/mame/machine/n64.cpp",
+	MAME_DIR .. "src/mame/video/n64.cpp",
+	MAME_DIR .. "src/mame/video/rdpblend.cpp",
+	MAME_DIR .. "src/mame/video/rdptpipe.cpp",
+	MAME_DIR .. "src/mame/drivers/hanaawas.cpp",
+	MAME_DIR .. "src/mame/video/hanaawas.cpp",
+	MAME_DIR .. "src/mame/drivers/jclub2.cpp",
+	MAME_DIR .. "src/mame/drivers/macs.cpp",
+	MAME_DIR .. "src/mame/drivers/seta.cpp",
+	MAME_DIR .. "src/mame/video/seta.cpp",
+	MAME_DIR .. "src/mame/drivers/seta2.cpp",
+	MAME_DIR .. "src/mame/video/seta2.cpp",
+	MAME_DIR .. "src/mame/drivers/speedatk.cpp",
+	MAME_DIR .. "src/mame/video/speedatk.cpp",
+	MAME_DIR .. "src/mame/drivers/speglsht.cpp",
+	MAME_DIR .. "src/mame/drivers/srmp2.cpp",
+	MAME_DIR .. "src/mame/video/srmp2.cpp",
+	MAME_DIR .. "src/mame/drivers/srmp5.cpp",
+	MAME_DIR .. "src/mame/drivers/srmp6.cpp",
+	MAME_DIR .. "src/mame/drivers/ssv.cpp",
+	MAME_DIR .. "src/mame/video/ssv.cpp",
+	MAME_DIR .. "src/mame/video/st0020.cpp",
+	MAME_DIR .. "src/mame/machine/st0016.cpp",
+	MAME_DIR .. "src/mame/drivers/simple_st0016.cpp",
+	MAME_DIR .. "src/mame/video/seta001.cpp",
+	MAME_DIR .. "src/mame/drivers/thedealr.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "sigma")
 files {
-	MAME_DIR .. "src/mame/drivers/nyny.c",
-	MAME_DIR .. "src/mame/drivers/r2dtank.c",
-	MAME_DIR .. "src/mame/drivers/sigmab52.c",
-	MAME_DIR .. "src/mame/drivers/sigmab98.c",
-	MAME_DIR .. "src/mame/drivers/spiders.c",
-	MAME_DIR .. "src/mame/audio/spiders.c",
-	MAME_DIR .. "src/mame/drivers/sub.c",
+	MAME_DIR .. "src/mame/drivers/nyny.cpp",
+	MAME_DIR .. "src/mame/drivers/r2dtank.cpp",
+	MAME_DIR .. "src/mame/drivers/sigmab52.cpp",
+	MAME_DIR .. "src/mame/drivers/sigmab98.cpp",
+	MAME_DIR .. "src/mame/drivers/spiders.cpp",
+	MAME_DIR .. "src/mame/audio/spiders.cpp",
+	MAME_DIR .. "src/mame/drivers/sub.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "snk")
 files {
-	MAME_DIR .. "src/mame/drivers/bbusters.c",
-	MAME_DIR .. "src/mame/video/bbusters.c",
-	MAME_DIR .. "src/mame/drivers/dmndrby.c",
-	MAME_DIR .. "src/mame/drivers/hng64.c",
-	MAME_DIR .. "src/mame/video/hng64.c",
-	MAME_DIR .. "src/mame/audio/hng64.c",
-	MAME_DIR .. "src/mame/machine/hng64_net.c",
-	MAME_DIR .. "src/mame/video/hng64_3d.c",
-	MAME_DIR .. "src/mame/video/hng64_sprite.c",
-	MAME_DIR .. "src/mame/drivers/lasso.c",
-	MAME_DIR .. "src/mame/video/lasso.c",
-	MAME_DIR .. "src/mame/drivers/mainsnk.c",
-	MAME_DIR .. "src/mame/video/mainsnk.c",
-	MAME_DIR .. "src/mame/drivers/munchmo.c",
-	MAME_DIR .. "src/mame/video/munchmo.c",
-	MAME_DIR .. "src/mame/drivers/prehisle.c",
-	MAME_DIR .. "src/mame/video/prehisle.c",
-	MAME_DIR .. "src/mame/drivers/snk6502.c",
-	MAME_DIR .. "src/mame/audio/snk6502.c",
-	MAME_DIR .. "src/mame/video/snk6502.c",
-	MAME_DIR .. "src/mame/drivers/snk.c",
-	MAME_DIR .. "src/mame/video/snk.c",
-	MAME_DIR .. "src/mame/drivers/snk68.c",
-	MAME_DIR .. "src/mame/video/snk68.c",
+	MAME_DIR .. "src/mame/drivers/bbusters.cpp",
+	MAME_DIR .. "src/mame/video/bbusters.cpp",
+	MAME_DIR .. "src/mame/drivers/dmndrby.cpp",
+	MAME_DIR .. "src/mame/drivers/hng64.cpp",
+	MAME_DIR .. "src/mame/video/hng64.cpp",
+	MAME_DIR .. "src/mame/audio/hng64.cpp",
+	MAME_DIR .. "src/mame/machine/hng64_net.cpp",
+	MAME_DIR .. "src/mame/video/hng64_3d.cpp",
+	MAME_DIR .. "src/mame/video/hng64_sprite.cpp",
+	MAME_DIR .. "src/mame/drivers/lasso.cpp",
+	MAME_DIR .. "src/mame/video/lasso.cpp",
+	MAME_DIR .. "src/mame/drivers/mainsnk.cpp",
+	MAME_DIR .. "src/mame/video/mainsnk.cpp",
+	MAME_DIR .. "src/mame/drivers/munchmo.cpp",
+	MAME_DIR .. "src/mame/video/munchmo.cpp",
+	MAME_DIR .. "src/mame/drivers/prehisle.cpp",
+	MAME_DIR .. "src/mame/video/prehisle.cpp",
+	MAME_DIR .. "src/mame/drivers/snk6502.cpp",
+	MAME_DIR .. "src/mame/audio/snk6502.cpp",
+	MAME_DIR .. "src/mame/video/snk6502.cpp",
+	MAME_DIR .. "src/mame/drivers/snk.cpp",
+	MAME_DIR .. "src/mame/video/snk.cpp",
+	MAME_DIR .. "src/mame/drivers/snk68.cpp",
+	MAME_DIR .. "src/mame/video/snk68.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "sony")
 files {
-	MAME_DIR .. "src/mame/drivers/zn.c",
-	MAME_DIR .. "src/mame/machine/zndip.c",
-	MAME_DIR .. "src/mame/machine/cat702.c",
+	MAME_DIR .. "src/mame/drivers/zn.cpp",
+	MAME_DIR .. "src/mame/machine/zndip.cpp",
+	MAME_DIR .. "src/mame/machine/cat702.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "stern")
 files {
-	MAME_DIR .. "src/mame/drivers/astinvad.c",
-	MAME_DIR .. "src/mame/drivers/berzerk.c",
-	MAME_DIR .. "src/mame/drivers/cliffhgr.c",
-	MAME_DIR .. "src/mame/audio/cliffhgr.c",
-	MAME_DIR .. "src/mame/drivers/mazerbla.c",
-	MAME_DIR .. "src/mame/drivers/supdrapo.c",
+	MAME_DIR .. "src/mame/drivers/astinvad.cpp",
+	MAME_DIR .. "src/mame/drivers/berzerk.cpp",
+	MAME_DIR .. "src/mame/drivers/cliffhgr.cpp",
+	MAME_DIR .. "src/mame/audio/cliffhgr.cpp",
+	MAME_DIR .. "src/mame/drivers/mazerbla.cpp",
+	MAME_DIR .. "src/mame/drivers/supdrapo.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "subsino")
 files {
-	MAME_DIR .. "src/mame/drivers/lastfght.c",
-	MAME_DIR .. "src/mame/drivers/subsino.c",
-	MAME_DIR .. "src/mame/drivers/subsino2.c",
-	MAME_DIR .. "src/mame/machine/subsino.c",
+	MAME_DIR .. "src/mame/drivers/lastfght.cpp",
+	MAME_DIR .. "src/mame/drivers/subsino.cpp",
+	MAME_DIR .. "src/mame/drivers/subsino2.cpp",
+	MAME_DIR .. "src/mame/machine/subsino.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "sun")
 files {
-	MAME_DIR .. "src/mame/drivers/arabian.c",
-	MAME_DIR .. "src/mame/video/arabian.c",
-	MAME_DIR .. "src/mame/drivers/dai3wksi.c",
-	MAME_DIR .. "src/mame/drivers/ikki.c",
-	MAME_DIR .. "src/mame/video/ikki.c",
-	MAME_DIR .. "src/mame/drivers/kangaroo.c",
-	MAME_DIR .. "src/mame/video/kangaroo.c",
-	MAME_DIR .. "src/mame/drivers/markham.c",
-	MAME_DIR .. "src/mame/video/markham.c",
-	MAME_DIR .. "src/mame/drivers/route16.c",
-	MAME_DIR .. "src/mame/video/route16.c",
-	MAME_DIR .. "src/mame/drivers/shanghai.c",
-	MAME_DIR .. "src/mame/drivers/shangha3.c",
-	MAME_DIR .. "src/mame/video/shangha3.c",
-	MAME_DIR .. "src/mame/drivers/strnskil.c",
-	MAME_DIR .. "src/mame/video/strnskil.c",
-	MAME_DIR .. "src/mame/drivers/tonton.c",
+	MAME_DIR .. "src/mame/drivers/arabian.cpp",
+	MAME_DIR .. "src/mame/video/arabian.cpp",
+	MAME_DIR .. "src/mame/drivers/dai3wksi.cpp",
+	MAME_DIR .. "src/mame/drivers/ikki.cpp",
+	MAME_DIR .. "src/mame/video/ikki.cpp",
+	MAME_DIR .. "src/mame/drivers/kangaroo.cpp",
+	MAME_DIR .. "src/mame/video/kangaroo.cpp",
+	MAME_DIR .. "src/mame/drivers/markham.cpp",
+	MAME_DIR .. "src/mame/video/markham.cpp",
+	MAME_DIR .. "src/mame/drivers/route16.cpp",
+	MAME_DIR .. "src/mame/video/route16.cpp",
+	MAME_DIR .. "src/mame/drivers/shanghai.cpp",
+	MAME_DIR .. "src/mame/drivers/shangha3.cpp",
+	MAME_DIR .. "src/mame/video/shangha3.cpp",
+	MAME_DIR .. "src/mame/drivers/strnskil.cpp",
+	MAME_DIR .. "src/mame/video/strnskil.cpp",
+	MAME_DIR .. "src/mame/drivers/tonton.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "suna")
 files {
-	MAME_DIR .. "src/mame/drivers/go2000.c",
-	MAME_DIR .. "src/mame/drivers/goindol.c",
-	MAME_DIR .. "src/mame/video/goindol.c",
-	MAME_DIR .. "src/mame/drivers/suna8.c",
-	MAME_DIR .. "src/mame/audio/suna8.c",
-	MAME_DIR .. "src/mame/video/suna8.c",
-	MAME_DIR .. "src/mame/drivers/suna16.c",
-	MAME_DIR .. "src/mame/video/suna16.c",
+	MAME_DIR .. "src/mame/drivers/go2000.cpp",
+	MAME_DIR .. "src/mame/drivers/goindol.cpp",
+	MAME_DIR .. "src/mame/video/goindol.cpp",
+	MAME_DIR .. "src/mame/drivers/suna8.cpp",
+	MAME_DIR .. "src/mame/audio/suna8.cpp",
+	MAME_DIR .. "src/mame/video/suna8.cpp",
+	MAME_DIR .. "src/mame/drivers/suna16.cpp",
+	MAME_DIR .. "src/mame/video/suna16.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "sure")
 files {
-	MAME_DIR .. "src/mame/drivers/mil4000.c",
+	MAME_DIR .. "src/mame/drivers/mil4000.cpp",
 
 }
 
 createMAMEProjects(_target, _subtarget, "taito")
 files {
-	MAME_DIR .. "src/mame/drivers/2mindril.c",
-	MAME_DIR .. "src/mame/drivers/40love.c",
-	MAME_DIR .. "src/mame/video/40love.c",
-	MAME_DIR .. "src/mame/drivers/arkanoid.c",
-	MAME_DIR .. "src/mame/machine/arkanoid.c",
-	MAME_DIR .. "src/mame/video/arkanoid.c",
-	MAME_DIR .. "src/mame/drivers/ashnojoe.c",
-	MAME_DIR .. "src/mame/video/ashnojoe.c",
-	MAME_DIR .. "src/mame/drivers/asuka.c",
-	MAME_DIR .. "src/mame/machine/bonzeadv.c",
-	MAME_DIR .. "src/mame/video/asuka.c",
-	MAME_DIR .. "src/mame/drivers/bigevglf.c",
-	MAME_DIR .. "src/mame/machine/bigevglf.c",
-	MAME_DIR .. "src/mame/video/bigevglf.c",
-	MAME_DIR .. "src/mame/drivers/bking.c",
-	MAME_DIR .. "src/mame/video/bking.c",
-	MAME_DIR .. "src/mame/drivers/bublbobl.c",
-	MAME_DIR .. "src/mame/machine/bublbobl.c",
-	MAME_DIR .. "src/mame/video/bublbobl.c",
-	MAME_DIR .. "src/mame/drivers/buggychl.c",
-	MAME_DIR .. "src/mame/machine/buggychl.c",
-	MAME_DIR .. "src/mame/video/buggychl.c",
-	MAME_DIR .. "src/mame/drivers/capr1.c",
-	MAME_DIR .. "src/mame/drivers/caprcyc.c",
-	MAME_DIR .. "src/mame/drivers/cchance.c",
-	MAME_DIR .. "src/mame/drivers/chaknpop.c",
-	MAME_DIR .. "src/mame/machine/chaknpop.c",
-	MAME_DIR .. "src/mame/video/chaknpop.c",
-	MAME_DIR .. "src/mame/drivers/champbwl.c",
-	MAME_DIR .. "src/mame/drivers/changela.c",
-	MAME_DIR .. "src/mame/video/changela.c",
-	MAME_DIR .. "src/mame/drivers/crbaloon.c",
-	MAME_DIR .. "src/mame/video/crbaloon.c",
-	MAME_DIR .. "src/mame/audio/crbaloon.c",
-	MAME_DIR .. "src/mame/drivers/cyclemb.c",
-	MAME_DIR .. "src/mame/drivers/darius.c",
-	MAME_DIR .. "src/mame/video/darius.c",
-	MAME_DIR .. "src/mame/drivers/darkmist.c",
-	MAME_DIR .. "src/mame/video/darkmist.c",
-	MAME_DIR .. "src/mame/drivers/exzisus.c",
-	MAME_DIR .. "src/mame/video/exzisus.c",
-	MAME_DIR .. "src/mame/drivers/fgoal.c",
-	MAME_DIR .. "src/mame/video/fgoal.c",
-	MAME_DIR .. "src/mame/drivers/flstory.c",
-	MAME_DIR .. "src/mame/machine/flstory.c",
-	MAME_DIR .. "src/mame/video/flstory.c",
-	MAME_DIR .. "src/mame/drivers/galastrm.c",
-	MAME_DIR .. "src/mame/video/galastrm.c",
-	MAME_DIR .. "src/mame/drivers/gladiatr.c",
-	MAME_DIR .. "src/mame/video/gladiatr.c",
-	MAME_DIR .. "src/mame/drivers/grchamp.c",
-	MAME_DIR .. "src/mame/audio/grchamp.c",
-	MAME_DIR .. "src/mame/video/grchamp.c",
-	MAME_DIR .. "src/mame/drivers/groundfx.c",
-	MAME_DIR .. "src/mame/video/groundfx.c",
-	MAME_DIR .. "src/mame/drivers/gsword.c",
-	MAME_DIR .. "src/mame/machine/tait8741.c",
-	MAME_DIR .. "src/mame/video/gsword.c",
-	MAME_DIR .. "src/mame/drivers/gunbustr.c",
-	MAME_DIR .. "src/mame/video/gunbustr.c",
-	MAME_DIR .. "src/mame/drivers/halleys.c",
-	MAME_DIR .. "src/mame/drivers/invqix.c",
-	MAME_DIR .. "src/mame/drivers/jollyjgr.c",
-	MAME_DIR .. "src/mame/drivers/ksayakyu.c",
-	MAME_DIR .. "src/mame/video/ksayakyu.c",
-	MAME_DIR .. "src/mame/drivers/lgp.c",
-	MAME_DIR .. "src/mame/drivers/lkage.c",
-	MAME_DIR .. "src/mame/machine/lkage.c",
-	MAME_DIR .. "src/mame/video/lkage.c",
-	MAME_DIR .. "src/mame/drivers/lsasquad.c",
-	MAME_DIR .. "src/mame/machine/lsasquad.c",
-	MAME_DIR .. "src/mame/video/lsasquad.c",
-	MAME_DIR .. "src/mame/drivers/marinedt.c",
-	MAME_DIR .. "src/mame/drivers/mexico86.c",
-	MAME_DIR .. "src/mame/machine/mexico86.c",
-	MAME_DIR .. "src/mame/video/mexico86.c",
-	MAME_DIR .. "src/mame/drivers/minivadr.c",
-	MAME_DIR .. "src/mame/drivers/missb2.c",
-	MAME_DIR .. "src/mame/drivers/mlanding.c",
-	MAME_DIR .. "src/mame/drivers/msisaac.c",
-	MAME_DIR .. "src/mame/video/msisaac.c",
-	MAME_DIR .. "src/mame/drivers/ninjaw.c",
-	MAME_DIR .. "src/mame/video/ninjaw.c",
-	MAME_DIR .. "src/mame/drivers/nycaptor.c",
-	MAME_DIR .. "src/mame/machine/nycaptor.c",
-	MAME_DIR .. "src/mame/video/nycaptor.c",
-	MAME_DIR .. "src/mame/drivers/opwolf.c",
-	MAME_DIR .. "src/mame/machine/opwolf.c",
-	MAME_DIR .. "src/mame/video/opwolf.c",
-	MAME_DIR .. "src/mame/drivers/othunder.c",
-	MAME_DIR .. "src/mame/video/othunder.c",
-	MAME_DIR .. "src/mame/drivers/pitnrun.c",
-	MAME_DIR .. "src/mame/machine/pitnrun.c",
-	MAME_DIR .. "src/mame/video/pitnrun.c",
-	MAME_DIR .. "src/mame/drivers/qix.c",
-	MAME_DIR .. "src/mame/machine/qix.c",
-	MAME_DIR .. "src/mame/audio/qix.c",
-	MAME_DIR .. "src/mame/video/qix.c",
-	MAME_DIR .. "src/mame/drivers/rbisland.c",
-	MAME_DIR .. "src/mame/machine/rbisland.c",
-	MAME_DIR .. "src/mame/video/rbisland.c",
-	MAME_DIR .. "src/mame/drivers/rastan.c",
-	MAME_DIR .. "src/mame/video/rastan.c",
-	MAME_DIR .. "src/mame/drivers/retofinv.c",
-	MAME_DIR .. "src/mame/machine/retofinv.c",
-	MAME_DIR .. "src/mame/video/retofinv.c",
-	MAME_DIR .. "src/mame/drivers/rollrace.c",
-	MAME_DIR .. "src/mame/video/rollrace.c",
-	MAME_DIR .. "src/mame/drivers/sbowling.c",
-	MAME_DIR .. "src/mame/drivers/slapshot.c",
-	MAME_DIR .. "src/mame/video/slapshot.c",
-	MAME_DIR .. "src/mame/drivers/ssrj.c",
-	MAME_DIR .. "src/mame/video/ssrj.c",
-	MAME_DIR .. "src/mame/drivers/superchs.c",
-	MAME_DIR .. "src/mame/video/superchs.c",
-	MAME_DIR .. "src/mame/drivers/superqix.c",
-	MAME_DIR .. "src/mame/video/superqix.c",
-	MAME_DIR .. "src/mame/drivers/taito_b.c",
-	MAME_DIR .. "src/mame/video/taito_b.c",
-	MAME_DIR .. "src/mame/drivers/taito_f2.c",
-	MAME_DIR .. "src/mame/video/taito_f2.c",
-	MAME_DIR .. "src/mame/drivers/taito_f3.c",
-	MAME_DIR .. "src/mame/video/taito_f3.c",
-	MAME_DIR .. "src/mame/audio/taito_en.c",
-	MAME_DIR .. "src/mame/drivers/taito_h.c",
-	MAME_DIR .. "src/mame/video/taito_h.c",
-	MAME_DIR .. "src/mame/drivers/taito_l.c",
-	MAME_DIR .. "src/mame/video/taito_l.c",
-	MAME_DIR .. "src/mame/drivers/taito_x.c",
-	MAME_DIR .. "src/mame/machine/cchip.c",
-	MAME_DIR .. "src/mame/drivers/taito_z.c",
-	MAME_DIR .. "src/mame/video/taito_z.c",
-	MAME_DIR .. "src/mame/drivers/taito_o.c",
-	MAME_DIR .. "src/mame/video/taito_o.c",
-	MAME_DIR .. "src/mame/drivers/taitoair.c",
-	MAME_DIR .. "src/mame/video/taitoair.c",
-	MAME_DIR .. "src/mame/drivers/taitogn.c",
-	MAME_DIR .. "src/mame/drivers/taitojc.c",
-	MAME_DIR .. "src/mame/video/taitojc.c",
-	MAME_DIR .. "src/mame/drivers/taitopjc.c",
-	MAME_DIR .. "src/mame/drivers/taitosj.c",
-	MAME_DIR .. "src/mame/machine/taitosj.c",
-	MAME_DIR .. "src/mame/video/taitosj.c",
-	MAME_DIR .. "src/mame/drivers/taitottl.c",
-	MAME_DIR .. "src/mame/drivers/taitotz.c",
-	MAME_DIR .. "src/mame/drivers/taitotx.c",
-	MAME_DIR .. "src/mame/drivers/taitowlf.c",
-	MAME_DIR .. "src/mame/drivers/tnzs.c",
-	MAME_DIR .. "src/mame/machine/tnzs.c",
-	MAME_DIR .. "src/mame/video/tnzs.c",
-	MAME_DIR .. "src/mame/drivers/topspeed.c",
-	MAME_DIR .. "src/mame/video/topspeed.c",
-	MAME_DIR .. "src/mame/drivers/tsamurai.c",
-	MAME_DIR .. "src/mame/video/tsamurai.c",
-	MAME_DIR .. "src/mame/drivers/undrfire.c",
-	MAME_DIR .. "src/mame/video/undrfire.c",
-	MAME_DIR .. "src/mame/drivers/volfied.c",
-	MAME_DIR .. "src/mame/machine/volfied.c",
-	MAME_DIR .. "src/mame/video/volfied.c",
-	MAME_DIR .. "src/mame/drivers/warriorb.c",
-	MAME_DIR .. "src/mame/video/warriorb.c",
-	MAME_DIR .. "src/mame/drivers/wgp.c",
-	MAME_DIR .. "src/mame/video/wgp.c",
-	MAME_DIR .. "src/mame/drivers/wyvernf0.c",
-	MAME_DIR .. "src/mame/audio/taitosnd.c",
-	MAME_DIR .. "src/mame/audio/taito_zm.c",
-	MAME_DIR .. "src/mame/audio/t5182.c",
-	MAME_DIR .. "src/mame/machine/taitoio.c",
-	MAME_DIR .. "src/mame/video/taito_helper.c",
-	MAME_DIR .. "src/mame/video/pc080sn.c",
-	MAME_DIR .. "src/mame/video/pc090oj.c",
-	MAME_DIR .. "src/mame/video/tc0080vco.c",
-	MAME_DIR .. "src/mame/video/tc0100scn.c",
-	MAME_DIR .. "src/mame/video/tc0150rod.c",
-	MAME_DIR .. "src/mame/video/tc0280grd.c",
-	MAME_DIR .. "src/mame/video/tc0360pri.c",
-	MAME_DIR .. "src/mame/video/tc0480scp.c",
-	MAME_DIR .. "src/mame/video/tc0110pcr.c",
-	MAME_DIR .. "src/mame/video/tc0180vcu.c",
+	MAME_DIR .. "src/mame/drivers/2mindril.cpp",
+	MAME_DIR .. "src/mame/drivers/40love.cpp",
+	MAME_DIR .. "src/mame/video/40love.cpp",
+	MAME_DIR .. "src/mame/drivers/arkanoid.cpp",
+	MAME_DIR .. "src/mame/machine/arkanoid.cpp",
+	MAME_DIR .. "src/mame/video/arkanoid.cpp",
+	MAME_DIR .. "src/mame/drivers/ashnojoe.cpp",
+	MAME_DIR .. "src/mame/video/ashnojoe.cpp",
+	MAME_DIR .. "src/mame/drivers/asuka.cpp",
+	MAME_DIR .. "src/mame/machine/bonzeadv.cpp",
+	MAME_DIR .. "src/mame/video/asuka.cpp",
+	MAME_DIR .. "src/mame/drivers/bigevglf.cpp",
+	MAME_DIR .. "src/mame/machine/bigevglf.cpp",
+	MAME_DIR .. "src/mame/video/bigevglf.cpp",
+	MAME_DIR .. "src/mame/drivers/bking.cpp",
+	MAME_DIR .. "src/mame/video/bking.cpp",
+	MAME_DIR .. "src/mame/drivers/bublbobl.cpp",
+	MAME_DIR .. "src/mame/machine/bublbobl.cpp",
+	MAME_DIR .. "src/mame/video/bublbobl.cpp",
+	MAME_DIR .. "src/mame/drivers/buggychl.cpp",
+	MAME_DIR .. "src/mame/machine/buggychl.cpp",
+	MAME_DIR .. "src/mame/video/buggychl.cpp",
+	MAME_DIR .. "src/mame/drivers/capr1.cpp",
+	MAME_DIR .. "src/mame/drivers/caprcyc.cpp",
+	MAME_DIR .. "src/mame/drivers/cchance.cpp",
+	MAME_DIR .. "src/mame/drivers/chaknpop.cpp",
+	MAME_DIR .. "src/mame/machine/chaknpop.cpp",
+	MAME_DIR .. "src/mame/video/chaknpop.cpp",
+	MAME_DIR .. "src/mame/drivers/champbwl.cpp",
+	MAME_DIR .. "src/mame/drivers/changela.cpp",
+	MAME_DIR .. "src/mame/video/changela.cpp",
+	MAME_DIR .. "src/mame/drivers/crbaloon.cpp",
+	MAME_DIR .. "src/mame/video/crbaloon.cpp",
+	MAME_DIR .. "src/mame/audio/crbaloon.cpp",
+	MAME_DIR .. "src/mame/drivers/cyclemb.cpp",
+	MAME_DIR .. "src/mame/drivers/darius.cpp",
+	MAME_DIR .. "src/mame/video/darius.cpp",
+	MAME_DIR .. "src/mame/drivers/darkmist.cpp",
+	MAME_DIR .. "src/mame/video/darkmist.cpp",
+	MAME_DIR .. "src/mame/drivers/exzisus.cpp",
+	MAME_DIR .. "src/mame/video/exzisus.cpp",
+	MAME_DIR .. "src/mame/drivers/fgoal.cpp",
+	MAME_DIR .. "src/mame/video/fgoal.cpp",
+	MAME_DIR .. "src/mame/drivers/flstory.cpp",
+	MAME_DIR .. "src/mame/machine/flstory.cpp",
+	MAME_DIR .. "src/mame/video/flstory.cpp",
+	MAME_DIR .. "src/mame/drivers/galastrm.cpp",
+	MAME_DIR .. "src/mame/video/galastrm.cpp",
+	MAME_DIR .. "src/mame/drivers/gladiatr.cpp",
+	MAME_DIR .. "src/mame/video/gladiatr.cpp",
+	MAME_DIR .. "src/mame/drivers/grchamp.cpp",
+	MAME_DIR .. "src/mame/audio/grchamp.cpp",
+	MAME_DIR .. "src/mame/video/grchamp.cpp",
+	MAME_DIR .. "src/mame/drivers/groundfx.cpp",
+	MAME_DIR .. "src/mame/video/groundfx.cpp",
+	MAME_DIR .. "src/mame/drivers/gsword.cpp",
+	MAME_DIR .. "src/mame/machine/tait8741.cpp",
+	MAME_DIR .. "src/mame/video/gsword.cpp",
+	MAME_DIR .. "src/mame/drivers/gunbustr.cpp",
+	MAME_DIR .. "src/mame/video/gunbustr.cpp",
+	MAME_DIR .. "src/mame/drivers/halleys.cpp",
+	MAME_DIR .. "src/mame/drivers/invqix.cpp",
+	MAME_DIR .. "src/mame/drivers/jollyjgr.cpp",
+	MAME_DIR .. "src/mame/drivers/ksayakyu.cpp",
+	MAME_DIR .. "src/mame/video/ksayakyu.cpp",
+	MAME_DIR .. "src/mame/drivers/lgp.cpp",
+	MAME_DIR .. "src/mame/drivers/lkage.cpp",
+	MAME_DIR .. "src/mame/machine/lkage.cpp",
+	MAME_DIR .. "src/mame/video/lkage.cpp",
+	MAME_DIR .. "src/mame/drivers/lsasquad.cpp",
+	MAME_DIR .. "src/mame/machine/lsasquad.cpp",
+	MAME_DIR .. "src/mame/video/lsasquad.cpp",
+	MAME_DIR .. "src/mame/drivers/marinedt.cpp",
+	MAME_DIR .. "src/mame/drivers/mexico86.cpp",
+	MAME_DIR .. "src/mame/machine/mexico86.cpp",
+	MAME_DIR .. "src/mame/video/mexico86.cpp",
+	MAME_DIR .. "src/mame/drivers/minivadr.cpp",
+	MAME_DIR .. "src/mame/drivers/missb2.cpp",
+	MAME_DIR .. "src/mame/drivers/mlanding.cpp",
+	MAME_DIR .. "src/mame/drivers/msisaac.cpp",
+	MAME_DIR .. "src/mame/video/msisaac.cpp",
+	MAME_DIR .. "src/mame/drivers/ninjaw.cpp",
+	MAME_DIR .. "src/mame/video/ninjaw.cpp",
+	MAME_DIR .. "src/mame/drivers/nycaptor.cpp",
+	MAME_DIR .. "src/mame/machine/nycaptor.cpp",
+	MAME_DIR .. "src/mame/video/nycaptor.cpp",
+	MAME_DIR .. "src/mame/drivers/opwolf.cpp",
+	MAME_DIR .. "src/mame/machine/opwolf.cpp",
+	MAME_DIR .. "src/mame/video/opwolf.cpp",
+	MAME_DIR .. "src/mame/drivers/othunder.cpp",
+	MAME_DIR .. "src/mame/video/othunder.cpp",
+	MAME_DIR .. "src/mame/drivers/pitnrun.cpp",
+	MAME_DIR .. "src/mame/machine/pitnrun.cpp",
+	MAME_DIR .. "src/mame/video/pitnrun.cpp",
+	MAME_DIR .. "src/mame/drivers/qix.cpp",
+	MAME_DIR .. "src/mame/machine/qix.cpp",
+	MAME_DIR .. "src/mame/audio/qix.cpp",
+	MAME_DIR .. "src/mame/video/qix.cpp",
+	MAME_DIR .. "src/mame/drivers/rbisland.cpp",
+	MAME_DIR .. "src/mame/machine/rbisland.cpp",
+	MAME_DIR .. "src/mame/video/rbisland.cpp",
+	MAME_DIR .. "src/mame/drivers/rastan.cpp",
+	MAME_DIR .. "src/mame/video/rastan.cpp",
+	MAME_DIR .. "src/mame/drivers/retofinv.cpp",
+	MAME_DIR .. "src/mame/machine/retofinv.cpp",
+	MAME_DIR .. "src/mame/video/retofinv.cpp",
+	MAME_DIR .. "src/mame/drivers/rollrace.cpp",
+	MAME_DIR .. "src/mame/video/rollrace.cpp",
+	MAME_DIR .. "src/mame/drivers/sbowling.cpp",
+	MAME_DIR .. "src/mame/drivers/slapshot.cpp",
+	MAME_DIR .. "src/mame/video/slapshot.cpp",
+	MAME_DIR .. "src/mame/drivers/ssrj.cpp",
+	MAME_DIR .. "src/mame/video/ssrj.cpp",
+	MAME_DIR .. "src/mame/drivers/superchs.cpp",
+	MAME_DIR .. "src/mame/video/superchs.cpp",
+	MAME_DIR .. "src/mame/drivers/superqix.cpp",
+	MAME_DIR .. "src/mame/video/superqix.cpp",
+	MAME_DIR .. "src/mame/drivers/taito_b.cpp",
+	MAME_DIR .. "src/mame/video/taito_b.cpp",
+	MAME_DIR .. "src/mame/drivers/taito_f2.cpp",
+	MAME_DIR .. "src/mame/video/taito_f2.cpp",
+	MAME_DIR .. "src/mame/drivers/taito_f3.cpp",
+	MAME_DIR .. "src/mame/video/taito_f3.cpp",
+	MAME_DIR .. "src/mame/audio/taito_en.cpp",
+	MAME_DIR .. "src/mame/drivers/taito_h.cpp",
+	MAME_DIR .. "src/mame/video/taito_h.cpp",
+	MAME_DIR .. "src/mame/drivers/taito_l.cpp",
+	MAME_DIR .. "src/mame/video/taito_l.cpp",
+	MAME_DIR .. "src/mame/drivers/taito_x.cpp",
+	MAME_DIR .. "src/mame/machine/cchip.cpp",
+	MAME_DIR .. "src/mame/drivers/taito_z.cpp",
+	MAME_DIR .. "src/mame/video/taito_z.cpp",
+	MAME_DIR .. "src/mame/drivers/taito_o.cpp",
+	MAME_DIR .. "src/mame/video/taito_o.cpp",
+	MAME_DIR .. "src/mame/drivers/taitoair.cpp",
+	MAME_DIR .. "src/mame/video/taitoair.cpp",
+	MAME_DIR .. "src/mame/drivers/taitogn.cpp",
+	MAME_DIR .. "src/mame/drivers/taitojc.cpp",
+	MAME_DIR .. "src/mame/video/taitojc.cpp",
+	MAME_DIR .. "src/mame/drivers/taitopjc.cpp",
+	MAME_DIR .. "src/mame/drivers/taitosj.cpp",
+	MAME_DIR .. "src/mame/machine/taitosj.cpp",
+	MAME_DIR .. "src/mame/video/taitosj.cpp",
+	MAME_DIR .. "src/mame/drivers/taitottl.cpp",
+	MAME_DIR .. "src/mame/drivers/taitotz.cpp",
+	MAME_DIR .. "src/mame/drivers/taitotx.cpp",
+	MAME_DIR .. "src/mame/drivers/taitowlf.cpp",
+	MAME_DIR .. "src/mame/drivers/tnzs.cpp",
+	MAME_DIR .. "src/mame/machine/tnzs.cpp",
+	MAME_DIR .. "src/mame/video/tnzs.cpp",
+	MAME_DIR .. "src/mame/drivers/topspeed.cpp",
+	MAME_DIR .. "src/mame/video/topspeed.cpp",
+	MAME_DIR .. "src/mame/drivers/tsamurai.cpp",
+	MAME_DIR .. "src/mame/video/tsamurai.cpp",
+	MAME_DIR .. "src/mame/drivers/undrfire.cpp",
+	MAME_DIR .. "src/mame/video/undrfire.cpp",
+	MAME_DIR .. "src/mame/drivers/volfied.cpp",
+	MAME_DIR .. "src/mame/machine/volfied.cpp",
+	MAME_DIR .. "src/mame/video/volfied.cpp",
+	MAME_DIR .. "src/mame/drivers/warriorb.cpp",
+	MAME_DIR .. "src/mame/video/warriorb.cpp",
+	MAME_DIR .. "src/mame/drivers/wgp.cpp",
+	MAME_DIR .. "src/mame/video/wgp.cpp",
+	MAME_DIR .. "src/mame/drivers/wyvernf0.cpp",
+	MAME_DIR .. "src/mame/audio/taitosnd.cpp",
+	MAME_DIR .. "src/mame/audio/taito_zm.cpp",
+	MAME_DIR .. "src/mame/audio/t5182.cpp",
+	MAME_DIR .. "src/mame/machine/taitoio.cpp",
+	MAME_DIR .. "src/mame/video/taito_helper.cpp",
+	MAME_DIR .. "src/mame/video/pc080sn.cpp",
+	MAME_DIR .. "src/mame/video/pc090oj.cpp",
+	MAME_DIR .. "src/mame/video/tc0080vco.cpp",
+	MAME_DIR .. "src/mame/video/tc0100scn.cpp",
+	MAME_DIR .. "src/mame/video/tc0150rod.cpp",
+	MAME_DIR .. "src/mame/video/tc0280grd.cpp",
+	MAME_DIR .. "src/mame/video/tc0360pri.cpp",
+	MAME_DIR .. "src/mame/video/tc0480scp.cpp",
+	MAME_DIR .. "src/mame/video/tc0110pcr.cpp",
+	MAME_DIR .. "src/mame/video/tc0180vcu.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "tatsumi")
 files {
-	MAME_DIR .. "src/mame/drivers/kingdrby.c",
-	MAME_DIR .. "src/mame/drivers/lockon.c",
-	MAME_DIR .. "src/mame/video/lockon.c",
-	MAME_DIR .. "src/mame/drivers/tatsumi.c",
-	MAME_DIR .. "src/mame/machine/tatsumi.c",
-	MAME_DIR .. "src/mame/video/tatsumi.c",
-	MAME_DIR .. "src/mame/drivers/tx1.c",
-	MAME_DIR .. "src/mame/machine/tx1.c",
-	MAME_DIR .. "src/mame/audio/tx1.c",
-	MAME_DIR .. "src/mame/video/tx1.c",
+	MAME_DIR .. "src/mame/drivers/kingdrby.cpp",
+	MAME_DIR .. "src/mame/drivers/lockon.cpp",
+	MAME_DIR .. "src/mame/video/lockon.cpp",
+	MAME_DIR .. "src/mame/drivers/tatsumi.cpp",
+	MAME_DIR .. "src/mame/machine/tatsumi.cpp",
+	MAME_DIR .. "src/mame/video/tatsumi.cpp",
+	MAME_DIR .. "src/mame/drivers/tx1.cpp",
+	MAME_DIR .. "src/mame/machine/tx1.cpp",
+	MAME_DIR .. "src/mame/audio/tx1.cpp",
+	MAME_DIR .. "src/mame/video/tx1.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "tch")
 files {
-	MAME_DIR .. "src/mame/drivers/kickgoal.c",
-	MAME_DIR .. "src/mame/video/kickgoal.c",
-	MAME_DIR .. "src/mame/drivers/littlerb.c",
-	MAME_DIR .. "src/mame/drivers/rltennis.c",
-	MAME_DIR .. "src/mame/video/rltennis.c",
-	MAME_DIR .. "src/mame/drivers/speedspn.c",
-	MAME_DIR .. "src/mame/video/speedspn.c",
-	MAME_DIR .. "src/mame/drivers/wheelfir.c",
+	MAME_DIR .. "src/mame/drivers/kickgoal.cpp",
+	MAME_DIR .. "src/mame/video/kickgoal.cpp",
+	MAME_DIR .. "src/mame/drivers/littlerb.cpp",
+	MAME_DIR .. "src/mame/drivers/rltennis.cpp",
+	MAME_DIR .. "src/mame/video/rltennis.cpp",
+	MAME_DIR .. "src/mame/drivers/speedspn.cpp",
+	MAME_DIR .. "src/mame/video/speedspn.cpp",
+	MAME_DIR .. "src/mame/drivers/wheelfir.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "tecfri")
 files {
-	MAME_DIR .. "src/mame/drivers/ambush.c",
-	MAME_DIR .. "src/mame/video/ambush.c",
-	MAME_DIR .. "src/mame/drivers/holeland.c",
-	MAME_DIR .. "src/mame/video/holeland.c",
-	MAME_DIR .. "src/mame/drivers/sauro.c",
-	MAME_DIR .. "src/mame/video/sauro.c",
-	MAME_DIR .. "src/mame/drivers/speedbal.c",
-	MAME_DIR .. "src/mame/video/speedbal.c",
+	MAME_DIR .. "src/mame/drivers/ambush.cpp",
+	MAME_DIR .. "src/mame/video/ambush.cpp",
+	MAME_DIR .. "src/mame/drivers/holeland.cpp",
+	MAME_DIR .. "src/mame/video/holeland.cpp",
+	MAME_DIR .. "src/mame/drivers/sauro.cpp",
+	MAME_DIR .. "src/mame/video/sauro.cpp",
+	MAME_DIR .. "src/mame/drivers/speedbal.cpp",
+	MAME_DIR .. "src/mame/video/speedbal.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "technos")
 files {
-	MAME_DIR .. "src/mame/drivers/battlane.c",
-	MAME_DIR .. "src/mame/video/battlane.c",
-	MAME_DIR .. "src/mame/drivers/blockout.c",
-	MAME_DIR .. "src/mame/video/blockout.c",
-	MAME_DIR .. "src/mame/drivers/bogeyman.c",
-	MAME_DIR .. "src/mame/video/bogeyman.c",
-	MAME_DIR .. "src/mame/drivers/chinagat.c",
-	MAME_DIR .. "src/mame/drivers/ddragon.c",
-	MAME_DIR .. "src/mame/video/ddragon.c",
-	MAME_DIR .. "src/mame/drivers/ddragon3.c",
-	MAME_DIR .. "src/mame/video/ddragon3.c",
-	MAME_DIR .. "src/mame/drivers/dogfgt.c",
-	MAME_DIR .. "src/mame/video/dogfgt.c",
-	MAME_DIR .. "src/mame/drivers/matmania.c",
-	MAME_DIR .. "src/mame/video/matmania.c",
-	MAME_DIR .. "src/mame/drivers/mystston.c",
-	MAME_DIR .. "src/mame/video/mystston.c",
-	MAME_DIR .. "src/mame/drivers/renegade.c",
-	MAME_DIR .. "src/mame/video/renegade.c",
-	MAME_DIR .. "src/mame/drivers/scregg.c",
-	MAME_DIR .. "src/mame/drivers/shadfrce.c",
-	MAME_DIR .. "src/mame/video/shadfrce.c",
-	MAME_DIR .. "src/mame/drivers/spdodgeb.c",
-	MAME_DIR .. "src/mame/video/spdodgeb.c",
-	MAME_DIR .. "src/mame/drivers/ssozumo.c",
-	MAME_DIR .. "src/mame/video/ssozumo.c",
-	MAME_DIR .. "src/mame/drivers/tagteam.c",
-	MAME_DIR .. "src/mame/video/tagteam.c",
-	MAME_DIR .. "src/mame/drivers/vball.c",
-	MAME_DIR .. "src/mame/video/vball.c",
-	MAME_DIR .. "src/mame/drivers/wwfsstar.c",
-	MAME_DIR .. "src/mame/video/wwfsstar.c",
-	MAME_DIR .. "src/mame/drivers/xain.c",
-	MAME_DIR .. "src/mame/video/xain.c",
+	MAME_DIR .. "src/mame/drivers/battlane.cpp",
+	MAME_DIR .. "src/mame/video/battlane.cpp",
+	MAME_DIR .. "src/mame/drivers/blockout.cpp",
+	MAME_DIR .. "src/mame/video/blockout.cpp",
+	MAME_DIR .. "src/mame/drivers/bogeyman.cpp",
+	MAME_DIR .. "src/mame/video/bogeyman.cpp",
+	MAME_DIR .. "src/mame/drivers/chinagat.cpp",
+	MAME_DIR .. "src/mame/drivers/ddragon.cpp",
+	MAME_DIR .. "src/mame/video/ddragon.cpp",
+	MAME_DIR .. "src/mame/drivers/ddragon3.cpp",
+	MAME_DIR .. "src/mame/video/ddragon3.cpp",
+	MAME_DIR .. "src/mame/drivers/dogfgt.cpp",
+	MAME_DIR .. "src/mame/video/dogfgt.cpp",
+	MAME_DIR .. "src/mame/drivers/matmania.cpp",
+	MAME_DIR .. "src/mame/video/matmania.cpp",
+	MAME_DIR .. "src/mame/drivers/mystston.cpp",
+	MAME_DIR .. "src/mame/video/mystston.cpp",
+	MAME_DIR .. "src/mame/drivers/renegade.cpp",
+	MAME_DIR .. "src/mame/video/renegade.cpp",
+	MAME_DIR .. "src/mame/drivers/scregg.cpp",
+	MAME_DIR .. "src/mame/drivers/shadfrce.cpp",
+	MAME_DIR .. "src/mame/video/shadfrce.cpp",
+	MAME_DIR .. "src/mame/drivers/spdodgeb.cpp",
+	MAME_DIR .. "src/mame/video/spdodgeb.cpp",
+	MAME_DIR .. "src/mame/drivers/ssozumo.cpp",
+	MAME_DIR .. "src/mame/video/ssozumo.cpp",
+	MAME_DIR .. "src/mame/drivers/tagteam.cpp",
+	MAME_DIR .. "src/mame/video/tagteam.cpp",
+	MAME_DIR .. "src/mame/drivers/vball.cpp",
+	MAME_DIR .. "src/mame/video/vball.cpp",
+	MAME_DIR .. "src/mame/drivers/wwfsstar.cpp",
+	MAME_DIR .. "src/mame/video/wwfsstar.cpp",
+	MAME_DIR .. "src/mame/drivers/xain.cpp",
+	MAME_DIR .. "src/mame/video/xain.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "tehkan")
 files {
-	MAME_DIR .. "src/mame/video/tecmo_spr.c",
-	MAME_DIR .. "src/mame/video/tecmo_mix.c",
-	MAME_DIR .. "src/mame/drivers/bombjack.c",
-	MAME_DIR .. "src/mame/video/bombjack.c",
-	MAME_DIR .. "src/mame/drivers/gaiden.c",
-	MAME_DIR .. "src/mame/video/gaiden.c",
-	MAME_DIR .. "src/mame/drivers/lvcards.c",
-	MAME_DIR .. "src/mame/video/lvcards.c",
-	MAME_DIR .. "src/mame/drivers/pbaction.c",
-	MAME_DIR .. "src/mame/video/pbaction.c",
-	MAME_DIR .. "src/mame/drivers/senjyo.c",
-	MAME_DIR .. "src/mame/audio/senjyo.c",
-	MAME_DIR .. "src/mame/video/senjyo.c",
-	MAME_DIR .. "src/mame/drivers/solomon.c",
-	MAME_DIR .. "src/mame/video/solomon.c",
-	MAME_DIR .. "src/mame/drivers/spbactn.c",
-	MAME_DIR .. "src/mame/video/spbactn.c",
-	MAME_DIR .. "src/mame/drivers/tbowl.c",
-	MAME_DIR .. "src/mame/video/tbowl.c",
-	MAME_DIR .. "src/mame/drivers/tecmo.c",
-	MAME_DIR .. "src/mame/video/tecmo.c",
-	MAME_DIR .. "src/mame/drivers/tecmo16.c",
-	MAME_DIR .. "src/mame/video/tecmo16.c",
-	MAME_DIR .. "src/mame/drivers/tecmosys.c",
-	MAME_DIR .. "src/mame/machine/tecmosys.c",
-	MAME_DIR .. "src/mame/video/tecmosys.c",
-	MAME_DIR .. "src/mame/drivers/tehkanwc.c",
-	MAME_DIR .. "src/mame/video/tehkanwc.c",
-	MAME_DIR .. "src/mame/drivers/wc90.c",
-	MAME_DIR .. "src/mame/video/wc90.c",
-	MAME_DIR .. "src/mame/drivers/wc90b.c",
-	MAME_DIR .. "src/mame/video/wc90b.c",
+	MAME_DIR .. "src/mame/video/tecmo_spr.cpp",
+	MAME_DIR .. "src/mame/video/tecmo_mix.cpp",
+	MAME_DIR .. "src/mame/drivers/bombjack.cpp",
+	MAME_DIR .. "src/mame/video/bombjack.cpp",
+	MAME_DIR .. "src/mame/drivers/gaiden.cpp",
+	MAME_DIR .. "src/mame/video/gaiden.cpp",
+	MAME_DIR .. "src/mame/drivers/lvcards.cpp",
+	MAME_DIR .. "src/mame/video/lvcards.cpp",
+	MAME_DIR .. "src/mame/drivers/pbaction.cpp",
+	MAME_DIR .. "src/mame/video/pbaction.cpp",
+	MAME_DIR .. "src/mame/drivers/senjyo.cpp",
+	MAME_DIR .. "src/mame/audio/senjyo.cpp",
+	MAME_DIR .. "src/mame/video/senjyo.cpp",
+	MAME_DIR .. "src/mame/drivers/solomon.cpp",
+	MAME_DIR .. "src/mame/video/solomon.cpp",
+	MAME_DIR .. "src/mame/drivers/spbactn.cpp",
+	MAME_DIR .. "src/mame/video/spbactn.cpp",
+	MAME_DIR .. "src/mame/drivers/tbowl.cpp",
+	MAME_DIR .. "src/mame/video/tbowl.cpp",
+	MAME_DIR .. "src/mame/drivers/tecmo.cpp",
+	MAME_DIR .. "src/mame/video/tecmo.cpp",
+	MAME_DIR .. "src/mame/drivers/tecmo16.cpp",
+	MAME_DIR .. "src/mame/video/tecmo16.cpp",
+	MAME_DIR .. "src/mame/drivers/tecmosys.cpp",
+	MAME_DIR .. "src/mame/machine/tecmosys.cpp",
+	MAME_DIR .. "src/mame/video/tecmosys.cpp",
+	MAME_DIR .. "src/mame/drivers/tehkanwc.cpp",
+	MAME_DIR .. "src/mame/video/tehkanwc.cpp",
+	MAME_DIR .. "src/mame/drivers/wc90.cpp",
+	MAME_DIR .. "src/mame/video/wc90.cpp",
+	MAME_DIR .. "src/mame/drivers/wc90b.cpp",
+	MAME_DIR .. "src/mame/video/wc90b.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "thepit")
 files {
-	MAME_DIR .. "src/mame/drivers/thepit.c",
-	MAME_DIR .. "src/mame/video/thepit.c",
-	MAME_DIR .. "src/mame/drivers/timelimt.c",
-	MAME_DIR .. "src/mame/video/timelimt.c",
+	MAME_DIR .. "src/mame/drivers/thepit.cpp",
+	MAME_DIR .. "src/mame/video/thepit.cpp",
+	MAME_DIR .. "src/mame/drivers/timelimt.cpp",
+	MAME_DIR .. "src/mame/video/timelimt.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "toaplan")
 files {
-	MAME_DIR .. "src/mame/drivers/mjsister.c",
-	MAME_DIR .. "src/mame/drivers/slapfght.c",
-	MAME_DIR .. "src/mame/machine/slapfght.c",
-	MAME_DIR .. "src/mame/video/slapfght.c",
-	MAME_DIR .. "src/mame/drivers/snowbros.c",
-	MAME_DIR .. "src/mame/video/kan_pand.c",
-	MAME_DIR .. "src/mame/video/kan_panb.c",
-	MAME_DIR .. "src/mame/drivers/toaplan1.c",
-	MAME_DIR .. "src/mame/machine/toaplan1.c",
-	MAME_DIR .. "src/mame/video/toaplan1.c",
-	MAME_DIR .. "src/mame/drivers/toaplan2.c",
-	MAME_DIR .. "src/mame/video/toaplan2.c",
-	MAME_DIR .. "src/mame/video/gp9001.c",
-	MAME_DIR .. "src/mame/drivers/twincobr.c",
-	MAME_DIR .. "src/mame/machine/twincobr.c",
-	MAME_DIR .. "src/mame/video/twincobr.c",
-	MAME_DIR .. "src/mame/drivers/wardner.c",
-	MAME_DIR .. "src/mame/video/toaplan_scu.c",
+	MAME_DIR .. "src/mame/drivers/mjsister.cpp",
+	MAME_DIR .. "src/mame/drivers/slapfght.cpp",
+	MAME_DIR .. "src/mame/machine/slapfght.cpp",
+	MAME_DIR .. "src/mame/video/slapfght.cpp",
+	MAME_DIR .. "src/mame/drivers/snowbros.cpp",
+	MAME_DIR .. "src/mame/video/kan_pand.cpp",
+	MAME_DIR .. "src/mame/video/kan_panb.cpp",
+	MAME_DIR .. "src/mame/drivers/toaplan1.cpp",
+	MAME_DIR .. "src/mame/machine/toaplan1.cpp",
+	MAME_DIR .. "src/mame/video/toaplan1.cpp",
+	MAME_DIR .. "src/mame/drivers/toaplan2.cpp",
+	MAME_DIR .. "src/mame/video/toaplan2.cpp",
+	MAME_DIR .. "src/mame/video/gp9001.cpp",
+	MAME_DIR .. "src/mame/drivers/twincobr.cpp",
+	MAME_DIR .. "src/mame/machine/twincobr.cpp",
+	MAME_DIR .. "src/mame/video/twincobr.cpp",
+	MAME_DIR .. "src/mame/drivers/wardner.cpp",
+	MAME_DIR .. "src/mame/video/toaplan_scu.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "tong")
 files {
-	MAME_DIR .. "src/mame/drivers/beezer.c",
-	MAME_DIR .. "src/mame/machine/beezer.c",
-	MAME_DIR .. "src/mame/video/beezer.c",
-	MAME_DIR .. "src/mame/audio/beezer.c",
+	MAME_DIR .. "src/mame/drivers/beezer.cpp",
+	MAME_DIR .. "src/mame/machine/beezer.cpp",
+	MAME_DIR .. "src/mame/video/beezer.cpp",
+	MAME_DIR .. "src/mame/audio/beezer.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "unico")
 files {
-	MAME_DIR .. "src/mame/drivers/drgnmst.c",
-	MAME_DIR .. "src/mame/video/drgnmst.c",
-	MAME_DIR .. "src/mame/drivers/silkroad.c",
-	MAME_DIR .. "src/mame/video/silkroad.c",
-	MAME_DIR .. "src/mame/drivers/unico.c",
-	MAME_DIR .. "src/mame/video/unico.c",
+	MAME_DIR .. "src/mame/drivers/drgnmst.cpp",
+	MAME_DIR .. "src/mame/video/drgnmst.cpp",
+	MAME_DIR .. "src/mame/drivers/silkroad.cpp",
+	MAME_DIR .. "src/mame/video/silkroad.cpp",
+	MAME_DIR .. "src/mame/drivers/unico.cpp",
+	MAME_DIR .. "src/mame/video/unico.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "univers")
 files {
-	MAME_DIR .. "src/mame/drivers/cheekyms.c",
-	MAME_DIR .. "src/mame/video/cheekyms.c",
-	MAME_DIR .. "src/mame/drivers/cosmic.c",
-	MAME_DIR .. "src/mame/video/cosmic.c",
-	MAME_DIR .. "src/mame/drivers/docastle.c",
-	MAME_DIR .. "src/mame/machine/docastle.c",
-	MAME_DIR .. "src/mame/video/docastle.c",
-	MAME_DIR .. "src/mame/drivers/ladybug.c",
-	MAME_DIR .. "src/mame/video/ladybug.c",
-	MAME_DIR .. "src/mame/drivers/mrdo.c",
-	MAME_DIR .. "src/mame/video/mrdo.c",
-	MAME_DIR .. "src/mame/drivers/redclash.c",
-	MAME_DIR .. "src/mame/video/redclash.c",
-	MAME_DIR .. "src/mame/drivers/superdq.c",
+	MAME_DIR .. "src/mame/drivers/cheekyms.cpp",
+	MAME_DIR .. "src/mame/video/cheekyms.cpp",
+	MAME_DIR .. "src/mame/drivers/cosmic.cpp",
+	MAME_DIR .. "src/mame/video/cosmic.cpp",
+	MAME_DIR .. "src/mame/drivers/docastle.cpp",
+	MAME_DIR .. "src/mame/machine/docastle.cpp",
+	MAME_DIR .. "src/mame/video/docastle.cpp",
+	MAME_DIR .. "src/mame/drivers/ladybug.cpp",
+	MAME_DIR .. "src/mame/video/ladybug.cpp",
+	MAME_DIR .. "src/mame/drivers/mrdo.cpp",
+	MAME_DIR .. "src/mame/video/mrdo.cpp",
+	MAME_DIR .. "src/mame/drivers/redclash.cpp",
+	MAME_DIR .. "src/mame/video/redclash.cpp",
+	MAME_DIR .. "src/mame/drivers/superdq.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "upl")
 files {
-	MAME_DIR .. "src/mame/drivers/mouser.c",
-	MAME_DIR .. "src/mame/video/mouser.c",
-	MAME_DIR .. "src/mame/drivers/ninjakd2.c",
-	MAME_DIR .. "src/mame/video/ninjakd2.c",
-	MAME_DIR .. "src/mame/drivers/nova2001.c",
-	MAME_DIR .. "src/mame/video/nova2001.c",
-	MAME_DIR .. "src/mame/drivers/xxmissio.c",
-	MAME_DIR .. "src/mame/video/xxmissio.c",
+	MAME_DIR .. "src/mame/drivers/mouser.cpp",
+	MAME_DIR .. "src/mame/video/mouser.cpp",
+	MAME_DIR .. "src/mame/drivers/ninjakd2.cpp",
+	MAME_DIR .. "src/mame/video/ninjakd2.cpp",
+	MAME_DIR .. "src/mame/drivers/nova2001.cpp",
+	MAME_DIR .. "src/mame/video/nova2001.cpp",
+	MAME_DIR .. "src/mame/drivers/xxmissio.cpp",
+	MAME_DIR .. "src/mame/video/xxmissio.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "valadon")
 files {
-	MAME_DIR .. "src/mame/drivers/bagman.c",
-	MAME_DIR .. "src/mame/machine/bagman.c",
-	MAME_DIR .. "src/mame/video/bagman.c",
-	MAME_DIR .. "src/mame/drivers/tankbust.c",
-	MAME_DIR .. "src/mame/video/tankbust.c",
+	MAME_DIR .. "src/mame/drivers/bagman.cpp",
+	MAME_DIR .. "src/mame/machine/bagman.cpp",
+	MAME_DIR .. "src/mame/video/bagman.cpp",
+	MAME_DIR .. "src/mame/drivers/tankbust.cpp",
+	MAME_DIR .. "src/mame/video/tankbust.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "veltmjr")
 files {
-	MAME_DIR .. "src/mame/drivers/cardline.c",
-	MAME_DIR .. "src/mame/drivers/witch.c",
+	MAME_DIR .. "src/mame/drivers/cardline.cpp",
+	MAME_DIR .. "src/mame/drivers/witch.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "venture")
 files {
-	MAME_DIR .. "src/mame/drivers/looping.c",
-	MAME_DIR .. "src/mame/drivers/spcforce.c",
-	MAME_DIR .. "src/mame/video/spcforce.c",
-	MAME_DIR .. "src/mame/drivers/suprridr.c",
-	MAME_DIR .. "src/mame/video/suprridr.c",
+	MAME_DIR .. "src/mame/drivers/looping.cpp",
+	MAME_DIR .. "src/mame/drivers/spcforce.cpp",
+	MAME_DIR .. "src/mame/video/spcforce.cpp",
+	MAME_DIR .. "src/mame/drivers/suprridr.cpp",
+	MAME_DIR .. "src/mame/video/suprridr.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "vsystem")
 files {
-	MAME_DIR .. "src/mame/video/vsystem_spr.c",
-	MAME_DIR .. "src/mame/video/vsystem_spr2.c",
-	MAME_DIR .. "src/mame/drivers/aerofgt.c",
-	MAME_DIR .. "src/mame/video/aerofgt.c",
-	MAME_DIR .. "src/mame/drivers/crshrace.c",
-	MAME_DIR .. "src/mame/video/crshrace.c",
-	MAME_DIR .. "src/mame/drivers/f1gp.c",
-	MAME_DIR .. "src/mame/video/f1gp.c",
-	MAME_DIR .. "src/mame/drivers/fromance.c",
-	MAME_DIR .. "src/mame/video/fromance.c",
-	MAME_DIR .. "src/mame/drivers/fromanc2.c",
-	MAME_DIR .. "src/mame/video/fromanc2.c",
-	MAME_DIR .. "src/mame/drivers/gstriker.c",
-	MAME_DIR .. "src/mame/video/gstriker.c",
-	MAME_DIR .. "src/mame/video/mb60553.c",
-	MAME_DIR .. "src/mame/video/vs920a.c",
-	MAME_DIR .. "src/mame/drivers/inufuku.c",
-	MAME_DIR .. "src/mame/video/inufuku.c",
-	MAME_DIR .. "src/mame/drivers/ojankohs.c",
-	MAME_DIR .. "src/mame/video/ojankohs.c",
-	MAME_DIR .. "src/mame/drivers/pipedrm.c",
-	MAME_DIR .. "src/mame/drivers/rpunch.c",
-	MAME_DIR .. "src/mame/video/rpunch.c",
-	MAME_DIR .. "src/mame/drivers/suprslam.c",
-	MAME_DIR .. "src/mame/video/suprslam.c",
-	MAME_DIR .. "src/mame/drivers/tail2nos.c",
-	MAME_DIR .. "src/mame/video/tail2nos.c",
-	MAME_DIR .. "src/mame/drivers/taotaido.c",
-	MAME_DIR .. "src/mame/video/taotaido.c",
-	MAME_DIR .. "src/mame/drivers/welltris.c",
-	MAME_DIR .. "src/mame/video/welltris.c",
+	MAME_DIR .. "src/mame/video/vsystem_spr.cpp",
+	MAME_DIR .. "src/mame/video/vsystem_spr2.cpp",
+	MAME_DIR .. "src/mame/drivers/aerofgt.cpp",
+	MAME_DIR .. "src/mame/video/aerofgt.cpp",
+	MAME_DIR .. "src/mame/drivers/crshrace.cpp",
+	MAME_DIR .. "src/mame/video/crshrace.cpp",
+	MAME_DIR .. "src/mame/drivers/f1gp.cpp",
+	MAME_DIR .. "src/mame/video/f1gp.cpp",
+	MAME_DIR .. "src/mame/drivers/fromance.cpp",
+	MAME_DIR .. "src/mame/video/fromance.cpp",
+	MAME_DIR .. "src/mame/drivers/fromanc2.cpp",
+	MAME_DIR .. "src/mame/video/fromanc2.cpp",
+	MAME_DIR .. "src/mame/drivers/gstriker.cpp",
+	MAME_DIR .. "src/mame/video/gstriker.cpp",
+	MAME_DIR .. "src/mame/video/mb60553.cpp",
+	MAME_DIR .. "src/mame/video/vs920a.cpp",
+	MAME_DIR .. "src/mame/drivers/inufuku.cpp",
+	MAME_DIR .. "src/mame/video/inufuku.cpp",
+	MAME_DIR .. "src/mame/drivers/ojankohs.cpp",
+	MAME_DIR .. "src/mame/video/ojankohs.cpp",
+	MAME_DIR .. "src/mame/drivers/pipedrm.cpp",
+	MAME_DIR .. "src/mame/drivers/rpunch.cpp",
+	MAME_DIR .. "src/mame/video/rpunch.cpp",
+	MAME_DIR .. "src/mame/drivers/suprslam.cpp",
+	MAME_DIR .. "src/mame/video/suprslam.cpp",
+	MAME_DIR .. "src/mame/drivers/tail2nos.cpp",
+	MAME_DIR .. "src/mame/video/tail2nos.cpp",
+	MAME_DIR .. "src/mame/drivers/taotaido.cpp",
+	MAME_DIR .. "src/mame/video/taotaido.cpp",
+	MAME_DIR .. "src/mame/drivers/welltris.cpp",
+	MAME_DIR .. "src/mame/video/welltris.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "yunsung")
 files {
-	MAME_DIR .. "src/mame/drivers/nmg5.c",
-	MAME_DIR .. "src/mame/drivers/paradise.c",
-	MAME_DIR .. "src/mame/video/paradise.c",
-	MAME_DIR .. "src/mame/drivers/yunsung8.c",
-	MAME_DIR .. "src/mame/video/yunsung8.c",
-	MAME_DIR .. "src/mame/drivers/yunsun16.c",
-	MAME_DIR .. "src/mame/video/yunsun16.c",
+	MAME_DIR .. "src/mame/drivers/nmg5.cpp",
+	MAME_DIR .. "src/mame/drivers/paradise.cpp",
+	MAME_DIR .. "src/mame/video/paradise.cpp",
+	MAME_DIR .. "src/mame/drivers/yunsung8.cpp",
+	MAME_DIR .. "src/mame/video/yunsung8.cpp",
+	MAME_DIR .. "src/mame/drivers/yunsun16.cpp",
+	MAME_DIR .. "src/mame/video/yunsun16.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "zaccaria")
 files {
-	MAME_DIR .. "src/mame/drivers/laserbat.c",
-	MAME_DIR .. "src/mame/audio/laserbat.c",
-	MAME_DIR .. "src/mame/drivers/seabattl.c",
-	MAME_DIR .. "src/mame/drivers/zac2650.c",
-	MAME_DIR .. "src/mame/video/zac2650.c",
-	MAME_DIR .. "src/mame/drivers/zaccaria.c",
-	MAME_DIR .. "src/mame/video/zaccaria.c",
+	MAME_DIR .. "src/mame/drivers/laserbat.cpp",
+	MAME_DIR .. "src/mame/audio/laserbat.cpp",
+	MAME_DIR .. "src/mame/drivers/seabattl.cpp",
+	MAME_DIR .. "src/mame/drivers/zac2650.cpp",
+	MAME_DIR .. "src/mame/video/zac2650.cpp",
+	MAME_DIR .. "src/mame/drivers/zaccaria.cpp",
+	MAME_DIR .. "src/mame/video/zaccaria.cpp",
 }
 
 --------------------------------------------------
@@ -3175,95 +3175,95 @@ files {
 
 createMAMEProjects(_target, _subtarget, "pinball")
 files {
-	MAME_DIR .. "src/mame/drivers/allied.c",
-	MAME_DIR .. "src/mame/drivers/alvg.c",
-	MAME_DIR .. "src/mame/drivers/atari_s1.c",
-	MAME_DIR .. "src/mame/drivers/atari_s2.c",
-	MAME_DIR .. "src/mame/drivers/bingo.c",
-	MAME_DIR .. "src/mame/drivers/by17.c",
-	MAME_DIR .. "src/mame/drivers/by35.c",
-	MAME_DIR .. "src/mame/drivers/by6803.c",
-	MAME_DIR .. "src/mame/drivers/by68701.c",
-	MAME_DIR .. "src/mame/drivers/byvid.c",
-	MAME_DIR .. "src/mame/drivers/capcom.c",
-	MAME_DIR .. "src/mame/drivers/de_2.c",
-	MAME_DIR .. "src/mame/drivers/de_3.c",
-	MAME_DIR .. "src/mame/machine/decopincpu.c",
-	MAME_DIR .. "src/mame/video/decodmd1.c",
-	MAME_DIR .. "src/mame/video/decodmd2.c",
-	MAME_DIR .. "src/mame/video/decodmd3.c",
-	MAME_DIR .. "src/mame/drivers/de_3b.c",
-	MAME_DIR .. "src/mame/drivers/flicker.c",
-	MAME_DIR .. "src/mame/drivers/g627.c",
-	MAME_DIR .. "src/mame/drivers/gp_1.c",
-	MAME_DIR .. "src/mame/machine/genpin.c",
-	MAME_DIR .. "src/mame/drivers/gp_2.c",
-	MAME_DIR .. "src/mame/drivers/gts1.c",
-	MAME_DIR .. "src/mame/drivers/gts3.c",
-	MAME_DIR .. "src/mame/drivers/gts3a.c",
-	MAME_DIR .. "src/mame/drivers/gts80.c",
-	MAME_DIR .. "src/mame/drivers/gts80a.c",
-	MAME_DIR .. "src/mame/drivers/gts80b.c",
-	MAME_DIR .. "src/mame/drivers/hankin.c",
-	MAME_DIR .. "src/mame/drivers/icecold.c",
-	MAME_DIR .. "src/mame/drivers/inder.c",
-	MAME_DIR .. "src/mame/drivers/jeutel.c",
-	MAME_DIR .. "src/mame/drivers/jp.c",
-	MAME_DIR .. "src/mame/drivers/jvh.c",
-	MAME_DIR .. "src/mame/drivers/kissproto.c",
-	MAME_DIR .. "src/mame/drivers/ltd.c",
-	MAME_DIR .. "src/mame/drivers/micropin.c",
-	MAME_DIR .. "src/mame/drivers/mephistp.c",
-	MAME_DIR .. "src/mame/drivers/mrgame.c",
-	MAME_DIR .. "src/mame/drivers/nsm.c",
-	MAME_DIR .. "src/mame/drivers/peyper.c",
-	MAME_DIR .. "src/mame/drivers/play_1.c",
-	MAME_DIR .. "src/mame/drivers/play_2.c",
-	MAME_DIR .. "src/mame/drivers/play_3.c",
-	MAME_DIR .. "src/mame/drivers/play_5.c",
-	MAME_DIR .. "src/mame/drivers/rowamet.c",
-	MAME_DIR .. "src/mame/drivers/s11.c",
-	MAME_DIR .. "src/mame/drivers/s11a.c",
-	MAME_DIR .. "src/mame/drivers/s11b.c",
-	MAME_DIR .. "src/mame/drivers/s11c.c",
-	MAME_DIR .. "src/mame/audio/s11c_bg.c",
-	MAME_DIR .. "src/mame/drivers/s3.c",
-	MAME_DIR .. "src/mame/drivers/s4.c",
-	MAME_DIR .. "src/mame/drivers/s6.c",
-	MAME_DIR .. "src/mame/drivers/s6a.c",
-	MAME_DIR .. "src/mame/drivers/s7.c",
-	MAME_DIR .. "src/mame/drivers/s8.c",
-	MAME_DIR .. "src/mame/drivers/s8a.c",
-	MAME_DIR .. "src/mame/drivers/s9.c",
-	MAME_DIR .. "src/mame/drivers/sam.c",
-	MAME_DIR .. "src/mame/drivers/sleic.c",
-	MAME_DIR .. "src/mame/drivers/spectra.c",
-	MAME_DIR .. "src/mame/drivers/spinb.c",
-	MAME_DIR .. "src/mame/drivers/st_mp100.c",
-	MAME_DIR .. "src/mame/drivers/st_mp200.c",
-	MAME_DIR .. "src/mame/drivers/taito.c",
-	MAME_DIR .. "src/mame/drivers/techno.c",
-	MAME_DIR .. "src/mame/drivers/vd.c",
-	MAME_DIR .. "src/mame/drivers/whitestar.c",
-	MAME_DIR .. "src/mame/drivers/white_mod.c",
-	MAME_DIR .. "src/mame/drivers/wico.c",
-	MAME_DIR .. "src/mame/drivers/wpc_95.c",
-	MAME_DIR .. "src/mame/drivers/wpc_an.c",
-	MAME_DIR .. "src/mame/drivers/wpc_dcs.c",
-	MAME_DIR .. "src/mame/drivers/wpc_dot.c",
-	MAME_DIR .. "src/mame/drivers/wpc_flip1.c",
-	MAME_DIR .. "src/mame/drivers/wpc_flip2.c",
-	MAME_DIR .. "src/mame/drivers/wpc_s.c",
-	MAME_DIR .. "src/mame/machine/wpc.c",
-	MAME_DIR .. "src/mame/audio/wpcsnd.c",
-	MAME_DIR .. "src/mame/video/wpc_dmd.c",
-	MAME_DIR .. "src/mame/machine/wpc_pic.c",
-	MAME_DIR .. "src/mame/machine/wpc_lamp.c",
-	MAME_DIR .. "src/mame/machine/wpc_out.c",
-	MAME_DIR .. "src/mame/machine/wpc_shift.c",
-	MAME_DIR .. "src/mame/drivers/zac_1.c",
-	MAME_DIR .. "src/mame/drivers/zac_2.c",
-	MAME_DIR .. "src/mame/drivers/zac_proto.c",
+	MAME_DIR .. "src/mame/drivers/allied.cpp",
+	MAME_DIR .. "src/mame/drivers/alvg.cpp",
+	MAME_DIR .. "src/mame/drivers/atari_s1.cpp",
+	MAME_DIR .. "src/mame/drivers/atari_s2.cpp",
+	MAME_DIR .. "src/mame/drivers/bingo.cpp",
+	MAME_DIR .. "src/mame/drivers/by17.cpp",
+	MAME_DIR .. "src/mame/drivers/by35.cpp",
+	MAME_DIR .. "src/mame/drivers/by6803.cpp",
+	MAME_DIR .. "src/mame/drivers/by68701.cpp",
+	MAME_DIR .. "src/mame/drivers/byvid.cpp",
+	MAME_DIR .. "src/mame/drivers/capcom.cpp",
+	MAME_DIR .. "src/mame/drivers/de_2.cpp",
+	MAME_DIR .. "src/mame/drivers/de_3.cpp",
+	MAME_DIR .. "src/mame/machine/decopincpu.cpp",
+	MAME_DIR .. "src/mame/video/decodmd1.cpp",
+	MAME_DIR .. "src/mame/video/decodmd2.cpp",
+	MAME_DIR .. "src/mame/video/decodmd3.cpp",
+	MAME_DIR .. "src/mame/drivers/de_3b.cpp",
+	MAME_DIR .. "src/mame/drivers/flicker.cpp",
+	MAME_DIR .. "src/mame/drivers/g627.cpp",
+	MAME_DIR .. "src/mame/drivers/gp_1.cpp",
+	MAME_DIR .. "src/mame/machine/genpin.cpp",
+	MAME_DIR .. "src/mame/drivers/gp_2.cpp",
+	MAME_DIR .. "src/mame/drivers/gts1.cpp",
+	MAME_DIR .. "src/mame/drivers/gts3.cpp",
+	MAME_DIR .. "src/mame/drivers/gts3a.cpp",
+	MAME_DIR .. "src/mame/drivers/gts80.cpp",
+	MAME_DIR .. "src/mame/drivers/gts80a.cpp",
+	MAME_DIR .. "src/mame/drivers/gts80b.cpp",
+	MAME_DIR .. "src/mame/drivers/hankin.cpp",
+	MAME_DIR .. "src/mame/drivers/icecold.cpp",
+	MAME_DIR .. "src/mame/drivers/inder.cpp",
+	MAME_DIR .. "src/mame/drivers/jeutel.cpp",
+	MAME_DIR .. "src/mame/drivers/jp.cpp",
+	MAME_DIR .. "src/mame/drivers/jvh.cpp",
+	MAME_DIR .. "src/mame/drivers/kissproto.cpp",
+	MAME_DIR .. "src/mame/drivers/ltd.cpp",
+	MAME_DIR .. "src/mame/drivers/micropin.cpp",
+	MAME_DIR .. "src/mame/drivers/mephistp.cpp",
+	MAME_DIR .. "src/mame/drivers/mrgame.cpp",
+	MAME_DIR .. "src/mame/drivers/nsm.cpp",
+	MAME_DIR .. "src/mame/drivers/peyper.cpp",
+	MAME_DIR .. "src/mame/drivers/play_1.cpp",
+	MAME_DIR .. "src/mame/drivers/play_2.cpp",
+	MAME_DIR .. "src/mame/drivers/play_3.cpp",
+	MAME_DIR .. "src/mame/drivers/play_5.cpp",
+	MAME_DIR .. "src/mame/drivers/rowamet.cpp",
+	MAME_DIR .. "src/mame/drivers/s11.cpp",
+	MAME_DIR .. "src/mame/drivers/s11a.cpp",
+	MAME_DIR .. "src/mame/drivers/s11b.cpp",
+	MAME_DIR .. "src/mame/drivers/s11c.cpp",
+	MAME_DIR .. "src/mame/audio/s11c_bg.cpp",
+	MAME_DIR .. "src/mame/drivers/s3.cpp",
+	MAME_DIR .. "src/mame/drivers/s4.cpp",
+	MAME_DIR .. "src/mame/drivers/s6.cpp",
+	MAME_DIR .. "src/mame/drivers/s6a.cpp",
+	MAME_DIR .. "src/mame/drivers/s7.cpp",
+	MAME_DIR .. "src/mame/drivers/s8.cpp",
+	MAME_DIR .. "src/mame/drivers/s8a.cpp",
+	MAME_DIR .. "src/mame/drivers/s9.cpp",
+	MAME_DIR .. "src/mame/drivers/sam.cpp",
+	MAME_DIR .. "src/mame/drivers/sleic.cpp",
+	MAME_DIR .. "src/mame/drivers/spectra.cpp",
+	MAME_DIR .. "src/mame/drivers/spinb.cpp",
+	MAME_DIR .. "src/mame/drivers/st_mp100.cpp",
+	MAME_DIR .. "src/mame/drivers/st_mp200.cpp",
+	MAME_DIR .. "src/mame/drivers/taito.cpp",
+	MAME_DIR .. "src/mame/drivers/techno.cpp",
+	MAME_DIR .. "src/mame/drivers/vd.cpp",
+	MAME_DIR .. "src/mame/drivers/whitestar.cpp",
+	MAME_DIR .. "src/mame/drivers/white_mod.cpp",
+	MAME_DIR .. "src/mame/drivers/wico.cpp",
+	MAME_DIR .. "src/mame/drivers/wpc_95.cpp",
+	MAME_DIR .. "src/mame/drivers/wpc_an.cpp",
+	MAME_DIR .. "src/mame/drivers/wpc_dcs.cpp",
+	MAME_DIR .. "src/mame/drivers/wpc_dot.cpp",
+	MAME_DIR .. "src/mame/drivers/wpc_flip1.cpp",
+	MAME_DIR .. "src/mame/drivers/wpc_flip2.cpp",
+	MAME_DIR .. "src/mame/drivers/wpc_s.cpp",
+	MAME_DIR .. "src/mame/machine/wpc.cpp",
+	MAME_DIR .. "src/mame/audio/wpcsnd.cpp",
+	MAME_DIR .. "src/mame/video/wpc_dmd.cpp",
+	MAME_DIR .. "src/mame/machine/wpc_pic.cpp",
+	MAME_DIR .. "src/mame/machine/wpc_lamp.cpp",
+	MAME_DIR .. "src/mame/machine/wpc_out.cpp",
+	MAME_DIR .. "src/mame/machine/wpc_shift.cpp",
+	MAME_DIR .. "src/mame/drivers/zac_1.cpp",
+	MAME_DIR .. "src/mame/drivers/zac_2.cpp",
+	MAME_DIR .. "src/mame/drivers/zac_proto.cpp",
 }
 
 --------------------------------------------------
@@ -3272,330 +3272,330 @@ files {
 
 createMAMEProjects(_target, _subtarget, "misc")
 files {
-	MAME_DIR .. "src/mame/drivers/1945kiii.c",
-	MAME_DIR .. "src/mame/drivers/39in1.c",
-	MAME_DIR .. "src/mame/drivers/3do.c",
-	MAME_DIR .. "src/mame/machine/3do.c",
-	MAME_DIR .. "src/mame/drivers/3x3puzzl.c",
-	MAME_DIR .. "src/mame/drivers/4enraya.c",
-	MAME_DIR .. "src/mame/video/4enraya.c",
-	MAME_DIR .. "src/mame/drivers/4enlinea.c",
-	MAME_DIR .. "src/mame/drivers/5clown.c",
-	MAME_DIR .. "src/mame/drivers/a1supply.c",
-	MAME_DIR .. "src/mame/drivers/acefruit.c",
-	MAME_DIR .. "src/mame/drivers/aces1.c",
-	MAME_DIR .. "src/mame/drivers/acesp.c",
-	MAME_DIR .. "src/mame/drivers/adp.c",
-	MAME_DIR .. "src/mame/drivers/alinvade.c",
-	MAME_DIR .. "src/mame/drivers/amaticmg.c",
-	MAME_DIR .. "src/mame/drivers/ampoker2.c",
-	MAME_DIR .. "src/mame/video/ampoker2.c",
-	MAME_DIR .. "src/mame/drivers/amspdwy.c",
-	MAME_DIR .. "src/mame/video/amspdwy.c",
-	MAME_DIR .. "src/mame/drivers/amusco.c",
-	MAME_DIR .. "src/mame/drivers/arachnid.c",
-	MAME_DIR .. "src/mame/drivers/artmagic.c",
-	MAME_DIR .. "src/mame/video/artmagic.c",
-	MAME_DIR .. "src/mame/drivers/astrafr.c",
-	MAME_DIR .. "src/mame/drivers/astrcorp.c",
-	MAME_DIR .. "src/mame/drivers/astropc.c",
-	MAME_DIR .. "src/mame/drivers/atronic.c",
-	MAME_DIR .. "src/mame/drivers/attckufo.c",
-	MAME_DIR .. "src/mame/drivers/avt.c",
-	MAME_DIR .. "src/mame/drivers/aztarac.c",
-	MAME_DIR .. "src/mame/audio/aztarac.c",
-	MAME_DIR .. "src/mame/video/aztarac.c",
-	MAME_DIR .. "src/mame/drivers/bailey.c",
-	MAME_DIR .. "src/mame/drivers/beaminv.c",
-	MAME_DIR .. "src/mame/drivers/belatra.c",
-	MAME_DIR .. "src/mame/drivers/bgt.c",
-	MAME_DIR .. "src/mame/drivers/bingoman.c",
-	MAME_DIR .. "src/mame/drivers/bingor.c",
-	MAME_DIR .. "src/mame/drivers/blitz.c",
-	MAME_DIR .. "src/mame/drivers/blitz68k.c",
-	MAME_DIR .. "src/mame/drivers/buster.c",
-	MAME_DIR .. "src/mame/drivers/calomega.c",
-	MAME_DIR .. "src/mame/video/calomega.c",
-	MAME_DIR .. "src/mame/drivers/carrera.c",
-	MAME_DIR .. "src/mame/drivers/castle.c",
-	MAME_DIR .. "src/mame/drivers/cave.c",
-	MAME_DIR .. "src/mame/video/cave.c",
-	MAME_DIR .. "src/mame/drivers/cavepc.c",
-	MAME_DIR .. "src/mame/drivers/cv1k.c",
-	MAME_DIR .. "src/mame/drivers/cb2001.c",
-	MAME_DIR .. "src/mame/drivers/cdi.c",
-	MAME_DIR .. "src/mame/video/mcd212.c",
-	MAME_DIR .. "src/mame/machine/cdi070.c",
-	MAME_DIR .. "src/mame/machine/cdislave.c",
-	MAME_DIR .. "src/mame/machine/cdicdic.c",
-	MAME_DIR .. "src/mame/drivers/cesclass.c",
-	MAME_DIR .. "src/mame/drivers/chance32.c",
-	MAME_DIR .. "src/mame/drivers/chexx.c",
-	MAME_DIR .. "src/mame/drivers/chicago.c",
-	MAME_DIR .. "src/mame/drivers/chsuper.c",
-	MAME_DIR .. "src/mame/drivers/cidelsa.c",
-	MAME_DIR .. "src/mame/video/cidelsa.c",
-	MAME_DIR .. "src/mame/drivers/cocoloco.c",
-	MAME_DIR .. "src/mame/drivers/coinmstr.c",
-	MAME_DIR .. "src/mame/drivers/coinmvga.c",
-	MAME_DIR .. "src/mame/drivers/comebaby.c",
-	MAME_DIR .. "src/mame/drivers/cupidon.c",
-	MAME_DIR .. "src/mame/drivers/bntyhunt.c",
-	MAME_DIR .. "src/mame/drivers/coolpool.c",
-	MAME_DIR .. "src/mame/drivers/megaphx.c",
-	MAME_DIR .. "src/mame/machine/inder_sb.c",
-	MAME_DIR .. "src/mame/machine/inder_vid.c",
-	MAME_DIR .. "src/mame/drivers/corona.c",
-	MAME_DIR .. "src/mame/drivers/crystal.c",
-	MAME_DIR .. "src/mame/video/vrender0.c",
-	MAME_DIR .. "src/mame/drivers/cubeqst.c",
-	MAME_DIR .. "src/mame/drivers/cybertnk.c",
-	MAME_DIR .. "src/mame/drivers/dcheese.c",
-	MAME_DIR .. "src/mame/video/dcheese.c",
-	MAME_DIR .. "src/mame/drivers/dfruit.c",
-	MAME_DIR .. "src/mame/drivers/dgpix.c",
-	MAME_DIR .. "src/mame/drivers/discoboy.c",
-	MAME_DIR .. "src/mame/drivers/dominob.c",
-	MAME_DIR .. "src/mame/drivers/dorachan.c",
-	MAME_DIR .. "src/mame/drivers/dreamwld.c",
-	MAME_DIR .. "src/mame/drivers/dribling.c",
-	MAME_DIR .. "src/mame/video/dribling.c",
-	MAME_DIR .. "src/mame/drivers/drw80pkr.c",
-	MAME_DIR .. "src/mame/drivers/dwarfd.c",
-	MAME_DIR .. "src/mame/drivers/dynadice.c",
-	MAME_DIR .. "src/mame/drivers/ecoinfr.c",
-	MAME_DIR .. "src/mame/drivers/ecoinf1.c",
-	MAME_DIR .. "src/mame/drivers/ecoinf2.c",
-	MAME_DIR .. "src/mame/drivers/ecoinf3.c",
-	MAME_DIR .. "src/mame/drivers/electra.c",
-	MAME_DIR .. "src/mame/drivers/epos.c",
-	MAME_DIR .. "src/mame/video/epos.c",
-	MAME_DIR .. "src/mame/drivers/esd16.c",
-	MAME_DIR .. "src/mame/video/esd16.c",
-	MAME_DIR .. "src/mame/drivers/esh.c",
-	MAME_DIR .. "src/mame/drivers/esripsys.c",
-	MAME_DIR .. "src/mame/video/esripsys.c",
-	MAME_DIR .. "src/mame/drivers/ettrivia.c",
-	MAME_DIR .. "src/mame/drivers/extrema.c",
-	MAME_DIR .. "src/mame/drivers/fireball.c",
-	MAME_DIR .. "src/mame/drivers/flipjack.c",
-	MAME_DIR .. "src/mame/drivers/flower.c",
-	MAME_DIR .. "src/mame/audio/flower.c",
-	MAME_DIR .. "src/mame/video/flower.c",
-	MAME_DIR .. "src/mame/drivers/fortecar.c",
-	MAME_DIR .. "src/mame/drivers/fresh.c",
-	MAME_DIR .. "src/mame/drivers/freekick.c",
-	MAME_DIR .. "src/mame/video/freekick.c",
-	MAME_DIR .. "src/mame/drivers/fungames.c",
-	MAME_DIR .. "src/mame/drivers/funkball.c",
-	MAME_DIR .. "src/mame/drivers/gambl186.c",
-	MAME_DIR .. "src/mame/drivers/galaxi.c",
-	MAME_DIR .. "src/mame/drivers/galgame.c",
-	MAME_DIR .. "src/mame/drivers/gamecstl.c",
-	MAME_DIR .. "src/mame/drivers/gammagic.c",
-	MAME_DIR .. "src/mame/drivers/gamtor.c",
-	MAME_DIR .. "src/mame/drivers/gei.c",
-	MAME_DIR .. "src/mame/drivers/globalfr.c",
-	MAME_DIR .. "src/mame/drivers/globalvr.c",
-	MAME_DIR .. "src/mame/drivers/gluck2.c",
-	MAME_DIR .. "src/mame/drivers/goldngam.c",
-	MAME_DIR .. "src/mame/drivers/goldnpkr.c",
-	MAME_DIR .. "src/mame/drivers/good.c",
-	MAME_DIR .. "src/mame/drivers/gotcha.c",
-	MAME_DIR .. "src/mame/video/gotcha.c",
-	MAME_DIR .. "src/mame/drivers/gstream.c",
-	MAME_DIR .. "src/mame/drivers/gumbo.c",
-	MAME_DIR .. "src/mame/video/gumbo.c",
-	MAME_DIR .. "src/mame/drivers/gunpey.c",
-	MAME_DIR .. "src/mame/drivers/hideseek.c",
-	MAME_DIR .. "src/mame/drivers/hazelgr.c",
-	MAME_DIR .. "src/mame/drivers/headonb.c",
-	MAME_DIR .. "src/mame/drivers/highvdeo.c",
-	MAME_DIR .. "src/mame/drivers/himesiki.c",
-	MAME_DIR .. "src/mame/video/himesiki.c",
-	MAME_DIR .. "src/mame/drivers/hitpoker.c",
-	MAME_DIR .. "src/mame/drivers/homedata.c",
-	MAME_DIR .. "src/mame/video/homedata.c",
-	MAME_DIR .. "src/mame/drivers/hotblock.c",
-	MAME_DIR .. "src/mame/drivers/hotstuff.c",
-	MAME_DIR .. "src/mame/drivers/ichiban.c",
-	MAME_DIR .. "src/mame/drivers/imolagp.c",
-	MAME_DIR .. "src/mame/drivers/intrscti.c",
-	MAME_DIR .. "src/mame/drivers/istellar.c",
-	MAME_DIR .. "src/mame/drivers/itgambl2.c",
-	MAME_DIR .. "src/mame/drivers/itgambl3.c",
-	MAME_DIR .. "src/mame/drivers/itgamble.c",
-	MAME_DIR .. "src/mame/drivers/jackpool.c",
-	MAME_DIR .. "src/mame/drivers/jankenmn.c",
-	MAME_DIR .. "src/mame/drivers/jokrwild.c",
-	MAME_DIR .. "src/mame/drivers/jongkyo.c",
-	MAME_DIR .. "src/mame/drivers/joystand.c",
-	MAME_DIR .. "src/mame/drivers/jubilee.c",
-	MAME_DIR .. "src/mame/drivers/kas89.c",
-	MAME_DIR .. "src/mame/drivers/kingpin.c",
-	MAME_DIR .. "src/mame/drivers/koikoi.c",
-	MAME_DIR .. "src/mame/drivers/kurukuru.c",
-	MAME_DIR .. "src/mame/drivers/kyugo.c",
-	MAME_DIR .. "src/mame/video/kyugo.c",
-	MAME_DIR .. "src/mame/drivers/ladyfrog.c",
-	MAME_DIR .. "src/mame/video/ladyfrog.c",
-	MAME_DIR .. "src/mame/drivers/laserbas.c",
-	MAME_DIR .. "src/mame/drivers/lethalj.c",
-	MAME_DIR .. "src/mame/video/lethalj.c",
-	MAME_DIR .. "src/mame/drivers/limenko.c",
-	MAME_DIR .. "src/mame/drivers/ltcasino.c",
-	MAME_DIR .. "src/mame/drivers/lucky74.c",
-	MAME_DIR .. "src/mame/video/lucky74.c",
-	MAME_DIR .. "src/mame/drivers/luckgrln.c",
-	MAME_DIR .. "src/mame/drivers/magic10.c",
-	MAME_DIR .. "src/mame/drivers/magicard.c",
-	MAME_DIR .. "src/mame/drivers/magicfly.c",
-	MAME_DIR .. "src/mame/drivers/magictg.c",
-	MAME_DIR .. "src/mame/drivers/magtouch.c",
-	MAME_DIR .. "src/mame/drivers/majorpkr.c",
-	MAME_DIR .. "src/mame/drivers/malzak.c",
-	MAME_DIR .. "src/mame/video/malzak.c",
-	MAME_DIR .. "src/mame/drivers/manohman.c",
-	MAME_DIR .. "src/mame/drivers/mcatadv.c",
-	MAME_DIR .. "src/mame/video/mcatadv.c",
-	MAME_DIR .. "src/mame/drivers/mgavegas.c",
-	MAME_DIR .. "src/mame/drivers/meyc8080.c",
-	MAME_DIR .. "src/mame/drivers/meyc8088.c",
-	MAME_DIR .. "src/mame/drivers/micro3d.c",
-	MAME_DIR .. "src/mame/machine/micro3d.c",
-	MAME_DIR .. "src/mame/video/micro3d.c",
-	MAME_DIR .. "src/mame/audio/micro3d.c",
-	MAME_DIR .. "src/mame/drivers/midas.c",
-	MAME_DIR .. "src/mame/drivers/miniboy7.c",
-	MAME_DIR .. "src/mame/drivers/mirax.c",
-	MAME_DIR .. "src/mame/drivers/mole.c",
-	MAME_DIR .. "src/mame/drivers/mosaic.c",
-	MAME_DIR .. "src/mame/video/mosaic.c",
-	MAME_DIR .. "src/mame/drivers/mpu12wbk.c",
-	MAME_DIR .. "src/mame/drivers/mrjong.c",
-	MAME_DIR .. "src/mame/video/mrjong.c",
-	MAME_DIR .. "src/mame/drivers/multfish.c",
-	MAME_DIR .. "src/mame/drivers/multfish_boot.c",
-	MAME_DIR .. "src/mame/drivers/multfish_ref.c",
-	MAME_DIR .. "src/mame/drivers/murogem.c",
-	MAME_DIR .. "src/mame/drivers/murogmbl.c",
-	MAME_DIR .. "src/mame/drivers/neoprint.c",
-	MAME_DIR .. "src/mame/drivers/neptunp2.c",
-	MAME_DIR .. "src/mame/drivers/news.c",
-	MAME_DIR .. "src/mame/video/news.c",
-	MAME_DIR .. "src/mame/drivers/nexus3d.c",
-	MAME_DIR .. "src/mame/drivers/norautp.c",
-	MAME_DIR .. "src/mame/audio/norautp.c",
-	MAME_DIR .. "src/mame/drivers/nsmpoker.c",
-	MAME_DIR .. "src/mame/drivers/oneshot.c",
-	MAME_DIR .. "src/mame/video/oneshot.c",
-	MAME_DIR .. "src/mame/drivers/onetwo.c",
-	MAME_DIR .. "src/mame/drivers/othello.c",
-	MAME_DIR .. "src/mame/drivers/pachifev.c",
-	MAME_DIR .. "src/mame/drivers/pasha2.c",
-	MAME_DIR .. "src/mame/drivers/pass.c",
-	MAME_DIR .. "src/mame/video/pass.c",
-	MAME_DIR .. "src/mame/drivers/peplus.c",
-	MAME_DIR .. "src/mame/drivers/photon.c",
-	MAME_DIR .. "src/mame/drivers/piggypas.c",
-	MAME_DIR .. "src/mame/video/pk8000.c",
-	MAME_DIR .. "src/mame/drivers/photon2.c",
-	MAME_DIR .. "src/mame/drivers/photoply.c",
-	MAME_DIR .. "src/mame/drivers/pinkiri8.c",
-	MAME_DIR .. "src/mame/drivers/pipeline.c",
-	MAME_DIR .. "src/mame/drivers/pkscram.c",
-	MAME_DIR .. "src/mame/drivers/pntnpuzl.c",
-	MAME_DIR .. "src/mame/drivers/policetr.c",
-	MAME_DIR .. "src/mame/video/policetr.c",
-	MAME_DIR .. "src/mame/drivers/polyplay.c",
-	MAME_DIR .. "src/mame/audio/polyplay.c",
-	MAME_DIR .. "src/mame/video/polyplay.c",
-	MAME_DIR .. "src/mame/drivers/poker72.c",
-	MAME_DIR .. "src/mame/drivers/potgoldu.c",
-	MAME_DIR .. "src/mame/drivers/proconn.c",
-	MAME_DIR .. "src/mame/drivers/psattack.c",
-	MAME_DIR .. "src/mame/drivers/pse.c",
-	MAME_DIR .. "src/mame/drivers/quizo.c",
-	MAME_DIR .. "src/mame/drivers/quizpun2.c",
-	MAME_DIR .. "src/mame/drivers/rbmk.c",
-	MAME_DIR .. "src/mame/drivers/rcorsair.c",
-	MAME_DIR .. "src/mame/drivers/re900.c",
-	MAME_DIR .. "src/mame/drivers/rgum.c",
-	MAME_DIR .. "src/mame/drivers/roul.c",
-	MAME_DIR .. "src/mame/drivers/savquest.c",
-	MAME_DIR .. "src/mame/drivers/sanremo.c",
-	MAME_DIR .. "src/mame/drivers/sealy.c",
-	MAME_DIR .. "src/mame/drivers/sfbonus.c",
-	MAME_DIR .. "src/mame/drivers/shangkid.c",
-	MAME_DIR .. "src/mame/video/shangkid.c",
-	MAME_DIR .. "src/mame/drivers/skeetsht.c",
-	MAME_DIR .. "src/mame/drivers/skimaxx.c",
-	MAME_DIR .. "src/mame/drivers/skyarmy.c",
-	MAME_DIR .. "src/mame/drivers/skylncr.c",
-	MAME_DIR .. "src/mame/drivers/sliver.c",
-	MAME_DIR .. "src/mame/drivers/slotcarn.c",
-	MAME_DIR .. "src/mame/drivers/smsmcorp.c",
-	MAME_DIR .. "src/mame/drivers/sothello.c",
-	MAME_DIR .. "src/mame/drivers/splus.c",
-	MAME_DIR .. "src/mame/drivers/spool99.c",
-	MAME_DIR .. "src/mame/drivers/sprcros2.c",
-	MAME_DIR .. "src/mame/video/sprcros2.c",
-	MAME_DIR .. "src/mame/drivers/sshot.c",
-	MAME_DIR .. "src/mame/drivers/ssingles.c",
-	MAME_DIR .. "src/mame/drivers/sstrangr.c",
-	MAME_DIR .. "src/mame/drivers/statriv2.c",
-	MAME_DIR .. "src/mame/drivers/stellafr.c",
-	MAME_DIR .. "src/mame/drivers/stuntair.c",
-	MAME_DIR .. "src/mame/drivers/su2000.c",
-	MAME_DIR .. "src/mame/drivers/subhuntr.c",
-	MAME_DIR .. "src/mame/drivers/summit.c",
-	MAME_DIR .. "src/mame/drivers/sumt8035.c",
-	MAME_DIR .. "src/mame/drivers/supercrd.c",
-	MAME_DIR .. "src/mame/drivers/supertnk.c",
-	MAME_DIR .. "src/mame/drivers/superwng.c",
-	MAME_DIR .. "src/mame/drivers/tapatune.c",
-	MAME_DIR .. "src/mame/drivers/tattack.c",
-	MAME_DIR .. "src/mame/drivers/taxidriv.c",
-	MAME_DIR .. "src/mame/video/taxidriv.c",
-	MAME_DIR .. "src/mame/drivers/tcl.c",
-	MAME_DIR .. "src/mame/drivers/thayers.c",
-	MAME_DIR .. "src/mame/drivers/thedeep.c",
-	MAME_DIR .. "src/mame/video/thedeep.c",
-	MAME_DIR .. "src/mame/drivers/tiamc1.c",
-	MAME_DIR .. "src/mame/video/tiamc1.c",
-	MAME_DIR .. "src/mame/audio/tiamc1.c",
-	MAME_DIR .. "src/mame/drivers/tickee.c",
-	MAME_DIR .. "src/mame/drivers/tmspoker.c",
-	MAME_DIR .. "src/mame/drivers/truco.c",
-	MAME_DIR .. "src/mame/video/truco.c",
-	MAME_DIR .. "src/mame/drivers/trucocl.c",
-	MAME_DIR .. "src/mame/video/trucocl.c",
-	MAME_DIR .. "src/mame/drivers/trvmadns.c",
-	MAME_DIR .. "src/mame/drivers/trvquest.c",
-	MAME_DIR .. "src/mame/drivers/ttchamp.c",
-	MAME_DIR .. "src/mame/drivers/tugboat.c",
-	MAME_DIR .. "src/mame/drivers/umipoker.c",
-	MAME_DIR .. "src/mame/drivers/unkfr.c",
-	MAME_DIR .. "src/mame/drivers/unkhorse.c",
-	MAME_DIR .. "src/mame/drivers/usgames.c",
-	MAME_DIR .. "src/mame/video/usgames.c",
-	MAME_DIR .. "src/mame/drivers/vamphalf.c",
-	MAME_DIR .. "src/mame/drivers/vcombat.c",
-	MAME_DIR .. "src/mame/drivers/vectrex.c",
-	MAME_DIR .. "src/mame/video/vectrex.c",
-	MAME_DIR .. "src/mame/machine/vectrex.c",
-	MAME_DIR .. "src/mame/drivers/videopkr.c",
-	MAME_DIR .. "src/mame/drivers/vlc.c",
-	MAME_DIR .. "src/mame/drivers/voyager.c",
-	MAME_DIR .. "src/mame/drivers/vp101.c",
-	MAME_DIR .. "src/mame/drivers/vpoker.c",
-	MAME_DIR .. "src/mame/drivers/vroulet.c",
-	MAME_DIR .. "src/mame/drivers/wildpkr.c",
-	MAME_DIR .. "src/mame/drivers/wms.c",
-	MAME_DIR .. "src/mame/drivers/wacky_gator.c",
-	MAME_DIR .. "src/mame/drivers/xtom3d.c",
-	MAME_DIR .. "src/mame/drivers/xyonix.c",
-	MAME_DIR .. "src/mame/video/xyonix.c",
+	MAME_DIR .. "src/mame/drivers/1945kiii.cpp",
+	MAME_DIR .. "src/mame/drivers/39in1.cpp",
+	MAME_DIR .. "src/mame/drivers/3do.cpp",
+	MAME_DIR .. "src/mame/machine/3do.cpp",
+	MAME_DIR .. "src/mame/drivers/3x3puzzl.cpp",
+	MAME_DIR .. "src/mame/drivers/4enraya.cpp",
+	MAME_DIR .. "src/mame/video/4enraya.cpp",
+	MAME_DIR .. "src/mame/drivers/4enlinea.cpp",
+	MAME_DIR .. "src/mame/drivers/5clown.cpp",
+	MAME_DIR .. "src/mame/drivers/a1supply.cpp",
+	MAME_DIR .. "src/mame/drivers/acefruit.cpp",
+	MAME_DIR .. "src/mame/drivers/aces1.cpp",
+	MAME_DIR .. "src/mame/drivers/acesp.cpp",
+	MAME_DIR .. "src/mame/drivers/adp.cpp",
+	MAME_DIR .. "src/mame/drivers/alinvade.cpp",
+	MAME_DIR .. "src/mame/drivers/amaticmg.cpp",
+	MAME_DIR .. "src/mame/drivers/ampoker2.cpp",
+	MAME_DIR .. "src/mame/video/ampoker2.cpp",
+	MAME_DIR .. "src/mame/drivers/amspdwy.cpp",
+	MAME_DIR .. "src/mame/video/amspdwy.cpp",
+	MAME_DIR .. "src/mame/drivers/amusco.cpp",
+	MAME_DIR .. "src/mame/drivers/arachnid.cpp",
+	MAME_DIR .. "src/mame/drivers/artmagic.cpp",
+	MAME_DIR .. "src/mame/video/artmagic.cpp",
+	MAME_DIR .. "src/mame/drivers/astrafr.cpp",
+	MAME_DIR .. "src/mame/drivers/astrcorp.cpp",
+	MAME_DIR .. "src/mame/drivers/astropc.cpp",
+	MAME_DIR .. "src/mame/drivers/atronic.cpp",
+	MAME_DIR .. "src/mame/drivers/attckufo.cpp",
+	MAME_DIR .. "src/mame/drivers/avt.cpp",
+	MAME_DIR .. "src/mame/drivers/aztarac.cpp",
+	MAME_DIR .. "src/mame/audio/aztarac.cpp",
+	MAME_DIR .. "src/mame/video/aztarac.cpp",
+	MAME_DIR .. "src/mame/drivers/bailey.cpp",
+	MAME_DIR .. "src/mame/drivers/beaminv.cpp",
+	MAME_DIR .. "src/mame/drivers/belatra.cpp",
+	MAME_DIR .. "src/mame/drivers/bgt.cpp",
+	MAME_DIR .. "src/mame/drivers/bingoman.cpp",
+	MAME_DIR .. "src/mame/drivers/bingor.cpp",
+	MAME_DIR .. "src/mame/drivers/blitz.cpp",
+	MAME_DIR .. "src/mame/drivers/blitz68k.cpp",
+	MAME_DIR .. "src/mame/drivers/buster.cpp",
+	MAME_DIR .. "src/mame/drivers/calomega.cpp",
+	MAME_DIR .. "src/mame/video/calomega.cpp",
+	MAME_DIR .. "src/mame/drivers/carrera.cpp",
+	MAME_DIR .. "src/mame/drivers/castle.cpp",
+	MAME_DIR .. "src/mame/drivers/cave.cpp",
+	MAME_DIR .. "src/mame/video/cave.cpp",
+	MAME_DIR .. "src/mame/drivers/cavepc.cpp",
+	MAME_DIR .. "src/mame/drivers/cv1k.cpp",
+	MAME_DIR .. "src/mame/drivers/cb2001.cpp",
+	MAME_DIR .. "src/mame/drivers/cdi.cpp",
+	MAME_DIR .. "src/mame/video/mcd212.cpp",
+	MAME_DIR .. "src/mame/machine/cdi070.cpp",
+	MAME_DIR .. "src/mame/machine/cdislave.cpp",
+	MAME_DIR .. "src/mame/machine/cdicdic.cpp",
+	MAME_DIR .. "src/mame/drivers/cesclass.cpp",
+	MAME_DIR .. "src/mame/drivers/chance32.cpp",
+	MAME_DIR .. "src/mame/drivers/chexx.cpp",
+	MAME_DIR .. "src/mame/drivers/chicago.cpp",
+	MAME_DIR .. "src/mame/drivers/chsuper.cpp",
+	MAME_DIR .. "src/mame/drivers/cidelsa.cpp",
+	MAME_DIR .. "src/mame/video/cidelsa.cpp",
+	MAME_DIR .. "src/mame/drivers/cocoloco.cpp",
+	MAME_DIR .. "src/mame/drivers/coinmstr.cpp",
+	MAME_DIR .. "src/mame/drivers/coinmvga.cpp",
+	MAME_DIR .. "src/mame/drivers/comebaby.cpp",
+	MAME_DIR .. "src/mame/drivers/cupidon.cpp",
+	MAME_DIR .. "src/mame/drivers/bntyhunt.cpp",
+	MAME_DIR .. "src/mame/drivers/coolpool.cpp",
+	MAME_DIR .. "src/mame/drivers/megaphx.cpp",
+	MAME_DIR .. "src/mame/machine/inder_sb.cpp",
+	MAME_DIR .. "src/mame/machine/inder_vid.cpp",
+	MAME_DIR .. "src/mame/drivers/corona.cpp",
+	MAME_DIR .. "src/mame/drivers/crystal.cpp",
+	MAME_DIR .. "src/mame/video/vrender0.cpp",
+	MAME_DIR .. "src/mame/drivers/cubeqst.cpp",
+	MAME_DIR .. "src/mame/drivers/cybertnk.cpp",
+	MAME_DIR .. "src/mame/drivers/dcheese.cpp",
+	MAME_DIR .. "src/mame/video/dcheese.cpp",
+	MAME_DIR .. "src/mame/drivers/dfruit.cpp",
+	MAME_DIR .. "src/mame/drivers/dgpix.cpp",
+	MAME_DIR .. "src/mame/drivers/discoboy.cpp",
+	MAME_DIR .. "src/mame/drivers/dominob.cpp",
+	MAME_DIR .. "src/mame/drivers/dorachan.cpp",
+	MAME_DIR .. "src/mame/drivers/dreamwld.cpp",
+	MAME_DIR .. "src/mame/drivers/dribling.cpp",
+	MAME_DIR .. "src/mame/video/dribling.cpp",
+	MAME_DIR .. "src/mame/drivers/drw80pkr.cpp",
+	MAME_DIR .. "src/mame/drivers/dwarfd.cpp",
+	MAME_DIR .. "src/mame/drivers/dynadice.cpp",
+	MAME_DIR .. "src/mame/drivers/ecoinfr.cpp",
+	MAME_DIR .. "src/mame/drivers/ecoinf1.cpp",
+	MAME_DIR .. "src/mame/drivers/ecoinf2.cpp",
+	MAME_DIR .. "src/mame/drivers/ecoinf3.cpp",
+	MAME_DIR .. "src/mame/drivers/electra.cpp",
+	MAME_DIR .. "src/mame/drivers/epos.cpp",
+	MAME_DIR .. "src/mame/video/epos.cpp",
+	MAME_DIR .. "src/mame/drivers/esd16.cpp",
+	MAME_DIR .. "src/mame/video/esd16.cpp",
+	MAME_DIR .. "src/mame/drivers/esh.cpp",
+	MAME_DIR .. "src/mame/drivers/esripsys.cpp",
+	MAME_DIR .. "src/mame/video/esripsys.cpp",
+	MAME_DIR .. "src/mame/drivers/ettrivia.cpp",
+	MAME_DIR .. "src/mame/drivers/extrema.cpp",
+	MAME_DIR .. "src/mame/drivers/fireball.cpp",
+	MAME_DIR .. "src/mame/drivers/flipjack.cpp",
+	MAME_DIR .. "src/mame/drivers/flower.cpp",
+	MAME_DIR .. "src/mame/audio/flower.cpp",
+	MAME_DIR .. "src/mame/video/flower.cpp",
+	MAME_DIR .. "src/mame/drivers/fortecar.cpp",
+	MAME_DIR .. "src/mame/drivers/fresh.cpp",
+	MAME_DIR .. "src/mame/drivers/freekick.cpp",
+	MAME_DIR .. "src/mame/video/freekick.cpp",
+	MAME_DIR .. "src/mame/drivers/fungames.cpp",
+	MAME_DIR .. "src/mame/drivers/funkball.cpp",
+	MAME_DIR .. "src/mame/drivers/gambl186.cpp",
+	MAME_DIR .. "src/mame/drivers/galaxi.cpp",
+	MAME_DIR .. "src/mame/drivers/galgame.cpp",
+	MAME_DIR .. "src/mame/drivers/gamecstl.cpp",
+	MAME_DIR .. "src/mame/drivers/gammagic.cpp",
+	MAME_DIR .. "src/mame/drivers/gamtor.cpp",
+	MAME_DIR .. "src/mame/drivers/gei.cpp",
+	MAME_DIR .. "src/mame/drivers/globalfr.cpp",
+	MAME_DIR .. "src/mame/drivers/globalvr.cpp",
+	MAME_DIR .. "src/mame/drivers/gluck2.cpp",
+	MAME_DIR .. "src/mame/drivers/goldngam.cpp",
+	MAME_DIR .. "src/mame/drivers/goldnpkr.cpp",
+	MAME_DIR .. "src/mame/drivers/good.cpp",
+	MAME_DIR .. "src/mame/drivers/gotcha.cpp",
+	MAME_DIR .. "src/mame/video/gotcha.cpp",
+	MAME_DIR .. "src/mame/drivers/gstream.cpp",
+	MAME_DIR .. "src/mame/drivers/gumbo.cpp",
+	MAME_DIR .. "src/mame/video/gumbo.cpp",
+	MAME_DIR .. "src/mame/drivers/gunpey.cpp",
+	MAME_DIR .. "src/mame/drivers/hideseek.cpp",
+	MAME_DIR .. "src/mame/drivers/hazelgr.cpp",
+	MAME_DIR .. "src/mame/drivers/headonb.cpp",
+	MAME_DIR .. "src/mame/drivers/highvdeo.cpp",
+	MAME_DIR .. "src/mame/drivers/himesiki.cpp",
+	MAME_DIR .. "src/mame/video/himesiki.cpp",
+	MAME_DIR .. "src/mame/drivers/hitpoker.cpp",
+	MAME_DIR .. "src/mame/drivers/homedata.cpp",
+	MAME_DIR .. "src/mame/video/homedata.cpp",
+	MAME_DIR .. "src/mame/drivers/hotblock.cpp",
+	MAME_DIR .. "src/mame/drivers/hotstuff.cpp",
+	MAME_DIR .. "src/mame/drivers/ichiban.cpp",
+	MAME_DIR .. "src/mame/drivers/imolagp.cpp",
+	MAME_DIR .. "src/mame/drivers/intrscti.cpp",
+	MAME_DIR .. "src/mame/drivers/istellar.cpp",
+	MAME_DIR .. "src/mame/drivers/itgambl2.cpp",
+	MAME_DIR .. "src/mame/drivers/itgambl3.cpp",
+	MAME_DIR .. "src/mame/drivers/itgamble.cpp",
+	MAME_DIR .. "src/mame/drivers/jackpool.cpp",
+	MAME_DIR .. "src/mame/drivers/jankenmn.cpp",
+	MAME_DIR .. "src/mame/drivers/jokrwild.cpp",
+	MAME_DIR .. "src/mame/drivers/jongkyo.cpp",
+	MAME_DIR .. "src/mame/drivers/joystand.cpp",
+	MAME_DIR .. "src/mame/drivers/jubilee.cpp",
+	MAME_DIR .. "src/mame/drivers/kas89.cpp",
+	MAME_DIR .. "src/mame/drivers/kingpin.cpp",
+	MAME_DIR .. "src/mame/drivers/koikoi.cpp",
+	MAME_DIR .. "src/mame/drivers/kurukuru.cpp",
+	MAME_DIR .. "src/mame/drivers/kyugo.cpp",
+	MAME_DIR .. "src/mame/video/kyugo.cpp",
+	MAME_DIR .. "src/mame/drivers/ladyfrog.cpp",
+	MAME_DIR .. "src/mame/video/ladyfrog.cpp",
+	MAME_DIR .. "src/mame/drivers/laserbas.cpp",
+	MAME_DIR .. "src/mame/drivers/lethalj.cpp",
+	MAME_DIR .. "src/mame/video/lethalj.cpp",
+	MAME_DIR .. "src/mame/drivers/limenko.cpp",
+	MAME_DIR .. "src/mame/drivers/ltcasino.cpp",
+	MAME_DIR .. "src/mame/drivers/lucky74.cpp",
+	MAME_DIR .. "src/mame/video/lucky74.cpp",
+	MAME_DIR .. "src/mame/drivers/luckgrln.cpp",
+	MAME_DIR .. "src/mame/drivers/magic10.cpp",
+	MAME_DIR .. "src/mame/drivers/magicard.cpp",
+	MAME_DIR .. "src/mame/drivers/magicfly.cpp",
+	MAME_DIR .. "src/mame/drivers/magictg.cpp",
+	MAME_DIR .. "src/mame/drivers/magtouch.cpp",
+	MAME_DIR .. "src/mame/drivers/majorpkr.cpp",
+	MAME_DIR .. "src/mame/drivers/malzak.cpp",
+	MAME_DIR .. "src/mame/video/malzak.cpp",
+	MAME_DIR .. "src/mame/drivers/manohman.cpp",
+	MAME_DIR .. "src/mame/drivers/mcatadv.cpp",
+	MAME_DIR .. "src/mame/video/mcatadv.cpp",
+	MAME_DIR .. "src/mame/drivers/mgavegas.cpp",
+	MAME_DIR .. "src/mame/drivers/meyc8080.cpp",
+	MAME_DIR .. "src/mame/drivers/meyc8088.cpp",
+	MAME_DIR .. "src/mame/drivers/micro3d.cpp",
+	MAME_DIR .. "src/mame/machine/micro3d.cpp",
+	MAME_DIR .. "src/mame/video/micro3d.cpp",
+	MAME_DIR .. "src/mame/audio/micro3d.cpp",
+	MAME_DIR .. "src/mame/drivers/midas.cpp",
+	MAME_DIR .. "src/mame/drivers/miniboy7.cpp",
+	MAME_DIR .. "src/mame/drivers/mirax.cpp",
+	MAME_DIR .. "src/mame/drivers/mole.cpp",
+	MAME_DIR .. "src/mame/drivers/mosaic.cpp",
+	MAME_DIR .. "src/mame/video/mosaic.cpp",
+	MAME_DIR .. "src/mame/drivers/mpu12wbk.cpp",
+	MAME_DIR .. "src/mame/drivers/mrjong.cpp",
+	MAME_DIR .. "src/mame/video/mrjong.cpp",
+	MAME_DIR .. "src/mame/drivers/multfish.cpp",
+	MAME_DIR .. "src/mame/drivers/multfish_boot.cpp",
+	MAME_DIR .. "src/mame/drivers/multfish_ref.cpp",
+	MAME_DIR .. "src/mame/drivers/murogem.cpp",
+	MAME_DIR .. "src/mame/drivers/murogmbl.cpp",
+	MAME_DIR .. "src/mame/drivers/neoprint.cpp",
+	MAME_DIR .. "src/mame/drivers/neptunp2.cpp",
+	MAME_DIR .. "src/mame/drivers/news.cpp",
+	MAME_DIR .. "src/mame/video/news.cpp",
+	MAME_DIR .. "src/mame/drivers/nexus3d.cpp",
+	MAME_DIR .. "src/mame/drivers/norautp.cpp",
+	MAME_DIR .. "src/mame/audio/norautp.cpp",
+	MAME_DIR .. "src/mame/drivers/nsmpoker.cpp",
+	MAME_DIR .. "src/mame/drivers/oneshot.cpp",
+	MAME_DIR .. "src/mame/video/oneshot.cpp",
+	MAME_DIR .. "src/mame/drivers/onetwo.cpp",
+	MAME_DIR .. "src/mame/drivers/othello.cpp",
+	MAME_DIR .. "src/mame/drivers/pachifev.cpp",
+	MAME_DIR .. "src/mame/drivers/pasha2.cpp",
+	MAME_DIR .. "src/mame/drivers/pass.cpp",
+	MAME_DIR .. "src/mame/video/pass.cpp",
+	MAME_DIR .. "src/mame/drivers/peplus.cpp",
+	MAME_DIR .. "src/mame/drivers/photon.cpp",
+	MAME_DIR .. "src/mame/drivers/piggypas.cpp",
+	MAME_DIR .. "src/mame/video/pk8000.cpp",
+	MAME_DIR .. "src/mame/drivers/photon2.cpp",
+	MAME_DIR .. "src/mame/drivers/photoply.cpp",
+	MAME_DIR .. "src/mame/drivers/pinkiri8.cpp",
+	MAME_DIR .. "src/mame/drivers/pipeline.cpp",
+	MAME_DIR .. "src/mame/drivers/pkscram.cpp",
+	MAME_DIR .. "src/mame/drivers/pntnpuzl.cpp",
+	MAME_DIR .. "src/mame/drivers/policetr.cpp",
+	MAME_DIR .. "src/mame/video/policetr.cpp",
+	MAME_DIR .. "src/mame/drivers/polyplay.cpp",
+	MAME_DIR .. "src/mame/audio/polyplay.cpp",
+	MAME_DIR .. "src/mame/video/polyplay.cpp",
+	MAME_DIR .. "src/mame/drivers/poker72.cpp",
+	MAME_DIR .. "src/mame/drivers/potgoldu.cpp",
+	MAME_DIR .. "src/mame/drivers/proconn.cpp",
+	MAME_DIR .. "src/mame/drivers/psattack.cpp",
+	MAME_DIR .. "src/mame/drivers/pse.cpp",
+	MAME_DIR .. "src/mame/drivers/quizo.cpp",
+	MAME_DIR .. "src/mame/drivers/quizpun2.cpp",
+	MAME_DIR .. "src/mame/drivers/rbmk.cpp",
+	MAME_DIR .. "src/mame/drivers/rcorsair.cpp",
+	MAME_DIR .. "src/mame/drivers/re900.cpp",
+	MAME_DIR .. "src/mame/drivers/rgum.cpp",
+	MAME_DIR .. "src/mame/drivers/roul.cpp",
+	MAME_DIR .. "src/mame/drivers/savquest.cpp",
+	MAME_DIR .. "src/mame/drivers/sanremo.cpp",
+	MAME_DIR .. "src/mame/drivers/sealy.cpp",
+	MAME_DIR .. "src/mame/drivers/sfbonus.cpp",
+	MAME_DIR .. "src/mame/drivers/shangkid.cpp",
+	MAME_DIR .. "src/mame/video/shangkid.cpp",
+	MAME_DIR .. "src/mame/drivers/skeetsht.cpp",
+	MAME_DIR .. "src/mame/drivers/skimaxx.cpp",
+	MAME_DIR .. "src/mame/drivers/skyarmy.cpp",
+	MAME_DIR .. "src/mame/drivers/skylncr.cpp",
+	MAME_DIR .. "src/mame/drivers/sliver.cpp",
+	MAME_DIR .. "src/mame/drivers/slotcarn.cpp",
+	MAME_DIR .. "src/mame/drivers/smsmcorp.cpp",
+	MAME_DIR .. "src/mame/drivers/sothello.cpp",
+	MAME_DIR .. "src/mame/drivers/splus.cpp",
+	MAME_DIR .. "src/mame/drivers/spool99.cpp",
+	MAME_DIR .. "src/mame/drivers/sprcros2.cpp",
+	MAME_DIR .. "src/mame/video/sprcros2.cpp",
+	MAME_DIR .. "src/mame/drivers/sshot.cpp",
+	MAME_DIR .. "src/mame/drivers/ssingles.cpp",
+	MAME_DIR .. "src/mame/drivers/sstrangr.cpp",
+	MAME_DIR .. "src/mame/drivers/statriv2.cpp",
+	MAME_DIR .. "src/mame/drivers/stellafr.cpp",
+	MAME_DIR .. "src/mame/drivers/stuntair.cpp",
+	MAME_DIR .. "src/mame/drivers/su2000.cpp",
+	MAME_DIR .. "src/mame/drivers/subhuntr.cpp",
+	MAME_DIR .. "src/mame/drivers/summit.cpp",
+	MAME_DIR .. "src/mame/drivers/sumt8035.cpp",
+	MAME_DIR .. "src/mame/drivers/supercrd.cpp",
+	MAME_DIR .. "src/mame/drivers/supertnk.cpp",
+	MAME_DIR .. "src/mame/drivers/superwng.cpp",
+	MAME_DIR .. "src/mame/drivers/tapatune.cpp",
+	MAME_DIR .. "src/mame/drivers/tattack.cpp",
+	MAME_DIR .. "src/mame/drivers/taxidriv.cpp",
+	MAME_DIR .. "src/mame/video/taxidriv.cpp",
+	MAME_DIR .. "src/mame/drivers/tcl.cpp",
+	MAME_DIR .. "src/mame/drivers/thayers.cpp",
+	MAME_DIR .. "src/mame/drivers/thedeep.cpp",
+	MAME_DIR .. "src/mame/video/thedeep.cpp",
+	MAME_DIR .. "src/mame/drivers/tiamc1.cpp",
+	MAME_DIR .. "src/mame/video/tiamc1.cpp",
+	MAME_DIR .. "src/mame/audio/tiamc1.cpp",
+	MAME_DIR .. "src/mame/drivers/tickee.cpp",
+	MAME_DIR .. "src/mame/drivers/tmspoker.cpp",
+	MAME_DIR .. "src/mame/drivers/truco.cpp",
+	MAME_DIR .. "src/mame/video/truco.cpp",
+	MAME_DIR .. "src/mame/drivers/trucocl.cpp",
+	MAME_DIR .. "src/mame/video/trucocl.cpp",
+	MAME_DIR .. "src/mame/drivers/trvmadns.cpp",
+	MAME_DIR .. "src/mame/drivers/trvquest.cpp",
+	MAME_DIR .. "src/mame/drivers/ttchamp.cpp",
+	MAME_DIR .. "src/mame/drivers/tugboat.cpp",
+	MAME_DIR .. "src/mame/drivers/umipoker.cpp",
+	MAME_DIR .. "src/mame/drivers/unkfr.cpp",
+	MAME_DIR .. "src/mame/drivers/unkhorse.cpp",
+	MAME_DIR .. "src/mame/drivers/usgames.cpp",
+	MAME_DIR .. "src/mame/video/usgames.cpp",
+	MAME_DIR .. "src/mame/drivers/vamphalf.cpp",
+	MAME_DIR .. "src/mame/drivers/vcombat.cpp",
+	MAME_DIR .. "src/mame/drivers/vectrex.cpp",
+	MAME_DIR .. "src/mame/video/vectrex.cpp",
+	MAME_DIR .. "src/mame/machine/vectrex.cpp",
+	MAME_DIR .. "src/mame/drivers/videopkr.cpp",
+	MAME_DIR .. "src/mame/drivers/vlc.cpp",
+	MAME_DIR .. "src/mame/drivers/voyager.cpp",
+	MAME_DIR .. "src/mame/drivers/vp101.cpp",
+	MAME_DIR .. "src/mame/drivers/vpoker.cpp",
+	MAME_DIR .. "src/mame/drivers/vroulet.cpp",
+	MAME_DIR .. "src/mame/drivers/wildpkr.cpp",
+	MAME_DIR .. "src/mame/drivers/wms.cpp",
+	MAME_DIR .. "src/mame/drivers/wacky_gator.cpp",
+	MAME_DIR .. "src/mame/drivers/xtom3d.cpp",
+	MAME_DIR .. "src/mame/drivers/xyonix.cpp",
+	MAME_DIR .. "src/mame/video/xyonix.cpp",
 }
 end
 
diff --git a/scripts/target/mame/dummy.lua b/scripts/target/mame/dummy.lua
index be09e5f97cd..9b86a52633d 100644
--- a/scripts/target/mame/dummy.lua
+++ b/scripts/target/mame/dummy.lua
@@ -34,8 +34,8 @@ function createProjects_mame_dummy(_target, _subtarget)
 	}
 
 	files{
-		MAME_DIR .. "src/mame/drivers/coleco.c",
-		MAME_DIR .. "src/mame/machine/coleco.c",
+		MAME_DIR .. "src/mame/drivers/coleco.cpp",
+		MAME_DIR .. "src/mame/machine/coleco.cpp",
 	}
 end
 
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 61872202e6e..c6816a22b1c 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -925,72 +925,72 @@ function createProjects_mame_mess(_target, _subtarget)
 if (_subtarget=="mess") then
 createMESSProjects(_target, _subtarget, "mameshared")
 files {
-	MAME_DIR .. "src/mame/machine/archimds.c",
-	MAME_DIR .. "src/mame/video/archimds.c",
-	MAME_DIR .. "src/mame/machine/amiga.c",
-	MAME_DIR .. "src/mame/video/amiga.c",
-	MAME_DIR .. "src/mame/video/amigaaga.c",
-	MAME_DIR .. "src/mame/video/tia.c",
-	MAME_DIR .. "src/mame/machine/atari.c",
-	MAME_DIR .. "src/mame/video/atari.c",
-	MAME_DIR .. "src/mame/video/antic.c",
-	MAME_DIR .. "src/mame/video/gtia.c",
-	MAME_DIR .. "src/mame/drivers/jaguar.c",
-	MAME_DIR .. "src/mame/audio/jaguar.c",
-	MAME_DIR .. "src/mame/video/jaguar.c",
-	MAME_DIR .. "src/mame/audio/gorf.c",
-	MAME_DIR .. "src/mame/audio/wow.c",
-	MAME_DIR .. "src/mame/drivers/astrocde.c",
-	MAME_DIR .. "src/mame/video/astrocde.c",
-	MAME_DIR .. "src/mame/machine/kabuki.c",
-	MAME_DIR .. "src/mame/video/pk8000.c",
-	MAME_DIR .. "src/mame/video/ppu2c0x.c",
-	MAME_DIR .. "src/mame/machine/snes.c",
-	MAME_DIR .. "src/mame/audio/snes_snd.c",
-	MAME_DIR .. "src/mame/machine/n64.c",
-	MAME_DIR .. "src/mame/video/n64.c",
-	MAME_DIR .. "src/mame/video/rdpblend.c",
-	MAME_DIR .. "src/mame/video/rdptpipe.c",
-	MAME_DIR .. "src/mame/machine/megadriv.c",
-	MAME_DIR .. "src/mame/drivers/naomi.c",
-	MAME_DIR .. "src/mame/machine/awboard.c",
-	MAME_DIR .. "src/mame/machine/dc.c",
-	MAME_DIR .. "src/mame/machine/dc-ctrl.c",
-	MAME_DIR .. "src/mame/machine/gdrom.c",
-	MAME_DIR .. "src/mame/machine/jvs13551.c",
-	MAME_DIR .. "src/mame/machine/maple-dc.c",
-	MAME_DIR .. "src/mame/machine/mapledev.c",
-	MAME_DIR .. "src/mame/machine/mie.c",
-	MAME_DIR .. "src/mame/machine/naomi.c",
-	MAME_DIR .. "src/mame/machine/naomibd.c",
-	MAME_DIR .. "src/mame/machine/naomig1.c",
-	MAME_DIR .. "src/mame/machine/naomigd.c",
-	MAME_DIR .. "src/mame/machine/naomim1.c",
-	MAME_DIR .. "src/mame/machine/naomim2.c",
-	MAME_DIR .. "src/mame/machine/naomim4.c",
-	MAME_DIR .. "src/mame/machine/naomirom.c",
-	MAME_DIR .. "src/mame/machine/315-5881_crypt.c",
-	MAME_DIR .. "src/mame/video/powervr2.c",
-	MAME_DIR .. "src/mame/drivers/neogeo.c",
-	MAME_DIR .. "src/mame/machine/neocrypt.c",
-	MAME_DIR .. "src/mame/machine/ng_memcard.c",
-	MAME_DIR .. "src/mame/video/neogeo.c",
-	MAME_DIR .. "src/mame/video/neogeo_spr.c",
-	MAME_DIR .. "src/mame/drivers/cdi.c",
-	MAME_DIR .. "src/mame/machine/cdi070.c",
-	MAME_DIR .. "src/mame/machine/cdicdic.c",
-	MAME_DIR .. "src/mame/machine/cdislave.c",
-	MAME_DIR .. "src/mame/video/mcd212.c",
-	MAME_DIR .. "src/mame/drivers/3do.c",
-	MAME_DIR .. "src/mame/machine/3do.c",
-	MAME_DIR .. "src/mame/drivers/konamim2.c",
-	MAME_DIR .. "src/mame/drivers/vectrex.c",
-	MAME_DIR .. "src/mame/machine/vectrex.c",
-	MAME_DIR .. "src/mame/video/vectrex.c",
-	MAME_DIR .. "src/mame/drivers/cps1.c",
-	MAME_DIR .. "src/mame/video/cps1.c",
-	MAME_DIR .. "src/mame/video/chihiro.c",
-	MAME_DIR .. "src/mame/machine/xbox.c",
+	MAME_DIR .. "src/mame/machine/archimds.cpp",
+	MAME_DIR .. "src/mame/video/archimds.cpp",
+	MAME_DIR .. "src/mame/machine/amiga.cpp",
+	MAME_DIR .. "src/mame/video/amiga.cpp",
+	MAME_DIR .. "src/mame/video/amigaaga.cpp",
+	MAME_DIR .. "src/mame/video/tia.cpp",
+	MAME_DIR .. "src/mame/machine/atari.cpp",
+	MAME_DIR .. "src/mame/video/atari.cpp",
+	MAME_DIR .. "src/mame/video/antic.cpp",
+	MAME_DIR .. "src/mame/video/gtia.cpp",
+	MAME_DIR .. "src/mame/drivers/jaguar.cpp",
+	MAME_DIR .. "src/mame/audio/jaguar.cpp",
+	MAME_DIR .. "src/mame/video/jaguar.cpp",
+	MAME_DIR .. "src/mame/audio/gorf.cpp",
+	MAME_DIR .. "src/mame/audio/wow.cpp",
+	MAME_DIR .. "src/mame/drivers/astrocde.cpp",
+	MAME_DIR .. "src/mame/video/astrocde.cpp",
+	MAME_DIR .. "src/mame/machine/kabuki.cpp",
+	MAME_DIR .. "src/mame/video/pk8000.cpp",
+	MAME_DIR .. "src/mame/video/ppu2c0x.cpp",
+	MAME_DIR .. "src/mame/machine/snes.cpp",
+	MAME_DIR .. "src/mame/audio/snes_snd.cpp",
+	MAME_DIR .. "src/mame/machine/n64.cpp",
+	MAME_DIR .. "src/mame/video/n64.cpp",
+	MAME_DIR .. "src/mame/video/rdpblend.cpp",
+	MAME_DIR .. "src/mame/video/rdptpipe.cpp",
+	MAME_DIR .. "src/mame/machine/megadriv.cpp",
+	MAME_DIR .. "src/mame/drivers/naomi.cpp",
+	MAME_DIR .. "src/mame/machine/awboard.cpp",
+	MAME_DIR .. "src/mame/machine/dc.cpp",
+	MAME_DIR .. "src/mame/machine/dc-ctrl.cpp",
+	MAME_DIR .. "src/mame/machine/gdrom.cpp",
+	MAME_DIR .. "src/mame/machine/jvs13551.cpp",
+	MAME_DIR .. "src/mame/machine/maple-dc.cpp",
+	MAME_DIR .. "src/mame/machine/mapledev.cpp",
+	MAME_DIR .. "src/mame/machine/mie.cpp",
+	MAME_DIR .. "src/mame/machine/naomi.cpp",
+	MAME_DIR .. "src/mame/machine/naomibd.cpp",
+	MAME_DIR .. "src/mame/machine/naomig1.cpp",
+	MAME_DIR .. "src/mame/machine/naomigd.cpp",
+	MAME_DIR .. "src/mame/machine/naomim1.cpp",
+	MAME_DIR .. "src/mame/machine/naomim2.cpp",
+	MAME_DIR .. "src/mame/machine/naomim4.cpp",
+	MAME_DIR .. "src/mame/machine/naomirom.cpp",
+	MAME_DIR .. "src/mame/machine/315-5881_crypt.cpp",
+	MAME_DIR .. "src/mame/video/powervr2.cpp",
+	MAME_DIR .. "src/mame/drivers/neogeo.cpp",
+	MAME_DIR .. "src/mame/machine/neocrypt.cpp",
+	MAME_DIR .. "src/mame/machine/ng_memcard.cpp",
+	MAME_DIR .. "src/mame/video/neogeo.cpp",
+	MAME_DIR .. "src/mame/video/neogeo_spr.cpp",
+	MAME_DIR .. "src/mame/drivers/cdi.cpp",
+	MAME_DIR .. "src/mame/machine/cdi070.cpp",
+	MAME_DIR .. "src/mame/machine/cdicdic.cpp",
+	MAME_DIR .. "src/mame/machine/cdislave.cpp",
+	MAME_DIR .. "src/mame/video/mcd212.cpp",
+	MAME_DIR .. "src/mame/drivers/3do.cpp",
+	MAME_DIR .. "src/mame/machine/3do.cpp",
+	MAME_DIR .. "src/mame/drivers/konamim2.cpp",
+	MAME_DIR .. "src/mame/drivers/vectrex.cpp",
+	MAME_DIR .. "src/mame/machine/vectrex.cpp",
+	MAME_DIR .. "src/mame/video/vectrex.cpp",
+	MAME_DIR .. "src/mame/drivers/cps1.cpp",
+	MAME_DIR .. "src/mame/video/cps1.cpp",
+	MAME_DIR .. "src/mame/video/chihiro.cpp",
+	MAME_DIR .. "src/mame/machine/xbox.cpp",
 }
 end
 --------------------------------------------------
@@ -999,14 +999,14 @@ end
 --------------------------------------------------
 createMESSProjects(_target, _subtarget, "messshared")
 files {
-	MAME_DIR .. "src/mame/audio/mea8000.c",
-	MAME_DIR .. "src/mame/machine/appldriv.c",
-	MAME_DIR .. "src/mame/machine/applefdc.c",
-	MAME_DIR .. "src/mame/machine/microdrv.c",
-	MAME_DIR .. "src/mame/machine/smartmed.c",
-	MAME_DIR .. "src/mame/machine/sonydriv.c",
-	MAME_DIR .. "src/mame/machine/teleprinter.c",
-	MAME_DIR .. "src/mame/machine/z80bin.c",
+	MAME_DIR .. "src/mame/audio/mea8000.cpp",
+	MAME_DIR .. "src/mame/machine/appldriv.cpp",
+	MAME_DIR .. "src/mame/machine/applefdc.cpp",
+	MAME_DIR .. "src/mame/machine/microdrv.cpp",
+	MAME_DIR .. "src/mame/machine/smartmed.cpp",
+	MAME_DIR .. "src/mame/machine/sonydriv.cpp",
+	MAME_DIR .. "src/mame/machine/teleprinter.cpp",
+	MAME_DIR .. "src/mame/machine/z80bin.cpp",
 }
 --------------------------------------------------
 -- manufacturer-specific groupings for drivers
@@ -1014,1584 +1014,1584 @@ files {
 
 createMESSProjects(_target, _subtarget, "acorn")
 files {
-	MAME_DIR .. "src/mame/drivers/a310.c",
-	MAME_DIR .. "src/mame/drivers/a6809.c",
-	MAME_DIR .. "src/mame/drivers/acrnsys1.c",
-	MAME_DIR .. "src/mame/drivers/atom.c",
-	MAME_DIR .. "src/mame/drivers/bbc.c",
-	MAME_DIR .. "src/mame/machine/bbc.c",
-	MAME_DIR .. "src/mame/video/bbc.c",
-	MAME_DIR .. "src/mame/drivers/bbcbc.c",
-	MAME_DIR .. "src/mame/drivers/electron.c",
-	MAME_DIR .. "src/mame/machine/electron.c",
-	MAME_DIR .. "src/mame/video/electron.c",
-	MAME_DIR .. "src/mame/drivers/riscpc.c",
-	MAME_DIR .. "src/mame/drivers/z88.c",
-	MAME_DIR .. "src/mame/machine/upd65031.c",
-	MAME_DIR .. "src/mame/video/z88.c",
+	MAME_DIR .. "src/mame/drivers/a310.cpp",
+	MAME_DIR .. "src/mame/drivers/a6809.cpp",
+	MAME_DIR .. "src/mame/drivers/acrnsys1.cpp",
+	MAME_DIR .. "src/mame/drivers/atom.cpp",
+	MAME_DIR .. "src/mame/drivers/bbc.cpp",
+	MAME_DIR .. "src/mame/machine/bbc.cpp",
+	MAME_DIR .. "src/mame/video/bbc.cpp",
+	MAME_DIR .. "src/mame/drivers/bbcbc.cpp",
+	MAME_DIR .. "src/mame/drivers/electron.cpp",
+	MAME_DIR .. "src/mame/machine/electron.cpp",
+	MAME_DIR .. "src/mame/video/electron.cpp",
+	MAME_DIR .. "src/mame/drivers/riscpc.cpp",
+	MAME_DIR .. "src/mame/drivers/z88.cpp",
+	MAME_DIR .. "src/mame/machine/upd65031.cpp",
+	MAME_DIR .. "src/mame/video/z88.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "act")
 files {
-	MAME_DIR .. "src/mame/drivers/apricot.c",
-	MAME_DIR .. "src/mame/drivers/apricotf.c",
-	MAME_DIR .. "src/mame/drivers/apricotp.c",
-	MAME_DIR .. "src/mame/machine/apricotkb.c",
-	MAME_DIR .. "src/mame/machine/apricotkb_hle.c",
-	MAME_DIR .. "src/mame/drivers/victor9k.c",
-	MAME_DIR .. "src/mame/machine/victor9kb.c",
-	MAME_DIR .. "src/mame/machine/victor9k_fdc.c",
+	MAME_DIR .. "src/mame/drivers/apricot.cpp",
+	MAME_DIR .. "src/mame/drivers/apricotf.cpp",
+	MAME_DIR .. "src/mame/drivers/apricotp.cpp",
+	MAME_DIR .. "src/mame/machine/apricotkb.cpp",
+	MAME_DIR .. "src/mame/machine/apricotkb_hle.cpp",
+	MAME_DIR .. "src/mame/drivers/victor9k.cpp",
+	MAME_DIR .. "src/mame/machine/victor9kb.cpp",
+	MAME_DIR .. "src/mame/machine/victor9k_fdc.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "adc")
 files {
-	MAME_DIR .. "src/mame/drivers/super6.c",
-	MAME_DIR .. "src/mame/drivers/superslave.c",
+	MAME_DIR .. "src/mame/drivers/super6.cpp",
+	MAME_DIR .. "src/mame/drivers/superslave.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "alesis")
 files {
-	MAME_DIR .. "src/mame/drivers/alesis.c",
-	MAME_DIR .. "src/mame/audio/alesis.c",
-	MAME_DIR .. "src/mame/video/alesis.c",
+	MAME_DIR .. "src/mame/drivers/alesis.cpp",
+	MAME_DIR .. "src/mame/audio/alesis.cpp",
+	MAME_DIR .. "src/mame/video/alesis.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "altos")
 files {
-	MAME_DIR .. "src/mame/drivers/altos5.c",
+	MAME_DIR .. "src/mame/drivers/altos5.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "amiga")
 files {
-	MAME_DIR .. "src/mame/drivers/amiga.c",
-	MAME_DIR .. "src/mame/machine/amigakbd.c",
+	MAME_DIR .. "src/mame/drivers/amiga.cpp",
+	MAME_DIR .. "src/mame/machine/amigakbd.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "amstrad")
 files {
-	MAME_DIR .. "src/mame/drivers/amstrad.c",
-	MAME_DIR .. "src/mame/machine/amstrad.c",
-	MAME_DIR .. "src/mame/drivers/amstr_pc.c",
-	MAME_DIR .. "src/mame/drivers/nc.c",
-	MAME_DIR .. "src/mame/machine/nc.c",
-	MAME_DIR .. "src/mame/video/nc.c",
-	MAME_DIR .. "src/mame/drivers/pc1512.c",
-	MAME_DIR .. "src/mame/machine/pc1512kb.c",
-	MAME_DIR .. "src/mame/video/pc1512.c",
-	MAME_DIR .. "src/mame/drivers/pcw.c",
-	MAME_DIR .. "src/mame/video/pcw.c",
-	MAME_DIR .. "src/mame/drivers/pcw16.c",
-	MAME_DIR .. "src/mame/video/pcw16.c",
-	MAME_DIR .. "src/mame/drivers/pda600.c",
+	MAME_DIR .. "src/mame/drivers/amstrad.cpp",
+	MAME_DIR .. "src/mame/machine/amstrad.cpp",
+	MAME_DIR .. "src/mame/drivers/amstr_pc.cpp",
+	MAME_DIR .. "src/mame/drivers/nc.cpp",
+	MAME_DIR .. "src/mame/machine/nc.cpp",
+	MAME_DIR .. "src/mame/video/nc.cpp",
+	MAME_DIR .. "src/mame/drivers/pc1512.cpp",
+	MAME_DIR .. "src/mame/machine/pc1512kb.cpp",
+	MAME_DIR .. "src/mame/video/pc1512.cpp",
+	MAME_DIR .. "src/mame/drivers/pcw.cpp",
+	MAME_DIR .. "src/mame/video/pcw.cpp",
+	MAME_DIR .. "src/mame/drivers/pcw16.cpp",
+	MAME_DIR .. "src/mame/video/pcw16.cpp",
+	MAME_DIR .. "src/mame/drivers/pda600.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "apf")
 files {
-	MAME_DIR .. "src/mame/drivers/apf.c",
+	MAME_DIR .. "src/mame/drivers/apf.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "apollo")
 files {
-	MAME_DIR .. "src/mame/drivers/apollo.c",
-	MAME_DIR .. "src/mame/machine/apollo.c",
-	MAME_DIR .. "src/mame/machine/apollo_dbg.c",
-	MAME_DIR .. "src/mame/machine/apollo_kbd.c",
-	MAME_DIR .. "src/mame/video/apollo.c",
+	MAME_DIR .. "src/mame/drivers/apollo.cpp",
+	MAME_DIR .. "src/mame/machine/apollo.cpp",
+	MAME_DIR .. "src/mame/machine/apollo_dbg.cpp",
+	MAME_DIR .. "src/mame/machine/apollo_kbd.cpp",
+	MAME_DIR .. "src/mame/video/apollo.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "apple")
 files {
-	MAME_DIR .. "src/mame/drivers/apple1.c",
-	MAME_DIR .. "src/mame/machine/apple1.c",
-	MAME_DIR .. "src/mame/video/apple1.c",
-	MAME_DIR .. "src/mame/drivers/apple2.c",
-	MAME_DIR .. "src/mame/drivers/apple2e.c",
-	MAME_DIR .. "src/mame/machine/apple2.c",
-	MAME_DIR .. "src/mame/video/apple2.c",
-	MAME_DIR .. "src/mame/drivers/tk2000.c",
-	MAME_DIR .. "src/mame/drivers/apple2gs.c",
-	MAME_DIR .. "src/mame/machine/apple2gs.c",
-	MAME_DIR .. "src/mame/video/apple2gs.c",
-	MAME_DIR .. "src/mame/drivers/apple3.c",
-	MAME_DIR .. "src/mame/machine/apple3.c",
-	MAME_DIR .. "src/mame/video/apple3.c",
-	MAME_DIR .. "src/mame/drivers/lisa.c",
-	MAME_DIR .. "src/mame/machine/lisa.c",
-	MAME_DIR .. "src/mame/drivers/mac.c",
-	MAME_DIR .. "src/mame/audio/mac.c",
-	MAME_DIR .. "src/mame/machine/egret.c",
-	MAME_DIR .. "src/mame/machine/mac.c",
-	MAME_DIR .. "src/mame/machine/macadb.c",
-	MAME_DIR .. "src/mame/machine/macrtc.c",
-	MAME_DIR .. "src/mame/machine/mackbd.c",
-	MAME_DIR .. "src/mame/machine/swim.c",
-	MAME_DIR .. "src/mame/video/mac.c",
-	MAME_DIR .. "src/mame/drivers/macpci.c",
-	MAME_DIR .. "src/mame/machine/macpci.c",
-	MAME_DIR .. "src/mame/machine/cuda.c",
+	MAME_DIR .. "src/mame/drivers/apple1.cpp",
+	MAME_DIR .. "src/mame/machine/apple1.cpp",
+	MAME_DIR .. "src/mame/video/apple1.cpp",
+	MAME_DIR .. "src/mame/drivers/apple2.cpp",
+	MAME_DIR .. "src/mame/drivers/apple2e.cpp",
+	MAME_DIR .. "src/mame/machine/apple2.cpp",
+	MAME_DIR .. "src/mame/video/apple2.cpp",
+	MAME_DIR .. "src/mame/drivers/tk2000.cpp",
+	MAME_DIR .. "src/mame/drivers/apple2gs.cpp",
+	MAME_DIR .. "src/mame/machine/apple2gs.cpp",
+	MAME_DIR .. "src/mame/video/apple2gs.cpp",
+	MAME_DIR .. "src/mame/drivers/apple3.cpp",
+	MAME_DIR .. "src/mame/machine/apple3.cpp",
+	MAME_DIR .. "src/mame/video/apple3.cpp",
+	MAME_DIR .. "src/mame/drivers/lisa.cpp",
+	MAME_DIR .. "src/mame/machine/lisa.cpp",
+	MAME_DIR .. "src/mame/drivers/mac.cpp",
+	MAME_DIR .. "src/mame/audio/mac.cpp",
+	MAME_DIR .. "src/mame/machine/egret.cpp",
+	MAME_DIR .. "src/mame/machine/mac.cpp",
+	MAME_DIR .. "src/mame/machine/macadb.cpp",
+	MAME_DIR .. "src/mame/machine/macrtc.cpp",
+	MAME_DIR .. "src/mame/machine/mackbd.cpp",
+	MAME_DIR .. "src/mame/machine/swim.cpp",
+	MAME_DIR .. "src/mame/video/mac.cpp",
+	MAME_DIR .. "src/mame/drivers/macpci.cpp",
+	MAME_DIR .. "src/mame/machine/macpci.cpp",
+	MAME_DIR .. "src/mame/machine/cuda.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "applied")
 files {
-	MAME_DIR .. "src/mame/drivers/mbee.c",
-	MAME_DIR .. "src/mame/machine/mbee.c",
-	MAME_DIR .. "src/mame/video/mbee.c",
+	MAME_DIR .. "src/mame/drivers/mbee.cpp",
+	MAME_DIR .. "src/mame/machine/mbee.cpp",
+	MAME_DIR .. "src/mame/video/mbee.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "arcadia")
 files {
-	MAME_DIR .. "src/mame/drivers/arcadia.c",
-	MAME_DIR .. "src/mame/audio/arcadia.c",
-	MAME_DIR .. "src/mame/video/arcadia.c",
+	MAME_DIR .. "src/mame/drivers/arcadia.cpp",
+	MAME_DIR .. "src/mame/audio/arcadia.cpp",
+	MAME_DIR .. "src/mame/video/arcadia.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "ascii")
 files {
-	MAME_DIR .. "src/mame/drivers/msx.c",
-	MAME_DIR .. "src/mame/machine/msx.c",
-	MAME_DIR .. "src/mame/machine/msx_matsushita.c",
-	MAME_DIR .. "src/mame/machine/msx_s1985.c",
-	MAME_DIR .. "src/mame/machine/msx_switched.c",
-	MAME_DIR .. "src/mame/machine/msx_systemflags.c",
+	MAME_DIR .. "src/mame/drivers/msx.cpp",
+	MAME_DIR .. "src/mame/machine/msx.cpp",
+	MAME_DIR .. "src/mame/machine/msx_matsushita.cpp",
+	MAME_DIR .. "src/mame/machine/msx_s1985.cpp",
+	MAME_DIR .. "src/mame/machine/msx_switched.cpp",
+	MAME_DIR .. "src/mame/machine/msx_systemflags.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "at")
 files {
-	MAME_DIR .. "src/mame/drivers/at.c",
-	MAME_DIR .. "src/mame/machine/at.c",
-	MAME_DIR .. "src/mame/drivers/ct486.c",
+	MAME_DIR .. "src/mame/drivers/at.cpp",
+	MAME_DIR .. "src/mame/machine/at.cpp",
+	MAME_DIR .. "src/mame/drivers/ct486.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "atari")
 files {
-	MAME_DIR .. "src/mame/drivers/a2600.c",
-	MAME_DIR .. "src/mame/drivers/a7800.c",
-	MAME_DIR .. "src/mame/video/maria.c",
-	MAME_DIR .. "src/mame/drivers/atari400.c",
-	MAME_DIR .. "src/mame/machine/atarifdc.c",
-	MAME_DIR .. "src/mame/drivers/atarist.c",
-	MAME_DIR .. "src/mame/video/atarist.c",
-	MAME_DIR .. "src/mame/drivers/lynx.c",
-	MAME_DIR .. "src/mame/audio/lynx.c",
-	MAME_DIR .. "src/mame/machine/lynx.c",
-	MAME_DIR .. "src/mame/drivers/portfoli.c",
+	MAME_DIR .. "src/mame/drivers/a2600.cpp",
+	MAME_DIR .. "src/mame/drivers/a7800.cpp",
+	MAME_DIR .. "src/mame/video/maria.cpp",
+	MAME_DIR .. "src/mame/drivers/atari400.cpp",
+	MAME_DIR .. "src/mame/machine/atarifdc.cpp",
+	MAME_DIR .. "src/mame/drivers/atarist.cpp",
+	MAME_DIR .. "src/mame/video/atarist.cpp",
+	MAME_DIR .. "src/mame/drivers/lynx.cpp",
+	MAME_DIR .. "src/mame/audio/lynx.cpp",
+	MAME_DIR .. "src/mame/machine/lynx.cpp",
+	MAME_DIR .. "src/mame/drivers/portfoli.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "att")
 files {
-	MAME_DIR .. "src/mame/drivers/unixpc.c",
+	MAME_DIR .. "src/mame/drivers/unixpc.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "bally")
 files {
-	MAME_DIR .. "src/mame/drivers/astrohome.c",
+	MAME_DIR .. "src/mame/drivers/astrohome.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "banctec")
 files {
-	MAME_DIR .. "src/mame/drivers/banctec.c",
+	MAME_DIR .. "src/mame/drivers/banctec.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "bandai")
 files {
-	MAME_DIR .. "src/mame/drivers/sv8000.c",
-	MAME_DIR .. "src/mame/drivers/rx78.c",
-	MAME_DIR .. "src/mame/drivers/tamag1.c",
-	MAME_DIR .. "src/mame/drivers/wswan.c",
-	MAME_DIR .. "src/mame/audio/wswan_snd.c",
-	MAME_DIR .. "src/mame/machine/wswan.c",
-	MAME_DIR .. "src/mame/video/wswan_video.c",
+	MAME_DIR .. "src/mame/drivers/sv8000.cpp",
+	MAME_DIR .. "src/mame/drivers/rx78.cpp",
+	MAME_DIR .. "src/mame/drivers/tamag1.cpp",
+	MAME_DIR .. "src/mame/drivers/wswan.cpp",
+	MAME_DIR .. "src/mame/audio/wswan_snd.cpp",
+	MAME_DIR .. "src/mame/machine/wswan.cpp",
+	MAME_DIR .. "src/mame/video/wswan_video.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "be")
 files {
-	MAME_DIR .. "src/mame/drivers/bebox.c",
-	MAME_DIR .. "src/mame/machine/bebox.c",
+	MAME_DIR .. "src/mame/drivers/bebox.cpp",
+	MAME_DIR .. "src/mame/machine/bebox.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "bnpo")
 files {
-	MAME_DIR .. "src/mame/drivers/b2m.c",
-	MAME_DIR .. "src/mame/machine/b2m.c",
-	MAME_DIR .. "src/mame/video/b2m.c",
+	MAME_DIR .. "src/mame/drivers/b2m.cpp",
+	MAME_DIR .. "src/mame/machine/b2m.cpp",
+	MAME_DIR .. "src/mame/video/b2m.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "bondwell")
 files {
-	MAME_DIR .. "src/mame/drivers/bw12.c",
-	MAME_DIR .. "src/mame/drivers/bw2.c",
+	MAME_DIR .. "src/mame/drivers/bw12.cpp",
+	MAME_DIR .. "src/mame/drivers/bw2.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "booth")
 files {
-	MAME_DIR .. "src/mame/drivers/apexc.c",
+	MAME_DIR .. "src/mame/drivers/apexc.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "camputers")
 files {
-	MAME_DIR .. "src/mame/drivers/camplynx.c",
-	MAME_DIR .. "src/lib/formats/camplynx_dsk.c",
+	MAME_DIR .. "src/mame/drivers/camplynx.cpp",
+	MAME_DIR .. "src/lib/formats/camplynx_dsk.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "canon")
 files {
-	MAME_DIR .. "src/mame/drivers/cat.c",
-	MAME_DIR .. "src/mame/drivers/x07.c",
-	MAME_DIR .. "src/mame/drivers/canon_s80.c",
+	MAME_DIR .. "src/mame/drivers/cat.cpp",
+	MAME_DIR .. "src/mame/drivers/x07.cpp",
+	MAME_DIR .. "src/mame/drivers/canon_s80.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "cantab")
 files {
-	MAME_DIR .. "src/mame/drivers/jupace.c",
+	MAME_DIR .. "src/mame/drivers/jupace.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "casio")
 files {
-	MAME_DIR .. "src/mame/drivers/casloopy.c",
-	MAME_DIR .. "src/mame/drivers/cfx9850.c",
-	MAME_DIR .. "src/mame/drivers/fp200.c",
-	MAME_DIR .. "src/mame/drivers/fp1100.c",
-	MAME_DIR .. "src/mame/drivers/fp6000.c",
-	MAME_DIR .. "src/mame/drivers/pb1000.c",
-	MAME_DIR .. "src/mame/drivers/pv1000.c",
-	MAME_DIR .. "src/mame/drivers/pv2000.c",
+	MAME_DIR .. "src/mame/drivers/casloopy.cpp",
+	MAME_DIR .. "src/mame/drivers/cfx9850.cpp",
+	MAME_DIR .. "src/mame/drivers/fp200.cpp",
+	MAME_DIR .. "src/mame/drivers/fp1100.cpp",
+	MAME_DIR .. "src/mame/drivers/fp6000.cpp",
+	MAME_DIR .. "src/mame/drivers/pb1000.cpp",
+	MAME_DIR .. "src/mame/drivers/pv1000.cpp",
+	MAME_DIR .. "src/mame/drivers/pv2000.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "cbm")
 files {
-	MAME_DIR .. "src/mame/drivers/c128.c",
-	MAME_DIR .. "src/mame/drivers/c64.c",
-	MAME_DIR .. "src/mame/drivers/c64dtv.c",
-	MAME_DIR .. "src/mame/drivers/c65.c",
-	MAME_DIR .. "src/mame/drivers/c900.c",
-	MAME_DIR .. "src/mame/drivers/cbm2.c",
-	MAME_DIR .. "src/mame/drivers/clcd.c",
-	MAME_DIR .. "src/mame/drivers/pet.c",
-	MAME_DIR .. "src/mame/drivers/plus4.c",
-	MAME_DIR .. "src/mame/drivers/vic10.c",
-	MAME_DIR .. "src/mame/drivers/vic20.c",
-	MAME_DIR .. "src/mame/machine/cbm_snqk.c",
-	MAME_DIR .. "src/mame/drivers/mps1230.c",
+	MAME_DIR .. "src/mame/drivers/c128.cpp",
+	MAME_DIR .. "src/mame/drivers/c64.cpp",
+	MAME_DIR .. "src/mame/drivers/c64dtv.cpp",
+	MAME_DIR .. "src/mame/drivers/c65.cpp",
+	MAME_DIR .. "src/mame/drivers/c900.cpp",
+	MAME_DIR .. "src/mame/drivers/cbm2.cpp",
+	MAME_DIR .. "src/mame/drivers/clcd.cpp",
+	MAME_DIR .. "src/mame/drivers/pet.cpp",
+	MAME_DIR .. "src/mame/drivers/plus4.cpp",
+	MAME_DIR .. "src/mame/drivers/vic10.cpp",
+	MAME_DIR .. "src/mame/drivers/vic20.cpp",
+	MAME_DIR .. "src/mame/machine/cbm_snqk.cpp",
+	MAME_DIR .. "src/mame/drivers/mps1230.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "cccp")
 files {
-	MAME_DIR .. "src/mame/drivers/argo.c",
-	MAME_DIR .. "src/mame/drivers/cm1800.c",
-	MAME_DIR .. "src/mame/drivers/lviv.c",
-	MAME_DIR .. "src/mame/machine/lviv.c",
-	MAME_DIR .. "src/mame/video/lviv.c",
-	MAME_DIR .. "src/mame/drivers/mikro80.c",
-	MAME_DIR .. "src/mame/machine/mikro80.c",
-	MAME_DIR .. "src/mame/video/mikro80.c",
-	MAME_DIR .. "src/mame/drivers/pk8000.c",
-	MAME_DIR .. "src/mame/drivers/pk8020.c",
-	MAME_DIR .. "src/mame/machine/pk8020.c",
-	MAME_DIR .. "src/mame/video/pk8020.c",
-	MAME_DIR .. "src/mame/drivers/pyl601.c",
-	MAME_DIR .. "src/mame/drivers/sm1800.c",
-	MAME_DIR .. "src/mame/drivers/uknc.c",
-	MAME_DIR .. "src/mame/drivers/unior.c",
-	MAME_DIR .. "src/mame/drivers/ut88.c",
-	MAME_DIR .. "src/mame/machine/ut88.c",
-	MAME_DIR .. "src/mame/video/ut88.c",
-	MAME_DIR .. "src/mame/drivers/vector06.c",
-	MAME_DIR .. "src/mame/machine/vector06.c",
-	MAME_DIR .. "src/mame/video/vector06.c",
-	MAME_DIR .. "src/mame/drivers/vta2000.c",
+	MAME_DIR .. "src/mame/drivers/argo.cpp",
+	MAME_DIR .. "src/mame/drivers/cm1800.cpp",
+	MAME_DIR .. "src/mame/drivers/lviv.cpp",
+	MAME_DIR .. "src/mame/machine/lviv.cpp",
+	MAME_DIR .. "src/mame/video/lviv.cpp",
+	MAME_DIR .. "src/mame/drivers/mikro80.cpp",
+	MAME_DIR .. "src/mame/machine/mikro80.cpp",
+	MAME_DIR .. "src/mame/video/mikro80.cpp",
+	MAME_DIR .. "src/mame/drivers/pk8000.cpp",
+	MAME_DIR .. "src/mame/drivers/pk8020.cpp",
+	MAME_DIR .. "src/mame/machine/pk8020.cpp",
+	MAME_DIR .. "src/mame/video/pk8020.cpp",
+	MAME_DIR .. "src/mame/drivers/pyl601.cpp",
+	MAME_DIR .. "src/mame/drivers/sm1800.cpp",
+	MAME_DIR .. "src/mame/drivers/uknc.cpp",
+	MAME_DIR .. "src/mame/drivers/unior.cpp",
+	MAME_DIR .. "src/mame/drivers/ut88.cpp",
+	MAME_DIR .. "src/mame/machine/ut88.cpp",
+	MAME_DIR .. "src/mame/video/ut88.cpp",
+	MAME_DIR .. "src/mame/drivers/vector06.cpp",
+	MAME_DIR .. "src/mame/machine/vector06.cpp",
+	MAME_DIR .. "src/mame/video/vector06.cpp",
+	MAME_DIR .. "src/mame/drivers/vta2000.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "cce")
 files {
-	MAME_DIR .. "src/mame/drivers/mc1000.c",
+	MAME_DIR .. "src/mame/drivers/mc1000.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "ccs")
 files {
-	MAME_DIR .. "src/mame/drivers/ccs2810.c",
-	MAME_DIR .. "src/mame/drivers/ccs300.c",
+	MAME_DIR .. "src/mame/drivers/ccs2810.cpp",
+	MAME_DIR .. "src/mame/drivers/ccs300.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "chromatics")
 files {
-	MAME_DIR .. "src/mame/drivers/cgc7900.c",
-	MAME_DIR .. "src/mame/video/cgc7900.c",
+	MAME_DIR .. "src/mame/drivers/cgc7900.cpp",
+	MAME_DIR .. "src/mame/video/cgc7900.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "coleco")
 files {
-	MAME_DIR .. "src/mame/drivers/adam.c",
-	MAME_DIR .. "src/mame/drivers/coleco.c",
-	MAME_DIR .. "src/mame/machine/coleco.c",
+	MAME_DIR .. "src/mame/drivers/adam.cpp",
+	MAME_DIR .. "src/mame/drivers/coleco.cpp",
+	MAME_DIR .. "src/mame/machine/coleco.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "cromemco")
 files {
-	MAME_DIR .. "src/mame/drivers/c10.c",
-	MAME_DIR .. "src/mame/drivers/mcb216.c",
+	MAME_DIR .. "src/mame/drivers/c10.cpp",
+	MAME_DIR .. "src/mame/drivers/mcb216.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "comx")
 files {
-	MAME_DIR .. "src/mame/drivers/comx35.c",
-	MAME_DIR .. "src/mame/video/comx35.c",
+	MAME_DIR .. "src/mame/drivers/comx35.cpp",
+	MAME_DIR .. "src/mame/video/comx35.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "concept")
 files {
-	MAME_DIR .. "src/mame/drivers/concept.c",
-	MAME_DIR .. "src/mame/machine/concept.c",
+	MAME_DIR .. "src/mame/drivers/concept.cpp",
+	MAME_DIR .. "src/mame/machine/concept.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "conitec")
 files {
-	MAME_DIR .. "src/mame/drivers/prof180x.c",
-	MAME_DIR .. "src/mame/drivers/prof80.c",
-	MAME_DIR .. "src/mame/machine/prof80mmu.c",
+	MAME_DIR .. "src/mame/drivers/prof180x.cpp",
+	MAME_DIR .. "src/mame/drivers/prof80.cpp",
+	MAME_DIR .. "src/mame/machine/prof80mmu.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "cybiko")
 files {
-	MAME_DIR .. "src/mame/drivers/cybiko.c",
-	MAME_DIR .. "src/mame/machine/cybiko.c",
+	MAME_DIR .. "src/mame/drivers/cybiko.cpp",
+	MAME_DIR .. "src/mame/machine/cybiko.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "dai")
 files {
-	MAME_DIR .. "src/mame/drivers/dai.c",
-	MAME_DIR .. "src/mame/audio/dai_snd.c",
-	MAME_DIR .. "src/mame/machine/dai.c",
-	MAME_DIR .. "src/mame/video/dai.c",
+	MAME_DIR .. "src/mame/drivers/dai.cpp",
+	MAME_DIR .. "src/mame/audio/dai_snd.cpp",
+	MAME_DIR .. "src/mame/machine/dai.cpp",
+	MAME_DIR .. "src/mame/video/dai.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "ddr")
 files {
-	MAME_DIR .. "src/mame/drivers/ac1.c",
-	MAME_DIR .. "src/mame/machine/ac1.c",
-	MAME_DIR .. "src/mame/video/ac1.c",
-	MAME_DIR .. "src/mame/drivers/bcs3.c",
-	MAME_DIR .. "src/mame/drivers/c80.c",
-	MAME_DIR .. "src/mame/drivers/huebler.c",
-	MAME_DIR .. "src/mame/drivers/jtc.c",
-	MAME_DIR .. "src/mame/drivers/kramermc.c",
-	MAME_DIR .. "src/mame/machine/kramermc.c",
-	MAME_DIR .. "src/mame/video/kramermc.c",
-	MAME_DIR .. "src/mame/drivers/llc.c",
-	MAME_DIR .. "src/mame/machine/llc.c",
-	MAME_DIR .. "src/mame/video/llc.c",
-	MAME_DIR .. "src/mame/drivers/nanos.c",
-	MAME_DIR .. "src/mame/drivers/pcm.c",
-	MAME_DIR .. "src/mame/drivers/vcs80.c",
-	MAME_DIR .. "src/mame/machine/k7659kb.c",
+	MAME_DIR .. "src/mame/drivers/ac1.cpp",
+	MAME_DIR .. "src/mame/machine/ac1.cpp",
+	MAME_DIR .. "src/mame/video/ac1.cpp",
+	MAME_DIR .. "src/mame/drivers/bcs3.cpp",
+	MAME_DIR .. "src/mame/drivers/c80.cpp",
+	MAME_DIR .. "src/mame/drivers/huebler.cpp",
+	MAME_DIR .. "src/mame/drivers/jtc.cpp",
+	MAME_DIR .. "src/mame/drivers/kramermc.cpp",
+	MAME_DIR .. "src/mame/machine/kramermc.cpp",
+	MAME_DIR .. "src/mame/video/kramermc.cpp",
+	MAME_DIR .. "src/mame/drivers/llc.cpp",
+	MAME_DIR .. "src/mame/machine/llc.cpp",
+	MAME_DIR .. "src/mame/video/llc.cpp",
+	MAME_DIR .. "src/mame/drivers/nanos.cpp",
+	MAME_DIR .. "src/mame/drivers/pcm.cpp",
+	MAME_DIR .. "src/mame/drivers/vcs80.cpp",
+	MAME_DIR .. "src/mame/machine/k7659kb.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "dec")
 files {
-	MAME_DIR .. "src/mame/drivers/dct11em.c",
-	MAME_DIR .. "src/mame/drivers/dectalk.c",
-	MAME_DIR .. "src/mame/drivers/decwritr.c",
-	MAME_DIR .. "src/mame/drivers/pdp11.c",
-	MAME_DIR .. "src/mame/drivers/vax11.c",
-	MAME_DIR .. "src/mame/drivers/rainbow.c",
-	MAME_DIR .. "src/mame/drivers/vk100.c",
-	MAME_DIR .. "src/mame/drivers/vt100.c",
-	MAME_DIR .. "src/mame/drivers/vt220.c",
-	MAME_DIR .. "src/mame/drivers/vt240.c",
-	MAME_DIR .. "src/mame/drivers/vt320.c",
-	MAME_DIR .. "src/mame/drivers/vt520.c",
-	MAME_DIR .. "src/mame/machine/dec_lk201.c",
-	MAME_DIR .. "src/mame/machine/rx01.c",
-	MAME_DIR .. "src/mame/video/vtvideo.c",
+	MAME_DIR .. "src/mame/drivers/dct11em.cpp",
+	MAME_DIR .. "src/mame/drivers/dectalk.cpp",
+	MAME_DIR .. "src/mame/drivers/decwritr.cpp",
+	MAME_DIR .. "src/mame/drivers/pdp11.cpp",
+	MAME_DIR .. "src/mame/drivers/vax11.cpp",
+	MAME_DIR .. "src/mame/drivers/rainbow.cpp",
+	MAME_DIR .. "src/mame/drivers/vk100.cpp",
+	MAME_DIR .. "src/mame/drivers/vt100.cpp",
+	MAME_DIR .. "src/mame/drivers/vt220.cpp",
+	MAME_DIR .. "src/mame/drivers/vt240.cpp",
+	MAME_DIR .. "src/mame/drivers/vt320.cpp",
+	MAME_DIR .. "src/mame/drivers/vt520.cpp",
+	MAME_DIR .. "src/mame/machine/dec_lk201.cpp",
+	MAME_DIR .. "src/mame/machine/rx01.cpp",
+	MAME_DIR .. "src/mame/video/vtvideo.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "dicksmth")
 files {
-	MAME_DIR .. "src/mame/drivers/super80.c",
-	MAME_DIR .. "src/mame/machine/super80.c",
-	MAME_DIR .. "src/mame/video/super80.c",
+	MAME_DIR .. "src/mame/drivers/super80.cpp",
+	MAME_DIR .. "src/mame/machine/super80.cpp",
+	MAME_DIR .. "src/mame/video/super80.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "dms")
 files {
-	MAME_DIR .. "src/mame/drivers/dms5000.c",
-	MAME_DIR .. "src/mame/drivers/dms86.c",
-	MAME_DIR .. "src/mame/drivers/zsbc3.c",
+	MAME_DIR .. "src/mame/drivers/dms5000.cpp",
+	MAME_DIR .. "src/mame/drivers/dms86.cpp",
+	MAME_DIR .. "src/mame/drivers/zsbc3.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "dragon")
 files {
-	MAME_DIR .. "src/mame/drivers/dgn_beta.c",
-	MAME_DIR .. "src/mame/machine/dgn_beta.c",
-	MAME_DIR .. "src/mame/video/dgn_beta.c",
+	MAME_DIR .. "src/mame/drivers/dgn_beta.cpp",
+	MAME_DIR .. "src/mame/machine/dgn_beta.cpp",
+	MAME_DIR .. "src/mame/video/dgn_beta.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "drc")
 files {
-	MAME_DIR .. "src/mame/drivers/zrt80.c",
+	MAME_DIR .. "src/mame/drivers/zrt80.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "eaca")
 files {
-	MAME_DIR .. "src/mame/drivers/cgenie.c",
+	MAME_DIR .. "src/mame/drivers/cgenie.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "einis")
 files {
-	MAME_DIR .. "src/mame/drivers/pecom.c",
-	MAME_DIR .. "src/mame/machine/pecom.c",
-	MAME_DIR .. "src/mame/video/pecom.c",
+	MAME_DIR .. "src/mame/drivers/pecom.cpp",
+	MAME_DIR .. "src/mame/machine/pecom.cpp",
+	MAME_DIR .. "src/mame/video/pecom.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "elektrka")
 files {
-	MAME_DIR .. "src/mame/drivers/bk.c",
-	MAME_DIR .. "src/mame/machine/bk.c",
-	MAME_DIR .. "src/mame/video/bk.c",
-	MAME_DIR .. "src/mame/drivers/dvk_kcgd.c",
-	MAME_DIR .. "src/mame/drivers/dvk_ksm.c",
-	MAME_DIR .. "src/mame/machine/ms7004.c",
-	MAME_DIR .. "src/mame/drivers/mk85.c",
-	MAME_DIR .. "src/mame/drivers/mk90.c",
+	MAME_DIR .. "src/mame/drivers/bk.cpp",
+	MAME_DIR .. "src/mame/machine/bk.cpp",
+	MAME_DIR .. "src/mame/video/bk.cpp",
+	MAME_DIR .. "src/mame/drivers/dvk_kcgd.cpp",
+	MAME_DIR .. "src/mame/drivers/dvk_ksm.cpp",
+	MAME_DIR .. "src/mame/machine/ms7004.cpp",
+	MAME_DIR .. "src/mame/drivers/mk85.cpp",
+	MAME_DIR .. "src/mame/drivers/mk90.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "elektor")
 files {
-	MAME_DIR .. "src/mame/drivers/ec65.c",
-	MAME_DIR .. "src/mame/drivers/elekscmp.c",
-	MAME_DIR .. "src/mame/drivers/junior.c",
+	MAME_DIR .. "src/mame/drivers/ec65.cpp",
+	MAME_DIR .. "src/mame/drivers/elekscmp.cpp",
+	MAME_DIR .. "src/mame/drivers/junior.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "ensoniq")
 files {
-	MAME_DIR .. "src/mame/drivers/esq1.c",
-	MAME_DIR .. "src/mame/drivers/esq5505.c",
-	MAME_DIR .. "src/mame/drivers/esqasr.c",
-	MAME_DIR .. "src/mame/drivers/esqkt.c",
-	MAME_DIR .. "src/mame/drivers/esqmr.c",
-	MAME_DIR .. "src/mame/drivers/enmirage.c",
-	MAME_DIR .. "src/mame/machine/esqpanel.c",
-	MAME_DIR .. "src/mame/machine/esqvfd.c",
+	MAME_DIR .. "src/mame/drivers/esq1.cpp",
+	MAME_DIR .. "src/mame/drivers/esq5505.cpp",
+	MAME_DIR .. "src/mame/drivers/esqasr.cpp",
+	MAME_DIR .. "src/mame/drivers/esqkt.cpp",
+	MAME_DIR .. "src/mame/drivers/esqmr.cpp",
+	MAME_DIR .. "src/mame/drivers/enmirage.cpp",
+	MAME_DIR .. "src/mame/machine/esqpanel.cpp",
+	MAME_DIR .. "src/mame/machine/esqvfd.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "enterprise")
 files {
-	MAME_DIR .. "src/mame/drivers/ep64.c",
-	MAME_DIR .. "src/mame/audio/dave.c",
-	MAME_DIR .. "src/mame/video/nick.c",
+	MAME_DIR .. "src/mame/drivers/ep64.cpp",
+	MAME_DIR .. "src/mame/audio/dave.cpp",
+	MAME_DIR .. "src/mame/video/nick.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "entex")
 files {
-	MAME_DIR .. "src/mame/drivers/advision.c",
-	MAME_DIR .. "src/mame/machine/advision.c",
-	MAME_DIR .. "src/mame/video/advision.c",
+	MAME_DIR .. "src/mame/drivers/advision.cpp",
+	MAME_DIR .. "src/mame/machine/advision.cpp",
+	MAME_DIR .. "src/mame/video/advision.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "epoch")
 files {
-	MAME_DIR .. "src/mame/drivers/gamepock.c",
-	MAME_DIR .. "src/mame/machine/gamepock.c",
-	MAME_DIR .. "src/mame/drivers/scv.c",
-	MAME_DIR .. "src/mame/audio/upd1771.c",
+	MAME_DIR .. "src/mame/drivers/gamepock.cpp",
+	MAME_DIR .. "src/mame/machine/gamepock.cpp",
+	MAME_DIR .. "src/mame/drivers/scv.cpp",
+	MAME_DIR .. "src/mame/audio/upd1771.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "epson")
 files {
-	MAME_DIR .. "src/mame/drivers/hx20.c",
-	MAME_DIR .. "src/mame/drivers/px4.c",
-	MAME_DIR .. "src/mame/drivers/px8.c",
-	MAME_DIR .. "src/mame/drivers/qx10.c",
-	MAME_DIR .. "src/mame/machine/qx10kbd.c",
+	MAME_DIR .. "src/mame/drivers/hx20.cpp",
+	MAME_DIR .. "src/mame/drivers/px4.cpp",
+	MAME_DIR .. "src/mame/drivers/px8.cpp",
+	MAME_DIR .. "src/mame/drivers/qx10.cpp",
+	MAME_DIR .. "src/mame/machine/qx10kbd.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "exidy")
 files {
-	MAME_DIR .. "src/mame/machine/sorcerer.c",
-	MAME_DIR .. "src/mame/drivers/sorcerer.c",
-	MAME_DIR .. "src/mame/machine/micropolis.c",
+	MAME_DIR .. "src/mame/machine/sorcerer.cpp",
+	MAME_DIR .. "src/mame/drivers/sorcerer.cpp",
+	MAME_DIR .. "src/mame/machine/micropolis.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "fairch")
 files {
-	MAME_DIR .. "src/mame/drivers/channelf.c",
-	MAME_DIR .. "src/mame/audio/channelf.c",
-	MAME_DIR .. "src/mame/video/channelf.c",
+	MAME_DIR .. "src/mame/drivers/channelf.cpp",
+	MAME_DIR .. "src/mame/audio/channelf.cpp",
+	MAME_DIR .. "src/mame/video/channelf.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "fidelity")
 files {
-	MAME_DIR .. "src/mame/drivers/csc.c",
-	MAME_DIR .. "src/mame/drivers/fidelz80.c",
+	MAME_DIR .. "src/mame/drivers/csc.cpp",
+	MAME_DIR .. "src/mame/drivers/fidelz80.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "force")
 files {
-	MAME_DIR .. "src/mame/drivers/force68k.c",
+	MAME_DIR .. "src/mame/drivers/force68k.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "fujitsu")
 files {
-	MAME_DIR .. "src/mame/drivers/fmtowns.c",
-	MAME_DIR .. "src/mame/video/fmtowns.c",
-	MAME_DIR .. "src/mame/machine/fm_scsi.c",
-	MAME_DIR .. "src/mame/drivers/fm7.c",
-	MAME_DIR .. "src/mame/video/fm7.c",
+	MAME_DIR .. "src/mame/drivers/fmtowns.cpp",
+	MAME_DIR .. "src/mame/video/fmtowns.cpp",
+	MAME_DIR .. "src/mame/machine/fm_scsi.cpp",
+	MAME_DIR .. "src/mame/drivers/fm7.cpp",
+	MAME_DIR .. "src/mame/video/fm7.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "funtech")
 files {
-	MAME_DIR .. "src/mame/drivers/supracan.c",
+	MAME_DIR .. "src/mame/drivers/supracan.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "galaxy")
 files {
-	MAME_DIR .. "src/mame/drivers/galaxy.c",
-	MAME_DIR .. "src/mame/machine/galaxy.c",
-	MAME_DIR .. "src/mame/video/galaxy.c",
+	MAME_DIR .. "src/mame/drivers/galaxy.cpp",
+	MAME_DIR .. "src/mame/machine/galaxy.cpp",
+	MAME_DIR .. "src/mame/video/galaxy.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "gamepark")
 files {
-	MAME_DIR .. "src/mame/drivers/gp2x.c",
-	MAME_DIR .. "src/mame/drivers/gp32.c",
+	MAME_DIR .. "src/mame/drivers/gp2x.cpp",
+	MAME_DIR .. "src/mame/drivers/gp32.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "gi")
 files {
-	MAME_DIR .. "src/mame/drivers/hh_pic16.c",
+	MAME_DIR .. "src/mame/drivers/hh_pic16.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "grundy")
 files {
-	MAME_DIR .. "src/mame/drivers/newbrain.c",
-	MAME_DIR .. "src/mame/video/newbrain.c",
+	MAME_DIR .. "src/mame/drivers/newbrain.cpp",
+	MAME_DIR .. "src/mame/video/newbrain.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "hartung")
 files {
-	MAME_DIR .. "src/mame/drivers/gmaster.c",
+	MAME_DIR .. "src/mame/drivers/gmaster.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "heathkit")
 files {
-	MAME_DIR .. "src/mame/drivers/et3400.c",
-	MAME_DIR .. "src/mame/drivers/h8.c",
-	MAME_DIR .. "src/mame/drivers/h19.c",
-	MAME_DIR .. "src/mame/drivers/h89.c",
+	MAME_DIR .. "src/mame/drivers/et3400.cpp",
+	MAME_DIR .. "src/mame/drivers/h8.cpp",
+	MAME_DIR .. "src/mame/drivers/h19.cpp",
+	MAME_DIR .. "src/mame/drivers/h89.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "hegener")
 files {
-	MAME_DIR .. "src/mame/drivers/glasgow.c",
-	MAME_DIR .. "src/mame/drivers/mephisto.c",
-	MAME_DIR .. "src/mame/drivers/mmodular.c",
-	MAME_DIR .. "src/mame/drivers/stratos.c",
-	MAME_DIR .. "src/mame/machine/mboard.c",
+	MAME_DIR .. "src/mame/drivers/glasgow.cpp",
+	MAME_DIR .. "src/mame/drivers/mephisto.cpp",
+	MAME_DIR .. "src/mame/drivers/mmodular.cpp",
+	MAME_DIR .. "src/mame/drivers/stratos.cpp",
+	MAME_DIR .. "src/mame/machine/mboard.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "hitachi")
 files {
-	MAME_DIR .. "src/mame/drivers/b16.c",
-	MAME_DIR .. "src/mame/drivers/bmjr.c",
-	MAME_DIR .. "src/mame/drivers/bml3.c",
-	MAME_DIR .. "src/mame/drivers/hh_hmcs40.c",
+	MAME_DIR .. "src/mame/drivers/b16.cpp",
+	MAME_DIR .. "src/mame/drivers/bmjr.cpp",
+	MAME_DIR .. "src/mame/drivers/bml3.cpp",
+	MAME_DIR .. "src/mame/drivers/hh_hmcs40.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "homebrew")
 files {
-	MAME_DIR .. "src/mame/drivers/4004clk.c",
-	MAME_DIR .. "src/mame/drivers/68ksbc.c",
-	MAME_DIR .. "src/mame/drivers/craft.c",
-	MAME_DIR .. "src/mame/drivers/homez80.c",
-	MAME_DIR .. "src/mame/drivers/p112.c",
-	MAME_DIR .. "src/mame/drivers/phunsy.c",
-	MAME_DIR .. "src/mame/drivers/pimps.c",
-	MAME_DIR .. "src/mame/drivers/ravens.c",
-	MAME_DIR .. "src/mame/drivers/sbc6510.c",
-	MAME_DIR .. "src/mame/drivers/sitcom.c",
-	MAME_DIR .. "src/mame/drivers/slc1.c",
-	MAME_DIR .. "src/mame/drivers/uzebox.c",
-	MAME_DIR .. "src/mame/drivers/z80dev.c",
+	MAME_DIR .. "src/mame/drivers/4004clk.cpp",
+	MAME_DIR .. "src/mame/drivers/68ksbc.cpp",
+	MAME_DIR .. "src/mame/drivers/craft.cpp",
+	MAME_DIR .. "src/mame/drivers/homez80.cpp",
+	MAME_DIR .. "src/mame/drivers/p112.cpp",
+	MAME_DIR .. "src/mame/drivers/phunsy.cpp",
+	MAME_DIR .. "src/mame/drivers/pimps.cpp",
+	MAME_DIR .. "src/mame/drivers/ravens.cpp",
+	MAME_DIR .. "src/mame/drivers/sbc6510.cpp",
+	MAME_DIR .. "src/mame/drivers/sitcom.cpp",
+	MAME_DIR .. "src/mame/drivers/slc1.cpp",
+	MAME_DIR .. "src/mame/drivers/uzebox.cpp",
+	MAME_DIR .. "src/mame/drivers/z80dev.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "homelab")
 files {
-	MAME_DIR .. "src/mame/drivers/homelab.c",
+	MAME_DIR .. "src/mame/drivers/homelab.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "hp")
 files {
-	MAME_DIR .. "src/mame/drivers/hp16500.c",
-	MAME_DIR .. "src/mame/drivers/hp48.c",
-	MAME_DIR .. "src/mame/machine/hp48.c",
-	MAME_DIR .. "src/mame/video/hp48.c",
-	MAME_DIR .. "src/mame/drivers/hp49gp.c",
-	MAME_DIR .. "src/mame/drivers/hp9845.c",
-	MAME_DIR .. "src/mame/drivers/hp9k.c",
-	MAME_DIR .. "src/mame/drivers/hp9k_3xx.c",
-	MAME_DIR .. "src/mame/drivers/hp64k.c",
-	MAME_DIR .. "src/mame/drivers/hp_ipc.c",
+	MAME_DIR .. "src/mame/drivers/hp16500.cpp",
+	MAME_DIR .. "src/mame/drivers/hp48.cpp",
+	MAME_DIR .. "src/mame/machine/hp48.cpp",
+	MAME_DIR .. "src/mame/video/hp48.cpp",
+	MAME_DIR .. "src/mame/drivers/hp49gp.cpp",
+	MAME_DIR .. "src/mame/drivers/hp9845.cpp",
+	MAME_DIR .. "src/mame/drivers/hp9k.cpp",
+	MAME_DIR .. "src/mame/drivers/hp9k_3xx.cpp",
+	MAME_DIR .. "src/mame/drivers/hp64k.cpp",
+	MAME_DIR .. "src/mame/drivers/hp_ipc.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "hec2hrp")
 files {
-	MAME_DIR .. "src/mame/drivers/hec2hrp.c",
-	MAME_DIR .. "src/mame/machine/hec2hrp.c",
-	MAME_DIR .. "src/mame/machine/hecdisk2.c",
-	MAME_DIR .. "src/mame/video/hec2video.c",
-	MAME_DIR .. "src/mame/drivers/interact.c",
+	MAME_DIR .. "src/mame/drivers/hec2hrp.cpp",
+	MAME_DIR .. "src/mame/machine/hec2hrp.cpp",
+	MAME_DIR .. "src/mame/machine/hecdisk2.cpp",
+	MAME_DIR .. "src/mame/video/hec2video.cpp",
+	MAME_DIR .. "src/mame/drivers/interact.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "heurikon")
 files {
-	MAME_DIR .. "src/mame/drivers/hk68v10.c",
+	MAME_DIR .. "src/mame/drivers/hk68v10.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "intel")
 files {
-	MAME_DIR .. "src/mame/drivers/basic52.c",
-	MAME_DIR .. "src/mame/drivers/imds.c",
-	MAME_DIR .. "src/mame/drivers/ipc.c",
-	MAME_DIR .. "src/mame/drivers/ipds.c",
-	MAME_DIR .. "src/mame/drivers/isbc.c",
-	MAME_DIR .. "src/mame/machine/isbc_215g.c",
-	MAME_DIR .. "src/mame/drivers/rex6000.c",
-	MAME_DIR .. "src/mame/drivers/sdk80.c",
-	MAME_DIR .. "src/mame/drivers/sdk85.c",
-	MAME_DIR .. "src/mame/drivers/sdk86.c",
-	MAME_DIR .. "src/mame/drivers/imds2.c",
+	MAME_DIR .. "src/mame/drivers/basic52.cpp",
+	MAME_DIR .. "src/mame/drivers/imds.cpp",
+	MAME_DIR .. "src/mame/drivers/ipc.cpp",
+	MAME_DIR .. "src/mame/drivers/ipds.cpp",
+	MAME_DIR .. "src/mame/drivers/isbc.cpp",
+	MAME_DIR .. "src/mame/machine/isbc_215g.cpp",
+	MAME_DIR .. "src/mame/drivers/rex6000.cpp",
+	MAME_DIR .. "src/mame/drivers/sdk80.cpp",
+	MAME_DIR .. "src/mame/drivers/sdk85.cpp",
+	MAME_DIR .. "src/mame/drivers/sdk86.cpp",
+	MAME_DIR .. "src/mame/drivers/imds2.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "imp")
 files {
-	MAME_DIR .. "src/mame/drivers/tim011.c",
-	MAME_DIR .. "src/mame/drivers/tim100.c",
+	MAME_DIR .. "src/mame/drivers/tim011.cpp",
+	MAME_DIR .. "src/mame/drivers/tim100.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "interton")
 files {
-	MAME_DIR .. "src/mame/drivers/vc4000.c",
-	MAME_DIR .. "src/mame/audio/vc4000snd.c",
-	MAME_DIR .. "src/mame/video/vc4000.c",
+	MAME_DIR .. "src/mame/drivers/vc4000.cpp",
+	MAME_DIR .. "src/mame/audio/vc4000snd.cpp",
+	MAME_DIR .. "src/mame/video/vc4000.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "intv")
 files {
-	MAME_DIR .. "src/mame/drivers/intv.c",
-	MAME_DIR .. "src/mame/machine/intv.c",
-	MAME_DIR .. "src/mame/video/intv.c",
-	MAME_DIR .. "src/mame/video/stic.c",
+	MAME_DIR .. "src/mame/drivers/intv.cpp",
+	MAME_DIR .. "src/mame/machine/intv.cpp",
+	MAME_DIR .. "src/mame/video/intv.cpp",
+	MAME_DIR .. "src/mame/video/stic.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "isc")
 files {
-	MAME_DIR .. "src/mame/drivers/compucolor.c",
+	MAME_DIR .. "src/mame/drivers/compucolor.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "kaypro")
 files {
-	MAME_DIR .. "src/mame/drivers/kaypro.c",
-	MAME_DIR .. "src/mame/machine/kaypro.c",
-	MAME_DIR .. "src/mame/machine/kay_kbd.c",
-	MAME_DIR .. "src/mame/video/kaypro.c",
+	MAME_DIR .. "src/mame/drivers/kaypro.cpp",
+	MAME_DIR .. "src/mame/machine/kaypro.cpp",
+	MAME_DIR .. "src/mame/machine/kay_kbd.cpp",
+	MAME_DIR .. "src/mame/video/kaypro.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "koei")
 files {
-	MAME_DIR .. "src/mame/drivers/pasogo.c",
+	MAME_DIR .. "src/mame/drivers/pasogo.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "kyocera")
 files {
-	MAME_DIR .. "src/mame/drivers/kyocera.c",
-	MAME_DIR .. "src/mame/video/kyocera.c",
+	MAME_DIR .. "src/mame/drivers/kyocera.cpp",
+	MAME_DIR .. "src/mame/video/kyocera.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "luxor")
 files {
-	MAME_DIR .. "src/mame/drivers/abc80.c",
-	MAME_DIR .. "src/mame/machine/abc80kb.c",
-	MAME_DIR .. "src/mame/video/abc80.c",
-	MAME_DIR .. "src/mame/drivers/abc80x.c",
-	MAME_DIR .. "src/mame/video/abc800.c",
-	MAME_DIR .. "src/mame/video/abc802.c",
-	MAME_DIR .. "src/mame/video/abc806.c",
-	MAME_DIR .. "src/mame/drivers/abc1600.c",
-	MAME_DIR .. "src/mame/machine/abc1600mac.c",
-	MAME_DIR .. "src/mame/video/abc1600.c",
+	MAME_DIR .. "src/mame/drivers/abc80.cpp",
+	MAME_DIR .. "src/mame/machine/abc80kb.cpp",
+	MAME_DIR .. "src/mame/video/abc80.cpp",
+	MAME_DIR .. "src/mame/drivers/abc80x.cpp",
+	MAME_DIR .. "src/mame/video/abc800.cpp",
+	MAME_DIR .. "src/mame/video/abc802.cpp",
+	MAME_DIR .. "src/mame/video/abc806.cpp",
+	MAME_DIR .. "src/mame/drivers/abc1600.cpp",
+	MAME_DIR .. "src/mame/machine/abc1600mac.cpp",
+	MAME_DIR .. "src/mame/video/abc1600.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "magnavox")
 files {
-	MAME_DIR .. "src/mame/drivers/odyssey2.c",
+	MAME_DIR .. "src/mame/drivers/odyssey2.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "makerbot")
 files {
-	MAME_DIR .. "src/mame/drivers/replicator.c",
+	MAME_DIR .. "src/mame/drivers/replicator.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "marx")
 files {
-	MAME_DIR .. "src/mame/drivers/elecbowl.c",
+	MAME_DIR .. "src/mame/drivers/elecbowl.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "mattel")
 files {
-	MAME_DIR .. "src/mame/drivers/aquarius.c",
-	MAME_DIR .. "src/mame/video/aquarius.c",
-	MAME_DIR .. "src/mame/drivers/juicebox.c",
-	MAME_DIR .. "src/mame/drivers/hyperscan.c",
+	MAME_DIR .. "src/mame/drivers/aquarius.cpp",
+	MAME_DIR .. "src/mame/video/aquarius.cpp",
+	MAME_DIR .. "src/mame/drivers/juicebox.cpp",
+	MAME_DIR .. "src/mame/drivers/hyperscan.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "matsushi")
 files {
-	MAME_DIR .. "src/mame/drivers/jr100.c",
-	MAME_DIR .. "src/mame/drivers/jr200.c",
-	MAME_DIR .. "src/mame/drivers/myb3k.c",
+	MAME_DIR .. "src/mame/drivers/jr100.cpp",
+	MAME_DIR .. "src/mame/drivers/jr200.cpp",
+	MAME_DIR .. "src/mame/drivers/myb3k.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "mb")
 files {
-	MAME_DIR .. "src/mame/drivers/mbdtower.c",
-	MAME_DIR .. "src/mame/drivers/microvsn.c",
+	MAME_DIR .. "src/mame/drivers/mbdtower.cpp",
+	MAME_DIR .. "src/mame/drivers/microvsn.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "mchester")
 files {
-	MAME_DIR .. "src/mame/drivers/ssem.c",
+	MAME_DIR .. "src/mame/drivers/ssem.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "memotech")
 files {
-	MAME_DIR .. "src/mame/drivers/mtx.c",
-	MAME_DIR .. "src/mame/machine/mtx.c",
+	MAME_DIR .. "src/mame/drivers/mtx.cpp",
+	MAME_DIR .. "src/mame/machine/mtx.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "mgu")
 files {
-	MAME_DIR .. "src/mame/drivers/irisha.c",
+	MAME_DIR .. "src/mame/drivers/irisha.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "microkey")
 files {
-	MAME_DIR .. "src/mame/drivers/primo.c",
-	MAME_DIR .. "src/mame/machine/primo.c",
-	MAME_DIR .. "src/mame/video/primo.c",
+	MAME_DIR .. "src/mame/drivers/primo.cpp",
+	MAME_DIR .. "src/mame/machine/primo.cpp",
+	MAME_DIR .. "src/mame/video/primo.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "microsoft")
 files {
-	MAME_DIR .. "src/mame/drivers/xbox.c",
+	MAME_DIR .. "src/mame/drivers/xbox.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "mit")
 files {
-	MAME_DIR .. "src/mame/drivers/tx0.c",
-	MAME_DIR .. "src/mame/video/crt.c",
-	MAME_DIR .. "src/mame/video/tx0.c",
+	MAME_DIR .. "src/mame/drivers/tx0.cpp",
+	MAME_DIR .. "src/mame/video/crt.cpp",
+	MAME_DIR .. "src/mame/video/tx0.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "mits")
 files {
-	MAME_DIR .. "src/mame/drivers/altair.c",
-	MAME_DIR .. "src/mame/drivers/mits680b.c",
+	MAME_DIR .. "src/mame/drivers/altair.cpp",
+	MAME_DIR .. "src/mame/drivers/mits680b.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "mitsubishi")
 files {
-	MAME_DIR .. "src/mame/drivers/hh_melps4.c",
-	MAME_DIR .. "src/mame/drivers/multi8.c",
-	MAME_DIR .. "src/mame/drivers/multi16.c",
+	MAME_DIR .. "src/mame/drivers/hh_melps4.cpp",
+	MAME_DIR .. "src/mame/drivers/multi8.cpp",
+	MAME_DIR .. "src/mame/drivers/multi16.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "mizar")
 files {
-	MAME_DIR .. "src/mame/drivers/mzr8105.c",
+	MAME_DIR .. "src/mame/drivers/mzr8105.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "morrow")
 files {
-	MAME_DIR .. "src/mame/drivers/microdec.c",
-	MAME_DIR .. "src/mame/drivers/mpz80.c",
-	MAME_DIR .. "src/mame/drivers/tricep.c",
+	MAME_DIR .. "src/mame/drivers/microdec.cpp",
+	MAME_DIR .. "src/mame/drivers/mpz80.cpp",
+	MAME_DIR .. "src/mame/drivers/tricep.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "mos")
 files {
-	MAME_DIR .. "src/mame/drivers/kim1.c",
+	MAME_DIR .. "src/mame/drivers/kim1.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "motorola")
 files {
-	MAME_DIR .. "src/mame/drivers/m6805evs.c",
-	MAME_DIR .. "src/mame/drivers/mekd2.c",
+	MAME_DIR .. "src/mame/drivers/m6805evs.cpp",
+	MAME_DIR .. "src/mame/drivers/mekd2.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "multitch")
 files {
-	MAME_DIR .. "src/mame/drivers/mkit09.c",
-	MAME_DIR .. "src/mame/drivers/mpf1.c",
+	MAME_DIR .. "src/mame/drivers/mkit09.cpp",
+	MAME_DIR .. "src/mame/drivers/mpf1.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "nakajima")
 files {
-	MAME_DIR .. "src/mame/drivers/nakajies.c",
+	MAME_DIR .. "src/mame/drivers/nakajies.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "nascom")
 files {
-	MAME_DIR .. "src/mame/drivers/nascom1.c",
+	MAME_DIR .. "src/mame/drivers/nascom1.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "ne")
 files {
-	MAME_DIR .. "src/mame/drivers/z80ne.c",
-	MAME_DIR .. "src/mame/machine/z80ne.c",
+	MAME_DIR .. "src/mame/drivers/z80ne.cpp",
+	MAME_DIR .. "src/mame/machine/z80ne.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "nec")
 files {
-	MAME_DIR .. "src/mame/drivers/apc.c",
-	MAME_DIR .. "src/mame/drivers/pce.c",
-	MAME_DIR .. "src/mame/machine/pce.c",
-	MAME_DIR .. "src/mame/machine/pce_cd.c",
-	MAME_DIR .. "src/mame/drivers/pcfx.c",
-	MAME_DIR .. "src/mame/drivers/pc6001.c",
-	MAME_DIR .. "src/mame/drivers/pc8401a.c",
-	MAME_DIR .. "src/mame/video/pc8401a.c",
-	MAME_DIR .. "src/mame/drivers/pc8001.c",
-	MAME_DIR .. "src/mame/drivers/pc8801.c",
-	MAME_DIR .. "src/mame/drivers/pc88va.c",
-	MAME_DIR .. "src/mame/drivers/pc100.c",
-	MAME_DIR .. "src/mame/drivers/pc9801.c",
-	MAME_DIR .. "src/mame/machine/pc9801_26.c",
-	MAME_DIR .. "src/mame/machine/pc9801_86.c",
-	MAME_DIR .. "src/mame/machine/pc9801_118.c",
-	MAME_DIR .. "src/mame/machine/pc9801_cbus.c",
-	MAME_DIR .. "src/mame/machine/pc9801_kbd.c",
-	MAME_DIR .. "src/mame/drivers/tk80bs.c",
-	MAME_DIR .. "src/mame/drivers/hh_ucom4.c",
+	MAME_DIR .. "src/mame/drivers/apc.cpp",
+	MAME_DIR .. "src/mame/drivers/pce.cpp",
+	MAME_DIR .. "src/mame/machine/pce.cpp",
+	MAME_DIR .. "src/mame/machine/pce_cd.cpp",
+	MAME_DIR .. "src/mame/drivers/pcfx.cpp",
+	MAME_DIR .. "src/mame/drivers/pc6001.cpp",
+	MAME_DIR .. "src/mame/drivers/pc8401a.cpp",
+	MAME_DIR .. "src/mame/video/pc8401a.cpp",
+	MAME_DIR .. "src/mame/drivers/pc8001.cpp",
+	MAME_DIR .. "src/mame/drivers/pc8801.cpp",
+	MAME_DIR .. "src/mame/drivers/pc88va.cpp",
+	MAME_DIR .. "src/mame/drivers/pc100.cpp",
+	MAME_DIR .. "src/mame/drivers/pc9801.cpp",
+	MAME_DIR .. "src/mame/machine/pc9801_26.cpp",
+	MAME_DIR .. "src/mame/machine/pc9801_86.cpp",
+	MAME_DIR .. "src/mame/machine/pc9801_118.cpp",
+	MAME_DIR .. "src/mame/machine/pc9801_cbus.cpp",
+	MAME_DIR .. "src/mame/machine/pc9801_kbd.cpp",
+	MAME_DIR .. "src/mame/drivers/tk80bs.cpp",
+	MAME_DIR .. "src/mame/drivers/hh_ucom4.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "netronic")
 files {
-	MAME_DIR .. "src/mame/drivers/elf.c",
-	MAME_DIR .. "src/mame/drivers/exp85.c",
+	MAME_DIR .. "src/mame/drivers/elf.cpp",
+	MAME_DIR .. "src/mame/drivers/exp85.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "next")
 files {
-	MAME_DIR .. "src/mame/drivers/next.c",
-	MAME_DIR .. "src/mame/machine/nextkbd.c",
-	MAME_DIR .. "src/mame/machine/nextmo.c",
+	MAME_DIR .. "src/mame/drivers/next.cpp",
+	MAME_DIR .. "src/mame/machine/nextkbd.cpp",
+	MAME_DIR .. "src/mame/machine/nextmo.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "nintendo")
 files {
-	MAME_DIR .. "src/mame/drivers/gb.c",
-	MAME_DIR .. "src/mame/audio/gb.c",
-	MAME_DIR .. "src/mame/machine/gb.c",
-	MAME_DIR .. "src/mame/video/gb_lcd.c",
-	MAME_DIR .. "src/mame/drivers/gba.c",
-	MAME_DIR .. "src/mame/video/gba.c",
-	MAME_DIR .. "src/mame/drivers/n64.c",
-	MAME_DIR .. "src/mame/drivers/nes.c",
-	MAME_DIR .. "src/mame/machine/nes.c",
-	MAME_DIR .. "src/mame/video/nes.c",
-	MAME_DIR .. "src/mame/drivers/pokemini.c",
-	MAME_DIR .. "src/mame/drivers/snes.c",
-	MAME_DIR .. "src/mame/machine/snescx4.c",
-	MAME_DIR .. "src/mame/drivers/vboy.c",
-	MAME_DIR .. "src/mame/audio/vboy.c",
+	MAME_DIR .. "src/mame/drivers/gb.cpp",
+	MAME_DIR .. "src/mame/audio/gb.cpp",
+	MAME_DIR .. "src/mame/machine/gb.cpp",
+	MAME_DIR .. "src/mame/video/gb_lcd.cpp",
+	MAME_DIR .. "src/mame/drivers/gba.cpp",
+	MAME_DIR .. "src/mame/video/gba.cpp",
+	MAME_DIR .. "src/mame/drivers/n64.cpp",
+	MAME_DIR .. "src/mame/drivers/nes.cpp",
+	MAME_DIR .. "src/mame/machine/nes.cpp",
+	MAME_DIR .. "src/mame/video/nes.cpp",
+	MAME_DIR .. "src/mame/drivers/pokemini.cpp",
+	MAME_DIR .. "src/mame/drivers/snes.cpp",
+	MAME_DIR .. "src/mame/machine/snescx4.cpp",
+	MAME_DIR .. "src/mame/drivers/vboy.cpp",
+	MAME_DIR .. "src/mame/audio/vboy.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "nokia")
 files {
-	MAME_DIR .. "src/mame/drivers/mikromik.c",
-	MAME_DIR .. "src/mame/machine/mm1kb.c",
-	MAME_DIR .. "src/mame/video/mikromik.c",
+	MAME_DIR .. "src/mame/drivers/mikromik.cpp",
+	MAME_DIR .. "src/mame/machine/mm1kb.cpp",
+	MAME_DIR .. "src/mame/video/mikromik.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "northstar")
 files {
-	MAME_DIR .. "src/mame/drivers/horizon.c",
+	MAME_DIR .. "src/mame/drivers/horizon.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "novag")
 files {
-	MAME_DIR .. "src/mame/drivers/mk1.c",
-	MAME_DIR .. "src/mame/drivers/mk2.c",
-	MAME_DIR .. "src/mame/drivers/ssystem3.c",
-	MAME_DIR .. "src/mame/video/ssystem3.c",
-	MAME_DIR .. "src/mame/drivers/supercon.c",
+	MAME_DIR .. "src/mame/drivers/mk1.cpp",
+	MAME_DIR .. "src/mame/drivers/mk2.cpp",
+	MAME_DIR .. "src/mame/drivers/ssystem3.cpp",
+	MAME_DIR .. "src/mame/video/ssystem3.cpp",
+	MAME_DIR .. "src/mame/drivers/supercon.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "olivetti")
 files {
-	MAME_DIR .. "src/mame/drivers/m20.c",
-	MAME_DIR .. "src/mame/machine/m20_kbd.c",
-	MAME_DIR .. "src/mame/machine/m20_8086.c",
-	MAME_DIR .. "src/mame/drivers/m24.c",
-	MAME_DIR .. "src/mame/machine/m24_kbd.c",
-	MAME_DIR .. "src/mame/machine/m24_z8000.c"
+	MAME_DIR .. "src/mame/drivers/m20.cpp",
+	MAME_DIR .. "src/mame/machine/m20_kbd.cpp",
+	MAME_DIR .. "src/mame/machine/m20_8086.cpp",
+	MAME_DIR .. "src/mame/drivers/m24.cpp",
+	MAME_DIR .. "src/mame/machine/m24_kbd.cpp",
+	MAME_DIR .. "src/mame/machine/m24_z8000.cpp"
 }
 
 createMESSProjects(_target, _subtarget, "olympia")
 files {
-	MAME_DIR .. "src/mame/drivers/peoplepc.c"
+	MAME_DIR .. "src/mame/drivers/peoplepc.cpp"
 }
 
 createMESSProjects(_target, _subtarget, "ns")
 files {
-	MAME_DIR .. "src/mame/drivers/hh_cop400.c",
+	MAME_DIR .. "src/mame/drivers/hh_cop400.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "omnibyte")
 files {
-	MAME_DIR .. "src/mame/drivers/msbc1.c",
-	MAME_DIR .. "src/mame/drivers/ob68k1a.c",
+	MAME_DIR .. "src/mame/drivers/msbc1.cpp",
+	MAME_DIR .. "src/mame/drivers/ob68k1a.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "orion")
 files {
-	MAME_DIR .. "src/mame/drivers/orion.c",
-	MAME_DIR .. "src/mame/machine/orion.c",
-	MAME_DIR .. "src/mame/video/orion.c",
+	MAME_DIR .. "src/mame/drivers/orion.cpp",
+	MAME_DIR .. "src/mame/machine/orion.cpp",
+	MAME_DIR .. "src/mame/video/orion.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "osborne")
 files {
-	MAME_DIR .. "src/mame/drivers/osborne1.c",
-	MAME_DIR .. "src/mame/machine/osborne1.c",
-	MAME_DIR .. "src/mame/drivers/osbexec.c",
-	MAME_DIR .. "src/mame/drivers/vixen.c",
+	MAME_DIR .. "src/mame/drivers/osborne1.cpp",
+	MAME_DIR .. "src/mame/machine/osborne1.cpp",
+	MAME_DIR .. "src/mame/drivers/osbexec.cpp",
+	MAME_DIR .. "src/mame/drivers/vixen.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "osi")
 files {
-	MAME_DIR .. "src/mame/drivers/osi.c",
-	MAME_DIR .. "src/mame/video/osi.c",
+	MAME_DIR .. "src/mame/drivers/osi.cpp",
+	MAME_DIR .. "src/mame/video/osi.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "palm")
 files {
-	MAME_DIR .. "src/mame/drivers/palm.c",
-	MAME_DIR .. "src/mame/drivers/palmz22.c",
+	MAME_DIR .. "src/mame/drivers/palm.cpp",
+	MAME_DIR .. "src/mame/drivers/palmz22.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "parker")
 files {
-	MAME_DIR .. "src/mame/drivers/wildfire.c",
+	MAME_DIR .. "src/mame/drivers/wildfire.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "pitronic")
 files {
-	MAME_DIR .. "src/mame/drivers/beta.c",
+	MAME_DIR .. "src/mame/drivers/beta.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "pc")
 files {
-	MAME_DIR .. "src/mame/drivers/asst128.c",
-	MAME_DIR .. "src/mame/drivers/europc.c",
-	MAME_DIR .. "src/mame/drivers/genpc.c",
-	MAME_DIR .. "src/mame/machine/genpc.c",
-	MAME_DIR .. "src/mame/drivers/ibmpc.c",
-	MAME_DIR .. "src/mame/drivers/ibmpcjr.c",
-	MAME_DIR .. "src/mame/drivers/pc.c",
-	MAME_DIR .. "src/mame/drivers/tandy1t.c",
-	MAME_DIR .. "src/mame/video/pc_t1t.c",
+	MAME_DIR .. "src/mame/drivers/asst128.cpp",
+	MAME_DIR .. "src/mame/drivers/europc.cpp",
+	MAME_DIR .. "src/mame/drivers/genpc.cpp",
+	MAME_DIR .. "src/mame/machine/genpc.cpp",
+	MAME_DIR .. "src/mame/drivers/ibmpc.cpp",
+	MAME_DIR .. "src/mame/drivers/ibmpcjr.cpp",
+	MAME_DIR .. "src/mame/drivers/pc.cpp",
+	MAME_DIR .. "src/mame/drivers/tandy1t.cpp",
+	MAME_DIR .. "src/mame/video/pc_t1t.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "pdp1")
 files {
-	MAME_DIR .. "src/mame/drivers/pdp1.c",
-	MAME_DIR .. "src/mame/video/pdp1.c",
+	MAME_DIR .. "src/mame/drivers/pdp1.cpp",
+	MAME_DIR .. "src/mame/video/pdp1.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "pel")
 files {
-	MAME_DIR .. "src/mame/drivers/galeb.c",
-	MAME_DIR .. "src/mame/video/galeb.c",
-		MAME_DIR .. "src/mame/drivers/orao.c",
-	MAME_DIR .. "src/mame/machine/orao.c",
-	MAME_DIR .. "src/mame/video/orao.c",
+	MAME_DIR .. "src/mame/drivers/galeb.cpp",
+	MAME_DIR .. "src/mame/video/galeb.cpp",
+		MAME_DIR .. "src/mame/drivers/orao.cpp",
+	MAME_DIR .. "src/mame/machine/orao.cpp",
+	MAME_DIR .. "src/mame/video/orao.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "philips")
 files {
-	MAME_DIR .. "src/mame/drivers/p2000t.c",
-	MAME_DIR .. "src/mame/machine/p2000t.c",
-	MAME_DIR .. "src/mame/video/p2000m.c",
-	MAME_DIR .. "src/mame/drivers/vg5k.c",
+	MAME_DIR .. "src/mame/drivers/p2000t.cpp",
+	MAME_DIR .. "src/mame/machine/p2000t.cpp",
+	MAME_DIR .. "src/mame/video/p2000m.cpp",
+	MAME_DIR .. "src/mame/drivers/vg5k.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "poly88")
 files {
-	MAME_DIR .. "src/mame/drivers/poly88.c",
-	MAME_DIR .. "src/mame/machine/poly88.c",
-	MAME_DIR .. "src/mame/video/poly88.c",
+	MAME_DIR .. "src/mame/drivers/poly88.cpp",
+	MAME_DIR .. "src/mame/machine/poly88.cpp",
+	MAME_DIR .. "src/mame/video/poly88.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "psion")
 files {
-	MAME_DIR .. "src/mame/drivers/psion.c",
-	MAME_DIR .. "src/mame/machine/psion_pack.c",
+	MAME_DIR .. "src/mame/drivers/psion.cpp",
+	MAME_DIR .. "src/mame/machine/psion_pack.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "radio")
 files {
-	MAME_DIR .. "src/mame/drivers/apogee.c",
-	MAME_DIR .. "src/mame/drivers/mikrosha.c",
-	MAME_DIR .. "src/mame/drivers/partner.c",
-	MAME_DIR .. "src/mame/machine/partner.c",
-	MAME_DIR .. "src/mame/drivers/radio86.c",
-	MAME_DIR .. "src/mame/machine/radio86.c",
+	MAME_DIR .. "src/mame/drivers/apogee.cpp",
+	MAME_DIR .. "src/mame/drivers/mikrosha.cpp",
+	MAME_DIR .. "src/mame/drivers/partner.cpp",
+	MAME_DIR .. "src/mame/machine/partner.cpp",
+	MAME_DIR .. "src/mame/drivers/radio86.cpp",
+	MAME_DIR .. "src/mame/machine/radio86.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "rca")
 files {
-	MAME_DIR .. "src/mame/drivers/microkit.c",
-	MAME_DIR .. "src/mame/drivers/studio2.c",
-	MAME_DIR .. "src/mame/drivers/vip.c",
+	MAME_DIR .. "src/mame/drivers/microkit.cpp",
+	MAME_DIR .. "src/mame/drivers/studio2.cpp",
+	MAME_DIR .. "src/mame/drivers/vip.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "regnecentralen")
 files {
-	MAME_DIR .. "src/mame/drivers/rc759.c",
+	MAME_DIR .. "src/mame/drivers/rc759.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "ritam")
 files {
-	MAME_DIR .. "src/mame/drivers/monty.c",
+	MAME_DIR .. "src/mame/drivers/monty.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "rm")
 files {
-	MAME_DIR .. "src/mame/drivers/rm380z.c",
-	MAME_DIR .. "src/mame/machine/rm380z.c",
-	MAME_DIR .. "src/mame/video/rm380z.c",
-	MAME_DIR .. "src/mame/drivers/rmnimbus.c",
-	MAME_DIR .. "src/mame/machine/rmnimbus.c",
-	MAME_DIR .. "src/mame/video/rmnimbus.c",
-	MAME_DIR .. "src/mame/machine/rmnkbd.c",
+	MAME_DIR .. "src/mame/drivers/rm380z.cpp",
+	MAME_DIR .. "src/mame/machine/rm380z.cpp",
+	MAME_DIR .. "src/mame/video/rm380z.cpp",
+	MAME_DIR .. "src/mame/drivers/rmnimbus.cpp",
+	MAME_DIR .. "src/mame/machine/rmnimbus.cpp",
+	MAME_DIR .. "src/mame/video/rmnimbus.cpp",
+	MAME_DIR .. "src/mame/machine/rmnkbd.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "robotron")
 files {
-	MAME_DIR .. "src/mame/drivers/a5105.c",
-	MAME_DIR .. "src/mame/drivers/a51xx.c",
-	MAME_DIR .. "src/mame/drivers/a7150.c",
-	MAME_DIR .. "src/mame/drivers/k1003.c",
-	MAME_DIR .. "src/mame/drivers/k8915.c",
-	MAME_DIR .. "src/mame/drivers/rt1715.c",
-	MAME_DIR .. "src/mame/drivers/z1013.c",
-	MAME_DIR .. "src/mame/drivers/z9001.c",
+	MAME_DIR .. "src/mame/drivers/a5105.cpp",
+	MAME_DIR .. "src/mame/drivers/a51xx.cpp",
+	MAME_DIR .. "src/mame/drivers/a7150.cpp",
+	MAME_DIR .. "src/mame/drivers/k1003.cpp",
+	MAME_DIR .. "src/mame/drivers/k8915.cpp",
+	MAME_DIR .. "src/mame/drivers/rt1715.cpp",
+	MAME_DIR .. "src/mame/drivers/z1013.cpp",
+	MAME_DIR .. "src/mame/drivers/z9001.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "roland")
 files {
-	MAME_DIR .. "src/mame/drivers/rmt32.c",
-	MAME_DIR .. "src/mame/drivers/rd110.c",
-	MAME_DIR .. "src/mame/drivers/rsc55.c",
-	MAME_DIR .. "src/mame/drivers/tb303.c",
+	MAME_DIR .. "src/mame/drivers/rmt32.cpp",
+	MAME_DIR .. "src/mame/drivers/rd110.cpp",
+	MAME_DIR .. "src/mame/drivers/rsc55.cpp",
+	MAME_DIR .. "src/mame/drivers/tb303.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "rockwell")
 files {
-	MAME_DIR .. "src/mame/drivers/aim65.c",
-	MAME_DIR .. "src/mame/machine/aim65.c",
-	MAME_DIR .. "src/mame/drivers/aim65_40.c",
+	MAME_DIR .. "src/mame/drivers/aim65.cpp",
+	MAME_DIR .. "src/mame/machine/aim65.cpp",
+	MAME_DIR .. "src/mame/drivers/aim65_40.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "sage")
 files {
-	MAME_DIR .. "src/mame/drivers/sage2.c",
+	MAME_DIR .. "src/mame/drivers/sage2.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "samcoupe")
 files {
-	MAME_DIR .. "src/mame/drivers/samcoupe.c",
-	MAME_DIR .. "src/mame/machine/samcoupe.c",
-	MAME_DIR .. "src/mame/video/samcoupe.c",
+	MAME_DIR .. "src/mame/drivers/samcoupe.cpp",
+	MAME_DIR .. "src/mame/machine/samcoupe.cpp",
+	MAME_DIR .. "src/mame/video/samcoupe.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "samsung")
 files {
-	MAME_DIR .. "src/mame/drivers/spc1000.c",
+	MAME_DIR .. "src/mame/drivers/spc1000.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "sanyo")
 files {
-	MAME_DIR .. "src/mame/drivers/mbc200.c",
-	MAME_DIR .. "src/mame/drivers/mbc55x.c",
-	MAME_DIR .. "src/mame/machine/mbc55x.c",
-	MAME_DIR .. "src/mame/video/mbc55x.c",
-	MAME_DIR .. "src/mame/drivers/phc25.c",
+	MAME_DIR .. "src/mame/drivers/mbc200.cpp",
+	MAME_DIR .. "src/mame/drivers/mbc55x.cpp",
+	MAME_DIR .. "src/mame/machine/mbc55x.cpp",
+	MAME_DIR .. "src/mame/video/mbc55x.cpp",
+	MAME_DIR .. "src/mame/drivers/phc25.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "sega")
 files {
-	MAME_DIR .. "src/mame/drivers/dccons.c",
-	MAME_DIR .. "src/mame/machine/dccons.c",
-	MAME_DIR .. "src/mame/drivers/megadriv.c",
-	MAME_DIR .. "src/mame/drivers/saturn.c",
-	MAME_DIR .. "src/mame/drivers/segapico.c",
-	MAME_DIR .. "src/mame/drivers/sega_sawatte.c",
-	MAME_DIR .. "src/mame/drivers/segapm.c",
-	MAME_DIR .. "src/mame/drivers/sg1000.c",
-	MAME_DIR .. "src/mame/drivers/sms.c",
-	MAME_DIR .. "src/mame/machine/sms.c",
-	MAME_DIR .. "src/mame/drivers/svmu.c",
-	MAME_DIR .. "src/mame/machine/mega32x.c",
-	MAME_DIR .. "src/mame/machine/megacd.c",
-	MAME_DIR .. "src/mame/machine/megacdcd.c",
+	MAME_DIR .. "src/mame/drivers/dccons.cpp",
+	MAME_DIR .. "src/mame/machine/dccons.cpp",
+	MAME_DIR .. "src/mame/drivers/megadriv.cpp",
+	MAME_DIR .. "src/mame/drivers/saturn.cpp",
+	MAME_DIR .. "src/mame/drivers/segapico.cpp",
+	MAME_DIR .. "src/mame/drivers/sega_sawatte.cpp",
+	MAME_DIR .. "src/mame/drivers/segapm.cpp",
+	MAME_DIR .. "src/mame/drivers/sg1000.cpp",
+	MAME_DIR .. "src/mame/drivers/sms.cpp",
+	MAME_DIR .. "src/mame/machine/sms.cpp",
+	MAME_DIR .. "src/mame/drivers/svmu.cpp",
+	MAME_DIR .. "src/mame/machine/mega32x.cpp",
+	MAME_DIR .. "src/mame/machine/megacd.cpp",
+	MAME_DIR .. "src/mame/machine/megacdcd.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "sgi")
 files {
-	MAME_DIR .. "src/mame/machine/sgi.c",
-	MAME_DIR .. "src/mame/drivers/sgi_ip2.c",
-	MAME_DIR .. "src/mame/drivers/sgi_ip6.c",
-	MAME_DIR .. "src/mame/drivers/ip20.c",
-	MAME_DIR .. "src/mame/drivers/ip22.c",
-	MAME_DIR .. "src/mame/video/newport.c",
+	MAME_DIR .. "src/mame/machine/sgi.cpp",
+	MAME_DIR .. "src/mame/drivers/sgi_ip2.cpp",
+	MAME_DIR .. "src/mame/drivers/sgi_ip6.cpp",
+	MAME_DIR .. "src/mame/drivers/ip20.cpp",
+	MAME_DIR .. "src/mame/drivers/ip22.cpp",
+	MAME_DIR .. "src/mame/video/newport.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "sharp")
 files {
-	MAME_DIR .. "src/mame/drivers/hh_sm510.c",
-	MAME_DIR .. "src/mame/video/mz700.c",
-	MAME_DIR .. "src/mame/drivers/mz700.c",
-	MAME_DIR .. "src/mame/drivers/pc1500.c",
-	MAME_DIR .. "src/mame/drivers/pocketc.c",
-	MAME_DIR .. "src/mame/video/pc1401.c",
-	MAME_DIR .. "src/mame/machine/pc1401.c",
-	MAME_DIR .. "src/mame/video/pc1403.c",
-	MAME_DIR .. "src/mame/machine/pc1403.c",
-	MAME_DIR .. "src/mame/video/pc1350.c",
-	MAME_DIR .. "src/mame/machine/pc1350.c",
-	MAME_DIR .. "src/mame/video/pc1251.c",
-	MAME_DIR .. "src/mame/machine/pc1251.c",
-	MAME_DIR .. "src/mame/video/pocketc.c",
-	MAME_DIR .. "src/mame/machine/mz700.c",
-	MAME_DIR .. "src/mame/drivers/x68k.c",
-	MAME_DIR .. "src/mame/video/x68k.c",
-	MAME_DIR .. "src/mame/machine/x68k_hdc.c",
-	MAME_DIR .. "src/mame/machine/x68k_kbd.c",
-	MAME_DIR .. "src/mame/drivers/mz80.c",
-	MAME_DIR .. "src/mame/video/mz80.c",
-	MAME_DIR .. "src/mame/machine/mz80.c",
-	MAME_DIR .. "src/mame/drivers/mz2000.c",
-	MAME_DIR .. "src/mame/drivers/x1.c",
-	MAME_DIR .. "src/mame/machine/x1.c",
-	MAME_DIR .. "src/mame/drivers/x1twin.c",
-	MAME_DIR .. "src/mame/drivers/mz2500.c",
-	MAME_DIR .. "src/mame/drivers/mz3500.c",
-	MAME_DIR .. "src/mame/drivers/pce220.c",
-	MAME_DIR .. "src/mame/machine/pce220_ser.c",
-	MAME_DIR .. "src/mame/drivers/mz6500.c",
-	MAME_DIR .. "src/mame/drivers/zaurus.c",
+	MAME_DIR .. "src/mame/drivers/hh_sm510.cpp",
+	MAME_DIR .. "src/mame/video/mz700.cpp",
+	MAME_DIR .. "src/mame/drivers/mz700.cpp",
+	MAME_DIR .. "src/mame/drivers/pc1500.cpp",
+	MAME_DIR .. "src/mame/drivers/pocketc.cpp",
+	MAME_DIR .. "src/mame/video/pc1401.cpp",
+	MAME_DIR .. "src/mame/machine/pc1401.cpp",
+	MAME_DIR .. "src/mame/video/pc1403.cpp",
+	MAME_DIR .. "src/mame/machine/pc1403.cpp",
+	MAME_DIR .. "src/mame/video/pc1350.cpp",
+	MAME_DIR .. "src/mame/machine/pc1350.cpp",
+	MAME_DIR .. "src/mame/video/pc1251.cpp",
+	MAME_DIR .. "src/mame/machine/pc1251.cpp",
+	MAME_DIR .. "src/mame/video/pocketc.cpp",
+	MAME_DIR .. "src/mame/machine/mz700.cpp",
+	MAME_DIR .. "src/mame/drivers/x68k.cpp",
+	MAME_DIR .. "src/mame/video/x68k.cpp",
+	MAME_DIR .. "src/mame/machine/x68k_hdc.cpp",
+	MAME_DIR .. "src/mame/machine/x68k_kbd.cpp",
+	MAME_DIR .. "src/mame/drivers/mz80.cpp",
+	MAME_DIR .. "src/mame/video/mz80.cpp",
+	MAME_DIR .. "src/mame/machine/mz80.cpp",
+	MAME_DIR .. "src/mame/drivers/mz2000.cpp",
+	MAME_DIR .. "src/mame/drivers/x1.cpp",
+	MAME_DIR .. "src/mame/machine/x1.cpp",
+	MAME_DIR .. "src/mame/drivers/x1twin.cpp",
+	MAME_DIR .. "src/mame/drivers/mz2500.cpp",
+	MAME_DIR .. "src/mame/drivers/mz3500.cpp",
+	MAME_DIR .. "src/mame/drivers/pce220.cpp",
+	MAME_DIR .. "src/mame/machine/pce220_ser.cpp",
+	MAME_DIR .. "src/mame/drivers/mz6500.cpp",
+	MAME_DIR .. "src/mame/drivers/zaurus.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "sinclair")
 files {
-	MAME_DIR .. "src/mame/video/spectrum.c",
-	MAME_DIR .. "src/mame/video/timex.c",
-	MAME_DIR .. "src/mame/video/zx.c",
-	MAME_DIR .. "src/mame/drivers/zx.c",
-	MAME_DIR .. "src/mame/machine/zx.c",
-	MAME_DIR .. "src/mame/drivers/spectrum.c",
-	MAME_DIR .. "src/mame/drivers/spec128.c",
-	MAME_DIR .. "src/mame/drivers/timex.c",
-	MAME_DIR .. "src/mame/drivers/specpls3.c",
-	MAME_DIR .. "src/mame/drivers/scorpion.c",
-	MAME_DIR .. "src/mame/drivers/atm.c",
-	MAME_DIR .. "src/mame/drivers/pentagon.c",
-	MAME_DIR .. "src/mame/machine/beta.c",
-	MAME_DIR .. "src/mame/machine/spec_snqk.c",
-	MAME_DIR .. "src/mame/drivers/ql.c",
-	MAME_DIR .. "src/mame/machine/qimi.c",
-	MAME_DIR .. "src/mame/video/zx8301.c",
-	MAME_DIR .. "src/mame/machine/zx8302.c",
+	MAME_DIR .. "src/mame/video/spectrum.cpp",
+	MAME_DIR .. "src/mame/video/timex.cpp",
+	MAME_DIR .. "src/mame/video/zx.cpp",
+	MAME_DIR .. "src/mame/drivers/zx.cpp",
+	MAME_DIR .. "src/mame/machine/zx.cpp",
+	MAME_DIR .. "src/mame/drivers/spectrum.cpp",
+	MAME_DIR .. "src/mame/drivers/spec128.cpp",
+	MAME_DIR .. "src/mame/drivers/timex.cpp",
+	MAME_DIR .. "src/mame/drivers/specpls3.cpp",
+	MAME_DIR .. "src/mame/drivers/scorpion.cpp",
+	MAME_DIR .. "src/mame/drivers/atm.cpp",
+	MAME_DIR .. "src/mame/drivers/pentagon.cpp",
+	MAME_DIR .. "src/mame/machine/beta.cpp",
+	MAME_DIR .. "src/mame/machine/spec_snqk.cpp",
+	MAME_DIR .. "src/mame/drivers/ql.cpp",
+	MAME_DIR .. "src/mame/machine/qimi.cpp",
+	MAME_DIR .. "src/mame/video/zx8301.cpp",
+	MAME_DIR .. "src/mame/machine/zx8302.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "siemens")
 files {
-	MAME_DIR .. "src/mame/drivers/pcd.c",
-	MAME_DIR .. "src/mame/machine/pcd_kbd.c",
-	MAME_DIR .. "src/mame/video/pcd.c",
+	MAME_DIR .. "src/mame/drivers/pcd.cpp",
+	MAME_DIR .. "src/mame/machine/pcd_kbd.cpp",
+	MAME_DIR .. "src/mame/video/pcd.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "slicer")
 files {
-	MAME_DIR .. "src/mame/drivers/slicer.c",
+	MAME_DIR .. "src/mame/drivers/slicer.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "snk")
 files {
-	MAME_DIR .. "src/mame/drivers/ng_aes.c",
-	MAME_DIR .. "src/mame/drivers/ngp.c",
-	MAME_DIR .. "src/mame/video/k1ge.c",
+	MAME_DIR .. "src/mame/drivers/ng_aes.cpp",
+	MAME_DIR .. "src/mame/drivers/ngp.cpp",
+	MAME_DIR .. "src/mame/video/k1ge.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "sony")
 files {
-	MAME_DIR .. "src/mame/drivers/pockstat.c",
-	MAME_DIR .. "src/mame/drivers/psx.c",
-	MAME_DIR .. "src/mame/machine/psxcd.c",
-	MAME_DIR .. "src/mame/drivers/pve500.c",
-	MAME_DIR .. "src/mame/drivers/smc777.c",
+	MAME_DIR .. "src/mame/drivers/pockstat.cpp",
+	MAME_DIR .. "src/mame/drivers/psx.cpp",
+	MAME_DIR .. "src/mame/machine/psxcd.cpp",
+	MAME_DIR .. "src/mame/drivers/pve500.cpp",
+	MAME_DIR .. "src/mame/drivers/smc777.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "sord")
 files {
-	MAME_DIR .. "src/mame/drivers/m5.c",
+	MAME_DIR .. "src/mame/drivers/m5.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "special")
 files {
-	MAME_DIR .. "src/mame/drivers/special.c",
-	MAME_DIR .. "src/mame/audio/specimx_snd.c",
-	MAME_DIR .. "src/mame/machine/special.c",
-	MAME_DIR .. "src/mame/video/special.c",
+	MAME_DIR .. "src/mame/drivers/special.cpp",
+	MAME_DIR .. "src/mame/audio/specimx_snd.cpp",
+	MAME_DIR .. "src/mame/machine/special.cpp",
+	MAME_DIR .. "src/mame/video/special.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "sun")
 files {
-	MAME_DIR .. "src/mame/drivers/sun1.c",
-	MAME_DIR .. "src/mame/drivers/sun2.c",
-	MAME_DIR .. "src/mame/drivers/sun3.c",
-	MAME_DIR .. "src/mame/drivers/sun4.c",
+	MAME_DIR .. "src/mame/drivers/sun1.cpp",
+	MAME_DIR .. "src/mame/drivers/sun2.cpp",
+	MAME_DIR .. "src/mame/drivers/sun3.cpp",
+	MAME_DIR .. "src/mame/drivers/sun4.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "svi")
 files {
-	MAME_DIR .. "src/mame/drivers/svi318.c",
-	MAME_DIR .. "src/mame/machine/svi318.c",
+	MAME_DIR .. "src/mame/drivers/svi318.cpp",
+	MAME_DIR .. "src/mame/machine/svi318.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "svision")
 files {
-	MAME_DIR .. "src/mame/drivers/svision.c",
-	MAME_DIR .. "src/mame/audio/svis_snd.c",
+	MAME_DIR .. "src/mame/drivers/svision.cpp",
+	MAME_DIR .. "src/mame/audio/svis_snd.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "swtpc09")
 files {
-	MAME_DIR .. "src/mame/drivers/swtpc09.c",
-	MAME_DIR .. "src/mame/machine/swtpc09.c",
+	MAME_DIR .. "src/mame/drivers/swtpc09.cpp",
+	MAME_DIR .. "src/mame/machine/swtpc09.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "synertec")
 files {
-	MAME_DIR .. "src/mame/drivers/sym1.c",
+	MAME_DIR .. "src/mame/drivers/sym1.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "ta")
 files {
-	MAME_DIR .. "src/mame/drivers/alphatro.c",
+	MAME_DIR .. "src/mame/drivers/alphatro.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "tandberg")
 files {
-	MAME_DIR .. "src/mame/drivers/tdv2324.c",
+	MAME_DIR .. "src/mame/drivers/tdv2324.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "tangerin")
 files {
-	MAME_DIR .. "src/mame/drivers/microtan.c",
-	MAME_DIR .. "src/mame/machine/microtan.c",
-	MAME_DIR .. "src/mame/video/microtan.c",
-	MAME_DIR .. "src/mame/drivers/oric.c",
+	MAME_DIR .. "src/mame/drivers/microtan.cpp",
+	MAME_DIR .. "src/mame/machine/microtan.cpp",
+	MAME_DIR .. "src/mame/video/microtan.cpp",
+	MAME_DIR .. "src/mame/drivers/oric.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "tatung")
 files {
-	MAME_DIR .. "src/mame/drivers/einstein.c",
-	MAME_DIR .. "src/mame/machine/einstein.c",
+	MAME_DIR .. "src/mame/drivers/einstein.cpp",
+	MAME_DIR .. "src/mame/machine/einstein.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "teamconc")
 files {
-	MAME_DIR .. "src/mame/drivers/comquest.c",
-	MAME_DIR .. "src/mame/video/comquest.c",
+	MAME_DIR .. "src/mame/drivers/comquest.cpp",
+	MAME_DIR .. "src/mame/video/comquest.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "tektroni")
 files {
-	MAME_DIR .. "src/mame/drivers/tek405x.c",
-	MAME_DIR .. "src/mame/drivers/tek410x.c",
+	MAME_DIR .. "src/mame/drivers/tek405x.cpp",
+	MAME_DIR .. "src/mame/drivers/tek410x.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "telenova")
 files {
-	MAME_DIR .. "src/mame/drivers/compis.c",
-	MAME_DIR .. "src/mame/machine/compiskb.c",
+	MAME_DIR .. "src/mame/drivers/compis.cpp",
+	MAME_DIR .. "src/mame/machine/compiskb.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "telercas")
 files {
-	MAME_DIR .. "src/mame/drivers/tmc1800.c",
-	MAME_DIR .. "src/mame/video/tmc1800.c",
-	MAME_DIR .. "src/mame/drivers/tmc600.c",
-	MAME_DIR .. "src/mame/video/tmc600.c",
-	MAME_DIR .. "src/mame/drivers/tmc2000e.c",
+	MAME_DIR .. "src/mame/drivers/tmc1800.cpp",
+	MAME_DIR .. "src/mame/video/tmc1800.cpp",
+	MAME_DIR .. "src/mame/drivers/tmc600.cpp",
+	MAME_DIR .. "src/mame/video/tmc600.cpp",
+	MAME_DIR .. "src/mame/drivers/tmc2000e.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "televideo")
 files {
-	MAME_DIR .. "src/mame/drivers/ts802.c",
-	MAME_DIR .. "src/mame/drivers/ts803.c",
-	MAME_DIR .. "src/mame/drivers/ts816.c",
-	MAME_DIR .. "src/mame/drivers/tv950.c",
+	MAME_DIR .. "src/mame/drivers/ts802.cpp",
+	MAME_DIR .. "src/mame/drivers/ts803.cpp",
+	MAME_DIR .. "src/mame/drivers/ts816.cpp",
+	MAME_DIR .. "src/mame/drivers/tv950.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "tem")
 files {
-	MAME_DIR .. "src/mame/drivers/tec1.c",
+	MAME_DIR .. "src/mame/drivers/tec1.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "tesla")
 files {
-	MAME_DIR .. "src/mame/drivers/ondra.c",
-	MAME_DIR .. "src/mame/machine/ondra.c",
-	MAME_DIR .. "src/mame/video/ondra.c",
-	MAME_DIR .. "src/mame/drivers/pmd85.c",
-	MAME_DIR .. "src/mame/machine/pmd85.c",
-	MAME_DIR .. "src/mame/drivers/pmi80.c",
-	MAME_DIR .. "src/mame/drivers/sapi1.c",
+	MAME_DIR .. "src/mame/drivers/ondra.cpp",
+	MAME_DIR .. "src/mame/machine/ondra.cpp",
+	MAME_DIR .. "src/mame/video/ondra.cpp",
+	MAME_DIR .. "src/mame/drivers/pmd85.cpp",
+	MAME_DIR .. "src/mame/machine/pmd85.cpp",
+	MAME_DIR .. "src/mame/drivers/pmi80.cpp",
+	MAME_DIR .. "src/mame/drivers/sapi1.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "test")
 files {
-	MAME_DIR .. "src/mame/drivers/test_t400.c",
-	MAME_DIR .. "src/mame/drivers/zexall.c",
+	MAME_DIR .. "src/mame/drivers/test_t400.cpp",
+	MAME_DIR .. "src/mame/drivers/zexall.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "thomson")
 files {
-	MAME_DIR .. "src/mame/drivers/thomson.c",
-	MAME_DIR .. "src/mame/machine/thomson.c",
-	MAME_DIR .. "src/mame/machine/thomflop.c",
-	MAME_DIR .. "src/mame/video/thomson.c",
+	MAME_DIR .. "src/mame/drivers/thomson.cpp",
+	MAME_DIR .. "src/mame/machine/thomson.cpp",
+	MAME_DIR .. "src/mame/machine/thomflop.cpp",
+	MAME_DIR .. "src/mame/video/thomson.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "ti")
 files {
-	MAME_DIR .. "src/mame/drivers/avigo.c",
-	MAME_DIR .. "src/mame/video/avigo.c",
-	MAME_DIR .. "src/mame/drivers/cc40.c",
-	MAME_DIR .. "src/mame/drivers/evmbug.c",
-	MAME_DIR .. "src/mame/drivers/exelv.c",
-	MAME_DIR .. "src/mame/drivers/geneve.c",
-	MAME_DIR .. "src/mame/drivers/ticalc1x.c",
-	MAME_DIR .. "src/mame/drivers/tispeak.c",
-	MAME_DIR .. "src/mame/drivers/ti74.c",
-	MAME_DIR .. "src/mame/drivers/ti85.c",
-	MAME_DIR .. "src/mame/machine/ti85.c",
-	MAME_DIR .. "src/mame/video/ti85.c",
-	MAME_DIR .. "src/mame/drivers/ti89.c",
-	MAME_DIR .. "src/mame/drivers/ti99_2.c",
-	MAME_DIR .. "src/mame/drivers/ti99_4x.c",
-	MAME_DIR .. "src/mame/drivers/ti99_4p.c",
-	MAME_DIR .. "src/mame/drivers/ti99_8.c",
-	MAME_DIR .. "src/mame/drivers/ti990_4.c",
-	MAME_DIR .. "src/mame/drivers/ti990_10.c",
-	MAME_DIR .. "src/mame/drivers/tm990189.c",
-	MAME_DIR .. "src/mame/video/733_asr.c",
-	MAME_DIR .. "src/mame/video/911_vdt.c",
-	MAME_DIR .. "src/mame/drivers/hh_tms1k.c",
+	MAME_DIR .. "src/mame/drivers/avigo.cpp",
+	MAME_DIR .. "src/mame/video/avigo.cpp",
+	MAME_DIR .. "src/mame/drivers/cc40.cpp",
+	MAME_DIR .. "src/mame/drivers/evmbug.cpp",
+	MAME_DIR .. "src/mame/drivers/exelv.cpp",
+	MAME_DIR .. "src/mame/drivers/geneve.cpp",
+	MAME_DIR .. "src/mame/drivers/ticalc1x.cpp",
+	MAME_DIR .. "src/mame/drivers/tispeak.cpp",
+	MAME_DIR .. "src/mame/drivers/ti74.cpp",
+	MAME_DIR .. "src/mame/drivers/ti85.cpp",
+	MAME_DIR .. "src/mame/machine/ti85.cpp",
+	MAME_DIR .. "src/mame/video/ti85.cpp",
+	MAME_DIR .. "src/mame/drivers/ti89.cpp",
+	MAME_DIR .. "src/mame/drivers/ti99_2.cpp",
+	MAME_DIR .. "src/mame/drivers/ti99_4x.cpp",
+	MAME_DIR .. "src/mame/drivers/ti99_4p.cpp",
+	MAME_DIR .. "src/mame/drivers/ti99_8.cpp",
+	MAME_DIR .. "src/mame/drivers/ti990_4.cpp",
+	MAME_DIR .. "src/mame/drivers/ti990_10.cpp",
+	MAME_DIR .. "src/mame/drivers/tm990189.cpp",
+	MAME_DIR .. "src/mame/video/733_asr.cpp",
+	MAME_DIR .. "src/mame/video/911_vdt.cpp",
+	MAME_DIR .. "src/mame/drivers/hh_tms1k.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "tiger")
 files {
-	MAME_DIR .. "src/mame/drivers/gamecom.c",
-	MAME_DIR .. "src/mame/machine/gamecom.c",
-	MAME_DIR .. "src/mame/video/gamecom.c",
+	MAME_DIR .. "src/mame/drivers/gamecom.cpp",
+	MAME_DIR .. "src/mame/machine/gamecom.cpp",
+	MAME_DIR .. "src/mame/video/gamecom.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "tigertel")
 files {
-	MAME_DIR .. "src/mame/drivers/gizmondo.c",
-	MAME_DIR .. "src/mame/machine/docg3.c",
+	MAME_DIR .. "src/mame/drivers/gizmondo.cpp",
+	MAME_DIR .. "src/mame/machine/docg3.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "tiki")
 files {
-	MAME_DIR .. "src/mame/drivers/tiki100.c",
+	MAME_DIR .. "src/mame/drivers/tiki100.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "tomy")
 files {
-	MAME_DIR .. "src/mame/drivers/tutor.c",
+	MAME_DIR .. "src/mame/drivers/tutor.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "toshiba")
 files {
-	MAME_DIR .. "src/mame/drivers/pasopia.c",
-	MAME_DIR .. "src/mame/drivers/pasopia7.c",
-	MAME_DIR .. "src/mame/drivers/paso1600.c",
+	MAME_DIR .. "src/mame/drivers/pasopia.cpp",
+	MAME_DIR .. "src/mame/drivers/pasopia7.cpp",
+	MAME_DIR .. "src/mame/drivers/paso1600.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "trainer")
 files {
-	MAME_DIR .. "src/mame/drivers/amico2k.c",
-	MAME_DIR .. "src/mame/drivers/babbage.c",
-	MAME_DIR .. "src/mame/drivers/bob85.c",
-	MAME_DIR .. "src/mame/drivers/cvicny.c",
-	MAME_DIR .. "src/mame/drivers/dolphunk.c",
-	MAME_DIR .. "src/mame/drivers/instruct.c",
-	MAME_DIR .. "src/mame/drivers/mk14.c",
-	MAME_DIR .. "src/mame/drivers/pro80.c",
-	MAME_DIR .. "src/mame/drivers/savia84.c",
-	MAME_DIR .. "src/mame/drivers/selz80.c",
-	MAME_DIR .. "src/mame/drivers/tk80.c",
-	MAME_DIR .. "src/mame/drivers/zapcomputer.c",
+	MAME_DIR .. "src/mame/drivers/amico2k.cpp",
+	MAME_DIR .. "src/mame/drivers/babbage.cpp",
+	MAME_DIR .. "src/mame/drivers/bob85.cpp",
+	MAME_DIR .. "src/mame/drivers/cvicny.cpp",
+	MAME_DIR .. "src/mame/drivers/dolphunk.cpp",
+	MAME_DIR .. "src/mame/drivers/instruct.cpp",
+	MAME_DIR .. "src/mame/drivers/mk14.cpp",
+	MAME_DIR .. "src/mame/drivers/pro80.cpp",
+	MAME_DIR .. "src/mame/drivers/savia84.cpp",
+	MAME_DIR .. "src/mame/drivers/selz80.cpp",
+	MAME_DIR .. "src/mame/drivers/tk80.cpp",
+	MAME_DIR .. "src/mame/drivers/zapcomputer.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "trs")
 files {
-	MAME_DIR .. "src/mame/drivers/coco12.c",
-	MAME_DIR .. "src/mame/drivers/coco3.c",
-	MAME_DIR .. "src/mame/drivers/dragon.c",
-	MAME_DIR .. "src/mame/drivers/mc10.c",
-	MAME_DIR .. "src/mame/machine/6883sam.c",
-	MAME_DIR .. "src/mame/machine/coco.c",
-	MAME_DIR .. "src/mame/machine/coco12.c",
-	MAME_DIR .. "src/mame/machine/coco3.c",
-	MAME_DIR .. "src/mame/machine/coco_vhd.c",
-	MAME_DIR .. "src/mame/machine/dragon.c",
-	MAME_DIR .. "src/mame/machine/dgnalpha.c",
-	MAME_DIR .. "src/mame/video/gime.c",
-	MAME_DIR .. "src/mame/drivers/trs80.c",
-	MAME_DIR .. "src/mame/machine/trs80.c",
-	MAME_DIR .. "src/mame/video/trs80.c",
-	MAME_DIR .. "src/mame/drivers/trs80m2.c",
-	MAME_DIR .. "src/mame/machine/trs80m2kb.c",
-	MAME_DIR .. "src/mame/drivers/tandy2k.c",
-	MAME_DIR .. "src/mame/machine/tandy2kb.c",
+	MAME_DIR .. "src/mame/drivers/coco12.cpp",
+	MAME_DIR .. "src/mame/drivers/coco3.cpp",
+	MAME_DIR .. "src/mame/drivers/dragon.cpp",
+	MAME_DIR .. "src/mame/drivers/mc10.cpp",
+	MAME_DIR .. "src/mame/machine/6883sam.cpp",
+	MAME_DIR .. "src/mame/machine/coco.cpp",
+	MAME_DIR .. "src/mame/machine/coco12.cpp",
+	MAME_DIR .. "src/mame/machine/coco3.cpp",
+	MAME_DIR .. "src/mame/machine/coco_vhd.cpp",
+	MAME_DIR .. "src/mame/machine/dragon.cpp",
+	MAME_DIR .. "src/mame/machine/dgnalpha.cpp",
+	MAME_DIR .. "src/mame/video/gime.cpp",
+	MAME_DIR .. "src/mame/drivers/trs80.cpp",
+	MAME_DIR .. "src/mame/machine/trs80.cpp",
+	MAME_DIR .. "src/mame/video/trs80.cpp",
+	MAME_DIR .. "src/mame/drivers/trs80m2.cpp",
+	MAME_DIR .. "src/mame/machine/trs80m2kb.cpp",
+	MAME_DIR .. "src/mame/drivers/tandy2k.cpp",
+	MAME_DIR .. "src/mame/machine/tandy2kb.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "ultimachine")
 files {
-	MAME_DIR .. "src/mame/drivers/rambo.c",
+	MAME_DIR .. "src/mame/drivers/rambo.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "ultratec")
 files {
-	MAME_DIR .. "src/mame/drivers/minicom.c",
+	MAME_DIR .. "src/mame/drivers/minicom.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "unisonic")
 files {
-	MAME_DIR .. "src/mame/drivers/unichamp.c",
-	MAME_DIR .. "src/mame/video/gic.c",
-	MAME_DIR .. "src/mame/video/gic.c",
+	MAME_DIR .. "src/mame/drivers/unichamp.cpp",
+	MAME_DIR .. "src/mame/video/gic.cpp",
+	MAME_DIR .. "src/mame/video/gic.cpp",
 }
 
 
 createMESSProjects(_target, _subtarget, "unisys")
 files {
-	MAME_DIR .. "src/mame/drivers/univac.c",
+	MAME_DIR .. "src/mame/drivers/univac.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "veb")
 files {
-	MAME_DIR .. "src/mame/drivers/chessmst.c",
-	MAME_DIR .. "src/mame/drivers/kc.c",
-	MAME_DIR .. "src/mame/machine/kc.c",
-	MAME_DIR .. "src/mame/machine/kc_keyb.c",
-	MAME_DIR .. "src/mame/video/kc.c",
-	MAME_DIR .. "src/mame/drivers/lc80.c",
-	MAME_DIR .. "src/mame/drivers/mc80.c",
-	MAME_DIR .. "src/mame/machine/mc80.c",
-	MAME_DIR .. "src/mame/video/mc80.c",
-	MAME_DIR .. "src/mame/drivers/poly880.c",
-	MAME_DIR .. "src/mame/drivers/sc1.c",
-	MAME_DIR .. "src/mame/drivers/sc2.c",
+	MAME_DIR .. "src/mame/drivers/chessmst.cpp",
+	MAME_DIR .. "src/mame/drivers/kc.cpp",
+	MAME_DIR .. "src/mame/machine/kc.cpp",
+	MAME_DIR .. "src/mame/machine/kc_keyb.cpp",
+	MAME_DIR .. "src/mame/video/kc.cpp",
+	MAME_DIR .. "src/mame/drivers/lc80.cpp",
+	MAME_DIR .. "src/mame/drivers/mc80.cpp",
+	MAME_DIR .. "src/mame/machine/mc80.cpp",
+	MAME_DIR .. "src/mame/video/mc80.cpp",
+	MAME_DIR .. "src/mame/drivers/poly880.cpp",
+	MAME_DIR .. "src/mame/drivers/sc1.cpp",
+	MAME_DIR .. "src/mame/drivers/sc2.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "vidbrain")
 files {
-	MAME_DIR .. "src/mame/drivers/vidbrain.c",
-	MAME_DIR .. "src/mame/video/uv201.c",
+	MAME_DIR .. "src/mame/drivers/vidbrain.cpp",
+	MAME_DIR .. "src/mame/video/uv201.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "videoton")
 files {
-	MAME_DIR .. "src/mame/drivers/tvc.c",
-	MAME_DIR .. "src/mame/audio/tvc_snd.c",
+	MAME_DIR .. "src/mame/drivers/tvc.cpp",
+	MAME_DIR .. "src/mame/audio/tvc_snd.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "visual")
 files {
-	MAME_DIR .. "src/mame/drivers/v1050.c",
-	MAME_DIR .. "src/mame/machine/v1050kb.c",
-	MAME_DIR .. "src/mame/video/v1050.c",
+	MAME_DIR .. "src/mame/drivers/v1050.cpp",
+	MAME_DIR .. "src/mame/machine/v1050kb.cpp",
+	MAME_DIR .. "src/mame/video/v1050.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "votrax")
 files {
-	MAME_DIR .. "src/mame/drivers/votrpss.c",
-	MAME_DIR .. "src/mame/drivers/votrtnt.c",
+	MAME_DIR .. "src/mame/drivers/votrpss.cpp",
+	MAME_DIR .. "src/mame/drivers/votrtnt.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "vtech")
 files {
-	MAME_DIR .. "src/mame/drivers/crvision.c",
-	MAME_DIR .. "src/mame/drivers/geniusiq.c",
-	MAME_DIR .. "src/mame/drivers/laser3k.c",
-	MAME_DIR .. "src/mame/drivers/lcmate2.c",
-	MAME_DIR .. "src/mame/drivers/pc4.c",
-	MAME_DIR .. "src/mame/video/pc4.c",
-	MAME_DIR .. "src/mame/drivers/pc2000.c",
-	MAME_DIR .. "src/mame/drivers/pitagjr.c",
-	MAME_DIR .. "src/mame/drivers/prestige.c",
-	MAME_DIR .. "src/mame/drivers/vtech1.c",
-	MAME_DIR .. "src/mame/drivers/vtech2.c",
-	MAME_DIR .. "src/mame/machine/vtech2.c",
-	MAME_DIR .. "src/mame/video/vtech2.c",
-	MAME_DIR .. "src/mame/drivers/socrates.c",
-	MAME_DIR .. "src/mame/audio/socrates.c",
+	MAME_DIR .. "src/mame/drivers/crvision.cpp",
+	MAME_DIR .. "src/mame/drivers/geniusiq.cpp",
+	MAME_DIR .. "src/mame/drivers/laser3k.cpp",
+	MAME_DIR .. "src/mame/drivers/lcmate2.cpp",
+	MAME_DIR .. "src/mame/drivers/pc4.cpp",
+	MAME_DIR .. "src/mame/video/pc4.cpp",
+	MAME_DIR .. "src/mame/drivers/pc2000.cpp",
+	MAME_DIR .. "src/mame/drivers/pitagjr.cpp",
+	MAME_DIR .. "src/mame/drivers/prestige.cpp",
+	MAME_DIR .. "src/mame/drivers/vtech1.cpp",
+	MAME_DIR .. "src/mame/drivers/vtech2.cpp",
+	MAME_DIR .. "src/mame/machine/vtech2.cpp",
+	MAME_DIR .. "src/mame/video/vtech2.cpp",
+	MAME_DIR .. "src/mame/drivers/socrates.cpp",
+	MAME_DIR .. "src/mame/audio/socrates.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "wang")
 files {
-	MAME_DIR .. "src/mame/drivers/wangpc.c",
-	MAME_DIR .. "src/mame/machine/wangpckb.c",
+	MAME_DIR .. "src/mame/drivers/wangpc.cpp",
+	MAME_DIR .. "src/mame/machine/wangpckb.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "wavemate")
 files {
-	MAME_DIR .. "src/mame/drivers/bullet.c",
-	MAME_DIR .. "src/mame/drivers/jupiter.c",
+	MAME_DIR .. "src/mame/drivers/bullet.cpp",
+	MAME_DIR .. "src/mame/drivers/jupiter.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "xerox")
 files {
-	MAME_DIR .. "src/mame/drivers/xerox820.c",
-	MAME_DIR .. "src/mame/machine/x820kb.c",
-	MAME_DIR .. "src/mame/drivers/bigbord2.c",
-	MAME_DIR .. "src/mame/drivers/alto2.c",
+	MAME_DIR .. "src/mame/drivers/xerox820.cpp",
+	MAME_DIR .. "src/mame/machine/x820kb.cpp",
+	MAME_DIR .. "src/mame/drivers/bigbord2.cpp",
+	MAME_DIR .. "src/mame/drivers/alto2.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "xussrpc")
 files {
-	MAME_DIR .. "src/mame/drivers/ec184x.c",
-	MAME_DIR .. "src/mame/drivers/iskr103x.c",
-	MAME_DIR .. "src/mame/drivers/mc1502.c",
-	MAME_DIR .. "src/mame/drivers/poisk1.c",
-	MAME_DIR .. "src/mame/video/poisk1.c",
+	MAME_DIR .. "src/mame/drivers/ec184x.cpp",
+	MAME_DIR .. "src/mame/drivers/iskr103x.cpp",
+	MAME_DIR .. "src/mame/drivers/mc1502.cpp",
+	MAME_DIR .. "src/mame/drivers/poisk1.cpp",
+	MAME_DIR .. "src/mame/video/poisk1.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "yamaha")
 files {
-	MAME_DIR .. "src/mame/drivers/ymmu100.c",
-	MAME_DIR .. "src/mame/drivers/fb01.c",
+	MAME_DIR .. "src/mame/drivers/ymmu100.cpp",
+	MAME_DIR .. "src/mame/drivers/fb01.cpp",
 }
 dependency {
-	{ MAME_DIR .. "src/mame/drivers/ymmu100.c",    GEN_DIR .. "mame/drivers/ymmu100.inc" },
+	{ MAME_DIR .. "src/mame/drivers/ymmu100.cpp",    GEN_DIR .. "mame/drivers/ymmu100.inc" },
 }
 custombuildtask {
 	{ MAME_DIR .. "src/mame/drivers/ymmu100.ppm", GEN_DIR .. "mame/drivers/ymmu100.inc",  {  MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting src/drivers/ymmu100.ppm...", PYTHON .. " $(1) $(<) $(@) ymmu100_bkg UINT8" }},
@@ -2599,157 +2599,157 @@ custombuildtask {
 
 createMESSProjects(_target, _subtarget, "zenith")
 files {
-	MAME_DIR .. "src/mame/drivers/z100.c",
+	MAME_DIR .. "src/mame/drivers/z100.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "zpa")
 files {
-	MAME_DIR .. "src/mame/drivers/iq151.c",
+	MAME_DIR .. "src/mame/drivers/iq151.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "zvt")
 files {
-	MAME_DIR .. "src/mame/drivers/pp01.c",
-	MAME_DIR .. "src/mame/machine/pp01.c",
-	MAME_DIR .. "src/mame/video/pp01.c",
+	MAME_DIR .. "src/mame/drivers/pp01.cpp",
+	MAME_DIR .. "src/mame/machine/pp01.cpp",
+	MAME_DIR .. "src/mame/video/pp01.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "skeleton")
 files {
-	MAME_DIR .. "src/mame/drivers/alphasma.c",
-	MAME_DIR .. "src/mame/drivers/ampro.c",
-	MAME_DIR .. "src/mame/drivers/amust.c",
-	MAME_DIR .. "src/mame/drivers/applix.c",
-	MAME_DIR .. "src/mame/drivers/attache.c",
-	MAME_DIR .. "src/mame/drivers/aussiebyte.c",
-	MAME_DIR .. "src/mame/video/aussiebyte.c",
-	MAME_DIR .. "src/mame/drivers/ax20.c",
-	MAME_DIR .. "src/mame/drivers/beehive.c",
-	MAME_DIR .. "src/mame/drivers/binbug.c",
-	MAME_DIR .. "src/mame/drivers/besta.c",
-	MAME_DIR .. "src/mame/drivers/bitgraph.c",
-	MAME_DIR .. "src/mame/drivers/br8641.c",
-	MAME_DIR .. "src/mame/drivers/busicom.c",
-	MAME_DIR .. "src/mame/video/busicom.c",
-	MAME_DIR .. "src/mame/drivers/chaos.c",
-	MAME_DIR .. "src/mame/drivers/chesstrv.c",
-	MAME_DIR .. "src/mame/drivers/cd2650.c",
-	MAME_DIR .. "src/mame/drivers/cdc721.c",
-	MAME_DIR .. "src/mame/drivers/codata.c",
-	MAME_DIR .. "src/mame/drivers/cortex.c",
-	MAME_DIR .. "src/mame/drivers/cosmicos.c",
-	MAME_DIR .. "src/mame/drivers/cp1.c",
-	MAME_DIR .. "src/mame/drivers/cxhumax.c",
-	MAME_DIR .. "src/mame/drivers/czk80.c",
-	MAME_DIR .. "src/mame/drivers/d6800.c",
-	MAME_DIR .. "src/mame/drivers/d6809.c",
-	MAME_DIR .. "src/mame/drivers/daruma.c",
-	MAME_DIR .. "src/mame/drivers/digel804.c",
-	MAME_DIR .. "src/mame/drivers/dim68k.c",
-	MAME_DIR .. "src/mame/drivers/dm7000.c",
-	MAME_DIR .. "src/mame/drivers/dmv.c",
-	MAME_DIR .. "src/mame/machine/dmv_keyb.c",
-	MAME_DIR .. "src/mame/drivers/dps1.c",
-	MAME_DIR .. "src/mame/drivers/dsb46.c",
-	MAME_DIR .. "src/mame/drivers/dual68.c",
-	MAME_DIR .. "src/mame/drivers/eacc.c",
-	MAME_DIR .. "src/mame/drivers/elwro800.c",
-	MAME_DIR .. "src/mame/drivers/eti660.c",
-	MAME_DIR .. "src/mame/drivers/excali64.c",
-	MAME_DIR .. "src/mame/drivers/fanucs15.c",
-	MAME_DIR .. "src/mame/drivers/fanucspmg.c",
-	MAME_DIR .. "src/mame/drivers/fc100.c",
-	MAME_DIR .. "src/mame/drivers/fk1.c",
-	MAME_DIR .. "src/mame/drivers/ft68m.c",
-	MAME_DIR .. "src/mame/drivers/gamate.c",
-	MAME_DIR .. "src/mame/audio/gamate.c",
-	MAME_DIR .. "src/mame/drivers/gameking.c",
-	MAME_DIR .. "src/mame/drivers/gimix.c",
-	MAME_DIR .. "src/mame/drivers/grfd2301.c",
-	MAME_DIR .. "src/mame/drivers/harriet.c",
-	MAME_DIR .. "src/mame/drivers/hprot1.c",
-	MAME_DIR .. "src/mame/drivers/hpz80unk.c",
-	MAME_DIR .. "src/mame/drivers/ht68k.c",
-	MAME_DIR .. "src/mame/drivers/hunter2.c",
-	MAME_DIR .. "src/mame/drivers/i7000.c",
-	MAME_DIR .. "src/mame/drivers/ibm6580.c",
-	MAME_DIR .. "src/mame/drivers/icatel.c",
-	MAME_DIR .. "src/mame/drivers/ie15.c",
-	MAME_DIR .. "src/mame/machine/ie15_kbd.c",
-	MAME_DIR .. "src/mame/drivers/if800.c",
-	MAME_DIR .. "src/mame/drivers/imsai.c",
-	MAME_DIR .. "src/mame/drivers/indiana.c",
-	MAME_DIR .. "src/mame/drivers/itt3030.c",
-	MAME_DIR .. "src/mame/drivers/jade.c",
-	MAME_DIR .. "src/mame/drivers/jonos.c",
-	MAME_DIR .. "src/mame/drivers/konin.c",
-	MAME_DIR .. "src/mame/drivers/leapster.c",
-	MAME_DIR .. "src/mame/drivers/lft.c",
-	MAME_DIR .. "src/mame/drivers/lg-dvd.c",
-	MAME_DIR .. "src/mame/drivers/lola8a.c",
-	MAME_DIR .. "src/mame/drivers/m79152pc.c",
-	MAME_DIR .. "src/mame/drivers/mccpm.c",
-	MAME_DIR .. "src/mame/drivers/mes.c",
-	MAME_DIR .. "src/mame/drivers/mice.c",
-	MAME_DIR .. "src/mame/drivers/micral.c",
-	MAME_DIR .. "src/mame/drivers/micronic.c",
-	MAME_DIR .. "src/mame/drivers/mini2440.c",
-	MAME_DIR .. "src/mame/drivers/mmd1.c",
-	MAME_DIR .. "src/mame/drivers/mod8.c",
-	MAME_DIR .. "src/mame/drivers/modellot.c",
-	MAME_DIR .. "src/mame/drivers/molecular.c",
-	MAME_DIR .. "src/mame/drivers/ms0515.c",
-	MAME_DIR .. "src/mame/drivers/ms9540.c",
-	MAME_DIR .. "src/mame/drivers/mstation.c",
-	MAME_DIR .. "src/mame/drivers/mt735.c",
-	MAME_DIR .. "src/mame/drivers/mx2178.c",
-	MAME_DIR .. "src/mame/drivers/mycom.c",
-	MAME_DIR .. "src/mame/drivers/myvision.c",
-	MAME_DIR .. "src/mame/drivers/ngen.c",
-	MAME_DIR .. "src/mame/machine/ngen_kb.c",
-	MAME_DIR .. "src/mame/drivers/octopus.c",
-	MAME_DIR .. "src/mame/drivers/onyx.c",
-	MAME_DIR .. "src/mame/drivers/okean240.c",
-	MAME_DIR .. "src/mame/drivers/p8k.c",
-	MAME_DIR .. "src/mame/drivers/pegasus.c",
-	MAME_DIR .. "src/mame/drivers/pencil2.c",
-	MAME_DIR .. "src/mame/drivers/pes.c",
-	MAME_DIR .. "src/mame/drivers/pipbug.c",
-	MAME_DIR .. "src/mame/drivers/plan80.c",
-	MAME_DIR .. "src/mame/drivers/pm68k.c",
-	MAME_DIR .. "src/mame/drivers/poly.c",
-	MAME_DIR .. "src/mame/drivers/proteus3.c",
-	MAME_DIR .. "src/mame/drivers/pt68k4.c",
-	MAME_DIR .. "src/mame/drivers/ptcsol.c",
-	MAME_DIR .. "src/mame/drivers/pulsar.c",
-	MAME_DIR .. "src/mame/drivers/pv9234.c",
-	MAME_DIR .. "src/mame/drivers/qtsbc.c",
-	MAME_DIR .. "src/mame/drivers/rd100.c",
-	MAME_DIR .. "src/mame/drivers/rvoice.c",
-	MAME_DIR .. "src/mame/drivers/sacstate.c",
-	MAME_DIR .. "src/mame/drivers/sbrain.c",
-	MAME_DIR .. "src/mame/drivers/seattlecmp.c",
-	MAME_DIR .. "src/mame/drivers/sh4robot.c",
-	MAME_DIR .. "src/mame/drivers/softbox.c",
-	MAME_DIR .. "src/mame/drivers/squale.c",
-	MAME_DIR .. "src/mame/drivers/swtpc.c",
-	MAME_DIR .. "src/mame/drivers/swyft.c",
-	MAME_DIR .. "src/mame/drivers/sys2900.c",
-	MAME_DIR .. "src/mame/drivers/systec.c",
-	MAME_DIR .. "src/mame/drivers/tavernie.c",
-	MAME_DIR .. "src/mame/drivers/tecnbras.c",
-	MAME_DIR .. "src/mame/drivers/terak.c",
-	MAME_DIR .. "src/mame/drivers/ti630.c",
-	MAME_DIR .. "src/mame/drivers/tsispch.c",
-	MAME_DIR .. "src/mame/drivers/tvgame.c",
-	MAME_DIR .. "src/mame/drivers/unistar.c",
-	MAME_DIR .. "src/mame/drivers/v6809.c",
-	MAME_DIR .. "src/mame/drivers/vector4.c",
-	MAME_DIR .. "src/mame/drivers/vii.c",
-	MAME_DIR .. "src/mame/drivers/wicat.c",
-	MAME_DIR .. "src/mame/drivers/xor100.c",
-	MAME_DIR .. "src/mame/drivers/xavix.c",
-	MAME_DIR .. "src/mame/drivers/zorba.c",
+	MAME_DIR .. "src/mame/drivers/alphasma.cpp",
+	MAME_DIR .. "src/mame/drivers/ampro.cpp",
+	MAME_DIR .. "src/mame/drivers/amust.cpp",
+	MAME_DIR .. "src/mame/drivers/applix.cpp",
+	MAME_DIR .. "src/mame/drivers/attache.cpp",
+	MAME_DIR .. "src/mame/drivers/aussiebyte.cpp",
+	MAME_DIR .. "src/mame/video/aussiebyte.cpp",
+	MAME_DIR .. "src/mame/drivers/ax20.cpp",
+	MAME_DIR .. "src/mame/drivers/beehive.cpp",
+	MAME_DIR .. "src/mame/drivers/binbug.cpp",
+	MAME_DIR .. "src/mame/drivers/besta.cpp",
+	MAME_DIR .. "src/mame/drivers/bitgraph.cpp",
+	MAME_DIR .. "src/mame/drivers/br8641.cpp",
+	MAME_DIR .. "src/mame/drivers/busicom.cpp",
+	MAME_DIR .. "src/mame/video/busicom.cpp",
+	MAME_DIR .. "src/mame/drivers/chaos.cpp",
+	MAME_DIR .. "src/mame/drivers/chesstrv.cpp",
+	MAME_DIR .. "src/mame/drivers/cd2650.cpp",
+	MAME_DIR .. "src/mame/drivers/cdc721.cpp",
+	MAME_DIR .. "src/mame/drivers/codata.cpp",
+	MAME_DIR .. "src/mame/drivers/cortex.cpp",
+	MAME_DIR .. "src/mame/drivers/cosmicos.cpp",
+	MAME_DIR .. "src/mame/drivers/cp1.cpp",
+	MAME_DIR .. "src/mame/drivers/cxhumax.cpp",
+	MAME_DIR .. "src/mame/drivers/czk80.cpp",
+	MAME_DIR .. "src/mame/drivers/d6800.cpp",
+	MAME_DIR .. "src/mame/drivers/d6809.cpp",
+	MAME_DIR .. "src/mame/drivers/daruma.cpp",
+	MAME_DIR .. "src/mame/drivers/digel804.cpp",
+	MAME_DIR .. "src/mame/drivers/dim68k.cpp",
+	MAME_DIR .. "src/mame/drivers/dm7000.cpp",
+	MAME_DIR .. "src/mame/drivers/dmv.cpp",
+	MAME_DIR .. "src/mame/machine/dmv_keyb.cpp",
+	MAME_DIR .. "src/mame/drivers/dps1.cpp",
+	MAME_DIR .. "src/mame/drivers/dsb46.cpp",
+	MAME_DIR .. "src/mame/drivers/dual68.cpp",
+	MAME_DIR .. "src/mame/drivers/eacc.cpp",
+	MAME_DIR .. "src/mame/drivers/elwro800.cpp",
+	MAME_DIR .. "src/mame/drivers/eti660.cpp",
+	MAME_DIR .. "src/mame/drivers/excali64.cpp",
+	MAME_DIR .. "src/mame/drivers/fanucs15.cpp",
+	MAME_DIR .. "src/mame/drivers/fanucspmg.cpp",
+	MAME_DIR .. "src/mame/drivers/fc100.cpp",
+	MAME_DIR .. "src/mame/drivers/fk1.cpp",
+	MAME_DIR .. "src/mame/drivers/ft68m.cpp",
+	MAME_DIR .. "src/mame/drivers/gamate.cpp",
+	MAME_DIR .. "src/mame/audio/gamate.cpp",
+	MAME_DIR .. "src/mame/drivers/gameking.cpp",
+	MAME_DIR .. "src/mame/drivers/gimix.cpp",
+	MAME_DIR .. "src/mame/drivers/grfd2301.cpp",
+	MAME_DIR .. "src/mame/drivers/harriet.cpp",
+	MAME_DIR .. "src/mame/drivers/hprot1.cpp",
+	MAME_DIR .. "src/mame/drivers/hpz80unk.cpp",
+	MAME_DIR .. "src/mame/drivers/ht68k.cpp",
+	MAME_DIR .. "src/mame/drivers/hunter2.cpp",
+	MAME_DIR .. "src/mame/drivers/i7000.cpp",
+	MAME_DIR .. "src/mame/drivers/ibm6580.cpp",
+	MAME_DIR .. "src/mame/drivers/icatel.cpp",
+	MAME_DIR .. "src/mame/drivers/ie15.cpp",
+	MAME_DIR .. "src/mame/machine/ie15_kbd.cpp",
+	MAME_DIR .. "src/mame/drivers/if800.cpp",
+	MAME_DIR .. "src/mame/drivers/imsai.cpp",
+	MAME_DIR .. "src/mame/drivers/indiana.cpp",
+	MAME_DIR .. "src/mame/drivers/itt3030.cpp",
+	MAME_DIR .. "src/mame/drivers/jade.cpp",
+	MAME_DIR .. "src/mame/drivers/jonos.cpp",
+	MAME_DIR .. "src/mame/drivers/konin.cpp",
+	MAME_DIR .. "src/mame/drivers/leapster.cpp",
+	MAME_DIR .. "src/mame/drivers/lft.cpp",
+	MAME_DIR .. "src/mame/drivers/lg-dvd.cpp",
+	MAME_DIR .. "src/mame/drivers/lola8a.cpp",
+	MAME_DIR .. "src/mame/drivers/m79152pc.cpp",
+	MAME_DIR .. "src/mame/drivers/mccpm.cpp",
+	MAME_DIR .. "src/mame/drivers/mes.cpp",
+	MAME_DIR .. "src/mame/drivers/mice.cpp",
+	MAME_DIR .. "src/mame/drivers/micral.cpp",
+	MAME_DIR .. "src/mame/drivers/micronic.cpp",
+	MAME_DIR .. "src/mame/drivers/mini2440.cpp",
+	MAME_DIR .. "src/mame/drivers/mmd1.cpp",
+	MAME_DIR .. "src/mame/drivers/mod8.cpp",
+	MAME_DIR .. "src/mame/drivers/modellot.cpp",
+	MAME_DIR .. "src/mame/drivers/molecular.cpp",
+	MAME_DIR .. "src/mame/drivers/ms0515.cpp",
+	MAME_DIR .. "src/mame/drivers/ms9540.cpp",
+	MAME_DIR .. "src/mame/drivers/mstation.cpp",
+	MAME_DIR .. "src/mame/drivers/mt735.cpp",
+	MAME_DIR .. "src/mame/drivers/mx2178.cpp",
+	MAME_DIR .. "src/mame/drivers/mycom.cpp",
+	MAME_DIR .. "src/mame/drivers/myvision.cpp",
+	MAME_DIR .. "src/mame/drivers/ngen.cpp",
+	MAME_DIR .. "src/mame/machine/ngen_kb.cpp",
+	MAME_DIR .. "src/mame/drivers/octopus.cpp",
+	MAME_DIR .. "src/mame/drivers/onyx.cpp",
+	MAME_DIR .. "src/mame/drivers/okean240.cpp",
+	MAME_DIR .. "src/mame/drivers/p8k.cpp",
+	MAME_DIR .. "src/mame/drivers/pegasus.cpp",
+	MAME_DIR .. "src/mame/drivers/pencil2.cpp",
+	MAME_DIR .. "src/mame/drivers/pes.cpp",
+	MAME_DIR .. "src/mame/drivers/pipbug.cpp",
+	MAME_DIR .. "src/mame/drivers/plan80.cpp",
+	MAME_DIR .. "src/mame/drivers/pm68k.cpp",
+	MAME_DIR .. "src/mame/drivers/poly.cpp",
+	MAME_DIR .. "src/mame/drivers/proteus3.cpp",
+	MAME_DIR .. "src/mame/drivers/pt68k4.cpp",
+	MAME_DIR .. "src/mame/drivers/ptcsol.cpp",
+	MAME_DIR .. "src/mame/drivers/pulsar.cpp",
+	MAME_DIR .. "src/mame/drivers/pv9234.cpp",
+	MAME_DIR .. "src/mame/drivers/qtsbc.cpp",
+	MAME_DIR .. "src/mame/drivers/rd100.cpp",
+	MAME_DIR .. "src/mame/drivers/rvoice.cpp",
+	MAME_DIR .. "src/mame/drivers/sacstate.cpp",
+	MAME_DIR .. "src/mame/drivers/sbrain.cpp",
+	MAME_DIR .. "src/mame/drivers/seattlecmp.cpp",
+	MAME_DIR .. "src/mame/drivers/sh4robot.cpp",
+	MAME_DIR .. "src/mame/drivers/softbox.cpp",
+	MAME_DIR .. "src/mame/drivers/squale.cpp",
+	MAME_DIR .. "src/mame/drivers/swtpc.cpp",
+	MAME_DIR .. "src/mame/drivers/swyft.cpp",
+	MAME_DIR .. "src/mame/drivers/sys2900.cpp",
+	MAME_DIR .. "src/mame/drivers/systec.cpp",
+	MAME_DIR .. "src/mame/drivers/tavernie.cpp",
+	MAME_DIR .. "src/mame/drivers/tecnbras.cpp",
+	MAME_DIR .. "src/mame/drivers/terak.cpp",
+	MAME_DIR .. "src/mame/drivers/ti630.cpp",
+	MAME_DIR .. "src/mame/drivers/tsispch.cpp",
+	MAME_DIR .. "src/mame/drivers/tvgame.cpp",
+	MAME_DIR .. "src/mame/drivers/unistar.cpp",
+	MAME_DIR .. "src/mame/drivers/v6809.cpp",
+	MAME_DIR .. "src/mame/drivers/vector4.cpp",
+	MAME_DIR .. "src/mame/drivers/vii.cpp",
+	MAME_DIR .. "src/mame/drivers/wicat.cpp",
+	MAME_DIR .. "src/mame/drivers/xor100.cpp",
+	MAME_DIR .. "src/mame/drivers/xavix.cpp",
+	MAME_DIR .. "src/mame/drivers/zorba.cpp",
 }
 
 end
diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua
index b3fb48454f3..e7baf905f7f 100644
--- a/scripts/target/mame/nl.lua
+++ b/scripts/target/mame/nl.lua
@@ -102,15 +102,15 @@ function createProjects_mame_nl(_target, _subtarget)
 	}
 
 	files{
-		MAME_DIR .. "src/mame/drivers/pong.c",
-		MAME_DIR .. "src/mame/drivers/nl_pong.c",
-		MAME_DIR .. "src/mame/drivers/nl_pongd.c",
-		MAME_DIR .. "src/mame/drivers/nl_breakout.c",
+		MAME_DIR .. "src/mame/drivers/pong.cpp",
+		MAME_DIR .. "src/mame/drivers/nl_pong.cpp",
+		MAME_DIR .. "src/mame/drivers/nl_pongd.cpp",
+		MAME_DIR .. "src/mame/drivers/nl_breakout.cpp",
 
-		MAME_DIR .. "src/mame/drivers/1942.c",
-		MAME_DIR .. "src/mame/video/1942.c",
-		MAME_DIR .. "src/mame/drivers/popeye.c",
-		MAME_DIR .. "src/mame/video/popeye.c",
+		MAME_DIR .. "src/mame/drivers/1942.cpp",
+		MAME_DIR .. "src/mame/video/1942.cpp",
+		MAME_DIR .. "src/mame/drivers/popeye.cpp",
+		MAME_DIR .. "src/mame/video/popeye.cpp",
 
 	}
 end
diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua
index d690c1f10f5..99529931e65 100644
--- a/scripts/target/mame/tiny.lua
+++ b/scripts/target/mame/tiny.lua
@@ -97,44 +97,44 @@ function createProjects_mame_tiny(_target, _subtarget)
 	}
 
 	files{
-		MAME_DIR .. "src/mame/machine/ticket.c",
-		MAME_DIR .. "src/mame/drivers/carpolo.c",
-		MAME_DIR .. "src/mame/machine/carpolo.c",
-		MAME_DIR .. "src/mame/video/carpolo.c",
-		MAME_DIR .. "src/mame/drivers/circus.c",
-		MAME_DIR .. "src/mame/audio/circus.c",
-		MAME_DIR .. "src/mame/video/circus.c",
-		MAME_DIR .. "src/mame/drivers/exidy.c",
-		MAME_DIR .. "src/mame/audio/exidy.c",
-		MAME_DIR .. "src/mame/video/exidy.c",
-		MAME_DIR .. "src/mame/audio/exidy440.c",
-		MAME_DIR .. "src/mame/drivers/starfire.c",
-		MAME_DIR .. "src/mame/video/starfire.c",
-		MAME_DIR .. "src/mame/drivers/vertigo.c",
-		MAME_DIR .. "src/mame/machine/vertigo.c",
-		MAME_DIR .. "src/mame/video/vertigo.c",
-		MAME_DIR .. "src/mame/drivers/victory.c",
-		MAME_DIR .. "src/mame/video/victory.c",
-		MAME_DIR .. "src/mame/audio/targ.c",
-		MAME_DIR .. "src/mame/drivers/astrocde.c",
-		MAME_DIR .. "src/mame/video/astrocde.c",
-		MAME_DIR .. "src/mame/drivers/gridlee.c",
-		MAME_DIR .. "src/mame/audio/gridlee.c",
-		MAME_DIR .. "src/mame/video/gridlee.c",
-		MAME_DIR .. "src/mame/drivers/williams.c",
-		MAME_DIR .. "src/mame/machine/williams.c",
-		MAME_DIR .. "src/mame/audio/williams.c",
-		MAME_DIR .. "src/mame/video/williams.c",
-		MAME_DIR .. "src/mame/audio/gorf.c",
-		MAME_DIR .. "src/mame/audio/wow.c",
-		MAME_DIR .. "src/mame/drivers/gaelco.c",
-		MAME_DIR .. "src/mame/video/gaelco.c",
-		MAME_DIR .. "src/mame/machine/gaelcrpt.c",
-		MAME_DIR .. "src/mame/drivers/wrally.c",
-		MAME_DIR .. "src/mame/machine/wrally.c",
-		MAME_DIR .. "src/mame/video/wrally.c",
-		MAME_DIR .. "src/mame/drivers/looping.c",
-		MAME_DIR .. "src/mame/drivers/supertnk.c",
+		MAME_DIR .. "src/mame/machine/ticket.cpp",
+		MAME_DIR .. "src/mame/drivers/carpolo.cpp",
+		MAME_DIR .. "src/mame/machine/carpolo.cpp",
+		MAME_DIR .. "src/mame/video/carpolo.cpp",
+		MAME_DIR .. "src/mame/drivers/circus.cpp",
+		MAME_DIR .. "src/mame/audio/circus.cpp",
+		MAME_DIR .. "src/mame/video/circus.cpp",
+		MAME_DIR .. "src/mame/drivers/exidy.cpp",
+		MAME_DIR .. "src/mame/audio/exidy.cpp",
+		MAME_DIR .. "src/mame/video/exidy.cpp",
+		MAME_DIR .. "src/mame/audio/exidy440.cpp",
+		MAME_DIR .. "src/mame/drivers/starfire.cpp",
+		MAME_DIR .. "src/mame/video/starfire.cpp",
+		MAME_DIR .. "src/mame/drivers/vertigo.cpp",
+		MAME_DIR .. "src/mame/machine/vertigo.cpp",
+		MAME_DIR .. "src/mame/video/vertigo.cpp",
+		MAME_DIR .. "src/mame/drivers/victory.cpp",
+		MAME_DIR .. "src/mame/video/victory.cpp",
+		MAME_DIR .. "src/mame/audio/targ.cpp",
+		MAME_DIR .. "src/mame/drivers/astrocde.cpp",
+		MAME_DIR .. "src/mame/video/astrocde.cpp",
+		MAME_DIR .. "src/mame/drivers/gridlee.cpp",
+		MAME_DIR .. "src/mame/audio/gridlee.cpp",
+		MAME_DIR .. "src/mame/video/gridlee.cpp",
+		MAME_DIR .. "src/mame/drivers/williams.cpp",
+		MAME_DIR .. "src/mame/machine/williams.cpp",
+		MAME_DIR .. "src/mame/audio/williams.cpp",
+		MAME_DIR .. "src/mame/video/williams.cpp",
+		MAME_DIR .. "src/mame/audio/gorf.cpp",
+		MAME_DIR .. "src/mame/audio/wow.cpp",
+		MAME_DIR .. "src/mame/drivers/gaelco.cpp",
+		MAME_DIR .. "src/mame/video/gaelco.cpp",
+		MAME_DIR .. "src/mame/machine/gaelcrpt.cpp",
+		MAME_DIR .. "src/mame/drivers/wrally.cpp",
+		MAME_DIR .. "src/mame/machine/wrally.cpp",
+		MAME_DIR .. "src/mame/video/wrally.cpp",
+		MAME_DIR .. "src/mame/drivers/looping.cpp",
+		MAME_DIR .. "src/mame/drivers/supertnk.cpp",
 	}
 end