diff --git a/src/mame/drivers/bartop52.c b/src/mame/drivers/bartop52.c
index 35644c992fb..c43b1c05351 100644
--- a/src/mame/drivers/bartop52.c
+++ b/src/mame/drivers/bartop52.c
@@ -16,7 +16,6 @@
 */
 
 #include "emu.h"
-#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "includes/atari.h"
 #include "sound/speaker.h"
@@ -121,7 +120,7 @@ static MACHINE_CONFIG_START( a5200, bartop52_state )
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu", M6502, FREQ_17_EXACT)
 	MCFG_CPU_PROGRAM_MAP(a5200_mem)
-	MCFG_CPU_VBLANK_INT_HACK(a5200_interrupt, TOTAL_LINES_60HZ)
+	MCFG_TIMER_ADD_SCANLINE("scantimer", a5200_interrupt, "screen", 0, 1)
 
 	/* video hardware */
 	MCFG_SCREEN_ADD("screen", RASTER)
diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c
index 715838362b9..e34df8ba75f 100644
--- a/src/mame/drivers/maxaflex.c
+++ b/src/mame/drivers/maxaflex.c
@@ -11,7 +11,6 @@
 ******************************************************************************/
 
 #include "emu.h"
-#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "cpu/m6805/m6805.h"
 #include "includes/atari.h"
@@ -401,7 +400,7 @@ static MACHINE_CONFIG_START( a600xl, maxaflex_state )
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu", M6502, FREQ_17_EXACT)
 	MCFG_CPU_PROGRAM_MAP(a600xl_mem)
-	MCFG_CPU_VBLANK_INT_HACK(a800xl_interrupt, TOTAL_LINES_60HZ)
+	MCFG_TIMER_ADD_SCANLINE("scantimer", a800xl_interrupt, "screen", 0, 1)
 
 	MCFG_CPU_ADD("mcu", M68705, 3579545)
 	MCFG_CPU_PROGRAM_MAP(mcu_mem)
diff --git a/src/mame/includes/atari.h b/src/mame/includes/atari.h
index 727eb51a6d4..882d5185641 100644
--- a/src/mame/includes/atari.h
+++ b/src/mame/includes/atari.h
@@ -590,10 +590,10 @@ extern int atari_frame_counter;
 extern VIDEO_START( atari );
 extern SCREEN_UPDATE( atari );
 
-INTERRUPT_GEN( a400_interrupt );
-INTERRUPT_GEN( a800_interrupt );
-INTERRUPT_GEN( a800xl_interrupt );
-INTERRUPT_GEN( a5200_interrupt );
+TIMER_DEVICE_CALLBACK( a400_interrupt );
+TIMER_DEVICE_CALLBACK( a800_interrupt );
+TIMER_DEVICE_CALLBACK( a800xl_interrupt );
+TIMER_DEVICE_CALLBACK( a5200_interrupt );
 
 extern PALETTE_INIT( atari );
 
diff --git a/src/mame/video/atari.c b/src/mame/video/atari.c
index a01fc5ab455..b255086d103 100644
--- a/src/mame/video/atari.c
+++ b/src/mame/video/atari.c
@@ -1540,24 +1540,24 @@ static void generic_atari_interrupt(running_machine &machine, void (*handle_keyb
 
 
 
-INTERRUPT_GEN( a400_interrupt )
+TIMER_DEVICE_CALLBACK( a400_interrupt )
 {
-	generic_atari_interrupt(device->machine(), a800_handle_keyboard, 4);
+	generic_atari_interrupt(timer.machine(), a800_handle_keyboard, 4);
 }
 
-INTERRUPT_GEN( a800_interrupt )
+TIMER_DEVICE_CALLBACK( a800_interrupt )
 {
-	generic_atari_interrupt(device->machine(), a800_handle_keyboard, 4);
+	generic_atari_interrupt(timer.machine(), a800_handle_keyboard, 4);
 }
 
-INTERRUPT_GEN( a800xl_interrupt )
+TIMER_DEVICE_CALLBACK( a800xl_interrupt )
 {
-	generic_atari_interrupt(device->machine(), a800_handle_keyboard, 2);
+	generic_atari_interrupt(timer.machine(), a800_handle_keyboard, 2);
 }
 
-INTERRUPT_GEN( a5200_interrupt )
+TIMER_DEVICE_CALLBACK( a5200_interrupt )
 {
-	generic_atari_interrupt(device->machine(), a5200_handle_keypads, 4);
+	generic_atari_interrupt(timer.machine(), a5200_handle_keypads, 4);
 }
 
 /**************************************************************