diff --git a/src/mame/drivers/hp80.cpp b/src/mame/drivers/hp80.cpp
index 3ac7042b314..671ccb3c1e2 100644
--- a/src/mame/drivers/hp80.cpp
+++ b/src/mame/drivers/hp80.cpp
@@ -281,7 +281,7 @@ hp85_state::hp85_state(const machine_config &mconfig, device_type type, const ch
 
 void hp85_state::machine_start()
 {
-	machine().first_screen()->register_screen_bitmap(m_bitmap);
+	m_screen->register_screen_bitmap(m_bitmap);
 	m_video_mem.resize(VIDEO_MEM_SIZE);
 }
 
diff --git a/src/mame/drivers/pokemini.cpp b/src/mame/drivers/pokemini.cpp
index cdf890942bf..d76aa166f99 100644
--- a/src/mame/drivers/pokemini.cpp
+++ b/src/mame/drivers/pokemini.cpp
@@ -54,13 +54,14 @@ class pokemini_state : public driver_device
 {
 public:
 	pokemini_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_p_ram(*this, "p_ram"),
-		m_speaker(*this, "speaker"),
-		m_i2cmem(*this, "i2cmem"),
-		m_cart(*this, "cartslot"),
-		m_inputs(*this, "INPUTS")
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_screen(*this, "screen")
+		, m_p_ram(*this, "p_ram")
+		, m_speaker(*this, "speaker")
+		, m_i2cmem(*this, "i2cmem")
+		, m_cart(*this, "cartslot")
+		, m_inputs(*this, "INPUTS")
 	{ }
 
 	uint8_t m_pm_reg[0x100];
@@ -96,6 +97,7 @@ protected:
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
 	required_device<cpu_device> m_maincpu;
+	required_device<screen_device> m_screen;
 	required_shared_ptr<uint8_t> m_p_ram;
 	required_device<speaker_sound_device> m_speaker;
 	required_device<i2cmem_device> m_i2cmem;
@@ -1744,7 +1746,7 @@ static const int16_t speaker_levels[] = {-32768, 0, 32767};
 
 void pokemini_state::video_start()
 {
-	machine().first_screen()->register_screen_bitmap(m_bitmap);
+	m_screen->register_screen_bitmap(m_bitmap);
 }
 
 
diff --git a/src/mame/drivers/uzebox.cpp b/src/mame/drivers/uzebox.cpp
index 8521fe56a0e..d76ffed64b2 100644
--- a/src/mame/drivers/uzebox.cpp
+++ b/src/mame/drivers/uzebox.cpp
@@ -34,15 +34,17 @@ class uzebox_state : public driver_device
 {
 public:
 	uzebox_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_cart(*this, "cartslot"),
-		m_ctrl1(*this, "ctrl1"),
-		m_ctrl2(*this, "ctrl2"),
-		m_speaker(*this, "speaker")
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_screen(*this, "screen")
+		, m_cart(*this, "cartslot")
+		, m_ctrl1(*this, "ctrl1")
+		, m_ctrl2(*this, "ctrl2")
+		, m_speaker(*this, "speaker")
 	{ }
 
 	required_device<avr8_device> m_maincpu;
+	required_device<screen_device> m_screen;
 	required_device<generic_slot_device> m_cart;
 	required_device<snes_control_port_device> m_ctrl1;
 	required_device<snes_control_port_device> m_ctrl2;
@@ -80,7 +82,7 @@ private:
 
 void uzebox_state::machine_start()
 {
-	machine().first_screen()->register_screen_bitmap(m_bitmap);
+	m_screen->register_screen_bitmap(m_bitmap);
 
 	if (m_cart->exists())
 		m_maincpu->space(AS_PROGRAM).install_read_handler(0x0000, 0xffff, read8_delegate(FUNC(generic_slot_device::read_rom),(generic_slot_device*)m_cart));
diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp
index 131e4936697..0161a248069 100644
--- a/src/mame/drivers/vboy.cpp
+++ b/src/mame/drivers/vboy.cpp
@@ -1278,8 +1278,6 @@ void vboy_state::m_set_irq(uint16_t irq_vector)
 /* TODO: obviously all of this needs clean-ups and better implementation ... */
 void vboy_state::m_scanline_tick(int scanline, uint8_t screen_type)
 {
-	//int frame_num = machine().first_screen()->frame_number();
-
 	if(screen_type == 0)
 		m_row_num = (scanline / 8) & 0x1f;
 
diff --git a/src/mame/machine/archimds.cpp b/src/mame/machine/archimds.cpp
index 2ef79a32979..13fffe96ab3 100644
--- a/src/mame/machine/archimds.cpp
+++ b/src/mame/machine/archimds.cpp
@@ -990,7 +990,7 @@ WRITE32_MEMBER(archimedes_state::archimedes_vidc_w)
 		}
 
 		// update partials
-		machine().first_screen()->update_partial(machine().first_screen()->vpos());
+		m_screen->update_partial(m_screen->vpos());
 	}
 	else if (reg >= 0x60 && reg <= 0x7c)
 	{