From c8608dcc22da4caee2b94263d0944def10d050db Mon Sep 17 00:00:00 2001
From: Phil Bennett <philipjbennett@users.noreply.github.com>
Date: Tue, 8 Dec 2009 14:54:29 +0000
Subject: [PATCH] Cleaned-up several drivers; added missing prototypes and
 removed dead ones, marked non-exported functions as static and removed cases
 of #include "deprecat.h" [Atari Ace]

---------- Forwarded message ----------
From: Atari Ace <atari_ace@verizon.net>

Date: Sat, Dec 5, 2009 at 7:18 AM
Subject: [patch] Header cleanups
To: submit@mamedev.org
Cc: atariace@hotmail.com

Hi mamedev,

This patch improves the quality of the mame driver headers, by adding
missing prototypes and source comments, removing dead prototypes, and
marking some non-exported functions as static within the drivers.  It
also eliminates about a dozen cases of #include "deprecat.h".

~aa
---
 src/emu/cpu/esrip/esrip.c     |  1 -
 src/emu/cpu/tms0980/tms0980.c |  1 -
 src/emu/drawgfx.c             |  1 -
 src/emu/mame.c                |  1 -
 src/emu/sound/rf5c400.c       |  4 ++--
 src/emu/video.c               |  1 -
 src/mame/drivers/bnstars.c    |  3 +++
 src/mame/drivers/boxer.c      |  2 +-
 src/mame/drivers/btime.c      |  6 +++---
 src/mame/drivers/destroyr.c   |  2 +-
 src/mame/drivers/diverboy.c   |  4 ++--
 src/mame/drivers/dotrikun.c   |  4 ++--
 src/mame/drivers/dynax.c      |  2 +-
 src/mame/drivers/flyball.c    |  4 ++--
 src/mame/drivers/gal3.c       |  1 -
 src/mame/drivers/himesiki.c   |  1 -
 src/mame/drivers/hng64.c      |  2 +-
 src/mame/drivers/konamigx.c   | 26 -------------------------
 src/mame/drivers/maygayv1.c   |  1 -
 src/mame/drivers/ms32.c       | 13 -------------
 src/mame/drivers/nbmj8900.c   |  4 ++--
 src/mame/drivers/othello.c    |  3 +--
 src/mame/drivers/sauro.c      |  1 -
 src/mame/drivers/scregg.c     |  2 +-
 src/mame/drivers/seta.c       |  2 +-
 src/mame/drivers/skimaxx.c    | 16 ++++++++--------
 src/mame/drivers/sub.c        |  6 +++---
 src/mame/drivers/toaplan2.c   | 10 +++++-----
 src/mame/drivers/turrett.c    |  1 -
 src/mame/drivers/vball.c      |  1 -
 src/mame/drivers/xain.c       |  1 -
 src/mame/includes/ashnojoe.h  |  2 +-
 src/mame/includes/bogeyman.h  |  2 +-
 src/mame/includes/bombjack.h  |  2 +-
 src/mame/includes/btime.h     |  2 --
 src/mame/includes/cop01.h     |  2 +-
 src/mame/includes/dc.h        |  1 +
 src/mame/includes/galaxian.h  |  2 ++
 src/mame/includes/hng64.h     |  9 +++++----
 src/mame/includes/konamigx.h  | 32 ++++++++++++++++++++++++++++++-
 src/mame/includes/mappy.h     |  3 ---
 src/mame/includes/ms32.h      | 21 ++++++++++++++++----
 src/mame/includes/pandoras.h  |  3 ++-
 src/mame/includes/tetrisp2.h  |  1 +
 src/mame/includes/yunsun16.h  |  2 +-
 src/mame/includes/zerozone.h  |  2 ++
 src/mame/machine/n64.c        | 18 +++++++++---------
 src/mame/video/hng64.c        | 36 +++++++++++++++++------------------
 src/mame/video/konamigx.c     |  4 ++--
 src/mame/video/ladyfrog.c     |  2 +-
 src/mame/video/ms32.c         |  8 ++++----
 src/mame/video/n64.c          |  6 ++++--
 src/mame/video/nbmj8900.c     |  2 ++
 src/mame/video/vball.c        |  1 -
 54 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/src/emu/cpu/esrip/esrip.c b/src/emu/cpu/esrip/esrip.c
index 277893e1d39..a2a6bae9ac9 100644
--- a/src/emu/cpu/esrip/esrip.c
+++ b/src/emu/cpu/esrip/esrip.c
@@ -8,7 +8,6 @@
 ***************************************************************************/
 
 #include "debugger.h"
-#include "deprecat.h"
 #include "esrip.h"
 
 CPU_DISASSEMBLE( esrip );
diff --git a/src/emu/cpu/tms0980/tms0980.c b/src/emu/cpu/tms0980/tms0980.c
index 132b6e29fec..a123168341a 100644
--- a/src/emu/cpu/tms0980/tms0980.c
+++ b/src/emu/cpu/tms0980/tms0980.c
@@ -121,7 +121,6 @@ unknown cycle: CME, SSE, SSS
 
 #include "debugger.h"
 #include "tms0980.h"
-#include "deprecat.h"
 
 #define LOG					0
 
diff --git a/src/emu/drawgfx.c b/src/emu/drawgfx.c
index 0a199997a20..b2ecf54a236 100644
--- a/src/emu/drawgfx.c
+++ b/src/emu/drawgfx.c
@@ -11,7 +11,6 @@
 
 #include "driver.h"
 #include "drawgfxm.h"
-#include "deprecat.h"
 
 
 /***************************************************************************
diff --git a/src/emu/mame.c b/src/emu/mame.c
index 90f8b9c8fa2..c429a91b0c9 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -85,7 +85,6 @@
 #include "uimenu.h"
 #include "uiinput.h"
 #include "streams.h"
-#include "deprecat.h"
 #include "debug/debugcon.h"
 
 #include <stdarg.h>
diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c
index aa9c7322b97..b6d7342aafd 100644
--- a/src/emu/sound/rf5c400.c
+++ b/src/emu/sound/rf5c400.c
@@ -451,11 +451,11 @@ WRITE16_DEVICE_HANDLER( rf5c400_w )
 
 			default:
 			{
-				//mame_printf_debug("%s:rf5c400_w: %08X, %08X, %08X\n", cpuexec_describe_context(Machine), data, offset, mem_mask);
+				//mame_printf_debug("%s:rf5c400_w: %08X, %08X, %08X\n", cpuexec_describe_context(device->machine), data, offset, mem_mask);
 				break;
 			}
 		}
-		//mame_printf_debug("%s:rf5c400_w: %08X, %08X, %08X at %08X\n", cpuexec_describe_context(Machine), data, offset, mem_mask);
+		//mame_printf_debug("%s:rf5c400_w: %08X, %08X, %08X at %08X\n", cpuexec_describe_context(device->machine), data, offset, mem_mask);
 	}
 	else
 	{
diff --git a/src/emu/video.c b/src/emu/video.c
index 2a8de8aba7a..5e35b88dac4 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -16,7 +16,6 @@
 #include "rendutil.h"
 #include "ui.h"
 #include "aviio.h"
-#include "deprecat.h"
 
 #include "snap.lh"
 
diff --git a/src/mame/drivers/bnstars.c b/src/mame/drivers/bnstars.c
index b66cc659738..94c500853c0 100644
--- a/src/mame/drivers/bnstars.c
+++ b/src/mame/drivers/bnstars.c
@@ -96,6 +96,9 @@ ROMs    : MR96004-10.1  [125661cd] (IC5 - Samples)
 
 #define ms32_roz_ctrl bnstars_roz_ctrl
 #define ms32_spram bnstars_spram
+#define ms32_tx_tilemap bnstars_tx_tilemap
+#define ms32_bg_tilemap bnstars_bg_tilemap
+#define ms32_roz_tilemap bnstars_tx_tilemap
 
 static tilemap *ms32_tx_tilemap[2];
 static tilemap *ms32_bg_tilemap[2];
diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c
index 55856a5f126..a8dd86fe977 100644
--- a/src/mame/drivers/boxer.c
+++ b/src/mame/drivers/boxer.c
@@ -154,7 +154,7 @@ static void draw_boxer( running_machine *machine, bitmap_t* bitmap, const rectan
 }
 
 
-VIDEO_UPDATE( boxer )
+static VIDEO_UPDATE( boxer )
 {
 	boxer_state *state = (boxer_state *)screen->machine->driver_data;
 	int i, j;
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 5c18dc9df37..dbca222d5e5 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -1448,7 +1448,7 @@ static MACHINE_START( mmonkey )
 	state_save_register_global(machine, state->protection_ret);
 }
 
-MACHINE_RESET( btime )
+static MACHINE_RESET( btime )
 {
 	btime_state *state = (btime_state *)machine->driver_data;
 
@@ -1465,7 +1465,7 @@ MACHINE_RESET( btime )
 	state->audio_nmi_state = 0;
 }
 
-MACHINE_RESET( lnc )
+static MACHINE_RESET( lnc )
 {
 	btime_state *state = (btime_state *)machine->driver_data;
 	*state->lnc_charbank = 1;
@@ -1473,7 +1473,7 @@ MACHINE_RESET( lnc )
 	MACHINE_RESET_CALL(btime);
 }
 
-MACHINE_RESET( mmonkey )
+static MACHINE_RESET( mmonkey )
 {
 	btime_state *state = (btime_state *)machine->driver_data;
 
diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c
index 91b2e51e5c0..4c003c76ab6 100644
--- a/src/mame/drivers/destroyr.c
+++ b/src/mame/drivers/destroyr.c
@@ -33,7 +33,7 @@ struct _destroyr_state
 };
 
 
-VIDEO_UPDATE( destroyr )
+static VIDEO_UPDATE( destroyr )
 {
 	destroyr_state *state = (destroyr_state *)screen->machine->driver_data;
 	int i, j;
diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c
index be2f3c907a5..72a094dc130 100644
--- a/src/mame/drivers/diverboy.c
+++ b/src/mame/drivers/diverboy.c
@@ -66,7 +66,7 @@ struct _diverboy_state
 };
 
 
-VIDEO_START(diverboy)
+static VIDEO_START(diverboy)
 {
 }
 
@@ -106,7 +106,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect
 	}
 }
 
-VIDEO_UPDATE(diverboy)
+static VIDEO_UPDATE(diverboy)
 {
 //  bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine));
 	draw_sprites(screen->machine, bitmap, cliprect);
diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c
index ba9c3eb484b..7d65a38a382 100644
--- a/src/mame/drivers/dotrikun.c
+++ b/src/mame/drivers/dotrikun.c
@@ -42,7 +42,7 @@ struct _dotrikun_state
  *
  *************************************/
 
-WRITE8_HANDLER( dotrikun_color_w )
+static WRITE8_HANDLER( dotrikun_color_w )
 {
 	dotrikun_state *state = (dotrikun_state *)space->machine->driver_data;
 	video_screen_update_partial(space->machine->primary_screen, video_screen_get_vpos(space->machine->primary_screen));
@@ -50,7 +50,7 @@ WRITE8_HANDLER( dotrikun_color_w )
 }
 
 
-VIDEO_UPDATE( dotrikun )
+static VIDEO_UPDATE( dotrikun )
 {
 	dotrikun_state *state = (dotrikun_state *)screen->machine->driver_data;
 	int offs;
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index b41cda795bd..8dfecdf070e 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -608,7 +608,7 @@ static WRITE8_HANDLER( hjingi_hopper_w )
 	hjingi_hopper = data & 0x01;
 }
 
-UINT8 hjingi_hopper_bit(running_machine *machine)
+static UINT8 hjingi_hopper_bit(running_machine *machine)
 {
 	return (hjingi_hopper && !(video_screen_get_frame_number(machine->primary_screen)%10)) ? 0 : (1<<6);
 }
diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c
index adde5f61713..6baa76d302b 100644
--- a/src/mame/drivers/flyball.c
+++ b/src/mame/drivers/flyball.c
@@ -66,14 +66,14 @@ static TILE_GET_INFO( flyball_get_tile_info )
 }
 
 
-VIDEO_START( flyball )
+static VIDEO_START( flyball )
 {
 	flyball_state *state = (flyball_state *)machine->driver_data;
 	state->tmap = tilemap_create(machine, flyball_get_tile_info, flyball_get_memory_offset, 8, 16, 32, 16);
 }
 
 
-VIDEO_UPDATE( flyball )
+static VIDEO_UPDATE( flyball )
 {
 	flyball_state *state = (flyball_state *)screen->machine->driver_data;
 	int pitcherx = state->pitcher_horz;
diff --git a/src/mame/drivers/gal3.c b/src/mame/drivers/gal3.c
index 9b316b1d549..84243ac9ed4 100644
--- a/src/mame/drivers/gal3.c
+++ b/src/mame/drivers/gal3.c
@@ -126,7 +126,6 @@ better notes (complete chip lists) for each board still needed
 
 #include "driver.h"
 #include "cpu/m68000/m68000.h"
-#include "deprecat.h"
 #include "namcos2.h"
 #include "cpu/tms32025/tms32025.h"
 #include "namcoic.h"
diff --git a/src/mame/drivers/himesiki.c b/src/mame/drivers/himesiki.c
index b20de1398f0..68ee24046b4 100644
--- a/src/mame/drivers/himesiki.c
+++ b/src/mame/drivers/himesiki.c
@@ -83,7 +83,6 @@ A                                                   12.000MHz
 */
 
 #include "driver.h"
-#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/2203intf.h"
 #include "includes/himesiki.h"
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index 645b9f075f8..c388244e43a 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -1670,7 +1670,7 @@ static DRIVER_INIT( hng64_reorder_gfx )
 
 
 #ifdef HACK_REGION
-void hng64_patch_bios_region(running_machine* machine, int region)
+static void hng64_patch_bios_region(running_machine* machine, int region)
 {
 	UINT8 *rom = memory_region(machine, "user1");
 
diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c
index 502a6e37a46..cfe7cec00b3 100644
--- a/src/mame/drivers/konamigx.c
+++ b/src/mame/drivers/konamigx.c
@@ -109,31 +109,10 @@
 
 #define GX_DEBUG     0
 
-VIDEO_START(konamigx_5bpp);
-VIDEO_START(konamigx_6bpp);
-VIDEO_START(konamigx_6bpp_2);
-VIDEO_START(konamigx_type3);
-VIDEO_START(konamigx_type4);
-VIDEO_START(konamigx_type4_sd2);
-VIDEO_START(le2);
-VIDEO_START(dragoonj);
-VIDEO_START(winspike);
-VIDEO_START(opengolf);
-VIDEO_START(racinfrc);
-VIDEO_UPDATE(konamigx);
-
 static MACHINE_START(konamigx);
 static MACHINE_RESET(konamigx);
 
-WRITE32_HANDLER( konamigx_palette_w );
-WRITE32_HANDLER( konamigx_palette2_w );
-WRITE32_HANDLER( konamigx_555_palette_w );
-WRITE32_HANDLER( konamigx_555_palette2_w );
-WRITE32_HANDLER( konamigx_tilebank_w );
-
 UINT32 *gx_psacram, *gx_subpaletteram32;
-WRITE32_HANDLER( konamigx_t1_psacmap_w );
-WRITE32_HANDLER( konamigx_t4_psacmap_w );
 
 static int konamigx_cfgport;
 
@@ -702,8 +681,6 @@ static INTERRUPT_GEN(konamigx_vbinterrupt)
 	dmastart_callback(0);
 }
 
-extern int konamigx_current_frame;
-
 static INTERRUPT_GEN(konamigx_vbinterrupt_type4)
 {
 	// lift idle suspension
@@ -1242,9 +1219,6 @@ static ADDRESS_MAP_START( gx_type2_map, ADDRESS_SPACE_PROGRAM, 32 )
 	AM_IMPORT_FROM(gx_base_memmap)
 ADDRESS_MAP_END
 
-extern WRITE32_HANDLER( konamigx_type3_psac2_bank_w );
-extern UINT32* konamigx_type3_psac2_bank;
-
 static ADDRESS_MAP_START( gx_type3_map, ADDRESS_SPACE_PROGRAM, 32 )
 	AM_RANGE(0xd90000, 0xd97fff) AM_RAM
 	//AM_RANGE(0xcc0000, 0xcc0007) AM_WRITE(type4_prot_w)
diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c
index 58e2d0fd3ef..1ac8f5745be 100644
--- a/src/mame/drivers/maygayv1.c
+++ b/src/mame/drivers/maygayv1.c
@@ -133,7 +133,6 @@ Find lamps/reels after UPD changes.
 #include "sound/2413intf.h"
 #include "sound/upd7759.h"
 
-//#include "deprecat.h"
 
 /*************************************
  *
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index 48d91f26fed..25a56a79d62 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -244,16 +244,6 @@ static WRITE32_HANDLER( reset_sub_w )
 /********** MEMORY MAP **********/
 
 
-extern tilemap *ms32_tx_tilemap, *ms32_roz_tilemap, *ms32_bg_tilemap, *ms32_bg_tilemap_alt;
-extern UINT8* ms32_priram_8;
-extern UINT16* ms32_palram_16;
-extern UINT16* ms32_rozram_16;
-extern UINT16* ms32_lineram_16;
-extern UINT16* ms32_sprram_16;
-extern UINT16* ms32_txram_16;
-extern UINT16* ms32_bgram_16;
-extern UINT32 ms32_tilemaplayoutcontrol;
-
 static READ8_HANDLER(   ms32_nvram_r8 )    { return ms32_nvram_8[offset]; }
 static WRITE8_HANDLER(  ms32_nvram_w8 )    { ms32_nvram_8[offset] = data; }
 static READ8_HANDLER(   ms32_priram_r8 )   { return ms32_priram_8[offset]; }
@@ -324,9 +314,6 @@ ADDRESS_MAP_END
 /* F1 Super Battle has an extra linemap for the road, and am unknown maths chip (mcu?) handling perspective calculations for the road / corners etc. */
 /* it should use it's own memory map */
 
-extern UINT16* f1superb_extraram_16;
-extern tilemap* ms32_extra_tilemap;
-
 static WRITE16_HANDLER( ms32_extra_w16 )  { COMBINE_DATA(&f1superb_extraram_16[offset]); tilemap_mark_tile_dirty(ms32_extra_tilemap,offset/2); }
 static READ16_HANDLER(  ms32_extra_r16 )  { return f1superb_extraram_16[offset]; }
 
diff --git a/src/mame/drivers/nbmj8900.c b/src/mame/drivers/nbmj8900.c
index ec0db9d6f52..357c6498e11 100644
--- a/src/mame/drivers/nbmj8900.c
+++ b/src/mame/drivers/nbmj8900.c
@@ -158,7 +158,7 @@ static ADDRESS_MAP_START( ohpaipee_io_map, ADDRESS_SPACE_IO, 8 )
 ADDRESS_MAP_END
 
 
-INPUT_PORTS_START( ohpaipee )
+static INPUT_PORTS_START( ohpaipee )
 	PORT_START("DSWA")
 	PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
@@ -242,7 +242,7 @@ INPUT_PORTS_START( ohpaipee )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 INPUT_PORTS_END
 
-INPUT_PORTS_START( togenkyo )
+static INPUT_PORTS_START( togenkyo )
 	PORT_START("DSWA")
 	PORT_DIPNAME( 0x01, 0x01, "DIPSW 1-1" )
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
diff --git a/src/mame/drivers/othello.c b/src/mame/drivers/othello.c
index 8a45aa1c11f..5cbd6505966 100644
--- a/src/mame/drivers/othello.c
+++ b/src/mame/drivers/othello.c
@@ -36,7 +36,6 @@ Limit for help/undo (matta):
 */
 
 #include "driver.h"
-#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
 #include "video/mc6845.h"
@@ -96,7 +95,7 @@ static PALETTE_INIT( othello )
     palette_set_color(machine,0x0f,MAKE_RGB(0xff,0xff,0xff));
 }
 
-VIDEO_UPDATE( othello )
+static VIDEO_UPDATE( othello )
 {
 	const device_config *mc6845 = devtag_get_device(screen->machine, "crtc");
 	mc6845_update(mc6845, bitmap, cliprect);
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index 1133dda879d..7dea4fbacdb 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -74,7 +74,6 @@ Addition by Reip
 ***************************************************************************/
 
 #include "driver.h"
-#include "deprecat.h"
 #include "cpu/z80/z80.h"
 #include "sound/3812intf.h"
 #include "sound/sp0256.h"
diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c
index deb2aab8b9c..dfbcb4121b5 100644
--- a/src/mame/drivers/scregg.c
+++ b/src/mame/drivers/scregg.c
@@ -213,7 +213,7 @@ static MACHINE_START( scregg )
 	state_save_register_global_array(machine, state->btime_tilemap);
 }
 
-MACHINE_RESET( scregg )
+static MACHINE_RESET( scregg )
 {
 	btime_state *state = (btime_state *)machine->driver_data;
 
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 797c4e2385b..00f90b2ca8d 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -2196,7 +2196,7 @@ static READ16_HANDLER( setaroul_d4_10_r )
 
 
 // ?? looks like sprite ram access is 8-bit not 16?
-WRITE16_HANDLER( setaroul_spr_w )
+static WRITE16_HANDLER( setaroul_spr_w )
 {
 	int realoffs = offset;
 	realoffs >>=1;
diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c
index 77f60ca09af..38bd41b0a1d 100644
--- a/src/mame/drivers/skimaxx.c
+++ b/src/mame/drivers/skimaxx.c
@@ -56,16 +56,16 @@ static UINT16 *fg_buffer;	// i.e. text
  *
  *************************************/
 
-UINT32 *skimaxx_bg_buffer_front;
-UINT32 *skimaxx_bg_buffer_back;
+static UINT32 *skimaxx_bg_buffer_front;
+static UINT32 *skimaxx_bg_buffer_back;
 
-UINT32 *skimaxx_blitter_regs;
-UINT16 *skimaxx_blitter_gfx;
+static UINT32 *skimaxx_blitter_regs;
+static UINT16 *skimaxx_blitter_gfx;
 
-UINT32 skimaxx_blitter_gfx_len;
+static UINT32 skimaxx_blitter_gfx_len;
 
-UINT32 skimaxx_blitter_src_x, skimaxx_blitter_src_dx;
-UINT32 skimaxx_blitter_src_y, skimaxx_blitter_src_dy;
+static UINT32 skimaxx_blitter_src_x, skimaxx_blitter_src_dx;
+static UINT32 skimaxx_blitter_src_y, skimaxx_blitter_src_dy;
 
 // Set up blit parameters
 static WRITE32_HANDLER( skimaxx_blitter_w )
@@ -236,7 +236,7 @@ static READ32_HANDLER( m68k_tms_r )
   bit 0: bit banging data
 */
 
-UINT32 *skimaxx_fpga_ctrl;
+static UINT32 *skimaxx_fpga_ctrl;
 static WRITE32_HANDLER( skimaxx_fpga_ctrl_w )
 {
 	UINT32 newdata = COMBINE_DATA( skimaxx_fpga_ctrl );
diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c
index 476724415d3..39087dc528d 100644
--- a/src/mame/drivers/sub.c
+++ b/src/mame/drivers/sub.c
@@ -114,11 +114,11 @@ static UINT8* sub_vid;
 static UINT8* sub_attr;
 static UINT8* sub_scrolly;
 
-VIDEO_START(sub)
+static VIDEO_START(sub)
 {
 }
 
-VIDEO_UPDATE(sub)
+static VIDEO_UPDATE(sub)
 {
 	const gfx_element *gfx = screen->machine->gfx[0];
 	int y,x;
@@ -361,7 +361,7 @@ static GFXDECODE_START( sub )
 	GFXDECODE_ENTRY( "gfx2", 0, tiles16x32_layout, 0, 0x80 )
 GFXDECODE_END
 
-PALETTE_INIT( sub )
+static PALETTE_INIT( sub )
 {
 	int i;
 	UINT8* lookup = memory_region(machine,"proms2");
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 1d0f8853216..f987730b990 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -3484,7 +3484,7 @@ MACHINE_DRIVER_END
 
 /* x = modified to match batsugun 'unencrypted' code */
 
-const UINT8 ts002mach_decryption_table[256] = {
+static const UINT8 ts002mach_decryption_table[256] = {
 	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, 0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, /* 00 */
 	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, 0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f, /* 10 */
 	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27, 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f, /* 20 */
@@ -3552,7 +3552,7 @@ MACHINE_DRIVER_END
   '!' = code stops being the same as batsugun at this point, might be wrong
   - they seem to have mostly mapped extra opcodes for common ones, eg. mov
 */
-const UINT8 ts004dash_decryption_table[256] = {
+static const UINT8 ts004dash_decryption_table[256] = {
 	0x00,0x01,0x02,0x03,0x8c,0x05,0x06,0x07, 0x08,0x09,0x36,0x0b,0x0c,0x0d,0x8c,0x0f, /* 00 */
 	                    /*?*/                          /*?*/               /*?*/
 	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, 0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x8e,0x1f, /* 10 */
@@ -3832,7 +3832,7 @@ MACHINE_DRIVER_END
 
 /* x = modified to match batsugun 'unencrypted' code - '?' likewise, but not so sure about them */
 /* this one seems more different to the other tables */
-const UINT8 ts001turbo_decryption_table[256] = {
+static const UINT8 ts001turbo_decryption_table[256] = {
 	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, 0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, /* 00 */
 	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, 0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f, /* 10 */
 	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27, 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f, /* 20 */
@@ -3941,7 +3941,7 @@ MACHINE_DRIVER_END
     - note, the basic startup code remapping seems identical between all games, so they
       probably use a common remap with some per-game changes which supports the above theory
    */
-const UINT8 ts007spy_vfive_decryption_table[256] = {
+static const UINT8 ts007spy_vfive_decryption_table[256] = {
 	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, 0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, /* 00 */
 	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, 0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f, /* 10 */
 	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27, 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f, /* 20 */
@@ -4022,7 +4022,7 @@ static const ym2151_interface batsugun_ym2151_interface =
 
 /* the batsugun cpu is mostly non-encrypted, from a glance over the code it seems they
    only encrypted a few opcodes used in the interrupt routine, the rest is a 1:1 mapping */
-const UINT8 ts007spy_decryption_table[256] = {
+static const UINT8 ts007spy_decryption_table[256] = {
 	0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07, 0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f, /* 00 */
 	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, 0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f, /* 10 */
 	0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27, 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f, /* 20 */
diff --git a/src/mame/drivers/turrett.c b/src/mame/drivers/turrett.c
index b30aaf2f0d8..205247152a1 100644
--- a/src/mame/drivers/turrett.c
+++ b/src/mame/drivers/turrett.c
@@ -59,7 +59,6 @@ Windows showed a 5.94 gig partion empty and a 12.74 unallocated partition
 
 #include "driver.h"
 #include "cpu/mips/r3000.h"
-#include "deprecat.h"
 
 
 #define R3041_CLOCK		25000000
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index 82741123837..69133763cc0 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -88,7 +88,6 @@ VBlank = 58Hz
   *********************************************************************************************************************/
 
 #include "driver.h"
-#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "cpu/z80/z80.h"
 #include "sound/2151intf.h"
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index ed6ff5948fb..6afec582816 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -142,7 +142,6 @@ TODO:
 ***************************************************************************/
 
 #include "driver.h"
-#include "deprecat.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/m6805/m6805.h"
 #include "sound/2203intf.h"
diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h
index f8ceb1e71e2..6df033914a8 100644
--- a/src/mame/includes/ashnojoe.h
+++ b/src/mame/includes/ashnojoe.h
@@ -32,7 +32,7 @@ struct _ashnojoe_state
 };
 
 
-/* defined in video/ashnojoe.c */
+/*----------- defined in video/ashnojoe.c -----------*/
 
 WRITE16_HANDLER( ashnojoe_tileram_w );
 WRITE16_HANDLER( ashnojoe_tileram2_w );
diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h
index fb59897d219..a2e6d01fbb7 100644
--- a/src/mame/includes/bogeyman.h
+++ b/src/mame/includes/bogeyman.h
@@ -25,7 +25,7 @@ struct _bogeyman_state
 };
 
 
-/* defined in video/bogeyman.c */
+/*----------- defined in video/bogeyman.c -----------*/
 
 WRITE8_HANDLER( bogeyman_videoram_w );
 WRITE8_HANDLER( bogeyman_colorram_w );
diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h
index 04c001e7849..536a4f4d9f2 100644
--- a/src/mame/includes/bombjack.h
+++ b/src/mame/includes/bombjack.h
@@ -23,7 +23,7 @@ struct _bombjack_state
 };
 
 
-/* defined in video/bombjack.c */
+/*----------- defined in video/bombjack.c -----------*/
 
 WRITE8_HANDLER( bombjack_videoram_w );
 WRITE8_HANDLER( bombjack_colorram_w );
diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h
index d7cd863f361..28c0e9a5c33 100644
--- a/src/mame/includes/btime.h
+++ b/src/mame/includes/btime.h
@@ -53,8 +53,6 @@ WRITE8_HANDLER( mmonkey_protection_w );
 PALETTE_INIT( btime );
 PALETTE_INIT( lnc );
 
-MACHINE_RESET( lnc );
-
 VIDEO_START( btime );
 VIDEO_START( bnj );
 
diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h
index 8f4e258295a..516fbd58b3a 100644
--- a/src/mame/includes/cop01.h
+++ b/src/mame/includes/cop01.h
@@ -27,7 +27,7 @@ struct _cop01_state
 
 
 
-/*----------- defined in video/circusc.c -----------*/
+/*----------- defined in video/cop01.c -----------*/
 
 
 PALETTE_INIT( cop01 );
diff --git a/src/mame/includes/dc.h b/src/mame/includes/dc.h
index 9240e6f4239..eb5cdf50532 100644
--- a/src/mame/includes/dc.h
+++ b/src/mame/includes/dc.h
@@ -41,6 +41,7 @@ INPUT_CHANGED( dc_coin_slots_callback );
 extern UINT32 dc_sysctrl_regs[0x200/4];
 extern UINT32 dc_coin_counts[2];
 extern UINT8 maple0x86data1[0x80];
+extern UINT32 g1bus_regs[0x100/4];
 
 /*--------- Ch2-DMA Control Registers ----------*/
 #define SB_C2DSTAT	((0x005f6800-0x005f6800)/4)
diff --git a/src/mame/includes/galaxian.h b/src/mame/includes/galaxian.h
index b733f4845a6..a8a3ea4007e 100644
--- a/src/mame/includes/galaxian.h
+++ b/src/mame/includes/galaxian.h
@@ -121,6 +121,8 @@ void calipso_extend_sprite_info(const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8 *
 void jumpbug_extend_tile_info(UINT16 *code, UINT8 *color, UINT8 attrib, UINT8 x);
 void jumpbug_extend_sprite_info(const UINT8 *base, UINT8 *sx, UINT8 *sy, UINT8 *flipx, UINT8 *flipy, UINT16 *code, UINT8 *color);
 
+/*----------- defined in drivers/galaxian.c -----------*/
+
 /* Ten Spot extensions */
 void tenspot_set_game_bank(running_machine *machine, int bank, int from_game);
 
diff --git a/src/mame/includes/hng64.h b/src/mame/includes/hng64.h
index 1e127f5583f..6b6990be1d3 100644
--- a/src/mame/includes/hng64.h
+++ b/src/mame/includes/hng64.h
@@ -1,8 +1,9 @@
-/* hng64.h */
-
-extern int hng64_mcu_type;
-
 #define FIGHT_MCU  1
 #define SHOOT_MCU  2
 #define RACING_MCU 3
 #define SAMSHO_MCU 4
+
+/*----------- defined in drivers/hng64.c -----------*/
+
+extern int hng64_mcu_type;
+
diff --git a/src/mame/includes/konamigx.h b/src/mame/includes/konamigx.h
index c20f565725e..333f5a0449f 100644
--- a/src/mame/includes/konamigx.h
+++ b/src/mame/includes/konamigx.h
@@ -1,3 +1,4 @@
+/*----------- defined in video/konamigx.c -----------*/
 
 // 2nd-Tier GX/MW Hardware Functions
 void K053247GP_set_SpriteOffset(int offsx, int offsy);
@@ -77,6 +78,35 @@ void konamigx_mixer_primode(int mode);
 
 
 void konamigx_objdma(void);
+extern UINT16 *K053247_ram;
+
+VIDEO_START(konamigx_5bpp);
+VIDEO_START(konamigx_6bpp);
+VIDEO_START(konamigx_6bpp_2);
+VIDEO_START(konamigx_type3);
+VIDEO_START(konamigx_type4);
+VIDEO_START(konamigx_type4_sd2);
+VIDEO_START(le2);
+VIDEO_START(dragoonj);
+VIDEO_START(winspike);
+VIDEO_START(opengolf);
+VIDEO_START(racinfrc);
+VIDEO_UPDATE(konamigx);
+
+WRITE32_HANDLER( konamigx_palette_w );
+WRITE32_HANDLER( konamigx_palette2_w );
+WRITE32_HANDLER( konamigx_555_palette_w );
+WRITE32_HANDLER( konamigx_555_palette2_w );
+WRITE32_HANDLER( konamigx_tilebank_w );
+WRITE32_HANDLER( konamigx_t1_psacmap_w );
+WRITE32_HANDLER( konamigx_t4_psacmap_w );
+
+extern int konamigx_current_frame;
+extern WRITE32_HANDLER( konamigx_type3_psac2_bank_w );
+extern UINT32* konamigx_type3_psac2_bank;
+
+
+/*----------- defined in machine/konamigx.c -----------*/
 
 // K055550/K053990/ESC protection devices handlers
 READ16_HANDLER ( K055550_word_r );
@@ -87,5 +117,5 @@ void konamigx_esc_alert(UINT32 *srcbase, int srcoffs, int count, int mode);
 void fantjour_dma_install(running_machine *machine);
 WRITE32_HANDLER(fantjour_dma_w);
 
-extern UINT16 *K053247_ram;
+
 
diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h
index a431ec33729..0e83c557cbd 100644
--- a/src/mame/includes/mappy.h
+++ b/src/mame/includes/mappy.h
@@ -13,9 +13,6 @@ struct _mappy_state
 
 /*----------- defined in video/mappy.c -----------*/
 
-extern UINT8 *mappy_videoram;
-extern UINT8 *mappy_spriteram;
-
 VIDEO_START( phozon );
 PALETTE_INIT( phozon );
 VIDEO_UPDATE( phozon );
diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h
index 36dd662098e..f9631b999d1 100644
--- a/src/mame/includes/ms32.h
+++ b/src/mame/includes/ms32.h
@@ -7,12 +7,25 @@ extern void decrypt_ms32_bg(running_machine *machine, int addr_xor,int data_xor,
 
 /*----------- defined in video/ms32.c -----------*/
 
+extern tilemap *ms32_tx_tilemap, *ms32_roz_tilemap, *ms32_bg_tilemap, *ms32_bg_tilemap_alt;
+extern UINT8* ms32_priram_8;
+extern UINT16* ms32_palram_16;
+extern UINT16* ms32_rozram_16;
+extern UINT16* ms32_lineram_16;
+extern UINT16* ms32_sprram_16;
+extern UINT16* ms32_txram_16;
+extern UINT16* ms32_bgram_16;
+extern UINT32 ms32_tilemaplayoutcontrol;
+
+extern UINT16* f1superb_extraram_16;
+extern tilemap* ms32_extra_tilemap;
+
 //extern UINT32 *ms32_fce00000;
 extern UINT32 *ms32_roz_ctrl;
 extern UINT32 *ms32_tx_scroll;
 extern UINT32 *ms32_bg_scroll;
 
-/*
+#if 0
 extern UINT32 *ms32_priram;
 extern UINT32 *ms32_palram;
 extern UINT32 *ms32_bgram;
@@ -20,11 +33,11 @@ extern UINT32 *ms32_rozram;
 extern UINT32 *ms32_lineram;
 extern UINT32 *ms32_spram;
 extern UINT32 *ms32_txram;
-*/
+#endif
 extern UINT32 *ms32_mainram;
 
 WRITE32_HANDLER( ms32_brightness_w );
-/*
+#if 0
 WRITE32_HANDLER( ms32_palram_w );
 READ32_HANDLER( ms32_txram_r );
 WRITE32_HANDLER( ms32_txram_w );
@@ -36,7 +49,7 @@ READ32_HANDLER( ms32_bgram_r );
 WRITE32_HANDLER( ms32_bgram_w );
 READ32_HANDLER( ms32_spram_r );
 WRITE32_HANDLER( ms32_spram_w );
-*/
+#endif
 
 WRITE32_HANDLER( ms32_gfxctrl_w );
 VIDEO_START( ms32 );
diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h
index 79f3b11cb8b..d6f8be3d287 100644
--- a/src/mame/includes/pandoras.h
+++ b/src/mame/includes/pandoras.h
@@ -28,7 +28,8 @@ struct _pandoras_state
 };
 
 
-/* defined in video/pandoras.c */
+/*----------- defined in video/pandoras.c -----------*/
+
 PALETTE_INIT( pandoras );
 
 WRITE8_HANDLER( pandoras_vram_w );
diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h
index ca0131cc19b..3bca1761259 100644
--- a/src/mame/includes/tetrisp2.h
+++ b/src/mame/includes/tetrisp2.h
@@ -43,3 +43,4 @@ VIDEO_START( rocknms );
 VIDEO_UPDATE( rocknms );
 
 VIDEO_START( nndmseal );
+void tetrisp2_draw_sprites(running_machine *machine, bitmap_t *bitmap, bitmap_t *bitmap_pri, const rectangle *cliprect, UINT8* priram, UINT16 *sprram_top, size_t sprram_size, int gfxnum, int reverseorder, int flip, int allowzoom);
diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h
index 3b4f4ab4b02..abeb160a55a 100644
--- a/src/mame/includes/yunsun16.h
+++ b/src/mame/includes/yunsun16.h
@@ -26,7 +26,7 @@ struct _yunsun16_state
 };
 
 
-/* defined in video/yunsun16.c */
+/*----------- defined in video/yunsun16.c -----------*/
 
 WRITE16_HANDLER( yunsun16_vram_0_w );
 WRITE16_HANDLER( yunsun16_vram_1_w );
diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h
index ce78a54ecce..515fe97a16c 100644
--- a/src/mame/includes/zerozone.h
+++ b/src/mame/includes/zerozone.h
@@ -20,6 +20,8 @@ struct _zerozone_state
 	const device_config *audiocpu;
 };
 
+/*----------- defined in video/zerozone.c -----------*/
+
 WRITE16_HANDLER( zerozone_tilemap_w );
 WRITE16_HANDLER( zerozone_tilebank_w );
 
diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c
index 7b11c912db7..103c68fcd8d 100644
--- a/src/mame/machine/n64.c
+++ b/src/mame/machine/n64.c
@@ -156,7 +156,7 @@ void clear_rcp_interrupt(running_machine *machine, int interrupt)
 	}
 }
 
-UINT8 is64_buffer[0x10000];
+static UINT8 is64_buffer[0x10000];
 
 READ32_HANDLER( n64_is64_r )
 {
@@ -1384,14 +1384,14 @@ WRITE32_HANDLER( n64_pi_reg_w )
 }
 
 // RDRAM Interface
-UINT32 ri_mode = 0;
-UINT32 ri_config = 0;
-UINT32 ri_current_load = 0;
-UINT32 ri_select = 0;
-UINT32 ri_count = 0;
-UINT32 ri_latency = 0;
-UINT32 ri_rerror = 0;
-UINT32 ri_werror = 0;
+static UINT32 ri_mode = 0;
+static UINT32 ri_config = 0;
+static UINT32 ri_current_load = 0;
+static UINT32 ri_select = 0;
+static UINT32 ri_count = 0;
+static UINT32 ri_latency = 0;
+static UINT32 ri_rerror = 0;
+static UINT32 ri_werror = 0;
 
 READ32_HANDLER( n64_ri_reg_r )
 {
diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c
index 58892bed661..efbeeda9960 100644
--- a/src/mame/video/hng64.c
+++ b/src/mame/video/hng64.c
@@ -12,25 +12,25 @@
 
 // !!! I'm sure this isn't right !!!
 UINT32 hng64_dls[2][0x81] ;
-UINT8 additive_tilemap_debug;
+static UINT8 additive_tilemap_debug;
 
 static int frameCount = 0 ;
 
 UINT32* hng64_videoram;
-tilemap *hng64_tilemap0_8x8;
-tilemap *hng64_tilemap1_8x8;
-tilemap *hng64_tilemap2_8x8;
-tilemap *hng64_tilemap3_8x8;
+static tilemap *hng64_tilemap0_8x8;
+static tilemap *hng64_tilemap1_8x8;
+static tilemap *hng64_tilemap2_8x8;
+static tilemap *hng64_tilemap3_8x8;
 
-tilemap *hng64_tilemap0_16x16;
-tilemap *hng64_tilemap1_16x16;
-tilemap *hng64_tilemap2_16x16;
-tilemap *hng64_tilemap3_16x16;
+static tilemap *hng64_tilemap0_16x16;
+static tilemap *hng64_tilemap1_16x16;
+static tilemap *hng64_tilemap2_16x16;
+static tilemap *hng64_tilemap3_16x16;
 
-tilemap *hng64_tilemap0_16x16_alt;
-tilemap *hng64_tilemap1_16x16_alt;
-tilemap *hng64_tilemap2_16x16_alt;
-tilemap *hng64_tilemap3_16x16_alt;
+static tilemap *hng64_tilemap0_16x16_alt;
+static tilemap *hng64_tilemap1_16x16_alt;
+static tilemap *hng64_tilemap2_16x16_alt;
+static tilemap *hng64_tilemap3_16x16_alt;
 
 
 UINT32 *hng64_spriteram;
@@ -43,7 +43,7 @@ UINT32 *hng64_tcram ;
 
 UINT8 hng64_screen_dis;
 
-void hng64_mark_all_tiles_dirty( int tilemap )
+static void hng64_mark_all_tiles_dirty( int tilemap )
 {
 	if (tilemap == 0)
 	{
@@ -71,7 +71,7 @@ void hng64_mark_all_tiles_dirty( int tilemap )
 	}
 }
 
-void hng64_mark_tile_dirty( int tilemap, int tile_index )
+static void hng64_mark_tile_dirty( int tilemap, int tile_index )
 {
 	if (tilemap == 0)
 	{
@@ -148,7 +148,7 @@ do																					\
 while (0)																			\
 
 
-void pdrawgfx_transpen_additive(bitmap_t *dest, const rectangle *cliprect, const gfx_element *gfx,
+static void pdrawgfx_transpen_additive(bitmap_t *dest, const rectangle *cliprect, const gfx_element *gfx,
 		UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty,
 		bitmap_t *priority, UINT32 pmask, UINT32 transpen)
 {
@@ -181,7 +181,7 @@ void pdrawgfx_transpen_additive(bitmap_t *dest, const rectangle *cliprect, const
 }
 
 
-void pdrawgfxzoom_transpen_additive(bitmap_t *dest, const rectangle *cliprect, const gfx_element *gfx,
+static void pdrawgfxzoom_transpen_additive(bitmap_t *dest, const rectangle *cliprect, const gfx_element *gfx,
 		UINT32 code, UINT32 color, int flipx, int flipy, INT32 destx, INT32 desty,
 		UINT32 scalex, UINT32 scaley, bitmap_t *priority, UINT32 pmask,
 		UINT32 transpen)
@@ -1659,7 +1659,7 @@ static void hng64_tilemap_draw_roz_core(running_machine* machine, tilemap *tmap,
 
 
 
-void hng64_tilemap_draw_roz_primask(running_machine* machine, bitmap_t *dest, const rectangle *cliprect, tilemap *tmap,
+static void hng64_tilemap_draw_roz_primask(running_machine* machine, bitmap_t *dest, const rectangle *cliprect, tilemap *tmap,
 		UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy,
 		int wraparound, UINT32 flags, UINT8 priority, UINT8 priority_mask, hng64trans_t drawformat)
 {
diff --git a/src/mame/video/konamigx.c b/src/mame/video/konamigx.c
index 3f9a54ab863..30975340f72 100644
--- a/src/mame/video/konamigx.c
+++ b/src/mame/video/konamigx.c
@@ -1807,8 +1807,8 @@ static TILE_GET_INFO( get_gx_psac_tile_info )
 }
 
 UINT32* konamigx_type3_psac2_bank;
-int konamigx_type3_psac2_actual_bank;
-int konamigx_type3_psac2_actual_last_bank = 0;
+static int konamigx_type3_psac2_actual_bank;
+//int konamigx_type3_psac2_actual_last_bank = 0;
 
 WRITE32_HANDLER( konamigx_type3_psac2_bank_w )
 {
diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c
index 66c2aa5ff0d..0f6f5dbc90d 100644
--- a/src/mame/video/ladyfrog.c
+++ b/src/mame/video/ladyfrog.c
@@ -132,7 +132,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
 
 }
 
-VIDEO_START( ladyfrog_common )
+static VIDEO_START( ladyfrog_common )
 {
   ladyfrog_spriteram = auto_alloc_array(machine, UINT8, 160);
   bg_tilemap = tilemap_create( machine, get_tile_info,tilemap_scan_rows,8,8,32,32 );
diff --git a/src/mame/video/ms32.c b/src/mame/video/ms32.c
index 53a3ae212e0..3948251a247 100644
--- a/src/mame/video/ms32.c
+++ b/src/mame/video/ms32.c
@@ -13,11 +13,12 @@ priority should be given to
 
 
 #include "driver.h"
+#include "includes/tetrisp2.h"
 #include "includes/ms32.h"
 
-bitmap_t* temp_bitmap_tilemaps;
-bitmap_t* temp_bitmap_sprites;
-bitmap_t* temp_bitmap_sprites_pri;
+static bitmap_t* temp_bitmap_tilemaps;
+static bitmap_t* temp_bitmap_sprites;
+static bitmap_t* temp_bitmap_sprites_pri;
 
 
 //UINT32 *ms32_fce00000;
@@ -231,7 +232,6 @@ WRITE32_HANDLER( ms32_gfxctrl_w )
 
 /* SPRITES based on tetrisp2 for now, readd priority bits later */
 /* now using function in tetrisp2.c */
-void tetrisp2_draw_sprites(running_machine *machine, bitmap_t *bitmap, bitmap_t *bitmap_pri, const rectangle *cliprect, UINT8* priram, UINT16 *sprram_top, size_t sprram_size, int gfxnum, int reverseorder, int flip, int allowzoom);
 
 
 
diff --git a/src/mame/video/n64.c b/src/mame/video/n64.c
index 5403a072be7..706f3d70967 100644
--- a/src/mame/video/n64.c
+++ b/src/mame/video/n64.c
@@ -52,7 +52,7 @@ typedef struct
     int dzpix;
 } SPAN;
 
-UINT8 cvg_mem[8*1048576];
+//UINT8 cvg_mem[8*1048576];
 
 static SPAN span[4096];
 
@@ -254,7 +254,7 @@ static INT32 NormPointRom[64];
 static INT32 NormSlopeRom[64];
 
 #define zmode other_modes.z_mode
-struct
+static struct
 {
 	UINT32 shift;
 	UINT32 add;
@@ -2820,6 +2820,7 @@ INLINE void tcdiv(INT32 ss, INT32 st, INT32 sw, INT32* sss, INT32* sst)
 	}
 }
 
+#ifdef UNUSED_FUNCTION
 void col_decode16(UINT16* addr, COLOR* col)
 {
 	col->r = (((*addr >> 11) & 0x1f) << 3) | (((*addr >> 11) & 0x1f) >> 2);
@@ -2827,6 +2828,7 @@ void col_decode16(UINT16* addr, COLOR* col)
 	col->b = (((*addr >> 1) & 0x1f) << 3) | (((*addr >> 6) & 0x1f) >> 2);
 	col->a = (*addr & 1) ? 0xff : 0;
 }
+#endif
 
 static void texture_rectangle_16bit(running_machine *machine, TEX_RECTANGLE *rect)
 {
diff --git a/src/mame/video/nbmj8900.c b/src/mame/video/nbmj8900.c
index 0af3264b8ff..c4aa6f67559 100644
--- a/src/mame/video/nbmj8900.c
+++ b/src/mame/video/nbmj8900.c
@@ -67,6 +67,7 @@ READ8_HANDLER( nbmj8900_palette_type2_r )
 	return nbmj8900_palette[offset];
 }
 
+#ifdef UNUSED_FUNCTION
 WRITE8_HANDLER( nbmj8900_palette_type2_w )
 {
 	int r, g, b;
@@ -105,6 +106,7 @@ WRITE8_HANDLER( nbmj8900_palette_type3_w )
 
 	palette_set_color_rgb(space->machine, (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
 }
+#endif
 
 WRITE8_HANDLER( nbmj8900_clutsel_w )
 {
diff --git a/src/mame/video/vball.c b/src/mame/video/vball.c
index 8167215bc6f..3d2e705eead 100644
--- a/src/mame/video/vball.c
+++ b/src/mame/video/vball.c
@@ -7,7 +7,6 @@
 ***************************************************************************/
 
 #include "driver.h"
-#include "deprecat.h"
 #include "cpu/m6502/m6502.h"
 #include "includes/vball.h"