diff --git a/src/emu/cpu/saturn/satops.c b/src/emu/cpu/saturn/satops.c
index a26353d9282..dd95f5cb600 100644
--- a/src/emu/cpu/saturn/satops.c
+++ b/src/emu/cpu/saturn/satops.c
@@ -222,7 +222,7 @@ INLINE void saturn_mem_unconfig(void)
 	if (saturn.config&&saturn.config->unconfig) saturn.config->unconfig(Machine, S64_READ_A(C));
 }
 
-int monitor_id;
+static int monitor_id;
 
 INLINE void saturn_mem_id(void)
 {
@@ -271,7 +271,7 @@ INLINE void saturn_out_cs(void)
 	if (saturn.config&&saturn.config->out) saturn.config->out(Machine, saturn.out);
 }
 
-int monitor_in;
+static int monitor_in;
 
 INLINE void saturn_in(int reg)
 {
diff --git a/src/emu/cpu/saturn/sattable.c b/src/emu/cpu/saturn/sattable.c
index 2a374aeaf6d..54f59792c4e 100644
--- a/src/emu/cpu/saturn/sattable.c
+++ b/src/emu/cpu/saturn/sattable.c
@@ -35,25 +35,25 @@ static const int add_right[]={B,C,A,C, I,I,I,I, A,B,C,D, I,I,I,I};
 static const int sub_left[] ={A,B,C,D, I,I,I,I, B,C,A,C, A,B,C,D};
 static const int sub_right[]={B,C,A,C, I,I,I,I, A,B,C,D, B,C,A,C};
 
-void saturn_invalid3( int op1, int op2, int op3 )
+static void saturn_invalid3( int op1, int op2, int op3 )
 {
 	logerror( "SATURN#%d invalid opcode %x%x%x at %05x\n",
 		  cpu_getactivecpu(), op1, op2, op3, saturn.pc-3 );
 }
 
-void saturn_invalid4( int op1, int op2, int op3, int op4 )
+static void saturn_invalid4( int op1, int op2, int op3, int op4 )
 {
 	logerror( "SATURN#%d invalid opcode %x%x%x%x at %05x\n",
 		  cpu_getactivecpu(), op1, op2, op3, op4, saturn.pc-4 );
 }
 
-void saturn_invalid5( int op1, int op2, int op3, int op4, int op5 )
+static void saturn_invalid5( int op1, int op2, int op3, int op4, int op5 )
 {
 	logerror( "SATURN#%d invalid opcode %x%x%x%x%x at %05x\n",
 		  cpu_getactivecpu(), op1, op2, op3, op4, op5, saturn.pc-5 );
 }
 
-void saturn_invalid6( int op1, int op2, int op3, int op4, int op5, int op6 )
+static void saturn_invalid6( int op1, int op2, int op3, int op4, int op5, int op6 )
 {
 	logerror( "SATURN#%d invalid opcode %x%x%x%x%x%x at %05x\n",
 		  cpu_getactivecpu(), op1, op2, op3, op4, op5, op6, saturn.pc-6 );
diff --git a/src/emu/sound/gaelco.h b/src/emu/sound/gaelco.h
index 04f4e16d405..40e962ea643 100644
--- a/src/emu/sound/gaelco.h
+++ b/src/emu/sound/gaelco.h
@@ -7,6 +7,8 @@ struct gaelcosnd_interface
 	int banks[4];			/* start of each ROM bank */
 };
 
+extern UINT16 *gaelco_sndregs;
+
 WRITE16_HANDLER( gaelcosnd_w );
 READ16_HANDLER( gaelcosnd_r );
 
diff --git a/src/emu/sound/namco.h b/src/emu/sound/namco.h
index f8eecf7a013..057eb536906 100644
--- a/src/emu/sound/namco.h
+++ b/src/emu/sound/namco.h
@@ -8,6 +8,8 @@ struct namco_interface
 	int stereo;		/* set to 1 to indicate stereo (e.g., System 1) */
 };
 
+WRITE8_HANDLER( snkwave_w );
+
 WRITE8_HANDLER( pacman_sound_enable_w );
 WRITE8_HANDLER( pacman_sound_w );
 
diff --git a/src/emu/sound/scsp.h b/src/emu/sound/scsp.h
index 386041c0ba1..66d990e73ba 100644
--- a/src/emu/sound/scsp.h
+++ b/src/emu/sound/scsp.h
@@ -25,4 +25,6 @@ WRITE16_HANDLER( SCSP_1_w );
 WRITE16_HANDLER( SCSP_MidiIn );
 READ16_HANDLER( SCSP_MidiOutR );
 
+extern UINT32* stv_scu;
+
 #endif
diff --git a/src/emu/video.h b/src/emu/video.h
index 68a7bf55fd3..902d1a7428a 100644
--- a/src/emu/video.h
+++ b/src/emu/video.h
@@ -267,7 +267,6 @@ int video_mng_is_movie_active(const device_config *screen);
 void video_mng_begin_recording(const device_config *screen, const char *name);
 void video_mng_end_recording(const device_config *screen);
 
-int video_avi_is_movie_active(const device_config *screen);
 void video_avi_begin_recording(const device_config *screen, const char *name);
 void video_avi_end_recording(const device_config *screen);
 void video_avi_add_sound(running_machine *machine, const INT16 *sound, int numsamples);
diff --git a/src/mame/audio/galaxian.c b/src/mame/audio/galaxian.c
index b05b6e93f61..13d226dea4a 100644
--- a/src/mame/audio/galaxian.c
+++ b/src/mame/audio/galaxian.c
@@ -2,7 +2,7 @@
 #include "streams.h"
 #include "deprecat.h"
 #include "sound/samples.h"
-#include "includes/galaxold.h"
+#include "includes/galaxian.h"
 
 #define VERBOSE 0
 
diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c
index 8cc3fde6c59..52bbb635156 100644
--- a/src/mame/drivers/astrocorp.c
+++ b/src/mame/drivers/astrocorp.c
@@ -186,7 +186,7 @@ ADDRESS_MAP_END
                                 Input Ports
 ***************************************************************************/
 
-INPUT_PORTS_START( showhand )
+static INPUT_PORTS_START( showhand )
 	PORT_START_TAG("INPUTS")	// 54000
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW,  IPT_COIN1     )	PORT_IMPULSE(1)	// coin
 	PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON3   )	PORT_NAME("Payout")	PORT_CODE(KEYCODE_F1) // payout (must be 0 on startup)
diff --git a/src/mame/drivers/blackt96.c b/src/mame/drivers/blackt96.c
index e83d48effce..bd198361f0f 100644
--- a/src/mame/drivers/blackt96.c
+++ b/src/mame/drivers/blackt96.c
@@ -44,7 +44,7 @@ Notes:
 #include "driver.h"
 #include "sound/okim6295.h"
 
-VIDEO_START( blackt96 )
+static VIDEO_START( blackt96 )
 {
 
 }
@@ -52,7 +52,7 @@ VIDEO_START( blackt96 )
 static UINT16* blackt96_tilemapram;
 static UINT16* blackt96_tilemapram2;
 
-VIDEO_UPDATE( blackt96 )
+static VIDEO_UPDATE( blackt96 )
 {
 	int y,x;
 	int count = 0;
diff --git a/src/mame/drivers/cloak.c b/src/mame/drivers/cloak.c
index 57d6b08b218..9df61088c0f 100644
--- a/src/mame/drivers/cloak.c
+++ b/src/mame/drivers/cloak.c
@@ -110,20 +110,10 @@
 #include "driver.h"
 #include "deprecat.h"
 #include "sound/pokey.h"
+#include "includes/cloak.h"
 
 static int cloak_nvram_enabled;
 
-extern WRITE8_HANDLER( cloak_videoram_w );
-extern WRITE8_HANDLER( cloak_paletteram_w );
-extern WRITE8_HANDLER( cloak_clearbmp_w );
-extern WRITE8_HANDLER( graph_processor_w );
-extern WRITE8_HANDLER( cloak_flipscreen_w );
-extern READ8_HANDLER( graph_processor_r );
-
-extern VIDEO_START( cloak );
-extern VIDEO_UPDATE( cloak );
-
-
 /*************************************
  *
  *  Output ports
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index db2f696e6ba..b2c6a85f4f1 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -167,7 +167,7 @@ READ16_HANDLER( cps1_dsw_r )
 	return (in << 8) | 0xff;
 }
 
-READ16_HANDLER( cps1_hack_dsw_r )
+static READ16_HANDLER( cps1_hack_dsw_r )
 {
 	static const char *const dswname[] = { "IN0", "DSWA", "DSWB", "DSWC" };
 	int in = input_port_read(machine, dswname[offset]);
diff --git a/src/mame/drivers/dambustr.c b/src/mame/drivers/dambustr.c
index aa8f386b1d8..b205420a6a9 100644
--- a/src/mame/drivers/dambustr.c
+++ b/src/mame/drivers/dambustr.c
@@ -11,15 +11,10 @@ Reverse-engineering and MAME Driver by Norbert Kehrer (August 2006)
 #include "driver.h"
 
 #include "cpu/z80/z80.h"
+#include "includes/galaxian.h"
 #include "galaxold.h"
 
 
-PALETTE_INIT( dambustr );
-WRITE8_HANDLER( dambustr_bg_split_line_w );
-WRITE8_HANDLER( dambustr_bg_color_w );
-VIDEO_START( dambustr );
-VIDEO_UPDATE( dambustr );
-
 static int noise_data = 0;
 
 
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 2ba5bfe455d..307af492e6f 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -1932,7 +1932,7 @@ static DRIVER_INIT( toffy )
 	/* should the sound rom be bitswapped too? */
 }
 
-DRIVER_INIT( ddgn6809 )
+static DRIVER_INIT( ddgn6809 )
 {
 	/* Descramble GFX here */
 
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index 88b162d3a4d..d30d6adafee 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -9,12 +9,11 @@
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 #include "decocrpt.h"
+#include "decoprot.h"
 #include "deco16ic.h"
 
 VIDEO_UPDATE( dietgo );
 VIDEO_START( dietgo );
-READ16_HANDLER( dietgo_104_prot_r );
-WRITE16_HANDLER( dietgo_104_prot_w );
 
 
 static ADDRESS_MAP_START( dietgo_map, ADDRESS_SPACE_PROGRAM, 16 )
diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c
index 5323e96c20a..276a5ab234f 100644
--- a/src/mame/drivers/expro02.c
+++ b/src/mame/drivers/expro02.c
@@ -123,13 +123,6 @@ U78 (22CV10)
 #include "includes/kaneko16.h"
 #include "sound/okim6295.h"
 
-//extern DRIVER_INIT(berlwall);
-extern VIDEO_START(galsnew);
-extern VIDEO_UPDATE(galsnew);
-extern PALETTE_INIT(berlwall);
-extern UINT16* galsnew_bg_pixram;
-extern UINT16* galsnew_fg_pixram;
-
 static INPUT_PORTS_START( galsnew )
 	PORT_START_TAG("DSW1")
 	PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unused ) )
diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c
index 1e0c5d1037a..bd398756b15 100644
--- a/src/mame/drivers/fastfred.c
+++ b/src/mame/drivers/fastfred.c
@@ -857,8 +857,6 @@ ROM_START( imago )
 	ROM_LOAD( "imago.97", 0x0200, 0x0100, CRC(e28a7f00) SHA1(05b4882c5ea5da332735866d858872bc5eeaca24) )
 ROM_END
 
-extern int fastfred_hardware_type;
-
 static DRIVER_INIT( flyboy )
 {
 	memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xc085, 0xc099, 0, 0, flyboy_custom1_io_r);
diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c
index fadf3b1851d..5c450b4e16e 100644
--- a/src/mame/drivers/gaelco2.c
+++ b/src/mame/drivers/gaelco2.c
@@ -25,7 +25,6 @@
 #include "sound/gaelco.h"
 #include "rendlay.h"
 
-extern UINT16 *gaelco_sndregs;
 extern UINT16 *gaelco2_vregs;
 extern UINT16 *snowboar_protection;
 
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 5e8c2446a59..bfddac89b06 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -1527,18 +1527,18 @@ static const gfx_layout galaxian_spritelayout =
  *
  *************************************/
 
-GFXDECODE_START(galaxian)
+static GFXDECODE_START(galaxian)
 	GFXDECODE_SCALE(REGION_GFX1, 0x0000, galaxian_charlayout,   0, 8, GALAXIAN_XSCALE,1)
 	GFXDECODE_SCALE(REGION_GFX1, 0x0000, galaxian_spritelayout, 0, 8, GALAXIAN_XSCALE,1)
 GFXDECODE_END
 
-GFXDECODE_START(gmgalax)
+static GFXDECODE_START(gmgalax)
 	GFXDECODE_SCALE(REGION_GFX1, 0x0000, galaxian_charlayout,   0, 16, GALAXIAN_XSCALE,1)
 	GFXDECODE_SCALE(REGION_GFX1, 0x0000, galaxian_spritelayout, 0, 16, GALAXIAN_XSCALE,1)
 GFXDECODE_END
 
 /* separate character and sprite ROMs */
-GFXDECODE_START(pacmanbl)
+static GFXDECODE_START(pacmanbl)
 	GFXDECODE_SCALE(REGION_GFX1, 0x0000, galaxian_charlayout,   0, 8, GALAXIAN_XSCALE,1)
 	GFXDECODE_SCALE(REGION_GFX2, 0x0000, galaxian_spritelayout, 0, 8, GALAXIAN_XSCALE,1)
 GFXDECODE_END
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index 6a0dd5b4fcc..7c062db038b 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -356,6 +356,7 @@ TO DO :
 #include "sound/dac.h"
 #include "sound/flt_rc.h"
 #include "includes/cclimber.h"
+#include "includes/galaxian.h"
 
 
 /*************************************
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index 72d4b9d1fa6..98b9a040a93 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -181,11 +181,6 @@ Frequencies: 68k is XTAL_32MHZ/2
 //UINT16 *gs_videoram3;
 static UINT16 *gs_mixer_regs;
 
-/* in video */
-VIDEO_UPDATE( gstriker );
-VIDEO_START( gstriker );
-VIDEO_START( twrldc94 );
-
 
 /*** MISC READ / WRITE HANDLERS **********************************************/
 
diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c
index f1431d8087b..2a653b1e3f3 100644
--- a/src/mame/drivers/gticlub.c
+++ b/src/mame/drivers/gticlub.c
@@ -65,11 +65,6 @@ READ32_HANDLER(K001604_reg_r);
 
 
 
-VIDEO_START( gticlub );
-VIDEO_UPDATE( gticlub );
-
-
-
 static WRITE32_HANDLER( paletteram32_w )
 {
 	COMBINE_DATA(&paletteram32[offset]);
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index febf7fe2ad1..ecef8de8fc0 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -255,7 +255,7 @@ static VIDEO_UPDATE( guab )
  *
  *************************************/
 
-struct wd1770
+static struct wd1770
 {
 	UINT32	status;
 	UINT8	cmd;
diff --git a/src/mame/drivers/igs_180.c b/src/mame/drivers/igs_180.c
index 48be62545e3..0cbb138be98 100644
--- a/src/mame/drivers/igs_180.c
+++ b/src/mame/drivers/igs_180.c
@@ -73,7 +73,7 @@ static VIDEO_START(igs_180)
 
 
 static UINT8 *sprites_gfx;
-int sprites_gfx_size;
+static int sprites_gfx_size;
 
 // Eeach 16 bit word in the sprites gfx roms contains three 5 bit pens: x-22222-11111-00000.
 // This routine expands each word into three bytes.
diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c
index 48aeda00def..7497db881fc 100644
--- a/src/mame/drivers/itgambl2.c
+++ b/src/mame/drivers/itgambl2.c
@@ -60,12 +60,12 @@
 *     Video Hardware     *
 *************************/
 
-VIDEO_START( itgambl2 )
+static VIDEO_START( itgambl2 )
 {
 }
 
 
-VIDEO_UPDATE( itgambl2 )
+static VIDEO_UPDATE( itgambl2 )
 {
 	return 0;
 }
@@ -169,7 +169,7 @@ GFXDECODE_END
 *      Machine Reset      *
 **************************/
 
-MACHINE_RESET( itgambl2 )
+static MACHINE_RESET( itgambl2 )
 {
 	/* stop the CPU, we have no code for it anyway */
 	cpunum_set_input_line(machine, 0, INPUT_LINE_HALT, ASSERT_LINE);
diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c
index c8fbf87a5ad..31bf18deddb 100644
--- a/src/mame/drivers/itgamble.c
+++ b/src/mame/drivers/itgamble.c
@@ -62,11 +62,11 @@
 *     Video Hardware     *
 *************************/
 
-VIDEO_START( itgamble )
+static VIDEO_START( itgamble )
 {
 }
 
-VIDEO_UPDATE( itgamble )
+static VIDEO_UPDATE( itgamble )
 {
 	return 0;
 }
@@ -168,7 +168,7 @@ GFXDECODE_END
 *      Machine Reset      *
 **************************/
 
-MACHINE_RESET( itgamble )
+static MACHINE_RESET( itgamble )
 {
 	/* stop the CPU, we have no code for it anyway */
 	cpunum_set_input_line(machine, 0, INPUT_LINE_HALT, ASSERT_LINE);
diff --git a/src/mame/drivers/jcross.c b/src/mame/drivers/jcross.c
index abd07a0b991..408a0d2aed6 100644
--- a/src/mame/drivers/jcross.c
+++ b/src/mame/drivers/jcross.c
@@ -24,8 +24,6 @@ Could be bad dump ('final' romset is made of two sets marked as 'bad' )
 
 UINT8 *jcr_textram;
 
-WRITE8_HANDLER( snkwave_w );
-
 READ8_HANDLER( jcross_background_ram_r );
 WRITE8_HANDLER( jcross_background_ram_w );
 
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index 0c35ab71f00..e72b63e3708 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -78,11 +78,6 @@ Dip locations verified from manual for:
 #include "sound/2151intf.h"
 #include "sound/okim6295.h"
 
-extern void (*toybox_mcu_run)(running_machine *machine);	/* one of the following */
-void bloodwar_mcu_run(running_machine *machine);
-void bonkadv_mcu_run(running_machine *machine);
-void gtmr_mcu_run(running_machine *machine);
-
 /***************************************************************************
 
 
diff --git a/src/mame/drivers/kinstb.c b/src/mame/drivers/kinstb.c
index 612813d2346..947ca5874c7 100644
--- a/src/mame/drivers/kinstb.c
+++ b/src/mame/drivers/kinstb.c
@@ -36,8 +36,6 @@
 #include "driver.h"
 #include "includes/snes.h"
 
-extern DRIVER_INIT( snes_hirom );
-
 static INT8 shared_ram[0x100];
 
 static READ8_HANDLER(sharedram_r)
diff --git a/src/mame/drivers/legionna.c b/src/mame/drivers/legionna.c
index aea09d1b4ad..dc9683d7ee5 100644
--- a/src/mame/drivers/legionna.c
+++ b/src/mame/drivers/legionna.c
@@ -166,7 +166,7 @@ static ADDRESS_MAP_START( godzilla_map, ADDRESS_SPACE_PROGRAM, 16 )
 ADDRESS_MAP_END
 
 /* did they swap the lines, or does the protection device swap the words during the DMA?? */
-WRITE16_HANDLER( denjin_paletteram16_xBBBBBGGGGGRRRRR_word_w )
+static WRITE16_HANDLER( denjin_paletteram16_xBBBBBGGGGGRRRRR_word_w )
 {
 	offset^=1;
 	COMBINE_DATA(&paletteram16[offset]);
@@ -990,7 +990,7 @@ static const gfx_layout legionna_new_charlayout =
 };
 
 
-void descramble_legionnaire_gfx(UINT8* src)
+static void descramble_legionnaire_gfx(UINT8* src)
 {
 	UINT8 *buffer;
 	int len = 0x10000;
@@ -2089,7 +2089,7 @@ static DRIVER_INIT( denjinmk )
 	ROM[0x5fe4/2] = 0x4e71;
 }
 
-DRIVER_INIT( legiongfx )
+static DRIVER_INIT( legiongfx )
 {
 	descramble_legionnaire_gfx( memory_region(REGION_GFX5) );
 }
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index dd5cfed8ea0..7903f7cba22 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -74,8 +74,6 @@ cc_p14.j2 8192 0xedc6a1eb M5L2764k
 #include "sound/ay8910.h"
 #include "sound/namco.h"
 
-WRITE8_HANDLER( snkwave_w );
-
 extern UINT8 *mainsnk_fgram;
 extern UINT8 *mainsnk_bgram;
 WRITE8_HANDLER(mainsnk_c600_w);
diff --git a/src/mame/drivers/marvins.c b/src/mame/drivers/marvins.c
index 918fe686752..1f4fee9e1d6 100644
--- a/src/mame/drivers/marvins.c
+++ b/src/mame/drivers/marvins.c
@@ -96,8 +96,6 @@ extern WRITE8_HANDLER( marvins_palette_bank_w );
 **
 ***************************************************************************/
 
-extern WRITE8_HANDLER( snkwave_w );
-
 static int sound_cpu_busy;
 
 static const struct namco_interface snkwave_interface =
diff --git a/src/mame/drivers/megadriv.h b/src/mame/drivers/megadriv.h
index bd50f98541e..4fb8616625c 100644
--- a/src/mame/drivers/megadriv.h
+++ b/src/mame/drivers/megadriv.h
@@ -25,4 +25,7 @@ void megatech_set_megadrive_z80_as_megadrive_z80(running_machine *machine);
 extern READ8_HANDLER (megatech_sms_ioport_dc_r);
 extern READ8_HANDLER (megatech_sms_ioport_dd_r);
 
-
+MACHINE_RESET( megadriv );
+VIDEO_START( megadriv );
+VIDEO_UPDATE( megadriv );
+VIDEO_EOF( megadriv );
diff --git a/src/mame/drivers/megaplay.c b/src/mame/drivers/megaplay.c
index cea540c6f4a..5623ee37974 100644
--- a/src/mame/drivers/megaplay.c
+++ b/src/mame/drivers/megaplay.c
@@ -649,10 +649,6 @@ ADDRESS_MAP_END
 VIDEO_START( megaplay_normal );
 VIDEO_UPDATE( megaplay_normal );
 
-/* give us access to the megadriv start and update functions so that we can call them */
-VIDEO_START( megadriv );
-VIDEO_UPDATE( megadriv );
-
 static VIDEO_START(megplay)
 {
 	//printf("megplay vs\n");
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index c54ca038c9a..3084aada86b 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -130,24 +130,6 @@ RAM         RW      0f0000-0f3fff       0e0000-0effff?      <
 static UINT16 ip_select, ip_select_values[5];
 static UINT8 megasys1_ignore_oki_status = 0;	/* used in MACHINE_RESET */
 
-/* Variables defined in video: */
-
-
-
-/* Functions defined in video: */
-
-PALETTE_INIT( megasys1 );
-VIDEO_START( megasys1 );
-VIDEO_UPDATE( megasys1 );
-
-READ16_HANDLER( megasys1_vregs_C_r );
-
-WRITE16_HANDLER( megasys1_vregs_A_w );
-WRITE16_HANDLER( megasys1_vregs_C_w );
-WRITE16_HANDLER( megasys1_vregs_D_w );
-
-
-
 
 static MACHINE_RESET( megasys1 )
 {
diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c
index a2d6424e9b9..80e6aede45d 100644
--- a/src/mame/drivers/megatech.c
+++ b/src/mame/drivers/megatech.c
@@ -91,19 +91,6 @@ UINT32 bios_ctrl_inputs;
 
 #define MASTER_CLOCK		53693100
 
-/* give us access to the megadriv start and update functions so that we can call them */
-VIDEO_UPDATE( megadriv );
-VIDEO_START( megadriv );
-VIDEO_EOF( megadriv );
-MACHINE_RESET( megadriv );
-
-/* in drivers/segae.c */
-VIDEO_UPDATE( megatech_bios );
-VIDEO_EOF( megatech_bios );
-MACHINE_RESET( megatech_bios );
-DRIVER_INIT( megatech_bios );
-
-
 /* not currently used */
 static INPUT_PORTS_START( megatech ) /* Genesis Input Ports */
 	PORT_INCLUDE(megadriv)
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index bdfb9633193..6880c4f2ffc 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -516,7 +516,6 @@ Virtua Striker 2 2000      840-0010C  21929C       15         315-6213   317-025
 static const struct sh4_config sh4cpu_config = {  1,  0,  1,  0,  0,  0,  1,  1,  0, CPU_CLOCK };
 
 static UINT32 *dc_sound_ram;
-extern UINT64 *dc_texture_ram;
 static UINT32 rom_offset, dma_count;
 UINT32 dma_offset;
 
diff --git a/src/mame/drivers/nitedrvr.c b/src/mame/drivers/nitedrvr.c
index 1b1b9872b65..08661115523 100644
--- a/src/mame/drivers/nitedrvr.c
+++ b/src/mame/drivers/nitedrvr.c
@@ -39,22 +39,6 @@
 #include "sound/discrete.h"
 #include "nitedrvr.h"
 
-READ8_HANDLER( nitedrvr_in0_r );
-READ8_HANDLER( nitedrvr_in1_r );
-READ8_HANDLER( nitedrvr_steering_reset_r );
-WRITE8_HANDLER( nitedrvr_steering_reset_w );
-WRITE8_HANDLER( nitedrvr_out0_w );
-WRITE8_HANDLER( nitedrvr_out1_w );
-void nitedrvr_register_machine_vars(void);
-
-extern UINT8 *nitedrvr_hvc;
-
-WRITE8_HANDLER( nitedrvr_videoram_w );
-WRITE8_HANDLER( nitedrvr_hvc_w );
-
-VIDEO_START( nitedrvr );
-VIDEO_UPDATE( nitedrvr );
-
 /* Memory Map */
 
 static ADDRESS_MAP_START( nitedrvr_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/nss.c b/src/mame/drivers/nss.c
index 81e8d1a006e..f8e0e13fd33 100644
--- a/src/mame/drivers/nss.c
+++ b/src/mame/drivers/nss.c
@@ -295,8 +295,6 @@ Contra III   CONTRA_III_1   TC574000   CONTRA_III_0   TC574000    GAME1_NSSU
 #include "driver.h"
 #include "includes/snes.h"
 
-extern DRIVER_INIT( snes );
-
 static ADDRESS_MAP_START( snes_map, ADDRESS_SPACE_PROGRAM, 8)
 	AM_RANGE(0x000000, 0x2fffff) AM_READWRITE(snes_r_bank1, snes_w_bank1)	/* I/O and ROM (repeats for each bank) */
 	AM_RANGE(0x300000, 0x3fffff) AM_READWRITE(snes_r_bank2, snes_w_bank2)	/* I/O and ROM (repeats for each bank) */
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index fac1c3e5fbe..fe122518772 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -1790,10 +1790,6 @@ static DRIVER_INIT( martmast )
 }
 
 
-extern READ16_HANDLER( PSTARS_protram_r );
-extern READ16_HANDLER( PSTARS_r16 );
-extern WRITE16_HANDLER( PSTARS_w16 );
-
 static DRIVER_INIT( pstar )
 {
 	pgm_basic_init();
diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c
index e3db722fa96..3ed5f5efe4e 100644
--- a/src/mame/drivers/polepos.c
+++ b/src/mame/drivers/polepos.c
@@ -224,45 +224,6 @@ Notes:
 #define POLEPOS_TOGGLE	PORT_TOGGLE
 
 
-/* from audio */
-void *polepos_sh_start(int clock, const struct CustomSound_interface *config);
-void polepos_sh_reset(void *token);
-WRITE8_HANDLER( polepos_engine_sound_lsb_w );
-WRITE8_HANDLER( polepos_engine_sound_msb_w );
-
-/* from video */
-extern UINT16 *polepos_view16_memory;
-extern UINT16 *polepos_road16_memory;
-extern UINT16 *polepos_alpha16_memory;
-extern UINT16 *polepos_sprite16_memory;
-extern int polepos_gear_bit;
-
-VIDEO_START( polepos );
-PALETTE_INIT( polepos );
-VIDEO_UPDATE( polepos );
-
-WRITE16_HANDLER( polepos_view16_w );
-WRITE16_HANDLER( polepos_road16_w );
-WRITE16_HANDLER( polepos_alpha16_w );
-WRITE16_HANDLER( polepos_sprite16_w );
-WRITE8_HANDLER( polepos_view_w );
-WRITE8_HANDLER( polepos_road_w );
-WRITE8_HANDLER( polepos_alpha_w );
-WRITE8_HANDLER( polepos_sprite_w );
-WRITE8_HANDLER( polepos_chacl_w );
-
-READ16_HANDLER( polepos_view16_r );
-READ16_HANDLER( polepos_road16_r );
-READ16_HANDLER( polepos_alpha16_r );
-READ16_HANDLER( polepos_sprite16_r );
-READ8_HANDLER( polepos_view_r );
-READ8_HANDLER( polepos_road_r );
-READ8_HANDLER( polepos_alpha_r );
-READ8_HANDLER( polepos_sprite_r );
-WRITE16_HANDLER( polepos_view16_hscroll_w );
-WRITE16_HANDLER( polepos_road16_vscroll_w );
-
-
 /*************************************************************************************/
 /* Pole Position II protection                                                       */
 /*************************************************************************************/
diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c
index 5b9069747a2..8739daa1bf6 100644
--- a/src/mame/drivers/stv.c
+++ b/src/mame/drivers/stv.c
@@ -254,7 +254,6 @@ static UINT8 *smpc_ram;
 UINT32* stv_workram_l;
 UINT32* stv_workram_h;
 static UINT32* stv_backupram;
-extern UINT32* stv_scu;
 static UINT32* ioga;
 static UINT16* scsp_regs;
 static UINT16* sound_ram;
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index c8d073529df..8108351399b 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -2848,7 +2848,7 @@ GAME( 1988, tetrisbl, tetris,   tetrisbl, tetris,   tetrisbl, ROT0,   "bootleg",
 GAME( 1989, tturfbl,  tturf,    tturfbl,  tturf,    tturfbl,  ROT0,   "bootleg", "Tough Turf (bootleg)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND | GAME_NOT_WORKING )
 GAME( 1988, wb3bbl,   wb3,      wb3bbl,   wb3b,     wb3bbl,   ROT0,   "bootleg", "Wonder Boy III - Monster Lair (bootleg)", 0 )
 
-DRIVER_INIT( beautyb )
+static DRIVER_INIT( beautyb )
 {
 	UINT16*rom = (UINT16*)memory_region( REGION_CPU1 );
 	int x;
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 3ff3591a2c5..fab9e15bc74 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -316,13 +316,7 @@ Stephh's notes (based on the game M68000 code and some tests) :
 #include "seta.h"
 #include "sound/2610intf.h"
 #include "sound/2151intf.h"
-
-MACHINE_RESET( cchip1 );
-READ16_HANDLER( cchip1_ctrl_r );
-READ16_HANDLER( cchip1_ram_r );
-WRITE16_HANDLER( cchip1_ctrl_w );
-WRITE16_HANDLER( cchip1_bank_w );
-WRITE16_HANDLER( cchip1_ram_w );
+#include "includes/taito_f2.h"
 
 
 
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index d9e2496da65..59e89620a36 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -405,7 +405,7 @@ INLINE void set_color_555(pen_t color, int rshift, int gshift, int bshift, UINT1
 }
 
 
-WRITE16_HANDLER( tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w )
+static WRITE16_HANDLER( tilemap_paletteram16_xGGGGGRRRRRBBBBB_word_w )
 {
 	COMBINE_DATA(&tilemap_paletteram16[offset]);
 	set_color_555(offset+0x4000, 5, 10, 0, tilemap_paletteram16[offset]);
@@ -714,7 +714,7 @@ static void tecmosys_render_sprites_to_bitmap(bitmap_t *bitmap, UINT16 extrax, U
 	}
 }
 
-void tecmosys_tilemap_copy_to_compose(UINT16 pri)
+static void tecmosys_tilemap_copy_to_compose(UINT16 pri)
 {
 	int y,x;
 	UINT16 *srcptr;
@@ -731,7 +731,7 @@ void tecmosys_tilemap_copy_to_compose(UINT16 pri)
 	}
 }
 
-void tecmosys_do_final_mix(bitmap_t* bitmap)
+static void tecmosys_do_final_mix(bitmap_t* bitmap)
 {
 	const pen_t *paldata = Machine->pens;
 	int y,x;
@@ -1106,7 +1106,7 @@ static MACHINE_RESET( deroon )
 	device_status = DS_IDLE;
 }
 
-void tecmosys_decramble(void)
+static void tecmosys_decramble(void)
 {
 	UINT8 *gfxsrc    = memory_region       ( REGION_GFX1 );
 	size_t  srcsize = memory_region_length( REGION_GFX1 );
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index 92d7e10fae0..6c92ad4421d 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -544,7 +544,7 @@ static ADDRESS_MAP_START( i8742_writeport, ADDRESS_SPACE_IO, 8 )
 ADDRESS_MAP_END
 
 
-WRITE8_HANDLER( jpopnics_palette_w )
+static WRITE8_HANDLER( jpopnics_palette_w )
 {
 	int r,g,b;
 	UINT16 paldata;
@@ -575,6 +575,7 @@ static ADDRESS_MAP_START( jpopnics_main_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xf800, 0xffff) AM_RAM AM_WRITE(jpopnics_palette_w) AM_BASE(&paletteram)
 ADDRESS_MAP_END
 
+#ifdef UNUSED_FUNCTION
 READ8_HANDLER( moo_r )
 {
 	return mame_rand(machine);
@@ -584,8 +585,9 @@ READ8_HANDLER( bbb_r )
 {
 	return 0xff;
 }
+#endif
 
-WRITE8_HANDLER( jpopnics_subbankswitch_w )
+static WRITE8_HANDLER( jpopnics_subbankswitch_w )
 {
 	UINT8 *RAM = memory_region(REGION_CPU2);
 
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 147f4c9e0d1..3f03e500e36 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -381,7 +381,7 @@ void kbash_okisnd_w(running_machine *machine, int data);
 void fixeight_okisnd_w(running_machine *machine, int data);
 void batsugun_okisnd_w(running_machine *machine, int data);
 
-MACHINE_RESET(batsugun);
+static MACHINE_RESET(batsugun);
 #if USE_V25
 static READ16_HANDLER( batsugun_share_r );
 static READ16_HANDLER( batsugun_share2_r );
@@ -674,7 +674,7 @@ static WRITE16_HANDLER( toaplan2_coin_word_w )
 	}
 }
 
-WRITE16_HANDLER( toaplan2_v25_coin_word_w )
+static WRITE16_HANDLER( toaplan2_v25_coin_word_w )
 {
 	// logerror("toaplan2_v25_coin_word_w %04x\n",data);
 
@@ -3895,20 +3895,20 @@ static MACHINE_DRIVER_START( vfive )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 MACHINE_DRIVER_END
 
-MACHINE_RESET(batsugun)
+static MACHINE_RESET(batsugun)
 {
 	#if USE_V25
 	cpunum_set_input_line(machine, 1, INPUT_LINE_HALT, ASSERT_LINE);
 	#endif
 }
 
-void batsugun_ym2151_irqhandler(running_machine *machine, int linestate)
+static void batsugun_ym2151_irqhandler(running_machine *machine, int linestate)
 {
 	logerror("batsugun_ym2151_irqhandler %02x\n",linestate);
 //  update_irq_lines(machine, linestate ? assert : clear);
 }
 
-const struct YM2151interface batsugun_ym2151_interface =
+static const struct YM2151interface batsugun_ym2151_interface =
 {
 	batsugun_ym2151_irqhandler
 };
diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h
index c5b2a2e2ae8..7b660ad9838 100644
--- a/src/mame/includes/arkanoid.h
+++ b/src/mame/includes/arkanoid.h
@@ -27,6 +27,8 @@ extern VIDEO_UPDATE( arkanoid );
 
 /*----------- defined in machine/arkanoid.c -----------*/
 
+extern UINT8 arkanoid_paddle_select;
+
 extern MACHINE_START( arkanoid );
 extern MACHINE_RESET( arkanoid );
 
diff --git a/src/mame/includes/cloak.h b/src/mame/includes/cloak.h
index 261261e440d..31780077d5a 100644
--- a/src/mame/includes/cloak.h
+++ b/src/mame/includes/cloak.h
@@ -6,6 +6,9 @@
 
 /*----------- defined in video/cloak.c -----------*/
 
+WRITE8_HANDLER( cloak_videoram_w );
+WRITE8_HANDLER( cloak_flipscreen_w );
+
 WRITE8_HANDLER( cloak_paletteram_w );
 READ8_HANDLER( graph_processor_r );
 WRITE8_HANDLER( graph_processor_w );
diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h
index 497a172cda2..2099ded0e2c 100644
--- a/src/mame/includes/dc.h
+++ b/src/mame/includes/dc.h
@@ -95,6 +95,8 @@ extern UINT32 dc_coin_counts[2];
 
 /*----------- defined in video/dc.c -----------*/
 
+extern UINT64 *dc_texture_ram;
+
 void dc_vblank( running_machine *machine );
 
 READ64_HANDLER( pvr_ctrl_r );
diff --git a/src/mame/includes/decoprot.h b/src/mame/includes/decoprot.h
index 7d712700fba..0ada698f7eb 100644
--- a/src/mame/includes/decoprot.h
+++ b/src/mame/includes/decoprot.h
@@ -24,3 +24,6 @@ void decoprot_reset(void);
 
 extern UINT16 *deco16_prot_ram;
 extern UINT32 *deco32_prot_ram;
+
+READ16_HANDLER( dietgo_104_prot_r );
+WRITE16_HANDLER( dietgo_104_prot_w );
diff --git a/src/mame/includes/fastfred.h b/src/mame/includes/fastfred.h
index 253700a75c9..91e63080516 100644
--- a/src/mame/includes/fastfred.h
+++ b/src/mame/includes/fastfred.h
@@ -7,6 +7,8 @@
 
 /*----------- defined in video/fastfred.c -----------*/
 
+extern int fastfred_hardware_type;
+
 extern UINT8 *fastfred_videoram;
 extern UINT8 *fastfred_spriteram;
 extern size_t fastfred_spriteram_size;
diff --git a/src/mame/includes/gaelcrpt.h b/src/mame/includes/gaelcrpt.h
index 168412dbdf3..a9971d68dc8 100644
--- a/src/mame/includes/gaelcrpt.h
+++ b/src/mame/includes/gaelcrpt.h
@@ -1,2 +1,3 @@
-UINT16 gaelco_decrypt(int offset, int data, int param1, int param2);
+/*----------- defined in machine/gaelcrpt.c -----------*/
 
+UINT16 gaelco_decrypt(int offset, int data, int param1, int param2);
diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h
index 6be1ee4dd6c..78903c890d1 100644
--- a/src/mame/includes/galaxian.h
+++ b/src/mame/includes/galaxian.h
@@ -98,7 +98,6 @@ void pisces_extend_sprite_info(const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8 *f
 
 /* Batman Part 2 extensions */
 void batman2_extend_tile_info(UINT16 *code, UINT8 *color, UINT8 attrib, UINT8 x);
-void batman2_extend_sprite_info(const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8 *flipx, UINT8 *flipy, UINT16 *code, UINT8 *color);
 
 /* Moon Cresta extensions */
 void mooncrst_extend_tile_info(UINT16 *code, UINT8 *color, UINT8 attrib, UINT8 x);
@@ -123,7 +122,9 @@ 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;
+
 WRITE8_HANDLER( galaxian_sound_w );
 WRITE8_HANDLER( galaxian_pitch_w );
 WRITE8_HANDLER( galaxian_vol_w );
diff --git a/src/mame/includes/galaxold.h b/src/mame/includes/galaxold.h
index a9eaed291da..930545eba2a 100644
--- a/src/mame/includes/galaxold.h
+++ b/src/mame/includes/galaxold.h
@@ -13,7 +13,7 @@
 
 #include "machine/8255ppi.h"
 
-/*----------- defined in video/galaxian.c -----------*/
+/*----------- defined in video/galaxold.c -----------*/
 
 extern UINT8 *galaxold_videoram;
 extern UINT8 *galaxold_spriteram;
@@ -27,6 +27,7 @@ extern UINT8 *racknrol_tiles_bank;
 extern size_t galaxold_spriteram_size;
 extern size_t galaxold_spriteram2_size;
 extern size_t galaxold_bulletsram_size;
+extern UINT8 galaxold_stars_on;
 
 PALETTE_INIT( galaxold );
 PALETTE_INIT( scrambold );
@@ -37,14 +38,19 @@ PALETTE_INIT( minefld );
 PALETTE_INIT( stratgyx );
 PALETTE_INIT( mariner );
 PALETTE_INIT( rockclim );
+PALETTE_INIT( dambustr );
 PALETTE_INIT( turtles );
 
+VIDEO_START( dambustr );
+
 WRITE8_HANDLER( galaxold_videoram_w );
 READ8_HANDLER( galaxold_videoram_r );
 
 WRITE8_HANDLER( rockclim_videoram_w );
 WRITE8_HANDLER( rockclim_scroll_w );
 READ8_HANDLER( rockclim_videoram_r );
+WRITE8_HANDLER( dambustr_bg_split_line_w );
+WRITE8_HANDLER( dambustr_bg_color_w );
 
 WRITE8_HANDLER( galaxold_attributesram_w );
 
@@ -60,13 +66,8 @@ WRITE8_HANDLER( racknrol_tiles_bank_w );
 VIDEO_START( galaxold_plain );
 VIDEO_START( galaxold );
 VIDEO_START( mooncrst );
-VIDEO_START( mooncrgx );
-VIDEO_START( moonqsr );
-VIDEO_START( mshuttle );
 VIDEO_START( pisces );
 VIDEO_START( batman2 );
-VIDEO_START( jumpbug );
-VIDEO_START( azurian );
 VIDEO_START( dkongjrm );
 VIDEO_START( scrambold );
 VIDEO_START( theend );
@@ -75,13 +76,9 @@ VIDEO_START( rescue );
 VIDEO_START( minefld );
 VIDEO_START( stratgyx );
 VIDEO_START( mimonkey );
-VIDEO_START( turtles );
-VIDEO_START( frogger );
 VIDEO_START( mariner );
 VIDEO_START( ckongs );
-VIDEO_START( froggers );
 VIDEO_START( newsin7 );
-VIDEO_START( sfx );
 VIDEO_START( rockclim );
 VIDEO_START( drivfrcg );
 VIDEO_START( bongo );
@@ -89,7 +86,11 @@ VIDEO_START( scorpion );
 VIDEO_START( racknrol );
 VIDEO_START( ad2083 );
 
+void galaxold_init_stars(running_machine *machine, int colors_offset);
+void galaxold_draw_stars(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect);
+
 VIDEO_UPDATE( galaxold );
+VIDEO_UPDATE( dambustr );
 
 WRITE8_HANDLER( galaxold_gfxbank_w );
 WRITE8_HANDLER( galaxold_flip_screen_x_w );
@@ -98,7 +99,7 @@ WRITE8_HANDLER( gteikob2_flip_screen_x_w );
 WRITE8_HANDLER( gteikob2_flip_screen_y_w );
 
 
-/*----------- defined in machine/galaxian.c -----------*/
+/*----------- defined in machine/galaxold.c -----------*/
 
 DRIVER_INIT( zigzag );
 DRIVER_INIT( pisces );
@@ -131,8 +132,6 @@ WRITE8_HANDLER( galaxold_leds_w );
 READ8_HANDLER( scramblb_protection_1_r );
 READ8_HANDLER( scramblb_protection_2_r );
 
-READ8_HANDLER( jumpbug_protection_r );
-
 WRITE8_HANDLER( kingball_speech_dip_w );
 WRITE8_HANDLER( kingball_sound1_w );
 WRITE8_HANDLER( kingball_sound2_w );
@@ -205,18 +204,6 @@ READ8_HANDLER( hunchbks_mirror_r );
 WRITE8_HANDLER( hunchbks_mirror_w );
 
 
-
-/*----------- defined in audio/galaxian.c -----------*/
-
-extern const struct Samplesinterface galaxian_samples_interface;
-WRITE8_HANDLER( galaxian_pitch_w );
-WRITE8_HANDLER( galaxian_vol_w );
-WRITE8_HANDLER( galaxian_noise_enable_w );
-WRITE8_HANDLER( galaxian_background_enable_w );
-WRITE8_HANDLER( galaxian_shoot_enable_w );
-WRITE8_HANDLER( galaxian_lfo_freq_w );
-
-
 /*----------- defined in audio/scramble.c -----------*/
 
 void scramble_sh_init(void);
diff --git a/src/mame/includes/genesis.h b/src/mame/includes/genesis.h
index 9081160624d..5736bf86b63 100644
--- a/src/mame/includes/genesis.h
+++ b/src/mame/includes/genesis.h
@@ -51,6 +51,9 @@ VIDEO_UPDATE( megaplay );
 
 void segac2_enable_display(running_machine *machine, int enable);
 
+void system18_vdp_start(running_machine *machine);
+void system18_vdp_update(bitmap_t *bitmap, const rectangle *cliprect);
+
 READ16_HANDLER ( genesis_vdp_r );
 WRITE16_HANDLER( genesis_vdp_w );
 
diff --git a/src/mame/includes/gstriker.h b/src/mame/includes/gstriker.h
index 22494ad35bc..79e64ef1b15 100644
--- a/src/mame/includes/gstriker.h
+++ b/src/mame/includes/gstriker.h
@@ -69,4 +69,8 @@ extern tCG10103 CG10103[MAX_CG10103];
 #define CG10103_0_vram	(CG10103[0].vram)
 #define CG10103_1_vram	(CG10103[1].vram)
 
+VIDEO_UPDATE( gstriker );
+VIDEO_START( gstriker );
+VIDEO_START( twrldc94 );
+
 #endif
diff --git a/src/mame/includes/kaneko16.h b/src/mame/includes/kaneko16.h
index 164b4f8ec9f..790e83f186a 100644
--- a/src/mame/includes/kaneko16.h
+++ b/src/mame/includes/kaneko16.h
@@ -28,6 +28,10 @@ WRITE16_HANDLER( toybox_mcu_com2_w );
 WRITE16_HANDLER( toybox_mcu_com3_w );
 READ16_HANDLER( toybox_mcu_status_r );
 
+extern void (*toybox_mcu_run)(running_machine *machine);	/* one of the following */
+void bloodwar_mcu_run(running_machine *machine);
+void bonkadv_mcu_run(running_machine *machine);
+void gtmr_mcu_run(running_machine *machine);
 
 
 /*----------- defined in drivers/kaneko16.c -----------*/
@@ -103,6 +107,12 @@ VIDEO_UPDATE( kaneko16 );
 VIDEO_UPDATE( sandscrp );
 VIDEO_UPDATE( berlwall );
 
+VIDEO_START( galsnew );
+VIDEO_UPDATE( galsnew );
+
+extern UINT16* galsnew_bg_pixram;
+extern UINT16* galsnew_fg_pixram;
+
 
 /*----------- defined in drivers/galpani2.c -----------*/
 
diff --git a/src/mame/includes/megasys1.h b/src/mame/includes/megasys1.h
index 663d3550fc4..fa045578545 100644
--- a/src/mame/includes/megasys1.h
+++ b/src/mame/includes/megasys1.h
@@ -181,6 +181,15 @@ extern int megasys1_bits_per_color_code;
 
 /* Functions */
 VIDEO_START( megasys1 );
+VIDEO_UPDATE( megasys1 );
+
+PALETTE_INIT( megasys1 );
+
+READ16_HANDLER( megasys1_vregs_C_r );
+
+WRITE16_HANDLER( megasys1_vregs_A_w );
+WRITE16_HANDLER( megasys1_vregs_C_w );
+WRITE16_HANDLER( megasys1_vregs_D_w );
 
 WRITE16_HANDLER( megasys1_scrollram_0_w );
 WRITE16_HANDLER( megasys1_scrollram_1_w );
@@ -188,6 +197,7 @@ WRITE16_HANDLER( megasys1_scrollram_2_w );
 
 void megasys1_set_vreg_flag(int which, int data);
 
+
 /*----------- defined in drivers/megasys1.c -----------*/
 
 void astyanax_rom_decode(int cpu);
diff --git a/src/mame/includes/n64.h b/src/mame/includes/n64.h
index 931f64b0301..37b18bbee1f 100644
--- a/src/mame/includes/n64.h
+++ b/src/mame/includes/n64.h
@@ -5,6 +5,8 @@
 
 /*----------- defined in video/n64.c -----------*/
 
+extern int fb_width;
+
 extern VIDEO_START( n64 );
 extern VIDEO_UPDATE( n64 );
 extern void rdp_process_list(void);
@@ -48,6 +50,16 @@ extern UINT32 *rdram;
 extern UINT32 *rsp_imem;
 extern UINT32 *rsp_dmem;
 
+extern UINT32 dp_start;
+extern UINT32 dp_end;
+extern UINT32 dp_current;
+extern UINT32 dp_status;
+
+extern UINT32 n64_vi_width;
+extern UINT32 n64_vi_origin;
+extern UINT32 n64_vi_control;
+
+extern void dp_full_sync(void);
 extern void signal_rcp_interrupt(int interrupt);
 extern void clear_rcp_interrupt(int interrupt);
 
diff --git a/src/mame/includes/nitedrvr.h b/src/mame/includes/nitedrvr.h
index 4495bd7e512..717fad02940 100644
--- a/src/mame/includes/nitedrvr.h
+++ b/src/mame/includes/nitedrvr.h
@@ -25,6 +25,7 @@ WRITE8_HANDLER( nitedrvr_out0_w );
 WRITE8_HANDLER( nitedrvr_out1_w );
 
 void nitedrvr_crash_toggle(running_machine *machine);
+void nitedrvr_register_machine_vars(void);
 
 
 /*----------- defined in audio/nitedrvr.c -----------*/
@@ -35,5 +36,9 @@ DISCRETE_SOUND_EXTERN( nitedrvr );
 /*----------- defined in video/nitedrvr.c -----------*/
 
 extern UINT8 *nitedrvr_hvc;
+
 WRITE8_HANDLER( nitedrvr_hvc_w );
+WRITE8_HANDLER( nitedrvr_videoram_w );
+
+VIDEO_START( nitedrvr );
 VIDEO_UPDATE( nitedrvr );
diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h
index 16b6ce55a07..888d4553b06 100644
--- a/src/mame/includes/pgm.h
+++ b/src/mame/includes/pgm.h
@@ -24,7 +24,8 @@ void pgm_puzzli2_decrypt(void);
 /*----------- defined in machine/pgmprot.c -----------*/
 
 READ16_HANDLER (PSTARS_protram_r);
-READ16_HANDLER (PSTARS_r16);
+READ16_HANDLER ( PSTARS_r16 );
+WRITE16_HANDLER( PSTARS_w16 );
 
 READ16_HANDLER( pgm_asic3_r );
 WRITE16_HANDLER( pgm_asic3_w );
diff --git a/src/mame/includes/polepos.h b/src/mame/includes/polepos.h
index e2edb03d130..d329c0f9467 100644
--- a/src/mame/includes/polepos.h
+++ b/src/mame/includes/polepos.h
@@ -5,8 +5,48 @@
 *************************************************************************/
 
 #include "sound/discrete.h"
+#include "sound/custom.h"
 
 
 /*----------- defined in audio/polepos.c -----------*/
 
+void *polepos_sh_start(int clock, const struct CustomSound_interface *config);
+void polepos_sh_reset(void *token);
+WRITE8_HANDLER( polepos_engine_sound_lsb_w );
+WRITE8_HANDLER( polepos_engine_sound_msb_w );
+
 DISCRETE_SOUND_EXTERN( polepos );
+
+
+/*----------- defined in video/polepos.c -----------*/
+
+extern UINT16 *polepos_view16_memory;
+extern UINT16 *polepos_road16_memory;
+extern UINT16 *polepos_alpha16_memory;
+extern UINT16 *polepos_sprite16_memory;
+extern int polepos_gear_bit;
+
+VIDEO_START( polepos );
+PALETTE_INIT( polepos );
+VIDEO_UPDATE( polepos );
+
+WRITE16_HANDLER( polepos_view16_w );
+WRITE16_HANDLER( polepos_road16_w );
+WRITE16_HANDLER( polepos_alpha16_w );
+WRITE16_HANDLER( polepos_sprite16_w );
+WRITE8_HANDLER( polepos_view_w );
+WRITE8_HANDLER( polepos_road_w );
+WRITE8_HANDLER( polepos_alpha_w );
+WRITE8_HANDLER( polepos_sprite_w );
+WRITE8_HANDLER( polepos_chacl_w );
+
+READ16_HANDLER( polepos_view16_r );
+READ16_HANDLER( polepos_road16_r );
+READ16_HANDLER( polepos_alpha16_r );
+READ16_HANDLER( polepos_sprite16_r );
+READ8_HANDLER( polepos_view_r );
+READ8_HANDLER( polepos_road_r );
+READ8_HANDLER( polepos_alpha_r );
+READ8_HANDLER( polepos_sprite_r );
+WRITE16_HANDLER( polepos_view16_hscroll_w );
+WRITE16_HANDLER( polepos_road16_vscroll_w );
diff --git a/src/mame/includes/segag80r.h b/src/mame/includes/segag80r.h
index 4e5d607a227..d8be50df753 100644
--- a/src/mame/includes/segag80r.h
+++ b/src/mame/includes/segag80r.h
@@ -25,8 +25,6 @@ WRITE8_HANDLER( sega005_sound_b_w );
 
 WRITE8_HANDLER( spaceod_sound_w );
 
- READ8_HANDLER( monsterb_audio_8255_r );
-
 
 /*----------- defined in video/segag80r.c -----------*/
 
diff --git a/src/mame/includes/snes.h b/src/mame/includes/snes.h
index 0d75e70a53c..e27c9c4c92c 100644
--- a/src/mame/includes/snes.h
+++ b/src/mame/includes/snes.h
@@ -351,6 +351,9 @@
 
 /*----------- defined in machine/snes.c -----------*/
 
+extern DRIVER_INIT( snes );
+extern DRIVER_INIT( snes_hirom );
+
 extern MACHINE_START( snes );
 extern MACHINE_RESET( snes );
 
diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h
index bd9abac85e6..13c52746a3f 100644
--- a/src/mame/includes/taito_f2.h
+++ b/src/mame/includes/taito_f2.h
@@ -53,3 +53,9 @@ extern UINT16 *cchip2_ram;
 READ16_HANDLER ( cchip2_word_r );
 WRITE16_HANDLER( cchip2_word_w );
 
+MACHINE_RESET( cchip1 );
+READ16_HANDLER( cchip1_ctrl_r );
+READ16_HANDLER( cchip1_ram_r );
+WRITE16_HANDLER( cchip1_ctrl_w );
+WRITE16_HANDLER( cchip1_bank_w );
+WRITE16_HANDLER( cchip1_ram_w );
diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h
index 465c6254758..128a23fbf6a 100644
--- a/src/mame/includes/tatsumi.h
+++ b/src/mame/includes/tatsumi.h
@@ -1,5 +1,7 @@
 /*----------- defined in drivers/tatsumi.c -----------*/
 
+extern UINT16 bigfight_a40000[2];
+
 extern UINT8* tatsumi_rom_sprite_lookup1;
 extern UINT8* tatsumi_rom_sprite_lookup2;
 extern UINT8* tatsumi_rom_clut0;
diff --git a/src/mame/machine/deco156.c b/src/mame/machine/deco156.c
index d589638c7fb..132dcf25e98 100644
--- a/src/mame/machine/deco156.c
+++ b/src/mame/machine/deco156.c
@@ -31,6 +31,7 @@
 */
 
 #include "driver.h"
+#include "includes/decocrpt.h"
 
 
 static void decrypt(UINT32 *src, UINT32 *dst, int length)
diff --git a/src/mame/machine/gaelcrpt.c b/src/mame/machine/gaelcrpt.c
index e60d2a51b3e..eccaf8a8689 100644
--- a/src/mame/machine/gaelcrpt.c
+++ b/src/mame/machine/gaelcrpt.c
@@ -7,6 +7,7 @@ Thanks to GAELCO SA for information on the algorithm.
 */
 
 #include "driver.h"
+#include "includes/gaelcrpt.h"
 
 static int decrypt(int const param1, int const param2, int const enc_prev_word, int const dec_prev_word, int const enc_word)
 {
diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c
index 15475d80ab5..6270555f65c 100644
--- a/src/mame/machine/kaneko16.c
+++ b/src/mame/machine/kaneko16.c
@@ -541,10 +541,7 @@ probably the MCU model string, so this one should be in internal MCU ROM (anothe
 TODO: look at this one since this remark is only driver-based.
 */
 
-void (*toybox_mcu_run)(running_machine *machine);	/* One of the following */
-void bloodwar_mcu_run(running_machine *machine);
-void bonkadv_mcu_run(running_machine *machine);
-void gtmr_mcu_run(running_machine *machine);
+void (*toybox_mcu_run)(running_machine *machine);
 
 static UINT16 toybox_mcu_com[4];
 
diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c
index 9d1a5e6182d..441049be8de 100644
--- a/src/mame/machine/n64.c
+++ b/src/mame/machine/n64.c
@@ -27,8 +27,6 @@ static UINT32 mi_version;
 static UINT32 mi_interrupt = 0;
 static UINT32 mi_intr_mask = 0;
 
-extern int fb_width;
-
 void signal_rcp_interrupt(int interrupt)
 {
 	if (mi_intr_mask & interrupt)
diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c
index 2cabab7b0f9..6065b7c93a9 100644
--- a/src/mame/machine/scramble.c
+++ b/src/mame/machine/scramble.c
@@ -37,7 +37,7 @@ MACHINE_RESET( sfx )
 	sfx_sh_init();
 }
 
-int monsterz_count = 0;
+static int monsterz_count = 0;
 MACHINE_RESET( monsterz )
 {
 /*
diff --git a/src/mame/machine/scudsp.c b/src/mame/machine/scudsp.c
index 27c9c408b3c..6f5729df3b0 100644
--- a/src/mame/machine/scudsp.c
+++ b/src/mame/machine/scudsp.c
@@ -53,6 +53,7 @@ Changelog:
 #include "deprecat.h"
 #include "machine/scudsp.h"
 #include "osd_cpu.h"
+#include "sound/scsp.h"
 
 /*DSP macros*/
 #define PRF ((stv_scu[32] & 0x04000000) >> 26)
@@ -104,8 +105,6 @@ static struct {
 	   UINT32 internal_prg[0x100];
 } dsp_reg;
 
-extern UINT32* stv_scu;
-
 static UINT32 opcode;
 static UINT8 update_mul = 0;
 
diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c
index c7d29032012..b213a360e23 100644
--- a/src/mame/machine/seicop.c
+++ b/src/mame/machine/seicop.c
@@ -76,7 +76,7 @@ extern void heatbrl_setgfxbank(UINT16 data);
 extern void denjinmk_setgfxbank(UINT16 data);
 extern UINT16 legionna_layer_disable;
 
-void copd2_set_tableoffset(UINT16 data, running_machine *machine)
+static void copd2_set_tableoffset(UINT16 data, running_machine *machine)
 {
 	logerror("mcu_offs %04x\n", data);
 	copd2_offs = data;
@@ -125,7 +125,7 @@ void copd2_set_tableoffset(UINT16 data, running_machine *machine)
 
 }
 
-void copd2_set_tabledata(UINT16 data, running_machine *machine)
+static void copd2_set_tabledata(UINT16 data, running_machine *machine)
 {
 	copd2_table[copd2_offs] = data;
 	logerror("mcu_data %04x\n", data);
diff --git a/src/mame/machine/wrally.c b/src/mame/machine/wrally.c
index 6adabe550b6..4d1ec6d1716 100644
--- a/src/mame/machine/wrally.c
+++ b/src/mame/machine/wrally.c
@@ -54,7 +54,7 @@ WRITE16_HANDLER( wrally_coin_lockout_w )
 }
 
 /* Converts memory offsets to the format expected by the Dallas */
-READ32_HANDLER( wrally_external_ram_iaddr )
+static READ32_HANDLER( wrally_external_ram_iaddr )
 {
 	return offset ^= 0x0001;
 }
diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c
index 809aea0c4a3..2814692c5b9 100644
--- a/src/mame/video/arkanoid.c
+++ b/src/mame/video/arkanoid.c
@@ -10,7 +10,6 @@
 #include "includes/arkanoid.h"
 
 static UINT8 gfxbank, palettebank;
-extern UINT8 arkanoid_paddle_select;
 
 static tilemap *bg_tilemap;
 
diff --git a/src/mame/video/fastfred.c b/src/mame/video/fastfred.c
index 2fa48d4c729..7d4cc7632ea 100644
--- a/src/mame/video/fastfred.c
+++ b/src/mame/video/fastfred.c
@@ -9,10 +9,7 @@
 #include "driver.h"
 #include "video/resnet.h"
 #include "fastfred.h"
-
-extern UINT8 galaxold_stars_on;
-void galaxold_init_stars(running_machine *machine, int colors_offset);
-void galaxold_draw_stars(running_machine *machine, bitmap_t *bitmap);
+#include "includes/galaxold.h"
 
 UINT8 *fastfred_videoram;
 UINT8 *fastfred_spriteram;
@@ -390,7 +387,7 @@ VIDEO_START( imago )
 VIDEO_UPDATE( imago )
 {
 	tilemap_draw(bitmap,cliprect,web_tilemap,0,0);
-	galaxold_draw_stars(screen->machine, bitmap);
+	galaxold_draw_stars(screen->machine, bitmap, cliprect);
 	tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
 	draw_sprites(screen->machine, bitmap, cliprect);
 	tilemap_draw(bitmap,cliprect,fg_tilemap,0,0);
diff --git a/src/mame/video/gticlub.h b/src/mame/video/gticlub.h
index 104344048e6..a40f4a3cf91 100644
--- a/src/mame/video/gticlub.h
+++ b/src/mame/video/gticlub.h
@@ -10,3 +10,6 @@ READ32_HANDLER(K001006_0_r);
 WRITE32_HANDLER(K001006_0_w);
 READ32_HANDLER(K001006_1_r);
 WRITE32_HANDLER(K001006_1_w);
+
+VIDEO_START( gticlub );
+VIDEO_UPDATE( gticlub );
diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c
index 8d27b13313b..71e01ea6fcd 100644
--- a/src/mame/video/metro.c
+++ b/src/mame/video/metro.c
@@ -125,11 +125,13 @@ static TILEMAP_MAPPER( tilemap_scan_gstrik2 )
 
 ***************************************************************************/
 
+#ifdef UNUSED_FUNCTION
 WRITE16_HANDLER( metro_paletteram_w )
 {
 	data = COMBINE_DATA(&paletteram16[offset]);
 	palette_set_color_rgb(machine,offset,pal5bit(data >> 6),pal5bit(data >> 11),pal5bit(data >> 1));
 }
+#endif
 
 
 /***************************************************************************
diff --git a/src/mame/video/n64.c b/src/mame/video/n64.c
index 5ac90e4a135..6a8a0c45e03 100644
--- a/src/mame/video/n64.c
+++ b/src/mame/video/n64.c
@@ -11,20 +11,6 @@
 static FILE *rdp_exec;
 #endif
 
-/* defined in systems/n64.c */
-extern UINT32 *rdram;
-extern UINT32 *rsp_imem;
-extern UINT32 *rsp_dmem;
-extern void dp_full_sync(void);
-
-extern UINT32 n64_vi_origin;
-extern UINT32 n64_vi_control;
-
-extern UINT32 dp_start;
-extern UINT32 dp_end;
-extern UINT32 dp_current;
-extern UINT32 dp_status;
-
 static UINT32 rdp_cmd_data[0x1000];
 static int rdp_cmd_ptr = 0;
 static int rdp_cmd_cur = 0;
diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c
index 722db8f2bdc..bd36b3cddaf 100644
--- a/src/mame/video/namcona1.c
+++ b/src/mame/video/namcona1.c
@@ -15,8 +15,8 @@ TODO:
 UINT16 *namcona1_vreg;
 UINT16 *namcona1_scroll;
 UINT16 *namcona1_workram;
-UINT16 *namcona1_sparevram;
-UINT16 *namcona1_pixmap;
+//UINT16 *namcona1_sparevram;
+//UINT16 *namcona1_pixmap;
 
 /* private variables */
 static char *dirtychar;
diff --git a/src/mame/video/polepos.c b/src/mame/video/polepos.c
index bb2ff504d58..aede53bc9d0 100644
--- a/src/mame/video/polepos.c
+++ b/src/mame/video/polepos.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "includes/polepos.h"
 
 UINT16 *polepos_view16_memory;
 UINT16 *polepos_road16_memory;
diff --git a/src/mame/video/segas18.c b/src/mame/video/segas18.c
index 1f387932b3b..213bbce9497 100644
--- a/src/mame/video/segas18.c
+++ b/src/mame/video/segas18.c
@@ -6,6 +6,7 @@
 
 #include "driver.h"
 #include "segaic16.h"
+#include "includes/genesis.h"
 #include "includes/system16.h"
 
 
@@ -34,17 +35,6 @@ static UINT8 vdp_mixing;
 
 
 
-/*************************************
- *
- *  Prototypes
- *
- *************************************/
-
-void system18_vdp_start(running_machine *machine);
-void system18_vdp_update(bitmap_t *bitmap, const rectangle *cliprect);
-
-
-
 /*************************************
  *
  *  Video startup
diff --git a/src/mame/video/slapshot.c b/src/mame/video/slapshot.c
index 3a1b5101595..de1c6126255 100644
--- a/src/mame/video/slapshot.c
+++ b/src/mame/video/slapshot.c
@@ -4,8 +4,6 @@
 #define TC0480SCP_GFX_NUM 1
 #define TC0100SCN_GFX_NUM 1
 
-extern UINT8 TC0360PRI_regs[16];
-
 struct tempsprite
 {
 	int gfx;
diff --git a/src/mame/video/snk.c b/src/mame/video/snk.c
index d36c81eba58..42b7e2d91bc 100644
--- a/src/mame/video/snk.c
+++ b/src/mame/video/snk.c
@@ -238,7 +238,7 @@ VIDEO_UPDATE( tnk3 )
 	return 0;
 }
 
-void athena_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int xscroll, int yscroll )
+static void athena_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect, int xscroll, int yscroll )
 {
 	const gfx_element *gfx = machine->gfx[2];
 
diff --git a/src/mame/video/stvvdp1.c b/src/mame/video/stvvdp1.c
index d5757429f34..996660bc5a2 100644
--- a/src/mame/video/stvvdp1.c
+++ b/src/mame/video/stvvdp1.c
@@ -18,6 +18,7 @@ Framebuffer todo:
 
 #include "driver.h"
 #include "deprecat.h"
+#include "sound/scsp.h"
 
 static int vdp1_sprite_log = 0;
 
@@ -25,7 +26,6 @@ UINT32 *stv_vdp1_vram;
 static UINT32 *stv_vdp1_regs;
 UINT8* stv_vdp1_gfx_decode;
 
-extern UINT32 *stv_scu;
 extern int stv_vblank;
 
 static UINT16	 *stv_framebuffer[2];
@@ -1766,7 +1766,7 @@ static void stv_vpd1_draw_normal_sprite(const rectangle *cliprect, int sprite_ty
 	}
 }
 
-void stv_vdp1_process_list()
+static void stv_vdp1_process_list()
 {
 	int position;
 	int spritecount;
diff --git a/src/mame/video/system16.c b/src/mame/video/system16.c
index ae7ad52ad77..a0756218f88 100644
--- a/src/mame/video/system16.c
+++ b/src/mame/video/system16.c
@@ -91,16 +91,9 @@ type1       type0           function
 #include "driver.h"
 #include "system16.h"
 #include "video/resnet.h"
+#include "includes/genesis.h"
 
-/* video/segac2.c */
-void system18_vdp_update( bitmap_t *bitmap, const rectangle *cliprect );
-void system18_vdp_start(running_machine *machine);
-READ16_HANDLER( segac2_vdp_r );
-WRITE16_HANDLER( segac2_vdp_w );
-UINT16 sys18_ddcrew_bankregs[0x20];
-
-
-
+static UINT16 sys18_ddcrew_bankregs[0x20];
 
 /* callback to poll video registers */
 void (* sys16_update_proc)( void );
diff --git a/src/mame/video/taito_f2.c b/src/mame/video/taito_f2.c
index 1ac3bda226d..8099032dfa7 100644
--- a/src/mame/video/taito_f2.c
+++ b/src/mame/video/taito_f2.c
@@ -7,8 +7,6 @@
 #define TC0280GRD_GFX_NUM 2
 #define TC0430GRW_GFX_NUM 2
 
-extern UINT8 TC0360PRI_regs[16];
-
 struct tempsprite
 {
 	int code,color;
diff --git a/src/mame/video/taito_h.c b/src/mame/video/taito_h.c
index aba75e10af8..85d520c1fbd 100644
--- a/src/mame/video/taito_h.c
+++ b/src/mame/video/taito_h.c
@@ -49,12 +49,6 @@ sprite RAM
 #include "taitoic.h"
 
 
-extern UINT16	*TC0080VCO_chain_ram_0;
-extern UINT16	*TC0080VCO_chain_ram_1;
-extern UINT16	*TC0080VCO_spriteram;
-extern UINT16	*TC0080VCO_scroll_ram;
-extern int		TC0080VCO_flipscreen;
-
 /* These are hand-tuned values */
 static const int zoomy_conv_table[] =
 {
diff --git a/src/mame/video/taitoair.c b/src/mame/video/taitoair.c
index 8892219b4d6..ea8958bc744 100644
--- a/src/mame/video/taitoair.c
+++ b/src/mame/video/taitoair.c
@@ -49,12 +49,6 @@ sprite RAM
 #include "taitoic.h"
 
 
-extern UINT16	*TC0080VCO_chain_ram_0;
-extern UINT16	*TC0080VCO_chain_ram_1;
-extern UINT16	*TC0080VCO_spriteram;
-extern UINT16	*TC0080VCO_scroll_ram;
-extern int		TC0080VCO_flipscreen;
-
 /* These are hand-tuned values */
 static const int zoomy_conv_table[] =
 {
diff --git a/src/mame/video/taitoic.h b/src/mame/video/taitoic.h
index e148264f521..bb8393a29cd 100644
--- a/src/mame/video/taitoic.h
+++ b/src/mame/video/taitoic.h
@@ -4,6 +4,14 @@
 
 extern const int TC0100SCN_SINGLE_VDU;	/* value set in taitoic.c */
 
+extern UINT8 TC0360PRI_regs[16];
+
+extern UINT16	*TC0080VCO_chain_ram_0;
+extern UINT16	*TC0080VCO_chain_ram_1;
+extern UINT16	*TC0080VCO_spriteram;
+extern UINT16	*TC0080VCO_scroll_ram;
+extern int	TC0080VCO_flipscreen;
+
 int number_of_TC0100SCN(void);
 int has_TC0110PCR(void);
 int has_second_TC0110PCR(void);
diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c
index d9f1de8cc57..1e8799d4eca 100644
--- a/src/mame/video/tatsumi.c
+++ b/src/mame/video/tatsumi.c
@@ -11,12 +11,10 @@ UINT16 *cyclwarr_videoram0, *cyclwarr_videoram1;
 UINT16* tatsumi_sprite_control_ram;
 static UINT16* roundup5_vram;
 
-extern UINT16 bigfight_a40000[2];
 static UINT16 bigfight_bank, bigfight_last_bank;
 
 static UINT8 roundupt_crt_selected_reg;
 static UINT8 roundupt_crt_reg[64];
-extern UINT16 debugA,debugB,debugC,debugD;
 
 static UINT8* shadow_pen_array;