diff --git a/src/emu/bus/c64/supercpu.h b/src/emu/bus/c64/supercpu.h
index 82902a1c38a..c2ad8f4dd40 100644
--- a/src/emu/bus/c64/supercpu.h
+++ b/src/emu/bus/c64/supercpu.h
@@ -50,7 +50,7 @@ protected:
 	virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw);
 
 private:
-	required_device<legacy_cpu_device> m_maincpu;
+	required_device<cpu_device> m_maincpu;
 	required_device<c64_expansion_slot_device> m_exp;
 
 	required_shared_ptr<UINT8> m_sram;
diff --git a/src/emu/video/epic12.c b/src/emu/video/epic12.c
index 32af89aec87..8e927e1ade5 100644
--- a/src/emu/video/epic12.c
+++ b/src/emu/video/epic12.c
@@ -62,7 +62,7 @@ void epic12_device::set_is_unsafe(device_t &device, int is_unsafe)
 
 }
 
-void epic12_device::set_cpu_device(device_t &device, legacy_cpu_device* maincpu)
+void epic12_device::set_cpu_device(device_t &device, cpu_device* maincpu)
 {
 	epic12_device &dev = downcast<epic12_device &>(device);
 	dev.m_maincpu = maincpu;
diff --git a/src/emu/video/epic12.h b/src/emu/video/epic12.h
index bbd94c151e5..8ce6ef13b5e 100644
--- a/src/emu/video/epic12.h
+++ b/src/emu/video/epic12.h
@@ -112,11 +112,11 @@ public:
 
 	int m_is_unsafe;
 	int m_delay_scale;
-	legacy_cpu_device* m_maincpu;
+	cpu_device* m_maincpu;
 
 	static void set_delay_scale(device_t &device, int delay_scale);
 	static void set_is_unsafe(device_t &device, int is_unsafe);
-	static void set_cpu_device(device_t &device, legacy_cpu_device* maincpu);
+	static void set_cpu_device(device_t &device, cpu_device* maincpu);
 
 	void install_handlers(int addr1, int addr2);
 
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index 16c3a39227f..9112e8cfb9c 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -993,7 +993,7 @@ static void curthread_command(running_machine &machine, int ref, int params, con
 	offs_t address;
 	cpuinfo cpu_info;
 
-	CPU_GET_INFO_NAME(i386)((legacy_cpu_device *)machine.firstcpu,CPUINFO_INT_REGISTER + 44,&cpu_info);
+	fsbase = machine.firstcpu->state_int(44);
 	fsbase=cpu_info.i;
 	address=(offs_t)fsbase+0x28;
 	if (!debug_cpu_translate(space,TRANSLATE_READ_DEBUG,&address))
diff --git a/src/mame/drivers/cv1k.c b/src/mame/drivers/cv1k.c
index 4e2298fe3ff..56aef065128 100644
--- a/src/mame/drivers/cv1k.c
+++ b/src/mame/drivers/cv1k.c
@@ -189,7 +189,7 @@ public:
 		m_eeprom(*this, "eeprom"),
 		cv1k_ram(*this, "mainram") { }
 
-	required_device<legacy_cpu_device> m_maincpu;
+	required_device<cpu_device> m_maincpu;
 	required_device<epic12_device> m_blitter;
 	required_device<serflash_device> m_serflash;
 	required_device<rtc9701_device> m_eeprom;