diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 5f101510b19..c67a7ed2f71 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -912,6 +912,7 @@ function linkProjects_mame_arcade(_target, _subtarget)
 		"funworld",
 		"fuuki",
 		"gaelco",
+		"galaxian",
 		"gameplan",
 		"gametron",
 		"gottlieb",
@@ -1025,20 +1026,56 @@ function createProjects_mame_arcade(_target, _subtarget)
 
 createMAMEProjects(_target, _subtarget, "shared")
 files {
-	MAME_DIR .. "src/mame/machine/bacta_datalogger.h",
 	MAME_DIR .. "src/mame/machine/bacta_datalogger.cpp",
+	MAME_DIR .. "src/mame/machine/bacta_datalogger.h",
+	MAME_DIR .. "src/mame/machine/cedar_magnet_board.cpp",
+	MAME_DIR .. "src/mame/machine/cedar_magnet_board.h",
+	MAME_DIR .. "src/mame/machine/dc_g2if.cpp",
+	MAME_DIR .. "src/mame/machine/dc_g2if.h",
+	MAME_DIR .. "src/mame/machine/dc.cpp",
+	MAME_DIR .. "src/mame/includes/dc.h",
+	MAME_DIR .. "src/mame/machine/dc-ctrl.cpp",
+	MAME_DIR .. "src/mame/machine/dc-ctrl.h",
+	MAME_DIR .. "src/mame/machine/gdrom.cpp",
+	MAME_DIR .. "src/mame/machine/gdrom.h",
+	MAME_DIR .. "src/mame/machine/inder_vid.cpp",
+	MAME_DIR .. "src/mame/machine/inder_vid.h",
+	MAME_DIR .. "src/mame/machine/maple-dc.cpp",
+	MAME_DIR .. "src/mame/machine/maple-dc.h",
+	MAME_DIR .. "src/mame/machine/mapledev.cpp",
+	MAME_DIR .. "src/mame/machine/mapledev.h",
+	MAME_DIR .. "src/mame/machine/mc8123.cpp",
+	MAME_DIR .. "src/mame/machine/mc8123.h",
+	MAME_DIR .. "src/mame/machine/mie.cpp",
+	MAME_DIR .. "src/mame/machine/mie.h",
+	MAME_DIR .. "src/mame/machine/naomig1.cpp",
+	MAME_DIR .. "src/mame/machine/naomig1.h",
 	MAME_DIR .. "src/mame/machine/nmk112.cpp",
 	MAME_DIR .. "src/mame/machine/nmk112.h",
 	MAME_DIR .. "src/mame/machine/pcshare.cpp",
 	MAME_DIR .. "src/mame/machine/pcshare.h",
+	MAME_DIR .. "src/mame/machine/sec.cpp",
+	MAME_DIR .. "src/mame/machine/sec.h",
+	MAME_DIR .. "src/mame/machine/segacrp2_device.cpp",
+	MAME_DIR .. "src/mame/machine/segacrp2_device.h",
 	MAME_DIR .. "src/mame/machine/segacrpt_device.cpp",
 	MAME_DIR .. "src/mame/machine/segacrpt_device.h",
-	MAME_DIR .. "src/mame/video/avgdvg.cpp",
-	MAME_DIR .. "src/mame/video/avgdvg.h",
-	MAME_DIR .. "src/mame/video/awpvid.cpp",
-	MAME_DIR .. "src/mame/video/awpvid.h",
-	MAME_DIR .. "src/mame/video/tmap038.cpp",
-	MAME_DIR .. "src/mame/video/tmap038.h",
+	MAME_DIR .. "src/mame/machine/taito68705interface.cpp",
+	MAME_DIR .. "src/mame/machine/taito68705interface.h",
+	MAME_DIR .. "src/mame/machine/xbox.cpp",
+	MAME_DIR .. "src/mame/machine/xbox.h",
+	MAME_DIR .. "src/mame/machine/xbox_pci.cpp",
+	MAME_DIR .. "src/mame/machine/xbox_pci.h",
+	MAME_DIR .. "src/mame/machine/xbox_usb.cpp",
+	MAME_DIR .. "src/mame/machine/xbox_usb.h",
+	MAME_DIR .. "src/mame/audio/cage.cpp",
+	MAME_DIR .. "src/mame/audio/cage.h",
+	MAME_DIR .. "src/mame/audio/bally.cpp",
+	MAME_DIR .. "src/mame/audio/bally.h",
+	MAME_DIR .. "src/mame/audio/gottlieb.cpp",
+	MAME_DIR .. "src/mame/audio/gottlieb.h",
+	MAME_DIR .. "src/mame/audio/seibu.cpp",
+	MAME_DIR .. "src/mame/audio/seibu.h",
 	MAME_DIR .. "src/mame/audio/dcs.cpp",
 	MAME_DIR .. "src/mame/audio/dcs.h",
 	MAME_DIR .. "src/mame/audio/decobsmt.cpp",
@@ -1049,12 +1086,42 @@ files {
 	MAME_DIR .. "src/mame/audio/fruitsamples.h",
 	MAME_DIR .. "src/mame/audio/rax.cpp",
 	MAME_DIR .. "src/mame/audio/rax.h",
+	MAME_DIR .. "src/mame/audio/s11c_bg.cpp",
+	MAME_DIR .. "src/mame/audio/s11c_bg.h",
 	MAME_DIR .. "src/mame/audio/segam1audio.cpp",
 	MAME_DIR .. "src/mame/audio/segam1audio.h",
-	MAME_DIR .. "src/mame/video/snk68_spr.cpp",
-	MAME_DIR .. "src/mame/video/snk68_spr.h",
+	MAME_DIR .. "src/mame/audio/taitosnd.cpp",
+	MAME_DIR .. "src/mame/audio/taitosnd.h",
+	MAME_DIR .. "src/mame/audio/timeplt.cpp",
+	MAME_DIR .. "src/mame/audio/timeplt.h",
+	MAME_DIR .. "src/mame/audio/williams.cpp",
+	MAME_DIR .. "src/mame/audio/williams.h",
 	MAME_DIR .. "src/mame/video/alpha68k_palette.cpp",
 	MAME_DIR .. "src/mame/video/alpha68k_palette.h",
+	MAME_DIR .. "src/mame/video/avgdvg.cpp",
+	MAME_DIR .. "src/mame/video/avgdvg.h",
+	MAME_DIR .. "src/mame/video/awpvid.cpp",
+	MAME_DIR .. "src/mame/video/awpvid.h",
+	MAME_DIR .. "src/mame/video/decospr.cpp",
+	MAME_DIR .. "src/mame/video/decospr.h",
+	MAME_DIR .. "src/mame/video/k051316.cpp",
+	MAME_DIR .. "src/mame/video/k051316.h",
+	MAME_DIR .. "src/mame/video/k053936.cpp",
+	MAME_DIR .. "src/mame/video/k053936.h",
+	MAME_DIR .. "src/mame/video/pk8000.cpp",
+	MAME_DIR .. "src/mame/video/pk8000.h",
+	MAME_DIR .. "src/mame/video/powervr2.cpp",
+	MAME_DIR .. "src/mame/video/powervr2.h",
+	MAME_DIR .. "src/mame/video/seta001.cpp",
+	MAME_DIR .. "src/mame/video/seta001.h",
+	MAME_DIR .. "src/mame/video/snk68_spr.cpp",
+	MAME_DIR .. "src/mame/video/snk68_spr.h",
+	MAME_DIR .. "src/mame/video/tecmo_spr.cpp",
+	MAME_DIR .. "src/mame/video/tecmo_spr.h",
+	MAME_DIR .. "src/mame/video/tmap038.cpp",
+	MAME_DIR .. "src/mame/video/tmap038.h",
+	MAME_DIR .. "src/mame/video/xbox_nv2a.cpp",
+	MAME_DIR .. "src/mame/video/xbox_nv2a.h",
 }
 
 --------------------------------------------------
@@ -1077,7 +1144,6 @@ files {
 
 createMAMEProjects(_target, _subtarget, "alba")
 files {
-	MAME_DIR .. "src/mame/drivers/albazc.cpp",
 	MAME_DIR .. "src/mame/drivers/albazg.cpp",
 	MAME_DIR .. "src/mame/drivers/rmhaihai.cpp",
 	MAME_DIR .. "src/mame/drivers/vsmjtria.cpp",
@@ -1286,8 +1352,8 @@ files {
 	MAME_DIR .. "src/mame/video/jag_blitter.h",
 	MAME_DIR .. "src/mame/video/jaguar.cpp",
 	MAME_DIR .. "src/mame/video/jagblit.h",
-	MAME_DIR .. "src/mame/video/jagblit.hxx",
-	MAME_DIR .. "src/mame/video/jagobj.hxx",
+	MAME_DIR .. "src/mame/video/jagblit.ipp",
+	MAME_DIR .. "src/mame/video/jagobj.ipp",
 	MAME_DIR .. "src/mame/drivers/jedi.cpp",
 	MAME_DIR .. "src/mame/includes/jedi.h",
 	MAME_DIR .. "src/mame/audio/jedi.cpp",
@@ -1299,6 +1365,14 @@ files {
 	MAME_DIR .. "src/mame/includes/liberatr.h",
 	MAME_DIR .. "src/mame/video/liberatr.cpp",
 	MAME_DIR .. "src/mame/drivers/marblmd2.cpp",
+	MAME_DIR .. "src/mame/drivers/maxaflex.cpp",
+	MAME_DIR .. "src/mame/machine/atari400.cpp",
+	MAME_DIR .. "src/mame/includes/atari400.h",
+	MAME_DIR .. "src/mame/video/atari400.cpp",
+	MAME_DIR .. "src/mame/video/antic.cpp",
+	MAME_DIR .. "src/mame/video/antic.h",
+	MAME_DIR .. "src/mame/video/gtia.cpp",
+	MAME_DIR .. "src/mame/video/gtia.h",
 	MAME_DIR .. "src/mame/drivers/mediagx.cpp",
 	MAME_DIR .. "src/mame/drivers/metalmx.cpp",
 	MAME_DIR .. "src/mame/includes/metalmx.h",
@@ -1434,8 +1508,6 @@ files {
 	MAME_DIR .. "src/mame/audio/atarijsa.h",
 	MAME_DIR .. "src/mame/audio/atarisac.cpp",
 	MAME_DIR .. "src/mame/audio/atarisac.h",
-	MAME_DIR .. "src/mame/audio/cage.cpp",
-	MAME_DIR .. "src/mame/audio/cage.h",
 	MAME_DIR .. "src/mame/audio/redbaron.cpp",
 	MAME_DIR .. "src/mame/audio/redbaron.h",
 	MAME_DIR .. "src/mame/video/atarimo.cpp",
@@ -1511,8 +1583,6 @@ files {
 	MAME_DIR .. "src/mame/machine/bfm_comn.cpp",
 	MAME_DIR .. "src/mame/machine/bfm_sc45_helper.h",
 	MAME_DIR .. "src/mame/machine/bfm_sc45_helper.cpp",
-	MAME_DIR .. "src/mame/machine/sec.h",
-	MAME_DIR .. "src/mame/machine/sec.cpp",
 	MAME_DIR .. "src/mame/video/bfm_adr2.h",
 	MAME_DIR .. "src/mame/video/bfm_adr2.cpp",
 	MAME_DIR .. "src/mame/video/bfm_dm01.h",
@@ -1801,6 +1871,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/rohga.cpp",
 	MAME_DIR .. "src/mame/includes/rohga.h",
 	MAME_DIR .. "src/mame/video/rohga.cpp",
+	MAME_DIR .. "src/mame/drivers/scregg.cpp",
 	MAME_DIR .. "src/mame/drivers/shootout.cpp",
 	MAME_DIR .. "src/mame/drivers/sidepckt.cpp",
 	MAME_DIR .. "src/mame/includes/sidepckt.h",
@@ -1817,6 +1888,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/supbtime.cpp",
 	MAME_DIR .. "src/mame/includes/supbtime.h",
 	MAME_DIR .. "src/mame/video/supbtime.cpp",
+	MAME_DIR .. "src/mame/drivers/thedeep.cpp",
 	MAME_DIR .. "src/mame/drivers/tryout.cpp",
 	MAME_DIR .. "src/mame/includes/tryout.h",
 	MAME_DIR .. "src/mame/video/tryout.cpp",
@@ -1844,8 +1916,6 @@ files {
 	MAME_DIR .. "src/mame/video/deco16ic.h",
 	MAME_DIR .. "src/mame/video/decocomn.cpp",
 	MAME_DIR .. "src/mame/video/decocomn.h",
-	MAME_DIR .. "src/mame/video/decospr.cpp",
-	MAME_DIR .. "src/mame/video/decospr.h",
 	MAME_DIR .. "src/mame/video/decmxc06.cpp",
 	MAME_DIR .. "src/mame/video/decmxc06.h",
 	MAME_DIR .. "src/mame/video/deckarn.cpp",
@@ -1909,11 +1979,9 @@ files {
 	MAME_DIR .. "src/mame/drivers/cedar_magnet.cpp",
 	MAME_DIR .. "src/mame/machine/cedar_magnet_plane.h",
 	MAME_DIR .. "src/mame/machine/cedar_magnet_sprite.h",
-	MAME_DIR .. "src/mame/machine/cedar_magnet_board.h",
 	MAME_DIR .. "src/mame/machine/cedar_magnet_flop.h",
 	MAME_DIR .. "src/mame/machine/cedar_magnet_plane.cpp",
 	MAME_DIR .. "src/mame/machine/cedar_magnet_sprite.cpp",
-	MAME_DIR .. "src/mame/machine/cedar_magnet_board.cpp",
 	MAME_DIR .. "src/mame/machine/cedar_magnet_flop.cpp",
 	MAME_DIR .. "src/mame/drivers/cidelsa.cpp",
 	MAME_DIR .. "src/mame/includes/cidelsa.h",
@@ -1969,14 +2037,6 @@ files {
 	MAME_DIR .. "src/mame/audio/exidy440.h",
 	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/atari400.cpp",
-	MAME_DIR .. "src/mame/includes/atari400.h",
-	MAME_DIR .. "src/mame/video/atari400.cpp",
-	MAME_DIR .. "src/mame/video/antic.cpp",
-	MAME_DIR .. "src/mame/video/antic.h",
-	MAME_DIR .. "src/mame/video/gtia.cpp",
-	MAME_DIR .. "src/mame/video/gtia.h",
 	MAME_DIR .. "src/mame/audio/nl_fireone.h",
 	MAME_DIR .. "src/mame/audio/nl_fireone.cpp",
 	MAME_DIR .. "src/mame/audio/nl_starfire.h",
@@ -2080,6 +2140,31 @@ files {
 	MAME_DIR .. "src/mame/drivers/bigkarnk_ms.cpp",
 }
 
+createMAMEProjects(_target, _subtarget, "galaxian")
+files {
+	MAME_DIR .. "src/mame/drivers/dambustr.cpp",
+	MAME_DIR .. "src/mame/drivers/fastfred.cpp",
+	MAME_DIR .. "src/mame/includes/fastfred.h",
+	MAME_DIR .. "src/mame/video/fastfred.cpp",
+	MAME_DIR .. "src/mame/drivers/galaxian.cpp",
+	MAME_DIR .. "src/mame/includes/galaxian.h",
+	MAME_DIR .. "src/mame/drivers/galaxian_rockclim.cpp",
+	MAME_DIR .. "src/mame/audio/galaxian.cpp",
+	MAME_DIR .. "src/mame/audio/galaxian.h",
+	MAME_DIR .. "src/mame/video/galaxian.cpp",
+	MAME_DIR .. "src/mame/audio/nl_konami.h",
+	MAME_DIR .. "src/mame/audio/nl_konami.cpp",
+	MAME_DIR .. "src/mame/drivers/galaxold.cpp",
+	MAME_DIR .. "src/mame/includes/galaxold.h",
+	MAME_DIR .. "src/mame/machine/galaxold.cpp",
+	MAME_DIR .. "src/mame/video/galaxold.cpp",
+	MAME_DIR .. "src/mame/drivers/scobra.cpp",
+	MAME_DIR .. "src/mame/drivers/scramble.cpp",
+	MAME_DIR .. "src/mame/includes/scramble.h",
+	MAME_DIR .. "src/mame/machine/scramble.cpp",
+	MAME_DIR .. "src/mame/audio/scramble.cpp",
+}
+
 createMAMEProjects(_target, _subtarget, "gameplan")
 files {
 	MAME_DIR .. "src/mame/drivers/enigma2.cpp",
@@ -2087,6 +2172,7 @@ files {
 	MAME_DIR .. "src/mame/includes/gameplan.h",
 	MAME_DIR .. "src/mame/video/gameplan.cpp",
 	MAME_DIR .. "src/mame/drivers/toratora.cpp",
+	MAME_DIR .. "src/mame/drivers/trvquest.cpp",
 }
 
 createMAMEProjects(_target, _subtarget, "gametron")
@@ -2107,8 +2193,6 @@ files {
 	MAME_DIR .. "src/mame/video/exterm.cpp",
 	MAME_DIR .. "src/mame/drivers/gottlieb.cpp",
 	MAME_DIR .. "src/mame/includes/gottlieb.h",
-	MAME_DIR .. "src/mame/audio/gottlieb.cpp",
-	MAME_DIR .. "src/mame/audio/gottlieb.h",
 	MAME_DIR .. "src/mame/video/gottlieb.cpp",
 }
 
@@ -2270,6 +2354,7 @@ files {
 
 createMAMEProjects(_target, _subtarget, "jaleco")
 files {
+	MAME_DIR .. "src/mame/drivers/acommand.cpp",
 	MAME_DIR .. "src/mame/drivers/aeroboto.cpp",
 	MAME_DIR .. "src/mame/includes/aeroboto.h",
 	MAME_DIR .. "src/mame/video/aeroboto.cpp",
@@ -2301,6 +2386,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/homerun.cpp",
 	MAME_DIR .. "src/mame/includes/homerun.h",
 	MAME_DIR .. "src/mame/video/homerun.cpp",
+	MAME_DIR .. "src/mame/drivers/jalmah.cpp",
 	MAME_DIR .. "src/mame/drivers/megasys1.cpp",
 	MAME_DIR .. "src/mame/includes/megasys1.h",
 	MAME_DIR .. "src/mame/video/megasys1.cpp",
@@ -2450,9 +2536,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/djmain.cpp",
 	MAME_DIR .. "src/mame/includes/djmain.h",
 	MAME_DIR .. "src/mame/video/djmain.cpp",
-	MAME_DIR .. "src/mame/drivers/fastfred.cpp",
-	MAME_DIR .. "src/mame/includes/fastfred.h",
-	MAME_DIR .. "src/mame/video/fastfred.cpp",
 	MAME_DIR .. "src/mame/drivers/fastlane.cpp",
 	MAME_DIR .. "src/mame/drivers/finalizr.cpp",
 	MAME_DIR .. "src/mame/includes/finalizr.h",
@@ -2592,14 +2675,9 @@ files {
 	MAME_DIR .. "src/mame/drivers/sbasketb.cpp",
 	MAME_DIR .. "src/mame/includes/sbasketb.h",
 	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/includes/scotrsht.h",
 	MAME_DIR .. "src/mame/video/scotrsht.cpp",
-	MAME_DIR .. "src/mame/drivers/scramble.cpp",
-	MAME_DIR .. "src/mame/includes/scramble.h",
-	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/includes/shaolins.h",
 	MAME_DIR .. "src/mame/video/shaolins.cpp",
@@ -2618,8 +2696,6 @@ files {
 	MAME_DIR .. "src/mame/video/thunderx.cpp",
 	MAME_DIR .. "src/mame/drivers/timeplt.cpp",
 	MAME_DIR .. "src/mame/includes/timeplt.h",
-	MAME_DIR .. "src/mame/audio/timeplt.cpp",
-	MAME_DIR .. "src/mame/audio/timeplt.h",
 	MAME_DIR .. "src/mame/video/timeplt.cpp",
 	MAME_DIR .. "src/mame/drivers/tmnt.cpp",
 	MAME_DIR .. "src/mame/includes/tmnt.h",
@@ -2671,8 +2747,6 @@ files {
 	MAME_DIR .. "src/mame/video/k007420.h",
 	MAME_DIR .. "src/mame/video/k037122.cpp",
 	MAME_DIR .. "src/mame/video/k037122.h",
-	MAME_DIR .. "src/mame/video/k051316.cpp",
-	MAME_DIR .. "src/mame/video/k051316.h",
 	MAME_DIR .. "src/mame/video/k051733.cpp",
 	MAME_DIR .. "src/mame/video/k051733.h",
 	MAME_DIR .. "src/mame/video/k051960.cpp",
@@ -2697,8 +2771,6 @@ files {
 	MAME_DIR .. "src/mame/video/k054000.h",
 	MAME_DIR .. "src/mame/video/k054338.cpp",
 	MAME_DIR .. "src/mame/video/k054338.h",
-	MAME_DIR .. "src/mame/video/k053936.cpp",
-	MAME_DIR .. "src/mame/video/k053936.h",
 	MAME_DIR .. "src/mame/video/k001006.cpp",
 	MAME_DIR .. "src/mame/video/k001006.h",
 	MAME_DIR .. "src/mame/video/k001005.cpp",
@@ -2857,8 +2929,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/williams.cpp",
 	MAME_DIR .. "src/mame/includes/williams.h",
 	MAME_DIR .. "src/mame/machine/williams.cpp",
-	MAME_DIR .. "src/mame/audio/williams.cpp",
-	MAME_DIR .. "src/mame/audio/williams.h",
 	MAME_DIR .. "src/mame/video/williams.cpp",
 	MAME_DIR .. "src/mame/machine/midwayic.cpp",
 	MAME_DIR .. "src/mame/machine/midwayic.h",
@@ -2890,7 +2960,6 @@ files {
 	MAME_DIR .. "src/mame/video/baraduke.cpp",
 	MAME_DIR .. "src/mame/drivers/cgang.cpp",
 	MAME_DIR .. "src/mame/drivers/cswat.cpp",
-	MAME_DIR .. "src/mame/drivers/dambustr.cpp",
 	MAME_DIR .. "src/mame/drivers/dangbar.cpp",
 	MAME_DIR .. "src/mame/drivers/dkmb.cpp",
 	MAME_DIR .. "src/mame/drivers/gal3.cpp",
@@ -2907,18 +2976,6 @@ files {
 	MAME_DIR .. "src/mame/machine/xevious.cpp",
 	MAME_DIR .. "src/mame/includes/xevious.h",
 	MAME_DIR .. "src/mame/video/xevious.cpp",
-	MAME_DIR .. "src/mame/drivers/galaxian.cpp",
-	MAME_DIR .. "src/mame/includes/galaxian.h",
-	MAME_DIR .. "src/mame/drivers/galaxian_rockclim.cpp",
-	MAME_DIR .. "src/mame/audio/galaxian.cpp",
-	MAME_DIR .. "src/mame/audio/galaxian.h",
-	MAME_DIR .. "src/mame/video/galaxian.cpp",
-	MAME_DIR .. "src/mame/audio/nl_konami.h",
-	MAME_DIR .. "src/mame/audio/nl_konami.cpp",
-	MAME_DIR .. "src/mame/drivers/galaxold.cpp",
-	MAME_DIR .. "src/mame/includes/galaxold.h",
-	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/includes/gaplus.h",
 	MAME_DIR .. "src/mame/machine/gaplus.cpp",
@@ -3067,6 +3124,7 @@ files {
 
 createMAMEProjects(_target, _subtarget, "neogeo")
 files {
+	MAME_DIR .. "src/mame/drivers/midas.cpp",
 	MAME_DIR .. "src/mame/drivers/neogeo.cpp",
 	MAME_DIR .. "src/mame/includes/neogeo.h",
 	MAME_DIR .. "src/mame/video/neogeo.cpp",
@@ -3160,6 +3218,18 @@ files {
 
 createMAMEProjects(_target, _subtarget, "nintendo")
 files {
+	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/n64types.h",
+	MAME_DIR .. "src/mame/video/rdpfiltr.ipp",
+	MAME_DIR .. "src/mame/video/n64.h",
+	MAME_DIR .. "src/mame/video/rdpblend.cpp",
+	MAME_DIR .. "src/mame/video/rdpblend.h",
+	MAME_DIR .. "src/mame/video/rdptpipe.cpp",
+	MAME_DIR .. "src/mame/video/rdptpipe.h",
+	MAME_DIR .. "src/mame/video/pin64.cpp",
+	MAME_DIR .. "src/mame/video/pin64.h",
 	MAME_DIR .. "src/mame/drivers/cham24.cpp",
 	MAME_DIR .. "src/mame/drivers/dkong.cpp",
 	MAME_DIR .. "src/mame/includes/dkong.h",
@@ -3216,10 +3286,8 @@ files {
 
 createMAMEProjects(_target, _subtarget, "nmk")
 files {
-	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/drivers/nmk16.cpp",
 	MAME_DIR .. "src/mame/includes/nmk16.h",
@@ -3422,8 +3490,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/blockade.cpp",
 	MAME_DIR .. "src/mame/drivers/calorie.cpp",
 	MAME_DIR .. "src/mame/drivers/chihiro.cpp",
-	MAME_DIR .. "src/mame/includes/xbox_nv2a.h",
-	MAME_DIR .. "src/mame/video/xbox_nv2a.cpp",
 	MAME_DIR .. "src/mame/drivers/coolridr.cpp",
 	MAME_DIR .. "src/mame/drivers/deniam.cpp",
 	MAME_DIR .. "src/mame/includes/deniam.h",
@@ -3462,7 +3528,7 @@ files {
 	MAME_DIR .. "src/mame/drivers/model2.cpp",
 	MAME_DIR .. "src/mame/machine/model2.cpp",
 	MAME_DIR .. "src/mame/includes/model2.h",
-	MAME_DIR .. "src/mame/video/model2rd.hxx",
+	MAME_DIR .. "src/mame/video/model2rd.ipp",
 	MAME_DIR .. "src/mame/video/model2.cpp",
 	MAME_DIR .. "src/mame/drivers/model3.cpp",
 	MAME_DIR .. "src/mame/includes/model3.h",
@@ -3471,21 +3537,13 @@ files {
 	MAME_DIR .. "src/mame/drivers/monacogp.cpp",
 	MAME_DIR .. "src/mame/drivers/naomi.cpp",
 	MAME_DIR .. "src/mame/drivers/dc_atomiswave.cpp",
-	MAME_DIR .. "src/mame/includes/dc.h",
 	MAME_DIR .. "src/mame/includes/naomi.h",
 	MAME_DIR .. "src/mame/includes/dc_atomiswave.h",
 	MAME_DIR .. "src/mame/drivers/segasp.cpp",
 	MAME_DIR .. "src/mame/includes/segasp.h",
-	MAME_DIR .. "src/mame/machine/dc.cpp",
 	MAME_DIR .. "src/mame/drivers/y2.cpp",
-	MAME_DIR .. "src/mame/video/powervr2.cpp",
-	MAME_DIR .. "src/mame/video/powervr2.h",
 	MAME_DIR .. "src/mame/machine/gunsense.cpp",
 	MAME_DIR .. "src/mame/machine/gunsense.h",
-	MAME_DIR .. "src/mame/machine/naomig1.cpp",
-	MAME_DIR .. "src/mame/machine/naomig1.h",
-	MAME_DIR .. "src/mame/machine/dc_g2if.cpp",
-	MAME_DIR .. "src/mame/machine/dc_g2if.h",
 	MAME_DIR .. "src/mame/machine/naomibd.cpp",
 	MAME_DIR .. "src/mame/machine/naomibd.h",
 	MAME_DIR .. "src/mame/machine/naomirom.cpp",
@@ -3498,8 +3556,6 @@ files {
 	MAME_DIR .. "src/mame/machine/naomim2.h",
 	MAME_DIR .. "src/mame/machine/naomim4.cpp",
 	MAME_DIR .. "src/mame/machine/naomim4.h",
-	MAME_DIR .. "src/mame/machine/gdrom.cpp",
-	MAME_DIR .. "src/mame/machine/gdrom.h",
 	MAME_DIR .. "src/mame/machine/m3comm.cpp",
 	MAME_DIR .. "src/mame/machine/m3comm.h",
 	MAME_DIR .. "src/mame/machine/315-5881_crypt.cpp",
@@ -3508,14 +3564,6 @@ files {
 	MAME_DIR .. "src/mame/machine/315-6154.h",
 	MAME_DIR .. "src/mame/machine/awboard.cpp",
 	MAME_DIR .. "src/mame/machine/awboard.h",
-	MAME_DIR .. "src/mame/machine/mie.cpp",
-	MAME_DIR .. "src/mame/machine/mie.h",
-	MAME_DIR .. "src/mame/machine/maple-dc.cpp",
-	MAME_DIR .. "src/mame/machine/maple-dc.h",
-	MAME_DIR .. "src/mame/machine/mapledev.cpp",
-	MAME_DIR .. "src/mame/machine/mapledev.h",
-	MAME_DIR .. "src/mame/machine/dc-ctrl.cpp",
-	MAME_DIR .. "src/mame/machine/dc-ctrl.h",
 	MAME_DIR .. "src/mame/machine/jvs13551.cpp",
 	MAME_DIR .. "src/mame/machine/jvs13551.h",
 	MAME_DIR .. "src/mame/machine/segashiobd.cpp",
@@ -3607,8 +3655,6 @@ files {
 	MAME_DIR .. "src/mame/video/suprloco.cpp",
 	MAME_DIR .. "src/mame/drivers/system1.cpp",
 	MAME_DIR .. "src/mame/includes/system1.h",
-	MAME_DIR .. "src/mame/machine/segacrp2_device.cpp",
-	MAME_DIR .. "src/mame/machine/segacrp2_device.h",
 	MAME_DIR .. "src/mame/video/system1.cpp",
 	MAME_DIR .. "src/mame/drivers/system16.cpp",
 	MAME_DIR .. "src/mame/includes/system16.h",
@@ -3657,8 +3703,6 @@ files {
 	MAME_DIR .. "src/mame/machine/fd1089.h",
 	MAME_DIR .. "src/mame/machine/fd1094.cpp",
 	MAME_DIR .. "src/mame/machine/fd1094.h",
-	MAME_DIR .. "src/mame/machine/mc8123.cpp",
-	MAME_DIR .. "src/mame/machine/mc8123.h",
 	MAME_DIR .. "src/mame/machine/segaic16.cpp",
 	MAME_DIR .. "src/mame/machine/segaic16.h",
 	MAME_DIR .. "src/mame/machine/segabill.cpp",
@@ -3679,9 +3723,6 @@ files {
 	MAME_DIR .. "src/mame/video/sega16sp.h",
 	MAME_DIR .. "src/mame/video/segaic24.cpp",
 	MAME_DIR .. "src/mame/video/segaic24.h",
-	MAME_DIR .. "src/mame/machine/xbox.cpp",
-	MAME_DIR .. "src/mame/machine/xbox_usb.cpp",
-	MAME_DIR .. "src/mame/machine/xbox_pci.cpp",
 	MAME_DIR .. "src/mame/drivers/flashbeats.cpp",
 	MAME_DIR .. "src/mame/drivers/segaatom.cpp",
 }
@@ -3734,8 +3775,8 @@ files {
 	MAME_DIR .. "src/mame/machine/r2crypt.cpp",
 	MAME_DIR .. "src/mame/machine/r2crypt.h",
 	MAME_DIR .. "src/mame/machine/seibucop.cpp",
-	MAME_DIR .. "src/mame/machine/seibucop_dma.hxx",
-	MAME_DIR .. "src/mame/machine/seibucop_cmd.hxx",
+	MAME_DIR .. "src/mame/machine/seibucop_dma.ipp",
+	MAME_DIR .. "src/mame/machine/seibucop_cmd.ipp",
 	MAME_DIR .. "src/mame/machine/seibucop.h",
 	MAME_DIR .. "src/mame/drivers/r2dx_v33.cpp",
 	MAME_DIR .. "src/mame/drivers/seibuspi.cpp",
@@ -3761,8 +3802,6 @@ files {
 	MAME_DIR .. "src/mame/machine/seicopbl.h",
 	MAME_DIR .. "src/mame/machine/seibuspi.cpp",
 	MAME_DIR .. "src/mame/machine/seibuspi.h",
-	MAME_DIR .. "src/mame/audio/seibu.cpp",
-	MAME_DIR .. "src/mame/audio/seibu.h",
 	MAME_DIR .. "src/mame/audio/t5182.cpp",
 	MAME_DIR .. "src/mame/audio/t5182.h",
 	MAME_DIR .. "src/mame/video/seibu_crtc.cpp",
@@ -3771,18 +3810,7 @@ files {
 
 createMAMEProjects(_target, _subtarget, "seta")
 files {
-	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/n64types.h",
-	MAME_DIR .. "src/mame/video/rdpfiltr.hxx",
-	MAME_DIR .. "src/mame/video/n64.h",
-	MAME_DIR .. "src/mame/video/rdpblend.cpp",
-	MAME_DIR .. "src/mame/video/rdpblend.h",
-	MAME_DIR .. "src/mame/video/rdptpipe.cpp",
-	MAME_DIR .. "src/mame/video/rdptpipe.h",
-	MAME_DIR .. "src/mame/video/pin64.cpp",
-	MAME_DIR .. "src/mame/video/pin64.h",
+	MAME_DIR .. "src/mame/drivers/albazc.cpp",
 	MAME_DIR .. "src/mame/drivers/hanaawas.cpp",
 	MAME_DIR .. "src/mame/drivers/jclub2.cpp",
 	MAME_DIR .. "src/mame/drivers/macs.cpp",
@@ -3809,8 +3837,6 @@ files {
 	MAME_DIR .. "src/mame/machine/st0016.cpp",
 	MAME_DIR .. "src/mame/machine/st0016.h",
 	MAME_DIR .. "src/mame/drivers/simple_st0016.cpp",
-	MAME_DIR .. "src/mame/video/seta001.cpp",
-	MAME_DIR .. "src/mame/video/seta001.h",
 	MAME_DIR .. "src/mame/video/x1_012.cpp",
 	MAME_DIR .. "src/mame/video/x1_012.h",
 	MAME_DIR .. "src/mame/drivers/thedealr.cpp",
@@ -3844,8 +3870,8 @@ files {
 	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.hxx",
-	MAME_DIR .. "src/mame/video/hng64_sprite.hxx",
+	MAME_DIR .. "src/mame/video/hng64_3d.ipp",
+	MAME_DIR .. "src/mame/video/hng64_sprite.ipp",
 	MAME_DIR .. "src/mame/drivers/lasso.cpp",
 	MAME_DIR .. "src/mame/includes/lasso.h",
 	MAME_DIR .. "src/mame/video/lasso.cpp",
@@ -3874,8 +3900,11 @@ files {
 
 createMAMEProjects(_target, _subtarget, "sony")
 files {
+	MAME_DIR .. "src/mame/drivers/taitogn.cpp",
 	MAME_DIR .. "src/mame/drivers/zn.cpp",
 	MAME_DIR .. "src/mame/includes/zn.h",
+	MAME_DIR .. "src/mame/audio/taito_zm.cpp",
+	MAME_DIR .. "src/mame/audio/taito_zm.h",
 	MAME_DIR .. "src/mame/machine/znmcu.cpp",
 	MAME_DIR .. "src/mame/machine/znmcu.h",
 	MAME_DIR .. "src/mame/machine/cat702.cpp",
@@ -3965,8 +3994,6 @@ files {
 	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/taito68705interface.cpp",
-	MAME_DIR .. "src/mame/machine/taito68705interface.h",
 	MAME_DIR .. "src/mame/machine/taitosjsec.cpp",
 	MAME_DIR .. "src/mame/machine/taitosjsec.h",
 	MAME_DIR .. "src/mame/drivers/capr1.cpp",
@@ -4114,7 +4141,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/taitoair.cpp",
 	MAME_DIR .. "src/mame/includes/taitoair.h",
 	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/includes/taitojc.h",
 	MAME_DIR .. "src/mame/video/taitojc.cpp",
@@ -4150,10 +4176,6 @@ files {
 	MAME_DIR .. "src/mame/includes/wgp.h",
 	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/taitosnd.h",
-	MAME_DIR .. "src/mame/audio/taito_zm.cpp",
-	MAME_DIR .. "src/mame/audio/taito_zm.h",
 	MAME_DIR .. "src/mame/machine/taitoio.cpp",
 	MAME_DIR .. "src/mame/machine/taitoio.h",
 	MAME_DIR .. "src/mame/machine/taitoio_yoke.cpp",
@@ -4261,7 +4283,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/renegade.cpp",
 	MAME_DIR .. "src/mame/includes/renegade.h",
 	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/includes/shadfrce.h",
 	MAME_DIR .. "src/mame/video/shadfrce.cpp",
@@ -4283,8 +4304,6 @@ files {
 
 createMAMEProjects(_target, _subtarget, "tehkan")
 files {
-	MAME_DIR .. "src/mame/video/tecmo_spr.cpp",
-	MAME_DIR .. "src/mame/video/tecmo_spr.h",
 	MAME_DIR .. "src/mame/video/tecmo_mix.cpp",
 	MAME_DIR .. "src/mame/video/tecmo_mix.h",
 	MAME_DIR .. "src/mame/drivers/bombjack.cpp",
@@ -4617,8 +4636,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/s11c.cpp",
 	MAME_DIR .. "src/mame/audio/pinsnd88.cpp",
 	MAME_DIR .. "src/mame/audio/pinsnd88.h",
-	MAME_DIR .. "src/mame/audio/s11c_bg.cpp",
-	MAME_DIR .. "src/mame/audio/s11c_bg.h",
 	MAME_DIR .. "src/mame/drivers/s3.cpp",
 	MAME_DIR .. "src/mame/drivers/s4.cpp",
 	MAME_DIR .. "src/mame/drivers/s6.cpp",
@@ -4651,8 +4668,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/wpc_s.cpp",
 	MAME_DIR .. "src/mame/machine/wpc.cpp",
 	MAME_DIR .. "src/mame/machine/wpc.h",
-	MAME_DIR .. "src/mame/audio/bally.h",
-	MAME_DIR .. "src/mame/audio/bally.cpp",
 	MAME_DIR .. "src/mame/audio/wpcsnd.cpp",
 	MAME_DIR .. "src/mame/audio/wpcsnd.h",
 	MAME_DIR .. "src/mame/video/wpc_dmd.cpp",
@@ -4775,8 +4790,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/megaphx.cpp",
 	MAME_DIR .. "src/mame/machine/inder_sb.cpp",
 	MAME_DIR .. "src/mame/machine/inder_sb.h",
-	MAME_DIR .. "src/mame/machine/inder_vid.cpp",
-	MAME_DIR .. "src/mame/machine/inder_vid.h",
 	MAME_DIR .. "src/mame/drivers/corona.cpp",
 	MAME_DIR .. "src/mame/drivers/cwheel.cpp",
 	MAME_DIR .. "src/mame/drivers/crystal.cpp",
@@ -4934,7 +4947,6 @@ files {
 	MAME_DIR .. "src/mame/audio/micro3d.cpp",
 	MAME_DIR .. "src/mame/audio/micro3d.h",
 	MAME_DIR .. "src/mame/drivers/microdar.cpp",
-	MAME_DIR .. "src/mame/drivers/midas.cpp",
 	MAME_DIR .. "src/mame/drivers/mil4000.cpp",
 	MAME_DIR .. "src/mame/drivers/miniboy7.cpp",
 	MAME_DIR .. "src/mame/drivers/minivideo.cpp",
@@ -4977,7 +4989,6 @@ files {
 	MAME_DIR .. "src/mame/video/pass.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/pipeline.cpp",
 	MAME_DIR .. "src/mame/drivers/pkscram.cpp",
@@ -5057,7 +5068,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/teamjocs.cpp",
 	MAME_DIR .. "src/mame/drivers/tecnodar.cpp",
 	MAME_DIR .. "src/mame/drivers/thayers.cpp",
-	MAME_DIR .. "src/mame/drivers/thedeep.cpp",
 	MAME_DIR .. "src/mame/drivers/tickee.cpp",
 	MAME_DIR .. "src/mame/drivers/tmspoker.cpp",
 	MAME_DIR .. "src/mame/drivers/tomsadvs.cpp",
@@ -5070,7 +5080,6 @@ files {
 	MAME_DIR .. "src/mame/video/trucocl.cpp",
 	MAME_DIR .. "src/mame/drivers/truesys.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/tvg01.cpp",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index f3a49bbc59e..909bd9e503f 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -1273,7 +1273,6 @@ function linkProjects_mame_mess(_target, _subtarget)
 		"dec",
 		"dicksmth",
 		"dms",
-		"dragon",
 		"drc",
 		"dulmont",
 		"eaca",
@@ -1379,7 +1378,6 @@ function linkProjects_mame_mess(_target, _subtarget)
 		"omnibyte",
 		"omron",
 		"openuni",
-		"orion",
 		"osborne",
 		"osi",
 		"palm",
@@ -1560,8 +1558,8 @@ files {
 	MAME_DIR .. "src/mame/audio/jaguar.cpp",
 	MAME_DIR .. "src/mame/video/jaguar.cpp",
 	MAME_DIR .. "src/mame/video/jagblit.h",
-	MAME_DIR .. "src/mame/video/jagblit.hxx",
-	MAME_DIR .. "src/mame/video/jagobj.hxx",
+	MAME_DIR .. "src/mame/video/jagblit.ipp",
+	MAME_DIR .. "src/mame/video/jagobj.ipp",
 	MAME_DIR .. "src/mame/drivers/astrocde.cpp",
 	MAME_DIR .. "src/mame/includes/astrocde.h",
 	MAME_DIR .. "src/mame/video/astrocde.cpp",
@@ -1572,7 +1570,7 @@ files {
 	MAME_DIR .. "src/mame/machine/n64.cpp",
 	MAME_DIR .. "src/mame/video/n64.cpp",
 	MAME_DIR .. "src/mame/video/n64types.h",
-	MAME_DIR .. "src/mame/video/rdpfiltr.hxx",
+	MAME_DIR .. "src/mame/video/rdpfiltr.ipp",
 	MAME_DIR .. "src/mame/video/n64.h",
 	MAME_DIR .. "src/mame/video/rdpblend.cpp",
 	MAME_DIR .. "src/mame/video/rdpblend.h",
@@ -1619,8 +1617,16 @@ files {
 	MAME_DIR .. "src/mame/machine/315-6154.h",
 	MAME_DIR .. "src/mame/machine/segashiobd.cpp",
 	MAME_DIR .. "src/mame/machine/segashiobd.h",
+	MAME_DIR .. "src/mame/machine/xbox.cpp",
+	MAME_DIR .. "src/mame/machine/xbox.h",
+	MAME_DIR .. "src/mame/machine/xbox_pci.cpp",
+	MAME_DIR .. "src/mame/machine/xbox_pci.h",
+	MAME_DIR .. "src/mame/machine/xbox_usb.cpp",
+	MAME_DIR .. "src/mame/machine/xbox_usb.h",
 	MAME_DIR .. "src/mame/video/powervr2.cpp",
 	MAME_DIR .. "src/mame/video/powervr2.h",
+	MAME_DIR .. "src/mame/video/xbox_nv2a.cpp",
+	MAME_DIR .. "src/mame/video/xbox_nv2a.h",
 	MAME_DIR .. "src/mame/drivers/neogeo.cpp",
 	MAME_DIR .. "src/mame/includes/neogeo.h",
 	MAME_DIR .. "src/mame/machine/ng_memcard.cpp",
@@ -1648,10 +1654,6 @@ files {
 	MAME_DIR .. "src/mame/includes/cps1.h",
 	MAME_DIR .. "src/mame/video/cps1.cpp",
 	MAME_DIR .. "src/mame/drivers/fcrash.cpp",
-	MAME_DIR .. "src/mame/video/xbox_nv2a.cpp",
-	MAME_DIR .. "src/mame/machine/xbox.cpp",
-	MAME_DIR .. "src/mame/machine/xbox_usb.cpp",
-	MAME_DIR .. "src/mame/machine/xbox_pci.cpp",
 	MAME_DIR .. "src/mame/includes/saturn.h",
 	MAME_DIR .. "src/mame/drivers/saturn.cpp",
 	MAME_DIR .. "src/mame/machine/saturn.cpp",
@@ -1675,16 +1677,33 @@ files {
 	MAME_DIR .. "src/mame/audio/special.h",
 }
 end
+
 --------------------------------------------------
 -- the following files are general components and
 -- shared across a number of drivers
 --------------------------------------------------
 createMESSProjects(_target, _subtarget, "messshared")
 files {
+	MAME_DIR .. "src/mame/audio/vboy.cpp",
+	MAME_DIR .. "src/mame/audio/vboy.h",
+	MAME_DIR .. "src/mame/audio/wswan.cpp",
+	MAME_DIR .. "src/mame/audio/wswan.h",
+	MAME_DIR .. "src/mame/machine/isbc_215g.cpp",
+	MAME_DIR .. "src/mame/machine/isbc_215g.h",
+	MAME_DIR .. "src/mame/machine/mega32x.cpp",
+	MAME_DIR .. "src/mame/machine/mega32x.h",
+	MAME_DIR .. "src/mame/machine/megacdcd.cpp",
+	MAME_DIR .. "src/mame/machine/megacdcd.h",
+	MAME_DIR .. "src/mame/machine/ms7004.cpp",
+	MAME_DIR .. "src/mame/machine/ms7004.h",
 	MAME_DIR .. "src/mame/machine/teleprinter.cpp",
 	MAME_DIR .. "src/mame/machine/teleprinter.h",
+	MAME_DIR .. "src/mame/machine/vt100_kbd.cpp",
+	MAME_DIR .. "src/mame/machine/vt100_kbd.h",
 	MAME_DIR .. "src/mame/machine/z80bin.cpp",
 	MAME_DIR .. "src/mame/machine/z80bin.h",
+	MAME_DIR .. "src/mame/video/crt.cpp",
+	MAME_DIR .. "src/mame/video/crt.h",
 }
 --------------------------------------------------
 -- manufacturer-specific groupings for drivers
@@ -1984,8 +2003,6 @@ files {
 	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.cpp",
-	MAME_DIR .. "src/mame/audio/wswan.h",
 	MAME_DIR .. "src/mame/video/wswan.cpp",
 	MAME_DIR .. "src/mame/video/wswan.h",
 	MAME_DIR .. "src/mame/drivers/bandai_design_master.cpp",
@@ -2110,7 +2127,6 @@ files {
 	MAME_DIR .. "src/mame/machine/mikro80.cpp",
 	MAME_DIR .. "src/mame/drivers/okean240.cpp",
 	MAME_DIR .. "src/mame/drivers/pk8000.cpp",
-	MAME_DIR .. "src/mame/includes/pk8000.h",
 	MAME_DIR .. "src/mame/drivers/pk8020.cpp",
 	MAME_DIR .. "src/mame/includes/pk8020.h",
 	MAME_DIR .. "src/mame/machine/pk8020.cpp",
@@ -2307,8 +2323,6 @@ files {
 	MAME_DIR .. "src/mame/machine/dec_lk201.h",
 	MAME_DIR .. "src/mame/machine/rx01.cpp",
 	MAME_DIR .. "src/mame/machine/rx01.h",
-	MAME_DIR .. "src/mame/machine/vt100_kbd.cpp",
-	MAME_DIR .. "src/mame/machine/vt100_kbd.h",
 	MAME_DIR .. "src/mame/video/vtvideo.cpp",
 	MAME_DIR .. "src/mame/video/vtvideo.h",
 }
@@ -2328,14 +2342,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/zsbc3.cpp",
 }
 
-createMESSProjects(_target, _subtarget, "dragon")
-files {
-	MAME_DIR .. "src/mame/drivers/dgn_beta.cpp",
-	MAME_DIR .. "src/mame/includes/dgn_beta.h",
-	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.cpp",
@@ -2380,8 +2386,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/dvk_kcgd.cpp",
 	MAME_DIR .. "src/mame/drivers/dvk_ksm.cpp",
 	MAME_DIR .. "src/mame/drivers/im01.cpp",
-	MAME_DIR .. "src/mame/machine/ms7004.cpp",
-	MAME_DIR .. "src/mame/machine/ms7004.h",
 	MAME_DIR .. "src/mame/drivers/mk85.cpp",
 	MAME_DIR .. "src/mame/drivers/mk90.cpp",
 	MAME_DIR .. "src/mame/drivers/mk98.cpp",
@@ -2799,8 +2803,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/isbc8030.cpp",
 	MAME_DIR .. "src/mame/machine/imm6_76.cpp",
 	MAME_DIR .. "src/mame/machine/imm6_76.h",
-	MAME_DIR .. "src/mame/machine/isbc_215g.cpp",
-	MAME_DIR .. "src/mame/machine/isbc_215g.h",
 	MAME_DIR .. "src/mame/machine/isbc_208.cpp",
 	MAME_DIR .. "src/mame/machine/isbc_208.h",
 	MAME_DIR .. "src/mame/drivers/rex6000.cpp",
@@ -3024,7 +3026,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/ec7915.cpp",
 	MAME_DIR .. "src/mame/drivers/konin.cpp",
 	MAME_DIR .. "src/mame/drivers/m79152pc.cpp",
-	MAME_DIR .. "src/mame/drivers/meritum.cpp",
 	MAME_DIR .. "src/mame/drivers/vdm7932x.cpp",
 }
 
@@ -3048,9 +3049,6 @@ files {
 createMESSProjects(_target, _subtarget, "microsoft")
 files {
 	MAME_DIR .. "src/mame/drivers/xbox.cpp",
-	MAME_DIR .. "src/mame/includes/xbox.h",
-	MAME_DIR .. "src/mame/includes/xbox_usb.h",
-	MAME_DIR .. "src/mame/includes/xbox_pci.h",
 }
 
 createMESSProjects(_target, _subtarget, "microterm")
@@ -3072,8 +3070,6 @@ createMESSProjects(_target, _subtarget, "mit")
 files {
 	MAME_DIR .. "src/mame/drivers/tx0.cpp",
 	MAME_DIR .. "src/mame/includes/tx0.h",
-	MAME_DIR .. "src/mame/video/crt.cpp",
-	MAME_DIR .. "src/mame/video/crt.h",
 	MAME_DIR .. "src/mame/video/tx0.cpp",
 }
 
@@ -3263,13 +3259,11 @@ files {
 	MAME_DIR .. "src/mame/includes/snes.h",
 	MAME_DIR .. "src/mame/machine/snescx4.cpp",
 	MAME_DIR .. "src/mame/machine/snescx4.h",
-	MAME_DIR .. "src/mame/machine/cx4data.hxx",
-	MAME_DIR .. "src/mame/machine/cx4fn.hxx",
-	MAME_DIR .. "src/mame/machine/cx4oam.hxx",
-	MAME_DIR .. "src/mame/machine/cx4ops.hxx",
+	MAME_DIR .. "src/mame/machine/cx4data.ipp",
+	MAME_DIR .. "src/mame/machine/cx4fn.ipp",
+	MAME_DIR .. "src/mame/machine/cx4oam.ipp",
+	MAME_DIR .. "src/mame/machine/cx4ops.ipp",
 	MAME_DIR .. "src/mame/drivers/vboy.cpp",
-	MAME_DIR .. "src/mame/audio/vboy.cpp",
-	MAME_DIR .. "src/mame/audio/vboy.h",
 	MAME_DIR .. "src/mame/drivers/gamecube.cpp",
 	MAME_DIR .. "src/mame/machine/m6502_vtscr.cpp",
 	MAME_DIR .. "src/mame/machine/m6502_vtscr.h",
@@ -3364,14 +3358,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/hektor.cpp",
 }
 
-createMESSProjects(_target, _subtarget, "orion")
-files {
-	MAME_DIR .. "src/mame/drivers/orion.cpp",
-	MAME_DIR .. "src/mame/includes/orion.h",
-	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.cpp",
@@ -3391,7 +3377,7 @@ files {
 createMESSProjects(_target, _subtarget, "palm")
 files {
 	MAME_DIR .. "src/mame/drivers/palm.cpp",
-	MAME_DIR .. "src/mame/drivers/palm_dbg.hxx",
+	MAME_DIR .. "src/mame/drivers/palm_dbg.ipp",
 	MAME_DIR .. "src/mame/drivers/palmz22.cpp",
 }
 
@@ -3505,6 +3491,10 @@ createMESSProjects(_target, _subtarget, "radio")
 files {
 	MAME_DIR .. "src/mame/drivers/apogee.cpp",
 	MAME_DIR .. "src/mame/drivers/mikrosha.cpp",
+	MAME_DIR .. "src/mame/drivers/orion.cpp",
+	MAME_DIR .. "src/mame/includes/orion.h",
+	MAME_DIR .. "src/mame/machine/orion.cpp",
+	MAME_DIR .. "src/mame/video/orion.cpp",
 	MAME_DIR .. "src/mame/drivers/partner.cpp",
 	MAME_DIR .. "src/mame/includes/partner.h",
 	MAME_DIR .. "src/mame/machine/partner.cpp",
@@ -3709,12 +3699,8 @@ files {
 	MAME_DIR .. "src/mame/drivers/sg1000.cpp",
 	MAME_DIR .. "src/mame/includes/sg1000.h",
 	MAME_DIR .. "src/mame/drivers/svmu.cpp",
-	MAME_DIR .. "src/mame/machine/mega32x.cpp",
-	MAME_DIR .. "src/mame/machine/mega32x.h",
 	MAME_DIR .. "src/mame/machine/megacd.cpp",
 	MAME_DIR .. "src/mame/machine/megacd.h",
-	MAME_DIR .. "src/mame/machine/megacdcd.cpp",
-	MAME_DIR .. "src/mame/machine/megacdcd.h",
 }
 
 createMESSProjects(_target, _subtarget, "selchow")
@@ -3837,6 +3823,7 @@ files {
 	MAME_DIR .. "src/mame/includes/specpls3.h",
 	MAME_DIR .. "src/mame/drivers/scorpion.cpp",
 	MAME_DIR .. "src/mame/drivers/atm.cpp",
+	MAME_DIR .. "src/mame/drivers/elwro800.cpp",
 	MAME_DIR .. "src/mame/drivers/pentagon.cpp",
 	MAME_DIR .. "src/mame/machine/beta.cpp",
 	MAME_DIR .. "src/mame/machine/beta.h",
@@ -4191,13 +4178,18 @@ files {
 	MAME_DIR .. "src/mame/machine/coco3.cpp",
 	MAME_DIR .. "src/mame/machine/coco_vhd.cpp",
 	MAME_DIR .. "src/mame/machine/coco_vhd.h",
-	MAME_DIR .. "src/mame/machine/dragon.cpp",
+	MAME_DIR .. "src/mame/drivers/dgn_beta.cpp",
+	MAME_DIR .. "src/mame/includes/dgn_beta.h",
+	MAME_DIR .. "src/mame/machine/dgn_beta.cpp",
+	MAME_DIR .. "src/mame/video/dgn_beta.cpp",
 	MAME_DIR .. "src/mame/machine/dgnalpha.cpp",
 	MAME_DIR .. "src/mame/includes/dgnalpha.h",
+	MAME_DIR .. "src/mame/machine/dragon.cpp",
 	MAME_DIR .. "src/mame/video/gime.cpp",
 	MAME_DIR .. "src/mame/video/gime.h",
 	MAME_DIR .. "src/mame/drivers/lnw80.cpp",
 	MAME_DIR .. "src/mame/drivers/max80.cpp",
+	MAME_DIR .. "src/mame/drivers/meritum.cpp",
 	MAME_DIR .. "src/mame/drivers/radionic.cpp",
 	MAME_DIR .. "src/mame/drivers/trs80.cpp",
 	MAME_DIR .. "src/mame/includes/trs80.h",
@@ -4653,7 +4645,6 @@ files {
 	MAME_DIR .. "src/mame/drivers/e100.cpp",
 	MAME_DIR .. "src/mame/drivers/eacc.cpp",
 	MAME_DIR .. "src/mame/drivers/easy_karaoke.cpp",
-	MAME_DIR .. "src/mame/drivers/elwro800.cpp",
 	MAME_DIR .. "src/mame/drivers/elzet80.cpp",
 	MAME_DIR .. "src/mame/drivers/epic14e.cpp",
 	MAME_DIR .. "src/mame/drivers/esprit.cpp",
diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp
index a3c13a669b1..2fc4b864e4a 100644
--- a/src/mame/drivers/chihiro.cpp
+++ b/src/mame/drivers/chihiro.cpp
@@ -431,8 +431,8 @@ Thanks to Alex, Mr Mudkips, and Philip Burke for this info.
 #include "emu.h"
 #include "machine/pci.h"
 #include "machine/idectrl.h"
-#include "includes/xbox_pci.h"
-#include "includes/xbox.h"
+#include "machine/xbox_pci.h"
+#include "machine/xbox.h"
 
 #include "bus/ata/idehd.h"
 #include "cpu/i386/i386.h"
diff --git a/src/mame/drivers/nforcepc.cpp b/src/mame/drivers/nforcepc.cpp
index 44b14ecc97f..8d43ccb80c9 100644
--- a/src/mame/drivers/nforcepc.cpp
+++ b/src/mame/drivers/nforcepc.cpp
@@ -33,7 +33,7 @@
 #include "bus/rs232/null_modem.h"
 #include "bus/rs232/sun_kbd.h"
 #include "bus/rs232/terminal.h"
-#include "includes/xbox_pci.h"
+#include "machine/xbox_pci.h"
 #include "includes/nforcepc.h"
 
 #if 1
diff --git a/src/mame/drivers/palm.cpp b/src/mame/drivers/palm.cpp
index 023b04f698f..f15cd7bf424 100644
--- a/src/mame/drivers/palm.cpp
+++ b/src/mame/drivers/palm.cpp
@@ -483,4 +483,4 @@ COMP( 19??, spt1500,  pilot1k, 0,      palmvx,  palm, palm_state, empty_init, "S
 COMP( 19??, spt1700,  pilot1k, 0,      palmvx,  palm, palm_state, empty_init, "Symbol",        "SPT 1700",            MACHINE_NOT_WORKING )
 COMP( 19??, spt1740,  pilot1k, 0,      palmvx,  palm, palm_state, empty_init, "Symbol",        "SPT 1740",            MACHINE_NOT_WORKING )
 
-#include "palm_dbg.hxx"
+#include "palm_dbg.ipp"
diff --git a/src/mame/drivers/palm_dbg.hxx b/src/mame/drivers/palm_dbg.ipp
similarity index 100%
rename from src/mame/drivers/palm_dbg.hxx
rename to src/mame/drivers/palm_dbg.ipp
diff --git a/src/mame/drivers/photon.cpp b/src/mame/drivers/photon.cpp
index bf6a367dfc2..8cdadc82d45 100644
--- a/src/mame/drivers/photon.cpp
+++ b/src/mame/drivers/photon.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "emu.h"
-#include "includes/pk8000.h"
+#include "video/pk8000.h"
 
 #include "cpu/i8085/i8085.h"
 #include "machine/i8255.h"
diff --git a/src/mame/drivers/pk8000.cpp b/src/mame/drivers/pk8000.cpp
index fd131bf964e..2eb135fa126 100644
--- a/src/mame/drivers/pk8000.cpp
+++ b/src/mame/drivers/pk8000.cpp
@@ -10,7 +10,7 @@ PK-8000
 ****************************************************************************/
 
 #include "emu.h"
-#include "includes/pk8000.h"
+#include "video/pk8000.h"
 
 #include "cpu/i8085/i8085.h"
 #include "machine/i8255.h"
diff --git a/src/mame/drivers/xbox.cpp b/src/mame/drivers/xbox.cpp
index fe626f022ad..e7782b0227d 100644
--- a/src/mame/drivers/xbox.cpp
+++ b/src/mame/drivers/xbox.cpp
@@ -10,8 +10,8 @@
 #include "emu.h"
 #include "machine/pci.h"
 #include "machine/idectrl.h"
-#include "includes/xbox_pci.h"
-#include "includes/xbox.h"
+#include "machine/xbox_pci.h"
+#include "machine/xbox.h"
 
 #include "cpu/i386/i386.h"
 #include "bus/ata/atapicdr.h"
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index ed0b77b21be..43a9a3b396f 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -663,56 +663,56 @@ public:
 	/* checker = 0, textured = 0, transparent = 0 */
 	#define MODEL2_FUNC 0
 	#define MODEL2_FUNC_NAME    model2_3d_render_0
-	#include "video/model2rd.hxx"
+	#include "video/model2rd.ipp"
 	#undef MODEL2_FUNC
 	#undef MODEL2_FUNC_NAME
 
 	/* checker = 0, textured = 0, translucent = 1 */
 	#define MODEL2_FUNC 1
 	#define MODEL2_FUNC_NAME    model2_3d_render_1
-	#include "video/model2rd.hxx"
+	#include "video/model2rd.ipp"
 	#undef MODEL2_FUNC
 	#undef MODEL2_FUNC_NAME
 
 	/* checker = 0, textured = 1, translucent = 0 */
 	#define MODEL2_FUNC 2
 	#define MODEL2_FUNC_NAME    model2_3d_render_2
-	#include "video/model2rd.hxx"
+	#include "video/model2rd.ipp"
 	#undef MODEL2_FUNC
 	#undef MODEL2_FUNC_NAME
 
 	/* checker = 0, textured = 1, translucent = 1 */
 	#define MODEL2_FUNC 3
 	#define MODEL2_FUNC_NAME    model2_3d_render_3
-	#include "video/model2rd.hxx"
+	#include "video/model2rd.ipp"
 	#undef MODEL2_FUNC
 	#undef MODEL2_FUNC_NAME
 
 	/* checker = 1, textured = 0, translucent = 0 */
 	#define MODEL2_FUNC 4
 	#define MODEL2_FUNC_NAME    model2_3d_render_4
-	#include "video/model2rd.hxx"
+	#include "video/model2rd.ipp"
 	#undef MODEL2_FUNC
 	#undef MODEL2_FUNC_NAME
 
 	/* checker = 1, textured = 0, translucent = 1 */
 	#define MODEL2_FUNC 5
 	#define MODEL2_FUNC_NAME    model2_3d_render_5
-	#include "video/model2rd.hxx"
+	#include "video/model2rd.ipp"
 	#undef MODEL2_FUNC
 	#undef MODEL2_FUNC_NAME
 
 	/* checker = 1, textured = 1, translucent = 0 */
 	#define MODEL2_FUNC 6
 	#define MODEL2_FUNC_NAME    model2_3d_render_6
-	#include "video/model2rd.hxx"
+	#include "video/model2rd.ipp"
 	#undef MODEL2_FUNC
 	#undef MODEL2_FUNC_NAME
 
 	/* checker = 1, textured = 1, translucent = 1 */
 	#define MODEL2_FUNC 7
 	#define MODEL2_FUNC_NAME    model2_3d_render_7
-	#include "video/model2rd.hxx"
+	#include "video/model2rd.ipp"
 	#undef MODEL2_FUNC
 	#undef MODEL2_FUNC_NAME
 
diff --git a/src/mame/machine/cx4data.hxx b/src/mame/machine/cx4data.ipp
similarity index 100%
rename from src/mame/machine/cx4data.hxx
rename to src/mame/machine/cx4data.ipp
diff --git a/src/mame/machine/cx4fn.hxx b/src/mame/machine/cx4fn.ipp
similarity index 100%
rename from src/mame/machine/cx4fn.hxx
rename to src/mame/machine/cx4fn.ipp
diff --git a/src/mame/machine/cx4oam.hxx b/src/mame/machine/cx4oam.ipp
similarity index 100%
rename from src/mame/machine/cx4oam.hxx
rename to src/mame/machine/cx4oam.ipp
diff --git a/src/mame/machine/cx4ops.hxx b/src/mame/machine/cx4ops.ipp
similarity index 100%
rename from src/mame/machine/cx4ops.hxx
rename to src/mame/machine/cx4ops.ipp
diff --git a/src/mame/machine/seibucop.cpp b/src/mame/machine/seibucop.cpp
index 1d546c9a746..26fb9af4b49 100644
--- a/src/mame/machine/seibucop.cpp
+++ b/src/mame/machine/seibucop.cpp
@@ -115,8 +115,8 @@
 #define LOG_Move0205    0
 #define LOG_Move0905    0
 
-#include "seibucop_dma.hxx"
-#include "seibucop_cmd.hxx"
+#include "seibucop_dma.ipp"
+#include "seibucop_cmd.ipp"
 
 #include <algorithm>
 
diff --git a/src/mame/machine/seibucop_cmd.hxx b/src/mame/machine/seibucop_cmd.ipp
similarity index 100%
rename from src/mame/machine/seibucop_cmd.hxx
rename to src/mame/machine/seibucop_cmd.ipp
diff --git a/src/mame/machine/seibucop_dma.hxx b/src/mame/machine/seibucop_dma.ipp
similarity index 100%
rename from src/mame/machine/seibucop_dma.hxx
rename to src/mame/machine/seibucop_dma.ipp
diff --git a/src/mame/machine/snescx4.cpp b/src/mame/machine/snescx4.cpp
index 9ffb0abcd02..7a1b96f7237 100644
--- a/src/mame/machine/snescx4.cpp
+++ b/src/mame/machine/snescx4.cpp
@@ -25,8 +25,8 @@ static void CX4_writew(address_space &space, uint16_t addr, uint16_t data);
 
 static void CX4_C4DrawLine(int32_t X1, int32_t Y1, int16_t Z1, int32_t X2, int32_t Y2, int16_t Z2, uint8_t Color);
 
-#include "machine/cx4data.hxx"
-#include "machine/cx4fn.hxx"
+#include "machine/cx4data.ipp"
+#include "machine/cx4fn.ipp"
 
 static uint32_t CX4_ldr(uint8_t r)
 {
@@ -114,8 +114,8 @@ static void CX4_transfer_data(address_space &space)
 	}
 }
 
-#include "machine/cx4oam.hxx"
-#include "machine/cx4ops.hxx"
+#include "machine/cx4oam.ipp"
+#include "machine/cx4ops.ipp"
 
 void CX4_write(address_space &space, uint32_t addr, uint8_t data)
 {
diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp
index 3ce1c78b4dd..a4e4b6e35a7 100644
--- a/src/mame/machine/xbox.cpp
+++ b/src/mame/machine/xbox.cpp
@@ -4,8 +4,8 @@
 #include "emu.h"
 #include "machine/pci.h"
 #include "machine/idectrl.h"
-#include "includes/xbox_pci.h"
-#include "includes/xbox.h"
+#include "machine/xbox_pci.h"
+#include "machine/xbox.h"
 
 #include "cpu/i386/i386.h"
 #include "debug/debugcon.h"
diff --git a/src/mame/includes/xbox.h b/src/mame/machine/xbox.h
similarity index 98%
rename from src/mame/includes/xbox.h
rename to src/mame/machine/xbox.h
index c0779b740f3..66870c5bca8 100644
--- a/src/mame/includes/xbox.h
+++ b/src/mame/machine/xbox.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "xbox_nv2a.h"
-#include "xbox_usb.h"
+#include "machine/xbox_usb.h"
+#include "video/xbox_nv2a.h"
 
 #include "machine/idectrl.h"
 #include "machine/pic8259.h"
diff --git a/src/mame/machine/xbox_pci.cpp b/src/mame/machine/xbox_pci.cpp
index b2d1f125cd7..ea84afd414c 100644
--- a/src/mame/machine/xbox_pci.cpp
+++ b/src/mame/machine/xbox_pci.cpp
@@ -4,8 +4,8 @@
 #include "emu.h"
 #include "machine/pci.h"
 #include "machine/idectrl.h"
-#include "includes/xbox_pci.h"
-#include "includes/xbox.h"
+#include "machine/xbox_pci.h"
+#include "machine/xbox.h"
 #include "machine/ds128x.h"
 
 #include <functional>
diff --git a/src/mame/includes/xbox_pci.h b/src/mame/machine/xbox_pci.h
similarity index 99%
rename from src/mame/includes/xbox_pci.h
rename to src/mame/machine/xbox_pci.h
index 52e9e5c4a52..f9d0b0d9916 100644
--- a/src/mame/includes/xbox_pci.h
+++ b/src/mame/machine/xbox_pci.h
@@ -5,9 +5,10 @@
 
 #pragma once
 
+#include "machine/xbox_usb.h"
+#include "video/xbox_nv2a.h"
+
 #include "machine/pit8253.h"
-#include "xbox_nv2a.h"
-#include "xbox_usb.h"
 
 /*
  * Host
diff --git a/src/mame/machine/xbox_usb.cpp b/src/mame/machine/xbox_usb.cpp
index aefa352a12a..d07577eacb4 100644
--- a/src/mame/machine/xbox_usb.cpp
+++ b/src/mame/machine/xbox_usb.cpp
@@ -4,9 +4,9 @@
 #include "emu.h"
 #include "machine/pci.h"
 #include "machine/idectrl.h"
-#include "includes/xbox_pci.h"
-#include "includes/xbox_usb.h"
-#include "includes/xbox.h"
+#include "machine/xbox_pci.h"
+#include "machine/xbox_usb.h"
+#include "machine/xbox.h"
 
 //#define LOG_OHCI
 
diff --git a/src/mame/includes/xbox_usb.h b/src/mame/machine/xbox_usb.h
similarity index 100%
rename from src/mame/includes/xbox_usb.h
rename to src/mame/machine/xbox_usb.h
diff --git a/src/mame/video/hng64.cpp b/src/mame/video/hng64.cpp
index 23228f88733..9c662991e03 100644
--- a/src/mame/video/hng64.cpp
+++ b/src/mame/video/hng64.cpp
@@ -1270,5 +1270,5 @@ void hng64_state::video_start()
 	m_vertsrom_size = memregion("verts")->bytes();
 }
 
-#include "video/hng64_3d.hxx"
-#include "video/hng64_sprite.hxx"
+#include "video/hng64_3d.ipp"
+#include "video/hng64_sprite.ipp"
diff --git a/src/mame/video/hng64_3d.hxx b/src/mame/video/hng64_3d.ipp
similarity index 100%
rename from src/mame/video/hng64_3d.hxx
rename to src/mame/video/hng64_3d.ipp
diff --git a/src/mame/video/hng64_sprite.hxx b/src/mame/video/hng64_sprite.ipp
similarity index 100%
rename from src/mame/video/hng64_sprite.hxx
rename to src/mame/video/hng64_sprite.ipp
diff --git a/src/mame/video/jagblit.hxx b/src/mame/video/jagblit.ipp
similarity index 99%
rename from src/mame/video/jagblit.hxx
rename to src/mame/video/jagblit.ipp
index 86c3bc9d8d7..59f95a00d3b 100644
--- a/src/mame/video/jagblit.hxx
+++ b/src/mame/video/jagblit.ipp
@@ -12,7 +12,7 @@
     #define COMMAND  -- blitter command bits for blitter
     #define A1FIXED  -- fixed A1 flag bits for blitter
     #define A2FIXED  -- fixed A2 flag bits for blitter
-    #include "jagblit.hxx"
+    #include "jagblit.ipp"
 
 ****************************************************************************/
 
diff --git a/src/mame/video/jagobj.hxx b/src/mame/video/jagobj.ipp
similarity index 100%
rename from src/mame/video/jagobj.hxx
rename to src/mame/video/jagobj.ipp
diff --git a/src/mame/video/jaguar.cpp b/src/mame/video/jaguar.cpp
index 0aa82800e52..9992d850c9c 100644
--- a/src/mame/video/jaguar.cpp
+++ b/src/mame/video/jaguar.cpp
@@ -878,7 +878,7 @@ uint32_t jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
  *************************************/
 
 #define INCLUDE_OBJECT_PROCESSOR
-#include "jagobj.hxx"
+#include "jagobj.ipp"
 
 
 
@@ -893,7 +893,7 @@ uint32_t jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
 #define COMMAND     command
 #define A1FIXED     a1flags
 #define A2FIXED     a2flags
-#include "jagblit.hxx"
+#include "jagblit.ipp"
 #undef A2FIXED
 #undef A1FIXED
 #undef COMMAND
@@ -904,7 +904,7 @@ uint32_t jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
 #define COMMAND     0x09800001
 #define A1FIXED     0x010020
 #define A2FIXED     0x010020
-#include "jagblit.hxx"
+#include "jagblit.ipp"
 #undef A2FIXED
 #undef A1FIXED
 #undef COMMAND
@@ -914,7 +914,7 @@ uint32_t jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
 #define COMMAND     0x09800009
 #define A1FIXED     0x000020
 #define A2FIXED     0x000020
-#include "jagblit.hxx"
+#include "jagblit.ipp"
 #undef A2FIXED
 #undef A1FIXED
 #undef COMMAND
@@ -924,7 +924,7 @@ uint32_t jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
 #define COMMAND     0x01800009
 #define A1FIXED     0x000028
 #define A2FIXED     0x000028
-#include "jagblit.hxx"
+#include "jagblit.ipp"
 #undef A2FIXED
 #undef A1FIXED
 #undef COMMAND
@@ -934,7 +934,7 @@ uint32_t jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
 #define COMMAND     0x01800001
 #define A1FIXED     0x000018
 #define A2FIXED     0x000018
-#include "jagblit.hxx"
+#include "jagblit.ipp"
 #undef A2FIXED
 #undef A1FIXED
 #undef COMMAND
@@ -944,7 +944,7 @@ uint32_t jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
 #define COMMAND     0x01c00001
 #define A1FIXED     0x000018
 #define A2FIXED     0x000018
-#include "jagblit.hxx"
+#include "jagblit.ipp"
 #undef A2FIXED
 #undef A1FIXED
 #undef COMMAND
@@ -955,7 +955,7 @@ uint32_t jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
 #define COMMAND     0x00010000
 #define A1FIXED     a1flags
 #define A2FIXED     a2flags
-#include "jagblit.hxx"
+#include "jagblit.ipp"
 #undef A2FIXED
 #undef A1FIXED
 #undef COMMAND
@@ -965,7 +965,7 @@ uint32_t jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
 #define COMMAND     0x01800001
 #define A1FIXED     a1flags
 #define A2FIXED     a2flags
-#include "jagblit.hxx"
+#include "jagblit.ipp"
 #undef A2FIXED
 #undef A1FIXED
 #undef COMMAND
@@ -975,7 +975,7 @@ uint32_t jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap
 #define COMMAND     ((command & 0xf0000f00) | 0x01800001)
 #define A1FIXED     a1flags
 #define A2FIXED     a2flags
-#include "jagblit.hxx"
+#include "jagblit.ipp"
 #undef A2FIXED
 #undef A1FIXED
 #undef COMMAND
diff --git a/src/mame/video/model2rd.hxx b/src/mame/video/model2rd.ipp
similarity index 100%
rename from src/mame/video/model2rd.hxx
rename to src/mame/video/model2rd.ipp
diff --git a/src/mame/video/n64.cpp b/src/mame/video/n64.cpp
index df4ef2c1cc5..2891632afdb 100644
--- a/src/mame/video/n64.cpp
+++ b/src/mame/video/n64.cpp
@@ -70,7 +70,7 @@ bool n64_rdp::rdp_range_check(uint32_t addr)
 /*****************************************************************************/
 
 // The functions in this file should be moved into the parent Processor class.
-#include "rdpfiltr.hxx"
+#include "rdpfiltr.ipp"
 
 int32_t n64_rdp::get_alpha_cvg(int32_t comb_alpha, rdp_span_aux* userdata, const rdp_poly_state &object)
 {
diff --git a/src/mame/video/pk8000.cpp b/src/mame/video/pk8000.cpp
index 9f5f3ccc5c5..4e53a91625e 100644
--- a/src/mame/video/pk8000.cpp
+++ b/src/mame/video/pk8000.cpp
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
 #include "emu.h"
-#include "includes/pk8000.h"
+#include "pk8000.h"
 
 uint8_t pk8000_base_state::video_color_r()
 {
diff --git a/src/mame/includes/pk8000.h b/src/mame/video/pk8000.h
similarity index 92%
rename from src/mame/includes/pk8000.h
rename to src/mame/video/pk8000.h
index cb92dca6aa7..80882471569 100644
--- a/src/mame/includes/pk8000.h
+++ b/src/mame/video/pk8000.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
-#ifndef MAME_INCLUDES_PK8000_H
-#define MAME_INCLUDES_PK8000_H
+#ifndef MAME_VIDEO_PK8000_H
+#define MAME_VIDEO_PK8000_H
 
 #pragma once
 
@@ -9,13 +9,12 @@
 
 class pk8000_base_state : public driver_device
 {
-public:
+protected:
 	pk8000_base_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
 	{ }
 
-protected:
 	uint8_t _84_porta_r();
 	void _84_porta_w(uint8_t data);
 	void _84_portc_w(uint8_t data);
@@ -48,4 +47,4 @@ protected:
 	required_device<cpu_device> m_maincpu;
 };
 
-#endif // MAME_INCLUDES_PK8000_H
+#endif // MAME_VIDEO_PK8000_H
diff --git a/src/mame/video/rdpfiltr.hxx b/src/mame/video/rdpfiltr.ipp
similarity index 100%
rename from src/mame/video/rdpfiltr.hxx
rename to src/mame/video/rdpfiltr.ipp
diff --git a/src/mame/video/xbox_nv2a.cpp b/src/mame/video/xbox_nv2a.cpp
index cbaa7a7843b..9eb2bf67f34 100644
--- a/src/mame/video/xbox_nv2a.cpp
+++ b/src/mame/video/xbox_nv2a.cpp
@@ -3,7 +3,7 @@
 #include "emu.h"
 #include "video/poly.h"
 #include "bitmap.h"
-#include "includes/xbox_nv2a.h"
+#include "video/xbox_nv2a.h"
 #include <bitset>
 #include <cfloat>
 
diff --git a/src/mame/includes/xbox_nv2a.h b/src/mame/video/xbox_nv2a.h
similarity index 100%
rename from src/mame/includes/xbox_nv2a.h
rename to src/mame/video/xbox_nv2a.h
diff --git a/src/tools/reorganize.py b/src/tools/reorganize.py
index e755ff8a86e..a0cc8f48806 100755
--- a/src/tools/reorganize.py
+++ b/src/tools/reorganize.py
@@ -27,22 +27,32 @@ def resolve_conflicts(root, *parts):
     for part in parts:
         c = part[0]
         for file in walk(part):
+            base, ext = os.path.splitext(file)
+            key = part + '/' + base
             if file in present:
-                base, ext = os.path.splitext(file)
                 if not ext:
                     raise Exception('File %s has no extension' % (file, ))
-                nf = base + '_' + c + ext
+                nb = base + '_' + c
+                nf = nb + ext
                 #print('%s -> %s' % (os.path.join(part, file), nf))
                 if nf in present:
                     raise Exception('File %s still conflicted after renaming from %s' % (nf, file))
+                result[key] = nb
             else:
                 nf = file
+                if key not in result:
+                    result[key] = base
             present.add(nf)
-            result[part + '/' + file] = nf
 
     return result
 
 
+def remap_file(renaming, filename):
+    parts = filename.split('/')
+    parts[-1], ext = os.path.splitext(parts[-1])
+    return renaming.get('/'.join(parts), parts[-1]) + ext
+
+
 def update_projects(root, renaming, *scripts):
     keys = ('createMAMEProjects', 'createMESSProjects')
     result = { 'video/konamiic.txt': 'konami' }
@@ -78,18 +88,13 @@ def update_projects(root, renaming, *scripts):
                     else:
                         if fn not in result:
                             bad = True
-                            #print("Missing in projects and seen in another .lua: %s" % fn)
+                            print("Missing in projects and seen in another .lua: %s" % fn)
                             ap = '?'
                         else:
                             ap = result[fn]
-                    ls = ls[:p+22] + ap + '/' + renaming[fn] + ls[p2:]
+                    ls = ls[:p+22] + ap + '/' + remap_file(renaming, fn) + ls[p2:]
                 print(ls, file=f)
 
-    for k in renaming:
-        if k not in result:
-            print('Missing in projects: %s' % (k, ))
-            bad = True
-
     if bad:
         raise Exception('Error updating project scripts')
 
@@ -105,7 +110,7 @@ def update_driver_list(fname, renaming, projectmap):
             match = re.match('(.*@source:)([-_0-9a-z]+\\.cpp)\\b(\s*)(.*)', ls)
             if match:
                 f = 'drivers/' + match.group(2)
-                r = projectmap[f] + '/' + renaming.get(f, match.group(2))
+                r = projectmap[f] + '/' + remap_file(renaming, f)
                 if match.group(3):
                     w = len(match.group(2)) + len(match.group(3))
                     if len(r) < w:
@@ -126,7 +131,7 @@ def update_driver_filter(fname, renaming, projectmap):
             match = re.match('(.*)(?<![-_0-9a-z])([-_0-9a-z]+\\.cpp)\\b(.*)', ls)
             if match:
                 f = 'drivers/' + match.group(2)
-                b = renaming.get(f, match.group(2))
+                b = remap_file(renaming, f)
                 print(match.group(1) + projectmap[f] + '/' + b + match.group(3), file=outfile)
             else:
                 print(ls, file=outfile)
@@ -163,13 +168,20 @@ def relocate_source(root, filename, destbase, renaming, projectmap):
                     if (fik is not None) and (fik in projectmap):
                         fim = fpmap[fik]
                         if fim == destproject:
-                            nfi = renaming[fik]
+                            nfi = remap_file(renaming, fik)
                         else:
-                            nfi = fim + '/' + renaming[fik]
+                            nfi = fim + '/' + remap_file(renaming, fik)
                         l = l[:si] + nfi + l[ei:]
             fdh.write(l)
 
 
+def relocate_sources(root, renaming, projectmap):
+    for src, dst in renaming.items():
+        for file in glob.glob(os.path.join(root, 'src', 'mame', *src.split('/')) + '.*'):
+            extension = os.path.splitext(file)[1]
+            relocate_source(root, src + extension, dst + extension, renaming, projectmap)
+
+
 if __name__ == '__main__':
     options = parse_command()
     src = os.path.join(options.srcroot, 'src', 'mame')
@@ -194,8 +206,7 @@ if __name__ == '__main__':
         os.makedirs(os.path.join(src, d), exist_ok=True)
 
     # Move the files around
-    for fs, bfd in renaming.items():
-        relocate_source(options.srcroot, fs, bfd, renaming, fpmap)
+    relocate_sources(options.srcroot, renaming, fpmap)
 
     for d in areas:
         os.rmdir(os.path.join(src, d))