diff --git a/src/devices/bus/abckb/abc77.cpp b/src/devices/bus/abckb/abc77.cpp
index 87acedf4fb8..996a5af23c9 100644
--- a/src/devices/bus/abckb/abc77.cpp
+++ b/src/devices/bus/abckb/abc77.cpp
@@ -129,7 +129,8 @@ DISCRETE_SOUND_END
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(abc77_device::device_add_mconfig)
+void abc77_device::device_add_mconfig(machine_config &config)
+{
 	// keyboard cpu
 	I8035(config, m_maincpu, XTAL(4'608'000));
 	m_maincpu->set_addrmap(AS_PROGRAM, &abc77_device::abc77_map);
@@ -144,9 +145,8 @@ MACHINE_CONFIG_START(abc77_device::device_add_mconfig)
 
 	// discrete sound
 	SPEAKER(config, "mono").front_center();
-	MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE, abc77_discrete)
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
-MACHINE_CONFIG_END
+	DISCRETE(config, m_discrete, abc77_discrete).add_route(ALL_OUTPUTS, "mono", 0.80);
+}
 
 
 //-------------------------------------------------
diff --git a/src/devices/bus/acorn/system/vdu40.cpp b/src/devices/bus/acorn/system/vdu40.cpp
index 93d54819fa5..a6bfebb5932 100644
--- a/src/devices/bus/acorn/system/vdu40.cpp
+++ b/src/devices/bus/acorn/system/vdu40.cpp
@@ -25,12 +25,13 @@ DEFINE_DEVICE_TYPE(ACORN_VDU40, acorn_vdu40_device, "acorn_vdu40", "Acorn 40 Col
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(acorn_vdu40_device::device_add_mconfig)
-	device = &SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+void acorn_vdu40_device::device_add_mconfig(machine_config &config)
+{
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
 	m_screen->set_raw(12_MHz_XTAL, 768, 132, 612, 311, 20, 270);
-	MCFG_SCREEN_UPDATE_DEVICE("mc6845", mc6845_device, screen_update)
+	m_screen->set_screen_update("mc6845", FUNC(mc6845_device::screen_update));
 
-	MCFG_PALETTE_ADD("palette", 8)
+	PALETTE(config, "palette").set_entries(8);
 
 	HD6845(config, m_crtc, 12_MHz_XTAL / 6);
 	m_crtc->set_screen("screen");
@@ -41,7 +42,7 @@ MACHINE_CONFIG_START(acorn_vdu40_device::device_add_mconfig)
 
 	SAA5050(config, m_trom, 12_MHz_XTAL / 2);
 	m_trom->set_screen_size(40, 25, 40);
-MACHINE_CONFIG_END
+}
 
 
 //**************************************************************************
diff --git a/src/devices/bus/apricot/keyboard/hle.cpp b/src/devices/bus/apricot/keyboard/hle.cpp
index 698dd532a66..28e98b9fb50 100644
--- a/src/devices/bus/apricot/keyboard/hle.cpp
+++ b/src/devices/bus/apricot/keyboard/hle.cpp
@@ -205,11 +205,12 @@ ioport_constructor apricot_keyboard_hle_device::device_input_ports() const
 	return INPUT_PORTS_NAME( keyboard );
 }
 
-MACHINE_CONFIG_START(apricot_keyboard_hle_device::device_add_mconfig)
-	MCFG_DEVICE_ADD("rtc", MSM5832, 32.768_kHz_XTAL)
+void apricot_keyboard_hle_device::device_add_mconfig(machine_config &config)
+{
+	MSM5832(config, m_rtc, 32.768_kHz_XTAL);
 
 	TIMER(config, "timer").configure_periodic(FUNC(apricot_keyboard_hle_device::mouse_callback), attotime::from_hz(60));
-MACHINE_CONFIG_END
+}
 
 
 //**************************************************************************
diff --git a/src/devices/bus/centronics/comxpl80.cpp b/src/devices/bus/centronics/comxpl80.cpp
index afdce31a8bf..17fd3165f8d 100644
--- a/src/devices/bus/centronics/comxpl80.cpp
+++ b/src/devices/bus/centronics/comxpl80.cpp
@@ -86,11 +86,12 @@ void comx_pl80_device::comxpl80_mem(address_map &map)
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(comx_pl80_device::device_add_mconfig)
-	MCFG_DEVICE_ADD(CX005_TAG, M6805, 4000000) // CX005: some kind of MC6805/MC68HC05 clone
-	MCFG_DEVICE_PROGRAM_MAP(comxpl80_mem)
-	MCFG_DEVICE_DISABLE()
-MACHINE_CONFIG_END
+void comx_pl80_device::device_add_mconfig(machine_config &config)
+{
+	m6805_device &cx005(M6805(config, CX005_TAG, 4000000)); // CX005: some kind of MC6805/MC68HC05 clone
+	cx005.set_addrmap(AS_PROGRAM, &comx_pl80_device::comxpl80_mem);
+	cx005.set_disable();
+}
 
 
 //-------------------------------------------------
diff --git a/src/devices/bus/centronics/nec_p72.cpp b/src/devices/bus/centronics/nec_p72.cpp
index cd7914a0bde..c3a9ddd2ab2 100644
--- a/src/devices/bus/centronics/nec_p72.cpp
+++ b/src/devices/bus/centronics/nec_p72.cpp
@@ -49,12 +49,12 @@ void nec_p72_device::p72_mem(address_map &map)
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(nec_p72_device::device_add_mconfig)
+void nec_p72_device::device_add_mconfig(machine_config &config)
+{
 	/* basic machine hardware */
-	MCFG_DEVICE_ADD("maincpu", V33, XTAL(16'000'000)/2) /* TODO it's actually a V40 */
-	MCFG_DEVICE_PROGRAM_MAP(p72_mem)
-
-MACHINE_CONFIG_END
+	V33(config, m_maincpu, XTAL(16'000'000)/2); /* TODO it's actually a V40 */
+	m_maincpu->set_addrmap(AS_PROGRAM, &nec_p72_device::p72_mem);
+}
 
 
 //-------------------------------------------------
diff --git a/src/devices/bus/coco/coco_gmc.cpp b/src/devices/bus/coco/coco_gmc.cpp
index 706bdf3cb1b..72c9edfdc80 100644
--- a/src/devices/bus/coco/coco_gmc.cpp
+++ b/src/devices/bus/coco/coco_gmc.cpp
@@ -51,11 +51,11 @@ namespace
 };
 
 
-MACHINE_CONFIG_START(coco_pak_gmc_device::device_add_mconfig)
+void coco_pak_gmc_device::device_add_mconfig(machine_config &config)
+{
 	SPEAKER(config, "gmc_speaker").front_center();
-	MCFG_DEVICE_ADD(SN76489AN_TAG, SN76489A, 4_MHz_XTAL)
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "gmc_speaker", 1.0)
-MACHINE_CONFIG_END
+	SN76489A(config, m_psg, 4_MHz_XTAL).add_route(ALL_OUTPUTS, "gmc_speaker", 1.0);
+}
 
 
 //**************************************************************************
diff --git a/src/devices/bus/coco/coco_ssc.cpp b/src/devices/bus/coco/coco_ssc.cpp
index 8840df18835..d9546f61553 100644
--- a/src/devices/bus/coco/coco_ssc.cpp
+++ b/src/devices/bus/coco/coco_ssc.cpp
@@ -152,7 +152,8 @@ DEFINE_DEVICE_TYPE(COCOSSC_SAC, cocossc_sac_device, "cocossc_sac", "CoCo SSC Sou
 //  MACHINE FRAGMENTS AND ADDRESS MAPS
 //**************************************************************************
 
-MACHINE_CONFIG_START(coco_ssc_device::device_add_mconfig)
+void coco_ssc_device::device_add_mconfig(machine_config &config)
+{
 	TMS7040(config, m_tms7040, DERIVED_CLOCK(2, 1));
 	m_tms7040->in_porta().set(FUNC(coco_ssc_device::ssc_port_a_r));
 	m_tms7040->out_portb().set(FUNC(coco_ssc_device::ssc_port_b_w));
@@ -173,9 +174,9 @@ MACHINE_CONFIG_START(coco_ssc_device::device_add_mconfig)
 	m_ay->set_flags(AY8910_SINGLE_OUTPUT);
 	m_ay->add_route(ALL_OUTPUTS, "coco_sac_tag", AY8913_GAIN);
 
-	MCFG_DEVICE_ADD("coco_sac_tag", COCOSSC_SAC, DERIVED_CLOCK(2, 1))
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "ssc_audio", 1.0)
-MACHINE_CONFIG_END
+	COCOSSC_SAC(config, m_sac, DERIVED_CLOCK(2, 1));
+	m_sac->add_route(ALL_OUTPUTS, "ssc_audio", 1.0);
+}
 
 ROM_START(coco_ssc)
 	ROM_REGION(0x1000, PIC_TAG, 0)
diff --git a/src/devices/bus/ekara/rom.cpp b/src/devices/bus/ekara/rom.cpp
index b957fb7b048..c167e07c546 100644
--- a/src/devices/bus/ekara/rom.cpp
+++ b/src/devices/bus/ekara/rom.cpp
@@ -140,21 +140,24 @@ bool ekara_rom_i2c_24c08_epitch_device::is_write_access_not_rom(void)
 	return (m_buscontrol[1] & 0x04) ? true : false;
 }
 
-MACHINE_CONFIG_START(ekara_rom_i2c_24c08_epitch_device::device_add_mconfig)
+void ekara_rom_i2c_24c08_epitch_device::device_add_mconfig(machine_config &config)
+{
 	I2CMEM(config, "i2cmem", 0)/*.set_page_size(16)*/.set_data_size(0x400); // 24C08
-MACHINE_CONFIG_END
+}
 
 // i2c 24lc04
 
-MACHINE_CONFIG_START(ekara_rom_i2c_24lc04_device::device_add_mconfig)
+void ekara_rom_i2c_24lc04_device::device_add_mconfig(machine_config &config)
+{
 	I2CMEM(config, "i2cmem", 0)/*.set_page_size(16)*/.set_data_size(0x200); // 24LC04
-MACHINE_CONFIG_END
+}
 
 // i2c 24lc02
 
-MACHINE_CONFIG_START(ekara_rom_i2c_24lc02_device::device_add_mconfig)
+void ekara_rom_i2c_24lc02_device::device_add_mconfig(machine_config &config)
+{
 	I2CMEM(config, "i2cmem", 0)/*.set_page_size(16)*/.set_data_size(0x100); // 24LC02
-MACHINE_CONFIG_END
+}
 
 
 /*-------------------------------------------------
diff --git a/src/devices/bus/gamate/rom.cpp b/src/devices/bus/gamate/rom.cpp
index cda37716b5f..74af9e76160 100644
--- a/src/devices/bus/gamate/rom.cpp
+++ b/src/devices/bus/gamate/rom.cpp
@@ -168,9 +168,10 @@ WRITE8_MEMBER(gamate_rom_4in1_device::write_rom)
 	}
 }
 
-MACHINE_CONFIG_START(gamate_rom_plain_device::device_add_mconfig)
-	MCFG_DEVICE_ADD("protection", GAMATE_PROT, 0)
-MACHINE_CONFIG_END
+void gamate_rom_plain_device::device_add_mconfig(machine_config &config)
+{
+	GAMATE_PROT(config, m_protection, 0);
+}
 
 
 /*-------------------------------------------------
diff --git a/src/devices/bus/hp9845_io/98032.cpp b/src/devices/bus/hp9845_io/98032.cpp
index 0209ef7a3d4..fc55a786fe2 100644
--- a/src/devices/bus/hp9845_io/98032.cpp
+++ b/src/devices/bus/hp9845_io/98032.cpp
@@ -56,12 +56,13 @@ hp98032_io_card_device::~hp98032_io_card_device()
 {
 }
 
-MACHINE_CONFIG_START(hp98032_io_card_device::device_add_mconfig)
+void hp98032_io_card_device::device_add_mconfig(machine_config &config)
+{
 	HP98032_GPIO_SLOT(config , m_gpio , 0);
 	m_gpio->pflg_cb().set(FUNC(hp98032_io_card_device::pflg_w));
 	m_gpio->psts_cb().set(FUNC(hp98032_io_card_device::psts_w));
 	m_gpio->eir_cb().set(FUNC(hp98032_io_card_device::eir_w));
-MACHINE_CONFIG_END
+}
 
 static INPUT_PORTS_START(hp98032_port)
 	MCFG_HP9845_IO_SC(2)
diff --git a/src/devices/bus/ieee488/hardbox.cpp b/src/devices/bus/ieee488/hardbox.cpp
index 677037c5ba7..0b982ee772d 100644
--- a/src/devices/bus/ieee488/hardbox.cpp
+++ b/src/devices/bus/ieee488/hardbox.cpp
@@ -267,11 +267,12 @@ WRITE8_MEMBER( hardbox_device::ppi1_pc_w )
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(hardbox_device::device_add_mconfig)
+void hardbox_device::device_add_mconfig(machine_config &config)
+{
 	// basic machine hardware
-	MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2)
-	MCFG_DEVICE_PROGRAM_MAP(hardbox_mem)
-	MCFG_DEVICE_IO_MAP(hardbox_io)
+	Z80(config, m_maincpu, XTAL(8'000'000)/2);
+	m_maincpu->set_addrmap(AS_PROGRAM, &hardbox_device::hardbox_mem);
+	m_maincpu->set_addrmap(AS_IO, &hardbox_device::hardbox_io);
 
 	// devices
 	i8255_device &ppi0(I8255A(config, I8255_0_TAG));
@@ -285,16 +286,12 @@ MACHINE_CONFIG_START(hardbox_device::device_add_mconfig)
 	ppi1.in_pc_callback().set(FUNC(hardbox_device::ppi1_pc_r));
 	ppi1.out_pc_callback().set(FUNC(hardbox_device::ppi1_pc_w));
 
-	MCFG_DEVICE_ADD(CORVUS_HDC_TAG, CORVUS_HDC, 0)
-	MCFG_HARDDISK_ADD("harddisk1")
-	MCFG_HARDDISK_INTERFACE("corvus_hdd")
-	MCFG_HARDDISK_ADD("harddisk2")
-	MCFG_HARDDISK_INTERFACE("corvus_hdd")
-	MCFG_HARDDISK_ADD("harddisk3")
-	MCFG_HARDDISK_INTERFACE("corvus_hdd")
-	MCFG_HARDDISK_ADD("harddisk4")
-	MCFG_HARDDISK_INTERFACE("corvus_hdd")
-MACHINE_CONFIG_END
+	CORVUS_HDC(config, m_hdc, 0);
+	HARDDISK(config, "harddisk1", "corvus_hdd");
+	HARDDISK(config, "harddisk2", "corvus_hdd");
+	HARDDISK(config, "harddisk3", "corvus_hdd");
+	HARDDISK(config, "harddisk4", "corvus_hdd");
+}
 
 
 //-------------------------------------------------
diff --git a/src/devices/bus/interpro/sr/edge.cpp b/src/devices/bus/interpro/sr/edge.cpp
index eb680532d3b..390b3459079 100644
--- a/src/devices/bus/interpro/sr/edge.cpp
+++ b/src/devices/bus/interpro/sr/edge.cpp
@@ -475,7 +475,7 @@ void mpcb828_device::device_add_mconfig(machine_config &config)
 	TMS32030(config, m_dsp, 30_MHz_XTAL);
 	m_dsp->holda().set(FUNC(mpcb828_device::holda));
 	m_dsp->set_disable();
-	//MCFG_DEVICE_ADDRESS_MAP(0, map_dynamic<2>)
+	//m_dsp->set_addrmap(0, map_dynamic<2>);
 
 	BT458(config, "ramdac", 83'020'800);
 
@@ -484,7 +484,7 @@ void mpcb828_device::device_add_mconfig(machine_config &config)
 	m_scc->out_txda_callback().set("kbd", FUNC(interpro_keyboard_port_device::write_txd));
 
 	INTERPRO_KEYBOARD_PORT(config, "kbd", interpro_keyboard_devices, "hle_en_us").rxd_handler_cb().set(m_scc, FUNC(z80scc_device::rxa_w));
-MACHINE_CONFIG_END
+}
 
 /*
  * MPCB849: EDGE-1 graphics, 2 megapixels, single screen, 60Hz refresh.
diff --git a/src/devices/bus/odyssey2/chess.cpp b/src/devices/bus/odyssey2/chess.cpp
index d2ba5d05f5f..44890a394ce 100644
--- a/src/devices/bus/odyssey2/chess.cpp
+++ b/src/devices/bus/odyssey2/chess.cpp
@@ -45,8 +45,9 @@ void o2_chess_device::chess_io(address_map &map)
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(o2_chess_device::device_add_mconfig)
-	MCFG_DEVICE_ADD("subcpu", NSC800, XTAL(4'000'000))
-	MCFG_DEVICE_PROGRAM_MAP(chess_mem)
-	MCFG_DEVICE_IO_MAP(chess_io)
-MACHINE_CONFIG_END
+void o2_chess_device::device_add_mconfig(machine_config &config)
+{
+	NSC800(config, m_cpu, XTAL(4'000'000));
+	m_cpu->set_addrmap(AS_PROGRAM, &o2_chess_device::chess_mem);
+	m_cpu->set_addrmap(AS_IO, &o2_chess_device::chess_io);
+}
diff --git a/src/devices/bus/psi_kbd/ergoline.cpp b/src/devices/bus/psi_kbd/ergoline.cpp
index 20c02052221..7b892cf861b 100644
--- a/src/devices/bus/psi_kbd/ergoline.cpp
+++ b/src/devices/bus/psi_kbd/ergoline.cpp
@@ -58,11 +58,12 @@ const tiny_rom_entry *ergoline_keyboard_device::device_rom_region() const
 	return ROM_NAME(kbd_pcb);
 }
 
-MACHINE_CONFIG_START(ergoline_keyboard_device::device_add_mconfig)
-	MCFG_DEVICE_ADD("maincpu", I8031, XTAL(5'529'600))
-	MCFG_DEVICE_PROGRAM_MAP(kbd_mem)
-	MCFG_DEVICE_IO_MAP(kbd_io)
-MACHINE_CONFIG_END
+void ergoline_keyboard_device::device_add_mconfig(machine_config &config)
+{
+	i8031_device &maincpu(I8031(config, "maincpu", XTAL(5'529'600)));
+	maincpu.set_addrmap(AS_PROGRAM, &ergoline_keyboard_device::kbd_mem);
+	maincpu.set_addrmap(AS_IO, &ergoline_keyboard_device::kbd_io);
+}
 
 
 //**************************************************************************
diff --git a/src/devices/bus/scsi/omti5100.cpp b/src/devices/bus/scsi/omti5100.cpp
index 415b68bb4ed..519aa723a0b 100644
--- a/src/devices/bus/scsi/omti5100.cpp
+++ b/src/devices/bus/scsi/omti5100.cpp
@@ -176,7 +176,8 @@ void omti5100_device::WriteData( uint8_t *data, int dataLength )
 	}
 }
 
-MACHINE_CONFIG_START(omti5100_device::device_add_mconfig)
-	MCFG_HARDDISK_ADD("image0")
-	MCFG_HARDDISK_ADD("image1")
-MACHINE_CONFIG_END
+void omti5100_device::device_add_mconfig(machine_config &config)
+{
+	HARDDISK(config, m_image0);
+	HARDDISK(config, m_image1);
+}
diff --git a/src/devices/bus/scsi/s1410.cpp b/src/devices/bus/scsi/s1410.cpp
index e05cfe73014..5416089fd9d 100644
--- a/src/devices/bus/scsi/s1410.cpp
+++ b/src/devices/bus/scsi/s1410.cpp
@@ -165,14 +165,15 @@ void s1410_device::s1410_io(address_map &map)
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(s1410_device::device_add_mconfig)
-	MCFG_DEVICE_ADD(Z8400A_TAG, Z80, XTAL(16'000'000)/4)
-	MCFG_DEVICE_PROGRAM_MAP(s1410_mem)
-	MCFG_DEVICE_IO_MAP(s1410_io)
-	MCFG_DEVICE_DISABLE()
+void s1410_device::device_add_mconfig(machine_config &config)
+{
+	z80_device &z8400a(Z80(config, Z8400A_TAG, XTAL(16'000'000)/4));
+	z8400a.set_addrmap(AS_PROGRAM, &s1410_device::s1410_mem);
+	z8400a.set_addrmap(AS_IO, &s1410_device::s1410_io);
+	z8400a.set_disable();
 
-	MCFG_HARDDISK_ADD("image")
-MACHINE_CONFIG_END
+	HARDDISK(config, "image");
+}
 
 
 
diff --git a/src/devices/bus/scsi/sa1403d.cpp b/src/devices/bus/scsi/sa1403d.cpp
index 902b69f5b63..5ab22288835 100644
--- a/src/devices/bus/scsi/sa1403d.cpp
+++ b/src/devices/bus/scsi/sa1403d.cpp
@@ -57,9 +57,10 @@ const tiny_rom_entry *sa1403d_device::device_rom_region() const
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(sa1403d_device::device_add_mconfig)
-	MCFG_HARDDISK_ADD("image")
-MACHINE_CONFIG_END
+void sa1403d_device::device_add_mconfig(machine_config &config)
+{
+	HARDDISK(config, "image");
+}
 
 
 //-------------------------------------------------
diff --git a/src/devices/bus/scsi/scsihd.cpp b/src/devices/bus/scsi/scsihd.cpp
index b63bafeb098..4fb01e02130 100644
--- a/src/devices/bus/scsi/scsihd.cpp
+++ b/src/devices/bus/scsi/scsihd.cpp
@@ -29,7 +29,7 @@ void scsihd_device::device_start()
 	scsihle_device::device_start();
 }
 
-MACHINE_CONFIG_START(scsihd_device::device_add_mconfig)
-	MCFG_HARDDISK_ADD("image")
-	MCFG_HARDDISK_INTERFACE("scsi_hdd")
-MACHINE_CONFIG_END
+void scsihd_device::device_add_mconfig(machine_config &config)
+{
+	HARDDISK(config, "image", "scsi_hdd");
+}
diff --git a/src/devices/bus/sg1000_exp/fm_unit.cpp b/src/devices/bus/sg1000_exp/fm_unit.cpp
index 44f3ae69367..a7bdc4bcc5d 100644
--- a/src/devices/bus/sg1000_exp/fm_unit.cpp
+++ b/src/devices/bus/sg1000_exp/fm_unit.cpp
@@ -50,12 +50,13 @@ SMS version is not playing PSG sound on his Mark III with the FM unit.
 DEFINE_DEVICE_TYPE(SEGA_FM_UNIT, sega_fm_unit_device, "sega_fm_unit", "SG-1000 FM Sound Unit")
 
 
-MACHINE_CONFIG_START(sega_fm_unit_device::device_add_mconfig)
-	MCFG_DEVICE_ADD("ym2413", YM2413, XTAL(10'738'635)/3)
+void sega_fm_unit_device::device_add_mconfig(machine_config &config)
+{
+	YM2413(config, m_ym, XTAL(10'738'635)/3);
 	// if this output gain is changed, the gain set when unmute the output need
 	// to be changed too, probably along the gain set for SMSJ/SMSKRFM drivers.
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, ":mono", 1.00)
-MACHINE_CONFIG_END
+	m_ym->add_route(ALL_OUTPUTS, ":mono", 1.00);
+}
 
 
 //**************************************************************************
diff --git a/src/devices/bus/snes/event.cpp b/src/devices/bus/snes/event.cpp
index 7131807edab..34d064a03d0 100644
--- a/src/devices/bus/snes/event.cpp
+++ b/src/devices/bus/snes/event.cpp
@@ -221,11 +221,12 @@ void sns_pfest94_device::dsp_data_map_lorom(address_map &map)
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(sns_pfest94_device::device_add_mconfig)
-	MCFG_DEVICE_ADD("dsp", UPD7725, 8000000)
-	MCFG_DEVICE_PROGRAM_MAP(dsp_prg_map_lorom)
-	MCFG_DEVICE_DATA_MAP(dsp_data_map_lorom)
-MACHINE_CONFIG_END
+void sns_pfest94_device::device_add_mconfig(machine_config &config)
+{
+	UPD7725(config, m_upd7725, 8000000);
+	m_upd7725->set_addrmap(AS_PROGRAM, &sns_pfest94_device::dsp_prg_map_lorom);
+	m_upd7725->set_addrmap(AS_DATA, &sns_pfest94_device::dsp_data_map_lorom);
+}
 
 //-------------------------------------------------
 //  Dipswitch
diff --git a/src/devices/bus/snes/sa1.cpp b/src/devices/bus/snes/sa1.cpp
index aaf7024ce5f..2c872866ed7 100644
--- a/src/devices/bus/snes/sa1.cpp
+++ b/src/devices/bus/snes/sa1.cpp
@@ -1143,7 +1143,8 @@ void sns_sa1_device::sa1_map(address_map &map)
 }
 
 
-MACHINE_CONFIG_START(sns_sa1_device::device_add_mconfig)
-	MCFG_DEVICE_ADD("sa1cpu", G65816, 10000000)
-	MCFG_DEVICE_PROGRAM_MAP(sa1_map)
-MACHINE_CONFIG_END
+void sns_sa1_device::device_add_mconfig(machine_config &config)
+{
+	G65816(config, m_sa1, 10000000);
+	m_sa1->set_addrmap(AS_PROGRAM, &sns_sa1_device::sa1_map);
+}
diff --git a/src/devices/bus/sunkbd/hlekbd.cpp b/src/devices/bus/sunkbd/hlekbd.cpp
index 2cb5547947e..21f4de349ed 100644
--- a/src/devices/bus/sunkbd/hlekbd.cpp
+++ b/src/devices/bus/sunkbd/hlekbd.cpp
@@ -789,11 +789,11 @@ WRITE_LINE_MEMBER( hle_device_base::input_txd )
     add machine configuration
 --------------------------------------------------*/
 
-MACHINE_CONFIG_START(hle_device_base::device_add_mconfig)
+void hle_device_base::device_add_mconfig(machine_config &config)
+{
 	SPEAKER(config, "bell").front_center();
-	MCFG_DEVICE_ADD("beeper", BEEP, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND))
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "bell", 1.0)
-MACHINE_CONFIG_END
+	BEEP(config, m_beeper, ATTOSECONDS_TO_HZ(480 * ATTOSECONDS_PER_MICROSECOND)).add_route(ALL_OUTPUTS, "bell", 1.0);
+}
 
 
 /*--------------------------------------------------
diff --git a/src/devices/bus/ti8x/tispeaker.cpp b/src/devices/bus/ti8x/tispeaker.cpp
index 17d81fe10b9..ed9ec36a5ec 100644
--- a/src/devices/bus/ti8x/tispeaker.cpp
+++ b/src/devices/bus/ti8x/tispeaker.cpp
@@ -26,16 +26,15 @@ stereo_speaker_device::stereo_speaker_device(
 }
 
 
-MACHINE_CONFIG_START(stereo_speaker_device::device_add_mconfig)
+void stereo_speaker_device::device_add_mconfig(machine_config &config)
+{
 	SPEAKER(config, "outl").front_left();
 	SPEAKER(config, "outr").front_right();
 
-	MCFG_DEVICE_ADD("lspkr", SPEAKER_SOUND, 0)
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "outl", 0.50)
+	SPEAKER_SOUND(config, m_left_speaker, 0).add_route(ALL_OUTPUTS, "outl", 0.50);
 
-	MCFG_DEVICE_ADD("rspkr", SPEAKER_SOUND, 0)
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "outr", 0.50)
-MACHINE_CONFIG_END
+	SPEAKER_SOUND(config, m_right_speaker, 0).add_route(ALL_OUTPUTS, "outr", 0.50);
+}
 
 
 void stereo_speaker_device::device_start()
@@ -70,12 +69,12 @@ mono_speaker_device::mono_speaker_device(
 }
 
 
-MACHINE_CONFIG_START(mono_speaker_device::device_add_mconfig)
+void mono_speaker_device::device_add_mconfig(machine_config &config)
+{
 	SPEAKER(config, "mono").front_center();
 
-	MCFG_DEVICE_ADD("spkr", SPEAKER_SOUND, 0)
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-MACHINE_CONFIG_END
+	SPEAKER_SOUND(config, m_speaker, 0).add_route(ALL_OUTPUTS, "mono", 0.50);
+}
 
 
 void mono_speaker_device::device_start()
diff --git a/src/devices/bus/ti99/peb/memex.cpp b/src/devices/bus/ti99/peb/memex.cpp
index 1d770a9b224..4ea73ac5252 100644
--- a/src/devices/bus/ti99/peb/memex.cpp
+++ b/src/devices/bus/ti99/peb/memex.cpp
@@ -152,11 +152,12 @@ INPUT_PORTS_START( memex )
 		PORT_DIPSETTING( MDIP8, "Lock out pages FC-FF")
 INPUT_PORTS_END
 
-MACHINE_CONFIG_START(geneve_memex_device::device_add_mconfig)
+void geneve_memex_device::device_add_mconfig(machine_config &config)
+{
 	RAM(config, m_ram, 0);
 	m_ram->set_default_size("2M");
 	m_ram->set_default_value(0);
-MACHINE_CONFIG_END
+}
 
 ioport_constructor geneve_memex_device::device_input_ports() const
 {
diff --git a/src/devices/bus/ti99/peb/ti_32kmem.cpp b/src/devices/bus/ti99/peb/ti_32kmem.cpp
index fce434c70d7..3b3b36c04da 100644
--- a/src/devices/bus/ti99/peb/ti_32kmem.cpp
+++ b/src/devices/bus/ti99/peb/ti_32kmem.cpp
@@ -100,10 +100,11 @@ void ti_32k_expcard_device::device_start()
 {
 }
 
-MACHINE_CONFIG_START(ti_32k_expcard_device::device_add_mconfig)
+void ti_32k_expcard_device::device_add_mconfig(machine_config &config)
+{
 	RAM(config, m_ram, 0);
 	m_ram->set_default_size("32k");
 	m_ram->set_default_value(0);
-MACHINE_CONFIG_END
+}
 
 } } } // end namespace bus::ti99::peb
diff --git a/src/devices/bus/ti99/peb/ti_rs232.cpp b/src/devices/bus/ti99/peb/ti_rs232.cpp
index 8f2ed3f4c45..fb7ce4eaa0a 100644
--- a/src/devices/bus/ti99/peb/ti_rs232.cpp
+++ b/src/devices/bus/ti99/peb/ti_rs232.cpp
@@ -1101,7 +1101,8 @@ INPUT_PORTS_START( ti_rs232 )
 		PORT_CONFSETTING(    0x02, "5-20" )
 INPUT_PORTS_END
 
-MACHINE_CONFIG_START(ti_rs232_pio_device::device_add_mconfig)
+void ti_rs232_pio_device::device_add_mconfig(machine_config &config)
+{
 	TMS9902(config, m_uart0, 3000000);
 	m_uart0->int_cb().set(FUNC(ti_rs232_pio_device::int0_callback));
 	m_uart0->rcv_cb().set(FUNC(ti_rs232_pio_device::rcv0_callback));
@@ -1128,7 +1129,7 @@ MACHINE_CONFIG_START(ti_rs232_pio_device::device_add_mconfig)
 	m_crulatch->q_out_cb<5>().set(FUNC(ti_rs232_pio_device::cts0_w));
 	m_crulatch->q_out_cb<6>().set(FUNC(ti_rs232_pio_device::cts1_w));
 	m_crulatch->q_out_cb<7>().set(FUNC(ti_rs232_pio_device::led_w));
-MACHINE_CONFIG_END
+}
 
 const tiny_rom_entry *ti_rs232_pio_device::device_rom_region() const
 {
diff --git a/src/devices/bus/ti99/peb/tn_usbsm.cpp b/src/devices/bus/ti99/peb/tn_usbsm.cpp
index 813ced0eb0d..c558579445e 100644
--- a/src/devices/bus/ti99/peb/tn_usbsm.cpp
+++ b/src/devices/bus/ti99/peb/tn_usbsm.cpp
@@ -366,12 +366,13 @@ INPUT_PORTS_START( tn_usbsm )
 		PORT_DIPSETTING( 0x01, "Geneve mode")
 INPUT_PORTS_END
 
-MACHINE_CONFIG_START(nouspikel_usb_smartmedia_device::device_add_mconfig)
+void nouspikel_usb_smartmedia_device::device_add_mconfig(machine_config &config)
+{
 	SMARTMEDIA(config, "smartmedia", 0);
 	STRATAFLASH(config, STRATA_TAG, 0);
 	RAM(config, RAM1_TAG).set_default_size("512K").set_default_value(0);
 	RAM(config, RAM2_TAG).set_default_size("512K").set_default_value(0);
-MACHINE_CONFIG_END
+}
 
 ioport_constructor nouspikel_usb_smartmedia_device::device_input_ports() const
 {
diff --git a/src/devices/bus/ti99x/990_tap.cpp b/src/devices/bus/ti99x/990_tap.cpp
index 2d945cb7cd4..cafefbffda8 100644
--- a/src/devices/bus/ti99x/990_tap.cpp
+++ b/src/devices/bus/ti99x/990_tap.cpp
@@ -956,9 +956,6 @@ void ti990_tape_image_device::call_unload()
 	tpc->set_tape(tape_get_id(), this, false, false, true);
 }
 
-#define MCFG_TI990_TAPE_ADD(_tag)   \
-	MCFG_DEVICE_ADD((_tag),  TI990_TAPE, 0)
-
 
 DEFINE_DEVICE_TYPE(TI990_TAPE_CTRL, tap_990_device, "ti990_tap", "Generic TI-900 Tape Controller")
 
@@ -989,9 +986,10 @@ void tap_990_device::device_start()
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-MACHINE_CONFIG_START(tap_990_device::device_add_mconfig)
-	MCFG_TI990_TAPE_ADD("tape0")
-	MCFG_TI990_TAPE_ADD("tape1")
-	MCFG_TI990_TAPE_ADD("tape2")
-	MCFG_TI990_TAPE_ADD("tape3")
-MACHINE_CONFIG_END
+void tap_990_device::device_add_mconfig(machine_config &config)
+{
+	TI990_TAPE(config, "tape0", 0);
+	TI990_TAPE(config, "tape1", 0);
+	TI990_TAPE(config, "tape2", 0);
+	TI990_TAPE(config, "tape3", 0);
+}