There is only one Sega

scripts/src/machine.lua

@@ -5062,3 +5062,25 @@ if (MACHINES["SAA7191"]~=null) then
 		MAME_DIR .. "src/devices/machine/saa7191.h",
 	}
 end
+
+---------------------------------------------------
+--
+--@src/devices/machine/segacrpt_device.h,MACHINES["SEGACRPT"] = true
+---------------------------------------------------
+if (MACHINES["SEGACRPT"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/segacrpt_device.cpp",
+		MAME_DIR .. "src/devices/machine/segacrpt_device.h",
+	}
+end
+
+---------------------------------------------------
+--
+--@src/devices/machine/segacrp2_device.h,MACHINES["SEGACRP2"] = true
+---------------------------------------------------
+if (MACHINES["SEGACRP2"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/segacrp2_device.cpp",
+		MAME_DIR .. "src/devices/machine/segacrp2_device.h",
+	}
+end

src/mame/igs/goldstar.cpp

@@ -215,12 +215,11 @@
 #include "emu.h"
 #include "goldstar.h"
 
-#include "segacrp2_device.h"
-#include "segacrpt_device.h"
-
 #include "cpu/z80/z80.h"
 #include "cpu/mcs51/mcs51.h"
 #include "machine/nvram.h"
+#include "machine/segacrp2_device.h"
+#include "machine/segacrpt_device.h"
 #include "sound/ay8910.h"
 #include "sound/okim6295.h"
 #include "sound/sn76496.h"

src/mame/kiwako/jongkyo.cpp

@@ -28,8 +28,7 @@
 
 #include "emu.h"
 
-#include "segacrpt_device.h"
-
+#include "machine/segacrpt_device.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 

src/mame/mame.lst

@@ -11933,7 +11933,7 @@ waidrive                        // 2005.01 WaiWai Drive
 xtrmhnt2                        // 2006.09 Extreme Hunting 2 Tournament Edition
 xtrmhunt                        // 2004.09 Extreme Hunting
 
-@source:segacons/dccons.cpp
+@source:sega/dccons.cpp
 dc                              // 1999 Sega Dreamcast (USA)
 dcdev                           // 1998 Sega HKT-0120 Sega Dreamcast Development Box
 dceu                            // 1999 Sega Dreamcast (Europe)
@@ -23053,7 +23053,7 @@ mechattu1                       // A8002 'MA' (c) 1989
 a51site4                        // ??           (c) 1998
 a51site4a                       // Sept.11,1998     (c) 1998
 
-@source:segacons/mdconsole.cpp
+@source:sega/mdconsole.cpp
 32x                             // 1994 Sega 32X (USA)
 32x_mcd                         // 1995 Sega Mega-CD (Europe w/32X addon)
 32x_mcdj                        // 1994 Sega Mega-CD (Japan w/32X addon)
@@ -23100,7 +23100,7 @@ ssf2mdb                         // MegaDrive-based hack
 topshoot                        // (c) 1995 Sun Mixing
 twinktmb                        // MegaDrive-based hack
 
-@source:segacons/megadriv_rad.cpp
+@source:sega/megadriv_rad.cpp
 rad_sf2                         // (c)2004 Radica
 rad_sf2p                        // (c)2004 Radica
 rad_gen1                        // (c)2004 Radica
@@ -23115,10 +23115,10 @@ msi_sf2
 dgunl3227
 ra145
 
-@source:segacons/megadriv_sunplus_hybrid.cpp
+@source:sega/megadriv_sunplus_hybrid.cpp
 reactmd
 
-@source:segacons/megadriv_vt_hybrid.cpp
+@source:sega/megadriv_vt_hybrid.cpp
 sarc110
 sarc110a
 
@@ -37779,10 +37779,10 @@ wg3dhfe                         // (c) 1996 Atari Games
 @source:skeleton/seattlecmp.cpp
 scp300f                         // Seattle SCP-300F
 
-@source:segacons/sega_beena.cpp
+@source:sega/sega_beena.cpp
 beena                           //
 
-@source:segacons/sega_sawatte.cpp
+@source:sega/sega_sawatte.cpp
 sawatte                         //
 
 @source:sega/segaatom.cpp
@@ -37949,13 +37949,13 @@ toutrunj1                       // 1987 (FD1094)
 toutrunj1d                      // bootleg
 toutrunjd                       // bootleg
 
-@source:segacons/segapico.cpp
+@source:sega/segapico.cpp
 copera                          // 1993 Sega / Yamaha
 pico                            // 1994 Sega Pico (Europe)
 picoj                           // 1993 Sega Pico (Japan)
 picou                           // 1994 Sega Pico (USA)
 
-@source:segacons/segapm.cpp
+@source:sega/segapm.cpp
 segapm                          // 1996 Sega Picture Magic (32x type hardware)
 
 @source:sega/segas16a.cpp
@@ -38869,7 +38869,7 @@ sfkick                          // (c) 1988 Haesung/HJ Corp
 sfkicka                         // (c) 198? Haesung
 spinkick                        // (c) 1988 Haesung/Seojin
 
-@source:segacons/sg1000.cpp
+@source:sega/sg1000.cpp
 omv1000                         // Tsukuda Original Othello Multivision FG-1000
 omv2000                         // Tsukuda Original Othello Multivision FG-2000
 sc3000                          // Sega SC-3000 (Japan)
@@ -40547,7 +40547,7 @@ svisionp                        //
 svisions                        //
 tvlinkp                         //
 
-@source:segacons/svmu.cpp
+@source:sega/svmu.cpp
 svmu                            // 1998 Sega Visual Memory Unit
 
 @source:namco/sweetland.cpp

src/mame/mess.flt

@@ -674,17 +674,17 @@ sanyo/phc25.cpp
 saturn/st17xx.cpp
 sega/saturn.cpp
 sega/sms.cpp
-segacons/dccons.cpp
-segacons/mdconsole.cpp
-segacons/megadriv_rad.cpp
-segacons/megadriv_sunplus_hybrid.cpp
-segacons/megadriv_vt_hybrid.cpp
-segacons/sega_beena.cpp
-segacons/sega_sawatte.cpp
-segacons/segapico.cpp
-segacons/segapm.cpp
-segacons/sg1000.cpp
-segacons/svmu.cpp
+sega/dccons.cpp
+sega/mdconsole.cpp
+sega/megadriv_rad.cpp
+sega/megadriv_sunplus_hybrid.cpp
+sega/megadriv_vt_hybrid.cpp
+sega/sega_beena.cpp
+sega/sega_sawatte.cpp
+sega/segapico.cpp
+sega/segapm.cpp
+sega/sg1000.cpp
+sega/svmu.cpp
 sequential/prophet600.cpp
 sfrj/galaxy.cpp
 sfrj/galeb.cpp

src/mame/nichibut/cclimber.h

@@ -5,8 +5,7 @@
 
 #pragma once
 
-#include "segacrpt_device.h"
-
+#include "machine/segacrpt_device.h"
 #include "machine/74259.h"
 #include "machine/gen_latch.h"
 

src/mame/nichibut/jangou.cpp

@@ -27,8 +27,7 @@ $c088-$c095 player tiles
 
 #include "emu.h"
 
-#include "segacrpt_device.h"
-
+#include "machine/segacrpt_device.h"
 #include "cpu/m6800/m6800.h"
 #include "cpu/z80/z80.h"
 #include "machine/gen_latch.h"

src/mame/pacman/pengo.cpp

@@ -66,8 +66,7 @@
 #include "emu.h"
 #include "pacman.h"
 
-#include "segacrpt_device.h"
-
+#include "machine/segacrpt_device.h"
 #include "cpu/z80/z80.h"
 #include "machine/74259.h"
 #include "machine/gen_latch.h"

src/mame/sanritsu/appoooh.cpp

@@ -165,8 +165,7 @@ Language
 
 #include "emu.h"
 
-#include "segacrp2_device.h"
-
+#include "machine/segacrp2_device.h"
 #include "cpu/z80/z80.h"
 #include "sound/msm5205.h"
 #include "sound/sn76496.h"

src/mame/sega/angelkds.cpp

@@ -128,9 +128,8 @@ Dumped by Chackn
 
 #include "emu.h"
 
-#include "segacrp2_device.h"
-
 #include "cpu/z80/z80.h"
+#include "machine/segacrp2_device.h"
 #include "machine/i8255.h"
 #include "sound/ymopn.h"
 

src/mame/sega/calorie.cpp

@@ -82,7 +82,7 @@ Notes:
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "machine/gen_latch.h"
-#include "segacrp2_device.h"
+#include "machine/segacrp2_device.h"
 #include "sound/ay8910.h"
 #include "emupal.h"
 #include "screen.h"

src/mame/sega/segae.cpp

@@ -301,7 +301,7 @@ GND  8A 8B GND
 #include "machine/adc0804.h"
 #include "machine/i8255.h"
 #include "machine/rescap.h"
-#include "segacrp2_device.h"
+#include "machine/segacrp2_device.h"
 #include "machine/upd4701.h"
 #include "video/315_5124.h"
 #include "speaker.h"

src/mame/sega/segag80r.cpp

@@ -110,8 +110,7 @@
 #include "segag80r.h"
 #include "segag80_m.h"
 
-#include "segacrpt_device.h"
-
+#include "machine/segacrpt_device.h"
 #include "cpu/z80/z80.h"
 #include "machine/i8255.h"
 #include "speaker.h"

src/mame/sega/segas16a.cpp

@@ -153,7 +153,7 @@ Tetris         -         -         -         -         EPR12169  EPR12170  -
 #include "fd1089.h"
 #include "fd1094.h"
 #include "machine/nvram.h"
-#include "segacrp2_device.h"
+#include "machine/segacrp2_device.h"
 #include "sound/dac.h"
 #include "speaker.h"
 

src/mame/sega/sg1000a.cpp

@@ -271,12 +271,11 @@ End
 
 #include "emu.h"
 
-#include "segacrpt_device.h"
-
 #include "cpu/z80/z80.h"
 #include "sound/sn76496.h"
 #include "video/tms9928a.h"
 #include "machine/i8255.h"
+#include "machine/segacrpt_device.h"
 
 #include "speaker.h"
 

src/mame/sega/suprloco.cpp

@@ -24,8 +24,7 @@ Sega PCB 834-5137
 #include "emu.h"
 #include "suprloco.h"
 
-#include "segacrpt_device.h"
-
+#include "machine/segacrpt_device.h"
 #include "cpu/z80/z80.h"
 #include "machine/i8255.h"
 #include "sound/sn76496.h"

src/mame/sega/system1.cpp

@@ -306,8 +306,7 @@ seem to have access to.
 #include "emu.h"
 #include "system1.h"
 
-#include "segacrpt_device.h"
-
+#include "machine/segacrpt_device.h"
 #include "cpu/z80/mc8123.h"
 #include "sound/sn76496.h"
 

src/mame/sega/system1.h

@@ -10,7 +10,8 @@
 #include "machine/z80pio.h"
 #include "machine/gen_latch.h"
 #include "machine/i8255.h"
-#include "segacrp2_device.h"
+#include "machine/segacrpt_device.h"
+#include "machine/segacrp2_device.h"
 #include "machine/timer.h"
 #include "emupal.h"
 #include "screen.h"

src/mame/sega/turbo.cpp

@@ -149,8 +149,7 @@
 #include "emu.h"
 #include "turbo.h"
 
-#include "segacrpt_device.h"
-
+#include "machine/segacrpt_device.h"
 #include "machine/74259.h"
 #include "machine/i8279.h"
 

src/mame/sega/zaxxon.cpp

@@ -257,9 +257,8 @@
 #include "zaxxon.h"
 #include "segausb.h"
 
-#include "segacrpt_device.h"
-
 #include "cpu/z80/z80.h"
+#include "machine/segacrpt_device.h"
 #include "machine/gen_latch.h"
 #include "machine/i8255.h"
 #include "sound/samples.h"

src/mame/tehkan/pbaction.cpp

@@ -97,8 +97,7 @@ Stephh's notes (based on the game Z80 code and some tests) :
 #include "emu.h"
 #include "pbaction.h"
 
-#include "segacrpt_device.h"
-
+#include "machine/segacrpt_device.h"
 #include "machine/74259.h"
 #include "sound/ay8910.h"
 #include "screen.h"

src/mame/tehkan/senjyo.cpp

@@ -80,8 +80,7 @@ I/O read/write
 #include "emu.h"
 #include "senjyo.h"
 
-#include "segacrpt_device.h"
-
+#include "machine/segacrpt_device.h"
 #include "cpu/z80/z80.h"
 #include "sound/sn76496.h"