diff --git a/src/osd/sdl/debugosx.m b/src/osd/sdl/debugosx.m
index 50482bc7459..001b2a3bbe4 100644
--- a/src/osd/sdl/debugosx.m
+++ b/src/osd/sdl/debugosx.m
@@ -75,7 +75,7 @@ void sdl_osd_interface::init_debugger()
 //  sdl_osd_interface::wait_for_debugger
 //============================================================
 
-void sdl_osd_interface::wait_for_debugger(running_device &device, bool firststop)
+void sdl_osd_interface::wait_for_debugger(device_t &device, bool firststop)
 {
 	// create a console window
 	if (main_console == nil)
@@ -735,7 +735,7 @@ void console_create_window(running_machine *machine)
 
 - (NSSize)maximumFrameSize {
 	debug_view_xy				max;
-	running_device				*curcpu = debug_cpu_get_visible_cpu(machine);
+	device_t				*curcpu = debug_cpu_get_visible_cpu(machine);
 	const debug_view_source		*source = view->source_list().match_device(curcpu);
 
 	max.x = max.y = 0;
@@ -782,7 +782,7 @@ void console_create_window(running_machine *machine)
 }
 
 
-- (void)selectSubviewForCPU:(running_device *)device {
+- (void)selectSubviewForCPU:(device_t *)device {
 	const debug_view_source		*selected = view->source();
 	const debug_view_source		*source = view->source_list().match_device(device);
 	if ( selected != source ) {
@@ -1020,7 +1020,7 @@ void console_create_window(running_machine *machine)
 
 - (NSSize)maximumFrameSize {
 	debug_view_xy				max;
-	running_device				*curcpu = debug_cpu_get_visible_cpu(machine);
+	device_t				*curcpu = debug_cpu_get_visible_cpu(machine);
 	const debug_view_source		*source = view->source_list().match_device(curcpu);
 
 	max.x = max.y = 0;
@@ -1067,7 +1067,7 @@ void console_create_window(running_machine *machine)
 }
 
 
-- (void)selectSubviewForCPU:(running_device *)device {
+- (void)selectSubviewForCPU:(device_t *)device {
 	const debug_view_source     *selected = view->source();
 	const debug_view_source     *source = view->source_list().match_device(device);
 	if ( selected != source ) {
@@ -1258,7 +1258,7 @@ void console_create_window(running_machine *machine)
 
 - (NSSize)maximumFrameSize {
 	debug_view_xy				max;
-	running_device				*curcpu = debug_cpu_get_visible_cpu(machine);
+	device_t				*curcpu = debug_cpu_get_visible_cpu(machine);
 	const debug_view_source		*source = view->source_list().match_device(curcpu);
 
 
@@ -1292,7 +1292,7 @@ void console_create_window(running_machine *machine)
 }
 
 
-- (void)selectSubviewForCPU:(running_device *)device {
+- (void)selectSubviewForCPU:(device_t *)device {
 	//dv = get_view(dmain, DVT_STATE);
 	view->set_source(*view->source_list().match_device(device));
 }
@@ -1542,7 +1542,7 @@ void console_create_window(running_machine *machine)
 
 
 - (void)showDebugger:(NSNotification *)notification {
-	running_device *device = (running_device *) [[[notification userInfo] objectForKey:@"MAMEDebugDevice"] pointerValue];
+	device_t *device = (device_t *) [[[notification userInfo] objectForKey:@"MAMEDebugDevice"] pointerValue];
 	if (device->machine == machine) {
 		if (![window isVisible] && ![window isMiniaturized])
 			[window orderFront:self];
@@ -1742,7 +1742,7 @@ void console_create_window(running_machine *machine)
 }
 
 
-- (void)setCPU:(running_device *)device {
+- (void)setCPU:(device_t *)device {
 	[regView selectSubviewForCPU:device];
 	[dasmView selectSubviewForCPU:device];
 	[window setTitle:[NSString stringWithFormat:@"Debug: %s - %s '%s'",
@@ -1789,7 +1789,7 @@ void console_create_window(running_machine *machine)
 
 
 - (void)showDebugger:(NSNotification *)notification {
-	running_device *device = (running_device * )[[[notification userInfo] objectForKey:@"MAMEDebugDevice"] pointerValue];
+	device_t *device = (device_t * )[[[notification userInfo] objectForKey:@"MAMEDebugDevice"] pointerValue];
 	if (device->machine == machine) {
 		[self setCPU:device];
 		[window makeKeyAndOrderFront:self];