diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index b03d94fa639..c1661453584 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -300,6 +300,7 @@ static TIMER_DEVICE_CALLBACK( interrupt_gen )
 
 static READ32_HANDLER( deco32_irq_controller_r )
 {
+	deco32_state *state = space->machine().driver_data<deco32_state>();
 	int vblank;
 
 	switch (offset)
@@ -326,7 +327,7 @@ static READ32_HANDLER( deco32_irq_controller_r )
 		if (vblank)
 			return 0xffffff80 | 0x1 | 0x10; /* Assume VBL takes priority over possible raster/lightgun irq */
 
-		return 0xffffff80 | vblank | (cpu_getiloops(&space->device()) ? 0x40 : 0x20);
+		return 0xffffff80 | vblank | ((state->m_irq_source) ? 0x40 : 0x20);
 //      return 0xffffff80 | vblank | (0x40); //test for lock load guns
 	}
 
@@ -2018,12 +2019,31 @@ static MACHINE_CONFIG_START( dragngun, dragngun_state )
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
 MACHINE_CONFIG_END
 
+static TIMER_DEVICE_CALLBACK( lockload_vbl_irq )
+{
+	deco32_state *state = timer.machine().driver_data<deco32_state>();
+	int scanline = param;
+
+	if(scanline == 31*8)
+	{
+		state->m_irq_source = 0;
+		device_set_input_line(state->m_maincpu, ARM_IRQ_LINE, HOLD_LINE);
+	}
+
+	if(scanline == 0)
+	{
+		state->m_irq_source = 1;
+		device_set_input_line(state->m_maincpu, ARM_IRQ_LINE, HOLD_LINE);
+	}
+}
+
+
 static MACHINE_CONFIG_START( lockload, dragngun_state )
 
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu", ARM, 28000000/4)
 	MCFG_CPU_PROGRAM_MAP(lockload_map)
-	MCFG_CPU_VBLANK_INT_HACK(deco32_vbl_interrupt,2) // From 2
+	MCFG_TIMER_ADD_SCANLINE("scantimer", lockload_vbl_irq, "screen", 0, 1)
 
 	MCFG_CPU_ADD("audiocpu", H6280, 32220000/8)
 	MCFG_CPU_PROGRAM_MAP(sound_map)
@@ -2039,7 +2059,7 @@ static MACHINE_CONFIG_START( lockload, dragngun_state )
 	MCFG_SCREEN_ADD("screen", RASTER)
 	MCFG_SCREEN_REFRESH_RATE(60)
 	MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
-	MCFG_SCREEN_SIZE(42*8, 32*8)
+	MCFG_SCREEN_SIZE(42*8, 32*8+22)
 	MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1)
 	MCFG_SCREEN_UPDATE(dragngun)
 	MCFG_SCREEN_EOF(dragngun)
diff --git a/src/mame/drivers/ggconnie.c b/src/mame/drivers/ggconnie.c
index 1cf116f8e2f..4d143055465 100644
--- a/src/mame/drivers/ggconnie.c
+++ b/src/mame/drivers/ggconnie.c
@@ -17,7 +17,6 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "deprecat.h"
 #include "machine/pcecommn.h"
 #include "video/vdc.h"
 #include "cpu/h6280/h6280.h"
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 1bad4726dbf..99017d288de 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -219,7 +219,6 @@ Todo:
 #include "cpu/z80/z80.h"
 #include "cpu/z8000/z8000.h"
 #include "cpu/mb88xx/mb88xx.h"
-#include "deprecat.h"
 #include "machine/namco06.h"
 #include "machine/namco51.h"
 #include "machine/namco53.h"
diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h
index 2da91b5b6a2..fb87dcb10c0 100644
--- a/src/mame/includes/deco32.h
+++ b/src/mame/includes/deco32.h
@@ -5,9 +5,11 @@ class deco32_state : public driver_device
 public:
 	deco32_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
 		m_decobsmt(*this, "decobsmt")
     { }
 
+	required_device<cpu_device> m_maincpu;
 	optional_device<decobsmt_device> m_decobsmt;
 
 	UINT32 *m_ram;
@@ -49,6 +51,7 @@ public:
 
 	device_t *m_deco_tilegen1;
 	device_t *m_deco_tilegen2;
+	UINT8 m_irq_source;
 };
 
 class dragngun_state : public deco32_state