diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index 00cb819fac0..19a185f3ca7 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -144,7 +144,7 @@ int mame_debug_is_active(void)
     on_vblank - called when a VBLANK hits
 -------------------------------------------------*/
 
-static void on_vblank(running_machine *machine, screen_state *screen, int vblank_state)
+static void on_vblank(running_machine *machine, const device_config *device, int vblank_state)
 {
 	/* if we're configured to stop on VBLANK, break */
 	if (vblank_state && break_on_vblank)
diff --git a/src/emu/sound.c b/src/emu/sound.c
index c30d364d2cb..adf82d3500c 100644
--- a/src/emu/sound.c
+++ b/src/emu/sound.c
@@ -808,7 +808,7 @@ static DEVICE_START( speaker_output )
 static DEVICE_STOP( speaker_output )
 {
 #ifdef MAME_DEBUG
-	speaker_info *info = token;
+	speaker_info *info = device->token;
 
 	/* log the maximum sample values for all speakers */
 	if (info->max_sample > 0)