diff --git a/src/emu/diexec.h b/src/emu/diexec.h
index 8d69fe8fbed..bb9c5ecabfb 100644
--- a/src/emu/diexec.h
+++ b/src/emu/diexec.h
@@ -143,7 +143,7 @@ typedef device_delegate<void (device_t &)> device_interrupt_delegate;
 
 // IRQ callback to be called by executing devices when an IRQ is actually taken
 typedef device_delegate<int (device_t &, int)> device_irq_acknowledge_delegate;
-ATTR_DEPRECATED typedef int (*device_irq_acknowledge_callback)(device_t *device, int irqnum);
+/*ATTR_DEPRECATED*/ typedef int (*device_irq_acknowledge_callback)(device_t *device, int irqnum);
 
 
 
diff --git a/src/emu/driver.h b/src/emu/driver.h
index 3b4bc1b5893..9608aec0988 100644
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@@ -134,7 +134,7 @@
 typedef delegate<void ()> driver_callback_delegate;
 
 // legacy callback functions
-typedef void   (*legacy_callback_func)(running_machine &machine);
+/*ATTR_DEPRECATED*/ typedef void (*legacy_callback_func)(running_machine &machine);
 
 
 // ======================> driver_device
@@ -166,7 +166,7 @@ public:
 
 	// inline configuration helpers
 	static void static_set_game(device_t &device, const game_driver &game);
-	static void static_set_callback(device_t &device, callback_type type, legacy_callback_func callback);
+	ATTR_DEPRECATED static void static_set_callback(device_t &device, callback_type type, legacy_callback_func callback);
 	static void static_set_callback(device_t &device, callback_type type, driver_callback_delegate callback);
 
 	// generic helpers
diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c
index 8d740ceab8d..5b7d7267759 100644
--- a/src/emu/machine/generic.c
+++ b/src/emu/machine/generic.c
@@ -558,6 +558,4 @@ void generic_pulse_irq_line(device_t *device, int irqline, int cycles) { device-
 
 // legacy
 INTERRUPT_GEN( irq2_line_hold ) { device->machine().driver_data()->irq2_line_hold(*device); }
-INTERRUPT_GEN( irq2_line_pulse ) { device->machine().driver_data()->irq2_line_pulse(*device); }
-INTERRUPT_GEN( irq2_line_assert ) { device->machine().driver_data()->irq2_line_assert(*device); }
 
diff --git a/src/emu/machine/generic.h b/src/emu/machine/generic.h
index bcb9c9c8f3e..8514e76e0a1 100644
--- a/src/emu/machine/generic.h
+++ b/src/emu/machine/generic.h
@@ -106,12 +106,9 @@ void set_led_status(running_machine &machine, int num, int value);
 
 /* ----- interrupt enable and vector helpers ----- */
 
-void generic_pulse_irq_line(device_t *device, int irqline, int cycles); // legacy
+ATTR_DEPRECATED void generic_pulse_irq_line(device_t *device, int irqline, int cycles);
 
 
-// legacy
-INTERRUPT_GEN( irq2_line_hold );
-INTERRUPT_GEN( irq2_line_pulse );
-INTERRUPT_GEN( irq2_line_assert );
+ATTR_DEPRECATED INTERRUPT_GEN( irq2_line_hold );
 
 #endif  /* __MACHINE_GENERIC_H__ */