summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.gitattributes21
-rw-r--r--src/mame/drivers/aerofgt.c40
-rw-r--r--src/mame/drivers/argus.c61
-rw-r--r--src/mame/drivers/armedf.c26
-rw-r--r--src/mame/drivers/dec8.c42
-rw-r--r--src/mame/drivers/dooyong.c43
-rw-r--r--src/mame/drivers/fromanc2.c42
-rw-r--r--src/mame/drivers/junofrst.c3
-rw-r--r--src/mame/drivers/m79amb.c17
-rw-r--r--src/mame/drivers/nbmj8688.c32
-rw-r--r--src/mame/drivers/nbmj8891.c24
-rw-r--r--src/mame/drivers/nbmj8991.c13
-rw-r--r--src/mame/drivers/nbmj9195.c21
-rw-r--r--src/mame/drivers/nemesis.c27
-rw-r--r--src/mame/drivers/niyanpai.c21
-rw-r--r--src/mame/drivers/nmk16.c61
-rw-r--r--src/mame/drivers/playmark.c29
-rw-r--r--src/mame/drivers/sspeedr.c21
-rw-r--r--src/mame/drivers/taito_b.c28
-rw-r--r--src/mame/drivers/taotaido.c13
-rw-r--r--src/mame/drivers/tetrisp2.c45
-rw-r--r--src/mame/drivers/tmnt.c31
-rw-r--r--src/mame/drivers/tumbleb.c36
-rw-r--r--src/mame/drivers/wc90.c20
-rw-r--r--src/mame/includes/aerofgt.h39
-rw-r--r--src/mame/includes/argus.h49
-rw-r--r--src/mame/includes/armedf.h26
-rw-r--r--src/mame/includes/dec8.h37
-rw-r--r--src/mame/includes/dooyong.h41
-rw-r--r--src/mame/includes/fromanc2.h41
-rw-r--r--src/mame/includes/nbmj8688.h29
-rw-r--r--src/mame/includes/nbmj8891.h23
-rw-r--r--src/mame/includes/nbmj8991.h12
-rw-r--r--src/mame/includes/nbmj9195.h21
-rw-r--r--src/mame/includes/nemesis.h24
-rw-r--r--src/mame/includes/niyanpai.h20
-rw-r--r--src/mame/includes/nmk16.h56
-rw-r--r--src/mame/includes/playmark.h26
-rw-r--r--src/mame/includes/sspeedr.h20
-rw-r--r--src/mame/includes/taito_b.h28
-rw-r--r--src/mame/includes/taotaido.h13
-rw-r--r--src/mame/includes/tetrisp2.h46
-rw-r--r--src/mame/includes/tmnt.h33
-rw-r--r--src/mame/includes/tumbleb.h40
-rw-r--r--src/mame/includes/wc90.h18
-rw-r--r--src/mame/video/aerofgt.c1
-rw-r--r--src/mame/video/argus.c1
-rw-r--r--src/mame/video/armedf.c1
-rw-r--r--src/mame/video/dec8.c1
-rw-r--r--src/mame/video/dooyong.c1
-rw-r--r--src/mame/video/fromanc2.c1
-rw-r--r--src/mame/video/nbmj8688.c1
-rw-r--r--src/mame/video/nbmj8891.c1
-rw-r--r--src/mame/video/nbmj8991.c1
-rw-r--r--src/mame/video/nbmj9195.c1
-rw-r--r--src/mame/video/nemesis.c2
-rw-r--r--src/mame/video/niyanpai.c1
-rw-r--r--src/mame/video/nmk16.c1
-rw-r--r--src/mame/video/playmark.c2
-rw-r--r--src/mame/video/sspeedr.c2
-rw-r--r--src/mame/video/taito_b.c1
-rw-r--r--src/mame/video/taotaido.c11
-rw-r--r--src/mame/video/tetrisp2.c3
-rw-r--r--src/mame/video/tmnt.c1
-rw-r--r--src/mame/video/tumbleb.c4
-rw-r--r--src/mame/video/wc90.c1
66 files changed, 716 insertions, 682 deletions
diff --git a/.gitattributes b/.gitattributes
index 6e424b52cdd..27981223bc2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2173,13 +2173,16 @@ src/mame/etc/fd1094dp.c svneol=native#text/plain
src/mame/etc/jrcrypt.c svneol=native#text/plain
src/mame/includes/20pacgal.h svneol=native#text/plain
src/mame/includes/8080bw.h svneol=native#text/plain
+src/mame/includes/aerofgt.h svneol=native#text/plain
src/mame/includes/ajax.h svneol=native#text/plain
src/mame/includes/amiga.h svneol=native#text/plain
src/mame/includes/appoooh.h svneol=native#text/plain
src/mame/includes/aquarium.h svneol=native#text/plain
src/mame/includes/arabian.h svneol=native#text/plain
src/mame/includes/arcadecl.h svneol=native#text/plain
+src/mame/includes/argus.h svneol=native#text/plain
src/mame/includes/arkanoid.h svneol=native#text/plain
+src/mame/includes/armedf.h svneol=native#text/plain
src/mame/includes/artmagic.h svneol=native#text/plain
src/mame/includes/asteroid.h svneol=native#text/plain
src/mame/includes/astrocde.h svneol=native#text/plain
@@ -2240,6 +2243,7 @@ src/mame/includes/cyberbal.h svneol=native#text/plain
src/mame/includes/dc.h svneol=native#text/plain
src/mame/includes/dcheese.h svneol=native#text/plain
src/mame/includes/dec0.h svneol=native#text/plain
+src/mame/includes/dec8.h svneol=native#text/plain
src/mame/includes/deco16ic.h svneol=native#text/plain
src/mame/includes/deco32.h svneol=native#text/plain
src/mame/includes/decocrpt.h svneol=native#text/plain
@@ -2247,6 +2251,7 @@ src/mame/includes/decoprot.h svneol=native#text/plain
src/mame/includes/dkong.h svneol=native#text/plain
src/mame/includes/docastle.h svneol=native#text/plain
src/mame/includes/dogfgt.h svneol=native#text/plain
+src/mame/includes/dooyong.h svneol=native#text/plain
src/mame/includes/dragrace.h svneol=native#text/plain
src/mame/includes/drgnmst.h svneol=native#text/plain
src/mame/includes/dribling.h svneol=native#text/plain
@@ -2268,6 +2273,7 @@ src/mame/includes/fitfight.h svneol=native#text/plain
src/mame/includes/flower.h svneol=native#text/plain
src/mame/includes/flstory.h svneol=native#text/plain
src/mame/includes/foodf.h svneol=native#text/plain
+src/mame/includes/fromanc2.h svneol=native#text/plain
src/mame/includes/fromance.h svneol=native#text/plain
src/mame/includes/gaelco2.h svneol=native#text/plain
src/mame/includes/gaelco3d.h svneol=native#text/plain
@@ -2354,10 +2360,17 @@ src/mame/includes/namcos2.h svneol=native#text/plain
src/mame/includes/namcos21.h svneol=native#text/plain
src/mame/includes/namcos22.h svneol=native#text/plain
src/mame/includes/nb1413m3.h svneol=native#text/plain
+src/mame/includes/nbmj8688.h svneol=native#text/plain
+src/mame/includes/nbmj8891.h svneol=native#text/plain
+src/mame/includes/nbmj8991.h svneol=native#text/plain
+src/mame/includes/nbmj9195.h svneol=native#text/plain
+src/mame/includes/nemesis.h svneol=native#text/plain
src/mame/includes/neogeo.h svneol=native#text/plain
src/mame/includes/news.h svneol=native#text/plain
src/mame/includes/ninjakd2.h svneol=native#text/plain
src/mame/includes/nitedrvr.h svneol=native#text/plain
+src/mame/includes/niyanpai.h svneol=native#text/plain
+src/mame/includes/nmk16.h svneol=native#text/plain
src/mame/includes/nova2001.h svneol=native#text/plain
src/mame/includes/nycaptor.h svneol=native#text/plain
src/mame/includes/offtwall.h svneol=native#text/plain
@@ -2369,6 +2382,7 @@ src/mame/includes/pgm.h svneol=native#text/plain
src/mame/includes/phoenix.h svneol=native#text/plain
src/mame/includes/pitnrun.h svneol=native#text/plain
src/mame/includes/playch10.h svneol=native#text/plain
+src/mame/includes/playmark.h svneol=native#text/plain
src/mame/includes/polepos.h svneol=native#text/plain
src/mame/includes/policetr.h svneol=native#text/plain
src/mame/includes/polyplay.h svneol=native#text/plain
@@ -2403,6 +2417,7 @@ src/mame/includes/spacefb.h svneol=native#text/plain
src/mame/includes/spiders.h svneol=native#text/plain
src/mame/includes/sprint2.h svneol=native#text/plain
src/mame/includes/sprint8.h svneol=native#text/plain
+src/mame/includes/sspeedr.h svneol=native#text/plain
src/mame/includes/st0016.h svneol=native#text/plain
src/mame/includes/stactics.h svneol=native#text/plain
src/mame/includes/starfire.h svneol=native#text/plain
@@ -2415,25 +2430,30 @@ src/mame/includes/suna8.h svneol=native#text/plain
src/mame/includes/suprnova.h svneol=native#text/plain
src/mame/includes/suprridr.h svneol=native#text/plain
src/mame/includes/system16.h svneol=native#text/plain
+src/mame/includes/taito_b.h svneol=native#text/plain
src/mame/includes/taito_f2.h svneol=native#text/plain
src/mame/includes/taito_f3.h svneol=native#text/plain
src/mame/includes/taitoipt.h svneol=native#text/plain
src/mame/includes/taitosj.h svneol=native#text/plain
src/mame/includes/tank8.h svneol=native#text/plain
+src/mame/includes/taotaido.h svneol=native#text/plain
src/mame/includes/targ.h svneol=native#text/plain
src/mame/includes/tatsumi.h svneol=native#text/plain
src/mame/includes/taxidrvr.h svneol=native#text/plain
src/mame/includes/tecmosys.h svneol=native#text/plain
+src/mame/includes/tetrisp2.h svneol=native#text/plain
src/mame/includes/thedeep.h svneol=native#text/plain
src/mame/includes/thunderj.h svneol=native#text/plain
src/mame/includes/tiamc1.h svneol=native#text/plain
src/mame/includes/timeplt.h svneol=native#text/plain
+src/mame/includes/tmnt.h svneol=native#text/plain
src/mame/includes/tnzs.h svneol=native#text/plain
src/mame/includes/toaplan1.h svneol=native#text/plain
src/mame/includes/toaplan2.h svneol=native#text/plain
src/mame/includes/toobin.h svneol=native#text/plain
src/mame/includes/triplhnt.h svneol=native#text/plain
src/mame/includes/tubep.h svneol=native#text/plain
+src/mame/includes/tumbleb.h svneol=native#text/plain
src/mame/includes/turbo.h svneol=native#text/plain
src/mame/includes/tutankhm.h svneol=native#text/plain
src/mame/includes/twin16.h svneol=native#text/plain
@@ -2449,6 +2469,7 @@ src/mame/includes/videopin.h svneol=native#text/plain
src/mame/includes/vindictr.h svneol=native#text/plain
src/mame/includes/vsnes.h svneol=native#text/plain
src/mame/includes/warpwarp.h svneol=native#text/plain
+src/mame/includes/wc90.h svneol=native#text/plain
src/mame/includes/williams.h svneol=native#text/plain
src/mame/includes/wrally.h svneol=native#text/plain
src/mame/includes/wwfwfest.h svneol=native#text/plain
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index f62ef4fb791..34fdc79caf4 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -63,45 +63,7 @@ Verification still needed for the other PCBs.
#include "sound/2610intf.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
-
-
-extern UINT16 *aerofgt_rasterram;
-extern UINT16 *aerofgt_bg1videoram,*aerofgt_bg2videoram;
-extern UINT16 *aerofgt_spriteram1,*aerofgt_spriteram2,*aerofgt_spriteram3;
-extern UINT16 *wbbc97_bitmapram;
-extern size_t aerofgt_spriteram1_size,aerofgt_spriteram2_size,aerofgt_spriteram3_size;
-extern UINT16 *spikes91_tx_tilemap_ram;
-
-WRITE16_HANDLER( aerofgt_bg1videoram_w );
-WRITE16_HANDLER( aerofgt_bg2videoram_w );
-WRITE16_HANDLER( pspikes_gfxbank_w );
-WRITE16_HANDLER( pspikesb_gfxbank_w );
-WRITE16_HANDLER( spikes91_lookup_w );
-WRITE16_HANDLER( karatblz_gfxbank_w );
-WRITE16_HANDLER( spinlbrk_gfxbank_w );
-WRITE16_HANDLER( turbofrc_gfxbank_w );
-WRITE16_HANDLER( aerofgt_gfxbank_w );
-WRITE16_HANDLER( aerofgt_bg1scrollx_w );
-WRITE16_HANDLER( aerofgt_bg1scrolly_w );
-WRITE16_HANDLER( aerofgt_bg2scrollx_w );
-WRITE16_HANDLER( aerofgt_bg2scrolly_w );
-WRITE16_HANDLER( pspikes_palette_bank_w );
-WRITE16_HANDLER( wbbc97_bitmap_enable_w );
-VIDEO_START( pspikes );
-VIDEO_START( karatblz );
-VIDEO_START( spinlbrk );
-VIDEO_START( turbofrc );
-VIDEO_UPDATE( pspikes );
-VIDEO_UPDATE( pspikesb );
-VIDEO_UPDATE( spikes91 );
-VIDEO_UPDATE( karatblz );
-VIDEO_UPDATE( spinlbrk );
-VIDEO_UPDATE( turbofrc );
-VIDEO_UPDATE( aerofgt );
-VIDEO_UPDATE( aerfboot );
-VIDEO_UPDATE( aerfboo2 );
-VIDEO_START( wbbc97 );
-VIDEO_UPDATE( wbbc97 );
+#include "includes/aerofgt.h"
static int pending_command;
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index a1b707387ba..cdcec41e6bc 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -89,66 +89,7 @@ Known issues :
#include "driver.h"
#include "deprecat.h"
#include "sound/2203intf.h"
-
-
-/***************************************************************************
-
- Variables
-
-***************************************************************************/
-
-extern UINT8 *argus_paletteram;
-extern UINT8 *argus_txram;
-extern UINT8 *argus_bg0ram;
-extern UINT8 *argus_bg0_scrollx;
-extern UINT8 *argus_bg0_scrolly;
-extern UINT8 *argus_bg1ram;
-extern UINT8 *argus_bg1_scrollx;
-extern UINT8 *argus_bg1_scrolly;
-extern UINT8 *butasan_bg1ram;
-
-VIDEO_START( argus );
-VIDEO_START( valtric );
-VIDEO_START( butasan );
-VIDEO_RESET( argus );
-VIDEO_RESET( valtric );
-VIDEO_RESET( butasan );
-VIDEO_UPDATE( argus );
-VIDEO_UPDATE( valtric );
-VIDEO_UPDATE( butasan );
-
-READ8_HANDLER( argus_txram_r );
-READ8_HANDLER( argus_bg1ram_r );
-READ8_HANDLER( argus_paletteram_r );
-
-WRITE8_HANDLER( argus_txram_w );
-WRITE8_HANDLER( argus_bg1ram_w );
-WRITE8_HANDLER( argus_bg0_scrollx_w );
-WRITE8_HANDLER( argus_bg0_scrolly_w );
-WRITE8_HANDLER( argus_bg1_scrollx_w );
-WRITE8_HANDLER( argus_bg1_scrolly_w );
-WRITE8_HANDLER( argus_bg_status_w );
-WRITE8_HANDLER( argus_flipscreen_w );
-WRITE8_HANDLER( argus_paletteram_w );
-
-WRITE8_HANDLER( valtric_bg_status_w );
-WRITE8_HANDLER( valtric_paletteram_w );
-WRITE8_HANDLER( valtric_mosaic_w );
-WRITE8_HANDLER( valtric_unknown_w );
-
-READ8_HANDLER( butasan_pagedram_r );
-READ8_HANDLER( butasan_bg1ram_r );
-READ8_HANDLER( butasan_txbackram_r );
-READ8_HANDLER( butasan_bg0backram_r );
-WRITE8_HANDLER( butasan_pageselect_w );
-WRITE8_HANDLER( butasan_pagedram_w );
-WRITE8_HANDLER( butasan_bg1ram_w );
-WRITE8_HANDLER( butasan_bg0_status_w );
-WRITE8_HANDLER( butasan_paletteram_w );
-WRITE8_HANDLER( butasan_txbackram_w );
-WRITE8_HANDLER( butasan_bg0backram_w );
-WRITE8_HANDLER( butasan_bg1_status_w );
-WRITE8_HANDLER( butasan_unknown_w );
+#include "includes/argus.h"
/***************************************************************************
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index e4c551491d5..132594e5b0f 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -163,35 +163,11 @@ Stephh's notes (based on the games M68000 code and some tests) :
#include "cpu/z80/z80.h"
#include "sound/dac.h"
#include "sound/3812intf.h"
+#include "includes/armedf.h"
#define LEGION_HACK 0
-extern void armedf_setgfxtype( int type );
-
-VIDEO_UPDATE( armedf );
-VIDEO_EOF( armedf );
-VIDEO_START( armedf );
-
-WRITE16_HANDLER( armedf_bg_videoram_w );
-WRITE16_HANDLER( armedf_fg_videoram_w );
-WRITE16_HANDLER( armedf_text_videoram_w );
-WRITE16_HANDLER( terraf_fg_scrollx_w );
-WRITE16_HANDLER( terraf_fg_scrolly_w );
-WRITE16_HANDLER( terraf_fg_scroll_msb_arm_w );
-WRITE16_HANDLER( armedf_fg_scrollx_w );
-WRITE16_HANDLER( armedf_fg_scrolly_w );
-WRITE16_HANDLER( armedf_bg_scrollx_w );
-WRITE16_HANDLER( armedf_bg_scrolly_w );
-WRITE16_HANDLER( armedf_mcu_cmd );
-
-extern UINT16 armedf_vreg;
-extern UINT16 *armedf_bg_videoram;
-extern UINT16 *armedf_fg_videoram;
-extern UINT16 *terraf_text_videoram;
-extern UINT16 *legion_cmd;
-extern tilemap *armedf_tx_tilemap;
-
static WRITE16_HANDLER( io_w )
{
COMBINE_DATA(&armedf_vreg);
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index ab856420e9f..584d4db297a 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -43,47 +43,7 @@ To do:
#include "sound/2203intf.h"
#include "sound/3812intf.h"
#include "sound/msm5205.h"
-
-PALETTE_INIT( ghostb );
-VIDEO_UPDATE( cobracom );
-VIDEO_UPDATE( ghostb );
-VIDEO_UPDATE( srdarwin );
-VIDEO_UPDATE( gondo );
-VIDEO_UPDATE( garyoret );
-VIDEO_UPDATE( lastmiss );
-VIDEO_UPDATE( shackled );
-VIDEO_UPDATE( oscar );
-VIDEO_START( cobracom );
-VIDEO_START( oscar );
-VIDEO_START( ghostb );
-VIDEO_START( lastmiss );
-VIDEO_START( shackled );
-VIDEO_START( srdarwin );
-VIDEO_START( gondo );
-VIDEO_START( garyoret );
-
-WRITE8_HANDLER( dec8_bac06_0_w );
-WRITE8_HANDLER( dec8_bac06_1_w );
-WRITE8_HANDLER( dec8_pf0_data_w );
-WRITE8_HANDLER( dec8_pf1_data_w );
-READ8_HANDLER( dec8_pf0_data_r );
-READ8_HANDLER( dec8_pf1_data_r );
-WRITE8_HANDLER( srdarwin_videoram_w );
-WRITE8_HANDLER( dec8_scroll1_w );
-WRITE8_HANDLER( dec8_scroll2_w );
-WRITE8_HANDLER( srdarwin_control_w );
-WRITE8_HANDLER( gondo_scroll_w );
-WRITE8_HANDLER( shackled_control_w );
-WRITE8_HANDLER( lastmiss_control_w );
-WRITE8_HANDLER( lastmiss_scrollx_w );
-WRITE8_HANDLER( lastmiss_scrolly_w );
-WRITE8_HANDLER( dec8_bac06_0_w );
-WRITE8_HANDLER( dec8_bac06_1_w );
-WRITE8_HANDLER( dec8_videoram_w );
-
-/******************************************************************************/
-
-extern UINT8 *dec8_pf0_data,*dec8_pf1_data,*dec8_row;
+#include "includes/dec8.h"
static int nmi_enable,int_enable;
static int i8751_return, i8751_value;
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index e525e4f18ff..29c25bbedfe 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -54,48 +54,7 @@ Flying Tiger
#include "sound/2203intf.h"
#include "sound/2151intf.h"
#include "sound/okim6295.h"
-
-
-extern UINT8 *dooyong_txvideoram;
-
-WRITE8_HANDLER( dooyong_bgscroll8_w );
-WRITE8_HANDLER( dooyong_bg2scroll8_w );
-WRITE8_HANDLER( dooyong_fgscroll8_w );
-WRITE8_HANDLER( dooyong_fg2scroll8_w );
-
-WRITE16_HANDLER( dooyong_bgscroll16_w );
-WRITE16_HANDLER( dooyong_bg2scroll16_w );
-WRITE16_HANDLER( dooyong_fgscroll16_w );
-WRITE16_HANDLER( dooyong_fg2scroll16_w );
-
-WRITE8_HANDLER( dooyong_txvideoram8_w );
-
-WRITE8_HANDLER( lastday_ctrl_w );
-WRITE8_HANDLER( pollux_ctrl_w );
-WRITE8_HANDLER( primella_ctrl_w );
-WRITE8_HANDLER( flytiger_ctrl_w );
-WRITE16_HANDLER( rshark_ctrl_w );
-
-VIDEO_UPDATE( lastday );
-VIDEO_UPDATE( gulfstrm );
-VIDEO_UPDATE( pollux );
-VIDEO_UPDATE( bluehawk );
-VIDEO_UPDATE( flytiger );
-VIDEO_UPDATE( primella );
-VIDEO_UPDATE( rshark );
-VIDEO_UPDATE( popbingo );
-
-VIDEO_START( lastday );
-VIDEO_START( gulfstrm );
-VIDEO_START( pollux );
-VIDEO_START( bluehawk );
-VIDEO_START( flytiger );
-VIDEO_START( primella );
-VIDEO_START( rshark );
-VIDEO_START( popbingo );
-
-VIDEO_EOF( dooyong );
-VIDEO_EOF( rshark );
+#include "includes/dooyong.h"
static WRITE8_HANDLER( lastday_bankswitch_w )
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index 2d3f042670d..0bebe29ef5c 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -27,47 +27,7 @@ Memo:
#include "machine/eeprom.h"
#include "sound/2610intf.h"
#include "rendlay.h"
-
-
-VIDEO_UPDATE( fromanc2 );
-VIDEO_START( fromanc2 );
-VIDEO_START( fromancr );
-VIDEO_START( fromanc4 );
-
-READ16_HANDLER( fromanc2_paletteram_0_r );
-READ16_HANDLER( fromanc2_paletteram_1_r );
-WRITE16_HANDLER( fromanc2_paletteram_0_w );
-WRITE16_HANDLER( fromanc2_paletteram_1_w );
-READ16_HANDLER( fromancr_paletteram_0_r );
-READ16_HANDLER( fromancr_paletteram_1_r );
-WRITE16_HANDLER( fromancr_paletteram_0_w );
-WRITE16_HANDLER( fromancr_paletteram_1_w );
-READ16_HANDLER( fromanc4_paletteram_0_r );
-READ16_HANDLER( fromanc4_paletteram_1_r );
-WRITE16_HANDLER( fromanc4_paletteram_0_w );
-WRITE16_HANDLER( fromanc4_paletteram_1_w );
-WRITE16_HANDLER( fromanc2_videoram_0_w );
-WRITE16_HANDLER( fromanc2_videoram_1_w );
-WRITE16_HANDLER( fromanc2_videoram_2_w );
-WRITE16_HANDLER( fromanc2_videoram_3_w );
-WRITE16_HANDLER( fromancr_videoram_0_w );
-WRITE16_HANDLER( fromancr_videoram_1_w );
-WRITE16_HANDLER( fromancr_videoram_2_w );
-WRITE16_HANDLER( fromanc4_videoram_0_w );
-WRITE16_HANDLER( fromanc4_videoram_1_w );
-WRITE16_HANDLER( fromanc4_videoram_2_w );
-WRITE16_HANDLER( fromanc2_gfxreg_0_w );
-WRITE16_HANDLER( fromanc2_gfxreg_1_w );
-WRITE16_HANDLER( fromanc2_gfxreg_2_w );
-WRITE16_HANDLER( fromanc2_gfxreg_3_w );
-WRITE16_HANDLER( fromancr_gfxreg_0_w );
-WRITE16_HANDLER( fromancr_gfxreg_1_w );
-WRITE16_HANDLER( fromanc2_gfxbank_0_w );
-WRITE16_HANDLER( fromanc2_gfxbank_1_w );
-void fromancr_gfxbank_w(int data);
-WRITE16_HANDLER( fromanc4_gfxreg_0_w );
-WRITE16_HANDLER( fromanc4_gfxreg_1_w );
-WRITE16_HANDLER( fromanc4_gfxreg_2_w );
+#include "includes/fromanc2.h"
static int fromanc2_portselect;
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index 3abd3da8ced..0679af321ce 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -90,9 +90,6 @@ Blitter source graphics
static int i8039_status;
-WRITE8_HANDLER( tutankhm_sh_irqtrigger_w );
-
-
static WRITE8_HANDLER( junofrst_bankselect_w )
{
memory_set_bank(1, data & 0x0f);
diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c
index fd89d85c353..80a4159395f 100644
--- a/src/mame/drivers/m79amb.c
+++ b/src/mame/drivers/m79amb.c
@@ -48,25 +48,10 @@ Ports:
8002 Sound Control (According to Manual)
8003 D0=SelfTest LED
- */
-#include "driver.h"
-
-INTERRUPT_GEN( invaders_interrupt );
-void ramtek_sh_update(void);
-
-
-/***************************************************************************
-
- video.c
-
- Functions to emulate the video hardware of the machine.
-
-***************************************************************************/
+*/
#include "driver.h"
-
-
static UINT8 *ramtek_videoram;
static UINT8 *mask;
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index 2cf01e6dc5a..1bcd662bf40 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -34,6 +34,8 @@ TODO:
#include "sound/3812intf.h"
#include "rendlay.h"
#include "nbmj8688.lh"
+#include "includes/nbmj8688.h"
+
#define SIGNED_DAC 0 // 0:unsigned DAC, 1:signed DAC
#if SIGNED_DAC
@@ -43,36 +45,6 @@ TODO:
#endif
-extern PALETTE_INIT( mbmj8688_8bit );
-extern PALETTE_INIT( mbmj8688_12bit );
-extern PALETTE_INIT( mbmj8688_16bit );
-extern VIDEO_UPDATE( mbmj8688 );
-extern VIDEO_UPDATE( mbmj8688_LCD );
-extern VIDEO_START( mbmj8688_8bit );
-extern VIDEO_START( mbmj8688_hybrid_12bit );
-extern VIDEO_START( mbmj8688_pure_12bit );
-extern VIDEO_START( mbmj8688_hybrid_16bit );
-extern VIDEO_START( mbmj8688_pure_16bit );
-extern VIDEO_START( mbmj8688_pure_16bit_LCD );
-
-extern WRITE8_HANDLER( nbmj8688_clut_w );
-extern WRITE8_HANDLER( nbmj8688_blitter_w );
-extern WRITE8_HANDLER( mjsikaku_gfxflag2_w );
-extern WRITE8_HANDLER( mjsikaku_gfxflag3_w );
-extern WRITE8_HANDLER( mjsikaku_scrolly_w );
-extern WRITE8_HANDLER( mjsikaku_romsel_w );
-extern WRITE8_HANDLER( secolove_romsel_w );
-extern WRITE8_HANDLER( seiha_romsel_w );
-extern WRITE8_HANDLER( crystalg_romsel_w );
-
-extern WRITE8_HANDLER( nbmj8688_HD61830B_0_instr_w );
-extern WRITE8_HANDLER( nbmj8688_HD61830B_0_data_w );
-extern WRITE8_HANDLER( nbmj8688_HD61830B_1_instr_w );
-extern WRITE8_HANDLER( nbmj8688_HD61830B_1_data_w );
-extern WRITE8_HANDLER( nbmj8688_HD61830B_both_instr_w );
-extern WRITE8_HANDLER( nbmj8688_HD61830B_both_data_w );
-
-
static DRIVER_INIT( mjsikaku )
{
nb1413m3_type = NB1413M3_MJSIKAKU;
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index 8dd3b98232f..5f95eae1cf9 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -48,6 +48,7 @@ TODO:
#include "sound/dac.h"
#include "sound/ay8910.h"
#include "sound/3812intf.h"
+#include "includes/nbmj8891.h"
#define SIGNED_DAC 0 // 0:unsigned DAC, 1:signed DAC
@@ -58,29 +59,6 @@ TODO:
#endif
-extern VIDEO_UPDATE( nbmj8891 );
-extern VIDEO_START( nbmj8891_1layer );
-extern VIDEO_START( nbmj8891_2layer );
-
-extern READ8_HANDLER( nbmj8891_palette_type1_r );
-extern WRITE8_HANDLER( nbmj8891_palette_type1_w );
-extern READ8_HANDLER( nbmj8891_palette_type2_r );
-extern WRITE8_HANDLER( nbmj8891_palette_type2_w );
-extern READ8_HANDLER( nbmj8891_palette_type3_r );
-extern WRITE8_HANDLER( nbmj8891_palette_type3_w );
-extern WRITE8_HANDLER( nbmj8891_blitter_w );
-extern WRITE8_HANDLER( nbmj8891_scrolly_w );
-extern WRITE8_HANDLER( nbmj8891_vramsel_w );
-extern WRITE8_HANDLER( nbmj8891_romsel_w );
-extern WRITE8_HANDLER( nbmj8891_clutsel_w );
-extern READ8_HANDLER( nbmj8891_clut_r );
-extern WRITE8_HANDLER( nbmj8891_clut_w );
-extern WRITE8_HANDLER( nbmj8891_taiwanmb_blitter_w );
-extern WRITE8_HANDLER( nbmj8891_taiwanmb_gfxflag_w );
-extern WRITE8_HANDLER( nbmj8891_taiwanmb_gfxdraw_w );
-extern WRITE8_HANDLER( nbmj8891_taiwanmb_mcu_w );
-
-
static DRIVER_INIT( gionbana )
{
UINT8 *prot = memory_region(machine, "protection");
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index 6b4069d2234..3acddf0f3b6 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -34,6 +34,7 @@ Notes:
#include "sound/ay8910.h"
#include "sound/3812intf.h"
#include "sound/dac.h"
+#include "includes/nbmj8991.h"
#define SIGNED_DAC 0 // 0:unsigned DAC, 1:signed DAC
@@ -46,18 +47,6 @@ Notes:
#endif
-extern VIDEO_UPDATE( nbmj8991_type1 ); // galkoku
-extern VIDEO_UPDATE( nbmj8991_type2 ); // pstadium
-extern VIDEO_START( nbmj8991 ); // pstadium
-
-extern WRITE8_HANDLER( nbmj8991_palette_type1_w ); // galkoku
-extern WRITE8_HANDLER( nbmj8991_palette_type2_w ); // galkaika
-extern WRITE8_HANDLER( nbmj8991_palette_type3_w ); // pstadium
-extern WRITE8_HANDLER( nbmj8991_blitter_w );
-extern READ8_HANDLER( nbmj8991_clut_r );
-extern WRITE8_HANDLER( nbmj8991_clut_w );
-
-
static WRITE8_HANDLER( nbmj8991_soundbank_w )
{
if (!(data & 0x80)) soundlatch_clear_w(machine, 0, 0);
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 57e989b5ce3..87ad1b1b737 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -25,6 +25,7 @@ Notes:
#include "sound/3812intf.h"
#include "sound/dac.h"
#include "cpu/z80/z80daisy.h"
+#include "includes/nbmj9195.h"
#define SIGNED_DAC 0 // 0:unsigned DAC, 1:signed DAC
@@ -37,26 +38,6 @@ Notes:
#endif
-extern VIDEO_UPDATE( nbmj9195 );
-extern VIDEO_START( nbmj9195_1layer );
-extern VIDEO_START( nbmj9195_2layer );
-extern VIDEO_START( nbmj9195_nb22090 );
-
-extern READ8_HANDLER( nbmj9195_palette_r );
-extern WRITE8_HANDLER( nbmj9195_palette_w );
-extern READ8_HANDLER( nbmj9195_nb22090_palette_r );
-extern WRITE8_HANDLER( nbmj9195_nb22090_palette_w );
-
-extern READ8_HANDLER( nbmj9195_blitter_0_r );
-extern READ8_HANDLER( nbmj9195_blitter_1_r );
-extern WRITE8_HANDLER( nbmj9195_blitter_0_w );
-extern WRITE8_HANDLER( nbmj9195_blitter_1_w );
-extern WRITE8_HANDLER( nbmj9195_clut_0_w );
-extern WRITE8_HANDLER( nbmj9195_clut_1_w );
-extern void nbmj9195_clutsel_w(int data);
-extern void nbmj9195_gfxflag2_w(int data);
-
-
static int nbmj9195_inputport;
static int nbmj9195_dipswbitsel;
static int nbmj9195_outcoin_flag;
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index 18163b0d53c..5da2e2cff90 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -46,36 +46,11 @@ So this is the correct behavior of real hardware, not an emulation bug.
#include "sound/k005289.h"
#include "sound/k007232.h"
#include "sound/k051649.h"
+#include "includes/nemesis.h"
static UINT16 *ram;
static UINT16 *ram2;
-extern UINT16 *nemesis_videoram1b;
-extern UINT16 *nemesis_videoram1f;
-extern UINT16 *nemesis_videoram2b;
-extern UINT16 *nemesis_videoram2f;
-extern UINT16 *nemesis_characterram;
-extern UINT16 *nemesis_xscroll1,*nemesis_xscroll2, *nemesis_yscroll;
-extern size_t nemesis_characterram_size;
-
-WRITE16_HANDLER( nemesis_videoram1b_word_w );
-WRITE16_HANDLER( nemesis_videoram1f_word_w );
-WRITE16_HANDLER( nemesis_videoram2b_word_w );
-WRITE16_HANDLER( nemesis_videoram2f_word_w );
-WRITE16_HANDLER( nemesis_characterram_word_w );
-VIDEO_UPDATE( nemesis );
-VIDEO_START( nemesis );
-VIDEO_UPDATE( salamand );
-static MACHINE_RESET( nemesis );
-
-WRITE16_HANDLER( nemesis_gfx_flipx_w );
-WRITE16_HANDLER( nemesis_gfx_flipy_w );
-WRITE16_HANDLER( salamander_palette_word_w );
-
-extern UINT16 *nemesis_yscroll1, *nemesis_yscroll2;
-
-WRITE16_HANDLER( nemesis_palette_word_w );
-
static int irq_on = 0;
static int irq1_on = 0;
static int irq2_on = 0;
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index 22691936fed..b2e5bb78439 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -39,6 +39,7 @@ Memo:
#include "sound/dac.h"
#include "sound/3812intf.h"
#include "cpu/z80/z80daisy.h"
+#include "includes/niyanpai.h"
#define SIGNED_DAC 0 // 0:unsigned DAC, 1:signed DAC
@@ -52,26 +53,6 @@ Memo:
-extern VIDEO_UPDATE( niyanpai );
-extern VIDEO_START( niyanpai );
-
-extern READ16_HANDLER( niyanpai_palette_r );
-extern WRITE16_HANDLER( niyanpai_palette_w );
-
-extern READ16_HANDLER( niyanpai_blitter_0_r );
-extern READ16_HANDLER( niyanpai_blitter_1_r );
-extern READ16_HANDLER( niyanpai_blitter_2_r );
-extern WRITE16_HANDLER( niyanpai_blitter_0_w );
-extern WRITE16_HANDLER( niyanpai_blitter_1_w );
-extern WRITE16_HANDLER( niyanpai_blitter_2_w );
-extern WRITE16_HANDLER( niyanpai_clut_0_w );
-extern WRITE16_HANDLER( niyanpai_clut_1_w );
-extern WRITE16_HANDLER( niyanpai_clut_2_w );
-extern WRITE16_HANDLER( niyanpai_clutsel_0_w );
-extern WRITE16_HANDLER( niyanpai_clutsel_1_w );
-extern WRITE16_HANDLER( niyanpai_clutsel_2_w );
-
-
static int musobana_inputport;
static int musobana_outcoin_flag;
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 3ec1a490ba4..7b441c97af4 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -160,6 +160,7 @@ Afega stands for "Art-Fiction Electronic Game"
#include "machine/nmk004.h"
#include "machine/nmk112.h"
#include "cpu/pic16c5x/pic16c5x.h"
+#include "includes/nmk16.h"
/**********************************************************
@@ -200,66 +201,6 @@ static WRITE16_HANDLER( nmk16_mainram_strange_w )
}
}
-extern UINT16 *nmk_bgvideoram,*nmk_fgvideoram,*nmk_txvideoram;
-extern UINT16 *gunnail_scrollram, *gunnail_scrollramy;
-
-READ16_HANDLER( nmk_bgvideoram_r );
-WRITE16_HANDLER( nmk_bgvideoram_w );
-READ16_HANDLER( nmk_fgvideoram_r );
-WRITE16_HANDLER( nmk_fgvideoram_w );
-READ16_HANDLER( nmk_txvideoram_r );
-WRITE16_HANDLER( nmk_txvideoram_w );
-WRITE16_HANDLER( nmk_scroll_w );
-WRITE16_HANDLER( nmk_scroll_2_w );
-WRITE16_HANDLER( nmk_scroll_3_w );
-WRITE16_HANDLER( nmk_flipscreen_w );
-WRITE16_HANDLER( nmk_tilebank_w );
-WRITE16_HANDLER( bioship_scroll_w );
-WRITE16_HANDLER( bioship_bank_w );
-WRITE16_HANDLER( mustang_scroll_w );
-WRITE16_HANDLER( bioshipbg_scroll_w );
-WRITE16_HANDLER( vandyke_scroll_w );
-WRITE16_HANDLER( manybloc_scroll_w );
-
-VIDEO_START( macross );
-VIDEO_UPDATE( manybloc );
-VIDEO_START( gunnail );
-VIDEO_START( macross2 );
-VIDEO_START( tdragon2 );
-VIDEO_START( bjtwin );
-VIDEO_START( bioship );
-VIDEO_START( strahl );
-VIDEO_UPDATE( bioship );
-VIDEO_UPDATE( strahl );
-VIDEO_UPDATE( macross );
-VIDEO_UPDATE( gunnail );
-VIDEO_UPDATE( bjtwin );
-VIDEO_UPDATE( tharrier );
-VIDEO_UPDATE( hachamf );
-VIDEO_UPDATE( tdragon );
-VIDEO_EOF( nmk );
-VIDEO_EOF( strahl );
-
-/* Variables defined in video: */
-
-extern UINT16 *afega_vram_0, *afega_scroll_0;
-extern UINT16 *afega_vram_1, *afega_scroll_1;
-
-/* Functions defined in video: */
-
-WRITE16_HANDLER( afega_vram_0_w );
-WRITE16_HANDLER( afega_vram_1_w );
-//WRITE16_HANDLER( afega_palette_w );
-
-VIDEO_START( afega );
-VIDEO_START( grdnstrm );
-VIDEO_START( firehawk );
-VIDEO_UPDATE( afega );
-VIDEO_UPDATE( redhawkb );
-VIDEO_UPDATE(redhawki );
-VIDEO_UPDATE( bubl2000 );
-VIDEO_UPDATE( firehawk );
-
static MACHINE_RESET( nmk16 )
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index cc7be57b56a..deb50d9fcc7 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -43,6 +43,7 @@ TODO:
#include "machine/eeprom.h"
#include "cpu/pic16c5x/pic16c5x.h"
#include "sound/okim6295.h"
+#include "includes/playmark.h"
static UINT16 playmark_snd_command;
@@ -51,34 +52,6 @@ static UINT8 playmark_oki_control;
static UINT8 playmark_oki_command;
-extern UINT16 *bigtwin_bgvideoram;
-extern UINT16 *wbeachvl_videoram1,*wbeachvl_videoram2,*wbeachvl_videoram3;
-extern UINT16 *wbeachvl_rowscroll;
-
-VIDEO_START( bigtwin );
-VIDEO_START( wbeachvl );
-VIDEO_START( excelsr );
-VIDEO_START( hotmind );
-VIDEO_START( hrdtimes );
-WRITE16_HANDLER( wbeachvl_txvideoram_w );
-WRITE16_HANDLER( wbeachvl_fgvideoram_w );
-WRITE16_HANDLER( wbeachvl_bgvideoram_w );
-WRITE16_HANDLER( hrdtimes_txvideoram_w );
-WRITE16_HANDLER( hrdtimes_fgvideoram_w );
-WRITE16_HANDLER( hrdtimes_bgvideoram_w );
-WRITE16_HANDLER( bigtwin_paletteram_w );
-WRITE16_HANDLER( bigtwin_bgvideoram_w );
-WRITE16_HANDLER( bigtwin_scroll_w );
-WRITE16_HANDLER( wbeachvl_scroll_w );
-WRITE16_HANDLER( excelsr_scroll_w );
-WRITE16_HANDLER( hrdtimes_scroll_w );
-VIDEO_UPDATE( bigtwin );
-VIDEO_UPDATE( wbeachvl );
-VIDEO_UPDATE( excelsr );
-VIDEO_UPDATE( hrdtimes );
-
-
-
static WRITE16_HANDLER( coinctrl_w )
{
if (ACCESSING_BITS_8_15)
diff --git a/src/mame/drivers/sspeedr.c b/src/mame/drivers/sspeedr.c
index e442d1112ef..02932087b96 100644
--- a/src/mame/drivers/sspeedr.c
+++ b/src/mame/drivers/sspeedr.c
@@ -5,27 +5,8 @@ Taito Super Speed Race driver
***************************************************************************/
#include "driver.h"
-
#include "sspeedr.lh"
-
-extern WRITE8_HANDLER( sspeedr_driver_horz_w );
-extern WRITE8_HANDLER( sspeedr_driver_horz_2_w );
-extern WRITE8_HANDLER( sspeedr_driver_vert_w );
-extern WRITE8_HANDLER( sspeedr_driver_pic_w );
-
-extern WRITE8_HANDLER( sspeedr_drones_horz_w );
-extern WRITE8_HANDLER( sspeedr_drones_horz_2_w );
-extern WRITE8_HANDLER( sspeedr_drones_vert_w );
-extern WRITE8_HANDLER( sspeedr_drones_mask_w );
-
-extern WRITE8_HANDLER( sspeedr_track_horz_w );
-extern WRITE8_HANDLER( sspeedr_track_horz_2_w );
-extern WRITE8_HANDLER( sspeedr_track_vert_w );
-extern WRITE8_HANDLER( sspeedr_track_ice_w );
-
-extern VIDEO_START( sspeedr );
-extern VIDEO_UPDATE( sspeedr );
-extern VIDEO_EOF( sspeedr );
+#include "includes/sspeedr.h"
static UINT8 led_TIME[2];
static UINT8 led_SCORE[24];
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index 540bb738553..3cef461b958 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -178,33 +178,7 @@ Notes:
#include "sound/2203intf.h"
#include "sound/2610intf.h"
#include "sound/okim6295.h"
-
-extern UINT16 *taitob_scroll;
-extern UINT16 *TC0180VCU_ram;
-extern UINT16 *taitob_spriteram;
-extern UINT16 *taitob_pixelram;
-
-VIDEO_START( taitob_color_order0 );
-VIDEO_START( taitob_color_order1 );
-VIDEO_START( taitob_color_order2 );
-VIDEO_START( hitice );
-VIDEO_EOF( taitob );
-
-VIDEO_RESET( hitice );
-
-VIDEO_UPDATE( taitob );
-
-WRITE16_HANDLER( TC0180VCU_word_w );
-READ16_HANDLER ( TC0180VCU_word_r );
-
-READ16_HANDLER( TC0180VCU_framebuffer_word_r );
-WRITE16_HANDLER( TC0180VCU_framebuffer_word_w );
-
-WRITE16_HANDLER( taitob_v_control_w );
-READ16_HANDLER ( taitob_v_control_r );
-
-WRITE16_HANDLER( hitice_pixelram_w );
-WRITE16_HANDLER( hitice_pixel_scroll_w );
+#include "includes/taito_b.h"
static WRITE8_HANDLER( bankswitch_w )
{
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index d6305351846..0661f94da36 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -65,21 +65,10 @@ zooming might be wrong
#include "driver.h"
#include "sound/2610intf.h"
+#include "includes/taotaido.h"
#define TAOTAIDO_SHOW_ALL_INPUTS 0
-UINT16 *taotaido_spriteram;
-UINT16 *taotaido_spriteram2;
-UINT16 *taotaido_scrollram;
-UINT16 *taotaido_bgram;
-
-WRITE16_HANDLER( taotaido_sprite_character_bank_select_w );
-WRITE16_HANDLER( taotaido_tileregs_w );
-WRITE16_HANDLER( taotaido_bgvideoram_w );
-VIDEO_START( taotaido );
-VIDEO_UPDATE( taotaido );
-VIDEO_EOF( taotaido );
-
static int pending_command;
static READ16_HANDLER( pending_command_r )
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index a131b9e172a..f38556393c6 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -37,6 +37,7 @@ Notes:
#include "sound/okim6295.h"
#include "sound/ymz280b.h"
#include "rocknms.lh"
+#include "includes/tetrisp2.h"
UINT16 tetrisp2_systemregs[0x10];
static UINT16 rocknms_sub_systemregs[0x10];
@@ -48,50 +49,6 @@ static UINT16 rockn_soundvolume;
static emu_timer *rockn_timer_l4;
static emu_timer *rockn_timer_sub_l4;
-/* Variables defined in video: */
-
-extern UINT16 *tetrisp2_vram_bg, *tetrisp2_scroll_bg;
-extern UINT16 *tetrisp2_vram_fg, *tetrisp2_scroll_fg;
-extern UINT16 *tetrisp2_vram_rot, *tetrisp2_rotregs;
-
-extern UINT16 *tetrisp2_priority;
-
-extern UINT16 *rocknms_sub_vram_bg, *rocknms_sub_scroll_bg;
-extern UINT16 *rocknms_sub_vram_fg, *rocknms_sub_scroll_fg;
-extern UINT16 *rocknms_sub_vram_rot, *rocknms_sub_rotregs;
-
-extern UINT16 *rocknms_sub_priority;
-
-/* Functions defined in video: */
-
-WRITE16_HANDLER( tetrisp2_palette_w );
-WRITE16_HANDLER( rocknms_sub_palette_w );
-READ16_HANDLER( tetrisp2_priority_r );
-WRITE16_HANDLER( tetrisp2_priority_w );
-WRITE16_HANDLER( rockn_priority_w );
-READ16_HANDLER( rocknms_sub_priority_r );
-WRITE16_HANDLER( rocknms_sub_priority_w );
-READ16_HANDLER( nndmseal_priority_r );
-
-WRITE16_HANDLER( tetrisp2_vram_bg_w );
-WRITE16_HANDLER( tetrisp2_vram_fg_w );
-WRITE16_HANDLER( tetrisp2_vram_rot_w );
-
-WRITE16_HANDLER( rocknms_sub_vram_bg_w );
-WRITE16_HANDLER( rocknms_sub_vram_fg_w );
-WRITE16_HANDLER( rocknms_sub_vram_rot_w );
-
-VIDEO_START( tetrisp2 );
-VIDEO_UPDATE( tetrisp2 );
-
-VIDEO_START( rockntread );
-VIDEO_UPDATE( rockntread );
-
-VIDEO_START( rocknms );
-VIDEO_UPDATE( rocknms );
-
-VIDEO_START( nndmseal );
-
/***************************************************************************
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index a1ffa3bb515..c46c1ac0d25 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -77,37 +77,8 @@ Updates:
#include "sound/k054539.h"
#include "sound/k007232.h"
#include "sound/upd7759.h"
+#include "includes/tmnt.h"
-WRITE16_HANDLER( tmnt_paletteram_word_w );
-WRITE16_HANDLER( tmnt_0a0000_w );
-WRITE16_HANDLER( punkshot_0a0020_w );
-WRITE16_HANDLER( lgtnfght_0a0018_w );
-WRITE16_HANDLER( blswhstl_700300_w );
-READ16_HANDLER( glfgreat_rom_r );
-WRITE16_HANDLER( glfgreat_122000_w );
-WRITE16_HANDLER( ssriders_1c0300_w );
-WRITE16_HANDLER( prmrsocr_122000_w );
-WRITE16_HANDLER( tmnt_priority_w );
-READ16_HANDLER( glfgreat_ball_r );
-READ16_HANDLER( prmrsocr_rom_r );
-VIDEO_START( sunsetbl );
-VIDEO_START( cuebrick );
-VIDEO_START( mia );
-VIDEO_START( tmnt );
-VIDEO_START( punkshot );
-VIDEO_START( lgtnfght );
-VIDEO_START( blswhstl );
-VIDEO_START( glfgreat );
-VIDEO_START( thndrx2 );
-VIDEO_START( prmrsocr );
-VIDEO_UPDATE( mia );
-VIDEO_UPDATE( tmnt );
-VIDEO_UPDATE( punkshot );
-VIDEO_UPDATE( lgtnfght );
-VIDEO_UPDATE( glfgreat );
-VIDEO_UPDATE( tmnt2 );
-VIDEO_UPDATE( thndrx2 );
-VIDEO_EOF( blswhstl );
static int tmnt_soundlatch;
static int cuebrick_snd_irqlatch, cuebrick_nvram_bank;
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index fd3e5fc59a7..164be536a9b 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -314,46 +314,12 @@ Stephh's notes (based on the games M68000 code and some tests) :
#include "sound/2151intf.h"
#include "sound/3812intf.h"
#include "sound/okim6295.h"
+#include "includes/tumbleb.h"
#define TUMBLEP_HACK 0
#define FNCYWLD_HACK 0
-VIDEO_START( tumblepb );
-VIDEO_START( fncywld );
-VIDEO_START( jumppop );
-VIDEO_START( sdfight );
-VIDEO_UPDATE( tumblep );
-VIDEO_UPDATE( tumblepb );
-VIDEO_UPDATE( jumpkids );
-VIDEO_UPDATE( fncywld );
-VIDEO_UPDATE( jumppop );
-VIDEO_UPDATE( semicom );
-VIDEO_UPDATE( semicom_altoffsets );
-VIDEO_UPDATE( bcstory );
-VIDEO_UPDATE(semibase );
-VIDEO_START( suprtrio );
-VIDEO_UPDATE( suprtrio );
-VIDEO_START( pangpang );
-VIDEO_UPDATE( pangpang );
-VIDEO_UPDATE( sdfight );
-
-
-
-WRITE16_HANDLER( tumblepb_pf1_data_w );
-WRITE16_HANDLER( tumblepb_pf2_data_w );
-WRITE16_HANDLER( fncywld_pf1_data_w );
-WRITE16_HANDLER( fncywld_pf2_data_w );
-WRITE16_HANDLER( tumblepb_control_0_w );
static WRITE16_HANDLER( semicom_soundcmd_w );
-WRITE16_HANDLER( pangpang_pf1_data_w );
-WRITE16_HANDLER( pangpang_pf2_data_w );
-
-extern WRITE16_HANDLER( bcstory_tilebank_w );
-extern WRITE16_HANDLER( suprtrio_tilebank_w );
-extern WRITE16_HANDLER( chokchok_tilebank_w );
-extern WRITE16_HANDLER( wlstar_tilebank_w );
-
-extern UINT16 *tumblepb_pf1_data,*tumblepb_pf2_data;
static UINT16* tumblepb_mainram;
UINT16* jumppop_control;
UINT16* suprtrio_control;
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index 195868bec40..ed4d2fb7bf3 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -54,25 +54,7 @@ Press one of the start buttons to exit.
#include "driver.h"
#include "cpu/z80/z80.h"
#include "sound/2608intf.h"
-
-
-extern UINT8 *wc90_fgvideoram,*wc90_bgvideoram,*wc90_txvideoram;
-
-
-extern UINT8 *wc90_scroll0xlo, *wc90_scroll0xhi;
-extern UINT8 *wc90_scroll1xlo, *wc90_scroll1xhi;
-extern UINT8 *wc90_scroll2xlo, *wc90_scroll2xhi;
-
-extern UINT8 *wc90_scroll0ylo, *wc90_scroll0yhi;
-extern UINT8 *wc90_scroll1ylo, *wc90_scroll1yhi;
-extern UINT8 *wc90_scroll2ylo, *wc90_scroll2yhi;
-
-VIDEO_START( wc90 );
-VIDEO_START( wc90t );
-WRITE8_HANDLER( wc90_fgvideoram_w );
-WRITE8_HANDLER( wc90_bgvideoram_w );
-WRITE8_HANDLER( wc90_txvideoram_w );
-VIDEO_UPDATE( wc90 );
+#include "includes/wc90.h"
static UINT8 *wc90_shared;
diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h
new file mode 100644
index 00000000000..120d9a782c5
--- /dev/null
+++ b/src/mame/includes/aerofgt.h
@@ -0,0 +1,39 @@
+/*----------- defined in video/aerofgt.c -----------*/
+
+extern UINT16 *aerofgt_rasterram;
+extern UINT16 *aerofgt_bg1videoram,*aerofgt_bg2videoram;
+extern UINT16 *aerofgt_spriteram1,*aerofgt_spriteram2,*aerofgt_spriteram3;
+extern UINT16 *wbbc97_bitmapram;
+extern size_t aerofgt_spriteram1_size,aerofgt_spriteram2_size,aerofgt_spriteram3_size;
+extern UINT16 *spikes91_tx_tilemap_ram;
+
+WRITE16_HANDLER( aerofgt_bg1videoram_w );
+WRITE16_HANDLER( aerofgt_bg2videoram_w );
+WRITE16_HANDLER( pspikes_gfxbank_w );
+WRITE16_HANDLER( pspikesb_gfxbank_w );
+WRITE16_HANDLER( spikes91_lookup_w );
+WRITE16_HANDLER( karatblz_gfxbank_w );
+WRITE16_HANDLER( spinlbrk_gfxbank_w );
+WRITE16_HANDLER( turbofrc_gfxbank_w );
+WRITE16_HANDLER( aerofgt_gfxbank_w );
+WRITE16_HANDLER( aerofgt_bg1scrollx_w );
+WRITE16_HANDLER( aerofgt_bg1scrolly_w );
+WRITE16_HANDLER( aerofgt_bg2scrollx_w );
+WRITE16_HANDLER( aerofgt_bg2scrolly_w );
+WRITE16_HANDLER( pspikes_palette_bank_w );
+WRITE16_HANDLER( wbbc97_bitmap_enable_w );
+VIDEO_START( pspikes );
+VIDEO_START( karatblz );
+VIDEO_START( spinlbrk );
+VIDEO_START( turbofrc );
+VIDEO_UPDATE( pspikes );
+VIDEO_UPDATE( pspikesb );
+VIDEO_UPDATE( spikes91 );
+VIDEO_UPDATE( karatblz );
+VIDEO_UPDATE( spinlbrk );
+VIDEO_UPDATE( turbofrc );
+VIDEO_UPDATE( aerofgt );
+VIDEO_UPDATE( aerfboot );
+VIDEO_UPDATE( aerfboo2 );
+VIDEO_START( wbbc97 );
+VIDEO_UPDATE( wbbc97 );
diff --git a/src/mame/includes/argus.h b/src/mame/includes/argus.h
new file mode 100644
index 00000000000..0868d33eab3
--- /dev/null
+++ b/src/mame/includes/argus.h
@@ -0,0 +1,49 @@
+/*----------- defined in video/argus.c -----------*/
+
+extern UINT8 *argus_paletteram;
+extern UINT8 *argus_txram;
+extern UINT8 *argus_bg0_scrollx;
+extern UINT8 *argus_bg0_scrolly;
+extern UINT8 *argus_bg1ram;
+extern UINT8 *argus_bg1_scrollx;
+extern UINT8 *argus_bg1_scrolly;
+extern UINT8 *butasan_bg1ram;
+
+VIDEO_START( argus );
+VIDEO_START( valtric );
+VIDEO_START( butasan );
+VIDEO_RESET( argus );
+VIDEO_RESET( valtric );
+VIDEO_RESET( butasan );
+VIDEO_UPDATE( argus );
+VIDEO_UPDATE( valtric );
+VIDEO_UPDATE( butasan );
+
+READ8_HANDLER( argus_txram_r );
+READ8_HANDLER( argus_bg1ram_r );
+READ8_HANDLER( argus_paletteram_r );
+
+WRITE8_HANDLER( argus_txram_w );
+WRITE8_HANDLER( argus_bg1ram_w );
+WRITE8_HANDLER( argus_bg0_scrollx_w );
+WRITE8_HANDLER( argus_bg0_scrolly_w );
+WRITE8_HANDLER( argus_bg1_scrollx_w );
+WRITE8_HANDLER( argus_bg1_scrolly_w );
+WRITE8_HANDLER( argus_bg_status_w );
+WRITE8_HANDLER( argus_flipscreen_w );
+WRITE8_HANDLER( argus_paletteram_w );
+
+WRITE8_HANDLER( valtric_bg_status_w );
+WRITE8_HANDLER( valtric_paletteram_w );
+WRITE8_HANDLER( valtric_mosaic_w );
+WRITE8_HANDLER( valtric_unknown_w );
+
+READ8_HANDLER( butasan_pagedram_r );
+READ8_HANDLER( butasan_bg1ram_r );
+WRITE8_HANDLER( butasan_pageselect_w );
+WRITE8_HANDLER( butasan_pagedram_w );
+WRITE8_HANDLER( butasan_bg1ram_w );
+WRITE8_HANDLER( butasan_bg0_status_w );
+WRITE8_HANDLER( butasan_paletteram_w );
+WRITE8_HANDLER( butasan_bg1_status_w );
+WRITE8_HANDLER( butasan_unknown_w );
diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h
new file mode 100644
index 00000000000..fdafe486a6b
--- /dev/null
+++ b/src/mame/includes/armedf.h
@@ -0,0 +1,26 @@
+/*----------- defined in video/armedf.c -----------*/
+
+extern UINT16 armedf_vreg;
+extern UINT16 *armedf_bg_videoram;
+extern UINT16 *armedf_fg_videoram;
+extern UINT16 *terraf_text_videoram;
+extern UINT16 *legion_cmd;
+extern tilemap *armedf_tx_tilemap;
+
+void armedf_setgfxtype( int type );
+
+VIDEO_UPDATE( armedf );
+VIDEO_EOF( armedf );
+VIDEO_START( armedf );
+
+WRITE16_HANDLER( armedf_bg_videoram_w );
+WRITE16_HANDLER( armedf_fg_videoram_w );
+WRITE16_HANDLER( armedf_text_videoram_w );
+WRITE16_HANDLER( terraf_fg_scrollx_w );
+WRITE16_HANDLER( terraf_fg_scrolly_w );
+WRITE16_HANDLER( terraf_fg_scroll_msb_arm_w );
+WRITE16_HANDLER( armedf_fg_scrollx_w );
+WRITE16_HANDLER( armedf_fg_scrolly_w );
+WRITE16_HANDLER( armedf_bg_scrollx_w );
+WRITE16_HANDLER( armedf_bg_scrolly_w );
+WRITE16_HANDLER( armedf_mcu_cmd );
diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h
new file mode 100644
index 00000000000..87cdfd19424
--- /dev/null
+++ b/src/mame/includes/dec8.h
@@ -0,0 +1,37 @@
+/*----------- defined in video/dec8.c -----------*/
+
+extern UINT8 *dec8_pf0_data,*dec8_pf1_data,*dec8_row;
+
+PALETTE_INIT( ghostb );
+VIDEO_UPDATE( cobracom );
+VIDEO_UPDATE( ghostb );
+VIDEO_UPDATE( srdarwin );
+VIDEO_UPDATE( gondo );
+VIDEO_UPDATE( garyoret );
+VIDEO_UPDATE( lastmiss );
+VIDEO_UPDATE( shackled );
+VIDEO_UPDATE( oscar );
+VIDEO_START( cobracom );
+VIDEO_START( oscar );
+VIDEO_START( ghostb );
+VIDEO_START( lastmiss );
+VIDEO_START( shackled );
+VIDEO_START( srdarwin );
+VIDEO_START( gondo );
+VIDEO_START( garyoret );
+
+WRITE8_HANDLER( dec8_bac06_0_w );
+WRITE8_HANDLER( dec8_bac06_1_w );
+WRITE8_HANDLER( dec8_pf0_data_w );
+WRITE8_HANDLER( dec8_pf1_data_w );
+READ8_HANDLER( dec8_pf0_data_r );
+READ8_HANDLER( dec8_pf1_data_r );
+WRITE8_HANDLER( srdarwin_videoram_w );
+WRITE8_HANDLER( dec8_scroll2_w );
+WRITE8_HANDLER( srdarwin_control_w );
+WRITE8_HANDLER( gondo_scroll_w );
+WRITE8_HANDLER( shackled_control_w );
+WRITE8_HANDLER( lastmiss_control_w );
+WRITE8_HANDLER( lastmiss_scrollx_w );
+WRITE8_HANDLER( lastmiss_scrolly_w );
+WRITE8_HANDLER( dec8_videoram_w );
diff --git a/src/mame/includes/dooyong.h b/src/mame/includes/dooyong.h
new file mode 100644
index 00000000000..8ca0bc5704b
--- /dev/null
+++ b/src/mame/includes/dooyong.h
@@ -0,0 +1,41 @@
+/*----------- defined in video/dooyong.c -----------*/
+
+extern UINT8 *dooyong_txvideoram;
+
+WRITE8_HANDLER( dooyong_bgscroll8_w );
+WRITE8_HANDLER( dooyong_fgscroll8_w );
+WRITE8_HANDLER( dooyong_fg2scroll8_w );
+
+WRITE16_HANDLER( dooyong_bgscroll16_w );
+WRITE16_HANDLER( dooyong_bg2scroll16_w );
+WRITE16_HANDLER( dooyong_fgscroll16_w );
+WRITE16_HANDLER( dooyong_fg2scroll16_w );
+
+WRITE8_HANDLER( dooyong_txvideoram8_w );
+
+WRITE8_HANDLER( lastday_ctrl_w );
+WRITE8_HANDLER( pollux_ctrl_w );
+WRITE8_HANDLER( primella_ctrl_w );
+WRITE8_HANDLER( flytiger_ctrl_w );
+WRITE16_HANDLER( rshark_ctrl_w );
+
+VIDEO_UPDATE( lastday );
+VIDEO_UPDATE( gulfstrm );
+VIDEO_UPDATE( pollux );
+VIDEO_UPDATE( bluehawk );
+VIDEO_UPDATE( flytiger );
+VIDEO_UPDATE( primella );
+VIDEO_UPDATE( rshark );
+VIDEO_UPDATE( popbingo );
+
+VIDEO_START( lastday );
+VIDEO_START( gulfstrm );
+VIDEO_START( pollux );
+VIDEO_START( bluehawk );
+VIDEO_START( flytiger );
+VIDEO_START( primella );
+VIDEO_START( rshark );
+VIDEO_START( popbingo );
+
+VIDEO_EOF( dooyong );
+VIDEO_EOF( rshark );
diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h
new file mode 100644
index 00000000000..27d3ed252ed
--- /dev/null
+++ b/src/mame/includes/fromanc2.h
@@ -0,0 +1,41 @@
+/*----------- defined in video/fromanc2.c -----------*/
+
+VIDEO_UPDATE( fromanc2 );
+VIDEO_START( fromanc2 );
+VIDEO_START( fromancr );
+VIDEO_START( fromanc4 );
+
+READ16_HANDLER( fromanc2_paletteram_0_r );
+READ16_HANDLER( fromanc2_paletteram_1_r );
+WRITE16_HANDLER( fromanc2_paletteram_0_w );
+WRITE16_HANDLER( fromanc2_paletteram_1_w );
+READ16_HANDLER( fromancr_paletteram_0_r );
+READ16_HANDLER( fromancr_paletteram_1_r );
+WRITE16_HANDLER( fromancr_paletteram_0_w );
+WRITE16_HANDLER( fromancr_paletteram_1_w );
+READ16_HANDLER( fromanc4_paletteram_0_r );
+READ16_HANDLER( fromanc4_paletteram_1_r );
+WRITE16_HANDLER( fromanc4_paletteram_0_w );
+WRITE16_HANDLER( fromanc4_paletteram_1_w );
+WRITE16_HANDLER( fromanc2_videoram_0_w );
+WRITE16_HANDLER( fromanc2_videoram_1_w );
+WRITE16_HANDLER( fromanc2_videoram_2_w );
+WRITE16_HANDLER( fromanc2_videoram_3_w );
+WRITE16_HANDLER( fromancr_videoram_0_w );
+WRITE16_HANDLER( fromancr_videoram_1_w );
+WRITE16_HANDLER( fromancr_videoram_2_w );
+WRITE16_HANDLER( fromanc4_videoram_0_w );
+WRITE16_HANDLER( fromanc4_videoram_1_w );
+WRITE16_HANDLER( fromanc4_videoram_2_w );
+WRITE16_HANDLER( fromanc2_gfxreg_0_w );
+WRITE16_HANDLER( fromanc2_gfxreg_1_w );
+WRITE16_HANDLER( fromanc2_gfxreg_2_w );
+WRITE16_HANDLER( fromanc2_gfxreg_3_w );
+WRITE16_HANDLER( fromancr_gfxreg_0_w );
+WRITE16_HANDLER( fromancr_gfxreg_1_w );
+WRITE16_HANDLER( fromanc2_gfxbank_0_w );
+WRITE16_HANDLER( fromanc2_gfxbank_1_w );
+void fromancr_gfxbank_w(int data);
+WRITE16_HANDLER( fromanc4_gfxreg_0_w );
+WRITE16_HANDLER( fromanc4_gfxreg_1_w );
+WRITE16_HANDLER( fromanc4_gfxreg_2_w );
diff --git a/src/mame/includes/nbmj8688.h b/src/mame/includes/nbmj8688.h
new file mode 100644
index 00000000000..9fec5394c5d
--- /dev/null
+++ b/src/mame/includes/nbmj8688.h
@@ -0,0 +1,29 @@
+/*----------- defined in video/nbmj8688.c -----------*/
+
+PALETTE_INIT( mbmj8688_8bit );
+PALETTE_INIT( mbmj8688_12bit );
+PALETTE_INIT( mbmj8688_16bit );
+VIDEO_UPDATE( mbmj8688 );
+VIDEO_UPDATE( mbmj8688_LCD );
+VIDEO_START( mbmj8688_8bit );
+VIDEO_START( mbmj8688_hybrid_12bit );
+VIDEO_START( mbmj8688_pure_12bit );
+VIDEO_START( mbmj8688_hybrid_16bit );
+VIDEO_START( mbmj8688_pure_16bit );
+VIDEO_START( mbmj8688_pure_16bit_LCD );
+
+WRITE8_HANDLER( nbmj8688_clut_w );
+WRITE8_HANDLER( nbmj8688_blitter_w );
+WRITE8_HANDLER( mjsikaku_gfxflag2_w );
+WRITE8_HANDLER( mjsikaku_scrolly_w );
+WRITE8_HANDLER( mjsikaku_romsel_w );
+WRITE8_HANDLER( secolove_romsel_w );
+WRITE8_HANDLER( seiha_romsel_w );
+WRITE8_HANDLER( crystalg_romsel_w );
+
+WRITE8_HANDLER( nbmj8688_HD61830B_0_instr_w );
+WRITE8_HANDLER( nbmj8688_HD61830B_0_data_w );
+WRITE8_HANDLER( nbmj8688_HD61830B_1_instr_w );
+WRITE8_HANDLER( nbmj8688_HD61830B_1_data_w );
+WRITE8_HANDLER( nbmj8688_HD61830B_both_instr_w );
+WRITE8_HANDLER( nbmj8688_HD61830B_both_data_w );
diff --git a/src/mame/includes/nbmj8891.h b/src/mame/includes/nbmj8891.h
new file mode 100644
index 00000000000..185c87e533f
--- /dev/null
+++ b/src/mame/includes/nbmj8891.h
@@ -0,0 +1,23 @@
+/*----------- defined in video/nbmj8891.c -----------*/
+
+VIDEO_UPDATE( nbmj8891 );
+VIDEO_START( nbmj8891_1layer );
+VIDEO_START( nbmj8891_2layer );
+
+READ8_HANDLER( nbmj8891_palette_type1_r );
+WRITE8_HANDLER( nbmj8891_palette_type1_w );
+READ8_HANDLER( nbmj8891_palette_type2_r );
+WRITE8_HANDLER( nbmj8891_palette_type2_w );
+READ8_HANDLER( nbmj8891_palette_type3_r );
+WRITE8_HANDLER( nbmj8891_palette_type3_w );
+WRITE8_HANDLER( nbmj8891_blitter_w );
+WRITE8_HANDLER( nbmj8891_scrolly_w );
+WRITE8_HANDLER( nbmj8891_vramsel_w );
+WRITE8_HANDLER( nbmj8891_romsel_w );
+WRITE8_HANDLER( nbmj8891_clutsel_w );
+READ8_HANDLER( nbmj8891_clut_r );
+WRITE8_HANDLER( nbmj8891_clut_w );
+WRITE8_HANDLER( nbmj8891_taiwanmb_blitter_w );
+WRITE8_HANDLER( nbmj8891_taiwanmb_gfxflag_w );
+WRITE8_HANDLER( nbmj8891_taiwanmb_gfxdraw_w );
+WRITE8_HANDLER( nbmj8891_taiwanmb_mcu_w );
diff --git a/src/mame/includes/nbmj8991.h b/src/mame/includes/nbmj8991.h
new file mode 100644
index 00000000000..5b51ff4dae2
--- /dev/null
+++ b/src/mame/includes/nbmj8991.h
@@ -0,0 +1,12 @@
+/*----------- defined in video/nbmj8991.c -----------*/
+
+VIDEO_UPDATE( nbmj8991_type1 );
+VIDEO_UPDATE( nbmj8991_type2 );
+VIDEO_START( nbmj8991 );
+
+WRITE8_HANDLER( nbmj8991_palette_type1_w );
+WRITE8_HANDLER( nbmj8991_palette_type2_w );
+WRITE8_HANDLER( nbmj8991_palette_type3_w );
+WRITE8_HANDLER( nbmj8991_blitter_w );
+READ8_HANDLER( nbmj8991_clut_r );
+WRITE8_HANDLER( nbmj8991_clut_w );
diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h
new file mode 100644
index 00000000000..03e022a2164
--- /dev/null
+++ b/src/mame/includes/nbmj9195.h
@@ -0,0 +1,21 @@
+/*----------- defined in video/nbmj9195.c -----------*/
+
+VIDEO_UPDATE( nbmj9195 );
+VIDEO_START( nbmj9195_1layer );
+VIDEO_START( nbmj9195_2layer );
+VIDEO_START( nbmj9195_nb22090 );
+
+READ8_HANDLER( nbmj9195_palette_r );
+WRITE8_HANDLER( nbmj9195_palette_w );
+READ8_HANDLER( nbmj9195_nb22090_palette_r );
+WRITE8_HANDLER( nbmj9195_nb22090_palette_w );
+
+READ8_HANDLER( nbmj9195_blitter_0_r );
+READ8_HANDLER( nbmj9195_blitter_1_r );
+WRITE8_HANDLER( nbmj9195_blitter_0_w );
+WRITE8_HANDLER( nbmj9195_blitter_1_w );
+WRITE8_HANDLER( nbmj9195_clut_0_w );
+WRITE8_HANDLER( nbmj9195_clut_1_w );
+
+void nbmj9195_clutsel_w(int data);
+void nbmj9195_gfxflag2_w(int data);
diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h
new file mode 100644
index 00000000000..631eb043ad2
--- /dev/null
+++ b/src/mame/includes/nemesis.h
@@ -0,0 +1,24 @@
+/*----------- defined in video/nemesis.c -----------*/
+
+extern UINT16 *nemesis_videoram1b;
+extern UINT16 *nemesis_videoram1f;
+extern UINT16 *nemesis_videoram2b;
+extern UINT16 *nemesis_videoram2f;
+extern UINT16 *nemesis_characterram;
+extern UINT16 *nemesis_xscroll1,*nemesis_xscroll2, *nemesis_yscroll;
+extern size_t nemesis_characterram_size;
+extern UINT16 *nemesis_yscroll1, *nemesis_yscroll2;
+
+WRITE16_HANDLER( nemesis_videoram1b_word_w );
+WRITE16_HANDLER( nemesis_videoram1f_word_w );
+WRITE16_HANDLER( nemesis_videoram2b_word_w );
+WRITE16_HANDLER( nemesis_videoram2f_word_w );
+WRITE16_HANDLER( nemesis_characterram_word_w );
+VIDEO_UPDATE( nemesis );
+VIDEO_START( nemesis );
+VIDEO_UPDATE( salamand );
+
+WRITE16_HANDLER( nemesis_gfx_flipx_w );
+WRITE16_HANDLER( nemesis_gfx_flipy_w );
+WRITE16_HANDLER( salamander_palette_word_w );
+WRITE16_HANDLER( nemesis_palette_word_w );
diff --git a/src/mame/includes/niyanpai.h b/src/mame/includes/niyanpai.h
new file mode 100644
index 00000000000..35f368ba453
--- /dev/null
+++ b/src/mame/includes/niyanpai.h
@@ -0,0 +1,20 @@
+/*----------- defined in video/niyanpai.c -----------*/
+
+VIDEO_UPDATE( niyanpai );
+VIDEO_START( niyanpai );
+
+READ16_HANDLER( niyanpai_palette_r );
+WRITE16_HANDLER( niyanpai_palette_w );
+
+READ16_HANDLER( niyanpai_blitter_0_r );
+READ16_HANDLER( niyanpai_blitter_1_r );
+READ16_HANDLER( niyanpai_blitter_2_r );
+WRITE16_HANDLER( niyanpai_blitter_0_w );
+WRITE16_HANDLER( niyanpai_blitter_1_w );
+WRITE16_HANDLER( niyanpai_blitter_2_w );
+WRITE16_HANDLER( niyanpai_clut_0_w );
+WRITE16_HANDLER( niyanpai_clut_1_w );
+WRITE16_HANDLER( niyanpai_clut_2_w );
+WRITE16_HANDLER( niyanpai_clutsel_0_w );
+WRITE16_HANDLER( niyanpai_clutsel_1_w );
+WRITE16_HANDLER( niyanpai_clutsel_2_w );
diff --git a/src/mame/includes/nmk16.h b/src/mame/includes/nmk16.h
new file mode 100644
index 00000000000..a3dc8c6c93c
--- /dev/null
+++ b/src/mame/includes/nmk16.h
@@ -0,0 +1,56 @@
+/*----------- defined in video/nmk16.c -----------*/
+
+extern UINT16 *nmk_bgvideoram,*nmk_fgvideoram,*nmk_txvideoram;
+extern UINT16 *gunnail_scrollram, *gunnail_scrollramy;
+extern UINT16 *afega_vram_0, *afega_scroll_0;
+extern UINT16 *afega_vram_1, *afega_scroll_1;
+
+
+READ16_HANDLER( nmk_bgvideoram_r );
+WRITE16_HANDLER( nmk_bgvideoram_w );
+READ16_HANDLER( nmk_fgvideoram_r );
+WRITE16_HANDLER( nmk_fgvideoram_w );
+READ16_HANDLER( nmk_txvideoram_r );
+WRITE16_HANDLER( nmk_txvideoram_w );
+WRITE16_HANDLER( nmk_scroll_w );
+WRITE16_HANDLER( nmk_scroll_2_w );
+WRITE16_HANDLER( nmk_scroll_3_w );
+WRITE16_HANDLER( nmk_flipscreen_w );
+WRITE16_HANDLER( nmk_tilebank_w );
+WRITE16_HANDLER( bioship_scroll_w );
+WRITE16_HANDLER( bioship_bank_w );
+WRITE16_HANDLER( mustang_scroll_w );
+WRITE16_HANDLER( bioshipbg_scroll_w );
+WRITE16_HANDLER( vandyke_scroll_w );
+WRITE16_HANDLER( manybloc_scroll_w );
+
+VIDEO_START( macross );
+VIDEO_UPDATE( manybloc );
+VIDEO_START( gunnail );
+VIDEO_START( macross2 );
+VIDEO_START( tdragon2 );
+VIDEO_START( bjtwin );
+VIDEO_START( bioship );
+VIDEO_START( strahl );
+VIDEO_UPDATE( bioship );
+VIDEO_UPDATE( strahl );
+VIDEO_UPDATE( macross );
+VIDEO_UPDATE( gunnail );
+VIDEO_UPDATE( bjtwin );
+VIDEO_UPDATE( tharrier );
+VIDEO_UPDATE( hachamf );
+VIDEO_UPDATE( tdragon );
+VIDEO_EOF( nmk );
+VIDEO_EOF( strahl );
+
+WRITE16_HANDLER( afega_vram_0_w );
+WRITE16_HANDLER( afega_vram_1_w );
+
+VIDEO_START( afega );
+VIDEO_START( grdnstrm );
+VIDEO_START( firehawk );
+VIDEO_UPDATE( afega );
+VIDEO_UPDATE( redhawkb );
+VIDEO_UPDATE(redhawki );
+VIDEO_UPDATE( bubl2000 );
+VIDEO_UPDATE( firehawk );
diff --git a/src/mame/includes/playmark.h b/src/mame/includes/playmark.h
new file mode 100644
index 00000000000..56e7085d3a4
--- /dev/null
+++ b/src/mame/includes/playmark.h
@@ -0,0 +1,26 @@
+/*----------- defined in video/playmark.c -----------*/
+
+extern UINT16 *bigtwin_bgvideoram;
+extern UINT16 *wbeachvl_videoram1,*wbeachvl_videoram2,*wbeachvl_videoram3;
+extern UINT16 *wbeachvl_rowscroll;
+
+VIDEO_START( bigtwin );
+VIDEO_START( wbeachvl );
+VIDEO_START( excelsr );
+VIDEO_START( hotmind );
+VIDEO_START( hrdtimes );
+WRITE16_HANDLER( wbeachvl_txvideoram_w );
+WRITE16_HANDLER( wbeachvl_fgvideoram_w );
+WRITE16_HANDLER( wbeachvl_bgvideoram_w );
+WRITE16_HANDLER( hrdtimes_txvideoram_w );
+WRITE16_HANDLER( hrdtimes_fgvideoram_w );
+WRITE16_HANDLER( hrdtimes_bgvideoram_w );
+WRITE16_HANDLER( bigtwin_paletteram_w );
+WRITE16_HANDLER( bigtwin_scroll_w );
+WRITE16_HANDLER( wbeachvl_scroll_w );
+WRITE16_HANDLER( excelsr_scroll_w );
+WRITE16_HANDLER( hrdtimes_scroll_w );
+VIDEO_UPDATE( bigtwin );
+VIDEO_UPDATE( wbeachvl );
+VIDEO_UPDATE( excelsr );
+VIDEO_UPDATE( hrdtimes );
diff --git a/src/mame/includes/sspeedr.h b/src/mame/includes/sspeedr.h
new file mode 100644
index 00000000000..829154028d7
--- /dev/null
+++ b/src/mame/includes/sspeedr.h
@@ -0,0 +1,20 @@
+/*----------- defined in video/sspeedr.c -----------*/
+
+WRITE8_HANDLER( sspeedr_driver_horz_w );
+WRITE8_HANDLER( sspeedr_driver_horz_2_w );
+WRITE8_HANDLER( sspeedr_driver_vert_w );
+WRITE8_HANDLER( sspeedr_driver_pic_w );
+
+WRITE8_HANDLER( sspeedr_drones_horz_w );
+WRITE8_HANDLER( sspeedr_drones_horz_2_w );
+WRITE8_HANDLER( sspeedr_drones_vert_w );
+WRITE8_HANDLER( sspeedr_drones_mask_w );
+
+WRITE8_HANDLER( sspeedr_track_horz_w );
+WRITE8_HANDLER( sspeedr_track_horz_2_w );
+WRITE8_HANDLER( sspeedr_track_vert_w );
+WRITE8_HANDLER( sspeedr_track_ice_w );
+
+VIDEO_START( sspeedr );
+VIDEO_UPDATE( sspeedr );
+VIDEO_EOF( sspeedr );
diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h
new file mode 100644
index 00000000000..53b8378af7e
--- /dev/null
+++ b/src/mame/includes/taito_b.h
@@ -0,0 +1,28 @@
+/*----------- defined in video/taito_b.c -----------*/
+
+extern UINT16 *taitob_scroll;
+extern UINT16 *TC0180VCU_ram;
+extern UINT16 *taitob_spriteram;
+extern UINT16 *taitob_pixelram;
+
+VIDEO_START( taitob_color_order0 );
+VIDEO_START( taitob_color_order1 );
+VIDEO_START( taitob_color_order2 );
+VIDEO_START( hitice );
+VIDEO_EOF( taitob );
+
+VIDEO_RESET( hitice );
+
+VIDEO_UPDATE( taitob );
+
+WRITE16_HANDLER( TC0180VCU_word_w );
+READ16_HANDLER ( TC0180VCU_word_r );
+
+READ16_HANDLER( TC0180VCU_framebuffer_word_r );
+WRITE16_HANDLER( TC0180VCU_framebuffer_word_w );
+
+WRITE16_HANDLER( taitob_v_control_w );
+READ16_HANDLER ( taitob_v_control_r );
+
+WRITE16_HANDLER( hitice_pixelram_w );
+WRITE16_HANDLER( hitice_pixel_scroll_w );
diff --git a/src/mame/includes/taotaido.h b/src/mame/includes/taotaido.h
new file mode 100644
index 00000000000..a8cfc43082f
--- /dev/null
+++ b/src/mame/includes/taotaido.h
@@ -0,0 +1,13 @@
+/*----------- defined in video/taotaido.c -----------*/
+
+extern UINT16 *taotaido_spriteram;
+extern UINT16 *taotaido_spriteram2;
+extern UINT16 *taotaido_scrollram;
+extern UINT16 *taotaido_bgram;
+
+WRITE16_HANDLER( taotaido_sprite_character_bank_select_w );
+WRITE16_HANDLER( taotaido_tileregs_w );
+WRITE16_HANDLER( taotaido_bgvideoram_w );
+VIDEO_START( taotaido );
+VIDEO_UPDATE( taotaido );
+VIDEO_EOF( taotaido );
diff --git a/src/mame/includes/tetrisp2.h b/src/mame/includes/tetrisp2.h
new file mode 100644
index 00000000000..367bf8b1f63
--- /dev/null
+++ b/src/mame/includes/tetrisp2.h
@@ -0,0 +1,46 @@
+/*----------- defined in drivers/tetrisp2.c -----------*/
+
+extern UINT16 tetrisp2_systemregs[0x10];
+
+
+/*----------- defined in video/tetrisp2.c -----------*/
+
+extern UINT16 *tetrisp2_vram_bg, *tetrisp2_scroll_bg;
+extern UINT16 *tetrisp2_vram_fg, *tetrisp2_scroll_fg;
+extern UINT16 *tetrisp2_vram_rot, *tetrisp2_rotregs;
+
+extern UINT16 *tetrisp2_priority;
+
+extern UINT16 *rocknms_sub_vram_bg, *rocknms_sub_scroll_bg;
+extern UINT16 *rocknms_sub_vram_fg, *rocknms_sub_scroll_fg;
+extern UINT16 *rocknms_sub_vram_rot, *rocknms_sub_rotregs;
+
+extern UINT16 *rocknms_sub_priority;
+
+WRITE16_HANDLER( tetrisp2_palette_w );
+WRITE16_HANDLER( rocknms_sub_palette_w );
+READ16_HANDLER( tetrisp2_priority_r );
+WRITE16_HANDLER( tetrisp2_priority_w );
+WRITE16_HANDLER( rockn_priority_w );
+READ16_HANDLER( rocknms_sub_priority_r );
+WRITE16_HANDLER( rocknms_sub_priority_w );
+READ16_HANDLER( nndmseal_priority_r );
+
+WRITE16_HANDLER( tetrisp2_vram_bg_w );
+WRITE16_HANDLER( tetrisp2_vram_fg_w );
+WRITE16_HANDLER( tetrisp2_vram_rot_w );
+
+WRITE16_HANDLER( rocknms_sub_vram_bg_w );
+WRITE16_HANDLER( rocknms_sub_vram_fg_w );
+WRITE16_HANDLER( rocknms_sub_vram_rot_w );
+
+VIDEO_START( tetrisp2 );
+VIDEO_UPDATE( tetrisp2 );
+
+VIDEO_START( rockntread );
+VIDEO_UPDATE( rockntread );
+
+VIDEO_START( rocknms );
+VIDEO_UPDATE( rocknms );
+
+VIDEO_START( nndmseal );
diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h
new file mode 100644
index 00000000000..e77d7f704c2
--- /dev/null
+++ b/src/mame/includes/tmnt.h
@@ -0,0 +1,33 @@
+/*----------- defined in video/tmnt.c -----------*/
+
+WRITE16_HANDLER( tmnt_paletteram_word_w );
+WRITE16_HANDLER( tmnt_0a0000_w );
+WRITE16_HANDLER( punkshot_0a0020_w );
+WRITE16_HANDLER( lgtnfght_0a0018_w );
+WRITE16_HANDLER( blswhstl_700300_w );
+READ16_HANDLER( glfgreat_rom_r );
+WRITE16_HANDLER( glfgreat_122000_w );
+WRITE16_HANDLER( ssriders_1c0300_w );
+WRITE16_HANDLER( prmrsocr_122000_w );
+WRITE16_HANDLER( tmnt_priority_w );
+READ16_HANDLER( glfgreat_ball_r );
+READ16_HANDLER( prmrsocr_rom_r );
+VIDEO_START( sunsetbl );
+VIDEO_START( cuebrick );
+VIDEO_START( mia );
+VIDEO_START( tmnt );
+VIDEO_START( punkshot );
+VIDEO_START( lgtnfght );
+VIDEO_START( blswhstl );
+VIDEO_START( glfgreat );
+VIDEO_START( thndrx2 );
+VIDEO_START( prmrsocr );
+VIDEO_UPDATE( mia );
+VIDEO_UPDATE( tmnt );
+VIDEO_UPDATE( punkshot );
+VIDEO_UPDATE( lgtnfght );
+VIDEO_UPDATE( glfgreat );
+VIDEO_UPDATE( tmnt2 );
+VIDEO_UPDATE( thndrx2 );
+VIDEO_EOF( blswhstl );
+
diff --git a/src/mame/includes/tumbleb.h b/src/mame/includes/tumbleb.h
new file mode 100644
index 00000000000..7e4b4ec98d2
--- /dev/null
+++ b/src/mame/includes/tumbleb.h
@@ -0,0 +1,40 @@
+/*----------- defined in drivers/tumbleb.c -----------*/
+
+extern UINT16* jumppop_control;
+extern UINT16* suprtrio_control;
+
+
+/*----------- defined in video/tumbleb.c -----------*/
+
+extern UINT16 *tumblepb_pf1_data,*tumblepb_pf2_data;
+
+VIDEO_START( tumblepb );
+VIDEO_START( fncywld );
+VIDEO_START( jumppop );
+VIDEO_START( sdfight );
+VIDEO_UPDATE( tumblepb );
+VIDEO_UPDATE( jumpkids );
+VIDEO_UPDATE( fncywld );
+VIDEO_UPDATE( jumppop );
+VIDEO_UPDATE( semicom );
+VIDEO_UPDATE( semicom_altoffsets );
+VIDEO_UPDATE( bcstory );
+VIDEO_UPDATE(semibase );
+VIDEO_START( suprtrio );
+VIDEO_UPDATE( suprtrio );
+VIDEO_START( pangpang );
+VIDEO_UPDATE( pangpang );
+VIDEO_UPDATE( sdfight );
+
+WRITE16_HANDLER( tumblepb_pf1_data_w );
+WRITE16_HANDLER( tumblepb_pf2_data_w );
+WRITE16_HANDLER( fncywld_pf1_data_w );
+WRITE16_HANDLER( fncywld_pf2_data_w );
+WRITE16_HANDLER( tumblepb_control_0_w );
+WRITE16_HANDLER( pangpang_pf1_data_w );
+WRITE16_HANDLER( pangpang_pf2_data_w );
+
+WRITE16_HANDLER( bcstory_tilebank_w );
+WRITE16_HANDLER( suprtrio_tilebank_w );
+WRITE16_HANDLER( chokchok_tilebank_w );
+WRITE16_HANDLER( wlstar_tilebank_w );
diff --git a/src/mame/includes/wc90.h b/src/mame/includes/wc90.h
new file mode 100644
index 00000000000..8969f4053bf
--- /dev/null
+++ b/src/mame/includes/wc90.h
@@ -0,0 +1,18 @@
+/*----------- defined in video/wc90.c -----------*/
+
+extern UINT8 *wc90_fgvideoram,*wc90_bgvideoram,*wc90_txvideoram;
+
+extern UINT8 *wc90_scroll0xlo, *wc90_scroll0xhi;
+extern UINT8 *wc90_scroll1xlo, *wc90_scroll1xhi;
+extern UINT8 *wc90_scroll2xlo, *wc90_scroll2xhi;
+
+extern UINT8 *wc90_scroll0ylo, *wc90_scroll0yhi;
+extern UINT8 *wc90_scroll1ylo, *wc90_scroll1yhi;
+extern UINT8 *wc90_scroll2ylo, *wc90_scroll2yhi;
+
+VIDEO_START( wc90 );
+VIDEO_START( wc90t );
+WRITE8_HANDLER( wc90_fgvideoram_w );
+WRITE8_HANDLER( wc90_bgvideoram_w );
+WRITE8_HANDLER( wc90_txvideoram_w );
+VIDEO_UPDATE( wc90 );
diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c
index 602dce162b9..d6c0fd7d311 100644
--- a/src/mame/video/aerofgt.c
+++ b/src/mame/video/aerofgt.c
@@ -1,4 +1,5 @@
#include "driver.h"
+#include "includes/aerofgt.h"
UINT16 *aerofgt_rasterram;
diff --git a/src/mame/video/argus.c b/src/mame/video/argus.c
index 4dff4a7d901..f2a4e573c42 100644
--- a/src/mame/video/argus.c
+++ b/src/mame/video/argus.c
@@ -115,6 +115,7 @@ BG0 palette intensity ( $C47F, $C4FF )
#include "driver.h"
#include "jalblend.h"
+#include "includes/argus.h"
UINT8 *argus_paletteram;
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index a6965e7e96b..a4f2c33e868 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -1,4 +1,5 @@
#include "driver.h"
+#include "includes/armedf.h"
UINT16 armedf_vreg;
diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c
index 9eda385357a..aca60277bad 100644
--- a/src/mame/video/dec8.c
+++ b/src/mame/video/dec8.c
@@ -41,6 +41,7 @@ sprites.
***************************************************************************/
#include "driver.h"
+#include "includes/dec8.h"
//static int scroll1[4];
static int scroll2[4];
diff --git a/src/mame/video/dooyong.c b/src/mame/video/dooyong.c
index 79e159cdfd7..7d527cb6aad 100644
--- a/src/mame/video/dooyong.c
+++ b/src/mame/video/dooyong.c
@@ -1,4 +1,5 @@
#include "driver.h"
+#include "includes/dooyong.h"
UINT8 *dooyong_txvideoram;
diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c
index 103596638a3..954d90dd314 100644
--- a/src/mame/video/fromanc2.c
+++ b/src/mame/video/fromanc2.c
@@ -7,6 +7,7 @@
******************************************************************************/
#include "driver.h"
+#include "includes/fromanc2.h"
static int fromanc2_scrollx[2][4], fromanc2_scrolly[2][4];
static int fromanc2_gfxbank[2][4];
diff --git a/src/mame/video/nbmj8688.c b/src/mame/video/nbmj8688.c
index a68a4048e8a..8a6ef191dfd 100644
--- a/src/mame/video/nbmj8688.c
+++ b/src/mame/video/nbmj8688.c
@@ -8,6 +8,7 @@
#include "driver.h"
#include "nb1413m3.h"
+#include "includes/nbmj8688.h"
static int mjsikaku_scrolly;
diff --git a/src/mame/video/nbmj8891.c b/src/mame/video/nbmj8891.c
index ac9bb9c8bf1..3819cad22b2 100644
--- a/src/mame/video/nbmj8891.c
+++ b/src/mame/video/nbmj8891.c
@@ -8,6 +8,7 @@
#include "driver.h"
#include "nb1413m3.h"
+#include "includes/nbmj8891.h"
static int nbmj8891_scrolly;
diff --git a/src/mame/video/nbmj8991.c b/src/mame/video/nbmj8991.c
index 0d35d66e464..92e609b2bc6 100644
--- a/src/mame/video/nbmj8991.c
+++ b/src/mame/video/nbmj8991.c
@@ -8,6 +8,7 @@
#include "driver.h"
#include "nb1413m3.h"
+#include "includes/nbmj8991.h"
static int nbmj8991_scrollx, nbmj8991_scrolly;
diff --git a/src/mame/video/nbmj9195.c b/src/mame/video/nbmj9195.c
index 24f3a2ec9a5..444fcdd87eb 100644
--- a/src/mame/video/nbmj9195.c
+++ b/src/mame/video/nbmj9195.c
@@ -8,6 +8,7 @@
******************************************************************************/
#include "driver.h"
+#include "includes/nbmj9195.h"
#define VRAM_MAX 2
diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c
index 7dceaf8c75b..e34df61e750 100644
--- a/src/mame/video/nemesis.c
+++ b/src/mame/video/nemesis.c
@@ -5,6 +5,8 @@
***************************************************************************/
#include "driver.h"
+#include "includes/nemesis.h"
+
UINT16 *nemesis_videoram1b;
UINT16 *nemesis_videoram2b;
diff --git a/src/mame/video/niyanpai.c b/src/mame/video/niyanpai.c
index 3947c75a5f6..ad5edbe1009 100644
--- a/src/mame/video/niyanpai.c
+++ b/src/mame/video/niyanpai.c
@@ -7,6 +7,7 @@
******************************************************************************/
#include "driver.h"
+#include "includes/niyanpai.h"
#define VRAM_MAX 3
diff --git a/src/mame/video/nmk16.c b/src/mame/video/nmk16.c
index 64a7be1091d..f80f594a819 100644
--- a/src/mame/video/nmk16.c
+++ b/src/mame/video/nmk16.c
@@ -8,6 +8,7 @@
*/
#include "driver.h"
+#include "includes/nmk16.h"
UINT16 *nmk_bgvideoram,*nmk_fgvideoram,*nmk_txvideoram;
UINT16 *gunnail_scrollram, *gunnail_scrollramy;
diff --git a/src/mame/video/playmark.c b/src/mame/video/playmark.c
index d89bf6c8235..7c055f004ee 100644
--- a/src/mame/video/playmark.c
+++ b/src/mame/video/playmark.c
@@ -1,4 +1,6 @@
#include "driver.h"
+#include "includes/playmark.h"
+
UINT16 *bigtwin_bgvideoram;
UINT16 *wbeachvl_videoram1,*wbeachvl_videoram2,*wbeachvl_videoram3;
diff --git a/src/mame/video/sspeedr.c b/src/mame/video/sspeedr.c
index 6ad211d0eb3..f12139b836d 100644
--- a/src/mame/video/sspeedr.c
+++ b/src/mame/video/sspeedr.c
@@ -5,6 +5,8 @@ Taito Super Speed Race video emulation
***************************************************************************/
#include "driver.h"
+#include "includes/sspeedr.h"
+
static int toggle;
diff --git a/src/mame/video/taito_b.c b/src/mame/video/taito_b.c
index 8d8bf54034c..36446c844f9 100644
--- a/src/mame/video/taito_b.c
+++ b/src/mame/video/taito_b.c
@@ -1,5 +1,6 @@
#include "driver.h"
#include "profiler.h"
+#include "includes/taito_b.h"
UINT16 *taitob_scroll;
UINT16 *TC0180VCU_ram;
diff --git a/src/mame/video/taotaido.c b/src/mame/video/taotaido.c
index 22a8687e3ed..af9515f6147 100644
--- a/src/mame/video/taotaido.c
+++ b/src/mame/video/taotaido.c
@@ -9,16 +9,17 @@ zooming might be wrong (only used on title logo?)
*/
#include "driver.h"
+#include "includes/taotaido.h"
+
+UINT16 *taotaido_spriteram;
+UINT16 *taotaido_spriteram2;
+UINT16 *taotaido_scrollram;
+UINT16 *taotaido_bgram;
static UINT16 taotaido_sprite_character_bank_select[8];
static UINT16 taotaido_video_bank_select[8];
static tilemap *bg_tilemap;
-extern UINT16 *taotaido_spriteram;
-extern UINT16 *taotaido_spriteram2;
-extern UINT16 *taotaido_scrollram;
-extern UINT16 *taotaido_bgram;
-
static UINT16 *taotaido_spriteram_old, *taotaido_spriteram_older;
static UINT16 *taotaido_spriteram2_old, *taotaido_spriteram2_older;
diff --git a/src/mame/video/tetrisp2.c b/src/mame/video/tetrisp2.c
index 46fa7db643e..4a13dfa8273 100644
--- a/src/mame/video/tetrisp2.c
+++ b/src/mame/video/tetrisp2.c
@@ -39,10 +39,9 @@ To Do:
***************************************************************************/
#include "driver.h"
+#include "includes/tetrisp2.h"
-extern UINT16 tetrisp2_systemregs[0x10];
-
/* Variables needed by driver: */
UINT16 *tetrisp2_vram_bg, *tetrisp2_scroll_bg;
diff --git a/src/mame/video/tmnt.c b/src/mame/video/tmnt.c
index 9c95a00eb6d..0d1f21b25bd 100644
--- a/src/mame/video/tmnt.c
+++ b/src/mame/video/tmnt.c
@@ -1,6 +1,7 @@
#include "driver.h"
#include "machine/eeprom.h"
#include "video/konamiic.h"
+#include "includes/tmnt.h"
static int layer_colorbase[3],sprite_colorbase,bg_colorbase;
diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c
index 8215f21706e..51d505335f9 100644
--- a/src/mame/video/tumbleb.c
+++ b/src/mame/video/tumbleb.c
@@ -15,14 +15,14 @@ to switch between 8*8 tiles and 16*16 tiles.
***************************************************************************/
#include "driver.h"
+#include "includes/tumbleb.h"
+
static UINT16 tumblepb_control_0[8];
UINT16 *tumblepb_pf1_data,*tumblepb_pf2_data;
static tilemap *pf1_tilemap,*pf1_alt_tilemap,*pf2_tilemap,*pf2_alt_tilemap;
static int flipscreen;
-extern UINT16* jumppop_control;
static UINT16 bcstory_tilebank;
-extern UINT16* suprtrio_control;
static int sprite_xoffset;
static int sprite_yoffset;
diff --git a/src/mame/video/wc90.c b/src/mame/video/wc90.c
index d8a7fe862bc..0eb3bc2c55e 100644
--- a/src/mame/video/wc90.c
+++ b/src/mame/video/wc90.c
@@ -1,4 +1,5 @@
#include "driver.h"
+#include "includes/wc90.h"
UINT8 *wc90_fgvideoram,*wc90_bgvideoram,*wc90_txvideoram;