diff --git a/src/emu/audit.c b/src/emu/audit.c
index 0332b133b4d..3ad452149b6 100644
--- a/src/emu/audit.c
+++ b/src/emu/audit.c
@@ -130,7 +130,7 @@ int audit_samples(core_options *options, const game_driver *gamedrv, audit_recor
 	for (sndnum = 0; sndnum < ARRAY_LENGTH(config->sound); sndnum++)
 		if (config->sound[sndnum].type == SOUND_SAMPLES)
 		{
-			const struct Samplesinterface *intf = (const struct Samplesinterface *)config->sound[sndnum].config;
+			const samples_interface *intf = (const samples_interface *)config->sound[sndnum].config;
 
 			if (intf->samplenames != NULL)
 			{
@@ -155,7 +155,7 @@ int audit_samples(core_options *options, const game_driver *gamedrv, audit_recor
 	for (sndnum = 0; sndnum < ARRAY_LENGTH(config->sound); sndnum++)
 		if (config->sound[sndnum].type == SOUND_SAMPLES)
 		{
-			const struct Samplesinterface *intf = (const struct Samplesinterface *)config->sound[sndnum].config;
+			const samples_interface *intf = (const samples_interface *)config->sound[sndnum].config;
 			const char *sharedname = NULL;
 
 			if (intf->samplenames != NULL)
diff --git a/src/emu/clifront.c b/src/emu/clifront.c
index e7ad38ee971..b1a2a0905f9 100644
--- a/src/emu/clifront.c
+++ b/src/emu/clifront.c
@@ -565,7 +565,7 @@ int cli_info_listsamples(core_options *options, const char *gamename)
 			for (sndnum = 0; sndnum < MAX_SOUND && config->sound[sndnum].type != SOUND_DUMMY; sndnum++)
 				if (config->sound[sndnum].type == SOUND_SAMPLES)
 				{
-					const char *const *samplenames = ((const struct Samplesinterface *)config->sound[sndnum].config)->samplenames;
+					const char *const *samplenames = ((const samples_interface *)config->sound[sndnum].config)->samplenames;
 					int sampnum;
 
 					/* if the list is legit, walk it and print the sample info */
diff --git a/src/emu/info.c b/src/emu/info.c
index ff6e5d18283..0ba5e0552db 100644
--- a/src/emu/info.c
+++ b/src/emu/info.c
@@ -499,7 +499,7 @@ static void print_game_sampleof(FILE *out, const game_driver *game, const machin
 	for (sndnum = 0; sndnum < ARRAY_LENGTH(config->sound) && config->sound[sndnum].type != SOUND_DUMMY; sndnum++)
 		if (config->sound[sndnum].type == SOUND_SAMPLES)
 		{
-			const char *const *samplenames = ((const struct Samplesinterface *)config->sound[sndnum].config)->samplenames;
+			const char *const *samplenames = ((const samples_interface *)config->sound[sndnum].config)->samplenames;
 			if (samplenames != NULL)
 			{
 				int sampnum;
@@ -533,7 +533,7 @@ static void print_game_sample(FILE *out, const game_driver *game, const machine_
 	for (sndnum = 0; sndnum < ARRAY_LENGTH(config->sound) && config->sound[sndnum].type != SOUND_DUMMY; sndnum++)
 		if (config->sound[sndnum].type == SOUND_SAMPLES)
 		{
-			const char *const *samplenames = ((const struct Samplesinterface *)config->sound[sndnum].config)->samplenames;
+			const char *const *samplenames = ((const samples_interface *)config->sound[sndnum].config)->samplenames;
 			if (samplenames != NULL)
 			{
 				int sampnum;
diff --git a/src/emu/machine/laserdsc.c b/src/emu/machine/laserdsc.c
index 6c186e4fc4f..61398379243 100644
--- a/src/emu/machine/laserdsc.c
+++ b/src/emu/machine/laserdsc.c
@@ -304,7 +304,7 @@ static void read_track_data(laserdisc_state *ld);
 static void process_track_data(const device_config *device);
 static void fake_metadata(UINT32 track, UINT8 which, vbi_metadata *metadata);
 static void render_display(UINT16 *videodata, UINT32 rowpixels, UINT32 width, int frame);
-static void *custom_start(int clock, const struct CustomSound_interface *config);
+static void *custom_start(int clock, const custom_sound_interface *config);
 static void custom_stream_callback(void *param, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
 
 /* Pioneer PR-7820 implementation */
@@ -351,7 +351,7 @@ static void vp932_state_changed(laserdisc_state *ld, UINT8 oldstate);
     GLOBAL VARIABLES
 ***************************************************************************/
 
-const struct CustomSound_interface laserdisc_custom_interface =
+const custom_sound_interface laserdisc_custom_interface =
 {
 	custom_start
 };
@@ -1484,7 +1484,7 @@ static void render_display(UINT16 *videodata, UINT32 rowpixels, UINT32 width, in
     for laserdiscs
 -------------------------------------------------*/
 
-static void *custom_start(int clock, const struct CustomSound_interface *config)
+static void *custom_start(int clock, const custom_sound_interface *config)
 {
 	sound_token *token = auto_malloc(sizeof(*token));
 	token->stream = stream_create(0, 2, 48000, token, custom_stream_callback);
diff --git a/src/emu/machine/laserdsc.h b/src/emu/machine/laserdsc.h
index 211bc022fef..04b22f7451b 100644
--- a/src/emu/machine/laserdsc.h
+++ b/src/emu/machine/laserdsc.h
@@ -14,6 +14,8 @@
 #ifndef __LASERDSC_H__
 #define __LASERDSC_H__
 
+#include "sound/custom.h"
+
 
 
 /***************************************************************************
@@ -92,7 +94,7 @@ struct _laserdisc_config
     GLOBAL VARIABLES
 ***************************************************************************/
 
-extern const struct CustomSound_interface laserdisc_custom_interface;
+extern const custom_sound_interface laserdisc_custom_interface;
 
 
 
diff --git a/src/emu/sound/2203intf.h b/src/emu/sound/2203intf.h
index 6ce0e3fabf2..b15b1ef9ac0 100644
--- a/src/emu/sound/2203intf.h
+++ b/src/emu/sound/2203intf.h
@@ -5,7 +5,7 @@
 
 struct YM2203interface
 {
-	const struct AY8910interface ay8910_intf;
+	const AY8910_interface ay8910_intf;
 	void (*handler)(running_machine *machine, int irq);
 };
 
diff --git a/src/emu/sound/2608intf.h b/src/emu/sound/2608intf.h
index d447979987c..e009e481f52 100644
--- a/src/emu/sound/2608intf.h
+++ b/src/emu/sound/2608intf.h
@@ -6,7 +6,7 @@
 
 struct YM2608interface
 {
-	const struct AY8910interface ay8910_intf;
+	const AY8910_interface ay8910_intf;
 	void ( *handler )( running_machine *machine, int irq );	/* IRQ handler for the YM2608 */
 };
 
diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c
index e0dcfb8c239..f9974b9d20e 100644
--- a/src/emu/sound/2610intf.c
+++ b/src/emu/sound/2610intf.c
@@ -123,7 +123,7 @@ static STATE_POSTLOAD( ym2610_postload )
 static void *ym2610_start(const char *tag, int sndindex, int clock, const void *config)
 {
 	static const struct YM2610interface generic_2610 = { 0 };
-	static const struct AY8910interface generic_ay8910 =
+	static const AY8910_interface generic_ay8910 =
 	{
 		AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
 		AY8910_DEFAULT_LOADS,
@@ -189,7 +189,7 @@ static void ym2610b_stream_update(void *param, stream_sample_t **inputs, stream_
 static void *ym2610b_start(const char *tag, int sndindex, int clock, const void *config)
 {
 	static const struct YM2610interface generic_2610 = { 0 };
-	static const struct AY8910interface generic_ay8910 =
+	static const AY8910_interface generic_ay8910 =
 	{
 		AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
 		AY8910_DEFAULT_LOADS,
diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c
index 1844f5f7558..13ac3db100d 100644
--- a/src/emu/sound/ay8910.c
+++ b/src/emu/sound/ay8910.c
@@ -164,7 +164,7 @@ struct _ay8910_context
 	int streams;
 	int ready;
 	sound_stream *channel;
-	const struct AY8910interface *intf;
+	const AY8910_interface *intf;
 	INT32 register_latch;
 	UINT8 regs[16];
 	INT32 last_enable;
@@ -657,7 +657,7 @@ static void ay8910_statesave(ay8910_context *psg, int sndindex)
  *
  *************************************/
 
-void *ay8910_start_ym(sound_type chip_type, int sndindex, int clock, const struct AY8910interface *intf)
+void *ay8910_start_ym(sound_type chip_type, int sndindex, int clock, const AY8910_interface *intf)
 {
 	ay8910_context *info;
 
@@ -818,25 +818,25 @@ int ay8910_read_ym(void *chip)
 
 static void *ay8910_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct AY8910interface generic_ay8910 =
+	static const AY8910_interface generic_ay8910 =
 	{
 		AY8910_LEGACY_OUTPUT,
 		AY8910_DEFAULT_LOADS,
 		NULL, NULL, NULL, NULL
 	};
-	const struct AY8910interface *intf = (config ? config : &generic_ay8910);
+	const AY8910_interface *intf = (config ? config : &generic_ay8910);
 	return ay8910_start_ym(SOUND_AY8910, sndindex+16, clock, intf);
 }
 
 static void *ym2149_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct AY8910interface generic_ay8910 =
+	static const AY8910_interface generic_ay8910 =
 	{
 		AY8910_LEGACY_OUTPUT,
 		AY8910_DEFAULT_LOADS,
 		NULL, NULL, NULL, NULL
 	};
-	const struct AY8910interface *intf = (config ? config : &generic_ay8910);
+	const AY8910_interface *intf = (config ? config : &generic_ay8910);
 	return ay8910_start_ym(SOUND_YM2149, sndindex+16, clock, intf);
 }
 
diff --git a/src/emu/sound/ay8910.h b/src/emu/sound/ay8910.h
index b00718d6513..6cc8120fcf9 100644
--- a/src/emu/sound/ay8910.h
+++ b/src/emu/sound/ay8910.h
@@ -56,10 +56,11 @@ YMZ294: 0 I/O port
  * mixing modul (i.e. mpatrol ties 6 channels from
  * AY-3-8910 together). Do not use it now.
  */
-/* TODO: implement mixing modul */
+/* TODO: implement mixing module */
 #define AY8910_RAW_OUTPUT			(8)
 
-struct AY8910interface
+typedef struct _AY8910_interface AY8910_interface;
+struct _AY8910_interface
 {
 	int					flags;			/* Flags */
 	int					res_load[3]; 	/* Load on channel in ohms */
@@ -69,6 +70,7 @@ struct AY8910interface
 	write8_machine_func	portBwrite;
 };
 
+
 void ay8910_set_volume(int chip,int channel,int volume);
 
 
@@ -122,7 +124,7 @@ WRITE16_HANDLER( AY8910_write_port_4_msb_w );
 
 /*********** An interface for SSG of YM2203 ***********/
 
-void *ay8910_start_ym(sound_type chip_type, int sndindex, int clock, const struct AY8910interface *intf);
+void *ay8910_start_ym(sound_type chip_type, int sndindex, int clock, const AY8910_interface *intf);
 
 void ay8910_stop_ym(void *chip);
 void ay8910_reset_ym(void *chip);
diff --git a/src/emu/sound/custom.c b/src/emu/sound/custom.c
index d54c42616c4..3384da40cb0 100644
--- a/src/emu/sound/custom.c
+++ b/src/emu/sound/custom.c
@@ -4,7 +4,7 @@
 
 struct custom_info
 {
-	const struct CustomSound_interface *intf;
+	const custom_sound_interface *intf;
 	void *		token;
 };
 
diff --git a/src/emu/sound/custom.h b/src/emu/sound/custom.h
index 45422b3579d..303a7be6118 100644
--- a/src/emu/sound/custom.h
+++ b/src/emu/sound/custom.h
@@ -1,9 +1,10 @@
 #ifndef CUSTOM_H
 #define CUSTOM_H
 
-struct CustomSound_interface
+typedef struct _custom_sound_interface custom_sound_interface;
+struct _custom_sound_interface
 {
-	void *(*start)(int clock, const struct CustomSound_interface *config);
+	void *(*start)(int clock, const custom_sound_interface *config);
 	void (*stop)(void *token);
 	void (*reset)(void *token);
 	void *extra_data;
diff --git a/src/emu/sound/samples.c b/src/emu/sound/samples.c
index 731ff0baa94..ecec83e0e0d 100644
--- a/src/emu/sound/samples.c
+++ b/src/emu/sound/samples.c
@@ -532,7 +532,7 @@ static STATE_POSTLOAD( samples_postload )
 static void *samples_start(const char *tag, int sndindex, int clock, const void *config)
 {
 	int i;
-	const struct Samplesinterface *intf = config;
+	const samples_interface *intf = config;
 	struct samples_info *info;
 
 	info = auto_malloc(sizeof(*info));
diff --git a/src/emu/sound/samples.h b/src/emu/sound/samples.h
index 2ff8e7cadf3..03ec3496436 100644
--- a/src/emu/sound/samples.h
+++ b/src/emu/sound/samples.h
@@ -14,7 +14,8 @@ struct loaded_samples
     struct loaded_sample sample[1]; /* array of samples */
 };
 
-struct Samplesinterface
+typedef struct _samples_interface samples_interface;
+struct _samples_interface
 {
     int         channels;   /* number of discrete audio channels needed */
     const char *const *samplenames;
diff --git a/src/emu/sound/sn76477.c b/src/emu/sound/sn76477.c
index dd7d5755598..6b08c76337c 100644
--- a/src/emu/sound/sn76477.c
+++ b/src/emu/sound/sn76477.c
@@ -98,7 +98,7 @@
 #if TEST_MODE
 #include "input.h"
 
-static const struct SN76477interface empty_interface =
+static const SN76477_interface empty_interface =
 {
 	0,			/*  4 noise_clock_res  */
 	0,			/*  5 filter_res       */
@@ -2390,11 +2390,11 @@ static void state_save_register(struct SN76477 *sn)
 static void *sn76477_start(const char *tag, int sndindex, int clock, const void *config)
 {
 	struct SN76477 *sn;
-	struct SN76477interface *intf;
+	SN76477_interface *intf;
 
 
 #if TEST_MODE == 0
-	intf = (struct SN76477interface *)config;
+	intf = (SN76477_interface *)config;
 #else
 	intf = &test_interface;
 #endif
diff --git a/src/emu/sound/sn76477.h b/src/emu/sound/sn76477.h
index d224cbe2ca8..5eb7b137f89 100644
--- a/src/emu/sound/sn76477.h
+++ b/src/emu/sound/sn76477.h
@@ -46,7 +46,8 @@
  *
  *****************************************************************************/
 
-struct SN76477interface
+typedef struct _SN76477_interface SN76477_interface;
+struct _SN76477_interface
 {
 	double noise_clock_res;
 	double noise_filter_res;
diff --git a/src/mame/audio/8080bw.c b/src/mame/audio/8080bw.c
index 5976f08a97d..37f267d5b7d 100644
--- a/src/mame/audio/8080bw.c
+++ b/src/mame/audio/8080bw.c
@@ -109,7 +109,7 @@ static const char *const lrescue_sample_names[] =
 	0
 };
 
-const struct Samplesinterface lrescue_samples_interface =
+const samples_interface lrescue_samples_interface =
 {
 	4,	/* 4 channels */
 	lrescue_sample_names
@@ -665,7 +665,7 @@ WRITE8_HANDLER( polaris_sh_port_3_w )
 #define SCHASER_4V		SCHASER_HSYNC /2 /4
 #define SCHASER_8V		SCHASER_HSYNC /2 /8
 
-const struct SN76477interface schaser_sn76477_interface =
+const SN76477_interface schaser_sn76477_interface =
 {
 	RES_K( 47),	/*  4 noise_res         */
 	RES_K(330),	/*  5 filter_res        */
diff --git a/src/mame/audio/amiga.c b/src/mame/audio/amiga.c
index 05062d31a9c..41fa6bb6f2c 100644
--- a/src/mame/audio/amiga.c
+++ b/src/mame/audio/amiga.c
@@ -262,7 +262,7 @@ static void amiga_stream_update(void *param, stream_sample_t **inputs, stream_sa
  *
  *************************************/
 
-void *amiga_sh_start(int clock, const struct CustomSound_interface *config)
+void *amiga_sh_start(int clock, const custom_sound_interface *config)
 {
 	int i;
 
diff --git a/src/mame/audio/astrof.c b/src/mame/audio/astrof.c
index a19276afb46..35498f386a7 100644
--- a/src/mame/audio/astrof.c
+++ b/src/mame/audio/astrof.c
@@ -174,7 +174,7 @@ static const char *const astrof_sample_names[] =
 };
 
 
-static const struct Samplesinterface astrof_samples_interface =
+static const samples_interface astrof_samples_interface =
 {
 	4,	/* 4 channels */
 	astrof_sample_names
@@ -237,7 +237,7 @@ WRITE8_HANDLER( tomahawk_audio_w )
 }
 
 
-static const struct SN76477interface tomahawk_sn76477_interface =
+static const SN76477_interface tomahawk_sn76477_interface =
 {
 	0,				/*  4 noise_res (N/C)        */
 	0,				/*  5 filter_res (N/C)       */
diff --git a/src/mame/audio/attckufo.c b/src/mame/audio/attckufo.c
index ec5be1dfa1b..b1e58d82830 100644
--- a/src/mame/audio/attckufo.c
+++ b/src/mame/audio/attckufo.c
@@ -208,7 +208,7 @@ static void attckufo_update (void *param,stream_sample_t **inputs, stream_sample
 /************************************/
 
 
-void *attckufo_custom_start(int clock, const struct CustomSound_interface *config)
+void *attckufo_custom_start(int clock, const custom_sound_interface *config)
 {
 	int i;
 
diff --git a/src/mame/audio/blockade.c b/src/mame/audio/blockade.c
index 778e009eba7..50100fd78a9 100644
--- a/src/mame/audio/blockade.c
+++ b/src/mame/audio/blockade.c
@@ -62,7 +62,7 @@ static const char *const blockade_sample_names[] =
     0
 };
 
-const struct Samplesinterface blockade_samples_interface =
+const samples_interface blockade_samples_interface =
 {
     1,	/* 1 channel */
 	blockade_sample_names
diff --git a/src/mame/audio/bzone.c b/src/mame/audio/bzone.c
index 9b055d8f90e..f0b765b852b 100644
--- a/src/mame/audio/bzone.c
+++ b/src/mame/audio/bzone.c
@@ -271,7 +271,7 @@ static void bzone_sound_update(void *param, stream_sample_t **inputs, stream_sam
 	}
 }
 
-void *bzone_sh_start(int clock, const struct CustomSound_interface *config)
+void *bzone_sh_start(int clock, const custom_sound_interface *config)
 {
     int i;
 
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index ba5d0325f26..a68100db874 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -98,7 +98,7 @@ static const char *const carnival_sample_names[] =
 };
 
 
-static const struct Samplesinterface carnival_samples_interface =
+static const samples_interface carnival_samples_interface =
 {
 	10,
 	carnival_sample_names
diff --git a/src/mame/audio/cclimber.c b/src/mame/audio/cclimber.c
index 1385ab9fa8c..8e81cf082e5 100644
--- a/src/mame/audio/cclimber.c
+++ b/src/mame/audio/cclimber.c
@@ -77,7 +77,7 @@ WRITE8_HANDLER( cclimber_sample_trigger_w )
 }
 
 
-const struct AY8910interface cclimber_ay8910_interface =
+const AY8910_interface cclimber_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -87,7 +87,7 @@ const struct AY8910interface cclimber_ay8910_interface =
 	NULL
 };
 
-const struct Samplesinterface cclimber_samples_interface =
+const samples_interface cclimber_samples_interface =
 {
 	1,
 	NULL,
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index 6dbd3c3a9ed..333a8c058c7 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -151,7 +151,7 @@ static const char *const spacewar_sample_names[] =
     0
 };
 
-static const struct Samplesinterface spacewar_samples_interface =
+static const samples_interface spacewar_samples_interface =
 {
 	8,
 	spacewar_sample_names
@@ -228,7 +228,7 @@ static const char *const barrier_sample_names[] =
     0
 };
 
-static const struct Samplesinterface barrier_samples_interface =
+static const samples_interface barrier_samples_interface =
 {
 	3,
 	barrier_sample_names
@@ -279,7 +279,7 @@ static const char *const speedfrk_sample_names[] =
     NULL
 };
 
-static const struct Samplesinterface speedfrk_samples_interface =
+static const samples_interface speedfrk_samples_interface =
 {
 	1,
 	speedfrk_sample_names
@@ -342,7 +342,7 @@ static const char *const starhawk_sample_names[] =
     NULL
 };
 
-static const struct Samplesinterface starhawk_samples_interface =
+static const samples_interface starhawk_samples_interface =
 {
 	5,
 	starhawk_sample_names
@@ -416,7 +416,7 @@ static const char *const sundance_sample_names[] =
     0
 };
 
-static const struct Samplesinterface sundance_samples_interface =
+static const samples_interface sundance_samples_interface =
 {
 	6,
 	sundance_sample_names
@@ -484,7 +484,7 @@ static const char *const tailg_sample_names[] =
     NULL
 };
 
-static const struct Samplesinterface tailg_samples_interface =
+static const samples_interface tailg_samples_interface =
 {
 	6,
 	tailg_sample_names
@@ -570,7 +570,7 @@ static const char *const warrior_sample_names[] =
     NULL
 };
 
-static const struct Samplesinterface warrior_samples_interface =
+static const samples_interface warrior_samples_interface =
 {
 	5,
 	warrior_sample_names
@@ -639,7 +639,7 @@ static const char *const armora_sample_names[] =
     NULL
 };
 
-static const struct Samplesinterface armora_samples_interface =
+static const samples_interface armora_samples_interface =
 {
 	7,
 	armora_sample_names
@@ -738,7 +738,7 @@ static const char *const ripoff_sample_names[] =
     NULL
 };
 
-static const struct Samplesinterface ripoff_samples_interface =
+static const samples_interface ripoff_samples_interface =
 {
 	6,
 	ripoff_sample_names
@@ -823,7 +823,7 @@ static const char *const starcas_sample_names[] =
     0
 };
 
-static const struct Samplesinterface starcas_samples_interface =
+static const samples_interface starcas_samples_interface =
 {
 	8,
 	starcas_sample_names
@@ -935,7 +935,7 @@ static const char *const solarq_sample_names[] =
     NULL
 };
 
-static const struct Samplesinterface solarq_samples_interface =
+static const samples_interface solarq_samples_interface =
 {
 	8,
 	solarq_sample_names
@@ -1074,7 +1074,7 @@ static const char *const boxingb_sample_names[] =
     NULL
 };
 
-static const struct Samplesinterface boxingb_samples_interface =
+static const samples_interface boxingb_samples_interface =
 {
 	12,
 	boxingb_sample_names
@@ -1203,7 +1203,7 @@ static const char *const wotw_sample_names[] =
     0
 };
 
-static const struct Samplesinterface wotw_samples_interface =
+static const samples_interface wotw_samples_interface =
 {
 	8,
 	wotw_sample_names
@@ -1315,7 +1315,7 @@ static const char *const wotwc_sample_names[] =
     0
 };
 
-static const struct Samplesinterface wotwc_samples_interface =
+static const samples_interface wotwc_samples_interface =
 {
 	8,
 	wotwc_sample_names
@@ -1469,7 +1469,7 @@ static WRITE8_HANDLER( sound_output_w )
 }
 
 
-static const struct AY8910interface demon_ay8910_interface_1 =
+static const AY8910_interface demon_ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1479,7 +1479,7 @@ static const struct AY8910interface demon_ay8910_interface_1 =
 	sound_portb_w
 };
 
-static const struct AY8910interface demon_ay8910_interface_3 =
+static const AY8910_interface demon_ay8910_interface_3 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/audio/circus.c b/src/mame/audio/circus.c
index 3a60f24073c..6483e3b63fa 100644
--- a/src/mame/audio/circus.c
+++ b/src/mame/audio/circus.c
@@ -13,7 +13,7 @@ static const char *const circus_sample_names[] =
 	0
 };
 
-const struct Samplesinterface circus_samples_interface =
+const samples_interface circus_samples_interface =
 {
 	3,	/* 3 channels */
 	circus_sample_names
@@ -26,7 +26,7 @@ static const char *const crash_sample_names[] =
 	0
 };
 
-const struct Samplesinterface crash_samples_interface =
+const samples_interface crash_samples_interface =
 {
 	1,	/* 1 channel */
 	crash_sample_names
@@ -42,7 +42,7 @@ static const char *const ripcord_sample_names[] =
 	0
 };
 
-const struct Samplesinterface ripcord_samples_interface =
+const samples_interface ripcord_samples_interface =
 {
 	4,	/* 4 channels */
 	ripcord_sample_names
@@ -59,7 +59,7 @@ static const char *const robotbwl_sample_names[] =
 	0
 };
 
-const struct Samplesinterface robotbwl_samples_interface =
+const samples_interface robotbwl_samples_interface =
 {
 	5,	/* 5 channels */
 	robotbwl_sample_names
diff --git a/src/mame/audio/cps3.c b/src/mame/audio/cps3.c
index 7900bbd76cd..1141f6d0944 100644
--- a/src/mame/audio/cps3.c
+++ b/src/mame/audio/cps3.c
@@ -97,7 +97,7 @@ static void cps3_stream_update(void *param, stream_sample_t **inputs, stream_sam
 
 }
 
-void *cps3_sh_start(int clock, const struct CustomSound_interface *config)
+void *cps3_sh_start(int clock, const custom_sound_interface *config)
 {
 	/* Allocate the stream */
 	cps3_stream = stream_create(0, 2, clock / 384, NULL, cps3_stream_update);
diff --git a/src/mame/audio/crbaloon.c b/src/mame/audio/crbaloon.c
index ed4954cca87..60d89402ab4 100644
--- a/src/mame/audio/crbaloon.c
+++ b/src/mame/audio/crbaloon.c
@@ -136,7 +136,7 @@ DISCRETE_SOUND_END
 
 
 
-static const struct SN76477interface sn76477_interface =
+static const SN76477_interface crbaloon_sn76477_interface =
 {
 	RES_K( 47),	/*  4 noise_res          */
 	RES_K(330),	/*  5 filter_res         */
@@ -170,7 +170,7 @@ MACHINE_DRIVER_START( crbaloon_audio )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("sn", SN76477, 0)
-	MDRV_SOUND_CONFIG(sn76477_interface)
+	MDRV_SOUND_CONFIG(crbaloon_sn76477_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0)
 
 	MDRV_SOUND_ADD("discrete", DISCRETE, 0)
diff --git a/src/mame/audio/depthch.c b/src/mame/audio/depthch.c
index e5f4f61952b..5307a397d96 100644
--- a/src/mame/audio/depthch.c
+++ b/src/mame/audio/depthch.c
@@ -29,7 +29,7 @@ static const char *const depthch_sample_names[] =
 };
 
 
-static const struct Samplesinterface depthch_samples_interface =
+static const samples_interface depthch_samples_interface =
 {
 	4,
 	depthch_sample_names
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index 2b117c20511..98a84c73911 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -996,7 +996,7 @@ Addresses found at @0x510, cpu2
         0
     };
 
-    static const struct Samplesinterface radarsc1_samples_interface =
+    static const samples_interface radarsc1_samples_interface =
     {
         8,
         radarsc1_sample_names
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index e0905b43b43..3594ae9892e 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -338,7 +338,7 @@ static void exidy_stream_update(void *param, stream_sample_t **inputs, stream_sa
  *
  *************************************/
 
-void *exidy_sh6840_sh_start(int clock, const struct CustomSound_interface *config)
+void *exidy_sh6840_sh_start(int clock, const custom_sound_interface *config)
 {
 	int sample_rate = SH8253_CLOCK;
 
@@ -626,7 +626,7 @@ static const pia6821_interface venture_pia_1_intf =
 };
 
 
-static void *venture_common_sh_start(int clock, const struct CustomSound_interface *config, int _has_tms5220)
+static void *venture_common_sh_start(int clock, const custom_sound_interface *config, int _has_tms5220)
 {
 	int i;
 
@@ -652,7 +652,7 @@ static void *venture_common_sh_start(int clock, const struct CustomSound_interfa
 }
 
 
-static void *venture_sh_start(int clock, const struct CustomSound_interface *config)
+static void *venture_sh_start(int clock, const custom_sound_interface *config)
 {
 	pia_config(0, &venture_pia_0_intf);
 	pia_config(1, &venture_pia_1_intf);
@@ -676,7 +676,7 @@ static void venture_sh_reset(void *token)
 }
 
 
-static const struct CustomSound_interface venture_custom_interface =
+static const custom_sound_interface venture_custom_interface =
 {
 	venture_sh_start,
 	0,
@@ -848,7 +848,7 @@ static const pia6821_interface victory_pia_e5_intf =
 };
 
 
-static void *victory_sh_start(int clock, const struct CustomSound_interface *config)
+static void *victory_sh_start(int clock, const custom_sound_interface *config)
 {
 	pia_config(1, &victory_pia_e5_intf);
 
@@ -873,7 +873,7 @@ static void victory_sh_reset(void *token)
 }
 
 
-static const struct CustomSound_interface victory_custom_interface =
+static const custom_sound_interface victory_custom_interface =
 {
 	victory_sh_start,
 	0,
diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c
index 9d981d2ce0c..41f4dcea72d 100644
--- a/src/mame/audio/exidy440.c
+++ b/src/mame/audio/exidy440.c
@@ -131,7 +131,7 @@ static void fir_filter(INT32 *input, INT16 *output, int count);
  *
  *************************************/
 
-static void *exidy440_sh_start(int clock, const struct CustomSound_interface *config)
+static void *exidy440_sh_start(int clock, const custom_sound_interface *config)
 {
 	int i, length;
 
@@ -914,7 +914,7 @@ ADDRESS_MAP_END
  *
  *************************************/
 
-static const struct CustomSound_interface custom_interface =
+static const custom_sound_interface custom_interface =
 {
 	exidy440_sh_start,
 	exidy440_sh_stop
diff --git a/src/mame/audio/flower.c b/src/mame/audio/flower.c
index 1f1f5108503..082e7b6dff9 100644
--- a/src/mame/audio/flower.c
+++ b/src/mame/audio/flower.c
@@ -155,7 +155,7 @@ static void flower_update_mono(void *param, stream_sample_t **inputs, stream_sam
 
 
 
-void * flower_sh_start(int clock, const struct CustomSound_interface *config)
+void * flower_sh_start(int clock, const custom_sound_interface *config)
 {
 	sound_channel *voice;
 	int i;
diff --git a/src/mame/audio/galaxian.c b/src/mame/audio/galaxian.c
index 510950ae142..572e79b46fb 100644
--- a/src/mame/audio/galaxian.c
+++ b/src/mame/audio/galaxian.c
@@ -554,14 +554,14 @@ static TIMER_CALLBACK( galaxian_sh_update )
 }
 
 
-const struct Samplesinterface galaxian_samples_interface =
+const samples_interface galaxian_samples_interface =
 {
 	5,
 	NULL,
 	galaxian_sh_start
 };
 
-const struct Samplesinterface galaxian_custom_interface =
+const samples_interface galaxian_custom_interface =
 {
 	5,
 	NULL,
diff --git a/src/mame/audio/geebee.c b/src/mame/audio/geebee.c
index a70805491e3..eaf4389ebc9 100644
--- a/src/mame/audio/geebee.c
+++ b/src/mame/audio/geebee.c
@@ -112,7 +112,7 @@ static void geebee_sound_update(void *param, stream_sample_t **inputs, stream_sa
     }
 }
 
-void *geebee_sh_start(int clock, const struct CustomSound_interface *config)
+void *geebee_sh_start(int clock, const custom_sound_interface *config)
 {
 	int i;
 
diff --git a/src/mame/audio/gomoku.c b/src/mame/audio/gomoku.c
index 1823687859e..4a376370314 100644
--- a/src/mame/audio/gomoku.c
+++ b/src/mame/audio/gomoku.c
@@ -163,7 +163,7 @@ static void gomoku_update_mono(void *param, stream_sample_t **inputs, stream_sam
 
 
 
-void *gomoku_sh_start(int clock, const struct CustomSound_interface *config)
+void *gomoku_sh_start(int clock, const custom_sound_interface *config)
 {
 	sound_channel *voice;
 	int ch;
diff --git a/src/mame/audio/gridlee.c b/src/mame/audio/gridlee.c
index f5b8479860a..d55af8ecc79 100644
--- a/src/mame/audio/gridlee.c
+++ b/src/mame/audio/gridlee.c
@@ -64,7 +64,7 @@ static void gridlee_stream_update(void *param, stream_sample_t **inputs, stream_
  *
  *************************************/
 
-void *gridlee_sh_start(int clock, const struct CustomSound_interface *config)
+void *gridlee_sh_start(int clock, const custom_sound_interface *config)
 {
 	/* allocate the stream */
 	gridlee_stream = stream_create(0, 1, Machine->sample_rate, NULL, gridlee_stream_update);
diff --git a/src/mame/audio/invinco.c b/src/mame/audio/invinco.c
index bcccdb83f6c..5a380aed9f9 100644
--- a/src/mame/audio/invinco.c
+++ b/src/mame/audio/invinco.c
@@ -35,7 +35,7 @@ static const char *const invinco_sample_names[] =
 };
 
 
-static const struct Samplesinterface invinco_samples_interface =
+static const samples_interface invinco_samples_interface =
 {
 	8,
 	invinco_sample_names
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index 04e0bc8fb9c..8a5ffdbb884 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -197,7 +197,7 @@ static void adpcm_int(running_machine *machine, int data)
  * and put with 470 KOhm to gnd.
  * The following is a approximation */
 
-static const struct AY8910interface irem_ay8910_interface_1 =
+static const AY8910_interface irem_ay8910_interface_1 =
 {
 	AY8910_SINGLE_OUTPUT,
 	{470, 0, 0},
@@ -207,7 +207,7 @@ static const struct AY8910interface irem_ay8910_interface_1 =
 	ay8910_0_portb_w
 };
 
-static const struct AY8910interface irem_ay8910_interface_2 =
+static const AY8910_interface irem_ay8910_interface_2 =
 {
 	AY8910_SINGLE_OUTPUT,
 	{470, 0, 0},
diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c
index a8159a8f3a8..7a746fdfc63 100644
--- a/src/mame/audio/leland.c
+++ b/src/mame/audio/leland.c
@@ -133,7 +133,7 @@ static void leland_update(void *param, stream_sample_t **inputs, stream_sample_t
 }
 
 
-void *leland_sh_start(int clock, const struct CustomSound_interface *config)
+void *leland_sh_start(int clock, const custom_sound_interface *config)
 {
 	/* reset globals */
 	dac_buffer[0] = dac_buffer[1] = NULL;
@@ -502,7 +502,7 @@ static void leland_80186_extern_update(void *param, stream_sample_t **inputs, st
 static TIMER_CALLBACK( internal_timer_int );
 static TIMER_CALLBACK( dma_timer_callback );
 
-void *leland_80186_sh_start(int clock, const struct CustomSound_interface *config)
+void *leland_80186_sh_start(int clock, const custom_sound_interface *config)
 {
 	int i;
 
@@ -543,7 +543,7 @@ void *leland_80186_sh_start(int clock, const struct CustomSound_interface *confi
 }
 
 
-void *redline_80186_sh_start(int clock, const struct CustomSound_interface *config)
+void *redline_80186_sh_start(int clock, const custom_sound_interface *config)
 {
 	void *result = leland_80186_sh_start(clock, config);
 	is_redline = 1;
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 9fb220ff2e4..8705010d129 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -428,7 +428,7 @@ ADDRESS_MAP_END
  *
  *************************************/
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -476,7 +476,7 @@ MACHINE_DRIVER_START( masao_audio )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 14318000/6)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 MACHINE_DRIVER_END
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index a689c6b18fe..96006102297 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -444,7 +444,7 @@ void ssio_set_custom_output(int which, int mask, write8_machine_func handler)
 
 
 /********* sound interfaces ***********/
-static const struct AY8910interface ssio_ay8910_interface_1 =
+static const AY8910_interface ssio_ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -454,7 +454,7 @@ static const struct AY8910interface ssio_ay8910_interface_1 =
 	ssio_portb0_w
 };
 
-static const struct AY8910interface ssio_ay8910_interface_2 =
+static const AY8910_interface ssio_ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c
index 9975508fb70..e609ad56bcc 100644
--- a/src/mame/audio/mw8080bw.c
+++ b/src/mame/audio/mw8080bw.c
@@ -127,7 +127,7 @@ static const char *const seawolf_sample_names[] =
 };
 
 
-static const struct Samplesinterface seawolf_samples_interface =
+static const samples_interface seawolf_samples_interface =
 {
 	5,	/* 5 channels */
 	seawolf_sample_names
@@ -187,7 +187,7 @@ static const char *const gunfight_sample_names[] =
 };
 
 
-static const struct Samplesinterface gunfight_samples_interface =
+static const samples_interface gunfight_samples_interface =
 {
 	1,	/* 1 channel */
 	gunfight_sample_names
@@ -1606,7 +1606,7 @@ static const char *const gmissile_sample_names[] =
 };
 
 
-static const struct Samplesinterface gmissile_samples_interface =
+static const samples_interface gmissile_samples_interface =
 {
 	1,	/* 1 channel */
 	gmissile_sample_names
@@ -1704,7 +1704,7 @@ static const char *const m4_sample_names[] =
 };
 
 
-static const struct Samplesinterface m4_samples_interface =
+static const samples_interface m4_samples_interface =
 {
 	2,	/* 2 channels */
 	m4_sample_names
@@ -1992,7 +1992,7 @@ static const char *const clowns_sample_names[] =
 	0
 };
 
-static const struct Samplesinterface clowns_samples_interface =
+static const samples_interface clowns_samples_interface =
 {
 	1,	/* 1 channel */
 	clowns_sample_names
@@ -2177,7 +2177,7 @@ WRITE8_HANDLER( dogpatch_audio_w )
  *  Apr 2007, D.R.
  *************************************/
 
-static const struct SN76477interface spcenctr_sn76477_interface =
+static const SN76477_interface spcenctr_sn76477_interface =
 {
 	0,				/*  4 noise_res (N/C)        */
 	0,				/*  5 filter_res (N/C)       */
@@ -2759,7 +2759,7 @@ static const char *const phantom2_sample_names[] =
 };
 
 
-static const struct Samplesinterface phantom2_samples_interface =
+static const samples_interface phantom2_samples_interface =
 {
 	2,	/* 2 channels */
 	phantom2_sample_names
@@ -2993,7 +2993,7 @@ WRITE8_HANDLER( bowler_audio_6_w )
  *
  *************************************/
 
-static const struct SN76477interface invaders_sn76477_interface =
+static const SN76477_interface invaders_sn76477_interface =
 {
 	0,			/*  4 noise_res (N/C)        */
 	0,			/*  5 filter_res (N/C)       */
@@ -3038,7 +3038,7 @@ static const char *const invaders_sample_names[] =
 };
 
 
-static const struct Samplesinterface invaders_samples_interface =
+static const samples_interface invaders_samples_interface =
 {
 	6,	/* 6 channels */
 	invaders_sample_names
@@ -3816,7 +3816,7 @@ WRITE8_HANDLER( blueshrk_audio_w )
  *
  *************************************/
 
-static const struct SN76477interface invad2ct_p1_sn76477_interface =
+static const SN76477_interface invad2ct_p1_sn76477_interface =
 {
 	0,			/*  4 noise_res (N/C)        */
 	0,			/*  5 filter_res (N/C)       */
@@ -3844,7 +3844,7 @@ static const struct SN76477interface invad2ct_p1_sn76477_interface =
 };
 
 
-static const struct SN76477interface invad2ct_p2_sn76477_interface =
+static const SN76477_interface invad2ct_p2_sn76477_interface =
 {
 	0,			  /*  4 noise_res (N/C)        */
 	0,			  /*  5 filter_res (N/C)       */
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index cb5c0025ef5..cb469b957ff 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -30,7 +30,7 @@ static int mono_flop[3];
 
 
 
-static const struct SN76477interface sheriff_sn76477_interface =
+static const SN76477_interface sheriff_sn76477_interface =
 {
 	RES_K(36)  ,  /* 04 */
 	RES_K(100) ,  /* 05 */
@@ -58,7 +58,7 @@ static const struct SN76477interface sheriff_sn76477_interface =
 };
 
 
-static const struct SN76477interface spacefev_sn76477_interface =
+static const SN76477_interface spacefev_sn76477_interface =
 {
 	RES_K(36)  ,  /* 04 */
 	RES_K(150) ,  /* 05 */
diff --git a/src/mame/audio/phoenix.c b/src/mame/audio/phoenix.c
index 3125fd14924..2c3c04fc706 100644
--- a/src/mame/audio/phoenix.c
+++ b/src/mame/audio/phoenix.c
@@ -426,7 +426,7 @@ WRITE8_HANDLER( phoenix_sound_control_b_w )
 	mm6221aa_tune_w(0, data >> 6);
 }
 
-void *phoenix_sh_start(int clock, const struct CustomSound_interface *config)
+void *phoenix_sh_start(int clock, const custom_sound_interface *config)
 {
 	int i, j;
 	UINT32 shiftreg;
diff --git a/src/mame/audio/pleiads.c b/src/mame/audio/pleiads.c
index 4aba0bfab70..b48beef3648 100644
--- a/src/mame/audio/pleiads.c
+++ b/src/mame/audio/pleiads.c
@@ -455,7 +455,7 @@ WRITE8_HANDLER( pleiads_sound_control_c_w )
 	sound_latch_c = data;
 }
 
-static void *common_sh_start(const struct CustomSound_interface *config, const char *name)
+static void *common_sh_start(const custom_sound_interface *config, const char *name)
 {
 	int i, j;
 	UINT32 shiftreg;
@@ -483,7 +483,7 @@ static void *common_sh_start(const struct CustomSound_interface *config, const c
 	return auto_malloc(1);
 }
 
-void *pleiads_sh_start(int clock, const struct CustomSound_interface *config)
+void *pleiads_sh_start(int clock, const custom_sound_interface *config)
 {
 	/* The real values are _unknown_!
      * I took the ones from Naughty Boy / Pop Flamer
@@ -544,7 +544,7 @@ void *pleiads_sh_start(int clock, const struct CustomSound_interface *config)
 	return common_sh_start(config, "Custom (Pleiads)");
 }
 
-void *naughtyb_sh_start(int clock, const struct CustomSound_interface *config)
+void *naughtyb_sh_start(int clock, const custom_sound_interface *config)
 {
 	/* charge 10u??? through 330K (R??) -> 3.3s */
 	pa5_charge_time = 3.3;
@@ -601,7 +601,7 @@ void *naughtyb_sh_start(int clock, const struct CustomSound_interface *config)
 	return common_sh_start(config, "Custom (Naughty Boy)");
 }
 
-void *popflame_sh_start(int clock, const struct CustomSound_interface *config)
+void *popflame_sh_start(int clock, const custom_sound_interface *config)
 {
 	/* charge 10u (C63 in Pop Flamer) through 330K -> 3.3s */
 	pa5_charge_time = 3.3;
diff --git a/src/mame/audio/polepos.c b/src/mame/audio/polepos.c
index 7c975686a09..e7d5a02dc6a 100644
--- a/src/mame/audio/polepos.c
+++ b/src/mame/audio/polepos.c
@@ -100,7 +100,7 @@ static void engine_sound_update(void *param, stream_sample_t **inputs, stream_sa
 /************************************/
 /* Sound handler start              */
 /************************************/
-void *polepos_sh_start(int clock, const struct CustomSound_interface *config)
+void *polepos_sh_start(int clock, const custom_sound_interface *config)
 {
 	stream = stream_create(0, 1, OUTPUT_RATE, NULL, engine_sound_update);
 	sample_msb = sample_lsb = 0;
diff --git a/src/mame/audio/pulsar.c b/src/mame/audio/pulsar.c
index 8f155c3fb97..58ac1263b6f 100644
--- a/src/mame/audio/pulsar.c
+++ b/src/mame/audio/pulsar.c
@@ -52,7 +52,7 @@ static const char *const pulsar_sample_names[] =
 };
 
 
-static const struct Samplesinterface pulsar_samples_interface =
+static const samples_interface pulsar_samples_interface =
 {
 	12,
 	pulsar_sample_names
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index 387492b60ae..8d3f7a0ed2b 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -125,7 +125,7 @@ static WRITE8_HANDLER( redalert_ay8910_latch_2_w )
 }
 
 
-static const struct AY8910interface redalert_ay8910_interface =
+static const AY8910_interface redalert_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -311,7 +311,7 @@ static ADDRESS_MAP_START( demoneye_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 ADDRESS_MAP_END
 
 
-static const struct AY8910interface demoneye_ay8910_interface =
+static const AY8910_interface demoneye_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/audio/redbaron.c b/src/mame/audio/redbaron.c
index 234b7b77c7a..12e0211da5f 100644
--- a/src/mame/audio/redbaron.c
+++ b/src/mame/audio/redbaron.c
@@ -169,7 +169,7 @@ static void redbaron_sound_update(void *param, stream_sample_t **inputs, stream_
 	}
 }
 
-void *redbaron_sh_start(int clock, const struct CustomSound_interface *config)
+void *redbaron_sh_start(int clock, const custom_sound_interface *config)
 {
     int i;
 
diff --git a/src/mame/audio/rockola.c b/src/mame/audio/rockola.c
index 2c49e2fc277..450559ac0be 100644
--- a/src/mame/audio/rockola.c
+++ b/src/mame/audio/rockola.c
@@ -55,7 +55,7 @@ static int Sound0StopOnRollover;
 static UINT8 LastPort1;
 
 
-const struct CustomSound_interface custom_interface =
+const custom_sound_interface custom_interface =
 {
 	rockola_sh_start
 };
@@ -73,7 +73,7 @@ static const char *const sasuke_sample_names[] =
 	0
 };
 
-const struct Samplesinterface sasuke_samples_interface =
+const samples_interface sasuke_samples_interface =
 {
 	4,	/* 4 channels */
 	sasuke_sample_names
@@ -108,7 +108,7 @@ static const char *const vanguard_sample_names[] =
 	0
 };
 
-const struct Samplesinterface vanguard_samples_interface =
+const samples_interface vanguard_samples_interface =
 {
 	3,	/* 3 channel */
 	vanguard_sample_names
@@ -135,14 +135,14 @@ static const char *const fantasy_sample_names[] =
 	0
 };
 
-const struct Samplesinterface fantasy_samples_interface =
+const samples_interface fantasy_samples_interface =
 {
 	1,	/* 1 channel */
 	fantasy_sample_names
 };
 
 
-const struct SN76477interface sasuke_sn76477_intf_1 =
+const SN76477_interface sasuke_sn76477_intf_1 =
 {
 	RES_K(470),		/*  4  noise_res     */
 	RES_K(150),		/*  5  filter_res    */
@@ -171,7 +171,7 @@ const struct SN76477interface sasuke_sn76477_intf_1 =
 	// ic48     GND: 2,22,26,27,28  +5V: 1,15,25
 };
 
-const struct SN76477interface sasuke_sn76477_intf_2 =
+const SN76477_interface sasuke_sn76477_intf_2 =
 {
 	RES_K(340),		/*  4  noise_res     */
 	RES_K(47),		/*  5  filter_res    */
@@ -200,7 +200,7 @@ const struct SN76477interface sasuke_sn76477_intf_2 =
 	// ic51     GND: 2,26,27        +5V: 1,15,22,25,28
 };
 
-const struct SN76477interface sasuke_sn76477_intf_3 =
+const SN76477_interface sasuke_sn76477_intf_3 =
 {
 	RES_K(330),		/*  4  noise_res     */
 	RES_K(47),		/*  5  filter_res    */
@@ -229,7 +229,7 @@ const struct SN76477interface sasuke_sn76477_intf_3 =
 	// ic52     GND: 2,22,27,28     +5V: 1,15,25,26
 };
 
-const struct SN76477interface satansat_sn76477_intf =
+const SN76477_interface satansat_sn76477_intf =
 {
 	RES_K(470),		/*  4  noise_res     */
 	RES_M(1.5),		/*  5  filter_res    */
@@ -258,7 +258,7 @@ const struct SN76477interface satansat_sn76477_intf =
 	// ???      GND: 2,26,27        +5V: 15,25
 };
 
-const struct SN76477interface vanguard_sn76477_intf_1 =
+const SN76477_interface vanguard_sn76477_intf_1 =
 {
 	RES_K(470),		/*  4  noise_res     */
 	RES_M(1.5),		/*  5  filter_res    */
@@ -287,7 +287,7 @@ const struct SN76477interface vanguard_sn76477_intf_1 =
 	// SHOT A   GND: 2,9,26,27  +5V: 15,25
 };
 
-const struct SN76477interface vanguard_sn76477_intf_2 =
+const SN76477_interface vanguard_sn76477_intf_2 =
 {
 	RES_K(10),		/*  4  noise_res     */
 	RES_K(30),		/*  5  filter_res    */
@@ -316,7 +316,7 @@ const struct SN76477interface vanguard_sn76477_intf_2 =
 	// SHOT B   GND: 1,2,26,27  +5V: 15,25,28
 };
 
-const struct SN76477interface fantasy_sn76477_intf =
+const SN76477_interface fantasy_sn76477_intf =
 {
 	RES_K(470),		/*  4  noise_res     */
 	RES_M(1.5),		/*  5  filter_res    */
@@ -629,7 +629,7 @@ void rockola_set_music_clock(double clock_time)
 	tone_clock = 0;
 }
 
-void *rockola_sh_start(int clock, const struct CustomSound_interface *config)
+void *rockola_sh_start(int clock, const custom_sound_interface *config)
 {
 	// adjusted
 	rockola_set_music_freq(43000);
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index 0fab7423fcc..befc7d781dd 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -378,7 +378,7 @@ static const struct TMS5110interface ad2083_tms5110_interface =
 };
 
 
-static const struct AY8910interface ad2083_ay8910_interface_1 =
+static const AY8910_interface ad2083_ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -388,7 +388,7 @@ static const struct AY8910interface ad2083_ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface ad2083_ay8910_interface_2 =
+static const AY8910_interface ad2083_ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index f12a0aef2e3..a1a8c70a9ab 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -197,7 +197,7 @@ static const char *const astrob_sample_names[] =
 };
 
 
-static const struct Samplesinterface astrob_samples_interface =
+static const samples_interface astrob_samples_interface =
 {
 	11,
 	astrob_sample_names
@@ -339,7 +339,7 @@ WRITE8_HANDLER( astrob_sound_w )
  *************************************/
 
 static SOUND_START( 005 );
-static void *sega005_custom_start(int clock, const struct CustomSound_interface *config);
+static void *sega005_custom_start(int clock, const custom_sound_interface *config);
 static void sega005_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **outputs, int samples);
 static TIMER_CALLBACK( sega005_auto_timer );
 
@@ -412,14 +412,14 @@ static const char *const sega005_sample_names[] =
 };
 
 
-static const struct Samplesinterface sega005_samples_interface =
+static const samples_interface sega005_samples_interface =
 {
 	7,
 	sega005_sample_names
 };
 
 
-static const struct CustomSound_interface sega005_custom_interface =
+static const custom_sound_interface sega005_custom_interface =
 {
 	sega005_custom_start
 };
@@ -576,7 +576,7 @@ WRITE8_HANDLER( sega005_sound_b_w )
  *
  *************************************/
 
-static void *sega005_custom_start(int clock, const struct CustomSound_interface *config)
+static void *sega005_custom_start(int clock, const custom_sound_interface *config)
 {
 	/* create the stream */
 	sega005_stream = stream_create(0, 1, SEGA005_COUNTER_FREQ, NULL, sega005_stream_update);
@@ -653,7 +653,7 @@ static const char *const spaceod_sample_names[] =
 };
 
 
-static const struct Samplesinterface spaceod_samples_interface =
+static const samples_interface spaceod_samples_interface =
 {
 	11,
 	spaceod_sample_names
@@ -778,7 +778,7 @@ static const char *const monsterb_sample_names[] =
 };
 
 
-static const struct Samplesinterface monsterb_samples_interface =
+static const samples_interface monsterb_samples_interface =
 {
 	2,
 	monsterb_sample_names
diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c
index e68145851f6..33da9d29edd 100644
--- a/src/mame/audio/segasnd.c
+++ b/src/mame/audio/segasnd.c
@@ -640,7 +640,7 @@ static void usb_stream_update(void *param, stream_sample_t **inputs, stream_samp
 }
 
 
-static void *usb_start(int clock, const struct CustomSound_interface *config)
+static void *usb_start(int clock, const custom_sound_interface *config)
 {
 	filter_state temp;
 	int tchan, tgroup;
@@ -902,7 +902,7 @@ ADDRESS_MAP_END
  *
  *************************************/
 
-static const struct CustomSound_interface usb_custom_interface =
+static const custom_sound_interface usb_custom_interface =
 {
     usb_start
 };
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index 6b8d87de0a7..287ca104659 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -168,7 +168,7 @@ static void seibu_adpcm_callback(void *param, stream_sample_t **inputs, stream_s
 	}
 }
 
-static void *seibu_adpcm_start(int clock, const struct CustomSound_interface *config)
+static void *seibu_adpcm_start(int clock, const custom_sound_interface *config)
 {
 	int i;
 
@@ -472,7 +472,7 @@ const struct YM3812interface seibu_ym3812_interface =
 	seibu_ym3812_irqhandler
 };
 
-const struct CustomSound_interface seibu_adpcm_interface =
+const custom_sound_interface seibu_adpcm_interface =
 {
 	seibu_adpcm_start,
 	seibu_adpcm_stop
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h
index fc005ad4323..f78f6803423 100644
--- a/src/mame/audio/seibu.h
+++ b/src/mame/audio/seibu.h
@@ -63,7 +63,7 @@ WRITE8_HANDLER( seibu_adpcm_adr_2_w );
 WRITE8_HANDLER( seibu_adpcm_ctl_2_w );
 
 extern const struct YM3812interface seibu_ym3812_interface;
-extern const struct CustomSound_interface seibu_adpcm_interface;
+extern const custom_sound_interface seibu_adpcm_interface;
 extern const struct YM2151interface seibu_ym2151_interface;
 extern const struct YM2203interface seibu_ym2203_interface;
 
diff --git a/src/mame/audio/snes.c b/src/mame/audio/snes.c
index 2b5c5643def..a73889c39c1 100644
--- a/src/mame/audio/snes.c
+++ b/src/mame/audio/snes.c
@@ -1136,7 +1136,7 @@ static TIMER_CALLBACK( snes_spc_timer  )
 	}
 }
 
-void *snes_sh_start(int clock, const struct CustomSound_interface *config)
+void *snes_sh_start(int clock, const custom_sound_interface *config)
 {
 	UINT8 ii;
 
diff --git a/src/mame/audio/spacefb.c b/src/mame/audio/spacefb.c
index 9f1e5a9e731..a7a1e45ba31 100644
--- a/src/mame/audio/spacefb.c
+++ b/src/mame/audio/spacefb.c
@@ -77,7 +77,7 @@ static const char *const spacefb_sample_names[] =
 };
 
 
-static const struct Samplesinterface spacefb_samples_interface =
+static const samples_interface spacefb_samples_interface =
 {
 	3,
 	spacefb_sample_names
diff --git a/src/mame/audio/targ.c b/src/mame/audio/targ.c
index 5e8375c13ca..99c24f0825e 100644
--- a/src/mame/audio/targ.c
+++ b/src/mame/audio/targ.c
@@ -174,7 +174,7 @@ static void targ_audio_start(void)
 }
 
 
-static const struct Samplesinterface spectar_samples_interface =
+static const samples_interface spectar_samples_interface =
 {
 	4,	/* number of channel */
 	sample_names,
@@ -182,7 +182,7 @@ static const struct Samplesinterface spectar_samples_interface =
 };
 
 
-static const struct Samplesinterface targ_samples_interface =
+static const samples_interface targ_samples_interface =
 {
 	4,	/* number of channel */
 	sample_names,
diff --git a/src/mame/audio/tiamc1.c b/src/mame/audio/tiamc1.c
index 3adca0faa96..9ee468f373c 100644
--- a/src/mame/audio/tiamc1.c
+++ b/src/mame/audio/tiamc1.c
@@ -280,7 +280,7 @@ static void tiamc1_sound_update(void *param, stream_sample_t **inputs, stream_sa
 	}
 }
 
-void *tiamc1_sh_start(int clock, const struct CustomSound_interface *config)
+void *tiamc1_sh_start(int clock, const custom_sound_interface *config)
 {
 	int i, j;
 
diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c
index e8afb80f8a1..b764f969dbf 100644
--- a/src/mame/audio/timeplt.c
+++ b/src/mame/audio/timeplt.c
@@ -152,7 +152,7 @@ ADDRESS_MAP_END
  *
  *************************************/
 
-static const struct AY8910interface timeplt_ay8910_interface =
+static const AY8910_interface timeplt_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/audio/triplhnt.c b/src/mame/audio/triplhnt.c
index 7fcab051523..d74fded4189 100644
--- a/src/mame/audio/triplhnt.c
+++ b/src/mame/audio/triplhnt.c
@@ -16,7 +16,7 @@ static const char *const triplhnt_sample_names[] =
 	0
 };
 
-const struct Samplesinterface triplhnt_samples_interface =
+const samples_interface triplhnt_samples_interface =
 {
 	2,	/* 2 channels */
 	triplhnt_sample_names
diff --git a/src/mame/audio/turbo.c b/src/mame/audio/turbo.c
index 032f8fe0d0e..4a0759b53dc 100644
--- a/src/mame/audio/turbo.c
+++ b/src/mame/audio/turbo.c
@@ -180,7 +180,7 @@ static const char *const turbo_sample_names[] =
 };
 
 
-static const struct Samplesinterface turbo_samples_interface =
+static const samples_interface turbo_samples_interface =
 {
 	10,
 	turbo_sample_names
@@ -436,7 +436,7 @@ static const char *const subroc3d_sample_names[] =
 };
 
 
-static const struct Samplesinterface subroc3d_samples_interface =
+static const samples_interface subroc3d_samples_interface =
 {
 	12,
 	subroc3d_sample_names
@@ -589,7 +589,7 @@ static const char *const buckrog_sample_names[]=
 };
 
 
-static const struct Samplesinterface buckrog_samples_interface =
+static const samples_interface buckrog_samples_interface =
 {
 	6,          /* 6 channels */
 	buckrog_sample_names
diff --git a/src/mame/audio/tx1.c b/src/mame/audio/tx1.c
index ae008576021..6131f01d0cf 100644
--- a/src/mame/audio/tx1.c
+++ b/src/mame/audio/tx1.c
@@ -274,7 +274,7 @@ static void tx1_stream_update(void *param, stream_sample_t **inputs, stream_samp
 }
 
 
-void *tx1_sh_start(int clock, const struct CustomSound_interface *config)
+void *tx1_sh_start(int clock, const custom_sound_interface *config)
 {
 	static const int r0[4] = { 390e3, 180e3, 180e3, 180e3 };
 	static const int r1[3] = { 180e3, 390e3, 56e3 };
@@ -495,7 +495,7 @@ static void buggyboy_stream_update(void *param, stream_sample_t **inputs, stream
 	}
 }
 
-void *buggyboy_sh_start(int clock, const struct CustomSound_interface *config)
+void *buggyboy_sh_start(int clock, const custom_sound_interface *config)
 {
 	static const int resistors[4] = { 330000, 220000, 330000, 220000 };
 	double aweights[4];
diff --git a/src/mame/audio/vicdual.c b/src/mame/audio/vicdual.c
index 09f4cd9d21b..8b9e751db26 100644
--- a/src/mame/audio/vicdual.c
+++ b/src/mame/audio/vicdual.c
@@ -113,7 +113,7 @@ static const char *const frogs_sample_names[] =
 	0
 };
 
-static const struct Samplesinterface frogs_samples_interface =
+static const samples_interface frogs_samples_interface =
 {
 	5,	/* 5 channels */
 	frogs_sample_names
diff --git a/src/mame/audio/warpwarp.c b/src/mame/audio/warpwarp.c
index 50797f83e87..6cc0570a280 100644
--- a/src/mame/audio/warpwarp.c
+++ b/src/mame/audio/warpwarp.c
@@ -204,7 +204,7 @@ static void warpwarp_sound_update(void *param, stream_sample_t **inputs, stream_
     }
 }
 
-void *warpwarp_sh_start(int clock, const struct CustomSound_interface *config)
+void *warpwarp_sh_start(int clock, const custom_sound_interface *config)
 {
 	int i;
 
diff --git a/src/mame/audio/wiping.c b/src/mame/audio/wiping.c
index 2dbbf6441a5..1a50360fef8 100644
--- a/src/mame/audio/wiping.c
+++ b/src/mame/audio/wiping.c
@@ -162,7 +162,7 @@ static void wiping_update_mono(void *param, stream_sample_t **inputs, stream_sam
 
 
 
-void *wiping_sh_start(int clock, const struct CustomSound_interface *config)
+void *wiping_sh_start(int clock, const custom_sound_interface *config)
 {
 	sound_channel *voice;
 
diff --git a/src/mame/audio/zaxxon.c b/src/mame/audio/zaxxon.c
index 5ef2f36e85e..3736a6cd896 100644
--- a/src/mame/audio/zaxxon.c
+++ b/src/mame/audio/zaxxon.c
@@ -100,7 +100,7 @@ static const char *const zaxxon_sample_names[] =
 };
 
 
-static const struct Samplesinterface zaxxon_samples_interface =
+static const samples_interface zaxxon_samples_interface =
 {
 	12,
 	zaxxon_sample_names
@@ -206,7 +206,7 @@ static const char *const congo_sample_names[] =
 };
 
 
-static const struct Samplesinterface congo_samples_interface =
+static const samples_interface congo_samples_interface =
 {
 	5,	/* 5 channels */
 	congo_sample_names
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index a0ef56db766..30276261c1e 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -1003,7 +1003,7 @@ static GFXDECODE_START( 40love )
 	GFXDECODE_ENTRY( "gfx1", 0, sprite_layout, 0, 64 )
 GFXDECODE_END
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1055,7 +1055,7 @@ static MACHINE_DRIVER_START( 40love )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 2000000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
 	MDRV_SOUND_ADD("msm", MSM5232, 8000000/4)
@@ -1110,7 +1110,7 @@ static MACHINE_DRIVER_START( undoukai )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 2000000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
 	MDRV_SOUND_ADD("msm", MSM5232, 8000000/4)
diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c
index 60e1a52eac4..bc71ebf5c41 100644
--- a/src/mame/drivers/aeroboto.c
+++ b/src/mame/drivers/aeroboto.c
@@ -218,7 +218,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -259,7 +259,7 @@ static MACHINE_DRIVER_START( formatz )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, XTAL_10MHz/8) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ay2", AY8910, XTAL_10MHz/16) /* verified on pcb */
diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c
index 8ddf95afa1f..7da25605e6c 100644
--- a/src/mame/drivers/alg.c
+++ b/src/mame/drivers/alg.c
@@ -449,7 +449,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct CustomSound_interface amiga_custom_interface =
+static const custom_sound_interface amiga_custom_interface =
 {
 	amiga_sh_start
 };
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index 6d9eef4611e..57fbf8634e4 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -1858,7 +1858,7 @@ GFXDECODE_END
 
 /******************************************************************************/
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -2024,7 +2024,7 @@ static MACHINE_DRIVER_START( jongbou )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 2000000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.65)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index 6a24b9563bd..5a568ed3417 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -159,7 +159,7 @@ static GFXDECODE_START( ambush )
 GFXDECODE_END
 
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -169,7 +169,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index 65378384623..e7f0a71ee46 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -1001,7 +1001,7 @@ GFXDECODE_END
 * AY8910 Interfase *
 *******************/
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1044,7 +1044,7 @@ static MACHINE_DRIVER_START( ampoker2 )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 	MDRV_SOUND_ADD("ay", AY8910,MASTER_CLOCK/4)	/* 1.5 MHz, measured */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index cfc89c85d16..5ef6382f21b 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -331,7 +331,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -374,7 +374,7 @@ static MACHINE_DRIVER_START( arabian )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, MAIN_OSC/4/2)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/arcadia.c b/src/mame/drivers/arcadia.c
index cbdb253bb21..2bf713f6e52 100644
--- a/src/mame/drivers/arcadia.c
+++ b/src/mame/drivers/arcadia.c
@@ -267,7 +267,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct CustomSound_interface amiga_custom_interface =
+static const custom_sound_interface amiga_custom_interface =
 {
 	amiga_sh_start
 };
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 0b425a88610..3fe77e11202 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -735,7 +735,7 @@ GFXDECODE_END
 
 /* Sound Interfaces */
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -780,7 +780,7 @@ static MACHINE_DRIVER_START( arkanoid )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, XTAL_12MHz/4/2) /* YM2149 clock is 3mhz, pin 26 is low so 3mhz/2 */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c
index 36294cd8483..0e7a60aadc7 100644
--- a/src/mame/drivers/astinvad.c
+++ b/src/mame/drivers/astinvad.c
@@ -491,7 +491,7 @@ static const char *const astinvad_sample_names[] =
 	0
 };
 
-static const struct Samplesinterface astinvad_samples_interface =
+static const samples_interface astinvad_samples_interface =
 {
 	6,   /* channels */
 	astinvad_sample_names
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index c34d64d8944..f58a9c65252 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -507,7 +507,7 @@ static z80ctc_interface ctc_intf =
 };
 
 
-static const struct AY8910interface ay8912_interface =
+static const AY8910_interface ay8912_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1217,19 +1217,19 @@ static const char *const seawolf_sample_names[] =
 	0
 };
 
-static const struct Samplesinterface seawolf2_samples_interface =
+static const samples_interface seawolf2_samples_interface =
 {
 	10,	/* 5*2 channels */
 	seawolf_sample_names
 };
 
-static const struct Samplesinterface wow_samples_interface =
+static const samples_interface wow_samples_interface =
 {
 	1,
 	wow_sample_names
 };
 
-static const struct Samplesinterface gorf_samples_interface =
+static const samples_interface gorf_samples_interface =
 {
 	1,
 	gorf_sample_names
diff --git a/src/mame/drivers/ataxx.c b/src/mame/drivers/ataxx.c
index 8bfb14b35f3..2d5dcac9ddb 100644
--- a/src/mame/drivers/ataxx.c
+++ b/src/mame/drivers/ataxx.c
@@ -291,7 +291,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct CustomSound_interface i80186_custom_interface =
+static const custom_sound_interface i80186_custom_interface =
 {
     leland_80186_sh_start
 };
diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c
index 82d9b2b8631..acf1a876c87 100644
--- a/src/mame/drivers/attckufo.c
+++ b/src/mame/drivers/attckufo.c
@@ -46,7 +46,7 @@ LOIPOIO-B
 #include "includes/attckufo.h"
 
 
-static const struct CustomSound_interface attckufo_sound_interface =
+static const custom_sound_interface attckufo_sound_interface =
 {
 	attckufo_custom_start
 };
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index b300f6a3726..c54f8c914be 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -429,7 +429,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -439,7 +439,7 @@ static const struct AY8910interface ay8910_interface =
 	NULL
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -482,7 +482,7 @@ static MACHINE_DRIVER_START( bagman )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
 	MDRV_SOUND_ADD("tms", TMS5110A, 640000)
@@ -518,7 +518,7 @@ static MACHINE_DRIVER_START( pickin )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
 	/* maybe */
@@ -573,7 +573,7 @@ static MACHINE_DRIVER_START( botanic )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
 	MDRV_SOUND_ADD("ay2", AY8910, 1500000)
diff --git a/src/mame/drivers/berzerk.c b/src/mame/drivers/berzerk.c
index e7a026dc461..5ce4308179b 100644
--- a/src/mame/drivers/berzerk.c
+++ b/src/mame/drivers/berzerk.c
@@ -465,7 +465,7 @@ static VIDEO_UPDATE( berzerk )
  *
  *************************************/
 
-static const struct CustomSound_interface berzerk_custom_interface =
+static const custom_sound_interface berzerk_custom_interface =
 {
 	exidy_sh6840_sh_start,
 	0,
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index f41b0c30133..e5889410184 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -432,7 +432,7 @@ static WRITE8_HANDLER( portb_w )
 	if (data != 0x00) logerror("portB = %02x\n",data);
 }
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -480,7 +480,7 @@ static MACHINE_DRIVER_START( bking )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ay2", AY8910, XTAL_6MHz/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index 9f9f4a96a56..44cef624ba9 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -248,7 +248,7 @@ GFXDECODE_END
 
 /* Sound Interfaces */
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -258,7 +258,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index 6e98f81b60c..e43cb0277e8 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -460,7 +460,7 @@ static WRITE8_HANDLER(input_mux_w)
 }
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -517,7 +517,7 @@ static MACHINE_DRIVER_START( bmcbowl )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ay", AY8910, 3579545/2)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.50)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.50)
 
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index bc271e8a519..7f47271385f 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -376,7 +376,7 @@ static WRITE8_HANDLER( portB_1_w )
 }
 
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -386,7 +386,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	portB_0_w
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index 7f5d6f44f5c..f4a474621b3 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -552,7 +552,7 @@ static const struct POKEYinterface bzone_pokey_interface =
 };
 
 
-static const struct CustomSound_interface bzone_custom_interface =
+static const custom_sound_interface bzone_custom_interface =
 {
 	bzone_sh_start
 };
@@ -565,7 +565,7 @@ static const struct POKEYinterface redbaron_pokey_interface =
 };
 
 
-static const struct CustomSound_interface redbaron_custom_interface =
+static const custom_sound_interface redbaron_custom_interface =
 {
 	redbaron_sh_start
 };
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index e127eb5a10c..6edc261660e 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -1882,7 +1882,7 @@ static MACHINE_RESET( calomega )
 *    Sound Interfaces    *
 *************************/
 
-static const struct AY8910interface sys903_ay8912_intf =
+static const AY8910_interface sys903_ay8912_intf =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1892,7 +1892,7 @@ static const struct AY8910interface sys903_ay8912_intf =
 	NULL
 };
 
-static const struct AY8910interface sys905_ay8912_intf =
+static const AY8910_interface sys905_ay8912_intf =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 189e503b04e..7f48df1d04c 100644
--- a/src/mame/drivers/carrera.c
+++ b/src/mame/drivers/carrera.c
@@ -269,7 +269,7 @@ static READ8_HANDLER( unknown_r )
 }
 
 /* these are set as input, but I have no idea which input port it uses is for the AY */
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -315,7 +315,7 @@ static MACHINE_DRIVER_START( carrera )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK/12)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index 5afc25bdf08..b0aa46ad425 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -1543,7 +1543,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct AY8910interface centipdb_ay8910_interface =
+static const AY8910_interface centipdb_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c
index 77740640f9c..1771cf0ba7f 100644
--- a/src/mame/drivers/chaknpop.c
+++ b/src/mame/drivers/chaknpop.c
@@ -77,7 +77,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_BANK1)			// bitmap plane 1-4
 ADDRESS_MAP_END
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -87,7 +87,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index f0c2227aee6..44faaca5e43 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -457,7 +457,7 @@ static INPUT_PORTS_START( changela )
 INPUT_PORTS_END
 
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -467,7 +467,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/cherrym.c b/src/mame/drivers/cherrym.c
index ae1acb96665..1449d96b778 100644
--- a/src/mame/drivers/cherrym.c
+++ b/src/mame/drivers/cherrym.c
@@ -361,7 +361,7 @@ static GFXDECODE_START( cherrym )
 	GFXDECODE_ENTRY( "gfx2", 0x0020, spritelayout, 0, 16 )
 GFXDECODE_END
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -399,7 +399,7 @@ static MACHINE_DRIVER_START( cmv801 )
 	// sound hardware
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 	MDRV_SOUND_ADD("ay", AY8910,18432000/12)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cherrym2.c b/src/mame/drivers/cherrym2.c
index da54744e2bc..6ef073a3ca5 100644
--- a/src/mame/drivers/cherrym2.c
+++ b/src/mame/drivers/cherrym2.c
@@ -341,7 +341,7 @@ static GFXDECODE_START( alt )
 GFXDECODE_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -378,7 +378,7 @@ static MACHINE_DRIVER_START( cm2v841 )
 	// sound hardware
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 	MDRV_SOUND_ADD("ay", AY8910,18432000/12)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c
index 26d961fe89d..0d4da02dfba 100644
--- a/src/mame/drivers/cidelsa.c
+++ b/src/mame/drivers/cidelsa.c
@@ -159,7 +159,7 @@ static WRITE8_HANDLER( draco_ay8910_port_b_w )
     */
 }
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_SINGLE_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -719,7 +719,7 @@ static MACHINE_DRIVER_START( draco )
 	MDRV_SOUND_ADD("cdp", CDP1869, DRACO_CHR2)
 
 	MDRV_SOUND_ADD("ay", AY8910, DRACO_SND_CHR1)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/clshroad.c b/src/mame/drivers/clshroad.c
index 83e6a9a45e7..02a6ae9a22d 100644
--- a/src/mame/drivers/clshroad.c
+++ b/src/mame/drivers/clshroad.c
@@ -36,7 +36,7 @@ VIDEO_START( clshroad );
 VIDEO_UPDATE( clshroad );
 
 extern UINT8 *wiping_soundregs;
-void *wiping_sh_start(int clock, const struct CustomSound_interface *config);
+void *wiping_sh_start(int clock, const custom_sound_interface *config);
 WRITE8_HANDLER( wiping_sound_w );
 
 
@@ -272,7 +272,7 @@ GFXDECODE_END
 
 
 
-static const struct CustomSound_interface custom_interface =
+static const custom_sound_interface custom_interface =
 {
 	wiping_sh_start
 };
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index c2872761039..3e5d95e1b56 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -619,7 +619,7 @@ static MACHINE_RESET( trailblz )
 	pia_reset();
 }
 
-static const struct AY8910interface ay8912_interface =
+static const AY8910_interface ay8912_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index 455e8551cb2..c335fe25377 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -864,7 +864,7 @@ static const char *const panic_sample_names[] =
 	0
 };
 
-static const struct Samplesinterface panic_samples_interface =
+static const samples_interface panic_samples_interface =
 {
 	9,	/* 9 channels */
 	panic_sample_names
@@ -891,7 +891,7 @@ static const char *const cosmicg_sample_names[] =
 	0
 };
 
-static const struct Samplesinterface cosmicg_samples_interface =
+static const samples_interface cosmicg_samples_interface =
 {
 	9,	/* 9 channels */
 	cosmicg_sample_names
diff --git a/src/mame/drivers/couple.c b/src/mame/drivers/couple.c
index 1558931e305..209ee0185b8 100644
--- a/src/mame/drivers/couple.c
+++ b/src/mame/drivers/couple.c
@@ -119,7 +119,7 @@ static WRITE8_HANDLER( merit_prot_w )
 }
 
 #if 0
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	input_port_4_r,
 };
@@ -386,7 +386,7 @@ static MACHINE_DRIVER_START( couple )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 4000000)
-//  MDRV_SOUND_CONFIG(ay8910_interface)
+//  MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c
index b83ec42e4a0..57cc21c5935 100644
--- a/src/mame/drivers/cps3.c
+++ b/src/mame/drivers/cps3.c
@@ -2415,7 +2415,7 @@ static INTERRUPT_GEN(cps3_other_interrupt)
 //static struct sh2_config sh2cp_conf_slave  = { 1 };
 
 
-static const struct CustomSound_interface custom_interface =
+static const custom_sound_interface custom_interface =
 {
 	cps3_sh_start
 };
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c
index a82f35e806f..5cbafba6a0c 100644
--- a/src/mame/drivers/cubocd32.c
+++ b/src/mame/drivers/cubocd32.c
@@ -213,7 +213,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct CustomSound_interface amiga_custom_interface =
+static const custom_sound_interface amiga_custom_interface =
 {
 	amiga_sh_start
 };
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index 361d988e866..1b7177782f7 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -378,7 +378,7 @@ static VIDEO_UPDATE( ddayjlc )
 	return 0;
 }
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -428,7 +428,7 @@ static MACHINE_DRIVER_START( ddayjlc )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, 12000000/6)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("ay2", AY8910, 12000000/6)
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index fee865afdc7..93048626aaf 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -6589,7 +6589,7 @@ static MACHINE_DRIVER_START( akamaru )
 MACHINE_DRIVER_END
 
 
-static const struct AY8910interface quiz365_ay8910_interface =
+static const AY8910_interface quiz365_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -6938,7 +6938,7 @@ static INTERRUPT_GEN( rtc_nmi_irq )
 	cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE);
 }
 
-static const struct AY8910interface mjmyster_ay8910_interface =
+static const AY8910_interface mjmyster_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -6988,7 +6988,7 @@ static INTERRUPT_GEN( hginga_irq )
 		cpunum_set_input_line_and_vector(machine, 0, 0, HOLD_LINE, 0xf8);
 }
 
-static const struct AY8910interface hginga_ay8910_interface =
+static const AY8910_interface hginga_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index ecd3c9c36fc..ccc9d99455f 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -771,7 +771,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -815,7 +815,7 @@ static MACHINE_DRIVER_START( dlair_base )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ay", AY8910, MASTER_CLOCK_US/8)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.33)
 
 	MDRV_SOUND_ADD("laserdisc", CUSTOM, 0)
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index 0756496a91c..ae89e30619b 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -235,7 +235,7 @@ static GFXDECODE_START( dominob )
 GFXDECODE_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -271,7 +271,7 @@ static MACHINE_DRIVER_START( dominob )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 	MDRV_SOUND_ADD("ay", AY8910, 8000000/4 /* guess */)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index 967e8d65197..d76ea23ecbf 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -663,7 +663,7 @@ GFXDECODE_END
                                 Machine Drivers
 ***************************************************************************/
 
-static const struct AY8910interface dunhuang_ay8910_interface =
+static const AY8910_interface dunhuang_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index 54c79178ead..1481d682765 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -674,7 +674,7 @@ static PALETTE_INIT(dwarfd)
 	palette_set_color(machine, 6, MAKE_RGB(255, 0, 0));
 }
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -712,7 +712,7 @@ static MACHINE_DRIVER_START( dwarfd )
 
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 	MDRV_SOUND_ADD("ay", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index d990499304c..07b0e027a24 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -3673,7 +3673,7 @@ MACHINE_DRIVER_END
                                 Hana Oriduru
 ***************************************************************************/
 
-static const struct AY8910interface hnoridur_ay8910_interface =
+static const AY8910_interface hnoridur_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -4077,7 +4077,7 @@ MACHINE_DRIVER_END
                            Hanafuda Hana Tengoku
 ***************************************************************************/
 
-static const struct AY8910interface htengoku_ay8910_interface =
+static const AY8910_interface htengoku_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -4140,7 +4140,7 @@ static INTERRUPT_GEN( tenkai_interrupt )
 	}
 }
 
-static const struct AY8910interface tenkai_ay8910_interface =
+static const AY8910_interface tenkai_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index 1e8b634c3d8..03dc8f3b045 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -390,7 +390,7 @@ static CUSTOM_INPUT( p2_controls_r )
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -584,7 +584,7 @@ static MACHINE_DRIVER_START( enigma2 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, AY8910_CLOCK)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -614,7 +614,7 @@ static MACHINE_DRIVER_START( enigma2a )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, AY8910_CLOCK)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index c138c3aad93..6fcd57c34b5 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -1120,7 +1120,7 @@ static const struct MSM5232interface equites_5232intf =
 };
 
 
-static const struct AY8910interface equites_8910intf =
+static const AY8910_interface equites_8910intf =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1140,7 +1140,7 @@ static const char *const alphamc07_sample_names[] =
 	0
 };
 
-static const struct Samplesinterface alphamc07_samples_interface =
+static const samples_interface alphamc07_samples_interface =
 {
 	3,	/* 3 channels */
 	alphamc07_sample_names
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index 712e72443a8..6f6b2ae7855 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -207,7 +207,7 @@ static VIDEO_UPDATE( ettrivia )
 	return 0;
 }
 
-static const struct AY8910interface ay8912_interface_2 =
+static const AY8910_interface ay8912_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -217,7 +217,7 @@ static const struct AY8910interface ay8912_interface_2 =
 	NULL
 };
 
-static const struct AY8910interface ay8912_interface_3 =
+static const AY8910_interface ay8912_interface_3 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index a74bae136f6..c8e501d2e4d 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -258,7 +258,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -303,7 +303,7 @@ static MACHINE_DRIVER_START( exerion )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 
 	MDRV_SOUND_ADD("ay2", AY8910, EXERION_AY8910_CLOCK)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/flower.c b/src/mame/drivers/flower.c
index be51789b7c6..2a459a5ab6c 100644
--- a/src/mame/drivers/flower.c
+++ b/src/mame/drivers/flower.c
@@ -86,7 +86,7 @@ WRITE8_HANDLER( flower_sound2_w );
 
 extern UINT8 *flower_textram, *flower_bg0ram, *flower_bg1ram, *flower_bg0_scroll, *flower_bg1_scroll;
 extern UINT8 *flower_soundregs1,*flower_soundregs2;
-void *flower_sh_start(int clock, const struct CustomSound_interface *config);
+void *flower_sh_start(int clock, const custom_sound_interface *config);
 
 static UINT8 *sn_irq_enable;
 static UINT8 *sn_nmi_enable;
@@ -246,7 +246,7 @@ static GFXDECODE_START( flower )
 	GFXDECODE_ENTRY( "gfx3", 0, flower_tilelayout, 0,  16 )
 GFXDECODE_END
 
-static const struct CustomSound_interface custom_interface =
+static const custom_sound_interface custom_interface =
 {
 	flower_sh_start
 };
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index ec1c826edf1..144095d0e22 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -633,7 +633,7 @@ static GFXDECODE_START( flstory )
 GFXDECODE_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -686,7 +686,7 @@ static MACHINE_DRIVER_START( flstory )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, XTAL_8MHz/4) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
 	MDRV_SOUND_ADD("msm", MSM5232, XTAL_8MHz/4) /* verified on pcb */
@@ -743,7 +743,7 @@ static MACHINE_DRIVER_START( onna34ro )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 8000000/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
 	MDRV_SOUND_ADD("msm", MSM5232, 2000000)
@@ -800,7 +800,7 @@ static MACHINE_DRIVER_START( victnine )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 8000000/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MDRV_SOUND_ADD("msm", MSM5232, 2000000)
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index 1774f4f2ba1..7e63e06a608 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -289,7 +289,7 @@ static GFXDECODE_START( funkybee )
 GFXDECODE_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -327,7 +327,7 @@ static MACHINE_DRIVER_START( funkybee )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 4e092c0d558..18d536a3c80 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -1664,7 +1664,7 @@ static const pia6821_interface pia1_intf =
 *    Sound Interface    *
 ************************/
 
-static const struct AY8910interface ay8910_intf =
+static const AY8910_interface ay8910_intf =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c
index d471e1b29c3..94081c01a6e 100644
--- a/src/mame/drivers/galaga.c
+++ b/src/mame/drivers/galaga.c
@@ -1634,7 +1634,7 @@ static const char *const battles_sample_names[] =
 	0	/* end of array */
 };
 
-static const struct Samplesinterface battles_samples_interface =
+static const samples_interface battles_samples_interface =
 {
 	1,	/* one channel */
 	battles_sample_names
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 952d6891900..16b96691512 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -1610,7 +1610,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct AY8910interface frogger_ay8910_interface =
+static const AY8910_interface frogger_ay8910_interface =
 {
 	AY8910_DISCRETE_OUTPUT,
 	{RES_K(5.1), RES_K(5.1), RES_K(5.1)},
@@ -1620,7 +1620,7 @@ static const struct AY8910interface frogger_ay8910_interface =
 	NULL
 };
 
-static const struct AY8910interface konami_ay8910_interface_1 =
+static const AY8910_interface konami_ay8910_interface_1 =
 {
 	AY8910_DISCRETE_OUTPUT,
 	{RES_K(5.1), RES_K(5.1), RES_K(5.1)},
@@ -1630,7 +1630,7 @@ static const struct AY8910interface konami_ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface konami_ay8910_interface_2 =
+static const AY8910_interface konami_ay8910_interface_2 =
 {
 	AY8910_DISCRETE_OUTPUT,
 	{RES_K(5.1), RES_K(5.1), RES_K(5.1)},
@@ -1640,7 +1640,7 @@ static const struct AY8910interface konami_ay8910_interface_2 =
 	NULL
 };
 
-static const struct AY8910interface explorer_ay8910_interface_1 =
+static const AY8910_interface explorer_ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1650,7 +1650,7 @@ static const struct AY8910interface explorer_ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface explorer_ay8910_interface_2 =
+static const AY8910_interface explorer_ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1660,7 +1660,7 @@ static const struct AY8910interface explorer_ay8910_interface_2 =
 	NULL
 };
 
-static const struct AY8910interface sfx_ay8910_interface =
+static const AY8910_interface sfx_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1670,7 +1670,7 @@ static const struct AY8910interface sfx_ay8910_interface =
 	sfx_sample_control_w
 };
 
-static const struct AY8910interface scorpion_ay8910_interface =
+static const AY8910_interface scorpion_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1680,7 +1680,7 @@ static const struct AY8910interface scorpion_ay8910_interface =
 	scorpion_sound_control_w,
 };
 
-static const struct AY8910interface checkmaj_ay8910_interface =
+static const AY8910_interface checkmaj_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index 49ead0cae76..754d9b2fca7 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -2276,7 +2276,7 @@ static GFXDECODE_START( _4in1 )
 	GFXDECODE_ENTRY( "gfx1", 0x4000, _4in1_spritelayout,    0, 8 )
 GFXDECODE_END
 
-static const struct AY8910interface checkmaj_ay8910_interface =
+static const AY8910_interface checkmaj_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -2286,7 +2286,7 @@ static const struct AY8910interface checkmaj_ay8910_interface =
 	NULL
 };
 
-static const struct AY8910interface bongo_ay8910_interface =
+static const AY8910_interface bongo_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index 895e9bb601e..e4b87c30b4f 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -1156,7 +1156,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1188,7 +1188,7 @@ static MACHINE_DRIVER_START( gameplan )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, GAMEPLAN_AY8910_CLOCK)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c
index db8b97c68a6..2111ab53682 100644
--- a/src/mame/drivers/gaplus.c
+++ b/src/mame/drivers/gaplus.c
@@ -529,7 +529,7 @@ static const char *const gaplus_sample_names[] =
 	0
 };
 
-static const struct Samplesinterface samples_interface =
+static const samples_interface gaplus_samples_interface =
 {
 	1,	/* one channel */
 	gaplus_sample_names
@@ -579,7 +579,7 @@ static MACHINE_DRIVER_START( gaplus )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("samples", SAMPLES, 0)
-	MDRV_SOUND_CONFIG(samples_interface)
+	MDRV_SOUND_CONFIG(gaplus_samples_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index fe2cc67940f..5be7c02ffca 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -273,7 +273,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -309,7 +309,7 @@ static MACHINE_DRIVER_START( goldstar )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")//set up a standard mono speaker called 'mono'
 	MDRV_SOUND_ADD("ay", AY8910,1500000)//1 AY8910, at clock 150000Hz
-	MDRV_SOUND_CONFIG(ay8910_interface)//read extra data from interface
+	MDRV_SOUND_CONFIG(ay8910_config)//read extra data from interface
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)//all sound goes to the 'mono' speaker, at 0.50 X maximum
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)//clock
@@ -345,7 +345,7 @@ static MACHINE_DRIVER_START( goldstbl )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")//set up a standard mono speaker called 'mono'
 	MDRV_SOUND_ADD("ay", AY8910,1500000)//1 AY8910, at clock 150000Hz
-	MDRV_SOUND_CONFIG(ay8910_interface)//read extra data from interface
+	MDRV_SOUND_CONFIG(ay8910_config)//read extra data from interface
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)//all sound goes to the 'mono' speaker, at 0.50 X maximum
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)//clock
@@ -380,7 +380,7 @@ static MACHINE_DRIVER_START( moonlght )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")//set up a standard mono speaker called 'mono'
 	MDRV_SOUND_ADD("ay", AY8910,1500000)//1 AY8910, at clock 150000Hz
-	MDRV_SOUND_CONFIG(ay8910_interface)//read extra data from interface
+	MDRV_SOUND_CONFIG(ay8910_config)//read extra data from interface
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)//all sound goes to the 'mono' speaker, at 0.50 X maximum
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)//clock
diff --git a/src/mame/drivers/gomoku.c b/src/mame/drivers/gomoku.c
index 1085c7c6686..5d6895398b3 100644
--- a/src/mame/drivers/gomoku.c
+++ b/src/mame/drivers/gomoku.c
@@ -43,7 +43,7 @@ extern UINT8 *gomoku_soundregs2;
 extern WRITE8_HANDLER( gomoku_sound1_w );
 extern WRITE8_HANDLER( gomoku_sound2_w );
 
-extern void *gomoku_sh_start(int clock, const struct CustomSound_interface *config);
+extern void *gomoku_sh_start(int clock, const custom_sound_interface *config);
 
 /* input ports are rotated 90 degrees */
 static READ8_HANDLER( input_port_r )
@@ -161,7 +161,7 @@ static GFXDECODE_START( gomoku )
 GFXDECODE_END
 
 
-static const struct CustomSound_interface custom_interface =
+static const custom_sound_interface custom_interface =
 {
 	gomoku_sh_start
 };
diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c
index a9852d80d9d..6b4883e4be3 100644
--- a/src/mame/drivers/gottlieb.c
+++ b/src/mame/drivers/gottlieb.c
@@ -1812,13 +1812,13 @@ static const char *const qbert_sample_names[] =
 	0	/* end of array */
 };
 
-static const struct Samplesinterface qbert_samples_interface =
+static const samples_interface qbert_samples_interface =
 {
  	1,	/* one channel */
 	qbert_sample_names
 };
 
-static const struct Samplesinterface reactor_samples_interface =
+static const samples_interface reactor_samples_interface =
 {
 	1,	/* one channel */
 	reactor_sample_names
diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c
index 77da62c452a..40f79f96dc9 100644
--- a/src/mame/drivers/gotya.c
+++ b/src/mame/drivers/gotya.c
@@ -188,7 +188,7 @@ static const char *const sample_names[] =
 	0
 };
 
-static const struct Samplesinterface samples_interface =
+static const samples_interface gotya_samples_interface =
 {
 	4,	/* 4 channels */
 	sample_names
@@ -221,7 +221,7 @@ static MACHINE_DRIVER_START( gotya )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("samples", SAMPLES, 0)
-	MDRV_SOUND_CONFIG(samples_interface)
+	MDRV_SOUND_CONFIG(gotya_samples_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index 3a9df2a6ea6..ef392bf4bdf 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -448,7 +448,7 @@ static WRITE8_HANDLER( grchamp_portB_2_w )
  *
  *************************************/
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -458,7 +458,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	grchamp_portB_0_w
 };
 
-static const struct AY8910interface ay8910_interface_3 =
+static const AY8910_interface ay8910_interface_3 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/gridlee.c b/src/mame/drivers/gridlee.c
index 5d0226a70e1..134d8ce1c54 100644
--- a/src/mame/drivers/gridlee.c
+++ b/src/mame/drivers/gridlee.c
@@ -403,7 +403,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct CustomSound_interface custom_interface =
+static const custom_sound_interface custom_interface =
 {
 	gridlee_sh_start
 };
@@ -417,7 +417,7 @@ static const char *const sample_names[] =
 	0	/* end of array */
 };
 
-static const struct Samplesinterface samples_interface =
+static const samples_interface gridlee_samples_interface =
 {
 	8,	/* 8 channels */
 	sample_names
@@ -459,7 +459,7 @@ static MACHINE_DRIVER_START( gridlee )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("samples", SAMPLES, 0)
-	MDRV_SOUND_CONFIG(samples_interface)
+	MDRV_SOUND_CONFIG(gridlee_samples_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index 686eb25bdd1..c42860f50bb 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -675,7 +675,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -738,7 +738,7 @@ static MACHINE_DRIVER_START( gsword )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 
 	MDRV_SOUND_ADD("ay2", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 
 	MDRV_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */
@@ -784,7 +784,7 @@ static MACHINE_DRIVER_START( josvolly )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 
 	MDRV_SOUND_ADD("ay2", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 
 #if 0
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index d50db0ac4bd..708fc1ffd48 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -371,7 +371,7 @@ static GFXDECODE_START( gyruss )
 GFXDECODE_END
 
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_DISCRETE_OUTPUT,
 	{ RES_K(3.3), RES_K(3.3), RES_K(3.3) },
@@ -381,7 +381,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	gyruss_filter0_w
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_DISCRETE_OUTPUT,
 	{ RES_K(3.3), RES_K(3.3), RES_K(3.3) },
@@ -391,7 +391,7 @@ static const struct AY8910interface ay8910_interface_2 =
 	gyruss_filter1_w
 };
 
-static const struct AY8910interface ay8910_interface_3 =
+static const AY8910_interface ay8910_interface_3 =
 {
 	AY8910_DISCRETE_OUTPUT,
 	{ RES_K(3.3), RES_K(3.3), RES_K(3.3) },
@@ -401,7 +401,7 @@ static const struct AY8910interface ay8910_interface_3 =
 	NULL
 };
 
-static const struct AY8910interface ay8910_interface_4 =
+static const AY8910_interface ay8910_interface_4 =
 {
 	AY8910_DISCRETE_OUTPUT,
 	{ RES_K(3.3), RES_K(3.3), RES_K(3.3) },
@@ -411,7 +411,7 @@ static const struct AY8910interface ay8910_interface_4 =
 	NULL
 };
 
-static const struct AY8910interface ay8910_interface_5 =
+static const AY8910_interface ay8910_interface_5 =
 {
 	AY8910_DISCRETE_OUTPUT,
 	{ RES_K(3.3), RES_K(3.3), RES_K(3.3) },
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index 9f60a32e546..475b68db919 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -1939,7 +1939,7 @@ static MACHINE_RESET( halleys )
 }
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1989,7 +1989,7 @@ static MACHINE_DRIVER_START( halleys )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
 
 	MDRV_SOUND_ADD("ay4", AY8910, XTAL_6MHz/4) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index f2bf34f66ac..d8030783f81 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -193,7 +193,7 @@ static GFXDECODE_START( hanaawas )
 GFXDECODE_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -231,7 +231,7 @@ static MACHINE_DRIVER_START( hanaawas )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 18432000/12)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c
index fddb1d5fde3..ac06a0af1cd 100644
--- a/src/mame/drivers/hanaroku.c
+++ b/src/mame/drivers/hanaroku.c
@@ -228,7 +228,7 @@ static GFXDECODE_START( hanaroku )
 GFXDECODE_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -263,7 +263,7 @@ static MACHINE_DRIVER_START( hanaroku )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c
index 7e91fa5f663..74dd14288aa 100644
--- a/src/mame/drivers/hexa.c
+++ b/src/mame/drivers/hexa.c
@@ -121,7 +121,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -158,7 +158,7 @@ static MACHINE_DRIVER_START( hexa )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 	MDRV_SOUND_ADD("ay", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c
index 93d116bf11f..efa78bd4a69 100644
--- a/src/mame/drivers/holeland.c
+++ b/src/mame/drivers/holeland.c
@@ -280,7 +280,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -290,7 +290,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index 1187bd0b90b..5befbe46cc0 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -176,7 +176,7 @@ static INTERRUPT_GEN( hotblocks_irq ) /* right? */
 	cpunum_set_input_line(machine, 0, INPUT_LINE_NMI, PULSE_LINE);
 }
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -211,7 +211,7 @@ static MACHINE_DRIVER_START( hotblock )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 1000000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index e65fb370e8d..678524a31dc 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -255,7 +255,7 @@ static INPUT_PORTS_START( hyhoo2 )
 INPUT_PORTS_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -292,7 +292,7 @@ static MACHINE_DRIVER_START( hyhoo )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 1250000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index c03bad85a33..f379c534979 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -863,7 +863,7 @@ static GFXDECODE_START( joinem )
 	GFXDECODE_ENTRY( "gfx1", 0, joinem_charlayout, 0, 32 )
 GFXDECODE_END
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -901,7 +901,7 @@ static MACHINE_DRIVER_START( jack )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 18000000/12)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c
index 41b05a6b398..fd8cbff6d1c 100644
--- a/src/mame/drivers/jongkyo.c
+++ b/src/mame/drivers/jongkyo.c
@@ -579,7 +579,7 @@ static PALETTE_INIT(jongkyo)
 	}
 }
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -612,7 +612,7 @@ static MACHINE_DRIVER_START( jongkyo )
 
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 	MDRV_SOUND_ADD("ay", AY8910, JONGKYO_CLOCK/8)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index 122b17698b3..27bbc13d15b 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -321,7 +321,7 @@ INPUT_PORTS_END
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -361,7 +361,7 @@ static MACHINE_DRIVER_START( junofrst )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 14318000/8)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(0, "filter.0.0", 0.30)
 	MDRV_SOUND_ROUTE(1, "filter.0.1", 0.30)
 	MDRV_SOUND_ROUTE(2, "filter.0.2", 0.30)
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 35e114c02fe..06d1e389c6e 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -1646,7 +1646,7 @@ static INTERRUPT_GEN( kaneko16_interrupt )
 	}
 }
 
-static const struct AY8910interface ay8910_intf_dsw =
+static const AY8910_interface ay8910_intf_dsw =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1656,7 +1656,7 @@ static const struct AY8910interface ay8910_intf_dsw =
 	NULL,
 };
 
-static const struct AY8910interface ay8910_intf_eeprom =
+static const AY8910_interface ay8910_intf_eeprom =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index a5509c59283..76a5278ec49 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -536,7 +536,7 @@ static GFXDECODE_START( rk )
 	GFXDECODE_ENTRY( "gfx4", 0x00000, rk_bglayout,       0, 32 )	/* bg tiles */
 GFXDECODE_END
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -590,7 +590,7 @@ static MACHINE_DRIVER_START( kingofb )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
@@ -640,7 +640,7 @@ static MACHINE_DRIVER_START( ringking )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
diff --git a/src/mame/drivers/kinstb.c b/src/mame/drivers/kinstb.c
index 2b7acc8d858..6bd573b41a1 100644
--- a/src/mame/drivers/kinstb.c
+++ b/src/mame/drivers/kinstb.c
@@ -197,7 +197,7 @@ static INPUT_PORTS_START( kinstb )
 
 INPUT_PORTS_END
 
-static const struct CustomSound_interface snes_sound_interface =
+static const custom_sound_interface snes_sound_interface =
 { snes_sh_start };
 
 static MACHINE_DRIVER_START( kinstb )
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index 24da0b97430..c078a1b9849 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -244,7 +244,7 @@ static GFXDECODE_START( kncljoe )
 	GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 0x80, 16 )
 GFXDECODE_END
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -294,7 +294,7 @@ static MACHINE_DRIVER_START( kncljoe )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 
 	MDRV_SOUND_ADD("sn1", SN76489, XTAL_3_579545MHz) /* verified on pcb */
diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c
index b9f0f952bce..ef202699b44 100644
--- a/src/mame/drivers/koikoi.c
+++ b/src/mame/drivers/koikoi.c
@@ -245,7 +245,7 @@ static GFXDECODE_START( koikoi )
 GFXDECODE_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -282,7 +282,7 @@ static MACHINE_DRIVER_START( koikoi )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, KOIKOI_CRYSTAL/8)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index fd7ab480d75..8b0e2fcec57 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -178,7 +178,7 @@ static WRITE8_HANDLER(dummy_w)
 	//DAC ? communication with main cpu ?
 }
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -188,7 +188,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	dummy_w
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index aa7bd17a4b8..a653f848629 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -477,7 +477,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -530,7 +530,7 @@ static MACHINE_DRIVER_START( gyrodine )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12)  /* verified on pcb */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 
 	MDRV_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/12)  /* verified on pcb */
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index d64320dacc4..4a7e6fb2070 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -121,7 +121,7 @@ static WRITE8_HANDLER(unk_w)
 
 }
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -314,7 +314,7 @@ static MACHINE_DRIVER_START( ladyfrog )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 8000000/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
 
 	MDRV_SOUND_ADD("msm", MSM5232, 2000000)
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index 94f16199eda..fd1ec156518 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -565,7 +565,7 @@ static VIDEO_UPDATE( laserbat )
 
 /* Laser Battle sound **********************************/
 
-static const struct SN76477interface sn76477_interface =
+static const SN76477_interface laserbat_sn76477_interface =
 {
 	RES_K(47), 		/*  4 noise_res         R21    47K */
 	0,				/*  5 filter_res (variable) */
@@ -658,7 +658,7 @@ static const pia6821_interface pia_0_intf =
 	/*irqs   : A/B             */ zaccaria_irq0a, zaccaria_irq0b
 };
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -718,7 +718,7 @@ static MACHINE_DRIVER_START( laserbat )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("sn", SN76477, 0) // output not connected
-	MDRV_SOUND_CONFIG(sn76477_interface)
+	MDRV_SOUND_CONFIG(laserbat_sn76477_interface)
 
 	MDRV_SOUND_ADD("tms1", TMS3615, 4000000/8/2) // 250 kHz, from second chip's clock out
 	MDRV_SOUND_ROUTE(TMS3615_FOOTAGE_8, "mono", 1.0)
@@ -759,7 +759,7 @@ static MACHINE_DRIVER_START( catnmous )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, 3580000/2) // ?
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("ay2", AY8910, 3580000/2) // ?
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index d9183653969..ec08a592a23 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -682,7 +682,7 @@ INPUT_PORTS_END
    register.
 */
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -693,19 +693,19 @@ static const struct AY8910interface ay8910_interface =
 };
 
 
-static const struct CustomSound_interface dac_custom_interface =
+static const custom_sound_interface dac_custom_interface =
 {
     leland_sh_start
 };
 
 
-static const struct CustomSound_interface i80186_custom_interface =
+static const custom_sound_interface i80186_custom_interface =
 {
     leland_80186_sh_start
 };
 
 
-static const struct CustomSound_interface redline_custom_interface =
+static const custom_sound_interface redline_custom_interface =
 {
   	redline_80186_sh_start
 };
@@ -741,11 +741,11 @@ static MACHINE_DRIVER_START( leland )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay8910.1", AY8910, 10000000/6)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ay8910.2", AY8910, 10000000/6)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("custom", CUSTOM, 0)
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index db270a3a954..807e677bd25 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -562,7 +562,7 @@ static const struct TMS5220interface tms5220_interface =
 	looping_spcint
 };
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -621,7 +621,7 @@ static MACHINE_DRIVER_START( looping )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, SOUND_CLOCK/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
 
 	MDRV_SOUND_ADD("tms", TMS5220, TMS_CLOCK)
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index d7e0add7c49..10c4b55832e 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -802,7 +802,7 @@ static const ppi8255_interface ppi8255_intf[4] =
 *      Sound Interfaces      *
 *****************************/
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -861,7 +861,7 @@ static MACHINE_DRIVER_START( lucky74 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, YM2149_CLOCK)	/* YM2149F */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/lucky8.c b/src/mame/drivers/lucky8.c
index 91be3b620c3..5e0f7ff7837 100644
--- a/src/mame/drivers/lucky8.c
+++ b/src/mame/drivers/lucky8.c
@@ -344,7 +344,7 @@ static GFXDECODE_START( lucky8 )
 	GFXDECODE_ENTRY( "gfx2", 0x1000, spritelayout2, 0, 64 )
 GFXDECODE_END
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -380,7 +380,7 @@ static MACHINE_DRIVER_START( lucky8 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 12000000/12)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c
index 63e2fd10f8a..260b5d47d07 100644
--- a/src/mame/drivers/lvcards.c
+++ b/src/mame/drivers/lvcards.c
@@ -456,7 +456,7 @@ GFXDECODE_END
 
 /* Sound Interfaces */
 
-static const struct AY8910interface lcay8910_interface =
+static const AY8910_interface lcay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c
index 7f853fd2b9b..a9d8b218ddb 100644
--- a/src/mame/drivers/m10.c
+++ b/src/mame/drivers/m10.c
@@ -733,7 +733,7 @@ static const char *const m10_sample_names[] =
 };
 
 
-static const struct Samplesinterface m10_samples_interface =
+static const samples_interface m10_samples_interface =
 {
 	6,	/* 6 channels */
 	m10_sample_names
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index 50beb8c630f..9123f0e1e2c 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -610,7 +610,7 @@ static GFXDECODE_START( fghtbskt )
 GFXDECODE_END
 
 
-static const struct Samplesinterface fghtbskt_samples_interface =
+static const samples_interface fghtbskt_samples_interface =
 {
 	1,
 	NULL,
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index fba74c055c8..6c9f2c20efb 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -161,7 +161,7 @@ static INPUT_PORTS_START( madalien )
 INPUT_PORTS_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -189,7 +189,7 @@ static MACHINE_DRIVER_START( madalien )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, SOUND_CLOCK / 4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.23)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index d75cbe81e8c..69c2f7178e0 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -350,7 +350,7 @@ static GFXDECODE_START( magmax )
 GFXDECODE_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -395,7 +395,7 @@ static MACHINE_DRIVER_START( magmax )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, XTAL_20MHz/16) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
 	MDRV_SOUND_ADD("ay2", AY8910, XTAL_20MHz/16) /* verified on pcb */
diff --git a/src/mame/drivers/malzak.c b/src/mame/drivers/malzak.c
index 22a6d3b6144..b50cab9095c 100644
--- a/src/mame/drivers/malzak.c
+++ b/src/mame/drivers/malzak.c
@@ -309,7 +309,7 @@ static PALETTE_INIT( malzak )
 }
 
 
-static const struct SN76477interface sn76477_intf =
+static const SN76477_interface sn76477_intf =
 {
 	0,	/* N/C */		/*  4  noise_res         */
 	0,	/* N/C */		/*  5  filter_res        */
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index 7ee0f6f207b..bb75bafdcf3 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -1470,7 +1470,7 @@ static MACHINE_RESET( greatgun )
 
 
 /* only Great Guns */
-static const struct AY8910interface ay8912_interface_1 =
+static const AY8910_interface ay8912_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1480,7 +1480,7 @@ static const struct AY8910interface ay8912_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface ay8912_interface_2 =
+static const AY8910_interface ay8912_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index 15eb1977fa8..d95b3c3fee2 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -1490,7 +1490,7 @@ static const char *const journey_sample_names[] =
 	0
 };
 
-static const struct Samplesinterface journey_samples_interface =
+static const samples_interface journey_samples_interface =
 {
 	1,
 	journey_sample_names
diff --git a/src/mame/drivers/meadows.c b/src/mame/drivers/meadows.c
index 60e453563a7..23716764a83 100644
--- a/src/mame/drivers/meadows.c
+++ b/src/mame/drivers/meadows.c
@@ -562,7 +562,7 @@ static const char *const bowl3d_sample_names[] =
 };
 
 
-static const struct Samplesinterface meadows_samples_interface =
+static const samples_interface meadows_samples_interface =
 {
 	2,
 	NULL,
@@ -570,7 +570,7 @@ static const struct Samplesinterface meadows_samples_interface =
 };
 
 
-static const struct Samplesinterface bowl3d_samples_interface =
+static const samples_interface bowl3d_samples_interface =
 {
  	1,
 	bowl3d_sample_names
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index 0381a276848..0f2a1ed3e96 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -299,7 +299,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -348,7 +348,7 @@ static MACHINE_DRIVER_START( megazone )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 14318000/8)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(0, "filter.0.0", 0.30)
 	MDRV_SOUND_ROUTE(1, "filter.0.1", 0.30)
 	MDRV_SOUND_ROUTE(2, "filter.0.2", 0.30)
diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c
index 88376a2f9e6..219fe62a6fc 100644
--- a/src/mame/drivers/meijinsn.c
+++ b/src/mame/drivers/meijinsn.c
@@ -289,7 +289,7 @@ static INTERRUPT_GEN( meijinsn_interrupt )
 		cpunum_set_input_line(machine, 0, 2, HOLD_LINE);
 }
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -334,7 +334,7 @@ static MACHINE_DRIVER_START( meijinsn )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 2000000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75)
 
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index c934f401cad..b619befed55 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -789,7 +789,7 @@ static const ppi8255_interface ppi8255_intf[2] =
 	}
 };
 
-static const struct AY8910interface merit_ay8912_interface =
+static const AY8910_interface merit_ay8912_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index 8f0d0ae1a20..77710b1bc44 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -729,7 +729,7 @@ static WRITE8_HANDLER(meritm_ay8930_port_b_w)
 	// lamps
 };
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -928,7 +928,7 @@ static MACHINE_DRIVER_START(meritm_crt250)
   /* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 	MDRV_SOUND_ADD("ay", AY8910, SYSTEM_CLK/12)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index ec4314a0cd3..a79e9a8afad 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -74,7 +74,7 @@ static void mjkjidai_adpcm_callback (void *param, stream_sample_t **inputs, stre
 	}
 }
 
-static void *mjkjidai_adpcm_start (int clock, const struct CustomSound_interface *config)
+static void *mjkjidai_adpcm_start (int clock, const custom_sound_interface *config)
 {
 	struct mjkjidai_adpcm_state *state = &mjkjidai_adpcm;
 	state->playing = 0;
@@ -345,7 +345,7 @@ static GFXDECODE_START( mjkjidai )
 GFXDECODE_END
 
 
-static const struct CustomSound_interface adpcm_interface =
+static const custom_sound_interface adpcm_interface =
 {
 	mjkjidai_adpcm_start
 };
diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c
index 13251908dea..8849326f1a8 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -298,7 +298,7 @@ INPUT_PORTS_END
 
 /****************************************************************************/
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -336,7 +336,7 @@ static MACHINE_DRIVER_START( mjsister )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, MCLK/8)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
diff --git a/src/mame/drivers/mjsiyoub.c b/src/mame/drivers/mjsiyoub.c
index 633d7b8fd71..70b13df1ca0 100644
--- a/src/mame/drivers/mjsiyoub.c
+++ b/src/mame/drivers/mjsiyoub.c
@@ -65,7 +65,7 @@ static INPUT_PORTS_START( mjsiyoub )
 INPUT_PORTS_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -109,7 +109,7 @@ static MACHINE_DRIVER_START( mjsiyoub )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 18432000/16) // ??
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
 	MDRV_SOUND_ADD("msm", MSM5205, 18432000/32) // ??
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index eef57523a9e..f742f5c55ea 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -1395,7 +1395,7 @@ static ADDRESS_MAP_START( mod2_memmap, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x1000, 0xffff) AM_READ(SMH_BANK1)	/* 64k  paged ROM (4 pages)  */
 ADDRESS_MAP_END
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_SINGLE_OUTPUT,
 	{820,0,0},
@@ -1418,7 +1418,7 @@ static MACHINE_DRIVER_START( mpu4mod2 )
 
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 	MDRV_SOUND_ADD("AY8913",AY8913, MPU4_MASTER_CLOCK/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index d0282e64724..e4978799e70 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -1698,7 +1698,7 @@ static MACHINE_DRIVER_START( mpu4_vid )
 
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 	MDRV_SOUND_ADD("AY8913",AY8913, MPU4_MASTER_CLOCK/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")/* Present on all video cards */
@@ -1725,7 +1725,7 @@ static MACHINE_DRIVER_START( dealem )
 
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 	MDRV_SOUND_ADD("AY8913",AY8913, MPU4_MASTER_CLOCK/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_NVRAM_HANDLER(generic_0fill)
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index 1d7b4d120da..1bece610477 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -320,7 +320,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct CustomSound_interface amiga_custom_interface =
+static const custom_sound_interface amiga_custom_interface =
 {
 	amiga_sh_start
 };
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index 2b12f5ae2c6..60db253f761 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -351,12 +351,12 @@ GFXDECODE_END
 
 
 
-static const struct CustomSound_interface naughtyb_custom_interface =
+static const custom_sound_interface naughtyb_custom_interface =
 {
 	naughtyb_sh_start
 };
 
-static const struct CustomSound_interface popflame_custom_interface =
+static const custom_sound_interface popflame_custom_interface =
 {
 	popflame_sh_start
 };
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index bc923666d37..a7a35fc79ad 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -2808,7 +2808,7 @@ static INPUT_PORTS_START( nightlov )
 INPUT_PORTS_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -2847,7 +2847,7 @@ static MACHINE_DRIVER_START( NBMJDRV_4096 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("8910", AY8910, 1250000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
@@ -2979,7 +2979,7 @@ static MACHINE_DRIVER_START( mbmj_p16bit_LCD )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("8910", AY8910, 1250000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index c8f675dc883..ec39f8e786c 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -2709,7 +2709,7 @@ INPUT_PORTS_END
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -2781,7 +2781,7 @@ static MACHINE_DRIVER_START( omotesnd )
 
 	/* sound hardware */
 	MDRV_SOUND_REPLACE("3812", AY8910, 1250000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
 MACHINE_DRIVER_END
 
@@ -2975,7 +2975,7 @@ static MACHINE_DRIVER_START( mjfocusm )
 
 	/* sound hardware */
 	MDRV_SOUND_REPLACE("3812", AY8910, 1250000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
 MACHINE_DRIVER_END
 
@@ -2998,7 +2998,7 @@ static MACHINE_DRIVER_START( taiwanmb )
 
 	/* sound hardware */
 	MDRV_SOUND_REPLACE("3812", AY8910, 1250000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index e36aba18138..b4d4de701e4 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -1577,7 +1577,7 @@ static INPUT_PORTS_START( av2mj2rg )
 INPUT_PORTS_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1671,7 +1671,7 @@ static MACHINE_DRIVER_START( nbmjdrv3 )
 
 	/* sound hardware */
 	MDRV_SOUND_REPLACE("3812", AY8910, 1250000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index 613acf634d7..daea654299d 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -2086,7 +2086,7 @@ GFXDECODE_END
 
 /******************************************************************************/
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -2096,7 +2096,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index cdd15b25d72..249d7b44c3d 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -913,7 +913,7 @@ static const struct YM2203interface ym2203_interface =
 };
 
 
-static const struct Samplesinterface samples_interface =
+static const samples_interface ninjakd2_samples_interface =
 {
 	1,	/* 1 channel */
 	NULL,
@@ -972,7 +972,7 @@ static MACHINE_DRIVER_START( ninjakd2 )
 	MDRV_SOUND_ROUTE(3, "mono", 0.50)
 
 	MDRV_SOUND_ADD("PCM", SAMPLES, 0)
-	MDRV_SOUND_CONFIG(samples_interface)
+	MDRV_SOUND_CONFIG(ninjakd2_samples_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index e59a648bdc9..a00669daa02 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -598,7 +598,7 @@ static int subwoofer_sh_start(const sound_config *msound)
 	return 0;
 }
 
-static const struct CustomSound_interface subwoofer_interface =
+static const custom_sound_interface subwoofer_interface =
 {
 	subwoofer_sh_start,
 	0, /* none */
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index b4c3693e1ed..7ca8e22eb57 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -651,7 +651,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct AY8910interface nova2001_ay8910_interface_1 =
+static const AY8910_interface nova2001_ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -661,7 +661,7 @@ static const struct AY8910interface nova2001_ay8910_interface_1 =
 	nova2001_scroll_y_w
 };
 
-static const struct AY8910interface nova2001_ay8910_interface_2 =
+static const AY8910_interface nova2001_ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -671,7 +671,7 @@ static const struct AY8910interface nova2001_ay8910_interface_2 =
 	NULL
 };
 
-static const struct AY8910interface pkunwar_ay8910_interface_1 =
+static const AY8910_interface pkunwar_ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -681,7 +681,7 @@ static const struct AY8910interface pkunwar_ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface pkunwar_ay8910_interface_2 =
+static const AY8910_interface pkunwar_ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c
index 7c77f5ca970..a8ed9741452 100644
--- a/src/mame/drivers/nss.c
+++ b/src/mame/drivers/nss.c
@@ -407,7 +407,7 @@ static INPUT_PORTS_START( snes )
 	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
 INPUT_PORTS_END
 
-static const struct CustomSound_interface snes_sound_interface =
+static const custom_sound_interface snes_sound_interface =
 { snes_sh_start };
 
 static MACHINE_DRIVER_START( snes )
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index 66beeafb89f..52c94c93b8c 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -263,7 +263,7 @@ static WRITE8_HANDLER(unk_w)
 
 }
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -807,11 +807,11 @@ static MACHINE_DRIVER_START( nycaptor )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, 8000000/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
 
 	MDRV_SOUND_ADD("ay2", AY8910, 8000000/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
 
 	MDRV_SOUND_ADD("msm", MSM5232, 2000000)
@@ -867,11 +867,11 @@ static MACHINE_DRIVER_START( cyclshtg )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, 8000000/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
 
 	MDRV_SOUND_ADD("ay2", AY8910, 8000000/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
 
 	MDRV_SOUND_ADD("msm", MSM5232, 2000000)
@@ -925,11 +925,11 @@ static MACHINE_DRIVER_START( bronx )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, 8000000/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
 
 	MDRV_SOUND_ADD("ay2", AY8910, 8000000/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
 
 	MDRV_SOUND_ADD("msm", MSM5232, 2000000)
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index d660015933a..6b489df68f0 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -459,7 +459,7 @@ static WRITE8_HANDLER( nyny_ay8910_37_port_b_w )
 }
 
 
-static const struct AY8910interface ay8910_37_interface =
+static const AY8910_interface ay8910_37_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -470,7 +470,7 @@ static const struct AY8910interface ay8910_37_interface =
 };
 
 
-static const struct AY8910interface ay8910_64_interface =
+static const AY8910_interface ay8910_64_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index c34b1a37946..21d254ff463 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -841,7 +841,7 @@ static GFXDECODE_START( ojankohs )
 GFXDECODE_END
 
 
-static const struct AY8910interface ojankohs_ay8910_interface =
+static const AY8910_interface ojankohs_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -849,7 +849,7 @@ static const struct AY8910interface ojankohs_ay8910_interface =
 	ojankohs_ay8910_1_r	/* read port #1 */
 };
 
-static const struct AY8910interface ojankoy_ay8910_interface =
+static const AY8910_interface ojankoy_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -857,7 +857,7 @@ static const struct AY8910interface ojankoy_ay8910_interface =
 	ojankoy_ay8910_1_r,		/* read port #1 */
 };
 
-static const struct AY8910interface ojankoc_ay8910_interface =
+static const AY8910_interface ojankoc_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index 24ccbf2d836..e86ae007881 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -3321,7 +3321,7 @@ static MACHINE_DRIVER_START( crush4 )
 	MDRV_GFXDECODE(crush4)
 MACHINE_DRIVER_END
 
-static const struct AY8910interface crushs_ay8910_interface =
+static const AY8910_interface crushs_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index 47e4f9087a7..320d2e1dd14 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -367,7 +367,7 @@ static READ8_HANDLER( pandoras_portB_r )
 	return (activecpu_gettotalcycles() / 512) & 0x0f;
 }
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -418,7 +418,7 @@ static MACHINE_DRIVER_START( pandoras )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 14318000/8)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index 33ee8ef321d..cfdc7fb6bd1 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -181,7 +181,7 @@ static INPUT_PORTS_START( pastelg )
 INPUT_PORTS_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -222,7 +222,7 @@ static MACHINE_DRIVER_START( pastelg )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 1250000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.35)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index 91d0d76b523..0cdd4474a6c 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -397,7 +397,7 @@ static const struct TMS36XXinterface phoenix_tms36xx_interface =
     0.21       /* tune speed (time between beats) */
 };
 
-static const struct CustomSound_interface phoenix_custom_interface =
+static const custom_sound_interface phoenix_custom_interface =
 {
 	phoenix_sh_start
 };
@@ -414,12 +414,12 @@ static const struct TMS36XXinterface pleiads_tms36xx_interface =
 	{0.33,0.33,0,0.33,0,0.33}
 };
 
-static const struct CustomSound_interface pleiads_custom_interface =
+static const custom_sound_interface pleiads_custom_interface =
 {
 	pleiads_sh_start
 };
 
-static const struct AY8910interface survival_ay8910_interface =
+static const AY8910_interface survival_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index 5b89a22ae8b..6160ef4d9f8 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -242,7 +242,7 @@ static const gfx_layout charlayout =
 	8*8*2
 };
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -293,11 +293,11 @@ static MACHINE_DRIVER_START( pitnrun )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, XTAL_18_432MHz/12)		 /* verified on pcb */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MDRV_SOUND_ADD("ay2", AY8910, XTAL_18_432MHz/12)		 /* verified on pcb */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index 79f16b283c6..d4d6874f2bb 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -823,7 +823,7 @@ static const struct namco_52xx_interface namco_52xx_interface =
 	.5				/* Combined gain of both filters */
 };
 
-static const struct CustomSound_interface custom_interface =
+static const custom_sound_interface custom_interface =
 {
 	polepos_sh_start,
 	NULL,
diff --git a/src/mame/drivers/polyplay.c b/src/mame/drivers/polyplay.c
index 8f9b2a92477..fb9734fab4c 100644
--- a/src/mame/drivers/polyplay.c
+++ b/src/mame/drivers/polyplay.c
@@ -113,7 +113,7 @@ static WRITE8_HANDLER( polyplay_sound_channel );
 
 
 /* Polyplay Sound Interface */
-static const struct Samplesinterface polyplay_samples_interface =
+static const samples_interface polyplay_samples_interface =
 {
 	2,
 	NULL,
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index 5ce3f5773e4..86b024e20d7 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -469,7 +469,7 @@ static READ8_HANDLER( popeye_portA_r )
 	return res;
 }
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -507,7 +507,7 @@ static MACHINE_DRIVER_START( skyskipr )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 8000000/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index ed1051f3c1b..df629881b84 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -190,7 +190,7 @@ static WRITE8_HANDLER( AY8910_port_w )
 }
 
 
-static const struct AY8910interface ay8910_1_interface =
+static const AY8910_interface ay8910_1_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -201,7 +201,7 @@ static const struct AY8910interface ay8910_1_interface =
 };
 
 
-static const struct AY8910interface ay8910_2_interface =
+static const AY8910_interface ay8910_2_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/rallyx.c b/src/mame/drivers/rallyx.c
index dfc8cb4b6ce..557f56680cb 100644
--- a/src/mame/drivers/rallyx.c
+++ b/src/mame/drivers/rallyx.c
@@ -829,7 +829,7 @@ static const char *const rallyx_sample_names[] =
 	0	/* end of array */
 };
 
-static const struct Samplesinterface samples_interface =
+static const samples_interface rallyx_samples_interface =
 {
 	1,	/* 1 channel */
 	rallyx_sample_names
@@ -870,7 +870,7 @@ static MACHINE_DRIVER_START( rallyx )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("samples", SAMPLES, 0)
-	MDRV_SOUND_CONFIG(samples_interface)
+	MDRV_SOUND_CONFIG(rallyx_samples_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/rcasino.c b/src/mame/drivers/rcasino.c
index a4a532e8032..3bd535c79f2 100644
--- a/src/mame/drivers/rcasino.c
+++ b/src/mame/drivers/rcasino.c
@@ -283,7 +283,7 @@ static GFXDECODE_START( rcasino )
 	GFXDECODE_ENTRY( "gfx2", 0x0000, charlayout2, 0, 16 )
 GFXDECODE_END
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -320,7 +320,7 @@ static MACHINE_DRIVER_START( rcasino )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 18432000/12)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index 30a668cdc38..71ecdddf886 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -165,7 +165,7 @@ static void renegade_adpcm_callback(void *param, stream_sample_t **inputs, strea
 	}
 }
 
-static void *renegade_adpcm_start(int clock, const struct CustomSound_interface *config)
+static void *renegade_adpcm_start(int clock, const custom_sound_interface *config)
 {
 	struct renegade_adpcm_state *state = &renegade_adpcm;
 	state->playing = 0;
@@ -775,7 +775,7 @@ static const struct YM3526interface ym3526_interface =
 	irqhandler
 };
 
-static const struct CustomSound_interface adpcm_interface =
+static const custom_sound_interface adpcm_interface =
 {
 	renegade_adpcm_start
 };
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index cad65feffa1..819a1039ca2 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -430,7 +430,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -473,7 +473,7 @@ static MACHINE_DRIVER_START( rmhaihai )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 20000000/16)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 
 	MDRV_SOUND_ADD("msm", MSM5205, 500000)
diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c
index 3ca25c5fdc3..8f5a6e3a344 100644
--- a/src/mame/drivers/route16.c
+++ b/src/mame/drivers/route16.c
@@ -567,7 +567,7 @@ INPUT_PORTS_END
 
 
 
-static const struct AY8910interface stratvox_ay8910_interface =
+static const AY8910_interface stratvox_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -578,7 +578,7 @@ static const struct AY8910interface stratvox_ay8910_interface =
 };
 
 
-static const struct SN76477interface sn76477_interface =
+static const SN76477_interface sn76477_intf =
 {
 	RES_K(47),		/*  4  noise_res                    */
 	RES_K(150),		/*  5  filter_res                   */
@@ -662,7 +662,7 @@ static MACHINE_DRIVER_START( stratvox )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MDRV_SOUND_ADD("sn", SN76477, 0)
-	MDRV_SOUND_CONFIG(sn76477_interface)
+	MDRV_SOUND_CONFIG(sn76477_intf)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index cb04c96d707..d8de5ce4b14 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -2205,7 +2205,7 @@ static INPUT_PORTS_START( mjdejavu )
 INPUT_PORTS_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -2239,7 +2239,7 @@ static MACHINE_DRIVER_START( royalmah )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 18432000/12)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index 65c6ad02798..dfa15419c46 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -69,7 +69,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface hustler_ay8910_interface =
+static const AY8910_interface hustler_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1100,7 +1100,7 @@ MM_COMMON2
 INPUT_PORTS_END
 
 
-static const struct AY8910interface scobra_ay8910_interface_2 =
+static const AY8910_interface scobra_ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index 766b92f4972..996e9141261 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -1715,7 +1715,7 @@ static GFXDECODE_START( ad2083 )
 	GFXDECODE_ENTRY( "gfx1", 0x0000, ad2083_spritelayout,  0, 8 )
 GFXDECODE_END
 
-static const struct AY8910interface scramble_ay8910_interface_2 =
+static const AY8910_interface scramble_ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1725,7 +1725,7 @@ static const struct AY8910interface scramble_ay8910_interface_2 =
 	NULL
 };
 
-static const struct AY8910interface sfx_ay8910_interface_1 =
+static const AY8910_interface sfx_ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1735,7 +1735,7 @@ static const struct AY8910interface sfx_ay8910_interface_1 =
 	sfx_sh_irqtrigger_w
 };
 
-static const struct AY8910interface explorer_ay8910_interface_1 =
+static const AY8910_interface explorer_ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1745,7 +1745,7 @@ static const struct AY8910interface explorer_ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface explorer_ay8910_interface_2 =
+static const AY8910_interface explorer_ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1755,7 +1755,7 @@ static const struct AY8910interface explorer_ay8910_interface_2 =
 	NULL
 };
 
-static const struct AY8910interface hotshock_ay8910_interface_2 =
+static const AY8910_interface hotshock_ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1765,7 +1765,7 @@ static const struct AY8910interface hotshock_ay8910_interface_2 =
 	NULL
 };
 
-static const struct AY8910interface scorpion_ay8910_interface_1 =
+static const AY8910_interface scorpion_ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1775,7 +1775,7 @@ static const struct AY8910interface scorpion_ay8910_interface_1 =
 	scorpion_sound_cmd_w,
 };
 
-static const struct AY8910interface triplep_ay8910_interface =
+static const AY8910_interface triplep_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index aaa5a7d2992..43ffdb5aeed 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -840,7 +840,7 @@ static const char *const elim_sample_names[] =
 	0	/* end of array */
 };
 
-static const struct Samplesinterface elim2_samples_interface =
+static const samples_interface elim2_samples_interface =
 {
 	8,	/* 8 channels */
 	elim_sample_names
@@ -872,7 +872,7 @@ static const char *const spacfury_sample_names[] =
 };
 
 
-static const struct Samplesinterface spacfury_samples_interface =
+static const samples_interface spacfury_samples_interface =
 {
 	8,	/* 8 channels */
 	spacfury_sample_names
@@ -903,7 +903,7 @@ static const char *const zektor_sample_names[] =
 };
 
 
-static const struct Samplesinterface zektor_samples_interface =
+static const samples_interface zektor_samples_interface =
 {
 	8,
 	zektor_sample_names
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index 9959fd14248..d440930a721 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -388,7 +388,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -434,7 +434,7 @@ static MACHINE_DRIVER_START( nvram )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 1536000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("dac", DAC, 0)
diff --git a/src/mame/drivers/senjyo.c b/src/mame/drivers/senjyo.c
index a6b47467071..200d7ee7ea5 100644
--- a/src/mame/drivers/senjyo.c
+++ b/src/mame/drivers/senjyo.c
@@ -635,7 +635,7 @@ static const struct z80_irq_daisy_chain daisy_chain[] =
 
 
 
-static const struct Samplesinterface senjyo_samples_interface =
+static const samples_interface senjyo_samples_interface =
 {
 	1,
 	NULL,
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index aeea1ff35f1..ba5470efc66 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -476,7 +476,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -524,7 +524,7 @@ static MACHINE_DRIVER_START( shangha3 )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 
 	MDRV_SOUND_ADD("oki", OKIM6295, 1056000)
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index f85dfbe844e..98cacf42026 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -409,7 +409,7 @@ static INPUT_PORTS_START( skylncr )
 
 INPUT_PORTS_END
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -451,7 +451,7 @@ static MACHINE_DRIVER_START( skylncr )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 	MDRV_SOUND_ADD("ay", AY8910, 12000000/8)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index 3b76f373b72..c392849f9f2 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -896,7 +896,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -906,7 +906,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index f700e18070f..28fb49eb568 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -1024,7 +1024,7 @@ INPUT_PORTS_END
 
 ***************************************************************************/
 
-static const struct AY8910interface srmp2_ay8910_interface =
+static const AY8910_interface srmp2_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index 7aa06c88715..e32222f1293 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -150,7 +150,7 @@ static GFXDECODE_START( ssrj )
 	GFXDECODE_ENTRY( "gfx1", 0, charlayout,     0, 8*4 )
 GFXDECODE_END
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -190,7 +190,7 @@ static MACHINE_DRIVER_START( ssrj )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 8000000/5)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/starcrus.c b/src/mame/drivers/starcrus.c
index 00eaa784152..83474bd0d0c 100644
--- a/src/mame/drivers/starcrus.c
+++ b/src/mame/drivers/starcrus.c
@@ -160,7 +160,7 @@ static const char *const starcrus_sample_names[] =
     0
 };
 
-static const struct Samplesinterface samples_interface =
+static const samples_interface starcrus_samples_interface =
 {
     4,	/* 4 channels */
 	starcrus_sample_names
@@ -194,7 +194,7 @@ static MACHINE_DRIVER_START( starcrus )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("samples", SAMPLES, 0)
-	MDRV_SOUND_CONFIG(samples_interface)
+	MDRV_SOUND_CONFIG(starcrus_samples_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 3322a9695f5..c9157558ea3 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -1025,7 +1025,7 @@ static WRITE8_HANDLER( bestbest_ay8910_port_a_w )
 	// ?
 }
 
-static const struct AY8910interface bestbest_ay8910_interface =
+static const AY8910_interface bestbest_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index 928a6dcafae..53fafb6e9a1 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -1532,7 +1532,7 @@ static void soundirq(running_machine *machine, int state)
 
 /* 1 x 24 MHz crystal */
 
-static const struct AY8910interface hardhead_ay8910_interface =
+static const AY8910_interface hardhead_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1542,7 +1542,7 @@ static const struct AY8910interface hardhead_ay8910_interface =
 	suna8_samples_number_w
 };
 
-static const struct Samplesinterface suna8_samples_interface =
+static const samples_interface suna8_samples_interface =
 {
 	1,
 	NULL,
@@ -1753,7 +1753,7 @@ MACHINE_DRIVER_END
                                 Star Fighter
 ***************************************************************************/
 
-static const struct AY8910interface starfigh_ay8910_interface =
+static const AY8910_interface starfigh_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index 9adf2208e56..8f2d482bc92 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -896,14 +896,14 @@ GFXDECODE_END
 
 
 
-static const struct Samplesinterface pbillian_samples_interface =
+static const samples_interface pbillian_samples_interface =
 {
 	1,
 	NULL,
 	pbillian_sh_start
 };
 
-static const struct AY8910interface pbillian_ay8910_interface =
+static const AY8910_interface pbillian_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -913,7 +913,7 @@ static const struct AY8910interface pbillian_ay8910_interface =
 	NULL
 };
 
-static const struct AY8910interface hotsmash_ay8910_interface =
+static const AY8910_interface hotsmash_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -923,7 +923,7 @@ static const struct AY8910interface hotsmash_ay8910_interface =
 	NULL
 };
 
-static const struct AY8910interface sqix_ay8910_interface_1 =
+static const AY8910_interface sqix_ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -933,7 +933,7 @@ static const struct AY8910interface sqix_ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface sqix_ay8910_interface_2 =
+static const AY8910_interface sqix_ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -943,7 +943,7 @@ static const struct AY8910interface sqix_ay8910_interface_2 =
 	sqix_z80_mcu_w		/* port Bwrite */
 };
 
-static const struct AY8910interface bootleg_ay8910_interface_1 =
+static const AY8910_interface bootleg_ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -953,7 +953,7 @@ static const struct AY8910interface bootleg_ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface bootleg_ay8910_interface_2 =
+static const AY8910_interface bootleg_ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index 01a5018755d..908d766ec15 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -335,7 +335,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -387,7 +387,7 @@ static MACHINE_DRIVER_START( suprridr )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ay2", AY8910, XTAL_49_152MHz/32)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index ced43c22518..77722028855 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -3078,7 +3078,7 @@ static int subwoofer_sh_start(const sound_config *msound)
 	return 0;
 }
 
-static const struct CustomSound_interface subwoofer_interface =
+static const custom_sound_interface subwoofer_interface =
 {
 	subwoofer_sh_start,
 	0, /* none */
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index 460aa8cadab..3e91a14f55b 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -1775,7 +1775,7 @@ static WRITE8_HANDLER( dac_vol_w )
 }
 
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1785,7 +1785,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	NULL
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1795,7 +1795,7 @@ static const struct AY8910interface ay8910_interface_2 =
 	dac_vol_w	/* port Bwrite */
 };
 
-static const struct AY8910interface ay8910_interface_3 =
+static const AY8910_interface ay8910_interface_3 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -1805,7 +1805,7 @@ static const struct AY8910interface ay8910_interface_3 =
 	NULL
 };
 
-static const struct AY8910interface ay8910_interface_4 =
+static const AY8910_interface ay8910_interface_4 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/tankbatt.c b/src/mame/drivers/tankbatt.c
index d1224d9c904..42e0e766734 100644
--- a/src/mame/drivers/tankbatt.c
+++ b/src/mame/drivers/tankbatt.c
@@ -264,7 +264,7 @@ static const char *const tankbatt_sample_names[] =
     0	/* end of array */
 };
 
-static const struct Samplesinterface samples_interface =
+static const samples_interface tankbatt_samples_interface =
 {
 	3,	/* 3 channels */
 	tankbatt_sample_names
@@ -298,7 +298,7 @@ static MACHINE_DRIVER_START( tankbatt )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("samples", SAMPLES, 0)
-	MDRV_SOUND_CONFIG(samples_interface)
+	MDRV_SOUND_CONFIG(tankbatt_samples_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index d30eea2d822..da922107a3a 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -323,7 +323,7 @@ static GFXDECODE_START( tankbust )
 	GFXDECODE_ENTRY( "gfx3", 0, charlayout2,		0x60, 16  )	/* txt tilemap characters*/
 GFXDECODE_END
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -369,7 +369,7 @@ static MACHINE_DRIVER_START( tankbust )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, 2000000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.10)
 
 	MDRV_SOUND_ADD("ay2", AY8910, 2000000)
diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c
index 39e15fa5e9c..94f77edd876 100644
--- a/src/mame/drivers/taxidrvr.c
+++ b/src/mame/drivers/taxidrvr.c
@@ -335,7 +335,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -345,7 +345,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	p8910_0b_w
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index 356b0719cab..0ed8d82bdad 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -635,7 +635,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -645,7 +645,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	tehkanwc_portB_w
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index 36ee19bf68b..7610e753c60 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -636,7 +636,7 @@ static GFXDECODE_START( suprmous )
 GFXDECODE_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -675,7 +675,7 @@ static MACHINE_DRIVER_START( thepit )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, PIXEL_CLOCK/4)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ay2", AY8910, PIXEL_CLOCK/4)
diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c
index 769a1f949b6..ffec5aebc4a 100644
--- a/src/mame/drivers/thief.c
+++ b/src/mame/drivers/thief.c
@@ -418,7 +418,7 @@ static const char *const sharkatt_sample_names[] =
 	0	/* end of array */
 };
 
-static const struct Samplesinterface sharkatt_samples_interface =
+static const samples_interface sharkatt_samples_interface =
 {
 	2,	/* number of channels */
 	sharkatt_sample_names
@@ -434,7 +434,7 @@ static const char *const thief_sample_names[] =
 	0	/* end of array */
 };
 
-static const struct Samplesinterface thief_samples_interface =
+static const samples_interface thief_samples_interface =
 {
 	2,	/* number of channels */
 	thief_sample_names
@@ -450,7 +450,7 @@ static const char *const natodef_sample_names[] =
 	0	/* end of array */
 };
 
-static const struct Samplesinterface natodef_samples_interface =
+static const samples_interface natodef_samples_interface =
 {
 	2,	/* number of channels */
 	natodef_sample_names
diff --git a/src/mame/drivers/tiamc1.c b/src/mame/drivers/tiamc1.c
index 06ad8b9920e..5d16971b675 100644
--- a/src/mame/drivers/tiamc1.c
+++ b/src/mame/drivers/tiamc1.c
@@ -136,7 +136,7 @@ extern UINT8 *tiamc1_spriteram_x, *tiamc1_spriteram_y, *tiamc1_spriteram_n,
 	*tiamc1_spriteram_a;
 
 /* routines defined in audio */
-extern void *tiamc1_sh_start(int clock, const struct CustomSound_interface *config);
+extern void *tiamc1_sh_start(int clock, const custom_sound_interface *config);
 extern WRITE8_HANDLER( tiamc1_timer0_w );
 extern WRITE8_HANDLER( tiamc1_timer1_w );
 extern WRITE8_HANDLER( tiamc1_timer1_gate_w );
@@ -267,7 +267,7 @@ static GFXDECODE_START( tiamc1 )
 	GFXDECODE_ENTRY( "gfx1", 0x0000, sprites16x16_layout, 0, 16 )
 GFXDECODE_END
 
-static const struct CustomSound_interface tiamc1_custom_interface =
+static const custom_sound_interface tiamc1_custom_interface =
 {
         tiamc1_sh_start
 };
diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c
index 3895bf1803c..14d5921f514 100644
--- a/src/mame/drivers/tickee.c
+++ b/src/mame/drivers/tickee.c
@@ -374,7 +374,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -384,7 +384,7 @@ static const struct AY8910interface ay8910_interface_1 =
  	NULL
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c
index f48b7379c20..130317ef290 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -243,7 +243,7 @@ GFXDECODE_END
 
 /***************************************************************************/
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -300,7 +300,7 @@ static MACHINE_DRIVER_START( timelimt )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 	MDRV_SOUND_ADD("ay2", AY8910, 18432000/12)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index b7b99ed71d3..932805cf7f8 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -2321,7 +2321,7 @@ static const struct K007232_interface k007232_interface =
 	volume_callback	/* external port callback */
 };
 
-static const struct Samplesinterface samples_interface =
+static const samples_interface tmnt_samples_interface =
 {
 	1,	/* 1 channel for the title music */
 	NULL,
@@ -2450,7 +2450,7 @@ static MACHINE_DRIVER_START( tmnt )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60)
 
 	MDRV_SOUND_ADD("samples", SAMPLES, 0)
-	MDRV_SOUND_CONFIG(samples_interface)
+	MDRV_SOUND_CONFIG(tmnt_samples_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index 091ef91d1c8..b4a76748e1a 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -1370,7 +1370,7 @@ static const struct YM2203interface kabukiz_ym2203_interface =
 	irqhandler
 };
 
-static const struct Samplesinterface samples_interface =
+static const samples_interface tnzs_samples_interface =
 {
 	1,
 	NULL,
@@ -1579,7 +1579,7 @@ static MACHINE_DRIVER_START( kageki )
 	MDRV_SOUND_ROUTE(3, "mono", 0.35)
 
 	MDRV_SOUND_ADD("samples", SAMPLES, 0)
-	MDRV_SOUND_CONFIG(samples_interface)
+	MDRV_SOUND_CONFIG(tnzs_samples_interface)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c
index f157af438d7..9a1929e82bf 100644
--- a/src/mame/drivers/toratora.c
+++ b/src/mame/drivers/toratora.c
@@ -169,7 +169,7 @@ static WRITE8_HANDLER( clear_timer_w )
  *
  *************************************/
 
-static const struct SN76477interface sn76477_interface =
+static const SN76477_interface sn76477_intf =
 {
 	RES_K(47),	/*  4 noise_res                */
 //  RES_K(120), /*  5 filter_res               */
@@ -420,11 +420,11 @@ static MACHINE_DRIVER_START( toratora )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("sn1", SN76477, 0)
-	MDRV_SOUND_CONFIG(sn76477_interface)
+	MDRV_SOUND_CONFIG(sn76477_intf)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	MDRV_SOUND_ADD("sn2", SN76477, 0)
-	MDRV_SOUND_CONFIG(sn76477_interface)
+	MDRV_SOUND_CONFIG(sn76477_intf)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index 9933830464a..81c5b0b3cd0 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -855,7 +855,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct AY8910interface ay8910_interface_1 =
+static const AY8910_interface ay8910_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -865,7 +865,7 @@ static const struct AY8910interface ay8910_interface_1 =
 	ay8910_portB_0_w  /* write port B */
 };
 
-static const struct AY8910interface ay8910_interface_2 =
+static const AY8910_interface ay8910_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -875,7 +875,7 @@ static const struct AY8910interface ay8910_interface_2 =
 	ay8910_portB_1_w  /* write port B */
 };
 
-static const struct AY8910interface ay8910_interface_3 =
+static const AY8910_interface ay8910_interface_3 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 021370b9b21..d5917158381 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -157,7 +157,7 @@ static INPUT_PORTS_START(twins)
 INPUT_PORTS_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -189,7 +189,7 @@ static MACHINE_DRIVER_START( twins )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 2000000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
@@ -277,7 +277,7 @@ static MACHINE_DRIVER_START( twinsa )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, XTAL_16MHz/8) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index a9a4de9b3b1..a68f1a1ab69 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -617,7 +617,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct AY8910interface tx1_ay8910_interface =
+static const AY8910_interface tx1_ay8910_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -629,7 +629,7 @@ static const struct AY8910interface tx1_ay8910_interface =
 
 
 /* YM2149 IC19 */
-static const struct AY8910interface buggyboy_ym2149_interface_1 =
+static const AY8910_interface buggyboy_ym2149_interface_1 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -640,7 +640,7 @@ static const struct AY8910interface buggyboy_ym2149_interface_1 =
 };
 
 /* YM2149 IC24 */
-static const struct AY8910interface buggyboy_ym2149_interface_2 =
+static const AY8910_interface buggyboy_ym2149_interface_2 =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -666,7 +666,7 @@ static const ppi8255_interface tx1_ppi8255_intf =
 	tx1_coin_cnt
 };
 
-static const struct CustomSound_interface tx1_custom_interface =
+static const custom_sound_interface tx1_custom_interface =
 {
 	tx1_sh_start,
 	NULL,
@@ -684,7 +684,7 @@ static const ppi8255_interface buggyboy_ppi8255_intf =
 	NULL
 };
 
-static const struct CustomSound_interface bb_custom_interface =
+static const custom_sound_interface bb_custom_interface =
 {
 	buggyboy_sh_start,
 	NULL,
diff --git a/src/mame/drivers/upscope.c b/src/mame/drivers/upscope.c
index 5280897d5fe..8e9dac951c2 100644
--- a/src/mame/drivers/upscope.c
+++ b/src/mame/drivers/upscope.c
@@ -273,7 +273,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct CustomSound_interface amiga_custom_interface =
+static const custom_sound_interface amiga_custom_interface =
 {
 	amiga_sh_start
 };
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index 3d9efb9faea..dd415cac108 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -292,7 +292,7 @@ GFXDECODE_END
 
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -340,7 +340,7 @@ static MACHINE_DRIVER_START( vastar )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 1500000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index b730c73d1a6..b6816cdd37c 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -218,7 +218,7 @@ GFXDECODE_END
 
 /* Sound Interface */
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -290,7 +290,7 @@ static MACHINE_DRIVER_START( vroulet )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay", AY8910, 2000000)
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
 
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/warpwarp.c b/src/mame/drivers/warpwarp.c
index 3041004be83..3f764d54869 100644
--- a/src/mame/drivers/warpwarp.c
+++ b/src/mame/drivers/warpwarp.c
@@ -700,12 +700,12 @@ static GFXDECODE_START( color )
 GFXDECODE_END
 
 
-static const struct CustomSound_interface geebee_custom_interface =
+static const custom_sound_interface geebee_custom_interface =
 {
 	geebee_sh_start
 };
 
-static const struct CustomSound_interface warpwarp_custom_interface =
+static const custom_sound_interface warpwarp_custom_interface =
 {
 	warpwarp_sh_start
 };
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index db8fb54b803..6e3851ffc07 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -427,7 +427,7 @@ static int subwoofer_sh_start(const sound_config *msound)
 	return 0;
 }
 
-static const struct CustomSound_interface subwoofer_interface =
+static const custom_sound_interface subwoofer_interface =
 {
 	subwoofer_sh_start,
 	0, /* none */
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index 561867f6ba2..bcad3dc29f3 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -298,7 +298,7 @@ static READ8_HANDLER( sound_r )
 	return sound_flag;
 }
 
-static const struct AY8910interface ay8912_interface =
+static const AY8910_interface ay8912_interface =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
diff --git a/src/mame/drivers/wiping.c b/src/mame/drivers/wiping.c
index ebc86385fb5..02954cb4c09 100644
--- a/src/mame/drivers/wiping.c
+++ b/src/mame/drivers/wiping.c
@@ -43,7 +43,7 @@ PALETTE_INIT( wiping );
 VIDEO_UPDATE( wiping );
 
 extern UINT8 *wiping_soundregs;
-void *wiping_sh_start(int clock, const struct CustomSound_interface *config);
+void *wiping_sh_start(int clock, const custom_sound_interface *config);
 WRITE8_HANDLER( wiping_sound_w );
 
 
@@ -287,7 +287,7 @@ GFXDECODE_END
 
 
 
-static const struct CustomSound_interface custom_interface =
+static const custom_sound_interface custom_interface =
 {
 	wiping_sh_start
 };
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index 94949bda41d..0bf8e3aa69c 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -542,7 +542,7 @@ static GFXDECODE_START( zaccaria )
 GFXDECODE_END
 
 
-static const struct AY8910interface ay8910_interface =
+static const AY8910_interface ay8910_config =
 {
 	AY8910_LEGACY_OUTPUT,
 	AY8910_DEFAULT_LOADS,
@@ -598,7 +598,7 @@ static MACHINE_DRIVER_START( zaccaria )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ay1", AY8910, XTAL_3_579545MHz/2) /* verified on pcb */
-	MDRV_SOUND_CONFIG(ay8910_interface)
+	MDRV_SOUND_CONFIG(ay8910_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15)
 
 	MDRV_SOUND_ADD("ay2", AY8910, XTAL_3_579545MHz/2) /* verified on pcb */
diff --git a/src/mame/includes/8080bw.h b/src/mame/includes/8080bw.h
index 52fdd587924..56507e8d47d 100644
--- a/src/mame/includes/8080bw.h
+++ b/src/mame/includes/8080bw.h
@@ -5,6 +5,10 @@
 *************************************************************************/
 
 #include "sound/discrete.h"
+#include "sound/custom.h"
+#include "sound/sn76477.h"
+#include "sound/samples.h"
+
 
 
 #define CABINET_PORT_TAG	"CAB"
@@ -24,7 +28,7 @@ WRITE8_HANDLER( spcewars_sh_port_w );
 
 WRITE8_HANDLER( lrescue_sh_port_1_w );
 WRITE8_HANDLER( lrescue_sh_port_2_w );
-extern const struct Samplesinterface lrescue_samples_interface;
+extern const samples_interface lrescue_samples_interface;
 
 WRITE8_HANDLER( cosmo_sh_port_2_w );
 
@@ -45,7 +49,7 @@ MACHINE_RESET( schaser );
 MACHINE_START( schaser );
 WRITE8_HANDLER( schaser_sh_port_1_w );
 WRITE8_HANDLER( schaser_sh_port_2_w );
-extern const struct SN76477interface schaser_sn76477_interface;
+extern const SN76477_interface schaser_sn76477_interface;
 DISCRETE_SOUND_EXTERN( schaser );
 
 WRITE8_HANDLER( rollingc_sh_port_w );
diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h
index 02817402eb9..2154340db7c 100644
--- a/src/mame/includes/amiga.h
+++ b/src/mame/includes/amiga.h
@@ -398,7 +398,7 @@ const amiga_machine_interface *amiga_get_interface(void);
 
 /*----------- defined in audio/amiga.c -----------*/
 
-void *amiga_sh_start(int clock, const struct CustomSound_interface *config);
+void *amiga_sh_start(int clock, const custom_sound_interface *config);
 void amiga_audio_update(void);
 void amiga_audio_data_w(int which, UINT16 data);
 
diff --git a/src/mame/includes/attckufo.h b/src/mame/includes/attckufo.h
index 76ce2cf6987..4acb780a10b 100644
--- a/src/mame/includes/attckufo.h
+++ b/src/mame/includes/attckufo.h
@@ -3,7 +3,7 @@
 /*----------- defined in audio/attckufo.c -----------*/
 
 void attckufo_soundport_w (int offset, int data);
-void *attckufo_custom_start(int clock, const struct CustomSound_interface *config);
+void *attckufo_custom_start(int clock, const custom_sound_interface *config);
 
 
 /*----------- defined in video/attckufo.c -----------*/
diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h
index b56d92e4813..a6469f09b34 100644
--- a/src/mame/includes/blockade.h
+++ b/src/mame/includes/blockade.h
@@ -1,5 +1,8 @@
 #include "sound/discrete.h"
 
+#include "sound/samples.h"
+
+
 /*----------- defined in video/blockade.c -----------*/
 
 WRITE8_HANDLER( blockade_videoram_w );
@@ -9,7 +12,7 @@ VIDEO_UPDATE( blockade );
 
 /*----------- defined in audio/blockade.c -----------*/
 
-extern const struct Samplesinterface blockade_samples_interface;
+extern const samples_interface blockade_samples_interface;
 DISCRETE_SOUND_EXTERN( blockade );
 
 WRITE8_HANDLER( blockade_sound_freq_w );
diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h
index 4b9389d0b0b..a937024a574 100644
--- a/src/mame/includes/bzone.h
+++ b/src/mame/includes/bzone.h
@@ -17,7 +17,7 @@ READ8_HANDLER( bzone_IN0_r );
 
 WRITE8_HANDLER( bzone_sounds_w );
 
-void *bzone_sh_start(int clock, const struct CustomSound_interface *config);
+void *bzone_sh_start(int clock, const custom_sound_interface *config);
 
 
 /*----------- defined in audio/redbaron.c -----------*/
@@ -25,4 +25,4 @@ void *bzone_sh_start(int clock, const struct CustomSound_interface *config);
 WRITE8_HANDLER( redbaron_sounds_w );
 WRITE8_HANDLER( redbaron_pokey_w );
 
-void *redbaron_sh_start(int clock, const struct CustomSound_interface *config);
+void *redbaron_sh_start(int clock, const custom_sound_interface *config);
diff --git a/src/mame/includes/cclimber.h b/src/mame/includes/cclimber.h
index ce22908f4e7..e373766f76a 100644
--- a/src/mame/includes/cclimber.h
+++ b/src/mame/includes/cclimber.h
@@ -1,5 +1,9 @@
 /*----------- defined in machine/cclimber.c -----------*/
 
+#include "sound/samples.h"
+#include "sound/ay8910.h"
+
+
 DRIVER_INIT( cclimber );
 DRIVER_INIT( cclimbrj );
 void cclimbrj_decode(running_machine *machine);
@@ -47,8 +51,8 @@ VIDEO_UPDATE( toprollr );
 
 /*----------- defined in audio/cclimber.c -----------*/
 
-extern const struct AY8910interface cclimber_ay8910_interface;
-extern const struct Samplesinterface cclimber_samples_interface;
+extern const AY8910_interface cclimber_ay8910_interface;
+extern const samples_interface cclimber_samples_interface;
 WRITE8_HANDLER( cclimber_sample_trigger_w );
 WRITE8_HANDLER( cclimber_sample_rate_w );
 WRITE8_HANDLER( cclimber_sample_volume_w );
diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h
index e80bfb7da68..0d6bf9813cf 100644
--- a/src/mame/includes/circus.h
+++ b/src/mame/includes/circus.h
@@ -13,10 +13,10 @@ extern WRITE8_HANDLER( circus_clown_z_w );
 DISCRETE_SOUND_EXTERN( circus );
 DISCRETE_SOUND_EXTERN( robotbwl );
 DISCRETE_SOUND_EXTERN( crash );
-extern const struct Samplesinterface circus_samples_interface;
-extern const struct Samplesinterface crash_samples_interface;
-extern const struct Samplesinterface ripcord_samples_interface;
-extern const struct Samplesinterface robotbwl_samples_interface;
+extern const samples_interface circus_samples_interface;
+extern const samples_interface crash_samples_interface;
+extern const samples_interface ripcord_samples_interface;
+extern const samples_interface robotbwl_samples_interface;
 
 /*----------- defined in video/circus.c -----------*/
 
diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h
index d3857ff983a..9314b9f90a8 100644
--- a/src/mame/includes/cps3.h
+++ b/src/mame/includes/cps3.h
@@ -8,7 +8,7 @@
 
 /*----------- defined in audio/cps3.c -----------*/
 
-void *cps3_sh_start(int clock, const struct CustomSound_interface *config);
+void *cps3_sh_start(int clock, const custom_sound_interface *config);
 
 WRITE32_HANDLER( cps3_sound_w );
 READ32_HANDLER( cps3_sound_r );
diff --git a/src/mame/includes/exidy.h b/src/mame/includes/exidy.h
index 8d8efb52add..8c315f33081 100644
--- a/src/mame/includes/exidy.h
+++ b/src/mame/includes/exidy.h
@@ -24,7 +24,7 @@
 
 /*----------- defined in audio/exidy.c -----------*/
 
-void *exidy_sh6840_sh_start(int clock, const struct CustomSound_interface *config);
+void *exidy_sh6840_sh_start(int clock, const custom_sound_interface *config);
 void exidy_sh6840_sh_reset(void *token);
 
 WRITE8_HANDLER( exidy_sh6840_w );
diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h
index fbef500f8d2..91204c198b3 100644
--- a/src/mame/includes/galaxian.h
+++ b/src/mame/includes/galaxian.h
@@ -4,6 +4,9 @@
 
 ***************************************************************************/
 
+#include "sound/samples.h"
+
+
 /* we scale horizontally by 3 to render stars correctly */
 #define GALAXIAN_XSCALE			3
 
@@ -123,8 +126,8 @@ void jumpbug_extend_sprite_info(const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8 *
 
 /*----------- defined in audio/galaxian.c -----------*/
 
-extern const struct Samplesinterface galaxian_samples_interface;
-extern const struct Samplesinterface galaxian_custom_interface;
+extern const samples_interface galaxian_samples_interface;
+extern const samples_interface galaxian_custom_interface;
 
 WRITE8_HANDLER( galaxian_sound_w );
 WRITE8_HANDLER( galaxian_pitch_w );
diff --git a/src/mame/includes/gridlee.h b/src/mame/includes/gridlee.h
index 0df4f5129b4..d172333b726 100644
--- a/src/mame/includes/gridlee.h
+++ b/src/mame/includes/gridlee.h
@@ -12,7 +12,7 @@
 /*----------- defined in audio/gridlee.c -----------*/
 
 WRITE8_HANDLER( gridlee_sound_w );
-void *gridlee_sh_start(int clock, const struct CustomSound_interface *config);
+void *gridlee_sh_start(int clock, const custom_sound_interface *config);
 
 
 /*----------- defined in video/gridlee.c -----------*/
diff --git a/src/mame/includes/leland.h b/src/mame/includes/leland.h
index dd3ad5b120d..18682224fd6 100644
--- a/src/mame/includes/leland.h
+++ b/src/mame/includes/leland.h
@@ -101,10 +101,10 @@ void leland_rotate_memory(running_machine *machine, const char *cpuname);
 
 /*----------- defined in audio/leland.c -----------*/
 
-void *leland_sh_start(int clock, const struct CustomSound_interface *config);
+void *leland_sh_start(int clock, const custom_sound_interface *config);
 
-void *leland_80186_sh_start(int clock, const struct CustomSound_interface *config);
-void *redline_80186_sh_start(int clock, const struct CustomSound_interface *config);
+void *leland_80186_sh_start(int clock, const custom_sound_interface *config);
+void *redline_80186_sh_start(int clock, const custom_sound_interface *config);
 void leland_dac_update(int dacnum, UINT8 sample);
 
 void leland_80186_sound_init(void);
diff --git a/src/mame/includes/phoenix.h b/src/mame/includes/phoenix.h
index 238965fce12..60de3069d33 100644
--- a/src/mame/includes/phoenix.h
+++ b/src/mame/includes/phoenix.h
@@ -24,7 +24,7 @@ DISCRETE_SOUND_EXTERN( phoenix );
 WRITE8_HANDLER( phoenix_sound_control_a_w );
 WRITE8_HANDLER( phoenix_sound_control_b_w );
 
-void *phoenix_sh_start(int clock, const struct CustomSound_interface *config);
+void *phoenix_sh_start(int clock, const custom_sound_interface *config);
 
 /*----------- defined in audio/pleiads.c -----------*/
 
@@ -32,9 +32,9 @@ WRITE8_HANDLER( pleiads_sound_control_a_w );
 WRITE8_HANDLER( pleiads_sound_control_b_w );
 WRITE8_HANDLER( pleiads_sound_control_c_w );
 
-void *pleiads_sh_start(int clock, const struct CustomSound_interface *config);
-void *naughtyb_sh_start(int clock, const struct CustomSound_interface *config);
-void *popflame_sh_start(int clock, const struct CustomSound_interface *config);
+void *pleiads_sh_start(int clock, const custom_sound_interface *config);
+void *naughtyb_sh_start(int clock, const custom_sound_interface *config);
+void *popflame_sh_start(int clock, const custom_sound_interface *config);
 
 /*----------- defined in video/naughtyb.c -----------*/
 
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index d329c0f9467..27a3e54e4f9 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -10,7 +10,7 @@
 
 /*----------- defined in audio/polepos.c -----------*/
 
-void *polepos_sh_start(int clock, const struct CustomSound_interface *config);
+void *polepos_sh_start(int clock, const custom_sound_interface *config);
 void polepos_sh_reset(void *token);
 WRITE8_HANDLER( polepos_engine_sound_lsb_w );
 WRITE8_HANDLER( polepos_engine_sound_msb_w );
diff --git a/src/mame/includes/rockola.h b/src/mame/includes/rockola.h
index cdad8080e4a..c95632e942a 100644
--- a/src/mame/includes/rockola.h
+++ b/src/mame/includes/rockola.h
@@ -9,17 +9,17 @@
 
 /*----------- defined in sndhrdw/rokola.c -----------*/
 
-extern const struct CustomSound_interface custom_interface;
-extern const struct Samplesinterface sasuke_samples_interface;
-extern const struct Samplesinterface vanguard_samples_interface;
-extern const struct Samplesinterface fantasy_samples_interface;
-extern const struct SN76477interface sasuke_sn76477_intf_1;
-extern const struct SN76477interface sasuke_sn76477_intf_2;
-extern const struct SN76477interface sasuke_sn76477_intf_3;
-extern const struct SN76477interface satansat_sn76477_intf;
-extern const struct SN76477interface vanguard_sn76477_intf_1;
-extern const struct SN76477interface vanguard_sn76477_intf_2;
-extern const struct SN76477interface fantasy_sn76477_intf;
+extern const custom_sound_interface custom_interface;
+extern const samples_interface sasuke_samples_interface;
+extern const samples_interface vanguard_samples_interface;
+extern const samples_interface fantasy_samples_interface;
+extern const SN76477_interface sasuke_sn76477_intf_1;
+extern const SN76477_interface sasuke_sn76477_intf_2;
+extern const SN76477_interface sasuke_sn76477_intf_3;
+extern const SN76477_interface satansat_sn76477_intf;
+extern const SN76477_interface vanguard_sn76477_intf_1;
+extern const SN76477_interface vanguard_sn76477_intf_2;
+extern const SN76477_interface fantasy_sn76477_intf;
 
 extern WRITE8_HANDLER( sasuke_sound_w );
 extern WRITE8_HANDLER( satansat_sound_w );
@@ -28,7 +28,7 @@ extern WRITE8_HANDLER( vanguard_speech_w );
 extern WRITE8_HANDLER( fantasy_sound_w );
 extern WRITE8_HANDLER( fantasy_speech_w );
 
-void *rockola_sh_start(int clock, const struct CustomSound_interface *config);
+void *rockola_sh_start(int clock, const custom_sound_interface *config);
 void rockola_set_music_clock(double clock_time);
 void rockola_set_music_freq(int freq);
 int rockola_music0_playing(void);
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h
index e27c9c4c92c..cad82268f27 100644
--- a/src/mame/includes/snes.h
+++ b/src/mame/includes/snes.h
@@ -462,7 +462,7 @@ extern WRITE8_HANDLER( spc_io_w );
 extern READ8_HANDLER( spc_ram_r );
 extern WRITE8_HANDLER( spc_ram_w );
 extern READ8_HANDLER( spc_ipl_r );
-extern void *snes_sh_start(int clock, const struct CustomSound_interface *config);
+extern void *snes_sh_start(int clock, const custom_sound_interface *config);
 extern void snes_sh_update( void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length );
 
 /* Stuff from OpenSPC 0.3.99 by Brad Martin */
diff --git a/src/mame/includes/triplhnt.h b/src/mame/includes/triplhnt.h
index be30515ad1f..831dbcfb4b5 100644
--- a/src/mame/includes/triplhnt.h
+++ b/src/mame/includes/triplhnt.h
@@ -23,7 +23,7 @@ void triplhnt_set_collision(running_machine *machine, int data);
 /*----------- defined in audio/triplhnt.c -----------*/
 
 DISCRETE_SOUND_EXTERN( triplhnt );
-extern const struct Samplesinterface triplhnt_samples_interface;
+extern const samples_interface triplhnt_samples_interface;
 
 
 /*----------- defined in video/triplhnt.c -----------*/
diff --git a/src/mame/includes/tx1.h b/src/mame/includes/tx1.h
index 92099053e02..a3f3258855e 100644
--- a/src/mame/includes/tx1.h
+++ b/src/mame/includes/tx1.h
@@ -56,12 +56,12 @@ WRITE8_HANDLER( tx1_pit8253_w );
 
 WRITE8_HANDLER( bb_ym1_a_w );
 WRITE8_HANDLER( bb_ym1_b_w );
-void *buggyboy_sh_start(int clock, const struct CustomSound_interface *config);
+void *buggyboy_sh_start(int clock, const custom_sound_interface *config);
 void buggyboy_sh_reset(void *token);
 
 WRITE8_HANDLER( tx1_ay8910_a_w );
 WRITE8_HANDLER( tx1_ay8910_b_w );
-void *tx1_sh_start(int clock, const struct CustomSound_interface *config);
+void *tx1_sh_start(int clock, const custom_sound_interface *config);
 void tx1_sh_reset(void *token);
 
 
diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h
index 9eb33667f1d..2af072de501 100644
--- a/src/mame/includes/warpwarp.h
+++ b/src/mame/includes/warpwarp.h
@@ -25,7 +25,7 @@ WRITE8_HANDLER( geebee_videoram_w );
 /*----------- defined in audio/geebee.c -----------*/
 
 WRITE8_HANDLER( geebee_sound_w );
-void *geebee_sh_start(int clock, const struct CustomSound_interface *config);
+void *geebee_sh_start(int clock, const custom_sound_interface *config);
 
 
 /*----------- defined in audio/warpwarp.c -----------*/
@@ -33,4 +33,4 @@ void *geebee_sh_start(int clock, const struct CustomSound_interface *config);
 WRITE8_HANDLER( warpwarp_sound_w );
 WRITE8_HANDLER( warpwarp_music1_w );
 WRITE8_HANDLER( warpwarp_music2_w );
-void *warpwarp_sh_start(int clock, const struct CustomSound_interface *config);
+void *warpwarp_sh_start(int clock, const custom_sound_interface *config);