diff --git a/src/emu/cpu/i8051/i8051.c b/src/emu/cpu/i8051/i8051.c
index b915cbaf673..3cfe4c7e27c 100644
--- a/src/emu/cpu/i8051/i8051.c
+++ b/src/emu/cpu/i8051/i8051.c
@@ -2319,16 +2319,6 @@ void i8752_set_serial_tx_callback(void (*callback)(int data))	{ i8051_set_serial
 void i8752_set_serial_rx_callback(int (*callback)(void))	{ i8051_set_serial_rx_callback(callback); }
 void i8752_state_save(void *file)				{ i8051_state_save(file); }
 void i8752_state_load(void *file)				{ i8051_state_load(file); }
-#if 0
-const char *i8752_info(void *context, int regnum)
-{
-	switch( regnum )
-	{
-		case CPU_INFO_NAME: return "I8752";
-	}
-	return i8051_info(context,regnum);
-}
-#endif
 
 /* The following two handlers are used by the MAME Debugger Memory Window...
    By keeping these functions separate from the internally used IRAM_W/IRAM_R functions,
diff --git a/src/emu/cpu/i8051/i8051.h b/src/emu/cpu/i8051/i8051.h
index 49ddce4e42c..bc363dba5a6 100644
--- a/src/emu/cpu/i8051/i8051.h
+++ b/src/emu/cpu/i8051/i8051.h
@@ -106,7 +106,6 @@ extern void i8051_set_irq_line(int irqline, int state);
 extern void i8051_set_irq_callback(int (*callback)(int irqline));
 extern void i8051_state_save(void *file);
 extern void i8051_state_load(void *file);
-extern const char *i8051_info(void *context, int regnum);
 
 WRITE8_HANDLER( i8051_internal_w );
 READ8_HANDLER( i8051_internal_r );
@@ -135,7 +134,6 @@ extern void i8752_set_irq_line(int irqline, int state);
 extern void i8752_set_irq_callback(int (*callback)(int irqline));
 extern void i8752_state_save(void *file);
 extern void i8752_state_load(void *file);
-extern const char *i8752_info(void *context, int regnum);
 extern void i8752_set_serial_tx_callback(void (*callback)(int data));
 extern void i8752_set_serial_rx_callback(int (*callback)(void));
 WRITE8_HANDLER( i8752_internal_w );
diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c
index 9f36ae3aba8..57463104767 100644
--- a/src/emu/cpu/minx/minx.c
+++ b/src/emu/cpu/minx/minx.c
@@ -87,7 +87,7 @@ typedef struct {
 } minx_regs;
 
 static minx_regs regs;
-int minx_icount;
+static int minx_icount;
 
 #define rd(offset)	program_read_byte_8( offset )
 #define wr(offset,data)	program_write_byte_8( offset, data )
diff --git a/src/emu/machine/scsicd.c b/src/emu/machine/scsicd.c
index a3e0f6f6737..060be974fc0 100644
--- a/src/emu/machine/scsicd.c
+++ b/src/emu/machine/scsicd.c
@@ -11,6 +11,7 @@
 #ifdef MESS
 #include "devices/chd_cd.h"
 #endif
+#include "scsicd.h"
 
 typedef struct
 {
diff --git a/src/emu/machine/scsihd.c b/src/emu/machine/scsihd.c
index 2c11b5dc889..971aa2b1617 100644
--- a/src/emu/machine/scsihd.c
+++ b/src/emu/machine/scsihd.c
@@ -11,6 +11,7 @@
 #ifdef MESS
 #include "devices/harddriv.h"
 #endif
+#include "scsihd.h"
 
 typedef struct
 {
diff --git a/src/emu/mame.h b/src/emu/mame.h
index 97b34c24990..5264d7794a5 100644
--- a/src/emu/mame.h
+++ b/src/emu/mame.h
@@ -252,7 +252,7 @@ extern running_machine *Machine;
 extern const char mame_disclaimer[];
 extern char giant_string_buffer[];
 
-extern char build_version[];
+extern const char build_version[];
 
 
 
diff --git a/src/emu/sound/sid.c b/src/emu/sound/sid.c
index b6825add8a4..cb22c98c0d4 100644
--- a/src/emu/sound/sid.c
+++ b/src/emu/sound/sid.c
@@ -22,7 +22,7 @@
 static float *filterTable;
 static float *bandPassParam;
 #define lowPassParam filterTable
-float filterResTable[16];
+static float filterResTable[16];
 
 #define maxLogicalVoices 4
 
@@ -30,7 +30,7 @@ static const int mix16monoMiddleIndex = 256*maxLogicalVoices/2;
 static UINT16 mix16mono[256*maxLogicalVoices];
 
 static UINT16 zero16bit=0;  /* either signed or unsigned */
-UINT32 splitBufferLen;
+//UINT32 splitBufferLen;
 
 void MixerInit(int threeVoiceAmplify)
 {
diff --git a/src/emu/sound/sidenvel.c b/src/emu/sound/sidenvel.c
index a042f303baa..bb90d31829e 100644
--- a/src/emu/sound/sidenvel.c
+++ b/src/emu/sound/sidenvel.c
@@ -87,7 +87,7 @@ static const float decayReleaseTimes[16] =
   static UINT32 decayReleaseRatesP[16];
 #endif
 
-const UINT32 attackTabLen = 255;
+static const UINT32 attackTabLen = 255;
 static UINT32 releaseTabLen;
 static UINT32 releasePos[256];
 
diff --git a/src/emu/sound/sp0256.c b/src/emu/sound/sp0256.c
index 22762080ba2..f7d315fd306 100644
--- a/src/emu/sound/sp0256.c
+++ b/src/emu/sound/sp0256.c
@@ -1225,7 +1225,7 @@ static void sp0256_stop(void *token)
 	free( sp->scratch );
 }
 
-void sp0256_reset(void *token)
+static void sp0256_reset(void *token)
 {
 	struct sp0256 *sp = token;
 
diff --git a/src/emu/sound/wave.c b/src/emu/sound/wave.c
index 0f33ba51343..c65adc15009 100644
--- a/src/emu/sound/wave.c
+++ b/src/emu/sound/wave.c
@@ -15,6 +15,7 @@
 #include "utils.h"
 #include "devices/cassette.h"
 #endif
+#include "wave.h"
 
 #define ALWAYS_PLAY_SOUND	0
 #define WAVE_TOKEN_MASK		0xFFFF0000
diff --git a/src/emu/video/vooddefs.h b/src/emu/video/vooddefs.h
index f15017d3c14..c9b43d2bb0b 100644
--- a/src/emu/video/vooddefs.h
+++ b/src/emu/video/vooddefs.h
@@ -1817,7 +1817,7 @@ INLINE INT32 fifo_space(fifo_state *f)
 
 INLINE INT32 fast_reciplog(INT64 value, INT32 *log2)
 {
-	extern UINT32 reciplog[];
+	extern UINT32 voodoo_reciplog[];
 	UINT32 temp, recip, rlog;
 	UINT32 interp;
 	UINT32 *table;
@@ -1855,7 +1855,7 @@ INLINE INT32 fast_reciplog(INT64 value, INT32 *log2)
 	/* compute a pointer to the table entries we want */
 	/* math is a bit funny here because we shift one less than we need to in order */
 	/* to account for the fact that there are two UINT32's per table entry */
-	table = &reciplog[(temp >> (31 - RECIPLOG_LOOKUP_BITS - 1)) & ((2 << RECIPLOG_LOOKUP_BITS) - 2)];
+	table = &voodoo_reciplog[(temp >> (31 - RECIPLOG_LOOKUP_BITS - 1)) & ((2 << RECIPLOG_LOOKUP_BITS) - 2)];
 
 	/* compute the interpolation value */
 	interp = (temp >> (31 - RECIPLOG_LOOKUP_BITS - 8)) & 0xff;
diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c
index 342878ca4b7..a6b3062300e 100644
--- a/src/emu/video/voodoo.c
+++ b/src/emu/video/voodoo.c
@@ -183,7 +183,7 @@ static UINT8 dither4_lookup[256*16*2];
 static UINT8 dither2_lookup[256*16*2];
 
 /* fast reciprocal+log2 lookup */
-UINT32 reciplog[(2 << RECIPLOG_LOOKUP_BITS) + 2];
+UINT32 voodoo_reciplog[(2 << RECIPLOG_LOOKUP_BITS) + 2];
 
 
 
@@ -300,8 +300,8 @@ void voodoo_start(int which, int scrnum, int type, int fbmem_in_mb, int tmem0_in
 	for (val = 0; val <= (1 << RECIPLOG_LOOKUP_BITS); val++)
 	{
 		UINT32 value = (1 << RECIPLOG_LOOKUP_BITS) + val;
-		reciplog[val*2 + 0] = (1 << (RECIPLOG_LOOKUP_PREC + RECIPLOG_LOOKUP_BITS)) / value;
-		reciplog[val*2 + 1] = (UINT32)(LOGB2((double)value / (double)(1 << RECIPLOG_LOOKUP_BITS)) * (double)(1 << RECIPLOG_LOOKUP_PREC));
+		voodoo_reciplog[val*2 + 0] = (1 << (RECIPLOG_LOOKUP_PREC + RECIPLOG_LOOKUP_BITS)) / value;
+		voodoo_reciplog[val*2 + 1] = (UINT32)(LOGB2((double)value / (double)(1 << RECIPLOG_LOOKUP_BITS)) * (double)(1 << RECIPLOG_LOOKUP_PREC));
 	}
 
 	/* create dithering tables */
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index 8e677a8fa04..93907c233ea 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -1099,7 +1099,7 @@ ADDRESS_MAP_END
  *
  *************************************/
 
-static const char *dkongjr_sample_names[] =
+static const char *const dkongjr_sample_names[] =
 {
 	"*dkongjr",
 	"jump.wav",
@@ -1117,14 +1117,14 @@ static const char *dkongjr_sample_names[] =
 	0	/* end of array */
 };
 
-static struct Samplesinterface dkongjr_samples_interface =
+static const struct Samplesinterface dkongjr_samples_interface =
 {
 	8,	/* 8 channels */
 	dkongjr_sample_names
 };
 
 #if !RADARSC1_USE_M58817
-static const char *radarsc1_sample_names[] =
+static const char *const radarsc1_sample_names[] =
 {
 	"*radarsc1",
 	"10.wav",
@@ -1139,17 +1139,17 @@ static const char *radarsc1_sample_names[] =
 	0	/* end of array */
 };
 
-static struct Samplesinterface radarsc1_samples_interface =
+static const struct Samplesinterface radarsc1_samples_interface =
 {
 	8,	/* 8 channels */
 	radarsc1_sample_names
 };
 #endif
 
-static struct NESinterface nes_interface_1 = { REGION_CPU2 };
-static struct NESinterface nes_interface_2 = { REGION_CPU3 };
+static const struct NESinterface nes_interface_1 = { REGION_CPU2 };
+static const struct NESinterface nes_interface_2 = { REGION_CPU3 };
 
-static struct M58817interface m58817_interface =
+static const struct M58817interface m58817_interface =
 {
 #if !RADARSC1_USE_M58817
 	-1,
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index 556a5357d73..7e4258aadc9 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -687,7 +687,7 @@ static VIDEO_UPDATE(crystal)
 	tail=GetVidReg(0x80);
 	while((head&0x7ff)!=(tail&0x7ff))
 	{
-		DoFlip=ProcessPacket(0x03800000+head*64,DrawDest,(UINT8*)textureram);
+		DoFlip=vrender0_ProcessPacket(0x03800000+head*64,DrawDest,(UINT8*)textureram);
 		head++;
 		head&=0x7ff;
 		if(DoFlip)
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index e54bbfe73a5..05adf62dfa2 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -99,6 +99,8 @@ TODO:
 #include "sound/2413intf.h"
 #include "machine/msm6242.h"
 #include "profiler.h"
+#include "includes/dynax.h"
+
 
 UINT8 *ddenlovr_pixmap[8];
 static mame_bitmap *framebuffer;
diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c
index 54f52a5f773..bb351b08197 100644
--- a/src/mame/drivers/drw80pkr.c
+++ b/src/mame/drivers/drw80pkr.c
@@ -42,27 +42,27 @@ static UINT8 *pkr_cmos_ram;
 * Write Handlers *
 ******************/
 
-WRITE8_HANDLER( p1_w )
+static WRITE8_HANDLER( p1_w )
 {
 	p1 = data;
 }
 
-WRITE8_HANDLER( p2_w )
+static WRITE8_HANDLER( p2_w )
 {
 	p2 = data;
 }
 
-WRITE8_HANDLER( p4_w )
+static WRITE8_HANDLER( p4_w )
 {
 	p4 = data;
 }
 
-WRITE8_HANDLER( bus_w )
+static WRITE8_HANDLER( bus_w )
 {
 	bus = data;
 }
 
-WRITE8_HANDLER( drw80pkr_cmos_w )
+static WRITE8_HANDLER( drw80pkr_cmos_w )
 {
     //if (p2 == 0xc7) CRTC Register
     //if (p2 == 0xd7) CRTC Address
@@ -73,22 +73,22 @@ WRITE8_HANDLER( drw80pkr_cmos_w )
 * Read Handlers *
 ****************/
 
-READ8_HANDLER( p1_r )
+static READ8_HANDLER( p1_r )
 {
     return p1;
 }
 
-READ8_HANDLER( p2_r )
+static READ8_HANDLER( p2_r )
 {
     return p2;
 }
 
-READ8_HANDLER( bus_r )
+static READ8_HANDLER( bus_r )
 {
     return bus;
 }
 
-READ8_HANDLER( drw80pkr_cmos_r )
+static READ8_HANDLER( drw80pkr_cmos_r )
 {
     return pkr_cmos_ram[offset];
 }
@@ -106,19 +106,19 @@ static TILE_GET_INFO( get_bg_tile_info )
 	SET_TILE_INFO(0, code, color, 0);
 }
 
-VIDEO_START( drw80pkr )
+static VIDEO_START( drw80pkr )
 {
 	bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, TILEMAP_TYPE_PEN, 8, 8, 40, 25);
 }
 
-VIDEO_UPDATE( drw80pkr )
+static VIDEO_UPDATE( drw80pkr )
 {
 	tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0);
 
 	return 0;
 }
 
-PALETTE_INIT( drw80pkr )
+static PALETTE_INIT( drw80pkr )
 {
 /*  prom bits
     7654 3210
diff --git a/src/mame/drivers/fitfight.c b/src/mame/drivers/fitfight.c
index 541f6344cc2..63a93d9f03a 100644
--- a/src/mame/drivers/fitfight.c
+++ b/src/mame/drivers/fitfight.c
@@ -87,7 +87,12 @@ Stephh's notes :
 
 
 UINT16 *fitfight_spriteram;
-UINT16 *fof_100000, *fof_600000, *fof_700000, *fof_800000, *fof_900000, *fof_a00000;
+static UINT16 *fof_100000;
+static UINT16 *fof_600000;
+UINT16 *fof_700000;
+static UINT16 *fof_800000;
+UINT16 *fof_900000;
+UINT16 *fof_a00000;
 
 UINT16 *fof_bak_tileram;
 UINT16 *fof_mid_tileram;
diff --git a/src/mame/drivers/lethal.c b/src/mame/drivers/lethal.c
index f23d882f31e..a7a4071a2fa 100644
--- a/src/mame/drivers/lethal.c
+++ b/src/mame/drivers/lethal.c
@@ -177,7 +177,7 @@ maybe some priority issues / sprite placement issues..
 
 VIDEO_START(lethalen);
 VIDEO_UPDATE(lethalen);
-WRITE8_HANDLER(le_palette_control);
+WRITE8_HANDLER(lethalen_palette_control);
 
 static int init_eeprom_count;
 static UINT8 cur_control2;
@@ -492,7 +492,7 @@ static ADDRESS_MAP_START( le_main, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4090, 0x4090) AM_READNOP
 	AM_RANGE(0x40a0, 0x40a0) AM_READNOP
 	AM_RANGE(0x40c4, 0x40c4) AM_WRITE(control2_w)
-	AM_RANGE(0x40c8, 0x40d0) AM_WRITE(le_palette_control)	// PCU1-PCU3 on the schematics
+	AM_RANGE(0x40c8, 0x40d0) AM_WRITE(lethalen_palette_control)	// PCU1-PCU3 on the schematics
 	AM_RANGE(0x40d4, 0x40d7) AM_READ(guns_r)
 	AM_RANGE(0x40d8, 0x40d8) AM_READ(control2_r)
 	AM_RANGE(0x40d9, 0x40d9) AM_READ(input_port_0_r)
diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c
index 1576ea74039..11f31a86390 100644
--- a/src/mame/drivers/macs.c
+++ b/src/mame/drivers/macs.c
@@ -62,7 +62,7 @@ KISEKAE -- info
 
 
 
-UINT8 macs_mux_data;
+static UINT8 macs_mux_data;
 
 static MACHINE_RESET(macs);
 
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 5b75723ebd0..707ec429ab3 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -737,13 +737,11 @@ static void irq_init(void)
 	cpunum_set_irq_callback(0, irq_callback);
 }
 
-extern void tgp_tick(void);
 static INTERRUPT_GEN(model1_interrupt)
 {
 	if (cpu_getiloops())
 	{
 		irq_raise(1);
-		tgp_tick();
 	}
 	else
 	{
diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c
index a89e785b6c0..d3ea92848a2 100644
--- a/src/mame/drivers/rungun.c
+++ b/src/mame/drivers/rungun.c
@@ -46,11 +46,11 @@
 VIDEO_START( rng );
 VIDEO_UPDATE( rng );
 static MACHINE_RESET( rng );
-READ16_HANDLER( ttl_ram_r );
-WRITE16_HANDLER( ttl_ram_w );
+READ16_HANDLER( rng_ttl_ram_r );
+WRITE16_HANDLER( rng_ttl_ram_w );
 WRITE16_HANDLER( rng_936_videoram_w );
 
-UINT16 *rng_936_videoram;
+extern UINT16 *rng_936_videoram;
 
 static UINT16 *rng_sysreg;
 static int init_eeprom_count;
@@ -223,7 +223,7 @@ static ADDRESS_MAP_START( rngreadmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x601000, 0x601fff) AM_READ(MRA16_RAM)		// communication? second monitor buffer?
 	AM_RANGE(0x6c0000, 0x6cffff) AM_READ(MRA16_RAM)		// PSAC2 render RAM
 	AM_RANGE(0x700000, 0x7007ff) AM_READ(MRA16_RAM)		// PSAC2 line effect
-	AM_RANGE(0x740000, 0x741fff) AM_READ(ttl_ram_r)		// text plane RAM
+	AM_RANGE(0x740000, 0x741fff) AM_READ(rng_ttl_ram_r)		// text plane RAM
 #if RNG_DEBUG
 	AM_RANGE(0x5c0010, 0x5c001f) AM_READ(K053247_reg_word_r)
 	AM_RANGE(0x640000, 0x640007) AM_READ(K053246_reg_word_r)
@@ -247,7 +247,7 @@ static ADDRESS_MAP_START( rngwritemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x680000, 0x68001f) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_ctrl)				// '936 registers
 	AM_RANGE(0x6c0000, 0x6cffff) AM_WRITE(rng_936_videoram_w) AM_BASE(&rng_936_videoram)	// PSAC2 ('936) RAM (34v + 35v)
 	AM_RANGE(0x700000, 0x7007ff) AM_WRITE(MWA16_RAM) AM_BASE(&K053936_0_linectrl)			// "Line RAM"
-	AM_RANGE(0x740000, 0x741fff) AM_WRITE(ttl_ram_w)		// text plane RAM
+	AM_RANGE(0x740000, 0x741fff) AM_WRITE(rng_ttl_ram_w)		// text plane RAM
 	AM_RANGE(0x7c0000, 0x7c0001) AM_WRITE(MWA16_NOP)		// watchdog
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/starwars.c b/src/mame/drivers/starwars.c
index a03b6bcd5a7..0ae21542162 100644
--- a/src/mame/drivers/starwars.c
+++ b/src/mame/drivers/starwars.c
@@ -196,7 +196,7 @@ ADDRESS_MAP_END
  *
  *************************************/
 
-static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )\
+static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_WRITE(starwars_sout_w)
 	AM_RANGE(0x0800, 0x0fff) AM_READ(starwars_sin_r)		/* SIN Read */
 	AM_RANGE(0x1000, 0x107f) AM_RAM							/* 6532 ram */
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 83f31950437..3a2d7428327 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -3771,7 +3771,7 @@ by introdon in ST-V ("SG0000000"),and according to the manual it's even wrong! (
 by Sega titles,and this is a Sunsoft game)It's likely to be a left-over...
 */
 
-DRIVER_INIT( sanjeon )
+static DRIVER_INIT( sanjeon )
 {
 	UINT8 *src    = memory_region       ( REGION_USER1 );
 	int x;
diff --git a/src/mame/drivers/zac2650.c b/src/mame/drivers/zac2650.c
index 667c7178042..3b926002042 100644
--- a/src/mame/drivers/zac2650.c
+++ b/src/mame/drivers/zac2650.c
@@ -13,7 +13,7 @@
 
 #include "tinv2650.lh"
 
-extern UINT8 *s2636ram;
+extern UINT8 *zac_s2636ram;
 
 extern WRITE8_HANDLER( tinvader_videoram_w );
 extern WRITE8_HANDLER( zac_s2636_w );
@@ -45,7 +45,7 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
     AM_RANGE(0x1d00, 0x1dff) AM_WRITE(MWA8_RAM)
     AM_RANGE(0x1e80, 0x1e80) AM_WRITE(tinvader_sound_w)
 	AM_RANGE(0x1e86, 0x1e86) AM_WRITE(MWA8_NOP)				/* Dodgem Only */
-    AM_RANGE(0x1f00, 0x1fff) AM_WRITE(zac_s2636_w) AM_BASE(&s2636ram)
+	AM_RANGE(0x1f00, 0x1fff) AM_WRITE(zac_s2636_w) AM_BASE(&zac_s2636ram)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/includes/dynax.h b/src/mame/includes/dynax.h
index 55f93d9b5d2..cc5748389b2 100644
--- a/src/mame/includes/dynax.h
+++ b/src/mame/includes/dynax.h
@@ -76,32 +76,18 @@ PALETTE_INIT( sprtmtch );
 //----------- defined in drivers/ddenlovr.c -----------
 
 WRITE8_HANDLER( ddenlovr_bgcolor_w );
-WRITE8_HANDLER( ddenlovr_bgcolor2_w );
-WRITE16_HANDLER( ddenlovr16_bgcolor_w );
 
 WRITE8_HANDLER( ddenlovr_priority_w );
-WRITE8_HANDLER( ddenlovr_priority2_w );
-WRITE16_HANDLER( ddenlovr16_priority_w );
 
 WRITE8_HANDLER( ddenlovr_layer_enable_w );
-WRITE8_HANDLER( ddenlovr_layer_enable2_w );
-WRITE16_HANDLER( ddenlovr16_layer_enable_w );
 
 WRITE8_HANDLER( ddenlovr_palette_base_w );
-WRITE8_HANDLER( ddenlovr_palette_base2_w );
-WRITE16_HANDLER( ddenlovr16_palette_base_w );
 
 WRITE8_HANDLER( ddenlovr_palette_mask_w );
-WRITE8_HANDLER( ddenlovr_palette_mask2_w );
-WRITE16_HANDLER( ddenlovr16_palette_mask_w );
 
 WRITE8_HANDLER( ddenlovr_transparency_pen_w );
-WRITE8_HANDLER( ddenlovr_transparency_pen2_w );
-WRITE16_HANDLER( ddenlovr16_transparency_pen_w );
 
 WRITE8_HANDLER( ddenlovr_transparency_mask_w );
-WRITE8_HANDLER( ddenlovr_transparency_mask2_w );
-WRITE16_HANDLER( ddenlovr16_transparency_mask_w );
 
 extern UINT8 *ddenlovr_pixmap[8];
 
diff --git a/src/mame/includes/segas24.h b/src/mame/includes/segas24.h
index f719d5001fc..95f13d819eb 100644
--- a/src/mame/includes/segas24.h
+++ b/src/mame/includes/segas24.h
@@ -1,4 +1,4 @@
-/*----------- defined in machine/system24.c -----------*/
+/*----------- defined in machine/segas24.c -----------*/
 
 /* system24temp_ functions / variables are from shared rewrite files,
    once the rest of the rewrite is complete they can be removed, I
diff --git a/src/mame/includes/st0016.h b/src/mame/includes/st0016.h
index 1499bc6d203..501e30b46bc 100644
--- a/src/mame/includes/st0016.h
+++ b/src/mame/includes/st0016.h
@@ -18,11 +18,6 @@
 #define ST0016_CHAR_BANK_MASK (ST0016_MAX_CHAR_BANK-1)
 #define ST0016_PAL_BANK_MASK  (ST0016_MAX_PAL_BANK-1)
 
-/*----------- defined in drivers/macs.c -----------*/
-
-extern UINT8 macs_mux_data;
-
-
 /*----------- defined in video/st0016.c -----------*/
 
 extern UINT8 *st0016_charram,*st0016_spriteram,*st0016_paletteram;
diff --git a/src/mame/machine/cubocd32.c b/src/mame/machine/cubocd32.c
index 3380ba3591c..920b67591ea 100644
--- a/src/mame/machine/cubocd32.c
+++ b/src/mame/machine/cubocd32.c
@@ -4,6 +4,8 @@
 #include "coreutil.h"
 #include "sound/cdda.h"
 #include "machine/i2cmem.h"
+#include "includes/cubocd32.h"
+
 
 
 /*********************************************************************************
diff --git a/src/mame/machine/model1.c b/src/mame/machine/model1.c
index a07b40125b5..fefae8c9e34 100644
--- a/src/mame/machine/model1.c
+++ b/src/mame/machine/model1.c
@@ -1155,10 +1155,6 @@ static void push_and_ident(void)
 	next_fn();
 }
 
-void tgp_tick(void)
-{
-}
-
 static void catmull_rom(void)
 {
 	float a = fifoin_pop_f();
diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c
index f261a96abf7..67b1279aef0 100644
--- a/src/mame/machine/tatsumi.c
+++ b/src/mame/machine/tatsumi.c
@@ -3,7 +3,7 @@
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 
-/*static*/ UINT16 tatsumi_control_word=0;
+UINT16 tatsumi_control_word=0;
 static UINT16 tatsumi_last_control=0;
 static UINT16 tatsumi_last_irq=0;
 static UINT8 apache3_adc;
diff --git a/src/mame/video/fitfight.c b/src/mame/video/fitfight.c
index 501fc7880b8..96f53264176 100644
--- a/src/mame/video/fitfight.c
+++ b/src/mame/video/fitfight.c
@@ -3,7 +3,9 @@
 #include "driver.h"
 
 extern UINT16 *fitfight_spriteram;
-extern UINT16 *fof_100000, *fof_600000, *fof_700000, *fof_800000, *fof_900000, *fof_a00000;
+extern UINT16 *fof_700000;
+extern UINT16 *fof_900000;
+extern UINT16 *fof_a00000;
 
 extern UINT16 *fof_bak_tileram;
 static tilemap *fof_bak_tilemap;
diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c
index 8fd2037bd19..0b9dbab6872 100644
--- a/src/mame/video/konamiic.c
+++ b/src/mame/video/konamiic.c
@@ -1214,8 +1214,8 @@ void konami_rom_deinterleave_4(int mem_region)
 /*                                                                         */
 /***************************************************************************/
 
-/*static*/ UINT8 K007121_ctrlram[MAX_K007121][8];
-/*static*/ int K007121_flipscreen[MAX_K007121];
+UINT8 K007121_ctrlram[MAX_K007121][8];
+static int K007121_flipscreen[MAX_K007121];
 
 
 void K007121_ctrl_w(int chip,int offset,int data)
diff --git a/src/mame/video/lethal.c b/src/mame/video/lethal.c
index 164f79467a4..d94c2b15e39 100644
--- a/src/mame/video/lethal.c
+++ b/src/mame/video/lethal.c
@@ -89,7 +89,7 @@ VIDEO_START(lethalen)
 	layer_colorbase[3] = 0xc0;
 }
 
-WRITE8_HANDLER(le_palette_control)
+WRITE8_HANDLER(lethalen_palette_control)
 {
 	switch (offset)
 	{
diff --git a/src/mame/video/rungun.c b/src/mame/video/rungun.c
index 2fd3de7aa61..73e6b319940 100644
--- a/src/mame/video/rungun.c
+++ b/src/mame/video/rungun.c
@@ -15,7 +15,7 @@ static tilemap *ttl_tilemap, *rng_936_tilemap;
 static UINT16 ttl_vram[0x1000];
 
 static int sprite_colorbase;
-extern UINT16 *rng_936_videoram;
+UINT16 *rng_936_videoram;
 
 /* TTL text plane stuff */
 
@@ -37,12 +37,12 @@ static void rng_sprite_callback(int *code, int *color, int *priority_mask)
 	*color = sprite_colorbase | (*color & 0x001f);
 }
 
-READ16_HANDLER( ttl_ram_r )
+READ16_HANDLER( rng_ttl_ram_r )
 {
 	return(ttl_vram[offset]);
 }
 
-WRITE16_HANDLER( ttl_ram_w )
+WRITE16_HANDLER( rng_ttl_ram_w )
 {
 	COMBINE_DATA(&ttl_vram[offset]);
 }
diff --git a/src/mame/video/vrender0.c b/src/mame/video/vrender0.c
index 448d2639c64..2f87ec3e272 100644
--- a/src/mame/video/vrender0.c
+++ b/src/mame/video/vrender0.c
@@ -365,7 +365,7 @@ static const _DrawTemplate DrawTile[]=
 #define Packet(i) program_read_word_32le(PacketPtr+2*i)
 
 //Returns TRUE if the operation was a flip (sync or async)
-int ProcessPacket(UINT32 PacketPtr,UINT16 *Dest,UINT8 *TEXTURE)
+int vrender0_ProcessPacket(UINT32 PacketPtr,UINT16 *Dest,UINT8 *TEXTURE)
 {
 	UINT32 Dx=Packet(1)&0x3ff;
 	UINT32 Dy=Packet(2)&0x1ff;
diff --git a/src/mame/video/vrender0.h b/src/mame/video/vrender0.h
index 01833e4bbbb..4165b9e3a11 100644
--- a/src/mame/video/vrender0.h
+++ b/src/mame/video/vrender0.h
@@ -1,2 +1,2 @@
 
-extern int ProcessPacket(UINT32 PacketPtr,UINT16 *Dest,UINT8 *TEXTURE);
+extern int vrender0_ProcessPacket(UINT32 PacketPtr,UINT16 *Dest,UINT8 *TEXTURE);
diff --git a/src/mame/video/zac2650.c b/src/mame/video/zac2650.c
index 7b18ccedc35..bd9ca2ddc5d 100644
--- a/src/mame/video/zac2650.c
+++ b/src/mame/video/zac2650.c
@@ -6,7 +6,7 @@
 
 #include "driver.h"
 
-UINT8 *s2636ram;
+UINT8 *zac_s2636ram;
 static mame_bitmap *spritebitmap;
 
 static UINT8 dirtychar[256>>3];
@@ -30,16 +30,16 @@ WRITE8_HANDLER( tinvader_videoram_w )
 
 WRITE8_HANDLER( zac_s2636_w )
 {
-	if (s2636ram[offset] != data)
+	if (zac_s2636ram[offset] != data)
     {
-		s2636ram[offset] = data;
+		zac_s2636ram[offset] = data;
         dirtychar[offset>>3] = 1;
     }
 }
 
 READ8_HANDLER( zac_s2636_r )
 {
-	if(offset!=0xCB) return s2636ram[offset];
+	if(offset!=0xCB) return zac_s2636ram[offset];
     else return CollisionSprite;
 }
 
@@ -57,10 +57,10 @@ static int SpriteCollision(running_machine *machine, int first,int second)
 	int Checksum=0;
 	int x,y;
 
-    if((s2636ram[first * 0x10 + 10] < 0xf0) && (s2636ram[second * 0x10 + 10] < 0xf0))
+    if((zac_s2636ram[first * 0x10 + 10] < 0xf0) && (zac_s2636ram[second * 0x10 + 10] < 0xf0))
     {
-    	int fx     = (s2636ram[first * 0x10 + 10] * 4)-22;
-        int fy     = (s2636ram[first * 0x10 + 12] * 3)+3;
+    	int fx     = (zac_s2636ram[first * 0x10 + 10] * 4)-22;
+        int fy     = (zac_s2636ram[first * 0x10 + 12] * 3)+3;
 		int expand = (first==1) ? 2 : 1;
 
         /* Draw first sprite */
@@ -96,7 +96,7 @@ static int SpriteCollision(running_machine *machine, int first,int second)
 			    second * 2,
 			    1,
 			    0,0,
-			    (s2636ram[second * 0x10 + 10] * 4)-22,(s2636ram[second * 0x10 + 12] * 3) + 3,
+			    (zac_s2636ram[second * 0x10 + 10] * 4)-22,(zac_s2636ram[second * 0x10 + 12] * 3) + 3,
 			    0, TRANSPARENCY_PEN, 0);
 
         /* Remove fingerprint */
@@ -168,21 +168,21 @@ static void draw_sprites(running_machine *machine, mame_bitmap *bitmap)
 
     for(offs=0;offs<0x50;offs+=0x10)
     {
-    	if((s2636ram[offs+10]<0xF0) && (offs!=0x30))
+    	if((zac_s2636ram[offs+10]<0xF0) && (offs!=0x30))
 		{
             int spriteno = (offs / 8);
-			int expand   = ((s2636ram[0xc0] & (spriteno*2))!=0) ? 2 : 1;
-            int bx       = (s2636ram[offs+10] * 4) - 22;
-            int by       = (s2636ram[offs+12] * 3) + 3;
+			int expand   = ((zac_s2636ram[0xc0] & (spriteno*2))!=0) ? 2 : 1;
+            int bx       = (zac_s2636ram[offs+10] * 4) - 22;
+            int by       = (zac_s2636ram[offs+12] * 3) + 3;
             int x,y;
 
             if(dirtychar[spriteno])
             {
             	/* 16x8 version */
-	   			decodechar(machine->gfx[1],spriteno,s2636ram,machine->drv->gfxdecodeinfo[1].gfxlayout);
+	   			decodechar(machine->gfx[1],spriteno,zac_s2636ram,machine->drv->gfxdecodeinfo[1].gfxlayout);
 
                 /* 16x16 version */
-   				decodechar(machine->gfx[2],spriteno,s2636ram,machine->drv->gfxdecodeinfo[2].gfxlayout);
+   				decodechar(machine->gfx[2],spriteno,zac_s2636ram,machine->drv->gfxdecodeinfo[2].gfxlayout);
 
                 dirtychar[spriteno] = 0;
             }
diff --git a/src/tools/chdman.c b/src/tools/chdman.c
index e154b62c198..c599cccab97 100644
--- a/src/tools/chdman.c
+++ b/src/tools/chdman.c
@@ -111,7 +111,7 @@ INLINE void put_bigendian_uint32(UINT8 *base, UINT32 value)
     print_big_int - 64-bit int printing with commas
 -------------------------------------------------*/
 
-void print_big_int(UINT64 intvalue, char *output)
+static void print_big_int(UINT64 intvalue, char *output)
 {
 	int chunk;
 
@@ -132,7 +132,7 @@ void print_big_int(UINT64 intvalue, char *output)
     big_int_string - return a string for a big int
 -------------------------------------------------*/
 
-char *big_int_string(UINT64 intvalue)
+static char *big_int_string(UINT64 intvalue)
 {
 	static char buffer[256];
 	buffer[0] = 0;
diff --git a/src/tools/makemeta.c b/src/tools/makemeta.c
index 3b01a5ab786..4be3290b729 100644
--- a/src/tools/makemeta.c
+++ b/src/tools/makemeta.c
@@ -334,7 +334,7 @@ static UINT32 parse_philips_code(char **argptr, const char *endchars)
     of pattern_data structs
 -------------------------------------------------*/
 
-pattern_data *parse_pattern(char *arg, int *countptr)
+static pattern_data *parse_pattern(char *arg, int *countptr)
 {
 	pattern_data *head = NULL;
 	pattern_data **tailptr = &head;
diff --git a/src/tools/romcmp.c b/src/tools/romcmp.c
index 7e1f4305c46..34557cb7d43 100644
--- a/src/tools/romcmp.c
+++ b/src/tools/romcmp.c
@@ -27,12 +27,6 @@
 #endif
 
 
-/* for unzip.c */
-void CLIB_DECL logerror(const char *text,...)
-{
-}
-
-
 
 /* compare modes when one file is twice as long as the other */
 /* A = All file */
@@ -51,7 +45,7 @@ enum {	MODE_A,
 		MODE_E, MODE_O,
 		MODE_E12, MODE_O12, MODE_E22, MODE_O22,
 		TOTAL_MODES };
-const char *const modenames[] =
+static const char *const modenames[] =
 {
 	"          ",
 	"[bits 0-3]",
@@ -113,8 +107,8 @@ struct _fileinfo
 };
 typedef struct _fileinfo fileinfo;
 
-fileinfo files[2][MAX_FILES];
-float matchscore[MAX_FILES][MAX_FILES][TOTAL_MODES][TOTAL_MODES];
+static fileinfo files[2][MAX_FILES];
+static float matchscore[MAX_FILES][MAX_FILES][TOTAL_MODES][TOTAL_MODES];
 
 
 static void checkintegrity(const fileinfo *file,int side)