diff --git a/src/mame/drivers/saturn.cpp b/src/mame/drivers/saturn.cpp
index 3081dca4fac..1db3046ba4d 100644
--- a/src/mame/drivers/saturn.cpp
+++ b/src/mame/drivers/saturn.cpp
@@ -429,7 +429,6 @@ test1f diagnostic hacks:
 #include "cpu/scudsp/scudsp.h"
 #include "cpu/sh/sh2.h"
 #include "imagedev/chd_cd.h"
-#include "machine/eepromser.h"
 #include "machine/nvram.h"
 #include "machine/smpc.h"
 #include "machine/stvcd.h"
diff --git a/src/mame/includes/saturn.h b/src/mame/includes/saturn.h
index 331296317ae..410ed46cac7 100644
--- a/src/mame/includes/saturn.h
+++ b/src/mame/includes/saturn.h
@@ -2,7 +2,6 @@
 // copyright-holders:David Haywood, Angelo Salese, Olivier Galibert, Mariusz Wojcieszek, R. Belmont
 
 #include "cdrom.h"
-#include "machine/eepromser.h"
 #include "machine/timer.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/adsp2100/adsp2100.h"
@@ -41,7 +40,6 @@ public:
 			m_audiocpu(*this, "audiocpu"),
 			m_smpc_hle(*this, "smpc"),
 			m_scudsp(*this, "scudsp"),
-			m_eeprom(*this, "eeprom"),
 			m_gfxdecode(*this, "gfxdecode"),
 			m_palette(*this, "palette")
 	{
@@ -128,19 +126,11 @@ public:
 	uint8_t m_cart_type;
 	uint32_t *m_cart_dram;
 
-	/* ST-V specific */
-	uint8_t     m_port_sel,m_mux_data;
-	uint8_t     m_system_output;
-	uint8_t     m_ioga_mode;
-	uint8_t     m_ioga_portg;
-	uint16_t    m_serial_tx;
-
 	required_device<sh2_device> m_maincpu;
 	required_device<sh2_device> m_slave;
 	required_device<m68000_base_device> m_audiocpu;
 	required_device<smpc_hle_device> m_smpc_hle;
 	required_device<scudsp_cpu_device> m_scudsp;
-	optional_device<eeprom_serial_93cxx_device> m_eeprom;
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<palette_device> m_palette;
 
diff --git a/src/mame/includes/stv.h b/src/mame/includes/stv.h
index 83747631329..a235c1f5881 100644
--- a/src/mame/includes/stv.h
+++ b/src/mame/includes/stv.h
@@ -3,6 +3,7 @@
 
 #include "includes/saturn.h"
 #include "audio/rax.h"
+#include "machine/eepromser.h"
 #include "machine/ticket.h"
 
 class stv_state : public saturn_state
@@ -15,6 +16,7 @@ public:
 		m_cart3(*this, "stv_slot3"),
 		m_cart4(*this, "stv_slot4"),
 		m_rax(*this, "rax"),
+		m_eeprom(*this, "eeprom"),
 		m_cryptdevice(*this, "315_5881"),
 		m_5838crypt(*this, "315_5838"),
 		m_hopper(*this, "hopper")
@@ -106,6 +108,12 @@ public:
 	DECLARE_WRITE32_MEMBER(batmanfr_sound_comms_w);
 	optional_device<acclaim_rax_device> m_rax;
 
+	uint8_t     m_port_sel,m_mux_data;
+	uint8_t     m_system_output;
+	uint8_t     m_ioga_mode;
+	uint8_t     m_ioga_portg;
+	uint16_t    m_serial_tx;
+
 	// protection specific variables and functions (see machine/stvprot.c)
 	uint32_t m_abus_protenable;
 	uint32_t m_abus_protkey;
@@ -118,6 +126,7 @@ public:
 	void install_common_protection();
 	void stv_register_protection_savestates();
 
+	required_device<eeprom_serial_93cxx_device> m_eeprom;
 	optional_device<sega_315_5881_crypt_device> m_cryptdevice;
 	optional_device<sega_315_5838_comp_device> m_5838crypt;
 	optional_device<ticket_dispenser_device> m_hopper;