diff --git a/src/emu/sound/beep.h b/src/emu/sound/beep.h
index 7b9fbf5cd67..d42bfcf1b24 100644
--- a/src/emu/sound/beep.h
+++ b/src/emu/sound/beep.h
@@ -3,9 +3,6 @@
 #ifndef __BEEP_H__
 #define __BEEP_H__
 
-#define BEEPER_TAG      "beeper"
-
-
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
diff --git a/src/mame/drivers/deshoros.c b/src/mame/drivers/deshoros.c
index cc5e2092a82..06857075271 100644
--- a/src/mame/drivers/deshoros.c
+++ b/src/mame/drivers/deshoros.c
@@ -36,10 +36,12 @@ class destiny_state : public driver_device
 public:
 	destiny_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu")
+		m_maincpu(*this, "maincpu"),
+		m_beeper(*this, "beeper")
 	{ }
 
 	required_device<cpu_device> m_maincpu;
+	required_device<beep_device> m_beeper;
 
 	char m_led_array[21];
 
@@ -158,7 +160,7 @@ INPUT_CHANGED_MEMBER(destiny_state::coin_inserted)
 WRITE8_MEMBER(destiny_state::sound_w)
 {
 	// a0: sound on/off
-	machine().device<beep_device>(BEEPER_TAG)->set_state(~offset & 1);
+	m_beeper->set_state(~offset & 1);
 }
 
 static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, destiny_state )
@@ -247,8 +249,8 @@ INPUT_PORTS_END
 
 void destiny_state::machine_start()
 {
-	machine().device<beep_device>(BEEPER_TAG)->set_frequency(800); // TODO: determine exact frequency thru schematics
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_frequency(800); // TODO: determine exact frequency thru schematics
+	m_beeper->set_state(0);
 }
 
 void destiny_state::machine_reset()
@@ -275,7 +277,7 @@ static MACHINE_CONFIG_START( destiny, destiny_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index 3ed98a462e2..c44514c8661 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -54,7 +54,8 @@ public:
 			m_pr7820(*this, "ld_pr7820"),
 			m_22vp932(*this, "ld_22vp932") ,
 		m_videoram(*this, "videoram"),
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_beeper(*this, "beeper")	 { }
 
 	void laserdisc_data_w(UINT8 data)
 	{
@@ -120,6 +121,7 @@ public:
 	DECLARE_WRITE16_MEMBER(serial_transmit);
 	DECLARE_READ16_MEMBER(serial_receive);
 	required_device<cpu_device> m_maincpu;
+	optional_device<beep_device> m_beeper;
 };
 
 
@@ -284,12 +286,11 @@ MACHINE_RESET_MEMBER(dlair_state,dlair)
 INTERRUPT_GEN_MEMBER(dlair_state::vblank_callback)
 {
 	/* also update the speaker on the European version */
-	beep_device *beep = machine().device<beep_device>("beep");
-	if (beep != NULL)
+	if (m_beeper != NULL)
 	{
 		z80ctc_device *ctc = machine().device<z80ctc_device>("ctc");
-		beep->set_state(1);
-		beep->set_frequency(ATTOSECONDS_TO_HZ(ctc->period(0).attoseconds));
+		m_beeper->set_state(1);
+		m_beeper->set_frequency(ATTOSECONDS_TO_HZ(ctc->period(0).attoseconds));
 	}
 }
 
@@ -789,7 +790,7 @@ static MACHINE_CONFIG_START( dleuro, dlair_state )
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
 
-	MCFG_SOUND_ADD("beep", BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.33)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.33)
 
diff --git a/src/mess/drivers/a5105.c b/src/mess/drivers/a5105.c
index 6b4e2b832ba..8f277de206c 100644
--- a/src/mess/drivers/a5105.c
+++ b/src/mess/drivers/a5105.c
@@ -40,13 +40,14 @@ public:
 			m_maincpu(*this, "maincpu"),
 			m_hgdc(*this, "upd7220"),
 			m_cass(*this, "cassette"),
-			m_beep(*this, BEEPER_TAG),
+			m_beep(*this, "beeper"),
 			m_fdc(*this, "upd765a"),
 			m_floppy0(*this, "upd765a:0"),
 			m_floppy1(*this, "upd765a:1"),
 			m_floppy2(*this, "upd765a:2"),
 			m_floppy3(*this, "upd765a:3"),
-			m_video_ram(*this, "video_ram")
+			m_video_ram(*this, "video_ram"),
+			m_ram(*this, RAM_TAG)
 		{ }
 
 	required_device<cpu_device> m_maincpu;
@@ -80,6 +81,7 @@ public:
 	virtual void video_start();
 	virtual void palette_init();
 	DECLARE_FLOPPY_FORMATS( floppy_formats );
+	required_device<ram_device> m_ram;
 };
 
 /* TODO */
@@ -484,7 +486,7 @@ void a5105_state::machine_reset()
 	a5105_ab_w(space, 0, 9); // turn motor off
 	m_beep->set_frequency(500);
 
-	m_ram_base = (UINT8*)machine().device<ram_device>(RAM_TAG)->pointer();
+	m_ram_base = (UINT8*)m_ram->pointer();
 	m_rom_base = (UINT8*)memregion("maincpu")->base();
 
 	membank("bank1")->set_base(m_rom_base);
@@ -601,7 +603,7 @@ static MACHINE_CONFIG_START( a5105, a5105_state )
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	/* Devices */
diff --git a/src/mess/drivers/ace.c b/src/mess/drivers/ace.c
index 4782237bdb4..4f4da2b68ea 100644
--- a/src/mess/drivers/ace.c
+++ b/src/mess/drivers/ace.c
@@ -76,7 +76,7 @@ SNAPSHOT_LOAD_MEMBER( ace_state, ace )
 	unsigned char ace_repeat, ace_byte, loop;
 	int done=0, ace_index=0x2000;
 
-	if (machine().device<ram_device>(RAM_TAG)->size() < 16*1024)
+	if (m_ram->size() < 16*1024)
 	{
 		image.seterror(IMAGE_ERROR_INVALIDIMAGE, "At least 16KB RAM expansion required");
 		image.message("At least 16KB RAM expansion required");
diff --git a/src/mess/drivers/alphatro.c b/src/mess/drivers/alphatro.c
index b628e1ffc61..3a56d4cff82 100644
--- a/src/mess/drivers/alphatro.c
+++ b/src/mess/drivers/alphatro.c
@@ -40,7 +40,7 @@ public:
 	m_crtc(*this, "crtc"),
 	m_usart(*this, "usart"),
 	m_cass(*this, "cassette"),
-	m_beep(*this, BEEPER_TAG),
+	m_beep(*this, "beeper"),
 	m_p_ram(*this, "p_ram"),
 	m_p_videoram(*this, "p_videoram"){ }
 
@@ -437,7 +437,7 @@ static MACHINE_CONFIG_START( alphatro, alphatro_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mess/drivers/aquarius.c b/src/mess/drivers/aquarius.c
index 0e04e2f277a..bb46a215510 100644
--- a/src/mess/drivers/aquarius.c
+++ b/src/mess/drivers/aquarius.c
@@ -187,8 +187,8 @@ DRIVER_INIT_MEMBER(aquarius_state,aquarius)
 	{
 		address_space &space = m_maincpu->space(AS_PROGRAM);
 
-		space.install_readwrite_bank(0x4000, 0x4000 + machine().device<ram_device>(RAM_TAG)->size() - 0x1000 - 1, "bank1");
-		membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+		space.install_readwrite_bank(0x4000, 0x4000 + m_ram->size() - 0x1000 - 1, "bank1");
+		membank("bank1")->set_base(m_ram->pointer());
 	}
 }
 
diff --git a/src/mess/drivers/bigbord2.c b/src/mess/drivers/bigbord2.c
index bb61cc9564e..ca1b466ea8a 100644
--- a/src/mess/drivers/bigbord2.c
+++ b/src/mess/drivers/bigbord2.c
@@ -98,7 +98,7 @@ public:
 	m_floppy1(*this, FLOPPY_1),
 	m_floppy2(*this, FLOPPY_2),
 	m_floppy3(*this, FLOPPY_3),
-	m_beeper(*this, BEEPER_TAG)
+	m_beeper(*this, "beeper")
 	{ }
 
 	virtual void machine_start();
@@ -712,7 +712,7 @@ static MACHINE_CONFIG_START( bigbord2, bigbord2_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/bmjr.c b/src/mess/drivers/bmjr.c
index 6cc8f65a5f7..30560078c96 100644
--- a/src/mess/drivers/bmjr.c
+++ b/src/mess/drivers/bmjr.c
@@ -26,7 +26,7 @@ public:
 		: driver_device(mconfig, type, tag),
 	m_maincpu(*this, "maincpu"),
 	m_cass(*this, "cassette"),
-	m_beep(*this, BEEPER_TAG)
+	m_beep(*this, "beeper")
 	,
 		m_p_wram(*this, "p_wram"){ }
 
@@ -362,7 +362,7 @@ static MACHINE_CONFIG_START( bmjr, bmjr_state )
 
 	/* Audio */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c
index a6b4cb92249..56280d34a56 100644
--- a/src/mess/drivers/bml3.c
+++ b/src/mess/drivers/bml3.c
@@ -49,7 +49,7 @@ public:
 	m_maincpu(*this, "maincpu"),
 	m_crtc(*this, "crtc"),
 	//m_cass(*this, "cassette"),
-	m_beep(*this, BEEPER_TAG)
+	m_beep(*this, "beeper")
 	{ }
 
 	required_device<cpu_device> m_maincpu;
@@ -918,7 +918,7 @@ static MACHINE_CONFIG_START( bml3, bml3_state )
 
 	/* Audio */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 
 	MCFG_SOUND_ADD("ym2203", YM2203, 2000000) //unknown clock / divider
diff --git a/src/mess/drivers/comx35.c b/src/mess/drivers/comx35.c
index af5a273f4e1..9d0bcc9a7ce 100644
--- a/src/mess/drivers/comx35.c
+++ b/src/mess/drivers/comx35.c
@@ -37,9 +37,9 @@ enum
     image_fread_memory - read image to memory
 -------------------------------------------------*/
 
-static void image_fread_memory(device_image_interface &image, UINT16 addr, UINT32 count)
+void comx35_state::image_fread_memory(device_image_interface &image, UINT16 addr, UINT32 count)
 {
-	UINT8 *ram = image.device().machine().device<ram_device>(RAM_TAG)->pointer() + (addr - 0x4000);
+	UINT8 *ram = m_ram->pointer() + (addr - 0x4000);
 
 	image.fread(ram, count);
 }
@@ -55,7 +55,7 @@ QUICKLOAD_LOAD_MEMBER( comx35_state, comx35_comx )
 	UINT8 header[16] = {0};
 	int size = image.length();
 
-	if (size > machine().device<ram_device>(RAM_TAG)->size())
+	if (size > m_ram->size())
 	{
 		return IMAGE_INIT_FAIL;
 	}
diff --git a/src/mess/drivers/electron.c b/src/mess/drivers/electron.c
index e27dbea0092..f471f54b096 100644
--- a/src/mess/drivers/electron.c
+++ b/src/mess/drivers/electron.c
@@ -192,7 +192,7 @@ static MACHINE_CONFIG_START( electron, electron_state )
 	MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE)
 
 	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
+	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
 
 	MCFG_CASSETTE_ADD( "cassette", electron_cassette_interface )
diff --git a/src/mess/drivers/enterp.c b/src/mess/drivers/enterp.c
index b4dddd8251e..8020ce5d124 100644
--- a/src/mess/drivers/enterp.c
+++ b/src/mess/drivers/enterp.c
@@ -70,10 +70,10 @@ void ep_state::enterprise_update_memory_page(address_space &space, offs_t page,
 	case 0xfa:
 	case 0xfb:
 		/* additional 64k ram */
-		if (space.machine().device<ram_device>(RAM_TAG)->size() == 128*1024)
+		if (m_ram->size() == 128*1024)
 		{
 			space.install_readwrite_bank(start, end, page_num);
-			membank(page_num)->set_base(space.machine().device<ram_device>(RAM_TAG)->pointer() + (index - 0xf4) * 0x4000);
+			membank(page_num)->set_base(m_ram->pointer() + (index - 0xf4) * 0x4000);
 		}
 		else
 		{
@@ -87,7 +87,7 @@ void ep_state::enterprise_update_memory_page(address_space &space, offs_t page,
 	case 0xff:
 		/* basic 64k ram */
 		space.install_readwrite_bank(start, end, page_num);
-		membank(page_num)->set_base(space.machine().device<ram_device>(RAM_TAG)->pointer() + (index - 0xfc) * 0x4000);
+		membank(page_num)->set_base(m_ram->pointer() + (index - 0xfc) * 0x4000);
 		break;
 
 	default:
diff --git a/src/mess/drivers/ex800.c b/src/mess/drivers/ex800.c
index 02c29187744..a0fe3abe843 100644
--- a/src/mess/drivers/ex800.c
+++ b/src/mess/drivers/ex800.c
@@ -137,7 +137,8 @@ class ex800_state : public driver_device
 public:
 	ex800_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag) ,
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_beeper(*this, "beeper") { }
 
 	int m_irq_state;
 	DECLARE_READ8_MEMBER(ex800_porta_r);
@@ -157,6 +158,7 @@ public:
 	virtual void machine_start();
 	DECLARE_INPUT_CHANGED_MEMBER(online_switch);
 	required_device<cpu_device> m_maincpu;
+	required_device<beep_device> m_beeper;
 };
 
 
@@ -208,10 +210,9 @@ INPUT_CHANGED_MEMBER(ex800_state::online_switch)
 void ex800_state::machine_start()
 {
 	m_irq_state = ASSERT_LINE;
-	beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
 	/* Setup beep */
-	speaker->set_state(0);
-	speaker->set_frequency(4000); /* measured at 4000 Hz */
+	m_beeper->set_state(0);
+	m_beeper->set_frequency(4000); /* measured at 4000 Hz */
 }
 
 
@@ -267,11 +268,10 @@ WRITE8_MEMBER(ex800_state::ex800_portb_w)
 
 WRITE8_MEMBER(ex800_state::ex800_portc_w)
 {
-	beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
 	if (data & 0x80)
-		speaker->set_state(0);
+		m_beeper->set_state(0);
 	else
-		speaker->set_state(1);
+		m_beeper->set_state(1);
 
 	logerror("PC W %x @%x\n", data, space.device().safe_pc());
 }
@@ -458,7 +458,7 @@ static MACHINE_CONFIG_START( ex800, ex800_state )
 
 	/* audio hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/fidelz80.c b/src/mess/drivers/fidelz80.c
index c17d58fd28c..b31d50e079f 100644
--- a/src/mess/drivers/fidelz80.c
+++ b/src/mess/drivers/fidelz80.c
@@ -1296,7 +1296,7 @@ static MACHINE_CONFIG_START( cc10, fidelz80_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
+	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/fk1.c b/src/mess/drivers/fk1.c
index 97e6d0d14a6..c553738000f 100644
--- a/src/mess/drivers/fk1.c
+++ b/src/mess/drivers/fk1.c
@@ -19,10 +19,13 @@ class fk1_state : public driver_device
 public:
 	fk1_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-	m_maincpu(*this, "maincpu")
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG)
 	{ }
 
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
+	
 	DECLARE_WRITE8_MEMBER(fk1_ppi_1_a_w);
 	DECLARE_WRITE8_MEMBER(fk1_ppi_1_b_w);
 	DECLARE_WRITE8_MEMBER(fk1_ppi_1_c_w);
@@ -297,7 +300,7 @@ WRITE8_MEMBER( fk1_state::fk1_intr_w )
 READ8_MEMBER( fk1_state::fk1_bank_ram_r )
 {
 	address_space &space_mem = m_maincpu->space(AS_PROGRAM);
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	space_mem.install_write_bank(0x0000, 0x3fff, "bank1");
 	membank("bank1")->set_base(ram);
@@ -310,7 +313,7 @@ READ8_MEMBER( fk1_state::fk1_bank_rom_r )
 	address_space &space_mem = m_maincpu->space(AS_PROGRAM);
 	space_mem.unmap_write(0x0000, 0x3fff);
 	membank("bank1")->set_base(memregion("maincpu")->base());
-	membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x10000);
+	membank("bank2")->set_base(m_ram->pointer() + 0x10000);
 	return 0;
 }
 
@@ -421,7 +424,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(fk1_state::vsync_callback)
 void fk1_state::machine_reset()
 {
 	address_space &space = m_maincpu->space(AS_PROGRAM);
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	space.unmap_write(0x0000, 0x3fff);
 	membank("bank1")->set_base(memregion("maincpu")->base()); // ROM
@@ -436,7 +439,7 @@ UINT32 fk1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, con
 {
 	UINT8 code;
 	int y, x, b;
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	for (x = 0; x < 64; x++)
 	{
diff --git a/src/mess/drivers/fm7.c b/src/mess/drivers/fm7.c
index 7c07652dd1b..0e0860215e6 100644
--- a/src/mess/drivers/fm7.c
+++ b/src/mess/drivers/fm7.c
@@ -229,7 +229,7 @@ READ8_MEMBER(fm7_state::fm7_irq_cause_r)
 
 TIMER_CALLBACK_MEMBER(fm7_state::fm7_beeper_off)
 {
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_state(0);
 	logerror("timed beeper off\n");
 }
 
@@ -239,23 +239,23 @@ WRITE8_MEMBER(fm7_state::fm7_beeper_w)
 
 	if(!m_speaker_active)  // speaker not active, disable all beeper sound
 	{
-		machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+		m_beeper->set_state(0);
 		return;
 	}
 
 	if(data & 0x80)
 	{
 		if(m_speaker_active)
-			machine().device<beep_device>(BEEPER_TAG)->set_state(1);
+			m_beeper->set_state(1);
 	}
 	else
-		machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+		m_beeper->set_state(0);
 
 	if(data & 0x40)
 	{
 		if(m_speaker_active)
 		{
-			machine().device<beep_device>(BEEPER_TAG)->set_state(1);
+			m_beeper->set_state(1);
 			logerror("timed beeper on\n");
 			machine().scheduler().timer_set(attotime::from_msec(205), timer_expired_delegate(FUNC(fm7_state::fm7_beeper_off),this));
 		}
@@ -272,7 +272,7 @@ READ8_MEMBER(fm7_state::fm7_sub_beeper_r)
 {
 	if(m_speaker_active)
 	{
-		machine().device<beep_device>(BEEPER_TAG)->set_state(1);
+		m_beeper->set_state(1);
 		logerror("timed beeper on\n");
 		machine().scheduler().timer_set(attotime::from_msec(205), timer_expired_delegate(FUNC(fm7_state::fm7_beeper_off),this));
 	}
@@ -1836,8 +1836,8 @@ MACHINE_START_MEMBER(fm7_state,fm7)
 	memset(m_shared_ram,0xff,0x80);
 	m_type = SYS_FM7;
 
-	machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_frequency(1200);
+	m_beeper->set_state(0);
 }
 
 MACHINE_START_MEMBER(fm7_state,fm77av)
@@ -1857,8 +1857,8 @@ MACHINE_START_MEMBER(fm7_state,fm77av)
 	membank("bank21")->set_base(RAM+0x800);
 
 	m_type = SYS_FM77AV;
-	machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_frequency(1200);
+	m_beeper->set_state(0);
 }
 
 MACHINE_START_MEMBER(fm7_state,fm11)
@@ -1868,8 +1868,8 @@ MACHINE_START_MEMBER(fm7_state,fm11)
 
 	memset(m_shared_ram,0xff,0x80);
 	m_type = SYS_FM11;
-	machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_frequency(1200);
+	m_beeper->set_state(0);
 	// last part of Initiate ROM is visible at the end of RAM too (interrupt vectors)
 	memcpy(RAM+0x3fff0,ROM+0x0ff0,16);
 }
@@ -1877,8 +1877,8 @@ MACHINE_START_MEMBER(fm7_state,fm11)
 MACHINE_START_MEMBER(fm7_state,fm16)
 {
 	m_type = SYS_FM16;
-	machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200);
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_frequency(1200);
+	m_beeper->set_state(0);
 }
 
 void fm7_state::machine_reset()
@@ -2022,7 +2022,7 @@ static MACHINE_CONFIG_START( fm7, fm7_state )
 	MCFG_SOUND_ADD("psg", AY8910, XTAL_4_9152MHz / 4)
 	MCFG_SOUND_CONFIG(fm7_psg_intf)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 1.00)
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.50)
 	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono", 0.25)
@@ -2064,7 +2064,7 @@ static MACHINE_CONFIG_START( fm8, fm7_state )
 	MCFG_QUANTUM_PERFECT_CPU("sub")
 
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
@@ -2107,7 +2107,7 @@ static MACHINE_CONFIG_START( fm77av, fm7_state )
 	MCFG_SOUND_ADD("ym", YM2203, XTAL_4_9152MHz / 4)
 	MCFG_SOUND_CONFIG(fm7_ym_intf)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",1.0)
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
@@ -2153,7 +2153,7 @@ static MACHINE_CONFIG_START( fm11, fm7_state )
 	MCFG_CPU_IO_MAP(fm11_x86_io)
 
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
@@ -2194,7 +2194,7 @@ static MACHINE_CONFIG_START( fm16beta, fm7_state )
 	MCFG_QUANTUM_PERFECT_CPU("sub")
 
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.25)
diff --git a/src/mess/drivers/fmtowns.c b/src/mess/drivers/fmtowns.c
index f6c59607564..8da8cac8a0f 100644
--- a/src/mess/drivers/fmtowns.c
+++ b/src/mess/drivers/fmtowns.c
@@ -2596,7 +2596,7 @@ void towns_state::driver_start()
 	m_towns_cd.read_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(towns_state::towns_cdrom_read_byte),this), (void*)machine().device("dma_1"));
 
 	m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(towns_state::towns_irq_callback),this));
-	m_maincpu->space(AS_PROGRAM).install_ram(0x100000,machine().device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,NULL);
+	m_maincpu->space(AS_PROGRAM).install_ram(0x100000,m_ram->size()-1,0xffffffff,0,NULL);
 
 }
 
@@ -2616,11 +2616,11 @@ void towns_state::machine_reset()
 	m_pic_master = machine().device("pic8259_master");
 	m_pic_slave = machine().device("pic8259_slave");
 	m_pit = machine().device("pit");
-	m_messram = machine().device<ram_device>(RAM_TAG);
+	m_messram = m_ram;
 	m_cdrom = machine().device<cdrom_image_device>("cdrom");
 	m_cdda = machine().device("cdda");
 	m_scsi = machine().device<fmscsi_device>("scsi:fm");
-	m_ram = machine().device<ram_device>(RAM_TAG);
+	m_ram = m_ram;
 	m_ftimer = 0x00;
 	m_freerun_timer = 0x00;
 	m_nmi_mask = 0x00;
diff --git a/src/mess/drivers/glasgow.c b/src/mess/drivers/glasgow.c
index f50375bd0b3..6828f9ac9e6 100644
--- a/src/mess/drivers/glasgow.c
+++ b/src/mess/drivers/glasgow.c
@@ -59,7 +59,7 @@ public:
 	glasgow_state(const machine_config &mconfig, device_type type, const char *tag)
 		: mboard_state(mconfig, type, tag),
 	m_maincpu(*this, "maincpu"),
-	m_beep(*this, BEEPER_TAG)
+	m_beep(*this, "beeper")
 	{ }
 
 	required_device<cpu_device> m_maincpu;
@@ -511,7 +511,7 @@ static MACHINE_CONFIG_START( glasgow, glasgow_state )
 	MCFG_CPU_ADD("maincpu", M68000, 12000000)
 	MCFG_CPU_PROGRAM_MAP(glasgow_mem)
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", glasgow_state, update_nmi, attotime::from_hz(50))
diff --git a/src/mess/drivers/h19.c b/src/mess/drivers/h19.c
index bee0c6d8ba1..318d101ef1b 100644
--- a/src/mess/drivers/h19.c
+++ b/src/mess/drivers/h19.c
@@ -49,7 +49,7 @@ public:
 			m_maincpu(*this, "maincpu"),
 			m_crtc(*this, "crtc"),
 			m_ace(*this, "ins8250"),
-			m_beep(*this, BEEPER_TAG),
+			m_beep(*this, "beeper"),
 			m_p_videoram(*this, "p_videoram")
 	{ }
 
@@ -419,7 +419,7 @@ static MACHINE_CONFIG_START( h19, h19_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/h8.c b/src/mess/drivers/h8.c
index d4b9c62ed94..4e7af71d993 100644
--- a/src/mess/drivers/h8.c
+++ b/src/mess/drivers/h8.c
@@ -28,7 +28,7 @@ public:
 		: driver_device(mconfig, type, tag),
 	m_maincpu(*this, "maincpu"),
 	//m_cass(*this, "cassette"),
-	m_beep(*this, BEEPER_TAG)
+	m_beep(*this, "beeper")
 	{ }
 
 	required_device<cpu_device> m_maincpu;
@@ -232,7 +232,7 @@ static MACHINE_CONFIG_START( h8, h8_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/jr100.c b/src/mess/drivers/jr100.c
index 04d3edff611..0fa203aaa0d 100644
--- a/src/mess/drivers/jr100.c
+++ b/src/mess/drivers/jr100.c
@@ -31,7 +31,7 @@ public:
 		m_vram(*this, "vram"),
 		m_via(*this, "via"),
 		m_cassette(*this, "cassette"),
-		m_beeper(*this, BEEPER_TAG),
+		m_beeper(*this, "beeper"),
 		m_speaker(*this, "speaker"),
 		m_region_maincpu(*this, "maincpu"),
 		m_line0(*this, "LINE0"),
@@ -413,7 +413,7 @@ static MACHINE_CONFIG_START( jr100, jr100_state )
 	MCFG_SOUND_ADD("speaker", SPEAKER_SOUND, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 
 	MCFG_CASSETTE_ADD( "cassette", jr100_cassette_interface )
diff --git a/src/mess/drivers/jr200.c b/src/mess/drivers/jr200.c
index c9bba31c082..a9fa13087cf 100644
--- a/src/mess/drivers/jr200.c
+++ b/src/mess/drivers/jr200.c
@@ -29,7 +29,7 @@ public:
 		m_cram(*this, "cram"),
 		m_mn1271_ram(*this, "mn1271_ram"),
 		m_maincpu(*this, "maincpu"),
-		m_beeper(*this, BEEPER_TAG),
+		m_beeper(*this, "beeper"),
 		m_pcg(*this, "pcg"),
 		m_gfx_rom(*this, "gfx_rom"),
 		m_gfx_ram(*this, "gfx_ram"),
@@ -559,7 +559,7 @@ static MACHINE_CONFIG_START( jr200, jr200_state )
 
 	// AY-8910 ?
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/kaypro.c b/src/mess/drivers/kaypro.c
index e81cecf1f89..af9d0281967 100644
--- a/src/mess/drivers/kaypro.c
+++ b/src/mess/drivers/kaypro.c
@@ -263,7 +263,7 @@ static MACHINE_CONFIG_START( kayproii, kaypro_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
 	/* devices */
@@ -308,7 +308,7 @@ static MACHINE_CONFIG_START( kaypro2x, kaypro_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
 	/* devices */
diff --git a/src/mess/drivers/lx800.c b/src/mess/drivers/lx800.c
index 162f9d154d1..90983bd2041 100644
--- a/src/mess/drivers/lx800.c
+++ b/src/mess/drivers/lx800.c
@@ -31,7 +31,7 @@ public:
 	lx800_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 	m_maincpu(*this, "maincpu"),
-	m_beep(*this, BEEPER_TAG)
+	m_beep(*this, "beeper")
 	{ }
 
 	required_device<cpu_device> m_maincpu;
@@ -268,7 +268,7 @@ static MACHINE_CONFIG_START( lx800, lx800_state )
 
 	/* audio hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	/* gate array */
diff --git a/src/mess/drivers/mephisto.c b/src/mess/drivers/mephisto.c
index 947bd9ef743..3f18be1ce77 100644
--- a/src/mess/drivers/mephisto.c
+++ b/src/mess/drivers/mephisto.c
@@ -74,7 +74,7 @@ public:
 	mephisto_state(const machine_config &mconfig, device_type type, const char *tag)
 		: mboard_state(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_beep(*this, BEEPER_TAG)
+		, m_beep(*this, "beeper")
 		, m_key1_0(*this, "KEY1_0")
 		, m_key1_1(*this, "KEY1_1")
 		, m_key1_2(*this, "KEY1_2")
@@ -459,7 +459,7 @@ static MACHINE_CONFIG_START( mephisto, mephisto_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", mephisto_state, update_nmi, attotime::from_hz(600))
diff --git a/src/mess/drivers/micronic.c b/src/mess/drivers/micronic.c
index 7a0f11534b4..21e0d054b61 100644
--- a/src/mess/drivers/micronic.c
+++ b/src/mess/drivers/micronic.c
@@ -384,7 +384,7 @@ static MACHINE_CONFIG_START( micronic, micronic_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
+	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
 
 	/* ram banks */
diff --git a/src/mess/drivers/mmodular.c b/src/mess/drivers/mmodular.c
index 0a751a350aa..5bdde66b695 100644
--- a/src/mess/drivers/mmodular.c
+++ b/src/mess/drivers/mmodular.c
@@ -129,10 +129,12 @@ class polgar_state : public mboard_state
 public:
 	polgar_state(const machine_config &mconfig, device_type type, const char *tag)
 		: mboard_state(mconfig, type, tag),
-			m_lcdc(*this, "hd44780")
+			m_lcdc(*this, "hd44780"),
+			m_beeper(*this, "beeper")
 		{ }
 
 	optional_device<hd44780_device> m_lcdc;
+	optional_device<beep_device> m_beeper;
 
 	UINT8 led_status;
 	UINT8 lcd_char;
@@ -244,9 +246,9 @@ WRITE8_MEMBER(polgar_state::write_polgar_IO)
 	}
 
 	if (BIT(data,2) || BIT(data,3))
-			machine().device<beep_device>("beep")->set_state(1);
+			m_beeper->set_state(1);
 		else
-			machine().device<beep_device>("beep")->set_state(0);
+			m_beeper->set_state(0);
 
 	if (BIT(data,7) && BIT(data, 4)) {
 		for (i = 0;i < 8;i++)
@@ -412,9 +414,9 @@ WRITE8_MEMBER(polgar_state::milano_write_LED)
 WRITE8_MEMBER(polgar_state::megaiv_write_LED)
 {
 	if (BIT(data,7))
-		machine().device<beep_device>("beep")->set_state(1);
+		m_beeper->set_state(1);
 	else
-		machine().device<beep_device>("beep")->set_state(0);
+		m_beeper->set_state(0);
 	output_set_led_value(102,BIT(data,1)?1:0);
 	output_set_led_value(107,BIT(data,6)?1:0);
 
@@ -475,13 +477,13 @@ if ((data & 0xa1) == 0xa1) {
 }
 
 if (BIT(data,7))
-	machine().device<beep_device>("beep")->set_state(1);
+	m_beeper->set_state(1);
 else
-	machine().device<beep_device>("beep")->set_state(0);
+	m_beeper->set_state(0);
 if (BIT(data,1))
-	machine().device<beep_device>("beep")->set_state(1);
+	m_beeper->set_state(1);
 else
-	machine().device<beep_device>("beep")->set_state(0);
+	m_beeper->set_state(0);
 //  logerror("LEDs  FUNC = %02x found = %d\n",data,found);
 	if (!found) {
 		logerror("unknown LED mask %d\n",data);
@@ -724,9 +726,9 @@ READ32_MEMBER(polgar_state::read_keys_BPL32)
 WRITE8_MEMBER(polgar_state::beep_academy)
 {
 	if (!BIT(data,7))
-			machine().device<beep_device>("beep")->set_state(1);
+			m_beeper->set_state(1);
 		else
-			machine().device<beep_device>("beep")->set_state(0);
+			m_beeper->set_state(0);
 }
 
 WRITE8_MEMBER(polgar_state::megaiv_IO)
@@ -878,7 +880,6 @@ WRITE16_MEMBER(polgar_state::write_LCD_data)
 void polgar_state::write_IOenable(unsigned char data,address_space &space)
 {
 	hd44780_device * hd44780 = space.machine().device<hd44780_device>("hd44780");
-	beep_device *speaker = machine().device<beep_device>("beep");
 
 	if (BIT(data,5) && BIT(data,4)) {
 		if (BIT(data,1)) {
@@ -904,9 +905,9 @@ void polgar_state::write_IOenable(unsigned char data,address_space &space)
 	logerror("Write to IOENBL data: %08x\n",data);
 
 		if (BIT(data,2) || BIT(data,3))
-					speaker->set_state(1);
+					m_beeper->set_state(1);
 				else
-					speaker->set_state(0);
+					m_beeper->set_state(0);
 	}
 
 }
@@ -1532,7 +1533,7 @@ static MACHINE_CONFIG_FRAGMENT ( chess_common )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD("beep", BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 MACHINE_CONFIG_END
diff --git a/src/mess/drivers/ms0515.c b/src/mess/drivers/ms0515.c
index 78a13f86934..f307e6cac08 100644
--- a/src/mess/drivers/ms0515.c
+++ b/src/mess/drivers/ms0515.c
@@ -19,10 +19,12 @@ class ms0515_state : public driver_device
 public:
 	ms0515_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-			m_maincpu(*this, "maincpu")
+			m_maincpu(*this, "maincpu"),
+			m_ram(*this, RAM_TAG)
 	{ }
 
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 
 	DECLARE_WRITE16_MEMBER(ms0515_bank_w);
 	DECLARE_WRITE8_MEMBER(ms0515_sys_w);
@@ -83,7 +85,7 @@ ADDRESS_MAP_END
 
 WRITE16_MEMBER(ms0515_state::ms0515_bank_w)
 {
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 	membank("bank0")->set_base(ram + 0000000 + BIT(data,0) * 0160000);
 	membank("bank1")->set_base(ram + 0020000 + BIT(data,1) * 0160000);
 	membank("bank2")->set_base(ram + 0040000 + BIT(data,2) * 0160000);
@@ -118,7 +120,7 @@ WRITE8_MEMBER(ms0515_state::ms0515_sys_w)
 
 void ms0515_state::machine_reset()
 {
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 	ms0515_bank_w(machine().driver_data()->generic_space(),0,0);
 
 	m_video_ram = ram + 0000000 + 0340000;
diff --git a/src/mess/drivers/mstation.c b/src/mess/drivers/mstation.c
index f4f2d512ffc..6453e3ceb4e 100644
--- a/src/mess/drivers/mstation.c
+++ b/src/mess/drivers/mstation.c
@@ -36,10 +36,12 @@ class mstation_state : public driver_device
 public:
 	mstation_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-			m_maincpu(*this, "maincpu")
+			m_maincpu(*this, "maincpu"),
+			m_ram(*this, RAM_TAG)
 		{ }
 
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 
 	intelfsh8_device *m_flashes[2];
 	UINT8 m_bank1[2];
@@ -454,7 +456,7 @@ void mstation_state::machine_start()
 
 	// allocate the videoram
 	m_vram = (UINT8*)machine().memory().region_alloc( "vram", 9600, 1, ENDIANNESS_LITTLE )->base();
-	m_ram_base = (UINT8*)machine().device<ram_device>(RAM_TAG)->pointer();
+	m_ram_base = (UINT8*)m_ram->pointer();
 
 	// map firsh RAM bank at 0xc000-0xffff
 	membank("sysram")->set_base(m_ram_base);
diff --git a/src/mess/drivers/multi8.c b/src/mess/drivers/multi8.c
index 669c6119ab8..4e48663a7e1 100644
--- a/src/mess/drivers/multi8.c
+++ b/src/mess/drivers/multi8.c
@@ -28,13 +28,13 @@ public:
 	m_maincpu(*this, "maincpu"),
 	m_ppi(*this, "ppi8255_0"),
 	m_crtc(*this, "crtc"),
-	m_beep(*this, BEEPER_TAG)
+	m_beeper(*this, "beeper")
 	{ }
 
 	required_device<cpu_device> m_maincpu;
 	required_device<i8255_device> m_ppi;
 	required_device<mc6845_device> m_crtc;
-	required_device<beep_device> m_beep;
+	required_device<beep_device> m_beeper;
 	DECLARE_WRITE8_MEMBER(multi8_6845_w);
 	DECLARE_READ8_MEMBER(key_input_r);
 	DECLARE_READ8_MEMBER(key_status_r);
@@ -629,7 +629,7 @@ static I8255_INTERFACE( ppi8255_intf_0 )
 
 WRITE8_MEMBER( multi8_state::ym2203_porta_w )
 {
-	m_beep->set_state((data & 0x08));
+	m_beeper->set_state((data & 0x08));
 }
 
 static const ym2203_interface ym2203_config =
@@ -655,8 +655,8 @@ void multi8_state::machine_start()
 
 void multi8_state::machine_reset()
 {
-	machine().device<beep_device>(BEEPER_TAG)->set_frequency(1200); //guesswork
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_frequency(1200); //guesswork
+	m_beeper->set_state(0);
 	m_mcu_init = 0;
 }
 
@@ -682,7 +682,7 @@ static MACHINE_CONFIG_START( multi8, multi8_state )
 	MCFG_SOUND_ADD("aysnd", AY8912, 1500000) //unknown clock / divider
 	MCFG_SOUND_CONFIG(ym2203_config)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 
 	/* Devices */
diff --git a/src/mess/drivers/mz2000.c b/src/mess/drivers/mz2000.c
index 66f14a7f861..524b91b520b 100644
--- a/src/mess/drivers/mz2000.c
+++ b/src/mess/drivers/mz2000.c
@@ -43,7 +43,7 @@ public:
 		m_maincpu(*this, "maincpu"),
 		m_mb8877a(*this, "mb8877a"),
 		m_pit8253(*this, "pit"),
-		m_beeper(*this, BEEPER_TAG),
+		m_beeper(*this, "beeper"),
 		m_region_tvram(*this, "tvram"),
 		m_region_gvram(*this, "gvram"),
 		m_region_chargen(*this, "chargen"),
@@ -892,7 +892,7 @@ static MACHINE_CONFIG_START( mz2000, mz2000_state )
 	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/mz2500.c b/src/mess/drivers/mz2500.c
index be736e044e5..2b51340a383 100644
--- a/src/mess/drivers/mz2500.c
+++ b/src/mess/drivers/mz2500.c
@@ -65,11 +65,13 @@ public:
 	mz2500_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_rtc(*this, RP5C15_TAG)
+		m_rtc(*this, RP5C15_TAG),
+		m_beeper(*this, "beeper")
 	{ }
 
 	required_device<cpu_device> m_maincpu;
 	required_device<rp5c15_device> m_rtc;
+	required_device<beep_device> m_beeper;
 
 	UINT8 *m_main_ram;
 	UINT8 *m_ipl_rom;
@@ -1806,8 +1808,8 @@ void mz2500_state::machine_reset()
 
 	m_cg_clear_flag = 0;
 
-	machine().device<beep_device>(BEEPER_TAG)->set_frequency(4096);
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_frequency(4096);
+	m_beeper->set_state(0);
 
 //  m_monitor_type = ioport("DSW1")->read() & 0x40 ? 1 : 0;
 }
@@ -1921,7 +1923,7 @@ WRITE8_MEMBER(mz2500_state::mz2500_portc_w)
 
 	m_old_portc = data;
 
-	machine().device<beep_device>(BEEPER_TAG)->set_state(data & 0x04);
+	m_beeper->set_state(data & 0x04);
 
 	m_screen_enable = data & 1;
 
@@ -2157,7 +2159,7 @@ static MACHINE_CONFIG_START( mz2500, mz2500_state )
 	MCFG_SOUND_ROUTE(2, "mono", 0.50)
 	MCFG_SOUND_ROUTE(3, "mono", 0.50)
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/mz3500.c b/src/mess/drivers/mz3500.c
index b5ac0243550..ed501728952 100644
--- a/src/mess/drivers/mz3500.c
+++ b/src/mess/drivers/mz3500.c
@@ -46,7 +46,8 @@ public:
 			m_hgdc1(*this, "upd7220_chr"),
 			m_hgdc2(*this, "upd7220_gfx"),
 			m_fdc(*this, "upd765a"),
-			m_video_ram(*this, "video_ram")
+			m_video_ram(*this, "video_ram"),
+			m_beeper(*this, "beeper")
 	{ }
 
 	// devices
@@ -56,6 +57,8 @@ public:
 	required_device<upd7220_device> m_hgdc2;
 	required_device<upd765a_device> m_fdc;
 	required_shared_ptr<UINT8> m_video_ram;
+	required_device<beep_device> m_beeper;
+	
 	UINT8 *m_ipl_rom;
 	UINT8 *m_basic_rom;
 	UINT8 *m_work_ram;
@@ -661,7 +664,7 @@ WRITE8_MEMBER(mz3500_state::mz3500_pc_w)
 	*/
 	//printf("%02x PC\n",data);
 
-	machine().device<beep_device>(BEEPER_TAG)->set_state(data & 0x10);
+	m_beeper->set_state(data & 0x10);
 
 }
 
@@ -815,8 +818,8 @@ void mz3500_state::machine_reset()
 		}
 	}
 
-	machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_frequency(2400);
+	m_beeper->set_state(0);
 }
 
 
@@ -883,7 +886,7 @@ static MACHINE_CONFIG_START( mz3500, mz3500_state )
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/nc.c b/src/mess/drivers/nc.c
index e195929e1b5..d930f7fc59d 100644
--- a/src/mess/drivers/nc.c
+++ b/src/mess/drivers/nc.c
@@ -347,7 +347,7 @@ void nc_state::nc_refresh_memory_bank_config(int bank)
 
 			mem_bank = mem_bank & m_membank_internal_ram_mask;
 
-			addr = machine().device<ram_device>(RAM_TAG)->pointer() + (mem_bank<<14);
+			addr = m_ram->pointer() + (mem_bank<<14);
 
 			membank(bank1)->set_base(addr);
 			membank(bank5)->set_base(addr);
@@ -420,13 +420,13 @@ void nc_state::nc_common_restore_memory_from_stream()
 	if (m_file->read(&stored_size, sizeof(UINT32)) != sizeof(UINT32))
 		stored_size = 0;
 
-	if (stored_size > machine().device<ram_device>(RAM_TAG)->size())
-		restore_size = machine().device<ram_device>(RAM_TAG)->size();
+	if (stored_size > m_ram->size())
+		restore_size = m_ram->size();
 	else
 		restore_size = stored_size;
 
 	/* read as much as will fit into memory */
-	m_file->read(machine().device<ram_device>(RAM_TAG)->pointer(), restore_size);
+	m_file->read(m_ram->pointer(), restore_size);
 	/* seek over remaining data */
 	m_file->seek(SEEK_CUR,stored_size - restore_size);
 }
@@ -434,7 +434,7 @@ void nc_state::nc_common_restore_memory_from_stream()
 /* store a block of memory to the nvram file */
 void nc_state::nc_common_store_memory_to_stream()
 {
-	UINT32 size = machine().device<ram_device>(RAM_TAG)->size();
+	UINT32 size = m_ram->size();
 	if (!m_file)
 		return;
 
@@ -443,7 +443,7 @@ void nc_state::nc_common_store_memory_to_stream()
 	m_file->write(&size, sizeof(UINT32));
 
 	/* write data block */
-	m_file->write(machine().device<ram_device>(RAM_TAG)->pointer(), size);
+	m_file->write(m_ram->pointer(), size);
 }
 
 void nc_state::nc_common_open_stream_for_reading()
@@ -660,15 +660,15 @@ void nc_state::nc_sound_update(int channel)
 	int on;
 	int frequency;
 	int period;
-	const char *beeper_device = NULL;
+	beep_device *beeper_device = NULL;
 
 	switch(channel)
 	{
 		case 0:
-			beeper_device = "beep.1";
+			beeper_device = m_beeper1;
 			break;
 		case 1:
-			beeper_device = "beep.2";
+			beeper_device = m_beeper2;
 			break;
 	}
 
@@ -681,9 +681,9 @@ void nc_state::nc_sound_update(int channel)
 	frequency = (int)(1000000.0f/((float)((period & 0x07fff)<<1) * 1.6276f));
 
 	/* set state */
-	machine().device<beep_device>(beeper_device)->set_state(on);
+	beeper_device->set_state(on);
 	/* set frequency */
-	machine().device<beep_device>(beeper_device)->set_frequency(frequency);
+	beeper_device->set_frequency(frequency);
 }
 
 WRITE8_MEMBER(nc_state::nc_sound_w)
diff --git a/src/mess/drivers/osborne1.c b/src/mess/drivers/osborne1.c
index 535a6012b81..a83f18edfaa 100644
--- a/src/mess/drivers/osborne1.c
+++ b/src/mess/drivers/osborne1.c
@@ -246,7 +246,7 @@ static MACHINE_CONFIG_START( osborne1, osborne1_state )
 	MCFG_PALETTE_LENGTH( 3 )
 
 	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
+	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
 
 	MCFG_PIA6821_ADD( "pia_0", osborne1_ieee_pia_config )
diff --git a/src/mess/drivers/osi.c b/src/mess/drivers/osi.c
index 007083ee432..c34bd10dfbc 100644
--- a/src/mess/drivers/osi.c
+++ b/src/mess/drivers/osi.c
@@ -852,7 +852,7 @@ static MACHINE_CONFIG_START( c1p, c1p_state )
 	MCFG_SOUND_ADD(DISCRETE_TAG, DISCRETE, 0)
 	MCFG_SOUND_CONFIG_DISCRETE(osi600c_discrete_interface)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MCFG_PIA6821_ADD( "pia_1", pia_dummy_intf )
@@ -933,9 +933,8 @@ ROM_END
 
 TIMER_CALLBACK_MEMBER(sb2m600_state::setup_beep)
 {
-	beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
-	speaker->set_state(0);
-	speaker->set_frequency(300);
+	m_beeper->set_state(0);
+	m_beeper->set_frequency(300);
 }
 
 DRIVER_INIT_MEMBER(c1p_state,c1p)
diff --git a/src/mess/drivers/p8k.c b/src/mess/drivers/p8k.c
index 71816dba69c..8845596cea0 100644
--- a/src/mess/drivers/p8k.c
+++ b/src/mess/drivers/p8k.c
@@ -792,7 +792,7 @@ static MACHINE_CONFIG_START( p8k, p8k_state )
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
 
 	/* video hardware */
@@ -819,7 +819,7 @@ static MACHINE_CONFIG_START( p8k_16, p8k_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5)
 
 	/* video hardware */
diff --git a/src/mess/drivers/pb1000.c b/src/mess/drivers/pb1000.c
index e1e7976ebbb..25e4f6cf1dd 100644
--- a/src/mess/drivers/pb1000.c
+++ b/src/mess/drivers/pb1000.c
@@ -31,12 +31,12 @@ public:
 	pb1000_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 			m_maincpu(*this, "maincpu"),
-			m_beep(*this, BEEPER_TAG),
+			m_beeper(*this, "beeper"),
 			m_hd44352(*this, "hd44352")
 		{ }
 
 	required_device<hd61700_cpu_device> m_maincpu;
-	required_device<beep_device> m_beep;
+	required_device<beep_device> m_beeper;
 	required_device<hd44352_device> m_hd44352;
 
 	emu_timer *m_kb_timer;
@@ -443,7 +443,8 @@ static UINT8 pb2000c_port_r(hd61700_cpu_device &device)
 
 static void port_w(hd61700_cpu_device &device, UINT8 data)
 {
-	device.machine().device<beep_device>(BEEPER_TAG)->set_state((BIT(data,7) ^ BIT(data,6)));
+	pb1000_state *state = device.machine().driver_data<pb1000_state>();
+	state->m_beeper->set_state((BIT(data,7) ^ BIT(data,6)));
 	//printf("%x\n", data);
 }
 
@@ -526,7 +527,7 @@ static MACHINE_CONFIG_START( pb1000, pb1000_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
+	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/pc100.c b/src/mess/drivers/pc100.c
index e96bd57804b..8541a782e1e 100644
--- a/src/mess/drivers/pc100.c
+++ b/src/mess/drivers/pc100.c
@@ -67,9 +67,9 @@ public:
 	pc100_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_rtc(*this, "rtc"),
-		m_palram(*this, "palram")
-		,
-		m_maincpu(*this, "maincpu") { }
+		m_palram(*this, "palram"),
+		m_maincpu(*this, "maincpu"),
+		m_beeper(*this, "beeper") { }
 
 	required_device<msm58321_device> m_rtc;
 	required_shared_ptr<UINT16> m_palram;
@@ -118,6 +118,7 @@ public:
 	TIMER_DEVICE_CALLBACK_MEMBER(pc100_10hz_irq);
 	IRQ_CALLBACK_MEMBER(pc100_irq_callback);
 	required_device<cpu_device> m_maincpu;
+	required_device<beep_device> m_beeper;
 };
 
 void pc100_state::video_start()
@@ -219,7 +220,7 @@ WRITE8_MEMBER( pc100_state::pc100_output_w )
 	if(offset == 0)
 	{
 		m_timer_mode = (data & 0x18) >> 3;
-		machine().device<beep_device>(BEEPER_TAG)->set_state(((data & 0x40) >> 6) ^ 1);
+		m_beeper->set_state(((data & 0x40) >> 6) ^ 1);
 		printf("%02x\n",data & 0xc0);
 	}
 }
@@ -429,8 +430,8 @@ void pc100_state::machine_start()
 
 void pc100_state::machine_reset()
 {
-	machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_frequency(2400);
+	m_beeper->set_state(0);
 }
 
 INTERRUPT_GEN_MEMBER(pc100_state::pc100_vblank_irq)
@@ -517,7 +518,7 @@ static MACHINE_CONFIG_START( pc100, pc100_state )
 
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/pc2000.c b/src/mess/drivers/pc2000.c
index c57df8afded..93e87658de9 100644
--- a/src/mess/drivers/pc2000.c
+++ b/src/mess/drivers/pc2000.c
@@ -28,7 +28,7 @@ public:
 		: driver_device(mconfig, type, tag),
 			m_maincpu(*this, "maincpu"),
 			m_lcdc(*this, "hd44780"),
-			m_beep(*this, BEEPER_TAG),
+			m_beep(*this, "beeper"),
 			m_bank1(*this, "bank1"),
 			m_bank2(*this, "bank2")
 		{ }
@@ -560,7 +560,7 @@ static MACHINE_CONFIG_START( pc2000, pc2000_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
+	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
 
 	MCFG_CARTSLOT_ADD("cart")
diff --git a/src/mess/drivers/pc4.c b/src/mess/drivers/pc4.c
index 1149b84b590..47f774a9167 100644
--- a/src/mess/drivers/pc4.c
+++ b/src/mess/drivers/pc4.c
@@ -233,7 +233,7 @@ static MACHINE_CONFIG_START( pc4, pc4_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
+	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
 
 	MCFG_RP5C01_ADD("rtc", XTAL_32_768kHz, rtc_intf)
diff --git a/src/mess/drivers/pc8801.c b/src/mess/drivers/pc8801.c
index 0c359c2245c..065329e7d35 100644
--- a/src/mess/drivers/pc8801.c
+++ b/src/mess/drivers/pc8801.c
@@ -303,7 +303,8 @@ public:
 			m_fdccpu(*this, "fdccpu"),
 			m_pic(*this, I8214_TAG),
 			m_rtc(*this, UPD1990A_TAG),
-			m_cassette(*this, "cassette")
+			m_cassette(*this, "cassette"),
+			m_beeper(*this, "beeper")
 	{ }
 
 	required_device<cpu_device> m_maincpu;
@@ -311,6 +312,7 @@ public:
 	optional_device<i8214_device> m_pic;
 	required_device<upd1990a_device> m_rtc;
 	required_device<cassette_image_device> m_cassette;
+	required_device<beep_device> m_beeper;
 	UINT8 *m_work_ram;
 	UINT8 *m_hi_work_ram;
 	UINT8 *m_ext_work_ram;
@@ -1185,10 +1187,10 @@ WRITE8_MEMBER(pc8801_state::pc8801_ctrl_w)
 	m_rtc->clk_w((data & 4) >> 2);
 
 	if(((m_device_ctrl_data & 0x20) == 0x00) && ((data & 0x20) == 0x20))
-		machine().device<beep_device>(BEEPER_TAG)->set_state(1);
+		m_beeper->set_state(1);
 
 	if(((m_device_ctrl_data & 0x20) == 0x20) && ((data & 0x20) == 0x00))
-		machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+		m_beeper->set_state(0);
 
 	if((m_device_ctrl_data & 0x40) != (data & 0x40))
 	{
@@ -1215,7 +1217,7 @@ WRITE8_MEMBER(pc8801_state::pc8801_ctrl_w)
 
 	/* TODO: is SING a buzzer mask? Bastard Special relies on this ... */
 	if(m_device_ctrl_data & 0x80)
-		machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+		m_beeper->set_state(0);
 
 	m_device_ctrl_data = data;
 }
@@ -2473,8 +2475,8 @@ void pc8801_state::machine_reset()
 		m_crtc.status = 0;
 	}
 
-	machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_frequency(2400);
+	m_beeper->set_state(0);
 
 	#ifdef USE_PROPER_I8214
 	{
@@ -2708,7 +2710,7 @@ static MACHINE_CONFIG_START( pc8801, pc8801_state )
 	MCFG_SOUND_CONFIG(pc88_ym2608_intf)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("rtc_timer", pc8801_state, pc8801_rtc_irq, attotime::from_hz(600))
diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c
index 5b7f3fa2d12..34b00673653 100644
--- a/src/mess/drivers/pc9801.c
+++ b/src/mess/drivers/pc9801.c
@@ -365,7 +365,9 @@ public:
 		m_hgdc2(*this, "upd7220_btm"),
 		m_sasibus(*this, SASIBUS_TAG ":host"),
 		m_video_ram_1(*this, "video_ram_1"),
-		m_video_ram_2(*this, "video_ram_2"){ }
+		m_video_ram_2(*this, "video_ram_2"),
+		m_beeper(*this, "beeper"),
+		m_ram(*this, RAM_TAG) { }
 
 	required_device<cpu_device> m_maincpu;
 	required_device<am9517a_device> m_dmac;
@@ -379,6 +381,8 @@ public:
 	optional_device<scsicb_device> m_sasibus;
 	required_shared_ptr<UINT8> m_video_ram_1;
 	required_shared_ptr<UINT8> m_video_ram_2;
+	required_device<beep_device> m_beeper;
+	optional_device<ram_device> m_ram;	
 
 	virtual void video_start();
 	UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -3109,7 +3113,7 @@ READ8_MEMBER(pc9801_state::ppi_prn_portb_r){ return ioport("DSW5")->read(); }
 
 WRITE8_MEMBER(pc9801_state::ppi_sys_portc_w)
 {
-	machine().device<beep_device>(BEEPER_TAG)->set_state(!(data & 0x08));
+	m_beeper->set_state(!(data & 0x08));
 }
 
 static I8255A_INTERFACE( ppi_system_intf )
@@ -3388,7 +3392,7 @@ MACHINE_START_MEMBER(pc9801_state,pc9801rs)
 	state_save_register_global_pointer(machine(), m_work_ram, 0xa0000);
 	state_save_register_global_pointer(machine(), m_ext_work_ram, 0x700000);
 
-	m_ram_size = machine().device<ram_device>(RAM_TAG)->size() - 0xa0000;
+	m_ram_size = m_ram->size() - 0xa0000;
 
 	upd765a_device *fdc;
 	fdc = machine().device<upd765a_device>(":upd765_2hd");
@@ -3427,8 +3431,8 @@ MACHINE_RESET_MEMBER(pc9801_state,pc9801_common)
 			m_tvram[(0x3fe0)+i*2] = default_memsw_data[i];
 	}
 
-	machine().device<beep_device>(BEEPER_TAG)->set_frequency(2400);
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_frequency(2400);
+	m_beeper->set_state(0);
 
 	m_nmi_ff = 0;
 	m_mouse.control = 0xff;
@@ -3612,7 +3616,7 @@ static MACHINE_CONFIG_START( pc9801, pc9801_state )
 
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
 MACHINE_CONFIG_END
 
@@ -3677,7 +3681,7 @@ static MACHINE_CONFIG_START( pc9801rs, pc9801_state )
 //  MCFG_SOUND_CONFIG(pc98_ym2608_intf)
 //  MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
 MACHINE_CONFIG_END
 
@@ -3743,7 +3747,7 @@ static MACHINE_CONFIG_START( pc9821, pc9801_state )
 //  MCFG_SOUND_CONFIG(pc98_ym2608_intf)
 //  MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15)
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/pce220.c b/src/mess/drivers/pce220.c
index 650dfefd2ff..b29583de9a8 100644
--- a/src/mess/drivers/pce220.c
+++ b/src/mess/drivers/pce220.c
@@ -42,7 +42,7 @@ public:
 		: driver_device(mconfig, type, tag),
 			m_maincpu(*this, "maincpu"),
 			m_ram(*this, RAM_TAG),
-			m_beep(*this, BEEPER_TAG),
+			m_beep(*this, "beeper"),
 			m_serial(*this, PCE220SERIAL_TAG)
 		{ }
 
@@ -939,7 +939,7 @@ static MACHINE_CONFIG_START( pce220, pce220_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pce220_state, pce220_timer_callback, attotime::from_msec(468))
@@ -974,7 +974,7 @@ static MACHINE_CONFIG_START( pcg850v, pcg850v_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("pce220_timer", pce220_state, pce220_timer_callback, attotime::from_msec(468))
diff --git a/src/mess/drivers/pcw.c b/src/mess/drivers/pcw.c
index 5d8e8b43c08..151ff06fc9f 100644
--- a/src/mess/drivers/pcw.c
+++ b/src/mess/drivers/pcw.c
@@ -239,7 +239,7 @@ void pcw_state::pcw_update_read_memory_block(int block, int bank)
 		space.install_read_bank(block * 0x04000 + 0x0000, block * 0x04000 + 0x3fff,block_name);
 //      LOG(("MEM: read block %i -> bank %i\n",block,bank));
 	}
-	membank(block_name)->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + ((bank * 0x4000) % machine().device<ram_device>(RAM_TAG)->size()));
+	membank(block_name)->set_base(m_ram->pointer() + ((bank * 0x4000) % m_ram->size()));
 }
 
 
@@ -249,7 +249,7 @@ void pcw_state::pcw_update_write_memory_block(int block, int bank)
 	char block_name[10];
 
 	sprintf(block_name,"bank%d",block+5);
-	membank(block_name)->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + ((bank * 0x4000) % machine().device<ram_device>(RAM_TAG)->size()));
+	membank(block_name)->set_base(m_ram->pointer() + ((bank * 0x4000) % m_ram->size()));
 //  LOG(("MEM: write block %i -> bank %i\n",block,bank));
 }
 
@@ -407,7 +407,6 @@ WRITE8_MEMBER(pcw_state::pcw_vdu_video_control_register_w)
 WRITE8_MEMBER(pcw_state::pcw_system_control_w)
 {
 	upd765a_device *fdc = machine().device<upd765a_device>("upd765");
-	beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
 	LOG(("SYSTEM CONTROL: %d\n",data));
 
 	switch (data)
@@ -545,14 +544,14 @@ WRITE8_MEMBER(pcw_state::pcw_system_control_w)
 		/* beep on */
 		case 11:
 		{
-			speaker->set_state(1);
+			m_beeper->set_state(1);
 		}
 		break;
 
 		/* beep off */
 		case 12:
 		{
-			speaker->set_state(0);
+			m_beeper->set_state(0);
 		}
 		break;
 
@@ -995,9 +994,8 @@ ADDRESS_MAP_END
 
 TIMER_CALLBACK_MEMBER(pcw_state::setup_beep)
 {
-	beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
-	speaker->set_state(0);
-	speaker->set_frequency(3750);
+	m_beeper->set_state(0);
+	m_beeper->set_frequency(3750);
 }
 
 
@@ -1028,9 +1026,9 @@ void pcw_state::machine_reset()
 	m_boot = 0;   // System starts up in bootstrap mode, disabled until it's possible to emulate it.
 
 	/* copy boot code into RAM - yes, it's skipping a step */
-	memset(machine().device<ram_device>(RAM_TAG)->pointer(),0x00,machine().device<ram_device>(RAM_TAG)->size());
+	memset(m_ram->pointer(),0x00,m_ram->size());
 	for(x=0;x<256;x++)
-		machine().device<ram_device>(RAM_TAG)->pointer()[x+2] = code[x+0x300];
+		m_ram->pointer()[x+2] = code[x+0x300];
 
 	/* and hack our way past the MCU side of the boot process */
 	code[0x01] = 0x40;
@@ -1291,7 +1289,7 @@ static MACHINE_CONFIG_START( pcw, pcw_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
 	MCFG_UPD765A_ADD("upd765", true, true)
diff --git a/src/mess/drivers/pcw16.c b/src/mess/drivers/pcw16.c
index 4d169e84c94..54e0810b744 100644
--- a/src/mess/drivers/pcw16.c
+++ b/src/mess/drivers/pcw16.c
@@ -842,14 +842,14 @@ WRITE8_MEMBER(pcw16_state::pcw16_system_control_w)
 		/* bleeper on */
 		case 0x0b:
 		{
-			m_speaker->set_state(1);
+			m_beeper->set_state(1);
 		}
 		break;
 
 		/* bleeper off */
 		case 0x0c:
 		{
-			m_speaker->set_state(0);
+			m_beeper->set_state(0);
 		}
 		break;
 
@@ -1005,7 +1005,6 @@ void pcw16_state::machine_reset()
 
 void pcw16_state::machine_start()
 {
-	beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
 	m_system_status = 0;
 	m_interrupt_counter = 0;
 
@@ -1015,8 +1014,8 @@ void pcw16_state::machine_start()
 	at_keyboard_init(machine(), AT_KEYBOARD_TYPE_AT);
 	at_keyboard_set_scan_code_set(3);
 
-	speaker->set_state(0);
-	speaker->set_frequency(3750);
+	m_beeper->set_state(0);
+	m_beeper->set_frequency(3750);
 }
 
 static INPUT_PORTS_START(pcw16)
@@ -1062,7 +1061,7 @@ static MACHINE_CONFIG_START( pcw16, pcw16_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
 	/* printer */
diff --git a/src/mess/drivers/portfoli.c b/src/mess/drivers/portfoli.c
index 3ddec174c3f..f42e75e263d 100644
--- a/src/mess/drivers/portfoli.c
+++ b/src/mess/drivers/portfoli.c
@@ -762,7 +762,7 @@ void portfolio_state::machine_start()
 	m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(portfolio_state::portfolio_int_ack),this));
 
 	/* memory expansions */
-	switch (machine().device<ram_device>(RAM_TAG)->size())
+	switch (m_ram->size())
 	{
 	case 128 * 1024:
 		program.unmap_readwrite(0x1f000, 0x9efff);
diff --git a/src/mess/drivers/psion.c b/src/mess/drivers/psion.c
index 32b43737b9a..d44b4a082de 100644
--- a/src/mess/drivers/psion.c
+++ b/src/mess/drivers/psion.c
@@ -490,7 +490,7 @@ static MACHINE_CONFIG_START( psion_2lines, psion_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
+	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
 
 	MCFG_NVRAM_HANDLER(psion)
diff --git a/src/mess/drivers/pyl601.c b/src/mess/drivers/pyl601.c
index 52b496650ab..a0dc8a54b03 100644
--- a/src/mess/drivers/pyl601.c
+++ b/src/mess/drivers/pyl601.c
@@ -498,7 +498,7 @@ static MC6845_INTERFACE( pyl601a_crtc6845_interface )
 
 DRIVER_INIT_MEMBER(pyl601_state,pyl601)
 {
-	memset(machine().device<ram_device>(RAM_TAG)->pointer(), 0, 64 * 1024);
+	memset(m_ram->pointer(), 0, 64 * 1024);
 }
 
 INTERRUPT_GEN_MEMBER(pyl601_state::pyl601_interrupt)
diff --git a/src/mess/drivers/qx10.c b/src/mess/drivers/qx10.c
index 96f3789f7e6..be42699606a 100644
--- a/src/mess/drivers/qx10.c
+++ b/src/mess/drivers/qx10.c
@@ -64,9 +64,9 @@ public:
 	m_fdc(*this, "upd765"),
 	m_hgdc(*this, "upd7220"),
 	m_rtc(*this, "rtc"),
-	m_vram_bank(0)
-	,
-		m_maincpu(*this, "maincpu") { }
+	m_vram_bank(0),
+	m_maincpu(*this, "maincpu"),
+	m_ram(*this, RAM_TAG) { }
 
 	required_device<pit8253_device> m_pit_1;
 	required_device<pit8253_device> m_pit_2;
@@ -149,6 +149,7 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(dma_hrq_changed);
 	IRQ_CALLBACK_MEMBER(irq_callback);
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 };
 
 static UPD7220_DISPLAY_PIXELS( hgdc_display_pixels )
@@ -274,7 +275,7 @@ void qx10_state::update_memory_mapping()
 	}
 	else
 	{
-		membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + drambank*64*1024);
+		membank("bank1")->set_base(m_ram->pointer() + drambank*64*1024);
 	}
 	if (m_memcmos)
 	{
@@ -282,7 +283,7 @@ void qx10_state::update_memory_mapping()
 	}
 	else
 	{
-		membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + drambank*64*1024 + 32*1024);
+		membank("bank2")->set_base(m_ram->pointer() + drambank*64*1024 + 32*1024);
 	}
 }
 
diff --git a/src/mess/drivers/rex6000.c b/src/mess/drivers/rex6000.c
index fce3b02468c..70d4d5aeaf4 100644
--- a/src/mess/drivers/rex6000.c
+++ b/src/mess/drivers/rex6000.c
@@ -61,7 +61,7 @@ public:
 		: driver_device(mconfig, type, tag),
 			m_maincpu(*this, "maincpu"),
 			m_ram(*this, RAM_TAG),
-			m_beep(*this, BEEPER_TAG)
+			m_beep(*this, "beeper")
 		{ }
 
 	required_device<cpu_device> m_maincpu;
@@ -684,7 +684,7 @@ static MACHINE_CONFIG_START( rex6000, rex6000_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
+	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 )
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/rt1715.c b/src/mess/drivers/rt1715.c
index c335e6ed41e..bd78550c77f 100644
--- a/src/mess/drivers/rt1715.c
+++ b/src/mess/drivers/rt1715.c
@@ -27,7 +27,8 @@ class rt1715_state : public driver_device
 public:
 	rt1715_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag) ,
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG) { }
 
 	int m_led1_val;
 	int m_led2_val;
@@ -41,6 +42,7 @@ public:
 	virtual void machine_reset();
 	virtual void palette_init();
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 };
 
 
@@ -109,8 +111,8 @@ WRITE8_MEMBER(rt1715_state::k7658_data_w)
 
 void rt1715_state::machine_start()
 {
-	membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x0800);
-	membank("bank3")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+	membank("bank2")->set_base(m_ram->pointer() + 0x0800);
+	membank("bank3")->set_base(m_ram->pointer());
 }
 
 void rt1715_state::machine_reset()
@@ -124,7 +126,7 @@ WRITE8_MEMBER(rt1715_state::rt1715_rom_disable)
 	logerror("%s: rt1715_set_bank %02x\n", machine().describe_context(), data);
 
 	/* disable ROM, enable RAM */
-	membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+	membank("bank1")->set_base(m_ram->pointer());
 }
 
 /***************************************************************************
diff --git a/src/mess/drivers/rx78.c b/src/mess/drivers/rx78.c
index 886ffa307d3..a9567725331 100644
--- a/src/mess/drivers/rx78.c
+++ b/src/mess/drivers/rx78.c
@@ -52,8 +52,9 @@ class rx78_state : public driver_device
 public:
 	rx78_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-	m_maincpu(*this, "maincpu"),
-	m_cass(*this, "cassette")
+		m_maincpu(*this, "maincpu"),
+		m_cass(*this, "cassette"),
+		m_ram(*this, RAM_TAG)
 	{ }
 
 	DECLARE_READ8_MEMBER( key_r );
@@ -78,6 +79,7 @@ public:
 	DECLARE_DRIVER_INIT(rx78);
 	required_device<cpu_device> m_maincpu;
 	required_device<cassette_image_device> m_cass;
+	required_device<ram_device> m_ram;
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER( rx78_cart );
 };
 
@@ -514,7 +516,7 @@ ROM_END
 
 DRIVER_INIT_MEMBER(rx78_state,rx78)
 {
-	UINT32 ram_size = machine().device<ram_device>(RAM_TAG)->size();
+	UINT32 ram_size = m_ram->size();
 	address_space &prg = m_maincpu->space(AS_PROGRAM);
 
 	if(ram_size == 0x4000)
diff --git a/src/mess/drivers/sc2.c b/src/mess/drivers/sc2.c
index 1bcc96c3679..7bfd6f08ee8 100644
--- a/src/mess/drivers/sc2.c
+++ b/src/mess/drivers/sc2.c
@@ -20,7 +20,7 @@ class sc2_state : public driver_device
 public:
 	sc2_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-	m_beep(*this, BEEPER_TAG)
+	m_beep(*this, "beeper")
 	,
 		m_maincpu(*this, "maincpu") { }
 
@@ -219,7 +219,7 @@ static MACHINE_CONFIG_START( sc2, sc2_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
+	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 0.50 )
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/smc777.c b/src/mess/drivers/smc777.c
index 288479fef1d..432273b878d 100644
--- a/src/mess/drivers/smc777.c
+++ b/src/mess/drivers/smc777.c
@@ -52,13 +52,15 @@ public:
 	m_maincpu(*this, "maincpu"),
 	m_crtc(*this, "crtc"),
 	m_fdc(*this, "fdc"),
-	m_sn(*this, "sn1")
+	m_sn(*this, "sn1"),
+	m_beeper(*this, "beeper")
 	{ }
 
 	required_device<cpu_device> m_maincpu;
 	required_device<mc6845_device> m_crtc;
 	required_device<mb8876_device> m_fdc;
 	optional_device<sn76489a_device> m_sn;
+	required_device<beep_device> m_beeper;
 
 	UINT8 *m_ipl_rom;
 	UINT8 *m_work_ram;
@@ -528,7 +530,7 @@ WRITE8_MEMBER(smc777_state::system_output_w)
 			m_raminh_prefetch = (UINT8)(space.device().state().state_int(Z80_R)) & 0x7f;
 			break;
 		case 0x02: printf("Interlace %s\n",data & 0x10 ? "on" : "off"); break;
-		case 0x05: machine().device<beep_device>(BEEPER_TAG)->set_state(data & 0x10); break;
+		case 0x05: m_beeper->set_state(data & 0x10); break;
 		default: printf("System FF W %02x\n",data); break;
 	}
 }
@@ -990,8 +992,8 @@ void smc777_state::machine_reset()
 	m_raminh_prefetch = 0xff;
 	m_pal_mode = 0x10;
 
-	machine().device<beep_device>(BEEPER_TAG)->set_frequency(300); //TODO: correct frequency
-	machine().device<beep_device>(BEEPER_TAG)->set_state(0);
+	m_beeper->set_frequency(300); //TODO: correct frequency
+	m_beeper->set_state(0);
 }
 
 
@@ -1114,7 +1116,7 @@ static MACHINE_CONFIG_START( smc777, smc777_state )
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 	MCFG_SOUND_CONFIG(psg_intf)
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.50)
 
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard_timer", smc777_state, keyboard_callback, attotime::from_hz(240/32))
diff --git a/src/mess/drivers/spc1000.c b/src/mess/drivers/spc1000.c
index 2655fb86f31..86eb08a540e 100644
--- a/src/mess/drivers/spc1000.c
+++ b/src/mess/drivers/spc1000.c
@@ -22,7 +22,8 @@ public:
 	spc1000_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 			m_vdg(*this, "mc6847") ,
-		m_maincpu(*this, "maincpu") {}
+			m_maincpu(*this, "maincpu"),
+			m_ram(*this, RAM_TAG) {}
 
 	required_device<mc6847_base_device> m_vdg;
 	UINT8 m_IPLK;
@@ -44,6 +45,7 @@ public:
 	DECLARE_READ8_MEMBER(spc1000_gmode_r);
 	DECLARE_READ8_MEMBER(spc1000_mc6847_videoram_r);
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 };
 
 
@@ -62,7 +64,7 @@ WRITE8_MEMBER(spc1000_state::spc1000_iplk_w)
 		membank("bank1")->set_base(mem);
 		membank("bank3")->set_base(mem);
 	} else {
-		UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+		UINT8 *ram = m_ram->pointer();
 		membank("bank1")->set_base(ram);
 		membank("bank3")->set_base(ram + 0x8000);
 	}
@@ -76,7 +78,7 @@ READ8_MEMBER(spc1000_state::spc1000_iplk_r)
 		membank("bank1")->set_base(mem);
 		membank("bank3")->set_base(mem);
 	} else {
-		UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+		UINT8 *ram = m_ram->pointer();
 		membank("bank1")->set_base(ram);
 		membank("bank3")->set_base(ram + 0x8000);
 	}
@@ -229,7 +231,7 @@ void spc1000_state::machine_reset()
 {
 	address_space &space = m_maincpu->space(AS_PROGRAM);
 	UINT8 *mem = memregion("maincpu")->base();
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	space.install_read_bank(0x0000, 0x7fff, "bank1");
 	space.install_read_bank(0x8000, 0xffff, "bank3");
diff --git a/src/mess/drivers/studio2.c b/src/mess/drivers/studio2.c
index b5a5e72fc7a..bae240febdc 100644
--- a/src/mess/drivers/studio2.c
+++ b/src/mess/drivers/studio2.c
@@ -446,7 +446,7 @@ READ_LINE_MEMBER( studio2_state::ef4_r )
 
 WRITE_LINE_MEMBER( studio2_state::q_w )
 {
-	m_speaker->set_state(state);
+	m_beeper->set_state(state);
 }
 
 static COSMAC_INTERFACE( studio2_cosmac_intf )
@@ -550,7 +550,7 @@ static MACHINE_CONFIG_START( studio2, studio2_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
 	MCFG_FRAGMENT_ADD( studio2_cartslot )
@@ -569,7 +569,7 @@ static MACHINE_CONFIG_START( visicom, visicom_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
 	MCFG_FRAGMENT_ADD( studio2_cartslot )
@@ -588,7 +588,7 @@ static MACHINE_CONFIG_START( mpt02, mpt02_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 
 	MCFG_CDP1864_ADD(CDP1864_TAG, CDP1864_CLOCK, mpt02_cdp1864_intf)
@@ -629,9 +629,8 @@ ROM_END
 
 TIMER_CALLBACK_MEMBER(studio2_state::setup_beep)
 {
-	beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
-	speaker->set_state(0);
-	speaker->set_frequency(300);
+	m_beeper->set_state(0);
+	m_beeper->set_frequency(300);
 }
 
 DRIVER_INIT_MEMBER(studio2_state,studio2)
diff --git a/src/mess/drivers/supercon.c b/src/mess/drivers/supercon.c
index 29cb1b829c8..2849a889426 100644
--- a/src/mess/drivers/supercon.c
+++ b/src/mess/drivers/supercon.c
@@ -29,7 +29,7 @@ public:
 	supercon_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_beep(*this, BEEPER_TAG),
+		m_beep(*this, "beeper"),
 		m_b_white(*this, "B_WHITE"),
 		m_b_black(*this, "B_BLACK"),
 		m_b_clr(*this, "B_CLR"),
@@ -793,7 +793,7 @@ static MACHINE_CONFIG_START( supercon, supercon_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("artwork_timer", supercon_state, update_artwork, attotime::from_hz(20))
diff --git a/src/mess/drivers/thomson.c b/src/mess/drivers/thomson.c
index 37230a261e3..f7249a0bc8d 100644
--- a/src/mess/drivers/thomson.c
+++ b/src/mess/drivers/thomson.c
@@ -317,7 +317,7 @@ static ADDRESS_MAP_START ( to7, AS_PROGRAM, 8, thomson_state )
 /* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */
 /* 0x20000 - 0x247ff: 18 KB floppy / network ROM controllers */
 
-/* machine.device<ram_device>(RAM_TAG)->pointer() mapping:
+/* RAM mapping:
    0x0000 - 0x3fff: 16 KB video RAM (actually 8 K x 8 bits + 8 K x 6 bits)
    0x4000 - 0x5fff:  8 KB base RAM
    0x6000 - 0x9fff: 16 KB extended RAM
@@ -784,7 +784,7 @@ static ADDRESS_MAP_START ( to770, AS_PROGRAM, 8, thomson_state )
 /* 0x10000 - 0x1ffff: 64 KB external ROM cartridge */
 /* 0x20000 - 0x247ff: 18 KB floppy / network ROM controllers */
 
-/* machine.device<ram_device>(RAM_TAG)->pointer() mapping:
+/* RAM mapping:
    0x00000 - 0x03fff: 16 KB video RAM
    0x04000 - 0x07fff: 16 KB unbanked base RAM
    0x08000 - 0x1ffff: 6 * 16 KB banked extended RAM
@@ -975,7 +975,7 @@ static ADDRESS_MAP_START ( mo5, AS_PROGRAM, 8, thomson_state )
 /* 0x10000 - 0x1ffff: 16 KB integrated BASIC / 64 KB external cartridge */
 /* 0x20000 - 0x247ff: 18 KB floppy / network ROM controllers */
 
-/* machine.device<ram_device>(RAM_TAG)->pointer() mapping:
+/* RAM mapping:
    0x00000 - 0x03fff: 16 KB video RAM
    0x04000 - 0x0bfff: 32 KB unbanked base RAM
    0x0c000 - 0x1bfff: 4 * 16 KB bank extended RAM
@@ -1182,7 +1182,7 @@ static ADDRESS_MAP_START ( to9, AS_PROGRAM, 8, thomson_state )
 /* 0x20000 - 0x3ffff: 128 KB internal software ROM */
 /* 0x40000 - 0x447ff: 18  KB external floppy / network ROM controllers */
 
-/* machine.device<ram_device>(RAM_TAG)->pointer() mapping:
+/* RAM mapping:
    0x00000 - 0x03fff: 16 KB video RAM
    0x04000 - 0x07fff: 16 KB unbanked base RAM
    0x08000 - 0x2ffff: 10 * 16 KB banked extended RAM
@@ -1507,7 +1507,7 @@ static ADDRESS_MAP_START ( to8, AS_PROGRAM, 8, thomson_state )
 /* 0x30000 - 0x33fff: 16 KB BIOS ROM */
 /* 0x34000 - 0x387ff: 18 KB external floppy / network ROM controllers */
 
-/* machine.device<ram_device>(RAM_TAG)->pointer() mapping: 512 KB flat (including video) */
+/* RAM mapping: 512 KB flat (including video) */
 
 ADDRESS_MAP_END
 
@@ -1703,7 +1703,7 @@ static ADDRESS_MAP_START ( to9p, AS_PROGRAM, 8, thomson_state )
 /* 0x30000 - 0x33fff: 16 KB BIOS ROM */
 /* 0x34000 - 0x387ff: 18 KB external floppy / network ROM controllers */
 
-/* machine.device<ram_device>(RAM_TAG)->pointer() mapping: 512 KB flat (including video) */
+/* RAM mapping: 512 KB flat (including video) */
 
 ADDRESS_MAP_END
 
@@ -1863,7 +1863,7 @@ static ADDRESS_MAP_START ( mo6, AS_PROGRAM, 8, thomson_state )
 /* 0x20000 - 0x2ffff: 64 KB BIOS ROM */
 /* 0x30000 - 0x347ff: 16 KB floppy / network ROM controllers */
 
-/* machine.device<ram_device>(RAM_TAG)->pointer() mapping: 128 KB flat (including video) */
+/* RAM mapping: 128 KB flat (including video) */
 
 ADDRESS_MAP_END
 
@@ -2178,7 +2178,7 @@ static ADDRESS_MAP_START ( mo5nr, AS_PROGRAM, 8, thomson_state )
 /* 0x20000 - 0x2ffff: 64 KB BIOS ROM */
 /* 0x30000 - 0x347ff: 16 KB floppy / network ROM controllers */
 
-/* machine.device<ram_device>(RAM_TAG)->pointer() mapping: 128 KB flat (including video) */
+/* RAM mapping: 128 KB flat (including video) */
 
 ADDRESS_MAP_END
 
diff --git a/src/mess/drivers/ti990_10.c b/src/mess/drivers/ti990_10.c
index bc4ef89d149..5514853dd97 100644
--- a/src/mess/drivers/ti990_10.c
+++ b/src/mess/drivers/ti990_10.c
@@ -238,7 +238,7 @@ static MACHINE_CONFIG_START( ti990_10, ti990_10_state )
 
 	/* 911 VDT has a beep tone generator */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MCFG_FRAGMENT_ADD( ti990_hdc )
diff --git a/src/mess/drivers/ti990_4.c b/src/mess/drivers/ti990_4.c
index adbb2bf6534..33b24e6a937 100644
--- a/src/mess/drivers/ti990_4.c
+++ b/src/mess/drivers/ti990_4.c
@@ -280,7 +280,7 @@ static MACHINE_CONFIG_START( ti990_4, ti990_4_state )
 #if VIDEO_911
 	/* 911 VDT has a beep tone generator */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 #endif
 	MCFG_LEGACY_FLOPPY_4_DRIVES_ADD(ti990_4_floppy_interface)
diff --git a/src/mess/drivers/tmc1800.c b/src/mess/drivers/tmc1800.c
index 7ff252a7b27..db163df307d 100644
--- a/src/mess/drivers/tmc1800.c
+++ b/src/mess/drivers/tmc1800.c
@@ -794,7 +794,7 @@ static MACHINE_CONFIG_START( tmc1800, tmc1800_state )
 	// sound hardware
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	// devices
@@ -820,7 +820,7 @@ static MACHINE_CONFIG_START( osc1000b, osc1000b_state )
 	// sound hardware
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	// devices
@@ -907,9 +907,8 @@ ROM_END
 
 TIMER_CALLBACK_MEMBER(tmc1800_state::setup_beep)
 {
-	beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
-	speaker->set_state(0);
-	speaker->set_frequency(0);
+	m_beeper->set_state(0);
+	m_beeper->set_frequency(0);
 }
 
 DRIVER_INIT_MEMBER(tmc1800_state,tmc1800)
diff --git a/src/mess/drivers/tvc.c b/src/mess/drivers/tvc.c
index ac0f3f7a475..523d191e64b 100644
--- a/src/mess/drivers/tvc.c
+++ b/src/mess/drivers/tvc.c
@@ -621,7 +621,7 @@ QUICKLOAD_LOAD_MEMBER( tvc_state,tvc64)
 	if (first_byte == 0x11)
 	{
 		image.fseek(0x90, SEEK_SET);
-		image.fread(machine().device<ram_device>(RAM_TAG)->pointer() + 0x19ef, image.length() - 0x90);
+		image.fread(m_ram->pointer() + 0x19ef, image.length() - 0x90);
 		return IMAGE_INIT_PASS;
 	}
 	else
diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c
index 3775fd65d32..3b511e1760c 100644
--- a/src/mess/drivers/v1050.c
+++ b/src/mess/drivers/v1050.c
@@ -1012,7 +1012,7 @@ void v1050_state::machine_start()
 	m_maincpu->set_irq_acknowledge_callback(device_irq_acknowledge_delegate(FUNC(v1050_state::v1050_int_ack),this));
 
 	// setup memory banking
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	membank("bank1")->configure_entries(0, 2, ram, 0x10000);
 	membank("bank1")->configure_entry(2, ram + 0x1c000);
diff --git a/src/mess/drivers/vg5k.c b/src/mess/drivers/vg5k.c
index b27a50f7eb2..bda40943abd 100644
--- a/src/mess/drivers/vg5k.c
+++ b/src/mess/drivers/vg5k.c
@@ -66,7 +66,8 @@ public:
 			m_ef9345(*this, "ef9345"),
 			m_dac(*this, "dac"),
 			m_printer(*this, "printer"),
-			m_cassette(*this, "cassette")
+			m_cassette(*this, "cassette"),
+			m_ram(*this, RAM_TAG)
 		{ }
 
 	required_device<cpu_device> m_maincpu;
@@ -74,6 +75,7 @@ public:
 	required_device<dac_device> m_dac;
 	required_device<printer_image_device> m_printer;
 	required_device<cassette_image_device> m_cassette;
+	required_device<ram_device> m_ram;
 
 	offs_t m_ef9345_offset;
 
@@ -339,8 +341,8 @@ DRIVER_INIT_MEMBER(vg5k_state,vg5k)
 
 	/* install expansion memory*/
 	address_space &program = m_maincpu->space(AS_PROGRAM);
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
-	UINT16 ram_size = machine().device<ram_device>(RAM_TAG)->size();
+	UINT8 *ram = m_ram->pointer();
+	UINT16 ram_size = m_ram->size();
 
 	if (ram_size > 0x4000)
 		program.install_ram(0x8000, 0x3fff + ram_size, ram);
diff --git a/src/mess/drivers/vk100.c b/src/mess/drivers/vk100.c
index 00eadb2381a..a5562651087 100644
--- a/src/mess/drivers/vk100.c
+++ b/src/mess/drivers/vk100.c
@@ -159,7 +159,7 @@ public:
 		m_maincpu(*this, "maincpu"),
 		m_screen(*this, "screen"),
 		m_crtc(*this, "crtc"),
-		m_speaker(*this, BEEPER_TAG),
+		m_speaker(*this, "beeper"),
 		m_uart(*this, "i8251"),
 		//m_i8251_rx_timer(NULL),
 		//m_i8251_tx_timer(NULL),
@@ -1025,7 +1025,7 @@ static MACHINE_CONFIG_START( vk100, vk100_state )
 	MCFG_DEFAULT_LAYOUT( layout_vk100 )
 
 	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
+	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 0.25 )
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/vt100.c b/src/mess/drivers/vt100.c
index 0f4be6125ce..80fe4a5541e 100644
--- a/src/mess/drivers/vt100.c
+++ b/src/mess/drivers/vt100.c
@@ -33,7 +33,7 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_crtc(*this, "vt100_video"),
-		m_speaker(*this, BEEPER_TAG),
+		m_speaker(*this, "beeper"),
 		m_uart(*this, "i8251"),
 		m_p_ram(*this, "p_ram")
 		{ }
@@ -454,7 +454,7 @@ static MACHINE_CONFIG_START( vt100, vt100_state )
 
 	/* audio hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard_timer", vt100_state, keyboard_callback, attotime::from_hz(800))
diff --git a/src/mess/drivers/vt220.c b/src/mess/drivers/vt220.c
index c314aeee99a..f8aea2609ac 100644
--- a/src/mess/drivers/vt220.c
+++ b/src/mess/drivers/vt220.c
@@ -16,12 +16,14 @@ class vt220_state : public driver_device
 public:
 	vt220_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag) ,
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG) { }
 
 	virtual void machine_reset();
 	virtual void video_start();
 	UINT32 screen_update_vt220(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 };
 
 
@@ -38,7 +40,7 @@ INPUT_PORTS_END
 
 void vt220_state::machine_reset()
 {
-	memset(machine().device<ram_device>(RAM_TAG)->pointer(),0,16*1024);
+	memset(m_ram->pointer(),0,16*1024);
 }
 
 void vt220_state::video_start()
diff --git a/src/mess/drivers/vt320.c b/src/mess/drivers/vt320.c
index dbe1541cb1d..fb04783518b 100644
--- a/src/mess/drivers/vt320.c
+++ b/src/mess/drivers/vt320.c
@@ -16,12 +16,14 @@ class vt320_state : public driver_device
 public:
 	vt320_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag) ,
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG) { }
 
 	virtual void machine_reset();
 	virtual void video_start();
 	UINT32 screen_update_vt320(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 };
 
 /*
@@ -64,7 +66,7 @@ INPUT_PORTS_END
 
 void vt320_state::machine_reset()
 {
-	memset(machine().device<ram_device>(RAM_TAG)->pointer(),0,16*1024);
+	memset(m_ram->pointer(),0,16*1024);
 }
 
 void vt320_state::video_start()
diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c
index eca0c48d102..752e9131088 100644
--- a/src/mess/drivers/vtech1.c
+++ b/src/mess/drivers/vtech1.c
@@ -161,14 +161,15 @@ public:
 			m_speaker(*this, "speaker"),
 			m_cassette(*this, "cassette"),
 			m_videoram(*this, "videoram"),
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG) { }
 
 	/* devices */
 	required_device<mc6847_base_device> m_mc6847;
 	optional_device<speaker_sound_device> m_speaker;
 	optional_device<cassette_image_device> m_cassette;
 
-	UINT8 *m_ram;
+	UINT8 *m_ram_pointer;
 	UINT32 m_ram_size;
 	required_shared_ptr<UINT8> m_videoram;
 
@@ -204,6 +205,7 @@ public:
 	void vtech1_get_track();
 	void vtech1_put_track();
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 };
 
 
@@ -239,7 +241,7 @@ SNAPSHOT_LOAD_MEMBER( vtech1_state, vtech1 )
 	}
 
 	/* write it to ram */
-	image.fread( &m_ram[start - 0x7800], size);
+	image.fread( &m_ram_pointer[start - 0x7800], size);
 
 	/* patch variables depending on snapshot type */
 	switch (header[21])
@@ -629,18 +631,18 @@ DRIVER_INIT_MEMBER(vtech1_state,vtech1)
 	int id;
 
 	/* ram */
-	m_ram = machine().device<ram_device>(RAM_TAG)->pointer();
-	m_ram_size = machine().device<ram_device>(RAM_TAG)->size();
+	m_ram_pointer = m_ram->pointer();
+	m_ram_size = m_ram->size();
 
 	/* setup memory banking */
-	membank("bank1")->set_base(m_ram);
+	membank("bank1")->set_base(m_ram_pointer);
 
 	/* 16k memory expansion? */
 	if (m_ram_size == 18*1024 || m_ram_size == 22*1024 || m_ram_size == 32*1024)
 	{
 		offs_t base = 0x7800 + (m_ram_size - 0x4000);
 		prg.install_readwrite_bank(base, base + 0x3fff, "bank2");
-		membank("bank2")->set_base(m_ram + base - 0x7800);
+		membank("bank2")->set_base(m_ram_pointer + base - 0x7800);
 	}
 
 	/* 64k expansion? */
@@ -648,11 +650,11 @@ DRIVER_INIT_MEMBER(vtech1_state,vtech1)
 	{
 		/* install fixed first bank */
 		prg.install_readwrite_bank(0x8000, 0xbfff, "bank2");
-		membank("bank2")->set_base(m_ram + 0x800);
+		membank("bank2")->set_base(m_ram_pointer + 0x800);
 
 		/* install the others, dynamically banked in */
 		prg.install_readwrite_bank(0xc000, 0xffff, "bank3");
-		membank("bank3")->configure_entries(0, (m_ram_size - 0x4800) / 0x4000, m_ram + 0x4800, 0x4000);
+		membank("bank3")->configure_entries(0, (m_ram_size - 0x4800) / 0x4000, m_ram_pointer + 0x4800, 0x4000);
 		membank("bank3")->set_entry(0);
 	}
 
diff --git a/src/mess/drivers/x07.c b/src/mess/drivers/x07.c
index 7df57e41751..079ba7ae345 100644
--- a/src/mess/drivers/x07.c
+++ b/src/mess/drivers/x07.c
@@ -1509,7 +1509,7 @@ static MACHINE_CONFIG_START( x07, x07_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO( "mono" )
-	MCFG_SOUND_ADD( BEEPER_TAG, BEEP, 0 )
+	MCFG_SOUND_ADD( "beeper", BEEP, 0 )
 	MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 0.50 )
 	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
diff --git a/src/mess/drivers/x68k.c b/src/mess/drivers/x68k.c
index 136a1ea1ec0..8080fd1bf9a 100644
--- a/src/mess/drivers/x68k.c
+++ b/src/mess/drivers/x68k.c
@@ -1466,7 +1466,7 @@ READ16_MEMBER(x68k_state::x68k_sram_r)
 //  if(offset == 0x5a/2)  // 0x5a should be 0 if no SASI HDs are present.
 //      return 0x0000;
 	if(offset == 0x08/2)
-		return machine().device<ram_device>(RAM_TAG)->size() >> 16;  // RAM size
+		return m_ram->size() >> 16;  // RAM size
 #if 0
 	if(offset == 0x46/2)
 		return 0x0024;
@@ -1481,7 +1481,7 @@ READ16_MEMBER(x68k_state::x68k_sram_r)
 READ32_MEMBER(x68k_state::x68k_sram32_r)
 {
 	if(offset == 0x08/4)
-		return (machine().device<ram_device>(RAM_TAG)->size() & 0xffff0000);  // RAM size
+		return (m_ram->size() & 0xffff0000);  // RAM size
 #if 0
 	if(offset == 0x46/2)
 		return 0x0024;
@@ -1600,7 +1600,7 @@ TIMER_CALLBACK_MEMBER(x68k_state::x68k_bus_error)
 {
 	int val = param;
 	int v;
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	if(strcmp(machine().system().name,"x68030") == 0)
 		v = 0x0b;
@@ -2410,8 +2410,8 @@ MACHINE_RESET_MEMBER(x68k_state,x68000)
 	UINT8* romdata = memregion("user2")->base();
 	attotime irq_time;
 
-	memset(machine().device<ram_device>(RAM_TAG)->pointer(),0,machine().device<ram_device>(RAM_TAG)->size());
-	memcpy(machine().device<ram_device>(RAM_TAG)->pointer(),romdata,8);
+	memset(m_ram->pointer(),0,m_ram->size());
+	memcpy(m_ram->pointer(),romdata,8);
 
 	// init keyboard
 	m_keyboard.delay = 500;  // 3*100+200
@@ -2468,8 +2468,8 @@ MACHINE_START_MEMBER(x68k_state,x68000)
 	m_spriteram = (UINT16*)(*memregion("user1"));
 	space.install_read_handler(0x000000,0xbffffb,0xffffffff,0,read16_delegate(FUNC(x68k_state::x68k_emptyram_r),this));
 	space.install_write_handler(0x000000,0xbffffb,0xffffffff,0,write16_delegate(FUNC(x68k_state::x68k_emptyram_w),this));
-	space.install_readwrite_bank(0x000000,machine().device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,"bank1");
-	membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+	space.install_readwrite_bank(0x000000,m_ram->size()-1,0xffffffff,0,"bank1");
+	membank("bank1")->set_base(m_ram->pointer());
 	space.install_read_handler(0xc00000,0xdfffff,0xffffffff,0,read16_delegate(FUNC(x68k_state::x68k_gvram_r),this));
 	space.install_write_handler(0xc00000,0xdfffff,0xffffffff,0,write16_delegate(FUNC(x68k_state::x68k_gvram_w),this));
 	membank("bank2")->set_base(m_gvram16);  // so that code in VRAM is executable - needed for Terra Cresta
@@ -2515,8 +2515,8 @@ MACHINE_START_MEMBER(x68k_state,x68030)
 	m_spriteram = (UINT16*)(*memregion("user1"));
 	space.install_read_handler(0x000000,0xbffffb,0xffffffff,0,read16_delegate(FUNC(x68k_state::x68k_rom0_r),this),0xffffffff);
 	space.install_write_handler(0x000000,0xbffffb,0xffffffff,0,write16_delegate(FUNC(x68k_state::x68k_rom0_w),this),0xffffffff);
-	space.install_readwrite_bank(0x000000,machine().device<ram_device>(RAM_TAG)->size()-1,0xffffffff,0,"bank1");
-	membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+	space.install_readwrite_bank(0x000000,m_ram->size()-1,0xffffffff,0,"bank1");
+	membank("bank1")->set_base(m_ram->pointer());
 	space.install_read_handler(0xc00000,0xdfffff,0xffffffff,0,read32_delegate(FUNC(x68k_state::x68k_gvram32_r),this));
 	space.install_write_handler(0xc00000,0xdfffff,0xffffffff,0,write32_delegate(FUNC(x68k_state::x68k_gvram32_w),this));
 	membank("bank2")->set_base(m_gvram32);  // so that code in VRAM is executable - needed for Terra Cresta
diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c
index 1720bcab320..6efecf90ec3 100644
--- a/src/mess/drivers/xerox820.c
+++ b/src/mess/drivers/xerox820.c
@@ -714,7 +714,7 @@ MACHINE_CONFIG_END
 static MACHINE_CONFIG_DERIVED_CLASS( bigboard, xerox820, bigboard_state )
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* bigboard only */
 MACHINE_CONFIG_END
 
diff --git a/src/mess/drivers/z9001.c b/src/mess/drivers/z9001.c
index 7273f9c360d..37b406f2992 100644
--- a/src/mess/drivers/z9001.c
+++ b/src/mess/drivers/z9001.c
@@ -45,7 +45,7 @@ public:
 		: driver_device(mconfig, type, tag),
 	m_maincpu(*this, "maincpu"),
 	m_framecnt(0),
-	m_beeper(*this, BEEPER_TAG),
+	m_beeper(*this, "beeper"),
 	m_cass(*this, "cassette"),
 	m_p_colorram(*this, "colorram"),
 	m_p_videoram(*this, "videoram"){ }
@@ -252,7 +252,7 @@ static MACHINE_CONFIG_START( z9001, z9001_state )
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	/* Devices */
diff --git a/src/mess/drivers/zrt80.c b/src/mess/drivers/zrt80.c
index 0493b600fcc..6560d43f149 100644
--- a/src/mess/drivers/zrt80.c
+++ b/src/mess/drivers/zrt80.c
@@ -30,7 +30,7 @@ public:
 	m_maincpu(*this, "maincpu"),
 	m_crtc(*this, "crtc"),
 	m_8250(*this, "ins8250"),
-	m_beep(*this, BEEPER_TAG),
+	m_beep(*this, "beeper"),
 	m_p_videoram(*this, "videoram"){ }
 
 	required_device<cpu_device> m_maincpu;
@@ -301,7 +301,7 @@ static MACHINE_CONFIG_START( zrt80, zrt80_state )
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
-	MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0)
+	MCFG_SOUND_ADD("beeper", BEEP, 0)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	/* Devices */
diff --git a/src/mess/includes/aim65.h b/src/mess/includes/aim65.h
index 5a16a6164e8..11949515d87 100644
--- a/src/mess/includes/aim65.h
+++ b/src/mess/includes/aim65.h
@@ -35,9 +35,10 @@ class aim65_state : public driver_device
 public:
 	aim65_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-	m_maincpu(*this, "maincpu"),
-	m_cassette1(*this, "cassette"),
-	m_cassette2(*this, "cassette2")
+		m_maincpu(*this, "maincpu"),
+		m_cassette1(*this, "cassette"),
+		m_cassette2(*this, "cassette2"),
+		m_ram(*this, RAM_TAG)
 	{ }
 
 	DECLARE_WRITE8_MEMBER(aim65_pia_a_w);
@@ -56,6 +57,7 @@ public:
 	required_device<cpu_device> m_maincpu;
 	required_device<cassette_image_device> m_cassette1;
 	required_device<cassette_image_device> m_cassette2;
+	required_device<ram_device> m_ram;
 	virtual void machine_start();
 	TIMER_CALLBACK_MEMBER(aim65_printer_timer);
 	void aim65_pia();
diff --git a/src/mess/includes/apple1.h b/src/mess/includes/apple1.h
index 1b69c40104f..bfb76a83682 100644
--- a/src/mess/includes/apple1.h
+++ b/src/mess/includes/apple1.h
@@ -10,6 +10,7 @@
 #include "imagedev/snapquik.h"
 #include "machine/6821pia.h"
 #include "imagedev/cassette.h"
+#include "machine/ram.h"
 
 typedef short termchar_t;
 
@@ -34,7 +35,8 @@ public:
 	apple1_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_cassette(*this, "cassette") { }
+		m_cassette(*this, "cassette"),
+		m_ram(*this, RAM_TAG) { }
 
 	int m_vh_clrscrn_pressed;
 	int m_kbd_data;
@@ -80,6 +82,7 @@ public:
 	terminal_t *terminal_create(int gfx, int blank_char, int char_bits,int (*getcursorcode)(int original_code),int num_cols, int num_rows);
 	attotime apple1_vh_dsp_time_to_ready();
 	DECLARE_SNAPSHOT_LOAD_MEMBER( apple1 );
+	required_device<ram_device> m_ram;
 };
 
 
diff --git a/src/mess/includes/b2m.h b/src/mess/includes/b2m.h
index ea3bc1711fb..f79d6f108b6 100644
--- a/src/mess/includes/b2m.h
+++ b/src/mess/includes/b2m.h
@@ -13,6 +13,7 @@
 #include "machine/wd_fdc.h"
 #include "sound/speaker.h"
 #include "sound/wave.h"
+#include "machine/ram.h"
 
 class b2m_state : public driver_device
 {
@@ -20,7 +21,8 @@ public:
 	b2m_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_speaker(*this, "speaker") { }
+		m_speaker(*this, "speaker"),
+		m_ram(*this, RAM_TAG) { }
 
 	UINT8 m_b2m_8255_porta;
 	UINT8 m_b2m_video_scroll;
@@ -42,6 +44,7 @@ public:
 	fd1793_t *m_fdc;
 	device_t *m_pic;
 	required_device<speaker_sound_device> m_speaker;
+	required_device<ram_device> m_ram;
 	DECLARE_READ8_MEMBER(b2m_keyboard_r);
 	DECLARE_WRITE8_MEMBER(b2m_palette_w);
 	DECLARE_READ8_MEMBER(b2m_palette_r);
diff --git a/src/mess/includes/bebox.h b/src/mess/includes/bebox.h
index f7b55cdc3e1..07fce9794d8 100644
--- a/src/mess/includes/bebox.h
+++ b/src/mess/includes/bebox.h
@@ -14,6 +14,7 @@
 #include "machine/8237dma.h"
 #include "machine/53c810.h"
 #include "machine/upd765.h"
+#include "machine/ram.h"
 
 struct bebox_devices_t
 {
@@ -31,11 +32,13 @@ public:
 		: driver_device(mconfig, type, tag),
 			m_ppc1(*this, "ppc1"),
 			m_ppc2(*this, "ppc2"),
-			m_lsi53c810(*this, "scsi:lsi53c810"){ }
+			m_lsi53c810(*this, "scsi:lsi53c810"),
+			m_ram(*this, RAM_TAG){ }
 
 	required_device<cpu_device> m_ppc1;
 	required_device<cpu_device> m_ppc2;
 	required_device<lsi53c810_device> m_lsi53c810;
+	required_device<ram_device> m_ram;
 	UINT32 m_cpu_imask[2];
 	UINT32 m_interrupts;
 	UINT32 m_crossproc_interrupts;
diff --git a/src/mess/includes/c65.h b/src/mess/includes/c65.h
index e068b846734..b87d8e12338 100644
--- a/src/mess/includes/c65.h
+++ b/src/mess/includes/c65.h
@@ -11,6 +11,7 @@
 #include "machine/cbmiec.h"
 #include "imagedev/cartslot.h"
 #include "imagedev/snapquik.h"
+#include "machine/ram.h"
 
 #define C64_MAX_ROMBANK 64 // .crt files contain multiple 'CHIPs', i.e. rom banks (of variable size) with headers. Known carts have at most 64 'CHIPs'.
 
@@ -66,7 +67,8 @@ public:
 			m_c65_chargen(*this, "c65_chargen"),
 			m_interface(*this, "interface"),
 			m_roml_writable(0),
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG) { }
 
 	optional_device<cbm_iec_device> m_iec;
 
@@ -176,6 +178,7 @@ public:
 	void c65_common_driver_init(  );
 
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 };
 
 /*----------- defined in machine/c65.c -----------*/
diff --git a/src/mess/includes/cgenie.h b/src/mess/includes/cgenie.h
index 06c0a86e8d8..3aa7d6c1cf2 100644
--- a/src/mess/includes/cgenie.h
+++ b/src/mess/includes/cgenie.h
@@ -9,6 +9,7 @@
 
 #include "machine/wd17xx.h"
 #include "imagedev/cassette.h"
+#include "machine/ram.h"
 
 // CRTC 6845
 struct CRTC6845
@@ -43,7 +44,8 @@ public:
 		m_colorram(*this, "colorram"),
 		m_fontram(*this, "fontram"),
 		m_maincpu(*this, "maincpu"),
-		m_cassette(*this, "cassette") { }
+		m_cassette(*this, "cassette"),
+		m_ram(*this, RAM_TAG) { }
 
 	required_shared_ptr<UINT8> m_colorram;
 	required_shared_ptr<UINT8> m_fontram;
@@ -82,6 +84,8 @@ public:
 	DECLARE_WRITE8_MEMBER(cgenie_sh_control_port_w);
 	required_device<cpu_device> m_maincpu;
 	required_device<cassette_image_device> m_cassette;
+	required_device<ram_device> m_ram;
+	
 	void cgenie_offset_xy();
 	int cgenie_get_register(int indx);
 	void cgenie_mode_select(int mode);
diff --git a/src/mess/includes/comx35.h b/src/mess/includes/comx35.h
index c83ee50d6f5..39fee6d28fc 100644
--- a/src/mess/includes/comx35.h
+++ b/src/mess/includes/comx35.h
@@ -92,6 +92,7 @@ public:
 	DECLARE_WRITE_LINE_MEMBER( prd_w );
 	DECLARE_INPUT_CHANGED_MEMBER( trigger_reset );
 	DECLARE_QUICKLOAD_LOAD_MEMBER( comx35_comx );
+	void image_fread_memory(device_image_interface &image, UINT16 addr, UINT32 count);
 
 	// processor state
 	int m_clear;                // CPU mode
diff --git a/src/mess/includes/dai.h b/src/mess/includes/dai.h
index fc33a12b0b6..8541c3b6165 100644
--- a/src/mess/includes/dai.h
+++ b/src/mess/includes/dai.h
@@ -57,7 +57,8 @@ public:
 		m_tms5501(*this, "tms5501"),
 		m_sound(*this, "custom"),
 		m_maincpu(*this, "maincpu"),
-		m_cassette(*this, "cassette") { }
+		m_cassette(*this, "cassette"),
+		m_ram(*this, RAM_TAG) { }
 
 	required_device<pit8253_device> m_pit;
 	required_device<tms5501_device> m_tms5501;
@@ -86,6 +87,7 @@ public:
 	TIMER_CALLBACK_MEMBER(dai_timer);
 	required_device<cpu_device> m_maincpu;
 	required_device<cassette_image_device> m_cassette;
+	required_device<ram_device> m_ram;
 	void dai_update_memory(int dai_rom_bank);
 };
 
diff --git a/src/mess/includes/dgn_beta.h b/src/mess/includes/dgn_beta.h
index 5251cc952c3..948a8676f4f 100644
--- a/src/mess/includes/dgn_beta.h
+++ b/src/mess/includes/dgn_beta.h
@@ -10,6 +10,7 @@
 #include "video/mc6845.h"
 #include "machine/wd17xx.h"
 #include "machine/6821pia.h"
+#include "machine/ram.h"
 
 /* Tags */
 
@@ -88,7 +89,8 @@ public:
 		: driver_device(mconfig, type, tag),
 			m_mc6845(*this, "crtc"),
 		m_videoram(*this, "videoram"),
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG) { }
 
 	required_device<mc6845_device> m_mc6845;
 	required_shared_ptr<UINT8> m_videoram;
@@ -207,6 +209,7 @@ public:
 	void ScanInKeyboard(void);
 	void dgn_beta_frame_interrupt (int data);
 	void dgn_beta_line_interrupt (int data);
+	required_device<ram_device> m_ram;
 };
 
 
diff --git a/src/mess/includes/electron.h b/src/mess/includes/electron.h
index 0fe96e264ce..cc817b31dd1 100644
--- a/src/mess/includes/electron.h
+++ b/src/mess/includes/electron.h
@@ -12,6 +12,7 @@
 #define ELECTRON_H_
 
 #include "imagedev/cassette.h"
+#include "sound/beep.h"
 
 /* Interrupts */
 #define INT_HIGH_TONE       0x40
@@ -58,7 +59,8 @@ public:
 	electron_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_cassette(*this, "cassette")	{ }
+		m_cassette(*this, "cassette"),
+		m_beeper(*this, "beeper")	{ }
 
 	ULA m_ula;
 	emu_timer *m_tape_timer;
@@ -84,6 +86,7 @@ public:
 	TIMER_CALLBACK_MEMBER(electron_scanline_interrupt);
 	required_device<cpu_device> m_maincpu;
 	required_device<cassette_image_device> m_cassette;
+	required_device<beep_device> m_beeper;
 	inline UINT8 read_vram( UINT16 addr );
 	inline void electron_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color);
 	void electron_interrupt_handler(int mode, int interrupt);
diff --git a/src/mess/includes/enterp.h b/src/mess/includes/enterp.h
index e8e0091999b..860cf5bf5ea 100644
--- a/src/mess/includes/enterp.h
+++ b/src/mess/includes/enterp.h
@@ -13,7 +13,7 @@
 
 #define NICK_PALETTE_SIZE   256
 
-
+#include "machine/ram.h"
 struct NICK_STATE;
 
 class ep_state : public driver_device
@@ -21,7 +21,8 @@ class ep_state : public driver_device
 public:
 	ep_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG) { }
 
 	UINT8 exdos_card_value;  /* state of the wd1770 irq/drq lines */
 	UINT8 keyboard_line;     /* index of keyboard line to read */
@@ -39,6 +40,7 @@ public:
 	DECLARE_WRITE_LINE_MEMBER(enterp_wd1770_intrq_w);
 	DECLARE_WRITE_LINE_MEMBER(enterp_wd1770_drq_w);
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 	void enterprise_update_memory_page(address_space &space, offs_t page, int index);
 	char Nick_FetchByte(unsigned long Addr);
 	void nick_write_pixel(int ci);
diff --git a/src/mess/includes/fidelz80.h b/src/mess/includes/fidelz80.h
index d098a78d0b3..fb4e40fe9e4 100644
--- a/src/mess/includes/fidelz80.h
+++ b/src/mess/includes/fidelz80.h
@@ -19,7 +19,7 @@ public:
 		: driver_device(mconfig, type, tag),
 			m_maincpu(*this, "maincpu"),
 			m_speech(*this, "speech"),
-			m_beep(*this, BEEPER_TAG),
+			m_beep(*this, "beeper"),
 			m_i8041(*this, "mcu"),
 			m_i8243(*this, "i8243")
 		{ }
diff --git a/src/mess/includes/fm7.h b/src/mess/includes/fm7.h
index 81ae378b348..5bdc457a9ea 100644
--- a/src/mess/includes/fm7.h
+++ b/src/mess/includes/fm7.h
@@ -1,4 +1,5 @@
 #include "imagedev/cassette.h"
+#include "sound/beep.h"
 
 /*
  *
@@ -110,7 +111,8 @@ public:
 		m_maincpu(*this, "maincpu"),
 		m_sub(*this, "sub"),
 		m_x86(*this, "x86"),
-		m_cassette(*this, "cassette") { }
+		m_cassette(*this, "cassette"),
+		m_beeper(*this, "beeper") { }
 
 	optional_shared_ptr<UINT8> m_shared_ram;
 	optional_shared_ptr<UINT8> m_boot_ram;
@@ -262,6 +264,7 @@ public:
 	required_device<cpu_device> m_sub;
 	optional_device<cpu_device> m_x86;
 	required_device<cassette_image_device> m_cassette;
+	required_device<beep_device> m_beeper;
 	void fm7_alu_mask_write(UINT32 offset, int bank, UINT8 dat);
 	void fm7_alu_function_compare(UINT32 offset);
 	void fm7_alu_function_pset(UINT32 offset);
diff --git a/src/mess/includes/gb.h b/src/mess/includes/gb.h
index 051346c5238..f1b1d604dd9 100644
--- a/src/mess/includes/gb.h
+++ b/src/mess/includes/gb.h
@@ -8,7 +8,7 @@
 #define GB_H_
 
 #include "machine/gb_slot.h"
-
+#include "machine/ram.h"
 
 /* Interrupts */
 #define VBL_INT               0       /* V-Blank    */
@@ -116,7 +116,8 @@ public:
 		m_custom(*this, "custom"),
 		m_region_maincpu(*this, "maincpu"),
 		m_rambank(*this, "cgb_ram"),
-		m_inputs(*this, "INPUTS") { }
+		m_inputs(*this, "INPUTS"),
+		m_ram(*this, RAM_TAG) { }
 
 	UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
@@ -213,6 +214,7 @@ protected:
 	required_memory_region m_region_maincpu;
 	optional_memory_bank m_rambank;   // cgb
 	required_ioport m_inputs;
+	optional_device<ram_device> m_ram;	
 
 	void gb_timer_increment();
 	void gb_timer_check_irq();
diff --git a/src/mess/includes/genpc.h b/src/mess/includes/genpc.h
index b3236ef46ef..7e4f6363e90 100644
--- a/src/mess/includes/genpc.h
+++ b/src/mess/includes/genpc.h
@@ -16,6 +16,7 @@
 #include "machine/pit8253.h"
 #include "sound/speaker.h"
 #include "imagedev/cassette.h"
+#include "machine/ram.h"
 
 #define MCFG_IBM5160_MOTHERBOARD_ADD(_tag, _cputag) \
 	MCFG_DEVICE_ADD(_tag, IBM5160_MOTHERBOARD, 0) \
@@ -49,6 +50,7 @@ public:
 	required_device<speaker_sound_device>  m_speaker;
 	required_device<isa8_device>  m_isabus;
 	required_device<pc_kbdc_device>  m_pc_kbdc;
+	required_device<ram_device> m_ram;
 
 	/* U73 is an LS74 - dual flip flop */
 	/* Q2 is set by OUT1 from the 8253 and goes to DRQ1 on the 8237 */
diff --git a/src/mess/includes/kaypro.h b/src/mess/includes/kaypro.h
index d594148e5ae..88cc356bac6 100644
--- a/src/mess/includes/kaypro.h
+++ b/src/mess/includes/kaypro.h
@@ -27,7 +27,7 @@ public:
 	m_centronics(*this, "centronics"),
 	m_fdc(*this, "wd1793"),
 	m_crtc(*this, "crtc"),
-	m_beep(*this, BEEPER_TAG),
+	m_beep(*this, "beeper"),
 	m_p_videoram(*this, "p_videoram"){ }
 
 	required_device<cpu_device> m_maincpu;
diff --git a/src/mess/includes/llc.h b/src/mess/includes/llc.h
index 5bec689cff7..efbf9e12fd5 100644
--- a/src/mess/includes/llc.h
+++ b/src/mess/includes/llc.h
@@ -21,9 +21,10 @@ class llc_state : public driver_device
 public:
 	llc_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-	m_speaker(*this, "speaker"),
-	m_p_videoram(*this, "videoram"),
-		m_maincpu(*this, "maincpu") { }
+		m_speaker(*this, "speaker"),
+		m_p_videoram(*this, "videoram"),
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG) { }
 
 	DECLARE_WRITE8_MEMBER(llc2_rom_disable_w);
 	DECLARE_WRITE8_MEMBER(llc2_basic_enable_w);
@@ -55,6 +56,7 @@ public:
 	UINT32 screen_update_llc1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	UINT32 screen_update_llc2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	required_device<cpu_device> m_maincpu;
+	optional_device<ram_device> m_ram;
 };
 
 
diff --git a/src/mess/includes/lviv.h b/src/mess/includes/lviv.h
index 0686d421a1a..7e792a6194c 100644
--- a/src/mess/includes/lviv.h
+++ b/src/mess/includes/lviv.h
@@ -11,6 +11,7 @@
 #include "machine/i8255.h"
 #include "sound/speaker.h"
 #include "imagedev/cassette.h"
+#include "machine/ram.h"
 
 class lviv_state : public driver_device
 {
@@ -19,7 +20,8 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_speaker(*this, "speaker"),
-		m_cassette(*this, "cassette") { }
+		m_cassette(*this, "cassette"),
+		m_ram(*this, RAM_TAG) { }
 
 	unsigned char * m_video_ram;
 	unsigned short m_colortable[1][4];
@@ -48,6 +50,7 @@ public:
 	required_device<cpu_device> m_maincpu;
 	required_device<speaker_sound_device> m_speaker;
 	required_device<cassette_image_device> m_cassette;
+	required_device<ram_device> m_ram;
 	void lviv_update_palette(UINT8 pal);
 	void lviv_update_memory ();
 	void lviv_setup_snapshot (UINT8 * data);
diff --git a/src/mess/includes/micronic.h b/src/mess/includes/micronic.h
index 07611a4c830..c17ff58e604 100644
--- a/src/mess/includes/micronic.h
+++ b/src/mess/includes/micronic.h
@@ -26,7 +26,7 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, Z80_TAG),
 		m_lcdc(*this, HD61830_TAG),
-		m_beep(*this, BEEPER_TAG),
+		m_beep(*this, "beeper"),
 		m_rtc(*this, MC146818_TAG),
 		m_ram(*this, RAM_TAG),
 		m_ram_base(*this, "ram_base"),
diff --git a/src/mess/includes/mtx.h b/src/mess/includes/mtx.h
index 43b25fd1576..f701d504278 100644
--- a/src/mess/includes/mtx.h
+++ b/src/mess/includes/mtx.h
@@ -12,6 +12,7 @@
 #include "machine/ctronics.h"
 #include "machine/z80ctc.h"
 #include "sound/sn76496.h"
+#include "machine/ram.h"
 
 #define Z80_TAG         "z80"
 #define Z80CTC_TAG      "z80ctc"
@@ -30,7 +31,8 @@ public:
 		: driver_device(mconfig, type, tag),
 			m_maincpu(*this, Z80_TAG),
 		m_sn(*this, SN76489A_TAG),
-		m_cassette(*this, "cassette")
+		m_cassette(*this, "cassette"),
+		m_ram(*this, RAM_TAG)
 	{ }
 
 	required_device<cpu_device> m_maincpu;
@@ -50,6 +52,7 @@ public:
 	z80ctc_device *m_z80ctc;
 	device_t *m_z80dart;
 	required_device<cassette_image_device> m_cassette;
+	required_device<ram_device> m_ram;
 	centronics_device *m_centronics;
 
 	/* timers */
diff --git a/src/mess/includes/mz700.h b/src/mess/includes/mz700.h
index fe3768fdcfe..a38a53a093d 100644
--- a/src/mess/includes/mz700.h
+++ b/src/mess/includes/mz700.h
@@ -17,6 +17,7 @@
 #include "machine/z80pio.h"
 #include "sound/speaker.h"
 #include "imagedev/cassette.h"
+#include "machine/ram.h"
 
 class mz_state : public driver_device
 {
@@ -25,7 +26,8 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_speaker(*this, "speaker"),
-		m_cassette(*this, "cassette") { }
+		m_cassette(*this, "cassette"),
+		m_ram(*this, RAM_TAG) { }
 
 	int m_mz700;                /* 1 if running on an mz700 */
 
@@ -98,6 +100,7 @@ public:
 	required_device<cpu_device> m_maincpu;
 	required_device<speaker_sound_device> m_speaker;
 	required_device<cassette_image_device> m_cassette;
+	required_device<ram_device> m_ram;
 };
 
 
diff --git a/src/mess/includes/nascom1.h b/src/mess/includes/nascom1.h
index 1134f1698b4..18dfee41fe3 100644
--- a/src/mess/includes/nascom1.h
+++ b/src/mess/includes/nascom1.h
@@ -10,6 +10,7 @@
 #include "imagedev/snapquik.h"
 #include "machine/wd17xx.h"
 #include "imagedev/cassette.h"
+#include "machine/ram.h"
 
 struct nascom1_portstat_t
 {
@@ -32,7 +33,8 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_videoram(*this, "videoram"),
 		m_maincpu(*this, "maincpu"),
-		m_cassette(*this, "cassette") { }
+		m_cassette(*this, "cassette"),
+		m_ram(*this, RAM_TAG) { }
 
 	required_shared_ptr<UINT8> m_videoram;
 	device_t *m_hd6402;
@@ -61,6 +63,7 @@ public:
 	DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( nascom1_cassette );
 	required_device<cpu_device> m_maincpu;
 	required_device<cassette_image_device> m_cassette;
+	required_device<ram_device> m_ram;	
 	DECLARE_SNAPSHOT_LOAD_MEMBER( nascom1 );
 };
 
diff --git a/src/mess/includes/nc.h b/src/mess/includes/nc.h
index 016863cef70..0e63cf18d15 100644
--- a/src/mess/includes/nc.h
+++ b/src/mess/includes/nc.h
@@ -6,7 +6,8 @@
 
 #ifndef NC_H_
 #define NC_H_
-
+#include "machine/ram.h"
+#include "sound/beep.h"
 
 #define NC_NUM_COLOURS 4
 
@@ -30,7 +31,10 @@ class nc_state : public driver_device
 public:
 	nc_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG),
+		m_beeper1(*this, "beep.1"),
+		m_beeper2(*this, "beep.2") { }
 
 	emu_timer *m_serial_timer;
 	char m_memory_config[4];
@@ -103,6 +107,10 @@ public:
 	void nc100_machine_stop();
 	void nc200_machine_stop();
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
+	required_device<beep_device> m_beeper1;
+	required_device<beep_device> m_beeper2;
+	
 	void nc200_video_set_backlight(int state);
 	void nc_card_save(device_image_interface &image);
 	int nc_card_calculate_mask(int size);
diff --git a/src/mess/includes/osborne1.h b/src/mess/includes/osborne1.h
index cd33378da0a..cc1e95afc5e 100644
--- a/src/mess/includes/osborne1.h
+++ b/src/mess/includes/osborne1.h
@@ -28,7 +28,7 @@ public:
 		m_pia0(*this, "pia_0"),
 		m_pia1(*this, "pia_1"),
 		m_fdc(*this, "mb8877"),
-		m_beep(*this, BEEPER_TAG),
+		m_beep(*this, "beeper"),
 		m_ram(*this, RAM_TAG),
 		m_ieee(*this, IEEE488_TAG),
 		m_row0(*this, "ROW0"),
diff --git a/src/mess/includes/osi.h b/src/mess/includes/osi.h
index 7306b3acc68..3f4d5de2111 100644
--- a/src/mess/includes/osi.h
+++ b/src/mess/includes/osi.h
@@ -45,7 +45,8 @@ public:
 	m_io_row6(*this, "ROW6"),
 	m_io_row7(*this, "ROW7"),
 	m_io_sound(*this, "Sound"),
-	m_io_reset(*this, "Reset")
+	m_io_reset(*this, "Reset"),
+	m_beeper(*this, "beeper")
 	{ }
 
 	virtual void machine_start();
@@ -86,6 +87,7 @@ public:
 	required_ioport m_io_row7;
 	required_ioport m_io_sound;
 	required_ioport m_io_reset;
+	optional_device<beep_device> m_beeper;
 };
 
 class c1p_state : public sb2m600_state
@@ -93,7 +95,7 @@ class c1p_state : public sb2m600_state
 public:
 	c1p_state(const machine_config &mconfig, device_type type, const char *tag)
 		: sb2m600_state(mconfig, type, tag),
-			m_beep(*this, BEEPER_TAG)
+			m_beep(*this, "beeper")
 	{ }
 
 	required_device<beep_device> m_beep;
diff --git a/src/mess/includes/partner.h b/src/mess/includes/partner.h
index 6b69deb4a2a..453ff22117b 100644
--- a/src/mess/includes/partner.h
+++ b/src/mess/includes/partner.h
@@ -10,12 +10,14 @@
 #include "machine/i8255.h"
 #include "machine/8257dma.h"
 #include "machine/wd17xx.h"
+#include "machine/ram.h"
 
 class partner_state : public radio86_state
 {
 public:
 	partner_state(const machine_config &mconfig, device_type type, const char *tag)
-		: radio86_state(mconfig, type, tag) { }
+		: radio86_state(mconfig, type, tag),
+		m_ram(*this, RAM_TAG) { }
 
 	UINT8 m_mem_page;
 	UINT8 m_win_mem_page;
@@ -32,6 +34,7 @@ public:
 	void partner_window_2(UINT8 bank_num, UINT16 offset,UINT8 *rom);
 	void partner_iomap_bank(UINT8 *rom);
 	void partner_bank_switch();
+	required_device<ram_device> m_ram;	
 };
 
 
diff --git a/src/mess/includes/pc.h b/src/mess/includes/pc.h
index d6e1bb31d41..36b9e111c23 100644
--- a/src/mess/includes/pc.h
+++ b/src/mess/includes/pc.h
@@ -16,6 +16,7 @@
 #include "machine/upd765.h"
 #include "sound/speaker.h"
 #include "imagedev/cassette.h"
+#include "machine/ram.h"
 
 class pc_state : public driver_device
 {
@@ -26,7 +27,8 @@ public:
 		m_dma8237(*this, "dma8237"),
 		m_pc_kbdc(*this, "pc_kbdc"),
 		m_speaker(*this, "speaker"),
-		m_cassette(*this, "cassette") { }
+		m_cassette(*this, "cassette"),
+		m_ram(*this, RAM_TAG) { }
 
 	required_device<cpu_device> m_maincpu;
 	device_t *m_pic8259;
@@ -35,6 +37,7 @@ public:
 	optional_device<pc_kbdc_device>  m_pc_kbdc;
 	optional_device<speaker_sound_device> m_speaker;
 	optional_device<cassette_image_device> m_cassette;
+	optional_device<ram_device> m_ram;
 
 	/* U73 is an LS74 - dual flip flop */
 	/* Q2 is set by OUT1 from the 8253 and goes to DRQ1 on the 8237 */
diff --git a/src/mess/includes/pc1350.h b/src/mess/includes/pc1350.h
index 3dbd8deb5a6..d4c9d89c03f 100644
--- a/src/mess/includes/pc1350.h
+++ b/src/mess/includes/pc1350.h
@@ -10,6 +10,7 @@
 #define PC1350_H_
 
 #include "machine/nvram.h"
+#include "machine/ram.h"
 
 #define PC1350_CONTRAST (ioport("DSW0")->read() & 0x07)
 
@@ -19,7 +20,8 @@ class pc1350_state : public driver_device
 public:
 	pc1350_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG) { }
 
 	UINT8 m_outa;
 	UINT8 m_outb;
@@ -41,6 +43,7 @@ public:
 
 	virtual void machine_start();
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 };
 
 #endif /* PC1350_H_ */
diff --git a/src/mess/includes/pc4.h b/src/mess/includes/pc4.h
index b6d05ec9897..971e14facf9 100644
--- a/src/mess/includes/pc4.h
+++ b/src/mess/includes/pc4.h
@@ -18,7 +18,7 @@ public:
 	pc4_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_beep(*this, BEEPER_TAG),
+		m_beep(*this, "beeper"),
 		m_region_charset(*this, "charset"),
 		m_rombank(*this, "rombank") { }
 
diff --git a/src/mess/includes/pcw.h b/src/mess/includes/pcw.h
index 22762480fe6..b64ade497fc 100644
--- a/src/mess/includes/pcw.h
+++ b/src/mess/includes/pcw.h
@@ -8,6 +8,8 @@
 #define PCW_H_
 
 #include "machine/upd765.h"
+#include "machine/ram.h"
+#include "sound/beep.h"
 
 #define PCW_BORDER_HEIGHT 8
 #define PCW_BORDER_WIDTH 8
@@ -28,7 +30,9 @@ public:
 		: driver_device(mconfig, type, tag),
 		  m_maincpu(*this, "maincpu"),
 		  m_screen(*this, "screen"),
-		  m_fdc(*this, "upd765")
+		  m_fdc(*this, "upd765"),
+		  m_ram(*this, RAM_TAG),
+		  m_beeper(*this, "beeper")	
 	{ }
 
 	int m_boot;
@@ -116,6 +120,9 @@ public:
 	required_device<cpu_device> m_maincpu;
 	required_device<screen_device> m_screen;
 	required_device<upd765a_device> m_fdc;
+	required_device<ram_device> m_ram;
+	required_device<beep_device> m_beeper;
+	
 	inline void pcw_plot_pixel(bitmap_ind16 &bitmap, int x, int y, UINT32 color);
 	void pcw_update_interrupt_counter();
 	void pcw_update_irqs();
diff --git a/src/mess/includes/pcw16.h b/src/mess/includes/pcw16.h
index 87abe82b6a1..1f68cbdd55d 100644
--- a/src/mess/includes/pcw16.h
+++ b/src/mess/includes/pcw16.h
@@ -39,7 +39,7 @@ public:
 			m_flash1(*this, "flash1"),
 			m_fdc(*this, "fdc"),
 			m_uart2(*this, "ns16550_2"),
-			m_speaker(*this, BEEPER_TAG),
+			m_beeper(*this, "beeper"),
 			m_ram(*this, RAM_TAG),
 			m_region_rom(*this, "maincpu"),
 			m_io_extra(*this, "EXTRA")
@@ -50,7 +50,7 @@ public:
 	required_device<intel_e28f008sa_device> m_flash1;
 	required_device<pc_fdc_superio_device> m_fdc;
 	required_device<ns16550_device> m_uart2;
-	required_device<beep_device> m_speaker;
+	required_device<beep_device> m_beeper;
 	required_device<ram_device> m_ram;
 	required_memory_region m_region_rom;
 	required_ioport m_io_extra;
diff --git a/src/mess/includes/portfoli.h b/src/mess/includes/portfoli.h
index 7faf2affdfc..fb44e24bee6 100644
--- a/src/mess/includes/portfoli.h
+++ b/src/mess/includes/portfoli.h
@@ -46,7 +46,8 @@ public:
 			m_y6(*this, "Y6"),
 			m_y7(*this, "Y7"),
 			m_battery(*this, "BATTERY"),
-			m_contrast(*this, "contrast")
+			m_contrast(*this, "contrast"),
+			m_ram(*this, RAM_TAG)
 	{ }
 
 	required_device<cpu_device> m_maincpu;
@@ -113,6 +114,7 @@ public:
 	DECLARE_READ8_MEMBER(hd61830_rd_r);
 	IRQ_CALLBACK_MEMBER(portfolio_int_ack);
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER( portfolio_cart );
+	required_device<ram_device> m_ram;
 };
 
 #endif
diff --git a/src/mess/includes/pp01.h b/src/mess/includes/pp01.h
index 49624f0cd34..4a3183bf5b9 100644
--- a/src/mess/includes/pp01.h
+++ b/src/mess/includes/pp01.h
@@ -9,13 +9,15 @@
 
 #include "machine/pit8253.h"
 #include "machine/i8255.h"
+#include "machine/ram.h"
 
 class pp01_state : public driver_device
 {
 public:
 	pp01_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG) { }
 
 	UINT8 m_video_scroll;
 	UINT8 m_memory_block[16];
@@ -44,6 +46,7 @@ public:
 	DECLARE_WRITE8_MEMBER(pp01_8255_portc_w);
 	DECLARE_READ8_MEMBER(pp01_8255_portc_r);
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 	void pp01_video_w(UINT8 block,UINT16 offset,UINT8 data,UINT8 part);
 	void pp01_set_memory(UINT8 block, UINT8 data);
 };
diff --git a/src/mess/includes/psion.h b/src/mess/includes/psion.h
index f2db7fe48ad..ea8de21d059 100644
--- a/src/mess/includes/psion.h
+++ b/src/mess/includes/psion.h
@@ -24,7 +24,7 @@ public:
 		: driver_device(mconfig, type, tag),
 			m_maincpu(*this, "maincpu"),
 			m_lcdc(*this, "hd44780"),
-			m_beep(*this, BEEPER_TAG),
+			m_beep(*this, "beeper"),
 			m_pack1(*this, "pack1"),
 			m_pack2(*this, "pack2"),
 			m_sys_register(*this, "sys_register"),
diff --git a/src/mess/includes/rmnimbus.h b/src/mess/includes/rmnimbus.h
index a527f51274d..347a316e719 100644
--- a/src/mess/includes/rmnimbus.h
+++ b/src/mess/includes/rmnimbus.h
@@ -10,6 +10,7 @@
 #include "machine/wd17xx.h"
 #include "machine/scsicb.h"
 #include "machine/6522via.h"
+#include "machine/ram.h"
 
 #define MAINCPU_TAG "maincpu"
 #define IOCPU_TAG   "iocpu"
@@ -393,7 +394,8 @@ public:
 	rmnimbus_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 			m_scsibus(*this, SCSIBUS_TAG ":host"),
-		m_maincpu(*this, "maincpu") {
+		m_maincpu(*this, "maincpu"),
+		m_ram(*this, RAM_TAG) {
 	}
 
 	required_device<scsicb_device> m_scsibus;
@@ -469,6 +471,7 @@ public:
 	void nimbus_scsi_linechange( UINT8 mask, UINT8 state );
 	IRQ_CALLBACK_MEMBER(int_callback);
 	required_device<cpu_device> m_maincpu;
+	required_device<ram_device> m_ram;
 	UINT8 get_pixel(UINT16 x, UINT16 y);
 	UINT16 read_pixel_line(UINT16 x, UINT16 y, UINT8 width);
 	UINT16 read_pixel_data(UINT16 x, UINT16 y);
diff --git a/src/mess/includes/samcoupe.h b/src/mess/includes/samcoupe.h
index 472cb3ba85a..114fe90f8f7 100644
--- a/src/mess/includes/samcoupe.h
+++ b/src/mess/includes/samcoupe.h
@@ -14,6 +14,7 @@
 #include "machine/wd_fdc.h"
 #include "sound/speaker.h"
 #include "imagedev/cassette.h"
+#include "machine/ram.h"
 
 /* screen dimensions */
 #define SAM_BLOCK           8
@@ -42,7 +43,8 @@ public:
 			: driver_device(mconfig, type, tag),
 			m_maincpu(*this, "maincpu"),
 			m_speaker(*this, "speaker"),
-			m_cassette(*this, "cassette") {
+			m_cassette(*this, "cassette"),
+			m_ram(*this, RAM_TAG) {
 				sam_bank_read_ptr[0] = NULL;
 				sam_bank_write_ptr[0] = NULL;
 				sam_bank_read_ptr[1] = NULL;
@@ -124,6 +126,7 @@ public:
 	required_device<cpu_device> m_maincpu;
 	required_device<speaker_sound_device> m_speaker;
 	required_device<cassette_image_device> m_cassette;
+	required_device<ram_device> m_ram;
 	void draw_mode4_line(int y, int hpos);
 	void draw_mode3_line(int y, int hpos);
 	void draw_mode12_block(bitmap_ind16 &bitmap, int vpos, int hpos, UINT8 mask);
diff --git a/src/mess/includes/studio2.h b/src/mess/includes/studio2.h
index 2d336198113..ea5d77584b7 100644
--- a/src/mess/includes/studio2.h
+++ b/src/mess/includes/studio2.h
@@ -23,7 +23,7 @@ public:
 	studio2_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 			m_maincpu(*this, CDP1802_TAG),
-			m_speaker(*this, BEEPER_TAG),
+			m_beeper(*this, "beeper"),
 			m_vdc(*this, CDP1861_TAG),
 			m_clear(*this, "CLEAR"),
 			m_a(*this, "A"),
@@ -31,7 +31,7 @@ public:
 	{ }
 
 	required_device<cosmac_device> m_maincpu;
-	required_device<beep_device> m_speaker;
+	required_device<beep_device> m_beeper;
 	optional_device<cdp1861_device> m_vdc;
 	required_ioport m_clear;
 	required_ioport m_a;
diff --git a/src/mess/includes/tmc1800.h b/src/mess/includes/tmc1800.h
index 269b1cc5ab1..52a768dbbaa 100644
--- a/src/mess/includes/tmc1800.h
+++ b/src/mess/includes/tmc1800.h
@@ -12,6 +12,7 @@
 #include "machine/rescap.h"
 #include "sound/cdp1864.h"
 #include "video/cdp1861.h"
+#include "sound/beep.h"
 
 #define TMC2000_COLORRAM_SIZE   0x200
 
@@ -29,7 +30,8 @@ public:
 			m_cassette(*this, "cassette"),
 			m_rom(*this, CDP1802_TAG),
 			m_run(*this, "RUN"),			
-			m_ram(*this, RAM_TAG)
+			m_ram(*this, RAM_TAG),
+			m_beeper(*this, "beeper")
 	{ }
 
 
@@ -38,6 +40,7 @@ public:
 	required_memory_region m_rom;
 	required_ioport m_run;
 	required_device<ram_device> m_ram;
+	optional_device<beep_device> m_beeper;
 
 	DECLARE_QUICKLOAD_LOAD_MEMBER( tmc1800 );
 };
diff --git a/src/mess/includes/x07.h b/src/mess/includes/x07.h
index b2a6b40fb69..e5b8614a244 100644
--- a/src/mess/includes/x07.h
+++ b/src/mess/includes/x07.h
@@ -160,7 +160,7 @@ public:
 		: driver_device(mconfig, type, tag),
 			m_maincpu(*this, "maincpu"),
 			m_printer(*this, "printer"),
-			m_beep(*this, BEEPER_TAG),
+			m_beep(*this, "beeper"),
 			m_ram(*this, RAM_TAG),
 			m_cassette(*this, "cassette")
 	{ }
diff --git a/src/mess/includes/x68k.h b/src/mess/includes/x68k.h
index 12204cb43c6..7e8b87bf6d7 100644
--- a/src/mess/includes/x68k.h
+++ b/src/mess/includes/x68k.h
@@ -12,7 +12,7 @@
 #include "machine/rp5c15.h"
 #include "machine/upd765.h"
 #include "sound/okim6258.h"
-
+#include "machine/ram.h"
 
 #define MC68901_TAG     "mc68901"
 #define RP5C15_TAG      "rp5c15"
@@ -55,7 +55,8 @@ public:
 			m_gvram32(*this, "gvram32"),
 			m_tvram32(*this, "tvram32"),
 		m_maincpu(*this, "maincpu"),
-		m_okim6258(*this, "okim6258") { }
+		m_okim6258(*this, "okim6258"),
+		m_ram(*this, RAM_TAG) { }
 
 	required_device<mc68901_device> m_mfpdev;
 	required_device<rp5c15_device> m_rtc;
@@ -384,6 +385,7 @@ private:
 public:	
 	required_device<cpu_device> m_maincpu;
 	required_device<okim6258_device> m_okim6258;
+	required_device<ram_device> m_ram;
 	bitmap_ind16* x68k_get_gfx_page(int pri,int type);
 	attotime prescale(int val);
 	void mfp_trigger_irq(int irq);
diff --git a/src/mess/includes/xerox820.h b/src/mess/includes/xerox820.h
index 69e1df6dd5e..71437971e11 100644
--- a/src/mess/includes/xerox820.h
+++ b/src/mess/includes/xerox820.h
@@ -114,7 +114,7 @@ class bigboard_state : public xerox820_state
 public:
 	bigboard_state(const machine_config &mconfig, device_type type, const char *tag)
 		: xerox820_state(mconfig, type, tag),
-			m_beeper(*this, BEEPER_TAG)
+			m_beeper(*this, "beeper")
 	{ }
 
 	required_device<beep_device> m_beeper;
diff --git a/src/mess/machine/aim65.c b/src/mess/machine/aim65.c
index cd81ffbe08c..0fc8c8d5802 100644
--- a/src/mess/machine/aim65.c
+++ b/src/mess/machine/aim65.c
@@ -140,7 +140,7 @@ WRITE8_MEMBER( aim65_state::aim65_riot_a_w )
 
 void aim65_state::machine_start()
 {
-	ram_device *ram = machine().device<ram_device>(RAM_TAG);
+	ram_device *ram = m_ram;
 	address_space &space = m_maincpu->space(AS_PROGRAM);
 
 	/* Init RAM */
diff --git a/src/mess/machine/apple1.c b/src/mess/machine/apple1.c
index 804099afc7c..353d1bf5dd4 100644
--- a/src/mess/machine/apple1.c
+++ b/src/mess/machine/apple1.c
@@ -135,8 +135,8 @@ DRIVER_INIT_MEMBER(apple1_state,apple1)
 {
 	address_space& space = m_maincpu->space(AS_PROGRAM);
 	/* Set up the handlers for MESS's dynamically-sized RAM. */
-	space.install_readwrite_bank(0x0000, machine().device<ram_device>(RAM_TAG)->size() - 1, "bank1");
-	membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+	space.install_readwrite_bank(0x0000, m_ram->size() - 1, "bank1");
+	membank("bank1")->set_base(m_ram->pointer());
 
 	/* Poll the keyboard input ports periodically.  These include both
 	   ordinary keys and the RESET and CLEAR SCREEN pushbutton
@@ -233,7 +233,7 @@ SNAPSHOT_LOAD_MEMBER( apple1_state,apple1)
 
 	end_addr = start_addr + datasize - 1;
 
-	if ((start_addr < 0xE000 && end_addr > machine().device<ram_device>(RAM_TAG)->size() - 1)
+	if ((start_addr < 0xE000 && end_addr > m_ram->size() - 1)
 		|| end_addr > 0xEFFF)
 	{
 		logerror("apple1 - Snapshot won't fit in this memory configuration;\n"
diff --git a/src/mess/machine/apple2.c b/src/mess/machine/apple2.c
index bd4385e4229..0f235a9c757 100644
--- a/src/mess/machine/apple2.c
+++ b/src/mess/machine/apple2.c
@@ -1128,7 +1128,7 @@ UINT8 apple2_state::apple2_getfloatingbusvalue()
 		//CMemory::mState |= CMemory::kVBLBar; // N: VBL' is true // FIX: MESS?
 	}
 
-	return m_ram->pointer()[address % machine().device<ram_device>(RAM_TAG)->size()]; // FIX: this seems to work, but is it right!?
+	return m_ram->pointer()[address % m_ram->size()]; // FIX: this seems to work, but is it right!?
 }
 
 
@@ -2107,7 +2107,7 @@ void apple2_state::apple2_init_common()
 	if (memregion("maincpu")->bytes() < 0x8000)
 		m_a2_mask &= ~VAR_ROMSWITCH;
 
-	if (machine().device<ram_device>(RAM_TAG)->size() <= 64*1024)
+	if (m_ram->size() <= 64*1024)
 		m_a2_mask &= ~(VAR_RAMRD | VAR_RAMWRT | VAR_80STORE | VAR_ALTZP | VAR_80COL);
 
 	apple2_refresh_delegates();
diff --git a/src/mess/machine/apple2gs.c b/src/mess/machine/apple2gs.c
index e3d468bf3aa..d0d86a6baf8 100644
--- a/src/mess/machine/apple2gs.c
+++ b/src/mess/machine/apple2gs.c
@@ -1576,7 +1576,7 @@ UINT8 apple2gs_state::apple2gs_xxCxxx_r(address_space &space, offs_t address)
 
 	if ((m_shadow & 0x40) && ((address & 0xF00000) == 0x000000)) // shadow all banks and C0xx?
 	{
-		result = machine().device<ram_device>(RAM_TAG)->pointer()[address];
+		result = m_ram->pointer()[address];
 	}
 	else if ((address & 0x000F00) == 0x000000)  // accessing C0xx?
 	{
@@ -1667,7 +1667,7 @@ void apple2gs_state::apple2gs_xxCxxx_w(address_space &space, offs_t address, UIN
 
 	if ((m_shadow & 0x40) && ((address & 0xF00000) == 0x000000))
 	{
-		machine().device<ram_device>(RAM_TAG)->pointer()[address] = data;
+		m_ram->pointer()[address] = data;
 	}
 	else if ((address & 0x000F00) == 0x000000)
 	{
@@ -1745,7 +1745,7 @@ DIRECT_UPDATE_MEMBER(apple2gs_state::apple2gs_opbase)
 	{
 		if ((m_shadow & 0x40) && ((address & 0xF00000) == 0x000000))
 		{
-			opptr = &machine().device<ram_device>(RAM_TAG)->pointer()[address];
+			opptr = &m_ram->pointer()[address];
 		}
 		else if ((address & 0x000F00) == 0x000000)
 		{
@@ -1829,22 +1829,22 @@ void apple2gs_state::apple2gs_setup_memory()
 	// otherwise nothing works :)
 	if (m_is_rom3)
 	{
-		int ramsize = machine().device<ram_device>(RAM_TAG)->size();
+		int ramsize = m_ram->size();
 
 		// ROM 03 hardware: the quoted "1 MB" for a base machine doesn't include banks e0/e1, so map accordingly
 		space.install_readwrite_bank(0x010000, ramsize - 1, "bank1");
-		membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x010000);
+		membank("bank1")->set_base(m_ram->pointer() + 0x010000);
 
 		space.install_read_handler( ramsize, 0xdfffff, read8_delegate(FUNC(apple2gs_state::apple2gs_bank_echo_r),this));
 		m_echo_bank = (ramsize >> 16);
 	}
 	else
 	{
-		int ramsize = machine().device<ram_device>(RAM_TAG)->size()-0x30000;
+		int ramsize = m_ram->size()-0x30000;
 
 		// ROM 00/01 hardware: the quoted "256K" for a base machine *does* include banks e0/e1.
 		space.install_readwrite_bank(0x010000, ramsize - 1 + 0x10000, "bank1");
-		membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x010000);
+		membank("bank1")->set_base(m_ram->pointer() + 0x010000);
 
 		space.install_read_handler( ramsize + 0x10000, 0xdfffff, read8_delegate(FUNC(apple2gs_state::apple2gs_bank_echo_r),this));
 		m_echo_bank = (ramsize+0x10000) >> 16;
@@ -1971,8 +1971,8 @@ MACHINE_START_MEMBER(apple2gs_state,apple2gscommon)
 	machine().device<nvram_device>("nvram")->set_base(m_clock_bram, sizeof(m_clock_bram));
 
 	/* save state stuff.  note that the driver takes care of docram. */
-	UINT8* ram = machine().device<ram_device>(RAM_TAG)->pointer();
-	state_save_register_item_pointer(machine(), "APPLE2GS_RAM", NULL, 0, ram, machine().device<ram_device>(RAM_TAG)->size());
+	UINT8* ram = m_ram->pointer();
+	state_save_register_item_pointer(machine(), "APPLE2GS_RAM", NULL, 0, ram, m_ram->size());
 
 	state_save_register_item(machine(), "NEWVIDEO", NULL, 0, m_newvideo);
 	state_save_register_item(machine(), "BORDERCOLOR", NULL, 0, m_bordercolor);
diff --git a/src/mess/machine/apple3.c b/src/mess/machine/apple3.c
index 2cd46dbf98a..35925a3a649 100644
--- a/src/mess/machine/apple3.c
+++ b/src/mess/machine/apple3.c
@@ -262,13 +262,13 @@ UINT8 *apple3_state::apple3_bankaddr(UINT16 bank, offs_t offset)
 {
 	if (bank != (UINT16) ~0)
 	{
-		bank %= machine().device<ram_device>(RAM_TAG)->size() / 0x8000;
-		if ((bank + 1) == (machine().device<ram_device>(RAM_TAG)->size() / 0x8000))
+		bank %= m_ram->size() / 0x8000;
+		if ((bank + 1) == (m_ram->size() / 0x8000))
 			bank = 0x02;
 	}
 	offset += ((offs_t) bank) * 0x8000;
-	offset %= machine().device<ram_device>(RAM_TAG)->size();
-	return &machine().device<ram_device>(RAM_TAG)->pointer()[offset];
+	offset %= m_ram->size();
+	return &m_ram->pointer()[offset];
 }
 
 
@@ -283,9 +283,9 @@ void apple3_state::apple3_setbank(const char *mame_bank, UINT16 bank, offs_t off
 	if (LOG_MEMORY)
 	{
 		#ifdef PTR64
-		//logerror("\tbank %s --> %02x/%04x [0x%08lx]\n", mame_bank, (unsigned) bank, (unsigned)offset, ptr - machine().device<ram_device>(RAM_TAG)->pointer());
+		//logerror("\tbank %s --> %02x/%04x [0x%08lx]\n", mame_bank, (unsigned) bank, (unsigned)offset, ptr - m_ram->pointer());
 		#else
-		logerror("\tbank %s --> %02x/%04x [0x%08lx]\n", mame_bank, (unsigned) bank, (unsigned)offset, ptr - machine().device<ram_device>(RAM_TAG)->pointer());
+		logerror("\tbank %s --> %02x/%04x [0x%08lx]\n", mame_bank, (unsigned) bank, (unsigned)offset, ptr - m_ram->pointer());
 		#endif
 	}
 	#endif
@@ -568,7 +568,7 @@ UINT8 *apple3_state::apple3_get_indexed_addr(offs_t offset)
 			else if (offset > 0x9FFF)
 				result = apple3_bankaddr(~0, offset - 0x8000);
 			else
-				result = &machine().device<ram_device>(RAM_TAG)->pointer()[offset - 0x2000];
+				result = &m_ram->pointer()[offset - 0x2000];
 		}
 		else if ((n >= 0x80) && (n <= 0x8E))
 		{
diff --git a/src/mess/machine/at.c b/src/mess/machine/at.c
index dbe4da18495..6d3c4b9b0b4 100644
--- a/src/mess/machine/at.c
+++ b/src/mess/machine/at.c
@@ -325,14 +325,14 @@ void at_state::init_at_common()
 	if (machine().device("cs4031") == NULL)
 	{
 		/* MESS managed RAM */
-		membank("bank10")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+		membank("bank10")->set_base(m_ram->pointer());
 
-		if (machine().device<ram_device>(RAM_TAG)->size() > 0x0a0000)
+		if (m_ram->size() > 0x0a0000)
 		{
-			offs_t ram_limit = 0x100000 + machine().device<ram_device>(RAM_TAG)->size() - 0x0a0000;
+			offs_t ram_limit = 0x100000 + m_ram->size() - 0x0a0000;
 			space.install_read_bank(0x100000,  ram_limit - 1, "bank1");
 			space.install_write_bank(0x100000,  ram_limit - 1, "bank1");
-			membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xa0000);
+			membank("bank1")->set_base(m_ram->pointer() + 0xa0000);
 		}
 	}
 
diff --git a/src/mess/machine/b2m.c b/src/mess/machine/b2m.c
index 65bb7c80e59..6c825aee8fd 100644
--- a/src/mess/machine/b2m.c
+++ b/src/mess/machine/b2m.c
@@ -44,7 +44,7 @@ void b2m_state::b2m_set_bank(int bank)
 {
 	UINT8 *rom;
 	address_space &space = m_maincpu->space(AS_PROGRAM);
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	space.install_write_bank(0x0000, 0x27ff, "bank1");
 	space.install_write_bank(0x2800, 0x2fff, "bank2");
diff --git a/src/mess/machine/bebox.c b/src/mess/machine/bebox.c
index 4a40dca51de..f472a09d845 100644
--- a/src/mess/machine/bebox.c
+++ b/src/mess/machine/bebox.c
@@ -1013,9 +1013,9 @@ DRIVER_INIT_MEMBER(bebox_state,bebox)
 	membank("bank2")->set_base(memregion("user2")->base());
 
 	/* install MESS managed RAM */
-	space_0.install_readwrite_bank(0, machine().device<ram_device>(RAM_TAG)->size() - 1, 0, 0x02000000, "bank3");
-	space_1.install_readwrite_bank(0, machine().device<ram_device>(RAM_TAG)->size() - 1, 0, 0x02000000, "bank3");
-	membank("bank3")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+	space_0.install_readwrite_bank(0, m_ram->size() - 1, 0, 0x02000000, "bank3");
+	space_1.install_readwrite_bank(0, m_ram->size() - 1, 0, 0x02000000, "bank3");
+	membank("bank3")->set_base(m_ram->pointer());
 	
 	/* The following is a verrrry ugly hack put in to support NetBSD for
 	 * NetBSD.  When NetBSD/bebox it does most of its work on CPU #0 and then
diff --git a/src/mess/machine/c65.c b/src/mess/machine/c65.c
index 83290e8f842..249bea1fa44 100644
--- a/src/mess/machine/c65.c
+++ b/src/mess/machine/c65.c
@@ -601,7 +601,7 @@ int c65_state::c65_fdc_r( int offset )
 READ8_MEMBER( c65_state::c65_ram_expansion_r )
 {
 	UINT8 data = 0xff;
-	if (machine().device<ram_device>(RAM_TAG)->size() > (128 * 1024))
+	if (m_ram->size() > (128 * 1024))
 		data = m_expansion_ram.reg;
 	return data;
 }
@@ -611,16 +611,16 @@ WRITE8_MEMBER( c65_state::c65_ram_expansion_w )
 	offs_t expansion_ram_begin;
 	offs_t expansion_ram_end;
 
-	if (space.machine().device<ram_device>(RAM_TAG)->size() > (128 * 1024))
+	if (m_ram->size() > (128 * 1024))
 	{
 		m_expansion_ram.reg = data;
 
 		expansion_ram_begin = 0x80000;
-		expansion_ram_end = 0x80000 + (machine().device<ram_device>(RAM_TAG)->size() - 128*1024) - 1;
+		expansion_ram_end = 0x80000 + (m_ram->size() - 128*1024) - 1;
 
 		if (data == 0x00) {
 			space.install_readwrite_bank(expansion_ram_begin, expansion_ram_end,"bank16");
-			membank("bank16")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 128*1024);
+			membank("bank16")->set_base(m_ram->pointer() + 128*1024);
 		} else {
 			space.nop_readwrite(expansion_ram_begin, expansion_ram_end);
 		}
@@ -985,7 +985,7 @@ DRIVER_INIT_MEMBER(c65_state,c65pal)
 MACHINE_START_MEMBER(c65_state,c65)
 {
 	/* clear upper memory */
-	memset(machine().device<ram_device>(RAM_TAG)->pointer() + 128*1024, 0xff, machine().device<ram_device>(RAM_TAG)->size() -  128*1024);
+	memset(m_ram->pointer() + 128*1024, 0xff, m_ram->size() -  128*1024);
 
 //removed   cbm_drive_0_config (SERIAL, 10);
 //removed   cbm_drive_1_config (SERIAL, 11);
diff --git a/src/mess/machine/cgenie.c b/src/mess/machine/cgenie.c
index 8c64cc327de..89995f1a9e9 100644
--- a/src/mess/machine/cgenie.c
+++ b/src/mess/machine/cgenie.c
@@ -146,10 +146,10 @@ void cgenie_state::machine_start()
 		memset(gfx + i * 8, i, 8);
 
 	/* set up RAM */
-	space.install_read_bank(0x4000, 0x4000 + machine().device<ram_device>(RAM_TAG)->size() - 1, "bank1");
-	space.install_write_handler(0x4000, 0x4000 + machine().device<ram_device>(RAM_TAG)->size() - 1, write8_delegate(FUNC(cgenie_state::cgenie_videoram_w),this));
-	m_videoram = machine().device<ram_device>(RAM_TAG)->pointer();
-	membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+	space.install_read_bank(0x4000, 0x4000 + m_ram->size() - 1, "bank1");
+	space.install_write_handler(0x4000, 0x4000 + m_ram->size() - 1, write8_delegate(FUNC(cgenie_state::cgenie_videoram_w),this));
+	m_videoram = m_ram->pointer();
+	membank("bank1")->set_base(m_ram->pointer());
 	machine().scheduler().timer_pulse(attotime::from_hz(11025), timer_expired_delegate(FUNC(cgenie_state::handle_cassette_input),this));
 }
 
diff --git a/src/mess/machine/dai.c b/src/mess/machine/dai.c
index 3b6e10beb23..7887a3c1b93 100644
--- a/src/mess/machine/dai.c
+++ b/src/mess/machine/dai.c
@@ -116,12 +116,12 @@ void dai_state::machine_start()
 	machine().scheduler().timer_set(attotime::zero, timer_expired_delegate(FUNC(dai_state::dai_bootstrap_callback),this));
 	machine().scheduler().timer_pulse(attotime::from_hz(100), timer_expired_delegate(FUNC(dai_state::dai_timer),this)); /* timer for tms5501 */
 
-	memset(machine().device<ram_device>(RAM_TAG)->pointer(), 0, machine().device<ram_device>(RAM_TAG)->size());
+	memset(m_ram->pointer(), 0, m_ram->size());
 }
 
 void dai_state::machine_reset()
 {
-	membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+	membank("bank1")->set_base(m_ram->pointer());
 }
 
 /***************************************************************************
diff --git a/src/mess/machine/dgn_beta.c b/src/mess/machine/dgn_beta.c
index 269180d75be..8bd9fe54b4d 100644
--- a/src/mess/machine/dgn_beta.c
+++ b/src/mess/machine/dgn_beta.c
@@ -231,17 +231,17 @@ void dgn_beta_state::UpdateBanks(int first, int last)
 		//
 		// Map block, $00-$BF are ram, $FC-$FF are Boot ROM
 		//
-		if ((MapPage*4) < ((machine().device<ram_device>(RAM_TAG)->size() / 1024)-1))     // Block is ram
+		if ((MapPage*4) < ((m_ram->size() / 1024)-1))     // Block is ram
 		{
 			if (!is_last_page(Page))
 			{
-				readbank = &machine().device<ram_device>(RAM_TAG)->pointer()[MapPage*RamPageSize];
+				readbank = &m_ram->pointer()[MapPage*RamPageSize];
 				if(m_LogDatWrites)
 					debug_console_printf(machine(), "Mapping page %X, pageno=%X, mess_ram)[%X]\n",Page,MapPage,(MapPage*RamPageSize));
 			}
 			else
 			{
-				readbank = &machine().device<ram_device>(RAM_TAG)->pointer()[(MapPage*RamPageSize)-256];
+				readbank = &m_ram->pointer()[(MapPage*RamPageSize)-256];
 				logerror("Error RAM in Last page !\n");
 			}
 			write8_delegate func = bank_info[Page].func;
@@ -310,7 +310,7 @@ void dgn_beta_state::SetDefaultTask()
 
 	/* Map video ram to base of area it can use, that way we can take the literal RA */
 	/* from the 6845 without having to mask it ! */
-//  videoram=&machine().device<ram_device>(RAM_TAG)->pointer()[TextVidBasePage*RamPageSize];
+//  videoram=&m_ram->pointer()[TextVidBasePage*RamPageSize];
 }
 
 // Return the value of a page register
@@ -1036,7 +1036,7 @@ void dgn_beta_state::machine_reset()
 	wd17xx_dden_w(fdc, CLEAR_LINE);
 	wd17xx_set_drive(fdc, 0);
 
-	m_videoram.set_target(machine().device<ram_device>(RAM_TAG)->pointer(),m_videoram.bytes());     /* Point video ram at the start of physical ram */
+	m_videoram.set_target(m_ram->pointer(),m_videoram.bytes());     /* Point video ram at the start of physical ram */
 
 	wd17xx_reset(fdc);
 	m_wd2797_written=0;
diff --git a/src/mess/machine/electron.c b/src/mess/machine/electron.c
index 65da18a5e3b..f2884fa78ed 100644
--- a/src/mess/machine/electron.c
+++ b/src/mess/machine/electron.c
@@ -171,7 +171,6 @@ static const UINT16 electron_screen_base[8] = { 0x3000, 0x3000, 0x3000, 0x4000,
 
 WRITE8_MEMBER(electron_state::electron_ula_w)
 {
-	beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
 	int i = electron_palette_offset[(( offset >> 1 ) & 0x03)];
 	logerror( "ULA: write offset %02x <- %02x\n", offset & 0x0f, data );
 	switch( offset & 0x0f )
@@ -231,7 +230,7 @@ WRITE8_MEMBER(electron_state::electron_ula_w)
 	case 0x06:  /* Counter divider */
 		if ( m_ula.communication_mode == 0x01)
 		{
-			speaker->set_frequency( 1000000 / ( 16 * ( data + 1 ) ) );
+			m_beeper->set_frequency( 1000000 / ( 16 * ( data + 1 ) ) );
 		}
 		break;
 	case 0x07:  /* Misc. */
@@ -239,19 +238,19 @@ WRITE8_MEMBER(electron_state::electron_ula_w)
 		switch( m_ula.communication_mode )
 		{
 		case 0x00:  /* cassette input */
-			speaker->set_state( 0 );
+			m_beeper->set_state( 0 );
 			electron_tape_start();
 			break;
 		case 0x01:  /* sound generation */
-			speaker->set_state( 1 );
+			m_beeper->set_state( 1 );
 			electron_tape_stop();
 			break;
 		case 0x02:  /* cassette output */
-			speaker->set_state( 0 );
+			m_beeper->set_state( 0 );
 			electron_tape_stop();
 			break;
 		case 0x03:  /* not used */
-			speaker->set_state( 0 );
+			m_beeper->set_state( 0 );
 			electron_tape_stop();
 			break;
 		}
@@ -309,9 +308,8 @@ void electron_state::electron_interrupt_handler(int mode, int interrupt)
 
 TIMER_CALLBACK_MEMBER(electron_state::setup_beep)
 {
-	beep_device *speaker = machine().device<beep_device>(BEEPER_TAG);
-	speaker->set_state( 0 );
-	speaker->set_frequency( 300 );
+	m_beeper->set_state( 0 );
+	m_beeper->set_frequency( 300 );
 }
 
 void electron_state::machine_reset()
diff --git a/src/mess/machine/galaxy.c b/src/mess/machine/galaxy.c
index 83ce925e710..faf840d1a4b 100644
--- a/src/mess/machine/galaxy.c
+++ b/src/mess/machine/galaxy.c
@@ -85,7 +85,7 @@ void galaxy_state::galaxy_setup_snapshot (const UINT8 * data, UINT32 size)
 			m_maincpu->set_state_int(Z80_I,    data[0x40]);
 			m_maincpu->set_state_int(Z80_R,    (data[0x44] & 0x7f) | (data[0x48] & 0x80));
 
-			memcpy (machine().device<ram_device>(RAM_TAG)->pointer(), data + 0x084c, (machine().device<ram_device>(RAM_TAG)->size() < 0x1800) ? machine().device<ram_device>(RAM_TAG)->size() : 0x1800);
+			memcpy (m_ram->pointer(), data + 0x084c, (m_ram->size() < 0x1800) ? m_ram->size() : 0x1800);
 
 			break;
 		case GALAXY_SNAPSHOT_V2_SIZE:
@@ -112,7 +112,7 @@ void galaxy_state::galaxy_setup_snapshot (const UINT8 * data, UINT32 size)
 			m_maincpu->set_state_int(Z80_I,    data[0x19]);
 			m_maincpu->set_state_int(Z80_R,    data[0x1a]);
 
-			memcpy (machine().device<ram_device>(RAM_TAG)->pointer(), data + 0x0834, (machine().device<ram_device>(RAM_TAG)->size() < 0x1800) ? machine().device<ram_device>(RAM_TAG)->size() : 0x1800);
+			memcpy (m_ram->pointer(), data + 0x0834, (m_ram->size() < 0x1800) ? m_ram->size() : 0x1800);
 
 			break;
 	}
@@ -155,9 +155,9 @@ DRIVER_INIT_MEMBER(galaxy_state,galaxy)
 	space.install_readwrite_bank( 0x2800, 0x2800 + m_ram->size() - 1, "bank1");
 	membank("bank1")->set_base(m_ram->pointer());
 
-	if (machine().device<ram_device>(RAM_TAG)->size() < (6 + 48) * 1024)
+	if (m_ram->size() < (6 + 48) * 1024)
 	{
-		space.nop_readwrite( 0x2800 + machine().device<ram_device>(RAM_TAG)->size(), 0xffff);
+		space.nop_readwrite( 0x2800 + m_ram->size(), 0xffff);
 	}
 
 	for ( int i = 0; i < 8; i++ )
diff --git a/src/mess/machine/gb.c b/src/mess/machine/gb.c
index ca088b6fca4..0ac1b62689e 100644
--- a/src/mess/machine/gb.c
+++ b/src/mess/machine/gb.c
@@ -110,7 +110,7 @@ enum {
 	MBC_UNKNOWN,    /* Unknown mapper                                */
 };
 
-/* machine.device<ram_device>(RAM_TAG)->pointer() layout defines */
+/* RAM layout defines */
 #define CGB_START_VRAM_BANKS    0x0000
 #define CGB_START_RAM_BANKS ( 2 * 8 * 1024 )
 
@@ -255,7 +255,7 @@ MACHINE_RESET_MEMBER(gb_state,gbc)
 	/* Allocate memory for internal ram */
 	for (ii = 0; ii < 8; ii++)
 	{
-		m_GBC_RAMMap[ii] = machine().device<ram_device>(RAM_TAG)->pointer() + CGB_START_RAM_BANKS + ii * 0x1000;
+		m_GBC_RAMMap[ii] = m_ram->pointer() + CGB_START_RAM_BANKS + ii * 0x1000;
 		memset(m_GBC_RAMMap[ii], 0, 0x1000);
 	}
 }
diff --git a/src/mess/machine/genpc.c b/src/mess/machine/genpc.c
index 95e4e77823d..c61519ac2f6 100644
--- a/src/mess/machine/genpc.c
+++ b/src/mess/machine/genpc.c
@@ -564,7 +564,8 @@ ibm5160_mb_device::ibm5160_mb_device(const machine_config &mconfig, const char *
 		m_ppi8255(*this, "ppi8255"),
 		m_speaker(*this, "speaker"),
 		m_isabus(*this, "isa"),
-		m_pc_kbdc(*this, "pc_kbdc")
+		m_pc_kbdc(*this, "pc_kbdc"),
+		m_ram(*this, RAM_TAG)
 {
 }
 
@@ -648,8 +649,8 @@ void ibm5160_mb_device::device_start()
 	install_device(this,    0x0080, 0x0087, 0, 0, FUNC(pc_page_r), FUNC(pc_page_w) );
 	install_device_write(this,    0x00a0, 0x00a1, 0, 0, FUNC(nmi_enable_w));
 	/* MESS managed RAM */
-	if ( machine().device<ram_device>(RAM_TAG)->pointer() )
-		membank( "bank10" )->set_base( machine().device<ram_device>(RAM_TAG)->pointer() );
+	if ( m_ram->pointer() )
+		membank( "bank10" )->set_base( m_ram->pointer() );
 }
 
 IRQ_CALLBACK_MEMBER(ibm5160_mb_device::pc_irq_callback)
@@ -761,7 +762,7 @@ READ8_MEMBER (ibm5150_mb_device::pc_ppi_porta_r)
 		 * 6-7  The number of floppy disk drives
 		 */
 		data = ioport("DSW0")->read() & 0xF3;
-		switch ( machine().device<ram_device>(RAM_TAG)->size() )
+		switch ( m_ram->size() )
 		{
 		case 16 * 1024:
 			data |= 0x00;
@@ -799,7 +800,7 @@ READ8_MEMBER ( ibm5150_mb_device::pc_ppi_portc_r )
 		/* read hi nibble of SW2 */
 		data = data & 0xf0;
 
-		switch ( machine().device<ram_device>(RAM_TAG)->size() - 64 * 1024 )
+		switch ( m_ram->size() - 64 * 1024 )
 		{
 		case 64 * 1024:     data |= 0x00; break;
 		case 128 * 1024:    data |= 0x02; break;
@@ -817,7 +818,7 @@ READ8_MEMBER ( ibm5150_mb_device::pc_ppi_portc_r )
 		case 896 * 1024:    data |= 0x0B; break;
 		case 960 * 1024:    data |= 0x0D; break;
 		}
-		if ( machine().device<ram_device>(RAM_TAG)->size() > 960 * 1024 )
+		if ( m_ram->size() > 960 * 1024 )
 			data |= 0x0D;
 
 		PIO_LOG(1,"PIO_C_r (hi)",("$%02x\n", data));
diff --git a/src/mess/machine/kay_kbd.c b/src/mess/machine/kay_kbd.c
index c4143a8726e..f7a822f74be 100644
--- a/src/mess/machine/kay_kbd.c
+++ b/src/mess/machine/kay_kbd.c
@@ -287,7 +287,7 @@ MACHINE_RESET_MEMBER(kaypro_state,kay_kbd)
 	/* disable CapsLock LED initially */
 	set_led_status(machine(), 1, 1);
 	set_led_status(machine(), 1, 0);
-	kbd->beeper = machine().device<beep_device>(BEEPER_TAG);
+	kbd->beeper = machine().device<beep_device>("beeper");
 	kbd->beep_on = 1;
 	kbd->control_status = 0x14;
 	kbd->beeper->set_state(0);
diff --git a/src/mess/machine/llc.c b/src/mess/machine/llc.c
index de2cfbf9b8f..1a9693b22c3 100644
--- a/src/mess/machine/llc.c
+++ b/src/mess/machine/llc.c
@@ -147,7 +147,7 @@ Z80CTC_INTERFACE( llc2_ctc_intf )
 /* Driver initialization */
 DRIVER_INIT_MEMBER(llc_state,llc2)
 {
-	m_p_videoram.set_target( machine().device<ram_device>(RAM_TAG)->pointer() + 0xc000,m_p_videoram.bytes());
+	m_p_videoram.set_target( m_ram->pointer() + 0xc000,m_p_videoram.bytes());
 }
 
 MACHINE_RESET_MEMBER(llc_state,llc2)
@@ -164,14 +164,14 @@ MACHINE_RESET_MEMBER(llc_state,llc2)
 	membank("bank3")->set_base(memregion("maincpu")->base() + 0x6000);
 
 	space.install_write_bank(0xc000, 0xffff, "bank4");
-	membank("bank4")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xc000);
+	membank("bank4")->set_base(m_ram->pointer() + 0xc000);
 
 }
 
 WRITE8_MEMBER(llc_state::llc2_rom_disable_w)
 {
 	address_space &mem_space = m_maincpu->space(AS_PROGRAM);
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	mem_space.install_write_bank(0x0000, 0xbfff, "bank1");
 	membank("bank1")->set_base(ram);
@@ -198,7 +198,7 @@ WRITE8_MEMBER(llc_state::llc2_basic_enable_w)
 	else
 	{
 		mem_space.install_write_bank(0x4000, 0x5fff, "bank2");
-		membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x4000);
+		membank("bank2")->set_base(m_ram->pointer() + 0x4000);
 	}
 
 }
diff --git a/src/mess/machine/lviv.c b/src/mess/machine/lviv.c
index dff973c498d..12131621fd7 100644
--- a/src/mess/machine/lviv.c
+++ b/src/mess/machine/lviv.c
@@ -26,7 +26,7 @@
 
 void lviv_state::lviv_update_memory ()
 {
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	if (m_ppi_port_outputs[0][2] & 0x02)
 	{
@@ -164,7 +164,7 @@ WRITE8_MEMBER(lviv_state::lviv_io_w)
 	address_space &cpuspace = m_maincpu->space(AS_PROGRAM);
 	if (m_startup_mem_map)
 	{
-		UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+		UINT8 *ram = m_ram->pointer();
 
 		m_startup_mem_map = 0;
 
@@ -226,7 +226,7 @@ void lviv_state::machine_reset()
 
 	space.set_direct_update_handler(direct_update_delegate(FUNC(lviv_state::lviv_directoverride), this));
 
-	m_video_ram = machine().device<ram_device>(RAM_TAG)->pointer() + 0xc000;
+	m_video_ram = m_ram->pointer() + 0xc000;
 
 	m_startup_mem_map = 1;
 
@@ -243,7 +243,7 @@ void lviv_state::machine_reset()
 
 	/*machine().scheduler().timer_pulse(TIME_IN_NSEC(200), FUNC(lviv_draw_pixel));*/
 
-	/*memset(machine().device<ram_device>(RAM_TAG)->pointer(), 0, sizeof(unsigned char)*0xffff);*/
+	/*memset(m_ram->pointer(), 0, sizeof(unsigned char)*0xffff);*/
 }
 
 
@@ -287,8 +287,8 @@ void lviv_state::lviv_setup_snapshot (UINT8 * data)
 	m_maincpu->set_state_int(I8085_PC, (hi << 8) | lo);
 
 	/* Memory dump */
-	memcpy (machine().device<ram_device>(RAM_TAG)->pointer(), data+0x0011, 0xc000);
-	memcpy (machine().device<ram_device>(RAM_TAG)->pointer()+0xc000, data+0x10011, 0x4000);
+	memcpy (m_ram->pointer(), data+0x0011, 0xc000);
+	memcpy (m_ram->pointer()+0xc000, data+0x10011, 0x4000);
 
 	/* Ports */
 	m_ppi_port_outputs[0][0] = data[0x14011+0xc0];
diff --git a/src/mess/machine/mtx.c b/src/mess/machine/mtx.c
index 3cb01f5a48f..8cc5e169b06 100644
--- a/src/mess/machine/mtx.c
+++ b/src/mess/machine/mtx.c
@@ -74,7 +74,7 @@ void mtx_state::bankswitch(UINT8 data)
 
 	*/
 	address_space &program = m_maincpu->space(AS_PROGRAM);
-	ram_device *messram = machine().device<ram_device>(RAM_TAG);
+	ram_device *messram = m_ram;
 
 //  UINT8 cbm_mode = data >> 7 & 0x01;
 	UINT8 rom_page = data >> 4 & 0x07;
@@ -366,7 +366,7 @@ SNAPSHOT_LOAD_MEMBER( mtx_state, mtx )
 
 MACHINE_START_MEMBER(mtx_state,mtx512)
 {
-	ram_device *messram = machine().device<ram_device>(RAM_TAG);
+	ram_device *messram = m_ram;
 
 	/* find devices */
 	m_z80ctc = machine().device<z80ctc_device>(Z80CTC_TAG);
diff --git a/src/mess/machine/mz700.c b/src/mess/machine/mz700.c
index 65b2a86c7e9..fb81c9c2649 100644
--- a/src/mess/machine/mz700.c
+++ b/src/mess/machine/mz700.c
@@ -171,7 +171,7 @@ READ8_MEMBER(mz_state::mz800_bank_0_r)
 
 			/* ram from 0xa000 to 0xbfff */
 			spc.install_readwrite_bank(0xa000, 0xbfff, "bank5");
-			membank("bank5")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xa000);
+			membank("bank5")->set_base(m_ram->pointer() + 0xa000);
 		}
 	}
 
@@ -183,7 +183,7 @@ WRITE8_MEMBER(mz_state::mz700_bank_0_w)
 	address_space &spc = m_maincpu->space(AS_PROGRAM);
 
 	spc.install_readwrite_bank(0x0000, 0x0fff, "bank1");
-	membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+	membank("bank1")->set_base(m_ram->pointer());
 }
 
 WRITE8_MEMBER(mz_state::mz800_bank_0_w)
@@ -191,7 +191,7 @@ WRITE8_MEMBER(mz_state::mz800_bank_0_w)
 	address_space &spc = m_maincpu->space(AS_PROGRAM);
 
 	spc.install_readwrite_bank(0x0000, 0x7fff, "bank1");
-	membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+	membank("bank1")->set_base(m_ram->pointer());
 }
 
 READ8_MEMBER(mz_state::mz800_bank_1_r)
@@ -200,19 +200,19 @@ READ8_MEMBER(mz_state::mz800_bank_1_r)
 
 	/* switch in ram from 0x1000 to 0x1fff */
 	spc.install_readwrite_bank(0x1000, 0x1fff, "bank2");
-	membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x1000);
+	membank("bank2")->set_base(m_ram->pointer() + 0x1000);
 
 	if (m_mz700_mode)
 	{
 		/* ram from 0xc000 to 0xcfff */
 		spc.install_readwrite_bank(0xc000, 0xcfff, "bank6");
-		membank("bank6")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xc000);
+		membank("bank6")->set_base(m_ram->pointer() + 0xc000);
 	}
 	else
 	{
 		/* ram from 0x8000 to 0xbfff */
 		spc.install_readwrite_bank(0x8000, 0xbfff, "bank4");
-		membank("bank4")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x8000);
+		membank("bank4")->set_base(m_ram->pointer() + 0x8000);
 	}
 
 	return 0xff;
@@ -228,7 +228,7 @@ WRITE8_MEMBER(mz_state::mz700_bank_1_w)
 		if (!m_mz700_ram_lock)
 		{
 			spc.install_readwrite_bank(0xd000, 0xffff, "bank7");
-			membank("bank7")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xd000);
+			membank("bank7")->set_base(m_ram->pointer() + 0xd000);
 			m_mz700_ram_vram = FALSE;
 		}
 	}
@@ -238,7 +238,7 @@ WRITE8_MEMBER(mz_state::mz700_bank_1_w)
 		if (!m_mz800_ram_lock)
 		{
 			spc.install_readwrite_bank(0xe000, 0xffff, "bank8");
-			membank("bank8")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xe000);
+			membank("bank8")->set_base(m_ram->pointer() + 0xe000);
 			m_mz800_ram_monitor = FALSE;
 		}
 	}
@@ -313,7 +313,7 @@ WRITE8_MEMBER(mz_state::mz700_bank_4_w)
 
 		/* rest is ram is always ram in mz700 mode */
 		spc.install_readwrite_bank(0x1000, 0xcfff, "bank2");
-		membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x1000);
+		membank("bank2")->set_base(m_ram->pointer() + 0x1000);
 	}
 	else
 	{
@@ -324,7 +324,7 @@ WRITE8_MEMBER(mz_state::mz700_bank_4_w)
 
 		/* ram from 0x2000 to 0x7fff */
 		spc.install_readwrite_bank(0x2000, 0x7fff, "bank3");
-		membank("bank3")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+		membank("bank3")->set_base(m_ram->pointer());
 
 		if (m_hires_mode)
 		{
@@ -340,12 +340,12 @@ WRITE8_MEMBER(mz_state::mz700_bank_4_w)
 
 			/* ram from 0xa000 to 0xbfff */
 			spc.install_readwrite_bank(0xa000, 0xbfff, "bank5");
-			membank("bank5")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xa000);
+			membank("bank5")->set_base(m_ram->pointer() + 0xa000);
 		}
 
 		/* ram from 0xc000 to 0xdfff */
 		spc.install_readwrite_bank(0xc000, 0xdfff, "bank6");
-		membank("bank6")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0xc000);
+		membank("bank6")->set_base(m_ram->pointer() + 0xc000);
 
 		/* mz800 monitor rom from 0xe000 to 0xffff */
 		spc.install_read_bank(0xe000, 0xffff, "bank8");
diff --git a/src/mess/machine/nascom1.c b/src/mess/machine/nascom1.c
index bbc56cebab0..57e94661528 100644
--- a/src/mess/machine/nascom1.c
+++ b/src/mess/machine/nascom1.c
@@ -257,7 +257,7 @@ void nascom1_state::machine_reset()
 
 DRIVER_INIT_MEMBER(nascom1_state,nascom1)
 {
-	switch (machine().device<ram_device>(RAM_TAG)->size())
+	switch (m_ram->size())
 	{
 	case 1 * 1024:
 		m_maincpu->space(AS_PROGRAM).nop_readwrite(
@@ -269,7 +269,7 @@ DRIVER_INIT_MEMBER(nascom1_state,nascom1)
 			0x1400, 0x4fff, "bank1");
 		m_maincpu->space(AS_PROGRAM).nop_readwrite(
 			0x5000, 0xafff);
-		membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+		membank("bank1")->set_base(m_ram->pointer());
 		break;
 
 	case 32 * 1024:
@@ -277,13 +277,13 @@ DRIVER_INIT_MEMBER(nascom1_state,nascom1)
 			0x1400, 0x8fff, "bank1");
 		m_maincpu->space(AS_PROGRAM).nop_readwrite(
 			0x9000, 0xafff);
-		membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+		membank("bank1")->set_base(m_ram->pointer());
 		break;
 
 	case 40 * 1024:
 		m_maincpu->space(AS_PROGRAM).install_readwrite_bank(
 			0x1400, 0xafff, "bank1");
-		membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer());
+		membank("bank1")->set_base(m_ram->pointer());
 		break;
 	}
 }
diff --git a/src/mess/machine/partner.c b/src/mess/machine/partner.c
index 0a1edd6aa76..53b05e726dd 100644
--- a/src/mess/machine/partner.c
+++ b/src/mess/machine/partner.c
@@ -142,7 +142,7 @@ void partner_state::partner_bank_switch()
 {
 	address_space &space = m_maincpu->space(AS_PROGRAM);
 	UINT8 *rom = memregion("maincpu")->base();
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	space.install_write_bank(0x0000, 0x07ff, "bank1");
 	space.install_write_bank(0x0800, 0x3fff, "bank2");
diff --git a/src/mess/machine/pc.c b/src/mess/machine/pc.c
index bba73b8bc52..d6c6a5f9d90 100644
--- a/src/mess/machine/pc.c
+++ b/src/mess/machine/pc.c
@@ -1076,7 +1076,7 @@ READ8_MEMBER(pc_state::pcjr_ppi_portc_r)
 
 	data&=~0x80;
 	data &= ~0x04;      /* floppy drive installed */
-	if ( machine().device<ram_device>(RAM_TAG)->size() > 64 * 1024 )    /* more than 64KB ram installed */
+	if ( m_ram->size() > 64 * 1024 )    /* more than 64KB ram installed */
 		data &= ~0x08;
 	data = ( data & ~0x01 ) | ( pcjr_keyb.latch ? 0x01: 0x00 );
 	if ( ! ( m_ppi_portb & 0x08 ) )
@@ -1414,8 +1414,8 @@ void pc_state::mess_init_pc_common(void (*set_keyb_int_func)(running_machine &,
 		init_pc_common(set_keyb_int_func);
 
 	/* MESS managed RAM */
-	if ( machine().device<ram_device>(RAM_TAG)->pointer() )
-		membank( "bank10" )->set_base( machine().device<ram_device>(RAM_TAG)->pointer() );
+	if ( m_ram->pointer() )
+		membank( "bank10" )->set_base( m_ram->pointer() );
 }
 
 
diff --git a/src/mess/machine/pc1350.c b/src/mess/machine/pc1350.c
index d652cfe103c..e64e567c52d 100644
--- a/src/mess/machine/pc1350.c
+++ b/src/mess/machine/pc1350.c
@@ -96,22 +96,22 @@ void pc1350_state::machine_start()
 	machine().scheduler().timer_set(attotime::from_seconds(1), timer_expired_delegate(FUNC(pc1350_state::pc1350_power_up),this));
 
 	space.install_readwrite_bank(0x6000, 0x6fff, "bank1");
-	membank("bank1")->set_base(&machine().device<ram_device>(RAM_TAG)->pointer()[0x0000]);
+	membank("bank1")->set_base(&m_ram->pointer()[0x0000]);
 
-	if (machine().device<ram_device>(RAM_TAG)->size() >= 0x3000)
+	if (m_ram->size() >= 0x3000)
 	{
 		space.install_readwrite_bank(0x4000, 0x5fff, "bank2");
-		membank("bank2")->set_base(&machine().device<ram_device>(RAM_TAG)->pointer()[0x1000]);
+		membank("bank2")->set_base(&m_ram->pointer()[0x1000]);
 	}
 	else
 	{
 		space.nop_readwrite(0x4000, 0x5fff);
 	}
 
-	if (machine().device<ram_device>(RAM_TAG)->size() >= 0x5000)
+	if (m_ram->size() >= 0x5000)
 	{
 		space.install_readwrite_bank(0x2000, 0x3fff, "bank3");
-		membank("bank3")->set_base(&machine().device<ram_device>(RAM_TAG)->pointer()[0x3000]);
+		membank("bank3")->set_base(&m_ram->pointer()[0x3000]);
 	}
 	else
 	{
diff --git a/src/mess/machine/pp01.c b/src/mess/machine/pp01.c
index ba52ff3b7f1..67e7c4f82d9 100644
--- a/src/mess/machine/pp01.c
+++ b/src/mess/machine/pp01.c
@@ -21,7 +21,7 @@ WRITE8_MEMBER(pp01_state::pp01_video_write_mode_w)
 void pp01_state::pp01_video_w(UINT8 block,UINT16 offset,UINT8 data,UINT8 part)
 {
 	UINT16 addroffset = part ? 0x1000  : 0x0000;
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	if (BIT(m_video_write_mode,3)) {
 		// Copy mode
@@ -117,7 +117,7 @@ void pp01_state::pp01_set_memory(UINT8 block, UINT8 data)
 					break;
 		}
 
-		membank(bank)->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + (data & 0x0F)* 0x1000);
+		membank(bank)->set_base(m_ram->pointer() + (data & 0x0F)* 0x1000);
 	} else if (data>=0xF8) {
 		space.install_read_bank (startaddr, endaddr, bank);
 		space.unmap_write(startaddr, endaddr);
diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c
index e9f66f47a4e..8a1b74cb789 100644
--- a/src/mess/machine/rmnimbus.c
+++ b/src/mess/machine/rmnimbus.c
@@ -1951,11 +1951,11 @@ static const nimbus_blocks ramblocks[] =
 void rmnimbus_state::nimbus_bank_memory()
 {
 	address_space &space = machine().device( MAINCPU_TAG)->memory().space( AS_PROGRAM );
-	int     ramsize = machine().device<ram_device>(RAM_TAG)->size();
+	int     ramsize = m_ram->size();
 	int     ramblock = 0;
 	int     blockno;
 	char    bank[10];
-	UINT8   *ram    = &machine().device<ram_device>(RAM_TAG)->pointer()[0];
+	UINT8   *ram    = &m_ram->pointer()[0];
 	UINT8   *map_blocks[3];
 	UINT8   *map_base;
 	int     map_blockno;
diff --git a/src/mess/machine/samcoupe.c b/src/mess/machine/samcoupe.c
index 8ee96a7b0e2..3237696e5c4 100644
--- a/src/mess/machine/samcoupe.c
+++ b/src/mess/machine/samcoupe.c
@@ -114,16 +114,16 @@ void samcoupe_state::samcoupe_install_ext_mem(address_space &space)
 	UINT8 *mem;
 
 	/* bank 3 */
-	if (m_lext >> 6 < space.machine().device<ram_device>(RAM_TAG)->size() >> 20)
-		mem = &space.machine().device<ram_device>(RAM_TAG)->pointer()[(space.machine().device<ram_device>(RAM_TAG)->size() & 0xfffff) + (m_lext >> 6) * 0x100000 + (m_lext & 0x3f) * 0x4000];
+	if (m_lext >> 6 < m_ram->size() >> 20)
+		mem = &m_ram->pointer()[(m_ram->size() & 0xfffff) + (m_lext >> 6) * 0x100000 + (m_lext & 0x3f) * 0x4000];
 	else
 		mem = NULL;
 
 	samcoupe_update_bank(space, 3, mem, FALSE);
 
 	/* bank 4 */
-	if (m_hext >> 6 < space.machine().device<ram_device>(RAM_TAG)->size() >> 20)
-		mem = &space.machine().device<ram_device>(RAM_TAG)->pointer()[(space.machine().device<ram_device>(RAM_TAG)->size() & 0xfffff) + (m_hext >> 6) * 0x100000 + (m_hext & 0x3f) * 0x4000];
+	if (m_hext >> 6 < m_ram->size() >> 20)
+		mem = &m_ram->pointer()[(m_ram->size() & 0xfffff) + (m_hext >> 6) * 0x100000 + (m_hext & 0x3f) * 0x4000];
 	else
 		mem = NULL;
 
@@ -133,7 +133,7 @@ void samcoupe_state::samcoupe_install_ext_mem(address_space &space)
 
 void samcoupe_state::samcoupe_update_memory(address_space &space)
 {
-	const int PAGE_MASK = ((machine().device<ram_device>(RAM_TAG)->size() & 0xfffff) / 0x4000) - 1;
+	const int PAGE_MASK = ((m_ram->size() & 0xfffff) / 0x4000) - 1;
 	UINT8 *rom = memregion("maincpu")->base();
 	UINT8 *memory;
 	int is_readonly;
@@ -142,7 +142,7 @@ void samcoupe_state::samcoupe_update_memory(address_space &space)
 	if (m_lmpr & LMPR_RAM0)   /* Is ram paged in at bank 1 */
 	{
 		if ((m_lmpr & 0x1F) <= PAGE_MASK)
-			memory = &machine().device<ram_device>(RAM_TAG)->pointer()[(m_lmpr & PAGE_MASK) * 0x4000];
+			memory = &m_ram->pointer()[(m_lmpr & PAGE_MASK) * 0x4000];
 		else
 			memory = NULL;  /* Attempt to page in non existant ram region */
 		is_readonly = FALSE;
@@ -157,7 +157,7 @@ void samcoupe_state::samcoupe_update_memory(address_space &space)
 
 	/* BANK2 */
 	if (((m_lmpr + 1) & 0x1f) <= PAGE_MASK)
-		memory = &machine().device<ram_device>(RAM_TAG)->pointer()[((m_lmpr + 1) & PAGE_MASK) * 0x4000];
+		memory = &m_ram->pointer()[((m_lmpr + 1) & PAGE_MASK) * 0x4000];
 	else
 		memory = NULL;  /* Attempt to page in non existant ram region */
 	samcoupe_update_bank(space, 2, memory, FALSE);
@@ -171,7 +171,7 @@ void samcoupe_state::samcoupe_update_memory(address_space &space)
 	{
 		/* BANK3 */
 		if ((m_hmpr & 0x1F) <= PAGE_MASK )
-			memory = &machine().device<ram_device>(RAM_TAG)->pointer()[(m_hmpr & PAGE_MASK)*0x4000];
+			memory = &m_ram->pointer()[(m_hmpr & PAGE_MASK)*0x4000];
 		else
 			memory = NULL;  /* Attempt to page in non existant ram region */
 		samcoupe_update_bank(space, 3, memory, FALSE);
@@ -186,7 +186,7 @@ void samcoupe_state::samcoupe_update_memory(address_space &space)
 		else
 		{
 			if (((m_hmpr + 1) & 0x1f) <= PAGE_MASK)
-				memory = &space.machine().device<ram_device>(RAM_TAG)->pointer()[((m_hmpr + 1) & PAGE_MASK) * 0x4000];
+				memory = &m_ram->pointer()[((m_hmpr + 1) & PAGE_MASK) * 0x4000];
 			else
 				memory = NULL;  /* Attempt to page in non existant ram region */
 			is_readonly = FALSE;
@@ -196,9 +196,9 @@ void samcoupe_state::samcoupe_update_memory(address_space &space)
 
 	/* video memory location */
 	if (m_vmpr & 0x40)   /* if bit set in 2 bank screen mode */
-		m_videoram = &machine().device<ram_device>(RAM_TAG)->pointer()[((m_vmpr & 0x1e) & PAGE_MASK) * 0x4000];
+		m_videoram = &m_ram->pointer()[((m_vmpr & 0x1e) & PAGE_MASK) * 0x4000];
 	else
-		m_videoram = &machine().device<ram_device>(RAM_TAG)->pointer()[((m_vmpr & 0x1f) & PAGE_MASK) * 0x4000];
+		m_videoram = &m_ram->pointer()[((m_vmpr & 0x1f) & PAGE_MASK) * 0x4000];
 }
 
 
diff --git a/src/mess/machine/vector06.c b/src/mess/machine/vector06.c
index 597fac60848..f8e30b96cdb 100644
--- a/src/mess/machine/vector06.c
+++ b/src/mess/machine/vector06.c
@@ -148,7 +148,7 @@ TIMER_CALLBACK_MEMBER(vector06_state::reset_check_callback)
 
 	if (BIT(val, 1))
 	{
-		membank("bank1")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x0000);
+		membank("bank1")->set_base(m_ram->pointer() + 0x0000);
 		m_maincpu->reset();
 	}
 }
@@ -177,9 +177,9 @@ void vector06_state::machine_reset()
 	space.install_write_bank(0x8000, 0xffff, "bank4");
 
 	membank("bank1")->set_base(memregion("maincpu")->base() + 0x10000);
-	membank("bank2")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x0000);
-	membank("bank3")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x8000);
-	membank("bank4")->set_base(machine().device<ram_device>(RAM_TAG)->pointer() + 0x8000);
+	membank("bank2")->set_base(m_ram->pointer() + 0x0000);
+	membank("bank3")->set_base(m_ram->pointer() + 0x8000);
+	membank("bank4")->set_base(m_ram->pointer() + 0x8000);
 
 	m_keyboard_mask = 0;
 	m_color_index = 0;
diff --git a/src/mess/video/911_vdt.c b/src/mess/video/911_vdt.c
index 681d59e4e29..75ad9b6f212 100644
--- a/src/mess/video/911_vdt.c
+++ b/src/mess/video/911_vdt.c
@@ -230,7 +230,7 @@ void vdt911_init(running_machine &machine)
 
 static TIMER_CALLBACK(setup_beep)
 {
-	machine.device<beep_device>(BEEPER_TAG)->set_frequency(2000);
+	machine.device<beep_device>("beeper")->set_frequency(2000);
 }
 
 
@@ -311,7 +311,7 @@ static TIMER_CALLBACK(blink_callback)
 */
 static TIMER_CALLBACK(beep_callback)
 {
-	machine.device<beep_device>(BEEPER_TAG)->set_state(0);
+	machine.device<beep_device>("beeper")->set_state(0);
 }
 
 /*
@@ -485,7 +485,7 @@ WRITE8_DEVICE_HANDLER( vdt911_cru_w )
 
 		case 0xe:
 			/* beep enable strobe - not tested */
-			space.machine().device<beep_device>(BEEPER_TAG)->set_state(1);
+			space.machine().device<beep_device>("beeper")->set_state(1);
 
 			vdt->beep_timer->adjust(attotime::from_usec(300));
 			break;
diff --git a/src/mess/video/apple3.c b/src/mess/video/apple3.c
index 53f7319ad9a..516ee037fa5 100644
--- a/src/mess/video/apple3.c
+++ b/src/mess/video/apple3.c
@@ -93,8 +93,8 @@ void apple3_state::apple3_video_text40(bitmap_ind16 &bitmap)
 	const UINT8 *char_data;
 	pen_t fg, bg, temp;
 	UINT16 *dest;
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
-	UINT32 ram_size = machine().device<ram_device>(RAM_TAG)->size();
+	UINT8 *ram = m_ram->pointer();
+	UINT32 ram_size = m_ram->size();
 
 	for (y = 0; y < 24; y++)
 	{
@@ -150,8 +150,8 @@ void apple3_state::apple3_video_text80(bitmap_ind16 &bitmap)
 	const UINT8 *char_data;
 	pen_t fg, bg;
 	UINT16 *dest;
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
-	UINT32 ram_size = machine().device<ram_device>(RAM_TAG)->size();
+	UINT8 *ram = m_ram->pointer();
+	UINT32 ram_size = m_ram->size();
 
 	for (y = 0; y < 24; y++)
 	{
@@ -201,7 +201,7 @@ void apple3_state::apple3_video_graphics_hgr(bitmap_ind16 &bitmap)
 	const UINT8 *pix_info;
 	UINT16 *ptr;
 	UINT8 b;
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	for (y = 0; y < 192; y++)
 	{
@@ -246,7 +246,7 @@ void apple3_state::apple3_video_graphics_chgr(bitmap_ind16 &bitmap)
 	UINT16 *ptr;
 	UINT8 b;
 	UINT16 fgcolor, bgcolor;
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	for (y = 0; y < 192; y++)
 	{
@@ -291,7 +291,7 @@ void apple3_state::apple3_video_graphics_shgr(bitmap_ind16 &bitmap)
 	const UINT8 *pix_info2;
 	UINT16 *ptr;
 	UINT8 b1, b2;
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	for (y = 0; y < 192; y++)
 	{
@@ -330,7 +330,7 @@ void apple3_state::apple3_video_graphics_chires(bitmap_ind16 &bitmap)
 	UINT16 *pen;
 	PAIR pix;
 	int y, i;
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	for (y = 0; y < 192; y++)
 	{
diff --git a/src/mess/video/b2m.c b/src/mess/video/b2m.c
index 95bf24a6f7b..329353ed954 100644
--- a/src/mess/video/b2m.c
+++ b/src/mess/video/b2m.c
@@ -21,7 +21,7 @@ UINT32 b2m_state::screen_update_b2m(screen_device &screen, bitmap_ind16 &bitmap,
 	UINT8 code2;
 	UINT8 col;
 	int y, x, b;
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	for (x = 0; x < 48; x++)
 	{
diff --git a/src/mess/video/epnick.c b/src/mess/video/epnick.c
index c395b9f3fb8..9753297b71e 100644
--- a/src/mess/video/epnick.c
+++ b/src/mess/video/epnick.c
@@ -1015,7 +1015,7 @@ void ep_state::video_start()
 {
 	nick = auto_alloc_clear(machine(), NICK_STATE);
 
-	nick->videoram = machine().device<ram_device>(RAM_TAG)->pointer();
+	nick->videoram = m_ram->pointer();
 	Nick_Init();
 	machine().primary_screen->register_screen_bitmap(m_bitmap);
 }
diff --git a/src/mess/video/mac.c b/src/mess/video/mac.c
index 8057d8c49b4..0ffae252cfa 100644
--- a/src/mess/video/mac.c
+++ b/src/mess/video/mac.c
@@ -86,8 +86,8 @@ UINT32 mac_state::screen_update_mac(screen_device &screen, bitmap_ind16 &bitmap,
 	UINT16 *line;
 	int y, x, b;
 
-	video_base = machine().device<ram_device>(RAM_TAG)->size() - (m_screen_buffer ? MAC_MAIN_SCREEN_BUF_OFFSET : MAC_ALT_SCREEN_BUF_OFFSET);
-	video_ram = (const UINT16 *) (machine().device<ram_device>(RAM_TAG)->pointer() + video_base);
+	video_base = m_ram->size() - (m_screen_buffer ? MAC_MAIN_SCREEN_BUF_OFFSET : MAC_ALT_SCREEN_BUF_OFFSET);
+	video_ram = (const UINT16 *) (m_ram->pointer() + video_base);
 
 	for (y = 0; y < MAC_V_VIS; y++)
 	{
@@ -381,7 +381,7 @@ UINT32 mac_state::screen_update_macrbv(screen_device &screen, bitmap_rgb32 &bitm
 {
 	UINT32 *scanline;
 	int x, y, hres, vres;
-	UINT8 *vram8 = (UINT8 *)machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *vram8 = (UINT8 *)m_ram->pointer();
 
 	switch (m_rbv_montype)
 	{
diff --git a/src/mess/video/nc.c b/src/mess/video/nc.c
index 5bbcca01bdd..cf5bb36eba8 100644
--- a/src/mess/video/nc.c
+++ b/src/mess/video/nc.c
@@ -89,7 +89,7 @@ UINT32 nc_state::screen_update_nc(screen_device &screen, bitmap_ind16 &bitmap, c
 	{
 		int by;
 		/* 64 bytes per line */
-		char *line_ptr = ((char*)machine().device<ram_device>(RAM_TAG)->pointer()) + m_display_memory_start + (y<<6);
+		char *line_ptr = ((char*)m_ram->pointer()) + m_display_memory_start + (y<<6);
 
 		x = 0;
 		for (by=0; by<width>>3; by++)
diff --git a/src/mess/video/pcw.c b/src/mess/video/pcw.c
index d8e18d7973f..834449e3999 100644
--- a/src/mess/video/pcw.c
+++ b/src/mess/video/pcw.c
@@ -92,14 +92,14 @@ UINT32 pcw_state::screen_update_pcw(screen_device &screen, bitmap_ind16 &bitmap,
 
 			x = PCW_BORDER_WIDTH;
 
-			roller_ram_ptr = machine().device<ram_device>(RAM_TAG)->pointer() + m_roller_ram_addr + roller_ram_offs;
+			roller_ram_ptr = m_ram->pointer() + m_roller_ram_addr + roller_ram_offs;
 
 			/* get line address */
 			/* b16-14 control which bank the line is to be found in, b13-3 the address in the bank (in 16-byte units), and b2-0 the offset. Thus a roller RAM address bbbxxxxxxxxxxxyyy indicates bank bbb, address 00xxxxxxxxxxx0yyy. */
 			line_data = ((unsigned char *)roller_ram_ptr)[0] | (((unsigned char *)roller_ram_ptr)[1]<<8);
 
 			/* calculate address of pixel data */
-			line_ptr = machine().device<ram_device>(RAM_TAG)->pointer() + ((line_data & 0x0e000)<<1) + ((line_data & 0x01ff8)<<1) + (line_data & 0x07);
+			line_ptr = m_ram->pointer() + ((line_data & 0x0e000)<<1) + ((line_data & 0x01ff8)<<1) + (line_data & 0x07);
 
 			for (by=0; by<90; by++)
 			{
diff --git a/src/mess/video/pp01.c b/src/mess/video/pp01.c
index a74afaf609c..6b543db5e59 100644
--- a/src/mess/video/pp01.c
+++ b/src/mess/video/pp01.c
@@ -20,7 +20,7 @@ UINT32 pp01_state::screen_update_pp01(screen_device &screen, bitmap_ind16 &bitma
 	UINT8 code_r,code_g,code_b;
 	UINT8 col;
 	int y, x, b;
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	for (y = 0; y < 256; y++)
 	{
diff --git a/src/mess/video/timex.c b/src/mess/video/timex.c
index c83236cbb55..d4180f66fd0 100644
--- a/src/mess/video/timex.c
+++ b/src/mess/video/timex.c
@@ -62,7 +62,7 @@ void spectrum_state::ts2068_hires_scanline(bitmap_ind16 &bitmap, int y, int bord
 	scrx=TS2068_LEFT_BORDER;
 	scry=((y&7) * 8) + ((y&0x38)>>3) + (y&0xC0);
 
-	scr=machine().device<ram_device>(RAM_TAG)->pointer() + y*32;
+	scr=m_ram->pointer() + y*32;
 	attr=scr + 0x2000;
 
 	for (x=0;x<32;x++)
@@ -106,7 +106,7 @@ void spectrum_state::ts2068_64col_scanline(bitmap_ind16 &bitmap, int y, int bord
 	scrx=TS2068_LEFT_BORDER;
 	scry=((y&7) * 8) + ((y&0x38)>>3) + (y&0xC0);
 
-	scr1=machine().device<ram_device>(RAM_TAG)->pointer() + y*32;
+	scr1=m_ram->pointer() + y*32;
 	scr2=scr1 + 0x2000;
 
 	for (x=0;x<32;x++)
@@ -141,8 +141,8 @@ void spectrum_state::ts2068_lores_scanline(bitmap_ind16 &bitmap, int y, int bord
 	scrx=TS2068_LEFT_BORDER;
 	scry=((y&7) * 8) + ((y&0x38)>>3) + (y&0xC0);
 
-	scr = machine().device<ram_device>(RAM_TAG)->pointer() + y*32 + screen*0x2000;
-	attr = machine().device<ram_device>(RAM_TAG)->pointer() + ((scry>>3)*32) + screen*0x2000 + 0x1800;
+	scr = m_ram->pointer() + y*32 + screen*0x2000;
+	attr = m_ram->pointer() + ((scry>>3)*32) + screen*0x2000 + 0x1800;
 
 	for (x=0;x<32;x++)
 	{
diff --git a/src/mess/video/vector06.c b/src/mess/video/vector06.c
index 98b615f3ba6..c0f8f27a50f 100644
--- a/src/mess/video/vector06.c
+++ b/src/mess/video/vector06.c
@@ -19,7 +19,7 @@ UINT32 vector06_state::screen_update_vector06(screen_device &screen, bitmap_ind1
 	UINT8 code1,code2,code3,code4;
 	UINT8 col;
 	int y, x, b,draw_y;
-	UINT8 *ram = machine().device<ram_device>(RAM_TAG)->pointer();
+	UINT8 *ram = m_ram->pointer();
 
 	int width = (m_video_mode==0x00) ? 256 : 512;
 	rectangle screen_area(0,width+64-1,0,256+64-1);
diff --git a/src/mess/video/x68k.c b/src/mess/video/x68k.c
index ce78f4c9252..0537237d26d 100644
--- a/src/mess/video/x68k.c
+++ b/src/mess/video/x68k.c
@@ -1288,7 +1288,7 @@ UINT32 x68k_state::screen_update_x68000(screen_device &screen, bitmap_ind16 &bit
 //  popmessage("Graphic layer scroll - %i, %i - %i, %i - %i, %i - %i, %i",
 //      m_crtc.reg[12],m_crtc.reg[13],m_crtc.reg[14],m_crtc.reg[15],m_crtc.reg[16],m_crtc.reg[17],m_crtc.reg[18],m_crtc.reg[19]);
 //  popmessage("IOC IRQ status - %02x",m_ioc.irqstatus);
-//  popmessage("RAM: mouse data - %02x %02x %02x %02x",machine().device<ram_device>(RAM_TAG)->pointer()[0x931],machine().device<ram_device>(RAM_TAG)->pointer()[0x930],machine().device<ram_device>(RAM_TAG)->pointer()[0x933],machine().device<ram_device>(RAM_TAG)->pointer()[0x932]);
+//  popmessage("RAM: mouse data - %02x %02x %02x %02x",m_ram->pointer()[0x931],m_ram->pointer()[0x930],m_ram->pointer()[0x933],m_ram->pointer()[0x932]);
 #endif
 	return 0;
 }