diff --git a/src/devices/machine/at28c16.h b/src/devices/machine/at28c16.h
index 232dc0749d3..56b75a8cfcc 100644
--- a/src/devices/machine/at28c16.h
+++ b/src/devices/machine/at28c16.h
@@ -14,14 +14,6 @@
 #pragma once
 
 
-//**************************************************************************
-//  INTERFACE CONFIGURATION MACROS
-//**************************************************************************
-
-#define MCFG_AT28C16_ADD( _tag, _interface ) \
-	MCFG_DEVICE_ADD( _tag, AT28C16, 0 )
-
-
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
diff --git a/src/devices/machine/timekpr.h b/src/devices/machine/timekpr.h
index dadbdde63f0..ffeef9efa63 100644
--- a/src/devices/machine/timekpr.h
+++ b/src/devices/machine/timekpr.h
@@ -26,31 +26,12 @@
 //  INTERFACE CONFIGURATION MACROS
 //**************************************************************************
 
-#define MCFG_M48T02_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, M48T02, 0)
-
-#define MCFG_M48T35_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, M48T35, 0)
-
-#define MCFG_M48T37_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, M48T37, 0)
-
 #define MCFG_M48T37_RESET_HANDLER(_devcb) \
 	devcb = &downcast<timekeeper_device &>(*device).set_reset_handler(DEVCB_##_devcb);
 
 #define MCFG_M48T37_IRQ_HANDLER(_devcb) \
 	devcb = &downcast<timekeeper_device &>(*device).set_irq_handler(DEVCB_##_devcb);
 
-#define MCFG_M48T58_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, M48T58, 0)
-
-#define MCFG_MK48T08_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, MK48T08, 0)
-
-#define MCFG_MK48T12_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, MK48T12, 0)
-
-
 
 //**************************************************************************
 //  TYPE DEFINITIONS
diff --git a/src/devices/sound/c352.cpp b/src/devices/sound/c352.cpp
index ea22dbf50f6..38d9987d091 100644
--- a/src/devices/sound/c352.cpp
+++ b/src/devices/sound/c352.cpp
@@ -42,7 +42,6 @@ c352_device::c352_device(const machine_config &mconfig, const char *tag, device_
 {
 }
 
-
 //-------------------------------------------------
 //  rom_bank_updated - the rom bank has changed
 //-------------------------------------------------
diff --git a/src/devices/sound/c352.h b/src/devices/sound/c352.h
index 5715bf653cf..1900f58cbe2 100644
--- a/src/devices/sound/c352.h
+++ b/src/devices/sound/c352.h
@@ -6,18 +6,6 @@
 #pragma once
 
 
-//**************************************************************************
-//  INTERFACE CONFIGURATION MACROS
-//**************************************************************************
-
-#define MCFG_C352_ADD(tag, clock, setting) \
-	MCFG_DEVICE_ADD((tag), C352, (clock)) \
-	MCFG_C352_DIVIDER(setting)
-
-#define MCFG_C352_DIVIDER(setting) \
-	downcast<c352_device &>(*device).set_divider((setting));
-
-
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
@@ -30,10 +18,15 @@ class c352_device : public device_t,
 {
 public:
 	// construction/destruction
+	c352_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, int divider)
+		: c352_device(mconfig, tag, owner, clock)
+	{
+		set_divider(divider);
+	}
+
 	c352_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// inline configuration helpers
-	void set_divider(int setting) { m_divider = setting; }
+	void set_divider(int divider) { m_divider = divider; }
 
 	DECLARE_READ16_MEMBER(read);
 	DECLARE_WRITE16_MEMBER(write);
diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp
index 1ccea3e97a4..aa9a0f82bfc 100644
--- a/src/mame/drivers/atlantis.cpp
+++ b/src/mame/drivers/atlantis.cpp
@@ -822,7 +822,7 @@ MACHINE_CONFIG_START(atlantis_state::mwskins)
 	MCFG_PCI9050_USER_OUTPUT_CALLBACK(WRITE32(*this, atlantis_state, user_io_output))
 	MCFG_PCI9050_USER_INPUT_CALLBACK(READ32(*this, atlantis_state, user_io_input))
 
-	MCFG_M48T37_ADD(m_rtc)
+	MCFG_DEVICE_ADD(m_rtc, M48T37, 0)
 	MCFG_M48T37_RESET_HANDLER(WRITELINE(*this, atlantis_state, watchdog_reset))
 	MCFG_M48T37_IRQ_HANDLER(WRITELINE(*this, atlantis_state, watchdog_irq))
 
diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp
index 43558cba3c4..9cce919e2af 100644
--- a/src/mame/drivers/cdi.cpp
+++ b/src/mame/drivers/cdi.cpp
@@ -791,7 +791,7 @@ MACHINE_CONFIG_START(cdi_state::cdimono1_base)
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "lspeaker", 1.0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "rspeaker", 1.0 )
 
-	MCFG_MK48T08_ADD( "mk48t08" )
+	MCFG_DEVICE_ADD("mk48t08", MK48T08, 0)
 MACHINE_CONFIG_END
 
 // CD-i model 220 (Mono-II, NTSC)
@@ -847,7 +847,7 @@ MACHINE_CONFIG_START(cdi_state::cdimono2)
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "lspeaker", 1.0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "rspeaker", 1.0 )
 
-	MCFG_MK48T08_ADD("mk48t08")
+	MCFG_DEVICE_ADD("mk48t08", MK48T08, 0)
 MACHINE_CONFIG_END
 
 MACHINE_CONFIG_START(cdi_state::cdi910)
@@ -902,7 +902,7 @@ MACHINE_CONFIG_START(cdi_state::cdi910)
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "lspeaker", 1.0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "rspeaker", 1.0 )
 
-	MCFG_MK48T08_ADD( "mk48t08" )
+	MCFG_DEVICE_ADD("mk48t08", MK48T08, 0)
 MACHINE_CONFIG_END
 
 // CD-i Mono-I, with CD-ROM image device (MESS) and Software List (MESS)
diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp
index e902d9e119f..3c70653d47a 100644
--- a/src/mame/drivers/cobra.cpp
+++ b/src/mame/drivers/cobra.cpp
@@ -3327,7 +3327,7 @@ MACHINE_CONFIG_START(cobra_state::cobra)
 	MCFG_DEVICE_ADD("dac2", DMADAC)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
 
-	MCFG_M48T58_ADD("m48t58")
+	MCFG_DEVICE_ADD("m48t58", M48T58, 0)
 
 	MCFG_DEVICE_ADD("k001604", K001604, 0)     // on the LAN board in Racing Jam DX
 	MCFG_K001604_LAYER_SIZE(0)
diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp
index 2dc84e56ea2..8a963e74a55 100644
--- a/src/mame/drivers/cps1.cpp
+++ b/src/mame/drivers/cps1.cpp
@@ -3448,7 +3448,7 @@ MACHINE_CONFIG_START(cps_state::ganbare)
 	MCFG_DEVICE_MODIFY("maincpu")
 	MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", cps_state, ganbare_interrupt, "screen", 0, 1) // need to investigate more
 
-	MCFG_M48T35_ADD("m48t35")
+	MCFG_DEVICE_ADD("m48t35", M48T35, 0)
 MACHINE_CONFIG_END
 
 MACHINE_CONFIG_START(cps_state::qsound)
diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp
index dadac86919c..ea15658b6f2 100644
--- a/src/mame/drivers/goldnpkr.cpp
+++ b/src/mame/drivers/goldnpkr.cpp
@@ -4717,7 +4717,7 @@ MACHINE_CONFIG_START(blitz_state::megadpkr)
 	MCFG_M68705_PORTB_W_CB(WRITE8(*this, blitz_state, mcu_portb_w))
 	MCFG_M68705_PORTC_W_CB(WRITE8(*this, blitz_state, mcu_portc_w))
 
-	MCFG_M48T02_ADD("timekpr")
+	MCFG_DEVICE_ADD("timekpr", M48T02, 0)
 
 	MCFG_DEVICE_ADD("pia0", PIA6821, 0)
 	MCFG_PIA_READPA_HANDLER(READ8(*this, goldnpkr_state, pottnpkr_mux_port_r))
diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp
index 48920f097b1..c6f4f887a82 100644
--- a/src/mame/drivers/harddriv.cpp
+++ b/src/mame/drivers/harddriv.cpp
@@ -1488,7 +1488,7 @@ MACHINE_CONFIG_START(harddriv_state::driver_nomsp)
 
 	MCFG_QUANTUM_TIME(attotime::from_hz(30000))
 
-	MCFG_M48T02_ADD("200e") // MK48T02
+	MCFG_DEVICE_ADD("200e", M48T02, 0)
 	MCFG_EEPROM_2816_ADD("210e") // MK48Z02
 
 	MCFG_DEVICE_ADD("duartn68681", MC68681, XTAL(3'686'400))
diff --git a/src/mame/drivers/harriet.cpp b/src/mame/drivers/harriet.cpp
index a020ba212a2..f09bc18d2e7 100644
--- a/src/mame/drivers/harriet.cpp
+++ b/src/mame/drivers/harriet.cpp
@@ -94,7 +94,7 @@ MACHINE_CONFIG_START(harriet_state::harriet)
 	MCFG_MC68901_TX_CLOCK(9600)
 	MCFG_MC68901_OUT_SO_CB(WRITELINE("rs232", rs232_port_device, write_txd))
 
-	MCFG_M48T02_ADD("timekpr")
+	MCFG_DEVICE_ADD("timekpr", M48T02, 0)
 	MCFG_NVRAM_ADD_0FILL("zpram") // MK48Z02
 
 	MCFG_DEVICE_ADD("rs232", RS232_PORT, default_rs232_devices, "terminal")
diff --git a/src/mame/drivers/hornet.cpp b/src/mame/drivers/hornet.cpp
index 1cb63fc53a6..f7f6e2a3b99 100644
--- a/src/mame/drivers/hornet.cpp
+++ b/src/mame/drivers/hornet.cpp
@@ -1059,7 +1059,7 @@ MACHINE_CONFIG_START(hornet_state::hornet)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
 
-	MCFG_M48T58_ADD( "m48t58" )
+	MCFG_DEVICE_ADD("m48t58", M48T58, 0)
 
 	MCFG_DEVICE_ADD("adc12138", ADC12138, 0)
 	MCFG_ADC1213X_IPT_CONVERT_CB(hornet_state, adc12138_input_callback)
diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp
index 29e3981efca..1568eeaf09c 100644
--- a/src/mame/drivers/itech32.cpp
+++ b/src/mame/drivers/itech32.cpp
@@ -1812,7 +1812,7 @@ MACHINE_CONFIG_START(itech32_state::tourny)
 
 	/* basic machine hardware */
 
-	MCFG_M48T02_ADD( "m48t02"  )
+	MCFG_DEVICE_ADD("m48t02", M48T02, 0)
 MACHINE_CONFIG_END
 
 
diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp
index cb8d3e5c45e..0c25f286895 100644
--- a/src/mame/drivers/ksys573.cpp
+++ b/src/mame/drivers/ksys573.cpp
@@ -2132,7 +2132,7 @@ MACHINE_CONFIG_START(ksys573_state::konami573)
 	MCFG_SOUND_ROUTE( 0, "lspeaker", 1.0 )
 	MCFG_SOUND_ROUTE( 1, "rspeaker", 1.0 )
 
-	MCFG_M48T58_ADD( "m48t58" )
+	MCFG_DEVICE_ADD("m48t58", M48T58, 0)
 
 	MCFG_DEVICE_ADD( "adc0834", ADC0834, 0 )
 	MCFG_ADC083X_INPUT_CB( ksys573_state, analogue_inputs_callback )
diff --git a/src/mame/drivers/midzeus.cpp b/src/mame/drivers/midzeus.cpp
index c34ec774965..4f6f8b2f8c9 100644
--- a/src/mame/drivers/midzeus.cpp
+++ b/src/mame/drivers/midzeus.cpp
@@ -1347,7 +1347,7 @@ MACHINE_CONFIG_START(midzeus2_state::midzeus2)
 	/* sound hardware */
 	MCFG_DEVICE_ADD("dcs", DCS2_AUDIO_2104, 0)
 
-	MCFG_M48T35_ADD( "m48t35" )
+	MCFG_DEVICE_ADD("m48t35", M48T35, 0)
 
 	MCFG_DEVICE_ADD("ioasic", MIDWAY_IOASIC, 0)
 	MCFG_MIDWAY_IOASIC_SHUFFLE(MIDWAY_IOASIC_STANDARD)
diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp
index 67ab8cab9dc..3dd3c850059 100644
--- a/src/mame/drivers/multfish.cpp
+++ b/src/mame/drivers/multfish.cpp
@@ -1051,7 +1051,7 @@ MACHINE_CONFIG_START(igrosoft_gamble_state::igrosoft_gamble)
 	MCFG_DEVICE_ADD("aysnd", AY8910, 6000000/4)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 
-	MCFG_M48T35_ADD( "m48t35" )
+	MCFG_DEVICE_ADD("m48t35", M48T35, 0)
 	MCFG_HOPPER_ADD("hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH)
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/mvme147.cpp b/src/mame/drivers/mvme147.cpp
index ef9ea2bc8df..ce89349f895 100644
--- a/src/mame/drivers/mvme147.cpp
+++ b/src/mame/drivers/mvme147.cpp
@@ -655,7 +655,7 @@ MACHINE_CONFIG_START(mvme147_state::mvme147)
 	MCFG_VME_DEVICE_ADD("vme")
 	MCFG_VME_SLOT_ADD("vme", 1, mvme147_vme_cards, nullptr)
 
-	MCFG_M48T02_ADD("m48t18") /* t08 differs only in accepted voltage levels compared to t18 */
+	MCFG_DEVICE_ADD("m48t18", M48T02, 0) /* t08 differs only in accepted voltage levels compared to t18 */
 
 	/* Terminal Port config */
 	MCFG_DEVICE_ADD("scc", SCC85C30, SCC_CLOCK)
diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp
index 285cc731d61..c89860b4d69 100644
--- a/src/mame/drivers/namcofl.cpp
+++ b/src/mame/drivers/namcofl.cpp
@@ -614,7 +614,7 @@ MACHINE_CONFIG_START(namcofl_state::namcofl)
 
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
-	MCFG_C352_ADD("c352", 48384000/2, 288)
+	MCFG_DEVICE_ADD("c352", C352, 48384000/2, 288)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
 	//MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present.
diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp
index 1ec49d25dd6..a6b9ebaf1e2 100644
--- a/src/mame/drivers/namconb1.cpp
+++ b/src/mame/drivers/namconb1.cpp
@@ -1104,7 +1104,7 @@ MACHINE_CONFIG_START(namconb1_state::namconb1)
 
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
-	MCFG_C352_ADD("c352", MASTER_CLOCK/2, 288)
+	MCFG_DEVICE_ADD("c352", C352, MASTER_CLOCK/2, 288)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
 	//MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present.
@@ -1145,7 +1145,7 @@ MACHINE_CONFIG_START(namconb1_state::namconb2)
 
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
-	MCFG_C352_ADD("c352", MASTER_CLOCK/2, 288)
+	MCFG_DEVICE_ADD("c352", C352, MASTER_CLOCK/2, 288)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
 	//MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present.
diff --git a/src/mame/drivers/namcond1.cpp b/src/mame/drivers/namcond1.cpp
index da8892bffb3..971338d633b 100644
--- a/src/mame/drivers/namcond1.cpp
+++ b/src/mame/drivers/namcond1.cpp
@@ -361,9 +361,8 @@ MACHINE_CONFIG_START(namcond1_state::namcond1)
 
 	MCFG_QUANTUM_TIME(attotime::from_hz(6000))
 
-
-	MCFG_YGV608_ADD("ygv608")
-	MCFG_YGV608_PALETTE("palette")
+	MCFG_DEVICE_ADD("ygv608", YGV608, 0)
+	MCFG_GFX_PALETTE("palette")
 	MCFG_YGV608_VBLANK_HANDLER(WRITELINE(*this, namcond1_state, vblank_irq_w))
 	MCFG_YGV608_RASTER_HANDLER(WRITELINE(*this, namcond1_state, raster_irq_w))
 	MCFG_VIDEO_SET_SCREEN("screen")
@@ -384,15 +383,13 @@ MACHINE_CONFIG_START(namcond1_state::namcond1)
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
 
-	MCFG_C352_ADD("c352", XTAL(49'152'000)/2, 288)
+	MCFG_DEVICE_ADD("c352", C352, XTAL(49'152'000)/2, 288)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
 	//MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present.
 	//MCFG_SOUND_ROUTE(3, "rspeaker", 1.00)
 
-	MCFG_AT28C16_ADD( "at28c16", nullptr )
-
-
+	MCFG_DEVICE_ADD("at28c16", AT28C16, 0)
 MACHINE_CONFIG_END
 
 MACHINE_CONFIG_START(namcond1_state::abcheck)
diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp
index 6481a7977a8..811e034aaf8 100644
--- a/src/mame/drivers/namcos11.cpp
+++ b/src/mame/drivers/namcos11.cpp
@@ -627,13 +627,13 @@ MACHINE_CONFIG_START(namcos11_state::coh110)
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
 
-	MCFG_C352_ADD("c352", 25401600, 288)
+	MCFG_DEVICE_ADD("c352", C352, 25401600, 288)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
 	//MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present.
 	//MCFG_SOUND_ROUTE(3, "rspeaker", 1.00)
 
-	MCFG_AT28C16_ADD( "at28c16", nullptr )
+	MCFG_DEVICE_ADD("at28c16", AT28C16, 0)
 MACHINE_CONFIG_END
 
 MACHINE_CONFIG_START(namcos11_state::coh100)
diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp
index 2a729208f3e..666f3ee5f5c 100644
--- a/src/mame/drivers/namcos12.cpp
+++ b/src/mame/drivers/namcos12.cpp
@@ -1736,13 +1736,13 @@ MACHINE_CONFIG_START(namcos12_state::namcos12_mobo)
 	MCFG_H8_SCI_CLK_CALLBACK(WRITELINE("rtc", rtc4543_device, clk_w)) MCFG_DEVCB_INVERT
 	MCFG_DEVCB_CHAIN_OUTPUT(WRITELINE("namco_settings", namco_settings_device, clk_w))
 
-	MCFG_AT28C16_ADD("at28c16", nullptr)
+	MCFG_DEVICE_ADD("at28c16", AT28C16, 0)
 
 	/* sound hardware */
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
 
-	MCFG_C352_ADD("c352", 25401600, 288)
+	MCFG_DEVICE_ADD("c352", C352, 25401600, 288)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
 	//MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present.
diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp
index 50a49166320..2730969dec2 100644
--- a/src/mame/drivers/namcos22.cpp
+++ b/src/mame/drivers/namcos22.cpp
@@ -3804,7 +3804,7 @@ MACHINE_CONFIG_START(namcos22_state::namcos22)
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
 
-	MCFG_C352_ADD("c352", SS22_MASTER_CLOCK/2, 288)
+	MCFG_DEVICE_ADD("c352", C352, SS22_MASTER_CLOCK/2, 288)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
 MACHINE_CONFIG_END
@@ -3872,7 +3872,7 @@ MACHINE_CONFIG_START(namcos22_state::namcos22s)
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
 
-	MCFG_C352_ADD("c352", SS22_MASTER_CLOCK/2, 288)
+	MCFG_DEVICE_ADD("c352", C352, SS22_MASTER_CLOCK/2, 288)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp
index e58473ba433..f93c3972f9d 100644
--- a/src/mame/drivers/namcos23.cpp
+++ b/src/mame/drivers/namcos23.cpp
@@ -3627,7 +3627,7 @@ MACHINE_CONFIG_START(namcos23_state::gorgon)
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
 
-	MCFG_C352_ADD("c352", C352CLOCK, C352DIV)
+	MCFG_DEVICE_ADD("c352", C352, C352CLOCK, C352DIV)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 1.00)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 1.00)
 	MCFG_SOUND_ROUTE(2, "lspeaker", 1.00)
@@ -3694,7 +3694,7 @@ MACHINE_CONFIG_START(namcos23_state::s23)
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
 
-	MCFG_C352_ADD("c352", C352CLOCK, C352DIV)
+	MCFG_DEVICE_ADD("c352", C352, C352CLOCK, C352DIV)
 	MCFG_SOUND_ROUTE(0, "rspeaker", 1.00)
 	MCFG_SOUND_ROUTE(1, "lspeaker", 1.00)
 	MCFG_SOUND_ROUTE(2, "rspeaker", 1.00)
@@ -3774,7 +3774,7 @@ MACHINE_CONFIG_START(namcos23_state::ss23)
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
 
-	MCFG_C352_ADD("c352", C352CLOCK, C352DIV)
+	MCFG_DEVICE_ADD("c352", C352, C352CLOCK, C352DIV)
 	MCFG_SOUND_ROUTE(0, "rspeaker", 1.00)
 	MCFG_SOUND_ROUTE(1, "lspeaker", 1.00)
 	MCFG_SOUND_ROUTE(2, "rspeaker", 1.00)
diff --git a/src/mame/drivers/nwk-tr.cpp b/src/mame/drivers/nwk-tr.cpp
index 84a759bcada..4b95bd3ca98 100644
--- a/src/mame/drivers/nwk-tr.cpp
+++ b/src/mame/drivers/nwk-tr.cpp
@@ -844,7 +844,7 @@ MACHINE_CONFIG_START(nwktr_state::nwktr)
 
 	MCFG_QUANTUM_TIME(attotime::from_hz(9000))
 
-	MCFG_M48T58_ADD( "m48t58" )
+	MCFG_DEVICE_ADD("m48t58", M48T58, 0)
 
 	MCFG_DEVICE_ADD("adc12138", ADC12138, 0)
 	MCFG_ADC1213X_IPT_CONVERT_CB(nwktr_state, adc12138_input_callback)
diff --git a/src/mame/drivers/pt68k4.cpp b/src/mame/drivers/pt68k4.cpp
index 5e48334c141..2cc7095d8f2 100644
--- a/src/mame/drivers/pt68k4.cpp
+++ b/src/mame/drivers/pt68k4.cpp
@@ -418,7 +418,7 @@ MACHINE_CONFIG_START(pt68k4_state::pt68k2)
 	MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE(*this, pt68k4_state, keyboard_data_w))
 	MCFG_PC_KBDC_SLOT_ADD(KBDC_TAG, "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
 
-	MCFG_M48T02_ADD(TIMEKEEPER_TAG)
+	MCFG_DEVICE_ADD(TIMEKEEPER_TAG, M48T02, 0)
 
 	MCFG_DEVICE_ADD(WDFDC_TAG, WD1772, 16_MHz_XTAL / 2)
 	MCFG_FLOPPY_DRIVE_ADD(WDFDC_TAG":0", pt68k_floppies, "525dd", pt68k4_state::floppy_formats)
@@ -459,7 +459,7 @@ MACHINE_CONFIG_START(pt68k4_state::pt68k4)
 	MCFG_PC_KBDC_OUT_DATA_CB(WRITELINE(*this, pt68k4_state, keyboard_data_w))
 	MCFG_PC_KBDC_SLOT_ADD(KBDC_TAG, "kbd", pc_xt_keyboards, STR_KBD_IBM_PC_XT_83)
 
-	MCFG_M48T02_ADD(TIMEKEEPER_TAG)
+	MCFG_DEVICE_ADD(TIMEKEEPER_TAG, M48T02, 0)
 
 	MCFG_DEVICE_ADD(ISABUS_TAG, ISA8, 0)
 	MCFG_ISA8_CPU(M68K_TAG)
diff --git a/src/mame/drivers/slapshot.cpp b/src/mame/drivers/slapshot.cpp
index 80b35d9e3f0..170043d8fb8 100644
--- a/src/mame/drivers/slapshot.cpp
+++ b/src/mame/drivers/slapshot.cpp
@@ -496,7 +496,7 @@ MACHINE_CONFIG_START(slapshot_state::slapshot)
 	MCFG_SOUND_ROUTE(1, "lspeaker",  1.0)
 	MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
 
-	MCFG_MK48T08_ADD( "mk48t08" )
+	MCFG_DEVICE_ADD("mk48t08", MK48T08, 0)
 
 	MCFG_DEVICE_ADD("tc0140syt", TC0140SYT, 0)
 	MCFG_TC0140SYT_MASTER_CPU("maincpu")
@@ -565,7 +565,7 @@ MACHINE_CONFIG_START(slapshot_state::opwolf3)
 	MCFG_SOUND_ROUTE(1, "lspeaker",  1.0)
 	MCFG_SOUND_ROUTE(2, "rspeaker", 1.0)
 
-	MCFG_MK48T08_ADD( "mk48t08" )
+	MCFG_DEVICE_ADD("mk48t08", MK48T08, 0)
 
 	MCFG_DEVICE_ADD("tc0140syt", TC0140SYT, 0)
 	MCFG_TC0140SYT_MASTER_CPU("maincpu")
diff --git a/src/mame/drivers/sun3x.cpp b/src/mame/drivers/sun3x.cpp
index 015d6da2d4c..94221f43769 100644
--- a/src/mame/drivers/sun3x.cpp
+++ b/src/mame/drivers/sun3x.cpp
@@ -587,7 +587,7 @@ MACHINE_CONFIG_START(sun3x_state::sun3_80)
 	MCFG_DEVICE_ADD("maincpu", M68030, 20000000)
 	MCFG_DEVICE_PROGRAM_MAP(sun3_80_mem)
 
-	MCFG_M48T02_ADD(TIMEKEEPER_TAG)
+	MCFG_DEVICE_ADD(TIMEKEEPER_TAG, M48T02, 0)
 
 	MCFG_DEVICE_ADD(SCC1_TAG, SCC8530N, 4.9152_MHz_XTAL)
 	MCFG_Z80SCC_OUT_TXDA_CB(WRITELINE(KEYBOARD_TAG, sun_keyboard_port_device, write_txd))
@@ -634,7 +634,7 @@ MACHINE_CONFIG_START(sun3x_state::sun3_460)
 	MCFG_DEVICE_ADD("maincpu", M68030, 33000000)
 	MCFG_DEVICE_PROGRAM_MAP(sun3_460_mem)
 
-	MCFG_M48T02_ADD(TIMEKEEPER_TAG)
+	MCFG_DEVICE_ADD(TIMEKEEPER_TAG, M48T02, 0)
 
 	MCFG_DEVICE_ADD(SCC1_TAG, SCC8530N, 4.9152_MHz_XTAL)
 	MCFG_DEVICE_ADD(SCC2_TAG, SCC8530N, 4.9152_MHz_XTAL)
diff --git a/src/mame/drivers/sun4.cpp b/src/mame/drivers/sun4.cpp
index 563409d087e..bb644cc3bc7 100644
--- a/src/mame/drivers/sun4.cpp
+++ b/src/mame/drivers/sun4.cpp
@@ -1918,7 +1918,7 @@ MACHINE_CONFIG_START(sun4_state::sun4)
 	MCFG_RAM_DEFAULT_SIZE("16M")
 	MCFG_RAM_DEFAULT_VALUE(0x00)
 
-	MCFG_MK48T12_ADD(TIMEKEEPER_TAG)
+	MCFG_DEVICE_ADD(TIMEKEEPER_TAG, MK48T12, 0)
 
 	MCFG_N82077AA_ADD(FDC_TAG, n82077aa_device::MODE_PS2)
 	MCFG_FLOPPY_DRIVE_ADD("fdc:0", sun_floppies, "35hd", sun4_state::floppy_formats)
@@ -1983,7 +1983,7 @@ MACHINE_CONFIG_START(sun4_state::sun4c)
 	MCFG_RAM_DEFAULT_SIZE("16M")
 	MCFG_RAM_DEFAULT_VALUE(0x00)
 
-	MCFG_MK48T12_ADD(TIMEKEEPER_TAG)
+	MCFG_DEVICE_ADD(TIMEKEEPER_TAG, MK48T12, 0)
 
 	MCFG_N82077AA_ADD(FDC_TAG, n82077aa_device::MODE_PS2)
 	MCFG_FLOPPY_DRIVE_ADD("fdc:0", sun_floppies, "35hd", sun4_state::floppy_formats)
diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp
index 2677b938aa0..a966ceb372a 100644
--- a/src/mame/drivers/tomcat.cpp
+++ b/src/mame/drivers/tomcat.cpp
@@ -359,7 +359,7 @@ MACHINE_CONFIG_START(tomcat_state::tomcat)
 
 	MCFG_WATCHDOG_ADD("watchdog")
 
-	MCFG_M48T02_ADD( "m48t02" )
+	MCFG_DEVICE_ADD("m48t02", M48T02, 0)
 
 	MCFG_VECTOR_ADD("vector")
 	MCFG_SCREEN_ADD("screen", VECTOR)
diff --git a/src/mame/drivers/vegaeo.cpp b/src/mame/drivers/vegaeo.cpp
index 96b87af1ccd..9a99410c2bf 100644
--- a/src/mame/drivers/vegaeo.cpp
+++ b/src/mame/drivers/vegaeo.cpp
@@ -175,7 +175,7 @@ MACHINE_CONFIG_START(vegaeo_state::vega)
 	MCFG_DEVICE_PROGRAM_MAP(vega_map)
 	MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", vegaeo_state, eolith_speedup, "screen", 0, 1)
 
-	MCFG_AT28C16_ADD("at28c16", nullptr)
+	MCFG_DEVICE_ADD("at28c16", AT28C16, 0)
 
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp
index 2363b4360ab..3dc6ad920a1 100644
--- a/src/mame/drivers/vegas.cpp
+++ b/src/mame/drivers/vegas.cpp
@@ -1744,7 +1744,7 @@ MACHINE_CONFIG_START(vegas_state::vegascore)
 	MCFG_DEVICE_MODIFY(PCI_ID_VIDEO":voodoo")
 	MCFG_VOODOO_VBLANK_CB(WRITELINE(*this, vegas_state, vblank_assert))
 
-	MCFG_M48T37_ADD(m_timekeeper)
+	MCFG_DEVICE_ADD(m_timekeeper, M48T37, 0)
 	MCFG_M48T37_RESET_HANDLER(WRITELINE(*this, vegas_state, watchdog_reset))
 	MCFG_M48T37_IRQ_HANDLER(WRITELINE(*this, vegas_state, watchdog_irq))
 
diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp
index 2bfe4274a52..d739494ecf5 100644
--- a/src/mame/drivers/vgmplay.cpp
+++ b/src/mame/drivers/vgmplay.cpp
@@ -1723,7 +1723,7 @@ MACHINE_CONFIG_START(vgmplay_state::vgmplay)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.5)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.5)
 
-	MCFG_C352_ADD("c352", 1000000, 288)
+	MCFG_DEVICE_ADD("c352", C352, 1000000, 288)
 	MCFG_DEVICE_ADDRESS_MAP(0, c352_map)
 	MCFG_SOUND_ROUTE(0, "lspeaker", 1)
 	MCFG_SOUND_ROUTE(1, "rspeaker", 1)
diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp
index d9b95cc74fd..1d841f59ea9 100644
--- a/src/mame/drivers/viper.cpp
+++ b/src/mame/drivers/viper.cpp
@@ -2416,7 +2416,7 @@ MACHINE_CONFIG_START(viper_state::viper)
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
 
-	MCFG_M48T58_ADD( "m48t58" )
+	MCFG_DEVICE_ADD("m48t58", M48T58, 0)
 MACHINE_CONFIG_END
 
 /*****************************************************************************/
diff --git a/src/mame/drivers/wpc_95.cpp b/src/mame/drivers/wpc_95.cpp
index 32cd1e9e06a..0db2b20213b 100644
--- a/src/mame/drivers/wpc_95.cpp
+++ b/src/mame/drivers/wpc_95.cpp
@@ -2254,11 +2254,12 @@ MACHINE_CONFIG_START(wpc_95_state::wpc_95)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(wpc_95_state, irq0_line_assert, XTAL(8'000'000)/8192.0)
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("zero_crossing", wpc_95_state, zc_timer, attotime::from_hz(120)) // Mains power zero crossing
 
-	MCFG_WPC_PIC_ADD("pic")
-	MCFG_WPC_LAMP_ADD("lamp")
-	MCFG_WPC_OUT_ADD("out", 3)
-	MCFG_WPC_SHIFT_ADD("shift")
-	MCFG_WPC_DMD_ADD("dmd", WRITELINE(*this, wpc_95_state, scanline_irq))
+	MCFG_DEVICE_ADD("pic", WPC_PIC, 0)
+	MCFG_DEVICE_ADD("lamp", WPC_LAMP, 0)
+	MCFG_DEVICE_ADD("out", WPC_OUT, 0, 3)
+	MCFG_DEVICE_ADD("shift", WPC_SHIFT, 0)
+	MCFG_DEVICE_ADD("dmd", WPC_DMD, 0)
+	MCFG_WPC_DMD_SCANLINE_CALLBACK(WRITELINE(*this, wpc_95_state, scanline_irq))
 
 	MCFG_NVRAM_ADD_0FILL("nvram")
 	MCFG_DEVICE_ADD("dcs", DCS_AUDIO_WPC, 0)
diff --git a/src/mame/drivers/wpc_dcs.cpp b/src/mame/drivers/wpc_dcs.cpp
index 1adfd143128..2fe9dad95e5 100644
--- a/src/mame/drivers/wpc_dcs.cpp
+++ b/src/mame/drivers/wpc_dcs.cpp
@@ -431,10 +431,11 @@ MACHINE_CONFIG_START(wpc_dcs_state::wpc_dcs)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(wpc_dcs_state, irq0_line_assert, XTAL(8'000'000)/8192.0)
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("zero_crossing", wpc_dcs_state, zc_timer, attotime::from_hz(120)) // Mains power zero crossing
 
-	MCFG_WPC_LAMP_ADD("lamp")
-	MCFG_WPC_OUT_ADD("out", 3)
-	MCFG_WPC_SHIFT_ADD("shift")
-	MCFG_WPC_DMD_ADD("dmd", WRITELINE(*this, wpc_dcs_state, scanline_irq))
+	MCFG_DEVICE_ADD("lamp", WPC_LAMP, 0)
+	MCFG_DEVICE_ADD("out", WPC_OUT, 0, 3)
+	MCFG_DEVICE_ADD("shift", WPC_SHIFT, 0)
+	MCFG_DEVICE_ADD("dmd", WPC_DMD, 0)
+	MCFG_WPC_DMD_SCANLINE_CALLBACK(WRITELINE(*this, wpc_dcs_state, scanline_irq))
 
 	MCFG_NVRAM_ADD_0FILL("nvram")
 	MCFG_DEVICE_ADD("dcs", DCS_AUDIO_8K, 0)
diff --git a/src/mame/drivers/wpc_s.cpp b/src/mame/drivers/wpc_s.cpp
index d41fd5c5001..4aa396a9e74 100644
--- a/src/mame/drivers/wpc_s.cpp
+++ b/src/mame/drivers/wpc_s.cpp
@@ -1977,11 +1977,12 @@ MACHINE_CONFIG_START(wpc_s_state::wpc_s)
 	MCFG_DEVICE_PERIODIC_INT_DRIVER(wpc_s_state, irq0_line_assert, XTAL(8'000'000)/8192.0)
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("zero_crossing", wpc_s_state, zc_timer, attotime::from_hz(120)) // Mains power zero crossing
 
-	MCFG_WPC_SHIFT_ADD("shift")
-	MCFG_WPC_PIC_ADD("pic")
-	MCFG_WPC_LAMP_ADD("lamp")
-	MCFG_WPC_OUT_ADD("out", 5)
-	MCFG_WPC_DMD_ADD("dmd", WRITELINE(*this, wpc_s_state, scanline_irq))
+	MCFG_DEVICE_ADD("shift", WPC_SHIFT, 0)
+	MCFG_DEVICE_ADD("pic", WPC_PIC, 0)
+	MCFG_DEVICE_ADD("lamp", WPC_LAMP, 0)
+	MCFG_DEVICE_ADD("out", WPC_OUT, 0, 5)
+	MCFG_DEVICE_ADD("dmd", WPC_DMD, 0)
+	MCFG_WPC_DMD_SCANLINE_CALLBACK(WRITELINE(*this, wpc_s_state, scanline_irq))
 
 	MCFG_NVRAM_ADD_0FILL("nvram")
 	MCFG_DEVICE_ADD("dcs", DCS_AUDIO_8K, 0)
diff --git a/src/mame/machine/wpc_lamp.h b/src/mame/machine/wpc_lamp.h
index b4fb87ab074..097753d3689 100644
--- a/src/mame/machine/wpc_lamp.h
+++ b/src/mame/machine/wpc_lamp.h
@@ -8,9 +8,6 @@
 
 #pragma once
 
-#define MCFG_WPC_LAMP_ADD( _tag ) \
-	MCFG_DEVICE_ADD( _tag, WPC_LAMP, 0 )
-
 class wpc_lamp_device : public device_t
 {
 public:
diff --git a/src/mame/machine/wpc_out.h b/src/mame/machine/wpc_out.h
index eaa08c7f8db..e40446e412c 100644
--- a/src/mame/machine/wpc_out.h
+++ b/src/mame/machine/wpc_out.h
@@ -8,15 +8,17 @@
 
 #pragma once
 
-#define MCFG_WPC_OUT_ADD( _tag, _count )    \
-	MCFG_DEVICE_ADD( _tag, WPC_OUT, 0 )     \
-		downcast<wpc_out_device *>(device)->set_gi_count(_count);
-
 class wpc_out_device : public device_t
 {
 public:
 	typedef delegate<bool (int, bool)> handler_t;
 
+	wpc_out_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, int gi_count)
+		: wpc_out_device(mconfig, tag, owner, clock)
+	{
+		set_gi_count(gi_count);
+	}
+
 	wpc_out_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 	virtual ~wpc_out_device();
 
diff --git a/src/mame/machine/wpc_pic.h b/src/mame/machine/wpc_pic.h
index 4b1fcda7baf..0ed0088b8f4 100644
--- a/src/mame/machine/wpc_pic.h
+++ b/src/mame/machine/wpc_pic.h
@@ -8,9 +8,6 @@
 
 #pragma once
 
-#define MCFG_WPC_PIC_ADD( _tag ) \
-	MCFG_DEVICE_ADD( _tag, WPC_PIC, 0 )
-
 class wpc_pic_device : public device_t
 {
 public:
diff --git a/src/mame/machine/wpc_shift.h b/src/mame/machine/wpc_shift.h
index 7aa4974b88f..a03d8392df0 100644
--- a/src/mame/machine/wpc_shift.h
+++ b/src/mame/machine/wpc_shift.h
@@ -6,9 +6,6 @@
 #ifndef MAME_MACHINE_WPC_SHIFT_H
 #define MAME_MACHINE_WPC_SHIFT_H
 
-#define MCFG_WPC_SHIFT_ADD( _tag ) \
-	MCFG_DEVICE_ADD( _tag, WPC_SHIFT, 0 )
-
 class wpc_shift_device : public device_t
 {
 public:
diff --git a/src/mame/video/wpc_dmd.h b/src/mame/video/wpc_dmd.h
index d995b9f27d4..312974f4fdd 100644
--- a/src/mame/video/wpc_dmd.h
+++ b/src/mame/video/wpc_dmd.h
@@ -10,8 +10,7 @@
 
 #include "machine/timer.h"
 
-#define MCFG_WPC_DMD_ADD( _tag, _scanline_cb ) \
-	MCFG_DEVICE_ADD( _tag, WPC_DMD, 0 ) \
+#define MCFG_WPC_DMD_SCANLINE_CALLBACK(_scanline_cb) \
 	devcb = &downcast<wpc_dmd_device &>(*device).set_scanline_cb(DEVCB_##_scanline_cb);
 
 class wpc_dmd_device : public device_t
diff --git a/src/mame/video/ygv608.h b/src/mame/video/ygv608.h
index aedd5d9e78b..c2c9e82ed3a 100644
--- a/src/mame/video/ygv608.h
+++ b/src/mame/video/ygv608.h
@@ -314,12 +314,6 @@ DECLARE_DEVICE_TYPE(YGV608, ygv608_device)
 //  INTERFACE CONFIGURATION MACROS
 //**************************************************************************
 
-#define MCFG_YGV608_ADD(_tag) \
-	MCFG_DEVICE_ADD(_tag, YGV608, 0)
-
-#define MCFG_YGV608_PALETTE(_palette_tag) \
-	MCFG_GFX_PALETTE(_palette_tag)
-
 #define MCFG_YGV608_VBLANK_HANDLER( _intcallb ) \
 	devcb = &downcast<ygv608_device &>(*device).set_vblank_callback(DEVCB_##_intcallb);