bfm_sc and maygay (nw)

scripts/target/mame/arcade.lua

@@ -1234,15 +1234,14 @@ files {
 	MAME_DIR .. "src/mame/video/bfm_adr2.cpp",
 	MAME_DIR .. "src/mame/video/bfm_adr2.h",
 	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/includes/bfm_sc5.h",
-	MAME_DIR .. "src/mame/drivers/bfm_sc5sw.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_sc5.inc",
 	MAME_DIR .. "src/mame/drivers/bfm_ad5.cpp",
 	MAME_DIR .. "src/mame/includes/bfm_ad5.h",
-	MAME_DIR .. "src/mame/drivers/bfm_ad5sw.cpp",
+	MAME_DIR .. "src/mame/drivers/bfm_ad5.inc",
-	MAME_DIR .. "src/mame/drivers/bfm_sc45_helper.cpp",
+	MAME_DIR .. "src/mame/machine/bfm_sc45_helper.cpp",
-	MAME_DIR .. "src/mame/drivers/bfm_sc45_helper.h",
+	MAME_DIR .. "src/mame/machine/bfm_sc45_helper.h",
 	MAME_DIR .. "src/mame/includes/bfm_sc45.h",
 	MAME_DIR .. "src/mame/drivers/bfm_swp.cpp",
 	MAME_DIR .. "src/mame/drivers/bfmsys83.cpp",
@@ -2385,7 +2384,7 @@ createMAMEProjects(_target, _subtarget, "maygay")
 files {
 	MAME_DIR .. "src/mame/drivers/maygay1b.cpp",
 	MAME_DIR .. "src/mame/includes/maygay1b.h",
-	MAME_DIR .. "src/mame/drivers/maygay1bsw.cpp",
+	MAME_DIR .. "src/mame/drivers/maygay1b.inc",
 	MAME_DIR .. "src/mame/drivers/maygayv1.cpp",
 	MAME_DIR .. "src/mame/drivers/maygayep.cpp",
 	MAME_DIR .. "src/mame/drivers/maygaysw.cpp",

src/mame/arcade.flt

@@ -112,11 +112,11 @@ belatra.cpp
 berzerk.cpp
 bestleag.cpp
 bfcobra.cpp
-bfm_ad5sw.cpp
+bfm_ad5.cpp
 bfm_sc1.cpp
 bfm_sc2.cpp
 bfm_sc4.cpp
-bfm_sc5sw.cpp
+bfm_sc5.cpp
 bfm_swp.cpp
 bfmsys83.cpp
 bfmsys85.cpp
@@ -661,7 +661,7 @@ markham.cpp
 mastboy.cpp
 matmania.cpp
 maxaflex.cpp
-maygay1bsw.cpp
+maygay1b.cpp
 maygayep.cpp
 maygaysw.cpp
 maygayv1.cpp

src/mame/drivers/bfm_ad5.cpp

@@ -14,10 +14,7 @@
 #include "emu.h"
 #include "includes/bfm_ad5.h"
 #include "machine/mcf5206e.h"
-
+#include "machine/bfm_sc45_helper.h"
-
-extern int find_project_string(running_machine &machine, int addrxor, int mode);
-
 
 DRIVER_INIT_MEMBER(adder5_state,ad5)
 {
@@ -88,3 +85,5 @@ MACHINE_CONFIG_START( bfm_ad5, adder5_state )
 	MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
 	/* unknown sound */
 MACHINE_CONFIG_END
+
+#include "bfm_ad5sw.inc"

src/mame/drivers/bfm_ad5sw.inc

@@ -13,9 +13,6 @@
 
 */
 
-#include "emu.h"
-#include "includes/bfm_ad5.h"
-
 
 MACHINE_CONFIG_EXTERN( bfm_ad5 );
 INPUT_PORTS_EXTERN( bfm_ad5 );

src/mame/drivers/bfm_sc5.cpp

@@ -19,7 +19,7 @@
 #include "machine/mcf5206e.h"
 #include "bfm_sc5.lh"
 #include "video/awpvid.h"
-#include "bfm_sc45_helper.h"
+#include "machine/bfm_sc45_helper.h"
 
 
 
@@ -231,3 +231,5 @@ MACHINE_CONFIG_START( bfm_sc5, bfm_sc5_state )
 	MCFG_SOUND_ADD("ymz", YMZ280B, 16000000) // ?? Mhz
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_CONFIG_END
+
+#include "bfm_sc5sw.inc"

src/mame/drivers/bfm_sc5sw.inc

@@ -12,8 +12,6 @@
 
 */
 
-#include "emu.h"
-#include "includes/bfm_sc5.h"
 
 MACHINE_CONFIG_EXTERN( bfm_sc5 );
 INPUT_PORTS_EXTERN( bfm_sc5 );

src/mame/drivers/maygay1b.cpp

@@ -713,3 +713,5 @@ DRIVER_INIT_MEMBER(maygay1b_state,m1)
 		m_maincpu->space(AS_PROGRAM).install_write_handler(0x2420, 0x2421, write8_delegate(FUNC(maygay1b_state::m1ab_no_oki_w), this));
 	}
 }
+
+#include "maygay1b.inc"

src/mame/drivers/maygay1b.inc

@@ -20,9 +20,6 @@
 
  */
 
-#include "emu.h"
-#include "includes/maygay1b.h"
-
 INPUT_PORTS_EXTERN( maygay_m1 );
 
 

src/mame/includes/bfm_ad5.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
 #include "cpu/m68000/m68000.h"
-#include "includes/bfm_sc45.h"
+#include "includes/bfm_sc4.h"
 
 
 class adder5_state : public driver_device

src/mame/includes/bfm_sc5.h

@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
 #include "cpu/m68000/m68000.h"
-#include "includes/bfm_sc45.h"
+#include "includes/bfm_sc4.h"
 
 class bfm_sc5_state : public bfm_sc45_state
 {

src/mame/mame.lst

@@ -2638,7 +2638,7 @@ qosb                            // 1992 BFM
 quizvadr                        // 1991 BFM
 trebltop                        // 1991 BFM
 
-@source:bfm_ad5sw.cpp
+@source:bfm_ad5.cpp
 ad5bpfpm                        // Bullseye Pounds For Points (Mazooma)
 ad5bpfpma                       //
 ad5bpfpmb                       //
@@ -6714,7 +6714,7 @@ sc4ziggye                       //
 sc4ziggyf                       //
 sc4ziggyg                       //
 
-@source:bfm_sc5sw.cpp
+@source:bfm_sc5.cpp
 sc5_3414                        //
 sc5_3434                        //
 sc5_3435                        //
@@ -17398,7 +17398,7 @@ mf_bdash                        // (c) 1984 Exidy / First Star Software
 mf_brist                        // (c) 1983 Exidy / First Star Software
 mf_flip                         // (c) 1983 Exidy / First Star Software
 
-@source:maygay1bsw.cpp
+@source:maygay1b.cpp
 m1albsq                         // Albert Square (Maygay)
 m1albsq1                        //
 m1albsq1p                       //