diff --git a/src/emu/driver.h b/src/emu/driver.h
index 51054ece6a9..965d3406806 100644
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@@ -54,16 +54,12 @@
 //**************************************************************************
 
 #define MACHINE_START_NAME(name)    machine_start_##name
-#define MACHINE_START(name)         void MACHINE_START_NAME(name)(running_machine &machine) // legacy
 #define MACHINE_START_CALL_MEMBER(name) MACHINE_START_NAME(name)()
-#define MACHINE_START_CALL_LEGACY(name) MACHINE_START_NAME(name)(machine())
 #define DECLARE_MACHINE_START(name) void MACHINE_START_NAME(name)()
 #define MACHINE_START_MEMBER(cls,name) void cls::MACHINE_START_NAME(name)()
 
 #define MACHINE_RESET_NAME(name)    machine_reset_##name
-#define MACHINE_RESET(name)         void MACHINE_RESET_NAME(name)(running_machine &machine) // legacy
 #define MACHINE_RESET_CALL_MEMBER(name) MACHINE_RESET_NAME(name)()
-#define MACHINE_RESET_CALL_LEGACY(name) MACHINE_RESET_NAME(name)(machine())
 #define DECLARE_MACHINE_RESET(name) void MACHINE_RESET_NAME(name)()
 #define MACHINE_RESET_MEMBER(cls,name) void cls::MACHINE_RESET_NAME(name)()
 
@@ -77,7 +73,6 @@
 #define SOUND_RESET_MEMBER(cls,name) void cls::SOUND_RESET_NAME(name)()
 
 #define VIDEO_START_NAME(name)      video_start_##name
-#define VIDEO_START(name)           void VIDEO_START_NAME(name)(running_machine &machine) // legacy
 #define VIDEO_START_CALL_MEMBER(name)       VIDEO_START_NAME(name)()
 #define DECLARE_VIDEO_START(name)   void VIDEO_START_NAME(name)()
 #define VIDEO_START_MEMBER(cls,name) void cls::VIDEO_START_NAME(name)()
diff --git a/src/emu/machine.h b/src/emu/machine.h
index 69e9c39b815..d474ae08392 100644
--- a/src/emu/machine.h
+++ b/src/emu/machine.h
@@ -65,17 +65,6 @@ const int DEBUG_FLAG_OSD_ENABLED    = 0x00001000;       // The OSD debugger is e
 //  MACROS
 //**************************************************************************
 
-// NULL versions
-#define machine_start_0             NULL
-#define machine_reset_0             NULL
-#define sound_start_0               NULL
-#define sound_reset_0               NULL
-#define video_start_0               NULL
-#define video_reset_0               NULL
-#define palette_init_0              NULL
-
-
-
 // global allocation helpers
 #define auto_alloc(m, t)                pool_alloc(static_cast<running_machine &>(m).respool(), t)
 #define auto_alloc_clear(m, t)          pool_alloc_clear(static_cast<running_machine &>(m).respool(), t)
diff --git a/src/mame/includes/mpu4.h b/src/mame/includes/mpu4.h
index b44b1430bc1..27b889f1998 100644
--- a/src/mame/includes/mpu4.h
+++ b/src/mame/includes/mpu4.h
@@ -317,7 +317,6 @@ MACHINE_CONFIG_EXTERN( mpu4_common2 );
 
 MACHINE_CONFIG_EXTERN( mod2     );
 
-extern MACHINE_START( mod2     );
 extern const ay8910_interface ay8910_config;
 
 INPUT_PORTS_EXTERN( mpu4 );
diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c
index e84ecd42681..e6099da8a6b 100644
--- a/src/mess/drivers/amiga.c
+++ b/src/mess/drivers/amiga.c
@@ -490,7 +490,7 @@ WRITE8_MEMBER(a1200_state::ami1200_cia_0_portb_w)
 MACHINE_START_MEMBER(cdtv_state,cdtv)
 {
 	MACHINE_START_CALL_MEMBER(amiga);
-	MACHINE_START_CALL_LEGACY( amigacd );
+	amigacd_start(machine());
 }
 
 
@@ -499,7 +499,7 @@ MACHINE_RESET_MEMBER(cdtv_state,cdtv)
 	MACHINE_RESET_CALL_MEMBER( amiga );
 
 	/* initialize the cdrom controller */
-	MACHINE_RESET_CALL_LEGACY( amigacd );
+	amigacd_reset(machine());
 }
 
 READ8_MEMBER(a1200_state::a1200_cia_0_portA_r)
diff --git a/src/mess/machine/amigacd.c b/src/mess/machine/amigacd.c
index e67d2c52236..46f88712425 100644
--- a/src/mess/machine/amigacd.c
+++ b/src/mess/machine/amigacd.c
@@ -524,7 +524,7 @@ static void cdrom_subcode_ready( running_machine &machine, int level )
 	tpi->i1_w(level);
 }
 
-MACHINE_START( amigacd )
+void amigacd_start(running_machine &machine)
 {
 	/* initialize the dmac */
 	memset( &dmac_data, 0, sizeof( dmac_data ) );
@@ -538,7 +538,7 @@ MACHINE_START( amigacd )
 	matsucd_init( machine.device<cdrom_image_device>("cdrom"), "cdda" );
 }
 
-MACHINE_RESET( amigacd )
+void amigacd_reset(running_machine &machine)
 {
 	/* initialize the cdrom */
 	matsucd_set_status_enabled_callback( cdrom_status_enabled );
diff --git a/src/mess/machine/amigacd.h b/src/mess/machine/amigacd.h
index 093b0d2d58b..5cc820ef2a1 100644
--- a/src/mess/machine/amigacd.h
+++ b/src/mess/machine/amigacd.h
@@ -2,8 +2,8 @@
 #define __AMIGACD_H__
 
 
-MACHINE_START( amigacd );
-MACHINE_RESET( amigacd );
+void amigacd_start(running_machine &machine);
+void amigacd_reset(running_machine &machine);
 
 
 #endif /* __AMIGACD_H__ */