diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c
index 1905c332275..b89db112e5d 100644
--- a/src/emu/machine/generic.c
+++ b/src/emu/machine/generic.c
@@ -316,7 +316,7 @@ void nvram_save(void)
 
 
 /*-------------------------------------------------
-    nvram_handler_generic_0fill - generic NVRAM
+    NVRAM_HANDLER( generic_0fill ) - generic NVRAM
     with a 0 fill
 -------------------------------------------------*/
 
@@ -332,7 +332,7 @@ NVRAM_HANDLER( generic_0fill )
 
 
 /*-------------------------------------------------
-    nvram_handler_generic_1fill - generic NVRAM
+    NVRAM_HANDLER( generic_1fill ) - generic NVRAM
     with a 1 fill
 -------------------------------------------------*/
 
@@ -348,7 +348,7 @@ NVRAM_HANDLER( generic_1fill )
 
 
 /*-------------------------------------------------
-    nvram_handler_generic_randfill - generic NVRAM
+    NVRAM_HANDLER( generic_randfill ) - generic NVRAM
     with a random fill
 -------------------------------------------------*/
 
diff --git a/src/emu/video/generic.c b/src/emu/video/generic.c
index 8e49d933777..aeed5b77ecd 100644
--- a/src/emu/video/generic.c
+++ b/src/emu/video/generic.c
@@ -303,7 +303,7 @@ void generic_video_init(running_machine *machine)
 ***************************************************************************/
 
 /*-------------------------------------------------
-    video_start_generic - general video system
+    VIDEO_START( generic ) - general video system
 -------------------------------------------------*/
 
 VIDEO_START( generic )
@@ -314,7 +314,7 @@ VIDEO_START( generic )
 
 
 /*-------------------------------------------------
-    video_start_generic_bitmapped - general video
+    VIDEO_START( generic_bitmapped ) - general video
     system with a bitmap
 -------------------------------------------------*/
 
@@ -329,7 +329,7 @@ VIDEO_START( generic_bitmapped )
 
 
 /*-------------------------------------------------
-    video_update_generic_bitmapped - blast the
+    VIDEO_UPDATE( generic_bitmapped ) - blast the
     generic bitmap to the screen
 -------------------------------------------------*/
 
diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c
index 9e41f30eb00..d9f16074bb6 100644
--- a/src/emu/video/v9938.c
+++ b/src/emu/video/v9938.c
@@ -135,7 +135,7 @@ PALETTE_INIT( v9958 )
 	UINT8 pal[19268*3];
 
 	/* init v9938 512-color palette */
-	palette_init_v9938(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(v9938);
 
 	/* set up YJK table */
 		pal_indYJK = auto_malloc(0x20000 * sizeof(UINT16));
@@ -430,7 +430,7 @@ void v9938_init (running_machine *machine, int model, int vram_size, void (*call
 	else
 		vdp.vram_exp = NULL;
 
-	video_start_generic_bitmapped(machine);
+	VIDEO_START_CALL(generic_bitmapped);
 }
 
 void v9938_reset (void)
diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c
index 4d7b0f1b67e..b6553f2ecfd 100644
--- a/src/mame/audio/8080bw.c
+++ b/src/mame/audio/8080bw.c
@@ -884,7 +884,7 @@ MACHINE_START( schaser )
 {
 	schaser_effect_555_timer = timer_alloc(schaser_effect_555_cb, NULL);
 
-	machine_start_mw8080bw(machine);
+	MACHINE_START_CALL(mw8080bw);
 }
 
 
@@ -896,7 +896,7 @@ MACHINE_RESET( schaser )
 	schaser_sh_port_2_w(0, 0);
 	schaser_effect_555_time_remain = attotime_zero;
 
-	machine_reset_mw8080bw(machine);
+	MACHINE_RESET_CALL(mw8080bw);
 }
 
 
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index 8c05b9b9c6d..1737e43f0fb 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -96,7 +96,7 @@ WRITE8_HANDLER( cinemat_sound_control_w )
 static void generic_init(running_machine *machine, void (*callback)(UINT8, UINT8))
 {
 	/* call the standard init */
-	machine_reset_cinemat(machine);
+	MACHINE_RESET_CALL(cinemat);
 
 	/* set the sound handler */
 	sound_handler = callback;
@@ -1593,7 +1593,7 @@ static WRITE8_HANDLER( qb3_sound_w )
 
 static MACHINE_RESET( qb3_sound )
 {
-	machine_reset_demon_sound(machine);
+	MACHINE_RESET_CALL(demon_sound);
 	memory_install_write8_handler(0, ADDRESS_SPACE_IO, 0x04, 0x04, 0, 0, qb3_sound_w);
 
 	/* this patch prevents the sound ROM from eating itself when command $0A is sent */
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index bcb39690c63..6be89b8adad 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -889,7 +889,7 @@ static SOUND_RESET( dkong )
 
 static SOUND_RESET( dkongjr )
 {
-	sound_reset_dkong(machine);
+	SOUND_RESET_CALL(dkong);
 	soundlatch_w(0,0x00);
 }
 
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 93b09828833..8630a35b7cc 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -76,7 +76,7 @@ static VIDEO_START( alg )
 	add_exit_callback(machine, video_cleanup);
 
 	/* standard video start */
-	video_start_amiga(machine);
+	VIDEO_START_CALL(amiga);
 
 	/* configure pen 4096 as transparent in the renderer and use it for the genlock color */
 	render_container_set_palette_alpha(render_container_get_screen(0), 4096, 0x00);
@@ -152,7 +152,7 @@ static MACHINE_START( alg )
 
 static MACHINE_RESET( alg )
 {
-	machine_reset_amiga(machine);
+	MACHINE_RESET_CALL(amiga);
 	laserdisc_reset(discinfo, 0);
 }
 
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 9280c9174ef..009fca484a6 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -508,7 +508,7 @@ static MACHINE_START( tenpindx )
 	/* initialize the CTC */
 	ctc_intf.baseclock = cpunum_get_clock(0);
 	z80ctc_init(0, &ctc_intf);
-	machine_start_astrocde(machine);
+	MACHINE_START_CALL(astrocde);
 }
 
 
diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c
index a17877823a5..1b1fea8addb 100644
--- a/src/mame/drivers/astrof.c
+++ b/src/mame/drivers/astrof.c
@@ -435,7 +435,7 @@ static MACHINE_START( astrof )
 	state_save_register_global(screen_off);
 	state_save_register_global(astrof_palette_bank);
 
-	machine_start_astrof_audio(machine);
+	MACHINE_START_CALL(astrof_audio);
 }
 
 
@@ -444,7 +444,7 @@ static MACHINE_START( abattle )
 	/* register for state saving */
 	state_save_register_global(abattle_count);
 
-	machine_start_astrof(machine);
+	MACHINE_START_CALL(astrof);
 }
 
 
@@ -494,7 +494,7 @@ static MACHINE_RESET( astrof )
 
 static MACHINE_RESET( abattle )
 {
-	machine_reset_astrof(machine);
+	MACHINE_RESET_CALL(astrof);
 
 	abattle_count = 0;
 }
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index 3ca9268f923..9df066f22ae 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -1554,7 +1554,7 @@ static void decode_mainrom(int rom_region)
 static MACHINE_RESET( init )
 {
 	// reset adder2
-	machine_reset_adder2(machine);
+	MACHINE_RESET_CALL(adder2);
 
 	// reset the board //////////////////////////////////////////////////////
 
@@ -1571,7 +1571,7 @@ static VIDEO_UPDATE( addersc2 )
 		output_set_value("door",( Scorpion2_GetSwitchState(sc2_door_state>>4, sc2_door_state & 0x0F) ) );
 	}
 
-	return video_update_adder2(machine,screen,bitmap,cliprect);
+	return VIDEO_UPDATE_CALL(adder2);
 }
 
 // memory map for scorpion2 board video addon /////////////////////////////
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index a6a23eed2f6..2f7ec3c88e1 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -483,7 +483,7 @@ static MACHINE_RESET( centiped )
 
 static MACHINE_RESET( magworm )
 {
-	machine_reset_centiped(machine);
+	MACHINE_RESET_CALL(centiped);
 
 	/* kludge: clear RAM so that magworm can be reset cleanly */
 	memset(rambase, 0, 0x400);
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index 2bfac91b002..5886d37bc83 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -107,7 +107,7 @@ static void video_cleanup(running_machine *machine)
 static VIDEO_UPDATE( cliff )
 {
 	/* update the TMS9928A video */
-	video_update_tms9928a( machine, screen, bitmap, cliprect );
+	VIDEO_UPDATE_CALL(tms9928a);
 
 	if (discinfo != NULL)
 	{
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 05adf62dfa2..a3d4bede7d9 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -184,14 +184,14 @@ VIDEO_START(ddenlovr)
 
 static VIDEO_START(mmpanic)
 {
-	video_start_ddenlovr(machine);
+	VIDEO_START_CALL(ddenlovr);
 
 	extra_layers = 1;
 }
 
 static VIDEO_START(hanakanz)
 {
-	video_start_ddenlovr(machine);
+	VIDEO_START_CALL(ddenlovr);
 
 	ddenlovr_blit_rom_bits = 16;
 	ddenlovr_blit_commands = hanakanz_commands;
@@ -199,7 +199,7 @@ static VIDEO_START(hanakanz)
 
 static VIDEO_START(mjflove)
 {
-	video_start_ddenlovr(machine);
+	VIDEO_START_CALL(ddenlovr);
 
 	ddenlovr_blit_commands = mjflove_commands;
 }
diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c
index 89856df895d..8287f4291f5 100644
--- a/src/mame/drivers/dkong.c
+++ b/src/mame/drivers/dkong.c
@@ -359,7 +359,7 @@ static MACHINE_START( hunchbkd )
 
 	dkong_state *state = machine->driver_data;
 
-	machine_start_dkong2b(machine);
+	MACHINE_START_CALL(dkong2b);
 	dma8257_config(0, &hb_dma);
 
 	for (i=0;i<0x200;i++)
@@ -377,7 +377,7 @@ static MACHINE_START( radarscp )
 {
 	dkong_state *state = machine->driver_data;
 
-	machine_start_dkong2b(machine);
+	MACHINE_START_CALL(dkong2b);
 	state->hardware_type = HARDWARE_TRS02;
 }
 
@@ -385,13 +385,13 @@ static MACHINE_START( radarsc1 )
 {
 	dkong_state *state = machine->driver_data;
 
-	machine_start_dkong2b(machine);
+	MACHINE_START_CALL(dkong2b);
 	state->hardware_type = HARDWARE_TRS01;
 }
 
 static MACHINE_START( dkong3 )
 {
-	machine_start_dkong2b(machine);
+	MACHINE_START_CALL(dkong2b);
 	z80dma_init(1);
 	z80dma_config(0, &dk3_dma);
 }
@@ -415,7 +415,7 @@ static MACHINE_RESET( strtheat )
 	dkong_state *state = machine->driver_data;
 	UINT8 *ROM = memory_region(REGION_CPU1);
 
-	machine_reset_dkong(machine);
+	MACHINE_RESET_CALL(dkong);
 
 	/* The initial state of the counter is 0x08 */
 	memory_configure_bank(1, 0, 4, &ROM[0x10000], 0x4000);
@@ -428,7 +428,7 @@ static MACHINE_RESET( drakton )
 	dkong_state *state = machine->driver_data;
 	UINT8 *ROM = memory_region(REGION_CPU1);
 
-	machine_reset_dkong(machine);
+	MACHINE_RESET_CALL(dkong);
 
 	/* The initial state of the counter is 0x09 */
 	memory_configure_bank(1, 0, 4, &ROM[0x10000], 0x4000);
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index 3fda9fb74a7..4e7f2d654c6 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -189,7 +189,7 @@ static PALETTE_INIT( dleuro )
 
 static VIDEO_START( dleuro )
 {
-	video_start_dlair(machine);
+	VIDEO_START_CALL(dlair);
 
 	overlay_bitmap = auto_bitmap_alloc(machine->screen[0].width, machine->screen[0].height, BITMAP_FORMAT_INDEXED16);
 	fillbitmap(overlay_bitmap, 8, NULL);
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index 720970d7e67..e256f88eb2c 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -76,7 +76,7 @@ static MACHINE_RESET( klaxp )
 
 static MACHINE_RESET( eprom )
 {
-	machine_reset_klaxp(machine);
+	MACHINE_RESET_CALL(klaxp);
 	state_save_register_global_pointer(sync_data, 2);
 }
 
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index d159fa24a63..5e575176863 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -808,7 +808,7 @@ static MACHINE_RESET( borntofi )
 {
 	int voice;
 
-	machine_reset_fantland(machine);
+	MACHINE_RESET_CALL(fantland);
 
 	for (voice = 0; voice < 4; voice++)
 		borntofi_adpcm_stop(voice);
diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c
index d993390466c..ac90ac79fa3 100644
--- a/src/mame/drivers/galpani2.c
+++ b/src/mame/drivers/galpani2.c
@@ -71,7 +71,7 @@ static UINT16 *galpani2_ram, *galpani2_ram2;
 
 static MACHINE_RESET( galpani2 )
 {
-	machine_reset_kaneko16(machine);
+	MACHINE_RESET_CALL(kaneko16);
 
 	kaneko16_sprite_type = 1;
 
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index d6562eeadad..17d19151a05 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -335,7 +335,7 @@ static MACHINE_RESET( itech32 )
 
 static MACHINE_RESET( drivedge )
 {
-	machine_reset_itech32(machine);
+	MACHINE_RESET_CALL(itech32);
 
 	cpunum_set_input_line(2, INPUT_LINE_RESET, ASSERT_LINE);
 	cpunum_set_input_line(3, INPUT_LINE_RESET, ASSERT_LINE);
@@ -832,8 +832,8 @@ static NVRAM_HANDLER( itech020 )
 
 static NVRAM_HANDLER( tournament )
 {
-	nvram_handler_itech020( machine, file, read_or_write );
-	nvram_handler_timekeeper_0( machine, file, read_or_write );
+	NVRAM_HANDLER_CALL(itech020);
+	NVRAM_HANDLER_CALL(timekeeper_0);
 }
 
 
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index 5cd1e6b8cee..c4b684845c7 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -618,7 +618,7 @@ static MACHINE_START( itech8 )
 
 static MACHINE_START( sstrike )
 {
-	machine_start_itech8(machine);
+	MACHINE_START_CALL(itech8);
 
 	/* we need to update behind the beam as well */
 	timer_set(video_screen_get_time_until_pos(0, 0, 0), NULL, 32, behind_the_beam_update);
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 9d7b5d7768b..7da1e660223 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -103,14 +103,14 @@ MACHINE_RESET( kaneko16 )
 
 static MACHINE_RESET( berlwall )
 {
-	machine_reset_kaneko16(machine);
+	MACHINE_RESET_CALL(kaneko16);
 
 	kaneko16_sprite_type = 2;	// like type 0, but using 16 instead of 8 bytes
 }
 
 static MACHINE_RESET( blazeon )
 {
-	machine_reset_kaneko16(machine);
+	MACHINE_RESET_CALL(kaneko16);
 
 	kaneko16_sprite_xoffs = 0x10000 - 0x680;
 	kaneko16_sprite_yoffs = 0x000;
@@ -162,7 +162,7 @@ static MACHINE_RESET( bonkadv )
 
 static MACHINE_RESET( bakubrkr )
 {
-	machine_reset_kaneko16(machine);
+	MACHINE_RESET_CALL(kaneko16);
 
 	kaneko16_priority.sprite[0] = 8;	// above all
 	kaneko16_priority.sprite[1] = 8;	// above all
@@ -174,7 +174,7 @@ static MACHINE_RESET( bakubrkr )
 
 static MACHINE_RESET( gtmr )
 {
-	machine_reset_kaneko16(machine);
+	MACHINE_RESET_CALL(kaneko16);
 
 	kaneko16_sprite_type = 1;
 
@@ -186,7 +186,7 @@ static MACHINE_RESET( gtmr )
 
 static MACHINE_RESET( mgcrystl )
 {
-	machine_reset_kaneko16(machine);
+	MACHINE_RESET_CALL(kaneko16);
 /*
     Sx = Sprites with priority x, x = tiles with priority x,
     Sprites - Tiles Order:
@@ -215,7 +215,7 @@ static MACHINE_RESET( mgcrystl )
 
 static MACHINE_RESET( shogwarr )
 {
-	machine_reset_kaneko16(machine);
+	MACHINE_RESET_CALL(kaneko16);
 
 	calc3_mcu_init();
 }
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index 0d9e02b02f6..6c69a672ebe 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -444,7 +444,7 @@ INPUT_PORTS_END
 
 static NVRAM_HANDLER( simpbowl )
 {
-	nvram_handler_konamigv_93C46( machine, file, read_or_write );
+	NVRAM_HANDLER_CALL(konamigv_93C46);
 	nvram_handler_intelflash( machine, 0, file, read_or_write );
 	nvram_handler_intelflash( machine, 1, file, read_or_write );
 	nvram_handler_intelflash( machine, 2, file, read_or_write );
@@ -626,7 +626,7 @@ static WRITE32_HANDLER( btc_trackball_w )
 
 static NVRAM_HANDLER( btchamp )
 {
-	nvram_handler_konamigv_93C46( machine, file, read_or_write );
+	NVRAM_HANDLER_CALL(konamigv_93C46);
 	nvram_handler_intelflash( machine, 0, file, read_or_write );
 }
 
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index 3b5c03c1c61..b7ca6985be7 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -98,21 +98,21 @@ static MACHINE_START( m72 )
 static MACHINE_RESET( m72 )
 {
 	m72_irq_base = 0x20;
-	machine_reset_m72_sound(machine);
+	MACHINE_RESET_CALL(m72_sound);
 	timer_adjust(scanline_timer, video_screen_get_time_until_pos(0, 0, 0), 0, attotime_never);
 }
 
 static MACHINE_RESET( xmultipl )
 {
 	m72_irq_base = 0x08;
-	machine_reset_m72_sound(machine);
+	MACHINE_RESET_CALL(m72_sound);
 	timer_adjust(scanline_timer, video_screen_get_time_until_pos(0, 0, 0), 0, attotime_never);
 }
 
 static MACHINE_RESET( kengo )
 {
 	m72_irq_base = 0x18;
-	machine_reset_m72_sound(machine);
+	MACHINE_RESET_CALL(m72_sound);
 	timer_adjust(scanline_timer, video_screen_get_time_until_pos(0, 0, 0), 0, attotime_never);
 }
 
diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c
index 929e75a988b..9bf34b3abbe 100644
--- a/src/mame/drivers/marineb.c
+++ b/src/mame/drivers/marineb.c
@@ -43,13 +43,13 @@ write
 static MACHINE_RESET( marineb )
 {
 	marineb_active_low_flipscreen = 0;
-	machine_reset_espial(machine);
+	MACHINE_RESET_CALL(espial);
 }
 
 static MACHINE_RESET( springer )
 {
 	marineb_active_low_flipscreen = 1;
-	machine_reset_espial(machine);
+	MACHINE_RESET_CALL(espial);
 }
 
 static ADDRESS_MAP_START( marineb_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index 998cb1c90c4..117b53912e0 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -665,25 +665,25 @@ ADDRESS_MAP_END
 
 
 /* in video/segasyse.c */
-void megaplay_start_video_normal(running_machine *machine);
-void megaplay_update_video_normal(running_machine *machine, mame_bitmap *bitmap, const rectangle *cliprect );
+VIDEO_START( megaplay_normal );
+VIDEO_UPDATE( megaplay_normal );
 
 /* give us access to the megadriv start and update functions so that we can call them */
-extern UINT32 video_update_megadriv(running_machine *machine, int screen, mame_bitmap *bitmap, const rectangle *cliprect);
-extern void video_start_megadriv(running_machine *machine);
+VIDEO_START( megadriv );
+VIDEO_UPDATE( megadriv );
 
 static VIDEO_START(megplay)
 {
 	//printf("megplay vs\n");
-	video_start_megadriv(Machine);
-	megaplay_start_video_normal(Machine);
+	VIDEO_START_CALL(megadriv);
+	VIDEO_START_CALL(megaplay_normal);
 }
 
 static VIDEO_UPDATE(megplay)
 {
 	//printf("megplay vu\n");
-	video_update_megadriv(machine,0,bitmap,cliprect);
-	megaplay_update_video_normal(machine, bitmap,cliprect);
+	VIDEO_UPDATE_CALL(megadriv);
+	VIDEO_UPDATE_CALL(megaplay_normal);
 	return 0;
 }
 
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index 783c57c938c..aaa9f7e017f 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -92,16 +92,16 @@ UINT32 bios_ctrl_inputs;
 #define MASTER_CLOCK		53693100
 
 /* give us access to the megadriv start and update functions so that we can call them */
-extern UINT32 video_update_megadriv(running_machine *machine, int screen, mame_bitmap *bitmap, const rectangle *cliprect);
-extern void video_start_megadriv(running_machine *machine);
-extern void video_eof_megadriv(running_machine *machine);
-extern void machine_reset_megadriv(running_machine *machine);
+VIDEO_UPDATE( megadriv );
+VIDEO_START( megadriv );
+VIDEO_EOF( megadriv );
+MACHINE_RESET( megadriv );
 
 /* in drivers/segae.c */
-extern UINT32 video_update_megatech_bios(running_machine *machine, int screen, mame_bitmap *bitmap, const rectangle *cliprect);
-extern void video_eof_megatech_bios(running_machine *machine);
-extern void machine_reset_megatech_bios(running_machine *machine);
-extern DRIVER_INIT(megatech_bios);
+VIDEO_UPDATE( megatech_bios );
+VIDEO_EOF( megatech_bios );
+MACHINE_RESET( megatech_bios );
+DRIVER_INIT( megatech_bios );
 
 
 /* not currently used */
@@ -604,7 +604,7 @@ static DRIVER_INIT(mtnew)
 static VIDEO_START(mtnew)
 {
 	init_for_megadrive(); // create an sms vdp too, for comptibility mode
-	video_start_megadriv(Machine);
+	VIDEO_START_CALL(megadriv);
 }
 //attotime_never
 static VIDEO_UPDATE(mtnew)
@@ -612,25 +612,25 @@ static VIDEO_UPDATE(mtnew)
 	if (screen ==0)
 	{
 		/* if we're running an sms game then use the SMS update.. maybe this should be moved to the megadrive emulation core as compatibility mode is a feature of the chip */
-		if (!current_game_is_sms) video_update_megadriv(machine,0,bitmap,cliprect);
-		else video_update_megatech_md_sms(machine,0,bitmap,cliprect);
+		if (!current_game_is_sms) VIDEO_UPDATE_CALL(megadriv);
+		else VIDEO_UPDATE_CALL(megatech_md_sms);
 	}
-	else if (screen ==1) video_update_megatech_bios(machine, 1, bitmap,cliprect);
+	else if (screen ==1) VIDEO_UPDATE_CALL(megatech_bios);
 	return 0;
 }
 
 static VIDEO_EOF(mtnew)
 {
-	if (!current_game_is_sms) video_eof_megadriv(Machine);
-	else video_eof_megatech_md_sms(Machine);
-	video_eof_megatech_bios(Machine);
+	if (!current_game_is_sms) VIDEO_EOF_CALL(megadriv);
+	else VIDEO_EOF_CALL(megatech_md_sms);
+	VIDEO_EOF_CALL(megatech_bios);
 }
 
 static MACHINE_RESET(mtnew)
 {
-	machine_reset_megadriv(Machine);
-	machine_reset_megatech_bios(Machine);
-	machine_reset_megatech_md_sms(Machine);
+	MACHINE_RESET_CALL(megadriv);
+	MACHINE_RESET_CALL(megatech_bios);
+	MACHINE_RESET_CALL(megatech_md_sms);
 	megatech_select_game(0);
 }
 
diff --git a/src/mame/drivers/midzeus.c b/src/mame/drivers/midzeus.c
index 78b360408d9..529524cb55e 100644
--- a/src/mame/drivers/midzeus.c
+++ b/src/mame/drivers/midzeus.c
@@ -93,7 +93,7 @@ static MACHINE_START( midzeus )
 static MACHINE_START( midzeus2 )
 {
 	timekeeper_init(0, TIMEKEEPER_MIDZEUS2, NULL);
-	machine_start_midzeus(machine);
+	MACHINE_START_CALL(midzeus);
 }
 
 
@@ -202,7 +202,7 @@ static WRITE32_HANDLER( zpram_w )
 
 static NVRAM_HANDLER( midzeus2 )
 {
-	nvram_handler_timekeeper_0(machine, file, read_or_write);
+	NVRAM_HANDLER_CALL(timekeeper_0);
 
 	if (read_or_write)
 		mame_fwrite(file, zpram, zpram_size);
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 5e5fc011edf..5dfc7d77b35 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -256,7 +256,7 @@ static void copro_fifoout_push(UINT32 data)
 
 static NVRAM_HANDLER( model2 )
 {
-	nvram_handler_93C46(machine, file, read_or_write);
+	NVRAM_HANDLER_CALL(93C46);
 
 	if (read_or_write)
 	{
@@ -355,7 +355,7 @@ static MACHINE_RESET(model2_common)
 
 static MACHINE_RESET(model2o)
 {
-	machine_reset_model2_common(machine);
+	MACHINE_RESET_CALL(model2_common);
 
 	// hold TGP in halt until we have code
 	cpunum_set_input_line(2, INPUT_LINE_HALT, ASSERT_LINE);
@@ -374,8 +374,8 @@ static MACHINE_RESET(model2_scsp)
 
 static MACHINE_RESET(model2)
 {
-	machine_reset_model2_common(machine);
-	machine_reset_model2_scsp(machine);
+	MACHINE_RESET_CALL(model2_common);
+	MACHINE_RESET_CALL(model2_scsp);
 
 	// hold TGP in halt until we have code
 	cpunum_set_input_line(2, INPUT_LINE_HALT, ASSERT_LINE);
@@ -385,8 +385,8 @@ static MACHINE_RESET(model2)
 
 static MACHINE_RESET(model2b)
 {
-	machine_reset_model2_common(machine);
-	machine_reset_model2_scsp(machine);
+	MACHINE_RESET_CALL(model2_common);
+	MACHINE_RESET_CALL(model2_scsp);
 
 	cpunum_set_input_line(2, INPUT_LINE_HALT, ASSERT_LINE);
 
@@ -400,8 +400,8 @@ static MACHINE_RESET(model2b)
 
 static MACHINE_RESET(model2c)
 {
-	machine_reset_model2_common(machine);
-	machine_reset_model2_scsp(machine);
+	MACHINE_RESET_CALL(model2_common);
+	MACHINE_RESET_CALL(model2_scsp);
 
 	dsp_type = DSP_TYPE_TGPX4;
 }
diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c
index b454555a14f..0adc184d0af 100644
--- a/src/mame/drivers/model3.c
+++ b/src/mame/drivers/model3.c
@@ -951,7 +951,7 @@ static NVRAM_HANDLER( model3 )
 	{
 		eeprom_handler(file, read_or_write);
 	} else {
-		nvram_handler_93C46(machine, file, read_or_write);
+		NVRAM_HANDLER_CALL(93C46);
 	}
 
 	if (read_or_write)
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index ed822398ce7..8d704b423bc 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -338,7 +338,7 @@ static MACHINE_RESET(mquake)
 	/* set ES5503 wave memory (this is banked in 64k increments) */
 	ES5503_set_base_0(memory_region(REGION_SOUND1));
 
-	machine_reset_amiga(machine);
+	MACHINE_RESET_CALL(amiga);
 }
 
 /*************************************
diff --git a/src/mame/drivers/mw8080bw.c b/src/mame/drivers/mw8080bw.c
index e95b913bc16..81c5104896e 100644
--- a/src/mame/drivers/mw8080bw.c
+++ b/src/mame/drivers/mw8080bw.c
@@ -882,7 +882,7 @@ static MACHINE_START( maze )
 	state_save_register_global(maze_tone_timing_state);
 	state_save_register_func_postload(maze_update_discrete);
 
-	machine_start_mw8080bw(machine);
+	MACHINE_START_CALL(mw8080bw);
 }
 
 
@@ -967,7 +967,7 @@ static MACHINE_START( boothill )
 	/* setup for save states */
 	state_save_register_global(rev_shift_res);
 
-	machine_start_mw8080bw(machine);
+	MACHINE_START_CALL(mw8080bw);
 }
 
 
@@ -1167,7 +1167,7 @@ static MACHINE_START( desertgu )
 	/* setup for save states */
 	state_save_register_global(desertgu_controller_select);
 
-	machine_start_mw8080bw(machine);
+	MACHINE_START_CALL(mw8080bw);
 }
 
 
@@ -1493,7 +1493,7 @@ static MACHINE_START( gmissile )
 	/* setup for save states */
 	state_save_register_global(rev_shift_res);
 
-	machine_start_mw8080bw(machine);
+	MACHINE_START_CALL(mw8080bw);
 }
 
 
@@ -1585,7 +1585,7 @@ static MACHINE_START( m4 )
 	/* setup for save states */
 	state_save_register_global(rev_shift_res);
 
-	machine_start_mw8080bw(machine);
+	MACHINE_START_CALL(mw8080bw);
 }
 
 
@@ -1682,7 +1682,7 @@ static MACHINE_START( clowns )
 	/* setup for save states */
 	state_save_register_global(clowns_controller_select);
 
-	machine_start_mw8080bw(machine);
+	MACHINE_START_CALL(mw8080bw);
 }
 
 
@@ -2059,7 +2059,7 @@ static MACHINE_START( spcenctr )
 	state_save_register_global_array(spcenctr_trench_slope);
 	state_save_register_func_postload(adjust_strobe_timers);
 
-	machine_start_mw8080bw(machine);
+	MACHINE_START_CALL(mw8080bw);
 }
 
 
@@ -2226,7 +2226,7 @@ static MACHINE_START( phantom2 )
 	/* setup for save states */
 	state_save_register_global(phantom2_cloud_counter);
 
-	machine_start_mw8080bw(machine);
+	MACHINE_START_CALL(mw8080bw);
 }
 
 
@@ -2463,7 +2463,7 @@ static MACHINE_START( invaders )
 	/* setup for save states */
 	state_save_register_global(invaders_flip_screen);
 
-	machine_start_mw8080bw(machine);
+	MACHINE_START_CALL(mw8080bw);
 }
 
 
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index c0e88f3236e..fb207513de1 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -83,7 +83,7 @@ static MACHINE_RESET( nbmj8991 )
 		memory_configure_bank(1, 0, 4, memory_region(REGION_CPU2) + 0x8000, 0x8000);
 		memory_set_bank(1, 0);
 	}
-	machine_reset_nb1413m3(machine);
+	MACHINE_RESET_CALL(nb1413m3);
 }
 
 static DRIVER_INIT( pstadium )
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 4d94590fe8c..7e99fe2af4a 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -266,7 +266,7 @@ static MACHINE_RESET( NMK004 )
 
 static MACHINE_RESET( mustang_sound )
 {
-	machine_reset_seibu_sound_1(machine);
+	MACHINE_RESET_CALL(seibu_sound_1);
 }
 
 static WRITE16_HANDLER ( ssmissin_sound_w )
diff --git a/src/mame/drivers/panicr.c b/src/mame/drivers/panicr.c
index 5e5f57247bc..03cea2f608e 100644
--- a/src/mame/drivers/panicr.c
+++ b/src/mame/drivers/panicr.c
@@ -71,7 +71,7 @@ static PALETTE_INIT( panicr )
 	int i;
 
 
-	palette_init_RRRR_GGGG_BBBB(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(RRRR_GGGG_BBBB);
 	color_prom += 256*3;
 
 	// txt lookup table
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index 8b8530214d7..348d169aaff 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -224,7 +224,7 @@ static NVRAM_HANDLER( peplus )
 		}
 	}
 
-	nvram_handler_i2cmem_0( machine, file, read_or_write );
+	NVRAM_HANDLER_CALL(i2cmem_0);
 }
 
 /*****************
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 6e4c8e26e30..1348240e139 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -2057,7 +2057,7 @@ static MACHINE_RESET( killbld )
 {
 	int i;
 
-	machine_reset_pgm(machine);
+	MACHINE_RESET_CALL(pgm);
 
 	/* fill the protection ram with a5 */
 	for (i = 0;i < 0x4000/2;i++)
@@ -2198,7 +2198,7 @@ static MACHINE_RESET( olds )
 //  UINT16 *mem16_a = (UINT16 *)memory_region(REGION_CPU1);
 	int i;
 
-	machine_reset_pgm(machine);
+	MACHINE_RESET_CALL(pgm);
 
 	/* populate shared protection ram with data read from pcb .. */
 
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index f0ef4717e52..2a79472f20c 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -131,14 +131,14 @@ static MACHINE_START( segac2 )
 	state_save_register_global(prot_write_buf);
 	state_save_register_global(prot_read_buf);
 
-	machine_start_genesis(machine);
+	MACHINE_START_CALL(genesis);
 }
 
 
 static MACHINE_RESET( segac2 )
 {
 	/* set up interrupts and such */
-	machine_reset_genesis(machine);
+	MACHINE_RESET_CALL(genesis);
 
 	/* determine how many sound banks */
 	sound_banks = 0;
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 1b560e01684..6027e1cedcd 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -205,7 +205,7 @@ static const ppi8255_interface single_ppi_intf =
 static void system16a_generic_init(running_machine *machine)
 {
 	/* call the generic init */
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 
 	/* init the FD1094 */
 	fd1094_driver_init(NULL);
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index 508e7bce480..e922d7aaa8f 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -1079,7 +1079,7 @@ static TIMER_CALLBACK( atomicp_sound_irq )
 
 static MACHINE_RESET( atomicp )
 {
-	machine_reset_system16b(machine);
+	MACHINE_RESET_CALL(system16b);
 	timer_pulse(ATTOTIME_IN_HZ(atomicp_sound_rate), NULL, 0, atomicp_sound_irq);
 }
 
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index 538695ba953..8220df8e953 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -33,7 +33,7 @@ static MACHINE_RESET( system1 )
 
 static MACHINE_RESET( system1_banked )
 {
-	machine_reset_system1(machine);
+	MACHINE_RESET_CALL(system1);
 	memory_configure_bank(1, 0, 4, memory_region(REGION_CPU1) + 0x10000, 0x4000);
 }
 
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index e71d6de4d39..27a416cee71 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -653,7 +653,7 @@ static MACHINE_RESET( bayroute )
 
 static DRIVER_INIT( bayrtbl1 )
 {
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 }
 /***************************************************************************/
 
@@ -812,7 +812,7 @@ static DRIVER_INIT( dduxbl )
 		0,2,0,0
 	};
 
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 	sys16_video_config(dduxbl_update_proc, -0x48, bank);
 }
 /***************************************************************************/
@@ -939,7 +939,7 @@ static MACHINE_RESET( eswatbl )
 
 static DRIVER_INIT( eswatbl )
 {
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 	sys16_rowscroll_scroll=0x8000;
 	sys18_splittab_fg_x=&sys16_textram[0x0f80];
 }
@@ -1063,7 +1063,7 @@ static MACHINE_RESET( fpointbl )
 
 static DRIVER_INIT( fpointbl )
 {
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 	sys16_video_config(fpoint_update_proc, -0xb8, NULL);
 }
 /***************************************************************************/
@@ -1297,7 +1297,7 @@ static MACHINE_RESET( goldnaxe )
 
 static DRIVER_INIT( goldnabl )
 {
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 }
 
 /***************************************************************************/
@@ -1510,12 +1510,12 @@ static MACHINE_RESET( passht4b )
 
 static DRIVER_INIT( passsht )
 {
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 }
 
 static DRIVER_INIT( passht4b )
 {
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 }
 
 /***************************************************************************/
@@ -1774,7 +1774,7 @@ static MACHINE_RESET( shinobl )
 static DRIVER_INIT( shinobl )
 {
 	shinobl_kludge = 1;
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 }
 
 
@@ -1857,7 +1857,7 @@ static MACHINE_RESET( tetrisbl )
 
 static DRIVER_INIT( tetrisbl )
 {
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 }
 
 
@@ -2063,7 +2063,7 @@ static DRIVER_INIT( tturfbl )
 {
 	UINT8 *mem;
 
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 
 	mem = memory_region(REGION_CPU2);
 	memcpy(mem, mem+0x10000, 0x8000);
@@ -2225,7 +2225,7 @@ static MACHINE_RESET( wb3bbl )
 
 static DRIVER_INIT( wb3bbl )
 {
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 }
 
 /***************************************************************************/
diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c
index 19417ca9562..63515446029 100644
--- a/src/mame/drivers/system18.c
+++ b/src/mame/drivers/system18.c
@@ -776,7 +776,7 @@ static DRIVER_INIT( shdancbl )
 	for(i = 0; i < 0xc0000; i++)
 		mem[i] ^= 0xFF;
 
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 	memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xffc000, 0xffc001, 0, 0, shdancbl_skip_r );
 
 	sys18_splittab_fg_x=&sys16_textram[0x0f80/2];
@@ -919,7 +919,7 @@ static DRIVER_INIT( mwalkbl ){
 		0x1f, 0xA0000  // ROM #4 = 256K
 	};
 
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 	sys18_splittab_fg_x=&sys16_textram[0x0f80/2];
 	sys18_splittab_bg_x=&sys16_textram[0x0fc0/2];
 
@@ -1100,7 +1100,7 @@ static DRIVER_INIT( astormbl ){
 		0x1f, 0xA0000  // ROM #4 = 256K
 	};
 
-	machine_reset_sys16_onetime(machine);
+	MACHINE_RESET_CALL(sys16_onetime);
 	sys18_splittab_fg_x=&sys16_textram[0x0f80/2];
 	sys18_splittab_bg_x=&sys16_textram[0x0fc0/2];
 	sys16_MaxShadowColors = 0; // doesn't seem to use transparent shadows
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index d81eba37ba9..45b91c1aaa5 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -391,7 +391,7 @@ static void toaplan2_reset(void)
 		cpunum_set_input_line(1, INPUT_LINE_RESET, PULSE_LINE);
 }
 
-static MACHINE_RESET( toaplan2 )		/* machine_reset_toaplan2(); */
+static MACHINE_RESET( toaplan2 )
 {
 	mcu_data = 0x00;
 
@@ -405,20 +405,20 @@ static MACHINE_RESET( toaplan2 )		/* machine_reset_toaplan2(); */
 
 static MACHINE_RESET( ghox )
 {
-	machine_reset_toaplan2(machine);
+	MACHINE_RESET_CALL(toaplan2);
 	old_p1_paddle_h = 0;
 	old_p2_paddle_h = 0;
 }
 
 static MACHINE_RESET( dogyuun )
 {
-	machine_reset_toaplan2(machine);
+	MACHINE_RESET_CALL(toaplan2);
 	mcu_data = 0xffaa;
 }
 
 static MACHINE_RESET( vfive )
 {
-	machine_reset_toaplan2(machine);
+	MACHINE_RESET_CALL(toaplan2);
 	mcu_data = 0xffaa;
 }
 
@@ -430,7 +430,7 @@ static MACHINE_RESET( bgaregga )
 	current_bank = 2;
 	memory_set_bankptr(1, &Z80[0x10000]);
 
-	machine_reset_toaplan2(machine);
+	MACHINE_RESET_CALL(toaplan2);
 }
 
 static DRIVER_INIT( T2_Z80 )		/* init_t2_Z80(); */
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 598f3b95d21..4d9c974925e 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -715,7 +715,7 @@ MACHINE_DRIVER_END
 
 static MACHINE_RESET( zeropt )
 {
-	machine_reset_unico(machine);
+	MACHINE_RESET_CALL(unico);
 }
 
 static MACHINE_DRIVER_START( zeropnt )
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index be3f416e208..22ea01fdc0e 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -1221,7 +1221,7 @@ static MACHINE_RESET( coh1000ta )
 
 static NVRAM_HANDLER( coh1000ta )
 {
-	nvram_handler_at28c16_0( machine, file, read_or_write );
+	NVRAM_HANDLER_CALL(at28c16_0);
 	if (read_or_write)
 	{
 		mame_fwrite(file, taitofx1_eeprom1, taitofx1_eeprom_size1);
@@ -1341,7 +1341,7 @@ static MACHINE_RESET( coh1000tb )
 
 static NVRAM_HANDLER( coh1000tb )
 {
-	nvram_handler_at28c16_0( machine, file, read_or_write );
+	NVRAM_HANDLER_CALL(at28c16_0);
 	if (read_or_write)
 	{
 		mame_fwrite(file, taitofx1_eeprom1, taitofx1_eeprom_size1);
diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c
index 6b9a2a965fd..339e2ed6736 100644
--- a/src/mame/drivers/zodiack.c
+++ b/src/mame/drivers/zodiack.c
@@ -29,13 +29,13 @@ int percuss_hardware;
 static MACHINE_RESET( zodiack )
 {
 	percuss_hardware = 0;
-	machine_reset_espial(machine);
+	MACHINE_RESET_CALL(espial);
 }
 
 static MACHINE_RESET( percuss )
 {
 	percuss_hardware = 1;
-	machine_reset_espial(machine);
+	MACHINE_RESET_CALL(espial);
 }
 
 
diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c
index e723ce41f1b..6997f815e70 100644
--- a/src/mame/machine/atarigen.c
+++ b/src/mame/machine/atarigen.c
@@ -362,7 +362,7 @@ READ32_HANDLER( atarigen_eeprom_upper32_r )
 
 
 /*---------------------------------------------------------------
-    nvram_handler_atarigen: Loads the EEPROM data.
+    NVRAM_HANDLER( atarigen ): Loads the EEPROM data.
 ---------------------------------------------------------------*/
 
 NVRAM_HANDLER( atarigen )
diff --git a/src/mame/machine/cubocd32.c b/src/mame/machine/cubocd32.c
index d4f45d689c5..96145417d8b 100644
--- a/src/mame/machine/cubocd32.c
+++ b/src/mame/machine/cubocd32.c
@@ -200,7 +200,7 @@ static UINT32 akiko_nvram_read(void)
 
 NVRAM_HANDLER( cd32 )
 {
-	nvram_handler_i2cmem_0( machine, file, read_or_write );
+	NVRAM_HANDLER_CALL(i2cmem_0);
 }
 
 /*************************************
diff --git a/src/mame/machine/mcr.c b/src/mame/machine/mcr.c
index 272bc878709..a68cb199368 100644
--- a/src/mame/machine/mcr.c
+++ b/src/mame/machine/mcr.c
@@ -393,7 +393,7 @@ MACHINE_START( zwackery )
 	pia_config(3, &zwackery_pia_3_intf);
 	pia_config(4, &zwackery_pia_4_intf);
 
-	machine_start_mcr68(machine);
+	MACHINE_START_CALL(mcr68);
 }
 
 
diff --git a/src/mame/machine/midwunit.c b/src/mame/machine/midwunit.c
index 2b1aa28977e..33f2271894e 100644
--- a/src/mame/machine/midwunit.c
+++ b/src/mame/machine/midwunit.c
@@ -624,7 +624,7 @@ MACHINE_RESET( midwunit )
 
 MACHINE_RESET( midxunit )
 {
-	machine_reset_midwunit(machine);
+	MACHINE_RESET_CALL(midwunit);
 	dcs_set_io_callbacks(midxunit_dcs_output_full, NULL);
 }
 
diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c
index fbe8f3b10b2..18b73e67f5e 100644
--- a/src/mame/machine/scramble.c
+++ b/src/mame/machine/scramble.c
@@ -20,7 +20,7 @@ static UINT8 security_2B_counter;
 
 MACHINE_RESET( scramble )
 {
-	machine_reset_galaxian(machine);
+	MACHINE_RESET_CALL(galaxian);
 
 	if (cpu_gettotalcpu() > 1)
 	{
@@ -32,7 +32,7 @@ MACHINE_RESET( scramble )
 
 MACHINE_RESET( sfx )
 {
-	machine_reset_scramble(machine);
+	MACHINE_RESET_CALL(scramble);
 
 	sfx_sh_init();
 }
@@ -49,7 +49,7 @@ MACHINE_RESET( monsterz )
 
     ROM[0xc5bc] = 0xaf;
 */
-	machine_reset_scramble(machine);
+	MACHINE_RESET_CALL(scramble);
 
 	sfx_sh_init();
 
@@ -61,7 +61,7 @@ MACHINE_RESET( explorer )
 	UINT8 *RAM = memory_region(REGION_CPU1);
 	RAM[0x47ff] = 0; /* If not set, it doesn't reset after the 1st time */
 
-	machine_reset_galaxian(machine);
+	MACHINE_RESET_CALL(galaxian);
 }
 
 static READ8_HANDLER( scrambls_input_port_2_r )
diff --git a/src/mame/machine/slikshot.c b/src/mame/machine/slikshot.c
index 7b0edc27c21..469937ec120 100644
--- a/src/mame/machine/slikshot.c
+++ b/src/mame/machine/slikshot.c
@@ -532,7 +532,7 @@ WRITE8_HANDLER( slikshot_z80_control_w )
 
 /*************************************
  *
- *  video_update_slikshot
+ *  VIDEO_UPDATE( slishot )
  *
  *************************************/
 
@@ -542,7 +542,7 @@ VIDEO_UPDATE( slikshot )
 	int temp, i;
 
 	/* draw the normal video first */
-	video_update_itech8_2page(machine, screen, bitmap, cliprect);
+	VIDEO_UPDATE_CALL(itech8_2page);
 
 	/* add the current X,Y positions to the list */
 	xbuffer[ybuffer_next % YBUFFER_COUNT] = readinputportbytag_safe("FAKEX", 0);
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index 0054b0a7b8f..8b502f6f722 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -307,13 +307,13 @@ void toaplan1_driver_savestate(void)
 
 MACHINE_RESET( zerozone )	/* Hack for ZeroWing and OutZone. See the video driver */
 {
-	machine_reset_toaplan1(machine);
+	MACHINE_RESET_CALL(toaplan1);
 	toaplan1_unk_reset_port = 1;
 }
 
 MACHINE_RESET( demonwld )
 {
-	machine_reset_toaplan1(machine);
+	MACHINE_RESET_CALL(toaplan1);
 	dsp_addr_w = 0;
 	main_ram_seg = 0;
 	dsp_execute = 0;
@@ -330,7 +330,7 @@ void demonwld_driver_savestate(void)
 
 MACHINE_RESET( vimana )
 {
-	machine_reset_toaplan1(machine);
+	MACHINE_RESET_CALL(toaplan1);
 	vimana_credits = 0;
 	vimana_latch = 0;
 }
diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c
index 4cc3b727393..081492c4a03 100644
--- a/src/mame/machine/williams.c
+++ b/src/mame/machine/williams.c
@@ -939,7 +939,7 @@ MACHINE_START( joust2 )
 MACHINE_RESET( joust2 )
 {
 	/* standard init */
-	machine_reset_williams2(machine);
+	MACHINE_RESET_CALL(williams2);
 	pia_set_input_ca1(3, 1);
 	state_save_register_global(joust2_current_sound_data);
 }
diff --git a/src/mame/video/4enraya.c b/src/mame/video/4enraya.c
index 6d1a4c58a68..7e213c47585 100644
--- a/src/mame/video/4enraya.c
+++ b/src/mame/video/4enraya.c
@@ -30,7 +30,7 @@ static TILE_GET_INFO( get_tile_info )
 VIDEO_START( 4enraya )
 {
 	bg_tilemap = tilemap_create( get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,32,32 );
-	video_start_generic(machine);
+	VIDEO_START_CALL(generic);
 }
 
 VIDEO_UPDATE( 4enraya)
diff --git a/src/mame/video/amiga.c b/src/mame/video/amiga.c
index 93c3a2df0cc..7532d7c3ce1 100644
--- a/src/mame/video/amiga.c
+++ b/src/mame/video/amiga.c
@@ -156,7 +156,7 @@ VIDEO_START( amiga )
 	/* reset the genlock color */
 	genlock_color = 0xffff;
 
-	video_start_generic_bitmapped(machine);
+	VIDEO_START_CALL(generic_bitmapped);
 }
 
 
diff --git a/src/mame/video/atari.c b/src/mame/video/atari.c
index 5bf9158a1c6..2278e69fbe9 100644
--- a/src/mame/video/atari.c
+++ b/src/mame/video/atari.c
@@ -766,7 +766,7 @@ VIDEO_START( atari )
 		memset(antic.video[i], 0, sizeof(VIDEO));
     }
 
-    video_start_generic_bitmapped(machine);
+    VIDEO_START_CALL(generic_bitmapped);
 }
 
 /************************************************************************
@@ -778,7 +778,7 @@ VIDEO_UPDATE( atari )
 {
 	UINT32 new_tv_artifacts;
 
-	video_update_generic_bitmapped(machine, screen, bitmap, cliprect);
+	VIDEO_UPDATE_CALL(generic_bitmapped);
 
 	new_tv_artifacts = readinputportbytag_safe("artifacts", 0);
 	if( tv_artifacts != new_tv_artifacts )
diff --git a/src/mame/video/atarirle.c b/src/mame/video/atarirle.c
index 73feb76cd0f..36824fd7e4f 100644
--- a/src/mame/video/atarirle.c
+++ b/src/mame/video/atarirle.c
@@ -441,14 +441,14 @@ void atarirle_command_w(int map, UINT8 command)
 
 
 /*---------------------------------------------------------------
-    video_eof_atarirle: Flush remaining changes.
+    VIDEO_EOF(atarirle): Flush remaining changes.
 ---------------------------------------------------------------*/
 
 VIDEO_EOF( atarirle )
 {
 	int i;
 
-//logerror("video_eof_atarirle\n");
+//logerror("VIDEO_EOF(atarirle)\n");
 
 	/* loop over all RLE handlers */
 	for (i = 0; i < ATARIRLE_MAX; i++)
diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c
index df6d96783bb..c17155c2dc9 100644
--- a/src/mame/video/avgdvg.c
+++ b/src/mame/video/avgdvg.c
@@ -1466,7 +1466,7 @@ static VIDEO_START( avg_common )
 	vg->ydac_xor = 0x200;
 
 	register_state ();
-	video_start_vector(machine);
+	VIDEO_START_CALL(vector);
 }
 
 VIDEO_START( dvg )
@@ -1481,48 +1481,48 @@ VIDEO_START( dvg )
 	vg_run_timer = timer_alloc(run_state_machine, NULL);
 
 	register_state ();
-	video_start_vector(machine);
+	VIDEO_START_CALL(vector);
 }
 
 VIDEO_START( avg )
 {
 	vgc = &avg_default;
 	vg = &vgd;
-	video_start_avg_common(machine);
+	VIDEO_START_CALL(avg_common);
 }
 
 VIDEO_START( avg_starwars )
 {
 	vgc = &avg_starwars;
 	vg = &vgd;
-	video_start_avg_common(machine);
+	VIDEO_START_CALL(avg_common);
 }
 
 VIDEO_START( avg_tempest )
 {
 	vgc = &avg_tempest;
 	vg = &vgd;
-	video_start_avg_common(machine);
+	VIDEO_START_CALL(avg_common);
 }
 
 VIDEO_START( avg_mhavoc )
 {
 	vgc = &avg_mhavoc;
 	vg = &vgd;
-	video_start_avg_common(machine);
+	VIDEO_START_CALL(avg_common);
 }
 
 VIDEO_START( avg_bzone )
 {
 	vgc = &avg_bzone;
 	vg = &vgd;
-	video_start_avg_common(machine);
+	VIDEO_START_CALL(avg_common);
 }
 
 VIDEO_START( avg_quantum )
 {
 	vgc = &avg_quantum;
 	vg = &vgd;
-	video_start_avg_common(machine);
+	VIDEO_START_CALL(avg_common);
 }
 
diff --git a/src/mame/video/aztarac.c b/src/mame/video/aztarac.c
index a671a0731a6..d0fba29985f 100644
--- a/src/mame/video/aztarac.c
+++ b/src/mame/video/aztarac.c
@@ -91,5 +91,5 @@ VIDEO_START( aztarac )
 	xcenter=((xmax + xmin) / 2) << 16;
 	ycenter=((ymax + ymin) / 2) << 16;
 
-	video_start_vector(machine);
+	VIDEO_START_CALL(vector);
 }
diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c
index e7e36327b62..51ead9f8ff3 100644
--- a/src/mame/video/btime.c
+++ b/src/mame/video/btime.c
@@ -149,7 +149,7 @@ VIDEO_START( bnj )
     /* the background area is twice as wide as the screen */
     background_bitmap = auto_bitmap_alloc(2*machine->screen[0].width,machine->screen[0].height,machine->screen[0].format);
 
-    video_start_btime(machine);
+    VIDEO_START_CALL(btime);
 }
 
 
diff --git a/src/mame/video/cchasm.c b/src/mame/video/cchasm.c
index b6e6ab93f15..90a1c981dad 100644
--- a/src/mame/video/cchasm.c
+++ b/src/mame/video/cchasm.c
@@ -132,5 +132,5 @@ VIDEO_START( cchasm )
 	xcenter=((xmax+xmin)/2) << 16;
 	ycenter=((ymax+ymin)/2) << 16;
 
-	video_start_vector(machine);
+	VIDEO_START_CALL(vector);
 }
diff --git a/src/mame/video/cinemat.c b/src/mame/video/cinemat.c
index 009ccdca6b3..250e562364e 100644
--- a/src/mame/video/cinemat.c
+++ b/src/mame/video/cinemat.c
@@ -180,35 +180,35 @@ WRITE8_HANDLER(cinemat_vector_control_w)
 VIDEO_START( cinemat_bilevel )
 {
 	color_mode = COLOR_BILEVEL;
-	video_start_vector(machine);
+	VIDEO_START_CALL(vector);
 }
 
 
 VIDEO_START( cinemat_16level )
 {
 	color_mode = COLOR_16LEVEL;
-	video_start_vector(machine);
+	VIDEO_START_CALL(vector);
 }
 
 
 VIDEO_START( cinemat_64level )
 {
 	color_mode = COLOR_64LEVEL;
-	video_start_vector(machine);
+	VIDEO_START_CALL(vector);
 }
 
 
 VIDEO_START( cinemat_color )
 {
 	color_mode = COLOR_RGB;
-	video_start_vector(machine);
+	VIDEO_START_CALL(vector);
 }
 
 
 VIDEO_START( cinemat_qb3color )
 {
 	color_mode = COLOR_QB3;
-	video_start_vector(machine);
+	VIDEO_START_CALL(vector);
 }
 
 
@@ -236,7 +236,7 @@ VIDEO_UPDATE( spacewar )
 {
 	int sw_option = readinputportbytag("INPUTS");
 
-	video_update_vector(machine, screen, bitmap, cliprect);
+	VIDEO_UPDATE_CALL(vector);
 
 	/* set the state of the artwork */
 	output_set_value("pressed3", (~sw_option >> 0) & 1);
diff --git a/src/mame/video/cischeat.c b/src/mame/video/cischeat.c
index 3d0887145f8..aea45bf8a91 100644
--- a/src/mame/video/cischeat.c
+++ b/src/mame/video/cischeat.c
@@ -141,7 +141,7 @@ static void prepare_shadows(void)
 /* 32 colour codes for the tiles */
 VIDEO_START( cischeat )
 {
-	video_start_megasys1(machine);
+	VIDEO_START_CALL(megasys1);
 
  	megasys1_bits_per_color_code = 5;
 
@@ -155,14 +155,14 @@ VIDEO_START( cischeat )
 /* 16 colour codes for the tiles */
 VIDEO_START( f1gpstar )
 {
-	video_start_cischeat(machine);
+	VIDEO_START_CALL(cischeat);
 
  	megasys1_bits_per_color_code = 4;
 }
 
 VIDEO_START( bigrun )
 {
-	video_start_f1gpstar(machine);
+	VIDEO_START_CALL(f1gpstar);
 }
 
 
diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c
index a638b27bb1b..9fbc2d3393f 100644
--- a/src/mame/video/cps1.c
+++ b/src/mame/video/cps1.c
@@ -1139,7 +1139,7 @@ static VIDEO_START( cps )
 {
 	int i;
 
-    machine_reset_cps(machine);
+    MACHINE_RESET_CALL(cps);
 
 	cps1_bg_tilemap[0] = tilemap_create(get_tile0_info,tilemap0_scan,TILEMAP_TYPE_PEN, 8, 8,64,64);
 	cps1_bg_tilemap[1] = tilemap_create(get_tile1_info,tilemap1_scan,TILEMAP_TYPE_PEN,16,16,64,64);
@@ -1201,7 +1201,7 @@ static VIDEO_START( cps )
 VIDEO_START( cps1 )
 {
     cps_version=1;
-    video_start_cps(machine);
+    VIDEO_START_CALL(cps);
 }
 
 VIDEO_START( cps2 )
@@ -1210,7 +1210,7 @@ VIDEO_START( cps2 )
     {
         cps_version=2;
     }
-    video_start_cps(machine);
+    VIDEO_START_CALL(cps);
 }
 
 /***************************************************************************
diff --git a/src/mame/video/dec0.c b/src/mame/video/dec0.c
index 1cd4874fdc9..8d4b9e29db3 100644
--- a/src/mame/video/dec0.c
+++ b/src/mame/video/dec0.c
@@ -713,7 +713,7 @@ VIDEO_START( dec0_nodma )
 
 VIDEO_START( dec0 )
 {
-	video_start_dec0_nodma(machine);
+	VIDEO_START_CALL(dec0_nodma);
 	dec0_spriteram=auto_malloc(0x800);
 }
 
diff --git a/src/mame/video/dkong.c b/src/mame/video/dkong.c
index a15c411dfae..57bb1a47973 100644
--- a/src/mame/video/dkong.c
+++ b/src/mame/video/dkong.c
@@ -886,7 +886,7 @@ VIDEO_START( dkong )
 {
 	dkong_state *state = machine->driver_data;
 
-	video_start_dkong_base(machine);
+	VIDEO_START_CALL(dkong_base);
 
 	switch (state->hardware_type)
 	{
diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c
index 07c79d5d260..249814ab921 100644
--- a/src/mame/video/dynax.c
+++ b/src/mame/video/dynax.c
@@ -771,7 +771,7 @@ VIDEO_START( hnoridur )
 
 VIDEO_START( mcnpshnt )
 {
-	video_start_hnoridur(machine);
+	VIDEO_START_CALL(hnoridur);
 	priority_table = priority_mcnpshnt;
 }
 
@@ -826,7 +826,7 @@ VIDEO_START( mjdialq2 )
 
 VIDEO_START( mjelctrn )
 {
-	video_start_hnoridur(machine);
+	VIDEO_START_CALL(hnoridur);
 
 	priority_table = priority_mjelctrn;
 	update_irq_func = mjelctrn_update_irq;
@@ -834,7 +834,7 @@ VIDEO_START( mjelctrn )
 
 VIDEO_START( neruton )
 {
-	video_start_hnoridur(machine);
+	VIDEO_START_CALL(hnoridur);
 
 //  priority_table = priority_mjelctrn;
 	update_irq_func = neruton_update_irq;
@@ -1256,8 +1256,8 @@ static mame_bitmap *framebuffer;
 
 VIDEO_START(htengoku)
 {
-	video_start_ddenlovr(machine);
-	video_start_hnoridur(machine);
+	VIDEO_START_CALL(ddenlovr);
+	VIDEO_START_CALL(hnoridur);
 	framebuffer = auto_bitmap_alloc(machine->screen[0].width,machine->screen[0].height,machine->screen[0].format);
 }
 
@@ -1266,7 +1266,7 @@ VIDEO_EOF(htengoku)
 	int layer,x,y;
 
 	// render the layers, one by one, "dynax.c" style. Then convert the pixmaps to "ddenlovr.c"
-	// format and let video_eof_ddenlovr do the final compositing (priorities + palettes)
+	// format and let VIDEO_EOF(ddenlovr) do the final compositing (priorities + palettes)
 	for (layer = 0; layer < 4; layer++)
 	{
 		fillbitmap(framebuffer,0,&machine->screen[0].visarea);
@@ -1276,5 +1276,5 @@ VIDEO_EOF(htengoku)
 			for (x=0; x < 512; x++)
 				ddenlovr_pixmap[3-layer][y*512+x] = (UINT8)(*BITMAP_ADDR16(framebuffer, y,x));
 	}
-	video_eof_ddenlovr(machine);
+	VIDEO_EOF_CALL(ddenlovr);
 }
diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c
index b2d32f82ddb..02c56aa3085 100644
--- a/src/mame/video/exerion.c
+++ b/src/mame/video/exerion.c
@@ -163,7 +163,7 @@ VIDEO_START( exerion )
 		}
 	}
 
-	video_start_generic(machine);
+	VIDEO_START_CALL(generic);
 }
 
 
diff --git a/src/mame/video/fcombat.c b/src/mame/video/fcombat.c
index a22d6346bdb..249d1644eeb 100644
--- a/src/mame/video/fcombat.c
+++ b/src/mame/video/fcombat.c
@@ -116,7 +116,7 @@ PALETTE_INIT( fcombat )
 VIDEO_START( fcombat )
 {
 	bgmap = tilemap_create(get_bg_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN, 16, 16,32*8*2,32);
-	video_start_generic(machine);
+	VIDEO_START_CALL(generic);
 }
 
 
diff --git a/src/mame/video/flstory.c b/src/mame/video/flstory.c
index b966b370b9a..abf643d0ce1 100644
--- a/src/mame/video/flstory.c
+++ b/src/mame/video/flstory.c
@@ -54,7 +54,7 @@ VIDEO_START( flstory )
 
 	paletteram = auto_malloc(0x200);
 	paletteram_2 = auto_malloc(0x200);
-	video_start_generic(machine);
+	VIDEO_START_CALL(generic);
 }
 
 VIDEO_START( victnine )
@@ -64,7 +64,7 @@ VIDEO_START( victnine )
 
 	paletteram = auto_malloc(0x200);
 	paletteram_2 = auto_malloc(0x200);
-	video_start_generic(machine);
+	VIDEO_START_CALL(generic);
 }
 
 WRITE8_HANDLER( flstory_videoram_w )
diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c
index e1c71d18e40..88ec8fada0a 100644
--- a/src/mame/video/fromance.c
+++ b/src/mame/video/fromance.c
@@ -153,13 +153,13 @@ VIDEO_START( nekkyoku )
 
 VIDEO_START( pipedrm )
 {
-	video_start_fromance(machine);
+	VIDEO_START_CALL(fromance);
 	scrolly_ofs = 0x00;
 }
 
 VIDEO_START( hatris )
 {
-	video_start_fromance(machine);
+	VIDEO_START_CALL(fromance);
 	scrollx_ofs = 0xB9;
 	scrolly_ofs = 0x00;
 }
diff --git a/src/mame/video/galaxian.c b/src/mame/video/galaxian.c
index eaa770e0391..414da51de2c 100644
--- a/src/mame/video/galaxian.c
+++ b/src/mame/video/galaxian.c
@@ -224,7 +224,7 @@ PALETTE_INIT( galaxian )
 
 PALETTE_INIT( scramble )
 {
-	palette_init_galaxian(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(galaxian);
 
 
 	/* blue background - 390 ohm resistor */
@@ -233,7 +233,7 @@ PALETTE_INIT( scramble )
 
 PALETTE_INIT( moonwar )
 {
-	palette_init_scramble(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(scramble);
 
 
 	/* wire mod to connect the bullet blue output to the 220 ohm resistor */
@@ -245,7 +245,7 @@ PALETTE_INIT( turtles )
 	int i;
 
 
-	palette_init_galaxian(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(galaxian);
 
 
 	/*  The background color generator is connected this way:
@@ -269,7 +269,7 @@ PALETTE_INIT( stratgyx )
 	int i;
 
 
-	palette_init_galaxian(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(galaxian);
 
 
 	/*  The background color generator is connected this way:
@@ -290,7 +290,7 @@ PALETTE_INIT( stratgyx )
 
 PALETTE_INIT( frogger )
 {
-	palette_init_galaxian(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(galaxian);
 
 
 	/* blue background - 470 ohm resistor */
@@ -384,7 +384,7 @@ PALETTE_INIT( minefld )
 	int i;
 
 
-	palette_init_galaxian(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(galaxian);
 
 
 	/* set up background colors */
@@ -415,7 +415,7 @@ PALETTE_INIT( rescue )
 	int i;
 
 
-	palette_init_galaxian(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(galaxian);
 
 
 	/* set up background colors */
@@ -436,7 +436,7 @@ PALETTE_INIT( mariner )
 	int i;
 
 
-	palette_init_galaxian(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(galaxian);
 
 
 	/* set up background colors */
@@ -465,7 +465,7 @@ PALETTE_INIT( dambustr )
 {
 	int i;
 
-	palette_init_galaxian(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(galaxian);
 
 
 	/*
@@ -559,7 +559,7 @@ VIDEO_START( galaxian_plain )
 
 VIDEO_START( galaxian )
 {
-	video_start_galaxian_plain(machine);
+	VIDEO_START_CALL(galaxian_plain);
 
 	draw_stars = galaxian_draw_stars;
 
@@ -568,7 +568,7 @@ VIDEO_START( galaxian )
 
 VIDEO_START( gmgalax )
 {
-	video_start_galaxian(machine);
+	VIDEO_START_CALL(galaxian);
 
 	modify_charcode   = gmgalax_modify_charcode;
 	modify_spritecode = gmgalax_modify_spritecode;
@@ -577,7 +577,7 @@ VIDEO_START( gmgalax )
 
 VIDEO_START( mooncrst )
 {
-	video_start_galaxian(machine);
+	VIDEO_START_CALL(galaxian);
 
 	modify_charcode   = mooncrst_modify_charcode;
 	modify_spritecode = mooncrst_modify_spritecode;
@@ -585,7 +585,7 @@ VIDEO_START( mooncrst )
 
 VIDEO_START( mooncrgx )
 {
-	video_start_galaxian(machine);
+	VIDEO_START_CALL(galaxian);
 
 	modify_charcode   = mooncrgx_modify_charcode;
 	modify_spritecode = mooncrgx_modify_spritecode;
@@ -593,7 +593,7 @@ VIDEO_START( mooncrgx )
 
 VIDEO_START( moonqsr )
 {
-	video_start_galaxian(machine);
+	VIDEO_START_CALL(galaxian);
 
 	modify_charcode   = moonqsr_modify_charcode;
 	modify_spritecode = moonqsr_modify_spritecode;
@@ -601,7 +601,7 @@ VIDEO_START( moonqsr )
 
 VIDEO_START( mshuttle )
 {
-	video_start_galaxian(machine);
+	VIDEO_START_CALL(galaxian);
 
 	modify_charcode   = mshuttle_modify_charcode;
 	modify_spritecode = mshuttle_modify_spritecode;
@@ -609,7 +609,7 @@ VIDEO_START( mshuttle )
 
 VIDEO_START( pisces )
 {
-	video_start_galaxian(machine);
+	VIDEO_START_CALL(galaxian);
 
 	modify_charcode   = pisces_modify_charcode;
 	modify_spritecode = pisces_modify_spritecode;
@@ -617,14 +617,14 @@ VIDEO_START( pisces )
 
 VIDEO_START( gteikob2 )
 {
-	video_start_pisces(machine);
+	VIDEO_START_CALL(pisces);
 
 	draw_bullets = gteikob2_draw_bullets;
 }
 
 VIDEO_START( batman2 )
 {
-	video_start_galaxian(machine);
+	VIDEO_START_CALL(galaxian);
 
 	modify_charcode   = batman2_modify_charcode;
 	modify_spritecode = batman2_modify_spritecode;
@@ -633,7 +633,7 @@ VIDEO_START( batman2 )
 
 VIDEO_START( scramble )
 {
-	video_start_galaxian_plain(machine);
+	VIDEO_START_CALL(galaxian_plain);
 
 	/* FIXME: This most probably needs to be adjusted
      * again when RAW video params are added to scramble
@@ -663,21 +663,21 @@ VIDEO_START( sfx )
 
 VIDEO_START( turtles )
 {
-	video_start_galaxian_plain(machine);
+	VIDEO_START_CALL(galaxian_plain);
 
 	draw_background = turtles_draw_background;
 }
 
 VIDEO_START( theend )
 {
-	video_start_galaxian(machine);
+	VIDEO_START_CALL(galaxian);
 
 	draw_bullets = theend_draw_bullets;
 }
 
 VIDEO_START( darkplnt )
 {
-	video_start_galaxian_plain(machine);
+	VIDEO_START_CALL(galaxian_plain);
 
 	tilemap_set_scrolldx(bg_tilemap, 0, 0);
 	draw_bullets = darkplnt_draw_bullets;
@@ -685,7 +685,7 @@ VIDEO_START( darkplnt )
 
 VIDEO_START( rescue )
 {
-	video_start_scramble(machine);
+	VIDEO_START_CALL(scramble);
 
 	draw_stars = rescue_draw_stars;
 
@@ -694,7 +694,7 @@ VIDEO_START( rescue )
 
 VIDEO_START( minefld )
 {
-	video_start_scramble(machine);
+	VIDEO_START_CALL(scramble);
 
 	draw_stars = rescue_draw_stars;
 
@@ -703,21 +703,21 @@ VIDEO_START( minefld )
 
 VIDEO_START( stratgyx )
 {
-	video_start_galaxian_plain(machine);
+	VIDEO_START_CALL(galaxian_plain);
 
 	draw_background = stratgyx_draw_background;
 }
 
 VIDEO_START( ckongs )
 {
-	video_start_scramble(machine);
+	VIDEO_START_CALL(scramble);
 
 	modify_spritecode = mshuttle_modify_spritecode;
 }
 
 VIDEO_START( calipso )
 {
-	video_start_galaxian_plain(machine);
+	VIDEO_START_CALL(galaxian_plain);
 
 	draw_bullets = scramble_draw_bullets;
 
@@ -728,7 +728,7 @@ VIDEO_START( calipso )
 
 VIDEO_START( mariner )
 {
-	video_start_galaxian_plain(machine);
+	VIDEO_START_CALL(galaxian_plain);
 
 	draw_stars = mariner_draw_stars;
 
@@ -741,7 +741,7 @@ VIDEO_START( mariner )
 
 VIDEO_START( froggers )
 {
-	video_start_galaxian_plain(machine);
+	VIDEO_START_CALL(galaxian_plain);
 
 	draw_background = frogger_draw_background;
 	modify_color = frogger_modify_color;
@@ -749,14 +749,14 @@ VIDEO_START( froggers )
 
 VIDEO_START( frogger )
 {
-	video_start_froggers(machine);
+	VIDEO_START_CALL(froggers);
 
 	modify_ypos = frogger_modify_ypos;
 }
 
 VIDEO_START( jumpbug )
 {
-	video_start_scramble(machine);
+	VIDEO_START_CALL(scramble);
 
 	draw_stars = jumpbug_draw_stars;
 
@@ -766,7 +766,7 @@ VIDEO_START( jumpbug )
 
 VIDEO_START( azurian )
 {
-	video_start_galaxian_plain(machine);
+	VIDEO_START_CALL(galaxian_plain);
 
 	draw_stars = galaxian_draw_stars;
 	draw_bullets = scramble_draw_bullets; /* Shots are yellow like in Scramble */
@@ -774,7 +774,7 @@ VIDEO_START( azurian )
 
 VIDEO_START( mimonkey )
 {
-	video_start_scramble(machine);
+	VIDEO_START_CALL(scramble);
 
 	modify_charcode   = mimonkey_modify_charcode;
 	modify_spritecode = mimonkey_modify_spritecode;
@@ -782,7 +782,7 @@ VIDEO_START( mimonkey )
 
 VIDEO_START( dkongjrm )
 {
-	video_start_galaxian_plain(machine);
+	VIDEO_START_CALL(galaxian_plain);
 
 	modify_charcode   = pisces_modify_charcode;
 	modify_spritecode = dkongjrm_modify_spritecode;
@@ -792,7 +792,7 @@ VIDEO_START( dkongjrm )
 
 VIDEO_START( newsin7 )
 {
-	video_start_scramble(machine);
+	VIDEO_START_CALL(scramble);
 
 	spritevisiblearea      = &_spritevisibleareaflipx;
 	spritevisibleareaflipx = &_spritevisiblearea;
@@ -800,7 +800,7 @@ VIDEO_START( newsin7 )
 
 VIDEO_START( scorpion )
 {
-	video_start_scramble(machine);
+	VIDEO_START_CALL(scramble);
 
 	modify_spritecode = batman2_modify_spritecode;
 }
@@ -817,7 +817,7 @@ static void rockclim_modify_spritecode(UINT8 *spriteram,int *code,int *flipx,int
 
 VIDEO_START( rockclim )
 {
-	video_start_galaxian(machine);
+	VIDEO_START_CALL(galaxian);
 	rockclim_tilemap = tilemap_create(rockclim_get_tile_info,tilemap_scan_rows,TILEMAP_TYPE_PEN,8,8,64,32);
 	draw_background = rockclim_draw_background;
 	modify_charcode = mooncrst_modify_charcode;
@@ -976,7 +976,7 @@ VIDEO_START( racknrol )
 
 VIDEO_START( bongo )
 {
-	video_start_galaxian_plain(machine);
+	VIDEO_START_CALL(galaxian_plain);
 
 	modify_spritecode = batman2_modify_spritecode;
 }
@@ -1003,7 +1003,7 @@ static TILE_GET_INFO( dambustr_get_tile_info2 )
 
 VIDEO_START( dambustr )
 {
-	video_start_galaxian(machine);
+	VIDEO_START_CALL(galaxian);
 
 	dambustr_bg_split_line = 0;
 	dambustr_bg_color_1 = 0;
diff --git a/src/mame/video/galpani2.c b/src/mame/video/galpani2.c
index bfcf293ebdd..7a64aeeeb1d 100644
--- a/src/mame/video/galpani2.c
+++ b/src/mame/video/galpani2.c
@@ -135,7 +135,7 @@ VIDEO_START( galpani2 )
 	galpani2_bg8_bitmap_0 = auto_bitmap_alloc(512, 256, BITMAP_FORMAT_INDEXED16);
 	galpani2_bg8_bitmap_1 = auto_bitmap_alloc(512, 256, BITMAP_FORMAT_INDEXED16);
 
-	video_start_kaneko16_sprites(machine);
+	VIDEO_START_CALL(kaneko16_sprites);
 }
 
 
diff --git a/src/mame/video/genesis.c b/src/mame/video/genesis.c
index 440621a3b61..b8b1b01ff85 100644
--- a/src/mame/video/genesis.c
+++ b/src/mame/video/genesis.c
@@ -11,8 +11,8 @@
 #include "genesis.h"
 
 /* in video/segasyse.c */
-void megaplay_start_video_normal(running_machine *machine);
-void megaplay_update_video_normal(running_machine *machine, mame_bitmap *bitmap, const rectangle *cliprect );
+VIDEO_START( megaplay_normal );
+VIDEO_UPDATE( megaplay_normal );
 
 static int genesis_screen_number;
 
@@ -272,7 +272,7 @@ VIDEO_UPDATE( segac2 )
 	if (!display_enable)
 		fillbitmap(bitmap, get_black_pen(machine), cliprect);
 	else
-		video_update_genesis(machine, screen, bitmap, cliprect);
+		VIDEO_UPDATE_CALL(genesis);
 	return 0;
 }
 
@@ -290,7 +290,7 @@ VIDEO_UPDATE( megaplay )
 	for (y = cliprect->min_y; y <= cliprect->max_y; y++)
 		drawline(BITMAP_ADDR16(bitmap, y, 0), y, 0);
 
-	megaplay_update_video_normal(machine, bitmap, cliprect);
+	VIDEO_UPDATE_CALL(megaplay_normal);
 
 	return 0;
 }
diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c
index e6cd65beaaa..f4286cf5672 100644
--- a/src/mame/video/goldstar.c
+++ b/src/mame/video/goldstar.c
@@ -28,7 +28,7 @@ VIDEO_START( goldstar )
 {
 //        int i;
 
-	video_start_generic(machine);
+	VIDEO_START_CALL(generic);
 
 	/* the background area is half as high as the screen */
 	tmpbitmap1 = auto_bitmap_alloc(machine->screen[0].width,machine->screen[0].height,machine->screen[0].format);
diff --git a/src/mame/video/jpmimpct.c b/src/mame/video/jpmimpct.c
index ae29710bc9d..22ec9bc205d 100644
--- a/src/mame/video/jpmimpct.c
+++ b/src/mame/video/jpmimpct.c
@@ -147,5 +147,5 @@ VIDEO_START( jpmimpct )
 	state_save_register_global(bt477.command);
 	state_save_register_global(bt477.color);
 
-	video_start_generic_bitmapped(machine);
+	VIDEO_START_CALL(generic_bitmapped);
 }
diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c
index 5d3ab09d63f..4dcfcef4faf 100644
--- a/src/mame/video/kaneko16.c
+++ b/src/mame/video/kaneko16.c
@@ -130,7 +130,7 @@ VIDEO_START( kaneko16_sprites )
 
 VIDEO_START( kaneko16_1xVIEW2 )
 {
-	video_start_kaneko16_sprites(machine);
+	VIDEO_START_CALL(kaneko16_sprites);
 
 	kaneko16_tmap_0 = tilemap_create(	get_tile_info_0, tilemap_scan_rows,
 										TILEMAP_TYPE_PEN, 16,16, 0x20,0x20	);
@@ -176,7 +176,7 @@ VIDEO_START( kaneko16_1xVIEW2 )
 
 VIDEO_START( kaneko16_2xVIEW2 )
 {
-	video_start_kaneko16_1xVIEW2(machine);
+	VIDEO_START_CALL(kaneko16_1xVIEW2);
 
 	kaneko16_tmap_2 = tilemap_create(	get_tile_info_2, tilemap_scan_rows,
 										TILEMAP_TYPE_PEN, 16,16, 0x20,0x20	);
@@ -216,7 +216,7 @@ VIDEO_START( kaneko16_2xVIEW2 )
 
 VIDEO_START( sandscrp_1xVIEW2 )
 {
-	video_start_kaneko16_1xVIEW2(machine);
+	VIDEO_START_CALL(kaneko16_1xVIEW2);
 	pandora_start(0,0,0);
 
 	tilemap_set_scrolldy( kaneko16_tmap_0, 0, 256 - 1 );
@@ -281,12 +281,12 @@ VIDEO_START( berlwall )
 			*BITMAP_ADDR16(kaneko16_bg15_bitmap, y, sx * 256 + x) = machine->pens[2048 + ((g << 10) | (r << 5) | b)];
 	  }
 
-	video_start_kaneko16_1xVIEW2(machine);
+	VIDEO_START_CALL(kaneko16_1xVIEW2);
 }
 
 VIDEO_START( galsnew )
 {
-	video_start_kaneko16_1xVIEW2(machine);
+	VIDEO_START_CALL(kaneko16_1xVIEW2);
 }
 
 /***************************************************************************
@@ -948,7 +948,7 @@ static void kaneko16_fill_bitmap(running_machine *machine, mame_bitmap *bitmap,
 		fillbitmap(bitmap,machine->pens[0],cliprect);
 }
 
-static void kaneko16_video_update_common(running_machine *machine, mame_bitmap *bitmap, const rectangle *cliprect)
+static VIDEO_UPDATE( common )
 {
 	int i;
 
@@ -962,6 +962,8 @@ static void kaneko16_video_update_common(running_machine *machine, mame_bitmap *
 		kaneko16_render_first_tilemap_chip(machine,bitmap,cliprect,i);
 		kaneko16_render_second_tilemap_chip(machine,bitmap,cliprect,i);
 	}
+
+	return 0;
 }
 
 VIDEO_UPDATE(berlwall)
@@ -972,7 +974,7 @@ VIDEO_UPDATE(berlwall)
 	// if the display is disabled, do nothing?
 	if (!kaneko16_disp_enable) return 0;
 
-	kaneko16_video_update_common(machine,bitmap,cliprect);
+	VIDEO_UPDATE_CALL(common);
 	kaneko16_render_sprites(machine,bitmap,cliprect);
 	return 0;
 }
@@ -986,7 +988,7 @@ VIDEO_UPDATE( kaneko16 )
 	// if the display is disabled, do nothing?
 	if (!kaneko16_disp_enable) return 0;
 
-	kaneko16_video_update_common(machine,bitmap,cliprect);
+	VIDEO_UPDATE_CALL(common);
 	kaneko16_render_sprites(machine,bitmap,cliprect);
 	return 0;
 }
@@ -1033,7 +1035,7 @@ VIDEO_UPDATE( galsnew )
 	// if the display is disabled, do nothing?
 	if (!kaneko16_disp_enable) return 0;
 
-	kaneko16_video_update_common(machine,bitmap,cliprect);
+	VIDEO_UPDATE_CALL(common);
 
 	kaneko16_render_sprites(machine,bitmap,cliprect);
 	return 0;
@@ -1047,7 +1049,7 @@ VIDEO_UPDATE( sandscrp )
 	// if the display is disabled, do nothing?
 	if (!kaneko16_disp_enable) return 0;
 
-	kaneko16_video_update_common(machine,bitmap,cliprect);
+	VIDEO_UPDATE_CALL(common);
 
 	// copy sprite bitmap to screen
 	pandora_update(machine,bitmap,cliprect);
diff --git a/src/mame/video/lasso.c b/src/mame/video/lasso.c
index 6522cc59e12..a2cd8508431 100644
--- a/src/mame/video/lasso.c
+++ b/src/mame/video/lasso.c
@@ -95,7 +95,7 @@ PALETTE_INIT( wwjgtin )
 {
 	int color, pen;
 
-	palette_init_lasso(machine,colortable,color_prom);
+	PALETTE_INIT_CALL(lasso);
 
 	for( color = 0; color < 0x10; color++ )
 		for( pen = 0; pen < 0x10; pen++ )
diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c
index 9388d74a83f..ca77bc217e7 100644
--- a/src/mame/video/leland.c
+++ b/src/mame/video/leland.c
@@ -71,7 +71,7 @@ VIDEO_START( leland )
 VIDEO_START( ataxx )
 {
 	/* first do the standard stuff */
-	video_start_leland(machine);
+	VIDEO_START_CALL(leland);
 
 	/* allocate memory */
 	ataxx_qram = auto_malloc(QRAM_SIZE);
diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c
index dc2bc216958..7dccee77459 100644
--- a/src/mame/video/lwings.c
+++ b/src/mame/video/lwings.c
@@ -112,7 +112,7 @@ VIDEO_START( trojan )
 
 VIDEO_START( avengers )
 {
-	video_start_trojan(machine);
+	VIDEO_START_CALL(trojan);
 	bAvengersHardware = 1;
 }
 
diff --git a/src/mame/video/m72.c b/src/mame/video/m72.c
index 86dfe810553..6011361f95f 100644
--- a/src/mame/video/m72.c
+++ b/src/mame/video/m72.c
@@ -173,7 +173,7 @@ VIDEO_START( rtype2 )
 
 VIDEO_START( poundfor )
 {
-	video_start_rtype2(machine);
+	VIDEO_START_CALL(rtype2);
 
 	tilemap_set_scrolldx(fg_tilemap,6,0);
 	tilemap_set_scrolldx(bg_tilemap,6,0);
diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c
index 36ba7068323..b8beed934bf 100644
--- a/src/mame/video/metro.c
+++ b/src/mame/video/metro.c
@@ -459,7 +459,7 @@ VIDEO_START( metro_14300 )
 
 VIDEO_START( blzntrnd )
 {
-	video_start_metro_14220(machine);
+	VIDEO_START_CALL(metro_14220);
 
 	has_zoom = 1;
 
@@ -476,7 +476,7 @@ VIDEO_START( blzntrnd )
 
 VIDEO_START( gstrik2 )
 {
-	video_start_metro_14220(machine);
+	VIDEO_START_CALL(metro_14220);
 
 	has_zoom = 1;
 
diff --git a/src/mame/video/midtunit.c b/src/mame/video/midtunit.c
index 12aa4ced849..dbeedcefa34 100644
--- a/src/mame/video/midtunit.c
+++ b/src/mame/video/midtunit.c
@@ -107,14 +107,14 @@ VIDEO_START( midtunit )
 
 VIDEO_START( midwunit )
 {
-	video_start_midtunit(machine);
+	VIDEO_START_CALL(midtunit);
 	midtunit_gfx_rom_large = 1;
 }
 
 
 VIDEO_START( midxunit )
 {
-	video_start_midtunit(machine);
+	VIDEO_START_CALL(midtunit);
 	midtunit_gfx_rom_large = 1;
 	videobank_select = 1;
 }
diff --git a/src/mame/video/midyunit.c b/src/mame/video/midyunit.c
index e5836179092..6514463218f 100644
--- a/src/mame/video/midyunit.c
+++ b/src/mame/video/midyunit.c
@@ -100,7 +100,7 @@ VIDEO_START( midyunit_4bit )
 {
 	int i;
 
-	video_start_common(machine);
+	VIDEO_START_CALL(common);
 
 	/* init for 4-bit */
 	for (i = 0; i < 65536; i++)
@@ -113,7 +113,7 @@ VIDEO_START( midyunit_6bit )
 {
 	int i;
 
-	video_start_common(machine);
+	VIDEO_START_CALL(common);
 
 	/* init for 6-bit */
 	for (i = 0; i < 65536; i++)
@@ -124,7 +124,7 @@ VIDEO_START( midyunit_6bit )
 
 VIDEO_START( mkyawdim )
 {
-	video_start_midyunit_6bit(machine);
+	VIDEO_START_CALL(midyunit_6bit);
 	yawdim_dma = 1;
 }
 
@@ -133,7 +133,7 @@ VIDEO_START( midzunit )
 {
 	int i;
 
-	video_start_common(machine);
+	VIDEO_START_CALL(common);
 
 	/* init for 8-bit */
 	for (i = 0; i < 65536; i++)
diff --git a/src/mame/video/n8080.c b/src/mame/video/n8080.c
index eb37bd81fa5..400b8752d94 100644
--- a/src/mame/video/n8080.c
+++ b/src/mame/video/n8080.c
@@ -46,7 +46,7 @@ PALETTE_INIT( helifire )
 {
 	int i;
 
-	palette_init_n8080(machine, NULL, NULL);
+	PALETTE_INIT_CALL(n8080);
 
 	for (i = 0; i < 0x100; i++)
 	{
diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c
index 270c2ebc820..ea5b280d6b1 100644
--- a/src/mame/video/namcos22.c
+++ b/src/mame/video/namcos22.c
@@ -2222,7 +2222,7 @@ static void namcos22_exit(running_machine *machine)
 	poly_free(poly);
 }
 
-static void video_start_common(running_machine *machine)
+static VIDEO_START( common )
 {
 	bgtilemap = tilemap_create( TextTilemapGetInfo,tilemap_scan_rows,TILEMAP_TYPE_PEN,16,16,64,64 );
 		tilemap_set_transparent_pen( bgtilemap, 0xf );
@@ -2249,7 +2249,7 @@ static void video_start_common(running_machine *machine)
 VIDEO_START( namcos22 )
 {
    mbSuperSystem22 = 0;
-   video_start_common(machine);
+   VIDEO_START_CALL(common);
 }
 
 VIDEO_START( namcos22s )
@@ -2259,7 +2259,7 @@ VIDEO_START( namcos22s )
    namcos22_czram[1] = auto_malloc( 0x200 );
    namcos22_czram[2] = auto_malloc( 0x200 );
    namcos22_czram[3] = auto_malloc( 0x200 );
-   video_start_common(machine);
+   VIDEO_START_CALL(common);
 }
 
 VIDEO_UPDATE( namcos22s )
diff --git a/src/mame/video/nbmj8688.c b/src/mame/video/nbmj8688.c
index 280e147def8..a79c2c50f43 100644
--- a/src/mame/video/nbmj8688.c
+++ b/src/mame/video/nbmj8688.c
@@ -713,7 +713,7 @@ VIDEO_UPDATE( mbmj8688_LCD )
 {
 	int x, y, b;
 
-	if(screen==0) video_update_mbmj8688(machine,screen,bitmap,cliprect);
+	if(screen==0) VIDEO_UPDATE_CALL(mbmj8688);
 
 	if (screen==1)
 	{
diff --git a/src/mame/video/ninjaw.c b/src/mame/video/ninjaw.c
index 33bb876ec1c..cb20371ccdc 100644
--- a/src/mame/video/ninjaw.c
+++ b/src/mame/video/ninjaw.c
@@ -48,7 +48,7 @@ static VIDEO_START( ninjaw_core )
 VIDEO_START( ninjaw )
 {
 	taito_hide_pixels = 22;
-	video_start_ninjaw_core(machine);
+	VIDEO_START_CALL(ninjaw_core);
 }
 
 /************************************************************
diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c
index df6166ef5a1..c490fd2aa83 100644
--- a/src/mame/video/nmk16.c
+++ b/src/mame/video/nmk16.c
@@ -754,7 +754,7 @@ VIDEO_UPDATE( gunnail )
 	}
 	tilemap_set_scrolly(bg_tilemap,0,gunnail_scrolly);
 
-	video_update_macross(machine,screen,bitmap,cliprect);
+	VIDEO_UPDATE_CALL(macross);
 	return 0;
 }
 
diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c
index c1ef8d7bc99..253699fc26e 100644
--- a/src/mame/video/nycaptor.c
+++ b/src/mame/video/nycaptor.c
@@ -82,7 +82,7 @@ VIDEO_START( nycaptor )
 	paletteram = auto_malloc(0x200);
 	paletteram_2 = auto_malloc(0x200);
 	tilemap_set_scroll_cols(bg_tilemap,32);
-	video_start_generic(machine);
+	VIDEO_START_CALL(generic);
 }
 
 WRITE8_HANDLER( nycaptor_videoram_w )
diff --git a/src/mame/video/pitnrun.c b/src/mame/video/pitnrun.c
index 87ee099612b..08e2b11b1ee 100644
--- a/src/mame/video/pitnrun.c
+++ b/src/mame/video/pitnrun.c
@@ -185,7 +185,7 @@ VIDEO_START(pitnrun)
 	tmp_bitmap[2] = auto_bitmap_alloc(128,128,machine->screen[0].format);
 	tmp_bitmap[3] = auto_bitmap_alloc(128,128,machine->screen[0].format);
 	pitnrun_spotlights();
-	video_start_generic(machine);
+	VIDEO_START_CALL(generic);
 }
 
 static void draw_sprites(running_machine *machine, mame_bitmap *bitmap, const rectangle *cliprect )
diff --git a/src/mame/video/quasar.c b/src/mame/video/quasar.c
index faa2f18d1b9..dc99546cd4a 100644
--- a/src/mame/video/quasar.c
+++ b/src/mame/video/quasar.c
@@ -126,7 +126,7 @@ VIDEO_START( quasar )
 	effect_bitmap = auto_bitmap_alloc(machine->screen[0].width,machine->screen[0].height,machine->screen[0].format);
 	background_bitmap = auto_bitmap_alloc(machine->screen[0].width, machine->screen[0].height, machine->screen[0].format);
 
-	video_start_cvs(machine);
+	VIDEO_START_CALL(cvs);
 }
 
 VIDEO_UPDATE( quasar )
diff --git a/src/mame/video/segag80v.c b/src/mame/video/segag80v.c
index 42634261adf..35f3a60dac3 100644
--- a/src/mame/video/segag80v.c
+++ b/src/mame/video/segag80v.c
@@ -331,13 +331,13 @@ VIDEO_START( sega )
 	min_x =machine->screen[0].visarea.min_x;
 	min_y =machine->screen[0].visarea.min_y;
 
-	video_start_vector(machine);
+	VIDEO_START_CALL(vector);
 }
 
 
 VIDEO_UPDATE( sega )
 {
 	sega_generate_vector_list();
-	video_update_vector(machine,screen,bitmap,cliprect);
+	VIDEO_UPDATE_CALL(vector);
 	return 0;
 }
diff --git a/src/mame/video/segasyse.c b/src/mame/video/segasyse.c
index cb0f6864d6a..d43ef9f93f2 100644
--- a/src/mame/video/segasyse.c
+++ b/src/mame/video/segasyse.c
@@ -53,7 +53,7 @@ static void draw_8pix_sprite(UINT8 *dest, UINT8 chip, UINT16 tile, UINT8 line);
 *******************************************************************************/
 
 /* starts vdp for bios screen only */
-void megaplay_start_video_normal(running_machine *machine)
+VIDEO_START( megaplay_normal )
 {
 	palette_base = 0x40;
 
@@ -62,7 +62,7 @@ void megaplay_start_video_normal(running_machine *machine)
 	cache_bitmap = auto_malloc( (16+256+16) * 192); /* 16 pixels either side to simplify drawing */
 }
 
-void megaplay_update_video_normal(running_machine *machine, mame_bitmap *bitmap, const rectangle *cliprect )
+VIDEO_UPDATE( megaplay_normal )
 {
 	int miny = (cliprect->min_y < 16) ? 16 : cliprect->min_y;
 	int maxy = (cliprect->max_y > 16+192-1) ? 16+192-1 : cliprect->max_y;
@@ -76,6 +76,7 @@ void megaplay_update_video_normal(running_machine *machine, mame_bitmap *bitmap,
 	for (i = miny;i <= maxy;i++)
 		draw_scanline8(bitmap,32,i,256,&cache_bitmap[(i-16) * (16+256+16) +24],&machine->pens[palette_base],0);
 
+	return 0;
 }
 
 /*******************************************************************************
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index 70a191e8193..2665af69f03 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -537,7 +537,7 @@ VIDEO_START( seta_no_layers )
 
 VIDEO_START( oisipuzl_2_layers )
 {
-	video_start_seta_2_layers(machine);
+	VIDEO_START_CALL(seta_2_layers);
 	tilemaps_flip = 1;
 }
 
diff --git a/src/mame/video/seta2.c b/src/mame/video/seta2.c
index 1f33316dd4f..89c76900d54 100644
--- a/src/mame/video/seta2.c
+++ b/src/mame/video/seta2.c
@@ -367,7 +367,7 @@ VIDEO_START( seta2 )
 
 VIDEO_START( seta2_offset )
 {
-	video_start_seta2(machine);
+	VIDEO_START_CALL(seta2);
 
 	yoffset = 0x10;
 }
diff --git a/src/mame/video/skychut.c b/src/mame/video/skychut.c
index 8fdb5cf224c..bd46afe0f56 100644
--- a/src/mame/video/skychut.c
+++ b/src/mame/video/skychut.c
@@ -97,7 +97,7 @@ VIDEO_START( iremm10 )
 	for (i=0;i<32*8;i++)
 		extyoffs[i] = i*8;
 
-	video_start_generic(machine);
+	VIDEO_START_CALL(generic);
 
 	tx_tilemap = tilemap_create(get_tile_info,tilemap_scan,TILEMAP_TYPE_COLORTABLE,8,8,32,32);
 	tilemap_set_transparent_pen(tx_tilemap, 0x07);
@@ -120,7 +120,7 @@ VIDEO_START( iremm15 )
 
 	decodegfx(machine->gfx[0], state->chargen,0,256);
 
-	video_start_generic(machine);
+	VIDEO_START_CALL(generic);
 
 	tx_tilemap = tilemap_create(get_tile_info,tilemap_scan,TILEMAP_TYPE_PEN,8,8,32,32);
 	tilemap_set_scrolldx(tx_tilemap, 0, 116);
diff --git a/src/mame/video/slapshot.c b/src/mame/video/slapshot.c
index e40f0ac0db2..18aaf975c2e 100644
--- a/src/mame/video/slapshot.c
+++ b/src/mame/video/slapshot.c
@@ -66,7 +66,7 @@ VIDEO_START( slapshot )
 {
 	taito_hide_pixels = 3;
 	taito_sprite_type = 2;
-	video_start_slapshot_core(machine);
+	VIDEO_START_CALL(slapshot_core);
 }
 
 
diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c
index d2fce2723ac..ce0839dbd3b 100644
--- a/src/mame/video/snk.c
+++ b/src/mame/video/snk.c
@@ -36,7 +36,7 @@ int snk_blink_parity = 0;
 PALETTE_INIT( snk_3bpp_shadow )
 {
 	int i;
-	palette_init_RRRR_GGGG_BBBB(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(RRRR_GGGG_BBBB);
 
 	if(!(machine->drv->video_attributes & VIDEO_HAS_SHADOWS))
 		popmessage("driver should use VIDEO_HAS_SHADOWS");
@@ -51,7 +51,7 @@ PALETTE_INIT( snk_3bpp_shadow )
 PALETTE_INIT( snk_4bpp_shadow )
 {
 	int i;
-	palette_init_RRRR_GGGG_BBBB(machine, colortable, color_prom);
+	PALETTE_INIT_CALL(RRRR_GGGG_BBBB);
 
 	if(!(machine->drv->video_attributes & VIDEO_HAS_SHADOWS))
 		popmessage("driver should use VIDEO_HAS_SHADOWS");
diff --git a/src/mame/video/ssv.c b/src/mame/video/ssv.c
index c6cbb126ffc..3191f11b261 100644
--- a/src/mame/video/ssv.c
+++ b/src/mame/video/ssv.c
@@ -199,7 +199,7 @@ VIDEO_START( ssv )
 
 VIDEO_START( eaglshot )
 {
-	video_start_ssv(machine);
+	VIDEO_START_CALL(ssv);
 
 	eaglshot_gfxram		=	(UINT16*)auto_malloc(16 * 0x40000);
 	eaglshot_dirty_tile	=	(char*)auto_malloc(16 * 0x40000 / (16*8));
@@ -221,7 +221,7 @@ WRITE16_HANDLER( gdfs_tmapram_w )
 
 VIDEO_START( gdfs )
 {
-	video_start_ssv(machine);
+	VIDEO_START_CALL(ssv);
 
 	machine->gfx[2]->color_granularity = 64; /* 256 colour sprites with palette selectable on 64 colour boundaries */
 
@@ -936,7 +936,7 @@ VIDEO_UPDATE( eaglshot )
 		}
 	}
 
-	video_update_ssv(machine, screen, bitmap, cliprect);
+	VIDEO_UPDATE_CALL(ssv);
 	return 0;
 }
 
@@ -1107,7 +1107,7 @@ VIDEO_UPDATE( gdfs )
 {
 	int tile, pri;
 
-	video_update_ssv(machine, screen, bitmap, cliprect);
+	VIDEO_UPDATE_CALL(ssv);
 
 	// Decode zooming sprites tiles from ram
 	if (eaglshot_dirty)
diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c
index 046e74e50ee..68e0a9f1566 100644
--- a/src/mame/video/system16.c
+++ b/src/mame/video/system16.c
@@ -885,29 +885,29 @@ VIDEO_START( system18old ){
 		8,8,
 		64*2,32*2 );
 
-	video_start_system16(machine);
+	VIDEO_START_CALL(system16);
 
-			tilemap_set_transparent_pen( foreground2, 0 );
+	tilemap_set_transparent_pen( foreground2, 0 );
 
-			if(sys18_splittab_fg_x){
-				tilemap_set_scroll_rows( foreground , 64 );
-				tilemap_set_scroll_rows( foreground2 , 64 );
-			}
-			if(sys18_splittab_bg_x){
-				tilemap_set_scroll_rows( background , 64 );
-				tilemap_set_scroll_rows( background2 , 64 );
-			}
+	if(sys18_splittab_fg_x){
+		tilemap_set_scroll_rows( foreground , 64 );
+		tilemap_set_scroll_rows( foreground2 , 64 );
+	}
+	if(sys18_splittab_bg_x){
+		tilemap_set_scroll_rows( background , 64 );
+		tilemap_set_scroll_rows( background2 , 64 );
+	}
 
-			sys16_textlayer_lo_min=0;
-			sys16_textlayer_lo_max=0x1f;
-			sys16_textlayer_hi_min=0x20;
-			sys16_textlayer_hi_max=0xff;
+	sys16_textlayer_lo_min=0;
+	sys16_textlayer_lo_max=0x1f;
+	sys16_textlayer_hi_min=0x20;
+	sys16_textlayer_hi_max=0xff;
 
-			sys16_18_mode=1;
-			sys16_bg_priority_mode=3;
-			sys16_fg_priority_mode=3;
-			sys16_bg_priority_value=0x1800;
-			sys16_fg_priority_value=0x2000;
+	sys16_18_mode=1;
+	sys16_bg_priority_mode=3;
+	sys16_fg_priority_mode=3;
+	sys16_bg_priority_value=0x1800;
+	sys16_fg_priority_value=0x2000;
 }
 
 /***************************************************************************/
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index d29bf4a6c8b..f79f5d65290 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -247,7 +247,7 @@ VIDEO_START( taitob_color_order0 )
   b_sp_color_base = 0x40*16;	/*sprites   */
   b_tx_color_base = 0x00;		/*text      */
 
-  video_start_taitob_core(machine);
+  VIDEO_START_CALL(taitob_core);
 }
 
 VIDEO_START( taitob_color_order1 )
@@ -258,7 +258,7 @@ VIDEO_START( taitob_color_order1 )
   b_sp_color_base = 0x80*16;
   b_tx_color_base = 0xc0;
 
-  video_start_taitob_core(machine);
+  VIDEO_START_CALL(taitob_core);
 }
 
 VIDEO_START( taitob_color_order2 )
@@ -269,13 +269,13 @@ VIDEO_START( taitob_color_order2 )
   b_sp_color_base = 0x10*16;
   b_tx_color_base = 0x00;
 
-  video_start_taitob_core(machine);
+  VIDEO_START_CALL(taitob_core);
 }
 
 
 VIDEO_START( hitice )
 {
-  video_start_taitob_color_order0(machine);
+  VIDEO_START_CALL(taitob_color_order0);
 
   pixel_bitmap = auto_bitmap_alloc(1024,512,machine->screen[0].format);
 
diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c
index b532b5264a9..7a55778ab5c 100644
--- a/src/mame/video/tmnt.c
+++ b/src/mame/video/tmnt.c
@@ -767,7 +767,7 @@ VIDEO_UPDATE( tmnt2 )
 			palette_set_shadow_mode(machine, 0);
 	}
 
-	video_update_lgtnfght(machine,screen,bitmap,cliprect);
+	VIDEO_UPDATE_CALL(lgtnfght);
 	return 0;
 }
 
diff --git a/src/mame/video/toaplan2.c b/src/mame/video/toaplan2.c
index c016ba6ece0..ec85acaa4d1 100644
--- a/src/mame/video/toaplan2.c
+++ b/src/mame/video/toaplan2.c
@@ -1517,7 +1517,7 @@ VIDEO_UPDATE( batsugun_1 )
 
 VIDEO_UPDATE( truxton2_0 )
 {
-	video_update_toaplan2_0(machine,screen,bitmap,cliprect);
+	VIDEO_UPDATE_CALL(toaplan2_0);
 	tilemap_draw(bitmap,cliprect,tx_tilemap,0,0);
 	return 0;
 }
diff --git a/src/mame/video/vicdual.c b/src/mame/video/vicdual.c
index 8c8b1761952..5d15189267f 100644
--- a/src/mame/video/vicdual.c
+++ b/src/mame/video/vicdual.c
@@ -143,9 +143,9 @@ VIDEO_UPDATE( vicdual_color )
 VIDEO_UPDATE( vicdual_bw_or_color )
 {
 	if (vicdual_is_cabinet_color())
-		video_update_vicdual_color(machine, screen, bitmap, cliprect);
+		VIDEO_UPDATE_CALL(vicdual_color);
 	else
-		video_update_vicdual_bw(machine, screen, bitmap, cliprect);
+		VIDEO_UPDATE_CALL(vicdual_bw);
 
 	return 0;
 }
diff --git a/src/mame/video/wiz.c b/src/mame/video/wiz.c
index 63b73be709a..3529d4fedbf 100644
--- a/src/mame/video/wiz.c
+++ b/src/mame/video/wiz.c
@@ -37,7 +37,7 @@ static int palette_bank;
 
 VIDEO_START( wiz )
 {
-	video_start_generic(machine);
+	VIDEO_START_CALL(generic);
 
 	state_save_register_global_array(char_bank);
 	state_save_register_global_array(palbank);
diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c
index a1aee8297f5..994889caf59 100644
--- a/src/mame/video/wwfwfest.c
+++ b/src/mame/video/wwfwfest.c
@@ -237,7 +237,7 @@ VIDEO_START( wwfwfest )
 
 VIDEO_START( wwfwfstb )
 {
-	video_start_wwfwfest(machine);
+	VIDEO_START_CALL(wwfwfest);
 
 	sprite_xoff = 2;
 	bg0_dx = bg1_dx[0] = -4;