diff --git a/.gitattributes b/.gitattributes
index d60d696c57d..3ad806efb7b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1008,6 +1008,7 @@ src/emu/uimenu.c svneol=native#text/plain
 src/emu/uimenu.h svneol=native#text/plain
 src/emu/uismall.png -text svneol=unset#image/png
 src/emu/validity.c svneol=native#text/plain
+src/emu/validity.h svneol=native#text/plain
 src/emu/video.c svneol=native#text/plain
 src/emu/video.h svneol=native#text/plain
 src/emu/video/generic.c svneol=native#text/plain
diff --git a/src/emu/clifront.c b/src/emu/clifront.c
index 8ab3900520e..e0172ea52f6 100644
--- a/src/emu/clifront.c
+++ b/src/emu/clifront.c
@@ -11,14 +11,15 @@
 
 #include "driver.h"
 #include "emuopts.h"
-#include "clifront.h"
 #include "hash.h"
 #include "jedparse.h"
 #include "audit.h"
 #include "info.h"
 #include "unzip.h"
 #include "romload.h"
+#include "validity.h"
 #include "sound/samples.h"
+#include "clifront.h"
 
 #include <new>
 #include <ctype.h>
@@ -237,7 +238,6 @@ static int execute_simple_commands(core_options *options, const char *exename)
 	/* validate? */
 	if (options_get_bool(options, CLIOPTION_VALIDATE))
 	{
-		extern int mame_validitychecks(const game_driver *driver);
 		return mame_validitychecks(NULL);
 	}
 
diff --git a/src/emu/cpuexec.c b/src/emu/cpuexec.c
index a2895f0c31c..d970b168ec8 100644
--- a/src/emu/cpuexec.c
+++ b/src/emu/cpuexec.c
@@ -13,6 +13,7 @@
 #include "profiler.h"
 #include "eminline.h"
 #include "debugger.h"
+#include "cpuexec.h"
 
 
 /***************************************************************************
diff --git a/src/emu/crsshair.c b/src/emu/crsshair.c
index 5f110256dc9..eb987e23800 100644
--- a/src/emu/crsshair.c
+++ b/src/emu/crsshair.c
@@ -13,6 +13,7 @@
 #include "rendutil.h"
 #include "config.h"
 #include "xmlfile.h"
+#include "crsshair.h"
 
 
 
diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c
index 922a24a2cb5..0512f246afd 100644
--- a/src/emu/devintrf.c
+++ b/src/emu/devintrf.c
@@ -11,6 +11,7 @@
 
 #include "driver.h"
 #include "cpuintrf.h"
+#include "devintrf.h"
 
 
 
diff --git a/src/emu/drawgfx.c b/src/emu/drawgfx.c
index eb705349bf3..522305b2c41 100644
--- a/src/emu/drawgfx.c
+++ b/src/emu/drawgfx.c
@@ -11,6 +11,7 @@
 
 #include "driver.h"
 #include "drawgfxm.h"
+#include "drawgfx.h"
 
 
 /***************************************************************************
diff --git a/src/emu/emupal.c b/src/emu/emupal.c
index e65f060e1dd..ba528a38660 100644
--- a/src/emu/emupal.c
+++ b/src/emu/emupal.c
@@ -10,6 +10,7 @@
 ******************************************************************************/
 
 #include "driver.h"
+#include "emupal.h"
 
 #define VERBOSE 0
 
diff --git a/src/emu/fileio.c b/src/emu/fileio.c
index 67a41194b4e..73fedb4c384 100644
--- a/src/emu/fileio.c
+++ b/src/emu/fileio.c
@@ -17,6 +17,7 @@
 #include "hash.h"
 #include "unzip.h"
 #include "options.h"
+#include "fileio.h"
 
 
 /***************************************************************************
diff --git a/src/emu/inptport.c b/src/emu/inptport.c
index 26ca03ea7a5..17f245de156 100644
--- a/src/emu/inptport.c
+++ b/src/emu/inptport.c
@@ -99,6 +99,8 @@
 #include "inputseq.h"
 #include "ui.h"
 #include "uiinput.h"
+#include "inptport.h"
+
 #include <ctype.h>
 #include <time.h>
 #include <stdarg.h>
diff --git a/src/emu/mame.c b/src/emu/mame.c
index 40152ac661f..bc6d0de1134 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -84,8 +84,9 @@
 #include "uimenu.h"
 #include "uiinput.h"
 #include "streams.h"
+#include "validity.h"
 #include "debug/debugcon.h"
-
+#include "mame.h"
 #include <new>
 #include <stdarg.h>
 #include <time.h>
@@ -195,8 +196,6 @@ const char mame_disclaimer[] =
     FUNCTION PROTOTYPES
 ***************************************************************************/
 
-extern int mame_validitychecks(const game_driver *driver);
-
 static int parse_ini_file(core_options *options, const char *name, int priority);
 
 static running_machine *create_machine(const game_driver *driver);
diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c
index 4ef8dc8c776..cfa33dc6fb8 100644
--- a/src/emu/mconfig.c
+++ b/src/emu/mconfig.c
@@ -11,6 +11,8 @@
 
 #include "driver.h"
 #include "devintrf.h"
+#include "mconfig.h"
+
 #include <ctype.h>
 
 #if defined(_MSC_VER)
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 0c254cd172d..137e86209b1 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -175,6 +175,7 @@
 #include "driver.h"
 #include "profiler.h"
 #include "debug/debugcpu.h"
+#include "memory.h"
 
 
 /***************************************************************************
diff --git a/src/emu/romload.c b/src/emu/romload.c
index 08b1dfd00df..a16453abe6a 100644
--- a/src/emu/romload.c
+++ b/src/emu/romload.c
@@ -16,6 +16,7 @@
 #include "harddisk.h"
 #include "config.h"
 #include "ui.h"
+#include "romload.h"
 
 
 #define LOG_LOAD 0
diff --git a/src/emu/sound.c b/src/emu/sound.c
index d0a22211739..34f632d6993 100644
--- a/src/emu/sound.c
+++ b/src/emu/sound.c
@@ -15,6 +15,7 @@
 #include "config.h"
 #include "profiler.h"
 #include "sound/wavwrite.h"
+#include "sound.h"
 
 
 
diff --git a/src/emu/state.c b/src/emu/state.c
index 93a8aac8989..499a4e64819 100644
--- a/src/emu/state.c
+++ b/src/emu/state.c
@@ -25,6 +25,8 @@
 
 #include "driver.h"
 #include "astring.h"
+#include "state.h"
+
 #include <zlib.h>
 
 
diff --git a/src/emu/timer.c b/src/emu/timer.c
index 35ceb66c65f..4c2ff3d5ec9 100644
--- a/src/emu/timer.c
+++ b/src/emu/timer.c
@@ -13,6 +13,7 @@
 #include "driver.h"
 #include "profiler.h"
 #include "pool.h"
+#include "timer.h"
 
 
 /***************************************************************************
diff --git a/src/emu/validity.c b/src/emu/validity.c
index 8cdf1619978..595c534c1b1 100644
--- a/src/emu/validity.c
+++ b/src/emu/validity.c
@@ -13,9 +13,11 @@
 #include "eminline.h"
 #include "driver.h"
 #include "hash.h"
+#include "unicode.h"
+#include "validity.h"
+
 #include <ctype.h>
 #include <stdarg.h>
-#include "unicode.h"
 #include <zlib.h>
 
 
diff --git a/src/emu/validity.h b/src/emu/validity.h
new file mode 100644
index 00000000000..314869e2fd2
--- /dev/null
+++ b/src/emu/validity.h
@@ -0,0 +1,22 @@
+/***************************************************************************
+
+    validity.h
+
+    Validity checks
+
+    Copyright Nicola Salmoria and the MAME Team.
+    Visit http://mamedev.org for licensing and usage restrictions.
+
+***************************************************************************/
+
+#pragma once
+
+#include "mamecore.h"
+
+#ifndef __VALIDITY_H__
+#define __VALIDITY_H__
+
+extern int mame_validitychecks(const game_driver *driver);
+
+#endif
+
diff --git a/src/emu/video.c b/src/emu/video.c
index d13aaa0b115..e82511ade46 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -16,6 +16,7 @@
 #include "rendutil.h"
 #include "ui.h"
 #include "aviio.h"
+#include "video.h"
 
 #include "snap.lh"
 
diff --git a/src/emu/watchdog.c b/src/emu/watchdog.c
index b218c19988e..abe685de2c2 100644
--- a/src/emu/watchdog.c
+++ b/src/emu/watchdog.c
@@ -10,6 +10,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "watchdog.h"
 
 
 
diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c
index a869759b4aa..64155f94b0e 100644
--- a/src/mame/audio/taito_en.c
+++ b/src/mame/audio/taito_en.c
@@ -229,7 +229,7 @@ static WRITE16_HANDLER(es5510_dsp_w)
 
 static UINT16 *sound_ram;
 
-ADDRESS_MAP_START( f3_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
+static ADDRESS_MAP_START( f3_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_MIRROR(0x30000) AM_SHARE("share1") AM_BASE(&sound_ram)
 	AM_RANGE(0x140000, 0x140fff) AM_READWRITE(f3_68000_share_r, f3_68000_share_w)
 	AM_RANGE(0x200000, 0x20001f) AM_DEVREADWRITE("ensoniq", es5505_r, es5505_w)
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index 892d53ae7c7..cc088233451 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -900,14 +900,14 @@ static INPUT_PORTS_START( schaser )
 	PORT_ADJUSTER( 70, "VR3 - Dot Volume" )
 INPUT_PORTS_END
 
-MACHINE_START( schaser )
+static MACHINE_START( schaser )
 {
 	MACHINE_START_CALL(schaser_sh);
 	MACHINE_START_CALL(extra_8080bw_vh);
 	MACHINE_START_CALL(mw8080bw);
 }
 
-MACHINE_RESET( schaser )
+static MACHINE_RESET( schaser )
 {
 	MACHINE_RESET_CALL(schaser_sh);
 	MACHINE_RESET_CALL(mw8080bw);
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index ba23c4f37f8..a383dc21119 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -95,28 +95,28 @@ static WRITE8_HANDLER( jackal_flipscreen_w )
 	flip_screen_set(space->machine, data & 0x08);
 }
 
-READ8_HANDLER( jackal_zram_r )
+static READ8_HANDLER( jackal_zram_r )
 {
 	jackal_state *state = (jackal_state *)space->machine->driver_data;
 	return state->rambank[0x0020 + offset];
 }
 
 
-READ8_HANDLER( jackal_voram_r )
+static READ8_HANDLER( jackal_voram_r )
 {
 	jackal_state *state = (jackal_state *)space->machine->driver_data;
 	return state->rambank[0x2000 + offset];
 }
 
 
-READ8_HANDLER( jackal_spriteram_r )
+static READ8_HANDLER( jackal_spriteram_r )
 {
 	jackal_state *state = (jackal_state *)space->machine->driver_data;
 	return state->spritebank[0x3000 + offset];
 }
 
 
-WRITE8_HANDLER( jackal_rambank_w )
+static WRITE8_HANDLER( jackal_rambank_w )
 {
 	jackal_state *state = (jackal_state *)space->machine->driver_data;
 	UINT8 *rgn = memory_region(space->machine, "master");
@@ -133,14 +133,14 @@ WRITE8_HANDLER( jackal_rambank_w )
 }
 
 
-WRITE8_HANDLER( jackal_zram_w )
+static WRITE8_HANDLER( jackal_zram_w )
 {
 	jackal_state *state = (jackal_state *)space->machine->driver_data;
 	state->rambank[0x0020 + offset] = data;
 }
 
 
-WRITE8_HANDLER( jackal_voram_w )
+static WRITE8_HANDLER( jackal_voram_w )
 {
 	jackal_state *state = (jackal_state *)space->machine->driver_data;
 
@@ -151,7 +151,7 @@ WRITE8_HANDLER( jackal_voram_w )
 }
 
 
-WRITE8_HANDLER( jackal_spriteram_w )
+static WRITE8_HANDLER( jackal_spriteram_w )
 {
 	jackal_state *state = (jackal_state *)space->machine->driver_data;
 	state->spritebank[0x3000 + offset] = data;
diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c
index 07acdc12835..5d63b7dd8ba 100644
--- a/src/mame/drivers/jpmimpct.c
+++ b/src/mame/drivers/jpmimpct.c
@@ -651,10 +651,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tms_program_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w)
-	AM_RANGE(0x00000000, 0x003fffff) AM_MIRROR(0xf8000000) AM_RAM AM_BASE(&tms_vram)
+	AM_RANGE(0x00000000, 0x003fffff) AM_MIRROR(0xf8000000) AM_RAM AM_BASE(&jpmimpct_vram)
 	AM_RANGE(0x00800000, 0x00ffffff) AM_MIRROR(0xf8000000) AM_ROM AM_REGION("user1", 0x100000)
 	AM_RANGE(0x02000000, 0x027fffff) AM_MIRROR(0xf8000000) AM_ROM AM_REGION("user1", 0)
-	AM_RANGE(0x01000000, 0x0100003f) AM_MIRROR(0xf87fffc0) AM_READWRITE(bt477_r, bt477_w)
+	AM_RANGE(0x01000000, 0x0100003f) AM_MIRROR(0xf87fffc0) AM_READWRITE(jpmimpct_bt477_r, jpmimpct_bt477_w)
 	AM_RANGE(0x07800000, 0x07bfffff) AM_MIRROR(0xf8400000) AM_RAM
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index 45db8a9f827..2278c361025 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -330,7 +330,7 @@ static ADDRESS_MAP_START( psikyo_map, ADDRESS_SPACE_PROGRAM, 32 )
 	AM_RANGE(0xfe0000, 0xffffff) AM_RAM														// RAM
 ADDRESS_MAP_END
 
-READ32_DEVICE_HANDLER( s1945bl_oki_r )
+static READ32_DEVICE_HANDLER( s1945bl_oki_r )
 {
 	UINT8 dat = okim6295_r(device, 0);
 	return dat << 24;
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index b8683a04760..01e98025c8e 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -333,7 +333,7 @@ static const s2636_interface s2636_2_config =
 // Quasar S2650 Main CPU, I8035 sound board
 // ****************************************
 
-MACHINE_START( quasar )
+static MACHINE_START( quasar )
 {
 	cvs_state *state = (cvs_state *)machine->driver_data;
 
diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c
index 4cc367718d5..69d19033fdd 100644
--- a/src/mame/drivers/tickee.c
+++ b/src/mame/drivers/tickee.c
@@ -224,14 +224,14 @@ static READ16_HANDLER( rapidfir_transparent_r )
 }
 
 
-void rapidfir_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+static void rapidfir_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
 {
 	if (address < 0x800000)
 		memcpy(shiftreg, &tickee_vram[TOWORD(address)], TOBYTE(0x2000));
 }
 
 
-void rapidfir_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
+static void rapidfir_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
 {
 	if (address < 0x800000)
 		memcpy(&tickee_vram[TOWORD(address)], shiftreg, TOBYTE(0x2000));
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index e7dd8833312..f787f98d77a 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -1367,7 +1367,7 @@ static MACHINE_DRIVER_START( zerowing )
 
 	MDRV_QUANTUM_TIME(HZ(600))
 
-	MDRV_MACHINE_RESET(zerozone)
+	MDRV_MACHINE_RESET(zerowing)
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
@@ -1485,7 +1485,7 @@ static MACHINE_DRIVER_START( outzone )
 
 	MDRV_QUANTUM_TIME(HZ(600))
 
-	MDRV_MACHINE_RESET(zerozone)
+	MDRV_MACHINE_RESET(zerowing)
 
 	/* video hardware */
 	MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
diff --git a/src/mame/includes/jaguar.h b/src/mame/includes/jaguar.h
index 47ab05cc959..1894f885a7f 100644
--- a/src/mame/includes/jaguar.h
+++ b/src/mame/includes/jaguar.h
@@ -35,7 +35,6 @@ void jaguar_dsp_suspend(running_machine *machine);
 void jaguar_dsp_resume(running_machine *machine);
 
 void cojag_sound_init(running_machine *machine);
-void cojag_sound_reset(running_machine *machine);
 
 void jaguar_external_int(const device_config *device, int state);
 
diff --git a/src/mame/includes/jpmimpct.h b/src/mame/includes/jpmimpct.h
index 753bdd2cd02..7b4a24df4c2 100644
--- a/src/mame/includes/jpmimpct.h
+++ b/src/mame/includes/jpmimpct.h
@@ -6,10 +6,10 @@
 
 /*----------- defined in video/jpmimpct.c -----------*/
 
-extern UINT16 *tms_vram;
+extern UINT16 *jpmimpct_vram;
 
-READ16_HANDLER( bt477_r );
-WRITE16_HANDLER( bt477_w );
+READ16_HANDLER( jpmimpct_bt477_r );
+WRITE16_HANDLER( jpmimpct_bt477_w );
 
 void jpmimpct_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
 void jpmimpct_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg);
diff --git a/src/mame/includes/ms32.h b/src/mame/includes/ms32.h
index e9219e22d16..88bc0c486f4 100644
--- a/src/mame/includes/ms32.h
+++ b/src/mame/includes/ms32.h
@@ -25,31 +25,9 @@ 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;
-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 );
-READ32_HANDLER( ms32_rozram_r );
-WRITE32_HANDLER( ms32_rozram_w );
-READ32_HANDLER( ms32_lineram_r );
-WRITE32_HANDLER( ms32_lineram_w );
-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/toaplan1.h b/src/mame/includes/toaplan1.h
index 0fc1c0caafa..77fac40a560 100644
--- a/src/mame/includes/toaplan1.h
+++ b/src/mame/includes/toaplan1.h
@@ -29,7 +29,7 @@ WRITE16_HANDLER( samesame_coin_w );
 MACHINE_RESET( toaplan1 );
 MACHINE_RESET( demonwld );
 MACHINE_RESET( vimana );
-MACHINE_RESET( zerozone );	/* hack for ZeroWing/OutZone. See video */
+MACHINE_RESET( zerowing );	/* hack for ZeroWing/OutZone. See video */
 
 extern void toaplan1_driver_savestate(running_machine *machine);
 extern void demonwld_driver_savestate(running_machine *machine);
diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h
index ca1ea4e57b1..7341e84860f 100644
--- a/src/mame/includes/twincobr.h
+++ b/src/mame/includes/twincobr.h
@@ -39,7 +39,6 @@ extern void twincobr_driver_savestate(running_machine *machine);
 extern void wardner_driver_savestate(running_machine *machine);
 
 extern int toaplan_main_cpu;	/* Main CPU type.  0 = 68000, 1 = Z80 */
-extern int twincobr_intenable;
 extern int wardner_membank;
 
 extern UINT8 *twincobr_sharedram;
diff --git a/src/mame/machine/toaplan1.c b/src/mame/machine/toaplan1.c
index a4a84d045a5..f16a20ba12c 100644
--- a/src/mame/machine/toaplan1.c
+++ b/src/mame/machine/toaplan1.c
@@ -311,7 +311,7 @@ void toaplan1_driver_savestate(running_machine *machine)
 	state_save_register_global(machine, toaplan1_unk_reset_port);
 }
 
-MACHINE_RESET( zerozone )	/* Hack for ZeroWing and OutZone. See the video driver */
+MACHINE_RESET( zerowing )	/* Hack for ZeroWing and OutZone. See the video driver */
 {
 	MACHINE_RESET_CALL(toaplan1);
 	toaplan1_unk_reset_port = 1;
diff --git a/src/mame/machine/twincobr.c b/src/mame/machine/twincobr.c
index 0c5068d9969..e9f6c89d95c 100644
--- a/src/mame/machine/twincobr.c
+++ b/src/mame/machine/twincobr.c
@@ -16,7 +16,7 @@
 
 
 int toaplan_main_cpu;	/* Main CPU type.  0 = 68000, 1 = Z80 */
-int twincobr_intenable;
+static int twincobr_intenable;
 int wardner_membank;
 static int twincobr_dsp_on;
 static int twincobr_dsp_BIO;
diff --git a/src/mame/video/fantland.c b/src/mame/video/fantland.c
index 4641644ec28..824a8ec92c9 100644
--- a/src/mame/video/fantland.c
+++ b/src/mame/video/fantland.c
@@ -59,6 +59,7 @@
 ***************************************************************************************/
 
 #include "driver.h"
+#include "includes/fantland.h"
 
 static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectangle *cliprect)
 {
diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c
index ebe35026a59..e78e5401a13 100644
--- a/src/mame/video/hyprduel.c
+++ b/src/mame/video/hyprduel.c
@@ -351,7 +351,7 @@ static STATE_POSTLOAD( hyprduel_postload )
 }
 
 
-VIDEO_START( common_14220 )
+static VIDEO_START( common_14220 )
 {
 	hyprduel_state *state = (hyprduel_state *)machine->driver_data;
 	alloc_empty_tiles(machine);
diff --git a/src/mame/video/jpmimpct.c b/src/mame/video/jpmimpct.c
index a9055ada042..64c2be8fa8f 100644
--- a/src/mame/video/jpmimpct.c
+++ b/src/mame/video/jpmimpct.c
@@ -9,7 +9,7 @@
 #include "includes/jpmimpct.h"
 
 
-UINT16 *tms_vram;
+UINT16 *jpmimpct_vram;
 
 
 /*************************************
@@ -39,7 +39,7 @@ static struct
  *  1 1 0    Command register
  */
 
-WRITE16_HANDLER( bt477_w )
+WRITE16_HANDLER( jpmimpct_bt477_w )
 {
 	UINT8 val = data & 0xff;
 
@@ -85,7 +85,7 @@ WRITE16_HANDLER( bt477_w )
 	}
 }
 
-READ16_HANDLER( bt477_r )
+READ16_HANDLER( jpmimpct_bt477_r )
 {
 	popmessage("Bt477: Unhandled read access (offset:%x)", offset);
 	return 0;
@@ -100,12 +100,12 @@ READ16_HANDLER( bt477_r )
 
 void jpmimpct_to_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
 {
-	memcpy(shiftreg, &tms_vram[TOWORD(address)], 512 * sizeof(UINT16));
+	memcpy(shiftreg, &jpmimpct_vram[TOWORD(address)], 512 * sizeof(UINT16));
 }
 
 void jpmimpct_from_shiftreg(const address_space *space, UINT32 address, UINT16 *shiftreg)
 {
-	memcpy(&tms_vram[TOWORD(address)], shiftreg, 512 * sizeof(UINT16));
+	memcpy(&jpmimpct_vram[TOWORD(address)], shiftreg, 512 * sizeof(UINT16));
 }
 
 
@@ -117,7 +117,7 @@ void jpmimpct_from_shiftreg(const address_space *space, UINT32 address, UINT16 *
 
 void jpmimpct_scanline_update(const device_config *screen, bitmap_t *bitmap, int scanline, const tms34010_display_params *params)
 {
-	UINT16 *vram = &tms_vram[(params->rowaddr << 8) & 0x3ff00];
+	UINT16 *vram = &jpmimpct_vram[(params->rowaddr << 8) & 0x3ff00];
 	UINT32 *dest = BITMAP_ADDR32(bitmap, scanline, 0);
 	int coladdr = params->coladdr;
 	int x;
diff --git a/src/mame/video/nbmj8900.c b/src/mame/video/nbmj8900.c
index d5fdec5741d..34848a2dd07 100644
--- a/src/mame/video/nbmj8900.c
+++ b/src/mame/video/nbmj8900.c
@@ -62,12 +62,12 @@ WRITE8_HANDLER( nbmj8900_palette_type1_w )
 	palette_set_color_rgb(space->machine, (offset >> 1), pal4bit(r), pal4bit(g), pal4bit(b));
 }
 
+#ifdef UNUSED_FUNCTION
 READ8_HANDLER( nbmj8900_palette_type2_r )
 {
 	return nbmj8900_palette[offset];
 }
 
-#ifdef UNUSED_FUNCTION
 WRITE8_HANDLER( nbmj8900_palette_type2_w )
 {
 	int r, g, b;
diff --git a/src/mame/video/pk8000.c b/src/mame/video/pk8000.c
index 714e3817af3..3652eac8366 100644
--- a/src/mame/video/pk8000.c
+++ b/src/mame/video/pk8000.c
@@ -1,4 +1,5 @@
 #include "driver.h"
+#include "includes/pk8000.h"
 
 static UINT8 pk8000_text_start;
 static UINT8 pk8000_chargen_start;